diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000000..d4cac7e429592
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: MrAlex94
+buy_me_a_coffee: waterfox
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000000..6ea4e4ba29b81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,42 @@
+name: Bug Report
+description: File a bug report
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing a bug report.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: checkboxes
+    id: firefox
+    attributes:
+      label: Reproducible?
+      description: Is this issue reproducible on Firefox?
+      options:
+        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      placeholder: e.g., 6.6.0
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you seeing the problem on?
+      multiple: true
+      options:
+        - Linux
+        - macOS
+        - Windows
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000000..3ba13e0cec6cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000000..cb310f26f642b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature_request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/README b/.github/workflows/README
deleted file mode 100644
index 4e5f9713c7eca..0000000000000
--- a/.github/workflows/README
+++ /dev/null
@@ -1,7 +0,0 @@
-IMPORTANT
-
-All changes and/or additions to GitHub Workflows MUST be approved by the
-Mozilla GitHub Enterprise Administrators Team.
-
-See https://mozilla-hub.atlassian.net/l/cp/f5ypVsa7 for contact information, or
-reach out on Matrix: https://chat.mozilla.org/#/room/#github-admin:mozilla.org
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000000000..c5418b7dcd56c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,530 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: ๐Ÿ— Build
+on:
+  workflow_dispatch:
+    inputs:
+      MOZ_BUILD_DATE:
+        description: Build date override
+        required: false
+        type: string
+      PRE_RELEASE:
+        description: Mark build as pre-release
+        required: false
+        type: string
+      TAG_VERSION:
+        description: Optional display version override
+        required: false
+        type: string
+      TRIGGER_EVENT:
+        description: Trigger event for the workflow
+        required: false
+        default: workflow_dispatch
+        type: string
+  workflow_call:
+    inputs:
+      MOZ_BUILD_DATE:
+        required: false
+        type: string
+      PRE_RELEASE:
+        required: false
+        type: string
+      TRIGGER_EVENT:
+        description: Trigger event for the workflow
+        required: false
+        type: string
+      TAG_VERSION:
+        required: false
+        type: string
+    outputs:
+      versiondisplay:
+        description: Output display version
+        value: '${{ jobs.build-windows-x64-stage-1.outputs.versionout }}'
+      run_id:
+        description: Build workflow run id
+        value: '${{ jobs.build-windows-x64-stage-1.outputs.run_id }}'
+    secrets:
+      MOZ_API_KEY:
+        required: true
+env:
+  CARGO_TERM_COLOR: always
+  MOZ_BUILD_DATE: '${{ inputs.MOZ_BUILD_DATE }}'
+  PRE_RELEASE: '${{ inputs.PRE_RELEASE }}'
+  SCCACHE_GHA_ENABLED: 'true'
+jobs:
+  build-windows-x64-stage-1:
+    name: ๐ŸชŸ Windows Stage 1
+    runs-on:
+      - warp-ubuntu-latest-x64-16x
+    concurrency:
+      group: '${{ github.head_ref }}-windows-x64-stage-1'
+      cancel-in-progress: true
+    env:
+      MOZCONFIG: .mozconfig-x86_64-pc-windows-msvc
+      WINEDEBUG: '-all'
+      ARCH: x86_64-pc-mingw32
+    outputs:
+      versionout: '${{ steps.versionexport.outputs.version }}'
+      run_id: '${{ steps.runid.outputs.run_id }}'
+    steps:
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Build dependencies
+        run: |
+          sudo apt update
+          sudo apt install msitools
+          rustup override set 1.90.0
+          rustup target add x86_64-pc-windows-msvc
+          mkdir -p $HOME/.mozbuild
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          tar -xvf clang.tar.zst -C $HOME/.mozbuild
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          curl https://rclone.org/install.sh | sudo bash
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ inputs.TAG_VERSION }} ]]; then
+            echo ${{ inputs.TAG_VERSION }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: ๐Ÿ“ฃ Export VERSION_DISPLAY
+        id: versionexport
+        run: echo "version=$(echo ${{ env.VERSION_DISPLAY }})" >> $GITHUB_OUTPUT
+      - name: ๐Ÿ“ฃ Export run id
+        id: runid
+        run: echo "run_id=${GITHUB_RUN_ID}" >> "$GITHUB_OUTPUT"
+      - name: ๐Ÿ— Build
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          fi
+          if [[ $PRE_RELEASE != 'true' ]]; then
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export GEN_PGO=1
+          ./mach build
+      - name: ๐Ÿ“ฆ Package
+        run: |
+          ./mach package
+      - name: ๐Ÿ“ฃ Save build metadata
+        run: |
+          mkdir -p artifacts
+          {
+            echo "VERSION_DISPLAY=${VERSION_DISPLAY}"
+            echo "PRE_RELEASE=${PRE_RELEASE}"
+            echo "MOZ_BUILD_DATE=${MOZ_BUILD_DATE}"
+            echo "TAG_VERSION=${{ inputs.TAG_VERSION }}"
+            echo "BUILD_RUN_ID=${GITHUB_RUN_ID}"
+            echo "COMMIT_SHA=${GITHUB_SHA}"
+          } > artifacts/build-metadata.env
+        shell: bash
+      - name: โ†‘ Upload metadata
+        uses: actions/upload-artifact@v6
+        with:
+          name: build-metadata
+          path: artifacts/build-metadata.env
+      - name: โ†‘ Upload Stage 1 Artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-${{ env.ARCH }}-stage-1
+          path: |
+            obj-${{ env.ARCH }}/dist/waterfox
+  build-windows-x64-stage-2:
+    name: ๐ŸชŸ Windows Stage 2
+    defaults:
+      run:
+        shell: bash
+    needs:
+      - build-windows-x64-stage-1
+    runs-on: windows-2025
+    concurrency:
+      group: '${{ github.head_ref }}-windows-x64-stage-2'
+      cancel-in-progress: true
+    env:
+      ARCH: x86_64-pc-mingw32
+    steps:
+      - name: โš™๏ธ Setup
+        run: |
+          curl -L https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe --output MozillaBuildSetup-Latest.exe
+          7z x MozillaBuildSetup-Latest.exe -o/c/mozilla-build
+          mkdir -p $HOME/.mozbuild
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.win64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          7z x "clang.tar.zst" -so | 7z x -aoa -si -ttar -o$HOME/.mozbuild
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+      - name: โ†“ Download Stage 1 Windows artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: windows-${{ env.ARCH }}-stage-1
+          path: obj-${{ env.ARCH }}/dist/waterfox
+      - name: ๐Ÿ— Run PGO
+        shell: pwsh
+        run: |
+          ls obj-${{ env.ARCH }}/dist/
+          ls obj-${{ env.ARCH }}/dist/waterfox
+          rm .mozconfig
+          python mach configure --disable-bootstrap
+          $env:LLVM_PROFDATA = $HOME + '/.mozbuild/clang/bin/llvm-profdata.exe'; $env:JARLOG_FILE = 'en-US.log'; python mach python build/pgo/profileserver.py --binary ./obj-${{ env.ARCH }}/dist/waterfox/waterfox.exe
+      - name: โ†‘ Upload Stage 2 Artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-${{ env.ARCH }}-stage-2
+          path: |
+            merged.profdata
+            en-US.log
+  build-windows-x64-stage-3:
+    name: ๐ŸชŸ Windows Stage 3
+    needs:
+      - build-windows-x64-stage-2
+    runs-on:
+      - warp-ubuntu-latest-x64-32x
+    concurrency:
+      group: '${{ github.head_ref }}-windows-x64-stage-3'
+      cancel-in-progress: true
+    env:
+      MOZCONFIG: .mozconfig-x86_64-pc-windows-msvc
+      WINEDEBUG: '-all'
+      ARCH: x86_64-pc-mingw32
+    steps:
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Build dependencies
+        run: |
+          sudo apt update
+          sudo apt install msitools
+          rustup override set 1.90.0
+          rustup target add x86_64-pc-windows-msvc
+          mkdir -p $HOME/.mozbuild
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          tar -xvf clang.tar.zst -C $HOME/.mozbuild
+          curl -L https://github.com/ebourg/jsign/releases/download/6.0/jsign_6.0_all.deb --output jsign_6.0_all.deb
+          sudo apt install -y ./jsign_6.0_all.deb
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          curl https://rclone.org/install.sh | sudo bash
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ inputs.TAG_VERSION }} ]]; then
+            echo ${{ inputs.TAG_VERSION }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: โ†“ Download Stage 2 Windows artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: windows-${{ env.ARCH }}-stage-2
+          path: ${{ github.workspace }}
+      - name: ๐Ÿ— Build
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          else
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export USE_PGO=1
+          ./mach build
+      - name: ๐Ÿ“ฆ Package
+        run: |
+          ./mach package
+          if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+            ./mach package-multi-locale --locales ar cs da de el en-GB en-US es-ES es-MX fr hu id it ja ko lt nl nn-NO pl pt-BR pt-PT ru sv-SE th uk vi zh-CN zh-TW
+          fi
+      - name: โ†‘ Upload Windows build outputs
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-${{ env.ARCH }}-build
+          path: |
+            obj-${{ env.ARCH }}/dist/waterfox
+            obj-${{ env.ARCH }}/dist/host/bin/mar
+            obj-${{ env.ARCH }}/browser/installer/windows/instgen/
+  build-macos-multi-stage-1:
+    name: ๐ŸŽ macOS Stage 1
+    runs-on:
+      - warp-ubuntu-latest-x64-16x
+    strategy:
+      matrix:
+        arch:
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
+    concurrency:
+      group: '${{ github.ref }}-${{ matrix.arch }}-macos-multi'
+      cancel-in-progress: true
+    env:
+      MOZCONFIG: '.mozconfig-${{ matrix.arch }}'
+    steps:
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Build dependencies
+        run: |
+          sudo apt update
+          sudo apt install nasm
+          rustup override set 1.90.0
+          rustup target add ${{ matrix.arch }}
+          mkdir -p $HOME/.mozbuild
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          tar -xvf clang.tar.zst -C $HOME/.mozbuild
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          curl https://rclone.org/install.sh | sudo bash
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ inputs.TAG_VERSION }} ]]; then
+            echo ${{ inputs.TAG_VERSION }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: ๐Ÿ— Build
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          else
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export GEN_PGO=1
+          ./mach build
+      - name: ๐Ÿ“ฆ Package
+        run: |
+          ./mach package
+      - name: โ†‘ Upload Stage 1 Artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: macos-${{ matrix.arch }}-stage-1
+          path: |
+            ./obj-${{ matrix.arch }}/dist/waterfox/*.app
+            ./obj-${{ matrix.arch }}/dist/host/bin/mar
+          retention-days: 1
+  build-macos-multi-stage-2:
+    name: ๐ŸŽ macOS Stage 2
+    runs-on: ${{ matrix.runs-on }}
+    concurrency:
+      group: '${{ github.ref }}-${{ matrix.arch }}-macos-multi-stage-2'
+      cancel-in-progress: true
+    strategy:
+      matrix:
+        include:
+          - runs-on: macos-15-intel
+            arch: x86_64-apple-darwin
+            clang_url: https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.macosx64-clang-20.latest/artifacts/public/build/clang.tar.zst
+          - runs-on: warp-macos-13-arm64-6x
+            arch: aarch64-apple-darwin
+            clang_url: https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.macosx64-aarch64-clang-20.latest/artifacts/public/build/clang.tar.zst
+    needs:
+      - build-macos-multi-stage-1
+    env:
+      MOZ_HEADLESS: '1'
+    steps:
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+      - name: โ†“ Download Stage 1 macOS artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: macos-${{ matrix.arch }}-stage-1
+          path: obj-${{ matrix.arch }}/dist/
+      - name: ๐Ÿ— Run PGO
+        run: |
+          mkdir -p $HOME/.mozbuild
+          curl -L ${{ matrix.clang_url }} -o clang.tar.zst
+          zstd -d clang.tar.zst
+          tar -xf clang.tar
+          ls obj-${{ matrix.arch }}/dist/
+          ls obj-${{ matrix.arch }}/dist/waterfox
+          xattr -dr com.apple.quarantine ./obj-${{ matrix.arch }}/dist/waterfox/Waterfox.app
+          find ./obj-${{ matrix.arch }}/dist/waterfox/ -type f -exec /bin/sh -c "file {} | grep -q executable && chmod +x {}" \;
+          rm .mozconfig || true
+          ./mach --no-interactive bootstrap --application-choice=browser
+          LLVM_PROFDATA=$PWD/clang/bin/llvm-profdata JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary ./obj-${{ matrix.arch }}/dist/waterfox/Waterfox.app/Contents/MacOS/waterfox
+      - name: โ†‘ Upload Stage 2 Artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: macos-${{ matrix.arch }}-stage-2
+          path: |
+            merged.profdata
+            en-US.log
+  build-macos-multi-stage-3:
+    name: ๐ŸŽ macOS Stage 3
+    runs-on:
+      - warp-ubuntu-latest-x64-32x
+    needs:
+      - build-macos-multi-stage-2
+    strategy:
+      matrix:
+        arch:
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
+    concurrency:
+      group: '${{ github.ref }}-${{ matrix.arch }}-macos-multi'
+      cancel-in-progress: true
+    env:
+      MOZCONFIG: '.mozconfig-${{ matrix.arch }}'
+    steps:
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Build dependencies
+        run: |
+          sudo apt update
+          sudo apt install nasm
+          rustup override set 1.90.0
+          rustup target add ${{ matrix.arch }}
+          mkdir -p $HOME/.mozbuild
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          tar -xvf clang.tar.zst -C $HOME/.mozbuild
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          curl https://rclone.org/install.sh | sudo bash
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: 'recursive'
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ inputs.TAG_VERSION }} ]]; then
+            echo ${{ inputs.TAG_VERSION }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: โ†“ Download Stage 2 ARM64 artifact
+        uses: actions/download-artifact@v7
+        with:
+          name: macos-${{ matrix.arch }}-stage-2
+          path: ${{ github.workspace }}
+      - name: ๐Ÿ— Build
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          else
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export USE_PGO=1
+          ./mach build
+      - name: ๐Ÿ“ฆ Package
+        run: |
+          ./mach package
+          if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+            ./mach package-multi-locale --locales ar cs da de el en-GB en-US es-ES es-MX fr hu id it ja ko lt nl nn-NO pl pt-BR pt-PT ru sv-SE th uk vi zh-CN zh-TW
+          fi
+      - name: โ†‘ Upload Stage 3 Artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: macos-${{ matrix.arch }}-stage-3
+          path: |
+            ./obj-${{ matrix.arch }}/dist/waterfox/*.app
+            ./obj-${{ matrix.arch }}/dist/host/bin/mar
+          retention-days: 1
+  build-linux-x64:
+    name: ๐Ÿง Linux
+    runs-on:
+      - warp-ubuntu-2204-x64-16x
+    concurrency:
+      group: '${{ github.head_ref }}-linux-x64'
+      cancel-in-progress: true
+    env:
+      MOZCONFIG: .mozconfig-x86_64-pc-linux-gnu
+      ARCH: x86_64-pc-linux-gnu
+      CARGO_INCREMENTAL: '0'
+      CARGO_TERM_COLOR: always
+    steps:
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Setup build packages
+        run: |
+          mkdir -p $HOME/.mozbuild
+          rustup override set 1.90.0
+          curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+          tar -xvf clang.tar.zst -C $HOME/.mozbuild
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          sudo apt install patchelf
+          python3 -m pip install cryptography
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: 'recursive'
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ inputs.TAG_VERSION }} ]]; then
+            echo ${{ inputs.TAG_VERSION }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: ๐Ÿ— Build Stage 1
+        run: |
+          echo "${{ secrets.MOZ_API_KEY }}" > mozilla-api
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          else
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export GEN_PGO=1
+          ./mach build
+      - name: ๐Ÿ— Build Stage 2
+        env:
+          DISPLAY: :0
+        run: |
+          ./mach package
+          Xvfb $DISPLAY -screen 0 1280x1024x24 &
+          LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary obj-${{ env.ARCH }}/dist/waterfox/waterfox
+          unset GEN_PGO
+          ./mach clobber
+      - name: ๐Ÿ— Build Stage 3
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            export WFX_PRE_RELEASE=1
+            echo "Set WFX_PRE_RELEASE as ${WFX_PRE_RELEASE}"
+            echo "WFX_RELEASE should be 0. ${WFX_RELEASE}"
+          else
+            export WFX_RELEASE=1
+            echo "Set WFX_RELEASE as ${WFX_RELEASE}"
+            echo "WFX_PRE_RELEASE should be 0. ${WFX_PRE_RELEASE}"
+          fi
+          export USE_PGO=1
+          ./mach build
+      - name: ๐Ÿ“ฆ Package
+        run: |
+          ./mach package
+          if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+            ./mach package-multi-locale --locales ar cs da de el en-GB en-US es-ES es-MX fr hu id it ja ko lt nl nn-NO pl pt-BR pt-PT ru sv-SE th uk vi zh-CN zh-TW
+          fi
+      - name: โ†‘ Upload Linux build outputs
+        uses: actions/upload-artifact@v6
+        with:
+          name: linux-build
+          path: |
+            obj-${{ env.ARCH }}/dist/waterfox/
+            obj-${{ env.ARCH }}/dist/host/bin/mar
diff --git a/.github/workflows/close-pr.yml b/.github/workflows/close-pr.yml
deleted file mode 100644
index a881cde247f6c..0000000000000
--- a/.github/workflows/close-pr.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: close pull request
-on:
-  pull_request_target:
-    types: [opened, reopened]
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: "README.txt"
-          sparse-checkout-cone-mode: false
-      - name: close
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PR: ${{ github.event.number }}
-        run: |
-          gh pr close ${{ env.PR }} --comment "(Automated Close) Please do not file pull requests here, see https://firefox-source-docs.mozilla.org/contributing/how_to_submit_a_patch.html"
-          gh pr lock ${{ env.PR }}
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
new file mode 100644
index 0000000000000..e822f70b3b481
--- /dev/null
+++ b/.github/workflows/pipeline.yml
@@ -0,0 +1,72 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: ๐Ÿš€ Deployment
+on:
+  workflow_dispatch:
+    inputs:
+      date:
+        description: Build date
+        required: true
+        type: string
+      prerelease:
+        description: This is a pre-release
+        required: true
+        type: string
+      tags:
+        description: Tag a release
+        required: true
+        type: string
+permissions:
+  contents: read
+  actions: read
+jobs:
+  build:
+    name: ๐Ÿ— Build
+    uses: ./.github/workflows/build.yml
+    secrets:
+      MOZ_API_KEY: '${{ secrets.MOZ_API_KEY }}'
+    with:
+      MOZ_BUILD_DATE: '${{ github.event.inputs.date }}'
+      PRE_RELEASE: '${{ github.event.inputs.prerelease }}'
+      TAG_VERSION: '${{ github.event.inputs.tags }}'
+      TRIGGER_EVENT: '${{ github.event_name }}'
+  sign:
+    name: โœ Sign
+    uses: ./.github/workflows/sign.yml
+    needs: build
+    permissions:
+      actions: read
+      contents: read
+      id-token: write
+    secrets:
+      AWS_ACCESS_KEY_ID: '${{ secrets.CF_ACCESS_KEY_ID }}'
+      AWS_SECRET_ACCESS_KEY: '${{ secrets.CF_ACCESS_KEY_SECRET }}'
+      AZURE_CLIENT_ID: '${{ secrets.AZURE_CLIENT_ID }}'
+      AZURE_CRT: '${{ secrets.AZURE_CRT }}'
+      AZURE_SUBSCRIPTION_ID: '${{ secrets.AZURE_SUBSCRIPTION_ID }}'
+      AZURE_TENANT_ID: '${{ secrets.AZURE_TENANT_ID }}'
+      AZURE_VAULT_ID: '${{ secrets.AZURE_VAULT_ID }}'
+      CF_ENDPOINT: '${{ secrets.CF_ENDPOINT }}'
+      MACOS_CERTIFICATE: '${{ secrets.MACOS_CERTIFICATE }}'
+      MACOS_CERTIFICATE_PWD: '${{ secrets.MACOS_CERTIFICATE_PWD }}'
+      MACOS_CI_KEYCHAIN_PWD: '${{ secrets.MACOS_CI_KEYCHAIN_PWD }}'
+      MACOS_NOTARIZATION_APPLE_ID: '${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}'
+      MACOS_NOTARIZATION_PWD: '${{ secrets.MACOS_NOTARIZATION_PWD }}'
+      MACOS_NOTARIZATION_TEAM_ID: '${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}'
+      ONE_PEM: '${{ secrets.ONE_PEM }}'
+      SIGN_BASE64: '${{ secrets.SIGN_BASE64 }}'
+    with:
+      build_run_id: '${{ needs.build.outputs.run_id }}'
+      manual_resign: 'false'
+  publish:
+    name: ๐Ÿš€ Publish
+    uses: ./.github/workflows/publish.yml
+    needs: sign
+    secrets:
+      AWS_ACCESS_KEY_ID: '${{ secrets.CF_ACCESS_KEY_ID }}'
+      AWS_SECRET_ACCESS_KEY: '${{ secrets.CF_ACCESS_KEY_SECRET }}'
+      CF_AUTH: '${{ secrets.BULK_REDIRECT_TOKEN }}'
+      CF_ENDPOINT: '${{ secrets.CF_ENDPOINT }}'
+      CF_ZONE_ID: '${{ secrets.CF_ZONE_ID }}'
+    with:
+      sign_run_id: '${{ needs.sign.outputs.sign_run_id }}'
+      manual_publish: 'false'
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
new file mode 100644
index 0000000000000..abbb57bbae47a
--- /dev/null
+++ b/.github/workflows/production.yml
@@ -0,0 +1,217 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: ๐Ÿš€ Production
+on:
+  workflow_call:
+    inputs:
+      COMMIT_SHA:
+        required: true
+        type: string
+      DISPLAY_VERSION:
+        description: Display Version
+        required: true
+        type: string
+      PRE_RELEASE:
+        required: true
+        type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      CF_AUTH:
+        required: true
+      CF_ENDPOINT:
+        required: true
+      CF_ZONE_ID:
+        required: true
+env:
+  PRE_RELEASE: '${{ inputs.PRE_RELEASE }}'
+  RCLONE_S3_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
+  RCLONE_S3_ACL: private
+  RCLONE_S3_ENDPOINT: '${{ secrets.CF_ENDPOINT }}'
+  RCLONE_S3_PROVIDER: Cloudflare
+  RCLONE_S3_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
+  RCLONE_S3_DECOMPRESS: true
+jobs:
+  soft-release:
+    name: ๐ŸŒ“ Soft Release
+    environment: Approval
+    runs-on: ubuntu-slim
+    steps:
+      - name: ๐Ÿท๏ธ Create GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          commit: '${{ inputs.COMMIT_SHA }}'
+          prerelease: '${{ inputs.PRE_RELEASE }}'
+          tag: '${{ inputs.DISPLAY_VERSION }}'
+      - name: ๐Ÿ’ฟ Setup rclone
+        run: 'curl https://rclone.org/install.sh | sudo bash'
+      - name: ๐Ÿ“ฃ Export CHANNEL
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            echo "CHANNEL=beta" >> $GITHUB_ENV
+          else
+            echo "CHANNEL=release" >> $GITHUB_ENV
+          fi
+      - name: ๐Ÿงช Dry run AUS
+        run: |
+          OSA=(WINNT_x86_64 Linux_x86_64 Darwin_x86_64-aarch64)
+          for OS in "${OSA[@]}"
+          do
+            mkdir -p aus_tmp/"$OS"/
+            rclone copyto :s3:aus/update/staging/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/"$OS"/update.xml ./aus_tmp/"$OS"/update.xml
+            sed -i 's/staging/releases/g' ./aus_tmp/"$OS"/update.xml
+          done
+          for VER in $(rclone lsf --dirs-only :s3:aus/update/production/${{ env.CHANNEL }} | awk -v RS= '{$1=$1}1' | sed 's|/||g')
+          do
+              if [[ $VER != '/' ]]
+              then
+                if [[ $VER == "G5"* ]] || [[ $VER == "G6"* ]]
+                  then
+                      for OS in "${OSA[@]}"
+                      do
+                          rclone moveto ./aus_tmp/"$OS"/update.xml :s3:aus/update/production/${{ env.CHANNEL }}/"$VER"/"$OS"/update.xml --log-level DEBUG --dry-run
+                      done
+                  fi
+              fi
+          done
+          for OS in "${OSA[@]}"
+          do
+              cat <<END >update.xml
+          <?xml version="1.0"?>
+          <updates>
+          </updates>
+              END
+                  rclone moveto ./update.xml :s3:aus/update/production/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/"$OS"/update.xml --log-level DEBUG --dry-run
+          done
+      - name: ๐Ÿงช Move installers from staging to production
+        run: >
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe.sha512
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe.sha512
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Install\ Waterfox.exe :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Install\ Waterfox.exe
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg.sha512
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg.sha512
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2.sha512
+          :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2.sha512
+      - name: โŽ† Update latest redirects
+        if: ${{ inputs.PRE_RELEASE == 'false' }}
+        run: >
+          curl "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ZONE_ID }}/rules/lists/500a3e4c6bd2435da861ad9f407f892b/items" \
+              -H "Authorization: Bearer ${{ secrets.CF_AUTH }}" \
+              -H "Content-Type: application/json" \
+              -d '[
+                {
+                  "redirect": {
+                    "source_url": "cdn.waterfox.com/waterfox/releases/latest/windows",
+                    "target_url": "https://cdn.waterfox.com/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox Setup ${{ inputs.DISPLAY_VERSION }}.exe",
+                    "preserve_query_string": true,
+                    "status_code": 302
+                  }
+                }
+              ]'
+          curl "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ZONE_ID }}/rules/lists/500a3e4c6bd2435da861ad9f407f892b/items" \
+              -H "Authorization: Bearer ${{ secrets.CF_AUTH }}" \
+              -H "Content-Type: application/json" \
+              -d '[
+                {
+                  "redirect": {
+                    "source_url": "cdn.waterfox.com/waterfox/releases/latest/windows-stub",
+                    "target_url": "https://cdn.waterfox.com/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Install Waterfox.exe",
+                    "preserve_query_string": true,
+                    "status_code": 302
+                  }
+                }
+              ]'
+          curl "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ZONE_ID }}/rules/lists/500a3e4c6bd2435da861ad9f407f892b/items" \
+              -H "Authorization: Bearer ${{ secrets.CF_AUTH }}" \
+              -H "Content-Type: application/json" \
+              -d '[
+                {
+                  "redirect": {
+                    "source_url": "cdn.waterfox.com/waterfox/releases/latest/macos",
+                    "target_url": "https://cdn.waterfox.com/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox ${{ inputs.DISPLAY_VERSION }}.dmg",
+                    "preserve_query_string": true,
+                    "status_code": 302
+                  }
+                }
+              ]'
+          curl "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_ZONE_ID }}/rules/lists/500a3e4c6bd2435da861ad9f407f892b/items" \
+              -H "Authorization: Bearer ${{ secrets.CF_AUTH }}" \
+              -H "Content-Type: application/json" \
+              -d '[
+                {
+                  "redirect": {
+                    "source_url": "cdn.waterfox.com/waterfox/releases/latest/linux",
+                    "target_url": "https://cdn.waterfox.com/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2",
+                    "preserve_query_string": true,
+                    "status_code": 302
+                  }
+                }
+              ]'
+  hard-release:
+    name: ๐ŸŒ• Hard Release
+    needs:
+      - soft-release
+    environment: Approval
+    runs-on: ubuntu-slim
+    steps:
+      - name: ๐Ÿ’ฟ Setup rclone
+        run: 'curl https://rclone.org/install.sh | sudo bash'
+      - name: ๐Ÿ“ฃ Export CHANNEL
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            echo "CHANNEL=beta" >> $GITHUB_ENV
+          else
+            echo "CHANNEL=release" >> $GITHUB_ENV
+          fi
+      - name: ๐Ÿšš Move MARs from staging
+        run: >
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/WINNT_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/update/WINNT_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/Darwin_x86_64-aarch64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/update/Darwin_x86_64-aarch64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+
+          rclone moveto :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar :s3:cdn/waterfox/releases/${{ inputs.DISPLAY_VERSION }}/update/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+      - name: ๐Ÿšš Move update XMLs from staging
+        run: |
+          OSA=(WINNT_x86_64 Linux_x86_64 Darwin_x86_64-aarch64)
+          for OS in "${OSA[@]}"
+          do
+            mkdir -p aus_tmp/"$OS"/
+            rclone copyto :s3:aus/update/staging/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/"$OS"/update.xml ./aus_tmp/"$OS"/update.xml
+            sed -i 's/staging/releases/g' ./aus_tmp/"$OS"/update.xml
+          done
+          for VER in $(rclone lsf --dirs-only :s3:aus/update/production/${{ env.CHANNEL }} | awk -v RS= '{$1=$1}1' | sed 's|/||g')
+          do
+            if [[ $VER != '/' ]]
+            then
+              if [[ $VER == "G5"* ]] || [[ $VER == "G6"* ]] || [[ $VER =~ ^[0-9]+(\.[0-9]+){1,3}(-beta-[0-9]+)?$ ]]
+              then
+                for OS in "${OSA[@]}"
+                do
+                  rclone copyto ./aus_tmp/"$OS"/update.xml :s3:aus/update/production/${{ env.CHANNEL }}/"$VER"/"$OS"/update.xml
+                done
+              fi
+            fi
+          done
+          for OS in "${OSA[@]}"
+          do
+            cat <<END >update.xml
+          <?xml version="1.0"?>
+          <updates>
+          </updates>
+          END
+            rclone moveto ./update.xml :s3:aus/update/production/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/"$OS"/update.xml
+          done
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000000000..e0ed1df4ba35c
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,143 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: ๐Ÿš€ Publish
+on:
+  workflow_dispatch:
+    inputs:
+      sign_run_id:
+        description: Sign workflow run id to publish from (defaults to latest successful run)
+        required: false
+        type: string
+      manual_publish:
+        description: Force "manual publish" mode (use GitHub App token to download artifacts from a separate run)
+        required: false
+        default: 'true'
+        type: string
+  workflow_call:
+    inputs:
+      sign_run_id:
+        required: false
+        type: string
+      manual_publish:
+        required: false
+        default: 'false'
+        type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      CF_AUTH:
+        required: true
+      CF_ENDPOINT:
+        required: true
+      CF_ZONE_ID:
+        required: true
+      ARTIFACTS_APP_ID:
+        required: false
+      ARTIFACTS_APP_PRIVATE_KEY:
+        required: false
+permissions:
+  contents: read
+  actions: read
+jobs:
+  prepare:
+    name: ๐Ÿงญ Resolve sign metadata
+    runs-on: ubuntu-slim
+    outputs:
+      sign_run_id: "${{ steps.resolve.outputs.sign_run_id }}"
+      display_version: "${{ steps.meta.outputs.VERSION_DISPLAY }}"
+      pre_release: "${{ steps.meta.outputs.PRE_RELEASE }}"
+      commit_sha: "${{ steps.meta.outputs.COMMIT_SHA }}"
+    steps:
+      - name: ๐Ÿงญ Resolve sign run
+        id: resolve
+        uses: actions/github-script@v8
+        env:
+          SIGN_RUN_ID_INPUT: "${{ inputs.sign_run_id }}"
+        with:
+          script: |
+            const provided = process.env.SIGN_RUN_ID_INPUT;
+            if (provided) {
+              core.setOutput('sign_run_id', provided.trim());
+              return;
+            }
+            const runs = await github.paginate(github.rest.actions.listWorkflowRuns, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'sign.yml',
+              status: 'success',
+              per_page: 1,
+            });
+            if (!runs.length) {
+              throw new Error('No successful sign workflow runs found to publish.');
+            }
+            core.setOutput('sign_run_id', `${runs[0].id}`);
+      - name: ๐Ÿ›‘ Require GitHub App credentials for manual publish
+        if: ${{ inputs.manual_publish == 'true' }}
+        env:
+          ARTIFACTS_APP_ID: ${{ secrets.ARTIFACTS_APP_ID }}
+          ARTIFACTS_APP_PRIVATE_KEY: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+        run: |
+          if [[ -z "$ARTIFACTS_APP_ID" || -z "$ARTIFACTS_APP_PRIVATE_KEY" ]]; then
+            echo "Missing required secrets for manual publish: ARTIFACTS_APP_ID and/or ARTIFACTS_APP_PRIVATE_KEY" >&2
+            exit 1
+          fi
+      - name: ๐Ÿ”‘ Create GitHub App token (manual publish)
+        if: ${{ inputs.manual_publish == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download sign metadata (manual publish)
+        if: ${{ inputs.manual_publish == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: sign-metadata
+          path: sign-metadata
+          run-id: "${{ steps.resolve.outputs.sign_run_id }}"
+      - name: โ†“ Download sign metadata
+        if: ${{ inputs.manual_publish != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: sign-metadata
+          path: sign-metadata
+          run-id: "${{ steps.resolve.outputs.sign_run_id }}"
+      - name: ๐Ÿ“„ Load sign metadata
+        id: meta
+        run: |
+          cat sign-metadata/build-metadata.env >> "$GITHUB_ENV"
+          while IFS='=' read -r key value; do
+            if [[ -n "$key" ]]; then
+              echo "$key=$value" >> "$GITHUB_OUTPUT"
+            fi
+          done < sign-metadata/build-metadata.env
+  stage:
+    name: ๐ŸŽญ Deploy to Staging
+    needs:
+      - prepare
+    uses: ./.github/workflows/stage.yml
+    with:
+      DISPLAY_VERSION: "${{ needs.prepare.outputs.display_version }}"
+      PRE_RELEASE: "${{ needs.prepare.outputs.pre_release }}"
+      SIGN_RUN_ID: "${{ needs.prepare.outputs.sign_run_id }}"
+    secrets:
+      AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
+      AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
+      CF_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
+  production:
+    name: ๐Ÿš€ Deploy to Production
+    needs:
+      - stage
+    uses: ./.github/workflows/production.yml
+    with:
+      COMMIT_SHA: "${{ needs.prepare.outputs.commit_sha }}"
+      PRE_RELEASE: "${{ needs.prepare.outputs.pre_release }}"
+      DISPLAY_VERSION: "${{ needs.prepare.outputs.display_version }}"
+    secrets:
+      AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
+      AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
+      CF_AUTH: "${{ secrets.CF_AUTH }}"
+      CF_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
+      CF_ZONE_ID: "${{ secrets.CF_ZONE_ID }}"
diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml
new file mode 100644
index 0000000000000..4eb4460d4401c
--- /dev/null
+++ b/.github/workflows/sign.yml
@@ -0,0 +1,565 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: โœ Sign
+on:
+  workflow_dispatch:
+    inputs:
+      build_run_id:
+        description: Reuse artifacts from a specific build workflow run
+        required: false
+        type: string
+      manual_resign:
+        description: Force "manual re-sign" mode (use GitHub App token to download artifacts from a separate run)
+        required: false
+        default: 'true'
+        type: string
+  workflow_call:
+    inputs:
+      build_run_id:
+        required: false
+        type: string
+      manual_resign:
+        required: false
+        default: 'false'
+        type: string
+    outputs:
+      versiondisplay:
+        description: Display version carried from the build metadata
+        value: "${{ jobs.prepare.outputs.version_display }}"
+      sign_run_id:
+        description: Sign workflow run id
+        value: "${{ jobs.prepare.outputs.sign_run_id }}"
+      build_run_id:
+        description: Resolved build workflow run id
+        value: "${{ jobs.prepare.outputs.build_run_id }}"
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      AZURE_CLIENT_ID:
+        required: true
+      AZURE_CRT:
+        required: true
+      AZURE_TENANT_ID:
+        required: true
+      AZURE_SUBSCRIPTION_ID:
+        required: true
+      AZURE_VAULT_ID:
+        required: true
+      CF_ENDPOINT:
+        required: true
+      MACOS_CERTIFICATE:
+        required: true
+      MACOS_CERTIFICATE_PWD:
+        required: true
+      MACOS_CI_KEYCHAIN_PWD:
+        required: true
+      MACOS_NOTARIZATION_APPLE_ID:
+        required: true
+      MACOS_NOTARIZATION_PWD:
+        required: true
+      MACOS_NOTARIZATION_TEAM_ID:
+        required: true
+      ONE_PEM:
+        required: true
+      SIGN_BASE64:
+        required: true
+permissions:
+  contents: read
+  actions: read
+env:
+  RCLONE_S3_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID || secrets.CF_ACCESS_KEY_ID }}"
+  RCLONE_S3_ACL: private
+  RCLONE_S3_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
+  RCLONE_S3_PROVIDER: Cloudflare
+  RCLONE_S3_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY || secrets.CF_ACCESS_KEY_SECRET }}"
+jobs:
+  prepare:
+    name: ๐Ÿงญ Resolve build & metadata
+    runs-on: ubuntu-slim
+    outputs:
+      build_run_id: "${{ steps.resolve.outputs.build_run_id }}"
+      version_display: "${{ steps.meta.outputs.VERSION_DISPLAY }}"
+      pre_release: "${{ steps.meta.outputs.PRE_RELEASE }}"
+      tag_version: "${{ steps.meta.outputs.TAG_VERSION }}"
+      commit_sha: "${{ steps.meta.outputs.COMMIT_SHA }}"
+      sign_run_id: "${{ steps.sign_run.outputs.sign_run_id }}"
+    steps:
+      - name: ๐Ÿงญ Resolve build run
+        id: resolve
+        uses: actions/github-script@v8
+        env:
+          BUILD_RUN_ID_INPUT: "${{ inputs.build_run_id }}"
+        with:
+          script: |
+            const provided = process.env.BUILD_RUN_ID_INPUT;
+            if (provided) {
+              core.setOutput('build_run_id', provided.trim());
+              return;
+            }
+            const runs = await github.paginate(github.rest.actions.listWorkflowRuns, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'build.yml',
+              status: 'success',
+              per_page: 1,
+            });
+            if (!runs.length) {
+              throw new Error('No successful build workflow runs found to sign.');
+            }
+            core.setOutput('build_run_id', `${runs[0].id}`);
+      - name: ๐Ÿ›‘ Require GitHub App credentials for manual re-sign
+        if: ${{ inputs.manual_resign == 'true' }}
+        env:
+          ARTIFACTS_APP_ID: ${{ secrets.ARTIFACTS_APP_ID }}
+          ARTIFACTS_APP_PRIVATE_KEY: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+        run: |
+          if [[ -z "$ARTIFACTS_APP_ID" || -z "$ARTIFACTS_APP_PRIVATE_KEY" ]]; then
+            echo "Missing required secrets for manual re-sign: ARTIFACTS_APP_ID and/or ARTIFACTS_APP_PRIVATE_KEY" >&2
+            exit 1
+          fi
+      - name: ๐Ÿ”‘ Create GitHub App token (for manual re-sign artifact downloads)
+        if: ${{ inputs.manual_resign == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download build metadata (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: build-metadata
+          path: build-metadata
+          run-id: ${{ steps.resolve.outputs.build_run_id }}
+      - name: โ†“ Download build metadata
+        if: ${{ inputs.manual_resign != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: build-metadata
+          path: build-metadata
+          run-id: ${{ steps.resolve.outputs.build_run_id }}
+      - name: ๐Ÿ“„ Load build metadata
+        id: meta
+        run: |
+          cat build-metadata/build-metadata.env >> "$GITHUB_ENV"
+          while IFS='=' read -r key value; do
+            if [[ -n "$key" ]]; then
+              echo "$key=$value" >> "$GITHUB_OUTPUT"
+            fi
+          done < build-metadata/build-metadata.env
+      - name: ๐Ÿ†” Capture sign run id
+        id: sign_run
+        run: echo "sign_run_id=${GITHUB_RUN_ID}" >> "$GITHUB_OUTPUT"
+      - name: ๐Ÿ“ Record sign metadata
+        run: echo "SIGN_RUN_ID=${GITHUB_RUN_ID}" >> build-metadata/build-metadata.env
+      - name: โ†‘ Upload sign metadata
+        uses: actions/upload-artifact@v6
+        with:
+          name: sign-metadata
+          path: build-metadata/build-metadata.env
+  windows-sign:
+    name: ๐ŸชŸ Windows signing
+    needs:
+      - prepare
+    runs-on:
+      - warp-ubuntu-latest-x64-4x
+    permissions:
+      id-token: write
+      contents: read
+    env:
+      ARCH: x86_64-pc-mingw32
+      MOZ_OBJDIR: obj-x86_64-pc-mingw32
+      VERSION_DISPLAY: "${{ needs.prepare.outputs.version_display }}"
+      PRE_RELEASE: "${{ needs.prepare.outputs.pre_release }}"
+    steps:
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+      - name: ๐Ÿ”‘ Create GitHub App token (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download Windows build artifact (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: windows-${{ env.ARCH }}-build
+          path: obj-${{ env.ARCH }}
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โ†“ Download Windows build artifact
+        if: ${{ inputs.manual_resign != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: windows-${{ env.ARCH }}-build
+          path: obj-${{ env.ARCH }}
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โšก Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: ๐Ÿ’ฟ Build dependencies
+        run: |
+          sudo apt update
+          sudo apt install msitools
+          mkdir -p $HOME/.mozbuild
+          curl -L https://github.com/ebourg/jsign/releases/download/7.4/jsign_7.4_all.deb --output jsign_7.4_all.deb
+          sudo apt install -y ./jsign_7.4_all.deb
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          curl https://rclone.org/install.sh | sudo bash
+      - name: ๐Ÿชช Azure CLI Login via OIDC
+        uses: azure/login@v2
+        with:
+          client-id: "${{ secrets.AZURE_CLIENT_ID }}"
+          tenant-id: "${{ secrets.AZURE_TENANT_ID }}"
+          subscription-id: "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+      - name: โœ Sign and package
+        run: |
+          jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" obj-${{ env.ARCH }}/browser/installer/windows/instgen/setup.exe
+
+          find obj-${{ env.ARCH }}/dist/waterfox -type f -name "*.exe" -exec jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" {} \;
+
+          find obj-${{ env.ARCH }}/dist/waterfox -type f -name "*.dll" -exec jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" {} \;
+
+          python3 -m pip install --break-system-packages cryptography
+
+          echo "${{ secrets.SIGN_BASE64 }}" | base64 --decode > sign.zip
+          unzip -q sign.zip
+          rm sign.zip
+          chmod +x ./sign/sign.sh
+
+          ./sign/sign.sh -k "$PWD"/sign/1 -p ${{ secrets.ONE_PEM }} -c "$PWD"/sign/2 -i "$PWD"/obj-${{ env.ARCH }}/dist/waterfox -t windows
+          rm -rf ./sign/
+
+          ./mach python -m mozbuild.action.zip -C obj-${{ env.ARCH }}/dist waterfox.zip waterfox
+
+          ./mach repackage installer -o "Waterfox Setup ${{ env.VERSION_DISPLAY }}.exe" --package-name waterfox --package obj-${{ env.ARCH }}/dist/waterfox.zip --tag browser/installer/windows/app.tag --setupexe obj-${{ env.ARCH }}/browser/installer/windows/instgen/setup.exe --sfx-stub other-licenses/7zstub/firefox/7zSD.Win32.sfx --use-upx
+
+          jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" "Waterfox Setup ${{ env.VERSION_DISPLAY }}.exe"
+
+          jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" obj-${{ env.ARCH }}/browser/installer/windows/instgen/setup-stub.exe
+
+          ./mach repackage installer -o "Install Waterfox.exe" --tag browser/installer/windows/stub.tag --setupexe obj-${{ env.ARCH }}/browser/installer/windows/instgen/setup-stub.exe --sfx-stub other-licenses/7zstub/firefox/7zSD.Win32.sfx --use-upx
+
+          jsign --storetype AZUREKEYVAULT -s ${{ secrets.AZURE_VAULT_ID }} -a ${{ secrets.AZURE_CRT }} -t "http://rfc3161timestamp.globalsign.com/advanced" -m RFC3161 -d SHA-512 --storepass "$(az account get-access-token --resource "https://vault.azure.net" -t ${{ secrets.AZURE_TENANT_ID }} | jq -r .accessToken)" "Install Waterfox.exe"
+
+          shasum -a 512 "Waterfox Setup ${{ env.VERSION_DISPLAY }}.exe" > "Waterfox Setup ${{ env.VERSION_DISPLAY }}.exe.sha512"
+      - name: ๐Ÿ“ฆ Package MAR
+        run: |
+          MAR_BIN="$PWD/obj-${{ env.ARCH }}/dist/host/bin/mar"
+          if [[ ! -f "$MAR_BIN" ]]; then
+            echo "Expected host mar binary not found in build artifacts: $MAR_BIN" >&2
+            find "obj-${{ env.ARCH }}/dist" -maxdepth 4 -name mar -print || true
+            exit 1
+          fi
+          chmod +x "$MAR_BIN" || true
+
+          INI_PATH="obj-${{ env.ARCH }}/dist/waterfox/application.ini"
+          if [[ ! -f "$INI_PATH" ]]; then
+            echo "Expected application.ini at $INI_PATH but not found"
+            find "obj-${{ env.ARCH }}/dist" -maxdepth 4 -name application.ini -print || true
+            exit 1
+          fi
+
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            ./mach repackage mar -i obj-${{ env.ARCH }}/dist/waterfox.zip --mar "$MAR_BIN" -o waterfox-${{ env.VERSION_DISPLAY }}.complete.mar --arch x86_64 --mar-channel-id beta
+          else
+            ./mach repackage mar -i obj-${{ env.ARCH }}/dist/waterfox.zip --mar "$MAR_BIN" -o waterfox-${{ env.VERSION_DISPLAY }}.complete.mar --arch x86_64 --mar-channel-id release
+          fi
+
+          xml=('<?xml version="1.0"?>'
+
+          '<updates>'
+
+          '    <update type="major" appVersion="VERSION"  buildID="BUILDID" detailsURL="https://www.waterfox.com/releases/VERSION_DISPLAY" displayVersion="VERSION_DISPLAY">'
+
+          '        <patch type="complete" URL="https://cdn.waterfox.com/waterfox/staging/${{ env.VERSION_DISPLAY }}/update/WINNT_x86_64/waterfox-${{ env.VERSION_DISPLAY }}.complete.mar" hashFunction="SHA512" hashValue="HASH" size="SIZE"/>'
+
+          '    </update>'
+
+          '</updates>')
+
+          for line in "${xml[@]}" ; do echo $line >> update.xml ; done
+
+          VERSION=$(grep '\<Version\>' "$INI_PATH" | cut -d'=' -f2)
+          BUILDID=$(grep 'BuildID=' "$INI_PATH" | cut -d'=' -f2)
+          SHA512=$(shasum -a 512 waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $1}')
+          SIZE=$(ls -l waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $5}')
+
+          echo "Display Version: ${{ env.VERSION_DISPLAY }}, Version: $VERSION, Build ID: $BUILDID, File Size: $SIZE, SHA512: $SHA512"
+
+          sed -i "s/VERSION_DISPLAY/${{ env.VERSION_DISPLAY }}/g" update.xml
+          sed -i "s/VERSION/$VERSION/g" update.xml
+          sed -i "s/BUILDID/$BUILDID/g" update.xml
+          sed -i "s/SIZE/$SIZE/g" update.xml
+          sed -i "s/HASH/"$SHA512"/g" update.xml
+      - name: โ†‘ Upload Windows signed artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-signed
+          path: |
+            Waterfox\ Setup\ ${{ env.VERSION_DISPLAY }}.exe
+            Waterfox\ Setup\ ${{ env.VERSION_DISPLAY }}.exe.sha512
+            Install\ Waterfox.exe
+            waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
+            update.xml
+  macos-sign:
+    name: ๐ŸŽ macOS signing
+    needs:
+      - prepare
+    runs-on: warp-macos-13-arm64-6x
+    env:
+      ARCH_X64: x86_64-apple-darwin
+      ARCH_ARM64: aarch64-apple-darwin
+      VERSION_DISPLAY: "${{ needs.prepare.outputs.version_display }}"
+      PRE_RELEASE: "${{ needs.prepare.outputs.pre_release }}"
+    steps:
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+      - name: ๐Ÿ”‘ Create GitHub App token (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download Stage 3 X64 artifact (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: macos-${{ env.ARCH_X64 }}-stage-3
+          path: "./obj-${{ env.ARCH_X64 }}/dist/"
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โ†“ Download Stage 3 X64 artifact
+        if: ${{ inputs.manual_resign != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: macos-${{ env.ARCH_X64 }}-stage-3
+          path: "./obj-${{ env.ARCH_X64 }}/dist/"
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โ†“ Download Stage 3 ARM64 artifact (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: macos-${{ env.ARCH_ARM64 }}-stage-3
+          path: "./obj-${{ env.ARCH_ARM64 }}/dist/"
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โ†“ Download Stage 3 ARM64 artifact
+        if: ${{ inputs.manual_resign != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: macos-${{ env.ARCH_ARM64 }}-stage-3
+          path: "./obj-${{ env.ARCH_ARM64 }}/dist/"
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: ๐Ÿ“ฃ Override version_display.txt
+        run: |
+          if [[ -n ${{ needs.prepare.outputs.tag_version }} ]]; then
+            echo ${{ needs.prepare.outputs.tag_version }} > browser/config/version_display.txt
+          fi
+          echo 'VERSION_DISPLAY<<EOF' >> $GITHUB_ENV
+          cat browser/config/version_display.txt >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: ๐Ÿงฉ Unify .app(s)
+        run: |
+          MOZCONFIG=.mozconfig-${{ env.ARCH_X64 }} ./mach python toolkit/mozapps/installer/unify.py obj-${{ env.ARCH_X64 }}/dist/waterfox/*.app obj-${{ env.ARCH_ARM64 }}/dist/waterfox/*.app
+      - name: ๐Ÿชช Add certificate and provisioning
+        run: |
+          echo ${{ secrets.MACOS_CERTIFICATE }} | base64 --decode > Certificate.p12
+          security create-keychain -p "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
+          security import Certificate.p12 -k build.keychain -P "${{ secrets.MACOS_CERTIFICATE_PWD }}" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${{ secrets.MACOS_CI_KEYCHAIN_PWD }}" build.keychain
+          echo "Create keychain profile"
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}" --team-id "${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}" --password "${{ secrets.MACOS_NOTARIZATION_PWD }}"
+      - name: โœ Sign .app(s)
+        run: |
+          sudo chmod -R 755 ./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app
+          xattr -dr com.apple.quarantine ./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app
+          python3 -m pip install --break-system-packages cryptography
+          echo "${{ secrets.SIGN_BASE64 }}" | base64 --decode > sign.zip
+          unzip -q sign.zip
+          rm sign.zip
+          chmod +x ./sign/sign.sh
+          ./sign/sign.sh -k "$PWD"/sign/1 -p ${{ secrets.ONE_PEM }} -c "$PWD"/sign/2 -i "$PWD"/obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app -t macos
+          rm -rf ./sign/
+          ./mach macos-sign -a ./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app -s ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }} -e production-without-restricted
+          echo "Creating temp notarization archive"
+          ditto -c -k --keepParent "./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app" "notarization.zip"
+          echo "Notarize app"
+          xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
+          echo "Attach staple"
+          xcrun stapler staple "./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app"
+      - name: ๐Ÿ“ฆ Create and โœ Sign .dmg
+        run: |
+          npm install --global create-dmg
+          create-dmg "obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app" ./
+          mv *.dmg "Waterfox ${{ env.VERSION_DISPLAY }}.dmg"
+          shasum -a 512 "Waterfox ${{ env.VERSION_DISPLAY }}.dmg" > "Waterfox ${{ env.VERSION_DISPLAY }}.dmg.sha512"
+      - name: ๐Ÿ“ฆ Create MAR
+        run: |
+          curl https://rclone.org/install.sh | sudo bash
+          rclone copy :s3:cdn/waterfox/libraries/toolchain/mar ./
+          sudo chmod +x ./mar
+
+          ./mach python -m mozbuild.action.zip -C obj-${{ env.ARCH_X64 }}/dist/waterfox/ waterfox.zip Waterfox.app
+
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            MAR=$PWD/mar MOZ_PRODUCT_VERSION=${{ env.VERSION_DISPLAY }} MAR_CHANNEL_ID=beta tools/update-packaging/make_full_update.sh waterfox-${{ env.VERSION_DISPLAY }}.complete.mar obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app
+          else
+            MAR=$PWD/mar MOZ_PRODUCT_VERSION=${{ env.VERSION_DISPLAY }} MAR_CHANNEL_ID=release tools/update-packaging/make_full_update.sh waterfox-${{ env.VERSION_DISPLAY }}.complete.mar obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app
+          fi
+
+          xml=('<?xml version="1.0"?>'
+
+          '<updates>'
+
+          '    <update type="major" appVersion="VERSION"  buildID="BUILDID" detailsURL="https://www.waterfox.com/releases/VERSION_DISPLAY" displayVersion="VERSION_DISPLAY">'
+
+          '        <patch type="complete" URL="https://cdn.waterfox.com/waterfox/staging/${{ env.VERSION_DISPLAY }}/update/Darwin_x86_64-aarch64/waterfox-${{ env.VERSION_DISPLAY }}.complete.mar" hashFunction="SHA512" hashValue="HASH" size="SIZE"/>'
+
+          '    </update>'
+
+          '</updates>')
+
+          for line in "${xml[@]}" ; do echo $line >> update.xml ; done
+
+          VERSION=$(grep '\<Version\>' ./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app/Contents/Resources/application.ini | cut -d'=' -f2)
+          BUILDID=$(grep 'BuildID=' ./obj-${{ env.ARCH_X64 }}/dist/waterfox/Waterfox.app/Contents/Resources/application.ini | cut -d'=' -f2)
+          SHA512=$(shasum -a 512 waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $1}')
+          SIZE=$(ls -l waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $5}')
+
+          echo "Display Version: ${{ env.VERSION_DISPLAY }}, Version: $VERSION, Build ID: $BUILDID, File Size: $SIZE, SHA512: $SHA512"
+
+          sed -i '' -e "s/VERSION_DISPLAY/${{ env.VERSION_DISPLAY }}/g" update.xml
+          sed -i '' -e "s/VERSION/$VERSION/g" update.xml
+          sed -i '' -e "s/BUILDID/$BUILDID/g" update.xml
+          sed -i '' -e "s/SIZE/$SIZE/g" update.xml
+          sed -i '' -e "s/HASH/"$SHA512"/g" update.xml
+      - name: โ†‘ Upload macOS signed artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: macos-signed
+          path: |
+            Waterfox ${{ env.VERSION_DISPLAY }}.dmg
+            Waterfox ${{ env.VERSION_DISPLAY }}.dmg.sha512
+            waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
+            update.xml
+  linux-sign:
+    name: ๐Ÿง Linux signing
+    needs:
+      - prepare
+    runs-on:
+      - warp-ubuntu-latest-x64-4x
+    env:
+      ARCH: x86_64-pc-linux-gnu
+      VERSION_DISPLAY: "${{ needs.prepare.outputs.version_display }}"
+      PRE_RELEASE: "${{ needs.prepare.outputs.pre_release }}"
+    steps:
+      - name: ๐Ÿ“ค Checkout
+        uses: actions/checkout@v6
+      - name: ๐Ÿ’ฟ Setup build packages
+        run: |
+          curl -L "https://github.com/ip7z/7zip/releases/download/25.01/7z2501-linux-x64.tar.xz" | tar xJ
+          sudo mv 7zz /usr/local/bin/7z
+          sudo apt install patchelf
+          python3 -m pip install cryptography
+      - name: ๐Ÿ”‘ Create GitHub App token (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download Linux build artifact (manual re-sign)
+        if: ${{ inputs.manual_resign == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: linux-build
+          path: obj-${{ env.ARCH }}/dist
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โ†“ Download Linux build artifact
+        if: ${{ inputs.manual_resign != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: linux-build
+          path: obj-${{ env.ARCH }}/dist
+          run-id: "${{ needs.prepare.outputs.build_run_id }}"
+      - name: โœ Sign and package
+        env:
+          DISPLAY: :0
+        run: |
+          echo "${{ secrets.SIGN_BASE64 }}" | base64 --decode > sign.zip
+          unzip -q sign.zip
+          rm sign.zip
+          chmod +x ./sign/sign.sh
+
+          DIST_ROOT="$PWD/obj-${{ env.ARCH }}/dist"
+          WATERFOX_DIR="$DIST_ROOT/waterfox"
+
+          MAR_BIN="$DIST_ROOT/host/bin/mar"
+          if [[ ! -f "$MAR_BIN" ]]; then
+            echo "Expected host mar binary not found in build artifacts: $MAR_BIN" >&2
+            echo "Directory tree (dist, depth 4):"
+            find "$DIST_ROOT" -maxdepth 4 -print
+            exit 1
+          fi
+          chmod +x "$MAR_BIN" || true
+
+          INI_PATH="$WATERFOX_DIR/application.ini"
+
+          ./sign/sign.sh -k "$PWD"/sign/1 -p ${{ secrets.ONE_PEM }} -c "$PWD"/sign/2 -i "$WATERFOX_DIR" -t linux
+          rm -rf ./sign/
+
+          patchelf --add-rpath '$ORIGIN' "$WATERFOX_DIR/updater"
+
+          tar -c --owner=0 --group=0 --numeric-owner --mode=go-w --exclude=.mkdir.done -jf waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2 -C "$DIST_ROOT" waterfox
+          shasum -a 512 waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2 > waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2.sha512
+
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            ./mach repackage mar -i waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2 --mar "$MAR_BIN" -o waterfox-${{ env.VERSION_DISPLAY }}.complete.mar --arch x86_64 --mar-channel-id beta
+          else
+            ./mach repackage mar -i waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2 --mar "$MAR_BIN" -o waterfox-${{ env.VERSION_DISPLAY }}.complete.mar --arch x86_64 --mar-channel-id release
+          fi
+
+          xml=('<?xml version="1.0"?>'
+
+          '<updates>'
+
+          '    <update type="major" appVersion="VERSION"  buildID="BUILDID" detailsURL="https://www.waterfox.com/releases/VERSION_DISPLAY" displayVersion="VERSION_DISPLAY">'
+
+          '        <patch type="complete" URL="https://cdn.waterfox.com/waterfox/staging/${{ env.VERSION_DISPLAY }}/update/Linux_x86_64/waterfox-${{ env.VERSION_DISPLAY }}.complete.mar" hashFunction="SHA512" hashValue="HASH" size="SIZE"/>'
+
+          '    </update>'
+
+          '</updates>')
+
+          for line in "${xml[@]}" ; do echo $line >> update.xml ; done
+
+          VERSION=$(grep '\<Version\>' "$INI_PATH" | cut -d'=' -f2)
+          BUILDID=$(grep 'BuildID=' "$INI_PATH" | cut -d'=' -f2)
+          SHA512=$(shasum -a 512 waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $1}')
+          SIZE=$(ls -l waterfox-${{ env.VERSION_DISPLAY }}.complete.mar | awk '{print $5}')
+
+          echo "Display Version: ${{ env.VERSION_DISPLAY }}, Version: $VERSION, Build ID: $BUILDID, File Size: $SIZE, SHA512: $SHA512"
+
+          sed -i "s/VERSION_DISPLAY/${{ env.VERSION_DISPLAY }}/g" update.xml
+          sed -i "s/VERSION/$VERSION/g" update.xml
+          sed -i "s/BUILDID/$BUILDID/g" update.xml
+          sed -i "s/SIZE/$SIZE/g" update.xml
+          sed -i "s/HASH/"$SHA512"/g" update.xml
+      - name: โ†‘ Upload Linux signed artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: linux-signed
+          path: |
+            waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2
+            waterfox-${{ env.VERSION_DISPLAY }}.tar.bz2.sha512
+            waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
+            update.xml
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
new file mode 100644
index 0000000000000..6bf86a7a8aac0
--- /dev/null
+++ b/.github/workflows/stage.yml
@@ -0,0 +1,183 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: ๐ŸŽญ Stage
+on:
+  workflow_dispatch:
+    inputs:
+      DISPLAY_VERSION:
+        description: Input display version
+        required: true
+        type: string
+      PRE_RELEASE:
+        description: This is a pre-release
+        required: false
+        type: string
+      SIGN_RUN_ID:
+        description: Sign workflow run id to pull artifacts from
+        required: true
+        type: string
+      manual_stage:
+        description: Force "manual stage" mode (use GitHub App token to download artifacts from a separate run)
+        required: false
+        default: 'true'
+        type: string
+  workflow_call:
+    inputs:
+      DISPLAY_VERSION:
+        description: Input display version
+        required: true
+        type: string
+      PRE_RELEASE:
+        description: This is a pre-release
+        required: false
+        type: string
+      SIGN_RUN_ID:
+        description: Sign workflow run id to pull artifacts from
+        required: true
+        type: string
+      manual_stage:
+        description: Force "manual stage" mode (use GitHub App token to download artifacts from a separate run)
+        required: false
+        default: 'false'
+        type: string
+    outputs:
+      versiondisplay:
+        description: Output display version
+        value: '${{ jobs.stage.outputs.versionout }}'
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      CF_ENDPOINT:
+        required: true
+      ARTIFACTS_APP_ID:
+        required: false
+      ARTIFACTS_APP_PRIVATE_KEY:
+        required: false
+permissions:
+  contents: read
+  actions: read
+env:
+  PRE_RELEASE: '${{ inputs.PRE_RELEASE }}'
+  RCLONE_S3_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
+  RCLONE_S3_ACL: private
+  RCLONE_S3_ENDPOINT: '${{ secrets.CF_ENDPOINT }}'
+  RCLONE_S3_PROVIDER: Cloudflare
+  RCLONE_S3_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
+jobs:
+  stage:
+    name: ๐ŸŽญ Multi-platform
+    runs-on: ubuntu-slim
+    outputs:
+      versionout: '${{ steps.versionexport.outputs.version }}'
+    steps:
+      - name: ๐Ÿ“ฃ Output VERSION_DISPLAY
+        id: versionexport
+        run: echo "version=$(echo ${{ inputs.DISPLAY_VERSION }})" >> $GITHUB_OUTPUT
+      - name: ๐Ÿ“ฃ Export CHANNEL
+        run: |
+          if [[ $PRE_RELEASE == 'true' ]]; then
+            echo "CHANNEL=beta" >> $GITHUB_ENV
+          else
+            echo "CHANNEL=release" >> $GITHUB_ENV
+          fi
+      - name: ๐Ÿ’ฟ Setup rclone
+        run: 'curl https://rclone.org/install.sh | sudo bash'
+      - name: ๐Ÿ›‘ Require GitHub App credentials for manual stage
+        if: ${{ inputs.manual_stage == 'true' }}
+        env:
+          ARTIFACTS_APP_ID: ${{ secrets.ARTIFACTS_APP_ID }}
+          ARTIFACTS_APP_PRIVATE_KEY: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+        run: |
+          if [[ -z "$ARTIFACTS_APP_ID" || -z "$ARTIFACTS_APP_PRIVATE_KEY" ]]; then
+            echo "Missing required secrets for manual stage: ARTIFACTS_APP_ID and/or ARTIFACTS_APP_PRIVATE_KEY" >&2
+            exit 1
+          fi
+      - name: ๐Ÿ”‘ Create GitHub App token (manual stage)
+        if: ${{ inputs.manual_stage == 'true' }}
+        id: app_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.ARTIFACTS_APP_ID }}
+          private-key: ${{ secrets.ARTIFACTS_APP_PRIVATE_KEY }}
+      - name: โ†“ Download Windows artifact (manual stage)
+        if: ${{ inputs.manual_stage == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: windows-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: win/
+      - name: โ†“ Download Windows artifact
+        if: ${{ inputs.manual_stage != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: windows-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: win/
+      - name: ๐ŸŽญ Stage Windows
+        run: >
+          rclone copyto win/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe
+
+          rclone copyto win/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe.sha512
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Waterfox\ Setup\ ${{ inputs.DISPLAY_VERSION }}.exe.sha512
+
+          rclone copyto win/Install\ Waterfox.exe :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/Install\ Waterfox.exe
+
+          rclone copyto win/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/WINNT_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+
+          rclone copyto win/update.xml :s3:aus/update/staging/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/WINNT_x86_64/update.xml
+      - name: โ†“ Download macOS artifact (manual stage)
+        if: ${{ inputs.manual_stage == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: macos-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: mac/
+      - name: โ†“ Download macOS artifact
+        if: ${{ inputs.manual_stage != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: macos-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: mac/
+      - name: ๐ŸŽญ Stage macOS
+        run: >
+          rclone copyto mac/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg
+
+          rclone copyto mac/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg.sha512
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/Waterfox\ ${{ inputs.DISPLAY_VERSION }}.dmg.sha512
+
+          rclone copyto mac/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/Darwin_x86_64-aarch64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+
+          rclone copyto mac/update.xml :s3:aus/update/staging/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/Darwin_x86_64-aarch64/update.xml
+      - name: โ†“ Download Linux artifact (manual stage)
+        if: ${{ inputs.manual_stage == 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          github-token: ${{ steps.app_token.outputs.token }}
+          name: linux-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: lin/
+      - name: โ†“ Download Linux artifact
+        if: ${{ inputs.manual_stage != 'true' }}
+        uses: actions/download-artifact@v7
+        with:
+          name: linux-signed
+          run-id: ${{ inputs.SIGN_RUN_ID }}
+          path: lin/
+      - name: ๐ŸŽญ Stage Linux
+        run: >
+          rclone copyto lin/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2 :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2
+
+          rclone copyto lin/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2.sha512 :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.tar.bz2.sha512
+
+          rclone copyto lin/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+          :s3:cdn/waterfox/staging/${{ inputs.DISPLAY_VERSION }}/update/Linux_x86_64/waterfox-${{ inputs.DISPLAY_VERSION }}.complete.mar
+
+          rclone copyto lin/update.xml :s3:aus/update/staging/${{ env.CHANNEL }}/${{ inputs.DISPLAY_VERSION }}/Linux_x86_64/update.xml
diff --git a/.gitignore b/.gitignore
index 54128923383b7..c5b000f81ea17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,8 +49,6 @@ ID
 # User files that may appear at the root
 /.clang-tidy
 /.clangd
-/.mozconfig*
-/mozconfig*
 /.moz-fast-forward
 /.moz-vendoring
 /old-configure
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000..56e41e8ab922b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "waterfox/browser/locales"]
+	path = waterfox/browser/locales
+	url = git@github.com:BrowserWorks/l10n.git
diff --git a/.mozconfig b/.mozconfig
new file mode 100644
index 0000000000000..051579ed469ab
--- /dev/null
+++ b/.mozconfig
@@ -0,0 +1,78 @@
+#!/bin/sh
+# For local development builds
+
+case $(uname -s) in
+    Darwin)
+        # Any macOS specific settings
+        # For release builds we should use -march=core2 -mtune=haswell
+        export CC="$HOME"/.mozbuild/clang/bin/clang
+        export CXX="$HOME"/.mozbuild/clang/bin/clang++
+        ;;
+    MINGW*)
+        # Any Windows specific settings
+        ac_add_options --disable-bits-download
+        ac_add_options --disable-maintenance-service
+        ac_add_options --disable-parental-controls
+        ;;
+    Linux)
+        # Any Linux specific settings
+        case $(uname -m) in
+            x86_64)
+                if test -d "$HOME/.mozbuild/clang/bin"; then
+                    export CC="$HOME"/.mozbuild/clang/bin/clang
+                    export CXX="$HOME"/.mozbuild/clang/bin/clang++
+                else
+                    export CC=clang
+                    export CXX=clang++
+                fi
+                if test -f "$HOME/.mozbuild/nasm/nasm"; then
+                    export NASM="$HOME"/.mozbuild/nasm/nasm
+                fi
+                ac_add_options --target=x86_64-pc-linux-gnu
+                ;;
+            ppc64le)
+                export CC=gcc
+                export CXX=g++
+                ac_add_options --enable-optimize="-w"
+                ac_add_options --target=powerpc64le-unknown-linux-gnu
+                ;;
+        esac
+        ;;
+esac
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-dmd
+ac_add_options --disable-geckodriver
+ac_add_options --disable-profiling
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+
+ac_add_options --enable-application=browser
+# Make sure to have the clang version in sync with your rust version
+# curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-20.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+# tar -xvf clang.tar.zst -C $HOME/.mozbuild
+# rm clang.tar.zst
+ac_add_options --enable-bootstrap=-clang
+ac_add_options --enable-jxl
+ac_add_options --enable-optimize="-Os -w"
+ac_add_options --enable-unverified-updates
+
+ac_add_options --with-app-basename=Waterfox
+ac_add_options --with-app-name=waterfox
+ac_add_options --with-branding=waterfox/browser/branding
+ac_add_options --with-distribution-id=net.waterfox
+if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+    ac_add_options --with-l10n-base="$PWD"/waterfox/browser/locales
+fi
+
+if test -x "$(command -v sccache)"; then
+    ac_add_options --with-ccache=sccache
+elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+    ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+fi
+
+mk_add_options AUTOCLOBBER=1
+mk_add_options MOZ_OBJDIR=./obj-"$(uname -s)"-"$(uname -m)"
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
diff --git a/.mozconfig-aarch64-apple-darwin b/.mozconfig-aarch64-apple-darwin
new file mode 100644
index 0000000000000..ac86b04708f15
--- /dev/null
+++ b/.mozconfig-aarch64-apple-darwin
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Targetting ARM64 builds. Expected to be run on Linux.
+
+if test "$WFX_RELEASE" || test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-lto=cross
+    ac_add_options --enable-optimize="-mcpu=apple-m1 -O3 -w"
+    ac_add_options --enable-release
+    ac_add_options --enable-rust-simd
+    ac_add_options RUSTC_OPT_LEVEL=3
+    export MOZILLA_OFFICIAL=1
+    export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=apple-m1"
+fi
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-dmd
+ac_add_options --disable-geckodriver
+ac_add_options --disable-profiling
+ac_add_options --disable-tests
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-bootstrap=-clang,-sccache
+if test -x "$(command -v sccache)"; then
+    ac_add_options --with-ccache=sccache
+elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+    ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+fi
+ac_add_options --enable-install-strip
+ac_add_options --enable-jxl
+if test "$GEN_PGO"; then
+    ac_add_options --enable-profile-generate=cross
+elif test "$USE_PGO"; then
+    ac_add_options --enable-profile-use=cross
+    ac_add_options --with-pgo-jarlog="$GITHUB_WORKSPACE"/en-US.log
+    ac_add_options --with-pgo-profile-path="$GITHUB_WORKSPACE"/merged.profdata
+fi
+ac_add_options --enable-strip
+if test "$WFX_RELEASE"; then
+    ac_add_options --enable-update-channel=release
+elif test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-update-channel=beta
+fi
+ac_add_options --enable-unverified-updates
+ac_add_options --enable-updater
+
+ac_add_options --target=aarch64-apple-darwin
+
+ac_add_options --with-app-basename=Waterfox
+ac_add_options --with-app-name=waterfox
+ac_add_options --with-branding=waterfox/browser/branding
+ac_add_options --with-distribution-id=net.waterfox
+if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+    ac_add_options --with-l10n-base="$PWD"/waterfox/browser/locales
+fi
+
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
diff --git a/.mozconfig-x86_64-apple-darwin b/.mozconfig-x86_64-apple-darwin
new file mode 100644
index 0000000000000..5a294179a4ca3
--- /dev/null
+++ b/.mozconfig-x86_64-apple-darwin
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Targetting X64 builds. Expected to be run on Linux.
+
+if test "$WFX_RELEASE" || test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-lto=cross
+    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
+    ac_add_options --enable-release
+    ac_add_options --enable-rust-simd
+    ac_add_options RUSTC_OPT_LEVEL=3
+    export MOZILLA_OFFICIAL=1
+    export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=nehalem"
+fi
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-dmd
+ac_add_options --disable-geckodriver
+ac_add_options --disable-profiling
+ac_add_options --disable-tests
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-bootstrap=-clang,-sccache
+if test -x "$(command -v sccache)"; then
+    ac_add_options --with-ccache=sccache
+elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+    ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+fi
+ac_add_options --enable-install-strip
+ac_add_options --enable-jxl
+if test "$GEN_PGO"; then
+    ac_add_options --enable-profile-generate=cross
+elif test "$USE_PGO"; then
+    ac_add_options --enable-profile-use=cross
+    ac_add_options --with-pgo-jarlog="$GITHUB_WORKSPACE"/en-US.log
+    ac_add_options --with-pgo-profile-path="$GITHUB_WORKSPACE"/merged.profdata
+fi
+ac_add_options --enable-strip
+if test "$WFX_RELEASE"; then
+    ac_add_options --enable-update-channel=release
+elif test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-update-channel=beta
+fi
+ac_add_options --enable-unverified-updates
+ac_add_options --enable-updater
+
+ac_add_options --target=x86_64-apple-darwin
+
+ac_add_options --with-app-basename=Waterfox
+ac_add_options --with-app-name=waterfox
+ac_add_options --with-branding=waterfox/browser/branding
+ac_add_options --with-distribution-id=net.waterfox
+if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+    ac_add_options --with-l10n-base="$PWD"/waterfox/browser/locales
+fi
+
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
diff --git a/.mozconfig-x86_64-pc-linux-gnu b/.mozconfig-x86_64-pc-linux-gnu
new file mode 100644
index 0000000000000..a0887012089ed
--- /dev/null
+++ b/.mozconfig-x86_64-pc-linux-gnu
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+if test -d "$HOME/.mozbuild/clang/bin"; then
+    export CC="$HOME"/.mozbuild/clang/bin/clang
+    export CXX="$HOME"/.mozbuild/clang/bin/clang++
+else
+    export CC=clang
+    export CXX=clang++
+fi
+
+if test "$WFX_RELEASE" || test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-lto
+    ac_add_options --enable-optimize="-march=x86-64-v2 -mtune=generic -O3 -w"
+    ac_add_options --enable-release
+    ac_add_options --enable-rust-simd
+    ac_add_options RUSTC_OPT_LEVEL=3
+    export MOZILLA_OFFICIAL=1
+    export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64-v2"
+fi
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-dmd
+ac_add_options --disable-geckodriver
+ac_add_options --disable-profiling
+ac_add_options --disable-tests
+
+ac_add_options --enable-alsa
+ac_add_options --enable-application=browser
+ac_add_options --enable-bootstrap=-clang,-sccache
+if test -x "$(command -v sccache)"; then
+    ac_add_options --with-ccache=sccache
+elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+    ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+fi
+ac_add_options --enable-install-strip
+ac_add_options --enable-jxl
+ac_add_options --enable-linker=lld
+if test "$GEN_PGO"; then
+    ac_add_options --enable-profile-generate
+elif test "$USE_PGO"; then
+    ac_add_options --enable-profile-use
+    ac_add_options --with-pgo-jarlog=$PWD/en-US.log
+    ac_add_options --with-pgo-profile-path=$PWD/merged.profdata
+fi
+ac_add_options --enable-pulseaudio
+ac_add_options --enable-strip
+if test "$WFX_RELEASE"; then
+    ac_add_options --enable-update-channel=release
+elif test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-update-channel=beta
+fi
+ac_add_options --enable-unverified-updates
+ac_add_options --enable-updater
+
+ac_add_options --target=x86_64-pc-linux-gnu
+
+ac_add_options --with-app-basename=Waterfox
+ac_add_options --with-app-name=waterfox
+ac_add_options --with-branding=waterfox/browser/branding
+ac_add_options --with-distribution-id=net.waterfox
+if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+    ac_add_options --with-l10n-base="$PWD"/waterfox/browser/locales
+fi
+if test -f "$PWD/mozilla-api"; then
+    ac_add_options --with-mozilla-api-keyfile="$PWD"/mozilla-api
+fi
+
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
diff --git a/.mozconfig-x86_64-pc-windows-msvc b/.mozconfig-x86_64-pc-windows-msvc
new file mode 100644
index 0000000000000..002e2b11becb1
--- /dev/null
+++ b/.mozconfig-x86_64-pc-windows-msvc
@@ -0,0 +1,62 @@
+#!/bin/sh
+export CROSS_BUILD=1
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_STUB_INSTALLER=1
+export MOZ_TELEMETRY_REPORTING=
+export WINEDEBUG=-all
+
+if test "$WFX_RELEASE" || test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-lto=cross
+    ac_add_options --enable-optimize="-clang:-march=x86-64-v2 -clang:-mtune=generic -O2 -w"
+    ac_add_options --enable-release
+    ac_add_options --enable-rust-simd
+    ac_add_options RUSTC_OPT_LEVEL=3
+    export MOZILLA_OFFICIAL=1
+    export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64-v2"
+fi
+
+ac_add_options --disable-bits-download
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-dmd
+ac_add_options --disable-geckodriver
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-parental-controls
+ac_add_options --disable-profiling
+ac_add_options --disable-tests
+
+ac_add_options --enable-bootstrap=-clang,-sccache
+if test -x "$(command -v sccache)"; then
+    ac_add_options --with-ccache=sccache
+elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+    ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+fi
+ac_add_options --enable-default-browser-agent
+ac_add_options --enable-install-strip
+ac_add_options --enable-jxl
+if test "$GEN_PGO"; then
+    ac_add_options --enable-profile-generate=cross
+elif test "$USE_PGO"; then
+    ac_add_options --enable-profile-use=cross
+    ac_add_options --with-pgo-jarlog="$GITHUB_WORKSPACE"/en-US.log
+    ac_add_options --with-pgo-profile-path="$GITHUB_WORKSPACE"/merged.profdata
+fi
+ac_add_options --enable-strip
+if test "$WFX_RELEASE"; then
+    ac_add_options --enable-update-channel=release
+elif test "$WFX_PRE_RELEASE"; then
+    ac_add_options --enable-update-channel=beta
+fi
+ac_add_options --enable-unverified-updates
+ac_add_options --enable-updater
+
+ac_add_options --target=x86_64-pc-mingw32
+
+ac_add_options --with-app-basename=Waterfox
+ac_add_options --with-app-name=waterfox
+ac_add_options --with-branding=waterfox/browser/branding
+ac_add_options --with-distribution-id=net.waterfox
+if [ -d "$PWD"/waterfox/browser/locales/en-GB ]; then
+    ac_add_options --with-l10n-base="$PWD"/waterfox/browser/locales
+fi
diff --git a/.zed/settings.json b/.zed/settings.json
new file mode 100644
index 0000000000000..d325bfa2df29d
--- /dev/null
+++ b/.zed/settings.json
@@ -0,0 +1,8 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#folder-specific-settings
+{
+  "format_on_save": "off",
+  "enable_language_server": false
+}
diff --git a/BUILDING.md b/BUILDING.md
new file mode 100644
index 0000000000000..90839f074586b
--- /dev/null
+++ b/BUILDING.md
@@ -0,0 +1,321 @@
+# Building Waterfox
+
+This guide will walk you through the process of building Waterfox from source code.
+
+## Prerequisites
+
+### System Requirements
+
+- **RAM**: At least 16GB (32GB recommended)
+- **Disk Space**: At least 40GB free space
+- **CPU**: Modern multi-core processor (8+ cores recommended)
+
+### Operating System
+
+Waterfox can be built on:
+- **Linux**: Ubuntu 22.04 or newer recommended
+- **macOS**: macOS 15 Sonoma (ideally always the latest version)
+- **Windows**: We strongly recommend using WSL2 (Windows Subsystem for Linux) with Ubuntu 24.04 instead of native Windows building
+
+## Development vs. Production Builds
+
+Before starting, understand there are two main build types:
+
+### Development Builds
+
+**Purpose:** Quick iteration, testing, and debugging
+- Uses simpler configurations with fewer optimizations
+- Faster build times
+- Suitable for testing code changes and features
+
+### Production Builds
+
+**Purpose:** Creating optimized, release-quality builds
+- Uses aggressive optimizations (LTO, PGO)
+- Much slower build times but produces faster executables
+- Requires specific toolchain versions
+- Uses the same process as our official releases
+
+## Setting Up the Build Environment
+
+### Common Dependencies
+
+1. **Git**: For checking out the source code
+2. **Rust**: Install via [rustup](https://rustup.rs/)
+3. **Python 3**: Required for the build system
+
+### Linux (Ubuntu/Debian)
+
+```bash
+# Install build dependencies
+sudo apt update
+sudo apt install git python3 python3-pip nasm patchelf
+
+# Set up Rust
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+source $HOME/.cargo/env
+```
+
+### macOS
+
+```bash
+# Install Homebrew if not already installed
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+# Install dependencies
+brew install python3 nasm
+
+# Set up Rust
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+source $HOME/.cargo/env
+```
+
+### Windows (via WSL2)
+
+1. Install WSL2 with Ubuntu:
+   ```
+   wsl --install ubuntu
+   ```
+
+2. Open the Ubuntu terminal and install dependencies:
+   ```bash
+   sudo apt update
+   sudo apt install git python3 python3-pip nasm
+
+   # Set up Rust
+   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+   source $HOME/.cargo/env
+   ```
+
+## Getting the Source Code
+
+```bash
+# Clone the repository
+git clone https://github.com/BrowserWorks/Waterfox.git --recursive
+cd Waterfox
+
+# If you forgot the --recursive flag when cloning:
+git submodule update --init
+```
+
+## Understanding the Bootstrap Process
+
+Waterfox uses Mozilla's bootstrap system which automatically downloads toolchain components. This is important to understand:
+
+- The bootstrap system handles downloading compilers and tools
+- For **development builds**, it downloads everything automatically
+- For **production builds**, some components need manual installation
+
+To manually bootstrap dependencies:
+
+```bash
+# Install browser build dependencies
+./mach bootstrap --application-choice=browser
+```
+
+## Building Waterfox - Quick Development Builds
+
+For quick development builds, use the default `.mozconfig`:
+
+```bash
+# Start the build
+./mach build
+```
+
+This will:
+1. Download necessary toolchains via bootstrap
+2. Build Waterfox with basic optimizations
+3. Create a development-oriented build
+
+After building, run your development build:
+
+```bash
+./mach run
+```
+
+## Building Waterfox - Production Builds
+
+Production builds require more setup and time, but produce optimized executables like our official releases.
+
+### Critical Notice: Version Alignment Required
+
+When building production versions of Waterfox, the LLVM version used by Clang **must match** the LLVM version used by Rust. This is not optional - mismatched versions will cause build failures during Link Time Optimization (LTO).
+
+Typical error with mismatched versions:
+```
+lld: error: Invalid attribute group entry
+```
+
+This happens because:
+1. LTO requires compatible LLVM IR from both C/C++ (Clang) and Rust code
+2. Each Rust version is built with a specific LLVM version
+3. When these don't match, the linker cannot properly optimize across languages
+
+### Current Requirements
+
+As of this writing:
+- **Rust 1.82-1.86**: Uses LLVM 19, requiring **Clang 19**
+- **Rust 1.87+**: Will use LLVM 20, requiring **Clang 20**
+
+This is why we specify exact Clang versions in the production build instructions rather than using system-provided compilers.
+
+For development builds, this alignment isn't necessary because we disable LTO to improve build times.
+
+### Step 1: Install LLVM/Clang manually
+
+Production builds require specific LLVM/Clang versions:
+
+```bash
+# Download Mozilla's Clang 19 (pick appropriate platform)
+mkdir -p $HOME/.mozbuild
+
+# For Linux:
+curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.linux64-clang-19.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+tar -xvf clang.tar.zst -C $HOME/.mozbuild
+
+# For macOS Intel:
+# curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.macosx64-clang-19.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+# tar -xvf clang.tar.zst -C $HOME/.mozbuild
+
+# For macOS ARM:
+# curl -L https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-3.toolchains.v3.macosx64-aarch64-clang-19.latest/artifacts/public/build/clang.tar.zst -o clang.tar.zst
+# tar -xvf clang.tar.zst -C $HOME/.mozbuild
+```
+
+### Step 2: Select appropriate platform configuration
+
+Link the configuration for your platform:
+
+```bash
+# For Linux:
+ln -sf .mozconfig-x86_64-pc-linux-gnu .mozconfig
+
+# For macOS Intel:
+# ln -sf .mozconfig-x86_64-apple-darwin .mozconfig
+
+# For macOS ARM64:
+# ln -sf .mozconfig-aarch64-apple-darwin .mozconfig
+
+# For Windows (in WSL):
+# ln -sf .mozconfig-x86_64-pc-windows-msvc .mozconfig
+```
+
+### Step 3: Choose release type
+
+Decide if you're building a release or beta version:
+
+```bash
+# For a stable release build:
+export WFX_RELEASE=1
+
+# For a beta/pre-release build:
+# export WFX_PRE_RELEASE=1
+```
+
+### Step 4: Build with Profile Guided Optimization (PGO)
+
+PGO creates faster executables by optimizing based on actual usage patterns. This is a two-stage process:
+
+```bash
+# Stage 1: Generate instrumented build
+export GEN_PGO=1
+./mach build
+./mach package
+
+# Run profile collection
+./mach python build/pgo/profileserver.py --binary ./obj-*/dist/waterfox/waterfox
+
+# Stage 2: Build with collected profile data
+./mach clobber
+unset GEN_PGO
+export USE_PGO=1
+./mach build
+./mach package
+```
+
+The final package will be in the `obj-*/dist/` directory.
+
+### Step 5: Create package
+
+```bash
+./mach package
+```
+
+## Understanding Build Configuration Files
+
+Waterfox includes several platform-specific config files:
+
+- `.mozconfig`: Simple version for development builds
+- `.mozconfig-x86_64-pc-linux-gnu`: Linux x64 production build
+- `.mozconfig-x86_64-apple-darwin`: macOS Intel production build
+- `.mozconfig-aarch64-apple-darwin`: macOS ARM64 production build
+- `.mozconfig-x86_64-pc-windows-msvc`: Windows x64 production build
+
+### Key differences between development and production configs:
+
+1. **Compiler optimization levels**:
+   - Development: `-Os -w` (size optimization)
+   - Production: `-O3 -w` with CPU-specific tuning flags
+
+2. **Link Time Optimization (LTO)**:
+   - Development: Disabled for faster build times
+   - Production: Enabled with `--enable-lto=full`
+
+3. **Rust optimization**:
+   - Development: Default level
+   - Production: Maximum (`RUSTC_OPT_LEVEL=3`)
+
+4. **Profile-Guided Optimization**:
+   - Development: Not used
+   - Production: Two-stage process as described above
+
+5. **Bootstrap settings**:
+   - Development: Full bootstrap (`--enable-bootstrap`)
+   - Production: Partial bootstrap (`--enable-bootstrap=-clang,-sccache`)
+
+6. **Mozilla official flags**:
+   - Development: Not set
+   - Production: Sets `MOZILLA_OFFICIAL=1`
+
+## Advanced Topics
+
+### Multi-locale Build
+
+To build with multiple language packs:
+
+```bash
+./mach package-multi-locale --locales ar cs da de el en-GB en-US es-ES es-MX fr hu id it ja ko lt nl nn-NO pl pt-BR pt-PT ru sv-SE th vi zh-CN zh-TW
+```
+
+### Custom Version Display
+
+To set a custom version for display:
+
+```bash
+echo "My Custom Version" > browser/config/version_display.txt
+```
+
+### Using sccache to Speed Up Builds
+
+To enable compiler caching (reduces rebuild times):
+
+```bash
+cargo install sccache
+# Make sure your .mozconfig includes:
+# ac_add_options --with-ccache=sccache
+```
+
+## Troubleshooting
+
+### Common Issues
+
+- **Bootstrap failures**: Check internet connection and try `./mach bootstrap` again
+- **Out of memory errors**: Increase available RAM or reduce parallel jobs
+- **Rust errors**: Run `rustup update` and add required targets
+- **Slow builds**: Enable sccache and ensure adequate disk space
+- **Signature verification failures**: Set `MOZ_REQUIRE_SIGNING=0`
+
+### Getting Help
+
+If you encounter issues not covered here:
+- Check our [GitHub issues](https://github.com/BrowserWorks/Waterfox/issues)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000000..8217e5fbb263e
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,181 @@
+# Contributing to Waterfox
+
+Thank you for your interest in contributing to Waterfox! This guide will help you understand our contribution process and how to effectively work with our codebase.
+
+## Table of Contents
+
+- [Code of Conduct](#code-of-conduct)
+- [Getting Started](#getting-started)
+- [Pull Request Process](#pull-request-process)
+- [Managing Upstream Changes](#managing-upstream-changes)
+- [Contribution Guidelines](#contribution-guidelines)
+- [Reporting Bugs](#reporting-bugs)
+- [Suggesting Features](#suggesting-features)
+
+## Code of Conduct
+
+Don't be an ass. We are all human.
+
+## Getting Started
+
+Before contributing, please:
+
+1. Fork the repository
+2. Set up your development environment following our [Build Guide](BUILDING.md)
+3. Create a new branch for your changes
+4. Make your changes
+5. Test thoroughly
+
+## Pull Request Process
+
+We welcome pull requests but have a few important considerations:
+
+1. **Limited Review Bandwidth**: The core team has limited availability to review PRs. While we appreciate your contributions, please understand that it may take time for your PR to be reviewed and merged.
+
+2. **Not All PRs Will Be Accepted**: We maintain specific technical and design directions for Waterfox. Even well-implemented features might not be accepted if they don't align with this direction. Please don't be discouraged if your PR is declined.
+
+3. **PR Requirements**:
+   - Ensure your code follows our coding style
+   - Include tests where appropriate
+   - Update documentation to reflect any changes
+   - Keep PRs focused on a single issue/feature
+   - Provide a clear description explaining the purpose and implementation details
+
+4. **Review Process**:
+   - PRs require approval from at least one maintainer
+   - You may be asked to make changes before your PR is accepted
+   - Please respond to review comments in a timely manner
+
+## Managing Upstream Changes
+
+Waterfox is based on Firefox, and we maintain our changes as commits on top of the upstream codebase. This creates some complexity when working with the repository:
+
+### How Our Update Process Works
+
+1. We regularly pull in upstream changes from Firefox
+2. We rebase our Waterfox-specific changes on top of these updates
+3. This rebasing changes the commit hashes of our modifications
+4. As a result, simple `git pull` operations can lead to significant merge conflicts
+
+### Keeping Your Fork in Sync
+
+If you're working on a contribution, follow these steps to avoid headaches:
+
+#### Before Starting New Work
+
+```bash
+# Ensure you have the Waterfox repo as a remote
+git remote add upstream https://github.com/BrowserWorks/Waterfox.git
+
+# Fetch the latest changes
+git fetch upstream
+
+# Reset your main branch to match upstream
+git checkout main
+git reset --hard upstream/main
+
+# Create a new branch for your work
+git checkout -b my-feature-branch
+```
+
+#### During Active Development (When Upstream Changes)
+
+If you're in the middle of development and the upstream Waterfox repository has changed:
+
+```bash
+# Stash any uncommitted changes
+git stash
+
+# Update your main branch
+git checkout main
+git fetch upstream
+git reset --hard upstream/main
+
+# Rebase your feature branch
+git checkout my-feature-branch
+git rebase main
+
+# Resolve any conflicts that arise during rebase
+# After resolving each file:
+git add <resolved-file>
+git rebase --continue
+
+# Restore your stashed changes if needed
+git stash pop
+```
+
+#### Alternative: Branch from Main and Cherry-Pick
+
+Sometimes a full rebase is too complex. In that case:
+
+```bash
+# Create a new branch from updated main
+git checkout main
+git pull upstream main
+git checkout -b my-feature-branch-new
+
+# Cherry-pick your commits from the old branch
+git cherry-pick <commit-hash>
+# Resolve conflicts as needed
+
+# Once all commits are transferred, you can continue work on the new branch
+```
+
+### Identifying Your Changes After Upstream Updates
+
+After a major upstream update, finding your specific changes can be challenging. These approaches may help:
+
+1. **Use commit messages**: Maintain descriptive commit messages that clearly identify Waterfox-specific changes
+2. **Create feature branches**: Keep work isolated in feature branches before submitting PRs
+3. **Use git blame with caution**: The rebasing process changes commit hashes, so `git blame` might not show the original author
+
+## Contribution Guidelines
+
+### Code Style
+
+- Follow the existing code style in the files you're modifying
+- For JavaScript/C++, we generally follow [Mozilla's coding style](https://firefox-source-docs.mozilla.org/code-quality/coding-style/index.html)
+- Use meaningful variable names and add comments for complex logic
+
+### Commit Messages
+
+- Use clear, descriptive commit messages
+- Start with a conventional commit type prefix:
+  - `fix:` for bug fixes
+  - `feat:` for new features
+  - `docs:` for documentation changes
+  - `style:` for formatting, missing semi-colons, etc.
+  - `refactor:` for code changes that neither fix bugs nor add features
+  - `perf:` for performance improvements
+  - `test:` for adding or correcting tests
+  - `chore:` for routine tasks, dependency updates, etc.
+  - `ci:` for CI/CD related changes
+- After the prefix, provide a brief summary (50 chars or less)
+- If needed, provide a more detailed explanation after a blank line
+- **Important:** Do not reference issue numbers in commit messages to avoid notification spam during rebases
+
+### Documentation
+
+- Update documentation to reflect your changes
+- Add comments to explain non-obvious code sections
+- If adding new features, update relevant README or documentation files
+
+## Reporting Bugs
+
+When reporting bugs:
+
+1. Use the GitHub Issues tracker
+2. Check if the issue already exists before creating a new one
+3. Include detailed steps to reproduce
+4. Provide system information (OS, Waterfox version, etc.)
+5. Include screenshots or videos if applicable
+
+## Suggesting Features
+
+We welcome feature suggestions:
+
+1. First, check if the feature has already been suggested
+2. Provide a clear description of the feature and its benefits
+3. Understand that not all features will be implemented, based on our priorities and resources
+
+Thank you for contributing to Waterfox!
diff --git a/Cargo.lock b/Cargo.lock
index b3e9b9472a802..b70062a76f2bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4082,9 +4082,9 @@ dependencies = [
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
diff --git a/README.md b/README.md
index 01457dc06666d..0a5a854e7e203 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,55 @@
-![Firefox Browser](./docs/readme/readme-banner.svg)
+# Waterfox
 
-[Firefox](https://firefox.com/) is a fast, reliable and private web browser from the non-profit [Mozilla organization](https://mozilla.org/).
+<p align="center">A privacy-focused, performance-oriented browser based on Firefox.</p>
 
-### Contributing
+<p align="center">
+  <a href="https://www.waterfox.com"><img src="https://img.shields.io/website?url=https://www.waterfox.com" alt="Website"></a>
+  <a href="https://github.com/BrowserWorks/Waterfox/actions/workflows/pipeline.yml"><img src="https://github.com/BrowserWorks/Waterfox/actions/workflows/pipeline.yml/badge.svg" alt="Build Status"></a>
+  <a href="https://opensource.org/licenses/MPL-2.0"><img src="https://img.shields.io/badge/License-MPL_2.0-brightgreen.svg" alt="License: MPL 2.0"></a>
+  <a href="https://www.reddit.com/r/waterfox/"><img src="https://img.shields.io/reddit/subreddit-subscribers/waterfox?style=social" alt="Reddit"></a>
+</p>
 
-To learn how to contribute to Firefox read the [Firefox Contributors' Quick Reference document](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html).
+## About Waterfox
 
-We use [bugzilla.mozilla.org](https://bugzilla.mozilla.org/) as our issue tracker, please file bugs there.
+Waterfox is an open-source, privacy-focused browser based on the popular open source browser with a red panda as a mascot. It is designed to be a drop-in replacement for said browser that offers enhanced privacy features, performance improvements, and customizability while maintaining compatibility with existing extensions.
 
-### Resources
+### Key Features
 
-* [Firefox Source Docs](https://firefox-source-docs.mozilla.org/) is our primary documentation repository
-* Nightly development builds can be downloaded from [Firefox Nightly page](https://www.mozilla.org/firefox/channel/desktop/#nightly)
+- **Privacy-focused**: Removal of telemetry and tracking, with bare minimum of data collection for operation.
+- **Performance-oriented**: Optimized for modern systems
+- **Customizable**: Support for classic and modern extensions
+- **Cross-platform**: Available for Windows, macOS, Linux and Android
+- **Modern**: Regular updates to stay current with web standards
 
-If you have a question about developing Firefox, and can't find the solution
-on [Firefox Source Docs](https://firefox-source-docs.mozilla.org/), you can try asking your question on Matrix at
-chat.mozilla.org in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org).
+## Getting Started
+
+### Download
+
+You can download the latest stable version of Waterfox from our [official website](https://www.waterfox.com/download/).
+
+### Building from Source
+
+For instructions on how to build Waterfox from source, please see our [Build Guide](BUILDING.md).
+
+## Contributing
+
+We welcome contributions from the community! Please see our [Contributing Guide](CONTRIBUTING.md) for details on how to get started.
+
+## Documentation
+
+- [Source Directory Structure](https://firefox-source-docs.mozilla.org/contributing/directory_structure.html)
+- [Quick Reference for Contributors](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html)
+- [Build Documentation](BUILDING.md)
+
+## Community
+
+- [Official Website](https://www.waterfox.com)
+- [Reddit](https://www.reddit.com/r/waterfox/)
+
+## Developer Information
+
+The core development team is typically available 9:00 ๐Ÿ•˜ โ†’ 17:00 ๐Ÿ•”, Monday โ†’ Friday (UK time). This does not include [UK bank holidays](https://www.gov.uk/bank-holidays) or annual leave.
+
+## License
+
+Waterfox is licensed under the [Mozilla Public License 2.0](LICENSE).
diff --git a/browser/actors/PromptParent.sys.mjs b/browser/actors/PromptParent.sys.mjs
index fe8c5db522a1f..d190dbfbc69f2 100644
--- a/browser/actors/PromptParent.sys.mjs
+++ b/browser/actors/PromptParent.sys.mjs
@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 ChromeUtils.defineLazyGetter(lazy, "gTabBrowserLocalization", function () {
-  return new Localization(["browser/tabbrowser.ftl"], true);
+  return new Localization(["browser/tabbrowser.ftl", "browser/waterfox.ftl"], true);
 });
 
 /**
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 295babcbd30f2..1a2442b30562b 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -31,7 +31,7 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for firefox.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
-EXTRA_DEPS += $(srcdir)/firefox.exe.manifest
+EXTRA_DEPS += $(srcdir)/waterfox.exe.manifest
 endif
 
 PROGRAMS_DEST = $(DIST)/bin
@@ -98,11 +98,12 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS-
 	rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
 	$(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
 	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
+	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/Assets.car '$(dist_dest)/Contents/Resources/Assets.car'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'
 	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
 ifdef MOZ_UPDATER
-	cp -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'
+	cp -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/net.waterfox.updater' '$(dist_dest)/Contents/Library/LaunchServices'
 endif
 	$(MKDIR) -p '$(dist_dest)/Contents/Frameworks'
 	mv '$(dist_dest)/Contents/Resources/ChannelPrefs.framework' '$(dist_dest)/Contents/Frameworks'
diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
index ea28831b90662..7a2584294912c 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -190,6 +190,8 @@
 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
 	<key>CFBundleIconFile</key>
 	<string>firefox.icns</string>
+	<key>CFBundleIconName</key>
+	<string>Waterfox</string>
 	<key>CFBundleIdentifier</key>
 	<string>@MOZ_MACBUNDLE_ID@</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -201,7 +203,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@APP_VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>MOZB</string>
+	<string>WFXB</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -262,7 +264,7 @@
   <string>GeckoNSApplication</string>
 	<key>SMPrivilegedExecutables</key>
 	<dict>
-		<key>org.mozilla.updater</key>
+		<key>net.waterfox.updater</key>
 		<string>@MOZ_SMPRIVILEGEDEXECUTABLES_REQUIREMENTS@</string>
 	</dict>
   <key>MozillaDeveloperRepoPath</key>
diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in
index 2f420f773610f..3551c6613d188 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -17,7 +17,6 @@
 /crashhelper
 #endif
 /nmhproxy
-/pingsender
 /pk12util
 /ssltunnel
 /xpcshell
diff --git a/browser/app/module.ver b/browser/app/module.ver
index 5ef8d2a02aefd..565bb884d9f81 100644
--- a/browser/app/module.ver
+++ b/browser/app/module.ver
@@ -1,8 +1,8 @@
-WIN32_MODULE_COMPANYNAME=Mozilla Corporation
-WIN32_MODULE_COPYRIGHT=ฉFirefox and Mozilla Developers; available under the MPL 2 license.
+WIN32_MODULE_COMPANYNAME=BrowserWorks Ltd
+WIN32_MODULE_COPYRIGHT=ยฉ Waterfox; available under the MPL 2 license.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
+WIN32_MODULE_TRADEMARKS=Waterfox is a Trademark of BrowserWorks Ltd
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
index a85fdbfebe0f0..99826d6e28a1b 100644
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -131,7 +131,7 @@ static MOZ_FORMAT_PRINTF(1, 2) void Output(const char* fmt, ...) {
     decltype(MessageBoxW)* messageBoxW =
         (decltype(MessageBoxW)*)GetProcAddress(user32, "MessageBoxW");
     if (messageBoxW) {
-      messageBoxW(nullptr, wide_msg, L"Firefox",
+      messageBoxW(nullptr, wide_msg, L"Waterfox",
                   MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
     }
     FreeLibrary(user32);
diff --git a/browser/app/firefox.exe.manifest b/browser/app/waterfox.exe.manifest
similarity index 76%
rename from browser/app/firefox.exe.manifest
rename to browser/app/waterfox.exe.manifest
index 995b2fc869c16..9d41634179116 100644
--- a/browser/app/firefox.exe.manifest
+++ b/browser/app/waterfox.exe.manifest
@@ -3,10 +3,10 @@
 <assemblyIdentity
         version="1.0.0.0"
         processorArchitecture="*"
-        name="Firefox"
+        name="Waterfox"
         type="win32"
 />
-<description>Firefox</description>
+<description>Waterfox</description>
 <dependency>
         <dependentAssembly>
                 <assemblyIdentity
@@ -36,6 +36,12 @@
     </ms_asmv3:requestedPrivileges>
   </ms_asmv3:security>
 </ms_asmv3:trustInfo>
+  <ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
+    <ms_asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">True</longPathAware>
+      <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
+    </ms_asmv3:windowsSettings>
+  </ms_asmv3:application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
diff --git a/browser/app/winlauncher/ErrorHandler.cpp b/browser/app/winlauncher/ErrorHandler.cpp
index 706842446bf8e..a1a5326a624c5 100644
--- a/browser/app/winlauncher/ErrorHandler.cpp
+++ b/browser/app/winlauncher/ErrorHandler.cpp
@@ -49,7 +49,7 @@
 #define QUOTE_ME(x) QUOTE_ME2(x)
 
 #define TELEMETRY_BASE_URL L"https://incoming.telemetry.mozilla.org/submit"
-#define TELEMETRY_NAMESPACE L"/firefox-launcher-process"
+#define TELEMETRY_NAMESPACE L"/waterfox-launcher-process"
 #define TELEMETRY_LAUNCHER_PING_DOCTYPE L"/launcher-process-failure"
 #define TELEMETRY_LAUNCHER_PING_VERSION L"/1"
 
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
index c64980810570f..3b220f3c33b5a 100644
--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
@@ -120,17 +120,13 @@
           <vbox id="experimental" hidden="true">
             <description class="text-blurb" id="warningDesc" data-l10n-id="warningDesc-version"></description>
             <description class="text-blurb" id="communityExperimentalDesc" data-l10n-id="community-exp">
-              <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-exp-mozillaLink"/>
+              <label is="text-link" href="https://www.waterfox.com/" data-l10n-name="community-exp-mozillaLink"/>
               <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
             </description>
           </vbox>
-          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
-            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>
-            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
-          </description>
+          <description class="text-blurb">We stand on the shoulders of giants. <br /> Waterfox is made by a small, global team with contributions from its community. Thank you for using Waterfox! <br /> Browse safely.</description>
           <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
-            <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
-            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
+            <label is="text-link" href="https://github.com/BrowserWorks/Waterfox" data-l10n-name="helpus-getInvolvedLink"/>
           </description>
         </vbox>
       </vbox>
@@ -138,8 +134,8 @@
     <vbox id="bottomBox">
       <hbox pack="center">
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>
+        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>
+        <label is="text-link" class="bottom-link" href="https://www.waterfox.com/docs/policies/privacy" data-l10n-id="bottomLinks-privacy"/>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
     </vbox>
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index afa7f8e7dd741..7f27e13a4463a 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
@@ -6,6 +6,10 @@
   <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>
+      <box id="tree-vertical-tabs-box"
+       slot="tabstrip"
+       orient="vertical"
+       hidden="true"/>
     </html:sidebar-main>
   </box>
   <splitter id="sidebar-launcher-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 685493f6f3cb6..0202e48d6a162 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1377,6 +1377,13 @@ var gLastOpenDirectory = {
         this._lastDir
       );
     }
+
+    if (BrowserUIUtils.closeShortcutDisabled) {
+      document.getElementById("key_close").remove();
+      document.getElementById("menu_close").removeAttribute("key");
+      document.getElementById("key_closeWindow").remove();
+      document.getElementById("menu_closeWindow").removeAttribute("key");
+    }
   },
   reset() {
     this._lastDir = null;
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
index d89b3bbb991ee..52072cbaeb6dc 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -99,6 +99,7 @@
   <link rel="localization" href="preview/onboarding.ftl"/>
   <link rel="localization" href="preview/smartTabGroups.ftl"/>
   <link rel="localization" href="preview/taskbartabs.ftl"/>
+  <link rel="localization" href="browser/waterfox.ftl" />
 
   <title data-l10n-id="browser-main-window-default-title"></title>
 
@@ -137,6 +138,10 @@
 
 #include fullscreen-and-pointerlock.inc.xhtml
 
+  <vbox id="browser-bottombox" layer="true">
+    <!-- gNotificationBox will be added here lazily. -->
+  </vbox>
+
   <html:div id="a11y-announcement" role="alert"/>
 
   <!-- Put it at the very end to make sure it's not covered by anything. -->
diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html
index 2f764caf6f473..4176b5ec00153 100644
--- a/browser/base/content/default-bookmarks.html
+++ b/browser/base/content/default-bookmarks.html
@@ -1,17 +1,15 @@
-#filter substitution
-
-#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
-
-#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAHY0lEQVR4Aa3VA5RrSdfG8f+uOidJp/umczm2ffFhbNvG9722bdv22LZt+3I81+04B1XvfpPmWHut3yk06smus1Z4L8uXDv6MHzpowA8eWFS8FaY9eU+cCvxaFfF8W/FWGDy8a6n7DM7/H96DR3ldu0MVb8a0J+9CI1qXJP11a+79GOdP1f11FW/EtCfvQpx8mziFxMHEEEV1KYkrKl6Pea1Nbnrs/7hz7q2KUQsqRcUE/eV1acb/pyFQ7b9N3fguzNTxVsXrMa/avFgPb6SnukY8W6EgXvszrszjivH08F0VLZFK0rbUgRt9H2aS+lORznUxnTMV45kJG6fNPZSGnEodTJwUFGbphqdSll/H/SxWjEc92kYxSoO0uzEcwo90g/9rlKpHpCmX491MxQgzuvjtE0UieyqxhYZA3UGp8CjUtSMR2YrkFdf+/szi9X88+zM3/uncSx/81/f+7/HzPsu8q09i8MUNcCUHUTImceAAL+RC+UW1nMzHuUvxSVGBCloTgMT+GuOLipaGyg/OpLuE/jVI58wHb/zsdxD5tBVbDMQwOPe/8UDqHYuuPJjCZnP5nw/+mfyUPhADRtkAaIfosum23klBxH8b+KzCfuczG8IPXi4C5yHQwvDoPYhCBSkz1n9y1+WLd8xFzVUxxmIRjBIBVHXFZF58aEtW3exxsp0V8Aac8gpBnGQBRNymkP4VXKPdgdj8H2JB/DgMVwreATFhdoCdj/wY8x7+GM8/djyJ81hlnCPTUWfHb/0QlyRUelalEPcCHswIQARJPd64ohh/KHBagPcQB7sggHgIVHcM0wUyWWUAoNaEuobI9bP1dj9lw1nnMvehj/LS0wdinYO4wM1f/h6z3v9n1t3pTnAWBj04ZQA7LFROwMsu7QCpgcjuCh4Asg5Wa0ImgNDqqHTOtDyIgPPKkZ/cZOstzmT+Nw4jcA5JBO9SHjzzWKZt8CRd03ohD/RZALCigIwHawBmKgKSVoAiAi2VDCzsgo0bYB04lSojEAaQDyETsmTZf3PPdZ+irvMgTTF4SAVX7+SRC/dj5/f/C6D9d5UQLBAIFBJILIhtB1g2a8uZq+1+LwiAV8CSTujPwqoRbJjCJMdAeRVue+j/WLh4T2I3jcCEhN4ShmDFYR2IAXC8OHdDaMYAYBxU82AFAgPShHoejAEgUEViy2h5UbS9LLBajf5oMr866wc0wlWQvEEyNQKbIcSSwZBNIfAO41NQ9ZXd0IgBAQdUDAQWpjQhcfi6gCgguDtTm3vIUBdhdwUA/Pggqmy49/n/pr/q8ZMq4DziEwI0QOtpiT1kXUqQRqC8ohaDy0BqoGzxOUE6q9DwMBiOvtzm5OLi3migAFEwpjnOCzmKhZXUkyr1uEwtLqky1aStNk4jqhFFDVZb6ykYMjBodQxw5RAKZUgSqAq+YmmWzFxF0P8L61Z8pHhf5/S+bfHQJm1OLcuzw4YPcWH3/qysTcebFHyESTOkhLjUokt8M8VFCVYDbLXhvdCfARfiG3lkykDr2qhbXJTRUZBAngMwootGI3tbrbcIsR3ugp3Yhbun89l9/ko+qCDVGpQruHKJqDakBmnq2KyXaDZKrDX1KWau+ij0ZqAvgwR1JFuFmihwPTkdDQN9co3C6IMnwujs0sppELcOV+NHVc2wzv2eb+74J6ZP6kGazeEgZZJqiaRWJo6qbDb5MU7c4ixYmYUhC7YJaQxVgYrgSxa3sgNftdww31+usFuvuykfWDzU/4HytL0llTVz+SbiAScTryKxFFc6dlnnQVZP+wEo2grT7ACb5V7g2BnXsVfxHsLEgfGQTYb/1kJqWpKV3VDLM1iXi/a8PDrtqmecl451DwLg8oG1DtnMmcsKq/bQ1V3BmBTsfzgIfHucwINxICivADt8eADkBLJGtcc0ydHsmU7QEXBFfzwTeFwRnLFtDoBD7nv5+vv61v2XXzHlfR7oKtQxLkFcCqkDK8qMHdIex4gSMxaoKZBtS8lQ18NtJsPSmv/Nyfc3nma4RjsA8Jnq1HU+WC9cY01z865pJQrdDcQkrW6IpGOfun3oxLnw6m/SEBIyVFbOIMhmiXJy35oL+vYDBhkuGxY3YaTuy9TLA+Jv2inu2j2ph9NrTUMmCyIGjwEnyiCtUaUWnGlLR1hIlM6rKwpUX5qBiTuI02Du94aqx8zJhEsVI4IPduUZV+7vDC0CDv9GdeolUjObL18ckutqMKkQkc2kiFHOITLCwyiUp1bNUhuYRFrrxPoMzdDM/XbUf/gZvvYsozX+Cl5d5vh690afrk3+0hR4XyoxqYmQICaTSwjClI6cA3EIvhWi0QiIm6rRgaQh1ikfsMK43/xv8YWfASuUe6sBAIzqPmNwjb1nJdnP5PDbOpPgJMXjWhDAC4JgvEWUaQkoib/o/NzQb37S1fP0+Dt/6wHGKqe6v1yZvuG+zc69p3m7d4dnW8TjAaEdwmFKEcztkfSG67KVG346aeV8YEglincRYLQClVcdKsery6lI1VVNJbyF+jdp8gPG4E08mAAAAABJRU5ErkJggg==
-
-#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
-
-#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
-
-#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
 <!-- 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/. -->
+#filter substitution
+
+#define waterfox_icon data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1419" height="1419"><path fill="#68edfc" d="M614.718994 191.63501c5.791016-6.072022 12.924011-11.394043 19.718018-16.312989 28.981994-20.984985 63.117981-35.830078 99.312988-36.60205 29.872009-.636963 60.557007 9.263061 82.296997 30.211059 9.559998 9.212036 17.825989 20.950928 22.077026 33.605957 3.164002 7.139038 4.552002 15.860962 4.971985 23.614991 1.008972 18.645019-4.499023 36.822021-14.075988 52.711059-19.775025 32.80896-54.786011 55.197998-89.164002 70.50293-16.020996 7.133056-32.520019 13.150024-48.53302 20.338989-20.298584 8.924561-39.88855 19.381104-58.599976 31.279053-17.957031 11.605957-35.963012 25.442993-49.314025 42.244018-5.817017 7.319947-10.458985 16.174988-16.77002 22.951966-1.396973 1.5-4.541992 4.52301-6.79895 4.244995-2.819031-.346985-5.486023-3.467957-7.055054-5.622009-4.448974-6.107972-6.966003-14.427979-9.084961-21.58899-10.652038-35.995971-11.437012-76.56604-5.129028-113.402954 7.178955-43.924927 26.596741-84.935791 56.025024-118.32605 6.031983-6.874023 12.645996-14.573974 20.122986-19.849975"/><linearGradient id="a" x1="427.141" x2="406.314" y1="596.232" y2="384.081" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#00dffe"/><stop offset="1" stop-color="#62fefa"/></linearGradient><path fill="url(#a)" d="M419.951996 382.072998c2.826996-.023926 5.778015.19104 8.588989.478027 14.093018 1.437989 27.669006 9 36.617005 19.903931 13.464996 16.407044 13.962005 38.019043 6.807006 57.261047-3.531006 9.492981-8.626983 18.383973-12.631988 27.685975-4.948181 11.512085-8.901947 23.426635-11.817993 35.613037-3.411011 14.164001-4.807007 29.151001-5.253022 43.704956-.221984 7.236999.080994 14.69104-.673004 21.882019-.299988 2.864013-.447998 5.999023-2.763 7.895019-6.842987.348999-15.384979-5.153991-21.264984-8.286987-7.081787-4.038452-13.746308-8.768189-19.895996-14.119995-27.334015-23.756043-44.638001-59.579041-46.933014-95.661072-1.674988-26.316955 5.277008-53.826965 23.022003-73.890991 12.333008-13.945923 27.730987-21.233032 46.197998-22.464966"/><path fill="#68edfc" d="M988.346985 98.922974c36.842956-6.212036 71.732971 18.659057 77.872986 55.514038 6.140014 36.85498-18.789917 71.697998-55.659973 77.770996-36.766968 6.05603-71.49701-18.800049-77.622986-55.557007-6.126038-36.756958 18.664978-71.532959 55.409973-77.729004"/><linearGradient id="b" x1="729.817" x2="432.834" y1="1172.043" y2="591.96" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#10b8f7"/><stop offset="1" stop-color="#2bffff"/></linearGradient><path fill="url(#b)" d="M713.786011 445.796997c14.122986-11.127991 31.753967-20.113037 47.825989-28.098999 60.896972-30.259033 130.79602-50.73706 199.351013-42.634033 37.917968 4.481079 76.226928 19.336059 100.416992 50.063049 7.589966 9.632019 15.689941 21.905945 14.209961 34.768982-.919922 8.02301-5.439942 14.947998-10.619995 20.917969-10.069947 11.61206-22.380005 21.48706-34.059937 31.43103-15.503845 12.95575-30.739075 26.229614-45.696045 39.812988-11.507629 10.632508-22.730957 21.568665-33.657959 32.796997-5.501037 5.648011-10.892029 12.453003-16.900024 17.43805-14.169983 15.827942-28.390015 31.68396-41.611023 48.32196-74.389954 88.343994-127.737 191.622986-183.544006 291.958985l-119.432984 213.336059-32.005981 56.900025c-11.255005 19.98999-21.619019 40.689941-37.137024 57.819946-19.177429 20.850708-43.837952 35.880859-71.158997 43.369995-4.436493 1.231445-8.906585 2.338501-13.404999 3.319946-1.514984.100098-2.705993.25-4.158996.740113-7.381989 2.439941-35.558991 2.899902-42.743988.619995-2.091004-.660034-3.906006-1.050049-6.091004-1.27002l-.764007-.060058c-6.75-1.630005-13.431-3.099976-20.057984-5.219971-28.213592-9.035889-53.118957-26.225342-71.574005-49.400025-18.52301-23.299926-28.999023-53.109985-40.960006-80.119995l-44.514008-100.569946c-7.944992-17.960083-15.306992-36.580078-24.225998-54.050049-2.871002-10.039978-9.054001-19.649963-12.645996-29.570007 2.893997 3.01001 5.326004 6.799988 7.979996 10.059997 6.758011 8.28003 14.327011 15.200013 23.397003 20.880005 21.854538 13.647461 48.268463 17.962769 73.330002 11.979981 17.604461-4.228638 33.65747-13.341553 46.312011-26.289978 15.718995-16.227967 28.517975-43.227967 39.957978-63.157959l40.757995-70.80304c8.853028-15.46997 17.416016-31.205993 26.731018-46.398987l79.286988-137.747985c21.476989-37.14502 41.997009-75.687012 66.027038-111.238038 25.64209-37.962036 56.244141-72.325744 90.992981-102.177978 15.602967-13.412964 32.580994-27.358032 50.388001-37.729004"/><path fill="#bafafc" d="M713.786011 445.796997c14.122986-11.127991 31.753967-20.113037 47.825989-28.098999 60.896972-30.259033 130.79602-50.73706 199.351013-42.634033 37.917968 4.481079 76.226928 19.336059 100.416992 50.063049 7.589966 9.632019 15.689941 21.905945 14.209961 34.768982-.919922 8.02301-5.439942 14.947998-10.619995 20.917969-10.069947 11.61206-22.380005 21.48706-34.059937 31.43103-15.503845 12.95575-30.739075 26.229614-45.696045 39.812988-11.507629 10.632508-22.730957 21.568665-33.657959 32.796997-5.501037 5.648011-10.892029 12.453003-16.900024 17.43805-20.937988 9.709961-40.307984 20.141968-63.18103 25.059997-15.880982 3.414002-34.821961 4.520996-48.915955-5.044006-10.351013-7.024048-14.434021-17.144043-16.893005-28.864014-21.507996 20.162964-50.903992 43.357972-80.588013 47.799012-12.460022 1.86499-24.973999.016967-35.198975-7.774048-14.222046-10.837952-20.47705-30.062989-22.693054-47.117981-4.912964-37.81897 5.827026-78.076966 25.229004-110.514954 6.347046-10.610046 13.842041-20.267029 21.371033-30.040039"/><linearGradient id="c" x1="782.06" x2="1178.071" y1="1081.194" y2="878.104" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#08a9f8"/><stop offset="1" stop-color="#0cdbfe"/></linearGradient><path fill="url(#c)" d="M709.500977 942.573975c55.807006-100.335999 109.154052-203.614991 183.544006-291.958985 12.299988 20.319031 23.429993 41.535034 34.968017 62.30304l65.731019 118.261963 60.975952 109.673034L1075.5 978.179016c7.01001 12.580994 13.359985 25.480957 23.109985 36.230957 10.829956 11.929993 26.640015 21.039978 42.01001 25.590027 24.703369 7.381836 51.338989 4.497925 73.890015-8 14.97998-8.289978 25.099975-19.400024 35.119995-33.064026l.579956.285034c-3.809937 9.359009-9.799927 19.158997-12.469971 28.778992-9.050049 17.530029-16.410034 36.339966-24.400024 54.410034l-45.880005 103.640015c-8.319946 18.809936-15.829956 39.349975-26.409912 56.98999-9.400025 15.669922-21.75 30.599976-35.920044 42.199951-20.940064 18.339966-48.790039 29.339966-76.209961 33.390015l-3.460083.530029c-15.439941 1.179932-29.613953.150025-44.90094-1.830078-5.176147-1.301269-10.33551-2.667969-15.477051-4.099976-26.805542-7.936767-50.855285-23.216186-69.428955-44.109985-15.080994-17.119995-25.216003-37.709961-36.23999-57.520019l-33.445007-60.140015Z"/><linearGradient id="d" x1="369.778" x2="49.934" y1="984.821" y2="474.81" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#008aed"/><stop offset="1" stop-color="#05d1ea"/></linearGradient><path fill="url(#d)" d="M3.24 560.663025c7.21-32.479004 21.826999-61.33905 46.606001-83.994019 24.467636-22.304992 55.532303-36.037048 88.497001-39.119995 9.660996-.844055 19.446991-.346008 29.119004.11499 42.470001 6.012024 79.031997 24.614991 105.294006 59.278992 13.880981 18.322998 22.097992 40.012024 31.363983 60.861023l27.347015 61.57898 95.623993 215.307006c-9.315002 15.192994-17.87799 30.929017-26.731018 46.398987l-40.757995 70.80304c-11.440003 19.929992-24.238983 46.929992-39.957978 63.157959-12.654541 12.948425-28.70755 22.06134-46.312011 26.289978-25.061539 5.982788-51.475464 1.66748-73.330002-11.979981-9.069992-5.679992-16.638992-12.599975-23.397003-20.880005-2.653992-3.260009-5.085999-7.049987-7.979996-10.059997-3.149994-6.415955-5.703995-13.313965-8.604004-19.867981l-20.319-45.832031L76.542 790.518982l-43.884999-98.696961C24.487 673.439026 15.065 654.888 8.633 635.835999c-5.295-15.685975-7.585-31.768982-7.881-48.281006-.034-8.982972 1.325-18 2.489-26.891968"/><linearGradient id="e" x1="1082.197" x2="1323.221" y1="1014.341" y2="449.013" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#2f76eb"/><stop offset="1" stop-color="#7e94f3"/></linearGradient><path fill="url(#e)" d="m993.744019 831.179993 96.385986-217.276001 26.219971-58.914002c8.710083-19.474975 16.580078-39.518005 29.320068-56.80896 17.098999-23.127746 40.463257-40.875305 67.329956-51.144043 37.745972-14.480224 79.724731-13.202392 116.52002 3.546997 36.58789 16.546387 65.05017 47.022828 79.059936 84.65503 10.109253 26.768249 12.313355 55.877746 6.350098 83.862976-4.970093 23.28601-16.300049 45.109009-25.910034 66.760986l-37.390015 84.280029-68.280029 154.054016c-10.969971 24.776978-21.26001 50.083985-32.890015 74.53595-.079956.166016-.169922.325012-.25.488037l-.579956-.285034c-10.02002 13.664002-20.140015 24.774048-35.119995 33.064026-22.551026 12.497925-49.186646 15.381836-73.890015 8-15.369995-4.550049-31.180054-13.660034-42.01001-25.590027-9.75-10.75-16.099975-23.649963-23.109985-36.230957l-20.780029-37.325989Z"/></svg>
+#define github_icon data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNiAwQzcuMTYgMCAwIDcuMTYgMCAxNkMwIDIzLjA4IDQuNTggMjkuMDYgMTAuOTQgMzEuMThDMTEuNzQgMzEuMzIgMTIuMDQgMzAuODQgMTIuMDQgMzAuNDJDMTIuMDQgMzAuMDQgMTIuMDIgMjguNzggMTIuMDIgMjcuNDRDOCAyOC4xOCA2Ljk2IDI2LjQ2IDYuNjQgMjUuNTZDNi40NiAyNS4xIDUuNjggMjMuNjggNSAyMy4zQzQuNDQgMjMgMy42NCAyMi4yNiA0Ljk4IDIyLjI0QzYuMjQgMjIuMjIgNy4xNCAyMy40IDcuNDQgMjMuODhDOC44OCAyNi4zIDExLjE4IDI1LjYyIDEyLjEgMjUuMkMxMi4yNCAyNC4xNiAxMi42NiAyMy40NiAxMy4xMiAyMy4wNkM5LjU2IDIyLjY2IDUuODQgMjEuMjggNS44NCAxNS4xNkM1Ljg0IDEzLjQyIDYuNDYgMTEuOTggNy40OCAxMC44NkM3LjMyIDEwLjQ2IDYuNzYgOC44MiA3LjY0IDYuNjJDNy42NCA2LjYyIDguOTggNi4yIDEyLjA0IDguMjZDMTMuMzIgNy45IDE0LjY4IDcuNzIgMTYuMDQgNy43MkMxNy40IDcuNzIgMTguNzYgNy45IDIwLjA0IDguMjZDMjMuMSA2LjE4IDI0LjQ0IDYuNjIgMjQuNDQgNi42MkMyNS4zMiA4LjgyIDI0Ljc2IDEwLjQ2IDI0LjYgMTAuODZDMjUuNjIgMTEuOTggMjYuMjQgMTMuNCAyNi4yNCAxNS4xNkMyNi4yNCAyMS4zIDIyLjUgMjIuNjYgMTguOTQgMjMuMDZDMTkuNTIgMjMuNTYgMjAuMDIgMjQuNTIgMjAuMDIgMjYuMDJDMjAuMDIgMjguMTYgMjAgMjkuODggMjAgMzAuNDJDMjAgMzAuODQgMjAuMyAzMS4zNCAyMS4xIDMxLjE4QzI3LjQyIDI5LjA2IDMyIDIzLjA2IDMyIDE2QzMyIDcuMTYgMjQuODQgMCAxNiAwVjBaIiBmaWxsPSIjMjQyOTJFIi8+Cjwvc3ZnPgo=
+#define browserworks_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAIAAAB7GkOtAAAAAXNSR0IArs4c6QAAAKZlWElmTU0AKgAAAAgABgESAAMAAAABAAEAAAEaAAUAAAABAAAAVgEbAAUAAAABAAAAXgEoAAMAAAABAAIAAAExAAIAAAAVAAAAZodpAAQAAAABAAAAfAAAAAAAAABIAAAAAQAAAEgAAAABUGl4ZWxtYXRvciBQcm8gMy42LjUAAAADoAEAAwAAAAEAAQAAoAIABAAAAAEAAAIAoAMABAAAAAEAAAIAAAAAAKijywkAAAAJcEhZcwAACxMAAAsTAQCanBgAAANuaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA2LjAuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjUxMjwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj41MTI8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPlBpeGVsbWF0b3IgUHJvIDMuNi41PC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx4bXA6TWV0YWRhdGFEYXRlPjIwMjQtMDgtMDNUMTE6NTc6MDIrMDE6MDA8L3htcDpNZXRhZGF0YURhdGU+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyMDAwMC8xMDAwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4K8C/KZwAAQABJREFUeAHtnQe8JUWZt9++CoiCZAUBnSEjoqISxIABVjEgGDBjQl11zRHDmtc1rbrr5xowrlkRc0YRDCQDSg7DkJMIKKASbn//qjOnp3PXOffUnenpp37zm9vdp/vtqqeq61/1VnV1MpcaAQIQgAAEBkhgboBpJskQgAAEICACCADFAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIIAAUAYgAAEIDJQAAjDQjCfZEIAABBAAygAEIACBgRJAAAaa8SQbAhCAAAJAGYAABCAwUAIIwEAznmRDAAIQQAAoAxCAAAQGSgABGGjGk2wIQAACCABlAAIQgMBACSAAA814kg0BCEAAAaAMQAACEBgoAQRgoBlPsiEAAQggAJQBCEAAAgMlgAAMNONJNgQgAAEEgDIAAQhAYKAEEICBZjzJhgAEIHDrxUCQLuwmycIu19WrPAKBKbjR7BKzy80utPRis7+a3WC2jtl6Zre3ZGuzLc3uYLap2XT5Fs4hhHm7tYVbyEMLsXadmaBdYXaBpWKo3b97ULcd09vcbDOzLcxukzc9+XZ7wie3V76ilNgF3q5krXwz9gdNYLqKZBJk85YeZnbcJJeUzlUcN/C13iZmSyy5t9m2ZhuaBZZsReD1Zr8pGZ1kd21fBavy3dGSu5vt4GvhW01iof3ca83+aOmPzH5t6bm+CvtHzQWp0isOd7BkJ7N9LXmgmTYkD4HhWkvfYPangLP3sOQdHZbTY83+01eytfbWsuR9Zves/W188HpL32N29Hi35e9dLXm3q8RrgipH1fXHW/oDs99ber7ZVWY315/o6n3Rk47ex5KHm+3m8zGwFGUmz7b01WZXZ/uz3niwJW/MCbxK72vNTljAXbLSu1Ou9NLzXwDRNenS+ALwZ1+1nbxgaKMHdc7SDSxRFfwAS55itqtZZ0V8laU/drXDQoMikFiq5uQ2lqj+fZKv4NZagFVVXpeYfcfSr1j6B9/en2+1pvOvcf/Ss8y+a6nqsv0sOcRsbzPFqjOklp5udkzneZas3yWualn/n6U/NGuK8NqWqF5uD+dY+nmzZe0nmc1Z8kgvwKUTdevzLP2y2RGWnmEmyexsKescdQ4u8EL7CUt2tuRgs8e7VoXuEhjSky09qln5Aq00nXZrS+6fq/112ujxCZHtJpuj41np3dYXmyeZqSmzkNLbfjt+7QuBudTi/lPVppb7zIPqfRXlt9nchV3xl/bIZzLboPpia0vebnOXd929Ce9VlnzMbI+OhnZHrPVUb2LJoTb3J5u7pSsm11myf4e90c/JY2zu5lZrapDepdXUWjZ3ZKuFWyx5T1jat7O5cyqmrrbkw2Z3W3AVptbxPSw53OauqdyiIeOSNy34pi3kbmvJV4sxUcNl45YLpvppVHrfaXNXFO/VkOS49QM3XbUEpipBk1yk5qrarTMPt5ida+k7LX2x2Tmt1mNEQM1Puen/w9Lnm53Y3BCujZdiLlfPoZa+0nft/1l7UthBtXnVv/m0zT/Z0i+ZtZtSZy/QX6QzW1rEN1l6hO+7tMYxVS+hJVxp9sOuCPvLkyeaLS0aOtPSf7P0dWanmN1U/GnSvRvN1KJ/hffqXBhwsRJ1+oJv2nKfDS3ZsfjzmREen1HpfYel/2r22wlLbzF27PWdQMuDPpukpZPWjxPd9p+Wfs+7+C9qvCw9yUx1bozwd0u/bfMv9E9RoH1d8n82/2xLvzU7N4JSd6qlr7L0Q6021d8PFACdqb5FU1hm6Xe7KkEpU6sAKFPkS+kOd/KOvqyQyuzvbf5FzmnmxnhnFf5q6Wdt/uXOp9QRJLfndpyyoJ+XmN2xYMCVXtXXMYKK4jd96V24dzRG9LC5KASyZyvO3VQ3yQWk5zZeUINUDvHP1Q/9uYcnagRkX2OPb3PO5e6giuZ9lr7GTJ2S2T7VInyZpe+yVI4Rebprg7Jao6AtNfvoKp0gx0hT0JikpCukEmwRAMXwewEN28TkjNLA+8pwts2/yo8b1w3zrjxtii11Bb5j82/3Y8gtl2vMJqSj0GKh5Seld7uiw+dmS6PWziqEv7VUqY6XqJb08tNqQEC1QsxwhaXLY9of2VZb5usNzbdFiMAtlv7U0g+YXd+aUtX+77H0/WbyfkRSRI0Pf8DSLzT3eDRWHCIALR2Fiy09slljMgBKYIsALLf06OZIZkY2teQZuUH+q23+HWbHBlyYWZhoQxrwNUu/2GY/PbUrlye6Y+lkdbx2KQ4waCB9eemkWe+q9P7I9x3bS++sb4u91YRAZAFQy0KNppCgiin/L+SS/DmanPer/P54W66hi8fb8f7+w8/k+XXzDdRNOdzS/zG7tvmcmfwiwXtv85Sn2wUIgKKxdkNUNI/oJ97z3vB74fANhb2VOzJyVEC9pubww3ITSdXzkPCo87FAp//KeNRtXWfpJ5r7N1K1k82kE5HCupbco2A6Vem9tHAkyo5K75csPT6KbYyu5gRuHTV+6WkBLaZbmT3MkofkIqKe6V/8jD1VqReEeUvkVagbCg6KQO7O029eYaZeyAPqXjLy9abrIujFrkUIml75X5Z8tG7ivHoAUnz55VpCiwvoL5Z+NSBDZbylB6Buyg8C+hAaDn1mbtBCDq6Pm/2tJd7Fn5QK+bukZIqJqmwNj2sjJJzlRpWS7euUUvKgIdl2eiG3aDpnMzfDeGVQhNXhaNLRlefNYktdDZXe++WAz8IqNlZ/AjEFQBXfiQEE1PB5kiVPL56pht7fLTndOShdfdHpMZdTWG0l/V9K0AlhT/4GZhvlIjCqNSQqqnEC3c3qSv/KkkuKz/DIpGatvGXCjoiq6fX87H65BRQNdc/DKwLFRMR+YcmjcykabS6sB+D6WIE8dbsGF5Ab+z2pK1NUfT/IbK+V8U+P8a+whVTi6zhHSqLLd/Z5qpJztR8kl+/o9ADh0bSCH1rynDr5vKLBzbgymgvbUu2/Sc5C4OOjK2ZVevUELclFgM0BECjVlzNNsWquPwUYXN+9klMOqvj0b0/3CqhrdtW17guXqMpQUvR/PgRGQK+tPs8STYnLglp5V1t6mXuBOf2af1mpU4F07UVmZ1cEQA3et5n9rqvKy26tVNzZv6f6QP+qwQaWXukHjb9t6S+DPUjXmn3W7CFmqvHz4bYVRPlfR9tiWOsC0ou7XwqOgGrqWgGQmn6na6BV0dC6F8/IRV7ZoXlHtQZL8deFz3f/9JZGIRX/tESvgH3G0o8F3F3lTUJeffFY+asqsjPoRUU1pYV60vBgX5VnV6n0npLtNG+o9L7QvQuyMoxKr6Kq0qt2/bKA9pMuvtCX3iUrzbA1BAKqb6IFPUUqVZ1Bz+oWzSdpGYDd/dy79tbfreqWZ7jUv/bZbHvFL3pW965U3KOq8uGWHOinyoXU4Go8nuk917k7ulmq3wz2G6xnyUGWvNi/4rTuCitO1PYxe6wfonyXl5l2FDpfjcdjLDnD7N65qGgzUADWKV412hOBo8OqktH5tfW1Xp74WVenSgneyxIlOQuafKnGe2eqVQYOsOT1fpmQ7NrRhlK0vf9pLb/+RG3cskukuKrrd8r2V2y4vosq5c6g/sf/K3YoOy8ZnSDdVRKyEPj4qKd434bSu78lj7X55/mJcJnZpg2NBJzlXhImDIrAXLzUuoVZ1IjuCu7Nlw2bT1J1IN9oZ9DDc5fySYERkPMn2aF87Yp9md3dkteZrd9wQv6wmrel9Kr5//GwpqvsbGzJqyzRNKHdzca1/wrzgqApMc9x7x4H0dBl8tcfveLqlX/UIQjJcKW6FG70zX/VjOGhzmflPDnqJLWH21nytGKRuCJsKsE6vv5qKUsjy9u3396ptVtLrhTUBZQAKIvbg8auZV9tGrllJv1XzPR0uV/mqP12+lWltylFo9J7WN1CGlWzN4XdrnohR/pMIFoPQO01+X86W0y6vwSgpb+scikh6QxbWLJH8aTACKilv21rrapH+r6W3jmgP646oti0dHNmji/GqmlPddMLLHll67OqBXae4Bzozo8hLO1BfgC1tV/iPWnZmYE9gKoAaGj0B8H9GN1O8P+Z3XW8cZ3Zt7sGMyR197LkX8aXjP5KS/5WPFK7p5t2lrfRm2U7114/PqgyeYfxdvZXWn52QAdoLb/GTr4hn1mYaENlSf6fzuSo9G7XsdJJsrelW5md0XV70SuW3q4L+H1NIBBNAFQBaayvM6gDq6dRj31TOM3S33Z1/7Ve2D5mehLyQY9QSAR0aymQGmstQY2szbo9EK5xnfe5j5r/1XqweiMtAfY4S17aWvuPrtJaMXqL+PsBa6iJ2XJL/lxwryW3M7ekaGcoCYCmYH7de0U6L8yfoISrvZwvX8rK47qyUjMCnlzRY9WDnYKnW8sFpwk8jym/TJuPlJoaycsClEz1eClcHjB1VZfcxpJ7lK6caje89MpVVR2uyN9TPUuV3k4BUOltaYflDbK9BhEI8QhMldy/BZQ5GdaImerf2qAmyZVuvZ3uifxq4DyxUnw1ae+0WrvFg+t4BSpVecVT3Bwk/esMquwyb5W88Me6NX+Cwg6+Vsqubb9G/X159kPqcfmj5DzJBz3hnRkuyyUactxLADq9H/kbaVtVdv4SqYgGckvxKV2iXTnQH1lJnfIoLyTVq0ZHlEc/sfTNZme2CoasiUP7v6oALHMLc3YHdR3u3H1W9xl6bbCzypaV28yu9KrXUu33dEeUM/pNoLM+mDZ5FwX5bZMlvgOruj77p8dYFYfcBVrk/QWWfqOrzag2nSZ+7FOJZ1gEnHN/l8q1pQN/9jOCSgeru6qkNh8fVRKO7HJ3jM5Vm/cQP+o7vrTjrwaK96zU0bXX6LWD0psHqi86vRMSAFWRueAq7rNy+4GbEoB8s/1yvyp4XhKqduTEl49ry8oP6leFjMHoOr0T/kmbf5yl7zD7pX+bRHFQ0VpwcOt155PTZHBprhHQdE7I8fDS2+7O0r3UilL3pTNI8+7YeRInrGkEVGlFCelyv+ZBp229IqsqPl/j/MMNRrnn7SQ/66796VWPW+8QHFq04G8aGoHNLNFD2x7Ull/efob/Ve8uqT8+CpqA9JvxdvtffaZDtV61ydly1TY+vZ3OJXnhSq5z5XYeddMt8j2Aq8w+H1b3Fa2lN1qSr+6P8681Fc8p76kndGBdH0Ut062Chyh101Nd5y/9iPt0j2sZ3N+Su3ltVvKna/DIpgqkeLYHDRcpqhJdNV/Cg1R542LE1H08L6zDcceA0vuLsIWq5OfcMTzSnLmGENAzESHoUQlrMaVykgT6SarR1KTv51ny6rqua3AEXKHfsGo6d0QLkH2wbkgzd8qKzV1XzkRyi8Ysr55ROXIrP3FFtdskIdnE0sB8K9VEkplOAVAtlheAn0+7Hpnay6o3R0GTiI7o6g+t7abAFl6FHV/tZkDt5qOh3mFgULtBHht13VS6buvG8N2H5P7Fkr18HimB6uiEB81DXRbUk3Dr6vwu3K47U98m02ct3Ht/WVAyNeMooMPhGhwbZJfVbZzrS++NdT+Vjmno4s6lQ+yu+QQCK5IJQWgVwwkfg8luoFHTXS15kXf955+czIpm8v0222neUHtQPej1G07Qc3iqX37y9w0n5A+r/tp7/DSO5Eddmc6widnDw/w5eVNKcmBLtpS92lV7szNkAvAPm/9ks/ht5ueNlDQmM676K6vCtFLTMV0V6F18T6jWQ6VB/oN9T/EvmfVJNm5wc2CcS/0rbj6Mc6A90X9QU+3uQBm4NOyNlrHqTBA55eNjKrN+1S0OeXxGpbe2/CsGKr1/svnXuK+NdgeV3vt2DSZ3W+GM/hEo1RAzSoAe1HNmZKpkRq31HW3uYDP927L5Ab46YL65LK/r24OqILKgZ1jVliq1i/yXBr4YNglVly/x809GFYr076TMYuvGNjmvUeuJhR+vDxuU1jXynudDWA8gGwROT/Crb+YtZNvy1z/DLTjRuNqHMI57AG4KqerQliBFf3Rx5efSyfdzb9i5zwCoXps6KD7L3eQozUZNd3OeQ9fnaO//je6lUeVrpr5r64Uai75rZWAm8PHRtXcp9qtGpVd+P5VerZH+5eDSq4/rHdD8NLWmgB97TSCOAJzf9cBPwUyDpc/ylU5Lmz0zqwhclu00b2ji4HvMPlo4Qc5rJwB/Dlv1bHSpGlBP8Z2J0a4uX1aw2bSTaPx5g6YfG4+n8jKrk9EZ1EKUwuWDcjvABbTiHPlt1PyX2NSGnd1bpm2r1UsA9E9BYnzkSjGoNSYXv5v92TIQoqH+N/lFQX7f1ZOov0Hx6N/9R9nUR/yaJYf598Brex7jiyJ+U0huTAlAKSwPK73qYuqbdB8uXLyi9F5ZFIbCKZUdaflTW9W3cgUH1hgCEQRAQ1hq/uuxn23Qq+rfcWZV79gD/VyLUXO7epdRBNSM6gxqEp674Ekiioa+K6tHKGOpW6uO7gyq7yRmpTq68yqdIPshAiDX1u2L5nTHcBfQKWY/Kl6e7Wn9mce7bzK7yZRNQbX/qAdwYtfHvzQQ8oiAeVAaLX+vpS8xO20WGqBoS/5/4FfveKv/Onzm+Cql6J/ei7KQnkfJYG432drsTrl9bYY/Puponlu8doo9ld57upkUK0vvFEa4pLcE1EqcddBjryGsmT8w6t5qQvqXbf7plqq5fcy4fqlGXxH4Q4QIVG80OqKvw7+pOHqpClrd8M6gxvjmk/e7xeHMoHdE3dySDYqRCOkBqC2s01S5fKl54o08Bgd6LSm5mPJ3U0dKGqDq7KtdrdHNzX34t1OZNDr9IJs73Mt/prX5O063vcx9Xth95qypxOoTC+pQRgo7VURa0GI8Pk3x1/C4Su/Spp85voYTiCAAalipnx4pqPpTV+BnNv8c94mV+vl28l3Ei0ApXZo891q/AFwOZCq3ibrnnUHt8abx55Zrr/cro0nkukIiAdioeFKIAOgcaYCqxW8Wr8321GBXJ2w7rxOdPQCtwfmz1ga7Bnj3dcs/BAVB3tPmPuMWTXILCKr1OpOgz5y9o3mW6kUBryJOF41b+y5giaFKr5ovixP0kvBhfh5arvQuzp25y2pCQGVw1uHysHnHG3q3Y/7+aoJpPFZtZ7nv8wOz1QhKBuS6eYObhaIldMqNx8AIVM1OekRNVy3fdkhlGs+o8dtpbToBuCLstSxVjttXegBy3azT5fLyOeJaxOc1JEBtRgmAui9KZksPQC1ZzWb5SVdh2NRM/oemqSzVKChdSyz5dzd7Kv282Q/9+4YqOQsM+vLE5y15R804RCpXWHtpnPrWkn/1AEoypsJ/wdQWJ7lQy2e92rsum3xfkxjj3J4SyFfAs0lCujzgjX8Ve03K/mDxyVe1rlpDc7f/YOlnzY7q+vyeFrz8kJnmg+5biLnrsEsDoga1mO7q+s5u7sq6lTspFbdUDs7ogFtOZ3mALVUru1cqF+X2bbquvbV7cdTNt6lNghrsB/iJKzIja6XWa962IFzrZl7W2xmdKa/OPn5eZv7CkG3NCHigJfdxMx3dB5k1VnG6H3aaWgmkVd/334RYWrm9JnSpZMYIenNwh7Jd9wqYND5qUOnVkhtv9kMv1dIb9dYYX80IzFoA9ATKQ/3XrlSqCO7qX+CSt6EUNnFPRXJ/S1/rv9Dd/uxdaPY5sz1yjtTACJRuGr6rilWvX+7vKws5Lmr5KXU6rTOoBa0qcqIg/893m2fm5E1pxQgJQCmItlru7UEx/2nz0qdqNj5hrHlKpnoA+r+22tUowgld02E38m9yqC84RVA8dXd9OeDeljzXK8Fv3MiQ+3KAKlDJz6RBI0ynWrK0eJlceacGCIC6VvuZ7Va8tnNvS/+Gc/60UekNGUDKXxW+LWgqvY/wpVexrS294dY4s/8EZl0EVKmdHPDA6NFV26da+4+Aqphu6VbHdA6E9taQlhj7lfvYk91tnBV68uVCbZeN8bkT/9XKEweZPds3WuW1UDxrg1rZ6lYLRXv4p59s2n5O6Vcl7Zdhqds5Ny01M6IIq83eVGWPTlO/6gsNL3+pwf5wN+VpZZA1ZWKtAOjgJzsUTi8fJQ9oxrjyNq1ba7lKzdVr+5i90L+AcoJ/QUEt90smUYK/e9l7VPFegd8U0mre/+o+bT1ZUEaUnr/Ax2ey24zPVumV706lVw2mltI7Pp2/QyBQKoALTvINlv4pwIg6v9t3nSaF2LpLAGRDr+mfaW6xl1EIjICqQnlgVU2Pgtwd6rXo//ag2ejPNHtoR53lVl2WBlzXbssPFMu/LBnobJWPLGmB1Y8HLbGnSjl5kF9hphoFVdlNujU6WfWg/tUGLcnw5KLfX0KuElTb3Nb8n2W1VsYHNUX14I617Menhv2VEqj7uIn3fR1iicaxtTDDl3wTvjNndQedc0XlRueHuRN1UxXXrDhVzIQeUA9PRaIzVEvvtQ0ynDcllXq2/1BoewHIX8L2mk5g1gJwcVgNtVXdoo8l1opaUxchf6Zqnz/n9i8Jm7MhBXqDd0ONLtXAwxubhz0z89c6eUseUmm4ZSeMNtQg3agYq9IJo11VkcdZokpn69qfiwfV1/mhezm5W6V0nUan1darfc4lAGp4hlSIxftrzyVcbqW8WQlASB5VTDlrct1IShWZmQfZ1PxXveur8aEDbP4VZj8O6DaJScX34j4D2dmTU1q2nZGSBT4+mnum4rrLGJwmqmr3/PFu0199oOIU3zKYNsuaDHO8vwRmLQBq9OWr4wYw7u1H1R3tQbPpr2k/w/8qb0/e4RMWAS197may67kdBT35Wh7gvPFu01/VEUebHVqZXVM6fzP/ds/ZpaN1u5p8cpQlT++qRpXA3/pPI4hJZ1Dz/1FFR03+EglAvgbP/9S+Lcl8WmXe6qgH0H5h7a+KxhP8axC1vyq9VzV3RLJL1HNS07ulOlPpvqvNvc7mT/Rvz2UX1m4IS6kJr2icUHtq8aAu3LGrSBSvaNw7N+jxcf4uld6lYzNq/n8r4GUFld6fmz0rN2A2NsDfwRKYqQBo3O+MgDlzemIlAO3TD9Q6/l3YV6iUAjlzRiEwAjp5u6KHRPXRfc2OaH65bHwH1wM4z7082RbkbN3D0l+0nbLiN/md5NXZy9cgqkdqg6qhM2z+MP8+qrY7g5r/z2h2KymlUzW6k/uZ6V8pkrLWUv82R9W1zTWc0HTtzTb/9ub3kMdmk20s+YjZkvF+01+dsGmAACgyGxZNKHfOLB6p3ZO7T+V54U/SqPQ2+d/yty6V3vV8EfpmQOn9oyXn5zq+eZtsD5LAVJVBE6l/ho0Aq77eoasautTXjDc03Sl3XI/fVuNd9db/UOwQjH8p/U3Ufc53QdRq3s03J0vnVXcv8+uMaoSzJagqeUjRfvPJWmcmfat7raHQj8nO1/TEo23++b7n0X7T0SVKyCNap6Mo1VPkudzHh9Q1cmVtiopPLXc1/7NcyxKb20iu95Wv6t/mf1phND0y4J07+VVCek4aQliSi4E29YKYru0Mqn9VnBYe9Pj8saEYFI1LPgvtJ5W3exUbNMXzV+5d4ttVIQVp5TVsrckEpnh8m3FolPL05l+zXzbO+V6yg9mGSudyt0abmwIUEjQxccn4vMAISDM0SabU39/R96kvH5tq+qun9Fj/7lJeP0ona7bMPSzVLU4q/VC3qyr+CEuvcdNI3ILSUkc9z4IgMTvPLVGQftpP/A9p+8u83tJ6Vutkf3W8krpotB/b3ezBNcrhhrsV20mDUMtJpQq3KUii7tL0W+64hkw/6Ca0uIWJ1HivpksY9Sryf4UJgOyoYs0FN4j959x+06b0bPTCc9MJtcf1RsX2xZEwfQYy5PGpK73JTpYuqRvELt1apfcYr77quhEgMFX7rRnb+WFTJlRlq/ypf50PquBU5anNdZyfhnh8w9yS/CXaVlW7Z+4jfIERUGWhZ68U9HXivfxXy0vHK7ua3p5cWvkGfek0jTE82a9IIcdrZ7jJuTvcrHmNW+7kJzUKjlRQC1osn2TAVkl4mdl9Wu83RQ9Aq0Ue0tA9mqIHoJWfH2vJ0tZISgA02VQKITLtQTWv3hf5uSWPc6LrXD0jQbrZFcX0eEs/5b84NN9uxf8qwc7HSgVSTkjZ6QzqFL60Rh07rpPSf8CSLXNnLQ+owXW61m+QC6gUNEKzpytCnUFMksuLKe28hhPWXAKz6wHIa39OWFNLXyl6bkV65Pq82l+u0iklCAzqTOw/fh9VEZAj5aqAKzWGtqRymtpx0pJ1A8Yetdj67+sewrxJuWK0WvJn3AtKQUHVjdwUR7kx4SmDX5I6eWZry1qKeVtLkwnvcHf34lu940it0VJHqtP2Uv8uRftV0vVdLFUnQCWqM6jYfNkvf7+Fn/6k+VeaMaWDl/g1yVWuQoKGbZTGzXKnyiP/29xuy6ZEIqTUlSwI3da5Q+GPzx3rukeyptJ7eEDpvcC7SfNSl4sFm0MjMDsBUGPttIYXiEpQLwtb7rx0VXVX1cRD/aedRj8FR8C1sm9fMSdr8tuoEllW+al04DrfqHx0q6dFl+gTVy+39EUBz2TJ/hS7ajJrTYXX1KWrZE19L50cHtRgf7rvlNReouIzkTNBfo/H+BGgWmv5g/Jl7ecVXdLYGXSO5nHp31n1IymdBjSK617xy5NRna72RLygTyDcKWc9vPTunJv1kBkYld7NA6YyX+c+k+kGitTiIQyeQL7ILwyGXpr/48IsTHr1NmYvyI19BUZA7d9di2No2X23yr1RnB2sbqix9quAvo6eyYPNStVK1drCj+hGd7O5t9Q1DKvG1y1Wc9UTSke0LMeBde710Wnyt7SMhZRMaVe1npioudoZtLjCsytr5XdeNd0Jcp39a8UreGGEjxrlopeoHtfocRbUUwnpLKr03r0BoPoTd83MNW+o9P4yoPQ2G+CXNYnA7ARASwiEdNhnBU+eUK1leL9c3XS1pWcHWFeLdceKA2p0nZYYu3/OYIsxvWV6SsvP459uZ3PvMHtAmM3xRZP9VZv6npb8t58IGOLbkWO93f2Sv72k5amt03XUPwjvAciaGp53y9+gdVsjIhL48Ni2Gmv80X/b0slS/lFQLamyJD9SpCDhVGUtMc5C4OMjuW0qvZqplX8cMsvVjXMsPa16lCNDJJAv9QtLvzwnIVMmFnaTFVeryfZa/16SqrMsBEZgk2b3vaozjaDKidwZVDX8JmyEcKnN/Y/3z4bUzp33LZ2gCD/Iko/6b6QE5qSIhTTARzeSH+ZJreo1UQ9gM7+SRL7WKyWntKtxlJf4HoPuEilo4OSJlryuMsNVg8YaAQ7xPk0XMXkgdyhITujwlUrvtg23HJVeTXDoDH8xOy6s9Haa4oSeEwisNrpSOWoxXdN12kx+v7PNvduSFxedD4qA+h8hTTY5XtVZbgrqmN+56bfccVUQ6kdfmzvSsrmrzX3Wv50rj/kMw/puFczk034x1HB1URwCnb9qsGu2/tLWGMtasAvIrZd571Zr1R+VxvdFW7NeTeYXuM9Mum/LlELsbwppLYftc7eU0qjDEfL4bFmcOZqz4TbVq2gp29nJKr3HVqbhZb+yMSQCMxIA+d/lErk5Mjl5Gx5jc18xe26x+6zbaoJzWATcXG/ZaQp6Mvdq+q1wXJ3o9KzCkbYdedI/5Vcf2ry1Qd1mIvebqt09LfmMJe8Pk6vcpe69rcAewJ38G8Xt0hLeA1DL9Bmt5PORzG9rytaHLXmLr/jaI5O/qn1bpX4X9xZx8k6/Jnn15EvjfpXFzYK9Q+6uwY9PogGAltKr/oHmAgUEOTAX1WEbECVOWSUEZiQAWoMzxCc+dRLlltnfVXlzn/PO7mqsAxcB1YUSgJYmsDzOctmvFRBR+buOD1iCMbOkpTTfaMnXzB7vB66nq8sUvXu5en/uG37WSrg7JYtGoACMpuuoP9QewgXgwV5Zp0u1+gGvseRIs6f5+UjTGRklRAVgO/cdxLkjvQuxofvivil0WXvKF/arBkLy9XjgIqCKvASgZVBEBVuDWCGl98oJS+/CksvVqy0B1QezCJcHLEYYeB893oqUSvl63h2/1NxHo1Qpq+jrcW16+AMjcHtLdij4XsuRkt/j7n4y6AXlX8r7N3ov0LMq7uPyebl9eWnvb8m9LD3Rf3LrFx6a1jzoDHqk1R7fw+xAR8O5LFQXTBfEtkX/Mpvy16vBrvq9PchaQx1auE7OFllThk4dNB6wuyUft1QzzbRs31H+u5jymcibERIUT7W4tQDRo9yn6GybhlkAI1OyeUbAat4h9609R7l512IuqPR2ljeZ0tDX9q1Zr9KrqczqZV5Ye+PcQZXeX/k+2e1zB9kcHoFkLp1ForUo//EBq7KE3EpVvGp/vZgjp4Ee2k39bmdNFBgBmb1v1zCvPmp/bJiHVP4iWQv0qJTSridQr6qe6peL0Jqgy/yIgg7qnyog1RH6pxpTH8bZxS3CnKjKWOLvJT4LCfJuK6fUAGwPStrexUqq6XxF/vSm38bH9R0FtUwXIgBjS+6vPI1a2fgsv0zQyX66zhW+vpYbUD+JntRx1IZY3wPc0Xeb9P92vt3dqZ16IpQoaUCkoHaAxkLkzc+CViNXpij+7UGz1FTe9Fy0hH/4WZ5/bTlj/JPm0claSGtgfAV/1zwCMxKANQ/MoqVIddYt/uHXkLImg6sW0K6XQLX4XPta4qfqbIH1/qIlZzFvpJpa9PRP0Eb0bvK7IiaA6/q6UhUcABczU7hXrwggAL3KLiILAQhAYHYEOvvDs7sVliAAAQhAYHUigACsTrlBXCAAAQgsIgEEYBFhcysIQAACqxMBBGB1yg3iAgEIQGARCSAAiwibW0EAAhBYnQggAKtTbhAXCEAAAotIAAFYRNjcCgIQgMDqRAABWJ1yg7hAAAIQWEQCCMAiwuZWEIAABFYnAgjA6pQbxAUCEIDAIhLQKjMECKxBBAIXNwxcW6ndWoiRdgt58CHW8udr4SP902qyfzG7YbyWnNY+0uqEWgVPa8aNlhScSRsvPBX5GGbbkyYtuzC/ERiH8HsFGhzFod2sTOWzY7Solw4qC7QslZZcVXYoa7SrlanaTeWTHH8bAYjPmDssGgF9F/pnvk7suqP7sor+tVeOZ/pFOptM6SsF+3UtcaqVZX8U9qmvJX751c7HUXWKVr67YMU6sm5x7Iv8yrVaRFYVkMKo0tdCeJtbsr2ZvhetlUd38JLQntimZPrj6TELWO9d9Z2XJbe+r5aq1j99C6EzpaX4aMHUn4zTWPopv6svPCtTNs4fqtsWxuWWHhdgcHR1U+7Ijur60RfCT/KZconZ38ZioF+VTP1Tdmgh+q3N7uFKnVvfV9tishooAYvB1ZUPjvWUwKk2/yj3bHeG5C3u+zxtHzxQ3f1cS/+v2ZK+9qwqadvmE/TLH2x+X7OrWs/Rj1ql/K2WvLI1PqpN9OH4X1r6Tf8hiovCVl9Xpa811XdyX/dMHuHrHbVAJw36Xs2jLf35pJflzldNJ2XS0rbSgLtY8kBfTe/mj+TOatv8js0/0de2bSc5qZv7flemyIKq7FdY+l2/8m67Qf2qb9B+xH2QqtBc0KrjWoJeTI609DdmqvdHAtxpTf2zrZ3YJwf5b09ttIplQPJEgMCaQkBPlyqakKCOeXv760++8d5iarSId8sJ+k71twJqf1nY3pIDW2v/ay39nqWHm50Q1L9ZGSnVU5e5f045/teSZ/nvoG3WlfaV1/stXX5B6dCEu1Iv9VH0T1/tPs/SX1iq73E+1JJXuE81hPQG0t+H1bBLzZS69nCRpa9zPN26651hC5v7UKX2v85nx8fM1IdQD2Ci8A/3/edU/44wkwy80H+hSF2EVRQW0C1cRTHmthBoJKBudWCTRjrRIgA3W/plM31npiWobpU3piWohSgB6Axr+cbgNg3n3eI8FfOHWPocM7U35fGfLuirCfoO8GE2/zT/RfiQui+70YW+hZvtLnxDeiCXzldt/smWfjLg42uK/MkB9bU+G7ejd3a1xPBymz/M96JkszNsbHMfNDug2PY/2+Zf6nqHLjsmrf3zd7zO7MeWPsupkV2c/2FRtxGARcXNzeISCBSAkUeiRQDOtfTIrpiqalZrrimo+S/PwGlNP+eOL7FEn4mu1S193uvDlh7kvoJpLffKGevYVBv8Jzb/dEu/0KVeOUOpKl9dOPMgGZAr5pWWvrqrnyS1OM9M57cH9eo0rtOSrfKhvd7sq2GdiQ1s7n3+C95ZHakInODo2We8o789MoG/atTqI5a+wH/iNPCSmZ6WJW6mVjEGgVVCQFWA/nUGlfraCnd0oWr2bwQMJKgR3dIDuMn3IVpOGN1Ln4eU80ft1mq4wtKXWPqaCJ+n1xjyyyz9f2GiolrvxOBvL1dT0XlEAwyfsfQDra3pS8K+maxPT0sAmoKq2tdb+vkwMdvQknebqa7PV5C/sflney+cOn8zDOpufs/mX7aAYfYFRCafvgWY4VIIrA4EVJxD3Kk6ba3m6F7svBPdn5tvdwGdZXZM8y2yX7Zyw7M1oiU/9b9Z+qmw2iqzFr6h2vA/fT+gc+hSww9KS2frO/zW1TPV0fmopV9pdPK47zP/tXpZ5cjWfopR5bA78DdL32rpZ8N4bmDJm914SaGVcI7Nq6eiLl0MFCpLP7VUknN9bewjHkQAIsLF9GITUPdfU006Q4sAqPn/ozDXTUsPYN4bUbu1Pcz5mTmaFFgKavtrjop6IbpFvHClpf/hvyDfXqMpFRoDiB00XvL+ZjfISUEoku3MNqmLqDoZ77T0E2E9Hs3XfJ0lzy+qsiTqvb7t386q7uahx9Rl/Jqf6hp6wWzOQwBmwxErqwWBxJLbBkSkRQBUE30xrJ3YIgBqX2sIodNRoKn6av6XInyDpR/yo8dRa/8RpOVm8r1omlBLWOYGbBcjnOVqwBpoGvw4pe54KU7q0u1UgalzVHe/z/u7bihdULerdzteYcmLK/3Io/2knZBx4zqrocdU9j4T1tcJtdh9HgLQzYgzekNAxTmwB1A7BqCR22PN1N4MCarfa138MiILf+oyIa3az0+CzJ+o/seRzh8SZdA1f6PRtnoqP/NdjWatSn8b1Pqu2p74yI2+/Xtl5brLLT2/crB64DZ+BLh0XDb/29L/CphopAvXs+RFlsgXXypCeiNEvqO/lEw37KoE3sns/pY82ZLnWHKw2V5mdyyOJTRc6pxLx5md2vRzlOO1z0GUO2EUAtEJyAVUalDX3rKpB/BXS78UVlnIbFMP4Eazbwa04zYz05tNt8/FT8//ic5ZEVrX6FIlRJXLvS3Z2bu/5UHWLHvNPjrHLLC5KvfIVyw5wL8jlovLik1FSQLQ6fdQNB7uR7MzC4KjfoNGU0707fdapcxOzjbk6z/Xpyg7oo2Lw2ZJynFfGktX7X+4pe8KyAvd5baWPNeSV5ttkL+33z7XNws6IejcTSw5xBJl6w7+RV9hucUS9WBOd6NKrmd5VcV46YD6jr+25L6loxF3EYCIcDG92AQCxwBuVTcIrJa7aqtjgqPc1ANYbulRXUbU/N/Hkj2Lp11l8+8xO7N4sGVvY/9+75Pceg9u6Fs+EB+l5HzvTf5I13sMmeWT3RutqrlqgpwSy2oOlw/pTeYDLTm0eFgacJMlGs+Qa/u9YZGRGp3ul8TIWUrVl/p7br9pc6l/5zn7VbX/5y19S9g6HOta8gzn+q9dQ8JF4PLMbvOG3EeH+cGD9YrnqD+hDsFuZrtY+sYuf5rG5EdvPKiILkqQSBEgsKYQUHEO7AFUWz7yEX+t6/nMc1IFp8Z+KciH8/OAKaQb+ub/RrmLVXfrwp8FOLt1kXRuW0ve5acq7jNeaExpV6JU3dzVktf6nzbP2W/Z/Ju/da2LPLD1LefJ3XysFLHsnyIjWbqLc6nrfVdbpyUG459U/S0fb2d/TwzogkhQtzPLeGpA9eu+tr0ys9K8oeWDnmLJm4r6kT9dDj3lTmcQdjl8SrV/dpWmqD7Nv1PWXrOrFaIhmdq8yEzNdKP6HMzUPMYgsJgEVPsECoDay6Vwqp+6E9LTH12oSqHq2dBsxW91v2ekPn7ygOIrS3pH6fNm15bi1LC7xJL3WvLI4kyV/Llqkj/FrROnuY/dviDf9UlU72yTN+G2U3VHrikfrO4nW5ptVT08PqIaVm/8KnXnjI80/RXS0nTPv1t6WoAArO1kb8VsWqnIt907z3Zp021yx9f2vah/N9sid7C0eUFABHSJRF3q2xKkAfu7ZTA63ulTAVYSFisgAItFmvssAgEJQPtDOIqDGsslAdBAnyruiyaJ4kgAJBi6aRbkTpHTvD2sbya/zaa5k1QFH+MdzbljjZtyNL/ezx9VrdcSVLU9xydKDdjOcKml51pSEgAlLeRaGZfLO2t9197rjpbcydJOARBJZU0+qBK/ML/fsC0P/q7+p5vNfmTzcuao1u4MWoRDnqu3uuXeGoMgSJVDmgXLfPdl40ZL+kHD/q6nopLTElSAVUIWKyAAi0Wa+ywCAVUfgT2AYsGXp9sJgLw6E4V/+Ic569RLRb7f7URK7mXJQ4o13dVmXwhqa2v50uSpfpgxxKOiaaYH+SlJnYmSk/0ss/2K58mR8vvikdo9kdQQdLvuKrZyB3UGkdTYeD4sD/O/S0238dn3M5t/TUBXQ7fQO9iPtOTtZkvz96vbzgt83e8rji23+ffb3Duc16ssY9lVGmHWgM3qFPTEECCwphDQsyoB6HxiVerzPQA1G1Vxd7ZPq5DkAsprhia9/KirtSjnjJr/mxdsabGd9FddF46u2MmPtQa2EOUZl9I0eaXzUVBCzs/v+22NfFYPVs5yVf8uXcz1Iq5ErjNIAO5QOCn9Q5A/xDWr5YE51tf+ZxQs1O9IR9UYf6dbh7WjtKgsqVHfWaJ0G/ltjnBrRbg5o8u7/Dz10VoFR4sNoVUQAW4JgZkS0Hxw1SOq01tCSQAuNvtGnUO/xcLoJ9WbWXdeG790K/12BHkqHl5c+VlR1YV/7rjO/SyXxTP8604B5644Ra3RLQJipcjL+a7/8w3CC8Pc6NX5l9XoqVJeVj1aOaK82yZ3UI6XE3O7TZuKswTgdF/7/zFAR/UC9oPcELrruITU7DKu0xSZzqDycLTrcqXbuW8emEZ6dvOvBUgj82A77SziCbdexHtxKwjEJyDP+FpdAiCFyAr+6GUoVRxThH/kBECN3O90TVhUDX5wZbxULuZjij2JppjoQyL7F/suTWdmx9X8D+wuyAukNmzmWdKwxGlBr0QkS8vN9uzmKzZE5tNhLzdsY4mGE7JwTdikWOW4Xp9+ffArC3ub/aeZlDik9tdZe1sqLCFTUUcxv859CMj1XT5l6RYmj5/dz5L7+CX/9NpHVvCyZK7SjdUsOquUBTdfEwjoWZUAtD+uagPqnFFQ0/trzTWd2qRq1jW1/vRT5gI6zb+BNbZa/3dH/8pV6ZmT46iz3+DNqd1aaCDX36N4VKOjt22MfuFUNf/zydTuSYXfG3d2rHt5Kjv7Wr/Q21dzSpn9VNpQpqiWvGPuqMioc9YZNOVf9vUSnOLcHlTj38fm3utfwA5vkt/d9xV+12667lcpwdk+c4+w9A5+puy+7v0PN2FJfYIw+amzO8tjpcI4S9PYgsDiE0jWsbSzUOvhHwmA2rm/bv7wr8YJn+oXqJF7pDZIAEaVjsZLf9y1qI78zo8zW1I25KZahvjH1c59WNhQav4OpWo9/1NpW/bz3DT/Ui9AdQbJrQRAMDMh1CUSEu2qe6SZtXoXV/qq2rkzbOQ/vJUJs8wsC3h1VmaVRr3K0BlU4d7dL/G/x4QOGY2lH+K/96vsni7Iy3eJpZeYHeX7BA/140DqiKhztqplIJ/n0yWOqyCwOhFQlZSrROpjJgEYFXxVHKqemurfnb0AfLcyOT0zmrmAtF7ND4qVYHZOtrHEC4Dq2XxQ5aXmv5qKnWEz7x6ZtL5QDNs7Q9l9xU2esSxcHLYAg+KjEewPZJf5jRvce79uDedT/RyefMeieOLKPeXIg33rODskMr/tQpqdHLKxic2903ljJnbHayz9SV7gfzjW+5Db1Z4jXdTLGZ91nyNOHuPfj7vHuCjWnh//IAIQnzF3WEwCqsg6C3XWA/idpUcXXR9ZVP2ESzdHUAabwqgH4LsRGoRsC6pEDqz78MuNvp5VZdcZ7tQ6Xb3pcjXkVR13BlX9mkWTUxe3/ppmAXUGrbX5uc6TAk6Qh+Q5Pg7ZuXqnWgIww6BmuApGLo0T2L6jm985f5lz7nc7mkLs+oU/3bI/b7LksWbyNK6ioEeBAIE1iEBID0D1neoCVY6a/KOnujZoQPLxvvZveTglAGrTyb/x/eZewsi4BgOfNH5VNX87tdAvze83bifbdM21r71UnZum/k3+fPVLJDBZkCCdsogTGTU1VkvxPDC7vd/Q2Mx5xSML3LvGZ7eATxfuaXP/6yb2FPpJ05kaXSXIZ1j68pif/QmIHgIQAIlTekQgRADkI1JL8Ez/3lZt61vN/4P9K0Kypn8NwX0TWJdroO8XDWeMD7tlGzTtpBrUA1BNFxI2nar1eo7ZlQHWBWTL3GlStdm2vnO2y5tCfZBbhb/8Bt+Fs/4SvXp6Pw6YEVuO33hfBWYPm/uMJc8sruE6/n3Kv/KVvcuvgx3iKJvyHm2XIQBtdPitfwTUYFd11h7U4JWH4cjmBQP0pcYne2ex1rFpFgA3QUjDvz/tcpf7VYLrhUTRCPTRy0Uz+cPq1jetVbgSH63mtjR3SMtit3u0cucuaFO1/0P9Ygx3KJqRV+2s4JWRipe27V3oh2rkC5o6aIL//1hyuNk+kw/IN930YrMPhul0k4UFHJ+8TC3gZlwKgegEVF93jgFIIbRm8jcb3jL1bVL3eSkFWWt3AV3mBvQ6Vu96mJt9WB9UOwc6JfSG86ThOr+8aMBVzr+0ee6880MdU7lrJt/UIszPsuQT/nXc0tXqgmgS6swbxZLbI5qdfqU4NO0q2k+wuW9Z8nmzg7zrbIGVqNTueN+MaLpjzOMLjHvMqGEbAlMQUOu+swdwa0u/1/wFWk37e9rY1SstaRUA9/WV9umS+sbss5uNqI5TZRcS9L7YhBWiVvLRIhPdQc4NvROrWZijoProvGDH1Piiyf7qjlom+i1uTdP6hdg0tV/DrTGCZqYeMzHJmojo/eeDbO6LNvcjSz5kJhff1gEtjxpD/pCk+uiuZkTTtQs73tlYWph5robAIhPQAO+6XbfUG0Zfb2h6q/n/iKK/fv1maxpX/HLXIm77WLJXswXFNrBpL1d+iDMnu5UcHUpj0xsM2WnauJ2fHKm+zihIkCQbC/GTjC3V/FXVr/eZH2/J0/0KQk1SfUnYIqD5G6gpK4Hs1EjNiVInQFksl9oCg9KixsHdLNGXAKTxy/20pZ9aeoLbDu3YjfXp1TQAABUZSURBVOIg0T3NkquK/bAFRi/scgQgjBNn9YWAHsvOKnVZc2I29XWTuhFZ0Ov7sllbs2iCzfENP40u1xDCoa2zd/Su2Xr1trP7jza0lrL7uGBWTZd+ru5qer5qupCwZVGiNKoRqfWtyGxsc+83e3RHQtILwiahZqnT17gO8k375dmhxg237t4f3HJAMwvSHhU5yYA6UgdborW19drwd8aDQ7Ulp3rvK8Jel6teuLAjCMDC+HH16kZAM+5v11WlNj2TWo1gX/eJ3UKQADQF2WkyNbpkz66KRhV63vnedCMd1/tiGhfdveWM3E/X2bz8EmpHdwYl+UHFDwJrVtK5nZe5xm/ycLMl4zM1bqxB9c4pp9dZer0leX0dG1j5Vx0dDUFrcm1gGH3M/SVmb7P0Y105IpvqS33Hf6u9xbkXeOvSaWooKEOXWHIX91ZzInfT+3xfU52qzqB3EjWnYNEDArDoyLlhVAJ6CDt7AE0R0Fd2n1q5vEUAmuyMjq9tc/IMtF+uqG7b3MPI27/SfWo4uWfACIea8F/xHyZrF6eR8dELCnli54e1vtVVOszsHuMoqurXuPpR492mv6rjjjF7QgVy/nx5n36X32/d1mJHh1ryKte3SB7tE94pQlr+74e+Z6YGe6SgQriuG/lPPuAHVE4IuE1nYyLAxhSnIABTQOOS1ZiAnj05tacI6jo8wGzvypWqwWUzpDItXpqocty/eKi6p+dvR18bdjZ4NYPls3410KzOrVrTETU2f2zp28K8/2r+qxWfn6EkZ7S6GtfUmi4e3Mp/+SRzSW3iBxJ+1g1KM15qPz+50vr1fuGdlfvNW6M3yF5nprsrKCG7hU18OtdNvXcrj2oMphr0ftbhdR98zp8p391BZiow7UH6+mBzk3E7y480uL1j1H6jaX9FAKYlx3WrJ4GpBWADs6fULWzZ3oRvgqDhzadXvm9Vd3Jyb7dAWNDnaPTGmT4F/C6/oLSSWQ16peB7Nv/m4BFU3VdJXi9n6CazPwZNTNLIZ+FCrXS9u6VidW3OWu3mhX5BhW1qf/MHdUKI80rfvHyyJW/ILSCq9y0e47+sqVS0B3VEvu389fX+N72c9akuFRT/q/13KDsHk29sj8r4140DJi+Mz53h37kZ2sIUBFY9gekEQFftVVyMbJySZDoB2NlVRq7r0Bk0K2aPzpP8CeoEfN3S1/pZOqVqRVWe5OF9Nv9S70DvbG/KnuY7yU+db/7roNb2kQB0BjWcJQDycuTDLsXXifM/5bf1eYBft/m70+Vhb0Ut9Z6fLXOmlaKH+n5J7ljTpsZpXTRqQSnH1R7XTy3/5EfSp+c/17oQqS5XZ+LHDXcpxizZNjcTt/hT1D16AFHxYnzRCajO1dM7adA0kicWP9SeWVB1EFKPZ+dro/bDL/kT8tvrmx3gWu7dbWddpc8Of83N0kke5QaE9aV1Bbdo/slmP/ALcKoTEBh2NXteZYjisrDPQIqJPFel1qMWdLuX/4xMewTkZfqVJX/xnyqrnqkBgFOC5lC6LohPfsGGVnB6aMDX53WN3FzqBOxX98EcicpmXW93y8JfLH27HzB/mvcmKR8zIHLEXevng77H63EhinU7a/tvBU9RbuuMTXQMAZgIFyev9gRUWU8+BqBP9yX/0lDR68GeVABUDT0+Vx20M9PYw4PcKmPd3xMe2VEVebr31Guy02gei6aHaghBx8ODfNOv8x8sLF2iCbJXlg7V7WrEdbvKcXUI7mf25YCYyAWvae9yQFWDejZ/qB6tHFGOSACqGa1RAXmBFIdOT5R06GgzRWPPinG95LVb2FzYP1v6v35O0b3dCwHug8bKEeXFpX6V7BM9zNpORumeyo59Jy9mJSNT7SIAU2HjotWWwBQCoHrkCQ3uYCVTj7Qc+uHV62h4sFo/thBTe/NQv/5aSOU7sqP4qI7rrOZqb3o7txK960OUnn65mM5q9Wlk1pbUfQZSQ8qqN5UWVX/tQc3/4/xyOqUI6Co1nM9sv9j/qsayuiDKl1JQ7u/uh4KPLv1Qt3uJX8Z1t8roq8w+2uwr7kuT3UHOt/P8VJ9veDvqBKj5r4OazBoY5Lna17+MHXj+TE/LOi0ztYoxCKwqAqoCJuxKJ3qZ85HNDfZ1vAaEJ0cLycmbdKvwC9yt1f9InlJXo01iJuhc6dNjLZHzR7JXCmp9nxzmsFZrtxbydn5Wa8lsdVdV5C8b1Ov8sEmoGnrdoWrXH9nIz8+pSkv1dFXT33dfaCkH9cnUlQkcmMkuVo2vrpg0QyPM4bW/Lhe0Q4sj6pnN+BsIQHzG3GExCUgA1GYPL9c6+XHFN6FKsV17EgFQa05aIu/EpEGDEP/mxzDDYz7pLXS+Bif0Iap/b5ieFDj/Ug1kJVC6WA1Kxd7VozVH0lP8Fx9Lv8gtc27Y5+O1XtOdSxePd5UF+zUsMTQ+Jfurz5alP6/TvM1s7mWLMioruVJv7F5ZjBZ7I2pxW+zEcD8IOAKqm6rOgSY0ow+1tzTYJ+oBqGJSQ16aMUXY1pL/8G+oRnoo13UfpXHrr23b4G5WW/iSgHir9b19gwVhv29D56Bk+Eq/ikappawmuUaA9X9XcIsuaGymKWxj9tCm34rHr/NDwXJJlYKaEQ+z5EXTZmXJWtOu3mF+nvsYzpQFpsnsJMcjlbVJosC5EJgtgXAB0FzyA81UX7QE1ea1rd3qJfLk7Osd0NWfQo6o0rmHzX3IfR237J0PubzlHFnWJ4Vfbcn7/FdutFsb1Pq+qvaH4kGZaiIm54m8Q1sWz6/dk5/kV5WPIeugfFCdQZWW7lKahJq/StmqQfgWhcidnGo04ne5/WxT48mvsuSZrTfKTp5iQ23/l/iZrHoBZdUFsSRAYI0i4D7hEtgD0Fzyg7pODu8BaHWEpy6svtDjeG+b+5hfj/r2M8oUCdh9be6jbtqPm6bSFG4OnUWaqPm/UZMVPzVz1+Zfc7+4T/5enNvXpibVLCseqd1bzw8AtHTapEMaCr5n7cWVg/o87zcbJp5qOtC7nXC6WaFNqlmx131Auax+5zt9jmzafXrUMxCAqHgxvioIqMoLEQANhx5gKz780hLNQAHQk7SPd+C0mAr5SRWNfEH/bcmHfWciJCFNZm/tfDV6V3buy/7TJS1NZlnQAKZeAQuZs3j3VpHTAqjiEFJdatXMk4pRV+0v11Bn2NgPnLaftmHwTFzNffpp85vYsvN6m/u075bdLixdLRFTIdHbEk+3uS/4cfiwPkqLvYX/pDJCgMCaRSCwB7CVmRwFOrk9yJ+wTkDFqJpCzf9ZPdIaTdXrRfu4JZ3TL3nPePjcEtUyqut3cRM93Xyk7cKGxDX/8ox2EP5XjZnv1KqvGoO9j6Wqo6/qsna92W98FoyUSe/Wnt21AMPIpOZZ3anLuDoBD7f0/c1f/cwb0DJ23zf3Zllte1gl5JE2t4f/cu8X/cI+SppGL0LEcnQXyaGE/M4uQ92HENQ7qZ1DlY/SYm0jAItFmvssGgF5Vx9idkXX/R7kHdZdZzmF2NsSVXztQcvBP6D9jAl/Va2hKuPlXle0boG+NKLqUj4TtZHVWi/VPjpZMZQPaqlfhHI/M00skXtBxwPDDZbs2vB2bt6CdE49gPawkyWaWHV++0n+V7FVWkYCcIsl8uoo5p1B56gx3hnUkXqO2a87z/Mn/M2/wLV+88ka+dDw/gGWaMmNY8yO9ROWLvWKdVMlO2RG5JU6vTGndobmGT/YD49v3aqdzTeP90syVypJ8W6FZQhAYCEE/upVTQJwkaVX+ze2/u4nkGgyiZzUqmhU46tpHFI5LiQaXCsCt/jpqmpkKCP0XWhlit4AUHYoSM+0SLWGW7ZwAuD+13BOuBJ7G4v2HwKwaKi5EQQgAIHVi0Ct02v1iiKxgQAEIACBGAQQgBhUsQkBCECgBwQQgB5kElGEAAQgEIMAAhCDKjYhAAEI9IAAAtCDTCKKEIAABGIQQABiUMUmBCAAgR4QQAB6kElEEQIQgEAMAghADKrYhAAEINADAghADzKJKEIAAhCIQQABiEEVmxCAAAR6QAAB6EEmEUUIQAACMQggADGoYhMCEIBADwggAD3IJKIIAQhAIAYBBCAGVWxCAAIQ6AEBBKAHmUQUIQABCMQggADEoIpNCEAAAj0ggAD0IJOIIgQgAIEYBBCAGFSxCQEIQKAHBBCAHmQSUYQABCAQgwACEIMqNiEAAQj0gAAC0INMIooQgAAEYhBAAGJQxSYEIACBHhBAAHqQSUQRAhCAQAwCCEAMqtiEAAQg0AMCCEAPMokoQgACEIhBAAGIQRWbEIAABHpAAAHoQSYRRQhAAAIxCCAAMahiEwIQgEAPCCAAPcgkoggBCEAgBgEEIAZVbEIAAhDoAQEEoAeZRBQhAAEIxCCAAMSgik0IQAACPSCAAPQgk4giBCAAgRgEEIAYVLEJAQhAoAcEEIAeZBJRhAAEIBCDAAIQgyo2IQABCPSAAALQg0wiihCAAARiEEAAYlDFJgQgAIEeEEAAepBJRBECEIBADAIIQAyq2IQABCDQAwIIQA8yiShCAAIQiEEAAYhBFZsQgAAEekAAAehBJhFFCEAAAjEIIAAxqGITAhCAQA8IIAA9yCSiCAEIQCAGAQQgBlVsQgACEOgBAQSgB5lEFCEAAQjEIIAAxKCKTQhAAAI9IIAA9CCTiCIEIACBGAQQgBhUsQkBCECgBwQQgB5kElGEAAQgEIMAAhCDKjYhAAEI9IAAAtCDTCKKEIAABGIQQABiUMUmBCAAgR4QQAB6kElEEQIQgEAMAghADKrYhAAEINADAghADzKJKEIAAhCIQQABiEEVmxCAAAR6QAAB6EEmEUUIQAACMQggADGoYhMCEIBADwggAD3IJKIIAQhAIAYBBCAGVWxCAAIQ6AEBBKAHmUQUIQABCMQggADEoIpNCEAAAj0ggAD0IJOIIgQgAIEYBBCAGFSxCQEIQKAHBBCAHmQSUYQABCAQgwACEIMqNiEAAQj0gAAC0INMIooQgAAEYhBAAGJQxSYEIACBHhBAAHqQSUQRAhCAQAwCCEAMqtiEAAQg0AMCCEAPMokoQgACEIhBAAGIQRWbEIAABHpAAAHoQSYRRQhAAAIxCCAAMahiEwIQgEAPCCAAPcgkoggBCEAgBgEEIAZVbEIAAhDoAQEEoAeZRBQhAAEIxCCAAMSgik0IQAACPSCAAPQgk4giBCAAgRgEEIAYVLEJAQhAoAcEEIAeZBJRhAAEIBCDAAIQgyo2IQABCPSAAALQg0wiihCAAARiEEAAYlDFJgQgAIEeEEAAepBJRBECEIBADAIIQAyq2IQABCDQAwIIQA8yiShCAAIQiEEAAYhBFZsQgAAEekAAAehBJhFFCEAAAjEIIAAxqGITAhCAQA8IIAA9yCSiCAEIQCAGAQQgBlVsQgACEOgBAQSgB5lEFCEAAQjEIIAAxKCKTQhAAAI9IIAA9CCTiCIEIACBGAQQgBhUsQkBCECgBwQQgB5kElGEAAQgEIMAAhCDKjYhAAEI9IAAAtCDTCKKEIAABGIQQABiUMUmBCAAgR4QQAB6kElEEQIQgEAMAghADKrYhAAEINADAghADzKJKEIAAhCIQQABiEEVmxCAAAR6QAAB6EEmEUUIQAACMQggADGoYhMCEIBADwggAD3IJKIIAQhAIAYBBCAGVWxCAAIQ6AEBBKAHmUQUIQABCMQggADEoIpNCEAAAj0ggAD0IJOIIgQgAIEYBBCAGFSxCQEIQKAHBBCAHmQSUYQABCAQgwACEIMqNiEAAQj0gAAC0INMIooQgAAEYhBAAGJQxSYEIACBHhBAAHqQSUQRAhCAQAwCCEAMqtiEAAQg0AMCCEAPMokoQgACEIhBAAGIQRWbEIAABHpAAAHoQSYRRQhAAAIxCCAAMahiEwIQgEAPCCAAPcgkoggBCEAgBgEEIAZVbEIAAhDoAQEEoAeZRBQhAAEIxCCAAMSgik0IQAACPSCAAPQgk4giBCAAgRgEEIAYVLEJAQhAoAcEEIAeZBJRhAAEIBCDAAIQgyo2IQABCPSAAALQg0wiihCAAARiEEAAYlDFJgQgAIEeEEAAepBJRBECEIBADAIIQAyq2IQABCDQAwIIQA8yiShCAAIQiEEAAYhBFZsQgAAEekAAAehBJhFFCEAAAjEIIAAxqGITAhCAQA8IIAA9yCSiCAEIQCAGAQQgBlVsQgACEOgBAQSgB5lEFCEAAQjEIIAAxKCKTQhAAAI9IIAA9CCTiCIEIACBGAQQgBhUsQkBCECgBwQQgB5kElGEAAQgEIMAAhCDKjYhAAEI9IAAAtCDTCKKEIAABGIQQABiUMUmBCAAgR4QQAB6kElEEQIQgEAMAghADKrYhAAEINADAghADzKJKEIAAhCIQQABiEEVmxCAAAR6QAAB6EEmEUUIQAACMQggADGoYhMCEIBADwggAD3IJKIIAQhAIAYBBCAGVWxCAAIQ6AEBBKAHmUQUIQABCMQggADEoIpNCEAAAj0ggAD0IJOIIgQgAIEYBBCAGFSxCQEIQKAHBBCAHmQSUYQABCAQgwACEIMqNiEAAQj0gAAC0INMIooQgAAEYhBAAGJQxSYEIACBHhBAAHqQSUQRAhCAQAwCCEAMqtiEAAQg0AMCCEAPMokoQgACEIhBAAGIQRWbEIAABHpAAAHoQSYRRQhAAAIxCCAAMahiEwIQgEAPCCAAPcgkoggBCEAgBgEEIAZVbEIAAhDoAQEEoAeZRBQhAAEIxCCAAMSgik0IQAACPSCAAPQgk4giBCAAgRgEEIAYVLEJAQhAoAcEEIAeZBJRhAAEIBCDAAIQgyo2IQABCPSAAALQg0wiihCAAARiEEAAYlDFJgQgAIEeEEAAepBJRBECEIBADAIIQAyq2IQABCDQAwIIQA8yiShCAAIQiEEAAYhBFZsQgAAEekAAAehBJhFFCEAAAjEIIAAxqGITAhCAQA8IIAA9yCSiCAEIQCAGAQQgBlVsQgACEOgBAQSgB5lEFCEAAQjEIIAAxKCKTQhAAAI9IIAA9CCTiCIEIACBGAQQgBhUsQkBCECgBwQQgB5kElGEAAQgEIMAAhCDKjYhAAEI9IAAAtCDTCKKEIAABGIQQABiUMUmBCAAgR4QQAB6kElEEQIQgEAMAghADKrYhAAEINADAghADzKJKEIAAhCIQQABiEEVmxCAAAR6QOD/A50JPjduQ7CAAAAAAElFTkSuQmCC
+#define bsky_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAMZlWElmTU0AKgAAAAgABgESAAMAAAABAAEAAAEaAAUAAAABAAAAVgEbAAUAAAABAAAAXgEoAAMAAAABAAIAAAExAAIAAAAVAAAAZodpAAQAAAABAAAAfAAAAAAAAABIAAAAAQAAAEgAAAABUGl4ZWxtYXRvciBQcm8gMy41LjEAAAAEkAQAAgAAABQAAACyoAEAAwAAAAEAAQAAoAIABAAAAAEAAAAgoAMABAAAAAEAAAAgAAAAADIwMjM6MTI6MjEgMTg6NDc6NTUA/Z0SygAAAAlwSFlzAAALEwAACxMBAJqcGAAAA7BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDYuMC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyMDAwMC8xMDAwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjMyPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjMyPC9leGlmOlBpeGVsWERpbWVuc2lvbj4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAyMy0xMi0yMVQxODo1NzoxNC0wODowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMjMtMTItMjFUMTg6NDc6NTUtMDg6MDA8L3htcDpDcmVhdGVEYXRlPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPlBpeGVsbWF0b3IgUHJvIDMuNS4xPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgplp5JWAAAD10lEQVRYCeVXW2hUZxCe+TcbQZMmxzUo9q0pfZUiIai0Igoq4psPpbS+WBqwxfatNYm41GbjDRHBG4jiDcWWPhSilFKpUvugRdCWouhTH0Q02aw3rHt2/+k3h5z1XPbk7Frzoj/s/jPzfXNmzn+Z2SV63QfrAszaJu22Sh9A7GCmC2Mb+cpULExuWHpEaDEJlTIunb6f58ctGqhakXOYFqkMAjlD9pIV/vLBIP+htv87NLC1shufhf6zKllaC/l9fmNY3s5YueUDgbnKJIWia/KUZxuwNy7mxThZ+w0Rfw2nTNTRGu42RujNKDChZ4R4k9MiI7N3yIwETqK5Ky9tTlbOIvgASLHg6miqNNcA+TfxKQowrSiX5ZfOvHROyguAHcPiuFk5D9PygDkmIvgzg1M4HkPihl7G2+hbxaGwRTnGyjk8tyeMxDUXsU25TKNxqK5lQSUrZ+iM1F1OzwNYpUW+g9xb9wkRo3lGo+bhZm8FKhEsSV0587bdlQQ6t+1u3bIkPGJ3S3kuGWLGxaP7ETBRFeENzpB8GCXA9hEJfx61T6LfU8zoF/brjs6NDznQsUW6fb5eZVSQ/b7eyIy39mJ6CcDhn0acApx23N+jqFpMuOuoI8eApR7QgL+KXkyvEorITWxFBE9VFzlD1Ect3iouSGVHCKwxMbwEiM0pLKFWq+YGyxY4NJ25F8SLOXEGxgf4upAcbi66x56F71yzfoh1CDH/Uj//DFCp3awnFqzEFA+Wk4hVuy2x5Zs5LCukKp9hYZcglaZ7QEL6T2A/z8R7iwP8U5ATS8AHO7fKPLb2E9ztZbC9hU+rjzU4a4+5gcP2o2vMnkf9PFbPL5ZAriC9VmQHyO/Vc3hB21O09u1o7QW09nLwGaEE0MXmo5FcAmFakPQS5ZHxfl49UX29x9YOoWpY8vWYmgmOhkaN9hENsSr3LS1VwR/hBISyPtDIjHL6K3i/N8L1OZbpHV/WOZSAGPNzEEyTWfgHLOdIGi+EG/ozqIfOAB2UrDMqf4OA5pI63KrLc1oz1FU1ciOVrQShayhA7yaeAepjF/1lHajpP0JZvn+Y5+LoJtaaflWfnzJc9P5Pg8GVH9oCNZQG+SIzf6XyJAPV1Gz1cfD3+XLSLMx9Y4N8OYrHElBCsZ93otUWouSaLl4tv+7rxRwdg5y0DU9xvz4u9fMRnx+c6yaghPHBzABKp27H46AD5AszppsvQjZsHVd5Dfb4bshOdBH2Huz7iYi9poYPYc38XGgrSFer0Foh2y1srpTKdBzVrO7d15/j+DOhibSxod+m6i/e8+xeBek/Imo+s/SkNeYAAAAASUVORK5CYII=
+#define mastodon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAGV0lEQVR4AcyYU5gjWRiGs/btXK73dn21NttOUklXqtI2xrZte9a2bdtqu2Onvj2jnO45528P/ud5m+9fz3mjhmk4o2m4iHGn5kS1XhBfqxcYL2pO43NdN35n79t1p9FzhBADfTD49w7xH9v96dCu03hFd8Z3MebpBSjVddysqjjXNFaTnY0znM6YmR3yNV2Pxxg4AQQZjzgcuN00mtH12MOaFv1F02I4ibygabjcNJwpLMRZbHGN5ogaDJx0tGiPrkYfGOpD5my29LSmRnCKEXOq4YzBn6j54d0MnKIEVDVyrYka1Ra0OewhnOJ8ffAhLh5exbkOW7CRgaGiq0HUVIZQXRGCZic8gvLiEOqrQyjUKIdGU4J2IcCh+EsctgCGwuqVYfz4QxzRKBITjwE/fB879D1qb+bUED76MIZgkO8ZBvDPP3Hs3xuBUxV2KD4X7wEl8Jaq+DEQTtWPzz6NYbD54P0oNHv/3b27wzyYmIaGOLtHA3yPxrDZvOMSh694EOeoVl+EgYH47NMohjqvvRJJ7K1bFYJhYEjT3hZHke5P7FI4rP4k/sqj+K5RLV4MxPrVQQxnDANYNDeA8kIfvF4Dw5nXX40Q5+A4zB5HIiDf7M1UzR4MxF9/0g8dr8dAT7d4yKaGON5/JyL6Xu7LJhQyUKp7MeCZLO4qHpDrKsnPc4OistgD2fz2Swz1ld6EN7nOi7/pULhdBhbP80M1H/aLNQ/efiMsddeuCBxySHJdU3lAjmsy+wIoVi7x49iJxYD6Co/gVhW5D92Cslk63yf4msUF9rgX3BefC3FPgprXO4sHZPdMzc/pBcWOTWLAH79FSf/zT8SHTU93HGqu3H/5+ZD4SvZuWOJy1Jx+AV0soBsUj+wRAz77OEz6LzwTEPxff46S/t4d4vW/+py+PoMFdPMAGwuwZ3eBQBrw/jsh0t+z3Sf4n34UJv3tG73SAInLyeqemQhgX5hkz+oEAQvwSQKCpL9ri3igj94Lkf72DUSA6HLYmflDKLOzxp7ZAYpHdksC3g6S/q7NsgDSZwEeSUBI6nI6axMBSmZ7iS2jHQQswCsLIP2dmz2SANrftl4S8FlI5nLSO8r4cyCtVbWlt4HikV0eMeCtAOnv3OQWA94NUj4LcMsDZD6ngN8DaW1mFgEKIoD0d26UBdD+tnUueYDgcuzprfl9AlrSbKktoHhkp1sWQPkswCUGvEP729ZKAj4NSlyOktJi5a9Cqc33KKnNoDggDfCTfm1RO9Ys6enHzPpO0t+6tle4/pcsQOJy0ppy+HMgpeFGJaUJBCzAJQa86Re8EcICeuQB9A6sSU13JwIsSY1XKcmNoDiwQxbgE7yRsnWNLCAw4I7loZZL+D2Q/uc4JakBFAe298oCBG+kbF3dLQ+gd3yzZuH0Pv8L+uls68P/gUAa8N4bPsEbIfKATwKkb0n670nTsWN96F8fAzKq1CYsnNLWj4klzYI3UsqVRuH6k8taSF956B+zGPB/tfUAa3UUB3D8ZHPONW9vytfn3XedcZhtDVlDGHLTmxqyMS+7ru1sDhmn35tyPdx/+/fdPpd/23sjCdR/ID21l7/RzyvgKZ6QnqLSuc/SU/ChXyW9+W3Sk1d6JryFleh3SXd+tnTnlE59kp7scoRUPfS7Rjly/aUrq/RGuLKxUc5MBfpbxHCnmXBmPgClA6+5I3NcOLIjCFENUHUTjnQIqBqYIJ0Zn3SmFwlHZhd8j4Ln4HM1xn0L4zyUjvQ1+LyXO9LrRUVqGmx1q9eba4JqE0xgLVDV5kjN+e0h6c215q5YZ+ZKllWRjmwPjlPdpDnaDuPTDZEWMZwsE/bkZ6Cqg1ckjyC9Jezx3bw8oarprbQnuyI9Rezhjrw8/gSo6hA4fooYLjVDeorZol6OYx+Aqp5oUOCEGdWgwaZ0K2GLGhiO9EdaRHFsNKzIR6BqIE5xdDuzRWYyHOHwnXBrbBK3RRdwHFlNbdGN4Cj8XgSfgYL/KpFWCRzxMGvkJVBa4ZZIJdIyaY72YJbQWWYJKy1ovgJVEbKvATOHJzBz8DYzh1SpUHPoEbUER6B/VdVzOMyYUGPgMDUHX1JTUNXCR3CWGIMzCE60RNpVjb1iCvQnBv9iagjuIIbgaWrwF2Hlnn/jMfBTo38X/LcChh8Ol9z2qIR9AYR0nryBE2ETAAAAAElFTkSuQmCC
+#define reddit_icon data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAB8lJREFUWAmVl3uMXVUVxr9z7r0zbYFO25mWWoZ2tAGk1rajtWK1QFuxNLEGo1NiFaMCidHWZzRqFCHlHx/RmCFEgwR5hAjVhvAIVaBAHwYCHUsN2jhFbYfKq6/pY+jM3HuPv2+fs2c66XQaV7LPOfux1rfW2mutvU+iM1AmJepQmmxQzUuylWpVXUtpy5h5H0MXKtPEgv0YY/v4/ivvzYw/nfxZPZ7LOlTSBtUTPou1I16Mn05mGgJeqvlq0FqAr1FZLWF1nafFRZGW4pbSTFUdpP8QrTP5k17y0Kky3Y90mgLZlSonz6iardIE9esWFq7Dhsbghyz3BoITwCOsZUV1cpUSOEqM1pAgdcL94+QR9UXZZog0QoG4IFuui7HmAVW0QINhaZWnRY5YH4WM8rYi3royMuyRnfSuTZ7SPyNG5BkSGCeyFexvpsdRYBpMhi/ThtZFxqF3eq7UMBUfsLR2Im8lxiqTAO7LNPB6NahR11vwrCQ2dkQsywiC4/4Ey0vaWoDbaoOfmdIGqW9AcOR0Ea8LaMdpL9Iupc08D6WOWYkycfQmRi0JnijiLMFXCVpkYc9PajuOXlBYbuedmWzlEZAWrZY6viS9cUDq3iU9t0Gas1xa9Rlpx3bpzpukd0zBG4eqyC4je6fG6cMhJsAuO9VIE4fLLcWe2+1jg1utSjNgKPDDT0uXzCVCdksLPyB99gapebo0Acvf/yHpXy9L2x9grKmsau9gwMiD+zvGDnnOvs9H5Loi4MZ2u8G9c5lzEZo5S3pyk7T4o9KNS6Sffk86eiSfq7PGzZTnR7nAWGdMp3oEW4t7GonWs++7wXGc+ntEWZKaJkv79mAt3+PGSRs3So3jpWuuIw7YgmfZknwLrAbMYBirTm1B5SRUuGqoYC1oaT29aHQycLkJ9wN6GNBFn5O+fav0fWJg/5Z8nB3VwTek5xHxHlorxbJ+9FR5riCuIweIiHZH5lI0aiEKaqxyrueUTsjB6tSSWi+pNkMa5L3voNRLwwFa044ih6TfbZZm028m05qnSee/U/oEdoTUfJsJPFM/mcu1gS5orqpgW4HldIbJPqgQtX0I7u7DffSbifjtIM7hu+Pr0nsXSpPJ83cvQBwMD92DIlj5El7Y9CC8rJsL45HXFLJ/Jv0GvDZ4eKR/OVeS7GPU6kTzUMTRkqqE4DcJokuI6Ms7sLRb2nKH9OXbpStWSDOQlp6qMVyR+kHe+4r01KPSL34gXbVKamMftt0tvY4yzWxHLWxHHaQUT+xKsqt0GAUm0ckAT3QE8IWk1k2/kqbi9pMnpEPk+IxZEWY4sl1BTBle8HfsI0qv7IZ/ujQRy//7H2n916Rdj9Anhmq9eRzgNyJG53k9lITy+Rxfq6/PwZ1C484ZBq9S9U5gQQqbWwSN3/ZASE+UmX1pDl5H+Iw26sNXpb8g2yXajMbkOLcCY5OtM/Udk24j4te0EuFb8jHPxfkXtkrXXy7d0ykNEHABIEcJiyuU7VEoxe6jNFOmQdx/GV8b7sxTyZZFgO5/SN9cL/0bRe76CW7EG9EDBuz8rvTyDukL35D27LY/c17LcNZsvEsirFSF30I9D7Y90DOkQA0FphJknX+Qfg+DKe7rhW3USoLyb4x9/PMkLBZF5RpIsxWM7WTuuiukadP5OIUe+yMV8l4y6l1kAtkFZ4HZU+azi+x3FuAv1KoSdPNY0kvgeT+TwgtTpkm3/lr6FtswE0EmK2cl/F79Ran9MqmFdS0oEMZtH9Tbm9eJGjESDGLSU1V1+eU7XEF81FGgme6Oh8ljlIhkgROnSG0XD6ehxyJV8MKcdqy/IAf3OHqF2Ol6QrJTasd5FDz5a3NKEXqaunSAxaUw64p1DoH2bDeHDPls8mJr/jbK3XtbnmLBYYwFi5jfu0e6m9Q96mLDeFRu25PEFApMRmZQAEZjGRNs6yhOpjtwyQ24pEqXKsNwqYWyS2n9zSbpIxQgk9PSZ/yj7OeESVjbloMd6OESwtqr1xBoS+AtClXXNukr9JsoQC6PmcWDkV9OfsuF9caowHz0ep7WyIJgrxKnDU7ZSy1fT1as/JR0LkXE5Nh4dS9bhLWmJpRpncXW2ImQi9fmx6QfXYvl7HJ5fL61Q7K5faRalGzSrlK4jj2s126erSYuC4sJRquJpBrW8WqeKt1+P4q8SBFBUIW7ynje4dCh3p9P85E82E/F2ye9gNWdNwO+nrOCYHKUheDjbesryK7rl1h/X8DG3HzHfA0fvpIVW2EenNTYStHs4UCi+0Fa+0p+S+bmlc7zx4ny/X/nMCJwtxZrnM4D+7EZQ3Ia9UqWb0FxQRzzUhpuulg0AFgv9cLeZ1sD4RDhBDVRthuJHRc0H+HDlIOPdimNa7Irix+Ss13LfSlJQUxJO3+bbKWzp068+A4wTI4ng1dw+1s462pc3xWxvCx4IK6PE5yQFzH2IGxn+TGJ7MYZQR5AK+KdkOEeuBMFRv0xcYgMUfIMv2T2xBPq5oBejO4/Q8V+hJR5G81C3UgDZ4txArgfHsvnvdapZt6qfh6u4aP8FbE+CPV7BMUfFQ8SF/Nw4VpwPolINhgq4HNs+lbNLZpTpcik/Jxyfv7fP6cwBcKkkb/ny/jnKWkZk6f/nvtE9aHmcyWltKdUuMf1qgXZmLF+z/8HuObo1EzDKmUAAAAASUVORK5CYII=
+
 <!DOCTYPE NETSCAPE-Bookmark-file-1>
 <html>
 <head>
@@ -22,36 +20,21 @@
          so that viewing the file directly shows the results. -->
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
-    <title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
+    <title>Default Bookmarks</title>
 </head>
 <body>
-<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
+<h1>Bookmarks</h1>
 
 <dl><p>
-#ifndef NIGHTLY_BUILD
-    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>
-        <dl><p>
-            <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>
-            <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>
-#ifdef EARLY_BETA_OR_EARLIER
-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-beta&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#else
-            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-#endif
-            <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>
-        </dl><p>
-#else
-    <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>
+    <dt><h3>Waterfox</h3></dt>
         <dl><p>
-            <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-nightly&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>
-            <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>
-            <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>
-            <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>
-            <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>
-            <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>
-            <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>
+            <dt><a href="https://www.waterfox.com/" icon="@waterfox_icon@">Website</a></dt>
+            <dt><a href="https://github.com/BrowserWorks/Waterfox" icon="@github_icon@">Source</a></dt>
+            <dt><a href="https://browser.works" icon="@browserworks_icon@">BrowserWorks</a></dt>
+            <dt><a href="https://bsky.app/profile/waterfox.net" icon="@bsky_icon@">BlueSky</a></dt>
+            <dt><a href="https://mastodon.social/@Waterfox" icon="@mastodon_icon@">Mastodon</a></dt>
+            <dt><a href="https://www.reddit.com/r/waterfox" icon="@reddit_icon@">Reddit</a></dt>
         </dl><p>
-#endif
 </dl>
 </body>
 </html>
diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
index 31d0ee3258478..5c463bb6b15f0 100644
--- a/browser/base/content/navigator-toolbox.js
+++ b/browser/base/content/navigator-toolbox.js
@@ -10,6 +10,7 @@ document.addEventListener(
   () => {
     const navigatorToolbox = document.getElementById("navigator-toolbox");
     const widgetOverflow = document.getElementById("widget-overflow");
+    const browserBottombox = document.getElementById("browser-bottombox");
 
     function onPopupShowing(event) {
       switch (event.target.id) {
@@ -39,6 +40,7 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("popupshowing", onPopupShowing);
     widgetOverflow.addEventListener("popupshowing", onPopupShowing);
+    browserBottombox.addEventListener("popupshowing", onPopupShowing);
 
     function onCommand(event) {
       let element = event.target.closest(`
@@ -102,6 +104,7 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("command", onCommand);
     widgetOverflow.addEventListener("command", onCommand);
+    browserBottombox.addEventListener("command", onCommand);
 
     function onMouseDown(event) {
       let element = event.target.closest(`
@@ -152,6 +155,7 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("mousedown", onMouseDown);
     widgetOverflow.addEventListener("mousedown", onMouseDown);
+    browserBottombox.addEventListener("mousedown", onMouseDown);
 
     function onMouseUp(event) {
       let element = event.target.closest(`
@@ -174,6 +178,7 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("mouseup", onMouseUp);
     widgetOverflow.addEventListener("mouseup", onMouseUp);
+    browserBottombox.addEventListener("mouseup", onMouseUp);
 
     function onClick(event) {
       const isLeftClick = event.button === 0;
@@ -289,6 +294,7 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("click", onClick);
     widgetOverflow.addEventListener("click", onClick);
+    browserBottombox.addEventListener("click", onClick);
     document.getElementById("sidebar-main").addEventListener("click", onClick);
 
     function onKeyPress(event) {
@@ -405,6 +411,9 @@ document.addEventListener(
       capture: true,
     });
     widgetOverflow.addEventListener("keypress", onKeyPress, { capture: true });
+    browserBottombox.addEventListener("keypress", onKeyPress, {
+      capture: true,
+    });
 
     function onDragAndDrop(event) {
       let element = event.target.closest(`
@@ -479,12 +488,16 @@ document.addEventListener(
 
     navigatorToolbox.addEventListener("dragenter", onDragAndDrop);
     widgetOverflow.addEventListener("dragenter", onDragAndDrop);
+    browserBottombox.addEventListener("dragenter", onDragAndDrop);
     navigatorToolbox.addEventListener("dragover", onDragAndDrop);
     widgetOverflow.addEventListener("dragover", onDragAndDrop);
+    browserBottombox.addEventListener("dragover", onDragAndDrop);
     navigatorToolbox.addEventListener("dragleave", onDragAndDrop);
     widgetOverflow.addEventListener("dragleave", onDragAndDrop);
+    browserBottombox.addEventListener("dragleave", onDragAndDrop);
     navigatorToolbox.addEventListener("drop", onDragAndDrop);
     widgetOverflow.addEventListener("drop", onDragAndDrop);
+    browserBottombox.addEventListener("drop", onDragAndDrop);
 
     document
       .getElementById("identity-box")
diff --git a/browser/base/content/nonbrowser-mac.js b/browser/base/content/nonbrowser-mac.js
index 4ddcce210f3f7..163a4ef11d4ca 100644
--- a/browser/base/content/nonbrowser-mac.js
+++ b/browser/base/content/nonbrowser-mac.js
@@ -110,6 +110,12 @@ var NonBrowserWindow = {
         document.getElementById("key_quitApplication").remove();
         document.getElementById("menu_FileQuitItem").removeAttribute("key");
       }
+      if (BrowserUIUtils.closeShortcutDisabled) {
+        document.getElementById("key_close").remove();
+        document.getElementById("menu_close").removeAttribute("key");
+        document.getElementById("key_closeWindow").remove();
+        document.getElementById("menu_closeWindow").removeAttribute("key");
+      }
     }
 
     this.delayedStartupTimeoutId = setTimeout(() => this.delayedStartup(), 0);
diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
index 5e5ee4aefc49f..20bdcecf5cf26 100644
--- a/browser/base/content/nsContextMenu.sys.mjs
+++ b/browser/base/content/nsContextMenu.sys.mjs
@@ -2830,16 +2830,29 @@ export class nsContextMenu {
     const docIsPrivate = lazy.PrivateBrowsingUtils.isBrowserPrivate(
       this.browser
     );
+    let isPrivateContainerTab = false;
+    try {
+      const win = this.browser.ownerGlobal;
+      const tab =
+        win?.gBrowser?.getTabForBrowser &&
+        win.gBrowser.getTabForBrowser(this.browser);
+      if (tab && win.PrivateTab?.isPrivate?.(tab)) {
+        isPrivateContainerTab = true;
+      }
+    } catch (e) {
+      // Fall back to docIsPrivate only
+    }
+    const usePrivateEngine = docIsPrivate || isPrivateContainerTab;
     const privatePref = "browser.search.separatePrivateDefault.ui.enabled";
     let showSearchSelect =
       !this.inAboutDevtoolsToolbox &&
       (this.isTextSelected || this.onLink) &&
       !this.onImage;
     // Don't show the private search item when we're already in a private
-    // browsing window.
+    // browsing window or PrivateTab container tab.
     let showPrivateSearchSelect =
       showSearchSelect &&
-      !docIsPrivate &&
+      !usePrivateEngine &&
       Services.prefs.getBoolPref(privatePref);
 
     menuItem.hidden = !showSearchSelect;
@@ -2882,9 +2895,9 @@ export class nsContextMenu {
     // format "Search <engine> for <selection>" string to show in menu
     let engineName = Services.search.defaultEngine.name;
     let privateEngineName = Services.search.defaultPrivateEngine.name;
-    menuItem.usePrivate = docIsPrivate;
+    menuItem.usePrivate = usePrivateEngine;
     let menuLabel = gNavigatorBundle.getFormattedString("contextMenuSearch", [
-      docIsPrivate ? privateEngineName : engineName,
+      usePrivateEngine ? privateEngineName : engineName,
       selectedText,
     ]);
     menuItem.label = menuLabel;
diff --git a/browser/base/content/overrides/app-license.html b/browser/base/content/overrides/app-license.html
index eafe95498af2f..4804359037cb2 100644
--- a/browser/base/content/overrides/app-license.html
+++ b/browser/base/content/overrides/app-license.html
@@ -2,7 +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/.  -->
 <p>
-  <b>Binaries</b> of this product have been made available to you by the
-  <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla Public
+  <b>Binaries</b> of this product have been made available to you by
+  <a href="https://browser.works/">BrowserWorks</a> under the Mozilla Public
   License 2.0 (MPL). <a href="about:rights">Know your rights</a>.
 </p>
diff --git a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
index 7b96764eba483..490c74405f9cf 100644
--- a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
+++ b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
@@ -55,7 +55,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
   const firefoxPath = getFirefoxExecutableFile().path;
   let enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
     `${firefoxPath}|Enabled`
   );
   is(enabled, 1, "Pre-XUL skeleton UI is enabled in the Windows registry");
@@ -63,7 +63,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
   Services.prefs.setBoolPref("browser.startup.preXulSkeletonUI", false);
   enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
     `${firefoxPath}|Enabled`
   );
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -72,7 +72,7 @@ add_task(async function testWritesEnabledOnPrefChange() {
   Services.prefs.setIntPref("browser.tabs.inTitlebar", 0);
   enabled = WindowsRegistry.readRegKey(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
     `${firefoxPath}|Enabled`
   );
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
@@ -105,7 +105,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
   for (let key of regKeys) {
     WindowsRegistry.removeRegKey(
       Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
       key
     );
   }
@@ -115,7 +115,7 @@ add_task(async function testPersistsNecessaryValuesOnChange() {
   for (let key of regKeys) {
     let value = readRegKeyExtended(
       Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+      "Software\\BrowserWorks\\Waterfox\\PreXULSkeletonUISettings",
       `${firefoxPath}|${key}`
     );
     isnot(
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index 7f4fb28f4ed3d..91e88f41e2f65 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -86,7 +86,9 @@ category browser-quit-application-granted resource:///modules/Interactions.sys.m
 category browser-quit-application-granted resource:///modules/pagedata/PageDataService.sys.mjs PageDataService.uninit
 category browser-quit-application-granted resource://gre/modules/PageThumbs.sys.mjs PageThumbs.uninit
 category browser-quit-application-granted resource://gre/modules/NewTabUtils.sys.mjs NewTabUtils.uninit
+#ifdef MOZ_NORMANDY
 category browser-quit-application-granted resource://normandy/Normandy.sys.mjs Normandy.uninit
+#endif
 category browser-quit-application-granted resource://gre/modules/RFPHelper.sys.mjs RFPHelper.uninit
 category browser-quit-application-granted resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs ASRouterNewTabHook.destroy
 category browser-quit-application-granted moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.uninit
diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
index eba756f4944b3..cac4fa29e58d2 100644
--- a/browser/components/BrowserContentHandler.sys.mjs
+++ b/browser/components/BrowserContentHandler.sys.mjs
@@ -745,6 +745,7 @@ nsBrowserContentHandler.prototype = {
   // to retrieve any other startup pages that needs to be displayed.
   // See Bug 1642039 for more information.
   getFirstWindowArgs() {
+
     var prefb = Services.prefs;
 
     if (!gFirstWindow) {
@@ -918,6 +919,7 @@ nsBrowserContentHandler.prototype = {
               lazy.LaterRun.enable(lazy.LaterRun.ENABLE_REASON_UPDATE_APPLIED);
             }
 
+
             // Send the update ping to signal that the update was successful.
             // Only do this if the update is installed right now.
             // The following code is ran asynchronously, but we won't await on it
@@ -947,11 +949,17 @@ nsBrowserContentHandler.prototype = {
             break;
           }
           case OVERRIDE_NEW_BUILD_ID: {
+
             // We must spin the events loop because `getFirstWindowArgs` cannot be
             // easily made asynchronous, having too many synchronous callers. Additionally
             // we must know the value of `updateInstalledAtStartup` immediately,
             // in order to properly enable `lazy.LaterRun`, that will be invoked shortly after this.
-            let updateInstalledAtStartup = spinForUpdateInstalledAtStartup();
+            let updateInstalledAtStartup = false;
+            try {
+              updateInstalledAtStartup = spinForUpdateInstalledAtStartup();
+            } catch (e) {
+              // ignore
+            }
 
             if (updateInstalledAtStartup) {
               let handleUpdateSuccessTask = lazy.UpdatePing.handleUpdateSuccess(
@@ -968,6 +976,27 @@ nsBrowserContentHandler.prototype = {
 
               lazy.LaterRun.enable(lazy.LaterRun.ENABLE_REASON_UPDATE_APPLIED);
             }
+            // Open the release notes / What's New Page for build-id-only updates,
+            // regardless of whether the update manager reports it was installed at startup.
+            // Prefer update-provided URL when allowed; fall back to the pref.
+            try {
+              const defaultOverridePage =
+                Services.urlFormatter.formatURLPref("startup.homepage_override_url");
+              const update = spinForLastUpdateInstalled();
+              // getPostUpdateOverridePage enforces actions/policy and can return "" if disabled.
+              overridePage = getPostUpdateOverridePage(update, defaultOverridePage);
+
+              // Fallback to pref-defined page if update actions/policy suppressed WNP.
+              if (!overridePage) {
+                overridePage = defaultOverridePage;
+              }
+
+            } catch (e) {
+              // If update info isn't available, just use the pref directly.
+              overridePage =
+                Services.urlFormatter.formatURLPref("startup.homepage_override_url");
+            }
+            overridePage = overridePage.replace("%OLD_VERSION%", old_mstone);
             break;
           }
         }
@@ -1200,7 +1229,7 @@ nsBrowserContentHandler.prototype = {
       var urlParam = cmdLine.getArgument(urlFlagIdx + 1);
       if (
         cmdLine.length != urlFlagIdx + 2 ||
-        /firefoxurl(-[a-f0-9]+)?:/i.test(urlParam)
+        /waterfoxurl(-[a-f0-9]+)?:/i.test(urlParam)
       ) {
         throw Components.Exception("", Cr.NS_ERROR_ABORT);
       }
@@ -1288,6 +1317,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
       ".xhtml",
       ".svg",
       ".webp",
+      ".jxl",
     ]);
     if (registeredExtensions.has(extension)) {
       counter[extension].add(1);
diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index bde641f7112ad..11ff286e4aaf4 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -80,6 +80,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "resource:///modules/WebProtocolHandlerRegistrar.sys.mjs",
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  WaterfoxGlue: "resource:///modules/WaterfoxGlue.sys.mjs",
 });
 
 XPCOMUtils.defineLazyServiceGetters(lazy, {
@@ -229,6 +230,12 @@ BrowserGlue.prototype = {
   // nsIObserver implementation
   observe: async function BG_observe(subject, topic, data) {
     switch (topic) {
+      case "app-startup":
+        const { BootstrapLoader } = ChromeUtils.importESModule(
+          "resource:///modules/BootstrapLoader.sys.mjs"
+        );
+        lazy.AddonManager.addExternalExtensionLoader(BootstrapLoader);
+      break;
       case "notifications-open-settings":
         this._openPreferences("privacy-permissions");
         break;
@@ -394,6 +401,8 @@ BrowserGlue.prototype = {
     }
 
     lazy.DesktopActorRegistry.init();
+
+    lazy.WaterfoxGlue.init();
   },
 
   // cleanup (called on application shutdown)
@@ -468,6 +477,7 @@ BrowserGlue.prototype = {
     // check for update if our build is old
     if (
       AppConstants.MOZ_UPDATER &&
+      Services.prefs.getBoolPref("app.update.enabled") &&
       Services.prefs.getBoolPref("app.update.checkInstallTime")
     ) {
       let buildID = Services.appinfo.appBuildID;
@@ -870,12 +880,12 @@ BrowserGlue.prototype = {
       if (updateChannel) {
         let uninstalledValue = lazy.WindowsRegistry.readRegKey(
           Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          "Software\\Mozilla\\Firefox",
+          "Software\\BrowserWorks\\Waterfox",
           `Uninstalled-${updateChannel}`
         );
         let removalSuccessful = lazy.WindowsRegistry.removeRegKey(
           Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          "Software\\Mozilla\\Firefox",
+          "Software\\BrowserWorks\\Waterfox",
           `Uninstalled-${updateChannel}`
         );
         if (removalSuccessful && uninstalledValue == "True") {
@@ -1257,14 +1267,14 @@ BrowserGlue.prototype = {
             let { BackgroundUpdate } = ChromeUtils.importESModule(
               "resource://gre/modules/BackgroundUpdate.sys.mjs"
             );
-            try {
-              await BackgroundUpdate.scheduleFirefoxMessagingSystemTargetingSnapshotting();
-            } catch (e) {
-              console.error(
-                "There was an error scheduling Firefox Messaging System targeting snapshotting: ",
-                e
-              );
-            }
+            // try {
+            //   await BackgroundUpdate.scheduleFirefoxMessagingSystemTargetingSnapshotting();
+            // } catch (e) {
+            //   console.error(
+            //     "There was an error scheduling Firefox Messaging System targeting snapshotting: ",
+            //     e
+            //   );
+            // }
             await BackgroundUpdate.maybeScheduleBackgroundUpdateTask();
           }
         },
@@ -1391,6 +1401,11 @@ BrowserGlue.prototype = {
         lazy.RemoteSecuritySettings.init();
       },
 
+      function RemoteSettingsPollChanges() {
+        // Support clients that use the "sync" event or "remote-settings:changes-poll-end".
+        lazy.RemoteSettings.pollChanges({ trigger: "timer" });
+      },
+
       function searchBackgroundChecks() {
         Services.search.runBackgroundChecks();
       },
@@ -1522,6 +1537,18 @@ BrowserGlue.prototype = {
       aQuitType = "quit";
     }
 
+    let restoreSession;
+    let startupPref = Services.prefs.getIntPref("browser.startup.page");
+
+    // If we are set to anything other than restore session,
+    if (startupPref != 3) {
+      console.log("Value of: " + startupPref);
+      restoreSession = { value: false };
+    } else {
+      console.log("Value of: " + startupPref);
+      restoreSession = { value: true };
+    }
+
     let win = lazy.BrowserWindowTracker.getTopWindow();
 
     // Our prompt for quitting is most important, so replace others.
@@ -1575,11 +1602,14 @@ BrowserGlue.prototype = {
       checkboxLabelId = "tabbrowser-ask-close-tabs-checkbox";
     }
 
-    const [title, quitButtonLabel, checkboxLabel] =
+    let checkboxLabelId2 = "tabbrowser-confirm-session-restore-checkbox";
+
+    const [title, quitButtonLabel, checkboxLabel, checkboxLabel2] =
       win.gBrowser.tabLocalization.formatMessagesSync([
         titleId,
         quitButtonLabelId,
         checkboxLabelId,
+        checkboxLabelId2,
       ]);
 
     // Only format the "close current tab" message if needed
@@ -1611,7 +1641,7 @@ BrowserGlue.prototype = {
     }
 
     // buttonPressed will be 0 for close all, 1 for cancel (don't close/quit), 2 for close current tab
-    let buttonPressed = Services.prompt.confirmEx(
+    let buttonPressed = Services.prompt.confirmEx2(
       win,
       title.value,
       null,
@@ -1620,7 +1650,9 @@ BrowserGlue.prototype = {
       null,
       showCloseCurrentTabOption ? closeTabButtonLabel.value : null,
       checkboxLabel.value,
-      warnOnClose
+      warnOnClose,
+      checkboxLabel2.value,
+      restoreSession
     );
 
     // If the user has unticked the box, and has confirmed closing, stop showing
@@ -1638,6 +1670,18 @@ BrowserGlue.prototype = {
       win.gBrowser.removeTab(win.gBrowser.selectedTab);
     }
 
+    // If we are set to anything other than restore session,
+    // leave its value.
+    if (buttonPressed == 0) {
+      if (!restoreSession.value) {
+        if (startupPref === 3) {
+          Services.prefs.setIntPref("browser.startup.page", 1);
+        }
+      } else if (restoreSession.value) {
+        Services.prefs.setIntPref("browser.startup.page", 3);
+      }
+    }
+
     this._quitSource = "unknown";
 
     aCancelQuit.data = buttonPressed != 0;
diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
index a2b9a3c3bd60b..0e285670ff8db 100644
--- a/browser/components/aboutlogins/content/aboutLogins.html
+++ b/browser/components/aboutlogins/content/aboutLogins.html
@@ -123,7 +123,7 @@ <h1 class="title" id="title"></h1>
           <span class="error-title" data-l10n-id="about-logins-import-dialog-error-unable-to-read-title"></span>
           <span class="error-description" data-l10n-id="about-logins-import-dialog-error-unable-to-read-description"></span>
           <span class="no-logins" data-l10n-id="about-logins-import-dialog-error-no-logins-imported"></span>
-          <a class="error-learn-more-link" href="https://support.mozilla.org/kb/import-login-data-file"
+          <a class="error-learn-more-link" href="https://www.waterfox.com/support/import-login-data-file"
             data-l10n-id="about-logins-import-dialog-error-learn-more" target="_blank" rel="noreferrer"></a>
         </div>
         <moz-button-group slot="buttons" class="buttons">
diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.html b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
index 6a6932502d8eb..f562f1c88efd0 100644
--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.html
+++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
@@ -40,7 +40,7 @@
         <h2 data-l10n-id="about-logins-import-report-title"></h2>
         <div data-l10n-id="about-logins-import-report-description2"></div>
         <a
-          href="https://support.mozilla.org/kb/import-login-data-file"
+          href="https://www.waterfox.com/support/import-login-data-file"
           class="about-logins-import-report-learn-more"
           data-l10n-id="about-logins-import-dialog-error-learn-more"
           target="_blank"
diff --git a/browser/components/aboutwelcome/actors/AboutWelcomeChild.sys.mjs b/browser/components/aboutwelcome/actors/AboutWelcomeChild.sys.mjs
index 9b3557ef028d1..fbe51aa552be2 100644
--- a/browser/components/aboutwelcome/actors/AboutWelcomeChild.sys.mjs
+++ b/browser/components/aboutwelcome/actors/AboutWelcomeChild.sys.mjs
@@ -9,6 +9,8 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AboutWelcomeDefaults:
     "resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs",
+  WaterfoxWelcomeConfig:
+    "resource:///modules/aboutwelcome/WaterfoxWelcomeConfig.sys.mjs",
   EnrollmentType: "resource://nimbus/ExperimentAPI.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
 });
@@ -196,18 +198,19 @@ export class AboutWelcomeChild extends JSWindowActorChild {
   async getAWContent() {
     let attributionData = await this.sendQuery("AWPage:GET_ATTRIBUTION_DATA");
 
-    let experimentMetadata =
-      lazy.NimbusFeatures.aboutwelcome.getEnrollmentMetadata(
-        lazy.EnrollmentType.EXPERIMENT
-      ) ?? {};
+    // Use Waterfox custom configuration instead of Nimbus if enabled
+    let experimentMetadata = {};
+    let featureConfig = {};
 
-    lazy.log.debug(
-      `Loading about:welcome with ${
-        experimentMetadata?.slug ?? "no"
-      } experiment`
-    );
+    if (lazy.WaterfoxWelcomeConfig.isEnabled()) {
+      experimentMetadata = lazy.WaterfoxWelcomeConfig.getEnrollmentMetadata();
+      featureConfig = lazy.WaterfoxWelcomeConfig.getAllVariables();
+
+      lazy.log.debug(
+        `Loading about:welcome with Waterfox custom configuration`
+      );
+    }
 
-    let featureConfig = lazy.NimbusFeatures.aboutwelcome.getAllVariables();
     featureConfig.needDefault = await this.sendQuery("AWPage:NEED_DEFAULT");
     featureConfig.needPin = await this.sendQuery("AWPage:DOES_APP_NEED_PIN");
     if (featureConfig.languageMismatchEnabled) {
@@ -216,7 +219,7 @@ export class AboutWelcomeChild extends JSWindowActorChild {
       );
     }
 
-    // FeatureConfig (from experiments) has higher precendence
+    // FeatureConfig (from experiments or Waterfox config) has higher precedence
     // to defaults. But the `screens` property isn't defined we shouldn't
     // override the default with `null`
     let defaults = lazy.AboutWelcomeDefaults.getDefaults();
diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css
index 7263a35504fc6..a47063870192c 100644
--- a/browser/components/aboutwelcome/content/aboutwelcome.css
+++ b/browser/components/aboutwelcome/content/aboutwelcome.css
@@ -994,7 +994,9 @@ html {
   min-width: fit-content;
 }
 .welcome-container .onboardingContainer:has(.addons-picker-container) {
-  min-height: 1080px;
+  min-height: 100vh;
+  max-height: 100vh;
+  overflow-y: auto;
 }
 
 .onboardingContainer {
diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
index 3bf3e12062a20..c809f01c74aae 100644
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
+++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
@@ -214,7 +214,7 @@ const BASE_MESSAGES = () => [
             },
             progress_bar: "true",
             background:
-              "url('chrome://activity-stream/content/data/content/assets/mr-settodefault.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
+              "url('chrome://onboarding/content/assets/loving-doodle.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
             logo: {},
             title: {
               string_id: "mr2022-onboarding-set-default-title",
@@ -295,7 +295,7 @@ const BASE_MESSAGES = () => [
                 "onboarding-mobile-download-security-and-privacy-subtitle",
             },
             hero_image: {
-              url: "chrome://activity-stream/content/data/content/assets/mobile-download-qr-existing-user.svg",
+              url: "chrome://onboarding/content/assets/qr-play-google-com.svg",
             },
             cta_paragraph: {
               text: {
@@ -305,7 +305,7 @@ const BASE_MESSAGES = () => [
               action: {
                 type: "OPEN_URL",
                 data: {
-                  args: "https://www.mozilla.org/firefox/mobile/get-app/?utm_medium=firefox-desktop&utm_source=onboarding-modal&utm_campaign=mr2022&utm_content=existing-global",
+                  args: "https://play.google.com/store/apps/details?id=net.waterfox.android.release",
                   where: "tab",
                 },
               },
@@ -432,7 +432,7 @@ const BASE_MESSAGES = () => [
               string_id: "mr2022-onboarding-gratitude-image-alt",
             },
             background:
-              "url('chrome://activity-stream/content/data/content/assets/mr-gratitude.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
+              "url('chrome://onboarding/content/assets/plant-doodle.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
             logo: {},
             title: {
               string_id: "mr2022-onboarding-gratitude-title",
diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
index 87bf515dee869..cd20af9a7fa73 100644
--- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
+++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
@@ -229,7 +229,10 @@ export var ToolbarContextMenu = {
           );
           menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
           if (popup.id != "toolbar-context-menu") {
-            menuItem.setAttribute("key", toolbar.getAttribute("key"));
+            let keyId = toolbar.getAttribute("key");
+            if (keyId) {
+              menuItem.setAttribute("key", keyId);
+            }
           }
 
           popup.insertBefore(menuItem, firstMenuItem);
diff --git a/browser/components/extensions/ext-browser.json b/browser/components/extensions/ext-browser.json
index d5f3e0a500f2e..4a2bd9a13cea5 100644
--- a/browser/components/extensions/ext-browser.json
+++ b/browser/components/extensions/ext-browser.json
@@ -94,6 +94,12 @@
     "scopes": ["addon_parent"],
     "paths": [["identity"]]
   },
+  "legacy": {
+    "url": "chrome://browser/content/parent/ext-legacy.js",
+    "schema": "chrome://browser/content/schemas/legacy.json",
+    "scopes": ["addon_parent"],
+    "manifest": ["legacy"]
+  },
   "menusChild": {
     "schema": "chrome://browser/content/schemas/menus_child.json",
     "scopes": ["addon_child", "content_child", "devtools_child"]
diff --git a/browser/components/extensions/jar.mn b/browser/components/extensions/jar.mn
index 1bb336b45b908..1e2f04caeb489 100644
--- a/browser/components/extensions/jar.mn
+++ b/browser/components/extensions/jar.mn
@@ -17,6 +17,7 @@ browser.jar:
     content/browser/parent/ext-devtools-panels.js (parent/ext-devtools-panels.js)
     content/browser/parent/ext-find.js (parent/ext-find.js)
     content/browser/parent/ext-history.js (parent/ext-history.js)
+	content/browser/parent/ext-legacy.js (parent/ext-legacy.js)
     content/browser/parent/ext-menus.js (parent/ext-menus.js)
     content/browser/parent/ext-normandyAddonStudy.js (parent/ext-normandyAddonStudy.js)
     content/browser/parent/ext-omnibox.js (parent/ext-omnibox.js)
diff --git a/browser/components/extensions/parent/ext-legacy.js b/browser/components/extensions/parent/ext-legacy.js
new file mode 100644
index 0000000000000..4c7be3334752c
--- /dev/null
+++ b/browser/components/extensions/parent/ext-legacy.js
@@ -0,0 +1,467 @@
+/* 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/. */
+
+ChromeUtils.defineESModuleGetters(this, {
+  ChromeManifest: "resource:///modules/ChromeManifest.sys.mjs",
+  ExtensionSupport: "resource:///modules/ExtensionSupport.sys.mjs",
+  Overlays: "resource:///modules/Overlays.sys.mjs",
+  XPIExports: "resource://gre/modules/addons/XPIExports.sys.mjs",
+});
+
+Cu.importGlobalProperties(["fetch"]);
+
+var { XPCOMUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/XPCOMUtils.sys.mjs"
+);
+var { ConsoleAPI } = ChromeUtils.importESModule(
+  "resource://gre/modules/Console.sys.mjs"
+);
+
+XPCOMUtils.defineLazyGetter(this, "BOOTSTRAP_REASONS", () => {
+  const { XPIExports } = ChromeUtils.importESModule(
+    "resource://gre/modules/addons/XPIExports.sys.mjs"
+  );
+  return XPIExports.XPIProvider.BOOTSTRAP_REASONS;
+});
+
+const { Log } = ChromeUtils.importESModule(
+  "resource://gre/modules/Log.sys.mjs"
+);
+var logger = Log.repository.getLogger("addons.bootstrap");
+
+let bootstrapScopes = new Map();
+let cachedParams = new Map();
+
+Services.obs.addObserver(() => {
+  for (let [id, scope] of bootstrapScopes.entries()) {
+    if (ExtensionSupport.loadedBootstrapExtensions.has(id)) {
+      scope.shutdown(
+        { ...cachedParams.get(id) },
+        BOOTSTRAP_REASONS.APP_SHUTDOWN
+      );
+    }
+  }
+}, "quit-application-granted");
+
+var { ExtensionError } = ExtensionUtils;
+
+this.legacy = class extends ExtensionAPI {
+  async onManifestEntry(entryName) {
+    if (this.extension.manifest.legacy) {
+      if (this.extension.manifest.legacy.type == "bootstrap") {
+        await this.registerBootstrapped();
+      } else {
+        await this.registerNonBootstrapped();
+      }
+    }
+  }
+
+  // This function is for non-bootstrapped add-ons.
+
+  async registerNonBootstrapped() {
+    this.extension.legacyLoaded = true;
+
+    let state = {
+      id: this.extension.id,
+      pendingOperation: null,
+      version: this.extension.version,
+    };
+    if (ExtensionSupport.loadedLegacyExtensions.has(this.extension.id)) {
+      state = ExtensionSupport.loadedLegacyExtensions.get(this.extension.id);
+      let versionComparison = Services.vc.compare(
+        this.extension.version,
+        state.version
+      );
+      if (versionComparison != 0) {
+        if (versionComparison > 0) {
+          state.pendingOperation = "upgrade";
+          ExtensionSupport.loadedLegacyExtensions.notifyObservers(state);
+        } else if (versionComparison < 0) {
+          state.pendingOperation = "downgrade";
+          ExtensionSupport.loadedLegacyExtensions.notifyObservers(state);
+        }
+
+        // Forget any cached files we might've had from another version of this extension.
+        Services.obs.notifyObservers(null, "startupcache-invalidate");
+      }
+      console.log(
+        `Legacy WebExtension ${this.extension.id} has already been loaded in this run, refusing to do so again. Please restart.`
+      );
+      return;
+    }
+
+    ExtensionSupport.loadedLegacyExtensions.set(this.extension.id, state);
+    if (this.extension.startupReason == "ADDON_INSTALL") {
+      // Usually, sideloaded extensions are disabled when they first appear,
+      // but to run calendar tests, we disable this.
+      let scope = XPIExports.XPIInternal.XPIStates.findAddon(this.extension.id).location
+        .scope;
+      let autoDisableScopes = Services.prefs.getIntPref(
+        "extensions.autoDisableScopes"
+      );
+
+      // If the extension was just installed from the distribution folder,
+      // it's in the profile extensions folder. We don't want to disable it.
+      let isDistroAddon = Services.prefs.getBoolPref(
+        "extensions.installedDistroAddon." + this.extension.id,
+        false
+      );
+
+      if (!isDistroAddon && scope & autoDisableScopes) {
+        state.pendingOperation = "install";
+        console.log(
+          `Legacy WebExtension ${this.extension.id} loading for other reason than startup (${this.extension.startupReason}), refusing to load immediately.`
+        );
+        ExtensionSupport.loadedLegacyExtensions.notifyObservers(state);
+
+        // Forget any cached files we might've had if this extension was previously installed.
+        Services.obs.notifyObservers(null, "startupcache-invalidate");
+        return;
+      }
+    }
+    if (this.extension.startupReason == "ADDON_ENABLE") {
+      state.pendingOperation = "enable";
+      console.log(
+        `Legacy WebExtension ${this.extension.id} loading for other reason than startup (${this.extension.startupReason}), refusing to load immediately.`
+      );
+      ExtensionSupport.loadedLegacyExtensions.notifyObservers(state);
+      return;
+    }
+
+    let extensionRoot;
+    if (this.extension.rootURI instanceof Ci.nsIJARURI) {
+      extensionRoot = this.extension.rootURI.JARFile.QueryInterface(
+        Ci.nsIFileURL
+      ).file;
+      console.log("Loading packed extension from", extensionRoot.path);
+    } else {
+      extensionRoot = this.extension.rootURI.QueryInterface(Ci.nsIFileURL).file;
+      console.log("Loading unpacked extension from", extensionRoot.path);
+    }
+
+    // Have Gecko do as much loading as is still possible
+    try {
+      Components.manager.addBootstrappedManifestLocation(extensionRoot);
+    } catch (e) {
+      throw new ExtensionError(e.message, e.fileName, e.lineNumber);
+    }
+
+    // Load chrome.manifest
+    let appinfo = Services.appinfo;
+    let options = {
+      application: appinfo.ID,
+      appversion: appinfo.version,
+      platformversion: appinfo.platformVersion,
+      os: appinfo.OS,
+      osversion: Services.sysinfo.getProperty("version"),
+      abi: appinfo.XPCOMABI,
+    };
+    let loader = async filename => {
+      let url = this.extension.getURL(filename);
+      try {
+        const response = await fetch(url);
+        if (!response.ok) {
+          throw new Error(`Failed to fetch ${filename}: ${response.status}`);
+        }
+        return await response.text();
+      } catch (error) {
+        console.error(`Error loading ${filename}:`, error);
+        throw error;
+      }
+    };
+    let chromeManifest = new ChromeManifest(loader, options);
+    await chromeManifest.parse("chrome.manifest");
+
+    // Load preference files
+    console.log("Loading add-on preferences from ", extensionRoot.path);
+    await ExtensionSupport.loadAddonPrefs(extensionRoot);
+
+    // Fire profile-after-change notifications, because we are past that event by now
+    console.log("Firing profile-after-change listeners for", this.extension.id);
+    let profileAfterChange = chromeManifest.category.get(
+      "profile-after-change"
+    );
+    for (let contractid of profileAfterChange.values()) {
+      let service = contractid.startsWith("service,");
+      let instance;
+      try {
+        if (service) {
+          instance = Cc[contractid.slice(8)].getService(Ci.nsIObserver);
+        } else {
+          instance = Cc[contractid].createInstance(Ci.nsIObserver);
+        }
+
+        instance.observe(null, "profile-after-change", null);
+      } catch (e) {
+        console.error(
+          "Error firing profile-after-change listener for",
+          contractid,
+          e
+        );
+      }
+    }
+
+    // Overlays.load must only be called once per window per extension.
+    // We use this WeakSet to remember all windows we've already seen.
+    let seenDocuments = new WeakSet();
+
+    // Listen for new windows to overlay.
+    let documentObserver = {
+      observe(doc) {
+        if (
+          ExtensionCommon.instanceOf(doc, "HTMLDocument") &&
+          !seenDocuments.has(doc)
+        ) {
+          seenDocuments.add(doc);
+          Overlays.load(chromeManifest, doc.defaultView);
+        }
+      },
+    };
+    Services.obs.addObserver(documentObserver, "chrome-document-interactive");
+
+    // Add overlays to all existing windows.
+    getAllWindows().forEach(win => {
+      if (
+        ["interactive", "complete"].includes(win.document.readyState) &&
+        !seenDocuments.has(win.document)
+      ) {
+        seenDocuments.add(win.document);
+        Overlays.load(chromeManifest, win);
+      }
+    });
+
+    this.extension.callOnClose({
+      close: () => {
+        Services.obs.removeObserver(
+          documentObserver,
+          "chrome-document-interactive"
+        );
+      },
+    });
+  }
+
+  // The following functions are for bootstrapped add-ons.
+
+  async registerBootstrapped() {
+    try {
+      let oldParams = cachedParams.get(this.extension.id);
+      let params = {
+        id: this.extension.id,
+        version: this.extension.version,
+        resourceURI: Services.io.newURI(this.extension.resourceURL),
+        installPath: this.extensionFile.path,
+      };
+      cachedParams.set(this.extension.id, { ...params });
+
+      if (
+        oldParams &&
+        ["ADDON_UPGRADE", "ADDON_DOWNGRADE"].includes(
+          this.extension.startupReason
+        )
+      ) {
+        params.oldVersion = oldParams.version;
+      }
+
+      let scope = await this.loadScope();
+      bootstrapScopes.set(this.extension.id, scope);
+
+      if (
+        ["ADDON_INSTALL", "ADDON_UPGRADE", "ADDON_DOWNGRADE"].includes(
+          this.extension.startupReason
+        )
+      ) {
+        scope.install(params, BOOTSTRAP_REASONS[this.extension.startupReason]);
+      }
+      scope.startup(params, BOOTSTRAP_REASONS[this.extension.startupReason]);
+      ExtensionSupport.loadedBootstrapExtensions.add(this.extension.id);
+    } catch (error) {
+      logger.error(`Failed to register bootstrapped extension ${this.extension.id}:`, error);
+      throw error;
+    }
+  }
+
+  static onDisable(id) {
+    if (bootstrapScopes.has(id)) {
+      bootstrapScopes
+        .get(id)
+        .shutdown({ ...cachedParams.get(id) }, BOOTSTRAP_REASONS.ADDON_DISABLE);
+      ExtensionSupport.loadedBootstrapExtensions.delete(id);
+    }
+  }
+
+  static onUpdate(id, manifest) {
+    if (bootstrapScopes.has(id)) {
+      let params = {
+        ...cachedParams.get(id),
+        newVersion: manifest.version,
+      };
+      let reason = BOOTSTRAP_REASONS.ADDON_UPGRADE;
+      if (Services.vc.compare(params.newVersion, params.version) < 0) {
+        reason = BOOTSTRAP_REASONS.ADDON_DOWNGRADE;
+      }
+
+      let scope = bootstrapScopes.get(id);
+      scope.shutdown(params, reason);
+      scope.uninstall(params, reason);
+      ExtensionSupport.loadedBootstrapExtensions.delete(id);
+      bootstrapScopes.delete(id);
+    }
+  }
+
+  static onUninstall(id) {
+    if (bootstrapScopes.has(id)) {
+      bootstrapScopes
+        .get(id)
+        .uninstall(
+          { ...cachedParams.get(id) },
+          BOOTSTRAP_REASONS.ADDON_UNINSTALL
+        );
+      bootstrapScopes.delete(id);
+    }
+  }
+
+  get extensionFile() {
+    let uri = Services.io.newURI(this.extension.resourceURL);
+    if (uri instanceof Ci.nsIJARURI) {
+      uri = uri.QueryInterface(Ci.nsIJARURI).JARFile;
+    }
+    return uri.QueryInterface(Ci.nsIFileURL).file;
+  }
+
+  loadScope() {
+    let { extension } = this;
+    let file = this.extensionFile;
+    let uri = this.extension.getURL("bootstrap.js");
+    let principal = Services.scriptSecurityManager.getSystemPrincipal();
+
+    let sandbox = new Cu.Sandbox(principal, {
+      sandboxName: uri,
+      addonId: this.extension.id,
+      wantGlobalProperties: ["ChromeUtils"],
+      metadata: { addonID: this.extension.id, URI: uri },
+    });
+
+    try {
+      Object.assign(sandbox, BOOTSTRAP_REASONS);
+
+      ChromeUtils.defineLazyGetter(
+        sandbox,
+        "console",
+        () => new ConsoleAPI({ consoleID: `addon/${this.extension.id}` })
+      );
+
+      Services.scriptloader.loadSubScript(uri, sandbox);
+    } catch (e) {
+      logger.warn(`Error loading bootstrap.js for ${this.extension.id}`, e);
+    }
+
+    function findMethod(name) {
+      if (sandbox[name] && typeof sandbox[name] === 'function') {
+        return sandbox[name];
+      }
+
+      try {
+        let method = Cu.evalInSandbox(name, sandbox);
+        if (typeof method === 'function') {
+          return method;
+        }
+      } catch (err) {
+        // Method not found, will return default function below
+      }
+
+      return () => {
+        logger.warn(
+          `Add-on ${extension.id} is missing bootstrap method ${name}`
+        );
+      };
+    }
+
+    let install = findMethod("install");
+    let uninstall = findMethod("uninstall");
+    let startup = findMethod("startup");
+    let shutdown = findMethod("shutdown");
+
+    return {
+      install(...args) {
+        try {
+          install(...args);
+        } catch (ex) {
+          logger.error(
+            `Exception running bootstrap method install on ${extension.id}`,
+            ex
+          );
+        }
+      },
+
+      uninstall(...args) {
+        try {
+          uninstall(...args);
+        } catch (ex) {
+          logger.error(
+            `Exception running bootstrap method uninstall on ${extension.id}`,
+            ex
+          );
+        } finally {
+          // Forget any cached files we might've had from this extension.
+          Services.obs.notifyObservers(null, "startupcache-invalidate");
+        }
+      },
+
+      startup(...args) {
+        logger.debug(`Registering manifest for ${file.path}\n`);
+        Components.manager.addBootstrappedManifestLocation(file);
+        try {
+          startup(...args);
+        } catch (ex) {
+          logger.error(
+            `Exception running bootstrap method startup on ${extension.id}`,
+            ex
+          );
+        }
+      },
+
+      shutdown(data, reason) {
+        try {
+          shutdown(data, reason);
+        } catch (ex) {
+          logger.error(
+            `Exception running bootstrap method shutdown on ${extension.id}`,
+            ex
+          );
+        } finally {
+          if (reason != BOOTSTRAP_REASONS.APP_SHUTDOWN) {
+            logger.debug(`Removing manifest for ${file.path}\n`);
+            Components.manager.removeBootstrappedManifestLocation(file);
+          }
+        }
+      },
+    };
+  }
+};
+
+function getAllWindows() {
+  let domWindows = [];
+
+  function getChildDocShells(parentDocShell) {
+    let docShells = parentDocShell.getAllDocShellsInSubtree(
+      Ci.nsIDocShellTreeItem.typeAll,
+      Ci.nsIDocShell.ENUMERATE_FORWARDS
+    );
+
+    for (let docShell of docShells) {
+      docShell
+        .QueryInterface(Ci.nsIInterfaceRequestor)
+        .getInterface(Ci.nsIWebProgress);
+      domWindows.push(docShell.domWindow);
+    }
+  }
+
+  for (let win of Services.ww.getWindowEnumerator()) {
+    let parentDocShell = win
+      .getInterface(Ci.nsIWebNavigation)
+      .QueryInterface(Ci.nsIDocShell);
+    getChildDocShells(parentDocShell);
+  }
+  return domWindows;
+}
diff --git a/browser/components/extensions/schemas/jar.mn b/browser/components/extensions/schemas/jar.mn
index 12428cda2619f..7077bbdbfd61e 100644
--- a/browser/components/extensions/schemas/jar.mn
+++ b/browser/components/extensions/schemas/jar.mn
@@ -12,6 +12,7 @@ browser.jar:
     content/browser/schemas/devtools_panels.json
     content/browser/schemas/find.json
     content/browser/schemas/history.json
+	content/browser/schemas/legacy.json
     content/browser/schemas/menus.json
     content/browser/schemas/menus_child.json
     content/browser/schemas/normandyAddonStudy.json
diff --git a/browser/components/extensions/schemas/legacy.json b/browser/components/extensions/schemas/legacy.json
new file mode 100644
index 0000000000000..825e324096bee
--- /dev/null
+++ b/browser/components/extensions/schemas/legacy.json
@@ -0,0 +1,43 @@
+[
+  {
+    "namespace": "manifest",
+    "types": [
+      {
+        "$extend": "WebExtensionManifest",
+        "properties": {
+          "legacy": {
+            "optional": true,
+            "choices": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": ["xul", "bootstrap"],
+                    "optional": true
+                  },
+                  "options": {
+                    "type": "object",
+                    "properties": {
+                      "page": {
+                        "type": "string"
+                      },
+                      "open_in_tab": {
+                        "type": "boolean",
+                        "optional": true
+                      }
+                    },
+                    "optional": true
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/browser/components/extensions/test/xpcshell/head.js b/browser/components/extensions/test/xpcshell/head.js
index 9ac33637ed0fd..3f0cbc4530689 100644
--- a/browser/components/extensions/test/xpcshell/head.js
+++ b/browser/components/extensions/test/xpcshell/head.js
@@ -10,8 +10,10 @@ const { AppConstants } = ChromeUtils.importESModule(
 ChromeUtils.defineESModuleGetters(this, {
   Extension: "resource://gre/modules/Extension.sys.mjs",
   ExtensionData: "resource://gre/modules/Extension.sys.mjs",
+
   ExtensionTestUtils:
     "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
+
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   HttpServer: "resource://testing-common/httpd.sys.mjs",
   NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
diff --git a/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js b/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
index 8c713191ccd7d..a347202955e0a 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
@@ -1,300 +1,298 @@
-"use strict";
-
 ChromeUtils.defineESModuleGetters(this, {
-  MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
-  ctypes: "resource://gre/modules/ctypes.sys.mjs",
+	MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
+	ctypes: "resource://gre/modules/ctypes.sys.mjs",
 });
 
 do_get_profile();
 
 let tmpDir;
 let baseDir;
-let slug =
-  AppConstants.platform === "linux" ? "pkcs11-modules" : "PKCS11Modules";
+const slug =
+	AppConstants.platform === "linux" ? "pkcs11-modules" : "PKCS11Modules";
 
 add_task(async function setupTest() {
-  tmpDir = await IOUtils.createUniqueDirectory(
-    Services.dirsvc.get("TmpD", Ci.nsIFile).path,
-    "PKCS11"
-  );
+	tmpDir = await IOUtils.createUniqueDirectory(
+		Services.dirsvc.get("TmpD", Ci.nsIFile).path,
+		"PKCS11",
+	);
 
-  baseDir = PathUtils.join(tmpDir, slug);
-  await IOUtils.makeDirectory(baseDir);
+	baseDir = PathUtils.join(tmpDir, slug);
+	await IOUtils.makeDirectory(baseDir);
 });
 
 registerCleanupFunction(async () => {
-  await IOUtils.remove(tmpDir, { recursive: true });
+	await IOUtils.remove(tmpDir, { recursive: true });
 });
 
 const testmodule = PathUtils.join(
-  PathUtils.parent(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, 5),
-  "security",
-  "manager",
-  "ssl",
-  "tests",
-  "unit",
-  "pkcs11testmodule",
-  ctypes.libraryName("pkcs11testmodule")
+	PathUtils.parent(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, 5),
+	"security",
+	"manager",
+	"ssl",
+	"tests",
+	"unit",
+	"pkcs11testmodule",
+	ctypes.libraryName("pkcs11testmodule"),
 );
 
 // This function was inspired by the native messaging test under
 // toolkit/components/extensions
 
 async function setupManifests(modules) {
-  async function writeManifest(module) {
-    let manifest = {
-      name: module.name,
-      description: module.description,
-      path: module.path,
-      type: "pkcs11",
-      allowed_extensions: [module.id],
-    };
+	async function writeManifest(module) {
+		const manifest = {
+			name: module.name,
+			description: module.description,
+			path: module.path,
+			type: "pkcs11",
+			allowed_extensions: [module.id],
+		};
 
-    let manifestPath = PathUtils.join(baseDir, `${module.name}.json`);
-    await IOUtils.writeJSON(manifestPath, manifest);
+		const manifestPath = PathUtils.join(baseDir, `${module.name}.json`);
+		await IOUtils.writeJSON(manifestPath, manifest);
 
-    return manifestPath;
-  }
+		return manifestPath;
+	}
 
-  switch (AppConstants.platform) {
-    case "macosx":
-    case "linux":
-      let dirProvider = {
-        getFile(property) {
-          if (
-            property == "XREUserNativeManifests" ||
-            property == "XRESysNativeManifests"
-          ) {
-            return new FileUtils.File(tmpDir);
-          }
-          return null;
-        },
-      };
+	switch (AppConstants.platform) {
+		case "macosx":
+		case "linux":
+			const dirProvider = {
+				getFile(property) {
+					if (
+						property == "XREUserNativeManifests" ||
+						property == "XRESysNativeManifests"
+					) {
+						return new FileUtils.File(tmpDir);
+					}
+					return null;
+				},
+			};
 
-      Services.dirsvc.registerProvider(dirProvider);
-      registerCleanupFunction(() => {
-        Services.dirsvc.unregisterProvider(dirProvider);
-      });
+			Services.dirsvc.registerProvider(dirProvider);
+			registerCleanupFunction(() => {
+				Services.dirsvc.unregisterProvider(dirProvider);
+			});
 
-      for (let module of modules) {
-        await writeManifest(module);
-      }
-      break;
+			for (const module of modules) {
+				await writeManifest(module);
+			}
+			break;
 
-    case "win":
-      const REGKEY = String.raw`Software\Mozilla\PKCS11Modules`;
+		case "win":
+			const REGKEY = String.raw`Software\BrowserWorks\PKCS11Modules`;
 
-      let registry = new MockRegistry();
-      registerCleanupFunction(() => {
-        registry.shutdown();
-      });
+			const registry = new MockRegistry();
+			registerCleanupFunction(() => {
+				registry.shutdown();
+			});
 
-      for (let module of modules) {
-        let manifestPath = await writeManifest(module);
-        registry.setValue(
-          Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-          `${REGKEY}\\${module.name}`,
-          "",
-          manifestPath
-        );
-      }
-      break;
+			for (const module of modules) {
+				const manifestPath = await writeManifest(module);
+				registry.setValue(
+					Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
+					`${REGKEY}\\${module.name}`,
+					"",
+					manifestPath,
+				);
+			}
+			break;
 
-    default:
-      ok(
-        false,
-        `Loading of PKCS#11 modules is not supported on ${AppConstants.platform}`
-      );
-  }
+		default:
+			ok(
+				false,
+				`Loading of PKCS#11 modules is not supported on ${AppConstants.platform}`,
+			);
+	}
 }
 
 add_task(async function test_pkcs11() {
-  async function background() {
-    try {
-      const { os } = await browser.runtime.getPlatformInfo();
-      if (os !== "win") {
-        // Expect this call to not throw (explicitly cover regression fixed in Bug 1759162).
-        let isInstalledNonAbsolute = await browser.pkcs11.isModuleInstalled(
-          "testmoduleNonAbsolutePath"
-        );
-        browser.test.assertFalse(
-          isInstalledNonAbsolute,
-          "PKCS#11 module with non absolute path expected to not be installed"
-        );
-      }
-      let isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertFalse(
-        isInstalled,
-        "PKCS#11 module is not installed before we install it"
-      );
-      await browser.pkcs11.installModule("testmodule", 0);
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertTrue(
-        isInstalled,
-        "PKCS#11 module is installed after we install it"
-      );
-      let slots = await browser.pkcs11.getModuleSlots("testmodule");
-      browser.test.assertEq(
-        "Test PKCS11 Slot",
-        slots[0].name,
-        "The first slot name matches the expected name"
-      );
-      browser.test.assertEq(
-        "Test PKCS11 Slot ไบŒ",
-        slots[1].name,
-        "The second slot name matches the expected name"
-      );
-      browser.test.assertTrue(slots[1].token, "The second slot has a token");
-      browser.test.assertFalse(slots[2].token, "The third slot has no token");
-      browser.test.assertEq(
-        "Test PKCS11 Tokeรฑ 2 Label",
-        slots[1].token.name,
-        "The token name matches the expected name"
-      );
-      browser.test.assertEq(
-        "Test PKCS11 Manufacturer ID",
-        slots[1].token.manufacturer,
-        "The token manufacturer matches the expected manufacturer"
-      );
-      browser.test.assertEq(
-        "0.0",
-        slots[1].token.HWVersion,
-        "The token hardware version matches the expected version"
-      );
-      browser.test.assertEq(
-        "0.0",
-        slots[1].token.FWVersion,
-        "The token firmware version matches the expected version"
-      );
-      browser.test.assertEq(
-        "",
-        slots[1].token.serial,
-        "The token has no serial number"
-      );
-      browser.test.assertFalse(
-        slots[1].token.isLoggedIn,
-        "The token is not logged in"
-      );
-      await browser.pkcs11.uninstallModule("testmodule");
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertFalse(
-        isInstalled,
-        "PKCS#11 module is no longer installed after we uninstall it"
-      );
-      await browser.pkcs11.installModule("testmodule");
-      isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
-      browser.test.assertTrue(
-        isInstalled,
-        "Installing the PKCS#11 module without flags parameter succeeds"
-      );
-      await browser.pkcs11.uninstallModule("testmodule");
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("nonexistingmodule"),
-        /No such PKCS#11 module nonexistingmodule/,
-        "We cannot access modules if no JSON file exists"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("othermodule"),
-        /No such PKCS#11 module othermodule/,
-        "We cannot access modules if we're not listed in the module's manifest file's allowed_extensions key"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("internalmodule"),
-        /No such PKCS#11 module internalmodule/,
-        "We cannot uninstall the NSS Builtin Roots Module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.installModule("osclientcerts", 0),
-        /No such PKCS#11 module osclientcerts/,
-        "installModule should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "uninstallModule should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "isModuleLoaded should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.getModuleSlots("osclientcerts"),
-        /No such PKCS#11 module osclientcerts/,
-        "getModuleSlots should not work on the built-in osclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.installModule("ipcclientcerts", 0),
-        /No such PKCS#11 module ipcclientcerts/,
-        "installModule should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.uninstallModule("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "uninstallModule should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.isModuleInstalled("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "isModuleLoaded should not work on the built-in ipcclientcerts module"
-      );
-      await browser.test.assertRejects(
-        browser.pkcs11.getModuleSlots("ipcclientcerts"),
-        /No such PKCS#11 module ipcclientcerts/,
-        "getModuleSlots should not work on the built-in ipcclientcerts module"
-      );
-      browser.test.notifyPass("pkcs11");
-    } catch (e) {
-      browser.test.fail(`Error: ${String(e)} :: ${e.stack}`);
-      browser.test.notifyFail("pkcs11 failed");
-    }
-  }
+	async function background() {
+		try {
+			const { os } = await browser.runtime.getPlatformInfo();
+			if (os !== "win") {
+				// Expect this call to not throw (explicitly cover regression fixed in Bug 1759162).
+				const isInstalledNonAbsolute = await browser.pkcs11.isModuleInstalled(
+					"testmoduleNonAbsolutePath",
+				);
+				browser.test.assertFalse(
+					isInstalledNonAbsolute,
+					"PKCS#11 module with non absolute path expected to not be installed",
+				);
+			}
+			let isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertFalse(
+				isInstalled,
+				"PKCS#11 module is not installed before we install it",
+			);
+			await browser.pkcs11.installModule("testmodule", 0);
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertTrue(
+				isInstalled,
+				"PKCS#11 module is installed after we install it",
+			);
+			const slots = await browser.pkcs11.getModuleSlots("testmodule");
+			browser.test.assertEq(
+				"Test PKCS11 Slot",
+				slots[0].name,
+				"The first slot name matches the expected name",
+			);
+			browser.test.assertEq(
+				"Test PKCS11 Slot ไบŒ",
+				slots[1].name,
+				"The second slot name matches the expected name",
+			);
+			browser.test.assertTrue(slots[1].token, "The second slot has a token");
+			browser.test.assertFalse(slots[2].token, "The third slot has no token");
+			browser.test.assertEq(
+				"Test PKCS11 Tokeรฑ 2 Label",
+				slots[1].token.name,
+				"The token name matches the expected name",
+			);
+			browser.test.assertEq(
+				"Test PKCS11 Manufacturer ID",
+				slots[1].token.manufacturer,
+				"The token manufacturer matches the expected manufacturer",
+			);
+			browser.test.assertEq(
+				"0.0",
+				slots[1].token.HWVersion,
+				"The token hardware version matches the expected version",
+			);
+			browser.test.assertEq(
+				"0.0",
+				slots[1].token.FWVersion,
+				"The token firmware version matches the expected version",
+			);
+			browser.test.assertEq(
+				"",
+				slots[1].token.serial,
+				"The token has no serial number",
+			);
+			browser.test.assertFalse(
+				slots[1].token.isLoggedIn,
+				"The token is not logged in",
+			);
+			await browser.pkcs11.uninstallModule("testmodule");
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertFalse(
+				isInstalled,
+				"PKCS#11 module is no longer installed after we uninstall it",
+			);
+			await browser.pkcs11.installModule("testmodule");
+			isInstalled = await browser.pkcs11.isModuleInstalled("testmodule");
+			browser.test.assertTrue(
+				isInstalled,
+				"Installing the PKCS#11 module without flags parameter succeeds",
+			);
+			await browser.pkcs11.uninstallModule("testmodule");
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("nonexistingmodule"),
+				/No such PKCS#11 module nonexistingmodule/,
+				"We cannot access modules if no JSON file exists",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("othermodule"),
+				/No such PKCS#11 module othermodule/,
+				"We cannot access modules if we're not listed in the module's manifest file's allowed_extensions key",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("internalmodule"),
+				/No such PKCS#11 module internalmodule/,
+				"We cannot uninstall the NSS Builtin Roots Module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.installModule("osclientcerts", 0),
+				/No such PKCS#11 module osclientcerts/,
+				"installModule should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"uninstallModule should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"isModuleLoaded should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.getModuleSlots("osclientcerts"),
+				/No such PKCS#11 module osclientcerts/,
+				"getModuleSlots should not work on the built-in osclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.installModule("ipcclientcerts", 0),
+				/No such PKCS#11 module ipcclientcerts/,
+				"installModule should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.uninstallModule("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"uninstallModule should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.isModuleInstalled("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"isModuleLoaded should not work on the built-in ipcclientcerts module",
+			);
+			await browser.test.assertRejects(
+				browser.pkcs11.getModuleSlots("ipcclientcerts"),
+				/No such PKCS#11 module ipcclientcerts/,
+				"getModuleSlots should not work on the built-in ipcclientcerts module",
+			);
+			browser.test.notifyPass("pkcs11");
+		} catch (e) {
+			browser.test.fail(`Error: ${String(e)} :: ${e.stack}`);
+			browser.test.notifyFail("pkcs11 failed");
+		}
+	}
 
-  let libDir = FileUtils.getDir("GreBinD", []);
-  await setupManifests([
-    {
-      name: "testmodule",
-      description: "PKCS#11 Test Module",
-      path: testmodule,
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "testmoduleNonAbsolutePath",
-      description: "PKCS#11 Test Module",
-      path: ctypes.libraryName("pkcs11testmodule"),
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "othermodule",
-      description: "PKCS#11 Test Module",
-      path: testmodule,
-      id: "other@tests.mozilla.org",
-    },
-    {
-      name: "internalmodule",
-      description: "Builtin Roots Module",
-      path: PathUtils.join(
-        Services.dirsvc.get("CurWorkD", Ci.nsIFile).path,
-        ctypes.libraryName("nssckbi")
-      ),
-      id: "pkcs11@tests.mozilla.org",
-    },
-    {
-      name: "osclientcerts",
-      description: "OS Client Cert Module",
-      path: PathUtils.join(libDir.path, ctypes.libraryName("osclientcerts")),
-      id: "pkcs11@tests.mozilla.org",
-    },
-  ]);
+	const libDir = FileUtils.getDir("GreBinD", []);
+	await setupManifests([
+		{
+			name: "testmodule",
+			description: "PKCS#11 Test Module",
+			path: testmodule,
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "testmoduleNonAbsolutePath",
+			description: "PKCS#11 Test Module",
+			path: ctypes.libraryName("pkcs11testmodule"),
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "othermodule",
+			description: "PKCS#11 Test Module",
+			path: testmodule,
+			id: "other@tests.mozilla.org",
+		},
+		{
+			name: "internalmodule",
+			description: "Builtin Roots Module",
+			path: PathUtils.join(
+				Services.dirsvc.get("CurWorkD", Ci.nsIFile).path,
+				ctypes.libraryName("nssckbi"),
+			),
+			id: "pkcs11@tests.mozilla.org",
+		},
+		{
+			name: "osclientcerts",
+			description: "OS Client Cert Module",
+			path: PathUtils.join(libDir.path, ctypes.libraryName("osclientcerts")),
+			id: "pkcs11@tests.mozilla.org",
+		},
+	]);
 
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      permissions: ["pkcs11"],
-      browser_specific_settings: { gecko: { id: "pkcs11@tests.mozilla.org" } },
-    },
-    background: background,
-  });
-  await extension.startup();
-  await extension.awaitFinish("pkcs11");
-  await extension.unload();
+	const extension = ExtensionTestUtils.loadExtension({
+		manifest: {
+			permissions: ["pkcs11"],
+			browser_specific_settings: { gecko: { id: "pkcs11@tests.mozilla.org" } },
+		},
+		background: background,
+	});
+	await extension.startup();
+	await extension.awaitFinish("pkcs11");
+	await extension.unload();
 });
diff --git a/browser/components/installerprefs/InstallerPrefs.sys.mjs b/browser/components/installerprefs/InstallerPrefs.sys.mjs
index 2eb9d42fdcb34..fb265d264ff9b 100644
--- a/browser/components/installerprefs/InstallerPrefs.sys.mjs
+++ b/browser/components/installerprefs/InstallerPrefs.sys.mjs
@@ -45,7 +45,7 @@ export function InstallerPrefs(prefsList) {
   // "Software\Mozilla\Firefox\Installer\71AE18FE3142402B\".
   ChromeUtils.defineLazyGetter(this, "_registryKeyPath", function () {
     const app = AppConstants.MOZ_APP_NAME;
-    const vendor = Services.appinfo.vendor || "Mozilla";
+    const vendor = Services.appinfo.vendor || "BrowserWorks";
     const xreDirProvider = Cc[
       "@mozilla.org/xre/directory-provider;1"
     ].getService(Ci.nsIXREDirProvider);
diff --git a/browser/components/migration/FirefoxImportMigrator.sys.mjs b/browser/components/migration/FirefoxImportMigrator.sys.mjs
new file mode 100644
index 0000000000000..6b9d4b0f4ecf2
--- /dev/null
+++ b/browser/components/migration/FirefoxImportMigrator.sys.mjs
@@ -0,0 +1,830 @@
+/* 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/. */
+
+/**
+ * Migrates from external Firefox profiles to Waterfox. This is different from
+ * the FirefoxProfileMigrator which is used for profile refresh within Firefox.
+ * This migrator can import data from Firefox installations on the system.
+ *
+ * Supported platforms: Windows, macOS, Linux (including Flatpak and Snap)
+ * Supported data types: Bookmarks, History, Passwords, Form Data, Cookies
+ */
+
+import { MigrationUtils } from "resource:///modules/MigrationUtils.sys.mjs";
+import { MigratorBase } from "resource:///modules/MigratorBase.sys.mjs";
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+  FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
+  LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
+  PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
+  Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+});
+
+/**
+ * Firefox profile migrator for importing from external Firefox profiles.
+ * This handles importing data from Firefox installations on the system.
+ */
+export class FirefoxImportMigrator extends MigratorBase {
+  static get key() {
+    return "firefox-import";
+  }
+
+  static get displayNameL10nID() {
+    return "migration-wizard-migrator-display-name-firefox";
+  }
+
+  static get brandImage() {
+    return "chrome://browser/content/migration/brands/firefox.png";
+  }
+
+  get enabled() {
+    return true;
+  }
+
+  /**
+   * Get the Firefox profile directory paths for different platforms.
+   * Supports standard installations as well as Flatpak and Snap on Linux.
+   *
+   * @returns {string[]} Array of Firefox profile directory paths
+   */
+  _getFirefoxProfilePaths() {
+    const paths = [];
+
+    try {
+      if (AppConstants.platform == "win") {
+        // Windows: %APPDATA%/Mozilla/Firefox
+        try {
+          let appData = Services.dirsvc.get("AppData", Ci.nsIFile);
+          let firefoxDir = appData.clone();
+          firefoxDir.append("Mozilla");
+          firefoxDir.append("Firefox");
+          if (firefoxDir.exists() && firefoxDir.isDirectory()) {
+            paths.push(firefoxDir.path);
+          }
+        } catch (ex) {
+          console.warn("Failed to check Windows Firefox path:", ex);
+        }
+      } else if (AppConstants.platform == "macosx") {
+        // macOS: ~/Library/Application Support/Firefox
+        try {
+          let homeDir = Services.dirsvc.get("Home", Ci.nsIFile);
+          let firefoxDir = homeDir.clone();
+          firefoxDir.appendRelativePath("Library/Application Support/Firefox");
+          if (firefoxDir.exists() && firefoxDir.isDirectory()) {
+            paths.push(firefoxDir.path);
+          }
+        } catch (ex) {
+          console.warn("Failed to check macOS Firefox path:", ex);
+        }
+      } else if (AppConstants.platform == "linux") {
+        // Linux: ~/.mozilla/firefox
+        try {
+          let homeDir = Services.dirsvc.get("Home", Ci.nsIFile);
+          let firefoxDir = homeDir.clone();
+          firefoxDir.appendRelativePath(".mozilla/firefox");
+          if (firefoxDir.exists() && firefoxDir.isDirectory()) {
+            paths.push(firefoxDir.path);
+          }
+        } catch (ex) {
+          console.warn("Failed to check Linux Firefox path:", ex);
+        }
+
+        // Also check for Flatpak installation
+        try {
+          let homeDir = Services.dirsvc.get("Home", Ci.nsIFile);
+          let flatpakDir = homeDir.clone();
+          flatpakDir.appendRelativePath(".var/app/org.mozilla.firefox/.mozilla/firefox");
+          if (flatpakDir.exists() && flatpakDir.isDirectory()) {
+            paths.push(flatpakDir.path);
+          }
+        } catch (ex) {
+          console.warn("Failed to check Flatpak Firefox path:", ex);
+        }
+
+        // Check for Snap installation
+        try {
+          let homeDir = Services.dirsvc.get("Home", Ci.nsIFile);
+          let snapDir = homeDir.clone();
+          snapDir.appendRelativePath("snap/firefox/common/.mozilla/firefox");
+          if (snapDir.exists() && snapDir.isDirectory()) {
+            paths.push(snapDir.path);
+          }
+        } catch (ex) {
+          console.warn("Failed to check Snap Firefox path:", ex);
+        }
+      }
+    } catch (ex) {
+      console.error("Error getting Firefox profile paths:", ex);
+    }
+
+    return paths;
+  }
+
+  /**
+   * Parse Firefox profiles.ini file to get profile information.
+   *
+   * @param {string} firefoxDir - Path to Firefox installation directory
+   * @returns {Promise<Array>} Array of profile objects with name, path, and existence info
+   */
+  async _parseProfilesIni(firefoxDir) {
+    let profiles = [];
+    let profilesIniPath;
+
+    try {
+      profilesIniPath = PathUtils.join(firefoxDir, "profiles.ini");
+    } catch (ex) {
+      console.error(`Failed to construct profiles.ini path for Firefox directory "${firefoxDir}":`, ex);
+      return [];
+    }
+
+    try {
+      let exists = await IOUtils.exists(profilesIniPath);
+
+      if (exists) {
+        let content = await IOUtils.readUTF8(profilesIniPath);
+
+        let lines = content.split(/\r?\n/);
+        let currentProfile = null;
+
+        for (let line of lines) {
+          line = line.trim();
+          if (line.startsWith("[Profile")) {
+            if (currentProfile && currentProfile.name && currentProfile.path) {
+              profiles.push(currentProfile);
+            }
+            currentProfile = {};
+          } else if (line.startsWith("Name=")) {
+            let name = line.substring(5).trim();
+            if (name) {
+              currentProfile.name = name;
+            }
+          } else if (line.startsWith("Path=")) {
+            let path = line.substring(5).trim();
+            // Clean up path separators and invalid characters
+            if (path) {
+              // Remove any quotes that might be around the path
+              path = path.replace(/^["']|["']$/g, "");
+              // Normalize path separators
+              currentProfile.path = path.replace(/\\/g, "/");
+            }
+          } else if (line.startsWith("IsRelative=")) {
+            currentProfile.isRelative = line.substring(11).trim() === "1";
+          }
+        }
+
+        // Add the last profile if valid
+        if (currentProfile && currentProfile.name && currentProfile.path) {
+          profiles.push(currentProfile);
+        }
+
+        // Resolve paths and validate profiles
+        for (let profile of profiles) {
+          if (!profile.path || !profile.name) {
+            console.warn(`Profile ${profile.name || 'unnamed'} has missing name or path, skipping`);
+            profile.exists = false;
+            profile.fullPath = "";
+            continue;
+          }
+
+          // Skip profiles with obviously invalid characters
+          if (profile.path.includes('\0') || profile.name.includes('\0')) {
+            console.warn(`Profile ${profile.name} contains null characters, skipping`);
+            profile.exists = false;
+            profile.fullPath = "";
+            continue;
+          }
+
+          try {
+            const pathSegments = profile.path.split(/[\\/]+/).filter(Boolean);
+            let resolvedPath;
+
+            if (profile.isRelative !== false) {
+              try {
+                resolvedPath = PathUtils.join(firefoxDir, ...pathSegments);
+              } catch (joinEx) {
+                console.warn(`Failed to join relative path for profile ${profile.name}: ${profile.path}`, joinEx);
+              }
+            } else {
+              try {
+                resolvedPath = PathUtils.normalize(profile.path);
+              } catch (pathEx) {
+                console.warn(`Invalid absolute path for profile ${profile.name}: ${profile.path}`, pathEx);
+                try {
+                  resolvedPath = PathUtils.join(firefoxDir, ...pathSegments);
+                } catch (joinEx) {
+                  console.warn(`Failed to join fallback relative path for profile ${profile.name}: ${profile.path}`, joinEx);
+                }
+              }
+            }
+
+            if (!resolvedPath) {
+              console.warn(`Could not resolve profile path for ${profile.name}: ${profile.path}`);
+              profile.exists = false;
+              profile.fullPath = profile.path;
+              continue;
+            }
+
+            profile.fullPath = resolvedPath;
+
+            // Check if profile directory exists
+            try {
+              profile.exists = await IOUtils.exists(profile.fullPath);
+            } catch (ex) {
+              console.warn(`Cannot check existence of profile path ${profile.fullPath}:`, ex);
+              profile.exists = false;
+            }
+          } catch (ex) {
+            console.error(`Failed to resolve profile path for ${profile.name} (${profile.path}):`, ex);
+            profile.exists = false;
+            profile.fullPath = profile.path;
+          }
+        }
+      }
+    } catch (ex) {
+      console.error(`Error parsing profiles.ini at "${profilesIniPath}":`, ex);
+      console.error("This might indicate a corrupted or inaccessible profiles.ini file");
+    }
+
+    let validProfiles = profiles.filter(p => p.exists);
+    return validProfiles;
+  }
+
+  /**
+   * Get all available Firefox profiles from all Firefox installations.
+   * Combines profiles from all detected Firefox installations.
+   *
+   * @returns {Promise<Array>} Array of all available Firefox profiles
+   */
+  async _getAllFirefoxProfiles() {
+    let allProfiles = [];
+    let firefoxPaths = this._getFirefoxProfilePaths();
+
+    if (firefoxPaths.length === 0) {
+      console.info("No Firefox installations found on this system");
+    }
+
+    for (let firefoxPath of firefoxPaths) {
+      let profiles = await this._parseProfilesIni(firefoxPath);
+
+      // Add source path info to each profile
+      for (let profile of profiles) {
+        profile.firefoxPath = firefoxPath;
+        profile.id = `${firefoxPath}::${profile.name}`;
+        allProfiles.push(profile);
+      }
+    }
+
+    return allProfiles;
+  }
+
+  async getSourceProfiles() {
+    let profiles = await this._getAllFirefoxProfiles();
+
+    // Filter out the current profile to avoid importing from ourselves
+    try {
+      // Get current profile directory from MigrationUtils
+      let currentProfilePath = null;
+      if (MigrationUtils.profileStartup && MigrationUtils.profileStartup.directory) {
+        currentProfilePath = MigrationUtils.profileStartup.directory.path;
+
+      } else {
+        // Fallback to Services directory service
+        try {
+          let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+          currentProfilePath = profileDir.path;
+
+        } catch (ex) {
+          console.warn("Could not get profile directory from Services:", ex);
+        }
+      }
+
+      if (currentProfilePath) {
+        profiles = profiles.filter(profile => {
+          try {
+            let normalizedProfilePath = PathUtils.normalize(profile.fullPath);
+            let normalizedCurrentPath = PathUtils.normalize(currentProfilePath);
+            return normalizedProfilePath !== normalizedCurrentPath;
+          } catch (ex) {
+            console.warn(`Path comparison failed for profile ${profile.name}:`, ex);
+            return true; // Include profile if path comparison fails
+          }
+        });
+      }
+    } catch (ex) {
+      console.warn("Could not determine current profile path for filtering:", ex);
+    }
+
+    let result = profiles.map(profile => ({
+      id: profile.id,
+      name: profile.name,
+      path: profile.fullPath
+    })).sort((a, b) => a.name.localeCompare(b.name));
+
+    return result;
+  }
+
+  /**
+   * Helper method to get a file object if it exists and is readable.
+   *
+   * @param {string} dir - Directory path
+   * @param {string} fileName - File name
+   * @returns {nsIFile|null} File object or null if not accessible
+   */
+  _getFileObject(dir, fileName) {
+    let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+    file.initWithPath(dir);
+    file.append(fileName);
+    return file.exists() && file.isReadable() ? file : null;
+  }
+
+  async _getFiles(aProfile, aFileName) {
+    const files = [];
+    let file = aProfile.clone();
+    file.append(aFileName);
+
+    if (await IOUtils.exists(file.path)) {
+      files.push(file.path);
+    } else {
+      return [];
+    }
+
+    // Also look for SQLite temporary files.
+    for (const suffix of ["-wal", "-shm"]) {
+      file = aProfile.clone();
+      file.append(aFileName + suffix);
+      if (await IOUtils.exists(file.path)) {
+        files.push(file.path);
+      }
+    }
+    return files;
+  }
+
+  async getResources(aProfile) {
+    if (!aProfile) {
+      console.warn("No profile provided to getResources");
+      return [];
+    }
+
+    let profilePath = aProfile.path;
+
+    if (!profilePath || !(await IOUtils.exists(profilePath))) {
+      console.warn("Profile path does not exist:", profilePath);
+      return [];
+    }
+
+    let resources = [];
+
+    // Bookmarks and History (Places database)
+    let placesResource = await this._getPlacesResource(profilePath);
+    if (placesResource) {
+      resources.push(placesResource);
+    }
+
+    // Passwords
+    let passwordsResource = await this._getPasswordsResource(profilePath);
+    if (passwordsResource) {
+      resources.push(passwordsResource);
+    }
+
+    // Form data
+    let formDataResource = await this._getFormDataResource(profilePath);
+    if (formDataResource) {
+      resources.push(formDataResource);
+    }
+
+    // Cookies
+    let cookiesResource = await this._getCookiesResource(profilePath);
+    if (cookiesResource) {
+      resources.push(cookiesResource);
+    }
+
+    // Bookmarks (separate from Places)
+    let bookmarksResource = await this._getBookmarksResource(profilePath);
+    if (bookmarksResource) {
+      resources.push(bookmarksResource);
+    }
+
+    return resources;
+  }
+
+  async _getPlacesResource(profilePath) {
+    let placesPath = PathUtils.join(profilePath, "places.sqlite");
+    if (!(await IOUtils.exists(placesPath))) {
+      return null;
+    }
+
+    return {
+      type: MigrationUtils.resourceTypes.HISTORY,
+      migrate: async (callback) => {
+        try {
+          await this._migratePlaces(placesPath);
+          callback(true);
+        } catch (ex) {
+          console.error("Failed to migrate places:", ex);
+          callback(false);
+        }
+      }
+    };
+  }
+
+  async _migratePlaces(placesPath) {
+    const sourceDB = await lazy.Sqlite.openConnection({ path: placesPath });
+    try {
+      const historyRows = await sourceDB.execute(`
+        SELECT p.url, p.title, v.visit_date, v.visit_type
+        FROM moz_historyvisits AS v
+        JOIN moz_places AS p ON v.place_id = p.id
+        WHERE p.url NOT LIKE ? AND p.url NOT LIKE ? AND p.visit_count > 0
+      `, ["place:%", "moz-anno:%"]);
+
+      const pageInfos = new Map();
+      const maxAge = Date.now() - MigrationUtils.HISTORY_MAX_AGE_IN_MILLISECONDS;
+
+      for (const row of historyRows) {
+        const url = row.getResultByName("url");
+        const visitDate = new Date(row.getResultByName("visit_date") / 1000);
+        if (!URL.canParse(url) || visitDate.getTime() < maxAge) {
+          continue;
+        }
+
+        const visit = {
+          date: visitDate,
+          transition: row.getResultByName("visit_type"),
+        };
+
+        if (pageInfos.has(url)) {
+          pageInfos.get(url).visits.push(visit);
+        } else {
+          pageInfos.set(url, {
+            url: new URL(url),
+            title: row.getResultByName("title") || url,
+            visits: [visit],
+          });
+        }
+      }
+      if (pageInfos.size > 0) {
+        await MigrationUtils.insertVisitsWrapper([...pageInfos.values()]);
+      }
+    } finally {
+      await sourceDB.close();
+    }
+  }
+
+  async _getPasswordsResource(profilePath) {
+    // Temporarily disable Firefox password migration until NSS-based import
+    // is fixed. Returning null hides the PASSWORDS resource for this migrator.
+    return null;
+  }
+
+  async _getBookmarksResource(profilePath) {
+    let placesPath = PathUtils.join(profilePath, "places.sqlite");
+    if (!(await IOUtils.exists(placesPath))) {
+      return null;
+    }
+
+    return {
+      type: MigrationUtils.resourceTypes.BOOKMARKS,
+      migrate: async (callback) => {
+        try {
+          await this._migrateBookmarks(placesPath);
+          callback(true);
+        } catch (ex) {
+          console.error("Failed to migrate bookmarks:", ex);
+          callback(false);
+        }
+      }
+    };
+  }
+
+  async _migrateBookmarks(placesPath) {
+    const sourceDB = await lazy.Sqlite.openConnection({ path: placesPath });
+    try {
+      // Get all folders first
+      const folders = await sourceDB.execute(`
+        SELECT id, parent, title, guid, type, position FROM moz_bookmarks
+        WHERE type = 2
+        ORDER BY parent, position
+      `);
+
+      // Get all bookmarks
+      const bookmarks = await sourceDB.execute(`
+        SELECT b.id, b.parent, b.title, p.url, b.dateAdded, b.lastModified, b.guid, b.position
+        FROM moz_bookmarks AS b
+        JOIN moz_places AS p ON b.fk = p.id
+        WHERE b.type = 1
+        ORDER BY b.parent, b.position
+      `);
+
+      // Create mapping of source folder IDs to target GUIDs
+      const folderGuidMap = new Map();
+
+      // Map root folders
+      for (const folder of folders) {
+        const guid = folder.getResultByName("guid");
+        const id = folder.getResultByName("id");
+
+        if (guid === "menu________") {
+          folderGuidMap.set(id, lazy.PlacesUtils.bookmarks.menuGuid);
+        } else if (guid === "toolbar_______") {
+          folderGuidMap.set(id, lazy.PlacesUtils.bookmarks.toolbarGuid);
+        } else if (guid === "unfiled_____") {
+          folderGuidMap.set(id, lazy.PlacesUtils.bookmarks.unfiledGuid);
+        } else if (guid === "mobile______") {
+          folderGuidMap.set(id, lazy.PlacesUtils.bookmarks.mobileGuid);
+        }
+      }
+
+      // Create custom folders in hierarchy order
+      let processedFolders = new Set([...folderGuidMap.keys()]);
+      let lastProcessedCount = -1;
+
+      while (processedFolders.size < folders.length && processedFolders.size !== lastProcessedCount) {
+        lastProcessedCount = processedFolders.size;
+
+        for (const folder of folders) {
+          const id = folder.getResultByName("id");
+          const parentId = folder.getResultByName("parent");
+          const title = folder.getResultByName("title");
+          const guid = folder.getResultByName("guid");
+
+          // Skip if already processed or is a root folder
+          if (processedFolders.has(id)) continue;
+          if (["menu________", "toolbar_______", "unfiled_____", "mobile______", "tags________", "root________"].includes(guid)) {
+            processedFolders.add(id);
+            continue;
+          }
+
+          // Skip tag folders (parent ID 4 is tags folder)
+          if (parentId === 4) {
+            processedFolders.add(id);
+            continue;
+          }
+
+          // Check if parent has been processed
+          const parentGuid = folderGuidMap.get(parentId);
+          if (parentGuid) {
+            try {
+              const folderSpec = {
+                parentGuid,
+                type: lazy.PlacesUtils.bookmarks.TYPE_FOLDER,
+                title: title || "Untitled Folder",
+                dateAdded: new Date(),
+              };
+              const newFolder = await MigrationUtils.insertBookmarkWrapper(folderSpec);
+              folderGuidMap.set(id, newFolder.guid);
+              processedFolders.add(id);
+            } catch (ex) {
+              console.error("Failed to create folder:", title, ex);
+            }
+          }
+        }
+      }
+
+      // Collect bookmarks by folder for batch insertion
+      const bookmarksByFolder = new Map();
+
+      for (const bookmark of bookmarks) {
+        const parentId = bookmark.getResultByName("parent");
+        const url = bookmark.getResultByName("url");
+        const title = bookmark.getResultByName("title");
+        const dateAdded = new Date(bookmark.getResultByName("dateAdded") / 1000);
+
+        if (!url || !URL.canParse(url)) {
+          continue;
+        }
+
+        const parentGuid = folderGuidMap.get(parentId);
+        if (parentGuid) {
+          if (!bookmarksByFolder.has(parentGuid)) {
+            bookmarksByFolder.set(parentGuid, []);
+          }
+          bookmarksByFolder.get(parentGuid).push({
+            url,
+            title: title || url,
+            dateAdded,
+          });
+        } else {
+          // Check if this is a tagged bookmark (parent is a tag folder)
+          const isTaggedBookmark = folders.some(f =>
+            f.getResultByName("id") === parentId &&
+            f.getResultByName("parent") === 4
+          );
+        }
+      }
+
+      // Insert bookmarks using MigrationUtils wrapper for proper counting
+      let totalImported = 0;
+      for (const [parentGuid, bookmarks] of bookmarksByFolder) {
+        try {
+          await MigrationUtils.insertManyBookmarksWrapper(bookmarks, parentGuid);
+          totalImported += bookmarks.length;
+        } catch (ex) {
+          console.error("Failed to insert bookmarks for folder:", parentGuid, ex);
+        }
+      }
+    } finally {
+      await sourceDB.close();
+    }
+  }
+
+  async _getFormDataResource(profilePath) {
+    let formHistoryPath = PathUtils.join(profilePath, "formhistory.sqlite");
+    if (!(await IOUtils.exists(formHistoryPath))) {
+      return null;
+    }
+
+    return {
+      type: MigrationUtils.resourceTypes.FORMDATA,
+      migrate: async (callback) => {
+        try {
+          await this._migrateFormData(formHistoryPath);
+          callback(true);
+        } catch (ex) {
+          console.error("Failed to migrate form data:", ex);
+          callback(false);
+        }
+      }
+    };
+  }
+
+  /**
+   * Migrate form history data from Firefox formhistory.sqlite database.
+   *
+   * @param {string} formHistoryPath - Path to formhistory.sqlite file
+   */
+  async _migrateFormData(formHistoryPath) {
+    let db = await lazy.Sqlite.openConnection({ path: formHistoryPath });
+
+    try {
+      let rows = await db.execute(`
+        SELECT fieldname, value, timesUsed, firstUsed, lastUsed
+        FROM moz_formhistory
+        WHERE fieldname IS NOT NULL AND value IS NOT NULL
+        ORDER BY lastUsed DESC
+      `);
+
+      let addOps = [];
+      for (let row of rows) {
+        let fieldname = row.getResultByName("fieldname");
+        let value = row.getResultByName("value");
+        let timesUsed = row.getResultByName("timesUsed") || 1;
+        let firstUsed = row.getResultByName("firstUsed") || 0;
+        let lastUsed = row.getResultByName("lastUsed") || 0;
+
+        if (fieldname && value) {
+          addOps.push({
+            op: "add",
+            fieldname,
+            value,
+            timesUsed,
+            firstUsed: firstUsed / 1000, // Convert from microseconds to milliseconds
+            lastUsed: lastUsed / 1000,   // Convert from microseconds to milliseconds
+          });
+        }
+      }
+
+      if (addOps.length > 0) {
+        await lazy.FormHistory.update(addOps);
+     }
+    } finally {
+      await db.close();
+    }
+  }
+
+  async _getCookiesResource(profilePath) {
+    let cookiesPath = PathUtils.join(profilePath, "cookies.sqlite");
+
+    if (!(await IOUtils.exists(cookiesPath))) {
+      return null;
+    }
+
+    return {
+      type: MigrationUtils.resourceTypes.COOKIES,
+      migrate: async (callback) => {
+        try {
+          await this._migrateCookies(cookiesPath);
+          callback(true);
+        } catch (ex) {
+          console.error("Failed to migrate cookies:", ex);
+          callback(false);
+        }
+      }
+    };
+  }
+
+  /**
+   * Migrate cookies from Firefox cookies.sqlite database.
+   * Only imports cookies that haven't expired.
+   *
+   * @param {string} cookiesPath - Path to cookies.sqlite file
+   */
+  async _migrateCookies(cookiesPath) {
+    let db;
+
+    try {
+      db = await lazy.Sqlite.openConnection({ path: cookiesPath });
+    } catch (ex) {
+      console.error("Failed to open cookies database:", ex);
+      throw ex;
+    }
+
+    try {
+      // First, let's see what's in the database
+      let allRows = await db.execute(`
+        SELECT COUNT(*) as total FROM moz_cookies
+      `);
+
+      let rows = await db.execute(`
+        SELECT host, path, name, value, expiry, isSecure, isHttpOnly, sameSite
+        FROM moz_cookies
+        WHERE expiry > ${Math.floor(Date.now() / 1000)}
+        ORDER BY lastAccessed DESC
+        LIMIT 1000
+      `);
+
+      if (rows.length === 0) {
+        // Let's try without the expiry filter to see if there are any cookies at all
+        let allCookies = await db.execute(`
+          SELECT host, path, name, value, expiry, isSecure, isHttpOnly, sameSite
+          FROM moz_cookies
+          ORDER BY lastAccessed DESC
+          LIMIT 100
+        `);
+      }
+
+      let successCount = 0;
+      let failCount = 0;
+
+      for (let row of rows) {
+        try {
+          let host = row.getResultByName("host");
+          let path = row.getResultByName("path");
+          let name = row.getResultByName("name");
+          let value = row.getResultByName("value");
+          let expiry = row.getResultByName("expiry");
+          let isSecure = Boolean(row.getResultByName("isSecure"));
+          let isHttpOnly = Boolean(row.getResultByName("isHttpOnly"));
+          let sameSite = row.getResultByName("sameSite") || Ci.nsICookie.SAMESITE_NONE;
+
+          // Skip invalid cookies
+          if (!host || !name) {
+            failCount++;
+            continue;
+          }
+
+          Services.cookies.add(
+            host,
+            path || "/",
+            name,
+            value || "",
+            isSecure,
+            isHttpOnly,
+            false, // isSession
+            expiry,
+            {}, // originAttributes
+            sameSite,
+            isSecure ? Ci.nsICookie.SCHEME_HTTPS : Ci.nsICookie.SCHEME_HTTP
+          );
+          successCount++;
+        } catch (ex) {
+          console.error("Failed to add cookie:", ex);
+          failCount++;
+        }
+      }
+    } finally {
+      await db.close();
+    }
+  }
+
+
+
+  async getLastUsedDate() {
+    let profiles = await this._getAllFirefoxProfiles();
+    let dates = [];
+
+    for (let profile of profiles) {
+      try {
+        let stat = await IOUtils.stat(profile.fullPath);
+        dates.push(stat.lastModified);
+
+        // Also check places.sqlite modification time
+        let placesPath = PathUtils.join(profile.fullPath, "places.sqlite");
+        if (await IOUtils.exists(placesPath)) {
+          let placesStat = await IOUtils.stat(placesPath);
+          dates.push(placesStat.lastModified);
+        }
+      } catch (ex) {
+        // Ignore errors for individual profiles
+      }
+    }
+
+    return dates.length > 0 ? new Date(Math.max(...dates)) : new Date(0);
+  }
+}
diff --git a/browser/components/migration/MigrationUtils.sys.mjs b/browser/components/migration/MigrationUtils.sys.mjs
index 50bd77edb50c5..e8eacb6e83b40 100644
--- a/browser/components/migration/MigrationUtils.sys.mjs
+++ b/browser/components/migration/MigrationUtils.sys.mjs
@@ -52,6 +52,10 @@ const MIGRATOR_MODULES = Object.freeze({
     moduleURI: "resource:///modules/FirefoxProfileMigrator.sys.mjs",
     platforms: ["linux", "macosx", "win"],
   },
+  FirefoxImportMigrator: {
+    moduleURI: "resource:///modules/FirefoxImportMigrator.sys.mjs",
+    platforms: ["linux", "macosx", "win"],
+  },
   IEProfileMigrator: {
     moduleURI: "resource:///modules/IEProfileMigrator.sys.mjs",
     platforms: ["win"],
diff --git a/browser/components/migration/MigrationWizardParent.sys.mjs b/browser/components/migration/MigrationWizardParent.sys.mjs
index ca951075557ca..8d887663400a3 100644
--- a/browser/components/migration/MigrationWizardParent.sys.mjs
+++ b/browser/components/migration/MigrationWizardParent.sys.mjs
@@ -757,7 +757,7 @@ export class MigrationWizardParent extends JSWindowActorParent {
       }
       case lazy.MigrationWizardConstants.DISPLAYED_RESOURCE_TYPES.PASSWORDS: {
         let quantity = MigrationUtils.getImportedCount("logins");
-        return lazy.gFluentStrings.formatValue(
+        return quantity === 0 ? "Passwords imported" : lazy.gFluentStrings.formatValue(
           "migration-wizard-progress-success-passwords",
           {
             quantity,
diff --git a/browser/components/migration/content/brands/firefox.png b/browser/components/migration/content/brands/firefox.png
new file mode 100644
index 0000000000000..b92d78ca6d09c
Binary files /dev/null and b/browser/components/migration/content/brands/firefox.png differ
diff --git a/browser/components/migration/content/migration-wizard.mjs b/browser/components/migration/content/migration-wizard.mjs
index 2014aa2d38cca..f1a8d7a0152ef 100644
--- a/browser/components/migration/content/migration-wizard.mjs
+++ b/browser/components/migration/content/migration-wizard.mjs
@@ -30,6 +30,7 @@ export class MigrationWizard extends HTMLElement {
   #expandedDetails = false;
   #extensionsSuccessLink = null;
   #supportTextLinks = null;
+  #passwordsMigrated = false;
 
   static get markup() {
     return `
@@ -107,6 +108,9 @@ export class MigrationWizard extends HTMLElement {
                 <label id="payment-methods" class="resource-type-label" data-resource-type="PAYMENT_METHODS">
                   <input type="checkbox"/><span data-l10n-id="migration-payment-methods-option-label"></span>
                 </label>
+                <label id="cookies" class="resource-type-label" data-resource-type="COOKIES">
+                  <input type="checkbox"/><span data-l10n-id="migration-cookies-option-label"></span>
+                </label>
               </fieldset>
             </details>
 
@@ -605,6 +609,9 @@ export class MigrationWizard extends HTMLElement {
     this.#ensureSelectionDropdown();
     this.#browserProfileSelectorList.textContent = "";
 
+    // Reset password migration flag when starting new migration
+    this.#passwordsMigrated = false;
+
     let selectionPage = this.#shadowRoot.querySelector(
       "div[name='page-selection']"
     );
@@ -828,6 +835,12 @@ export class MigrationWizard extends HTMLElement {
             this.#extensionsSuccessLink.textContent =
               state.progress[resourceType].message;
           }
+          if (
+            resourceType ==
+            MigrationWizardConstants.DISPLAYED_RESOURCE_TYPES.PASSWORDS
+          ) {
+            this.#passwordsMigrated = true;
+          }
           remainingProgressGroups--;
           break;
         }
@@ -864,6 +877,12 @@ export class MigrationWizard extends HTMLElement {
             this.#extensionsSuccessLink.textContent =
               state.progress[resourceType].message;
           }
+          if (
+            resourceType ==
+            MigrationWizardConstants.DISPLAYED_RESOURCE_TYPES.PASSWORDS
+          ) {
+            this.#passwordsMigrated = true;
+          }
           remainingProgressGroups--;
           break;
         }
@@ -898,6 +917,18 @@ export class MigrationWizard extends HTMLElement {
     cancelButton.hidden = migrationDone;
 
     if (migrationDone) {
+      // If passwords were migrated, change button text to "Restart Now"
+      if (this.#passwordsMigrated) {
+        let doneButton = progressPage.querySelector(".done-button");
+        let continueButton = progressPage.querySelector(".continue-button");
+        if (doneButton) {
+          document.l10n.setAttributes(doneButton, "quickactions-restart");
+        }
+        if (continueButton) {
+          document.l10n.setAttributes(continueButton, "quickactions-restart");
+        }
+      }
+
       // Since this might be called before the named-deck actually switches to
       // show the progress page, we cannot focus this button immediately.
       // Instead, we use a rAF to queue this up for focusing before the
@@ -1254,6 +1285,8 @@ export class MigrationWizard extends HTMLElement {
         "migration-list-autofill-label",
       [MigrationWizardConstants.DISPLAYED_RESOURCE_TYPES.PAYMENT_METHODS]:
         "migration-list-payment-methods-label",
+      [MigrationWizardConstants.DISPLAYED_RESOURCE_TYPES.COOKIES]:
+        "migration-cookies-option-label",
     };
 
     if (MigrationWizardConstants.USES_FAVORITES.includes(key)) {
@@ -1442,12 +1475,22 @@ export class MigrationWizard extends HTMLElement {
     ) {
       this.#doImport();
     } else if (
-      event.target.classList.contains("cancel-close") ||
-      event.target.classList.contains("finish-button")
+      event.target.classList.contains("cancel-close")
     ) {
       this.dispatchEvent(
         new CustomEvent("MigrationWizard:Close", { bubbles: true })
       );
+    } else if (
+      event.target.classList.contains("finish-button")
+    ) {
+      if (this.#passwordsMigrated) {
+        // Restart the browser when passwords were migrated
+        this.#restartBrowser();
+      } else {
+        this.dispatchEvent(
+          new CustomEvent("MigrationWizard:Close", { bubbles: true })
+        );
+      }
     } else if (
       event.currentTarget == this.#browserProfileSelectorList &&
       event.target != this.#browserProfileSelectorList
@@ -1574,6 +1617,32 @@ export class MigrationWizard extends HTMLElement {
       }
     }
   }
+
+  #restartBrowser() {
+    try {
+      // Notify all windows that an application quit has been requested
+      let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(
+        Ci.nsISupportsPRBool
+      );
+      Services.obs.notifyObservers(
+        cancelQuit,
+        "quit-application-requested",
+        "restart"
+      );
+
+      // Something aborted the quit process
+      if (cancelQuit.data) {
+        return;
+      }
+
+      // Restart the browser
+      Services.startup.quit(
+        Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart
+      );
+    } catch (ex) {
+      console.error("Failed to restart browser:", ex);
+    }
+  }
 }
 
 if (globalThis.customElements) {
diff --git a/browser/components/migration/jar.mn b/browser/components/migration/jar.mn
index 4eabe74555a59..b1d3f4d2b07cf 100644
--- a/browser/components/migration/jar.mn
+++ b/browser/components/migration/jar.mn
@@ -22,6 +22,7 @@ browser.jar:
    content/browser/migration/brands/brave.png                 (content/brands/brave.png)
    content/browser/migration/brands/chrome.png                (content/brands/chrome.png)
    content/browser/migration/brands/chromium.png              (content/brands/chromium.png)
+   content/browser/migration/brands/firefox.png               (content/brands/firefox.png)
    content/browser/migration/brands/opera.png                 (content/brands/opera.png)
    content/browser/migration/brands/operagx.png               (content/brands/operagx.png)
    content/browser/migration/brands/vivaldi.png               (content/brands/vivaldi.png)
diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build
index 8c958ab7d4d41..979ada319504f 100644
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -26,6 +26,7 @@ EXTRA_JS_MODULES += [
     "ChromeMigrationUtils.sys.mjs",
     "ChromeProfileMigrator.sys.mjs",
     "FileMigrators.sys.mjs",
+    "FirefoxImportMigrator.sys.mjs",
     "FirefoxProfileMigrator.sys.mjs",
     "InternalTestingProfileMigrator.sys.mjs",
     "MigrationUtils.sys.mjs",
diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index a5095e61b838e..d5964680186fc 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -1510,6 +1510,8 @@ var PlacesControllerDragHelper = {
    * @returns {string} The most relevant flavor, or undefined.
    */
   getMostRelevantFlavor(flavors) {
+    if (flavors.contains(PlacesUtils.TYPE_X_WS_TREE))
+      return PlacesUtils.TYPE_X_WS_TREE;
     // The DnD API returns a DOMStringList, but tests may pass an Array.
     flavors = Array.from(flavors);
     return PlacesUIUtils.SUPPORTED_FLAVORS.find(f => flavors.includes(f));
@@ -1526,6 +1528,8 @@ var PlacesControllerDragHelper = {
    * @returns {boolean}
    */
   canDrop: function PCDH_canDrop(ip, dt) {
+    if (dt.mozTypesAt(0).contains(PlacesUtils.TYPE_X_WS_TREE))
+      return true;
     let dropCount = dt.mozItemCount;
 
     // Check every dragged item.
diff --git a/browser/components/places/content/places.xhtml b/browser/components/places/content/places.xhtml
index f338ff6b53035..4f4b34448495a 100644
--- a/browser/components/places/content/places.xhtml
+++ b/browser/components/places/content/places.xhtml
@@ -176,7 +176,7 @@
         <toolbarbutton type="menu" class="tabbable" wantdropmarker="true"
               data-l10n-id="places-organize-button-mac"
 #else
-      <menubar id="placesMenu">
+      <menubar id="placesMenu" _moz-menubarkeeplocal="true">
         <menu class="menu-iconic" data-l10n-id="places-organize-button"
 #endif
               id="organizeButton">
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
index cb7f1c8c32b16..dd1f7653fcc59 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
@@ -690,6 +690,9 @@
       <radio id="manualDesktop"
              value="false"
              data-l10n-id="update-application-check-choose"/>
+      <radio id="disabledDesktop"
+             value="disabled"
+             data-l10n-id="update-application-manual"/>
     </radiogroup>
     <hbox id="updateSettingCrossUserWarningDesc" hidden="true">
       <hbox class="info-icon-container">
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 5878132edfe58..cf62774eb99f7 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -50,6 +50,9 @@ const ICON_URL_APP =
 // was set by us to a custom handler icon and CSS should not try to override it.
 const APP_ICON_ATTR_NAME = "appHandlerIcon";
 
+// WATERFOX
+const PREF_UPDATE_ENABLED = "app.update.enabled";
+
 Preferences.addAll([
   // Startup
   { id: "browser.startup.page", type: "int" },
@@ -183,6 +186,10 @@ Preferences.addAll([
 
   // Media
   { id: "media.hardwaremediakeys.enabled", type: "bool" },
+
+  // WATERFOX
+  // Enable auto update checking
+  { id: "app.update.enabled", type: "bool" },
 ]);
 
 if (AppConstants.HAVE_SHELL_SERVICE) {
@@ -884,6 +891,8 @@ var gMainPane = {
         // Start with no option selected since we are still reading the value
         document.getElementById("autoDesktop").removeAttribute("selected");
         document.getElementById("manualDesktop").removeAttribute("selected");
+        // WATERFOX
+        document.getElementById("disabledDesktop").removeAttribute("selected");
         // Start reading the correct value from the disk
         this.readUpdateAutoPref();
         setEventListener("updateRadioGroup", "command", event => {
@@ -2620,8 +2629,19 @@ var gMainPane = {
       let radiogroup = document.getElementById("updateRadioGroup");
 
       radiogroup.disabled = true;
-      let enabled = await UpdateUtils.getAppUpdateAutoEnabled();
-      radiogroup.value = enabled;
+      let autoPref = await UpdateUtils.getAppUpdateAutoEnabled();
+      // WATERFOX
+      // If user sets app.update.enabled to false, set value to disabled, else use enabled
+      var enabledPref = Preferences.get("app.update.enabled");
+
+      if (!enabledPref.value) {
+        // Don't care for autoPref.value in this case.
+        radiogroup.value = "disabled"; // 3. Never check for updates.
+      } else if (autoPref.value) {
+        radiogroup.value = "true"; //1. Automatically install updates
+      } else {
+        radiogroup.value = "false"; // 2. Check, but let me choose
+      }
       radiogroup.disabled = false;
 
       this.maybeDisableBackgroundUpdateControls();
@@ -2644,8 +2664,15 @@ var gMainPane = {
       );
       radiogroup.disabled = true;
       try {
+        // We need to set this pref first so that the auto pref observer
+        // has access to the correct enabled pref value.
+        Services.prefs.setBoolPref(
+          PREF_UPDATE_ENABLED,
+          radiogroup.value != "disabled"
+        );
         await UpdateUtils.setAppUpdateAutoEnabled(updateAutoValue);
         await _disableTimeOverPromise;
+
         radiogroup.disabled = false;
       } catch (error) {
         console.error(error);
@@ -2860,7 +2887,15 @@ var gMainPane = {
       if (aData != "true" && aData != "false") {
         throw new Error("Invalid preference value for app.update.auto");
       }
-      document.getElementById("updateRadioGroup").value = aData;
+      // WATERFOX
+      let manualUpdates = Services.prefs.getBoolPref(
+        "app.update.enabled",
+        true
+      );
+      // Only if enabledPref and autoPref are false should we select
+      // disabled, otherwise we just use the value of autoPref.
+      document.getElementById("updateRadioGroup").value =
+        !manualUpdates && !(aData === "true") ? "disabled" : aData;
       this.maybeDisableBackgroundUpdateControls();
     } else if (aTopic == BACKGROUND_UPDATE_CHANGED_TOPIC) {
       if (!AppConstants.MOZ_UPDATE_AGENT) {
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index 04c8a45a67273..59407ba7a76cb 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -79,6 +79,7 @@
   <link rel="localization" href="security/certificates/deviceManager.ftl"/>
   <link rel="localization" href="toolkit/updates/history.ftl"/>
   <link rel="localization" href="toolkit/global/profileSelection.ftl"/>
+  <link rel="localization" href="browser/waterfox.ftl"/>
 
   <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
 
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
index 28e325c938de7..7427c13c3453c 100644
--- a/browser/components/preferences/privacy.inc.xhtml
+++ b/browser/components/preferences/privacy.inc.xhtml
@@ -1227,7 +1227,7 @@
     <label><html:h2 id="dohGroupMessage" data-l10n-id="preferences-doh-group-message2"/></label>
     <vbox id="dohCategories">
       <radiogroup id="dohCategoryRadioGroup"
-                  preference="network.trr.mode" aria-labelledby="dohGroupMessage">
+                  aria-labelledby="dohGroupMessage">
         <vbox id="dohOptionDefault" class="privacy-detailedoption info-box-container">
           <hbox>
             <radio id="dohDefaultRadio"
@@ -1344,6 +1344,41 @@
             </vbox>
           </vbox>
         </vbox>
+        <vbox id="dohOptionUltra" class="privacy-detailedoption info-box-container">
+          <hbox>
+            <radio id="dohUltraRadio"
+                   value="ultra"
+                   data-l10n-id="preferences-doh-setting-ultra"
+                   flex="1"/>
+            <button id="dohUltraArrow"
+                    is="highlightable-button"
+                    class="arrowhead doh-expand-section"
+                    data-l10n-id="preferences-doh-expand-section"
+                    aria-expanded="false"/>
+          </hbox>
+          <vbox class="indent">
+            <label data-l10n-id="preferences-doh-ultra-desc"></label>
+            <vbox class="extra-information-label">
+              <label data-l10n-id="preferences-doh-ultra-fallback-mode"/>
+              <menulist id="dohUltraFallbackMode"
+                        sizetopopup="none">
+              </menulist>
+            </vbox>
+            <vbox class="privacy-extra-information">
+              <vbox class="indent">
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-1"/>
+                </hbox>
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-2"/>
+                </hbox>
+                <hbox class="extra-information-label">
+                  <label class="doh-label" data-l10n-id="preferences-doh-ultra-detailed-desc-3"/>
+                </hbox>
+              </vbox>
+            </vbox>
+          </vbox>
+        </vbox>
         <vbox id="dohOptionOff" class="privacy-detailedoption info-box-container">
           <hbox>
             <radio id="dohOffRadio"
diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js
index 5722057a06659..9cbe869a45b31 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -269,6 +269,7 @@ Preferences.addAll([
   { id: "network.trr.uri", type: "string" },
   { id: "network.trr.default_provider_uri", type: "string" },
   { id: "network.trr.custom_uri", type: "string" },
+  { id: "network.trr.use_ohttp", type: "bool" },
   { id: "doh-rollout.disable-heuristics", type: "bool" },
 ]);
 
@@ -786,30 +787,68 @@ var gPrivacyPane = {
     let defaultOption = document.getElementById("dohOptionDefault");
     let enabledOption = document.getElementById("dohOptionEnabled");
     let strictOption = document.getElementById("dohOptionStrict");
+    let ultraOption = document.getElementById("dohOptionUltra");
     let offOption = document.getElementById("dohOptionOff");
+    
+    // Clear all selections
     defaultOption.classList.remove("selected");
     enabledOption.classList.remove("selected");
     strictOption.classList.remove("selected");
+    ultraOption.classList.remove("selected");
     offOption.classList.remove("selected");
 
+    // Get the radiogroup and handle selection manually
+    let radioGroup = document.getElementById("dohCategoryRadioGroup");
+
+    // Check if Ultra Protection mode is enabled
+    let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+    
     switch (value) {
       case Ci.nsIDNSService.MODE_NATIVEONLY:
         defaultOption.classList.add("selected");
+        if (radioGroup) radioGroup.value = "0";
         break;
       case Ci.nsIDNSService.MODE_TRRFIRST:
-        enabledOption.classList.add("selected");
+        if (ohttpEnabled) {
+          // Ultra Protection with fallback allowed
+          ultraOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "ultra";
+          // Update the fallback dropdown state
+          let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+          if (fallbackDropdown) {
+            fallbackDropdown.disabled = false;
+            fallbackDropdown.value = "fallback";
+          }
+        } else {
+          enabledOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "2";
+        }
         break;
       case Ci.nsIDNSService.MODE_TRRONLY:
-        strictOption.classList.add("selected");
+        // Ultra Protection is strict mode + OHttp enabled, or regular strict mode
+        if (ohttpEnabled) {
+          ultraOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "ultra";
+          // Update the fallback dropdown state
+          let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+          if (fallbackDropdown) {
+            fallbackDropdown.disabled = false;
+            fallbackDropdown.value = "no-fallback";
+          }
+        } else {
+          strictOption.classList.add("selected");
+          if (radioGroup) radioGroup.value = "3";
+        }
         break;
       case Ci.nsIDNSService.MODE_TRROFF:
         offOption.classList.add("selected");
+        if (radioGroup) radioGroup.value = "5";
         break;
       default:
         // The pref is set to a random value.
         // This shouldn't happen, but let's make sure off is selected.
         offOption.classList.add("selected");
-        document.getElementById("dohCategoryRadioGroup").selectedIndex = 3;
+        if (radioGroup) radioGroup.value = "5";
         break;
     }
 
@@ -836,6 +875,26 @@ var gPrivacyPane = {
       }
     }
 
+    // Handle Ultra Protection mode (OHttp enabled with either TRR First or TRR Only)
+    if (ohttpEnabled && (value == Ci.nsIDNSService.MODE_TRRFIRST || value == Ci.nsIDNSService.MODE_TRRONLY)) {
+      // Ultra Protection mode - ensure OHttp is enabled
+      Services.prefs.setBoolPref("network.trr.use_ohttp", true);
+      // Enable the fallback dropdown
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        fallbackDropdown.disabled = false;
+      }
+    } else if (!ohttpEnabled) {
+      // Not Ultra Protection - ensure OHttp is disabled
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      // Disable the fallback dropdown when not in Ultra mode
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        fallbackDropdown.disabled = true;
+        fallbackDropdown.value = "fallback";
+      }
+    }
+
     // Bug 1900672
     // When the mode is set to 5, clear the pref to ensure that
     // network.trr.uri is set to fallbackProviderURIwhen the mode is set to 2 or 3 afterwards
@@ -853,6 +912,7 @@ var gPrivacyPane = {
     setEventListener("dohDefaultArrow", "command", this.toggleExpansion);
     setEventListener("dohEnabledArrow", "command", this.toggleExpansion);
     setEventListener("dohStrictArrow", "command", this.toggleExpansion);
+    setEventListener("dohUltraArrow", "command", this.toggleExpansion);
 
     function modeButtonPressed(e) {
       // Clicking the active mode again should not generate another event
@@ -866,13 +926,53 @@ var gPrivacyPane = {
       });
     }
 
-    setEventListener("dohDefaultRadio", "command", modeButtonPressed);
-    setEventListener("dohEnabledRadio", "command", modeButtonPressed);
-    setEventListener("dohStrictRadio", "command", modeButtonPressed);
-    setEventListener("dohOffRadio", "command", modeButtonPressed);
+    setEventListener("dohDefaultRadio", "command", (e) => {
+      // Default Protection: Use default mode and disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_NATIVEONLY);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohEnabledRadio", "command", (e) => {
+      // Enabled Protection: Use enabled mode and disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohStrictRadio", "command", (e) => {
+      // Strict Protection: Set TRR to strict mode but disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
+    setEventListener("dohUltraRadio", "command", (e) => {
+      // Ultra Protection: Enable OHttp and set default mode
+      Services.prefs.setBoolPref("network.trr.use_ohttp", true);
+      let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+      if (fallbackDropdown) {
+        // Default to fallback allowed unless user previously selected no-fallback
+        if (fallbackDropdown.value === "no-fallback") {
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+        } else {
+          fallbackDropdown.value = "fallback";
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+        }
+        fallbackDropdown.disabled = false;
+      } else {
+        // Fallback if dropdown not found
+        Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+      }
+      modeButtonPressed(e);
+    });
+    setEventListener("dohOffRadio", "command", (e) => {
+      // Off Protection: Set TRR to off and disable OHttp
+      Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRROFF);
+      Services.prefs.setBoolPref("network.trr.use_ohttp", false);
+      modeButtonPressed(e);
+    });
 
     this.populateDoHResolverList("dohEnabled");
     this.populateDoHResolverList("dohStrict");
+    this.populateUltraFallbackDropdown();
 
     Preferences.get("network.trr.uri").on("change", () => {
       gPrivacyPane.updateDoHResolverList("dohEnabled");
@@ -885,7 +985,19 @@ var gPrivacyPane = {
       "change",
       gPrivacyPane.highlightDoHCategoryAndUpdateStatus
     );
+    // Also listen for OHttp pref changes
+    Preferences.get("network.trr.use_ohttp").on(
+      "change", 
+      gPrivacyPane.highlightDoHCategoryAndUpdateStatus
+    );
+
+
+
+
     this.highlightDoHCategoryAndUpdateStatus();
+    
+    // Initialize Ultra Protection checkbox state
+    this.initUltraProtectionState();
 
     Services.obs.addObserver(this, "network:trr-uri-changed");
     Services.obs.addObserver(this, "network:trr-mode-changed");
@@ -913,6 +1025,54 @@ var gPrivacyPane = {
     }
   },
 
+  populateUltraFallbackDropdown() {
+    let menu = document.getElementById("dohUltraFallbackMode");
+    if (!menu) return;
+
+    // populate the fallback options like provider dropdowns do
+    menu.removeAllItems();
+    
+    let fallbackItem = menu.appendItem("Allow fallback to system DNS if secure DNS fails", "fallback");
+    let noFallbackItem = menu.appendItem("Never fall back to system DNS (sites may not load if secure DNS fails)", "no-fallback");
+    
+    // Set initial selection
+    menu.value = "fallback";
+    
+    // Add event listener
+    menu.addEventListener("command", (e) => {
+      let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+      let trrMode = Services.prefs.getIntPref("network.trr.mode", 0);
+      if (ohttpEnabled && (trrMode == Ci.nsIDNSService.MODE_TRRFIRST || trrMode == Ci.nsIDNSService.MODE_TRRONLY)) {
+        if (e.target.value === "no-fallback") {
+          // No fallback - switch to TRR Only mode
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRONLY);
+        } else {
+          // Allow fallback - switch to TRR First mode
+          Services.prefs.setIntPref("network.trr.mode", Ci.nsIDNSService.MODE_TRRFIRST);
+        }
+      }
+    });
+  },
+
+  initUltraProtectionState() {
+    // Initialize the Ultra Protection fallback dropdown state
+    let ohttpEnabled = Services.prefs.getBoolPref("network.trr.use_ohttp", false);
+    let trrMode = Services.prefs.getIntPref("network.trr.mode", 0);
+    let fallbackDropdown = document.getElementById("dohUltraFallbackMode");
+    
+    if (fallbackDropdown) {      
+      if (ohttpEnabled && (trrMode == Ci.nsIDNSService.MODE_TRRFIRST || trrMode == Ci.nsIDNSService.MODE_TRRONLY)) {
+        // Ultra Protection is active
+        fallbackDropdown.disabled = false;
+        fallbackDropdown.value = (trrMode == Ci.nsIDNSService.MODE_TRRONLY) ? "no-fallback" : "fallback";
+      } else {
+        // Ultra Protection is not active
+        fallbackDropdown.disabled = true;
+        fallbackDropdown.value = "fallback";
+      }
+    }
+  },
+
   initWebAuthn() {
     document.getElementById("openWindowsPasskeySettings").hidden =
       !Services.prefs.getBoolPref(
diff --git a/browser/components/search/SearchSERPTelemetry.sys.mjs b/browser/components/search/SearchSERPTelemetry.sys.mjs
index 8df8608860d4e..21ace89fc4c65 100644
--- a/browser/components/search/SearchSERPTelemetry.sys.mjs
+++ b/browser/components/search/SearchSERPTelemetry.sys.mjs
@@ -264,7 +264,8 @@ class TelemetryHandler {
    * can be tracked.
    */
   async init() {
-    if (this._initialized) {
+    // eslint-disable-next-line no-constant-condition
+    if (this._initialized || true) {
       return;
     }
 
@@ -975,7 +976,7 @@ class TelemetryHandler {
    *   Returns a provider or undefined if no provider was found for the url.
    */
   _getProviderInfoForURL(url) {
-    return this._searchProviderInfo.find(info =>
+    return this._searchProviderInfo?.find(info =>
       info.searchPageRegexp.test(url)
     );
   }
diff --git a/browser/components/search/SearchUIUtils.sys.mjs b/browser/components/search/SearchUIUtils.sys.mjs
index a680a7a12aa10..a5cbe2a5e6971 100644
--- a/browser/components/search/SearchUIUtils.sys.mjs
+++ b/browser/components/search/SearchUIUtils.sys.mjs
@@ -330,16 +330,18 @@ export var SearchUIUtils = {
   },
 
   /**
-   * Loads a search results page, given a set of search terms. Uses the current
-   * engine if the search bar is visible, or the default engine otherwise.
+   * Perform a search initiated by the UI.
    *
    * @param {WindowProxy} window
    *   The window where the search was triggered.
    * @param {string} searchText
    *   The search terms to use for the search.
-   * @param {?string} where
-   *   String indicating where the search should load. Most commonly used
-   *   are 'tab' or 'window', defaults to 'current'.
+   * @param {string} where
+   *   Where the search results should be displayed:
+   *     "tab"      in a new foreground tab;
+   *     "tabshifted" in a new background tab;
+   *     "window"   in a new window;
+   *     "current"  in the current tab.
    * @param {boolean} usePrivate
    *   Whether to use the Private Browsing mode default search engine.
    *   Defaults to `false`.
@@ -347,15 +349,16 @@ export var SearchUIUtils = {
    *   The principal to use for a new window or tab.
    * @param {nsIContentSecurityPolicy} csp
    *   The content security policy to use for a new window or tab.
-   * @param {boolean} [inBackground=false]
-   *   Set to true for the tab to be loaded in the background.
-   * @param {?nsISearchEngine} [engine=null]
-   *   The search engine to use for the search.
-   * @param {?NativeTab} [tab=null]
-   *   The tab to show the search result.
-   *
-   * @returns {Promise<?{engine: nsISearchEngine, url: nsIURI}>}
-   *   Object containing the search engine used to perform the
+   * @param {boolean} inBackground
+   *   Whether to open the new tab in the background.
+   * @param {nsISearchEngine} [engine]
+   *   Optional. The search engine to use.
+   * @param {object} [tab]
+   *   Optional. The tab to use for the search.
+   * @param {number|null} [userContextId]
+   *   Optional. The container userContextId to use for the search tab.
+   * @returns {object | null}
+   *   An object containing information about the performed
    *   search and the url, or null if no search was performed.
    */
   async _loadSearch(
@@ -367,7 +370,8 @@ export var SearchUIUtils = {
     csp,
     inBackground = false,
     engine = null,
-    tab = null
+    tab = null,
+    userContextId = null
   ) {
     if (!triggeringPrincipal) {
       throw new Error(
@@ -399,6 +403,7 @@ export var SearchUIUtils = {
       triggeringPrincipal,
       csp,
       targetBrowser: tab?.linkedBrowser,
+      userContextId,
       globalHistoryOptions: {
         triggeringSearchEngine: engine.name,
       },
@@ -439,9 +444,30 @@ export var SearchUIUtils = {
       // override: historically search opens in new tab
       where = "tab";
     }
-    if (usePrivate && !lazy.PrivateBrowsingUtils.isWindowPrivate(window)) {
+
+    const isPrivateWindow = lazy.PrivateBrowsingUtils.isWindowPrivate(window);
+    let isPrivateContainerTab = false;
+    let userContextId = null;
+
+    if (!isPrivateWindow && window.PrivateTab?.container?.userContextId) {
+      try {
+        const tab = window.gBrowser?.selectedTab;
+        if (tab && window.PrivateTab?.isPrivate?.(tab)) {
+          isPrivateContainerTab = true;
+          userContextId = window.PrivateTab.container.userContextId;
+        }
+      } catch (e) {
+        // Ignore and fall back to window-level privacy only
+      }
+    }
+
+    // For real private windows, keep behavior. For non-private windows:
+    // - If this is a PrivateTab container tab, keep using a tab.
+    // - Otherwise, open a new private window as before.
+    if (usePrivate && !isPrivateWindow && !isPrivateContainerTab) {
       where = "window";
     }
+
     let inBackground = Services.prefs.getBoolPref(
       "browser.search.context.loadInBackground"
     );
@@ -449,16 +475,28 @@ export var SearchUIUtils = {
       inBackground = !inBackground;
     }
 
+    let engineOverride = null;
+    let usePrivateForWindow = usePrivate;
+    if (usePrivate && isPrivateContainerTab) {
+      // Use the private default engine in a PrivateTab container tab, but do not
+      // open a real private window.
+      usePrivateForWindow = false;
+      engineOverride = await Services.search.getDefaultPrivate();
+    }
+
     let searchInfo = await SearchUIUtils._loadSearch(
       window,
       searchText,
       where,
-      usePrivate,
+      usePrivateForWindow,
       Services.scriptSecurityManager.createNullPrincipal(
         triggeringPrincipal.originAttributes
       ),
       csp,
-      inBackground
+      inBackground,
+      engineOverride,
+      null,
+      userContextId
     );
 
     if (searchInfo) {
diff --git a/browser/components/search/content/searchbar.js b/browser/components/search/content/searchbar.js
index e0db48bf0be8e..0c44298e992b0 100644
--- a/browser/components/search/content/searchbar.js
+++ b/browser/components/search/content/searchbar.js
@@ -532,15 +532,16 @@
 
     /**
      * Determines if we should select all the text in the searchbar based on the
-     * searchbar state, and whether the selection is empty.
+     * clickSelectsAll pref, searchbar state, and whether the selection is empty.
      */
     _maybeSelectAll() {
       if (
         !this._preventClickSelectsAll &&
+        UrlbarPrefs.get("clickSelectsAll") &&
         document.activeElement == this._textbox &&
         this._textbox.selectionStart == this._textbox.selectionEnd
       ) {
-        this.select();
+        this._textbox.editor.selectAll();
       }
     }
 
@@ -647,6 +648,11 @@
           // is text in the textbox.
           this.openSuggestionsPanel(true);
         }
+
+        if (event.detail == 2 && UrlbarPrefs.get("doubleClickSelectsAll")) {
+          this._textbox.editor.selectAll();
+          event.preventDefault();
+        }
       });
     }
 
diff --git a/browser/components/search/jar.mn b/browser/components/search/jar.mn
index 8fb17f801455c..91ee00801034e 100644
--- a/browser/components/search/jar.mn
+++ b/browser/components/search/jar.mn
@@ -11,6 +11,6 @@ browser.jar:
         content/browser/contentSearchUI.js                          (content/contentSearchUI.js)
         content/browser/contentSearchHandoffUI.js                   (content/contentSearchHandoffUI.js)
         content/browser/contentSearchUI.css                         (content/contentSearchUI.css)
-        search-extensions/                                          (extensions/**)
+#       search-extensions/                                          (extensions/**)
 
 % resource search-extensions %search-extensions/ contentaccessible=yes
diff --git a/browser/components/shell/ShellService.sys.mjs b/browser/components/shell/ShellService.sys.mjs
index 20e50d875c66d..207b253c4a238 100644
--- a/browser/components/shell/ShellService.sys.mjs
+++ b/browser/components/shell/ShellService.sys.mjs
@@ -261,10 +261,10 @@ let ShellServiceInternal = {
         lazy.NimbusFeatures.shellService.getVariable("setDefaultPDFHandler")
       ) {
         if (this._shouldSetDefaultPDFHandler()) {
-          lazy.log.info("Setting Firefox as default PDF handler");
-          extraFileExtensions.push(".pdf", "FirefoxPDF");
+          lazy.log.info("Setting Waterfox as default PDF handler");
+          extraFileExtensions.push(".pdf", "WaterfoxPDF");
         } else {
-          lazy.log.info("Not setting Firefox as default PDF handler");
+          lazy.log.info("Not setting Waterfox as default PDF handler");
         }
       }
       try {
@@ -300,7 +300,7 @@ let ShellServiceInternal = {
       try {
         this.defaultAgent.setDefaultExtensionHandlersUserChoice(aumi, [
           ".pdf",
-          "FirefoxPDF",
+          "WaterfoxPDF",
         ]);
       } catch (err) {
         telemetryResult = "ErrOther";
diff --git a/browser/components/shell/WindowsDefaultBrowser.cpp b/browser/components/shell/WindowsDefaultBrowser.cpp
index f39425829e846..cdb6aeebde802 100644
--- a/browser/components/shell/WindowsDefaultBrowser.cpp
+++ b/browser/components/shell/WindowsDefaultBrowser.cpp
@@ -25,7 +25,7 @@
 #include <wchar.h>
 #include <windows.h>
 
-#define APP_REG_NAME_BASE L"Firefox-"
+#define APP_REG_NAME_BASE L"Waterfox-"
 
 static bool IsWindowsLogonConnected() {
   WCHAR userName[UNLEN + 1];
diff --git a/browser/components/shell/WindowsUserChoice.h b/browser/components/shell/WindowsUserChoice.h
index b4925c0552be3..29591bae6800c 100644
--- a/browser/components/shell/WindowsUserChoice.h
+++ b/browser/components/shell/WindowsUserChoice.h
@@ -96,7 +96,7 @@ mozilla::UniquePtr<wchar_t[]> GenerateUserChoiceHash(const wchar_t* aExt,
 /*
  * Build a ProgID from a base and AUMI
  *
- * @param aProgIDBase   A base, such as FirefoxHTML or FirefoxURL
+ * @param aProgIDBase   A base, such as WaterfoxHTML or WaterfoxURL
  * @param aAumi         The AUMI of the installation
  *
  * @return Formatted ProgID.
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index 82ac52d14381f..66b7696e9c68b 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -339,21 +339,21 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) {
     nsresult rv;
     bool result = true;
 
-    // "FirefoxURL".
+    // "WaterfoxURL".
     rv = GetMsixProgId(L"https", extraProgID);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
     result = result && CheckProgIDExists(extraProgID.get());
 
-    // "FirefoxHTML".
+    // "WaterfoxHTML".
     rv = GetMsixProgId(L".htm", extraProgID);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
     result = result && CheckProgIDExists(extraProgID.get());
 
-    // "FirefoxPDF".
+    // "WaterfoxPDF".
     rv = GetMsixProgId(L".pdf", extraProgID);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
@@ -363,9 +363,9 @@ nsWindowsShellService::CheckAllProgIDsExist(bool* aResult) {
     *aResult = result;
   } else {
     *aResult =
-        CheckProgIDExists(FormatProgID(L"FirefoxURL", aumid.get()).get()) &&
-        CheckProgIDExists(FormatProgID(L"FirefoxHTML", aumid.get()).get()) &&
-        CheckProgIDExists(FormatProgID(L"FirefoxPDF", aumid.get()).get());
+        CheckProgIDExists(FormatProgID(L"WaterfoxURL", aumid.get()).get()) &&
+        CheckProgIDExists(FormatProgID(L"WaterfoxHTML", aumid.get()).get()) &&
+        CheckProgIDExists(FormatProgID(L"WaterfoxPDF", aumid.get()).get());
   }
 
   return NS_OK;
@@ -712,7 +712,7 @@ nsWindowsShellService::SetDesktopBackground(dom::Element* aElement,
                               getter_AddRefs(file));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // eventually, the path is "%APPDATA%\Mozilla\Firefox\Desktop Background.bmp"
+  // eventually, the path is "%APPDATA%\BrowserWorks\Waterfox\Desktop Background.bmp"
   rv = file->Append(fileLeafName);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/browser/components/shell/test/browser_setDefaultPDFHandler.js b/browser/components/shell/test/browser_setDefaultPDFHandler.js
index 321a863eaaf1b..09ddc4bc551c7 100644
--- a/browser/components/shell/test/browser_setDefaultPDFHandler.js
+++ b/browser/components/shell/test/browser_setDefaultPDFHandler.js
@@ -82,7 +82,7 @@ add_task(async function remoteEnableWithPDF() {
   Assert.ok(setDefaultBrowserUserChoiceStub.called);
   Assert.deepEqual(setDefaultBrowserUserChoiceStub.firstCall.args, [
     aumi,
-    [".pdf", "FirefoxPDF"],
+    [".pdf", "WaterfoxPDF"],
   ]);
 
   await doCleanup();
@@ -129,7 +129,7 @@ add_task(async function remoteEnableWithPDF_testOnlyReplaceBrowsers() {
     Assert.ok(setDefaultBrowserUserChoiceStub.called);
     Assert.deepEqual(
       setDefaultBrowserUserChoiceStub.firstCall.args,
-      [aumi, [".pdf", "FirefoxPDF"]],
+      [aumi, [".pdf", "WaterfoxPDF"]],
       `Will take default from missing association or known browser with ProgID '${progId}'`
     );
   }
diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
index 597da4246167f..00f3141a7924e 100644
--- a/browser/components/sidebar/browser-sidebar.js
+++ b/browser/components/sidebar/browser-sidebar.js
@@ -580,6 +580,165 @@ var SidebarController = {
     );
   },
 
+  _toggleTreeInProgress: false,
+
+  /**
+   * Toggle the vertical tabs preference.
+   */
+  async toggleTreeVerticalTabs(shouldShow) {
+    // Using a lock to prevent re-entrancy from the preference observer
+    // while the function is already being executed from the UI event.
+    if (this._toggleTreeInProgress) {
+      return;
+    }
+    this._toggleTreeInProgress = true;
+
+    try {
+      const treeVerticalTabsBox = document.querySelector(
+        "#tree-vertical-tabs-box"
+      );
+      const verticalTabs = document.querySelector("#vertical-tabs");
+      shouldShow ??= !this.treeVerticalTabsBrowser;
+      const addon = await AddonManager.getAddonByID("sidebar@waterfox.net");
+      if (shouldShow != this.treeVerticalTabsEnabled) {
+        Services.prefs.setBoolPref("browser.sidebar.enabled", shouldShow);
+      }
+      if (shouldShow) {
+        if (this.treeVerticalTabsBrowser) {
+          return;
+        }
+        if (!addon.isActive) {
+          await addon.enable({ allowSystemAddons: true });
+        }
+        await addon.startupPromise;
+        if (!Services.prefs.getBoolPref("sidebar.revamp")) {
+          await this.toggleRevampSidebar();
+        }
+        if (!Services.prefs.getBoolPref("sidebar.verticalTabs")) {
+          Services.prefs.setBoolPref("sidebar.verticalTabs", true);
+          // The sidebar-main maybe not initialized yet at the first time.
+          while (!this.sidebarMain.requestUpdate) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+          this.toggleTabstrip();
+        }
+
+        treeVerticalTabsBox.removeAttribute("hidden");
+        treeVerticalTabsBox.setAttribute("shown", true);
+
+        verticalTabs.setAttribute("hidden", true);
+        verticalTabs.removeAttribute("visible");
+
+        const policy = WebExtensionPolicy.getByID("sidebar@waterfox.net");
+
+        const treeVerticalTabs = document.createXULElement("browser");
+        treeVerticalTabs.setAttribute("id", "tree-vertical-tabs");
+        treeVerticalTabs.setAttribute("type", "content");
+        treeVerticalTabs.setAttribute("flex", "1");
+        treeVerticalTabs.setAttribute("disableglobalhistory", "true");
+        treeVerticalTabs.setAttribute(
+          "messagemanagergroup",
+          "webext-browsers"
+        );
+        treeVerticalTabs.setAttribute("webextension-view-type", "sidebar");
+        treeVerticalTabs.setAttribute("context", "contentAreaContextMenu");
+        treeVerticalTabs.setAttribute("tooltip", "aHTMLTooltip");
+        treeVerticalTabs.setAttribute("autocompletepopup", "PopupAutoComplete");
+        treeVerticalTabs.setAttribute("transparent", "true");
+        treeVerticalTabs.setAttribute("remote", "true");
+        treeVerticalTabs.setAttribute("remoteType", "extension");
+        treeVerticalTabs.setAttribute("maychangeremoteness", "true");
+        treeVerticalTabs.setAttribute("remoteType", "extension");
+        treeVerticalTabs.setAttribute("transparent", "true");
+        treeVerticalTabs.setAttribute(
+          "initialBrowsingContextGroupId",
+          policy.browsingContextGroupId
+        );
+
+        const { ExtensionUtils } = ChromeUtils.importESModule(
+          "resource://gre/modules/ExtensionUtils.sys.mjs"
+        );
+        const { promiseEvent } = ExtensionUtils;
+        const initBrowser = () => {
+          const { ExtensionParent } = ChromeUtils.importESModule(
+            "resource://gre/modules/ExtensionParent.sys.mjs"
+          );
+          ExtensionParent.apiManager.emit(
+            "extension-browser-inserted",
+            treeVerticalTabs,
+            {}
+          );
+          treeVerticalTabs.messageManager.loadFrameScript(
+            "chrome://extensions/content/ext-browser-content.js",
+            false,
+            true
+          );
+          treeVerticalTabs.messageManager.sendAsyncMessage(
+            "Extension:InitBrowser",
+            {}
+          );
+
+          const sidebarPanelUrl = policy.getURL("sidebar/sidebar.html");
+          const uri = Services.io.newURI(sidebarPanelUrl);
+          const triggeringPrincipal =
+            Services.scriptSecurityManager.createContentPrincipal(uri, {});
+          treeVerticalTabs.fixupAndLoadURIString(sidebarPanelUrl, {
+            triggeringPrincipal,
+          });
+        };
+        promiseEvent(treeVerticalTabs, "XULFrameLoaderCreated").then(
+          initBrowser
+        );
+        treeVerticalTabs.addEventListener(
+          "DidChangeBrowserRemoteness",
+          initBrowser
+        );
+
+        treeVerticalTabsBox.appendChild(treeVerticalTabs);
+
+        const event = new CustomEvent("TreeVerticalTabsShown", {
+          bubbles: true,
+        });
+        treeVerticalTabsBox.dispatchEvent(event);
+      } else {
+        const treeVerticalTabs = this.treeVerticalTabsBrowser;
+        if (!treeVerticalTabs) {
+          return;
+        }
+        const uri = Services.io.newURI("about:blank");
+        const triggeringPrincipal =
+          Services.scriptSecurityManager.createContentPrincipal(uri, {});
+        treeVerticalTabs.fixupAndLoadURIString("about:blank", {
+          triggeringPrincipal,
+        });
+        treeVerticalTabsBox.removeChild(treeVerticalTabs);
+
+        treeVerticalTabsBox.setAttribute("hidden", true);
+        treeVerticalTabsBox.removeAttribute("shown");
+
+        verticalTabs.removeAttribute("hidden");
+        if (Services.prefs.getBoolPref("sidebar.verticalTabs")) {
+          verticalTabs.setAttribute("visible", "");
+        }
+
+        const event = new CustomEvent("TreeVerticalTabsHidden", {
+          bubbles: true,
+        });
+        treeVerticalTabsBox.dispatchEvent(event);
+
+        if (!shouldShow && addon.isActive) {
+          await addon.disable({ allowSystemAddons: true });
+        }
+      }
+    } finally {
+      this._toggleTreeInProgress = false;
+    }
+  },
+
+  get treeVerticalTabsBrowser() {
+    return document.querySelector("#tree-vertical-tabs");
+  },
+
   /**
    * The handler for Services.obs.addObserver.
    */
@@ -760,6 +919,7 @@ var SidebarController = {
     if (content && content.updatePosition) {
       content.updatePosition();
     }
+    this.treeVerticalTabsBrowser?.reload();
   },
 
   /**
@@ -857,6 +1017,10 @@ var SidebarController = {
       return;
     }
 
+    if (this.treeVerticalTabsEnabled) {
+      this.toggleTreeVerticalTabs();
+    }
+
     let sourceWindow = window.opener;
     // No source window means this is the initial window.  If we're being
     // opened from another window, check that it is one we might open a sidebar
@@ -1979,6 +2143,9 @@ var SidebarController = {
       arrowScrollbox.setAttribute("orient", "horizontal");
       tabStrip.removeAttribute("expanded");
       tabStrip.setAttribute("orient", "horizontal");
+      if (this.treeVerticalTabsEnabled) {
+         this.toggleTreeVerticalTabs(false);
+       }
     }
 
     let verticalToolbar = document.getElementById(
@@ -2307,3 +2474,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
     }
   }
 );
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  SidebarController,
+  "treeVerticalTabsEnabled",
+  "browser.sidebar.enabled",
+  false,
+  (_aPreference, _previousValue, newValue) => {
+    SidebarController.toggleTreeVerticalTabs(newValue);
+  }
+);
diff --git a/browser/components/sidebar/sidebar-customize.html b/browser/components/sidebar/sidebar-customize.html
index 3996bae0ea6ec..70014e75775f8 100644
--- a/browser/components/sidebar/sidebar-customize.html
+++ b/browser/components/sidebar/sidebar-customize.html
@@ -14,6 +14,7 @@
     <title data-l10n-id="sidebar-customize-title"></title>
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="browser/sidebar.ftl" />
+    <link rel="localization" href="browser/waterfox.ftl" />
     <link
       rel="stylesheet"
       href="chrome://browser/content/sidebar/sidebar.css"
diff --git a/browser/components/sidebar/sidebar-customize.mjs b/browser/components/sidebar/sidebar-customize.mjs
index b9036bd22d847..c9c130143e1ab 100644
--- a/browser/components/sidebar/sidebar-customize.mjs
+++ b/browser/components/sidebar/sidebar-customize.mjs
@@ -296,6 +296,15 @@ export class SidebarCustomize extends SidebarPage {
                 ?disabled=${this.getWindow().SidebarController._state
                   .revampVisibility === "expand-on-hover"}
               ></moz-checkbox>
+              <moz-checkbox
+                slot="nested"
+                type="checkbox"
+                id="tree-vertical-tabs"
+                name="treeVerticalTabs"
+                data-l10n-id="sidebar-tree-vertical-tabs"
+                @change=${this.#handleTreeVerticalTabsChange}
+                ?checked=${this.getWindow().SidebarController.treeVerticalTabsEnabled}
+              ></moz-checkbox>
             `
           )}
           </moz-checkbox>
@@ -356,6 +365,11 @@ export class SidebarCustomize extends SidebarPage {
     });
   }
 
+  #handleTreeVerticalTabsChange(e) {
+    e.stopPropagation();
+    this.getWindow().SidebarController.toggleTreeVerticalTabs(e.target.checked);
+  }
+
   #toggleExpandOnHover(e) {
     e.stopPropagation();
     if (e.target.checked) {
diff --git a/browser/components/sidebar/sidebar-main.mjs b/browser/components/sidebar/sidebar-main.mjs
index 0b6d809f0a10e..42a5bca380a95 100644
--- a/browser/components/sidebar/sidebar-main.mjs
+++ b/browser/components/sidebar/sidebar-main.mjs
@@ -132,6 +132,9 @@ export default class SidebarMain extends MozLitElement {
   }
 
   onSidebarPopupShowing(event) {
+    if (event.target == SidebarController.treeVerticalTabsBrowser) {
+      return;
+    }
     // Store the context menu target which holds the id required for managing sidebar items
     let targetHost = event.explicitOriginalTarget.getRootNode().host;
     let toolbarContextMenuTarget =
diff --git a/browser/components/tabbrowser/content/tab-hover-preview.mjs b/browser/components/tabbrowser/content/tab-hover-preview.mjs
index 3280a391bd801..05259df4702c7 100644
--- a/browser/components/tabbrowser/content/tab-hover-preview.mjs
+++ b/browser/components/tabbrowser/content/tab-hover-preview.mjs
@@ -62,7 +62,14 @@ export default class TabHoverPreviewPanel {
     this._panelOpener = new TabPreviewPanelTimedFunction(
       () => {
         if (!this._isDisabled()) {
-          this._panel.openPopup(this._tab, this.#popupOptions);
+          if (this._win.SidebarController.treeVerticalTabsEnabled &&
+              typeof this.__ws__top == 'number') {
+            const [x, y] = this.calculateCoordinatesForVertical();
+            this._panel.openPopupAtScreen(x, y, false);
+          }
+          else {
+            this._panel.openPopup(this._tab, this.#popupOptions);
+          }
         }
       },
       this._prefPreviewDelay,
@@ -165,6 +172,18 @@ export default class TabHoverPreviewPanel {
       });
   }
 
+  calculateCoordinatesForVertical() {
+    const treeVerticalTabs = this._win.document.querySelector('#tree-vertical-tabs');
+    const treeVerticalTabsRect = treeVerticalTabs.getBoundingClientRect();
+    const align = Services.prefs.getBoolPref('sidebar.position_start') ? 'left' : 'right';
+    const previewRect = this._panel.getBoundingClientRect();
+    const x = align == 'left' ?
+      treeVerticalTabs.screenX + treeVerticalTabsRect.width - 2 :
+      treeVerticalTabs.screenX - previewRect.width + 2;
+    const y = Math.min(treeVerticalTabs.screenY + this.__ws__top, treeVerticalTabs.screenY + treeVerticalTabsRect.height - previewRect.height);
+    return [x, y];
+  }
+
   activate(tab) {
     if (this._isDisabled()) {
       return;
@@ -270,6 +289,12 @@ export default class TabHoverPreviewPanel {
 
   _movePanel() {
     if (this._tab) {
+      if (this._win.SidebarController.treeVerticalTabsEnabled &&
+          typeof this.__ws__top == 'number') {
+        const [x, y] = this.calculateCoordinatesForVertical();
+        this._panel.moveTo(x, y);
+        return;
+      }
       this._panel.moveToAnchor(
         this._tab,
         this.#popupOptions.position,
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 37570c54b06f9..30bcd3530113f 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -117,7 +117,7 @@
       });
       ChromeUtils.defineLazyGetter(this, "tabLocalization", () => {
         return new Localization(
-          ["browser/tabbrowser.ftl", "branding/brand.ftl"],
+          ["browser/tabbrowser.ftl", "branding/brand.ftl", "browser/waterfox.ftl"],
           true
         );
       });
@@ -1303,6 +1303,7 @@
       if (!this._previewMode) {
         newTab.recordTimeFromUnloadToReload();
         newTab.updateLastAccessed();
+        newTab.removeAttribute("unread");
         oldTab.updateLastAccessed();
         // if this is the foreground window, update the last-seen timestamps.
         if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1381,6 +1382,9 @@
           },
         });
         newTab.dispatchEvent(event);
+        
+        // Notify observers for native tab grouping feature
+        Services.obs.notifyObservers(newTab, "browser-tab-activated");
 
         this._tabAttrModified(oldTab, ["selected"]);
         this._tabAttrModified(newTab, ["selected"]);
@@ -3806,36 +3810,65 @@
       // default to true: if it were false, we wouldn't get this far
       var warnOnClose = { value: true };
 
+      let restoreSession;
+      let startupPref = Services.prefs.getIntPref("browser.startup.page");
+
+      // If we are set to anything other than restore session,
+      // leave its value.
+      if (startupPref != 3) {
+        restoreSession = { value: false };
+      } else {
+        restoreSession = { value: true };
+      }
+
       // focus the window before prompting.
       // this will raise any minimized window, which will
       // make it obvious which window the prompt is for and will
       // solve the problem of windows "obscuring" the prompt.
       // see bug #350299 for more details
       window.focus();
-      const [title, button, checkbox] = this.tabLocalization.formatValuesSync([
+      const [title, button, checkbox, checkboxLabel2] = this.tabLocalization.formatValuesSync([
         {
           id: "tabbrowser-confirm-close-tabs-title",
           args: { tabCount: tabsToClose },
         },
         { id: "tabbrowser-confirm-close-tabs-button" },
         { id: "tabbrowser-ask-close-tabs-checkbox" },
+        { id: "tabbrowser-confirm-session-restore-checkbox" }
       ]);
       let flags =
         ps.BUTTON_TITLE_IS_STRING * ps.BUTTON_POS_0 +
         ps.BUTTON_TITLE_CANCEL * ps.BUTTON_POS_1;
       let checkboxLabel =
         aCloseTabs == this.closingTabsEnum.ALL ? checkbox : null;
-      var buttonPressed = ps.confirmEx(
-        window,
-        title,
-        null,
-        flags,
-        button,
-        null,
-        null,
-        checkboxLabel,
-        warnOnClose
-      );
+      var buttonPressed;
+      if (Services.prefs.getBoolPref("browser.tabs.warnOnCloseOtherTabs")) {
+        buttonPressed = ps.confirmEx(
+          window,
+          title,
+          null,
+          flags,
+          button,
+          null,
+          null,
+          checkboxLabel,
+          warnOnClose
+        );
+      } else if (Services.prefs.getBoolPref("browser.tabs.warnOnClose")) {
+        buttonPressed = ps.confirmEx2(
+          window,
+          title,
+          null,
+          flags,
+          button,
+          null,
+          null,
+          checkboxLabel,
+          warnOnClose,
+          checkboxLabel2,
+          restoreSession
+        );
+      }
 
       var reallyClose = buttonPressed == 0;
 
@@ -3848,6 +3881,16 @@
         Services.prefs.setBoolPref(pref, false);
       }
 
+      if (buttonPressed == 0) {
+        if (!restoreSession.value) {
+          if (startupPref === 3) {
+            Services.prefs.setIntPref("browser.startup.page", 1);
+          }
+        } else if (restoreSession.value) {
+          Services.prefs.setIntPref("browser.startup.page", 3);
+        }
+      }
+
       return reallyClose;
     }
 
@@ -3997,6 +4040,9 @@
         detail: eventDetail || {},
       });
       tab.dispatchEvent(evt);
+      
+      // Notify observers for native tab grouping feature
+      Services.obs.notifyObservers(tab, "browser-tab-created");
     }
 
     /**
@@ -4973,6 +5019,8 @@
     }
 
     _endRemoveTab(aTab) {
+      // Notify observers for native tab grouping feature
+      Services.obs.notifyObservers(aTab, "browser-tab-removed");
       if (!aTab || !aTab._endRemoveArgs) {
         return;
       }
@@ -7180,6 +7228,10 @@
         // Intentional fallthrough
         case "deactivate":
           this.selectedTab.updateLastSeenActive();
+          // Notify observers for native tab grouping feature
+          if (aEvent.type === "activate") {
+            Services.obs.notifyObservers(null, "browser-window-focus-changed");
+          }
           break;
       }
     }
@@ -8094,6 +8146,9 @@
 
             this.mTab.setAttribute("bursting", "true");
           }
+
+          if (!this.mTab.selected)
+            this.mTab.setAttribute("unread", "true");
         }
 
         if (this.mTab.hasAttribute("progress")) {
diff --git a/browser/components/tests/browser/browser.ini b/browser/components/tests/browser/browser.ini
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/browser/components/tests/browser/browser_close_disabled.js b/browser/components/tests/browser/browser_close_disabled.js
new file mode 100644
index 0000000000000..3af90764c4e57
--- /dev/null
+++ b/browser/components/tests/browser/browser_close_disabled.js
@@ -0,0 +1,62 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+add_task(async function test_appMenu_close_disabled() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.closeShortcut.disabled", true]],
+  });
+
+  let win = await BrowserTestUtils.openNewBrowserWindow();
+  let doc = win.document;
+
+  let menuButton = doc.getElementById("PanelUI-menu-button");
+  menuButton.click();
+  await BrowserTestUtils.waitForEvent(win.PanelUI.mainView, "ViewShown");
+
+  let closeButton = doc.querySelector(`[key="key_closeWindow"]`);
+  is(closeButton, null, "No close button with shortcut key");
+
+  await BrowserTestUtils.closeWindow(win);
+
+  await SpecialPowers.popPrefEnv();
+});
+
+add_task(async function test_close_shortcut_disabled() {
+  async function testCloseShortcut(shouldClose) {
+    let win = await BrowserTestUtils.openNewBrowserWindow();
+
+    let closeRequested = false;
+    let observer = {
+      observe(subject, topic, data) {
+        is(topic, "close-application-requested", "Right observer topic");
+        ok(shouldClose, "Close shortcut should NOT have worked");
+
+        // Don't actually close the browser when testing.
+        let cancelClose = subject.QueryInterface(Ci.nsISupportsPRBool);
+        cancelClose.data = true;
+
+        closeRequested = true;
+      },
+    };
+    Services.obs.addObserver(observer, "close-application-requested");
+
+    let modifiers = { accelKey: true };
+    if (AppConstants.platform == "win") {
+      modifiers.shiftKey = true;
+    }
+    EventUtils.synthesizeKey("w", modifiers, win);
+
+    await BrowserTestUtils.closeWindow(win);
+    Services.obs.removeObserver(observer, "close-application-requested");
+
+    is(closeRequested, shouldClose, "Expected close state");
+  }
+
+  // Close shortcut should work when pref is not set.
+  await testCloseShortcut(true);
+
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.closeShortcut.disabled", true]],
+  });
+  await testCloseShortcut(false);
+});
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index cbe8cc6d94e9b..483cef4324eb2 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -4077,11 +4077,15 @@ export class UrlbarInput {
 
   /**
    * Determines if we should select all the text in the Urlbar based on the
-   *  Urlbar state, and whether the selection is empty.
+   * clickSelectsAll pref, Urlbar state, and whether the selection is empty.
+   *
+   * @param {boolean} [ignoreClickSelectsAllPref]
+   *        If true, the browser.urlbar.clickSelectsAll pref will be ignored.
    */
-  _maybeSelectAll() {
+  _maybeSelectAll(ignoreClickSelectsAllPref = false) {
     if (
       !this._preventClickSelectsAll &&
+      (ignoreClickSelectsAllPref || lazy.UrlbarPrefs.get("clickSelectsAll")) &&
       this._compositionState != lazy.UrlbarUtils.COMPOSITION.COMPOSING &&
       this.focused &&
       this.inputField.selectionStart == this.inputField.selectionEnd
@@ -4214,7 +4218,9 @@ export class UrlbarInput {
       return;
     }
 
-    this._maybeSelectAll();
+    // If the user right clicks, we select all regardless of the value of
+    // the browser.urlbar.clickSelectsAll pref.
+    this._maybeSelectAll(/* ignoreClickSelectsAllPref */ event.button == 2);
   }
 
   _on_focus(event) {
@@ -4263,7 +4269,7 @@ export class UrlbarInput {
       }
 
       if (this.inputField.hasAttribute("refocused-by-panel")) {
-        this._maybeSelectAll();
+        this._maybeSelectAll(true);
       }
     }
 
@@ -4325,7 +4331,10 @@ export class UrlbarInput {
           this.inputField.setSelectionRange(0, 0);
         }
 
-        if (event.target.classList.contains(SEARCH_BUTTON_CLASS)) {
+        if (event.detail == 2 && lazy.UrlbarPrefs.get("doubleClickSelectsAll")) {
+          this.editor.selectAll();
+          event.preventDefault();
+        } else if (event.target.classList.contains(SEARCH_BUTTON_CLASS)) {
           this._preventClickSelectsAll = true;
           this.search(lazy.UrlbarTokenizer.RESTRICT.SEARCH);
         } else {
diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
index 1c47a5000bbcd..95d56e6c56371 100644
--- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
+++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
@@ -75,6 +75,11 @@ const PREF_URLBAR_DEFAULTS = new Map([
   // active view if the the view utilizes OpenSearch.
   ["contextualSearch.enabled", true],
 
+  // If true, this optimizes for replacing the full URL rather than editing
+  // part of it. This also copies the urlbar value to the selection clipboard
+  // on systems that support it.
+  ["clickSelectsAll", false],
+
   // Whether using `ctrl` when hitting return/enter in the URL bar
   // (or clicking 'go') should prefix 'www.' and suffix
   // browser.fixup.alternate.suffix to the URL bar value prior to
@@ -90,6 +95,11 @@ const PREF_URLBAR_DEFAULTS = new Map([
   // "heuristic" result).  We fetch it as fast as possible.
   ["delay", 50],
 
+  // If true, this optimizes for replacing the full URL rather than selecting a
+  // portion of it. This also copies the urlbar value to the selection
+  // clipboard on systems that support it.
+  ["doubleClickSelectsAll", false],
+
   // Ensure we use trailing dots for DNS lookups for single words that could
   // be hosts.
   ["dnsResolveFullyQualifiedNames", true],
diff --git a/browser/components/urlbar/tests/browser/browser_doubleClickSelectsAll.js b/browser/components/urlbar/tests/browser/browser_doubleClickSelectsAll.js
new file mode 100644
index 0000000000000..2cd2e7802d619
--- /dev/null
+++ b/browser/components/urlbar/tests/browser/browser_doubleClickSelectsAll.js
@@ -0,0 +1,45 @@
+/* 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/. */
+
+ function doubleClick(target) {
+    let promise = BrowserTestUtils.waitForEvent(target, "dblclick");
+    EventUtils.synthesizeMouseAtCenter(
+      target,
+      { clickCount: 1 },
+      target.ownerGlobal
+    );
+    EventUtils.synthesizeMouseAtCenter(
+      target,
+      { clickCount: 2 },
+      target.ownerGlobal
+    );
+    return promise;
+  }
+  
+  add_task(async function() {
+    await SpecialPowers.pushPrefEnv({
+      set: [
+        ["browser.urlbar.clickSelectsAll", false],
+        ["browser.urlbar.doubleClickSelectsAll", true],
+      ],
+    });
+  
+    let url = "about:mozilla";
+    let win = await BrowserTestUtils.openNewBrowserWindow();
+    await BrowserTestUtils.openNewForegroundTab({ gBrowser: win.gBrowser, url });
+  
+    await doubleClick(win.gURLBar.inputField);
+    is(
+      win.gURLBar.selectionStart,
+      0,
+      "Selection should start at the beginning of the urlbar value"
+    );
+    is(
+      win.gURLBar.selectionEnd,
+      url.length,
+      "Selection should end at the end of the urlbar value"
+    );
+  
+    win.close();
+  });
\ No newline at end of file
diff --git a/browser/extensions/newtab/content-src/components/Sections/Sections.jsx b/browser/extensions/newtab/content-src/components/Sections/Sections.jsx
index fa3c9c84184d2..872866766e913 100644
--- a/browser/extensions/newtab/content-src/components/Sections/Sections.jsx
+++ b/browser/extensions/newtab/content-src/components/Sections/Sections.jsx
@@ -262,7 +262,7 @@ export class Section extends React.PureComponent {
           isWebExtension={this.props.isWebExtension}
         >
           {!shouldShowEmptyState && (
-            <ul className="section-list" style={{ padding: 0 }}>
+            <ul className="section-list">
               {cards}
             </ul>
           )}
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index a6b65c66c78d3..6e2423c45866d 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -10267,10 +10267,7 @@ class Section extends (external_React_default()).PureComponent {
       dispatch: this.props.dispatch,
       isWebExtension: this.props.isWebExtension
     }, !shouldShowEmptyState && /*#__PURE__*/external_React_default().createElement("ul", {
-      className: "section-list",
-      style: {
-        padding: 0
-      }
+      className: "section-list"
     }, cards), shouldShowEmptyState && /*#__PURE__*/external_React_default().createElement("div", {
       className: "section-empty-state"
     }, /*#__PURE__*/external_React_default().createElement("div", {
diff --git a/browser/extensions/newtab/lib/WallpaperFeed.sys.mjs b/browser/extensions/newtab/lib/WallpaperFeed.sys.mjs
index 3de340cf9c25b..1875ea10e8421 100644
--- a/browser/extensions/newtab/lib/WallpaperFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/WallpaperFeed.sys.mjs
@@ -129,19 +129,22 @@ export class WallpaperFeed {
     }
 
     // retrieving all records in collection
-    const records = await this.wallpaperClient.get();
-    if (!records?.length) {
-      return;
-    }
+    let records = [];
+    let baseAttachmentURL = "";
 
     const customWallpaperEnabled = Services.prefs.getBoolPref(
       PREF_WALLPAPERS_CUSTOM_WALLPAPER_ENABLED
     );
 
-    const baseAttachmentURL = await lazy.Utils.baseAttachmentsURL();
+    const customColorEnabled = Services.prefs.getBoolPref(
+      "browser.newtabpage.activity-stream.newtabWallpapers.customColor.enabled"
+    );
+
+    let wallpapers = [];
 
-    const wallpapers = [
-      ...records.map(record => {
+    // Process records if we have any
+    if (records && records.length > 0 && baseAttachmentURL) {
+      wallpapers = records.map(record => {
         return {
           ...record,
           ...(record.attachment
@@ -151,16 +154,42 @@ export class WallpaperFeed {
             : {}),
           category: record.category || "",
         };
-      }),
-    ];
+      });
+    }
 
-    const categories = [
+    // Build categories
+    let categories = [
       ...new Set(
         wallpapers.map(wallpaper => wallpaper.category).filter(Boolean)
       ),
-      ...(customWallpaperEnabled ? ["custom-wallpaper"] : []), // Conditionally add custom wallpaper input
     ];
 
+    // Always add solid-colors if custom color is enabled and not already present
+    if (customColorEnabled && !categories.includes("solid-colors")) {
+      categories.push("solid-colors");
+
+      // Add default solid colors if we have no wallpapers
+      if (wallpapers.length === 0) {
+        wallpapers = [
+          { title: "red-30", solid_color: "#ff7e8e", category: "solid-colors" },
+          { title: "orange-30", solid_color: "#ff8f31", category: "solid-colors" },
+          { title: "yellow-30", solid_color: "#f1af00", category: "solid-colors" },
+          { title: "green-30", solid_color: "#61cc69", category: "solid-colors" },
+          { title: "cyan-30", solid_color: "#00cadb", category: "solid-colors" },
+          { title: "blue-30", solid_color: "#60adff", category: "solid-colors" },
+          { title: "violet-30", solid_color: "#b295ff", category: "solid-colors"},
+          { title: "purple-30", solid_color: "#d98dfa", category: "solid-colors"},
+          { title: "pink-30", solid_color: "#ff7ead", category: "solid-colors"}
+        ];
+      }
+    }
+
+    // Always add custom-wallpaper if enabled
+    if (customWallpaperEnabled) {
+      categories.push("custom-wallpaper");
+    }
+
+    // Dispatch even with empty wallpapers as long as we have categories
     this.store.dispatch(
       ac.BroadcastToContent({
         type: at.WALLPAPERS_SET,
diff --git a/browser/fonts/TwemojiMozilla.ttf b/browser/fonts/TwemojiMozilla.ttf
index 9f45178e9deff..33a66be9853f4 100644
Binary files a/browser/fonts/TwemojiMozilla.ttf and b/browser/fonts/TwemojiMozilla.ttf differ
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index a315ebcb8b608..48ada962572e3 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -6,8 +6,8 @@
 #
 
 # updater on osx is bug 1311194
-LaunchServices/org.mozilla.updater
-updater.app/Contents/MacOS/org.mozilla.updater
+LaunchServices/net.waterfox.updater
+updater.app/Contents/MacOS/net.waterfox.updater
 
 plugin-container.app/Contents/PkgInfo
 updater.app/Contents/PkgInfo
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 6ebf2f62c4775..64d9993530c38 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -40,6 +40,7 @@
 #endif
 @APPNAME@/Contents/Frameworks
 @APPNAME@/Contents/PkgInfo
+@RESPATH@/Assets.car
 @RESPATH@/firefox.icns
 @RESPATH@/document.icns
 @RESPATH@/@LPROJ_ROOT@.lproj/*
@@ -221,10 +222,13 @@
 @RESPATH@/chrome/toolkit.manifest
 #ifdef MOZ_GTK
 @RESPATH@/browser/chrome/icons/default/default16.png
+@RESPATH@/browser/chrome/icons/default/default22.png
+@RESPATH@/browser/chrome/icons/default/default24.png
 @RESPATH@/browser/chrome/icons/default/default32.png
 @RESPATH@/browser/chrome/icons/default/default48.png
 @RESPATH@/browser/chrome/icons/default/default64.png
 @RESPATH@/browser/chrome/icons/default/default128.png
+@RESPATH@/browser/chrome/icons/default/default256.png
 #endif
 
 ; [DevTools Startup Files]
@@ -255,11 +259,19 @@
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/firefox.js
 @RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/browser/@PREF_DIR@/00-general.js
+@RESPATH@/browser/@PREF_DIR@/01-theme.js
+@RESPATH@/browser/@PREF_DIR@/02-privacy.js
+@RESPATH@/browser/@PREF_DIR@/03-features.js
+@RESPATH@/browser/@PREF_DIR@/04-sidebar.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/permissions
 ; Remote Settings JSON dumps
 @RESPATH@/browser/defaults/settings
+; Waterfox preference files
+@RESPATH@/browser/@PREF_DIR@/prefs-lepton.js
+@RESPATH@/browser/@PREF_DIR@/prefs-tabgroups.js
 
 # channel-prefs.js has been removed on macOS.
 #ifndef XP_MACOSX
@@ -398,7 +410,7 @@ bin/libfreebl_64int_3.so
 
 ; [ Ping Sender ]
 ;
-@BINPATH@/pingsender@BIN_SUFFIX@
+; @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; [ Native Messaging Host Proxy ]
 ;
diff --git a/browser/installer/windows/app.tag b/browser/installer/windows/app.tag
index 479d9f714a272..25d50bbcea98c 100644
--- a/browser/installer/windows/app.tag
+++ b/browser/installer/windows/app.tag
@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
-Title="Mozilla Firefox"
+Title="Waterfox"
 RunProgram="setup.exe"
 ;!@InstallEnd@!
\ No newline at end of file
diff --git a/browser/installer/windows/moz.build b/browser/installer/windows/moz.build
index b800ed9b3b4ef..235eb6ebb23f7 100644
--- a/browser/installer/windows/moz.build
+++ b/browser/installer/windows/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEFINES["APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
+DEFINES["APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
 
 DEFINES["MOZ_APP_NAME"] = CONFIG["MOZ_APP_NAME"]
 DEFINES["MOZ_APP_DISPLAYNAME"] = CONFIG["MOZ_APP_DISPLAYNAME"]
diff --git a/browser/installer/windows/msix/AppxManifest.xml.in b/browser/installer/windows/msix/AppxManifest.xml.in
index b81a73518a183..56a62dcca1917 100644
--- a/browser/installer/windows/msix/AppxManifest.xml.in
+++ b/browser/installer/windows/msix/AppxManifest.xml.in
@@ -67,6 +67,7 @@
               <uap:FileType>.xhtml</uap:FileType>
               <uap:FileType>.svg</uap:FileType>
               <uap:FileType>.webp</uap:FileType>
+              <uap:FileType>.jxl</uap:FileType>
             </uap:SupportedFileTypes>
             <uap:Logo>Assets\Document44x44.png</uap:Logo>
             <uap2:SupportedVerbs>
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index eb9e403c36510..89da0cda60359 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -23,21 +23,22 @@
 !endif
 
 # These defines should match application.ini settings
-!define AppName               "Firefox"
+!define AppName               "Waterfox"
 !define AppVersion            "@APP_VERSION@"
+!define AppVersionDisplay     "@APP_VERSION_DISPLAY@"
 !define GREVersion            @MOZILLA_VERSION@
 !define AB_CD                 "@AB_CD@"
 !define MOZ_BUILDID           "@MOZ_BUILDID@"
 
 !define FileMainEXE           "@MOZ_APP_NAME@.exe"
 !define PrivateBrowsingEXE    "private_browsing.exe"
-!define MainWindowClass       "MozillaWindowClass"
-!define DialogWindowClass     "MozillaDialogClass"
-!define DDEApplication        "Firefox"
-!define AppRegName            "Firefox"
+!define MainWindowClass       "WaterfoxWindowClass"
+!define DialogWindowClass     "WaterfoxDialogClass"
+!define DDEApplication        "Waterfox"
+!define AppRegName            "Waterfox"
 !define ToastAumidPrefix      "@MOZ_TOAST_APP_NAME@Toast-"
 
-!define BrandProductName      "Firefox"
+!define BrandProductName      "Waterfox"
 !ifndef DEV_EDITION
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
 !endif
@@ -56,12 +57,12 @@
 ; private_browsing.exe (as opposed to @MOZ_APP_NAME@.exe)
 !define IDI_PBICON_PB_EXE_ZERO_BASED "0"
 
-!define CERTIFICATE_NAME            "Mozilla Corporation"
-!define CERTIFICATE_ISSUER          "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
+!define CERTIFICATE_NAME            "WATERFOX LIMITED"
+!define CERTIFICATE_ISSUER          "GlobalSign GCC R45 EV CodeSigning CA 2020"
 ; Changing the name or issuer requires us to have both the old and the new
 ;  in the registry at the same time, temporarily.
-!define CERTIFICATE_NAME_PREVIOUS   "Mozilla Corporation"
-!define CERTIFICATE_ISSUER_PREVIOUS "DigiCert SHA2 Assured ID Code Signing CA"
+!define CERTIFICATE_NAME_PREVIOUS   "WATERFOX LIMITED"
+!define CERTIFICATE_ISSUER_PREVIOUS "GlobalSign GCC R45 EV CodeSigning CA 2020"
 
 # LSP_CATEGORIES is the permitted LSP categories for the application. Each LSP
 # category value is ANDed together to set multiple permitted categories.
@@ -77,7 +78,7 @@
 
 #ifdef MOZ_LAUNCHER_PROCESS
 !define MOZ_LAUNCHER_PROCESS
-!define MOZ_LAUNCHER_SUBKEY "Software\Mozilla\${AppName}\Launcher"
+!define MOZ_LAUNCHER_SUBKEY "Software\BrowserWorks\${AppName}\Launcher"
 #endif
 
 #ifdef RELEASE_OR_BETA
@@ -90,7 +91,7 @@
 !define BETA_UPDATE_CHANNEL
 !endif
 
-!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
+!define BaseURLStubPing ""
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
@@ -148,7 +149,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
 !define APPROXIMATE_REQUIRED_SPACE_MB "145"
 
 # Constants for parts of the telemetry submission URL
-!define TELEMETRY_BASE_URL https://incoming.telemetry.mozilla.org/submit
+!define TELEMETRY_BASE_URL
 !define TELEMETRY_NAMESPACE firefox-installer
 !define TELEMETRY_INSTALL_PING_VERSION 1
 !define TELEMETRY_INSTALL_PING_DOCTYPE install
diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index 491bcbbd84304..6938e046c4612 100755
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -76,7 +76,7 @@ Var PostSigningData
 ; are a member of the Administrators group.
 !define NONADMIN_ELEVATE
 
-!define AbortSurveyURL "http://www.kampyle.com/feedback_form/ff-feedback-form.php?site_code=8166124&form_id=12116&url="
+!define AbortSurveyURL "https://survey.waterfox.net/Desktop-Abort?channel=${UpdateChannel}&version=${AppVersion}&step="
 
 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
@@ -310,10 +310,10 @@ Section "-InstallStartCleanup"
   ${EndIf}
 
   ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
 
   ; Clean up old maintenance service logs
-  ${CleanMaintenanceServiceLogs} "Mozilla\Firefox"
+  ${CleanMaintenanceServiceLogs} "BrowserWorks\Waterfox"
 
   ${RemoveDeprecatedFiles}
   ${RemovePrecompleteEntries} "false"
@@ -421,25 +421,25 @@ Section "-Application" APP_IDX
 
   ${LogHeader} "Adding Registry Entries"
   SetShellVarContext current  ; Set SHCTX to HKCU
-  ${RegCleanMain} "Software\Mozilla"
+  ${RegCleanMain} "Software\BrowserWorks"
   ${RegCleanUninstall}
   ${UpdateProtocolHandlers}
 
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     StrCpy $RegHive "HKCU"
   ${Else}
     SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
     StrCpy $RegHive "HKLM"
-    ${RegCleanMain} "Software\Mozilla"
+    ${RegCleanMain} "Software\BrowserWorks"
     ${RegCleanUninstall}
     ${UpdateProtocolHandlers}
 
-    ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
+    ReadRegStr $0 HKLM "Software\waterfox.net\Waterfox" "CurrentVersion"
     ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
+      WriteRegStr HKLM "Software\waterfox.net\Waterfox" "CurrentVersion" "${GREVersion}"
     ${EndIf}
   ${EndIf}
 
@@ -470,11 +470,11 @@ Section "-Application" APP_IDX
 
   ; In Win8, the delegate execute handler picks up the value in FirefoxURL- and
   ; FirefoxHTML- to launch the desktop browser when it needs to.
-  ${AddDisabledDDEHandlerValues} "FirefoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                  "${AppRegName} HTML Document" ""
-  ${AddDisabledDDEHandlerValues} "FirefoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                  "${AppRegName} PDF Document" ""
-  ${AddDisabledDDEHandlerValues} "FirefoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                  "${AppRegName} URL" "true"
 
   ; The keys below can be set in HKCU if needed.
@@ -738,7 +738,7 @@ Section "-Application" APP_IDX
   ${EndIf}
   ; Remember whether we were told to skip registering the agent, so that updates
   ; won't try to create a registration when they don't find an existing one.
-  WriteRegDWORD HKCU "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+  WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
                      "DidRegisterDefaultBrowserAgent" $RegisterDefaultAgent
 !endif
 
@@ -837,7 +837,7 @@ Section "-InstallEndCleanup"
   ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
   ; invoked when we're running silently.
   ${If} ${Silent}
-    Call SendPing
+    ; Call SendPing
   ${EndIf}
 SectionEnd
 
@@ -1037,7 +1037,7 @@ Function SendPing
   ${If} ${Errors}
     StrCpy $0 "-1" ; Assign -1 if an error occured during registry read
   ${EndIf}
-  
+
   nsJSON::Set /tree ping "Data" "windows_ubr" /value '$0'
 
   ${GetParameters} $0
@@ -1071,12 +1071,12 @@ Function SendPing
   ${EndIf}
 
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" \
                    "Write Test"
   ${If} ${Errors}
     nsJSON::Set /tree ping "Data" "admin_user" /value false
   ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
     nsJSON::Set /tree ping "Data" "admin_user" /value true
   ${EndIf}
 
@@ -1101,7 +1101,7 @@ Function SendPing
     ${If} $1 == $INSTDIR
       nsJSON::Set /tree ping "Data" "new_default" /value true
     ${Else}
-      StrCpy $0 "$0" "" -11 # 11 == length of "firefox.exe"
+      StrCpy $0 "$0" "" -12 # 11 == length of "waterfox.exe"
       ${If} "$0" == "${FileMainEXE}"
         nsJSON::Set /tree ping "Data" "old_default" /value true
       ${EndIf}
@@ -1209,12 +1209,12 @@ Function WriteInstallationTelemetryData
   ; Check for write access to HKLM, if successful then report this user
   ; as an (elevated) admin.
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" \
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" \
                    "Write Test"
   ${If} ${Errors}
     StrCpy $1 "false"
   ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
     StrCpy $1 "true"
   ${EndIf}
   ${JSONSet} "admin_user" /value $1
@@ -1229,7 +1229,7 @@ Function WriteInstallationTelemetryData
   ; Check for top-level profile directory
   ; Note: This is the same check used to set $ExistingProfile in stub.nsi
   ${GetLocalAppDataFolder} $0
-  ${If} ${FileExists} "$0\Mozilla\Firefox"
+  ${If} ${FileExists} "$0\BrowserWorks\Waterfox"
     StrCpy $1 "true"
   ${Else}
     StrCpy $1 "false"
@@ -1430,7 +1430,7 @@ FunctionEnd
 !ifdef MOZ_MAINTENANCE_SERVICE
 Function preComponents
   ; If the service already exists, don't show this page
-  ServicesHelper::IsInstalled "MozillaMaintenance"
+  ServicesHelper::IsInstalled "WaterfoxMaintenance"
   Pop $R9
   ${If} $R9 == 1
     ; The service already exists so don't show this page.
@@ -1447,13 +1447,13 @@ Function preComponents
 
   ; Only show the maintenance service page if we have write access to HKLM
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" \
+  WriteRegStr HKLM "Software\BrowserWorks" \
               "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     ClearErrors
     Abort
   ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
   ${EndIf}
 
   StrCpy $PageName "Components"
@@ -1766,10 +1766,10 @@ Function .onInit
 !endif
 
   SetShellVarContext all
-  ${GetFirstInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $0
+  ${GetFirstInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $0
   ${If} "$0" == "false"
     SetShellVarContext current
-    ${GetFirstInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $0
+    ${GetFirstInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $0
     ${If} "$0" == "false"
       StrCpy $HadOldInstall false
     ${Else}
@@ -1965,5 +1965,5 @@ FunctionEnd
 
 Function .onGUIEnd
   ${OnEndCommon}
-  Call SendPing
+  ; Call SendPing
 FunctionEnd
diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi
index 5d50ee9e6c4be..c45b2741f002b 100644
--- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi
@@ -41,16 +41,16 @@ Var BrandFullName
 ; And anyone that wants to run tests themselves should already have 
 ; this installed.
 !define FallbackKey \
-  "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
+  "Software\BrowserWorks\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
 
-!define CompanyName "Mozilla Corporation"
+!define CompanyName "BrowserWorks"
 !define BrandFullNameInternal ""
 
 ; The following includes are custom.
 !include defines.nsi
-; We keep defines.nsi defined so that we get other things like 
+; We keep defines.nsi defined so that we get other things like
 ; the version number, but we redefine BrandFullName
-!define MaintFullName "Mozilla Maintenance Service"
+!define MaintFullName "Waterfox Maintenance Service"
 !ifdef BrandFullName
 !undef BrandFullName
 !endif
@@ -66,14 +66,14 @@ Name "${MaintFullName}"
 OutFile "maintenanceservice_installer.exe"
 
 ; Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\Mozilla\MaintenanceService" ""
+InstallDirRegKey HKLM "Software\BrowserWorks\MaintenanceService" ""
 
 SetOverwrite on
 
 ; serviceinstall.cpp also uses this key, in case the path is changed, update
 ; there too.
 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"
 
 ; Always install into the 32-bit location even if we have a 64-bit build.
 ; This is because we use only 1 service for all Firefox channels.
@@ -198,7 +198,7 @@ Section "MaintenanceService"
   WriteRegStr HKLM "${MaintUninstallKey}" "DisplayIcon" \
                    "$INSTDIR\Uninstall.exe,0"
   WriteRegStr HKLM "${MaintUninstallKey}" "DisplayVersion" "${AppVersion}"
-  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "Mozilla"
+  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "BrowserWorks"
   WriteRegStr HKLM "${MaintUninstallKey}" "Comments" "${BrandFullName}"
   WriteRegDWORD HKLM "${MaintUninstallKey}" "NoModify" 1
   ${GetSize} "$INSTDIR" "/S=0K" $R2 $R3 $R4
@@ -209,9 +209,9 @@ Section "MaintenanceService"
   ; want to install once on the first upgrade to maintenance service.
   ; Also write out that we are currently installed, preferences will check
   ; this value to determine if we should show the service update pref.
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Installed" 1
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Installed" 1
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
 
   ; Included here for debug purposes only.  
   ; These keys are used to bypass the installation dir is a valid installation
@@ -295,34 +295,34 @@ Section "Uninstall"
   Push "$INSTDIR\logs\maintenanceservice-uninstall.log"
   Call un.RenameDelete
   SetShellVarContext all
-  Push "$APPDATA\Mozilla\logs\maintenanceservice.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-1.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-1.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-2.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-2.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-3.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-3.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-4.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-4.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-5.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-5.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-6.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-6.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-7.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-7.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-8.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-8.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-9.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-9.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-10.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-10.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-install.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-install.log"
   Call un.RenameDelete
-  Push "$APPDATA\Mozilla\logs\maintenanceservice-uninstall.log"
+  Push "$APPDATA\BrowserWorks\logs\maintenanceservice-uninstall.log"
   Call un.RenameDelete
-  RMDir /REBOOTOK "$APPDATA\Mozilla\logs"
-  RMDir /REBOOTOK "$APPDATA\Mozilla"
+  RMDir /REBOOTOK "$APPDATA\BrowserWorks\logs"
+  RMDir /REBOOTOK "$APPDATA\BrowserWorks"
   RMDir /REBOOTOK "$INSTDIR\logs"
   RMDir /REBOOTOK "$INSTDIR\update"
   RMDir /REBOOTOK "$INSTDIR\UpdateLogs"
@@ -333,8 +333,8 @@ Section "Uninstall"
     SetRegView 64
   ${EndIf}
   DeleteRegKey HKLM "${MaintUninstallKey}"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "Installed"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "Installed"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
   DeleteRegKey HKLM "${FallbackKey}\"
   ${If} ${RunningX64}
   ${OrIf} ${IsNativeARM64}
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index 17dfb2aece853..cf50cf017af5b 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -2,32 +2,32 @@
 # 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/.
 
-; Generated by DeriveCapabilitySidsFromName with the name "lpacFirefoxInstallFiles"
+; Generated by DeriveCapabilitySidsFromName with the name "H"
 !define LpacFirefoxInstallFilesSid "S-1-15-3-1024-1238444810-1356253261-2257478630-1143196962-1563090664-2414759320-1282101916-4218287853"
 
 !macro PostUpdate
   ${CreateShortcutsLog}
 
   ; Remove registry entries for non-existent apps and for apps that point to our
-  ; install location in the Software\Mozilla key and uninstall registry entries
+  ; install location in the Software\BrowserWorks key and uninstall registry entries
   ; that point to our install location for both HKCU and HKLM.
   SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${RegCleanMain} "Software\Mozilla"
+  ${RegCleanMain} "Software\BrowserWorks"
   ${RegCleanUninstall}
   ${UpdateProtocolHandlers}
 
   ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
 
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     StrCpy $RegHive "HKCU"
   ${Else}
     SetShellVarContext all    ; Set SHCTX to all users (e.g. HKLM)
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
     StrCpy $RegHive "HKLM"
-    ${RegCleanMain} "Software\Mozilla"
+    ${RegCleanMain} "Software\BrowserWorks"
     ${RegCleanUninstall}
     ${UpdateProtocolHandlers}
     ${FixShellIconHandler} "HKLM"
@@ -36,9 +36,9 @@
     ; Add the Firewall entries after an update
     Call AddFirewallEntries
 
-    ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
+    ReadRegStr $0 HKLM "Software\waterfox.net\Waterfox" "CurrentVersion"
     ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
+      WriteRegStr HKLM "Software\waterfox.net\Waterfox" "CurrentVersion" "${GREVersion}"
     ${EndIf}
   ${EndIf}
 
@@ -88,10 +88,10 @@
     ; If it already exists, just delete the appdata one.
     ; It's possible this was for a different install, but it's impossible to
     ; know for sure, so we may as well just get rid of it.
-    Delete /REBOOTOK "$0\Mozilla\Firefox\postSigningData"
+    Delete /REBOOTOK "$0\Waterfox\postSigningData"
   ${Else}
-    ${If} ${FileExists} "$0\Mozilla\Firefox\postSigningData"
-      Rename "$0\Mozilla\Firefox\postSigningData" "$INSTDIR\postSigningData"
+    ${If} ${FileExists} "$0\Waterfox\postSigningData"
+      Rename "$0\Waterfox\postSigningData" "$INSTDIR\postSigningData"
     ${EndIf}
   ${EndIf}
 
@@ -125,7 +125,7 @@
     ${OrIf} ${IsNativeARM64}
       SetRegView 64
     ${EndIf}
-    ReadRegDWORD $5 HKLM "Software\Mozilla\MaintenanceService" "Attempted"
+    ReadRegDWORD $5 HKLM "Software\BrowserWorks\MaintenanceService" "Attempted"
     ClearErrors
     ${If} ${RunningX64}
     ${OrIf} ${IsNativeARM64}
@@ -173,7 +173,7 @@
 !ifdef MOZ_DEFAULT_BROWSER_AGENT
 ${If} $RegHive == "HKCU"
   ClearErrors
-  ReadRegDWORD $0 HKCU "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+  ReadRegDWORD $0 HKCU "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
                     "DidRegisterDefaultBrowserAgent"
   ${If} $0 != 0
   ${OrIf} ${Errors}
@@ -470,35 +470,35 @@ ${RemoveDefaultBrowserAgentShortcut}
   StrCpy $0 "SOFTWARE\Classes"
   StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
 
-  ; Associate the file handlers with FirefoxHTML, if they aren't already.
+  ; Associate the file handlers with WaterfoxHTML, if they aren't already.
   ReadRegStr $6 SHCTX "$0\.htm" ""
   ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.htm"   "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.htm"   "" "WaterfoxHTML$5"
   ${EndIf}
 
   ReadRegStr $6 SHCTX "$0\.html" ""
   ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.html"  "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.html"  "" "WaterfoxHTML$5"
   ${EndIf}
 
   ReadRegStr $6 SHCTX "$0\.shtml" ""
   ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.shtml" "" "WaterfoxHTML$5"
   ${EndIf}
 
   ReadRegStr $6 SHCTX "$0\.xht" ""
   ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xht"   "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.xht"   "" "WaterfoxHTML$5"
   ${EndIf}
 
   ReadRegStr $6 SHCTX "$0\.xhtml" ""
   ${WordFind} "$6" "-" "+1{" $6
-  ${If} "$6" != "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML$5"
+  ${If} "$6" != "WaterfoxHTML"
+    WriteRegStr SHCTX "$0\.xhtml" "" "WaterfoxHTML$5"
   ${EndIf}
 
 
@@ -506,25 +506,26 @@ ${RemoveDefaultBrowserAgentShortcut}
   ; https://searchfox.org/mozilla-central/source/browser/installer/windows/msix/AppxManifest.xml.in.
   ; and `os.environment.launched_to_handle` and `os.environment.invoked_to_handle` telemetry in
   ; https://searchfox.org/mozilla-central/source/browser/components/BrowserContentHandler.sys.mjs.
-  ${AddAssociationIfNoneExist} ".oga" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".ogg" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".ogv" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".webm" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".svg" "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".webp"  "FirefoxHTML$5"
-  ${AddAssociationIfNoneExist} ".avif" "FirefoxHTML$5"
-
-  ${AddAssociationIfNoneExist} ".pdf" "FirefoxPDF$5"
-
-  ; An empty string is used for the 5th param because FirefoxHTML- is not a
-  ; protocol handler.  Ditto for FirefoxPDF-.
-  ${AddDisabledDDEHandlerValues} "FirefoxHTML$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+  ${AddAssociationIfNoneExist} ".oga" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".ogg" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".ogv" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".webm" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".svg" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".webp"  "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".avif" "WaterfoxHTML$5"
+  ${AddAssociationIfNoneExist} ".jxl" "WaterfoxHTML$5"
+
+  ${AddAssociationIfNoneExist} ".pdf" "WaterfoxPDF$5"
+
+  ; An empty string is used for the 5th param because WaterfoxHTML- is not a
+  ; protocol handler.  Ditto for WaterfoxPDF-.
+  ${AddDisabledDDEHandlerValues} "WaterfoxHTML$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                  "${AppRegName} HTML Document" ""
 
-  ${AddDisabledDDEHandlerValues} "FirefoxPDF$5" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF$5" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                  "${AppRegName} PDF Document" ""
 
-  ${AddDisabledDDEHandlerValues} "FirefoxURL$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" "${AppRegName} URL" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxURL$5" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" "${AppRegName} URL" \
                                  "true"
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handlers already have a display name and the additional keys
@@ -562,7 +563,7 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
   ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7
 
-  ; If we already have keys at the old FIREFOX.EXE path, then just update those.
+  ; If we already have keys at the old WATERFOX.EXE path, then just update those.
   ; We have to be careful to update the existing keys in place so that we don't
   ; create duplicate keys for the same installation, or cause Windows to think
   ; something "suspicious" has happened and it should reset the default browser.
@@ -601,16 +602,16 @@ ${RemoveDefaultBrowserAgentShortcut}
   WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,${IDI_APPICON_ZERO_BASED}"
   WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
 
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html"  "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".svg"   "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".webp"  "FirefoxHTML$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".avif"  "FirefoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html"  "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".svg"   "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".webp"  "WaterfoxHTML$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".avif"  "WaterfoxHTML$2"
 
-  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".pdf"   "FirefoxPDF$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".pdf"   "WaterfoxPDF$2"
 
   WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$1"
 
@@ -618,9 +619,9 @@ ${RemoveDefaultBrowserAgentShortcut}
   ; entire key, we need to remove any existing registration.
   DeleteRegValue ${RegKey} "$0\Capabilities\URLAssociations" "ftp"
 
-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http"   "FirefoxURL$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https"  "FirefoxURL$2"
-  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "mailto" "FirefoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http"   "WaterfoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https"  "WaterfoxURL$2"
+  WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "mailto" "WaterfoxURL$2"
 
   WriteRegStr ${RegKey} "Software\RegisteredApplications" "$1" "$0\Capabilities"
 
@@ -703,31 +704,31 @@ ${RemoveDefaultBrowserAgentShortcut}
 
   ; Running Firefox 64 bit on Windows 64 bit
   ClearErrors
-  ReadRegDWORD $2 HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+  ReadRegDWORD $2 HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
   ; If there were no errors then the system was updated from Firefox 32 bit to
   ; Firefox 64 bit and if the value is already 1 then the registry value has
   ; already been updated in the HKLM registry.
   ${IfNot} ${Errors}
   ${AndIf} $2 != 1
     ClearErrors
-    WriteRegDWORD HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+    WriteRegDWORD HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
     ${If} ${Errors}
       ; There was an error writing to HKLM so just write it to HKCU
-      WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+      WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
     ${Else}
       ; This will delete the value from HKCU if it exists
-      DeleteRegValue HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+      DeleteRegValue HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
     ${EndIf}
   ${EndIf}
 
   ClearErrors
-  ReadRegDWORD $2 HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+  ReadRegDWORD $2 HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
   ; If there were no errors then the system was updated from Firefox 32 bit to
   ; Firefox 64 bit and if the value is already 1 then the registry value has
   ; already been updated in the HKCU registry.
   ${IfNot} ${Errors}
   ${AndIf} $2 != 1
-    WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 1
+    WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 1
   ${EndIf}
 
 !else
@@ -737,14 +738,14 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${OrIf} ${IsNativeARM64}
     ; Running Firefox 32 bit on a Windows 64 bit system
     ClearErrors
-    ReadRegDWORD $2 HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1"
+    ReadRegDWORD $2 HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1"
     ; If there were errors the value doesn't exist yet.
     ${If} ${Errors}
       ClearErrors
-      WriteRegDWORD HKLM "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 0
+      WriteRegDWORD HKLM "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 0
       ; If there were errors write the value in HKCU.
       ${If} ${Errors}
-        WriteRegDWORD HKCU "Software\Mozilla\${AppName}\32to64DidMigrate" "$1" 0
+        WriteRegDWORD HKCU "Software\BrowserWorks\${AppName}\32to64DidMigrate" "$1" 0
       ${EndIf}
     ${EndIf}
   ${EndIf}
@@ -756,17 +757,17 @@ ${RemoveDefaultBrowserAgentShortcut}
 !macroend
 !define Set32to64DidMigrateReg "!insertmacro Set32to64DidMigrateReg"
 
-; The IconHandler reference for FirefoxHTML can end up in an inconsistent state
+; The IconHandler reference for WaterfoxHTML can end up in an inconsistent state
 ; due to changes not being detected by the IconHandler for side by side
 ; installs (see bug 268512). The symptoms can be either an incorrect icon or no
 ; icon being displayed for files associated with Firefox (does not use SHCTX).
 !macro FixShellIconHandler RegKey
-  ; Find the correct key to update, either FirefoxHTML or FirefoxHTML-[PathHash]
-  StrCpy $3 "FirefoxHTML-$AppUserModelID"
+  ; Find the correct key to update, either WaterfoxHTML or WaterfoxHTML-[PathHash]
+  StrCpy $3 "WaterfoxHTML-$AppUserModelID"
   ClearErrors
   ReadRegStr $0 ${RegKey} "Software\Classes\$3\DefaultIcon" ""
   ${If} ${Errors}
-    StrCpy $3 "FirefoxHTML"
+    StrCpy $3 "WaterfoxHTML"
   ${EndIf}
 
   ClearErrors
@@ -781,7 +782,7 @@ ${RemoveDefaultBrowserAgentShortcut}
 !macroend
 !define FixShellIconHandler "!insertmacro FixShellIconHandler"
 
-; Add Software\Mozilla\ registry entries (uses SHCTX).
+; Add Software\BrowserWorks\ registry entries (uses SHCTX).
 ; This expects $RegHive to already have been set correctly.
 !macro SetAppKeys
   ; Check if this is an ESR release and if so add registry values so it is
@@ -795,14 +796,14 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${EndIf}
 
   ${GetLongPath} "$INSTDIR" $8
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main"
   ${WriteRegStr2} $RegHive "$0" "Install Directory" "$8" 0
   ${WriteRegStr2} $RegHive "$0" "PathToExe" "$8\${FileMainEXE}" 0
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall"
   ${WriteRegStr2} $RegHive "$0" "Description" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})"
   ${WriteRegStr2} $RegHive  "$0" "" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
   ${If} "$3" == ""
     DeleteRegValue SHCTX "$0" "ESR"
@@ -810,14 +811,14 @@ ${RemoveDefaultBrowserAgentShortcut}
     ${WriteRegDWORD2} $RegHive "$0" "ESR" 1 0
   ${EndIf}
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\bin"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3\bin"
   ${WriteRegStr2} $RegHive "$0" "PathToExe" "$8\${FileMainEXE}" 0
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\extensions"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3\extensions"
   ${WriteRegStr2} $RegHive "$0" "Components" "$8\components" 0
   ${WriteRegStr2} $RegHive "$0" "Plugins" "$8\plugins" 0
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal} ${AppVersion}$3"
   ${WriteRegStr2} $RegHive "$0" "GeckoVer" "${GREVersion}" 0
   ${If} "$3" == ""
     DeleteRegValue SHCTX "$0" "ESR"
@@ -825,7 +826,7 @@ ${RemoveDefaultBrowserAgentShortcut}
     ${WriteRegDWORD2} $RegHive "$0" "ESR" 1 0
   ${EndIf}
 
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}$3"
+  StrCpy $0 "Software\BrowserWorks\${BrandFullNameInternal}$3"
   ${WriteRegStr2} $RegHive "$0" "" "${GREVersion}" 0
   ${WriteRegStr2} $RegHive "$0" "CurrentVersion" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0
 !macroend
@@ -875,10 +876,10 @@ ${RemoveDefaultBrowserAgentShortcut}
     ${WriteRegStr2} $1 "$0" "Comments" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0
     ${WriteRegStr2} $1 "$0" "DisplayIcon" "$8\${FileMainEXE},${IDI_APPICON_ZERO_BASED}" 0
     ${WriteRegStr2} $1 "$0" "DisplayName" "${BrandFullNameInternal}$3 (${ARCH} ${AB_CD})" 0
-    ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
+    ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersionDisplay}" 0
     ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0
     ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
-    ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0
+    ${WriteRegStr2} $1 "$0" "Publisher" "BrowserWorks" 0
     ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0
     DeleteRegValue SHCTX "$0" "URLInfoAbout"
 ; Don't add URLUpdateInfo which is the release notes url except for the release
@@ -912,7 +913,7 @@ ${RemoveDefaultBrowserAgentShortcut}
 ; HKCU Software\Classes keys when associating handlers. The fix uses the merged
 ; view in HKCR to check for existance of an existing association. This macro
 ; cleans affected installations by removing the HKLM and HKCU value if it is set
-; to FirefoxHTML when there is a value for PersistentHandler or by removing the
+; to WaterfoxHTML when there is a value for PersistentHandler or by removing the
 ; HKCU value when the HKLM value has a value other than an empty string.
 !macro FixBadFileAssociation FILE_TYPE
   ; Only delete the default value in case the key has values for OpenWithList,
@@ -923,16 +924,16 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${WordFind} "$1" "-" "+1{" $1
   ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
   ${If} "$2" != ""
-    ; Since there is a persistent handler remove FirefoxHTML as the default
-    ; value from both HKCU and HKLM if it set to FirefoxHTML.
-    ${If} "$0" == "FirefoxHTML"
+    ; Since there is a persistent handler remove WaterfoxHTML as the default
+    ; value from both HKCU and HKLM if it set to WaterfoxHTML.
+    ${If} "$0" == "WaterfoxHTML"
       DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
     ${EndIf}
-    ${If} "$1" == "FirefoxHTML"
+    ${If} "$1" == "WaterfoxHTML"
       DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
     ${EndIf}
-  ${ElseIf} "$0" == "FirefoxHTML"
-    ; Since HKCU is set to FirefoxHTML remove FirefoxHTML as the default value
+  ${ElseIf} "$0" == "WaterfoxHTML"
+    ; Since HKCU is set to WaterfoxHTML remove WaterfoxHTML as the default value
     ; from HKCU if HKLM is set to a value other than an empty string.
     ${If} "$1" != ""
       DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@@ -989,36 +990,36 @@ ${RemoveDefaultBrowserAgentShortcut}
   ; Only set the file and protocol handlers if the existing one under HKCR is
   ; for this install location.
 
-  ${IsHandlerForInstallDir} "FirefoxHTML-$AppUserModelID" $R9
+  ${IsHandlerForInstallDir} "WaterfoxHTML-$AppUserModelID" $R9
   ${If} "$R9" == "true"
-    ; An empty string is used for the 5th param because FirefoxHTML is not a
+    ; An empty string is used for the 5th param because WaterfoxHTML is not a
     ; protocol handler.
-    ${AddDisabledDDEHandlerValues} "FirefoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+    ${AddDisabledDDEHandlerValues} "WaterfoxHTML-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                    "${AppRegName} HTML Document" ""
   ${Else}
-    ${IsHandlerForInstallDir} "FirefoxHTML" $R9
+    ${IsHandlerForInstallDir} "WaterfoxHTML" $R9
     ${If} "$R9" == "true"
-      ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+      ${AddDisabledDDEHandlerValues} "WaterfoxHTML" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                      "${AppRegName} HTML Document" ""
     ${EndIf}
   ${EndIf}
 
-  ; FirefoxPDF-* was added after FirefoxHTML and FirefoxURL, so we've never
-  ; supported bare "FirefoxPDF".  But we won't have it from the installer, so we
+  ; WaterfoxPDF-* was added after WaterfoxHTML and WaterfoxURL, so we've never
+  ; supported bare "WaterfoxPDF".  But we won't have it from the installer, so we
   ; add/update it unconditionally.  `PostUpdate` is gated on `uninstall.log`
   ; being present, so the invocation here will only happen for installed
   ; directories, not unpackaged directories.
-  ${AddDisabledDDEHandlerValues} "FirefoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
+  ${AddDisabledDDEHandlerValues} "WaterfoxPDF-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_PDF_ZERO_BASED}" \
                                  "${AppRegName} PDF Document" ""
 
-  ${IsHandlerForInstallDir} "FirefoxURL-$AppUserModelID" $R9
+  ${IsHandlerForInstallDir} "WaterfoxURL-$AppUserModelID" $R9
   ${If} "$R9" == "true"
-    ${AddDisabledDDEHandlerValues} "FirefoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+    ${AddDisabledDDEHandlerValues} "WaterfoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                    "${AppRegName} URL" "true"
   ${Else}
-    ${IsHandlerForInstallDir} "FirefoxURL" $R9
+    ${IsHandlerForInstallDir} "WaterfoxURL" $R9
     ${If} "$R9" == "true"
-      ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
+      ${AddDisabledDDEHandlerValues} "WaterfoxURL" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
                                      "${AppRegName} URL" "true"
     ${EndIf}
   ${EndIf}
@@ -1077,7 +1078,7 @@ ${RemoveDefaultBrowserAgentShortcut}
     ; Setting the Attempted value will ensure that a new Maintenance Service
     ; install will never be attempted again after this from updates.  The value
     ; is used only to see if updates should attempt new service installs.
-    WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
+    WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1
 
     ; These values associate the allowed certificates for the current
     ; installation.
@@ -1113,8 +1114,8 @@ ${RemoveDefaultBrowserAgentShortcut}
   ${RegCleanAppHandler} "chrome"
 
   ; Remove protocol handler registry keys added by the MS shim
-  DeleteRegKey HKLM "Software\Classes\Firefox.URL"
-  DeleteRegKey HKCU "Software\Classes\Firefox.URL"
+  DeleteRegKey HKLM "Software\Classes\Waterfox.URL"
+  DeleteRegKey HKCU "Software\Classes\Waterfox.URL"
 
   ; Unregister deprecated AccessibleHandler.dll.
   ${If} ${FileExists} "$INSTDIR\AccessibleHandler.dll"
@@ -1264,7 +1265,7 @@ ${RemoveDefaultBrowserAgentShortcut}
       ClearErrors
       WriteIniStr "$0" "TASKBAR" "Migrated" "true"
       WriteRegDWORD HKCU \
-        "Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
+        "Software\BrowserWorks\${AppName}\Installer\$AppUserModelID" \
         "WasPinnedToTaskbar" 1
       ${If} "${SHOULD_PIN}" == "1"
         ${PinToTaskBar}
@@ -1589,7 +1590,6 @@ ${RemoveDefaultBrowserAgentShortcut}
   Push "crashreporter.exe"
   Push "default-browser-agent.exe"
   Push "nmhproxy.exe"
-  Push "pingsender.exe"
   Push "updater.exe"
   Push "mozwer.dll"
   Push "${FileMainEXE}"
@@ -1669,7 +1669,7 @@ Function SetAsDefaultAppUserHKCU
   StrCpy $0 $0 -2
   ${If} $0 != $8
     ${If} $AppUserModelID == ""
-      ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+      ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
     ${EndIf}
     StrCpy $R9 "${AppRegName}-$AppUserModelID"
   ${EndIf}
@@ -1857,7 +1857,7 @@ FunctionEnd
   ; uninstalled.
 
   ; Do all of that twice, once for the local machine and once for the current user
-  
+
   ; Remove protocol handlers
   ClearErrors
   ReadRegStr $0 HKLM "Software\Classes\${_PROTOCOL}\DefaultIcon" ""
diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi
index d544d924b4a64..dabd22d500d50 100644
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1,103 +1,103 @@
-Unicode true
-
-OutFile "setup-stub.exe"
-
-; On real installer executables, test breakpoint checks are no-ops.
-; See test_stub.nsi for the test version of this macro.
-!macro IsTestBreakpointSet breakpointNumber
-!macroend
-
-Icon "firefox64.ico"
-!include "LogicLib.nsh"
-!include "FileFunc.nsh"
-!include "TextFunc.nsh"
-!include "WinVer.nsh"
-!include "WordFunc.nsh"
-
-!include "stub_shared_defs.nsh"
-
-Function CheckCpuSupportsSSE
-  ; Don't install on systems that don't support SSE2. The parameter value of
-  ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the
-  ; SSE2 instruction set is available.
-  System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7"
-  StrCpy $CpuSupportsSSE "$R7"
-FunctionEnd
-
-!include "stub.nsh"
-
-Page custom createProfileCleanup
-Page custom createInstall ; Download / Installation page
-
-Function CanWrite
-  StrCpy $CanWriteToInstallDir "false"
-
-  StrCpy $0 "$INSTDIR"
-  ; Use the existing directory when it exists
-  ${Unless} ${FileExists} "$INSTDIR"
-    ; Get the topmost directory that exists for new installs
-    ${DoUntil} ${FileExists} "$0"
-      ${GetParent} "$0" $0
-      ${If} "$0" == ""
-        Return
-      ${EndIf}
-    ${Loop}
-  ${EndUnless}
-
-  GetTempFileName $2 "$0"
-  Delete $2
-  CreateDirectory "$2"
-
-  ${If} ${FileExists} "$2"
-    ${If} ${FileExists} "$INSTDIR"
-      GetTempFileName $3 "$INSTDIR"
-    ${Else}
-      GetTempFileName $3 "$2"
-    ${EndIf}
-    ${If} ${FileExists} "$3"
-      Delete "$3"
-      StrCpy $CanWriteToInstallDir "true"
-    ${EndIf}
-    RmDir "$2"
-  ${EndIf}
-FunctionEnd
-
-Function .onInit
-  Call CommonOnInit
-FunctionEnd
-
-Function .onUserAbort
-  WebBrowser::CancelTimer $TimerHandle
-
-  ${If} "$IsDownloadFinished" != ""
-    ; Go ahead and cancel the download so it doesn't keep running while this
-    ; prompt is up. We'll resume it if the user decides to continue.
-    InetBgDL::Get /RESET /END
-
-    ${ShowTaskDialog} $(STUB_CANCEL_PROMPT_HEADING) \
-                      $(STUB_CANCEL_PROMPT_MESSAGE) \
-                      $(STUB_CANCEL_PROMPT_BUTTON_CONTINUE) \
-                      $(STUB_CANCEL_PROMPT_BUTTON_EXIT)
-    Pop $0
-    ${If} $0 == 1002
-      ; The cancel button was clicked
-      StrCpy $ExitCode "${ERR_DOWNLOAD_CANCEL}"
-      Call LaunchHelpPage
-      Call SendPing
-    ${Else}
-      ; Either the continue button was clicked or the dialog was dismissed
-      Call StartDownload
-    ${EndIf}
-  ${Else}
-    Call SendPing
-  ${EndIf}
-
-  ; Aborting the abort will allow SendPing to hide the installer window and
-  ; close the installer after it sends the metrics ping, or allow us to just go
-  ; back to installing if that's what the user selected.
-  Abort
-FunctionEnd
-
-
-Section
-SectionEnd
+Unicode true
+
+OutFile "setup-stub.exe"
+
+; On real installer executables, test breakpoint checks are no-ops.
+; See test_stub.nsi for the test version of this macro.
+!macro IsTestBreakpointSet breakpointNumber
+!macroend
+
+Icon "firefox64.ico"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
+!include "TextFunc.nsh"
+!include "WinVer.nsh"
+!include "WordFunc.nsh"
+
+!include "stub_shared_defs.nsh"
+
+Function CheckCpuSupportsSSE
+  ; Don't install on systems that don't support SSE2. The parameter value of
+  ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the
+  ; SSE2 instruction set is available.
+  System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7"
+  StrCpy $CpuSupportsSSE "$R7"
+FunctionEnd
+
+!include "stub.nsh"
+
+Page custom createProfileCleanup
+Page custom createInstall ; Download / Installation page
+
+Function CanWrite
+  StrCpy $CanWriteToInstallDir "false"
+
+  StrCpy $0 "$INSTDIR"
+  ; Use the existing directory when it exists
+  ${Unless} ${FileExists} "$INSTDIR"
+    ; Get the topmost directory that exists for new installs
+    ${DoUntil} ${FileExists} "$0"
+      ${GetParent} "$0" $0
+      ${If} "$0" == ""
+        Return
+      ${EndIf}
+    ${Loop}
+  ${EndUnless}
+
+  GetTempFileName $2 "$0"
+  Delete $2
+  CreateDirectory "$2"
+
+  ${If} ${FileExists} "$2"
+    ${If} ${FileExists} "$INSTDIR"
+      GetTempFileName $3 "$INSTDIR"
+    ${Else}
+      GetTempFileName $3 "$2"
+    ${EndIf}
+    ${If} ${FileExists} "$3"
+      Delete "$3"
+      StrCpy $CanWriteToInstallDir "true"
+    ${EndIf}
+    RmDir "$2"
+  ${EndIf}
+FunctionEnd
+
+Function .onInit
+  Call CommonOnInit
+FunctionEnd
+
+Function .onUserAbort
+  WebBrowser::CancelTimer $TimerHandle
+
+  ${If} "$IsDownloadFinished" != ""
+    ; Go ahead and cancel the download so it doesn't keep running while this
+    ; prompt is up. We'll resume it if the user decides to continue.
+    InetBgDL::Get /RESET /END
+
+    ${ShowTaskDialog} $(STUB_CANCEL_PROMPT_HEADING) \
+                      $(STUB_CANCEL_PROMPT_MESSAGE) \
+                      $(STUB_CANCEL_PROMPT_BUTTON_CONTINUE) \
+                      $(STUB_CANCEL_PROMPT_BUTTON_EXIT)
+    Pop $0
+    ${If} $0 == 1002
+      ; The cancel button was clicked
+      StrCpy $ExitCode "${ERR_DOWNLOAD_CANCEL}"
+      Call LaunchHelpPage
+      Call SendPing
+    ${Else}
+      ; Either the continue button was clicked or the dialog was dismissed
+      Call StartDownload
+    ${EndIf}
+  ${Else}
+    Call SendPing
+  ${EndIf}
+
+  ; Aborting the abort will allow SendPing to hide the installer window and
+  ; close the installer after it sends the metrics ping, or allow us to just go
+  ; back to installing if that's what the user selected.
+  Abort
+FunctionEnd
+
+
+Section
+SectionEnd
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
index 559c8b46ee06b..e644b06d00be2 100755
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -41,11 +41,10 @@ ManifestDPIAware true
 !define NO_LOG
 
 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"
 
 Var TmpVal
 Var MaintCertKey
-Var ShouldOpenSurvey
 Var ShouldSendPing
 Var InstalledVersion
 Var InstalledBuildID
@@ -154,10 +153,8 @@ OutFile "helper.exe"
 !endif
 ShowUnInstDetails nevershow
 
-!define URLUninstallSurvey "https://qsurvey.mozilla.com/s3/FF-Desktop-Post-Uninstall?channel=${UpdateChannel}&version=${AppVersion}&osversion="
-
 ; Support for the profile refresh feature
-!define URLProfileRefreshHelp "https://support.mozilla.org/kb/refresh-firefox-reset-add-ons-and-settings"
+!define URLProfileRefreshHelp "https://www.waterfox.com/support/refresh-waterfox-reset-add-ons-and-settings/"
 
 ; Arguments to add to the command line when launching FileMainEXE for profile refresh
 !define ArgsProfileRefresh "-reset-profile -migration -uninstaller-profile-refresh"
@@ -205,8 +202,6 @@ UninstPage custom un.preConfirm
 ; Finish Page
 !define MUI_FINISHPAGE_SHOWREADME
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(UN_SURVEY_CHECKBOX_LABEL)
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.Survey
 !define MUI_PAGE_CUSTOMFUNCTION_PRE un.preFinish
 !define MUI_PAGE_CUSTOMFUNCTION_SHOW un.showFinish
 !insertmacro MUI_UNPAGE_FINISH
@@ -217,15 +212,6 @@ ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
 ################################################################################
 # Helper Functions
 
-Function un.Survey
-  ; We can't actually call ExecInExplorer here because it's going to have to
-  ; make some marshalled COM calls and those are not allowed from within a
-  ; synchronous message handler (where we currently are); we'll be thrown
-  ; RPC_E_CANTCALLOUT_ININPUTSYNCCALL if we try. So all we can do is record
-  ; that we need to make the call later, which we'll do from un.onGUIEnd.
-  StrCpy $ShouldOpenSurvey "1"
-FunctionEnd
-
 ; This function is used to uninstall the maintenance service if the
 ; application currently being uninstalled is the last application to use the
 ; maintenance service.
@@ -245,7 +231,7 @@ Function un.UninstallServiceIfNotUsed
   ; Figure out the number of subkeys
   StrCpy $0 0
   ${Do}
-    EnumRegKey $1 HKLM "Software\Mozilla\MaintenanceService" $0
+    EnumRegKey $1 HKLM "Software\BrowserWorks\MaintenanceService" $0
     ${If} "$1" == ""
       ${ExitDo}
     ${EndIf}
@@ -450,8 +436,8 @@ Section "Uninstall"
   ${EndIf}
 
   SetShellVarContext current  ; Set SHCTX to HKCU
-  ${un.RegCleanMain} "Software\Mozilla"
-  ${un.RegCleanPrefs} "Software\Mozilla\${AppName}"
+  ${un.RegCleanMain} "Software\BrowserWorks"
+  ${un.RegCleanPrefs} "Software\BrowserWorks\${AppName}"
   ${un.RegCleanUninstall}
   ${un.DeleteShortcuts}
 
@@ -469,52 +455,53 @@ Section "Uninstall"
   ${EndIf}
 
   ; Clean up old maintenance service logs
-  ${un.CleanMaintenanceServiceLogs} "Mozilla\Firefox"
+  ${un.CleanMaintenanceServiceLogs} "BrowserWorks\Waterfox"
 
   ; Remove any app model id's stored in the registry for this install path
-  DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
-  DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKCU "Software\BrowserWorks\${AppName}\TaskBarIDs" "$INSTDIR"
+  DeleteRegValue HKLM "Software\BrowserWorks\${AppName}\TaskBarIDs" "$INSTDIR"
 
   ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+  WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
   ${If} ${Errors}
     StrCpy $RegHive "HKCU"
   ${Else}
     SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+    DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
     StrCpy $RegHive "HKLM"
-    ${un.RegCleanMain} "Software\Mozilla"
+    ${un.RegCleanMain} "Software\BrowserWorks"
     ${un.RegCleanUninstall}
     ${un.DeleteShortcuts}
     ${un.SetAppLSPCategories}
   ${EndIf}
 
-  ${un.RegCleanAppHandler} "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanAppHandler} "FirefoxPDF-$AppUserModelID"
-  ${un.RegCleanAppHandler} "FirefoxURL-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxPDF-$AppUserModelID"
+  ${un.RegCleanAppHandler} "WaterfoxURL-$AppUserModelID"
   ${un.RegCleanProtocolHandler} "http"
   ${un.RegCleanProtocolHandler} "https"
   ${un.RegCleanProtocolHandler} "mailto"
-  ${un.RegCleanFileHandler}  ".htm"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".html"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".shtml" "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".xht"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".xhtml" "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".oga"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".ogg"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".ogv"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".webm"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
-  ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
-
-  ${un.RegCleanFileHandler}  ".pdf"   "FirefoxPDF-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".htm"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".html"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".shtml" "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".xht"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".xhtml" "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".oga"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".ogg"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".ogv"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".webm"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".svg"   "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".webp"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".avif"  "WaterfoxHTML-$AppUserModelID"
+  ${un.RegCleanFileHandler}  ".jxl"   "WaterfoxHTML-$AppUserModelID"
+
+  ${un.RegCleanFileHandler}  ".pdf"   "WaterfoxPDF-$AppUserModelID"
 
   SetShellVarContext all  ; Set SHCTX to HKLM
-  ${un.GetSecondInstallPath} "Software\Mozilla" $R9
+  ${un.GetSecondInstallPath} "Software\BrowserWorks" $R9
   ${If} $R9 == "false"
     SetShellVarContext current  ; Set SHCTX to HKCU
-    ${un.GetSecondInstallPath} "Software\Mozilla" $R9
+    ${un.GetSecondInstallPath} "Software\BrowserWorks" $R9
   ${EndIf}
 
   DeleteRegKey HKLM "Software\Clients\StartMenuInternet\${AppRegName}-$AppUserModelID"
@@ -535,22 +522,22 @@ Section "Uninstall"
 
   ; Remove old protocol handler and StartMenuInternet keys without install path
   ; hashes, but only if they're for this installation.  We've never supported
-  ; bare FirefoxPDF.
-  ReadRegStr $0 HKLM "Software\Classes\FirefoxHTML\DefaultIcon" ""
+  ; bare WaterfoxPDF.
+  ReadRegStr $0 HKLM "Software\Classes\WaterfoxHTML\DefaultIcon" ""
   StrCpy $0 $0 -2
   ${If} $0 == "$INSTDIR\${FileMainEXE}"
-    DeleteRegKey HKLM "Software\Classes\FirefoxHTML"
-    DeleteRegKey HKLM "Software\Classes\FirefoxURL"
+    DeleteRegKey HKLM "Software\Classes\WaterfoxHTML"
+    DeleteRegKey HKLM "Software\Classes\WaterfoxURL"
     ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
     DeleteRegKey HKLM "Software\Clients\StartMenuInternet\$R9"
     DeleteRegValue HKLM "Software\RegisteredApplications" "$R9"
     DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegName}"
   ${EndIf}
-  ReadRegStr $0 HKCU "Software\Classes\FirefoxHTML\DefaultIcon" ""
+  ReadRegStr $0 HKCU "Software\Classes\WaterfoxHTML\DefaultIcon" ""
   StrCpy $0 $0 -2
   ${If} $0 == "$INSTDIR\${FileMainEXE}"
-    DeleteRegKey HKCU "Software\Classes\FirefoxHTML"
-    DeleteRegKey HKCU "Software\Classes\FirefoxURL"
+    DeleteRegKey HKCU "Software\Classes\WaterfoxHTML"
+    DeleteRegKey HKCU "Software\Classes\WaterfoxURL"
     ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
     DeleteRegKey HKCU "Software\Clients\StartMenuInternet\$R9"
     DeleteRegValue HKCU "Software\RegisteredApplications" "$R9"
@@ -567,7 +554,7 @@ Section "Uninstall"
     StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
     DeleteRegKey HKLM "$0"
     DeleteRegKey HKCU "$0"
-    StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
+    StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=waterfox"
     DeleteRegKey HKLM "$0"
     DeleteRegKey HKCU "$0"
   ${Else}
@@ -726,7 +713,7 @@ Section "Uninstall"
   ; subsequently deleted after checking. If the value is found during startup
   ; the browser will offer to Reset Firefox. We use the UpdateChannel to match
   ; uninstalls of Firefox-release with reinstalls of Firefox-release, for example.
-  WriteRegStr HKCU "Software\Mozilla\Firefox" "Uninstalled-${UpdateChannel}" "True"
+  WriteRegStr HKCU "Software\BrowserWorks\Waterfox" "Uninstalled-${UpdateChannel}" "True"
 
 !ifdef MOZ_MAINTENANCE_SERVICE
   ; Get the path the allowed cert is at and remove it
@@ -749,7 +736,7 @@ Section "Uninstall"
 !endif
 
 !ifdef MOZ_BITS_DOWNLOAD
-  BitsUtils::CancelBitsJobsByName "MozillaUpdate $AppUserModelID"
+  BitsUtils::CancelBitsJobsByName "WaterfoxUpdate $AppUserModelID"
   Pop $0
 !endif
 
@@ -989,10 +976,8 @@ Function un.onUninstSuccess
 FunctionEnd
 
 Function un.preFinish
-  ; Need to give the survey (readme) checkbox a few extra DU's of height
-  ; to accommodate a potentially multi-line label. If the reboot flag is set,
-  ; then we're not showing the survey checkbox and Field 4 is the "reboot now"
-  ; radio button; setting it to go from 90 to 120 (instead of 90 to 100) would
+  ; If the reboot flag is set, Field 4 is the "reboot now" radio button; 
+  ; setting it to go from 90 to 120 (instead of 90 to 100) would
   ; cover up Field 5 which is "reboot later", running from 110 to 120. For
   ; whatever reason child windows get created at the bottom of the z-order, so
   ; 4 overlaps 5.
@@ -1016,9 +1001,9 @@ Function un.ShowFinish
   ; scaling if the display is scaled at anything above 100%.
   ${un.ChangeMUISidebarImage} "$PLUGINSDIR\modern-wizard.bmp"
 
-  ; Either Fields 4 and 5 are the reboot option radio buttons, or Field 4 is
-  ; the survey checkbox and Field 5 doesn't exist. Either way, we need to
-  ; clear the theme from them before we can set their background colors.
+  ; Either Fields 4 and 5 are the reboot option radio buttons, or the fields
+  ; don't exist. Either way, we need to clear the theme from them
+  ; before we can set their background colors.
   ReadINIStr $0 "$PLUGINSDIR\ioSpecial.ini" "Field 4" "HWND"
   System::Call 'uxtheme::SetWindowTheme(i $0, w " ", w " ")'
   SetCtlColors $0 SYSCLR:WINDOWTEXT SYSCLR:WINDOW
@@ -1049,12 +1034,11 @@ Function un.onInit
   System::Call 'kernel32::SetDllDirectoryW(w "")'
 
   StrCpy $LANGUAGE 0
-  StrCpy $ShouldOpenSurvey "0"
 
   ${un.UninstallUnOnInitCommon}
 
   ; setup the application model id registration value
-  ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+  ${un.InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
 
   ; Find a default profile for this install.
   SetShellVarContext current
@@ -1103,29 +1087,6 @@ FunctionEnd
 Function un.onGUIEnd
   ${un.OnEndCommon}
 
-  ${If} $ShouldOpenSurvey == "1"
-    ; Though these values are sometimes incorrect due to bug 444664 it happens
-    ; so rarely it isn't worth working around it by reading the registry values.
-    ${WinVerGetMajor} $0
-    ${WinVerGetMinor} $1
-    ${WinVerGetBuild} $2
-    ${WinVerGetServicePackLevel} $3
-    StrCpy $R1 "${URLUninstallSurvey}$0.$1.$2.$3"
-
-    ; We can't just open the URL normally because we are most likely running
-    ; elevated without an unelevated process to redirect through, and we're
-    ; not going to go around starting elevated web browsers. But to start an
-    ; unelevated process directly from here we need a pretty nasty hack; see
-    ; the ExecInExplorer plugin code itself for the details.
-    ; If we were the default browser and we've now been uninstalled, we need
-    ; to take steps to make sure the user doesn't see an "open with" dialog;
-    ; they're helping us out by answering this survey, they don't need more
-    ; friction.
-    ; Windows 10 always seems to just clear the default browser, so for it
-    ; we'll manually invoke Edge using Edge's custom URI scheme.
-    ExecInExplorer::Exec "microsoft-edge:$R1"
-  ${EndIf}
-
   ; Finally send the ping, there's no GUI to freeze in case it is slow.
   ${If} $ShouldSendPing == "1"
     Call un.SendUninstallPing
diff --git a/browser/installer/windows/stub.tag b/browser/installer/windows/stub.tag
index f32bef36e8440..3e07732318652 100644
--- a/browser/installer/windows/stub.tag
+++ b/browser/installer/windows/stub.tag
@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
-Title="Mozilla Firefox"
+Title="Waterfox"
 RunProgram="setup-stub.exe"
 ;!@InstallEnd@!
\ No newline at end of file
diff --git a/browser/locales/en-US/browser/aboutDialog.ftl b/browser/locales/en-US/browser/aboutDialog.ftl
index d266d15b6ce87..4faeb29ad3e5b 100644
--- a/browser/locales/en-US/browser/aboutDialog.ftl
+++ b/browser/locales/en-US/browser/aboutDialog.ftl
@@ -63,7 +63,7 @@ community-exp = <label data-l10n-name="community-exp-mozillaLink">{ -vendor-shor
 
 community-2 = { -brand-short-name } is designed by <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, a <label data-l10n-name="community-creditsLink">global community</label> working together to keep the Web open, public and accessible to all.
 
-helpus = Want to help? <label data-l10n-name="helpus-donateLink">Make a donation</label> or <label data-l10n-name="helpus-getInvolvedLink">get involved!</label>
+helpus = Want to help? <label data-l10n-name="helpus-getInvolvedLink">Get involved!</label>
 
 bottomLinks-license = Licensing Information
 bottom-links-terms = Terms of Use
diff --git a/browser/locales/en-US/browser/appExtensionFields.ftl b/browser/locales/en-US/browser/appExtensionFields.ftl
index 06f56085fb4b6..0f6f260fb3296 100644
--- a/browser/locales/en-US/browser/appExtensionFields.ftl
+++ b/browser/locales/en-US/browser/appExtensionFields.ftl
@@ -14,5 +14,5 @@ extension-firefox-compact-light-description=A theme with a light color scheme.
 extension-firefox-compact-dark-name=Dark
 extension-firefox-compact-dark-description=A theme with a dark color scheme.
 
-extension-firefox-alpenglow-name=Firefox Alpenglow
+extension-firefox-alpenglow-name=Alpenglow
 extension-firefox-alpenglow-description=Use a colorful appearance for buttons, menus, and windows.
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
index 4b8d76f781671..17c4840157cd9 100644
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -8,7 +8,7 @@
 # .data-title-default and .data-title-private are used when the web content
 # opened has no title:
 #
-# default - "Mozilla Firefox"
+# default - "Waterfox"
 # private - "Mozilla Firefox (Private Browsing)"
 #
 # .data-content-title-default and .data-content-title-private are for use when
@@ -37,7 +37,7 @@ browser-main-window-titles =
 # opened has no title:
 #
 #
-# "default" - "Mozilla Firefox"
+# "default" - "Waterfox"
 # "private" - "Mozilla Firefox โ€” (Private Browsing)"
 #
 # .data-content-title-default and .data-content-title-private are for use when
diff --git a/browser/locales/en-US/browser/migration.ftl b/browser/locales/en-US/browser/migration.ftl
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/browser/locales/en-US/browser/newtab/onboarding.ftl b/browser/locales/en-US/browser/newtab/onboarding.ftl
index 5842d34a78190..77da414d36b34 100644
--- a/browser/locales/en-US/browser/newtab/onboarding.ftl
+++ b/browser/locales/en-US/browser/newtab/onboarding.ftl
@@ -266,7 +266,7 @@ mr2022-onboarding-privacy-segmentation-button-secondary-label = Show detailed in
 ## MR2022 Multistage Gratitude screen strings
 
 mr2022-onboarding-gratitude-title = Youโ€™re helping us build a better web
-mr2022-onboarding-gratitude-subtitle = Thank you for using { -brand-short-name }, backed by the Mozilla Foundation. With your support, weโ€™re working to make the internet more open, accessible, and better for everyone.
+mr2022-onboarding-gratitude-subtitle = Thank you for using { -brand-short-name }, developed by BrowserWorks.
 mr2022-onboarding-gratitude-primary-button-label = See whatโ€™s new
 mr2022-onboarding-gratitude-secondary-button-label = Start browsing
 
@@ -314,7 +314,7 @@ amo-picker-collection-link = Explore more add-ons
 
 # Easy setup screen
 onboarding-easy-setup-security-and-privacy-title = We love keeping you safe
-onboarding-easy-setup-security-and-privacy-subtitle = Our non-profit backed browser helps stop companies from secretly following you around the web.
+onboarding-easy-setup-security-and-privacy-subtitle = We offer privacy out of the box, bringing you the best balance between privacy and useability.
 
 # Mobile download screen
 onboarding-mobile-download-security-and-privacy-title = Stay encrypted when you hop between devices
@@ -322,7 +322,7 @@ onboarding-mobile-download-security-and-privacy-subtitle = When youโ€™re synced
 
 # Gratitude screen
 onboarding-gratitude-security-and-privacy-title = { -brand-short-name } has your back
-onboarding-gratitude-security-and-privacy-subtitle = Thank you for using { -brand-short-name }, backed by the Mozilla Foundation. With your support, weโ€™re working to make the internet safer and more accessible for everyone.
+onboarding-gratitude-security-and-privacy-subtitle = Thank you for using { -brand-short-name }, developed by Waterfox.
 
 # Sign up or Sign in screen
 onboarding-sign-up-title = Sync your data across devices
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
index 27196efa266dd..f607090beedc8 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -703,7 +703,7 @@ choose-bookmark =
     .label = Use Bookmarkโ€ฆ
     .accesskey = B
 
-## Home Section - Firefox Home Content Customization
+## Home Section - Waterfox Home Content Customization
 
 home-prefs-content-header2 = { -firefox-home-brand-name } Content
 home-prefs-content-description2 = Choose what content you want on your { -firefox-home-brand-name } screen.
@@ -877,7 +877,7 @@ sync-signedout-account-signin3 =
 #
 # They can be moved within the sentence as needed to adapt
 # to your language, but should not be changed or translated.
-sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
+sync-mobile-promo = Download Waterfox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
 
 ## Firefox account - Signed in
 
@@ -994,7 +994,7 @@ sync-engine-payment-methods2 =
 
 sync-engine-addons =
     .label = Add-ons
-    .tooltiptext = Extensions and themes for Firefox desktop
+    .tooltiptext = Extensions and themes for Waterfox desktop
     .accesskey = A
 
 sync-engine-settings =
@@ -1134,8 +1134,8 @@ history-header = History
 # "Firefox will" + "Remember history".
 #
 # If this doesn't work for your language, you can translate this message:
-#   - Simply as "Firefox", moving the verb into each option.
-#     This will result in "Firefox" + "Will remember history", etc.
+#   - Simply as "Waterfox", moving the verb into each option.
+#     This will result in "Waterfox" + "Will remember history", etc.
 #   - As a stand-alone message, for example "Firefox history settings:".
 history-remember-label = { -brand-short-name } will
     .accesskey = w
diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
index c7d3c0e88c075..46ff78e7a2bdf 100644
--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
+++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
@@ -3,29 +3,29 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 malformedURI2=Please check that the URL is correct and try again.
-fileNotFound=Firefox canโ€™t find the file at %S.
+fileNotFound=Waterfox canโ€™t find the file at %S.
 fileAccessDenied=The file at %S is not readable.
 # %S is replaced by the uri host
 httpErrorPage=%S sent back an error.
 serverError=%S might have a temporary problem or it could have moved.
 dnsNotFound2=We canโ€™t connect to the server at %S.
 basicHttpAuthDisabled=Someone pretending to be the site could try to steal things like your username, password, or email.
-unknownProtocolFound=Firefox doesnโ€™t know how to open this address, because one of the following protocols (%S) isnโ€™t associated with any program or is not allowed in this context.
-connectionFailure=Firefox canโ€™t establish a connection to the server at %S.
+unknownProtocolFound=Waterfox doesnโ€™t know how to open this address, because one of the following protocols (%S) isnโ€™t associated with any program or is not allowed in this context.
+connectionFailure=Waterfox canโ€™t establish a connection to the server at %S.
 netInterrupt=The connection to %S was interrupted while the page was loading.
 netTimeout=The server at %S is taking too long to respond.
-redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
+redirectLoop=Waterfox has detected that the server is redirecting the request for this address in a way that will never complete.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, donโ€™t translate "%S"
 confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
 resendButton.label=Resend
-unknownSocketType=Firefox doesnโ€™t know how to communicate with the server.
+unknownSocketType=Waterfox doesnโ€™t know how to communicate with the server.
 netReset=The connection to the server was reset while the page was loading.
 notCached=This document is no longer available.
-netOffline=Firefox is currently in offline mode and canโ€™t browse the Web.
+netOffline=Waterfox is currently in offline mode and canโ€™t browse the Web.
 isprinting=The document cannot change while Printing or in Print Preview.
-deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection.
-proxyResolveFailure=Firefox is configured to use a proxy server that canโ€™t be found.
-proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
+deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Waterfox has canceled the request for your protection.
+proxyResolveFailure=Waterfox is configured to use a proxy server that canโ€™t be found.
+proxyConnectFailure=Waterfox is configured to use a proxy server that is refusing connections.
 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 externalProtocolTitle=External Protocol Request
@@ -42,9 +42,9 @@ cspBlocked=This page has a content security policy that prevents it from being l
 xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
 ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
-sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
+sslv3Used=Waterfox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 blockedByPolicy=Your organization has blocked access to this page or website.
-blockedByCORP=Firefox didnโ€™t load this page because it looks like the security configuration doesnโ€™t match the previous page.
+blockedByCORP=Waterfox didnโ€™t load this page because it looks like the security configuration doesnโ€™t match the previous page.
 invalidHeaderValue=%S sent back a header with empty characters not allowed by web security standards.
-networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
+networkProtocolError=Waterfox has experienced a network protocol violation that cannot be repaired.
diff --git a/browser/locales/en-US/installer/custom.properties b/browser/locales/en-US/installer/custom.properties
index 8c33192e589de..c4b3e690e7008 100644
--- a/browser/locales/en-US/installer/custom.properties
+++ b/browser/locales/en-US/installer/custom.properties
@@ -73,8 +73,6 @@ STATUS_INSTALL_APP=Installing $BrandShortNameโ€ฆ
 STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortNameโ€ฆ
 STATUS_CLEANUP=A Little Housekeepingโ€ฆ
 
-UN_SURVEY_CHECKBOX_LABEL=Tell Mozilla why you uninstalled $BrandShortName
-
 # _DESC strings support approximately 65 characters per line.
 # One line
 OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
diff --git a/browser/locales/en-US/updater/updater.ini b/browser/locales/en-US/updater/updater.ini
index cc4ae5405ec0e..bac41f2ddd5a1 100644
--- a/browser/locales/en-US/updater/updater.ini
+++ b/browser/locales/en-US/updater/updater.ini
@@ -6,4 +6,4 @@
 [Strings]
 TitleText=%MOZ_APP_DISPLAYNAME% Update
 InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few momentsโ€ฆ
-MozillaMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
+WaterfoxMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
index 41803fe81fd13..04cc698b43aff 100644
--- a/browser/locales/l10n.toml
+++ b/browser/locales/l10n.toml
@@ -129,8 +129,8 @@ locales = [
     l10n = "{l}browser/**"
 
 [[paths]]
-    reference = "browser/branding/official/locales/en-US/**"
-    l10n = "{l}browser/branding/official/**"
+    reference = "waterfox/browser/branding/locales/en-US/**"
+    l10n = "{l}waterfox/browser/branding/**"
 
 # This file was removed in bug 1948916. In order to keep this file in
 # repositories, we need to preserve this entry until esr115 and esr128 become
@@ -153,6 +153,9 @@ locales = [
 [[includes]]
     path = "devtools/client/locales/l10n.toml"
 
+[[includes]]
+    path = "waterfox/browser/locales/l10n.toml"
+
 [[paths]]
     reference = "devtools/startup/locales/en-US/**"
     l10n = "{l}devtools/startup/**"
diff --git a/browser/modules/BrowserUIUtils.sys.mjs b/browser/modules/BrowserUIUtils.sys.mjs
index ab2ae3c1e56a0..559dbf67dd804 100644
--- a/browser/modules/BrowserUIUtils.sys.mjs
+++ b/browser/modules/BrowserUIUtils.sys.mjs
@@ -174,3 +174,10 @@ XPCOMUtils.defineLazyPreferenceGetter(
   "browser.quitShortcut.disabled",
   false
 );
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  BrowserUIUtils,
+  "closeShortcutDisabled",
+  "browser.closeShortcut.disabled",
+  false
+);
diff --git a/browser/moz.configure b/browser/moz.configure
index e8b401a7dfb21..ad8162ae14166 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -5,15 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option("MOZ_PLACES", True)
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
 imply_option("MOZ_SERVICES_SYNC", True)
 imply_option("MOZ_DEDICATED_PROFILES", True)
-imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
-imply_option("MOZ_NORMANDY", True)
+imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
+imply_option("MOZ_NORMANDY", False)
 imply_option("MOZ_PROFILE_MIGRATOR", True)
 
-
-imply_option("MOZ_APP_VENDOR", "Mozilla")
+imply_option("MOZ_APP_VENDOR", "BrowserWorks")
 imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
 # Include the DevTools client, not just the server (which is the default)
 imply_option("MOZ_DEVTOOLS", "all")
@@ -70,3 +69,4 @@ def requires_stub_installer(
 imply_option("MOZ_STUB_INSTALLER", True, when=requires_stub_installer)
 
 include("../toolkit/moz.configure")
+include("../waterfox/moz.configure")
diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
index 247db7774bd39..1162ee8ad3a59 100644
--- a/browser/themes/addons/alpenglow/manifest.json
+++ b/browser/themes/addons/alpenglow/manifest.json
@@ -7,7 +7,7 @@
     }
   },
 
-  "name": "Firefox Alpenglow",
+  "name": "Alpenglow",
   "description": "Use a colorful appearance for buttons, menus, and windows.",
   "version": "1.5",
   "icons": { "32": "icon.svg" },
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 5f789ef715892..3f1148ca9536e 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -64,6 +64,11 @@
   }
 }
 
+#browser-bottombox {
+  /* opaque for layers optimization */
+  background-color: -moz-Dialog;
+}
+
 /* Bookmark menus */
 .bookmark-item {
   &:is(menu, menuitem) {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 007aec91e089a..6aa0a989739f7 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -64,6 +64,10 @@
   }
 }
 
+#browser-bottombox:not(:-moz-lwtheme) {
+  background-color: -moz-dialog;
+}
+
 /* Titlebar */
 
 .titlebar-buttonbox {
diff --git a/build/application.ini.in b/build/application.ini.in
index 6df13230a45b2..78203be226b1d 100644
--- a/build/application.ini.in
+++ b/build/application.ini.in
@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
 
 #if MOZ_UPDATER
 [AppUpdate]
-URL=https://@MOZ_APPUPDATE_HOST@/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml
+URL=https://@MOZ_APPUPDATE_HOST@/update/%PRODUCT%/%DISPLAY_VERSION%/%OS%_%ARCH%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml
 #endif
diff --git a/build/moz.build b/build/moz.build
index f7a912ec35dd0..fb1ac51b5f88c 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -89,7 +89,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
         if CONFIG[var]:
             appini_defines[var] = True
 
-    appini_defines["MOZ_APPUPDATE_HOST"] = "aus5.mozilla.org"
+    appini_defines["MOZ_APPUPDATE_HOST"] = "aus1.waterfox.net"
     if CONFIG["MOZ_APPUPDATE_HOST"]:
         appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
 
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 1842548c61f6a..e6e81637508a1 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -108,8 +108,10 @@ def forced_pgo_optimization_level(target):
 @imports(_from="mozbuild.shellutil", _import="quote")
 def check_optimize_flags(src, flags):
     for flag in reversed(flags):
-        if flag.startswith(("-O", "/O")):
-            if flag[2:] == "0":
+        # The optimization flag may be prefixed, e.g. -clang:-O3.
+        opt_flag = flag.split(":")[-1]
+        if opt_flag.startswith(("-O", "/O")):
+            if opt_flag[2:] == "0":
                 die(
                     f"Optimization enabled through {src} but last optimization flag is {flag} which disables optimizations"
                 )
diff --git a/build/moz.configure/update-programs.configure b/build/moz.configure/update-programs.configure
index 3f3a08b65ffb3..a04f2dd9f44fa 100644
--- a/build/moz.configure/update-programs.configure
+++ b/build/moz.configure/update-programs.configure
@@ -73,7 +73,7 @@ def mac_prod_requirements_string(identifier):
         f'identifier "{identifier}" and anchor apple generic and '
         "certificate 1[field.1.2.840.113635.100.6.2.6] and "
         "certificate leaf[field.1.2.840.113635.100.6.1.13] and "
-        'certificate leaf[subject.OU] = "43AQ936H96"'
+        'certificate leaf[subject.OU] = "PZWYM7N4GF"'
     )
 
 
@@ -95,7 +95,7 @@ set_config("MOZ_SMAUTHORIZEDCLIENTS_REQUIREMENTS", smauthorizedclients_requireme
 
 @depends("--enable-mac-elevated-updates-with-generic-certs", when=target_is_osx)
 def smprivilegedexec_requirements(enabled):
-    updater_id = "org.mozilla.updater"
+    updater_id = "net.waterfox.updater"
     if enabled:
         return mac_relaxed_requirements_string(updater_id)
     else:
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index 6017810c873f6..2714efa3aea79 100755
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -7,6 +7,7 @@
 import glob
 import json
 import os
+import socket
 import subprocess
 import sys
 
@@ -18,7 +19,12 @@
 from mozprofile.permissions import ServerLocations
 from mozrunner import CLI, FirefoxRunner
 
-PORT = 8888
+def find_free_port():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.bind(('', 0))
+        return s.getsockname()[1]
+
+PORT = find_free_port()
 
 PATH_MAPPINGS = {
     "/webkit/PerformanceTests": "third_party/webkit/PerformanceTests",
diff --git a/build/variables.py b/build/variables.py
index 8b510b3ed9e87..91715f7c4e40c 100644
--- a/build/variables.py
+++ b/build/variables.py
@@ -38,6 +38,19 @@ def get_program_output(*command):
     except Exception:
         return ""
 
+def get_git_info(workdir):
+    repo = get_program_output('git', '-C', workdir, 'remote', 'get-url', 'origin')
+    if repo:
+        repo = repo.strip()
+        if repo.startswith("ssh://"):
+            repo = "https://" + repo[6:]
+        repo = repo.rstrip("/")
+        if repo.endswith('.git'):
+            repo = repo[:-4]
+
+    changeset = get_git_changeset(workdir)
+
+    return repo, changeset
 
 def get_hg_info(workdir):
     repo = get_program_output("hg", "-R", workdir, "path", "default")
@@ -51,6 +64,8 @@ def get_hg_info(workdir):
 
     return repo, changeset
 
+def get_git_changeset(path):
+    return get_program_output('git', '-C', path, 'rev-parse', 'HEAD')
 
 def get_hg_changeset(path):
     return get_program_output("hg", "-R", path, "parent", "--template={node}")
@@ -91,10 +106,12 @@ def source_repo_header(output):
         sourcestamp_path = os.path.join(buildconfig.topsrcdir, SOURCESTAMP_FILENAME)
         if os.path.exists(os.path.join(buildconfig.topsrcdir, ".hg")):
             repo, changeset = get_hg_info(buildconfig.topsrcdir)
+        elif os.path.exists(os.path.join(buildconfig.topsrcdir, ".git")):
+            repo, changeset = get_git_info(buildconfig.topsrcdir)
         elif os.path.exists(sourcestamp_path):
             repo, changeset = get_info_from_sourcestamp(sourcestamp_path)
     elif not changeset:
-        changeset = get_hg_changeset(buildconfig.topsrcdir)
+        changeset = get_git_changeset(buildconfig.topsrcdir)
         if not changeset:
             raise Exception(
                 "could not resolve changeset; " "try setting MOZ_SOURCE_CHANGESET"
@@ -104,7 +121,7 @@ def source_repo_header(output):
         output.write("#define MOZ_SOURCE_STAMP %s\n" % changeset)
 
     if repo and buildconfig.substs.get("MOZ_INCLUDE_SOURCE_INFO"):
-        source = "%s/rev/%s" % (repo, changeset)
+        source = "%s/commit/%s" % (repo, changeset)
         output.write("#define MOZ_SOURCE_REPO %s\n" % repo)
         output.write("#define MOZ_SOURCE_URL %s\n" % source)
 
diff --git a/dom/webgpu/Instance.cpp b/dom/webgpu/Instance.cpp
index a8250f089d862..bbdc5e2f5278e 100644
--- a/dom/webgpu/Instance.cpp
+++ b/dom/webgpu/Instance.cpp
@@ -22,9 +22,9 @@
 #include "nsString.h"
 #include "nsStringFwd.h"
 
-#ifndef EARLY_BETA_OR_EARLIER
-#  include "mozilla/dom/WorkerPrivate.h"
-#endif
+// #ifndef EARLY_BETA_OR_EARLIER
+// #  include "mozilla/dom/WorkerPrivate.h"
+// #endif
 
 #include <optional>
 #include <string_view>
@@ -113,22 +113,22 @@ already_AddRefed<dom::Promise> Instance::RequestAdapter(
     }
   };
 
-#ifndef EARLY_BETA_OR_EARLIER
-  rejectIf(true, "WebGPU is not yet available in Release or late Beta builds.");
-
-  // NOTE: Deliberately left after the above check so that we only enter
-  // here if it's removed. Above is a more informative diagnostic, while the
-  // check is still present.
-  //
-  // Follow-up to remove this check:
-  // <https://bugzilla.mozilla.org/show_bug.cgi?id=1942431>
-  if (dom::WorkerPrivate* wp = dom::GetCurrentThreadWorkerPrivate()) {
-    rejectIf(wp->IsServiceWorker(),
-             "WebGPU in service workers is not yet available in Release or "
-             "late Beta builds; see "
-             "<https://bugzilla.mozilla.org/show_bug.cgi?id=1942431>.");
-  }
-#endif
+// #ifndef EARLY_BETA_OR_EARLIER
+//   rejectIf(true, "WebGPU is not yet available in Release or late Beta builds.");
+
+//   // NOTE: Deliberately left after the above check so that we only enter
+//   // here if it's removed. Above is a more informative diagnostic, while the
+//   // check is still present.
+//   //
+//   // Follow-up to remove this check:
+//   // <https://bugzilla.mozilla.org/show_bug.cgi?id=1942431>
+//   if (dom::WorkerPrivate* wp = dom::GetCurrentThreadWorkerPrivate()) {
+//     rejectIf(wp->IsServiceWorker(),
+//              "WebGPU in service workers is not yet available in Release or "
+//              "late Beta builds; see "
+//              "<https://bugzilla.mozilla.org/show_bug.cgi?id=1942431>.");
+//   }
+// #endif
   rejectIf(!gfx::gfxVars::AllowWebGPU(), "WebGPU is disabled by blocklist.");
   rejectIf(!StaticPrefs::dom_webgpu_enabled(),
            "WebGPU is disabled because the `dom.webgpu.enabled` pref. is set "
diff --git a/dom/xul/XULPopupElement.cpp b/dom/xul/XULPopupElement.cpp
index d8fcb5c65ae97..022a5f5a65137 100644
--- a/dom/xul/XULPopupElement.cpp
+++ b/dom/xul/XULPopupElement.cpp
@@ -238,6 +238,10 @@ void XULPopupElement::GetState(nsString& aState) {
   // set this here in case there's no frame for the popup
   aState.AssignLiteral("closed");
 
+#ifdef MOZ_WIDGET_GTK
+  nsAutoString nativeState;
+#endif
+
   if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) {
     switch (pm->GetPopupState(this)) {
       case ePopupShown:
@@ -260,6 +264,11 @@ void XULPopupElement::GetState(nsString& aState) {
         break;
     }
   }
+#ifdef MOZ_WIDGET_GTK
+  else if (GetAttr(kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate, nativeState)) {
+    aState = nativeState;
+  }
+#endif
 }
 
 nsINode* XULPopupElement::GetTriggerNode() const {
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index cbcf964a2ba71..1aca311d9bd82 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -91,4 +91,9 @@ LOCAL_INCLUDES += [
 
 include("/ipc/chromium/chromium-config.mozbuild")
 
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+    LOCAL_INCLUDES += [
+        "/widget/gtk",
+    ]
+
 FINAL_LIBRARY = "xul"
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index c779e226af3a0..d5b9172f807de 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -3223,13 +3223,13 @@ void gfxPlatform::InitWebGPUConfig() {
 
   // When this condition changes, be sure to update the `run-if`
   // conditions in `dom/webgpu/tests/mochitest/*.toml` accordingly.
-#if !(defined(NIGHTLY_BUILD) || \
-      (defined(XP_WIN) && defined(EARLY_BETA_OR_EARLIER)))
-  feature.ForceDisable(
-      FeatureStatus::Blocked,
-      "WebGPU cannot be enabled unless in Nightly, or Early Beta on Windows.",
-      "WEBGPU_DISABLE_RELEASE_OR_NON_WINDOWS_EARLY_BETA"_ns);
-#endif
+  // #if !(defined(NIGHTLY_BUILD) || \
+  //       (defined(XP_WIN) && defined(EARLY_BETA_OR_EARLIER)))
+  //   feature.ForceDisable(
+  //       FeatureStatus::Blocked,
+  //       "WebGPU cannot be enabled unless in Nightly, or Early Beta on Windows.",
+  //       "WEBGPU_DISABLE_RELEASE_OR_NON_WINDOWS_EARLY_BETA"_ns);
+  // #endif
 
   gfxVars::SetAllowWebGPU(feature.IsEnabled());
 
diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp
index 59c47ad314e74..59f01d1bdfebf 100644
--- a/gfx/webrender_bindings/RendererOGL.cpp
+++ b/gfx/webrender_bindings/RendererOGL.cpp
@@ -70,15 +70,6 @@ wr::WrExternalImage wr_renderer_lock_external_image(void* aObj,
     return InvalidToWrExternalImage();
   }
 
-#if defined(MOZ_WAYLAND)
-  // Wayland native compositor doesn't use textures so pass null GL context.
-  if (texture->AsRenderDMABUFTextureHost() &&
-      renderer->GetCompositor()->CompositorType() ==
-          layers::WebRenderCompositor::WAYLAND) {
-    return texture->Lock(aChannelIndex, nullptr);
-  }
-#endif
-
   if (auto* gl = renderer->gl()) {
     return texture->Lock(aChannelIndex, gl);
   } else if (auto* swgl = renderer->swgl()) {
diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
index 21c94898cbbce..df0ee35cbf297 100644
--- a/image/DecoderFactory.cpp
+++ b/image/DecoderFactory.cpp
@@ -249,7 +249,8 @@ nsresult DecoderFactory::CreateAnimationDecoder(
   }
 
   MOZ_ASSERT(aType == DecoderType::GIF || aType == DecoderType::PNG ||
-                 aType == DecoderType::WEBP || aType == DecoderType::AVIF,
+                 aType == DecoderType::WEBP || aType == DecoderType::AVIF  ||
+                 aType == DecoderType::JXL,
              "Calling CreateAnimationDecoder for non-animating DecoderType");
 
   // Create an anonymous decoder. Interaction with the SurfaceCache and the
@@ -304,7 +305,8 @@ already_AddRefed<Decoder> DecoderFactory::CloneAnimationDecoder(
   // rediscover it is animated).
   DecoderType type = aDecoder->GetType();
   MOZ_ASSERT(type == DecoderType::GIF || type == DecoderType::PNG ||
-                 type == DecoderType::WEBP || type == DecoderType::AVIF,
+                 type == DecoderType::WEBP || type == DecoderType::AVIF  ||
+                 type == DecoderType::JXL,
              "Calling CloneAnimationDecoder for non-animating DecoderType");
 
   RefPtr<Decoder> decoder = GetDecoder(type, nullptr, /* aIsRedecode = */ true);
diff --git a/image/decoders/nsJXLDecoder.cpp b/image/decoders/nsJXLDecoder.cpp
index ffb7f3cd51e1d..98a8227a65ab8 100644
--- a/image/decoders/nsJXLDecoder.cpp
+++ b/image/decoders/nsJXLDecoder.cpp
@@ -45,9 +45,20 @@ nsJXLDecoder::nsJXLDecoder(RasterImage* aImage)
              Transition::TerminateSuccess()),
       mDecoder(JxlDecoderMake(nullptr)),
       mParallelRunner(
-          JxlThreadParallelRunnerMake(nullptr, PreferredThreadCount())) {
-  JxlDecoderSubscribeEvents(mDecoder.get(),
-                            JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
+          JxlThreadParallelRunnerMake(nullptr, PreferredThreadCount())),
+      mUsePipeTransform(true),
+      mCMSLine(nullptr),
+      mNumFrames(0),
+      mTimeout(FrameTimeout::Forever()),
+      mSurfaceFormat(SurfaceFormat::OS_RGBX),
+      mContinue(false) {
+  int events = JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE;
+
+  if (mCMSMode != CMSMode::Off) {
+    events |= JXL_DEC_COLOR_ENCODING;
+  }
+
+  JxlDecoderSubscribeEvents(mDecoder.get(), events);
   JxlDecoderSetParallelRunner(mDecoder.get(), JxlThreadParallelRunner,
                               mParallelRunner.get());
 
@@ -58,6 +69,10 @@ nsJXLDecoder::nsJXLDecoder(RasterImage* aImage)
 nsJXLDecoder::~nsJXLDecoder() {
   MOZ_LOG(sJXLLog, LogLevel::Debug,
           ("[this=%p] nsJXLDecoder::~nsJXLDecoder", this));
+
+  if (mCMSLine) {
+    free(mCMSLine);
+  }
 }
 
 size_t nsJXLDecoder::PreferredThreadCount() {
@@ -86,14 +101,20 @@ LexerResult nsJXLDecoder::DoDecode(SourceBufferIterator& aIterator,
 
 LexerTransition<nsJXLDecoder::State> nsJXLDecoder::ReadJXLData(
     const char* aData, size_t aLength) {
-  const uint8_t* input = (const uint8_t*)aData;
-  size_t length = aLength;
-  if (mBuffer.length() != 0) {
-    JXL_TRY_BOOL(mBuffer.append(aData, aLength));
-    input = mBuffer.begin();
-    length = mBuffer.length();
+  // Ignore data we have already read.
+  // This will only occur as a result of a yield for animation.
+  if (!mContinue) {
+    const uint8_t* input = (const uint8_t*)aData;
+    size_t length = aLength;
+    if (mBuffer.length() != 0) {
+      JXL_TRY_BOOL(mBuffer.append(aData, aLength));
+      input = mBuffer.begin();
+      length = mBuffer.length();
+    }
+
+    JXL_TRY(JxlDecoderSetInput(mDecoder.get(), input, length));
   }
-  JXL_TRY(JxlDecoderSetInput(mDecoder.get(), input, length));
+  mContinue = false;
 
   while (true) {
     JxlDecoderStatus status = JxlDecoderProcessInput(mDecoder.get());
@@ -106,6 +127,34 @@ LexerTransition<nsJXLDecoder::State> nsJXLDecoder::ReadJXLData(
         size_t remaining = JxlDecoderReleaseInput(mDecoder.get());
         mBuffer.clear();
         JXL_TRY_BOOL(mBuffer.append(aData + aLength - remaining, remaining));
+
+        if (mNumFrames == 0 && InFrame()) {
+          // If an image was flushed by JxlDecoderFlushImage, then we know that
+          // JXL_DEC_FRAME has already been run and there is a pipe.
+          if (JxlDecoderFlushImage(mDecoder.get()) == JXL_DEC_SUCCESS) {
+            // A full frame partial image is written to the buffer.
+            mPipe.ResetToFirstRow();
+            for (uint8_t* rowPtr = mOutBuffer.begin();
+                 rowPtr < mOutBuffer.end(); rowPtr += mInfo.xsize * mChannels) {
+              uint8_t* rowToWrite = rowPtr;
+
+              if (!mUsePipeTransform && mTransform) {
+                qcms_transform_data(mTransform, rowToWrite, mCMSLine,
+                                    mInfo.xsize);
+                rowToWrite = mCMSLine;
+              }
+
+              mPipe.WriteBuffer(reinterpret_cast<uint32_t*>(rowToWrite));
+            }
+
+            if (Maybe<SurfaceInvalidRect> invalidRect =
+                    mPipe.TakeInvalidRect()) {
+              PostInvalidation(invalidRect->mInputSpaceRect,
+                               Some(invalidRect->mOutputSpaceRect));
+            }
+          }
+        }
+
         return Transition::ContinueUnbuffered(State::JXL_DATA);
       }
 
@@ -116,42 +165,199 @@ LexerTransition<nsJXLDecoder::State> nsJXLDecoder::ReadJXLData(
           PostFrameCount(/* aFrameCount */ 1);
         }
         if (mInfo.alpha_bits > 0) {
+          mSurfaceFormat = SurfaceFormat::OS_RGBA;
           PostHasTransparency();
         }
+
+        if (!mInfo.have_animation && IsMetadataDecode()) {
+          return Transition::TerminateSuccess();
+        }
+
+        // If CMS is off or the image is RGB, always output in RGBA.
+        // If the image is grayscale, then the pipe transform can't be used.
+        if (mCMSMode != CMSMode::Off) {
+          mChannels = mInfo.num_color_channels == 1
+                          ? 1 + (mInfo.alpha_bits > 0 ? 1 : 0)
+                          : 4;
+        } else {
+          mChannels = 4;
+        }
+
+        mFormat = {mChannels, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
+
+        break;
+      }
+
+      case JXL_DEC_COLOR_ENCODING: {
+        size_t size = 0;
+        JXL_TRY(JxlDecoderGetICCProfileSize(
+            mDecoder.get(), JXL_COLOR_PROFILE_TARGET_DATA, &size))
+        std::vector<uint8_t> icc_profile(size);
+        JXL_TRY(JxlDecoderGetColorAsICCProfile(mDecoder.get(),
+                                               JXL_COLOR_PROFILE_TARGET_DATA,
+                                               icc_profile.data(), size))
+
+        mInProfile = qcms_profile_from_memory((char*)icc_profile.data(), size);
+
+        uint32_t profileSpace = qcms_profile_get_color_space(mInProfile);
+
+        // Skip color management if color profile is not compatible with number
+        // of channels.
+        if (profileSpace != icSigRgbData &&
+            (mInfo.num_color_channels == 3 || profileSpace != icSigGrayData)) {
+          break;
+        }
+
+        mUsePipeTransform =
+            profileSpace == icSigRgbData && mInfo.num_color_channels == 3;
+
+        qcms_data_type inType;
+        if (mInfo.num_color_channels == 3) {
+          inType = QCMS_DATA_RGBA_8;
+        } else if (mInfo.alpha_bits > 0) {
+          inType = QCMS_DATA_GRAYA_8;
+        } else {
+          inType = QCMS_DATA_GRAY_8;
+        }
+
+        if (!mUsePipeTransform) {
+          mCMSLine =
+              static_cast<uint8_t*>(malloc(sizeof(uint32_t) * mInfo.xsize));
+        }
+
+        int intent = gfxPlatform::GetRenderingIntent();
+        if (intent == -1) {
+          intent = qcms_profile_get_rendering_intent(mInProfile);
+        }
+
+        mTransform =
+            qcms_transform_create(mInProfile, inType, GetCMSOutputProfile(),
+                                  QCMS_DATA_RGBA_8, (qcms_intent)intent);
+
+        break;
+      }
+
+      case JXL_DEC_FRAME: {
+        if (mInfo.have_animation) {
+          JXL_TRY(JxlDecoderGetFrameHeader(mDecoder.get(), &mFrameHeader));
+          int32_t duration = (int32_t)(1000.0 * mFrameHeader.duration *
+                                       mInfo.animation.tps_denominator /
+                                       mInfo.animation.tps_numerator);
+
+          mTimeout = FrameTimeout::FromRawMilliseconds(duration);
+
+          if (!HasAnimation()) {
+            PostIsAnimated(mTimeout);
+          }
+        }
+
+        bool is_last = mInfo.have_animation ? mFrameHeader.is_last : true;
+        MOZ_LOG(sJXLLog, LogLevel::Debug,
+                ("[this=%p] nsJXLDecoder::ReadJXLData - frame %d, is_last %d, "
+                 "metadata decode %d, first frame decode %d\n",
+                 this, mNumFrames, is_last, IsMetadataDecode(),
+                 IsFirstFrameDecode()));
+
         if (IsMetadataDecode()) {
           return Transition::TerminateSuccess();
         }
+
+        OrientedIntSize size(mInfo.xsize, mInfo.ysize);
+
+        Maybe<AnimationParams> animParams;
+        if (!IsFirstFrameDecode()) {
+          animParams.emplace(FullFrame().ToUnknownRect(), mTimeout, mNumFrames,
+                             BlendMethod::SOURCE, DisposalMethod::CLEAR);
+        }
+
+        SurfacePipeFlags pipeFlags = SurfacePipeFlags();
+
+        if (mNumFrames == 0) {
+          // The first frame may be displayed progressively.
+          pipeFlags |= SurfacePipeFlags::PROGRESSIVE_DISPLAY;
+        }
+
+        if (mSurfaceFormat == SurfaceFormat::OS_RGBA &&
+            !(GetSurfaceFlags() & SurfaceFlags::NO_PREMULTIPLY_ALPHA)) {
+          pipeFlags |= SurfacePipeFlags::PREMULTIPLY_ALPHA;
+        }
+
+        qcms_transform* pipeTransform =
+            mUsePipeTransform ? mTransform : nullptr;
+
+        Maybe<SurfacePipe> pipe = SurfacePipeFactory::CreateSurfacePipe(
+            this, size, OutputSize(), FullFrame(), SurfaceFormat::R8G8B8A8,
+            mSurfaceFormat, animParams, pipeTransform, pipeFlags);
+
+        if (!pipe) {
+          MOZ_LOG(sJXLLog, LogLevel::Debug,
+                  ("[this=%p] nsJXLDecoder::ReadJXLData - no pipe\n", this));
+          return Transition::TerminateFailure();
+        }
+
+        mPipe = std::move(*pipe);
+
         break;
       }
 
       case JXL_DEC_NEED_IMAGE_OUT_BUFFER: {
         size_t size = 0;
-        JxlPixelFormat format{4, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-        JXL_TRY(JxlDecoderImageOutBufferSize(mDecoder.get(), &format, &size));
+        JXL_TRY(JxlDecoderImageOutBufferSize(mDecoder.get(), &mFormat, &size));
 
         mOutBuffer.clear();
         JXL_TRY_BOOL(mOutBuffer.growBy(size));
-        JXL_TRY(JxlDecoderSetImageOutBuffer(mDecoder.get(), &format,
+        JXL_TRY(JxlDecoderSetImageOutBuffer(mDecoder.get(), &mFormat,
                                             mOutBuffer.begin(), size));
         break;
       }
 
       case JXL_DEC_FULL_IMAGE: {
-        OrientedIntSize size(mInfo.xsize, mInfo.ysize);
-        Maybe<SurfacePipe> pipe = SurfacePipeFactory::CreateSurfacePipe(
-            this, size, OutputSize(), FullFrame(), SurfaceFormat::R8G8B8A8,
-            SurfaceFormat::OS_RGBA, Nothing(), nullptr, SurfacePipeFlags());
+        mPipe.ResetToFirstRow();
         for (uint8_t* rowPtr = mOutBuffer.begin(); rowPtr < mOutBuffer.end();
-             rowPtr += mInfo.xsize * 4) {
-          pipe->WriteBuffer(reinterpret_cast<uint32_t*>(rowPtr));
+             rowPtr += mInfo.xsize * mChannels) {
+          uint8_t* rowToWrite = rowPtr;
+
+          if (!mUsePipeTransform && mTransform) {
+            qcms_transform_data(mTransform, rowToWrite, mCMSLine, mInfo.xsize);
+            rowToWrite = mCMSLine;
+          }
+
+          mPipe.WriteBuffer(reinterpret_cast<uint32_t*>(rowToWrite));
         }
 
-        if (Maybe<SurfaceInvalidRect> invalidRect = pipe->TakeInvalidRect()) {
+        if (Maybe<SurfaceInvalidRect> invalidRect = mPipe.TakeInvalidRect()) {
           PostInvalidation(invalidRect->mInputSpaceRect,
                            Some(invalidRect->mOutputSpaceRect));
         }
-        PostFrameStop();
-        PostDecodeDone();
+
+        Opacity opacity = mSurfaceFormat == SurfaceFormat::OS_RGBA
+                              ? Opacity::SOME_TRANSPARENCY
+                              : Opacity::FULLY_OPAQUE;
+        PostFrameStop(opacity);
+
+        if (!IsFirstFrameDecode() && mInfo.have_animation &&
+            !mFrameHeader.is_last) {
+          mNumFrames++;
+          mContinue = true;
+          // Notify for a new frame but there may be data in the current buffer
+          // that can immediately be processed.
+          return Transition::ToAfterYield(State::JXL_DATA);
+        }
+        [[fallthrough]];  // We are done.
+      }
+
+      case JXL_DEC_SUCCESS: {
+        int32_t loopArg;
+        if (HasAnimation()) {
+          // JXL num_loops: 0 means infinite. (num_loops - 1) becomes -1.
+          // JXL num_loops: 1 means play once. (num_loops - 1) becomes 0 (0 repeats).
+          // JXL num_loops: N means play N times. (num_loops - 1) becomes N-1 (N-1 repeats).
+          loopArg = static_cast<int32_t>(mInfo.animation.num_loops) - 1;
+        } else {
+          loopArg = 0; // For non-animated images, repeat count is 0.
+        }
+        PostLoopCount(loopArg); // Pass the loop count to PostLoopCount
+        PostDecodeDone();       // Call PostDecodeDone without arguments
         return Transition::TerminateSuccess();
       }
     }
diff --git a/image/decoders/nsJXLDecoder.h b/image/decoders/nsJXLDecoder.h
index 0b723878aefdc..a83a749155577 100644
--- a/image/decoders/nsJXLDecoder.h
+++ b/image/decoders/nsJXLDecoder.h
@@ -45,7 +45,19 @@ class nsJXLDecoder final : public Decoder {
   JxlThreadParallelRunnerPtr mParallelRunner;
   Vector<uint8_t> mBuffer;
   Vector<uint8_t> mOutBuffer;
-  JxlBasicInfo mInfo{};
+  JxlBasicInfo mInfo;
+  JxlPixelFormat mFormat;
+  JxlFrameHeader mFrameHeader;
+
+  bool mUsePipeTransform;
+  uint8_t mChannels;
+  uint8_t* mCMSLine;
+
+  uint32_t mNumFrames;
+  FrameTimeout mTimeout;
+  gfx::SurfaceFormat mSurfaceFormat;
+  SurfacePipe mPipe;
+  bool mContinue;
 };
 
 }  // namespace mozilla::image
diff --git a/ipc/app/module.ver b/ipc/app/module.ver
index 8abbd23f0ea0e..e636da9ec9472 100644
--- a/ipc/app/module.ver
+++ b/ipc/app/module.ver
@@ -1,4 +1,4 @@
-WIN32_MODULE_COMPANYNAME=Mozilla Corporation
+WIN32_MODULE_COMPANYNAME=Waterfox Limited
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_DESCRIPTION=Plugin Container for @MOZ_APP_DISPLAYNAME@
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
index 1922382f924e7..cf4db08c0e9c8 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -11262,12 +11262,12 @@ bool PresShell::VerifyIncrementalReflow() {
   if (!ok) {
     nsString stra;
     static int num = 0;
-    stra.AppendLiteral("C:\\mozilla\\mozilla\\debug\\filea");
+    stra.AppendLiteral("C:\\BrowserWorks\\mozilla\\debug\\filea");
     stra.AppendInt(num);
     stra.AppendLiteral(".png");
     gfxUtils::WriteAsPNG(presShell, stra);
     nsString strb;
-    strb.AppendLiteral("C:\\mozilla\\mozilla\\debug\\fileb");
+    strb.AppendLiteral("C:\\BrowserWorks\\mozilla\\debug\\fileb");
     strb.AppendInt(num);
     strb.AppendLiteral(".png");
     gfxUtils::WriteAsPNG(presShell, strb);
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 9135208edbb32..1afc4f3833dcb 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -68,6 +68,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
         "/dom/system",
         "/dom/system/android",
     ]
+elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+    LOCAL_INCLUDES += [
+        "/widget/gtk",
+    ]
 
 XPCOM_MANIFESTS += [
     "components.conf",
diff --git a/mobile/shared/chrome/geckoview/geckoview.js b/mobile/shared/chrome/geckoview/geckoview.js
index 6ec21489e9cfb..757c8c3c40786 100644
--- a/mobile/shared/chrome/geckoview/geckoview.js
+++ b/mobile/shared/chrome/geckoview/geckoview.js
@@ -21,6 +21,7 @@ ChromeUtils.defineESModuleGetters(this, {
   InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.sys.mjs",
   RemoteSecuritySettings:
     "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs",
+  RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",
   CaptchaDetectionPingUtils:
     "resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs",
@@ -928,6 +929,8 @@ function startup() {
       // submits the ping if it has data and has been about 24 hours since the
       // last submission.
       CaptchaDetectionPingUtils.init();
+
+      RemoteSettings.pollChanges({ trigger: "timer" });
     });
 
     // This should always go last, since the idle tasks (except for the ones with
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index c175e7707cf38..30c1a3a5ee92d 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -157,6 +157,9 @@ pref("dom.text-recognition.enabled", true);
 // Fastback caching - if this pref is negative, then we calculate the number
 // of content viewers to cache based on the amount of available memory.
 pref("browser.sessionhistory.max_total_viewers", -1);
+#ifdef MOZ_WIDGET_GTK
+pref("ui.use_unity_menubar", true);
+#endif
 
 // See http://whatwg.org/specs/web-apps/current-work/#ping
 pref("browser.send_pings", false);
diff --git a/moz.build b/moz.build
index a931749b4581d..26fad42e0e79f 100644
--- a/moz.build
+++ b/moz.build
@@ -160,6 +160,7 @@ DIRS += [
     "python",
     "testing",
     "third_party/python",
+    "waterfox",
 ]
 
 if not CONFIG["JS_STANDALONE"]:
diff --git a/moz.configure b/moz.configure
index dd419e1cc0b63..5d9ab52caee74 100755
--- a/moz.configure
+++ b/moz.configure
@@ -929,7 +929,7 @@ set_config("MOZ_SYSTEM_ZLIB", True, when="--with-system-zlib")
 
 option(
     env="USE_LIBZ_RS",
-    default=milestone.is_early_beta_or_earlier,
+    default=True,
     help="Use libz-rs-sys instead of zlib",
     when=toolkit & ~with_system_zlib_option,
 )
diff --git a/netwerk/base/nsIPrompt.idl b/netwerk/base/nsIPrompt.idl
index 46f23ee7c5a9c..6455f474a4c82 100644
--- a/netwerk/base/nsIPrompt.idl
+++ b/netwerk/base/nsIPrompt.idl
@@ -90,6 +90,17 @@ interface nsIPrompt : nsISupports
                    in wstring checkMsg,
                    inout boolean checkValue);
 
+    int32_t confirmEx2(in wstring dialogTitle,
+                   in wstring text,
+                   in unsigned long buttonFlags,
+                   in wstring button0Title,
+                   in wstring button1Title,
+                   in wstring button2Title,
+                   in wstring checkMsg,
+                   inout boolean checkValue,
+                   in wstring checkMsg2,
+                   inout boolean checkValue2);
+
      boolean prompt(in wstring dialogTitle,
                     in wstring text,
                     inout wstring value,
diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 59a798d15172a..f855160ec9c8a 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -118,9 +118,10 @@ uint32_t CacheObserver::MemoryCacheCapacity() {
     if (x > 0) {
       // 0.1 is added here for rounding
       capacity = (int32_t)(x * x / 3.0 + x + 2.0 / 3 + 0.1);
-      if (capacity > 32) {
-        capacity = 32;
-      }
+      // Allow cache to be higher for systems with > 8GiB of RAM
+      // if (capacity > 32) {
+      //   capacity = 32;
+      // }
       capacity <<= 10;
     }
     return capacity;
diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
index 5aee3f8798947..65868c0dd5c13 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
 
   nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =
       do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
-  if (NS_WARN_IF(!exceptionListService)) {
+  if (!exceptionListService) {
     return;
   }
 
diff --git a/netwerk/url-classifier/components.conf b/netwerk/url-classifier/components.conf
index fbc8fd07f13a7..b2e6672473177 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -13,24 +13,4 @@ Classes = [
         'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
         'headers': ['mozilla/net/ChannelClassifierService.h'],
     },
-    {
-        'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
-        'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],
-        'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',
-        'constructor': 'UrlClassifierExceptionListService',
-    },
-    {
-        'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}',
-        'interfaces': ['nsIUrlClassifierExceptionListEntry'],
-        'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'],
-        'type': 'mozilla::net::UrlClassifierExceptionListEntry',
-        'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'],
-    },
-    {
-        'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}',
-        'interfaces': ['nsIUrlClassifierExceptionList'],
-        'headers': ['mozilla/net/UrlClassifierExceptionList.h'],
-        'type': 'mozilla::net::UrlClassifierExceptionList',
-        'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'],
-    },
 ]
diff --git a/other-licenses/7zstub/firefox/7zSD.ARM64.sfx b/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
index 5451c3553ba67..f2d97189244d7 100644
Binary files a/other-licenses/7zstub/firefox/7zSD.ARM64.sfx and b/other-licenses/7zstub/firefox/7zSD.ARM64.sfx differ
diff --git a/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx b/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx
new file mode 100644
index 0000000000000..5451c3553ba67
Binary files /dev/null and b/other-licenses/7zstub/firefox/7zSD.ARM64_original.sfx differ
diff --git a/other-licenses/7zstub/firefox/7zSD.Win32.sfx b/other-licenses/7zstub/firefox/7zSD.Win32.sfx
index 4d529b0433da3..35d314393ebd7 100644
Binary files a/other-licenses/7zstub/firefox/7zSD.Win32.sfx and b/other-licenses/7zstub/firefox/7zSD.Win32.sfx differ
diff --git a/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx b/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx
new file mode 100644
index 0000000000000..4d529b0433da3
Binary files /dev/null and b/other-licenses/7zstub/firefox/7zSD.Win32_original.sfx differ
diff --git a/other-licenses/7zstub/firefox/resource.rc b/other-licenses/7zstub/firefox/resource.rc
index 3a50a450c3fd7..1b7711230f35b 100644
--- a/other-licenses/7zstub/firefox/resource.rc
+++ b/other-licenses/7zstub/firefox/resource.rc
@@ -16,13 +16,13 @@ BEGIN
   BEGIN
       BLOCK "040904b0"
       BEGIN
-          VALUE "CompanyName", "Mozilla"
-          VALUE "FileDescription", "Firefox"
+          VALUE "CompanyName", "Waterfox Limited"
+          VALUE "FileDescription", "Waterfox"
           VALUE "FileVersion", MY_VERSION
           VALUE "InternalName", "7zSD.sfx"
-          VALUE "LegalCopyright", "Mozilla"
+          VALUE "LegalCopyright", "Waterfox Limited"
           VALUE "OriginalFilename", "7zSD.sfx"
-          VALUE "ProductName", "Firefox"
+          VALUE "ProductName", "Waterfox"
           VALUE "ProductVersion", MY_VERSION
       END
   END
diff --git a/other-licenses/7zstub/firefox/setup.ico b/other-licenses/7zstub/firefox/setup.ico
index 05ef62368ede2..80b28caa28846 100644
Binary files a/other-licenses/7zstub/firefox/setup.ico and b/other-licenses/7zstub/firefox/setup.ico differ
diff --git a/python/mach/mach/command_util.py b/python/mach/mach/command_util.py
index 44e13f18d6cce..14bf65d602571 100644
--- a/python/mach/mach/command_util.py
+++ b/python/mach/mach/command_util.py
@@ -292,14 +292,14 @@ def visit_FunctionDef(self, node):
             kwarg_dict = {}
 
             for name, arg in zip(["command", "subcommand"], decorator.args):
-                kwarg_dict[name] = arg.s
+                kwarg_dict[name] = arg.value
 
             for keyword in decorator.keywords:
                 if keyword.arg not in relevant_kwargs:
                     # We only care about these 3 kwargs, so we can safely skip the rest
                     continue
 
-                kwarg_dict[keyword.arg] = getattr(keyword.value, "s", "")
+                kwarg_dict[keyword.arg] = keyword.value.value
 
             command = kwarg_dict.pop("command")
             self.results.setdefault(command, {})
diff --git a/python/mach/mach/dispatcher.py b/python/mach/mach/dispatcher.py
index abc3b646c6f8a..54b0f9494f17e 100644
--- a/python/mach/mach/dispatcher.py
+++ b/python/mach/mach/dispatcher.py
@@ -289,16 +289,14 @@ def _handle_main_help(self, parser, verbose):
                     group = parser.add_argument_group(title, description)
 
                 description = handler.description
-                group.add_argument(command, help=description, action="store_true")
+                group.add_argument(command, help=description)
 
         if disabled_commands and "disabled" in r.categories:
             title, description, _priority = r.categories["disabled"]
             group = parser.add_argument_group(title, description)
             if verbose:
                 for c in disabled_commands:
-                    group.add_argument(
-                        c["command"], help=c["description"], action="store_true"
-                    )
+                    group.add_argument(c["command"], help=c["description"])
 
         parser.print_help()
 
@@ -405,9 +403,7 @@ def by_name(item):
             subhandlers,
             key=by_decl_order if handler.order == "declaration" else by_name,
         ):
-            group.add_argument(
-                subcommand, help=subhandler.description, action="store_true"
-            )
+            group.add_argument(subcommand, help=subhandler.description)
 
         if handler.docstring:
             parser.description = format_docstring(handler.docstring)
diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py
index 08dba432bbfb2..c4bea82681fd3 100644
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -698,9 +698,8 @@ class MacArtifactJob(ArtifactJob):
                 "{product}-bin",
                 "*.dylib",
                 "nmhproxy",
-                "pingsender",
                 "plugin-container.app/Contents/MacOS/plugin-container",
-                "updater.app/Contents/MacOS/org.mozilla.updater",
+                "updater.app/Contents/MacOS/net.waterfox.updater",
                 # 'xpcshell',
                 "XUL",
             ],
diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py
index 9f6292cb909de..89bf9995c1768 100644
--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
@@ -470,7 +470,7 @@ def c(new_node):
             return c(
                 ast.Subscript(
                     value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
-                    slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
+                    slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
                     ctx=node.ctx,
                 )
             )
@@ -1039,8 +1039,8 @@ def assigned_variable(node):
                 else:
                     # Others
                     assert isinstance(target.slice, ast.Index)
-                    assert isinstance(target.slice.value, ast.Str)
-                    key = target.slice.value.s
+                    assert isinstance(target.slice.value, ast.Constant)
+                    key = target.slice.value.value
             elif isinstance(target, ast.Attribute):
                 assert isinstance(target.attr, str)
                 key = target.attr
@@ -1051,11 +1051,11 @@ def assigned_values(node):
             value = node.value
             if isinstance(value, ast.List):
                 for v in value.elts:
-                    assert isinstance(v, ast.Str)
-                    yield v.s
+                    assert isinstance(v, ast.Constant)
+                    yield v.value
             else:
-                assert isinstance(value, ast.Str)
-                yield value.s
+                assert isinstance(value, ast.Constant)
+                yield value.value
 
         assignments = []
 
diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
index cfcc0f18b9a9a..de06b58819b6a 100644
--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
@@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node):
     """
     if isinstance(node.value, ast.List) and "elts" in node.value._fields:
         for f in node.value.elts:
-            if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str):
+            if not isinstance(f, ast.Constant):
                 log(
                     "Found non-constant source file name in list: ",
                     ast_get_source_segment(code, f),
                 )
                 return []
-        return [
-            f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts
-        ]
+        return [f.value for f in node.value.elts]
     elif isinstance(node.value, ast.ListComp):
         # SOURCES += [f for f in foo if blah]
         log("Could not find the files for " + ast_get_source_segment(code, node.value))
diff --git a/python/mozbuild/mozbuild/vendor/vendor_python.py b/python/mozbuild/mozbuild/vendor/vendor_python.py
index 9acee946fc4c8..2801e1b685d51 100644
--- a/python/mozbuild/mozbuild/vendor/vendor_python.py
+++ b/python/mozbuild/mozbuild/vendor/vendor_python.py
@@ -40,6 +40,10 @@
     # modified 'dummy' version of it so that the dependency checks still succeed, but
     # if it ever is attempted to be used, it will fail gracefully.
     "ansicon",
+    # jsonschema 4.17.3 is incompatible with Python 3.14+,
+    # but later versions use a dependency with Rust components, which we thus can't vendor.
+    # For now we apply the minimal patch to jsonschema to make it work again.
+    "jsonschema",
 }
 
 
diff --git a/security/mac/hardenedruntime/production/firefox.browser.xml b/security/mac/hardenedruntime/production/firefox.browser.xml
index abbf33e9d2b3c..ca84aa526b4f1 100644
--- a/security/mac/hardenedruntime/production/firefox.browser.xml
+++ b/security/mac/hardenedruntime/production/firefox.browser.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
      Entitlements to apply to the main browser process executable during
-     codesigning of production channel builds.
+     codesigning of production channel builds for Waterfox.
 -->
 <plist version="1.0">
   <dict>
     <!-- Allow loading third party libraries to support pkcs11 modules -->
     <key>com.apple.security.cs.disable-library-validation</key><true/>
 
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <!-- Waterfox needs to create executable pages with MAP_JIT on aarch64 -->
     <key>com.apple.security.cs.allow-jit</key><true/>
 
-    <!-- Firefox needs to access the microphone on sites the user allows -->
+    <!-- Waterfox needs to access the microphone on sites the user allows -->
     <key>com.apple.security.device.audio-input</key><true/>
 
-    <!-- Firefox needs to access the camera on sites the user allows -->
+    <!-- Waterfox needs to access the camera on sites the user allows -->
     <key>com.apple.security.device.camera</key><true/>
 
-    <!-- Firefox needs to access the location on sites the user allows -->
+    <!-- Waterfox needs to access the location on sites the user allows -->
     <key>com.apple.security.personal-information.location</key><true/>
 
     <!-- For SmartCardServices(7) -->
@@ -26,7 +26,7 @@
 
     <!-- Required for com.apple.developer.web-browser.public-key-credential -->
     <key>com.apple.application-identifier</key>
-    <string>43AQ936H96.org.mozilla.firefox</string>
+    <string>PZWYM7N4GF.net.waterfox.waterfox</string>
 
     <!-- For platform passkey (webauthn) support -->
     <key>com.apple.developer.web-browser.public-key-credential</key><true/>
diff --git a/security/manager/ssl/RemoteSecuritySettings.sys.mjs b/security/manager/ssl/RemoteSecuritySettings.sys.mjs
index d0aa8b3029324..316ba7df92563 100644
--- a/security/manager/ssl/RemoteSecuritySettings.sys.mjs
+++ b/security/manager/ssl/RemoteSecuritySettings.sys.mjs
@@ -241,6 +241,16 @@ export var RemoteSecuritySettings = {
 
 class IntermediatePreloads {
   constructor() {
+    this.maybeInit();
+  }
+
+  maybeInit() {
+    if (
+      this.client ||
+      !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true)
+    ) {
+      return;
+    }
     this.client = RemoteSettings("intermediates", {
       bucketName: SECURITY_STATE_BUCKET,
       signerName: SECURITY_STATE_SIGNER,
@@ -266,6 +276,7 @@ class IntermediatePreloads {
       );
       return;
     }
+    this.maybeInit();
 
     // Download attachments that are awaiting download, up to a max.
     const maxDownloadsPerRun = Services.prefs.getIntPref(
@@ -335,7 +346,7 @@ class IntermediatePreloads {
     lazy.log.debug(
       `There are ${waiting.length} intermediates awaiting download.`
     );
-    if (!waiting.length) {
+    if (!waiting.length || !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true) || !this.client) {
       // Nothing to do.
       Services.obs.notifyObservers(
         null,
@@ -430,6 +441,11 @@ class IntermediatePreloads {
   async maybeDownloadAttachment(record) {
     let result = { record, cert: null, subject: null };
 
+    // Early return if intermediates are disabled or client doesn't exist
+    if (!Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true) || !this.client) {
+      return result;
+    }
+
     let dataAsString = null;
     try {
       let { buffer } = await this.client.attachments.download(record, {
@@ -495,6 +511,16 @@ function compareFilters(filterA, filterB) {
 
 class CRLiteFilters {
   constructor() {
+    this.maybeInit();
+  }
+
+  maybeInit() {
+    if (
+      this.client ||
+      !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true)
+    ) {
+      return;
+    }
     this.client = RemoteSettings("cert-revocations", {
       bucketName: SECURITY_STATE_BUCKET,
       signerName: SECURITY_STATE_SIGNER,
@@ -545,6 +571,8 @@ class CRLiteFilters {
       return;
     }
 
+    this.maybeInit();
+
     let hasPriorFilter = await hasPriorData(
       Ci.nsICertStorage.DATA_TYPE_CRLITE_FILTER_FULL
     );
@@ -619,6 +647,10 @@ class CRLiteFilters {
     lazy.log.debug("filtersToDownload:", filtersToDownload);
     let filtersDownloaded = [];
     for (let filter of filtersToDownload) {
+      // Skip download if CRLite filters are disabled or client doesn't exist
+      if (!Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true) || !this.client) {
+        continue;
+      }
       try {
         let attachment = await this.client.attachments.downloadAsBytes(filter);
         let bytes = new Uint8Array(attachment);
diff --git a/security/sandbox/mac/SandboxPolicyContent.h b/security/sandbox/mac/SandboxPolicyContent.h
index f77d14ede11ff..bd975ed53712e 100644
--- a/security/sandbox/mac/SandboxPolicyContent.h
+++ b/security/sandbox/mac/SandboxPolicyContent.h
@@ -275,7 +275,7 @@ static const char SandboxPolicyContent[] = R"SANDBOX_LITERAL(
           (subpath debugWriteDir)
           (vnode-type REGULAR-FILE)))))
 
-  (allow-shared-list "org.mozilla.plugincontainer")
+  (allow-shared-list "net.waterfox.plugincontainer")
 
 ; Per-user and system-wide Extensions dir
   (allow file-read*
diff --git a/services/fxaccounts/tests/xpcshell/test_web_channel.js b/services/fxaccounts/tests/xpcshell/test_web_channel.js
index cc5b5876bb8b9..74660c8f93d71 100644
--- a/services/fxaccounts/tests/xpcshell/test_web_channel.js
+++ b/services/fxaccounts/tests/xpcshell/test_web_channel.js
@@ -168,7 +168,7 @@ add_test(function test_error_message_remove_profile_path() {
     windows: {
       err: new Error(
         "Win error 183 during operation rename on file C:\\Users\\Some Computer\\AppData\\Roaming\\" +
-          "Mozilla\\Firefox\\Profiles\\dbzjmzxa.default\\signedInUser.json (Cannot create a file)"
+          "Mozilla\\BrowserWorks\\Profiles\\dbzjmzxa.default\\signedInUser.json (Cannot create a file)"
       ),
       expected:
         "Error: Win error 183 during operation rename on file C:[REDACTED]signedInUser.json (Cannot create a file)",
@@ -183,7 +183,7 @@ add_test(function test_error_message_remove_profile_path() {
     },
     netpath: {
       err: new Error(
-        "Win error 32 during operation rename on file \\\\SVC.LOC\\HOMEDIRS$\\USERNAME\\Mozilla\\" +
+        "Win error 32 during operation rename on file \\\\SVC.LOC\\HOMEDIRS$\\USERNAME\\BrowserWorks\\" +
           "Firefox\\Profiles\\dbzjmzxa.default-release-7\\signedInUser.json (No space left on device)"
       ),
       expected:
@@ -192,7 +192,7 @@ add_test(function test_error_message_remove_profile_path() {
     mount: {
       err: new Error(
         "Win error 649 during operation rename on file C:\\SnapVolumes\\MountPoints\\" +
-          "{9e399ec5-0000-0000-0000-100000000000}\\SVROOT\\Users\\username\\AppData\\Roaming\\Mozilla\\Firefox\\" +
+          "{9e399ec5-0000-0000-0000-100000000000}\\SVROOT\\Users\\username\\AppData\\Roaming\\BrowserWorks\\Waterfox\\" +
           "Profiles\\dbzjmzxa.default-release\\signedInUser.json (The create operation failed)"
       ),
       expected:
diff --git a/services/settings/Attachments.sys.mjs b/services/settings/Attachments.sys.mjs
index af76aca084023..287ba3e454978 100644
--- a/services/settings/Attachments.sys.mjs
+++ b/services/settings/Attachments.sys.mjs
@@ -338,6 +338,30 @@ export class Downloader {
       fallbackToDump = false,
       avoidDownload = false,
     } = options || {};
+    
+    // Detect translation files based on record properties (collection is often undefined)
+    const isTranslationFile = record && (
+      record.fileType === "model" || 
+      record.fileType === "lex" || 
+      record.fileType === "wasm" || 
+      record.fileType === "vocab" ||
+      (record.fromLang && record.toLang) ||
+      (record.name && (
+        record.name.includes("model.") ||
+        record.name.includes("lex.") ||
+        record.name.includes("vocab.") ||
+        record.name.includes("bergamot")
+      )) ||
+      (record.attachment?.filename && (
+        record.attachment.filename.endsWith(".wasm") ||
+        record.attachment.filename.includes("bergamot")
+      ))
+    );
+    
+    // Force avoidDownload for non-translation files
+    if (!isTranslationFile) {
+      avoidDownload = true;
+    }
     if (!attachmentId) {
       // Check for pre-condition. This should not happen, but it is explicitly
       // checked to avoid mixing up attachments, which could be dangerous.
@@ -510,7 +534,7 @@ export class Downloader {
    * @throws {Downloader.BadContentError} if the downloaded content integrity is not valid.
    * @returns {ArrayBuffer} the file content.
    */
-  async downloadAsBytes(record, options = {}) {
+  async downloadAsBytes(record, options) {
     const {
       attachment: { location, hash, size },
     } = record;
@@ -519,7 +543,65 @@ export class Downloader {
     try {
       baseURL = await lazy.Utils.baseAttachmentsURL();
     } catch (error) {
-      throw new Downloader.ServerInfoError(error);
+      // For translation files only, fallback to Mozilla's server if Waterfox's is empty
+      const isTranslationFile = record && (
+        record.fileType === "model" || 
+        record.fileType === "lex" || 
+        record.fileType === "wasm" || 
+        record.fileType === "vocab" ||
+        (record.fromLang && record.toLang) ||
+        (record.name && (
+          record.name.includes("model.") ||
+          record.name.includes("lex.") ||
+          record.name.includes("vocab.") ||
+          record.name.includes("bergamot")
+        )) ||
+        (record.attachment?.filename && (
+          record.attachment.filename.endsWith(".wasm") ||
+          record.attachment.filename.includes("bergamot")
+        ))
+      );
+      
+      if (isTranslationFile) {
+        // Use Mozilla's CDN for translation files when server URL is empty
+        baseURL = "https://firefox.settings.services.mozilla.com/v1/";
+        const resp = await lazy.Utils.fetch(baseURL);
+        const serverInfo = await resp.json();
+        baseURL = serverInfo.capabilities.attachments.base_url;
+        if (!baseURL.endsWith("/")) {
+          baseURL += "/";
+        }
+      } else {
+        throw new Downloader.ServerInfoError(error);
+      }
+    }
+    
+    // Additional check: if baseURL is still empty and it's a translation file
+    if (!baseURL || baseURL === "/") {
+      const isTranslationFile = record && (
+        record.fileType === "model" || 
+        record.fileType === "lex" || 
+        record.fileType === "wasm" || 
+        record.fileType === "vocab" ||
+        (record.fromLang && record.toLang) ||
+        (record.name && (
+          record.name.includes("model.") ||
+          record.name.includes("lex.") ||
+          record.name.includes("vocab.") ||
+          record.name.includes("bergamot")
+        )) ||
+        (record.attachment?.filename && (
+          record.attachment.filename.endsWith(".wasm") ||
+          record.attachment.filename.includes("bergamot")
+        ))
+      );
+      
+      if (isTranslationFile) {
+        // Hardcode Mozilla's CDN URL for translations
+        baseURL = "https://cdn.settings.services.mozilla.com/";
+      } else {
+        throw new Downloader.ServerInfoError("No server URL configured");
+      }
     }
 
     const remoteFileUrl = baseURL + location;
diff --git a/services/settings/IDBHelpers.sys.mjs b/services/settings/IDBHelpers.sys.mjs
index d77243b7a1d91..30b9da7619920 100644
--- a/services/settings/IDBHelpers.sys.mjs
+++ b/services/settings/IDBHelpers.sys.mjs
@@ -180,6 +180,10 @@ async function openIDB(allowUpgrades = true) {
         });
       }
       if (event.oldVersion < 3) {
+        // Clear existing stores for a fresh start
+        transaction.objectStore("records").clear();
+        transaction.objectStore("timestamps").clear();
+        transaction.objectStore("collections").clear();
         // Attachment store
         db.createObjectStore("attachments", {
           keyPath: ["cid", "attachmentId"],
diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs
index dfb23ec49a075..a328c8f11de83 100644
--- a/services/settings/RemoteSettingsClient.sys.mjs
+++ b/services/settings/RemoteSettingsClient.sys.mjs
@@ -437,11 +437,19 @@ export class RemoteSettingsClient extends EventEmitter {
       order = "", // not sorted by default.
       dumpFallback = true,
       emptyListFallback = true,
-      forceSync = false,
       loadDumpIfNewer = true,
-      syncIfEmpty = true,
     } = options;
-    let { verifySignature = false } = options;
+
+    const hasLocalDump = await lazy.Utils.hasLocalDump(
+      this.bucketName,
+      this.collectionName
+    );
+    if (!hasLocalDump) {
+      return [];
+    }
+    const forceSync = false;
+    const syncIfEmpty = true;
+    let verifySignature = false;
 
     const hasParallelCall = !!this._importingPromise;
     let data;
@@ -621,6 +629,10 @@ export class RemoteSettingsClient extends EventEmitter {
    * @param {Object} options See #maybeSync() options.
    */
   async sync(options) {
+    if (AppConstants.MOZ_APP_VERSION) {
+      return;
+    }
+
     if (lazy.Utils.shouldSkipRemoteActivityDueToTests) {
       return;
     }
@@ -693,7 +705,7 @@ export class RemoteSettingsClient extends EventEmitter {
     let thrownError = null;
     try {
       // If network is offline, we can't synchronize.
-      if (lazy.Utils.isOffline) {
+      if (!AppConstants.MOZ_APP_VERSION && lazy.Utils.isOffline) {
         throw new RemoteSettingsClient.NetworkOfflineError();
       }
 
@@ -1079,14 +1091,8 @@ export class RemoteSettingsClient extends EventEmitter {
     options = {}
   ) {
     const { retry = false } = options;
-    const since = retry || !localTimestamp ? undefined : `"${localTimestamp}"`;
 
-    // Fetch collection metadata and list of changes from server.
-    lazy.console.debug(
-      `${this.identifier} Fetch changes from server (expected=${expectedTimestamp}, since=${since})`
-    );
-    const { metadata, remoteTimestamp, remoteRecords } =
-      await this._fetchChangeset(expectedTimestamp, since);
+    let metadata, remoteTimestamp;
 
     // We build a sync result, based on remote changes.
     const syncResult = {
@@ -1095,24 +1101,20 @@ export class RemoteSettingsClient extends EventEmitter {
       updated: [],
       deleted: [],
     };
-    // If data wasn't changed, return empty sync result.
-    // This can happen when we update the signature but not the data.
-    lazy.console.debug(
-      `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}`
-    );
-    if (localTimestamp && remoteTimestamp < localTimestamp) {
+
+    try {
+      await this._importJSONDump();
+    } catch (e) {
       return syncResult;
     }
 
-    await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
-      clear: retry,
-    });
-
     // Read the new local data, after updating.
     const newLocal = await this.db.list();
     const newRecords = newLocal.map(r => this._cleanLocalFields(r));
     // And verify the signature on what is now stored.
-    if (this.verifySignature) {
+    if (metadata === undefined) {
+      // When working only with dumps, we do not have signatures.
+    } else if (this.verifySignature) {
       try {
         await this.validateCollectionSignature(
           newRecords,
diff --git a/services/settings/dumps/gen_last_modified.py b/services/settings/dumps/gen_last_modified.py
index d16eaa01e3942..1151c1b30d97f 100644
--- a/services/settings/dumps/gen_last_modified.py
+++ b/services/settings/dumps/gen_last_modified.py
@@ -63,8 +63,10 @@ def main(output):
     dumps_locations = []
     if buildconfig.substs["MOZ_BUILD_APP"] == "browser":
         dumps_locations += ["services/settings/dumps/"]
+        dumps_locations += ["services/settings/static-dumps/"]
     elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/android":
         dumps_locations += ["services/settings/dumps/"]
+        dumps_locations += ["services/settings/static-dumps/"]
     elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/ios":
         dumps_locations += ["services/settings/dumps/"]
     elif buildconfig.substs["MOZ_BUILD_APP"] == "comm/mail":
diff --git a/services/settings/dumps/main/moz.build b/services/settings/dumps/main/moz.build
index 7f89890eb341c..18f0d0ee9869e 100644
--- a/services/settings/dumps/main/moz.build
+++ b/services/settings/dumps/main/moz.build
@@ -6,10 +6,6 @@ if CONFIG["MOZ_BUILD_APP"] == "browser":
     # These collections are only referenced from browser/
     FINAL_TARGET_FILES.defaults.settings.main += [
         "language-dictionaries.json",
-        "search-telemetry-v2.json",
-        "sites-classification.json",
-        "top-sites.json",
-        "urlbar-persisted-search-terms.json",
    ]
 
 # These collections are referenced in toolkit/ or other core code, however
@@ -24,13 +20,9 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
         "hijack-blocklists.json",
         "moz-essential-domain-fallbacks.json",
         "password-rules.json",
-        "search-config-icons.json",
-        "search-config-overrides-v2.json",
-        "search-config-v2.json",
         "search-default-override-allowlist.json",
         "translations-models.json",
         "translations-wasm.json",
-        "url-classifier-skip-urls.json",
         "url-parser-default-unknown-schemes-interventions.json",
         "websites-with-shared-credential-backends.json",
     ]
@@ -39,100 +31,3 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
 FINAL_TARGET_FILES.defaults.settings.main += [
     "password-recipes.json",
 ]
-
-# These search config icons only apply to desktop.
-if CONFIG["MOZ_BUILD_APP"] == "browser":
-    FINAL_TARGET_FILES.defaults.settings.main["search-config-icons"] += [
-        "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256",
-        "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json",
-        "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea",
-        "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json",
-        "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937",
-        "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json",
-        "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2",
-        "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json",
-        "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b",
-        "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json",
-        "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f",
-        "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json",
-        "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c",
-        "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json",
-        "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335",
-        "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json",
-        "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca",
-        "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json",
-        "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f",
-        "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json",
-        "search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c",
-        "search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c.meta.json",
-        "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11",
-        "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json",
-        "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171",
-        "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json",
-        "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2",
-        "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json",
-        "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d",
-        "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json",
-        "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41",
-        "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json",
-        "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66",
-        "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json",
-        "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27",
-        "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json",
-        "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173",
-        "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json",
-        "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c",
-        "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json",
-        "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e",
-        "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json",
-        "search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131",
-        "search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131.meta.json",
-        "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451",
-        "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json",
-        "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361",
-        "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json",
-        "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36",
-        "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json",
-        "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e",
-        "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json",
-        "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a",
-        "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a.meta.json",
-        "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716",
-        "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716.meta.json",
-        "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b",
-        "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b.meta.json",
-        "search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98",
-        "search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98.meta.json",
-        "search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e",
-        "search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e.meta.json",
-        "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd",
-        "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd.meta.json",
-        "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3",
-        "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3.meta.json",
-        "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d",
-        "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d.meta.json",
-        "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b",
-        "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b.meta.json",
-        "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21",
-        "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21.meta.json",
-        "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943",
-        "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943.meta.json",
-        "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd",
-        "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd.meta.json",
-        "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9",
-        "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9.meta.json",
-        "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c",
-        "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c.meta.json",
-        "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785",
-        "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785.meta.json",
-        "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a",
-        "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a.meta.json",
-        "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636",
-        "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636.meta.json",
-        "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc",
-        "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc.meta.json",
-        "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d",
-        "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d.meta.json",
-        "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136",
-        "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136.meta.json",
-    ]
diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs
index 138ea51626897..a1c36f7f8cf68 100644
--- a/services/settings/remote-settings.sys.mjs
+++ b/services/settings/remote-settings.sys.mjs
@@ -103,6 +103,7 @@ export async function jexlFilterFunc(entry, environment, collectionName) {
 function remoteSettingsFunction() {
   const _clients = new Map();
   let _invalidatePolling = false;
+  let _initialized = false;
 
   // If not explicitly specified, use the default signer.
   const defaultOptions = {
@@ -304,6 +305,39 @@ function remoteSettingsFunction() {
     trigger = "manual",
     full = false,
   } = {}) => {
+    if (AppConstants.MOZ_APP_VERSION) {
+      // Called multiple times on GeckoView due to bug 1730026
+      if (_initialized) {
+        return;
+      }
+      _initialized = true;
+      let importedFromDump = false;
+      for (const client of _clients.values()) {
+        const hasLocalDump = await lazy.Utils.hasLocalDump(
+          client.bucketName,
+          client.collectionName
+        );
+        if (hasLocalDump) {
+          const lastModified = await client.getLastModified();
+          const lastModifiedDump = await lazy.Utils.getLocalDumpLastModified(
+            client.bucketName,
+            client.collectionName
+          );
+          if (lastModified < lastModifiedDump) {
+            await client.maybeSync(lastModifiedDump, {
+              loadDump: true,
+              trigger,
+            });
+            importedFromDump = true;
+          }
+        }
+      }
+      if (importedFromDump) {
+        Services.obs.notifyObservers(null, "remote-settings:changes-poll-end");
+      }
+      return;
+    }
+
     if (lazy.Utils.shouldSkipRemoteActivityDueToTests) {
       return;
     }
diff --git a/services/settings/servicesSettings.manifest b/services/settings/servicesSettings.manifest
index c9c2370d2cf52..14b50e4b37157 100644
--- a/services/settings/servicesSettings.manifest
+++ b/services/settings/servicesSettings.manifest
@@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/
 # Schedule polling of remote settings changes
 # (default 6H, max 24H)
 # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155
-category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,21600,86400
+# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,21600,86400
diff --git a/services/settings/static-dumps/main/moz.build b/services/settings/static-dumps/main/moz.build
index 5ff825b497e32..ead4a24fddbcc 100644
--- a/services/settings/static-dumps/main/moz.build
+++ b/services/settings/static-dumps/main/moz.build
@@ -8,4 +8,5 @@ if CONFIG["MOZ_BUILD_APP"] == "browser":
 FINAL_TARGET_FILES.defaults.settings.main += [
     "doh-config.json",
     "doh-providers.json",
+    "query-stripping.json",
 ]
diff --git a/services/settings/static-dumps/main/query-stripping.json b/services/settings/static-dumps/main/query-stripping.json
new file mode 100644
index 0000000000000..ffc064bef7fa9
--- /dev/null
+++ b/services/settings/static-dumps/main/query-stripping.json
@@ -0,0 +1,44 @@
+{
+  "data": [
+    {
+      "schema": 1678379807899,
+      "allowList": [],
+      "stripList": [
+        "gclid",
+        "dclid",
+        "msclkid",
+        "_openstat",
+        "yclid",
+        "wickedid",
+        "twclid",
+        "_hsenc",
+        "__hssc",
+        "__hstc",
+        "__hsfp",
+        "hsctatracking",
+        "wbraid",
+        "gbraid",
+        "ysclid"
+      ],
+      "id": "85078bad-f31e-4d93-bb8a-81088b25d6dd",
+      "last_modified": 1678736907773
+    },
+    {
+      "schema": 1649695008608,
+      "allowList": [],
+      "stripList": [
+        "mc_eid",
+        "oly_anon_id",
+        "oly_enc_id",
+        "__s",
+        "vero_id",
+        "_hsenc",
+        "mkt_tok",
+        "fbclid"
+      ],
+      "id": "76495cfc-fac9-4079-9b5f-9ff0784484de",
+      "last_modified": 1649762862679
+    }
+  ],
+  "timestamp": 1678736907773
+}
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 4cf34b18c171e..4a4a3c6a4fec3 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -2347,6 +2347,12 @@ version = "1.4.0"
 notes = "I have read over the macros, and audited the unsafe code."
 aggregated-from = "https://raw.githubusercontent.com/mozilla/cargo-vet/main/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.mime_guess]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "2.0.4 -> 2.0.5"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.rkv]]
 who = "Kagami Sascha Rosylight <krosylight@mozilla.com>"
 criteria = "safe-to-deploy"
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
index be30c06eb5076..4bf4c8873c316 100644
--- a/taskcluster/config.yml
+++ b/taskcluster/config.yml
@@ -1017,7 +1017,7 @@ mac-signing:
                       - "/Contents/MacOS/crashreporter.app"
                       - "/Contents/MacOS/updater.app/Contents/Frameworks/UpdateSettings.framework"
                       - "/Contents/MacOS/updater.app"
-                      - "/Contents/Library/LaunchServices/org.mozilla.updater"
+                      - "/Contents/Library/LaunchServices/net.waterfox.updater"
                       - "/Contents/MacOS/XUL"
                       - "/Contents/MacOS/pingsender"
                       - "/Contents/MacOS/nmhproxy"
@@ -1062,7 +1062,7 @@ mac-signing:
                       - "/Contents/MacOS/crashreporter.app"
                       - "/Contents/MacOS/updater.app/Contents/Frameworks/UpdateSettings.framework"
                       - "/Contents/MacOS/updater.app"
-                      - "/Contents/Library/LaunchServices/org.mozilla.updater"
+                      - "/Contents/Library/LaunchServices/net.waterfox.updater"
                       - "/Contents/MacOS/pingsender"
                       - "/Contents/MacOS/nmhproxy"
                       - "/Contents/Frameworks/ChannelPrefs.framework"
diff --git a/testing/mozbase/mozcrash/mozcrash/mozcrash.py b/testing/mozbase/mozcrash/mozcrash/mozcrash.py
index 95f589761f53b..754208dd74cd6 100644
--- a/testing/mozbase/mozcrash/mozcrash/mozcrash.py
+++ b/testing/mozbase/mozcrash/mozcrash/mozcrash.py
@@ -814,7 +814,7 @@ def cleanup_pending_crash_reports():
     """
     if mozinfo.isWin:
         location = os.path.expanduser(
-            "~\\AppData\\Roaming\\Mozilla\\Firefox\\Crash Reports"
+            "~\\AppData\\Roaming\\BrowserWorks\\Waterfox\\Crash Reports"
         )
     elif mozinfo.isMac:
         location = os.path.expanduser(
diff --git a/testing/mozharness/configs/raptor/windows_config.py b/testing/mozharness/configs/raptor/windows_config.py
index a8856c72de0cd..a7e9322df69fa 100644
--- a/testing/mozharness/configs/raptor/windows_config.py
+++ b/testing/mozharness/configs/raptor/windows_config.py
@@ -46,7 +46,7 @@
     },
     "env": {
         # python3 requires C runtime, found in firefox installation; see bug 1361732
-        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\firefox;"
+        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\Waterfox;"
     },
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
diff --git a/testing/mozharness/configs/raptor/windows_vm_config.py b/testing/mozharness/configs/raptor/windows_vm_config.py
index 7bd5e9da58b06..3224ba702e864 100644
--- a/testing/mozharness/configs/raptor/windows_vm_config.py
+++ b/testing/mozharness/configs/raptor/windows_vm_config.py
@@ -41,6 +41,6 @@
     },
     "env": {
         # python3 requires C runtime, found in firefox installation; see bug 1361732
-        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\firefox;"
+        "PATH": "%(PATH)s;c:\\slave\\test\\build\\application\\Waterfox;"
     },
 }
diff --git a/third_party/python/jsonschema/jsonschema/validators.py b/third_party/python/jsonschema/jsonschema/validators.py
index 66e803ea2d0bf..88316a8bb727e 100644
--- a/third_party/python/jsonschema/jsonschema/validators.py
+++ b/third_party/python/jsonschema/jsonschema/validators.py
@@ -875,8 +875,11 @@ def _find_in_subschemas(self, url):
             return None
         uri, fragment = urldefrag(url)
         for subschema in subschemas:
+            id = subschema["$id"]
+            if not isinstance(id, str):
+                continue
             target_uri = self._urljoin_cache(
-                self.resolution_scope, subschema["$id"],
+                self.resolution_scope, id,
             )
             if target_uri.rstrip("/") == uri.rstrip("/"):
                 if fragment:
diff --git a/third_party/rust/mime_guess/.cargo-checksum.json b/third_party/rust/mime_guess/.cargo-checksum.json
index a1d0edbcf3b73..9af6043ca1483 100644
--- a/third_party/rust/mime_guess/.cargo-checksum.json
+++ b/third_party/rust/mime_guess/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"1be3b2e0b56466b1a4ab94c35176df5a41846677caa7bd2d5603cfdb19d9eef3","Cargo.toml":"c367dbd734e16d3dc6333fc072021372baee73170ec1c9b19606bb52f1772d9a","LICENSE":"6919f1acec82afc721be2d9907b993267f433a44d25d8aedf1003b5f59ebfd46","README.md":"417338ebb9da8e8bdfad3c3da81248ab5f023652f3468ec5dcb2fdf43ea40b32","benches/benchmark.rs":"2287c7233cf78a9af98b2b53cd20e221e4a785209bd70a87030f1ade34a02507","build.rs":"8e47254c0a927eeb243058cfc0da413f34a958226707c941e8634e4514562f04","examples/rev_map.rs":"0bab6cc20b9eace741c6cc4a8c67ebfa124df1bf213038c5e34976081ffd2ebc","src/impl_bin_search.rs":"32a89409690d57f074f11eb93a9d6e422f73788af63fc29f980e13d1c2d2fa6f","src/impl_phf.rs":"321028cc657364c6f7c5b5f538b0033bcfd6f3b5ef711304d806c0644466a964","src/lib.rs":"bb190bcbbf4139c410af20564f0376a99a83474ca12b7e8c6860228e0caff7da","src/mime_types.rs":"57ee8db84eb0fc4f06a3eac0da8c730a334cb99a7e81e60413f5febd886d91f4"},"package":"4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"}
\ No newline at end of file
+{"files":{"Cargo.lock":"2b59f34ab30d336b54edb66ea861174599310a5a87d597f45ca518cf55a186dc","Cargo.toml":"aca17af6f0fd2497700e94f764a25862ea41a35629fe4ba6603596213b8e1d88","LICENSE":"816000f9c28f7005d931c77636eb79fa7020071eb0f6e6a995515dfccd3559cb","README.md":"32663b3f4530e71cfec689576cca62911c83e504232963c65da82ebed26e2aa7","benches/benchmark.rs":"021dde9d834a3e4fab08d41f6e23d4f083f18c5f382b59866c2e07dc0ed9747a","build.rs":"bc413487e376b343b65089a9a897f4bb3c9d5fbaa5a6833e87db1d3c18c462d8","examples/rev_map.rs":"13a79d0b9eba6bfb49f99102917d1dada89c37ffcfab492759af997539b616ba","src/impl_bin_search.rs":"dd5817c9bc817c36274361c4cd0612ed303347c38bdbf8dff84cf57cd2918808","src/impl_phf.rs":"a9d956119304926c1f37754102ff74fbfe36004e24e326329e67e7c51fff381b","src/lib.rs":"7ea3571f3b7a231e4bf0003d66056becddeedb3084ee7af7fa9826f0602613f4","src/mime_types.rs":"1e89c58024547606d78e71488f0e027b740613fc22ac5877e24e3851e0f0628b"},"package":"f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"}
\ No newline at end of file
diff --git a/third_party/rust/mime_guess/Cargo.lock b/third_party/rust/mime_guess/Cargo.lock
index 18dfe39b8c08f..aedfa966a1c00 100644
--- a/third_party/rust/mime_guess/Cargo.lock
+++ b/third_party/rust/mime_guess/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -15,42 +24,27 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bstr"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "cast"
-version = "0.2.7"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version",
-]
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cfg-if"
@@ -60,9 +54,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "bitflags",
  "textwrap",
@@ -71,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
 dependencies = [
  "atty",
  "cast",
@@ -97,65 +91,45 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
 dependencies = [
  "cast",
  "itertools",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "csv"
-version = "1.1.6"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
 dependencies = [
- "bstr",
  "csv-core",
  "itoa",
  "ryu",
@@ -164,24 +138,24 @@ dependencies = [
 
 [[package]]
 name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "half"
-version = "1.7.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
 
 [[package]]
 name = "hermit-abi"
@@ -194,73 +168,61 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.10.1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.52"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.98"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
-
-[[package]]
-name = "memoffset"
-version = "0.6.4"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
-dependencies = [
- "autocfg",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 dependencies = [
  "criterion",
  "mime",
@@ -269,22 +231,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.13.0"
+name = "once_cell"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
@@ -294,9 +252,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "plotters"
-version = "0.3.1"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -307,97 +265,91 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.2"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.1"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
- "autocfg",
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.9.1"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "lazy_static",
- "num_cpus",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -408,29 +360,20 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "semver"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
-
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
 
 [[package]]
 name = "serde_cbor"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
  "half",
  "serde",
@@ -438,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -449,9 +392,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
  "itoa",
  "ryu",
@@ -460,13 +403,13 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -490,47 +433,46 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
 
 [[package]]
-name = "unicode-width"
-version = "0.1.8"
+name = "unicode-ident"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.2"
+name = "unicode-width"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.75"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -538,13 +480,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.75"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -553,9 +495,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.75"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -563,9 +505,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.75"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -576,15 +518,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.75"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.52"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -608,11 +550,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -620,3 +562,76 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
diff --git a/third_party/rust/mime_guess/Cargo.toml b/third_party/rust/mime_guess/Cargo.toml
index fc6f68d2a731f..401a74a5e5179 100644
--- a/third_party/rust/mime_guess/Cargo.toml
+++ b/third_party/rust/mime_guess/Cargo.toml
@@ -11,12 +11,16 @@
 
 [package]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 authors = ["Austin Bonander <austin.bonander@gmail.com>"]
 description = "A simple crate for detection of a file's MIME type by its extension."
 documentation = "https://docs.rs/mime_guess/"
 readme = "README.md"
-keywords = ["mime", "filesystem", "extension"]
+keywords = [
+    "mime",
+    "filesystem",
+    "extension",
+]
 license = "MIT"
 repository = "https://github.com/abonander/mime_guess"
 
@@ -27,13 +31,16 @@ required-features = ["rev-mappings"]
 [[bench]]
 name = "benchmark"
 harness = false
+
 [dependencies.mime]
 version = "0.3"
 
 [dependencies.unicase]
 version = "2.4.0"
+
 [dev-dependencies.criterion]
 version = "0.3"
+
 [build-dependencies.unicase]
 version = "2.4.0"
 
diff --git a/third_party/rust/mime_guess/LICENSE b/third_party/rust/mime_guess/LICENSE
index e3a186285799d..d4e2bcdb613b8 100644
--- a/third_party/rust/mime_guess/LICENSE
+++ b/third_party/rust/mime_guess/LICENSE
@@ -1,22 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Austin Bonander
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+The MIT License (MIT)
+
+Copyright (c) 2015 Austin Bonander
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/third_party/rust/mime_guess/README.md b/third_party/rust/mime_guess/README.md
index 6e774503a4b52..28989bb1b2c4a 100644
--- a/third_party/rust/mime_guess/README.md
+++ b/third_party/rust/mime_guess/README.md
@@ -1,86 +1,86 @@
-# mime_guess ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/abonander/mime_guess/Rust) [![Crates.io](https://img.shields.io/crates/v/mime_guess.svg)](https://crates.io/crates/mime_guess)
-
-MIME/MediaType guessing by file extension. 
-Uses a static map of known file extension -> MIME type mappings.
-
-**Returning Contributors: New Requirements for Submissions Below**
-
-##### Required Rust Version: 1.33
-
-#### [Documentation](https://docs.rs/mime_guess/)
-
-### Versioning
-
-Due to a mistaken premature release, `mime_guess` currently publicly depends on a pre-1.0 `mime`,
-which means `mime` upgrades are breaking changes and necessitate a major version bump. 
-Refer to the following table to find a version of `mime_guess` which matches your version of `mime`:
-
-| `mime` version | `mime_guess` version |
-|----------------|----------------------|
-| `0.1.x, 0.2.x` | `1.x.y` |
-| `0.3.x`        | `2.x.y` |
-
-#### Note: MIME Types Returned Are Not Stable/Guaranteed
-The media types returned for a given extension are not considered to be part of the crate's
- stable API and are often updated in patch (`x.y.z + 1`) releases to be as correct as possible. MIME
- changes are backported to previous major releases on a best-effort basis.
- 
-Note that only the extensions of paths/filenames are inspected in order to guess the MIME type. The
-file that may or may not reside at that path may or may not be a valid file of the returned MIME type.
-Be wary of unsafe or un-validated assumptions about file structure or length.
-
-An extension may also have multiple applicable MIME types. When more than one is returned, the first
-is considered to be the most "correct"--see below for elaboration.
-
-Contributing
------------
-
-#### Adding or correcting MIME types for extensions
-
-Is the MIME type for a file extension wrong or missing? Great! 
-Well, not great for us, but great for you if you'd like to open a pull request! 
-
-The file extension -> MIME type mappings are listed in `src/mime_types.rs`. 
-**The list is sorted lexicographically by file extension, and all extensions are lowercase (where applicable).** 
-The former is necessary to support fallback to binary search when the 
-`phf-map` feature is turned off, and for the maintainers' sanity.
-The latter is only for consistency's sake; the search is case-insensitive.
-
-Simply add or update the appropriate string pair(s) to make the correction(s) needed. 
-Run `cargo test` to make sure the library continues to work correctly.
-
-#### Important! Citing the corrected MIME type 
-
-When opening a pull request, please include a link to an official document or RFC noting 
-the correct MIME type for the file type in question **in the commit message** so
-that the commit history can be used as an audit trail.
-
-Though we're only guessing here, we like to be as correct as we can. 
-It makes it much easier to vet your contribution if we don't have to search for corroborating material.
-
-#### Multiple MIME types per extension
-As of `2.0.0`, multiple MIME types per extension are supported. The first MIME type in the list for 
-a given extension should be the most "correct" so users who only care about getting a single MIME 
-type can use the `first*()` methods.
-
-The definition of "correct" is open to debate, however. In the author's opinion this should be 
-whatever is defined by the latest IETF RFC for the given file format, or otherwise explicitly 
-supercedes all others.
-
-If an official IANA registration replaces an older "experimental" style media type, please
-place the new type before the old type in the list, but keep the old type for reference:
-
-```
-- ("md", &["text/x-markdown"]),
-+ ("md", &["text/markdown", "text/x-markdown"]),
-```
-
-#### Changes to the API or operation of the crate
-
-We're open to changes to the crate's API or its inner workings, breaking or not, if it improves the overall operation, efficiency, or ergonomics of the crate. However, it would be a good idea to open an issue on the repository so we can discuss your proposed changes and decide how best to approach them.
-
-
-License
--------
-
-MIT (See the `LICENSE` file in this repository for more information.)
+# mime_guess ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/abonander/mime_guess/rust.yml?branch=master) [![Crates.io](https://img.shields.io/crates/v/mime_guess.svg)](https://crates.io/crates/mime_guess)
+
+MIME/MediaType guessing by file extension. 
+Uses a static map of known file extension -> MIME type mappings.
+
+**Returning Contributors: New Requirements for Submissions Below**
+
+##### Required Rust Version: 1.33
+
+#### [Documentation](https://docs.rs/mime_guess/)
+
+### Versioning
+
+Due to a mistaken premature release, `mime_guess` currently publicly depends on a pre-1.0 `mime`,
+which means `mime` upgrades are breaking changes and necessitate a major version bump. 
+Refer to the following table to find a version of `mime_guess` which matches your version of `mime`:
+
+| `mime` version | `mime_guess` version |
+|----------------|----------------------|
+| `0.1.x, 0.2.x` | `1.x.y` |
+| `0.3.x`        | `2.x.y` |
+
+#### Note: MIME Types Returned Are Not Stable/Guaranteed
+The media types returned for a given extension are not considered to be part of the crate's
+ stable API and are often updated in patch (`x.y.z + 1`) releases to be as correct as possible. MIME
+ changes are backported to previous major releases on a best-effort basis.
+ 
+Note that only the extensions of paths/filenames are inspected in order to guess the MIME type. The
+file that may or may not reside at that path may or may not be a valid file of the returned MIME type.
+Be wary of unsafe or un-validated assumptions about file structure or length.
+
+An extension may also have multiple applicable MIME types. When more than one is returned, the first
+is considered to be the most "correct"--see below for elaboration.
+
+Contributing
+-----------
+
+#### Adding or correcting MIME types for extensions
+
+Is the MIME type for a file extension wrong or missing? Great! 
+Well, not great for us, but great for you if you'd like to open a pull request! 
+
+The file extension -> MIME type mappings are listed in `src/mime_types.rs`. 
+**The list is sorted lexicographically by file extension, and all extensions are lowercase (where applicable).** 
+The former is necessary to support fallback to binary search when the 
+`phf-map` feature is turned off, and for the maintainers' sanity.
+The latter is only for consistency's sake; the search is case-insensitive.
+
+Simply add or update the appropriate string pair(s) to make the correction(s) needed. 
+Run `cargo test` to make sure the library continues to work correctly.
+
+#### Important! Citing the corrected MIME type 
+
+When opening a pull request, please include a link to an official document or RFC noting 
+the correct MIME type for the file type in question **in the commit message** so
+that the commit history can be used as an audit trail.
+
+Though we're only guessing here, we like to be as correct as we can. 
+It makes it much easier to vet your contribution if we don't have to search for corroborating material.
+
+#### Multiple MIME types per extension
+As of `2.0.0`, multiple MIME types per extension are supported. The first MIME type in the list for 
+a given extension should be the most "correct" so users who only care about getting a single MIME 
+type can use the `first*()` methods.
+
+The definition of "correct" is open to debate, however. In the author's opinion this should be 
+whatever is defined by the latest IETF RFC for the given file format, or otherwise explicitly 
+supercedes all others.
+
+If an official IANA registration replaces an older "experimental" style media type, please
+place the new type before the old type in the list, but keep the old type for reference:
+
+```
+- ("md", &["text/x-markdown"]),
++ ("md", &["text/markdown", "text/x-markdown"]),
+```
+
+#### Changes to the API or operation of the crate
+
+We're open to changes to the crate's API or its inner workings, breaking or not, if it improves the overall operation, efficiency, or ergonomics of the crate. However, it would be a good idea to open an issue on the repository so we can discuss your proposed changes and decide how best to approach them.
+
+
+License
+-------
+
+MIT (See the `LICENSE` file in this repository for more information.)
diff --git a/third_party/rust/mime_guess/benches/benchmark.rs b/third_party/rust/mime_guess/benches/benchmark.rs
index 4a7af2e5842da..34ba59bd9bede 100644
--- a/third_party/rust/mime_guess/benches/benchmark.rs
+++ b/third_party/rust/mime_guess/benches/benchmark.rs
@@ -1,31 +1,31 @@
-#[macro_use]
-extern crate criterion;
-extern crate mime_guess;
-
-use self::criterion::Criterion;
-
-use mime_guess::from_ext;
-
-include!("../src/mime_types.rs");
-
-/// WARNING: this may take a while!
-fn bench_mime_str(c: &mut Criterion) {
-    c.bench_function("from_ext", |b| {
-        for (mime_ext, _) in MIME_TYPES {
-            b.iter(|| from_ext(mime_ext).first_raw());
-        }
-    });
-}
-
-fn bench_mime_str_uppercase(c: &mut Criterion) {
-    c.bench_function("from_ext uppercased", |b| {
-        let uppercased = MIME_TYPES.into_iter().map(|(s, _)| s.to_uppercase());
-
-        for mime_ext in uppercased {
-            b.iter(|| from_ext(&mime_ext).first_raw());
-        }
-    });
-}
-
-criterion_group!(benches, bench_mime_str, bench_mime_str_uppercase);
-criterion_main!(benches);
+#[macro_use]
+extern crate criterion;
+extern crate mime_guess;
+
+use self::criterion::Criterion;
+
+use mime_guess::from_ext;
+
+include!("../src/mime_types.rs");
+
+/// WARNING: this may take a while!
+fn bench_mime_str(c: &mut Criterion) {
+    c.bench_function("from_ext", |b| {
+        for (mime_ext, _) in MIME_TYPES {
+            b.iter(|| from_ext(mime_ext).first_raw());
+        }
+    });
+}
+
+fn bench_mime_str_uppercase(c: &mut Criterion) {
+    c.bench_function("from_ext uppercased", |b| {
+        let uppercased = MIME_TYPES.into_iter().map(|(s, _)| s.to_uppercase());
+
+        for mime_ext in uppercased {
+            b.iter(|| from_ext(&mime_ext).first_raw());
+        }
+    });
+}
+
+criterion_group!(benches, bench_mime_str, bench_mime_str_uppercase);
+criterion_main!(benches);
diff --git a/third_party/rust/mime_guess/build.rs b/third_party/rust/mime_guess/build.rs
index ff4ea764efe9c..3a59d5d31b271 100644
--- a/third_party/rust/mime_guess/build.rs
+++ b/third_party/rust/mime_guess/build.rs
@@ -1,191 +1,196 @@
-#[cfg(feature = "phf")]
-extern crate phf_codegen;
-extern crate unicase;
-
-use unicase::UniCase;
-
-use std::env;
-use std::fs::File;
-use std::io::prelude::*;
-use std::io::BufWriter;
-use std::path::Path;
-
-use std::collections::BTreeMap;
-
-use mime_types::MIME_TYPES;
-
-#[path = "src/mime_types.rs"]
-mod mime_types;
-
-#[cfg(feature = "phf")]
-const PHF_PATH: &str = "::impl_::phf";
-
-fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let dest_path = Path::new(&out_dir).join("mime_types_generated.rs");
-    let mut outfile = BufWriter::new(File::create(dest_path).unwrap());
-
-    #[cfg(feature = "phf")]
-    build_forward_map(&mut outfile);
-
-    #[cfg(feature = "rev-mappings")]
-    build_rev_map(&mut outfile);
-}
-
-// Build forward mappings (ext -> mime type)
-#[cfg(feature = "phf")]
-fn build_forward_map<W: Write>(out: &mut W) {
-    use phf_codegen::Map as PhfMap;
-
-    let mut forward_map = PhfMap::new();
-    forward_map.phf_path(PHF_PATH);
-
-    let mut map_entries: Vec<(&str, Vec<&str>)> = Vec::new();
-
-    for &(key, types) in MIME_TYPES {
-        if let Some(&mut (key_, ref mut values)) = map_entries.last_mut() {
-            // deduplicate extensions
-            if key == key_ {
-                values.extend_from_slice(types);
-                continue;
-            }
-        }
-
-        map_entries.push((key, types.into()));
-    }
-
-    for (key, values) in map_entries {
-        forward_map.entry(
-            UniCase::new(key),
-            &format!("&{:?}", values),
-        );
-    }
-
-    writeln!(
-        out,
-        "static MIME_TYPES: phf::Map<UniCase<&'static str>, &'static [&'static str]> = \n{};",
-        forward_map.build()
-    )
-        .unwrap();
-}
-
-// Build reverse mappings (mime type -> ext)
-#[cfg(all(feature = "phf", feature = "rev-mappings"))]
-fn build_rev_map<W: Write>(out: &mut W) {
-    use phf_codegen::Map as PhfMap;
-
-    let dyn_map = get_rev_mappings();
-
-    let mut rev_map = PhfMap::new();
-    rev_map.phf_path(PHF_PATH);
-
-    let mut exts = Vec::new();
-
-    for (top, subs) in dyn_map {
-        let top_start = exts.len();
-
-        let mut sub_map = PhfMap::new();
-        sub_map.phf_path(PHF_PATH);
-
-        for (sub, sub_exts) in subs {
-            let sub_start = exts.len();
-            exts.extend(sub_exts);
-            let sub_end = exts.len();
-
-            sub_map.entry(sub, &format!("({}, {})", sub_start, sub_end));
-        }
-
-        let top_end = exts.len();
-
-        rev_map.entry(
-            top,
-            &format!(
-                "TopLevelExts {{ start: {}, end: {}, subs: {} }}",
-                top_start, top_end, sub_map.build()
-            ),
-        );
-    }
-
-    writeln!(
-        out,
-        "static REV_MAPPINGS: phf::Map<UniCase<&'static str>, TopLevelExts> = \n{};",
-        rev_map.build()
-    ).unwrap();
-
-    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
-}
-
-#[cfg(all(not(feature = "phf"), feature = "rev-mappings"))]
-fn build_rev_map<W: Write>(out: &mut W) {
-    use std::fmt::Write as _;
-
-    macro_rules! unicase_const {
-        ($s:expr) => ({
-            format_args!("{}({:?})", (if $s.is_ascii() {
-                "UniCase::ascii"
-            } else {
-                "UniCase::unicode"
-            }), $s)
-        })
-    }
-
-    let dyn_map = get_rev_mappings();
-
-    write!(out, "static REV_MAPPINGS: &'static [(UniCase<&'static str>, TopLevelExts)] = &[").unwrap();
-
-    let mut exts = Vec::new();
-
-    for (top, subs) in dyn_map {
-        let top_start = exts.len();
-
-        let mut sub_map = String::new();
-
-        for (sub, sub_exts) in subs {
-            let sub_start = exts.len();
-            exts.extend(sub_exts);
-            let sub_end = exts.len();
-
-            write!(
-                sub_map,
-                "({}, ({}, {})),",
-                unicase_const!(sub), sub_start, sub_end
-            ).unwrap();
-        }
-
-        let top_end = exts.len();
-
-        write!(
-            out,
-            "({}, TopLevelExts {{ start: {}, end: {}, subs: &[{}] }}),",
-            unicase_const!(top), top_start, top_end, sub_map
-        ).unwrap();
-    }
-
-    writeln!(out, "];").unwrap();
-
-    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
-}
-
-#[cfg(feature = "rev-mappings")]
-fn get_rev_mappings(
-) -> BTreeMap<UniCase<&'static str>, BTreeMap<UniCase<&'static str>, Vec<&'static str>>> {
-    // First, collect all the mime type -> ext mappings)
-    let mut dyn_map = BTreeMap::new();
-    for &(key, types) in MIME_TYPES {
-        for val in types {
-            let (top, sub) = split_mime(val);
-            dyn_map
-                .entry(UniCase::new(top))
-                .or_insert_with(BTreeMap::new)
-                .entry(UniCase::new(sub))
-                .or_insert_with(Vec::new)
-                .push(key);
-        }
-    }
-    dyn_map
-}
-
-fn split_mime(mime: &str) -> (&str, &str) {
-    let split_idx = mime.find('/').unwrap();
-    (&mime[..split_idx], &mime[split_idx + 1..])
-}
+#[cfg(feature = "phf")]
+extern crate phf_codegen;
+extern crate unicase;
+
+use unicase::UniCase;
+
+use std::env;
+use std::fs::File;
+use std::io::prelude::*;
+use std::io::BufWriter;
+use std::path::Path;
+
+use std::collections::BTreeMap;
+
+use mime_types::MIME_TYPES;
+
+#[path = "src/mime_types.rs"]
+mod mime_types;
+
+#[cfg(feature = "phf")]
+const PHF_PATH: &str = "::impl_::phf";
+
+fn main() {
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let dest_path = Path::new(&out_dir).join("mime_types_generated.rs");
+    let mut outfile = BufWriter::new(File::create(&dest_path).unwrap());
+
+    println!(
+        "cargo:rustc-env=MIME_TYPES_GENERATED_PATH={}",
+        dest_path.display()
+    );
+
+    #[cfg(feature = "phf")]
+    build_forward_map(&mut outfile);
+
+    #[cfg(feature = "rev-mappings")]
+    build_rev_map(&mut outfile);
+}
+
+// Build forward mappings (ext -> mime type)
+#[cfg(feature = "phf")]
+fn build_forward_map<W: Write>(out: &mut W) {
+    use phf_codegen::Map as PhfMap;
+
+    let mut forward_map = PhfMap::new();
+    forward_map.phf_path(PHF_PATH);
+
+    let mut map_entries: Vec<(&str, Vec<&str>)> = Vec::new();
+
+    for &(key, types) in MIME_TYPES {
+        if let Some(&mut (key_, ref mut values)) = map_entries.last_mut() {
+            // deduplicate extensions
+            if key == key_ {
+                values.extend_from_slice(types);
+                continue;
+            }
+        }
+
+        map_entries.push((key, types.into()));
+    }
+
+    for (key, values) in map_entries {
+        forward_map.entry(
+            UniCase::new(key),
+            &format!("&{:?}", values),
+        );
+    }
+
+    writeln!(
+        out,
+        "static MIME_TYPES: phf::Map<UniCase<&'static str>, &'static [&'static str]> = \n{};",
+        forward_map.build()
+    )
+        .unwrap();
+}
+
+// Build reverse mappings (mime type -> ext)
+#[cfg(all(feature = "phf", feature = "rev-mappings"))]
+fn build_rev_map<W: Write>(out: &mut W) {
+    use phf_codegen::Map as PhfMap;
+
+    let dyn_map = get_rev_mappings();
+
+    let mut rev_map = PhfMap::new();
+    rev_map.phf_path(PHF_PATH);
+
+    let mut exts = Vec::new();
+
+    for (top, subs) in dyn_map {
+        let top_start = exts.len();
+
+        let mut sub_map = PhfMap::new();
+        sub_map.phf_path(PHF_PATH);
+
+        for (sub, sub_exts) in subs {
+            let sub_start = exts.len();
+            exts.extend(sub_exts);
+            let sub_end = exts.len();
+
+            sub_map.entry(sub, &format!("({}, {})", sub_start, sub_end));
+        }
+
+        let top_end = exts.len();
+
+        rev_map.entry(
+            top,
+            &format!(
+                "TopLevelExts {{ start: {}, end: {}, subs: {} }}",
+                top_start, top_end, sub_map.build()
+            ),
+        );
+    }
+
+    writeln!(
+        out,
+        "static REV_MAPPINGS: phf::Map<UniCase<&'static str>, TopLevelExts> = \n{};",
+        rev_map.build()
+    ).unwrap();
+
+    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
+}
+
+#[cfg(all(not(feature = "phf"), feature = "rev-mappings"))]
+fn build_rev_map<W: Write>(out: &mut W) {
+    use std::fmt::Write as _;
+
+    macro_rules! unicase_const {
+        ($s:expr) => ({
+            format_args!("{}({:?})", (if $s.is_ascii() {
+                "UniCase::ascii"
+            } else {
+                "UniCase::unicode"
+            }), $s)
+        })
+    }
+
+    let dyn_map = get_rev_mappings();
+
+    write!(out, "static REV_MAPPINGS: &'static [(UniCase<&'static str>, TopLevelExts)] = &[").unwrap();
+
+    let mut exts = Vec::new();
+
+    for (top, subs) in dyn_map {
+        let top_start = exts.len();
+
+        let mut sub_map = String::new();
+
+        for (sub, sub_exts) in subs {
+            let sub_start = exts.len();
+            exts.extend(sub_exts);
+            let sub_end = exts.len();
+
+            write!(
+                sub_map,
+                "({}, ({}, {})),",
+                unicase_const!(sub), sub_start, sub_end
+            ).unwrap();
+        }
+
+        let top_end = exts.len();
+
+        write!(
+            out,
+            "({}, TopLevelExts {{ start: {}, end: {}, subs: &[{}] }}),",
+            unicase_const!(top), top_start, top_end, sub_map
+        ).unwrap();
+    }
+
+    writeln!(out, "];").unwrap();
+
+    writeln!(out, "const EXTS: &'static [&'static str] = &{:?};", exts).unwrap();
+}
+
+#[cfg(feature = "rev-mappings")]
+fn get_rev_mappings(
+) -> BTreeMap<UniCase<&'static str>, BTreeMap<UniCase<&'static str>, Vec<&'static str>>> {
+    // First, collect all the mime type -> ext mappings)
+    let mut dyn_map = BTreeMap::new();
+    for &(key, types) in MIME_TYPES {
+        for val in types {
+            let (top, sub) = split_mime(val);
+            dyn_map
+                .entry(UniCase::new(top))
+                .or_insert_with(BTreeMap::new)
+                .entry(UniCase::new(sub))
+                .or_insert_with(Vec::new)
+                .push(key);
+        }
+    }
+    dyn_map
+}
+
+fn split_mime(mime: &str) -> (&str, &str) {
+    let split_idx = mime.find('/').unwrap();
+    (&mime[..split_idx], &mime[split_idx + 1..])
+}
diff --git a/third_party/rust/mime_guess/examples/rev_map.rs b/third_party/rust/mime_guess/examples/rev_map.rs
index f6f2fdeaf9aa6..444ac139c21e0 100644
--- a/third_party/rust/mime_guess/examples/rev_map.rs
+++ b/third_party/rust/mime_guess/examples/rev_map.rs
@@ -1,14 +1,14 @@
-extern crate mime_guess;
-
-fn main() {
-    print_exts("video/*");
-    print_exts("video/x-matroska");
-}
-
-fn print_exts(mime_type: &str) {
-    println!(
-        "Exts for {:?}: {:?}",
-        mime_type,
-        mime_guess::get_mime_extensions_str(mime_type)
-    );
-}
+extern crate mime_guess;
+
+fn main() {
+    print_exts("video/*");
+    print_exts("video/x-matroska");
+}
+
+fn print_exts(mime_type: &str) {
+    println!(
+        "Exts for {:?}: {:?}",
+        mime_type,
+        mime_guess::get_mime_extensions_str(mime_type)
+    );
+}
diff --git a/third_party/rust/mime_guess/src/impl_bin_search.rs b/third_party/rust/mime_guess/src/impl_bin_search.rs
index 2653714505af8..fee2cb681ee8f 100644
--- a/third_party/rust/mime_guess/src/impl_bin_search.rs
+++ b/third_party/rust/mime_guess/src/impl_bin_search.rs
@@ -1,41 +1,41 @@
-use unicase::UniCase;
-
-include!("mime_types.rs");
-include!(concat!(env!("OUT_DIR"), "/mime_types_generated.rs"));
-
-#[cfg(feature = "rev-mappings")]
-#[derive(Copy, Clone)]
-struct TopLevelExts {
-    start: usize,
-    end: usize,
-    subs: &'static [(UniCase<&'static str>, (usize, usize))],
-}
-
-pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
-    let ext = UniCase::new(ext);
-
-    map_lookup(MIME_TYPES, &ext)
-}
-
-#[cfg(feature = "rev-mappings")]
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    if toplevel == "*" {
-        return Some(EXTS);
-    }
-
-    let top = map_lookup(REV_MAPPINGS, toplevel)?;
-
-    if sublevel == "*" {
-        return Some(&EXTS[top.start..top.end]);
-    }
-
-    let sub = map_lookup(&top.subs, sublevel)?;
-    Some(&EXTS[sub.0..sub.1])
-}
-
-fn map_lookup<K, V>(map: &'static [(K, V)], key: &str) -> Option<V>
-    where K: Copy + Into<UniCase<&'static str>>, V: Copy {
-    map.binary_search_by_key(&UniCase::new(key), |(k, _)| (*k).into())
-        .ok()
-        .map(|i| map[i].1)
-}
+use unicase::UniCase;
+
+include!("mime_types.rs");
+include!(env!("MIME_TYPES_GENERATED_PATH"));
+
+#[cfg(feature = "rev-mappings")]
+#[derive(Copy, Clone)]
+struct TopLevelExts {
+    start: usize,
+    end: usize,
+    subs: &'static [(UniCase<&'static str>, (usize, usize))],
+}
+
+pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
+    let ext = UniCase::new(ext);
+
+    map_lookup(MIME_TYPES, &ext)
+}
+
+#[cfg(feature = "rev-mappings")]
+pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
+    if toplevel == "*" {
+        return Some(EXTS);
+    }
+
+    let top = map_lookup(REV_MAPPINGS, toplevel)?;
+
+    if sublevel == "*" {
+        return Some(&EXTS[top.start..top.end]);
+    }
+
+    let sub = map_lookup(&top.subs, sublevel)?;
+    Some(&EXTS[sub.0..sub.1])
+}
+
+fn map_lookup<K, V>(map: &'static [(K, V)], key: &str) -> Option<V>
+    where K: Copy + Into<UniCase<&'static str>>, V: Copy {
+    map.binary_search_by_key(&UniCase::new(key), |(k, _)| (*k).into())
+        .ok()
+        .map(|i| map[i].1)
+}
diff --git a/third_party/rust/mime_guess/src/impl_phf.rs b/third_party/rust/mime_guess/src/impl_phf.rs
index 980c31f369f9b..68b4bfacb18dd 100644
--- a/third_party/rust/mime_guess/src/impl_phf.rs
+++ b/third_party/rust/mime_guess/src/impl_phf.rs
@@ -1,40 +1,40 @@
-extern crate phf;
-
-use unicase::UniCase;
-
-include!(concat!(env!("OUT_DIR"), "/mime_types_generated.rs"));
-
-#[cfg(feature = "rev-mappings")]
-struct TopLevelExts {
-    start: usize,
-    end: usize,
-    subs: phf::Map<UniCase<&'static str>, (usize, usize)>,
-}
-
-pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
-    map_lookup(&MIME_TYPES, ext).cloned()
-}
-
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    if toplevel == "*" {
-        return Some(EXTS);
-    }
-
-    let top = map_lookup(&REV_MAPPINGS, toplevel)?;
-
-    if sublevel == "*" {
-        return Some(&EXTS[top.start..top.end]);
-    }
-
-    let sub = map_lookup(&top.subs, sublevel)?;
-    Some(&EXTS[sub.0..sub.1])
-}
-
-fn map_lookup<'key, 'map: 'key, V>(
-    map: &'map phf::Map<UniCase<&'static str>, V>,
-    key: &'key str,
-) -> Option<&'map V> {
-    // FIXME: this doesn't compile unless we transmute `key` to `UniCase<&'static str>`
-    // https://github.com/sfackler/rust-phf/issues/169
-    map.get(&UniCase::new(key))
-}
+extern crate phf;
+
+use unicase::UniCase;
+
+include!(env!("MIME_TYPES_GENERATED_PATH"));
+
+#[cfg(feature = "rev-mappings")]
+struct TopLevelExts {
+    start: usize,
+    end: usize,
+    subs: phf::Map<UniCase<&'static str>, (usize, usize)>,
+}
+
+pub fn get_mime_types(ext: &str) -> Option<&'static [&'static str]> {
+    map_lookup(&MIME_TYPES, ext).cloned()
+}
+
+pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
+    if toplevel == "*" {
+        return Some(EXTS);
+    }
+
+    let top = map_lookup(&REV_MAPPINGS, toplevel)?;
+
+    if sublevel == "*" {
+        return Some(&EXTS[top.start..top.end]);
+    }
+
+    let sub = map_lookup(&top.subs, sublevel)?;
+    Some(&EXTS[sub.0..sub.1])
+}
+
+fn map_lookup<'key, 'map: 'key, V>(
+    map: &'map phf::Map<UniCase<&'static str>, V>,
+    key: &'key str,
+) -> Option<&'map V> {
+    // FIXME: this doesn't compile unless we transmute `key` to `UniCase<&'static str>`
+    // https://github.com/sfackler/rust-phf/issues/169
+    map.get(&UniCase::new(key))
+}
diff --git a/third_party/rust/mime_guess/src/lib.rs b/third_party/rust/mime_guess/src/lib.rs
index e2563f495a73e..6e17f45af115d 100644
--- a/third_party/rust/mime_guess/src/lib.rs
+++ b/third_party/rust/mime_guess/src/lib.rs
@@ -1,534 +1,534 @@
-//! Guessing of MIME types by file extension.
-//!
-//! Uses a static list of file-extension : MIME type mappings.
-//!
-//! ```
-//! # extern crate mime;
-//! // the file doesn't have to exist, it just looks at the path
-//! let guess = mime_guess::from_path("some_file.gif");
-//! assert_eq!(guess.first(), Some(mime::IMAGE_GIF));
-//!
-//! ```
-//!
-//! #### Note: MIME Types Returned Are Not Stable/Guaranteed
-//! The media types returned for a given extension are not considered to be part of the crate's
-//! stable API and are often updated in patch <br /> (`x.y.[z + 1]`) releases to be as correct as
-//! possible.
-//!
-//! Additionally, only the extensions of paths/filenames are inspected in order to guess the MIME
-//! type. The file that may or may not reside at that path may or may not be a valid file of the
-//! returned MIME type.  Be wary of unsafe or un-validated assumptions about file structure or
-//! length.
-pub extern crate mime;
-extern crate unicase;
-
-pub use mime::Mime;
-
-use std::ffi::OsStr;
-use std::iter::FusedIterator;
-use std::path::Path;
-use std::{iter, slice};
-
-#[cfg(feature = "phf")]
-#[path = "impl_phf.rs"]
-mod impl_;
-
-#[cfg(not(feature = "phf"))]
-#[path = "impl_bin_search.rs"]
-mod impl_;
-
-/// A "guess" of the MIME/Media Type(s) of an extension or path as one or more
-/// [`Mime`](struct.Mime.html) instances.
-///
-/// ### Note: Ordering
-/// A given file format may have one or more applicable Media Types; in this case
-/// the first Media Type returned is whatever is declared in the latest IETF RFC for the
-/// presumed file format or the one that explicitly supercedes all others.
-/// Ordering of additional Media Types is arbitrary.
-///
-/// ### Note: Values Not Stable
-/// The exact Media Types returned in any given guess are not considered to be stable and are often
-/// updated in patch releases in order to reflect the most up-to-date information possible.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-// FIXME: change repr when `mime` gains macro/const fn constructor
-pub struct MimeGuess(&'static [&'static str]);
-
-impl MimeGuess {
-    /// Guess the MIME type of a file (real or otherwise) with the given extension.
-    ///
-    /// The search is case-insensitive.
-    ///
-    /// If `ext` is empty or has no (currently) known MIME type mapping, then an empty guess is
-    /// returned.
-    pub fn from_ext(ext: &str) -> MimeGuess {
-        if ext.is_empty() {
-            return MimeGuess(&[]);
-        }
-
-        impl_::get_mime_types(ext).map_or(MimeGuess(&[]), |v| MimeGuess(v))
-    }
-
-    /// Guess the MIME type of `path` by its extension (as defined by
-    /// [`Path::extension()`]). **No disk access is performed.**
-    ///
-    /// If `path` has no extension, the extension cannot be converted to `str`, or has
-    /// no known MIME type mapping, then an empty guess is returned.
-    ///
-    /// The search is case-insensitive.
-    ///
-    /// ## Note
-    /// **Guess** is the operative word here, as there are no guarantees that the contents of the
-    /// file that `path` points to match the MIME type associated with the path's extension.
-    ///
-    /// Take care when processing files with assumptions based on the return value of this function.
-    ///
-    /// [`Path::extension()`]: https://doc.rust-lang.org/std/path/struct.Path.html#method.extension
-    pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
-        path.as_ref()
-            .extension()
-            .and_then(OsStr::to_str)
-            .map_or(MimeGuess(&[]), Self::from_ext)
-    }
-
-    /// `true` if the guess did not return any known mappings for the given path or extension.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Get the number of MIME types in the current guess.
-    pub fn count(&self) -> usize {
-        self.0.len()
-    }
-
-    /// Get the first guessed `Mime`, if applicable.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first(&self) -> Option<Mime> {
-        self.first_raw().map(expect_mime)
-    }
-
-    /// Get the first guessed Media Type as a string, if applicable.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_raw(&self) -> Option<&'static str> {
-        self.0.get(0).cloned()
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return
-    /// [`application/octet-stream`] instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    ///
-    /// ### Note: HTTP Applications
-    /// For HTTP request and response bodies if a value for the `Content-Type` header
-    /// cannot be determined it might be preferable to not send one at all instead of defaulting to
-    /// `application/octet-stream` as the recipient will expect to infer the format directly from
-    /// the content instead. ([RFC 7231, Section 3.1.1.5][rfc7231])
-    ///
-    /// On the contrary, for `multipart/form-data` bodies, the `Content-Type` of a form-data part is
-    /// assumed to be `text/plain` unless specified so a default of `application/octet-stream`
-    /// for non-text parts is safer. ([RFC 7578, Section 4.4][rfc7578])
-    ///
-    /// [`application/octet-stream`]: https://docs.rs/mime/0.3/mime/constant.APPLICATION_OCTET_STREAM.html
-    /// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-    /// [rfc7578]: https://tools.ietf.org/html/rfc7578#section-4.4
-    pub fn first_or_octet_stream(&self) -> Mime {
-        self.first_or(mime::APPLICATION_OCTET_STREAM)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return
-    /// [`text/plain`](::mime::TEXT_PLAIN) instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or_text_plain(&self) -> Mime {
-        self.first_or(mime::TEXT_PLAIN)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, return the given `Mime` instead.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or(&self, default: Mime) -> Mime {
-        self.first().unwrap_or(default)
-    }
-
-    /// Get the first guessed `Mime`, or if the guess is empty, execute the closure and return its
-    /// result.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn first_or_else<F>(&self, default_fn: F) -> Mime
-    where
-        F: FnOnce() -> Mime,
-    {
-        self.first().unwrap_or_else(default_fn)
-    }
-
-    /// Get an iterator over the `Mime` values contained in this guess.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn iter(&self) -> Iter {
-        Iter(self.iter_raw().map(expect_mime))
-    }
-
-    /// Get an iterator over the raw media-type strings in this guess.
-    ///
-    /// See [Note: Ordering](#note-ordering) above.
-    pub fn iter_raw(&self) -> IterRaw {
-        IterRaw(self.0.iter().cloned())
-    }
-}
-
-impl IntoIterator for MimeGuess {
-    type Item = Mime;
-    type IntoIter = Iter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-impl<'a> IntoIterator for &'a MimeGuess {
-    type Item = Mime;
-    type IntoIter = Iter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-/// An iterator over the `Mime` types of a `MimeGuess`.
-///
-/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
-#[derive(Clone, Debug)]
-pub struct Iter(iter::Map<IterRaw, fn(&'static str) -> Mime>);
-
-impl Iterator for Iter {
-    type Item = Mime;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.0.size_hint()
-    }
-}
-
-impl DoubleEndedIterator for Iter {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.0.next_back()
-    }
-}
-
-impl FusedIterator for Iter {}
-
-impl ExactSizeIterator for Iter {
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-}
-
-/// An iterator over the raw media type strings of a `MimeGuess`.
-///
-/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
-#[derive(Clone, Debug)]
-pub struct IterRaw(iter::Cloned<slice::Iter<'static, &'static str>>);
-
-impl Iterator for IterRaw {
-    type Item = &'static str;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.0.size_hint()
-    }
-}
-
-impl DoubleEndedIterator for IterRaw {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.0.next_back()
-    }
-}
-
-impl FusedIterator for IterRaw {}
-
-impl ExactSizeIterator for IterRaw {
-    fn len(&self) -> usize {
-        self.0.len()
-    }
-}
-
-fn expect_mime(s: &str) -> Mime {
-    // `.parse()` should be checked at compile time to never fail
-    s.parse()
-        .unwrap_or_else(|e| panic!("failed to parse media-type {:?}: {}", s, e))
-}
-
-/// Wrapper of [`MimeGuess::from_ext()`](struct.MimeGuess.html#method.from_ext).
-pub fn from_ext(ext: &str) -> MimeGuess {
-    MimeGuess::from_ext(ext)
-}
-
-/// Wrapper of [`MimeGuess::from_path()`](struct.MimeGuess.html#method.from_path).
-pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
-    MimeGuess::from_path(path)
-}
-
-/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then the MIME type is assumed to be `application/octet-stream`.
-///
-/// ## Note
-/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
-/// that `path` points to match the MIME type associated with the path's extension.
-///
-/// Take care when processing files with assumptions based on the return value of this function.
-///
-/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
-/// header at all instead of defaulting to `application/octet-stream`.
-///
-/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-#[deprecated(
-    since = "2.0.0",
-    note = "Use `from_path(path).first_or_octet_stream()` instead"
-)]
-pub fn guess_mime_type<P: AsRef<Path>>(path: P) -> Mime {
-    from_path(path).first_or_octet_stream()
-}
-
-/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then `None` is returned.
-///
-#[deprecated(since = "2.0.0", note = "Use `from_path(path).first()` instead")]
-pub fn guess_mime_type_opt<P: AsRef<Path>>(path: P) -> Option<Mime> {
-    from_path(path).first()
-}
-
-/// Guess the MIME type string of `path` by its extension (as defined by `Path::extension()`).
-///
-/// If `path` has no extension, or its extension has no known MIME type mapping,
-/// then `None` is returned.
-///
-/// ## Note
-/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
-/// that `path` points to match the MIME type associated with the path's extension.
-///
-/// Take care when processing files with assumptions based on the return value of this function.
-#[deprecated(since = "2.0.0", note = "Use `from_path(path).first_raw()` instead")]
-pub fn mime_str_for_path_ext<P: AsRef<Path>>(path: P) -> Option<&'static str> {
-    from_path(path).first_raw()
-}
-
-/// Get the MIME type associated with a file extension.
-///
-/// If there is no association for the extension, or `ext` is empty,
-/// `application/octet-stream` is returned.
-///
-/// ## Note
-/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
-/// header at all instead of defaulting to `application/octet-stream`.
-///
-/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-#[deprecated(
-    since = "2.0.0",
-    note = "use `from_ext(search_ext).first_or_octet_stream()` instead"
-)]
-pub fn get_mime_type(search_ext: &str) -> Mime {
-    from_ext(search_ext).first_or_octet_stream()
-}
-
-/// Get the MIME type associated with a file extension.
-///
-/// If there is no association for the extension, or `ext` is empty,
-/// `None` is returned.
-#[deprecated(since = "2.0.0", note = "use `from_ext(search_ext).first()` instead")]
-pub fn get_mime_type_opt(search_ext: &str) -> Option<Mime> {
-    from_ext(search_ext).first()
-}
-
-/// Get the MIME type string associated with a file extension. Case-insensitive.
-///
-/// If `search_ext` is not already lowercase,
-/// it will be converted to lowercase to facilitate the search.
-///
-/// Returns `None` if `search_ext` is empty or an associated extension was not found.
-#[deprecated(
-    since = "2.0.0",
-    note = "use `from_ext(search_ext).first_raw()` instead"
-)]
-pub fn get_mime_type_str(search_ext: &str) -> Option<&'static str> {
-    from_ext(search_ext).first_raw()
-}
-
-/// Get a list of known extensions for a given `Mime`.
-///
-/// Ignores parameters (only searches with `<main type>/<subtype>`). Case-insensitive (for extension types).
-///
-/// Returns `None` if the MIME type is unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-#[cfg(feature = "rev-mappings")]
-pub fn get_mime_extensions(mime: &Mime) -> Option<&'static [&'static str]> {
-    get_extensions(mime.type_().as_ref(), mime.subtype().as_ref())
-}
-
-/// Get a list of known extensions for a MIME type string.
-///
-/// Ignores parameters (only searches `<main type>/<subtype>`). Case-insensitive.
-///
-/// Returns `None` if the MIME type is unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-///
-/// ### Panics
-/// If `mime_str` is not a valid MIME type specifier (naive).
-#[cfg(feature = "rev-mappings")]
-pub fn get_mime_extensions_str(mut mime_str: &str) -> Option<&'static [&'static str]> {
-    mime_str = mime_str.trim();
-
-    if let Some(sep_idx) = mime_str.find(';') {
-        mime_str = &mime_str[..sep_idx];
-    }
-
-    let (top, sub) = {
-        let split_idx = mime_str.find('/')?;
-        (&mime_str[..split_idx], &mime_str[split_idx + 1..])
-    };
-
-    get_extensions(top, sub)
-}
-
-/// Get the extensions for a given top-level and sub-level of a MIME type
-/// (`{toplevel}/{sublevel}`).
-///
-/// Returns `None` if `toplevel` or `sublevel` are unknown.
-///
-/// ### Wildcards
-/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
-///
-/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
-#[cfg(feature = "rev-mappings")]
-pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
-    impl_::get_extensions(toplevel, sublevel)
-}
-
-/// Get the MIME type for `application/octet-stream` (generic binary stream)
-#[deprecated(since = "2.0.0", note = "use `mime::APPLICATION_OCTET_STREAM` instead")]
-pub fn octet_stream() -> Mime {
-    "application/octet-stream".parse().unwrap()
-}
-
-#[cfg(test)]
-mod tests {
-    include!("mime_types.rs");
-
-    use super::{expect_mime, from_ext, from_path, get_mime_extensions_str};
-    #[allow(deprecated, unused_imports)]
-    use std::ascii::AsciiExt;
-
-    use std::fmt::Debug;
-    use std::path::Path;
-
-    #[test]
-    fn check_type_bounds() {
-        fn assert_type_bounds<T: Clone + Debug + Send + Sync + 'static>() {}
-
-        assert_type_bounds::<super::MimeGuess>();
-        assert_type_bounds::<super::Iter>();
-        assert_type_bounds::<super::IterRaw>();
-    }
-
-    #[test]
-    fn test_mime_type_guessing() {
-        assert_eq!(
-            from_ext("gif").first_or_octet_stream().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_ext("TXT").first_or_octet_stream().to_string(),
-            "text/plain".to_string()
-        );
-        assert_eq!(
-            from_ext("blahblah").first_or_octet_stream().to_string(),
-            "application/octet-stream".to_string()
-        );
-
-        assert_eq!(
-            from_path(Path::new("/path/to/file.gif"))
-                .first_or_octet_stream()
-                .to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_path("/path/to/file.gif")
-                .first_or_octet_stream()
-                .to_string(),
-            "image/gif".to_string()
-        );
-    }
-
-    #[test]
-    fn test_mime_type_guessing_opt() {
-        assert_eq!(
-            from_ext("gif").first().unwrap().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(
-            from_ext("TXT").first().unwrap().to_string(),
-            "text/plain".to_string()
-        );
-        assert_eq!(from_ext("blahblah").first(), None);
-
-        assert_eq!(
-            from_path("/path/to/file.gif").first().unwrap().to_string(),
-            "image/gif".to_string()
-        );
-        assert_eq!(from_path("/path/to/file").first(), None);
-    }
-
-    #[test]
-    fn test_are_mime_types_parseable() {
-        for (_, mimes) in MIME_TYPES {
-            mimes.iter().for_each(|s| {
-                expect_mime(s);
-            });
-        }
-    }
-
-    // RFC: Is this test necessary anymore? --@cybergeek94, 2/1/2016
-    #[test]
-    fn test_are_extensions_ascii() {
-        for (ext, _) in MIME_TYPES {
-            assert!(ext.is_ascii(), "Extension not ASCII: {:?}", ext);
-        }
-    }
-
-    #[test]
-    fn test_are_extensions_sorted() {
-        // simultaneously checks the requirement that duplicate extension entries are adjacent
-        for (&(ext, _), &(n_ext, _)) in MIME_TYPES.iter().zip(MIME_TYPES.iter().skip(1)) {
-            assert!(
-                ext <= n_ext,
-                "Extensions in src/mime_types should be sorted lexicographically
-                in ascending order. Failed assert: {:?} <= {:?}",
-                ext,
-                n_ext
-            );
-        }
-    }
-
-    #[test]
-    fn test_get_mime_extensions_str_no_panic_if_bad_mime() {
-        assert_eq!(get_mime_extensions_str(""), None);
-    }
-}
+//! Guessing of MIME types by file extension.
+//!
+//! Uses a static list of file-extension : MIME type mappings.
+//!
+//! ```
+//! # extern crate mime;
+//! // the file doesn't have to exist, it just looks at the path
+//! let guess = mime_guess::from_path("some_file.gif");
+//! assert_eq!(guess.first(), Some(mime::IMAGE_GIF));
+//!
+//! ```
+//!
+//! #### Note: MIME Types Returned Are Not Stable/Guaranteed
+//! The media types returned for a given extension are not considered to be part of the crate's
+//! stable API and are often updated in patch <br /> (`x.y.[z + 1]`) releases to be as correct as
+//! possible.
+//!
+//! Additionally, only the extensions of paths/filenames are inspected in order to guess the MIME
+//! type. The file that may or may not reside at that path may or may not be a valid file of the
+//! returned MIME type.  Be wary of unsafe or un-validated assumptions about file structure or
+//! length.
+pub extern crate mime;
+extern crate unicase;
+
+pub use mime::Mime;
+
+use std::ffi::OsStr;
+use std::iter::FusedIterator;
+use std::path::Path;
+use std::{iter, slice};
+
+#[cfg(feature = "phf")]
+#[path = "impl_phf.rs"]
+mod impl_;
+
+#[cfg(not(feature = "phf"))]
+#[path = "impl_bin_search.rs"]
+mod impl_;
+
+/// A "guess" of the MIME/Media Type(s) of an extension or path as one or more
+/// [`Mime`](struct.Mime.html) instances.
+///
+/// ### Note: Ordering
+/// A given file format may have one or more applicable Media Types; in this case
+/// the first Media Type returned is whatever is declared in the latest IETF RFC for the
+/// presumed file format or the one that explicitly supercedes all others.
+/// Ordering of additional Media Types is arbitrary.
+///
+/// ### Note: Values Not Stable
+/// The exact Media Types returned in any given guess are not considered to be stable and are often
+/// updated in patch releases in order to reflect the most up-to-date information possible.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+// FIXME: change repr when `mime` gains macro/const fn constructor
+pub struct MimeGuess(&'static [&'static str]);
+
+impl MimeGuess {
+    /// Guess the MIME type of a file (real or otherwise) with the given extension.
+    ///
+    /// The search is case-insensitive.
+    ///
+    /// If `ext` is empty or has no (currently) known MIME type mapping, then an empty guess is
+    /// returned.
+    pub fn from_ext(ext: &str) -> MimeGuess {
+        if ext.is_empty() {
+            return MimeGuess(&[]);
+        }
+
+        impl_::get_mime_types(ext).map_or(MimeGuess(&[]), |v| MimeGuess(v))
+    }
+
+    /// Guess the MIME type of `path` by its extension (as defined by
+    /// [`Path::extension()`]). **No disk access is performed.**
+    ///
+    /// If `path` has no extension, the extension cannot be converted to `str`, or has
+    /// no known MIME type mapping, then an empty guess is returned.
+    ///
+    /// The search is case-insensitive.
+    ///
+    /// ## Note
+    /// **Guess** is the operative word here, as there are no guarantees that the contents of the
+    /// file that `path` points to match the MIME type associated with the path's extension.
+    ///
+    /// Take care when processing files with assumptions based on the return value of this function.
+    ///
+    /// [`Path::extension()`]: https://doc.rust-lang.org/std/path/struct.Path.html#method.extension
+    pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
+        path.as_ref()
+            .extension()
+            .and_then(OsStr::to_str)
+            .map_or(MimeGuess(&[]), Self::from_ext)
+    }
+
+    /// `true` if the guess did not return any known mappings for the given path or extension.
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Get the number of MIME types in the current guess.
+    pub fn count(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Get the first guessed `Mime`, if applicable.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn first(&self) -> Option<Mime> {
+        self.first_raw().map(expect_mime)
+    }
+
+    /// Get the first guessed Media Type as a string, if applicable.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn first_raw(&self) -> Option<&'static str> {
+        self.0.get(0).cloned()
+    }
+
+    /// Get the first guessed `Mime`, or if the guess is empty, return
+    /// [`application/octet-stream`] instead.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    ///
+    /// ### Note: HTTP Applications
+    /// For HTTP request and response bodies if a value for the `Content-Type` header
+    /// cannot be determined it might be preferable to not send one at all instead of defaulting to
+    /// `application/octet-stream` as the recipient will expect to infer the format directly from
+    /// the content instead. ([RFC 7231, Section 3.1.1.5][rfc7231])
+    ///
+    /// On the contrary, for `multipart/form-data` bodies, the `Content-Type` of a form-data part is
+    /// assumed to be `text/plain` unless specified so a default of `application/octet-stream`
+    /// for non-text parts is safer. ([RFC 7578, Section 4.4][rfc7578])
+    ///
+    /// [`application/octet-stream`]: https://docs.rs/mime/0.3/mime/constant.APPLICATION_OCTET_STREAM.html
+    /// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
+    /// [rfc7578]: https://tools.ietf.org/html/rfc7578#section-4.4
+    pub fn first_or_octet_stream(&self) -> Mime {
+        self.first_or(mime::APPLICATION_OCTET_STREAM)
+    }
+
+    /// Get the first guessed `Mime`, or if the guess is empty, return
+    /// [`text/plain`](::mime::TEXT_PLAIN) instead.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn first_or_text_plain(&self) -> Mime {
+        self.first_or(mime::TEXT_PLAIN)
+    }
+
+    /// Get the first guessed `Mime`, or if the guess is empty, return the given `Mime` instead.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn first_or(&self, default: Mime) -> Mime {
+        self.first().unwrap_or(default)
+    }
+
+    /// Get the first guessed `Mime`, or if the guess is empty, execute the closure and return its
+    /// result.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn first_or_else<F>(&self, default_fn: F) -> Mime
+    where
+        F: FnOnce() -> Mime,
+    {
+        self.first().unwrap_or_else(default_fn)
+    }
+
+    /// Get an iterator over the `Mime` values contained in this guess.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn iter(&self) -> Iter {
+        Iter(self.iter_raw().map(expect_mime))
+    }
+
+    /// Get an iterator over the raw media-type strings in this guess.
+    ///
+    /// See [Note: Ordering](#note-ordering) above.
+    pub fn iter_raw(&self) -> IterRaw {
+        IterRaw(self.0.iter().cloned())
+    }
+}
+
+impl IntoIterator for MimeGuess {
+    type Item = Mime;
+    type IntoIter = Iter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a> IntoIterator for &'a MimeGuess {
+    type Item = Mime;
+    type IntoIter = Iter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+/// An iterator over the `Mime` types of a `MimeGuess`.
+///
+/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
+#[derive(Clone, Debug)]
+pub struct Iter(iter::Map<IterRaw, fn(&'static str) -> Mime>);
+
+impl Iterator for Iter {
+    type Item = Mime;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl DoubleEndedIterator for Iter {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.0.next_back()
+    }
+}
+
+impl FusedIterator for Iter {}
+
+impl ExactSizeIterator for Iter {
+    fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+/// An iterator over the raw media type strings of a `MimeGuess`.
+///
+/// See [Note: Ordering on `MimeGuess`](struct.MimeGuess.html#note-ordering).
+#[derive(Clone, Debug)]
+pub struct IterRaw(iter::Cloned<slice::Iter<'static, &'static str>>);
+
+impl Iterator for IterRaw {
+    type Item = &'static str;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl DoubleEndedIterator for IterRaw {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.0.next_back()
+    }
+}
+
+impl FusedIterator for IterRaw {}
+
+impl ExactSizeIterator for IterRaw {
+    fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+fn expect_mime(s: &str) -> Mime {
+    // `.parse()` should be checked at compile time to never fail
+    s.parse()
+        .unwrap_or_else(|e| panic!("failed to parse media-type {:?}: {}", s, e))
+}
+
+/// Wrapper of [`MimeGuess::from_ext()`](struct.MimeGuess.html#method.from_ext).
+pub fn from_ext(ext: &str) -> MimeGuess {
+    MimeGuess::from_ext(ext)
+}
+
+/// Wrapper of [`MimeGuess::from_path()`](struct.MimeGuess.html#method.from_path).
+pub fn from_path<P: AsRef<Path>>(path: P) -> MimeGuess {
+    MimeGuess::from_path(path)
+}
+
+/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
+///
+/// If `path` has no extension, or its extension has no known MIME type mapping,
+/// then the MIME type is assumed to be `application/octet-stream`.
+///
+/// ## Note
+/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
+/// that `path` points to match the MIME type associated with the path's extension.
+///
+/// Take care when processing files with assumptions based on the return value of this function.
+///
+/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
+/// header at all instead of defaulting to `application/octet-stream`.
+///
+/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
+#[deprecated(
+    since = "2.0.0",
+    note = "Use `from_path(path).first_or_octet_stream()` instead"
+)]
+pub fn guess_mime_type<P: AsRef<Path>>(path: P) -> Mime {
+    from_path(path).first_or_octet_stream()
+}
+
+/// Guess the MIME type of `path` by its extension (as defined by `Path::extension()`).
+///
+/// If `path` has no extension, or its extension has no known MIME type mapping,
+/// then `None` is returned.
+///
+#[deprecated(since = "2.0.0", note = "Use `from_path(path).first()` instead")]
+pub fn guess_mime_type_opt<P: AsRef<Path>>(path: P) -> Option<Mime> {
+    from_path(path).first()
+}
+
+/// Guess the MIME type string of `path` by its extension (as defined by `Path::extension()`).
+///
+/// If `path` has no extension, or its extension has no known MIME type mapping,
+/// then `None` is returned.
+///
+/// ## Note
+/// **Guess** is the operative word here, as there are no guarantees that the contents of the file
+/// that `path` points to match the MIME type associated with the path's extension.
+///
+/// Take care when processing files with assumptions based on the return value of this function.
+#[deprecated(since = "2.0.0", note = "Use `from_path(path).first_raw()` instead")]
+pub fn mime_str_for_path_ext<P: AsRef<Path>>(path: P) -> Option<&'static str> {
+    from_path(path).first_raw()
+}
+
+/// Get the MIME type associated with a file extension.
+///
+/// If there is no association for the extension, or `ext` is empty,
+/// `application/octet-stream` is returned.
+///
+/// ## Note
+/// In HTTP applications, it might be [preferable][rfc7231] to not send a `Content-Type`
+/// header at all instead of defaulting to `application/octet-stream`.
+///
+/// [rfc7231]: https://tools.ietf.org/html/rfc7231#section-3.1.1.5
+#[deprecated(
+    since = "2.0.0",
+    note = "use `from_ext(search_ext).first_or_octet_stream()` instead"
+)]
+pub fn get_mime_type(search_ext: &str) -> Mime {
+    from_ext(search_ext).first_or_octet_stream()
+}
+
+/// Get the MIME type associated with a file extension.
+///
+/// If there is no association for the extension, or `ext` is empty,
+/// `None` is returned.
+#[deprecated(since = "2.0.0", note = "use `from_ext(search_ext).first()` instead")]
+pub fn get_mime_type_opt(search_ext: &str) -> Option<Mime> {
+    from_ext(search_ext).first()
+}
+
+/// Get the MIME type string associated with a file extension. Case-insensitive.
+///
+/// If `search_ext` is not already lowercase,
+/// it will be converted to lowercase to facilitate the search.
+///
+/// Returns `None` if `search_ext` is empty or an associated extension was not found.
+#[deprecated(
+    since = "2.0.0",
+    note = "use `from_ext(search_ext).first_raw()` instead"
+)]
+pub fn get_mime_type_str(search_ext: &str) -> Option<&'static str> {
+    from_ext(search_ext).first_raw()
+}
+
+/// Get a list of known extensions for a given `Mime`.
+///
+/// Ignores parameters (only searches with `<main type>/<subtype>`). Case-insensitive (for extension types).
+///
+/// Returns `None` if the MIME type is unknown.
+///
+/// ### Wildcards
+/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
+///
+/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
+#[cfg(feature = "rev-mappings")]
+pub fn get_mime_extensions(mime: &Mime) -> Option<&'static [&'static str]> {
+    get_extensions(mime.type_().as_ref(), mime.subtype().as_ref())
+}
+
+/// Get a list of known extensions for a MIME type string.
+///
+/// Ignores parameters (only searches `<main type>/<subtype>`). Case-insensitive.
+///
+/// Returns `None` if the MIME type is unknown.
+///
+/// ### Wildcards
+/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
+///
+/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
+///
+/// ### Panics
+/// If `mime_str` is not a valid MIME type specifier (naive).
+#[cfg(feature = "rev-mappings")]
+pub fn get_mime_extensions_str(mut mime_str: &str) -> Option<&'static [&'static str]> {
+    mime_str = mime_str.trim();
+
+    if let Some(sep_idx) = mime_str.find(';') {
+        mime_str = &mime_str[..sep_idx];
+    }
+
+    let (top, sub) = {
+        let split_idx = mime_str.find('/')?;
+        (&mime_str[..split_idx], &mime_str[split_idx + 1..])
+    };
+
+    get_extensions(top, sub)
+}
+
+/// Get the extensions for a given top-level and sub-level of a MIME type
+/// (`{toplevel}/{sublevel}`).
+///
+/// Returns `None` if `toplevel` or `sublevel` are unknown.
+///
+/// ### Wildcards
+/// If the top-level of the MIME type is a wildcard (`*`), returns all extensions.
+///
+/// If the sub-level of the MIME type is a wildcard, returns all extensions for the top-level.
+#[cfg(feature = "rev-mappings")]
+pub fn get_extensions(toplevel: &str, sublevel: &str) -> Option<&'static [&'static str]> {
+    impl_::get_extensions(toplevel, sublevel)
+}
+
+/// Get the MIME type for `application/octet-stream` (generic binary stream)
+#[deprecated(since = "2.0.0", note = "use `mime::APPLICATION_OCTET_STREAM` instead")]
+pub fn octet_stream() -> Mime {
+    "application/octet-stream".parse().unwrap()
+}
+
+#[cfg(test)]
+mod tests {
+    include!("mime_types.rs");
+
+    use super::{expect_mime, from_ext, from_path, get_mime_extensions_str};
+    #[allow(deprecated, unused_imports)]
+    use std::ascii::AsciiExt;
+
+    use std::fmt::Debug;
+    use std::path::Path;
+
+    #[test]
+    fn check_type_bounds() {
+        fn assert_type_bounds<T: Clone + Debug + Send + Sync + 'static>() {}
+
+        assert_type_bounds::<super::MimeGuess>();
+        assert_type_bounds::<super::Iter>();
+        assert_type_bounds::<super::IterRaw>();
+    }
+
+    #[test]
+    fn test_mime_type_guessing() {
+        assert_eq!(
+            from_ext("gif").first_or_octet_stream().to_string(),
+            "image/gif".to_string()
+        );
+        assert_eq!(
+            from_ext("TXT").first_or_octet_stream().to_string(),
+            "text/plain".to_string()
+        );
+        assert_eq!(
+            from_ext("blahblah").first_or_octet_stream().to_string(),
+            "application/octet-stream".to_string()
+        );
+
+        assert_eq!(
+            from_path(Path::new("/path/to/file.gif"))
+                .first_or_octet_stream()
+                .to_string(),
+            "image/gif".to_string()
+        );
+        assert_eq!(
+            from_path("/path/to/file.gif")
+                .first_or_octet_stream()
+                .to_string(),
+            "image/gif".to_string()
+        );
+    }
+
+    #[test]
+    fn test_mime_type_guessing_opt() {
+        assert_eq!(
+            from_ext("gif").first().unwrap().to_string(),
+            "image/gif".to_string()
+        );
+        assert_eq!(
+            from_ext("TXT").first().unwrap().to_string(),
+            "text/plain".to_string()
+        );
+        assert_eq!(from_ext("blahblah").first(), None);
+
+        assert_eq!(
+            from_path("/path/to/file.gif").first().unwrap().to_string(),
+            "image/gif".to_string()
+        );
+        assert_eq!(from_path("/path/to/file").first(), None);
+    }
+
+    #[test]
+    fn test_are_mime_types_parseable() {
+        for (_, mimes) in MIME_TYPES {
+            mimes.iter().for_each(|s| {
+                expect_mime(s);
+            });
+        }
+    }
+
+    // RFC: Is this test necessary anymore? --@cybergeek94, 2/1/2016
+    #[test]
+    fn test_are_extensions_ascii() {
+        for (ext, _) in MIME_TYPES {
+            assert!(ext.is_ascii(), "Extension not ASCII: {:?}", ext);
+        }
+    }
+
+    #[test]
+    fn test_are_extensions_sorted() {
+        // simultaneously checks the requirement that duplicate extension entries are adjacent
+        for (&(ext, _), &(n_ext, _)) in MIME_TYPES.iter().zip(MIME_TYPES.iter().skip(1)) {
+            assert!(
+                ext <= n_ext,
+                "Extensions in src/mime_types should be sorted lexicographically
+                in ascending order. Failed assert: {:?} <= {:?}",
+                ext,
+                n_ext
+            );
+        }
+    }
+
+    #[test]
+    fn test_get_mime_extensions_str_no_panic_if_bad_mime() {
+        assert_eq!(get_mime_extensions_str(""), None);
+    }
+}
diff --git a/third_party/rust/mime_guess/src/mime_types.rs b/third_party/rust/mime_guess/src/mime_types.rs
index 13c91b7bee77a..e49d76474645b 100644
--- a/third_party/rust/mime_guess/src/mime_types.rs
+++ b/third_party/rust/mime_guess/src/mime_types.rs
@@ -1,1499 +1,1534 @@
-/// A mapping of known file extensions and their MIME types.
-///
-/// Required to be sorted lexicographically by extension for ease of maintenance.
-///
-/// Multiple MIME types per extension are supported; the order is arbitrary but the first should be
-/// the most prevalent by most recent RFC declaration or explicit succession of other media types.
-///
-/// NOTE: when adding or modifying entries, please include a citation in the commit message.
-/// If a media type for an extension changed by official IETF RFC, please keep the old entry but add
-/// the new one before it in the slice literal, e.g.:
-///
-/// ```ignore
-/// - ("md", &["text/x-markdown"]),
-/// + ("md", &["text/markdown", "text/x-markdown"]),
-/// ```
-///
-/// Sourced from:
-/// https://github.com/samuelneff/MimeTypeMap/blob/master/src/MimeTypes/MimeTypeMap.cs
-/// https://github.com/jshttp/mime-db extracted with https://gist.github.com/soyuka/b7e29d359b2c14c21bdead923c01cc81
-pub static MIME_TYPES: &[(&str, &[&str])] = &[
-    ("123", &["application/vnd.lotus-1-2-3"]),
-    ("323", &["text/h323"]),
-    ("3dml", &["text/vnd.in3d.3dml"]),
-    ("3ds", &["image/x-3ds"]),
-    ("3g2", &["video/3gpp2"]),
-    ("3gp", &["video/3gpp"]),
-    ("3gp2", &["video/3gpp2"]),
-    ("3gpp", &["video/3gpp"]),
-    ("7z", &["application/x-7z-compressed"]),
-    ("aa", &["audio/audible"]),
-    ("aab", &["application/x-authorware-bin"]),
-    ("aac", &["audio/aac"]),
-    ("aaf", &["application/octet-stream"]),
-    ("aam", &["application/x-authorware-map"]),
-    ("aas", &["application/x-authorware-seg"]),
-    ("aax", &["audio/vnd.audible.aax"]),
-    ("abw", &["application/x-abiword"]),
-    ("ac", &["application/pkix-attr-cert"]),
-    ("ac3", &["audio/ac3"]),
-    ("aca", &["application/octet-stream"]),
-    ("acc", &["application/vnd.americandynamics.acc"]),
-    ("accda", &["application/msaccess.addin"]),
-    ("accdb", &["application/msaccess"]),
-    ("accdc", &["application/msaccess.cab"]),
-    ("accde", &["application/msaccess"]),
-    ("accdr", &["application/msaccess.runtime"]),
-    ("accdt", &["application/msaccess"]),
-    ("accdw", &["application/msaccess.webapplication"]),
-    ("accft", &["application/msaccess.ftemplate"]),
-    ("ace", &["application/x-ace-compressed"]),
-    ("acu", &["application/vnd.acucobol"]),
-    ("acutc", &["application/vnd.acucorp"]),
-    ("acx", &["application/internet-property-stream"]),
-    ("addin", &["text/xml"]),
-    ("ade", &["application/msaccess"]),
-    ("adobebridge", &["application/x-bridge-url"]),
-    ("adp", &["application/msaccess"]),
-    ("adt", &["audio/vnd.dlna.adts"]),
-    ("adts", &["audio/aac"]),
-    ("aep", &["application/vnd.audiograph"]),
-    ("afm", &["application/octet-stream"]),
-    ("afp", &["application/vnd.ibm.modcap"]),
-    ("ahead", &["application/vnd.ahead.space"]),
-    ("ai", &["application/postscript"]),
-    ("aif", &["audio/aiff"]),
-    ("aifc", &["audio/aiff"]),
-    ("aiff", &["audio/aiff"]),
-    (
-        "air",
-        &["application/vnd.adobe.air-application-installer-package+zip"],
-    ),
-    ("ait", &["application/vnd.dvb.ait"]),
-    ("amc", &["application/mpeg"]),
-    ("ami", &["application/vnd.amiga.ami"]),
-    ("anx", &["application/annodex"]),
-    ("apk", &["application/vnd.android.package-archive"]),
-    ("apng", &["image/apng"]),
-    ("appcache", &["text/cache-manifest"]),
-    ("application", &["application/x-ms-application"]),
-    ("apr", &["application/vnd.lotus-approach"]),
-    ("arc", &["application/x-freearc"]),
-    ("arj", &["application/x-arj"]),
-    ("art", &["image/x-jg"]),
-    ("asa", &["application/xml"]),
-    ("asax", &["application/xml"]),
-    ("asc", &["application/pgp-signature"]),
-    ("ascx", &["application/xml"]),
-    ("asd", &["application/octet-stream"]),
-    ("asf", &["video/x-ms-asf"]),
-    ("ashx", &["application/xml"]),
-    ("asi", &["application/octet-stream"]),
-    ("asm", &["text/plain"]),
-    ("asmx", &["application/xml"]),
-    ("aso", &["application/vnd.accpac.simply.aso"]),
-    ("aspx", &["application/xml"]),
-    ("asr", &["video/x-ms-asf"]),
-    ("asx", &["video/x-ms-asf"]),
-    ("atc", &["application/vnd.acucorp"]),
-    ("atom", &["application/atom+xml"]),
-    ("atomcat", &["application/atomcat+xml"]),
-    ("atomsvc", &["application/atomsvc+xml"]),
-    ("atx", &["application/vnd.antix.game-component"]),
-    ("au", &["audio/basic"]),
-    ("avi", &["video/x-msvideo"]),
-    ("avif", &["image/avif"]),
-    ("aw", &["application/applixware"]),
-    ("axa", &["audio/annodex"]),
-    ("axs", &["application/olescript"]),
-    ("axv", &["video/annodex"]),
-    ("azf", &["application/vnd.airzip.filesecure.azf"]),
-    ("azs", &["application/vnd.airzip.filesecure.azs"]),
-    ("azw", &["application/vnd.amazon.ebook"]),
-    ("bas", &["text/plain"]),
-    ("bat", &["application/x-msdownload"]),
-    ("bcpio", &["application/x-bcpio"]),
-    ("bdf", &["application/x-font-bdf"]),
-    ("bdm", &["application/vnd.syncml.dm+wbxml"]),
-    ("bdoc", &["application/bdoc"]),
-    ("bed", &["application/vnd.realvnc.bed"]),
-    ("bh2", &["application/vnd.fujitsu.oasysprs"]),
-    ("bin", &["application/octet-stream"]),
-    ("blb", &["application/x-blorb"]),
-    ("blorb", &["application/x-blorb"]),
-    ("bmi", &["application/vnd.bmi"]),
-    ("bmp", &["image/bmp"]),
-    ("book", &["application/vnd.framemaker"]),
-    ("box", &["application/vnd.previewsystems.box"]),
-    ("boz", &["application/x-bzip2"]),
-    ("bpk", &["application/octet-stream"]),
-    ("btif", &["image/prs.btif"]),
-    ("buffer", &["application/octet-stream"]),
-    ("bz", &["application/x-bzip"]),
-    ("bz2", &["application/x-bzip2"]),
-    ("c", &["text/plain"]),
-    ("c11amc", &["application/vnd.cluetrust.cartomobile-config"]),
-    (
-        "c11amz",
-        &["application/vnd.cluetrust.cartomobile-config-pkg"],
-    ),
-    ("c4d", &["application/vnd.clonk.c4group"]),
-    ("c4f", &["application/vnd.clonk.c4group"]),
-    ("c4g", &["application/vnd.clonk.c4group"]),
-    ("c4p", &["application/vnd.clonk.c4group"]),
-    ("c4u", &["application/vnd.clonk.c4group"]),
-    ("cab", &["application/octet-stream"]),
-    ("caf", &["audio/x-caf"]),
-    ("calx", &["application/vnd.ms-office.calx"]),
-    ("cap", &["application/vnd.tcpdump.pcap"]),
-    ("car", &["application/vnd.curl.car"]),
-    ("cat", &["application/vnd.ms-pki.seccat"]),
-    ("cb7", &["application/x-cbr"]),
-    ("cba", &["application/x-cbr"]),
-    ("cbr", &["application/x-cbr"]),
-    ("cbt", &["application/x-cbr"]),
-    ("cbz", &["application/x-cbr"]),
-    ("cc", &["text/plain"]),
-    ("cco", &["application/x-cocoa"]),
-    ("cct", &["application/x-director"]),
-    ("ccxml", &["application/ccxml+xml"]),
-    ("cd", &["text/plain"]),
-    ("cdbcmsg", &["application/vnd.contact.cmsg"]),
-    ("cdda", &["audio/aiff"]),
-    ("cdf", &["application/x-cdf"]),
-    ("cdkey", &["application/vnd.mediastation.cdkey"]),
-    ("cdmia", &["application/cdmi-capability"]),
-    ("cdmic", &["application/cdmi-container"]),
-    ("cdmid", &["application/cdmi-domain"]),
-    ("cdmio", &["application/cdmi-object"]),
-    ("cdmiq", &["application/cdmi-queue"]),
-    ("cdx", &["chemical/x-cdx"]),
-    ("cdxml", &["application/vnd.chemdraw+xml"]),
-    ("cdy", &["application/vnd.cinderella"]),
-    ("cer", &["application/x-x509-ca-cert"]),
-    ("cfg", &["text/plain"]),
-    ("cfs", &["application/x-cfs-compressed"]),
-    ("cgm", &["image/cgm"]),
-    ("chat", &["application/x-chat"]),
-    ("chm", &["application/vnd.ms-htmlhelp"]),
-    ("chrt", &["application/vnd.kde.kchart"]),
-    ("cif", &["chemical/x-cif"]),
-    (
-        "cii",
-        &["application/vnd.anser-web-certificate-issue-initiation"],
-    ),
-    ("cil", &["application/vnd.ms-artgalry"]),
-    ("cla", &["application/vnd.claymore"]),
-    ("class", &["application/x-java-applet"]),
-    ("clkk", &["application/vnd.crick.clicker.keyboard"]),
-    ("clkp", &["application/vnd.crick.clicker.palette"]),
-    ("clkt", &["application/vnd.crick.clicker.template"]),
-    ("clkw", &["application/vnd.crick.clicker.wordbank"]),
-    ("clkx", &["application/vnd.crick.clicker"]),
-    ("clp", &["application/x-msclip"]),
-    ("cmc", &["application/vnd.cosmocaller"]),
-    ("cmd", &["text/plain"]),
-    ("cmdf", &["chemical/x-cmdf"]),
-    ("cml", &["chemical/x-cml"]),
-    ("cmp", &["application/vnd.yellowriver-custom-menu"]),
-    ("cmx", &["image/x-cmx"]),
-    ("cnf", &["text/plain"]),
-    ("cod", &["image/cis-cod"]),
-    ("coffee", &["text/coffeescript"]),
-    ("com", &["application/x-msdownload"]),
-    ("conf", &["text/plain"]),
-    ("config", &["application/xml"]),
-    ("contact", &["text/x-ms-contact"]),
-    ("coverage", &["application/xml"]),
-    ("cpio", &["application/x-cpio"]),
-    ("cpp", &["text/plain"]),
-    ("cpt", &["application/mac-compactpro"]),
-    ("crd", &["application/x-mscardfile"]),
-    ("crl", &["application/pkix-crl"]),
-    ("crt", &["application/x-x509-ca-cert"]),
-    ("crx", &["application/x-chrome-extension"]),
-    ("cryptonote", &["application/vnd.rig.cryptonote"]),
-    ("cs", &["text/plain"]),
-    ("csdproj", &["text/plain"]),
-    ("csh", &["application/x-csh"]),
-    ("csl", &["application/vnd.citationstyles.style+xml"]),
-    ("csml", &["chemical/x-csml"]),
-    ("csp", &["application/vnd.commonspace"]),
-    ("csproj", &["text/plain"]),
-    ("css", &["text/css"]),
-    ("cst", &["application/x-director"]),
-    ("csv", &["text/csv"]),
-    ("cu", &["application/cu-seeme"]),
-    ("cur", &["application/octet-stream"]),
-    ("curl", &["text/vnd.curl"]),
-    ("cww", &["application/prs.cww"]),
-    ("cxt", &["application/x-director"]),
-    ("cxx", &["text/plain"]),
-    ("dae", &["model/vnd.collada+xml"]),
-    ("daf", &["application/vnd.mobius.daf"]),
-    ("dart", &["application/vnd.dart"]),
-    ("dat", &["application/octet-stream"]),
-    ("dataless", &["application/vnd.fdsn.seed"]),
-    ("datasource", &["application/xml"]),
-    ("davmount", &["application/davmount+xml"]),
-    ("dbk", &["application/docbook+xml"]),
-    ("dbproj", &["text/plain"]),
-    ("dcr", &["application/x-director"]),
-    ("dcurl", &["text/vnd.curl.dcurl"]),
-    ("dd2", &["application/vnd.oma.dd2+xml"]),
-    ("ddd", &["application/vnd.fujixerox.ddd"]),
-    ("deb", &["application/octet-stream"]),
-    ("def", &["text/plain"]),
-    ("deploy", &["application/octet-stream"]),
-    ("der", &["application/x-x509-ca-cert"]),
-    ("dfac", &["application/vnd.dreamfactory"]),
-    ("dgc", &["application/x-dgc-compressed"]),
-    ("dgml", &["application/xml"]),
-    ("dib", &["image/bmp"]),
-    ("dic", &["text/x-c"]),
-    ("dif", &["video/x-dv"]),
-    ("dir", &["application/x-director"]),
-    ("dis", &["application/vnd.mobius.dis"]),
-    ("disco", &["text/xml"]),
-    (
-        "disposition-notification",
-        &["message/disposition-notification"],
-    ),
-    ("dist", &["application/octet-stream"]),
-    ("distz", &["application/octet-stream"]),
-    ("divx", &["video/divx"]),
-    ("djv", &["image/vnd.djvu"]),
-    ("djvu", &["image/vnd.djvu"]),
-    ("dll", &["application/x-msdownload"]),
-    ("dll.config", &["text/xml"]),
-    ("dlm", &["text/dlm"]),
-    ("dmg", &["application/octet-stream"]),
-    ("dmp", &["application/vnd.tcpdump.pcap"]),
-    ("dms", &["application/octet-stream"]),
-    ("dna", &["application/vnd.dna"]),
-    ("doc", &["application/msword"]),
-    (
-        "docm",
-        &["application/vnd.ms-word.document.macroEnabled.12"],
-    ),
-    (
-        "docx",
-        &["application/vnd.openxmlformats-officedocument.wordprocessingml.document"],
-    ),
-    ("dot", &["application/msword"]),
-    (
-        "dotm",
-        &["application/vnd.ms-word.template.macroEnabled.12"],
-    ),
-    (
-        "dotx",
-        &["application/vnd.openxmlformats-officedocument.wordprocessingml.template"],
-    ),
-    ("dp", &["application/vnd.osgi.dp"]),
-    ("dpg", &["application/vnd.dpgraph"]),
-    ("dra", &["audio/vnd.dra"]),
-    ("dsc", &["text/prs.lines.tag"]),
-    ("dsp", &["application/octet-stream"]),
-    ("dssc", &["application/dssc+der"]),
-    ("dsw", &["text/plain"]),
-    ("dtb", &["application/x-dtbook+xml"]),
-    ("dtd", &["text/xml"]),
-    ("dts", &["audio/vnd.dts"]),
-    ("dtsconfig", &["text/xml"]),
-    ("dtshd", &["audio/vnd.dts.hd"]),
-    ("dump", &["application/octet-stream"]),
-    ("dv", &["video/x-dv"]),
-    ("dvb", &["video/vnd.dvb.file"]),
-    ("dvi", &["application/x-dvi"]),
-    ("dwf", &["drawing/x-dwf"]),
-    ("dwg", &["application/acad"]),
-    ("dwp", &["application/octet-stream"]),
-    ("dxf", &["application/x-dxf"]),
-    ("dxp", &["application/vnd.spotfire.dxp"]),
-    ("dxr", &["application/x-director"]),
-    ("ear", &["application/java-archive"]),
-    ("ecelp4800", &["audio/vnd.nuera.ecelp4800"]),
-    ("ecelp7470", &["audio/vnd.nuera.ecelp7470"]),
-    ("ecelp9600", &["audio/vnd.nuera.ecelp9600"]),
-    ("ecma", &["application/ecmascript"]),
-    ("edm", &["application/vnd.novadigm.edm"]),
-    ("edx", &["application/vnd.novadigm.edx"]),
-    ("efif", &["application/vnd.picsel"]),
-    ("ei6", &["application/vnd.pg.osasli"]),
-    ("elc", &["application/octet-stream"]),
-    ("emf", &["application/x-msmetafile"]),
-    ("eml", &["message/rfc822"]),
-    ("emma", &["application/emma+xml"]),
-    ("emz", &["application/octet-stream"]),
-    ("eol", &["audio/vnd.digital-winds"]),
-    ("eot", &["application/vnd.ms-fontobject"]),
-    ("eps", &["application/postscript"]),
-    ("epub", &["application/epub+zip"]),
-    ("es", &["application/ecmascript"]),
-    ("es3", &["application/vnd.eszigno3+xml"]),
-    ("esa", &["application/vnd.osgi.subsystem"]),
-    ("esf", &["application/vnd.epson.esf"]),
-    ("et3", &["application/vnd.eszigno3+xml"]),
-    ("etl", &["application/etl"]),
-    ("etx", &["text/x-setext"]),
-    ("eva", &["application/x-eva"]),
-    ("evy", &["application/envoy"]),
-    ("exe", &["application/octet-stream"]),
-    ("exe.config", &["text/xml"]),
-    ("exi", &["application/exi"]),
-    ("ext", &["application/vnd.novadigm.ext"]),
-    ("ez", &["application/andrew-inset"]),
-    ("ez2", &["application/vnd.ezpix-album"]),
-    ("ez3", &["application/vnd.ezpix-package"]),
-    ("f", &["text/x-fortran"]),
-    ("f4v", &["video/x-f4v"]),
-    ("f77", &["text/x-fortran"]),
-    ("f90", &["text/x-fortran"]),
-    ("fbs", &["image/vnd.fastbidsheet"]),
-    ("fcdt", &["application/vnd.adobe.formscentral.fcdt"]),
-    ("fcs", &["application/vnd.isac.fcs"]),
-    ("fdf", &["application/vnd.fdf"]),
-    ("fe_launch", &["application/vnd.denovo.fcselayout-link"]),
-    ("feature", &["text/x-gherkin"]),
-    ("fg5", &["application/vnd.fujitsu.oasysgp"]),
-    ("fgd", &["application/x-director"]),
-    ("fh", &["image/x-freehand"]),
-    ("fh4", &["image/x-freehand"]),
-    ("fh5", &["image/x-freehand"]),
-    ("fh7", &["image/x-freehand"]),
-    ("fhc", &["image/x-freehand"]),
-    ("fif", &["application/fractals"]),
-    ("fig", &["application/x-xfig"]),
-    ("filters", &["application/xml"]),
-    ("fla", &["application/octet-stream"]),
-    ("flac", &["audio/flac"]),
-    ("fli", &["video/x-fli"]),
-    ("flo", &["application/vnd.micrografx.flo"]),
-    ("flr", &["x-world/x-vrml"]),
-    ("flv", &["video/x-flv"]),
-    ("flw", &["application/vnd.kde.kivio"]),
-    ("flx", &["text/vnd.fmi.flexstor"]),
-    ("fly", &["text/vnd.fly"]),
-    ("fm", &["application/vnd.framemaker"]),
-    ("fnc", &["application/vnd.frogans.fnc"]),
-    ("for", &["text/x-fortran"]),
-    ("fpx", &["image/vnd.fpx"]),
-    ("frame", &["application/vnd.framemaker"]),
-    ("fsc", &["application/vnd.fsc.weblaunch"]),
-    ("fsscript", &["application/fsharp-script"]),
-    ("fst", &["image/vnd.fst"]),
-    ("fsx", &["application/fsharp-script"]),
-    ("ftc", &["application/vnd.fluxtime.clip"]),
-    (
-        "fti",
-        &["application/vnd.anser-web-funds-transfer-initiation"],
-    ),
-    ("fvt", &["video/vnd.fvt"]),
-    ("fxp", &["application/vnd.adobe.fxp"]),
-    ("fxpl", &["application/vnd.adobe.fxp"]),
-    ("fzs", &["application/vnd.fuzzysheet"]),
-    ("g2w", &["application/vnd.geoplan"]),
-    ("g3", &["image/g3fax"]),
-    ("g3w", &["application/vnd.geospace"]),
-    ("gac", &["application/vnd.groove-account"]),
-    ("gam", &["application/x-tads"]),
-    ("gbr", &["application/rpki-ghostbusters"]),
-    ("gca", &["application/x-gca-compressed"]),
-    ("gdl", &["model/vnd.gdl"]),
-    ("gdoc", &["application/vnd.google-apps.document"]),
-    ("gemini", &["text/gemini"]),
-    ("generictest", &["application/xml"]),
-    ("geo", &["application/vnd.dynageo"]),
-    ("geojson", &["application/geo+json"]),
-    ("gex", &["application/vnd.geometry-explorer"]),
-    ("ggb", &["application/vnd.geogebra.file"]),
-    ("ggt", &["application/vnd.geogebra.tool"]),
-    ("ghf", &["application/vnd.groove-help"]),
-    ("gif", &["image/gif"]),
-    ("gim", &["application/vnd.groove-identity-message"]),
-    ("glb", &["model/gltf-binary"]),
-    ("gltf", &["model/gltf+json"]),
-    ("gmi", &["text/gemini"]),
-    ("gml", &["application/gml+xml"]),
-    ("gmx", &["application/vnd.gmx"]),
-    ("gnumeric", &["application/x-gnumeric"]),
-    ("gph", &["application/vnd.flographit"]),
-    ("gpx", &["application/gpx+xml"]),
-    ("gqf", &["application/vnd.grafeq"]),
-    ("gqs", &["application/vnd.grafeq"]),
-    ("gram", &["application/srgs"]),
-    ("gramps", &["application/x-gramps-xml"]),
-    ("gre", &["application/vnd.geometry-explorer"]),
-    ("group", &["text/x-ms-group"]),
-    ("grv", &["application/vnd.groove-injector"]),
-    ("grxml", &["application/srgs+xml"]),
-    ("gsf", &["application/x-font-ghostscript"]),
-    ("gsheet", &["application/vnd.google-apps.spreadsheet"]),
-    ("gslides", &["application/vnd.google-apps.presentation"]),
-    ("gsm", &["audio/x-gsm"]),
-    ("gtar", &["application/x-gtar"]),
-    ("gtm", &["application/vnd.groove-tool-message"]),
-    ("gtw", &["model/vnd.gtw"]),
-    ("gv", &["text/vnd.graphviz"]),
-    ("gxf", &["application/gxf"]),
-    ("gxt", &["application/vnd.geonext"]),
-    ("gz", &["application/gzip"]),
-    ("h", &["text/plain"]),
-    ("h261", &["video/h261"]),
-    ("h263", &["video/h263"]),
-    ("h264", &["video/h264"]),
-    ("hal", &["application/vnd.hal+xml"]),
-    ("hbci", &["application/vnd.hbci"]),
-    ("hbs", &["text/x-handlebars-template"]),
-    ("hdd", &["application/x-virtualbox-hdd"]),
-    ("hdf", &["application/x-hdf"]),
-    ("hdml", &["text/x-hdml"]),
-    ("hdr", &["image/vnd.radiance"]),
-    ("hh", &["text/plain"]),
-    ("hhc", &["application/x-oleobject"]),
-    ("hhk", &["application/octet-stream"]),
-    ("hhp", &["application/octet-stream"]),
-    ("hjson", &["application/hjson"]),
-    ("hlp", &["application/winhlp"]),
-    ("hpgl", &["application/vnd.hp-hpgl"]),
-    ("hpid", &["application/vnd.hp-hpid"]),
-    ("hpp", &["text/plain"]),
-    ("hps", &["application/vnd.hp-hps"]),
-    ("hqx", &["application/mac-binhex40"]),
-    ("hta", &["application/hta"]),
-    ("htc", &["text/x-component"]),
-    ("htke", &["application/vnd.kenameaapp"]),
-    ("htm", &["text/html"]),
-    ("html", &["text/html"]),
-    ("htt", &["text/webviewhtml"]),
-    ("hvd", &["application/vnd.yamaha.hv-dic"]),
-    ("hvp", &["application/vnd.yamaha.hv-voice"]),
-    ("hvs", &["application/vnd.yamaha.hv-script"]),
-    ("hxa", &["application/xml"]),
-    ("hxc", &["application/xml"]),
-    ("hxd", &["application/octet-stream"]),
-    ("hxe", &["application/xml"]),
-    ("hxf", &["application/xml"]),
-    ("hxh", &["application/octet-stream"]),
-    ("hxi", &["application/octet-stream"]),
-    ("hxk", &["application/xml"]),
-    ("hxq", &["application/octet-stream"]),
-    ("hxr", &["application/octet-stream"]),
-    ("hxs", &["application/octet-stream"]),
-    ("hxt", &["text/html"]),
-    ("hxv", &["application/xml"]),
-    ("hxw", &["application/octet-stream"]),
-    ("hxx", &["text/plain"]),
-    ("i", &["text/plain"]),
-    ("i2g", &["application/vnd.intergeo"]),
-    ("icc", &["application/vnd.iccprofile"]),
-    ("ice", &["x-conference/x-cooltalk"]),
-    ("icm", &["application/vnd.iccprofile"]),
-    ("ico", &["image/x-icon"]),
-    ("ics", &["application/octet-stream"]),
-    ("idl", &["text/plain"]),
-    ("ief", &["image/ief"]),
-    ("ifb", &["text/calendar"]),
-    ("ifm", &["application/vnd.shana.informed.formdata"]),
-    ("iges", &["model/iges"]),
-    ("igl", &["application/vnd.igloader"]),
-    ("igm", &["application/vnd.insors.igm"]),
-    ("igs", &["model/iges"]),
-    ("igx", &["application/vnd.micrografx.igx"]),
-    ("iif", &["application/vnd.shana.informed.interchange"]),
-    ("iii", &["application/x-iphone"]),
-    ("img", &["application/octet-stream"]),
-    ("imp", &["application/vnd.accpac.simply.imp"]),
-    ("ims", &["application/vnd.ms-ims"]),
-    ("in", &["text/plain"]),
-    ("inc", &["text/plain"]),
-    ("inf", &["application/octet-stream"]),
-    ("ini", &["text/plain"]),
-    ("ink", &["application/inkml+xml"]),
-    ("inkml", &["application/inkml+xml"]),
-    ("inl", &["text/plain"]),
-    ("ins", &["application/x-internet-signup"]),
-    ("install", &["application/x-install-instructions"]),
-    ("iota", &["application/vnd.astraea-software.iota"]),
-    ("ipa", &["application/x-itunes-ipa"]),
-    ("ipfix", &["application/ipfix"]),
-    ("ipg", &["application/x-itunes-ipg"]),
-    ("ipk", &["application/vnd.shana.informed.package"]),
-    ("ipproj", &["text/plain"]),
-    ("ipsw", &["application/x-itunes-ipsw"]),
-    ("iqy", &["text/x-ms-iqy"]),
-    ("irm", &["application/vnd.ibm.rights-management"]),
-    ("irp", &["application/vnd.irepository.package+xml"]),
-    ("iso", &["application/octet-stream"]),
-    ("isp", &["application/x-internet-signup"]),
-    ("ite", &["application/x-itunes-ite"]),
-    ("itlp", &["application/x-itunes-itlp"]),
-    ("itms", &["application/x-itunes-itms"]),
-    ("itp", &["application/vnd.shana.informed.formtemplate"]),
-    ("itpc", &["application/x-itunes-itpc"]),
-    ("ivf", &["video/x-ivf"]),
-    ("ivp", &["application/vnd.immervision-ivp"]),
-    ("ivu", &["application/vnd.immervision-ivu"]),
-    ("jad", &["text/vnd.sun.j2me.app-descriptor"]),
-    ("jade", &["text/jade"]),
-    ("jam", &["application/vnd.jam"]),
-    ("jar", &["application/java-archive"]),
-    ("jardiff", &["application/x-java-archive-diff"]),
-    ("java", &["application/octet-stream"]),
-    ("jck", &["application/liquidmotion"]),
-    ("jcz", &["application/liquidmotion"]),
-    ("jfif", &["image/pjpeg"]),
-    ("jisp", &["application/vnd.jisp"]),
-    ("jlt", &["application/vnd.hp-jlyt"]),
-    ("jng", &["image/x-jng"]),
-    ("jnlp", &["application/x-java-jnlp-file"]),
-    ("joda", &["application/vnd.joost.joda-archive"]),
-    ("jp2", &["image/jp2"]),
-    ("jpb", &["application/octet-stream"]),
-    ("jpe", &["image/jpeg"]),
-    ("jpeg", &["image/jpeg"]),
-    ("jpf", &["image/jpx"]),
-    ("jpg", &["image/jpeg"]),
-    ("jpg2", &["image/jp2"]),
-    ("jpgm", &["video/jpm"]),
-    ("jpgv", &["video/jpeg"]),
-    ("jpm", &["image/jpm"]),
-    ("jpx", &["image/jpx"]),
-    ("js", &["application/javascript"]),
-    ("jsm", &["application/javascript"]),
-    ("json", &["application/json"]),
-    ("json5", &["application/json5"]),
-    ("jsonld", &["application/ld+json"]),
-    ("jsonml", &["application/jsonml+json"]),
-    ("jsx", &["text/jscript"]),
-    ("jsxbin", &["text/plain"]),
-    ("kar", &["audio/midi"]),
-    ("karbon", &["application/vnd.kde.karbon"]),
-    ("kfo", &["application/vnd.kde.kformula"]),
-    ("kia", &["application/vnd.kidspiration"]),
-    ("kml", &["application/vnd.google-earth.kml+xml"]),
-    ("kmz", &["application/vnd.google-earth.kmz"]),
-    ("kne", &["application/vnd.kinar"]),
-    ("knp", &["application/vnd.kinar"]),
-    ("kon", &["application/vnd.kde.kontour"]),
-    ("kpr", &["application/vnd.kde.kpresenter"]),
-    ("kpt", &["application/vnd.kde.kpresenter"]),
-    ("kpxx", &["application/vnd.ds-keypoint"]),
-    ("ksp", &["application/vnd.kde.kspread"]),
-    ("ktr", &["application/vnd.kahootz"]),
-    ("ktx", &["image/ktx"]),
-    ("ktz", &["application/vnd.kahootz"]),
-    ("kwd", &["application/vnd.kde.kword"]),
-    ("kwt", &["application/vnd.kde.kword"]),
-    ("lasxml", &["application/vnd.las.las+xml"]),
-    ("latex", &["application/x-latex"]),
-    (
-        "lbd",
-        &["application/vnd.llamagraphics.life-balance.desktop"],
-    ),
-    (
-        "lbe",
-        &["application/vnd.llamagraphics.life-balance.exchange+xml"],
-    ),
-    ("les", &["application/vnd.hhe.lesson-player"]),
-    ("less", &["text/less"]),
-    ("lha", &["application/x-lzh-compressed"]),
-    ("library-ms", &["application/windows-library+xml"]),
-    ("link66", &["application/vnd.route66.link66+xml"]),
-    ("list", &["text/plain"]),
-    ("list3820", &["application/vnd.ibm.modcap"]),
-    ("listafp", &["application/vnd.ibm.modcap"]),
-    ("lit", &["application/x-ms-reader"]),
-    ("litcoffee", &["text/coffeescript"]),
-    ("lnk", &["application/x-ms-shortcut"]),
-    ("loadtest", &["application/xml"]),
-    ("log", &["text/plain"]),
-    ("lostxml", &["application/lost+xml"]),
-    ("lpk", &["application/octet-stream"]),
-    ("lrf", &["application/octet-stream"]),
-    ("lrm", &["application/vnd.ms-lrm"]),
-    ("lsf", &["video/x-la-asf"]),
-    ("lst", &["text/plain"]),
-    ("lsx", &["video/x-la-asf"]),
-    ("ltf", &["application/vnd.frogans.ltf"]),
-    ("lua", &["text/x-lua"]),
-    ("luac", &["application/x-lua-bytecode"]),
-    ("lvp", &["audio/vnd.lucent.voice"]),
-    ("lwp", &["application/vnd.lotus-wordpro"]),
-    ("lzh", &["application/octet-stream"]),
-    ("m13", &["application/x-msmediaview"]),
-    ("m14", &["application/x-msmediaview"]),
-    ("m1v", &["video/mpeg"]),
-    ("m21", &["application/mp21"]),
-    ("m2a", &["audio/mpeg"]),
-    ("m2t", &["video/vnd.dlna.mpeg-tts"]),
-    ("m2ts", &["video/vnd.dlna.mpeg-tts"]),
-    ("m2v", &["video/mpeg"]),
-    ("m3a", &["audio/mpeg"]),
-    ("m3u", &["audio/x-mpegurl"]),
-    ("m3u8", &["audio/x-mpegurl"]),
-    ("m4a", &["audio/m4a"]),
-    ("m4b", &["audio/m4b"]),
-    ("m4p", &["audio/m4p"]),
-    ("m4r", &["audio/x-m4r"]),
-    ("m4u", &["video/vnd.mpegurl"]),
-    ("m4v", &["video/x-m4v"]),
-    ("ma", &["application/mathematica"]),
-    ("mac", &["image/x-macpaint"]),
-    ("mads", &["application/mads+xml"]),
-    ("mag", &["application/vnd.ecowin.chart"]),
-    ("mak", &["text/plain"]),
-    ("maker", &["application/vnd.framemaker"]),
-    ("man", &["application/x-troff-man"]),
-    ("manifest", &["application/x-ms-manifest"]),
-    ("map", &["text/plain"]),
-    ("mar", &["application/octet-stream"]),
-    ("markdown", &["text/markdown"]),
-    ("master", &["application/xml"]),
-    ("mathml", &["application/mathml+xml"]),
-    ("mb", &["application/mathematica"]),
-    ("mbk", &["application/vnd.mobius.mbk"]),
-    ("mbox", &["application/mbox"]),
-    ("mc1", &["application/vnd.medcalcdata"]),
-    ("mcd", &["application/vnd.mcd"]),
-    ("mcurl", &["text/vnd.curl.mcurl"]),
-    ("md", &["text/markdown", "text/x-markdown"]),
-    ("mda", &["application/msaccess"]),
-    ("mdb", &["application/x-msaccess"]),
-    ("mde", &["application/msaccess"]),
-    ("mdi", &["image/vnd.ms-modi"]),
-    ("mdp", &["application/octet-stream"]),
-    ("me", &["application/x-troff-me"]),
-    ("mesh", &["model/mesh"]),
-    ("meta4", &["application/metalink4+xml"]),
-    ("metalink", &["application/metalink+xml"]),
-    ("mets", &["application/mets+xml"]),
-    ("mfm", &["application/vnd.mfmp"]),
-    ("mfp", &["application/x-shockwave-flash"]),
-    ("mft", &["application/rpki-manifest"]),
-    ("mgp", &["application/vnd.osgeo.mapguide.package"]),
-    ("mgz", &["application/vnd.proteus.magazine"]),
-    ("mht", &["message/rfc822"]),
-    ("mhtml", &["message/rfc822"]),
-    ("mid", &["audio/mid"]),
-    ("midi", &["audio/mid"]),
-    ("mie", &["application/x-mie"]),
-    ("mif", &["application/vnd.mif"]),
-    ("mime", &["message/rfc822"]),
-    ("mix", &["application/octet-stream"]),
-    ("mj2", &["video/mj2"]),
-    ("mjp2", &["video/mj2"]),
-    ("mjs", &["application/javascript"]),
-    ("mk", &["text/plain"]),
-    ("mk3d", &["video/x-matroska"]),
-    ("mka", &["audio/x-matroska"]),
-    ("mkd", &["text/x-markdown"]),
-    ("mks", &["video/x-matroska"]),
-    ("mkv", &["video/x-matroska"]),
-    ("mlp", &["application/vnd.dolby.mlp"]),
-    ("mmd", &["application/vnd.chipnuts.karaoke-mmd"]),
-    ("mmf", &["application/x-smaf"]),
-    ("mml", &["text/mathml"]),
-    ("mmr", &["image/vnd.fujixerox.edmics-mmr"]),
-    ("mng", &["video/x-mng"]),
-    ("mno", &["text/xml"]),
-    ("mny", &["application/x-msmoney"]),
-    ("mobi", &["application/x-mobipocket-ebook"]),
-    ("mod", &["video/mpeg"]),
-    ("mods", &["application/mods+xml"]),
-    ("mov", &["video/quicktime"]),
-    ("movie", &["video/x-sgi-movie"]),
-    ("mp2", &["audio/mpeg", "video/mpeg"]),
-    ("mp21", &["application/mp21"]),
-    ("mp2a", &["audio/mpeg"]),
-    ("mp2v", &["video/mpeg"]),
-    ("mp3", &["audio/mpeg"]),
-    ("mp4", &["video/mp4"]),
-    ("mp4a", &["audio/mp4"]),
-    ("mp4s", &["application/mp4"]),
-    ("mp4v", &["video/mp4"]),
-    ("mpa", &["video/mpeg"]),
-    ("mpc", &["application/vnd.mophun.certificate"]),
-    ("mpd", &["application/dash+xml"]),
-    ("mpe", &["video/mpeg"]),
-    ("mpeg", &["video/mpeg"]),
-    ("mpf", &["application/vnd.ms-mediapackage"]),
-    ("mpg", &["video/mpeg"]),
-    ("mpg4", &["video/mp4"]),
-    ("mpga", &["audio/mpeg"]),
-    ("mpkg", &["application/vnd.apple.installer+xml"]),
-    ("mpm", &["application/vnd.blueice.multipass"]),
-    ("mpn", &["application/vnd.mophun.application"]),
-    ("mpp", &["application/vnd.ms-project"]),
-    ("mpt", &["application/vnd.ms-project"]),
-    ("mpv2", &["video/mpeg"]),
-    ("mpy", &["application/vnd.ibm.minipay"]),
-    ("mqv", &["video/quicktime"]),
-    ("mqy", &["application/vnd.mobius.mqy"]),
-    ("mrc", &["application/marc"]),
-    ("mrcx", &["application/marcxml+xml"]),
-    ("ms", &["application/x-troff-ms"]),
-    ("mscml", &["application/mediaservercontrol+xml"]),
-    ("mseed", &["application/vnd.fdsn.mseed"]),
-    ("mseq", &["application/vnd.mseq"]),
-    ("msf", &["application/vnd.epson.msf"]),
-    ("msg", &["application/vnd.ms-outlook"]),
-    ("msh", &["model/mesh"]),
-    ("msi", &["application/octet-stream"]),
-    ("msl", &["application/vnd.mobius.msl"]),
-    ("msm", &["application/octet-stream"]),
-    ("mso", &["application/octet-stream"]),
-    ("msp", &["application/octet-stream"]),
-    ("msty", &["application/vnd.muvee.style"]),
-    ("mts", &["video/vnd.dlna.mpeg-tts"]),
-    ("mtx", &["application/xml"]),
-    ("mus", &["application/vnd.musician"]),
-    ("musicxml", &["application/vnd.recordare.musicxml+xml"]),
-    ("mvb", &["application/x-msmediaview"]),
-    ("mvc", &["application/x-miva-compiled"]),
-    ("mwf", &["application/vnd.mfer"]),
-    ("mxf", &["application/mxf"]),
-    ("mxl", &["application/vnd.recordare.musicxml"]),
-    ("mxml", &["application/xv+xml"]),
-    ("mxp", &["application/x-mmxp"]),
-    ("mxs", &["application/vnd.triscape.mxs"]),
-    ("mxu", &["video/vnd.mpegurl"]),
-    ("n-gage", &["application/vnd.nokia.n-gage.symbian.install"]),
-    ("n3", &["text/n3"]),
-    ("nb", &["application/mathematica"]),
-    ("nbp", &["application/vnd.wolfram.player"]),
-    ("nc", &["application/x-netcdf"]),
-    ("ncx", &["application/x-dtbncx+xml"]),
-    ("nfo", &["text/x-nfo"]),
-    ("ngdat", &["application/vnd.nokia.n-gage.data"]),
-    ("nitf", &["application/vnd.nitf"]),
-    ("nlu", &["application/vnd.neurolanguage.nlu"]),
-    ("nml", &["application/vnd.enliven"]),
-    ("nnd", &["application/vnd.noblenet-directory"]),
-    ("nns", &["application/vnd.noblenet-sealer"]),
-    ("nnw", &["application/vnd.noblenet-web"]),
-    ("npx", &["image/vnd.net-fpx"]),
-    ("nq", &["application/n-quads"]),
-    ("nsc", &["video/x-ms-asf"]),
-    ("nsf", &["application/vnd.lotus-notes"]),
-    ("nt", &["application/n-triples"]),
-    ("ntf", &["application/vnd.nitf"]),
-    ("nws", &["message/rfc822"]),
-    ("nzb", &["application/x-nzb"]),
-    ("oa2", &["application/vnd.fujitsu.oasys2"]),
-    ("oa3", &["application/vnd.fujitsu.oasys3"]),
-    ("oas", &["application/vnd.fujitsu.oasys"]),
-    ("obd", &["application/x-msbinder"]),
-    ("obj", &["application/x-tgif"]),
-    ("ocx", &["application/octet-stream"]),
-    ("oda", &["application/oda"]),
-    ("odb", &["application/vnd.oasis.opendocument.database"]),
-    ("odc", &["application/vnd.oasis.opendocument.chart"]),
-    ("odf", &["application/vnd.oasis.opendocument.formula"]),
-    (
-        "odft",
-        &["application/vnd.oasis.opendocument.formula-template"],
-    ),
-    ("odg", &["application/vnd.oasis.opendocument.graphics"]),
-    ("odh", &["text/plain"]),
-    ("odi", &["application/vnd.oasis.opendocument.image"]),
-    ("odl", &["text/plain"]),
-    ("odm", &["application/vnd.oasis.opendocument.text-master"]),
-    ("odp", &["application/vnd.oasis.opendocument.presentation"]),
-    ("ods", &["application/vnd.oasis.opendocument.spreadsheet"]),
-    ("odt", &["application/vnd.oasis.opendocument.text"]),
-    ("oga", &["audio/ogg"]),
-    ("ogg", &["audio/ogg"]),
-    ("ogv", &["video/ogg"]),
-    ("ogx", &["application/ogg"]),
-    ("omdoc", &["application/omdoc+xml"]),
-    ("one", &["application/onenote"]),
-    ("onea", &["application/onenote"]),
-    ("onepkg", &["application/onenote"]),
-    ("onetmp", &["application/onenote"]),
-    ("onetoc", &["application/onenote"]),
-    ("onetoc2", &["application/onenote"]),
-    ("opf", &["application/oebps-package+xml"]),
-    ("opml", &["text/x-opml"]),
-    ("oprc", &["application/vnd.palm"]),
-    ("opus", &["audio/ogg"]),
-    ("orderedtest", &["application/xml"]),
-    ("org", &["application/vnd.lotus-organizer"]),
-    ("osdx", &["application/opensearchdescription+xml"]),
-    ("osf", &["application/vnd.yamaha.openscoreformat"]),
-    (
-        "osfpvg",
-        &["application/vnd.yamaha.openscoreformat.osfpvg+xml"],
-    ),
-    (
-        "otc",
-        &["application/vnd.oasis.opendocument.chart-template"],
-    ),
-    ("otf", &["application/font-sfnt"]),
-    (
-        "otg",
-        &["application/vnd.oasis.opendocument.graphics-template"],
-    ),
-    ("oth", &["application/vnd.oasis.opendocument.text-web"]),
-    (
-        "oti",
-        &["application/vnd.oasis.opendocument.image-template"],
-    ),
-    (
-        "otp",
-        &["application/vnd.oasis.opendocument.presentation-template"],
-    ),
-    (
-        "ots",
-        &["application/vnd.oasis.opendocument.spreadsheet-template"],
-    ),
-    ("ott", &["application/vnd.oasis.opendocument.text-template"]),
-    ("ova", &["application/x-virtualbox-ova"]),
-    ("ovf", &["application/x-virtualbox-ovf"]),
-    ("oxps", &["application/oxps"]),
-    ("oxt", &["application/vnd.openofficeorg.extension"]),
-    ("p", &["text/x-pascal"]),
-    ("p10", &["application/pkcs10"]),
-    ("p12", &["application/x-pkcs12"]),
-    ("p7b", &["application/x-pkcs7-certificates"]),
-    ("p7c", &["application/pkcs7-mime"]),
-    ("p7m", &["application/pkcs7-mime"]),
-    ("p7r", &["application/x-pkcs7-certreqresp"]),
-    ("p7s", &["application/pkcs7-signature"]),
-    ("p8", &["application/pkcs8"]),
-    ("pac", &["application/x-ns-proxy-autoconfig"]),
-    ("pas", &["text/x-pascal"]),
-    ("paw", &["application/vnd.pawaafile"]),
-    ("pbd", &["application/vnd.powerbuilder6"]),
-    ("pbm", &["image/x-portable-bitmap"]),
-    ("pcap", &["application/vnd.tcpdump.pcap"]),
-    ("pcast", &["application/x-podcast"]),
-    ("pcf", &["application/x-font-pcf"]),
-    ("pcl", &["application/vnd.hp-pcl"]),
-    ("pclxl", &["application/vnd.hp-pclxl"]),
-    ("pct", &["image/pict"]),
-    ("pcurl", &["application/vnd.curl.pcurl"]),
-    ("pcx", &["application/octet-stream"]),
-    ("pcz", &["application/octet-stream"]),
-    ("pdb", &["application/vnd.palm"]),
-    ("pde", &["text/x-processing"]),
-    ("pdf", &["application/pdf"]),
-    ("pem", &["application/x-x509-ca-cert"]),
-    ("pfa", &["application/x-font-type1"]),
-    ("pfb", &["application/octet-stream"]),
-    ("pfm", &["application/octet-stream"]),
-    ("pfr", &["application/font-tdpfr"]),
-    ("pfx", &["application/x-pkcs12"]),
-    ("pgm", &["image/x-portable-graymap"]),
-    ("pgn", &["application/x-chess-pgn"]),
-    ("pgp", &["application/pgp-encrypted"]),
-    ("php", &["application/x-httpd-php"]),
-    ("pic", &["image/pict"]),
-    ("pict", &["image/pict"]),
-    ("pkg", &["application/octet-stream"]),
-    ("pkgdef", &["text/plain"]),
-    ("pkgundef", &["text/plain"]),
-    ("pki", &["application/pkixcmp"]),
-    ("pkipath", &["application/pkix-pkipath"]),
-    ("pko", &["application/vnd.ms-pki.pko"]),
-    ("pkpass", &["application/vnd.apple.pkpass"]),
-    ("pl", &["application/x-perl"]),
-    ("plb", &["application/vnd.3gpp.pic-bw-large"]),
-    ("plc", &["application/vnd.mobius.plc"]),
-    ("plf", &["application/vnd.pocketlearn"]),
-    ("pls", &["audio/scpls"]),
-    ("pm", &["application/x-perl"]),
-    ("pma", &["application/x-perfmon"]),
-    ("pmc", &["application/x-perfmon"]),
-    ("pml", &["application/x-perfmon"]),
-    ("pmr", &["application/x-perfmon"]),
-    ("pmw", &["application/x-perfmon"]),
-    ("png", &["image/png"]),
-    ("pnm", &["image/x-portable-anymap"]),
-    ("pnt", &["image/x-macpaint"]),
-    ("pntg", &["image/x-macpaint"]),
-    ("pnz", &["image/png"]),
-    ("portpkg", &["application/vnd.macports.portpkg"]),
-    ("pot", &["application/vnd.ms-powerpoint"]),
-    (
-        "potm",
-        &["application/vnd.ms-powerpoint.template.macroEnabled.12"],
-    ),
-    (
-        "potx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.template"],
-    ),
-    ("ppa", &["application/vnd.ms-powerpoint"]),
-    (
-        "ppam",
-        &["application/vnd.ms-powerpoint.addin.macroEnabled.12"],
-    ),
-    ("ppd", &["application/vnd.cups-ppd"]),
-    ("ppm", &["image/x-portable-pixmap"]),
-    ("pps", &["application/vnd.ms-powerpoint"]),
-    (
-        "ppsm",
-        &["application/vnd.ms-powerpoint.slideshow.macroEnabled.12"],
-    ),
-    (
-        "ppsx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.slideshow"],
-    ),
-    ("ppt", &["application/vnd.ms-powerpoint"]),
-    (
-        "pptm",
-        &["application/vnd.ms-powerpoint.presentation.macroEnabled.12"],
-    ),
-    (
-        "pptx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.presentation"],
-    ),
-    ("pqa", &["application/vnd.palm"]),
-    ("prc", &["application/x-mobipocket-ebook"]),
-    ("pre", &["application/vnd.lotus-freelance"]),
-    ("prf", &["application/pics-rules"]),
-    ("prm", &["application/octet-stream"]),
-    ("prx", &["application/octet-stream"]),
-    ("ps", &["application/postscript"]),
-    ("psb", &["application/vnd.3gpp.pic-bw-small"]),
-    ("psc1", &["application/PowerShell"]),
-    ("psd", &["application/octet-stream"]),
-    ("psess", &["application/xml"]),
-    ("psf", &["application/x-font-linux-psf"]),
-    ("pskcxml", &["application/pskc+xml"]),
-    ("psm", &["application/octet-stream"]),
-    ("psp", &["application/octet-stream"]),
-    ("pst", &["application/vnd.ms-outlook"]),
-    ("ptid", &["application/vnd.pvi.ptid1"]),
-    ("pub", &["application/x-mspublisher"]),
-    ("pvb", &["application/vnd.3gpp.pic-bw-var"]),
-    ("pwn", &["application/vnd.3m.post-it-notes"]),
-    ("pwz", &["application/vnd.ms-powerpoint"]),
-    ("py", &["text/plain"]),
-    ("pya", &["audio/vnd.ms-playready.media.pya"]),
-    ("pyv", &["video/vnd.ms-playready.media.pyv"]),
-    ("qam", &["application/vnd.epson.quickanime"]),
-    ("qbo", &["application/vnd.intu.qbo"]),
-    ("qfx", &["application/vnd.intu.qfx"]),
-    ("qht", &["text/x-html-insertion"]),
-    ("qhtm", &["text/x-html-insertion"]),
-    ("qps", &["application/vnd.publishare-delta-tree"]),
-    ("qt", &["video/quicktime"]),
-    ("qti", &["image/x-quicktime"]),
-    ("qtif", &["image/x-quicktime"]),
-    ("qtl", &["application/x-quicktimeplayer"]),
-    ("qwd", &["application/vnd.quark.quarkxpress"]),
-    ("qwt", &["application/vnd.quark.quarkxpress"]),
-    ("qxb", &["application/vnd.quark.quarkxpress"]),
-    ("qxd", &["application/octet-stream"]),
-    ("qxl", &["application/vnd.quark.quarkxpress"]),
-    ("qxt", &["application/vnd.quark.quarkxpress"]),
-    ("ra", &["audio/x-pn-realaudio"]),
-    ("ram", &["audio/x-pn-realaudio"]),
-    ("raml", &["application/raml+yaml"]),
-    ("rar", &["application/x-rar-compressed"]),
-    ("ras", &["image/x-cmu-raster"]),
-    ("rat", &["application/rat-file"]),
-    ("rc", &["text/plain"]),
-    ("rc2", &["text/plain"]),
-    ("rcprofile", &["application/vnd.ipunplugged.rcprofile"]),
-    ("rct", &["text/plain"]),
-    ("rdf", &["application/rdf+xml"]),
-    ("rdlc", &["application/xml"]),
-    ("rdz", &["application/vnd.data-vision.rdz"]),
-    ("reg", &["text/plain"]),
-    ("rep", &["application/vnd.businessobjects"]),
-    ("res", &["application/x-dtbresource+xml"]),
-    ("resx", &["application/xml"]),
-    ("rf", &["image/vnd.rn-realflash"]),
-    ("rgb", &["image/x-rgb"]),
-    ("rgs", &["text/plain"]),
-    ("rif", &["application/reginfo+xml"]),
-    ("rip", &["audio/vnd.rip"]),
-    ("ris", &["application/x-research-info-systems"]),
-    ("rl", &["application/resource-lists+xml"]),
-    ("rlc", &["image/vnd.fujixerox.edmics-rlc"]),
-    ("rld", &["application/resource-lists-diff+xml"]),
-    ("rm", &["application/vnd.rn-realmedia"]),
-    ("rmi", &["audio/mid"]),
-    ("rmp", &["application/vnd.rn-rn_music_package"]),
-    ("rms", &["application/vnd.jcp.javame.midlet-rms"]),
-    ("rmvb", &["application/vnd.rn-realmedia-vbr"]),
-    ("rnc", &["application/relax-ng-compact-syntax"]),
-    ("rng", &["application/xml"]),
-    ("roa", &["application/rpki-roa"]),
-    ("roff", &["application/x-troff"]),
-    ("rp9", &["application/vnd.cloanto.rp9"]),
-    ("rpm", &["audio/x-pn-realaudio-plugin"]),
-    ("rpss", &["application/vnd.nokia.radio-presets"]),
-    ("rpst", &["application/vnd.nokia.radio-preset"]),
-    ("rq", &["application/sparql-query"]),
-    ("rqy", &["text/x-ms-rqy"]),
-    ("rs", &["text/x-rust"]),
-    ("rsd", &["application/rsd+xml"]),
-    ("rss", &["application/rss+xml"]),
-    ("rtf", &["application/rtf"]),
-    ("rtx", &["text/richtext"]),
-    ("ruleset", &["application/xml"]),
-    ("run", &["application/x-makeself"]),
-    ("rvt", &["application/octet-stream"]),
-    ("s", &["text/plain"]),
-    ("s3m", &["audio/s3m"]),
-    ("saf", &["application/vnd.yamaha.smaf-audio"]),
-    ("safariextz", &["application/x-safari-safariextz"]),
-    ("sass", &["text/x-sass"]),
-    ("sbml", &["application/sbml+xml"]),
-    ("sc", &["application/vnd.ibm.secure-container"]),
-    ("scd", &["application/x-msschedule"]),
-    ("scm", &["application/vnd.lotus-screencam"]),
-    ("scq", &["application/scvp-cv-request"]),
-    ("scr", &["text/plain"]),
-    ("scs", &["application/scvp-cv-response"]),
-    ("scss", &["text/x-scss"]),
-    ("sct", &["text/scriptlet"]),
-    ("scurl", &["text/vnd.curl.scurl"]),
-    ("sd2", &["audio/x-sd2"]),
-    ("sda", &["application/vnd.stardivision.draw"]),
-    ("sdc", &["application/vnd.stardivision.calc"]),
-    ("sdd", &["application/vnd.stardivision.impress"]),
-    ("sdkd", &["application/vnd.solent.sdkm+xml"]),
-    ("sdkm", &["application/vnd.solent.sdkm+xml"]),
-    ("sdp", &["application/sdp"]),
-    ("sdw", &["application/vnd.stardivision.writer"]),
-    ("sea", &["application/octet-stream"]),
-    (
-        "searchconnector-ms",
-        &["application/windows-search-connector+xml"],
-    ),
-    ("see", &["application/vnd.seemail"]),
-    ("seed", &["application/vnd.fdsn.seed"]),
-    ("sema", &["application/vnd.sema"]),
-    ("semd", &["application/vnd.semd"]),
-    ("semf", &["application/vnd.semf"]),
-    ("ser", &["application/java-serialized-object"]),
-    ("setpay", &["application/set-payment-initiation"]),
-    ("setreg", &["application/set-registration-initiation"]),
-    ("settings", &["application/xml"]),
-    ("sfd-hdstx", &["application/vnd.hydrostatix.sof-data"]),
-    ("sfs", &["application/vnd.spotfire.sfs"]),
-    ("sfv", &["text/x-sfv"]),
-    ("sgi", &["image/sgi"]),
-    ("sgimb", &["application/x-sgimb"]),
-    ("sgl", &["application/vnd.stardivision.writer-global"]),
-    ("sgm", &["text/sgml"]),
-    ("sgml", &["text/sgml"]),
-    ("sh", &["application/x-sh"]),
-    ("shar", &["application/x-shar"]),
-    ("shex", &["text/shex"]),
-    ("shf", &["application/shf+xml"]),
-    ("shtml", &["text/html"]),
-    ("sid", &["image/x-mrsid-image"]),
-    ("sig", &["application/pgp-signature"]),
-    ("sil", &["audio/silk"]),
-    ("silo", &["model/mesh"]),
-    ("sis", &["application/vnd.symbian.install"]),
-    ("sisx", &["application/vnd.symbian.install"]),
-    ("sit", &["application/x-stuffit"]),
-    ("sitemap", &["application/xml"]),
-    ("sitx", &["application/x-stuffitx"]),
-    ("skd", &["application/vnd.koan"]),
-    ("skin", &["application/xml"]),
-    ("skm", &["application/vnd.koan"]),
-    ("skp", &["application/x-koan"]),
-    ("skt", &["application/vnd.koan"]),
-    (
-        "sldm",
-        &["application/vnd.ms-powerpoint.slide.macroEnabled.12"],
-    ),
-    (
-        "sldx",
-        &["application/vnd.openxmlformats-officedocument.presentationml.slide"],
-    ),
-    ("slim", &["text/slim"]),
-    ("slk", &["application/vnd.ms-excel"]),
-    ("slm", &["text/slim"]),
-    ("sln", &["text/plain"]),
-    ("slt", &["application/vnd.epson.salt"]),
-    ("slupkg-ms", &["application/x-ms-license"]),
-    ("sm", &["application/vnd.stepmania.stepchart"]),
-    ("smd", &["audio/x-smd"]),
-    ("smf", &["application/vnd.stardivision.math"]),
-    ("smi", &["application/octet-stream"]),
-    ("smil", &["application/smil+xml"]),
-    ("smv", &["video/x-smv"]),
-    ("smx", &["audio/x-smd"]),
-    ("smz", &["audio/x-smd"]),
-    ("smzip", &["application/vnd.stepmania.package"]),
-    ("snd", &["audio/basic"]),
-    ("snf", &["application/x-font-snf"]),
-    ("snippet", &["application/xml"]),
-    ("snp", &["application/octet-stream"]),
-    ("so", &["application/octet-stream"]),
-    ("sol", &["text/plain"]),
-    ("sor", &["text/plain"]),
-    ("spc", &["application/x-pkcs7-certificates"]),
-    ("spf", &["application/vnd.yamaha.smaf-phrase"]),
-    ("spl", &["application/futuresplash"]),
-    ("spot", &["text/vnd.in3d.spot"]),
-    ("spp", &["application/scvp-vp-response"]),
-    ("spq", &["application/scvp-vp-request"]),
-    ("spx", &["audio/ogg"]),
-    ("sql", &["application/x-sql"]),
-    ("src", &["application/x-wais-source"]),
-    ("srf", &["text/plain"]),
-    ("srt", &["application/x-subrip"]),
-    ("sru", &["application/sru+xml"]),
-    ("srx", &["application/sparql-results+xml"]),
-    ("ssdl", &["application/ssdl+xml"]),
-    ("sse", &["application/vnd.kodak-descriptor"]),
-    ("ssf", &["application/vnd.epson.ssf"]),
-    ("ssisdeploymentmanifest", &["text/xml"]),
-    ("ssm", &["application/streamingmedia"]),
-    ("ssml", &["application/ssml+xml"]),
-    ("sst", &["application/vnd.ms-pki.certstore"]),
-    ("st", &["application/vnd.sailingtracker.track"]),
-    ("stc", &["application/vnd.sun.xml.calc.template"]),
-    ("std", &["application/vnd.sun.xml.draw.template"]),
-    ("step", &["application/step"]),
-    ("stf", &["application/vnd.wt.stf"]),
-    ("sti", &["application/vnd.sun.xml.impress.template"]),
-    ("stk", &["application/hyperstudio"]),
-    ("stl", &["application/vnd.ms-pki.stl"]),
-    ("stp", &["application/step"]),
-    ("str", &["application/vnd.pg.format"]),
-    ("stw", &["application/vnd.sun.xml.writer.template"]),
-    ("styl", &["text/stylus"]),
-    ("stylus", &["text/stylus"]),
-    ("sub", &["text/vnd.dvb.subtitle"]),
-    ("sus", &["application/vnd.sus-calendar"]),
-    ("susp", &["application/vnd.sus-calendar"]),
-    ("sv4cpio", &["application/x-sv4cpio"]),
-    ("sv4crc", &["application/x-sv4crc"]),
-    ("svc", &["application/xml"]),
-    ("svd", &["application/vnd.svd"]),
-    ("svg", &["image/svg+xml"]),
-    ("svgz", &["image/svg+xml"]),
-    ("swa", &["application/x-director"]),
-    ("swf", &["application/x-shockwave-flash"]),
-    ("swi", &["application/vnd.aristanetworks.swi"]),
-    ("sxc", &["application/vnd.sun.xml.calc"]),
-    ("sxd", &["application/vnd.sun.xml.draw"]),
-    ("sxg", &["application/vnd.sun.xml.writer.global"]),
-    ("sxi", &["application/vnd.sun.xml.impress"]),
-    ("sxm", &["application/vnd.sun.xml.math"]),
-    ("sxw", &["application/vnd.sun.xml.writer"]),
-    ("t", &["application/x-troff"]),
-    ("t3", &["application/x-t3vm-image"]),
-    ("taglet", &["application/vnd.mynfc"]),
-    ("tao", &["application/vnd.tao.intent-module-archive"]),
-    ("tar", &["application/x-tar"]),
-    ("tcap", &["application/vnd.3gpp2.tcap"]),
-    ("tcl", &["application/x-tcl"]),
-    ("teacher", &["application/vnd.smart.teacher"]),
-    ("tei", &["application/tei+xml"]),
-    ("teicorpus", &["application/tei+xml"]),
-    ("testrunconfig", &["application/xml"]),
-    ("testsettings", &["application/xml"]),
-    ("tex", &["application/x-tex"]),
-    ("texi", &["application/x-texinfo"]),
-    ("texinfo", &["application/x-texinfo"]),
-    ("text", &["text/plain"]),
-    ("tfi", &["application/thraud+xml"]),
-    ("tfm", &["application/x-tex-tfm"]),
-    ("tga", &["image/x-tga"]),
-    ("tgz", &["application/x-compressed"]),
-    ("thmx", &["application/vnd.ms-officetheme"]),
-    ("thn", &["application/octet-stream"]),
-    ("tif", &["image/tiff"]),
-    ("tiff", &["image/tiff"]),
-    ("tk", &["application/x-tcl"]),
-    ("tlh", &["text/plain"]),
-    ("tli", &["text/plain"]),
-    ("tmo", &["application/vnd.tmobile-livetv"]),
-    ("toc", &["application/octet-stream"]),
-    ("toml", &["text/x-toml"]),
-    ("torrent", &["application/x-bittorrent"]),
-    ("tpl", &["application/vnd.groove-tool-template"]),
-    ("tpt", &["application/vnd.trid.tpt"]),
-    ("tr", &["application/x-troff"]),
-    ("tra", &["application/vnd.trueapp"]),
-    ("trig", &["application/trig"]),
-    ("trm", &["application/x-msterminal"]),
-    ("trx", &["application/xml"]),
-    ("ts", &["video/vnd.dlna.mpeg-tts"]),
-    ("tsd", &["application/timestamped-data"]),
-    ("tsv", &["text/tab-separated-values"]),
-    ("ttc", &["font/collection"]),
-    ("ttf", &["font/ttf", "application/x-font-ttf", "application/font-sfnt"]),
-    ("ttl", &["text/turtle"]),
-    ("tts", &["video/vnd.dlna.mpeg-tts"]),
-    ("twd", &["application/vnd.simtech-mindmapper"]),
-    ("twds", &["application/vnd.simtech-mindmapper"]),
-    ("txd", &["application/vnd.genomatix.tuxedo"]),
-    ("txf", &["application/vnd.mobius.txf"]),
-    ("txt", &["text/plain"]),
-    ("u32", &["application/octet-stream"]),
-    ("u8dsn", &["message/global-delivery-status"]),
-    ("u8hdr", &["message/global-headers"]),
-    ("u8mdn", &["message/global-disposition-notification"]),
-    ("u8msg", &["message/global"]),
-    ("udeb", &["application/x-debian-package"]),
-    ("ufd", &["application/vnd.ufdl"]),
-    ("ufdl", &["application/vnd.ufdl"]),
-    ("uls", &["text/iuls"]),
-    ("ulx", &["application/x-glulx"]),
-    ("umj", &["application/vnd.umajin"]),
-    ("unityweb", &["application/vnd.unity"]),
-    ("uoml", &["application/vnd.uoml+xml"]),
-    ("uri", &["text/uri-list"]),
-    ("uris", &["text/uri-list"]),
-    ("urls", &["text/uri-list"]),
-    ("user", &["text/plain"]),
-    ("ustar", &["application/x-ustar"]),
-    ("utz", &["application/vnd.uiq.theme"]),
-    ("uu", &["text/x-uuencode"]),
-    ("uva", &["audio/vnd.dece.audio"]),
-    ("uvd", &["application/vnd.dece.data"]),
-    ("uvf", &["application/vnd.dece.data"]),
-    ("uvg", &["image/vnd.dece.graphic"]),
-    ("uvh", &["video/vnd.dece.hd"]),
-    ("uvi", &["image/vnd.dece.graphic"]),
-    ("uvm", &["video/vnd.dece.mobile"]),
-    ("uvp", &["video/vnd.dece.pd"]),
-    ("uvs", &["video/vnd.dece.sd"]),
-    ("uvt", &["application/vnd.dece.ttml+xml"]),
-    ("uvu", &["video/vnd.uvvu.mp4"]),
-    ("uvv", &["video/vnd.dece.video"]),
-    ("uvva", &["audio/vnd.dece.audio"]),
-    ("uvvd", &["application/vnd.dece.data"]),
-    ("uvvf", &["application/vnd.dece.data"]),
-    ("uvvg", &["image/vnd.dece.graphic"]),
-    ("uvvh", &["video/vnd.dece.hd"]),
-    ("uvvi", &["image/vnd.dece.graphic"]),
-    ("uvvm", &["video/vnd.dece.mobile"]),
-    ("uvvp", &["video/vnd.dece.pd"]),
-    ("uvvs", &["video/vnd.dece.sd"]),
-    ("uvvt", &["application/vnd.dece.ttml+xml"]),
-    ("uvvu", &["video/vnd.uvvu.mp4"]),
-    ("uvvv", &["video/vnd.dece.video"]),
-    ("uvvx", &["application/vnd.dece.unspecified"]),
-    ("uvvz", &["application/vnd.dece.zip"]),
-    ("uvx", &["application/vnd.dece.unspecified"]),
-    ("uvz", &["application/vnd.dece.zip"]),
-    ("vb", &["text/plain"]),
-    ("vbdproj", &["text/plain"]),
-    ("vbk", &["video/mpeg"]),
-    ("vbox", &["application/x-virtualbox-vbox"]),
-    ("vbox-extpack", &["application/x-virtualbox-vbox-extpack"]),
-    ("vbproj", &["text/plain"]),
-    ("vbs", &["text/vbscript"]),
-    ("vcard", &["text/vcard"]),
-    ("vcd", &["application/x-cdlink"]),
-    ("vcf", &["text/x-vcard"]),
-    ("vcg", &["application/vnd.groove-vcard"]),
-    ("vcproj", &["application/xml"]),
-    ("vcs", &["text/plain"]),
-    ("vcx", &["application/vnd.vcx"]),
-    ("vcxproj", &["application/xml"]),
-    ("vddproj", &["text/plain"]),
-    ("vdi", &["application/x-virtualbox-vdi"]),
-    ("vdp", &["text/plain"]),
-    ("vdproj", &["text/plain"]),
-    ("vdx", &["application/vnd.ms-visio.viewer"]),
-    ("vhd", &["application/x-virtualbox-vhd"]),
-    ("vis", &["application/vnd.visionary"]),
-    ("viv", &["video/vnd.vivo"]),
-    ("vmdk", &["application/x-virtualbox-vmdk"]),
-    ("vml", &["text/xml"]),
-    ("vob", &["video/x-ms-vob"]),
-    ("vor", &["application/vnd.stardivision.writer"]),
-    ("vox", &["application/x-authorware-bin"]),
-    ("vrml", &["model/vrml"]),
-    ("vscontent", &["application/xml"]),
-    ("vsct", &["text/xml"]),
-    ("vsd", &["application/vnd.visio"]),
-    ("vsf", &["application/vnd.vsf"]),
-    ("vsi", &["application/ms-vsi"]),
-    ("vsix", &["application/vsix"]),
-    ("vsixlangpack", &["text/xml"]),
-    ("vsixmanifest", &["text/xml"]),
-    ("vsmdi", &["application/xml"]),
-    ("vspscc", &["text/plain"]),
-    ("vss", &["application/vnd.visio"]),
-    ("vsscc", &["text/plain"]),
-    ("vssettings", &["text/xml"]),
-    ("vssscc", &["text/plain"]),
-    ("vst", &["application/vnd.visio"]),
-    ("vstemplate", &["text/xml"]),
-    ("vsto", &["application/x-ms-vsto"]),
-    ("vsw", &["application/vnd.visio"]),
-    ("vsx", &["application/vnd.visio"]),
-    ("vtt", &["text/vtt"]),
-    ("vtu", &["model/vnd.vtu"]),
-    ("vtx", &["application/vnd.visio"]),
-    ("vxml", &["application/voicexml+xml"]),
-    ("w3d", &["application/x-director"]),
-    ("wad", &["application/x-doom"]),
-    ("wadl", &["application/vnd.sun.wadl+xml"]),
-    ("war", &["application/java-archive"]),
-    ("wasm", &["application/wasm"]),
-    ("wav", &["audio/wav"]),
-    ("wave", &["audio/wav"]),
-    ("wax", &["audio/x-ms-wax"]),
-    ("wbk", &["application/msword"]),
-    ("wbmp", &["image/vnd.wap.wbmp"]),
-    ("wbs", &["application/vnd.criticaltools.wbs+xml"]),
-    ("wbxml", &["application/vnd.wap.wbxml"]),
-    ("wcm", &["application/vnd.ms-works"]),
-    ("wdb", &["application/vnd.ms-works"]),
-    ("wdp", &["image/vnd.ms-photo"]),
-    ("weba", &["audio/webm"]),
-    ("webapp", &["application/x-web-app-manifest+json"]),
-    ("webarchive", &["application/x-safari-webarchive"]),
-    ("webm", &["video/webm"]),
-    ("webmanifest", &["application/manifest+json"]),
-    ("webp", &["image/webp"]),
-    ("webtest", &["application/xml"]),
-    ("wg", &["application/vnd.pmi.widget"]),
-    ("wgt", &["application/widget"]),
-    ("wiq", &["application/xml"]),
-    ("wiz", &["application/msword"]),
-    ("wks", &["application/vnd.ms-works"]),
-    ("wlmp", &["application/wlmoviemaker"]),
-    ("wlpginstall", &["application/x-wlpg-detect"]),
-    ("wlpginstall3", &["application/x-wlpg3-detect"]),
-    ("wm", &["video/x-ms-wm"]),
-    ("wma", &["audio/x-ms-wma"]),
-    ("wmd", &["application/x-ms-wmd"]),
-    ("wmf", &["application/x-msmetafile"]),
-    ("wml", &["text/vnd.wap.wml"]),
-    ("wmlc", &["application/vnd.wap.wmlc"]),
-    ("wmls", &["text/vnd.wap.wmlscript"]),
-    ("wmlsc", &["application/vnd.wap.wmlscriptc"]),
-    ("wmp", &["video/x-ms-wmp"]),
-    ("wmv", &["video/x-ms-wmv"]),
-    ("wmx", &["video/x-ms-wmx"]),
-    ("wmz", &["application/x-ms-wmz"]),
-    ("woff", &["application/font-woff"]),
-    ("woff2", &["font/woff2"]),
-    ("wpd", &["application/vnd.wordperfect"]),
-    ("wpl", &["application/vnd.ms-wpl"]),
-    ("wps", &["application/vnd.ms-works"]),
-    ("wqd", &["application/vnd.wqd"]),
-    ("wri", &["application/x-mswrite"]),
-    ("wrl", &["x-world/x-vrml"]),
-    ("wrz", &["x-world/x-vrml"]),
-    ("wsc", &["text/scriptlet"]),
-    ("wsdl", &["text/xml"]),
-    ("wspolicy", &["application/wspolicy+xml"]),
-    ("wtb", &["application/vnd.webturbo"]),
-    ("wvx", &["video/x-ms-wvx"]),
-    ("x", &["application/directx"]),
-    ("x32", &["application/x-authorware-bin"]),
-    ("x3d", &["model/x3d+xml"]),
-    ("x3db", &["model/x3d+binary"]),
-    ("x3dbz", &["model/x3d+binary"]),
-    ("x3dv", &["model/x3d+vrml"]),
-    ("x3dvz", &["model/x3d+vrml"]),
-    ("x3dz", &["model/x3d+xml"]),
-    ("xaf", &["x-world/x-vrml"]),
-    ("xaml", &["application/xaml+xml"]),
-    ("xap", &["application/x-silverlight-app"]),
-    ("xar", &["application/vnd.xara"]),
-    ("xbap", &["application/x-ms-xbap"]),
-    ("xbd", &["application/vnd.fujixerox.docuworks.binder"]),
-    ("xbm", &["image/x-xbitmap"]),
-    ("xdf", &["application/xcap-diff+xml"]),
-    ("xdm", &["application/vnd.syncml.dm+xml"]),
-    ("xdp", &["application/vnd.adobe.xdp+xml"]),
-    ("xdr", &["text/plain"]),
-    ("xdssc", &["application/dssc+xml"]),
-    ("xdw", &["application/vnd.fujixerox.docuworks"]),
-    ("xenc", &["application/xenc+xml"]),
-    ("xer", &["application/patch-ops-error+xml"]),
-    ("xfdf", &["application/vnd.adobe.xfdf"]),
-    ("xfdl", &["application/vnd.xfdl"]),
-    ("xht", &["application/xhtml+xml"]),
-    ("xhtml", &["application/xhtml+xml"]),
-    ("xhvml", &["application/xv+xml"]),
-    ("xif", &["image/vnd.xiff"]),
-    ("xla", &["application/vnd.ms-excel"]),
-    ("xlam", &["application/vnd.ms-excel.addin.macroEnabled.12"]),
-    ("xlc", &["application/vnd.ms-excel"]),
-    ("xld", &["application/vnd.ms-excel"]),
-    ("xlf", &["application/x-xliff+xml"]),
-    ("xlk", &["application/vnd.ms-excel"]),
-    ("xll", &["application/vnd.ms-excel"]),
-    ("xlm", &["application/vnd.ms-excel"]),
-    ("xls", &["application/vnd.ms-excel"]),
-    (
-        "xlsb",
-        &["application/vnd.ms-excel.sheet.binary.macroEnabled.12"],
-    ),
-    ("xlsm", &["application/vnd.ms-excel.sheet.macroEnabled.12"]),
-    (
-        "xlsx",
-        &["application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"],
-    ),
-    ("xlt", &["application/vnd.ms-excel"]),
-    (
-        "xltm",
-        &["application/vnd.ms-excel.template.macroEnabled.12"],
-    ),
-    (
-        "xltx",
-        &["application/vnd.openxmlformats-officedocument.spreadsheetml.template"],
-    ),
-    ("xlw", &["application/vnd.ms-excel"]),
-    ("xm", &["audio/xm"]),
-    ("xml", &["text/xml"]),
-    ("xmp", &["application/octet-stream"]),
-    ("xmta", &["application/xml"]),
-    ("xo", &["application/vnd.olpc-sugar"]),
-    ("xof", &["x-world/x-vrml"]),
-    ("xoml", &["text/plain"]),
-    ("xop", &["application/xop+xml"]),
-    ("xpi", &["application/x-xpinstall"]),
-    ("xpl", &["application/xproc+xml"]),
-    ("xpm", &["image/x-xpixmap"]),
-    ("xpr", &["application/vnd.is-xpr"]),
-    ("xps", &["application/vnd.ms-xpsdocument"]),
-    ("xpw", &["application/vnd.intercon.formnet"]),
-    ("xpx", &["application/vnd.intercon.formnet"]),
-    ("xrm-ms", &["text/xml"]),
-    ("xsc", &["application/xml"]),
-    ("xsd", &["text/xml"]),
-    ("xsf", &["text/xml"]),
-    ("xsl", &["text/xml"]),
-    ("xslt", &["text/xml"]),
-    ("xsm", &["application/vnd.syncml+xml"]),
-    ("xsn", &["application/octet-stream"]),
-    ("xspf", &["application/xspf+xml"]),
-    ("xss", &["application/xml"]),
-    ("xtp", &["application/octet-stream"]),
-    ("xul", &["application/vnd.mozilla.xul+xml"]),
-    ("xvm", &["application/xv+xml"]),
-    ("xvml", &["application/xv+xml"]),
-    ("xwd", &["image/x-xwindowdump"]),
-    ("xyz", &["chemical/x-xyz"]),
-    ("xz", &["application/x-xz"]),
-    ("yaml", &["text/x-yaml"]),
-    ("yang", &["application/yang"]),
-    ("yin", &["application/yin+xml"]),
-    ("yml", &["text/x-yaml"]),
-    ("ymp", &["text/x-suse-ymp"]),
-    ("z", &["application/x-compress"]),
-    ("z1", &["application/x-zmachine"]),
-    ("z2", &["application/x-zmachine"]),
-    ("z3", &["application/x-zmachine"]),
-    ("z4", &["application/x-zmachine"]),
-    ("z5", &["application/x-zmachine"]),
-    ("z6", &["application/x-zmachine"]),
-    ("z7", &["application/x-zmachine"]),
-    ("z8", &["application/x-zmachine"]),
-    ("zaz", &["application/vnd.zzazz.deck+xml"]),
-    ("zip", &["application/zip"]),
-    ("zir", &["application/vnd.zul"]),
-    ("zirz", &["application/vnd.zul"]),
-    ("zmm", &["application/vnd.handheld-entertainment+xml"]),
-];
+/// A mapping of known file extensions and their MIME types.
+///
+/// Required to be sorted lexicographically by extension for ease of maintenance.
+///
+/// Multiple MIME types per extension are supported; the order is arbitrary but the first should be
+/// the most prevalent by most recent RFC declaration or explicit succession of other media types.
+///
+/// NOTE: when adding or modifying entries, please include a citation in the commit message.
+/// If a media type for an extension changed by official IETF RFC, please keep the old entry but add
+/// the new one before it in the slice literal, e.g.:
+///
+/// ```ignore
+/// - ("md", &["text/x-markdown"]),
+/// + ("md", &["text/markdown", "text/x-markdown"]),
+/// ```
+///
+/// Sourced from:
+/// https://github.com/samuelneff/MimeTypeMap/blob/master/src/MimeTypes/MimeTypeMap.cs
+/// https://github.com/jshttp/mime-db extracted with https://gist.github.com/soyuka/b7e29d359b2c14c21bdead923c01cc81
+pub static MIME_TYPES: &[(&str, &[&str])] = &[
+    ("123", &["application/vnd.lotus-1-2-3"]),
+    ("323", &["text/h323"]),
+    ("3dml", &["text/vnd.in3d.3dml"]),
+    ("3ds", &["image/x-3ds"]),
+    ("3g2", &["video/3gpp2"]),
+    ("3gp", &["video/3gpp"]),
+    ("3gp2", &["video/3gpp2"]),
+    ("3gpp", &["video/3gpp"]),
+    ("7z", &["application/x-7z-compressed"]),
+    ("aa", &["audio/audible"]),
+    ("aab", &["application/x-authorware-bin"]),
+    ("aac", &["audio/aac"]),
+    ("aaf", &["application/octet-stream"]),
+    ("aam", &["application/x-authorware-map"]),
+    ("aas", &["application/x-authorware-seg"]),
+    ("aax", &["audio/vnd.audible.aax"]),
+    ("abw", &["application/x-abiword"]),
+    ("ac", &["application/pkix-attr-cert"]),
+    ("ac3", &["audio/ac3"]),
+    ("aca", &["application/octet-stream"]),
+    ("acc", &["application/vnd.americandynamics.acc"]),
+    ("accda", &["application/msaccess.addin"]),
+    ("accdb", &["application/msaccess"]),
+    ("accdc", &["application/msaccess.cab"]),
+    ("accde", &["application/msaccess"]),
+    ("accdr", &["application/msaccess.runtime"]),
+    ("accdt", &["application/msaccess"]),
+    ("accdw", &["application/msaccess.webapplication"]),
+    ("accft", &["application/msaccess.ftemplate"]),
+    ("ace", &["application/x-ace-compressed"]),
+    ("acu", &["application/vnd.acucobol"]),
+    ("acutc", &["application/vnd.acucorp"]),
+    ("acx", &["application/internet-property-stream"]),
+    ("addin", &["text/xml"]),
+    ("ade", &["application/msaccess"]),
+    ("adobebridge", &["application/x-bridge-url"]),
+    ("adp", &["application/msaccess"]),
+    ("adt", &["audio/vnd.dlna.adts"]),
+    ("adts", &["audio/aac"]),
+    ("aep", &["application/vnd.audiograph"]),
+    ("afm", &["application/octet-stream"]),
+    ("afp", &["application/vnd.ibm.modcap"]),
+    ("ahead", &["application/vnd.ahead.space"]),
+    ("ai", &["application/postscript"]),
+    ("aif", &["audio/aiff"]),
+    ("aifc", &["audio/aiff"]),
+    ("aiff", &["audio/aiff"]),
+    (
+        "air",
+        &["application/vnd.adobe.air-application-installer-package+zip"],
+    ),
+    ("ait", &["application/vnd.dvb.ait"]),
+    ("amc", &["application/mpeg"]),
+    ("ami", &["application/vnd.amiga.ami"]),
+    ("anx", &["application/annodex"]),
+    ("apk", &["application/vnd.android.package-archive"]),
+    ("apng", &["image/apng"]),
+    ("appcache", &["text/cache-manifest"]),
+    ("application", &["application/x-ms-application"]),
+    ("apr", &["application/vnd.lotus-approach"]),
+    ("arc", &["application/x-freearc"]),
+    ("arj", &["application/x-arj"]),
+    ("art", &["image/x-jg"]),
+    ("arw", &["image/x-sony-arw"]),
+    ("asa", &["application/xml"]),
+    ("asax", &["application/xml"]),
+    ("asc", &["application/pgp-signature"]),
+    ("ascx", &["application/xml"]),
+    ("asd", &["application/octet-stream"]),
+    ("asf", &["video/x-ms-asf"]),
+    ("ashx", &["application/xml"]),
+    ("asi", &["application/octet-stream"]),
+    ("asm", &["text/plain"]),
+    ("asmx", &["application/xml"]),
+    ("aso", &["application/vnd.accpac.simply.aso"]),
+    ("aspx", &["application/xml"]),
+    ("asr", &["video/x-ms-asf"]),
+    ("asx", &["video/x-ms-asf"]),
+    ("atc", &["application/vnd.acucorp"]),
+    ("atom", &["application/atom+xml"]),
+    ("atomcat", &["application/atomcat+xml"]),
+    ("atomsvc", &["application/atomsvc+xml"]),
+    ("atx", &["application/vnd.antix.game-component"]),
+    ("au", &["audio/basic"]),
+    ("avi", &["video/x-msvideo"]),
+    ("avif", &["image/avif"]),
+    ("avifs", &["image/avif-sequence"]),
+    ("aw", &["application/applixware"]),
+    ("axa", &["audio/annodex"]),
+    ("axs", &["application/olescript"]),
+    ("axv", &["video/annodex"]),
+    ("azf", &["application/vnd.airzip.filesecure.azf"]),
+    ("azs", &["application/vnd.airzip.filesecure.azs"]),
+    ("azw", &["application/vnd.amazon.ebook"]),
+    ("bas", &["text/plain"]),
+    ("bat", &["application/x-msdownload"]),
+    ("bcpio", &["application/x-bcpio"]),
+    ("bdf", &["application/x-font-bdf"]),
+    ("bdm", &["application/vnd.syncml.dm+wbxml"]),
+    ("bdoc", &["application/bdoc"]),
+    ("bed", &["application/vnd.realvnc.bed"]),
+    ("bh2", &["application/vnd.fujitsu.oasysprs"]),
+    ("bin", &["application/octet-stream"]),
+    ("blb", &["application/x-blorb"]),
+    ("blorb", &["application/x-blorb"]),
+    ("bmi", &["application/vnd.bmi"]),
+    ("bmp", &["image/bmp"]),
+    ("book", &["application/vnd.framemaker"]),
+    ("box", &["application/vnd.previewsystems.box"]),
+    ("boz", &["application/x-bzip2"]),
+    ("bpk", &["application/octet-stream"]),
+    ("btif", &["image/prs.btif"]),
+    ("buffer", &["application/octet-stream"]),
+    ("bz", &["application/x-bzip"]),
+    ("bz2", &["application/x-bzip2"]),
+    ("c", &["text/plain"]),
+    ("c11amc", &["application/vnd.cluetrust.cartomobile-config"]),
+    (
+        "c11amz",
+        &["application/vnd.cluetrust.cartomobile-config-pkg"],
+    ),
+    ("c4d", &["application/vnd.clonk.c4group"]),
+    ("c4f", &["application/vnd.clonk.c4group"]),
+    ("c4g", &["application/vnd.clonk.c4group"]),
+    ("c4p", &["application/vnd.clonk.c4group"]),
+    ("c4u", &["application/vnd.clonk.c4group"]),
+    ("cab", &["application/octet-stream"]),
+    ("caf", &["audio/x-caf"]),
+    ("calx", &["application/vnd.ms-office.calx"]),
+    ("cap", &["application/vnd.tcpdump.pcap"]),
+    ("car", &["application/vnd.curl.car"]),
+    ("cat", &["application/vnd.ms-pki.seccat"]),
+    ("cb7", &["application/x-cbr"]),
+    ("cba", &["application/x-cbr"]),
+    ("cbr", &["application/x-cbr"]),
+    ("cbt", &["application/x-cbr"]),
+    ("cbz", &["application/x-cbr"]),
+    ("cc", &["text/plain"]),
+    ("cco", &["application/x-cocoa"]),
+    ("cct", &["application/x-director"]),
+    ("ccxml", &["application/ccxml+xml"]),
+    ("cd", &["text/plain"]),
+    ("cdbcmsg", &["application/vnd.contact.cmsg"]),
+    ("cdda", &["audio/aiff"]),
+    ("cdf", &["application/x-cdf"]),
+    ("cdkey", &["application/vnd.mediastation.cdkey"]),
+    ("cdmia", &["application/cdmi-capability"]),
+    ("cdmic", &["application/cdmi-container"]),
+    ("cdmid", &["application/cdmi-domain"]),
+    ("cdmio", &["application/cdmi-object"]),
+    ("cdmiq", &["application/cdmi-queue"]),
+    ("cdx", &["chemical/x-cdx"]),
+    ("cdxml", &["application/vnd.chemdraw+xml"]),
+    ("cdy", &["application/vnd.cinderella"]),
+    ("cer", &["application/x-x509-ca-cert"]),
+    ("cfg", &["text/plain"]),
+    ("cfs", &["application/x-cfs-compressed"]),
+    ("cgm", &["image/cgm"]),
+    ("chat", &["application/x-chat"]),
+    ("chm", &["application/vnd.ms-htmlhelp"]),
+    ("chrt", &["application/vnd.kde.kchart"]),
+    ("cif", &["chemical/x-cif"]),
+    (
+        "cii",
+        &["application/vnd.anser-web-certificate-issue-initiation"],
+    ),
+    ("cil", &["application/vnd.ms-artgalry"]),
+    ("cla", &["application/vnd.claymore"]),
+    ("class", &["application/x-java-applet"]),
+    ("clkk", &["application/vnd.crick.clicker.keyboard"]),
+    ("clkp", &["application/vnd.crick.clicker.palette"]),
+    ("clkt", &["application/vnd.crick.clicker.template"]),
+    ("clkw", &["application/vnd.crick.clicker.wordbank"]),
+    ("clkx", &["application/vnd.crick.clicker"]),
+    ("clp", &["application/x-msclip"]),
+    ("cmc", &["application/vnd.cosmocaller"]),
+    ("cmd", &["text/plain"]),
+    ("cmdf", &["chemical/x-cmdf"]),
+    ("cml", &["chemical/x-cml"]),
+    ("cmp", &["application/vnd.yellowriver-custom-menu"]),
+    ("cmx", &["image/x-cmx"]),
+    ("cnf", &["text/plain"]),
+    ("cod", &["image/cis-cod"]),
+    ("coffee", &["text/coffeescript"]),
+    ("com", &["application/x-msdownload"]),
+    ("conf", &["text/plain"]),
+    ("config", &["application/xml"]),
+    ("contact", &["text/x-ms-contact"]),
+    ("coverage", &["application/xml"]),
+    ("cpio", &["application/x-cpio"]),
+    ("cpp", &["text/plain"]),
+    ("cpt", &["application/mac-compactpro"]),
+    ("cr2", &["image/x-canon-cr2"]),
+    ("cr3", &["image/x-canon-cr3"]),
+    ("crd", &["application/x-mscardfile"]),
+    ("crl", &["application/pkix-crl"]),
+    ("crt", &["application/x-x509-ca-cert"]),
+    ("crw", &["image/x-canon-crw"]),
+    ("crx", &["application/x-chrome-extension"]),
+    ("cryptonote", &["application/vnd.rig.cryptonote"]),
+    ("cs", &["text/plain"]),
+    ("csdproj", &["text/plain"]),
+    ("csh", &["application/x-csh"]),
+    ("csl", &["application/vnd.citationstyles.style+xml"]),
+    ("csml", &["chemical/x-csml"]),
+    ("csp", &["application/vnd.commonspace"]),
+    ("csproj", &["text/plain"]),
+    ("css", &["text/css"]),
+    ("cst", &["application/x-director"]),
+    ("csv", &["text/csv"]),
+    ("cu", &["application/cu-seeme"]),
+    ("cur", &["application/octet-stream"]),
+    ("curl", &["text/vnd.curl"]),
+    ("cww", &["application/prs.cww"]),
+    ("cxt", &["application/x-director"]),
+    ("cxx", &["text/plain"]),
+    ("dae", &["model/vnd.collada+xml"]),
+    ("daf", &["application/vnd.mobius.daf"]),
+    ("dart", &["application/vnd.dart"]),
+    ("dat", &["application/octet-stream"]),
+    ("dataless", &["application/vnd.fdsn.seed"]),
+    ("datasource", &["application/xml"]),
+    ("davmount", &["application/davmount+xml"]),
+    ("dbk", &["application/docbook+xml"]),
+    ("dbproj", &["text/plain"]),
+    ("dcr", &[
+        "application/x-director",
+        "image/x-kodak-dcr",
+    ]),
+    ("dcurl", &["text/vnd.curl.dcurl"]),
+    ("dd2", &["application/vnd.oma.dd2+xml"]),
+    ("ddd", &["application/vnd.fujixerox.ddd"]),
+    ("deb", &["application/octet-stream"]),
+    ("def", &["text/plain"]),
+    ("deploy", &["application/octet-stream"]),
+    ("der", &["application/x-x509-ca-cert"]),
+    ("dfac", &["application/vnd.dreamfactory"]),
+    ("dgc", &["application/x-dgc-compressed"]),
+    ("dgml", &["application/xml"]),
+    ("dib", &["image/bmp"]),
+    ("dic", &["text/x-c"]),
+    ("dif", &["video/x-dv"]),
+    ("dir", &["application/x-director"]),
+    ("dis", &["application/vnd.mobius.dis"]),
+    ("disco", &["text/xml"]),
+    (
+        "disposition-notification",
+        &["message/disposition-notification"],
+    ),
+    ("dist", &["application/octet-stream"]),
+    ("distz", &["application/octet-stream"]),
+    ("divx", &["video/divx"]),
+    ("djv", &["image/vnd.djvu"]),
+    ("djvu", &["image/vnd.djvu"]),
+    ("dll", &["application/x-msdownload"]),
+    ("dll.config", &["text/xml"]),
+    ("dlm", &["text/dlm"]),
+    ("dmg", &["application/octet-stream"]),
+    ("dmp", &["application/vnd.tcpdump.pcap"]),
+    ("dms", &["application/octet-stream"]),
+    ("dna", &["application/vnd.dna"]),
+    ("dng", &["image/x-adobe-dng"]),
+    ("doc", &["application/msword"]),
+    (
+        "docm",
+        &["application/vnd.ms-word.document.macroEnabled.12"],
+    ),
+    (
+        "docx",
+        &["application/vnd.openxmlformats-officedocument.wordprocessingml.document"],
+    ),
+    ("dot", &["application/msword"]),
+    (
+        "dotm",
+        &["application/vnd.ms-word.template.macroEnabled.12"],
+    ),
+    (
+        "dotx",
+        &["application/vnd.openxmlformats-officedocument.wordprocessingml.template"],
+    ),
+    ("dp", &["application/vnd.osgi.dp"]),
+    ("dpg", &["application/vnd.dpgraph"]),
+    ("dra", &["audio/vnd.dra"]),
+    ("dsc", &["text/prs.lines.tag"]),
+    ("dsp", &["application/octet-stream"]),
+    ("dssc", &["application/dssc+der"]),
+    ("dsw", &["text/plain"]),
+    ("dtb", &["application/x-dtbook+xml"]),
+    ("dtd", &["text/xml"]),
+    ("dts", &["audio/vnd.dts"]),
+    ("dtsconfig", &["text/xml"]),
+    ("dtshd", &["audio/vnd.dts.hd"]),
+    ("dump", &["application/octet-stream"]),
+    ("dv", &["video/x-dv"]),
+    ("dvb", &["video/vnd.dvb.file"]),
+    ("dvi", &["application/x-dvi"]),
+    ("dwf", &["drawing/x-dwf"]),
+    ("dwg", &["application/acad"]),
+    ("dwp", &["application/octet-stream"]),
+    ("dxf", &["application/x-dxf"]),
+    ("dxp", &["application/vnd.spotfire.dxp"]),
+    ("dxr", &["application/x-director"]),
+    ("ear", &["application/java-archive"]),
+    ("ecelp4800", &["audio/vnd.nuera.ecelp4800"]),
+    ("ecelp7470", &["audio/vnd.nuera.ecelp7470"]),
+    ("ecelp9600", &["audio/vnd.nuera.ecelp9600"]),
+    ("ecma", &["text/javascript"]),
+    ("edm", &["application/vnd.novadigm.edm"]),
+    ("edx", &["application/vnd.novadigm.edx"]),
+    ("efif", &["application/vnd.picsel"]),
+    ("ei6", &["application/vnd.pg.osasli"]),
+    ("elc", &["application/octet-stream"]),
+    ("emf", &["application/x-msmetafile"]),
+    ("eml", &["message/rfc822"]),
+    ("emma", &["application/emma+xml"]),
+    ("emz", &["application/octet-stream"]),
+    ("eol", &["audio/vnd.digital-winds"]),
+    ("eot", &["application/vnd.ms-fontobject"]),
+    ("eps", &["application/postscript"]),
+    ("epub", &["application/epub+zip"]),
+    ("erf", &[
+        "application/x-endace-erf",
+        "image/x-epson-erf",
+    ]),
+    ("es", &["text/javascript"]),
+    ("es3", &["application/vnd.eszigno3+xml"]),
+    ("esa", &["application/vnd.osgi.subsystem"]),
+    ("esf", &["application/vnd.epson.esf"]),
+    ("et3", &["application/vnd.eszigno3+xml"]),
+    ("etl", &["application/etl"]),
+    ("etx", &["text/x-setext"]),
+    ("eva", &["application/x-eva"]),
+    ("evy", &["application/envoy"]),
+    ("exe", &["application/octet-stream"]),
+    ("exe.config", &["text/xml"]),
+    ("exi", &["application/exi"]),
+    ("ext", &["application/vnd.novadigm.ext"]),
+    ("ez", &["application/andrew-inset"]),
+    ("ez2", &["application/vnd.ezpix-album"]),
+    ("ez3", &["application/vnd.ezpix-package"]),
+    ("f", &["text/x-fortran"]),
+    ("f4v", &["video/x-f4v"]),
+    ("f77", &["text/x-fortran"]),
+    ("f90", &["text/x-fortran"]),
+    ("fbs", &["image/vnd.fastbidsheet"]),
+    ("fcdt", &["application/vnd.adobe.formscentral.fcdt"]),
+    ("fcs", &["application/vnd.isac.fcs"]),
+    ("fdf", &["application/vnd.fdf"]),
+    ("fe_launch", &["application/vnd.denovo.fcselayout-link"]),
+    ("feature", &["text/x-gherkin"]),
+    ("fg5", &["application/vnd.fujitsu.oasysgp"]),
+    ("fgd", &["application/x-director"]),
+    ("fh", &["image/x-freehand"]),
+    ("fh4", &["image/x-freehand"]),
+    ("fh5", &["image/x-freehand"]),
+    ("fh7", &["image/x-freehand"]),
+    ("fhc", &["image/x-freehand"]),
+    ("fif", &["application/fractals"]),
+    ("fig", &["application/x-xfig"]),
+    ("filters", &["application/xml"]),
+    ("fla", &["application/octet-stream"]),
+    ("flac", &["audio/flac"]),
+    ("fli", &["video/x-fli"]),
+    ("flo", &["application/vnd.micrografx.flo"]),
+    ("flr", &["x-world/x-vrml"]),
+    ("flv", &["video/x-flv"]),
+    ("flw", &["application/vnd.kde.kivio"]),
+    ("flx", &["text/vnd.fmi.flexstor"]),
+    ("fly", &["text/vnd.fly"]),
+    ("fm", &["application/vnd.framemaker"]),
+    ("fnc", &["application/vnd.frogans.fnc"]),
+    ("for", &["text/x-fortran"]),
+    ("fpx", &["image/vnd.fpx"]),
+    ("frame", &["application/vnd.framemaker"]),
+    ("fsc", &["application/vnd.fsc.weblaunch"]),
+    ("fsscript", &["application/fsharp-script"]),
+    ("fst", &["image/vnd.fst"]),
+    ("fsx", &["application/fsharp-script"]),
+    ("ftc", &["application/vnd.fluxtime.clip"]),
+    (
+        "fti",
+        &["application/vnd.anser-web-funds-transfer-initiation"],
+    ),
+    ("fvt", &["video/vnd.fvt"]),
+    ("fxp", &["application/vnd.adobe.fxp"]),
+    ("fxpl", &["application/vnd.adobe.fxp"]),
+    ("fzs", &["application/vnd.fuzzysheet"]),
+    ("g2w", &["application/vnd.geoplan"]),
+    ("g3", &["image/g3fax"]),
+    ("g3w", &["application/vnd.geospace"]),
+    ("gac", &["application/vnd.groove-account"]),
+    ("gam", &["application/x-tads"]),
+    ("gbr", &["application/rpki-ghostbusters"]),
+    ("gca", &["application/x-gca-compressed"]),
+    ("gdl", &["model/vnd.gdl"]),
+    ("gdoc", &["application/vnd.google-apps.document"]),
+    ("gemini", &["text/gemini"]),
+    ("generictest", &["application/xml"]),
+    ("geo", &["application/vnd.dynageo"]),
+    ("geojson", &["application/geo+json"]),
+    ("gex", &["application/vnd.geometry-explorer"]),
+    ("ggb", &["application/vnd.geogebra.file"]),
+    ("ggt", &["application/vnd.geogebra.tool"]),
+    ("ghf", &["application/vnd.groove-help"]),
+    ("gif", &["image/gif"]),
+    ("gim", &["application/vnd.groove-identity-message"]),
+    ("glb", &["model/gltf-binary"]),
+    ("gltf", &["model/gltf+json"]),
+    ("gmi", &["text/gemini"]),
+    ("gml", &["application/gml+xml"]),
+    ("gmx", &["application/vnd.gmx"]),
+    ("gnumeric", &["application/x-gnumeric"]),
+    ("gph", &["application/vnd.flographit"]),
+    ("gpx", &["application/gpx+xml"]),
+    ("gqf", &["application/vnd.grafeq"]),
+    ("gqs", &["application/vnd.grafeq"]),
+    ("gram", &["application/srgs"]),
+    ("gramps", &["application/x-gramps-xml"]),
+    ("gre", &["application/vnd.geometry-explorer"]),
+    ("group", &["text/x-ms-group"]),
+    ("grv", &["application/vnd.groove-injector"]),
+    ("grxml", &["application/srgs+xml"]),
+    ("gsf", &["application/x-font-ghostscript"]),
+    ("gsheet", &["application/vnd.google-apps.spreadsheet"]),
+    ("gslides", &["application/vnd.google-apps.presentation"]),
+    ("gsm", &["audio/x-gsm"]),
+    ("gtar", &["application/x-gtar"]),
+    ("gtm", &["application/vnd.groove-tool-message"]),
+    ("gtw", &["model/vnd.gtw"]),
+    ("gv", &["text/vnd.graphviz"]),
+    ("gxf", &["application/gxf"]),
+    ("gxt", &["application/vnd.geonext"]),
+    ("gz", &["application/gzip", "application/x-gzip"]),
+    ("h", &["text/plain"]),
+    ("h261", &["video/h261"]),
+    ("h263", &["video/h263"]),
+    ("h264", &["video/h264"]),
+    ("hal", &["application/vnd.hal+xml"]),
+    ("hbci", &["application/vnd.hbci"]),
+    ("hbs", &["text/x-handlebars-template"]),
+    ("hdd", &["application/x-virtualbox-hdd"]),
+    ("hdf", &["application/x-hdf"]),
+    ("hdml", &["text/x-hdml"]),
+    ("hdr", &["image/vnd.radiance"]),
+    ("heic", &["image/heic"]),
+    ("heics", &["image/heic-sequence"]),
+    ("heif", &["image/heif"]),
+    ("heifs", &["image/heif-sequence"]),
+    ("hh", &["text/plain"]),
+    ("hhc", &["application/x-oleobject"]),
+    ("hhk", &["application/octet-stream"]),
+    ("hhp", &["application/octet-stream"]),
+    ("hjson", &["application/hjson"]),
+    ("hlp", &["application/winhlp"]),
+    ("hpgl", &["application/vnd.hp-hpgl"]),
+    ("hpid", &["application/vnd.hp-hpid"]),
+    ("hpp", &["text/plain"]),
+    ("hps", &["application/vnd.hp-hps"]),
+    ("hqx", &["application/mac-binhex40"]),
+    ("hta", &["application/hta"]),
+    ("htc", &["text/x-component"]),
+    ("htke", &["application/vnd.kenameaapp"]),
+    ("htm", &["text/html"]),
+    ("html", &["text/html"]),
+    ("htt", &["text/webviewhtml"]),
+    ("hvd", &["application/vnd.yamaha.hv-dic"]),
+    ("hvp", &["application/vnd.yamaha.hv-voice"]),
+    ("hvs", &["application/vnd.yamaha.hv-script"]),
+    ("hxa", &["application/xml"]),
+    ("hxc", &["application/xml"]),
+    ("hxd", &["application/octet-stream"]),
+    ("hxe", &["application/xml"]),
+    ("hxf", &["application/xml"]),
+    ("hxh", &["application/octet-stream"]),
+    ("hxi", &["application/octet-stream"]),
+    ("hxk", &["application/xml"]),
+    ("hxq", &["application/octet-stream"]),
+    ("hxr", &["application/octet-stream"]),
+    ("hxs", &["application/octet-stream"]),
+    ("hxt", &["text/html"]),
+    ("hxv", &["application/xml"]),
+    ("hxw", &["application/octet-stream"]),
+    ("hxx", &["text/plain"]),
+    ("i", &["text/plain"]),
+    ("i2g", &["application/vnd.intergeo"]),
+    ("icc", &["application/vnd.iccprofile"]),
+    ("ice", &["x-conference/x-cooltalk"]),
+    ("icm", &["application/vnd.iccprofile"]),
+    ("ico", &["image/x-icon"]),
+    ("ics", &["text/calendar"]),
+    ("idl", &["text/plain"]),
+    ("ief", &["image/ief"]),
+    ("ifb", &["text/calendar"]),
+    ("ifm", &["application/vnd.shana.informed.formdata"]),
+    ("iges", &["model/iges"]),
+    ("igl", &["application/vnd.igloader"]),
+    ("igm", &["application/vnd.insors.igm"]),
+    ("igs", &["model/iges"]),
+    ("igx", &["application/vnd.micrografx.igx"]),
+    ("iif", &["application/vnd.shana.informed.interchange"]),
+    ("iii", &["application/x-iphone"]),
+    ("img", &["application/octet-stream"]),
+    ("imp", &["application/vnd.accpac.simply.imp"]),
+    ("ims", &["application/vnd.ms-ims"]),
+    ("in", &["text/plain"]),
+    ("inc", &["text/plain"]),
+    ("inf", &["application/octet-stream"]),
+    ("ini", &["text/plain"]),
+    ("ink", &["application/inkml+xml"]),
+    ("inkml", &["application/inkml+xml"]),
+    ("inl", &["text/plain"]),
+    ("ins", &["application/x-internet-signup"]),
+    ("install", &["application/x-install-instructions"]),
+    ("iota", &["application/vnd.astraea-software.iota"]),
+    ("ipa", &["application/x-itunes-ipa"]),
+    ("ipfix", &["application/ipfix"]),
+    ("ipg", &["application/x-itunes-ipg"]),
+    ("ipk", &["application/vnd.shana.informed.package"]),
+    ("ipproj", &["text/plain"]),
+    ("ipsw", &["application/x-itunes-ipsw"]),
+    ("iqy", &["text/x-ms-iqy"]),
+    ("irm", &["application/vnd.ibm.rights-management"]),
+    ("irp", &["application/vnd.irepository.package+xml"]),
+    ("iso", &["application/octet-stream"]),
+    ("isp", &["application/x-internet-signup"]),
+    ("ite", &["application/x-itunes-ite"]),
+    ("itlp", &["application/x-itunes-itlp"]),
+    ("itms", &["application/x-itunes-itms"]),
+    ("itp", &["application/vnd.shana.informed.formtemplate"]),
+    ("itpc", &["application/x-itunes-itpc"]),
+    ("ivf", &["video/x-ivf"]),
+    ("ivp", &["application/vnd.immervision-ivp"]),
+    ("ivu", &["application/vnd.immervision-ivu"]),
+    ("jad", &["text/vnd.sun.j2me.app-descriptor"]),
+    ("jade", &["text/jade"]),
+    ("jam", &["application/vnd.jam"]),
+    ("jar", &["application/java-archive"]),
+    ("jardiff", &["application/x-java-archive-diff"]),
+    ("java", &["application/octet-stream"]),
+    ("jck", &["application/liquidmotion"]),
+    ("jcz", &["application/liquidmotion"]),
+    ("jfif", &["image/jpeg"]),
+    ("jisp", &["application/vnd.jisp"]),
+    ("jlt", &["application/vnd.hp-jlyt"]),
+    ("jng", &["image/x-jng"]),
+    ("jnlp", &["application/x-java-jnlp-file"]),
+    ("joda", &["application/vnd.joost.joda-archive"]),
+    ("jp2", &["image/jp2"]),
+    ("jpb", &["application/octet-stream"]),
+    ("jpe", &["image/jpeg"]),
+    ("jpeg", &["image/jpeg"]),
+    ("jpf", &["image/jpx"]),
+    ("jpg", &["image/jpeg"]),
+    ("jpg2", &["image/jp2"]),
+    ("jpgm", &["video/jpm"]),
+    ("jpgv", &["video/jpeg"]),
+    ("jpm", &["image/jpm"]),
+    ("jpx", &["image/jpx"]),
+    ("js", &["text/javascript"]),
+    ("jsm", &["text/javascript"]),
+    ("json", &["application/json"]),
+    ("json5", &["application/json5"]),
+    ("jsonld", &["application/ld+json"]),
+    ("jsonml", &["application/jsonml+json"]),
+    ("jsx", &["text/javascript"]),
+    ("jsxbin", &["text/plain"]),
+    ("jxl", &["image/jxl"]),
+    ("k25", &["image/x-kodak-k25"]),
+    ("kar", &["audio/midi"]),
+    ("karbon", &["application/vnd.kde.karbon"]),
+    ("kdc", &["image/x-kodak-kdc"]),
+    ("kfo", &["application/vnd.kde.kformula"]),
+    ("kia", &["application/vnd.kidspiration"]),
+    ("kml", &["application/vnd.google-earth.kml+xml"]),
+    ("kmz", &["application/vnd.google-earth.kmz"]),
+    ("kne", &["application/vnd.kinar"]),
+    ("knp", &["application/vnd.kinar"]),
+    ("kon", &["application/vnd.kde.kontour"]),
+    ("kpr", &["application/vnd.kde.kpresenter"]),
+    ("kpt", &["application/vnd.kde.kpresenter"]),
+    ("kpxx", &["application/vnd.ds-keypoint"]),
+    ("ksp", &["application/vnd.kde.kspread"]),
+    ("ktr", &["application/vnd.kahootz"]),
+    ("ktx", &["image/ktx"]),
+    ("ktz", &["application/vnd.kahootz"]),
+    ("kwd", &["application/vnd.kde.kword"]),
+    ("kwt", &["application/vnd.kde.kword"]),
+    ("lasxml", &["application/vnd.las.las+xml"]),
+    ("latex", &["application/x-latex"]),
+    (
+        "lbd",
+        &["application/vnd.llamagraphics.life-balance.desktop"],
+    ),
+    (
+        "lbe",
+        &["application/vnd.llamagraphics.life-balance.exchange+xml"],
+    ),
+    ("les", &["application/vnd.hhe.lesson-player"]),
+    ("less", &["text/less"]),
+    ("lha", &["application/x-lzh-compressed"]),
+    ("library-ms", &["application/windows-library+xml"]),
+    ("link66", &["application/vnd.route66.link66+xml"]),
+    ("list", &["text/plain"]),
+    ("list3820", &["application/vnd.ibm.modcap"]),
+    ("listafp", &["application/vnd.ibm.modcap"]),
+    ("lit", &["application/x-ms-reader"]),
+    ("litcoffee", &["text/coffeescript"]),
+    ("lnk", &["application/x-ms-shortcut"]),
+    ("loadtest", &["application/xml"]),
+    ("log", &["text/plain"]),
+    ("lostxml", &["application/lost+xml"]),
+    ("lpk", &["application/octet-stream"]),
+    ("lrf", &["application/octet-stream"]),
+    ("lrm", &["application/vnd.ms-lrm"]),
+    ("lsf", &["video/x-la-asf"]),
+    ("lst", &["text/plain"]),
+    ("lsx", &["video/x-la-asf"]),
+    ("ltf", &["application/vnd.frogans.ltf"]),
+    ("lua", &["text/x-lua"]),
+    ("luac", &["application/x-lua-bytecode"]),
+    ("lvp", &["audio/vnd.lucent.voice"]),
+    ("lwp", &["application/vnd.lotus-wordpro"]),
+    ("lzh", &["application/octet-stream"]),
+    ("m13", &["application/x-msmediaview"]),
+    ("m14", &["application/x-msmediaview"]),
+    ("m1v", &["video/mpeg"]),
+    ("m21", &["application/mp21"]),
+    ("m2a", &["audio/mpeg"]),
+    ("m2t", &["video/vnd.dlna.mpeg-tts"]),
+    ("m2ts", &["video/vnd.dlna.mpeg-tts"]),
+    ("m2v", &["video/mpeg"]),
+    ("m3a", &["audio/mpeg"]),
+    ("m3u", &["audio/x-mpegurl"]),
+    ("m3u8", &["audio/x-mpegurl"]),
+    ("m4a", &["audio/m4a"]),
+    ("m4b", &["audio/m4b"]),
+    ("m4p", &["audio/m4p"]),
+    ("m4r", &["audio/x-m4r"]),
+    ("m4u", &["video/vnd.mpegurl"]),
+    ("m4v", &["video/x-m4v"]),
+    ("ma", &["application/mathematica"]),
+    ("mac", &["image/x-macpaint"]),
+    ("mads", &["application/mads+xml"]),
+    ("mag", &["application/vnd.ecowin.chart"]),
+    ("mak", &["text/plain"]),
+    ("maker", &["application/vnd.framemaker"]),
+    ("man", &["application/x-troff-man"]),
+    ("manifest", &["application/x-ms-manifest"]),
+    ("map", &["text/plain"]),
+    ("mar", &["application/octet-stream"]),
+    ("markdown", &["text/markdown"]),
+    ("master", &["application/xml"]),
+    ("mathml", &["application/mathml+xml"]),
+    ("mb", &["application/mathematica"]),
+    ("mbk", &["application/vnd.mobius.mbk"]),
+    ("mbox", &["application/mbox"]),
+    ("mc1", &["application/vnd.medcalcdata"]),
+    ("mcd", &["application/vnd.mcd"]),
+    ("mcurl", &["text/vnd.curl.mcurl"]),
+    ("md", &["text/markdown", "text/x-markdown"]),
+    ("mda", &["application/msaccess"]),
+    ("mdb", &["application/x-msaccess"]),
+    ("mde", &["application/msaccess"]),
+    ("mdi", &["image/vnd.ms-modi"]),
+    ("mdp", &["application/octet-stream"]),
+    ("me", &["application/x-troff-me"]),
+    ("mesh", &["model/mesh"]),
+    ("meta4", &["application/metalink4+xml"]),
+    ("metalink", &["application/metalink+xml"]),
+    ("mets", &["application/mets+xml"]),
+    ("mfm", &["application/vnd.mfmp"]),
+    ("mfp", &["application/x-shockwave-flash"]),
+    ("mft", &["application/rpki-manifest"]),
+    ("mgp", &["application/vnd.osgeo.mapguide.package"]),
+    ("mgz", &["application/vnd.proteus.magazine"]),
+    ("mht", &["message/rfc822"]),
+    ("mhtml", &["message/rfc822"]),
+    ("mid", &["audio/mid"]),
+    ("midi", &["audio/mid"]),
+    ("mie", &["application/x-mie"]),
+    ("mif", &["application/vnd.mif"]),
+    ("mime", &["message/rfc822"]),
+    ("mix", &["application/octet-stream"]),
+    ("mj2", &["video/mj2"]),
+    ("mjp2", &["video/mj2"]),
+    ("mjs", &["application/javascript"]),
+    ("mk", &["text/plain"]),
+    ("mk3d", &["video/x-matroska"]),
+    ("mka", &["audio/x-matroska"]),
+    ("mkd", &["text/x-markdown"]),
+    ("mks", &["video/x-matroska"]),
+    ("mkv", &["video/x-matroska"]),
+    ("mlp", &["application/vnd.dolby.mlp"]),
+    ("mmd", &["application/vnd.chipnuts.karaoke-mmd"]),
+    ("mmf", &["application/x-smaf"]),
+    ("mml", &["text/mathml"]),
+    ("mmr", &["image/vnd.fujixerox.edmics-mmr"]),
+    ("mng", &["video/x-mng"]),
+    ("mno", &["text/xml"]),
+    ("mny", &["application/x-msmoney"]),
+    ("mobi", &["application/x-mobipocket-ebook"]),
+    ("mod", &["video/mpeg"]),
+    ("mods", &["application/mods+xml"]),
+    ("mov", &["video/quicktime"]),
+    ("movie", &["video/x-sgi-movie"]),
+    ("mp2", &["audio/mpeg", "video/mpeg"]),
+    ("mp21", &["application/mp21"]),
+    ("mp2a", &["audio/mpeg"]),
+    ("mp2v", &["video/mpeg"]),
+    ("mp3", &["audio/mpeg"]),
+    ("mp4", &["video/mp4"]),
+    ("mp4a", &["audio/mp4"]),
+    ("mp4s", &["application/mp4"]),
+    ("mp4v", &["video/mp4"]),
+    ("mpa", &["video/mpeg"]),
+    ("mpc", &["application/vnd.mophun.certificate"]),
+    ("mpd", &["application/dash+xml"]),
+    ("mpe", &["video/mpeg"]),
+    ("mpeg", &["video/mpeg"]),
+    ("mpf", &["application/vnd.ms-mediapackage"]),
+    ("mpg", &["video/mpeg"]),
+    ("mpg4", &["video/mp4"]),
+    ("mpga", &["audio/mpeg"]),
+    ("mpkg", &["application/vnd.apple.installer+xml"]),
+    ("mpm", &["application/vnd.blueice.multipass"]),
+    ("mpn", &["application/vnd.mophun.application"]),
+    ("mpp", &["application/vnd.ms-project"]),
+    ("mpt", &["application/vnd.ms-project"]),
+    ("mpv2", &["video/mpeg"]),
+    ("mpy", &["application/vnd.ibm.minipay"]),
+    ("mqv", &["video/quicktime"]),
+    ("mqy", &["application/vnd.mobius.mqy"]),
+    ("mrc", &["application/marc"]),
+    ("mrcx", &["application/marcxml+xml"]),
+    ("mrw", &["image/x-minolta-mrw"]),
+    ("ms", &["application/x-troff-ms"]),
+    ("mscml", &["application/mediaservercontrol+xml"]),
+    ("mseed", &["application/vnd.fdsn.mseed"]),
+    ("mseq", &["application/vnd.mseq"]),
+    ("msf", &["application/vnd.epson.msf"]),
+    ("msg", &["application/vnd.ms-outlook"]),
+    ("msh", &["model/mesh"]),
+    ("msi", &["application/octet-stream"]),
+    ("msl", &["application/vnd.mobius.msl"]),
+    ("msm", &["application/octet-stream"]),
+    ("mso", &["application/octet-stream"]),
+    ("msp", &["application/octet-stream"]),
+    ("msty", &["application/vnd.muvee.style"]),
+    ("mts", &["video/vnd.dlna.mpeg-tts"]),
+    ("mtx", &["application/xml"]),
+    ("mus", &["application/vnd.musician"]),
+    ("musicxml", &["application/vnd.recordare.musicxml+xml"]),
+    ("mvb", &["application/x-msmediaview"]),
+    ("mvc", &["application/x-miva-compiled"]),
+    ("mwf", &["application/vnd.mfer"]),
+    ("mxf", &["application/mxf"]),
+    ("mxl", &["application/vnd.recordare.musicxml"]),
+    ("mxml", &["application/xv+xml"]),
+    ("mxp", &["application/x-mmxp"]),
+    ("mxs", &["application/vnd.triscape.mxs"]),
+    ("mxu", &["video/vnd.mpegurl"]),
+    ("n-gage", &["application/vnd.nokia.n-gage.symbian.install"]),
+    ("n3", &["text/n3"]),
+    ("nb", &["application/mathematica"]),
+    ("nbp", &["application/vnd.wolfram.player"]),
+    ("nc", &["application/x-netcdf"]),
+    ("ncx", &["application/x-dtbncx+xml"]),
+    ("nef", &["image/x-nikon-nef"]),
+    ("nfo", &["text/x-nfo"]),
+    ("ngdat", &["application/vnd.nokia.n-gage.data"]),
+    ("nitf", &["application/vnd.nitf"]),
+    ("nlu", &["application/vnd.neurolanguage.nlu"]),
+    ("nml", &["application/vnd.enliven"]),
+    ("nnd", &["application/vnd.noblenet-directory"]),
+    ("nns", &["application/vnd.noblenet-sealer"]),
+    ("nnw", &["application/vnd.noblenet-web"]),
+    ("npx", &["image/vnd.net-fpx"]),
+    ("nq", &["application/n-quads"]),
+    ("nrw", &["image/x-nikon-nrw"]),
+    ("nsc", &["video/x-ms-asf"]),
+    ("nsf", &["application/vnd.lotus-notes"]),
+    ("nt", &["application/n-triples"]),
+    ("ntf", &["application/vnd.nitf"]),
+    ("nws", &["message/rfc822"]),
+    ("nzb", &["application/x-nzb"]),
+    ("oa2", &["application/vnd.fujitsu.oasys2"]),
+    ("oa3", &["application/vnd.fujitsu.oasys3"]),
+    ("oas", &["application/vnd.fujitsu.oasys"]),
+    ("obd", &["application/x-msbinder"]),
+    ("obj", &["application/x-tgif"]),
+    ("ocx", &["application/octet-stream"]),
+    ("oda", &["application/oda"]),
+    ("odb", &["application/vnd.oasis.opendocument.database"]),
+    ("odc", &["application/vnd.oasis.opendocument.chart"]),
+    ("odf", &["application/vnd.oasis.opendocument.formula"]),
+    (
+        "odft",
+        &["application/vnd.oasis.opendocument.formula-template"],
+    ),
+    ("odg", &["application/vnd.oasis.opendocument.graphics"]),
+    ("odh", &["text/plain"]),
+    ("odi", &["application/vnd.oasis.opendocument.image"]),
+    ("odl", &["text/plain"]),
+    ("odm", &["application/vnd.oasis.opendocument.text-master"]),
+    ("odp", &["application/vnd.oasis.opendocument.presentation"]),
+    ("ods", &["application/vnd.oasis.opendocument.spreadsheet"]),
+    ("odt", &["application/vnd.oasis.opendocument.text"]),
+    ("oga", &["audio/ogg"]),
+    ("ogg", &["audio/ogg"]),
+    ("ogv", &["video/ogg"]),
+    ("ogx", &["application/ogg"]),
+    ("omdoc", &["application/omdoc+xml"]),
+    ("one", &["application/onenote"]),
+    ("onea", &["application/onenote"]),
+    ("onepkg", &["application/onenote"]),
+    ("onetmp", &["application/onenote"]),
+    ("onetoc", &["application/onenote"]),
+    ("onetoc2", &["application/onenote"]),
+    ("opf", &["application/oebps-package+xml"]),
+    ("opml", &["text/x-opml"]),
+    ("oprc", &["application/vnd.palm"]),
+    ("opus", &["audio/ogg"]),
+    ("orderedtest", &["application/xml"]),
+    ("orf", &["image/x-olympus-orf"]),
+    ("org", &["application/vnd.lotus-organizer"]),
+    ("osdx", &["application/opensearchdescription+xml"]),
+    ("osf", &["application/vnd.yamaha.openscoreformat"]),
+    (
+        "osfpvg",
+        &["application/vnd.yamaha.openscoreformat.osfpvg+xml"],
+    ),
+    (
+        "otc",
+        &["application/vnd.oasis.opendocument.chart-template"],
+    ),
+    ("otf", &["application/font-sfnt"]),
+    (
+        "otg",
+        &["application/vnd.oasis.opendocument.graphics-template"],
+    ),
+    ("oth", &["application/vnd.oasis.opendocument.text-web"]),
+    (
+        "oti",
+        &["application/vnd.oasis.opendocument.image-template"],
+    ),
+    (
+        "otp",
+        &["application/vnd.oasis.opendocument.presentation-template"],
+    ),
+    (
+        "ots",
+        &["application/vnd.oasis.opendocument.spreadsheet-template"],
+    ),
+    ("ott", &["application/vnd.oasis.opendocument.text-template"]),
+    ("ova", &["application/x-virtualbox-ova"]),
+    ("ovf", &["application/x-virtualbox-ovf"]),
+    ("oxps", &["application/oxps"]),
+    ("oxt", &["application/vnd.openofficeorg.extension"]),
+    ("p", &["text/x-pascal"]),
+    ("p10", &["application/pkcs10"]),
+    ("p12", &["application/x-pkcs12"]),
+    ("p7b", &["application/x-pkcs7-certificates"]),
+    ("p7c", &["application/pkcs7-mime"]),
+    ("p7m", &["application/pkcs7-mime"]),
+    ("p7r", &["application/x-pkcs7-certreqresp"]),
+    ("p7s", &["application/pkcs7-signature"]),
+    ("p8", &["application/pkcs8"]),
+    ("pac", &["application/x-ns-proxy-autoconfig"]),
+    ("parquet", &["application/vnd.apache.parquet", "application/x-parquet"]),
+    ("pas", &["text/x-pascal"]),
+    ("paw", &["application/vnd.pawaafile"]),
+    ("pbd", &["application/vnd.powerbuilder6"]),
+    ("pbm", &["image/x-portable-bitmap"]),
+    ("pcap", &["application/vnd.tcpdump.pcap"]),
+    ("pcast", &["application/x-podcast"]),
+    ("pcf", &["application/x-font-pcf"]),
+    ("pcl", &["application/vnd.hp-pcl"]),
+    ("pclxl", &["application/vnd.hp-pclxl"]),
+    ("pct", &["image/pict"]),
+    ("pcurl", &["application/vnd.curl.pcurl"]),
+    ("pcx", &["application/octet-stream"]),
+    ("pcz", &["application/octet-stream"]),
+    ("pdb", &["application/vnd.palm"]),
+    ("pde", &["text/x-processing"]),
+    ("pdf", &["application/pdf"]),
+    ("pef", &["image/x-pentax-pef"]),
+    ("pem", &["application/x-x509-ca-cert"]),
+    ("pfa", &["application/x-font-type1"]),
+    ("pfb", &["application/octet-stream"]),
+    ("pfm", &["application/octet-stream"]),
+    ("pfr", &["application/font-tdpfr"]),
+    ("pfx", &["application/x-pkcs12"]),
+    ("pgm", &["image/x-portable-graymap"]),
+    ("pgn", &["application/x-chess-pgn"]),
+    ("pgp", &["application/pgp-encrypted"]),
+    ("php", &["application/x-httpd-php"]),
+    ("pic", &["image/pict"]),
+    ("pict", &["image/pict"]),
+    ("pkg", &["application/octet-stream"]),
+    ("pkgdef", &["text/plain"]),
+    ("pkgundef", &["text/plain"]),
+    ("pki", &["application/pkixcmp"]),
+    ("pkipath", &["application/pkix-pkipath"]),
+    ("pko", &["application/vnd.ms-pki.pko"]),
+    ("pkpass", &["application/vnd.apple.pkpass"]),
+    ("pl", &["application/x-perl"]),
+    ("plb", &["application/vnd.3gpp.pic-bw-large"]),
+    ("plc", &["application/vnd.mobius.plc"]),
+    ("plf", &["application/vnd.pocketlearn"]),
+    ("pls", &["audio/scpls"]),
+    ("pm", &["application/x-perl"]),
+    ("pma", &["application/x-perfmon"]),
+    ("pmc", &["application/x-perfmon"]),
+    ("pml", &["application/x-perfmon"]),
+    ("pmr", &["application/x-perfmon"]),
+    ("pmw", &["application/x-perfmon"]),
+    ("png", &["image/png"]),
+    ("pnm", &["image/x-portable-anymap"]),
+    ("pnt", &["image/x-macpaint"]),
+    ("pntg", &["image/x-macpaint"]),
+    ("pnz", &["image/png"]),
+    ("portpkg", &["application/vnd.macports.portpkg"]),
+    ("pot", &["application/vnd.ms-powerpoint"]),
+    (
+        "potm",
+        &["application/vnd.ms-powerpoint.template.macroEnabled.12"],
+    ),
+    (
+        "potx",
+        &["application/vnd.openxmlformats-officedocument.presentationml.template"],
+    ),
+    ("ppa", &["application/vnd.ms-powerpoint"]),
+    (
+        "ppam",
+        &["application/vnd.ms-powerpoint.addin.macroEnabled.12"],
+    ),
+    ("ppd", &["application/vnd.cups-ppd"]),
+    ("ppm", &["image/x-portable-pixmap"]),
+    ("pps", &["application/vnd.ms-powerpoint"]),
+    (
+        "ppsm",
+        &["application/vnd.ms-powerpoint.slideshow.macroEnabled.12"],
+    ),
+    (
+        "ppsx",
+        &["application/vnd.openxmlformats-officedocument.presentationml.slideshow"],
+    ),
+    ("ppt", &["application/vnd.ms-powerpoint"]),
+    (
+        "pptm",
+        &["application/vnd.ms-powerpoint.presentation.macroEnabled.12"],
+    ),
+    (
+        "pptx",
+        &["application/vnd.openxmlformats-officedocument.presentationml.presentation"],
+    ),
+    ("pqa", &["application/vnd.palm"]),
+    ("prc", &["application/x-mobipocket-ebook"]),
+    ("pre", &["application/vnd.lotus-freelance"]),
+    ("prf", &["application/pics-rules"]),
+    ("prm", &["application/octet-stream"]),
+    ("prx", &["application/octet-stream"]),
+    ("ps", &["application/postscript"]),
+    ("psb", &["application/vnd.3gpp.pic-bw-small"]),
+    ("psc1", &["application/PowerShell"]),
+    ("psd", &["application/octet-stream"]),
+    ("psess", &["application/xml"]),
+    ("psf", &["application/x-font-linux-psf"]),
+    ("pskcxml", &["application/pskc+xml"]),
+    ("psm", &["application/octet-stream"]),
+    ("psp", &["application/octet-stream"]),
+    ("pst", &["application/vnd.ms-outlook"]),
+    ("ptid", &["application/vnd.pvi.ptid1"]),
+    ("pub", &["application/x-mspublisher"]),
+    ("pvb", &["application/vnd.3gpp.pic-bw-var"]),
+    ("pwn", &["application/vnd.3m.post-it-notes"]),
+    ("pwz", &["application/vnd.ms-powerpoint"]),
+    ("py", &["text/plain"]),
+    ("pya", &["audio/vnd.ms-playready.media.pya"]),
+    ("pyv", &["video/vnd.ms-playready.media.pyv"]),
+    ("qam", &["application/vnd.epson.quickanime"]),
+    ("qbo", &["application/vnd.intu.qbo"]),
+    ("qfx", &["application/vnd.intu.qfx"]),
+    ("qht", &["text/x-html-insertion"]),
+    ("qhtm", &["text/x-html-insertion"]),
+    ("qps", &["application/vnd.publishare-delta-tree"]),
+    ("qt", &["video/quicktime"]),
+    ("qti", &["image/x-quicktime"]),
+    ("qtif", &["image/x-quicktime"]),
+    ("qtl", &["application/x-quicktimeplayer"]),
+    ("qwd", &["application/vnd.quark.quarkxpress"]),
+    ("qwt", &["application/vnd.quark.quarkxpress"]),
+    ("qxb", &["application/vnd.quark.quarkxpress"]),
+    ("qxd", &["application/octet-stream"]),
+    ("qxl", &["application/vnd.quark.quarkxpress"]),
+    ("qxt", &["application/vnd.quark.quarkxpress"]),
+    ("ra", &["audio/x-pn-realaudio"]),
+    ("raf", &["image/x-fuji-raf"]),
+    ("ram", &["audio/x-pn-realaudio"]),
+    ("raml", &["application/raml+yaml"]),
+    ("rar", &["application/x-rar-compressed"]),
+    ("ras", &["image/x-cmu-raster"]),
+    ("rat", &["application/rat-file"]),
+    ("raw", &["image/x-panasonic-rw"]),
+    ("rc", &["text/plain"]),
+    ("rc2", &["text/plain"]),
+    ("rcprofile", &["application/vnd.ipunplugged.rcprofile"]),
+    ("rct", &["text/plain"]),
+    ("rdf", &["application/rdf+xml"]),
+    ("rdlc", &["application/xml"]),
+    ("rdz", &["application/vnd.data-vision.rdz"]),
+    ("reg", &["text/plain"]),
+    ("rep", &["application/vnd.businessobjects"]),
+    ("res", &["application/x-dtbresource+xml"]),
+    ("resx", &["application/xml"]),
+    ("rf", &["image/vnd.rn-realflash"]),
+    ("rgb", &["image/x-rgb"]),
+    ("rgs", &["text/plain"]),
+    ("rif", &["application/reginfo+xml"]),
+    ("rip", &["audio/vnd.rip"]),
+    ("ris", &["application/x-research-info-systems"]),
+    ("rl", &["application/resource-lists+xml"]),
+    ("rlc", &["image/vnd.fujixerox.edmics-rlc"]),
+    ("rld", &["application/resource-lists-diff+xml"]),
+    ("rm", &["application/vnd.rn-realmedia"]),
+    ("rmi", &["audio/mid"]),
+    ("rmp", &["application/vnd.rn-rn_music_package"]),
+    ("rms", &["application/vnd.jcp.javame.midlet-rms"]),
+    ("rmvb", &["application/vnd.rn-realmedia-vbr"]),
+    ("rnc", &["application/relax-ng-compact-syntax"]),
+    ("rng", &["application/xml"]),
+    ("roa", &["application/rpki-roa"]),
+    ("roff", &["application/x-troff"]),
+    ("rp9", &["application/vnd.cloanto.rp9"]),
+    ("rpm", &["audio/x-pn-realaudio-plugin"]),
+    ("rpss", &["application/vnd.nokia.radio-presets"]),
+    ("rpst", &["application/vnd.nokia.radio-preset"]),
+    ("rq", &["application/sparql-query"]),
+    ("rqy", &["text/x-ms-rqy"]),
+    ("rs", &["text/x-rust"]),
+    ("rsd", &["application/rsd+xml"]),
+    ("rss", &["application/rss+xml"]),
+    ("rtf", &["application/rtf"]),
+    ("rtx", &["text/richtext"]),
+    ("ruleset", &["application/xml"]),
+    ("run", &["application/x-makeself"]),
+    ("rvt", &["application/octet-stream"]),
+    ("rw2", &["image/x-panasonic-rw2"]),
+    ("rwl", &["image/x-panasonic-rw2"]),
+    ("s", &["text/plain"]),
+    ("s3m", &["audio/s3m"]),
+    ("saf", &["application/vnd.yamaha.smaf-audio"]),
+    ("safariextz", &["application/x-safari-safariextz"]),
+    ("sass", &["text/x-sass"]),
+    ("sbml", &["application/sbml+xml"]),
+    ("sc", &["application/vnd.ibm.secure-container"]),
+    ("scd", &["application/x-msschedule"]),
+    ("scm", &["application/vnd.lotus-screencam"]),
+    ("scq", &["application/scvp-cv-request"]),
+    ("scr", &["text/plain"]),
+    ("scs", &["application/scvp-cv-response"]),
+    ("scss", &["text/x-scss"]),
+    ("sct", &["text/scriptlet"]),
+    ("scurl", &["text/vnd.curl.scurl"]),
+    ("sd2", &["audio/x-sd2"]),
+    ("sda", &["application/vnd.stardivision.draw"]),
+    ("sdc", &["application/vnd.stardivision.calc"]),
+    ("sdd", &["application/vnd.stardivision.impress"]),
+    ("sdkd", &["application/vnd.solent.sdkm+xml"]),
+    ("sdkm", &["application/vnd.solent.sdkm+xml"]),
+    ("sdp", &["application/sdp"]),
+    ("sdw", &["application/vnd.stardivision.writer"]),
+    ("sea", &["application/octet-stream"]),
+    (
+        "searchconnector-ms",
+        &["application/windows-search-connector+xml"],
+    ),
+    ("see", &["application/vnd.seemail"]),
+    ("seed", &["application/vnd.fdsn.seed"]),
+    ("sema", &["application/vnd.sema"]),
+    ("semd", &["application/vnd.semd"]),
+    ("semf", &["application/vnd.semf"]),
+    ("ser", &["application/java-serialized-object"]),
+    ("setpay", &["application/set-payment-initiation"]),
+    ("setreg", &["application/set-registration-initiation"]),
+    ("settings", &["application/xml"]),
+    ("sfd-hdstx", &["application/vnd.hydrostatix.sof-data"]),
+    ("sfs", &["application/vnd.spotfire.sfs"]),
+    ("sfv", &["text/x-sfv"]),
+    ("sgi", &["image/sgi"]),
+    ("sgimb", &["application/x-sgimb"]),
+    ("sgl", &["application/vnd.stardivision.writer-global"]),
+    ("sgm", &["text/sgml"]),
+    ("sgml", &["text/sgml"]),
+    ("sh", &["application/x-sh"]),
+    ("shar", &["application/x-shar"]),
+    ("shex", &["text/shex"]),
+    ("shf", &["application/shf+xml"]),
+    ("shtml", &["text/html"]),
+    ("sid", &["image/x-mrsid-image"]),
+    ("sig", &["application/pgp-signature"]),
+    ("sil", &["audio/silk"]),
+    ("silo", &["model/mesh"]),
+    ("sis", &["application/vnd.symbian.install"]),
+    ("sisx", &["application/vnd.symbian.install"]),
+    ("sit", &["application/x-stuffit"]),
+    ("sitemap", &["application/xml"]),
+    ("sitx", &["application/x-stuffitx"]),
+    ("skd", &["application/vnd.koan"]),
+    ("skin", &["application/xml"]),
+    ("skm", &["application/vnd.koan"]),
+    ("skp", &["application/x-koan"]),
+    ("skt", &["application/vnd.koan"]),
+    (
+        "sldm",
+        &["application/vnd.ms-powerpoint.slide.macroEnabled.12"],
+    ),
+    (
+        "sldx",
+        &["application/vnd.openxmlformats-officedocument.presentationml.slide"],
+    ),
+    ("slim", &["text/slim"]),
+    ("slk", &["application/vnd.ms-excel"]),
+    ("slm", &["text/slim"]),
+    ("sln", &["text/plain"]),
+    ("slt", &["application/vnd.epson.salt"]),
+    ("slupkg-ms", &["application/x-ms-license"]),
+    ("sm", &["application/vnd.stepmania.stepchart"]),
+    ("smd", &["audio/x-smd"]),
+    ("smf", &["application/vnd.stardivision.math"]),
+    ("smi", &["application/octet-stream"]),
+    ("smil", &["application/smil+xml"]),
+    ("smv", &["video/x-smv"]),
+    ("smx", &["audio/x-smd"]),
+    ("smz", &["audio/x-smd"]),
+    ("smzip", &["application/vnd.stepmania.package"]),
+    ("snd", &["audio/basic"]),
+    ("snf", &["application/x-font-snf"]),
+    ("snippet", &["application/xml"]),
+    ("snp", &["application/octet-stream"]),
+    ("so", &["application/octet-stream"]),
+    ("sol", &["text/plain"]),
+    ("sor", &["text/plain"]),
+    ("spc", &["application/x-pkcs7-certificates"]),
+    ("spf", &["application/vnd.yamaha.smaf-phrase"]),
+    ("spl", &["application/futuresplash"]),
+    ("spot", &["text/vnd.in3d.spot"]),
+    ("spp", &["application/scvp-vp-response"]),
+    ("spq", &["application/scvp-vp-request"]),
+    ("spx", &["audio/ogg"]),
+    ("sql", &["application/x-sql"]),
+    ("sr2", &["image/x-sony-sr2"]),
+    ("src", &["application/x-wais-source"]),
+    ("srf", &[
+        "text/plain",
+        "image/x-sony-srf"
+    ]),
+    ("srt", &["application/x-subrip"]),
+    ("sru", &["application/sru+xml"]),
+    ("srx", &["application/sparql-results+xml"]),
+    ("ssdl", &["application/ssdl+xml"]),
+    ("sse", &["application/vnd.kodak-descriptor"]),
+    ("ssf", &["application/vnd.epson.ssf"]),
+    ("ssisdeploymentmanifest", &["text/xml"]),
+    ("ssm", &["application/streamingmedia"]),
+    ("ssml", &["application/ssml+xml"]),
+    ("sst", &["application/vnd.ms-pki.certstore"]),
+    ("st", &["application/vnd.sailingtracker.track"]),
+    ("stc", &["application/vnd.sun.xml.calc.template"]),
+    ("std", &["application/vnd.sun.xml.draw.template"]),
+    ("step", &["application/step"]),
+    ("stf", &["application/vnd.wt.stf"]),
+    ("sti", &["application/vnd.sun.xml.impress.template"]),
+    ("stk", &["application/hyperstudio"]),
+    ("stl", &["application/vnd.ms-pki.stl"]),
+    ("stp", &["application/step"]),
+    ("str", &["application/vnd.pg.format"]),
+    ("stw", &["application/vnd.sun.xml.writer.template"]),
+    ("styl", &["text/stylus"]),
+    ("stylus", &["text/stylus"]),
+    ("sub", &["text/vnd.dvb.subtitle"]),
+    ("sus", &["application/vnd.sus-calendar"]),
+    ("susp", &["application/vnd.sus-calendar"]),
+    ("sv4cpio", &["application/x-sv4cpio"]),
+    ("sv4crc", &["application/x-sv4crc"]),
+    ("svc", &["application/xml"]),
+    ("svd", &["application/vnd.svd"]),
+    ("svg", &["image/svg+xml"]),
+    ("svgz", &["image/svg+xml"]),
+    ("swa", &["application/x-director"]),
+    ("swf", &["application/x-shockwave-flash"]),
+    ("swi", &["application/vnd.aristanetworks.swi"]),
+    ("sxc", &["application/vnd.sun.xml.calc"]),
+    ("sxd", &["application/vnd.sun.xml.draw"]),
+    ("sxg", &["application/vnd.sun.xml.writer.global"]),
+    ("sxi", &["application/vnd.sun.xml.impress"]),
+    ("sxm", &["application/vnd.sun.xml.math"]),
+    ("sxw", &["application/vnd.sun.xml.writer"]),
+    ("t", &["application/x-troff"]),
+    ("t3", &["application/x-t3vm-image"]),
+    ("taglet", &["application/vnd.mynfc"]),
+    ("tao", &["application/vnd.tao.intent-module-archive"]),
+    ("tar", &["application/x-tar"]),
+    ("tcap", &["application/vnd.3gpp2.tcap"]),
+    ("tcl", &["application/x-tcl"]),
+    ("teacher", &["application/vnd.smart.teacher"]),
+    ("tei", &["application/tei+xml"]),
+    ("teicorpus", &["application/tei+xml"]),
+    ("testrunconfig", &["application/xml"]),
+    ("testsettings", &["application/xml"]),
+    ("tex", &["application/x-tex"]),
+    ("texi", &["application/x-texinfo"]),
+    ("texinfo", &["application/x-texinfo"]),
+    ("text", &["text/plain"]),
+    ("tfi", &["application/thraud+xml"]),
+    ("tfm", &["application/x-tex-tfm"]),
+    ("tga", &["image/x-tga"]),
+    ("tgz", &["application/x-compressed"]),
+    ("thmx", &["application/vnd.ms-officetheme"]),
+    ("thn", &["application/octet-stream"]),
+    ("tif", &["image/tiff"]),
+    ("tiff", &["image/tiff"]),
+    ("tk", &["application/x-tcl"]),
+    ("tlh", &["text/plain"]),
+    ("tli", &["text/plain"]),
+    ("tmo", &["application/vnd.tmobile-livetv"]),
+    ("toc", &["application/octet-stream"]),
+    ("toml", &["text/x-toml"]),
+    ("torrent", &["application/x-bittorrent"]),
+    ("tpl", &["application/vnd.groove-tool-template"]),
+    ("tpt", &["application/vnd.trid.tpt"]),
+    ("tr", &["application/x-troff"]),
+    ("tra", &["application/vnd.trueapp"]),
+    ("trig", &["application/trig"]),
+    ("trm", &["application/x-msterminal"]),
+    ("trx", &["application/xml"]),
+    ("ts", &["video/vnd.dlna.mpeg-tts"]),
+    ("tsd", &["application/timestamped-data"]),
+    ("tsv", &["text/tab-separated-values"]),
+    ("ttc", &["font/collection"]),
+    ("ttf", &["font/ttf", "application/x-font-ttf", "application/font-sfnt"]),
+    ("ttl", &["text/turtle"]),
+    ("tts", &["video/vnd.dlna.mpeg-tts"]),
+    ("twd", &["application/vnd.simtech-mindmapper"]),
+    ("twds", &["application/vnd.simtech-mindmapper"]),
+    ("txd", &["application/vnd.genomatix.tuxedo"]),
+    ("txf", &["application/vnd.mobius.txf"]),
+    ("txt", &["text/plain"]),
+    ("u32", &["application/octet-stream"]),
+    ("u8dsn", &["message/global-delivery-status"]),
+    ("u8hdr", &["message/global-headers"]),
+    ("u8mdn", &["message/global-disposition-notification"]),
+    ("u8msg", &["message/global"]),
+    ("udeb", &["application/x-debian-package"]),
+    ("ufd", &["application/vnd.ufdl"]),
+    ("ufdl", &["application/vnd.ufdl"]),
+    ("uls", &["text/iuls"]),
+    ("ulx", &["application/x-glulx"]),
+    ("umj", &["application/vnd.umajin"]),
+    ("unityweb", &["application/vnd.unity"]),
+    ("uoml", &["application/vnd.uoml+xml"]),
+    ("uri", &["text/uri-list"]),
+    ("uris", &["text/uri-list"]),
+    ("urls", &["text/uri-list"]),
+    ("user", &["text/plain"]),
+    ("ustar", &["application/x-ustar"]),
+    ("utz", &["application/vnd.uiq.theme"]),
+    ("uu", &["text/x-uuencode"]),
+    ("uva", &["audio/vnd.dece.audio"]),
+    ("uvd", &["application/vnd.dece.data"]),
+    ("uvf", &["application/vnd.dece.data"]),
+    ("uvg", &["image/vnd.dece.graphic"]),
+    ("uvh", &["video/vnd.dece.hd"]),
+    ("uvi", &["image/vnd.dece.graphic"]),
+    ("uvm", &["video/vnd.dece.mobile"]),
+    ("uvp", &["video/vnd.dece.pd"]),
+    ("uvs", &["video/vnd.dece.sd"]),
+    ("uvt", &["application/vnd.dece.ttml+xml"]),
+    ("uvu", &["video/vnd.uvvu.mp4"]),
+    ("uvv", &["video/vnd.dece.video"]),
+    ("uvva", &["audio/vnd.dece.audio"]),
+    ("uvvd", &["application/vnd.dece.data"]),
+    ("uvvf", &["application/vnd.dece.data"]),
+    ("uvvg", &["image/vnd.dece.graphic"]),
+    ("uvvh", &["video/vnd.dece.hd"]),
+    ("uvvi", &["image/vnd.dece.graphic"]),
+    ("uvvm", &["video/vnd.dece.mobile"]),
+    ("uvvp", &["video/vnd.dece.pd"]),
+    ("uvvs", &["video/vnd.dece.sd"]),
+    ("uvvt", &["application/vnd.dece.ttml+xml"]),
+    ("uvvu", &["video/vnd.uvvu.mp4"]),
+    ("uvvv", &["video/vnd.dece.video"]),
+    ("uvvx", &["application/vnd.dece.unspecified"]),
+    ("uvvz", &["application/vnd.dece.zip"]),
+    ("uvx", &["application/vnd.dece.unspecified"]),
+    ("uvz", &["application/vnd.dece.zip"]),
+    ("vb", &["text/plain"]),
+    ("vbdproj", &["text/plain"]),
+    ("vbk", &["video/mpeg"]),
+    ("vbox", &["application/x-virtualbox-vbox"]),
+    ("vbox-extpack", &["application/x-virtualbox-vbox-extpack"]),
+    ("vbproj", &["text/plain"]),
+    ("vbs", &["text/vbscript"]),
+    ("vcard", &["text/vcard"]),
+    ("vcd", &["application/x-cdlink"]),
+    ("vcf", &["text/x-vcard"]),
+    ("vcg", &["application/vnd.groove-vcard"]),
+    ("vcproj", &["application/xml"]),
+    ("vcs", &["text/plain"]),
+    ("vcx", &["application/vnd.vcx"]),
+    ("vcxproj", &["application/xml"]),
+    ("vddproj", &["text/plain"]),
+    ("vdi", &["application/x-virtualbox-vdi"]),
+    ("vdp", &["text/plain"]),
+    ("vdproj", &["text/plain"]),
+    ("vdx", &["application/vnd.ms-visio.viewer"]),
+    ("vhd", &["application/x-virtualbox-vhd"]),
+    ("vis", &["application/vnd.visionary"]),
+    ("viv", &["video/vnd.vivo"]),
+    ("vmdk", &["application/x-virtualbox-vmdk"]),
+    ("vml", &["text/xml"]),
+    ("vob", &["video/x-ms-vob"]),
+    ("vor", &["application/vnd.stardivision.writer"]),
+    ("vox", &["application/x-authorware-bin"]),
+    ("vrml", &["model/vrml"]),
+    ("vscontent", &["application/xml"]),
+    ("vsct", &["text/xml"]),
+    ("vsd", &["application/vnd.visio"]),
+    ("vsf", &["application/vnd.vsf"]),
+    ("vsi", &["application/ms-vsi"]),
+    ("vsix", &["application/vsix"]),
+    ("vsixlangpack", &["text/xml"]),
+    ("vsixmanifest", &["text/xml"]),
+    ("vsmdi", &["application/xml"]),
+    ("vspscc", &["text/plain"]),
+    ("vss", &["application/vnd.visio"]),
+    ("vsscc", &["text/plain"]),
+    ("vssettings", &["text/xml"]),
+    ("vssscc", &["text/plain"]),
+    ("vst", &["application/vnd.visio"]),
+    ("vstemplate", &["text/xml"]),
+    ("vsto", &["application/x-ms-vsto"]),
+    ("vsw", &["application/vnd.visio"]),
+    ("vsx", &["application/vnd.visio"]),
+    ("vtt", &["text/vtt"]),
+    ("vtu", &["model/vnd.vtu"]),
+    ("vtx", &["application/vnd.visio"]),
+    ("vxml", &["application/voicexml+xml"]),
+    ("w3d", &["application/x-director"]),
+    ("wad", &["application/x-doom"]),
+    ("wadl", &["application/vnd.sun.wadl+xml"]),
+    ("war", &["application/java-archive"]),
+    ("wasm", &["application/wasm"]),
+    ("wav", &["audio/wav"]),
+    ("wave", &["audio/wav"]),
+    ("wax", &["audio/x-ms-wax"]),
+    ("wbk", &["application/msword"]),
+    ("wbmp", &["image/vnd.wap.wbmp"]),
+    ("wbs", &["application/vnd.criticaltools.wbs+xml"]),
+    ("wbxml", &["application/vnd.wap.wbxml"]),
+    ("wcm", &["application/vnd.ms-works"]),
+    ("wdb", &["application/vnd.ms-works"]),
+    ("wdp", &["image/vnd.ms-photo"]),
+    ("weba", &["audio/webm"]),
+    ("webapp", &["application/x-web-app-manifest+json"]),
+    ("webarchive", &["application/x-safari-webarchive"]),
+    ("webm", &["video/webm"]),
+    ("webmanifest", &["application/manifest+json"]),
+    ("webp", &["image/webp"]),
+    ("webtest", &["application/xml"]),
+    ("wg", &["application/vnd.pmi.widget"]),
+    ("wgt", &["application/widget"]),
+    ("wiq", &["application/xml"]),
+    ("wiz", &["application/msword"]),
+    ("wks", &["application/vnd.ms-works"]),
+    ("wlmp", &["application/wlmoviemaker"]),
+    ("wlpginstall", &["application/x-wlpg-detect"]),
+    ("wlpginstall3", &["application/x-wlpg3-detect"]),
+    ("wm", &["video/x-ms-wm"]),
+    ("wma", &["audio/x-ms-wma"]),
+    ("wmd", &["application/x-ms-wmd"]),
+    ("wmf", &["application/x-msmetafile"]),
+    ("wml", &["text/vnd.wap.wml"]),
+    ("wmlc", &["application/vnd.wap.wmlc"]),
+    ("wmls", &["text/vnd.wap.wmlscript"]),
+    ("wmlsc", &["application/vnd.wap.wmlscriptc"]),
+    ("wmp", &["video/x-ms-wmp"]),
+    ("wmv", &["video/x-ms-wmv"]),
+    ("wmx", &["video/x-ms-wmx"]),
+    ("wmz", &["application/x-ms-wmz"]),
+    ("woff", &["application/font-woff"]),
+    ("woff2", &["font/woff2"]),
+    ("wpd", &["application/vnd.wordperfect"]),
+    ("wpl", &["application/vnd.ms-wpl"]),
+    ("wps", &["application/vnd.ms-works"]),
+    ("wqd", &["application/vnd.wqd"]),
+    ("wri", &["application/x-mswrite"]),
+    ("wrl", &["x-world/x-vrml"]),
+    ("wrz", &["x-world/x-vrml"]),
+    ("wsc", &["text/scriptlet"]),
+    ("wsdl", &["text/xml"]),
+    ("wspolicy", &["application/wspolicy+xml"]),
+    ("wtb", &["application/vnd.webturbo"]),
+    ("wvx", &["video/x-ms-wvx"]),
+    ("x", &["application/directx"]),
+    ("x32", &["application/x-authorware-bin"]),
+    ("x3d", &["model/x3d+xml"]),
+    ("x3db", &["model/x3d+binary"]),
+    ("x3dbz", &["model/x3d+binary"]),
+    ("x3dv", &["model/x3d+vrml"]),
+    ("x3dvz", &["model/x3d+vrml"]),
+    ("x3dz", &["model/x3d+xml"]),
+    ("x3f", &["image/x-sigma-x3f"]),
+    ("xaf", &["x-world/x-vrml"]),
+    ("xaml", &["application/xaml+xml"]),
+    ("xap", &["application/x-silverlight-app"]),
+    ("xar", &["application/vnd.xara"]),
+    ("xbap", &["application/x-ms-xbap"]),
+    ("xbd", &["application/vnd.fujixerox.docuworks.binder"]),
+    ("xbm", &["image/x-xbitmap"]),
+    ("xdf", &["application/xcap-diff+xml"]),
+    ("xdm", &["application/vnd.syncml.dm+xml"]),
+    ("xdp", &["application/vnd.adobe.xdp+xml"]),
+    ("xdr", &["text/plain"]),
+    ("xdssc", &["application/dssc+xml"]),
+    ("xdw", &["application/vnd.fujixerox.docuworks"]),
+    ("xenc", &["application/xenc+xml"]),
+    ("xer", &["application/patch-ops-error+xml"]),
+    ("xfdf", &["application/vnd.adobe.xfdf"]),
+    ("xfdl", &["application/vnd.xfdl"]),
+    ("xht", &["application/xhtml+xml"]),
+    ("xhtml", &["application/xhtml+xml"]),
+    ("xhvml", &["application/xv+xml"]),
+    ("xif", &["image/vnd.xiff"]),
+    ("xla", &["application/vnd.ms-excel"]),
+    ("xlam", &["application/vnd.ms-excel.addin.macroEnabled.12"]),
+    ("xlc", &["application/vnd.ms-excel"]),
+    ("xld", &["application/vnd.ms-excel"]),
+    ("xlf", &["application/x-xliff+xml"]),
+    ("xlk", &["application/vnd.ms-excel"]),
+    ("xll", &["application/vnd.ms-excel"]),
+    ("xlm", &["application/vnd.ms-excel"]),
+    ("xls", &["application/vnd.ms-excel"]),
+    (
+        "xlsb",
+        &["application/vnd.ms-excel.sheet.binary.macroEnabled.12"],
+    ),
+    ("xlsm", &["application/vnd.ms-excel.sheet.macroEnabled.12"]),
+    (
+        "xlsx",
+        &["application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"],
+    ),
+    ("xlt", &["application/vnd.ms-excel"]),
+    (
+        "xltm",
+        &["application/vnd.ms-excel.template.macroEnabled.12"],
+    ),
+    (
+        "xltx",
+        &["application/vnd.openxmlformats-officedocument.spreadsheetml.template"],
+    ),
+    ("xlw", &["application/vnd.ms-excel"]),
+    ("xm", &["audio/xm"]),
+    ("xml", &["text/xml"]),
+    ("xmp", &["application/octet-stream"]),
+    ("xmta", &["application/xml"]),
+    ("xo", &["application/vnd.olpc-sugar"]),
+    ("xof", &["x-world/x-vrml"]),
+    ("xoml", &["text/plain"]),
+    ("xop", &["application/xop+xml"]),
+    ("xpi", &["application/x-xpinstall"]),
+    ("xpl", &["application/xproc+xml"]),
+    ("xpm", &["image/x-xpixmap"]),
+    ("xpr", &["application/vnd.is-xpr"]),
+    ("xps", &["application/vnd.ms-xpsdocument"]),
+    ("xpw", &["application/vnd.intercon.formnet"]),
+    ("xpx", &["application/vnd.intercon.formnet"]),
+    ("xrm-ms", &["text/xml"]),
+    ("xsc", &["application/xml"]),
+    ("xsd", &["text/xml"]),
+    ("xsf", &["text/xml"]),
+    ("xsl", &["text/xml"]),
+    ("xslt", &["text/xml"]),
+    ("xsm", &["application/vnd.syncml+xml"]),
+    ("xsn", &["application/octet-stream"]),
+    ("xspf", &["application/xspf+xml"]),
+    ("xss", &["application/xml"]),
+    ("xtp", &["application/octet-stream"]),
+    ("xul", &["application/vnd.mozilla.xul+xml"]),
+    ("xvm", &["application/xv+xml"]),
+    ("xvml", &["application/xv+xml"]),
+    ("xwd", &["image/x-xwindowdump"]),
+    ("xyz", &["chemical/x-xyz"]),
+    ("xz", &["application/x-xz"]),
+    ("yaml", &["text/x-yaml"]),
+    ("yang", &["application/yang"]),
+    ("yin", &["application/yin+xml"]),
+    ("yml", &["text/x-yaml"]),
+    ("ymp", &["text/x-suse-ymp"]),
+    ("z", &["application/x-compress"]),
+    ("z1", &["application/x-zmachine"]),
+    ("z2", &["application/x-zmachine"]),
+    ("z3", &["application/x-zmachine"]),
+    ("z4", &["application/x-zmachine"]),
+    ("z5", &["application/x-zmachine"]),
+    ("z6", &["application/x-zmachine"]),
+    ("z7", &["application/x-zmachine"]),
+    ("z8", &["application/x-zmachine"]),
+    ("zaz", &["application/vnd.zzazz.deck+xml"]),
+    ("zip", &["application/zip"]),
+    ("zir", &["application/vnd.zul"]),
+    ("zirz", &["application/vnd.zul"]),
+    ("zmm", &["application/vnd.handheld-entertainment+xml"]),
+];
diff --git a/toolkit/components/antitracking/antitracking.manifest b/toolkit/components/antitracking/antitracking.manifest
index 5eb37f9a3f99d..872e6af07575a 100644
--- a/toolkit/components/antitracking/antitracking.manifest
+++ b/toolkit/components/antitracking/antitracking.manifest
@@ -1 +1 @@
-category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main
+# category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main
diff --git a/toolkit/components/antitracking/components.conf b/toolkit/components/antitracking/components.conf
index 6a584b493fba4..94c1b9b9e1a6c 100644
--- a/toolkit/components/antitracking/components.conf
+++ b/toolkit/components/antitracking/components.conf
@@ -11,13 +11,6 @@ Classes = [
         'esModule': 'resource://gre/modules/TrackingDBService.sys.mjs',
         'constructor': 'TrackingDBService',
     },
-    {
-        'cid': '{5874af6d-5719-4e1b-b155-ef4eae7fcb32}',
-        'contract_ids': ['@mozilla.org/tracking-url-decoration-service;1'],
-        'esModule': 'resource://gre/modules/URLDecorationAnnotationsService.sys.mjs',
-        'constructor': 'URLDecorationAnnotationsService',
-        'processes': ProcessSelector.MAIN_PROCESS_ONLY,
-    },
     {
         'cid': '{90d1fd17-2018-4e16-b73c-a04a26fa6dd4}',
         'contract_ids': ['@mozilla.org/purge-tracker-service;1'],
diff --git a/toolkit/components/cookiebanners/CookieBannerParent.sys.mjs b/toolkit/components/cookiebanners/CookieBannerParent.sys.mjs
index e74816dc45dae..bfc68062deb58 100644
--- a/toolkit/components/cookiebanners/CookieBannerParent.sys.mjs
+++ b/toolkit/components/cookiebanners/CookieBannerParent.sys.mjs
@@ -188,12 +188,17 @@ export class CookieBannerParent extends JSWindowActorParent {
           mode = perDomainMode;
         }
       } catch (e) {
-        // getPerSitePref could throw with NS_ERROR_NOT_AVAILABLE if the service
-        // is disabled. We will fallback to global pref setting if any errors
-        // occur.
-        if (e.result == Cr.NS_ERROR_NOT_AVAILABLE) {
-          console.error("The cookie banner handling service is not available");
-        } else {
+        // getDomainPref can throw in a few expected cases where we should
+        // silently fall back to the global pref:
+        // - NS_ERROR_NOT_AVAILABLE: service disabled.
+        // - NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS: hosts like localhost, IPs,
+        //   or eTLDs without enough labels for a base domain.
+        // - NS_ERROR_HOST_IS_IP_ADDRESS: IP literal hosts.
+        if (
+          e.result != Cr.NS_ERROR_NOT_AVAILABLE &&
+          e.result != Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS &&
+          e.result != Cr.NS_ERROR_HOST_IS_IP_ADDRESS
+        ) {
           console.error("Fail on getting domain pref:", e);
         }
       }
diff --git a/toolkit/components/downloads/DownloadList.sys.mjs b/toolkit/components/downloads/DownloadList.sys.mjs
index c4e5776940c4c..d580d193bda5e 100644
--- a/toolkit/components/downloads/DownloadList.sys.mjs
+++ b/toolkit/components/downloads/DownloadList.sys.mjs
@@ -50,6 +50,7 @@ const FILE_EXTENSIONS = [
   "jpg",
   "jpeg",
   "json",
+  "jxl",
   "m4a",
   "mdb",
   "mid",
diff --git a/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js b/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js
index decf158d45054..96916de07ff39 100644
--- a/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js
+++ b/toolkit/components/enterprisepolicies/tests/browser/browser_policies_gpo.js
@@ -6,7 +6,7 @@
 add_task(async function setup_preferences() {
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["browser.policies.alternateGPO", "SOFTWARE\\Mozilla\\PolicyTesting"],
+      ["browser.policies.alternateGPO", "SOFTWARE\\BrowserWorks\\PolicyTesting"],
     ],
   });
 });
@@ -29,7 +29,7 @@ add_task(async function test_gpo_policies() {
     Ci.nsIWindowsRegKey
   );
   let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
   wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
   wrk.writeIntValue("gpo_policy", 1);
   wrk.close();
@@ -60,8 +60,8 @@ add_task(async function test_gpo_policies() {
 
   delete Policies.gpo_policy;
 
-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
   wrk.removeChild("PolicyTesting\\Mozilla");
   wrk.removeChild("PolicyTesting");
   wrk.close();
@@ -99,7 +99,7 @@ add_task(async function test_gpo_json_policies() {
     Ci.nsIWindowsRegKey
   );
   let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
   wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
   wrk.writeIntValue("gpo_policy", 1);
   wrk.writeIntValue("coexist_policy", 0);
@@ -146,8 +146,8 @@ add_task(async function test_gpo_json_policies() {
   delete Policies.json_policy;
   delete Policies.coexist_policy;
 
-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
   wrk.removeChild("PolicyTesting\\Mozilla");
   wrk.removeChild("PolicyTesting");
   wrk.close();
@@ -171,7 +171,7 @@ add_task(async function test_gpo_broken_json_policies() {
     Ci.nsIWindowsRegKey
   );
   let regLocation =
-    "SOFTWARE\\Mozilla\\PolicyTesting\\Mozilla\\" + Services.appinfo.name;
+    "SOFTWARE\\BrowserWorks\\PolicyTesting\\BrowserWorks\\" + Services.appinfo.name;
   wrk.create(wrk.ROOT_KEY_CURRENT_USER, regLocation, wrk.ACCESS_WRITE);
   wrk.writeIntValue("gpo_policy", 1);
   wrk.close();
@@ -198,8 +198,8 @@ add_task(async function test_gpo_broken_json_policies() {
 
   delete Policies.gpo_policy;
 
-  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "SOFTWARE\\Mozilla", wrk.ACCESS_WRITE);
-  wrk.removeChild("PolicyTesting\\Mozilla\\" + Services.appinfo.name);
+  wrk.open(wrk.ROOT_KEY_CURRENT_USER, "Software\\Waterfox", wrk.ACCESS_WRITE);
+  wrk.removeChild("PolicyTesting\\BrowserWorks\\" + Services.appinfo.name);
   wrk.removeChild("PolicyTesting\\Mozilla");
   wrk.removeChild("PolicyTesting");
   wrk.close();
diff --git a/toolkit/components/extensions/NativeManifests.sys.mjs b/toolkit/components/extensions/NativeManifests.sys.mjs
index 59313e821fd3c..cd5b2a1209555 100644
--- a/toolkit/components/extensions/NativeManifests.sys.mjs
+++ b/toolkit/components/extensions/NativeManifests.sys.mjs
@@ -25,6 +25,10 @@ const TYPES = {
 const NATIVE_MANIFEST_SCHEMA =
   "chrome://extensions/content/schemas/native_manifest.json";
 
+// WATERFOX
+// Future rebase take note: leave this so extensions
+// can communicate with software without being
+// made specifically for Waterfox.
 const REGPATH = "Software\\Mozilla";
 
 export var NativeManifests = {
@@ -38,8 +42,12 @@ export var NativeManifests = {
         this._lookup = this._winLookup;
       } else if (platform == "macosx" || platform == "linux") {
         let dirs = [
-          Services.dirsvc.get("XREUserNativeManifests", Ci.nsIFile).path,
-          Services.dirsvc.get("XRESysNativeManifests", Ci.nsIFile).path,
+          Services.dirsvc
+            .get("XREUserNativeManifests", Ci.nsIFile)
+            .path.replace("Waterfox", "Mozilla"),
+          Services.dirsvc
+            .get("XRESysNativeManifests", Ci.nsIFile)
+            .path.replace("Waterfox", "Mozilla"),
         ];
         this._lookup = (type, name, context) =>
           this._tryPaths(type, name, dirs, context);
diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js
index 3b81d5e60a5e3..41e6efa57caf0 100644
--- a/toolkit/components/extensions/parent/ext-downloads.js
+++ b/toolkit/components/extensions/parent/ext-downloads.js
@@ -104,6 +104,7 @@ const FILTER_IMAGES_EXTENSIONS = [
   "raw",
   "webp",
   "heic",
+  "jxl",
 ];
 
 const FILTER_XML_EXTENSIONS = ["xml"];
diff --git a/toolkit/components/extensions/test/xpcshell/head_native_messaging.js b/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
index 32b6948033c9f..e5c5fc9f344f8 100644
--- a/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
+++ b/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
@@ -99,7 +99,7 @@ async function setupHosts(scripts) {
       break;
 
     case "win":
-      const REGKEY = String.raw`Software\Mozilla\NativeMessagingHosts`;
+      const REGKEY = String.raw`Software\BrowserWorks\NativeMessagingHosts`;
 
       let registry = new MockRegistry();
       registerCleanupFunction(() => {
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js b/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js
index 5bf6dcc3bc30a..35cba7b3f4f79 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_storage_managed.js
@@ -50,7 +50,7 @@ add_task(async function setup() {
     registry = new MockRegistry();
     registry.setValue(
       Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      `Software\\\Mozilla\\\ManagedStorage\\${MANIFEST.name}`,
+      `Software\\\BrowserWorks\\\ManagedStorage\\${MANIFEST.name}`,
       "",
       path
     );
diff --git a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
index b83c766397426..8d011cbbd0d35 100644
--- a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
+++ b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
@@ -37,7 +37,7 @@ if (AppConstants.platform == "win") {
   });
 }
 
-const REGPATH = "Software\\Mozilla\\NativeMessagingHosts";
+const REGPATH = "Software\\BrowserWorks\\NativeMessagingHosts";
 
 const BASE_SCHEMA = "chrome://extensions/content/schemas/manifest.json";
 
diff --git a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
index 88e994b3bd297..38ed8b49ffa1c 100644
--- a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
+++ b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
@@ -38,17 +38,17 @@ Var BrandFullName
 !insertmacro GetSize
 
 ; The test machines use this fallback key to run tests.
-; And anyone that wants to run tests themselves should already have 
+; And anyone that wants to run tests themselves should already have
 ; this installed.
 !define FallbackKey \
-  "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
+  "SOFTWARE\BrowserWorks\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
 
-!define CompanyName "Mozilla Corporation"
+!define CompanyName "BrowserWorks"
 !define BrandFullNameInternal ""
 
 ; The following includes are custom.
 !include defines.nsi
-; We keep defines.nsi defined so that we get other things like 
+; We keep defines.nsi defined so that we get other things like
 ; the version number, but we redefine BrandFullName
 !define MaintFullName "Mozilla Maintenance Service"
 !ifdef BrandFullName
@@ -66,12 +66,12 @@ Name "${MaintFullName}"
 OutFile "maintenanceservice_installer.exe"
 
 ; Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\Mozilla\MaintenanceService" ""
+InstallDirRegKey HKLM "Software\BrowserWorks\MaintenanceService" ""
 
 SetOverwrite on
 
 !define MaintUninstallKey \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\WaterfoxMaintenanceService"
 
 ; Always install into the 32-bit location even if we have a 64-bit build.
 ; This is because we use only 1 service for all Firefox channels.
@@ -146,7 +146,7 @@ Section "MaintenanceService"
     StrCpy $TempMaintServiceName "maintenanceservice_tmp.exe"
   skipAlreadyExists:
 
-  ; We always write out a copy and then decide whether to install it or 
+  ; We always write out a copy and then decide whether to install it or
   ; not via calling its 'install' cmdline which works by version comparison.
   CopyFiles "$EXEDIR\maintenanceservice.exe" "$INSTDIR\$TempMaintServiceName"
 
@@ -180,7 +180,7 @@ Section "MaintenanceService"
   WriteRegStr HKLM "${MaintUninstallKey}" "DisplayIcon" \
                    "$INSTDIR\Uninstall.exe,0"
   WriteRegStr HKLM "${MaintUninstallKey}" "DisplayVersion" "${AppVersion}"
-  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "Mozilla"
+  WriteRegStr HKLM "${MaintUninstallKey}" "Publisher" "BrowserWorks"
   WriteRegStr HKLM "${MaintUninstallKey}" "Comments" "${BrandFullName}"
   WriteRegDWORD HKLM "${MaintUninstallKey}" "NoModify" 1
   ${GetSize} "$INSTDIR" "/S=0K" $R2 $R3 $R4
@@ -197,15 +197,15 @@ Section "MaintenanceService"
   ${OrIf} ${IsNativeARM64}
     SetRegView 64
   ${EndIf}
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
-  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Installed" 1
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Attempted" 1
+  WriteRegDWORD HKLM "Software\BrowserWorks\MaintenanceService" "Installed" 1
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
 
-  ; Included here for debug purposes only.  
+  ; Included here for debug purposes only.
   ; These keys are used to bypass the installation dir is a valid installation
   ; check from the service so that tests can be run.
-  WriteRegStr HKLM "${FallbackKey}\0" "name" "Mozilla Corporation"
-  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
+  WriteRegStr HKLM "${FallbackKey}\0" "name" "WATERFOX LIMITED"
+  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "GlobalSign GCC R45 EV CodeSigning CA 2020"
   WriteRegStr HKLM "${FallbackKey}\1" "name" "Mozilla Fake SPC"
   WriteRegStr HKLM "${FallbackKey}\1" "issuer" "Mozilla Fake CA"
   ${If} ${RunningX64}
@@ -226,7 +226,7 @@ Function un.RenameDelete
   Rename "$9" "$9.moz-delete"
   ${If} ${Errors}
     Delete /REBOOTOK "$9"
-  ${Else} 
+  ${Else}
     Delete /REBOOTOK "$9.moz-delete"
   ${EndIf}
   ClearErrors
@@ -258,12 +258,11 @@ Section "Uninstall"
   ${OrIf} ${IsNativeARM64}
     SetRegView 64
   ${EndIf}
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "Installed"
-  DeleteRegValue HKLM "Software\Mozilla\MaintenanceService" "FFPrefetchDisabled"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "Installed"
+  DeleteRegValue HKLM "Software\BrowserWorks\MaintenanceService" "FFPrefetchDisabled"
   DeleteRegKey HKLM "${FallbackKey}\"
   ${If} ${RunningX64}
   ${OrIf} ${IsNativeARM64}
     SetRegView lastused
   ${EndIf}
 SectionEnd
-
diff --git a/toolkit/components/maintenanceservice/serviceinstall.cpp b/toolkit/components/maintenanceservice/serviceinstall.cpp
index c59a74b94a02f..e837b4324dbc1 100644
--- a/toolkit/components/maintenanceservice/serviceinstall.cpp
+++ b/toolkit/components/maintenanceservice/serviceinstall.cpp
@@ -25,7 +25,7 @@
 
 // This uninstall key is defined originally in maintenanceservice_installer.nsi
 #define MAINT_UNINSTALL_KEY                                                    \
-  L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MozillaMaintenan" \
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\WaterfoxMaintenan" \
   L"ceService"
 
 static BOOL UpdateUninstallerVersionString(LPWSTR versionString) {
@@ -54,7 +54,7 @@ static int ReadMaintenanceServiceStrings(
     LPCWSTR path, MaintenanceServiceStringTable* results) {
   // Read in the maintenance service description string if specified.
   const unsigned int kNumStrings = 1;
-  const char* kServiceKeys = "MozillaMaintenanceDescription\0";
+  const char* kServiceKeys = "WaterfoxMaintenanceDescription\0";
   mozilla::UniquePtr<char[]> serviceString;
   int result = ReadStrings(path, kServiceKeys, kNumStrings, &serviceString);
   if (result != OK) {
@@ -206,12 +206,12 @@ BOOL FixServicePath(SC_HANDLE service, LPCWSTR currentServicePath,
       currentServicePath[currentServicePathLen - 1] == L'\"';
 
   if (doesServiceHaveCorrectPath) {
-    LOG(("The MozillaMaintenance service path is correct."));
+    LOG(("The WaterfoxMaintenance service path is correct."));
     servicePathWasWrong = FALSE;
     return TRUE;
   }
   // This is a recoverable situation so not logging as a warning
-  LOG(("The MozillaMaintenance path is NOT correct. It was: %ls",
+  LOG(("The WaterfoxMaintenance path is NOT correct. It was: %ls",
        currentServicePath));
 
   servicePathWasWrong = TRUE;
diff --git a/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp b/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp
index beff8e8e472bd..11406c643a4fb 100644
--- a/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp
+++ b/toolkit/components/maintenanceservice/tests/gtest/ServiceStartInteractiveOnly.cpp
@@ -44,7 +44,7 @@ TEST(MaintenanceServiceTest, ServiceStartInteractiveOnly)
   ASSERT_TRUE(scmHandle);
 
   SC_HANDLE serviceHandle =
-      OpenServiceW(scmHandle, L"MozillaMaintenance", SERVICE_START);
+      OpenServiceW(scmHandle, L"WaterfoxMaintenance", SERVICE_START);
   // Automatically close the SCM when we are done with it.
   nsAutoServiceHandle uniqueServiceHandle(serviceHandle);
   ASSERT_FALSE(serviceHandle);
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 754c63f7c1753..b40a62ffe2605 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -135,7 +135,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] not in ("android", "windows"):
     DIRS += ["aboutwebauthn"]
 
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["messaging-system", "normandy"]
+    if CONFIG["MOZ_NORMANDY"]:
+        DIRS += ["normandy"]
+    DIRS += ["messaging-system"]
 
 DIRS += ["nimbus"]
 
diff --git a/toolkit/components/places/PlacesUtils.sys.mjs b/toolkit/components/places/PlacesUtils.sys.mjs
index d11573403881c..5f779b00eadf4 100644
--- a/toolkit/components/places/PlacesUtils.sys.mjs
+++ b/toolkit/components/places/PlacesUtils.sys.mjs
@@ -430,6 +430,9 @@ export var PlacesUtils = {
   // Used to track the action that populated the clipboard.
   TYPE_X_MOZ_PLACE_ACTION: "text/x-moz-place-action",
 
+  // Used to track actouns from the Tree Vertical Tabs sidebar.
+  TYPE_X_WS_TREE: "application/x-ws-tree",
+
   // Deprecated: Remaining only for supporting migration of old livemarks.
   LMANNO_FEEDURI: "livemark/feedURI",
   LMANNO_SITEURI: "livemark/siteURI",
@@ -1305,6 +1308,17 @@ export var PlacesUtils = {
         }
         break;
       }
+      case this.TYPE_X_WS_TREE: {
+        const data = JSON.parse(blob);
+        for (const tab of data.tabs) {
+          validNodes.push({
+            uri:   tab.url,
+            title: tab.title,
+            type:  "text/x-moz-url",
+          });
+        }
+        break;
+      }
       default:
         throw Components.Exception("", Cr.NS_ERROR_INVALID_ARG);
     }
diff --git a/toolkit/components/prompts/content/commonDialog.js b/toolkit/components/prompts/content/commonDialog.js
index 71108e6d35956..6c11782cca38d 100644
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/toolkit/components/prompts/content/commonDialog.js
@@ -95,6 +95,7 @@ function commonDialogOnLoad() {
     infoTitle: document.getElementById("infoTitle"),
     infoIcon: document.getElementById("infoIcon"),
     checkbox: document.getElementById("checkbox"),
+    checkbox2: document.getElementById("checkbox2"),
     checkboxContainer: document.getElementById("checkboxContainer"),
     button3: dialog.getButton("extra2"),
     button2: dialog.getButton("extra1"),
@@ -140,6 +141,9 @@ function commonDialogOnLoad() {
       case "checkbox":
         Dialog.onCheckbox();
         break;
+      case "checkbox2":
+        Dialog.onCheckbox2();
+        break;
     }
   });
 
diff --git a/toolkit/components/prompts/content/commonDialog.xhtml b/toolkit/components/prompts/content/commonDialog.xhtml
index c47761ec958a1..5ce85d73978e4 100644
--- a/toolkit/components/prompts/content/commonDialog.xhtml
+++ b/toolkit/components/prompts/content/commonDialog.xhtml
@@ -92,6 +92,7 @@
         <div />
         <!-- spacer -->
         <xul:checkbox id="checkbox" />
+        <xul:checkbox id="checkbox2" />
       </div>
     </div>
   </dialog>
diff --git a/toolkit/components/prompts/src/CommonDialog.sys.mjs b/toolkit/components/prompts/src/CommonDialog.sys.mjs
index fbe3ac253a516..37cde1f5a6809 100644
--- a/toolkit/components/prompts/src/CommonDialog.sys.mjs
+++ b/toolkit/components/prompts/src/CommonDialog.sys.mjs
@@ -78,6 +78,28 @@ export class CommonDialog {
         this.iconClass = ["question-icon"];
         this.soundID = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
         break;
+      case "confirmEx2":
+        var numButtons2 = 0;
+        if (this.args.button0Label) {
+          numButtons2++;
+        }
+        if (this.args.button1Label) {
+          numButtons2++;
+        }
+        if (this.args.button2Label) {
+          numButtons2++;
+        }
+        if (this.args.button3Label) {
+          numButtons2++;
+        }
+        if (numButtons2 == 0) {
+          throw new Error("A dialog with no buttons? Can not haz.");
+        }
+        this.numButtons = numButtons2;
+        this.hasInputField = false;
+        this.iconClass = ["question-icon"];
+        this.soundID = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
+        break;
       case "prompt":
         this.numButtons = 2;
         this.iconClass = ["question-icon"];
@@ -171,13 +193,35 @@ export class CommonDialog {
     let infoBody = this.ui.infoBody;
     infoBody.appendChild(infoBody.ownerDocument.createTextNode(croppedMessage));
 
+    // WATERFOX: Check if both labels are undefined before deciding to hide the container.
+    // This first checks if both labels are undefined before hiding the container.
+    // If not, it shows the container and then proceeds to render each checkbox if its corresponding label is defined.
     let label = this.args.checkLabel;
-    if (label) {
-      // Only show the checkbox if label has a value.
+    let label2 = this.args.checkLabel2;
+
+    if (!label && !label2) {
+      // Hide everything if both labels undefined
+      this.ui.checkboxContainer.hidden = true;
+    } else {
+      // Show container
       this.ui.checkboxContainer.hidden = false;
-      this.ui.checkboxContainer.clientTop; // style flush to assure binding is attached
-      this.setLabelForNode(this.ui.checkbox, label);
-      this.ui.checkbox.checked = this.args.checked;
+      this.ui.checkboxContainer.clientTop;
+
+      if (label) {
+        this.setLabelForNode(this.ui.checkbox, label);
+        this.ui.checkbox.hidden = false;
+        this.ui.checkbox.checked = this.args.checked;
+      } else {
+        this.ui.checkbox.hidden = true;
+      }
+
+      if (label2) {
+        this.setLabelForNode(this.ui.checkbox2, label2);
+        this.ui.checkbox2.hidden = false;
+        this.ui.checkbox2.checked = this.args.checked2;
+      } else {
+        this.ui.checkbox2.hidden = true;
+      }
     }
 
     // set the icon
@@ -310,6 +354,10 @@ export class CommonDialog {
     this.args.checked = this.ui.checkbox.checked;
   }
 
+  onCheckbox2() {
+    this.args.checked2 = this.ui.checkbox2.checked;
+  }
+
   onButton0() {
     this.args.promptActive = false;
     this.args.ok = true;
diff --git a/toolkit/components/prompts/src/Prompter.sys.mjs b/toolkit/components/prompts/src/Prompter.sys.mjs
index 0977c1e7bbe99..19723f441c93f 100644
--- a/toolkit/components/prompts/src/Prompter.sys.mjs
+++ b/toolkit/components/prompts/src/Prompter.sys.mjs
@@ -312,6 +312,34 @@ Prompter.prototype = {
     );
   },
 
+  confirmEx2(
+    domWin,
+    title,
+    text,
+    flags,
+    button0,
+    button1,
+    button2,
+    checkLabel,
+    checkValue,
+    checkLabel2,
+    checkValue2
+  ) {
+    let p = this.pickPrompter({ domWin });
+    return p.confirmEx2(
+      title,
+      text,
+      flags,
+      button0,
+      button1,
+      button2,
+      checkLabel,
+      checkValue,
+      checkLabel2,
+      checkValue2
+    );
+  },
+
   /**
    * Puts up a dialog with up to 3 buttons and an optional, labeled checkbox.
    * @param {BrowsingContext} browsingContext - The browsing context the
@@ -1524,6 +1552,66 @@ class ModalPrompter {
     return args.buttonNumClicked;
   }
 
+  confirmEx2(
+    title,
+    text,
+    flags,
+    button0,
+    button1,
+    button2,
+    checkLabel,
+    checkValue,
+    checkLabel2,
+    checkValue2,
+    extraArgs = {}
+  ) {
+    if (!title) {
+      title = InternalPromptUtils.getLocalizedString("Confirm");
+    }
+
+    let args = {
+      promptType: "confirmEx2",
+      title,
+      text,
+      checkLabel,
+      checked: this.async ? checkValue : checkValue.value,
+      checkLabel2,
+      checked2: this.async ? checkValue2 : checkValue2.value,
+      ok: false,
+      buttonNumClicked: 1,
+      ...extraArgs,
+    };
+
+    let [label0, label1, label2, defaultButtonNum, isDelayEnabled] =
+      InternalPromptUtils.confirmExHelper(flags, button0, button1, button2);
+
+    args.defaultButtonNum = defaultButtonNum;
+    args.enableDelay = isDelayEnabled;
+
+    if (label0) {
+      args.button0Label = label0;
+      if (label1) {
+        args.button1Label = label1;
+        if (label2) {
+          args.button2Label = label2;
+        }
+      }
+    }
+
+    if (this.async) {
+      return this.openPromptAsync(args, result => ({
+        checked: !!result.checked,
+        checked2: !!result.checked2,
+        buttonNumClicked: result.buttonNumClicked,
+      }));
+    }
+
+    this.openPromptSync(args);
+    checkValue.value = args.checked;
+    checkValue2.value = args.checked2;
+    return args.buttonNumClicked;
+  }
+
   nsIPrompt_prompt(title, text, value, checkLabel, checkValue) {
     if (!title) {
       title = InternalPromptUtils.getLocalizedString("Prompt");
diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs b/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs
index f077b4580c435..a19dda870428b 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs
@@ -99,40 +99,8 @@ export class RemoteWebNavigation {
   }
 
   _speculativeConnect(uri, loadURIOptions) {
-    try {
-      // Let's start a network connection before the content process asks.
-      // Note that we might have already set up the speculative connection in
-      // some cases, especially when the url is from location bar or its popup
-      // menu.
-      if (uri.schemeIs("http") || uri.schemeIs("https")) {
-        let isBrowserPrivate = lazy.PrivateBrowsingUtils.isBrowserPrivate(
-          this._browser
-        );
-        let principal = loadURIOptions.triggeringPrincipal;
-        // We usually have a triggeringPrincipal assigned, but in case we
-        // don't have one or if it's a SystemPrincipal, let's create it with OA
-        // inferred from the current context.
-        if (!principal || principal.isSystemPrincipal) {
-          let attrs = {
-            userContextId: this._browser.getAttribute("usercontextid") || 0,
-            privateBrowsingId: isBrowserPrivate ? 1 : 0,
-          };
-          principal = Services.scriptSecurityManager.createContentPrincipal(
-            uri,
-            attrs
-          );
-        }
-        Services.io.speculativeConnect(
-          uri,
-          principal,
-          new NotificationCallbacks(this._browser),
-          false
-        );
-      }
-    } catch (ex) {
-      // Can't setup speculative connection for this uri for some
-      // reason, just ignore it.
-    }
+    // Speculative connections are disabled in Waterfox.
+    return;
   }
 
   loadURI(uri, loadURIOptions) {
diff --git a/toolkit/components/search/AppProvidedSearchEngine.sys.mjs b/toolkit/components/search/AppProvidedSearchEngine.sys.mjs
index 32e2e54244cc9..933f3f6137a2f 100644
--- a/toolkit/components/search/AppProvidedSearchEngine.sys.mjs
+++ b/toolkit/components/search/AppProvidedSearchEngine.sys.mjs
@@ -115,11 +115,13 @@ class IconHandler {
     if (!this.#iconMap) {
       await this.#buildIconMap();
     }
-
-    let iconList = this.#iconMap.get(this.getKey(engineIdentifier)) || [];
-    return iconList.filter(r =>
-      this.#identifierMatches(engineIdentifier, r.engineIdentifiers)
-    );
+    // If #buildIconMap could have resulted in #iconMap being null
+    if (!this.#iconMap) {
+        console.warn("Icon map is not available.");
+        return [];
+    }
+    // Get the array of icon objects for the engine, or an empty array if not found.
+    return this.#iconMap.get(engineIdentifier) || [];
   }
 
   /**
@@ -240,25 +242,20 @@ class IconHandler {
   async #buildIconMap() {
     let iconList = [];
     try {
-      iconList = await this.#iconCollection.get();
+      this.#iconMap = new Map(
+        await (
+          await fetch(
+            "chrome://browser/content/search/BrowserSearchEngineIcons.json"
+          )
+        ).json()
+      );
     } catch (ex) {
       console.error(ex);
+      this.#iconMap = null;
     }
-    if (!iconList.length) {
+    if (!this.#iconMap) {
       console.error("Failed to obtain search engine icon list records");
     }
-
-    this.#iconMap = new Map();
-    for (let record of iconList) {
-      let keys = new Set(record.engineIdentifiers.map(this.getKey));
-      for (let key of keys) {
-        if (this.#iconMap.has(key)) {
-          this.#iconMap.get(key).push(record);
-        } else {
-          this.#iconMap.set(key, [record]);
-        }
-      }
-    }
   }
 
   /**
@@ -561,27 +558,29 @@ export class AppProvidedSearchEngine extends SearchEngine {
    *   A promise that resolves to the URL of the icon.
    */
   async getIconURL(preferredWidth) {
-    // XPCOM interfaces pass optional number parameters as 0.
     preferredWidth ||= 16;
 
-    let availableRecords =
+    // This call should return a string (the icon URL) if the engineId is in your JSON,
+    // or undefined if not found or if #iconMap failed to build.
+    const iconURLString =
       await AppProvidedSearchEngine.iconHandler.getAvailableRecords(this.id);
-    if (!availableRecords.length) {
-      console.warn("No icon found for", this.id);
-      return null;
-    }
 
-    let availableSizes = availableRecords.map(r => r.imageSize);
-    let width = lazy.SearchUtils.chooseIconSize(preferredWidth, availableSizes);
-
-    if (this.#blobURLPromises.has(width)) {
-      return this.#blobURLPromises.get(width);
+    if (typeof iconURLString === "string") {
+      // We have a direct URL string.
+      // The #blobURLPromises cache was keyed by actual image width.
+      // Since we only get one URL directly, we can use preferredWidth as the cache key.
+      if (this.#blobURLPromises.has(preferredWidth)) {
+        return this.#blobURLPromises.get(preferredWidth);
+      }
+      // Store and return the promise for this direct URL.
+      const promise = Promise.resolve(iconURLString);
+      this.#blobURLPromises.set(preferredWidth, promise);
+      return promise;
+    } else {
+      // No specific icon URL found from the JSON-backed map for this engine.
+      console.warn(`No icon URL string found for engine ${this.id} via IconHandler.getAvailableRecords.`);
+      return null;
     }
-
-    let record = availableRecords.find(r => r.imageSize == width);
-    let promise = AppProvidedSearchEngine.iconHandler.createIconURL(record);
-    this.#blobURLPromises.set(width, promise);
-    return promise;
   }
 
   /**
diff --git a/toolkit/components/search/SearchEngineSelector.sys.mjs b/toolkit/components/search/SearchEngineSelector.sys.mjs
index ee32b05d723a7..3d86e5e757850 100644
--- a/toolkit/components/search/SearchEngineSelector.sys.mjs
+++ b/toolkit/components/search/SearchEngineSelector.sys.mjs
@@ -129,6 +129,23 @@ export class SearchEngineSelector {
     return this._configuration;
   }
 
+  /**
+   * Obtains the list of built-in search engines from the static JSON file.
+   *
+   * @returns {Promise<object[]>}
+   *   An array of engine configuration objects.
+   */
+  async _getStaticEngines() {
+    if (!this._staticEngines) {
+      this._staticEngines = await (
+        await fetch(
+          "chrome://browser/content/search/BrowserSearchEngines.json"
+        )
+      ).json();
+    }
+    return this._staticEngines;
+  }
+
   /**
    * Finds an engine configuration that has a matching host.
    *
@@ -139,17 +156,28 @@ export class SearchEngineSelector {
    *   The configuration data for an engine.
    */
   async findContextualSearchEngineByHost(host) {
-    for (let config of this._configuration) {
+    let engines = await this._getStaticEngines();
+
+    for (let config of engines) {
       if (config.recordType !== "engine") {
         continue;
       }
-      let searchHost = new URL(config.base.urls.search.base).hostname;
+
+      let searchBase = config.urls?.search?.base;
+      if (!searchBase) {
+        continue;
+      }
+
+      let searchHost = new URL(searchBase).hostname;
+
       if (searchHost.startsWith("www.")) {
         searchHost = searchHost.slice(4);
       }
       if (searchHost.startsWith(host)) {
-        let engine = structuredClone(config.base);
-        engine.identifier = config.identifier;
+        let engine = structuredClone(config);
+        if (!engine.identifier && config.identifier) {
+          engine.identifier = config.identifier;
+        }
         return engine;
       }
     }
@@ -166,13 +194,17 @@ export class SearchEngineSelector {
    *   The configuration data for an engine.
    */
   async findContextualSearchEngineById(id) {
-    for (let config of this._configuration) {
+    let engines = await this._getStaticEngines();
+
+    for (let config of engines) {
       if (config.recordType !== "engine") {
         continue;
       }
       if (config.identifier == id) {
-        let engine = structuredClone(config.base);
-        engine.identifier = config.identifier;
+        let engine = structuredClone(config);
+        if (!engine.identifier && config.identifier) {
+          engine.identifier = config.identifier;
+        }
         return engine;
       }
     }
diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs
index aca95f0acb025..087aa23766037 100644
--- a/toolkit/components/search/SearchService.sys.mjs
+++ b/toolkit/components/search/SearchService.sys.mjs
@@ -1424,10 +1424,6 @@ export class SearchService {
     // start listening straight away.
     Services.obs.addObserver(this, lazy.Region.REGION_TOPIC);
 
-    this.#getIgnoreListAndSubscribe().catch(ex =>
-      console.error(ex, "Search Service could not get the ignore list.")
-    );
-
     this.#engineSelector = new lazy.SearchEngineSelector(
       this.#handleConfigurationUpdated.bind(this)
     );
@@ -1570,6 +1566,7 @@ export class SearchService {
    * handled via a sync listener.
    *
    */
+  // eslint-disable-next-line no-unused-private-class-members
   async #getIgnoreListAndSubscribe() {
     let listener = this.#handleIgnoreListUpdated.bind(this);
     const current = await lazy.IgnoreLists.getAndSubscribe(listener);
@@ -2631,21 +2628,11 @@ export class SearchService {
   // This is prefixed with _ rather than # because it is
   // called in test_remove_engine_notification_box.js
   async _fetchEngineSelectorEngines() {
-    let searchEngineSelectorProperties = {
-      locale: Services.locale.appLocaleAsBCP47,
-      region: lazy.Region.home || "unknown",
-      channel: lazy.SearchUtils.MODIFIED_APP_CHANNEL,
-      experiment: this._experimentPrefValue,
-      distroID: lazy.SearchUtils.distroID ?? "",
-    };
-
-    for (let [key, value] of Object.entries(searchEngineSelectorProperties)) {
-      this._settings.setMetaDataAttribute(key, value);
-    }
-
-    return this.#engineSelector.fetchEngineConfiguration(
-      searchEngineSelectorProperties
-    );
+    const engines = await (
+      await fetch("chrome://browser/content/search/BrowserSearchEngines.json")
+    ).json();
+    // MODIFICATION: Use the correct property names appDefaultEngineId and appPrivateDefaultEngineId.
+    return { engines, appDefaultEngineId: "startpage", appPrivateDefaultEngineId: "startpage" };
   }
 
   #setDefaultFromSelector(refinedConfig) {
diff --git a/toolkit/components/telemetry/app/TelemetrySend.sys.mjs b/toolkit/components/telemetry/app/TelemetrySend.sys.mjs
index 730f0571aafad..3e497d1887585 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.sys.mjs
+++ b/toolkit/components/telemetry/app/TelemetrySend.sys.mjs
@@ -1689,46 +1689,6 @@ export var TelemetrySendImpl = {
   },
 
   runPingSender(pings, observer) {
-    if (AppConstants.platform === "android") {
-      throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
-    }
-
-    let suppressPingsender = Services.prefs.getBoolPref(
-      "toolkit.telemetry.testing.suppressPingsender",
-      false
-    );
-    if (suppressPingsender) {
-      this._log.trace("Silently skipping pingsender call in automation");
-      return;
-    }
-
-    // By default, invoke `pingsender[.exe] URL path ...`.
-    let exeName =
-      AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
-    let params = [];
-
-    if (lazy.NimbusFeatures.pingsender.getVariable("backgroundTaskEnabled")) {
-      // If using pingsender background task, invoke `firefox[.exe] --backgroundtask pingsender URL path ...`.
-      exeName =
-        AppConstants.MOZ_APP_NAME +
-        (AppConstants.platform === "win" ? ".exe" : "");
-      params = ["--backgroundtask", "pingsender"];
-    }
-
-    this._log.info(
-      `Invoking '${exeName}${params.length ? " " + params.join(" ") : ""} ...'`
-    );
-
-    let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-    exe.append(exeName);
-
-    params.push(...pings.flatMap(ping => [ping.url, ping.path]));
-    let process = Cc["@mozilla.org/process/util;1"].createInstance(
-      Ci.nsIProcess
-    );
-    process.init(exe);
-    process.startHidden = true;
-    process.noShell = true;
-    process.runAsync(params, params.length, observer);
+    throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
 };
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index a133831d2c26b..9d1f25e6edfae 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -8,9 +8,9 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-DIRS = [
-    "pingsender",
-]
+# DIRS = [
+#    "pingsender",
+# ]
 
 if CONFIG["COMPILE_ENVIRONMENT"]:
     EXPORTS.mozilla += ["!dap_ffi_generated.h"]
diff --git a/toolkit/components/urlformatter/URLFormatter.sys.mjs b/toolkit/components/urlformatter/URLFormatter.sys.mjs
index fe94e14b2eee0..d6d84c8528443 100644
--- a/toolkit/components/urlformatter/URLFormatter.sys.mjs
+++ b/toolkit/components/urlformatter/URLFormatter.sys.mjs
@@ -114,12 +114,16 @@ nsURLFormatterService.prototype = {
     XPCOMABI() {
       return this.ABI;
     },
+    ARCH() {
+      return UpdateUtils.ABI.substring(0, UpdateUtils.ABI.indexOf("-"));
+    },
     BUILD_TARGET() {
       return Services.appinfo.OS + "_" + this.ABI;
     },
     OS_VERSION() {
       return this.OSVersion;
     },
+    DISPLAY_VERSION: () => AppConstants.MOZ_APP_VERSION_DISPLAY,
     CHANNEL: () => lazy.UpdateUtils.UpdateChannel,
     MOZILLA_API_KEY: () => AppConstants.MOZ_MOZILLA_API_KEY,
     GOOGLE_LOCATION_SERVICE_API_KEY: () =>
diff --git a/toolkit/components/utils/WindowsInstallsInfo.sys.mjs b/toolkit/components/utils/WindowsInstallsInfo.sys.mjs
index b599687e6cd70..7a6b687d5391d 100644
--- a/toolkit/components/utils/WindowsInstallsInfo.sys.mjs
+++ b/toolkit/components/utils/WindowsInstallsInfo.sys.mjs
@@ -53,7 +53,7 @@ export var WindowsInstallsInfo = {
       }
     }
 
-    const subKeyName = `Software\\Mozilla\\${Services.appinfo.name}\\TaskBarIDs`;
+    const subKeyName = `Software\\Waterfox\\${Services.appinfo.name}\\TaskBarIDs`;
 
     const paths = new Set();
 
diff --git a/toolkit/components/windowwatcher/nsIPromptService.idl b/toolkit/components/windowwatcher/nsIPromptService.idl
index a675d4ababc97..e1fd43944ffcd 100644
--- a/toolkit/components/windowwatcher/nsIPromptService.idl
+++ b/toolkit/components/windowwatcher/nsIPromptService.idl
@@ -363,6 +363,67 @@ interface nsIPromptService : nsISupports
                     in wstring aButton2Title,
                     in wstring aCheckMsg,
                     inout boolean aCheckState);
+
+  /**
+   * Puts up a dialog with up to 3 buttons and an optional, labeled checkbox.
+   *
+   * @param aParent
+   *        The parent window or null.
+   * @param aDialogTitle
+   *        Text to appear in the title of the dialog.
+   * @param aText
+   *        Text to appear in the body of the dialog.
+   * @param aButtonFlags
+   *        A combination of Button Flags.
+   * @param aButton0Title
+   *        Used when button 0 uses TITLE_IS_STRING
+   * @param aButton1Title
+   *        Used when button 1 uses TITLE_IS_STRING
+   * @param aButton2Title
+   *        Used when button 2 uses TITLE_IS_STRING
+   * @param aCheckMsg
+   *        Text to appear with the checkbox.  Null if no checkbox.
+   * @param aCheckState
+   *        Contains the initial checked state of the checkbox when this method
+   *        is called and the final checked state after this method returns.
+   * @param aCheckMsg2
+   *        A second text to appear with the checkbox.  Null if no checkbox.
+   * @param aCheckState2
+   *        Contains the initial checked state of the checkbox when this method
+   *        is called and the final checked state after this method returns.
+   *
+   * @return index of the button pressed.
+   *
+   * Buttons are numbered 0 - 2. The implementation can decide whether the
+   * sequence goes from right to left or left to right.  Button 0 is the
+   * default button unless one of the Button Default Flags is specified.
+   *
+   * A button may use a predefined title, specified by one of the Button Title
+   * Flags values.  Each title value can be multiplied by a position value to
+   * assign the title to a particular button.  If BUTTON_TITLE_IS_STRING is
+   * used for a button, the string parameter for that button will be used.  If
+   * the value for a button position is zero, the button will not be shown.
+   *
+   * In general, aButtonFlags is constructed per the following example:
+   *
+   *   aButtonFlags = (BUTTON_POS_0) * (BUTTON_TITLE_AAA) +
+   *                  (BUTTON_POS_1) * (BUTTON_TITLE_BBB) +
+   *                   BUTTON_POS_1_DEFAULT;
+   *
+   * where "AAA" and "BBB" correspond to one of the button titles.
+   */
+  int32_t confirmEx2(in mozIDOMWindowProxy aParent,
+                    in wstring aDialogTitle,
+                    in wstring aText,
+                    in unsigned long aButtonFlags,
+                    in wstring aButton0Title,
+                    in wstring aButton1Title,
+                    in wstring aButton2Title,
+                    in wstring aCheckMsg,
+                    inout boolean aCheckState,
+                    in wstring aCheckMsg2,
+                    inout boolean aCheckState2);
+
   /**
    * Like confirmEx, but with a BrowsingContext as parent.
    *
diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml
index aae16e4dd0676..34108db89050c 100644
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -26,322 +26,6 @@
   </head>
 
   <body id="body">
-    <div id="categories">
-      <div class="heading">
-        <span id="ping-type" class="change-ping dropdown"></span>
-        <div id="controls" hidden="true">
-          <span
-            id="older-ping"
-            data-l10n-id="about-telemetry-previous-ping"
-          ></span>
-          <span id="ping-date" class="change-ping"></span>
-          <span id="newer-ping" data-l10n-id="about-telemetry-next-ping"></span>
-        </div>
-      </div>
-      <div
-        id="category-home"
-        class="category category-no-icon has-data selected"
-        value="home-section"
-      >
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-home-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="general-data-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-general-data-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="environment-data-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-environment-data-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="session-info-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-session-info-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="scalars-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-scalar-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="keyed-scalars-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-keyed-scalar-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="histograms-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-histograms-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="keyed-histograms-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-keyed-histogram-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="events-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-events-section"
-        ></span>
-      </div>
-      <div
-        class="category category-no-icon"
-        value="simple-measurements-section"
-      >
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-simple-measurements-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="slow-sql-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-slow-sql-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="addon-details-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-addon-details-section"
-        ></span>
-      </div>
-      <div class="category category-no-icon" value="late-writes-section">
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-late-writes-section"
-        ></span>
-      </div>
-      <div
-        class="category category-no-icon has-data"
-        value="raw-payload-section"
-      >
-        <span
-          class="category-name"
-          data-l10n-id="about-telemetry-raw-payload-section"
-        ></span>
-      </div>
-      <div
-        id="category-raw"
-        class="category category-no-icon has-data"
-        value="raw-json-viewer"
-      >
-        <span class="category-name" data-l10n-id="about-telemetry-raw"></span>
-      </div>
-    </div>
-
-    <div id="main" class="main-content">
-      <div id="ping-picker" class="hidden">
-        <div id="ping-source-picker">
-          <h4
-            class="title"
-            data-l10n-id="about-telemetry-ping-data-source"
-          ></h4>
-          <label class="radio-container-with-text">
-            <input
-              type="radio"
-              id="ping-source-current"
-              name="choose-ping-source"
-              value="current"
-              checked="checked"
-            />
-            <span data-l10n-id="about-telemetry-show-current-data"></span>
-          </label>
-          <label
-            id="ping-source-archive-container"
-            class="radio-container-with-text"
-          >
-            <input
-              type="radio"
-              id="ping-source-archive"
-              name="choose-ping-source"
-              value="archive"
-            />
-            <span data-l10n-id="about-telemetry-show-archived-ping-data"></span>
-          </label>
-        </div>
-        <label id="current-ping-picker" class="toggle-container-with-text">
-          <input id="show-subsession-data" type="checkbox" checked="checked" />
-          <span data-l10n-id="about-telemetry-show-subsession-data"></span>
-        </label>
-        <div id="archived-ping-picker">
-          <h4 class="title" data-l10n-id="about-telemetry-choose-ping"></h4>
-          <div>
-            <h4
-              class="title"
-              data-l10n-id="about-telemetry-archive-ping-type"
-            ></h4>
-            <select id="choose-ping-type"></select>
-          </div>
-          <div>
-            <h4
-              class="title"
-              data-l10n-id="about-telemetry-archive-ping-header"
-            ></h4>
-            <select id="choose-ping-id">
-              <optgroup
-                data-l10n-id="about-telemetry-option-group-today"
-              ></optgroup>
-              <optgroup
-                data-l10n-id="about-telemetry-option-group-yesterday"
-              ></optgroup>
-              <optgroup
-                data-l10n-id="about-telemetry-option-group-older"
-              ></optgroup>
-            </select>
-          </div>
-        </div>
-      </div>
-
-      <div class="header">
-        <h1
-          id="sectionTitle"
-          class="header-name"
-          data-l10n-id="about-telemetry-page-title"
-        />
-        <div id="sectionFilters">
-          <label
-            id="storesLabel"
-            for="stores"
-            hidden="true"
-            data-l10n-id="about-telemetry-current-store"
-          />
-          <select id="stores" hidden="true"></select>
-          <input type="text" id="search" placeholder="" />
-        </div>
-      </div>
-
-      <div id="no-search-results" hidden="true" class="hidden">
-        <span id="no-search-results-text"></span>
-      </div>
-
-      <section id="home-section" class="active">
-        <p id="page-subtitle"></p>
-        <p id="settings-explanation">
-          <a
-            id="uploadLink"
-            data-l10n-name="upload-link"
-            class="change-data-choices-link"
-            href="#"
-          ></a>
-        </p>
-        <p id="ping-explanation">
-          <a
-            id="pingLink"
-            data-l10n-name="ping-link"
-            href="https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/concepts/pings.html"
-          ></a>
-        </p>
-        <p data-l10n-id="about-telemetry-more-information"></p>
-        <ul>
-          <li data-l10n-id="about-telemetry-firefox-data-doc">
-            <a
-              id="dataDocLink"
-              data-l10n-name="data-doc-link"
-              href="https://docs.telemetry.mozilla.org/"
-            ></a>
-          </li>
-          <li data-l10n-id="about-telemetry-telemetry-client-doc">
-            <a
-              id="clientDocLink"
-              data-l10n-name="client-doc-link"
-              href="https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/index.html"
-            ></a>
-          </li>
-          <li data-l10n-id="about-telemetry-telemetry-dashboard">
-            <a
-              id="dashboardLink"
-              data-l10n-name="dashboard-link"
-              href="https://telemetry.mozilla.org/"
-            ></a>
-          </li>
-          <li data-l10n-id="about-telemetry-telemetry-probe-dictionary">
-            <a
-              id="probeDictionaryLink"
-              data-l10n-name="probe-dictionary-link"
-              href="https://probes.telemetry.mozilla.org/"
-            ></a>
-          </li>
-        </ul>
-      </section>
-
-      <section id="raw-payload-section">
-        <button
-          id="payload-json-viewer"
-          data-l10n-id="about-telemetry-show-in-Firefox-json-viewer"
-        ></button>
-        <pre id="raw-payload-data"></pre>
-      </section>
-
-      <section id="general-data-section">
-        <div id="general-data" class="data"></div>
-      </section>
-
-      <section id="environment-data-section">
-        <div id="environment-data" class="data"></div>
-      </section>
-
-      <section id="session-info-section">
-        <div id="session-info" class="data"></div>
-      </section>
-
-      <section id="scalars-section">
-        <div id="scalars" class="data"></div>
-      </section>
-
-      <section id="keyed-scalars-section">
-        <div id="keyed-scalars" class="data"></div>
-      </section>
-
-      <section id="histograms-section">
-        <div id="histograms" class="data"></div>
-      </section>
-
-      <section id="keyed-histograms-section">
-        <div id="keyed-histograms" class="data"></div>
-      </section>
-
-      <section id="events-section" class="text-search">
-        <div id="events" class="data"></div>
-      </section>
-
-      <section id="simple-measurements-section">
-        <div id="simple-measurements" class="data"></div>
-      </section>
-
-      <section id="slow-sql-section">
-        <p id="sql-warning" data-l10n-id="about-telemetry-full-sql-warning"></p>
-        <div id="slow-sql-tables" class="data"></div>
-      </section>
-
-      <section id="late-writes-section">
-        <a
-          id="late-writes-fetch-symbols"
-          href=""
-          data-l10n-id="about-telemetry-fetch-stack-symbols"
-        ></a>
-        <a
-          id="late-writes-hide-symbols"
-          href=""
-          data-l10n-id="about-telemetry-hide-stack-symbols"
-        ></a>
-        <div id="late-writes" class="data"></div>
-      </section>
-
-      <section id="addon-details-section">
-        <div id="addon-details" class="data"></div>
-      </section>
-    </div>
+    <p>Waterfox does not collect any telemetry.</p>
   </body>
 </html>
diff --git a/toolkit/content/filepicker.properties b/toolkit/content/filepicker.properties
index 03daec114c288..b6bd09c3c5625 100644
--- a/toolkit/content/filepicker.properties
+++ b/toolkit/content/filepicker.properties
@@ -5,7 +5,7 @@
 allFilter=*
 htmlFilter=*.html; *.htm; *.shtml; *.xhtml
 textFilter=*.txt; *.text
-imageFilter=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico; *.svg; *.svgz; *.tif; *.tiff; *.ai; *.drw; *.pct; *.psp; *.xcf; *.psd; *.raw; *.webp; *.heic
+imageFilter=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico; *.svg; *.svgz; *.tif; *.tiff; *.ai; *.drw; *.pct; *.psp; *.xcf; *.psd; *.raw; *.webp; *.heic; *.avif; *.jxl
 xmlFilter=*.xml
 xulFilter=*.xul
 audioFilter=*.aac; *.aif; *.flac; *.iff; *.m4a; *.m4b; *.mid; *.midi; *.mp3; *.mpa; *.mpc; *.oga; *.ogg; *.opus; *.ra; *.ram; *.snd; *.wav; *.wma
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index 323d8643d7b43..dcca55955586d 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -317,6 +317,13 @@ toolbox {
   }
 }
 
+@media (-moz-platform: linux) {
+*|*:root[shellshowingmenubar="true"]
+toolbar[type="menubar"]:not([customizing="true"]) {
+  display: none !important;
+}
+}
+
 toolbarspring {
   flex: 1000 1000;
 }
diff --git a/toolkit/crashreporter/client/crashreporter_win.cpp b/toolkit/crashreporter/client/crashreporter_win.cpp
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc b/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc
index 5b70903a4da31..2601722f74a46 100644
--- a/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc
+++ b/toolkit/crashreporter/google-breakpad/src/tools/windows/converter_exe/converter.cc
@@ -378,7 +378,7 @@ static void ConvertMissingSymbolFile(const MissingSymbolInfo &missing_info,
     // symbol server when crashes occur in Google extension code hosted by a
     // Firefox process.
     if (_stricmp(code_extension.c_str(), ".exe") == 0 &&
-        _stricmp(missing_info.code_file.c_str(), "firefox.exe") != 0) {
+        _stricmp(missing_info.code_file.c_str(), "waterfox.exe") != 0) {
       is_exe = true;
     }
   }
diff --git a/toolkit/locales/en-US/toolkit/branding/accounts.ftl b/toolkit/locales/en-US/toolkit/branding/accounts.ftl
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
index d9766a9e7968f..4cad545130fb0 100644
--- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
@@ -15,17 +15,17 @@
 ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
 
 -facebook-container-brand-name = Facebook Container
--monitor-brand-name = Firefox Monitor
+-monitor-brand-name = Monitor
 -monitor-brand-short-name = Monitor
 -mozmonitor-brand-name = Mozilla Monitor
 -pocket-brand-name = Pocket
--send-brand-name = Firefox Send
--screenshots-brand-name = Firefox Screenshots
+-send-brand-name = Send
+-screenshots-brand-name = Screenshots
 -mozilla-vpn-brand-name = Mozilla VPN
--profiler-brand-name = Firefox Profiler
--translations-brand-name = Firefox Translations
--focus-brand-name = Firefox Focus
--relay-brand-name = Firefox Relay
+-profiler-brand-name = Waterfox Profiler
+-translations-brand-name = Waterfox Translations
+-focus-brand-name = Focus
+-relay-brand-name = Relay
 -relay-brand-short-name = Relay
 -fakespot-brand-name = Fakespot
 -solo-ai-brand-name = Solo
@@ -38,18 +38,18 @@
 
 # โ€œSuggestโ€ can be localized, โ€œFirefoxโ€ must be treated as a brand
 # and kept in English.
--firefox-suggest-brand-name = Firefox Suggest
+-firefox-suggest-brand-name = Waterfox Suggest
 
 # โ€Home" can be localized, โ€œFirefoxโ€ must be treated as a brand
 # and kept in English.
--firefox-home-brand-name = Firefox Home
+-firefox-home-brand-name = Waterfox Home
 
 # View" can be localized, โ€œFirefoxโ€ must be treated as a brand
 # and kept in English.
--firefoxview-brand-name = Firefox View
+-firefoxview-brand-name = Waterfox View
 
 # Firefox Labs is the name for a page in Settings to allow users to learn about
 # experimental and in-development features, and turn those features on and off.
 # The "Labs" portion can be localized, โ€œFirefoxโ€ must be treated as a brand
 # and kept in English.
--firefoxlabs-brand-name = Firefox Labs
+-firefoxlabs-brand-name = Labs
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
index a794e82288d30..451b4b71f8fef 100644
--- a/toolkit/modules/AppConstants.sys.mjs
+++ b/toolkit/modules/AppConstants.sys.mjs
@@ -211,11 +211,11 @@ export var AppConstants = Object.freeze({
 #ifdef MOZ_THUNDERBIRD
     "https://thunderbird-settings.thunderbird.net/v1",
 #else
-    "https://firefox.settings.services.mozilla.com/v1",
+    "",
 #endif
 
   REMOTE_SETTINGS_VERIFY_SIGNATURE:
-#ifdef MOZ_THUNDERBIRD
+#if defined(MOZ_THUNDERBIRD) || defined(MOZ_APP_VERSION)
     false,
 #else
     true,
diff --git a/toolkit/modules/PrivateBrowsingUtils.sys.mjs b/toolkit/modules/PrivateBrowsingUtils.sys.mjs
index 487a43bfbf602..34d2d1094861e 100644
--- a/toolkit/modules/PrivateBrowsingUtils.sys.mjs
+++ b/toolkit/modules/PrivateBrowsingUtils.sys.mjs
@@ -29,7 +29,10 @@ export var PrivateBrowsingUtils = {
 
   // This should be used only in frame scripts.
   isContentWindowPrivate: function pbu_isWindowPrivate(aWindow) {
-    return this.privacyContextFromWindow(aWindow).usePrivateBrowsing;
+    // Waterfox: Essential to prevent form data from being saved.
+    return this.privacyContextFromWindow(aWindow).usePrivateBrowsing
+      ? true
+      : Services.prefs.getBoolPref("browser.tabs.selectedTabPrivate", false);
   },
 
   isBrowserPrivate(aBrowser) {
diff --git a/toolkit/modules/ResetProfile.sys.mjs b/toolkit/modules/ResetProfile.sys.mjs
index e1b8ae608185c..7a57a300df9f7 100644
--- a/toolkit/modules/ResetProfile.sys.mjs
+++ b/toolkit/modules/ResetProfile.sys.mjs
@@ -24,7 +24,7 @@ ChromeUtils.defineLazyGetter(lazy, "MigrationUtils", () => {
   return undefined;
 });
 
-const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME;
+const MOZ_APP_NAME = "firefox";
 
 export var ResetProfile = {
   /**
diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
index 2c8a093013d40..fc5dd6419b3d1 100644
--- a/toolkit/modules/UpdateUtils.sys.mjs
+++ b/toolkit/modules/UpdateUtils.sys.mjs
@@ -77,6 +77,9 @@ export var UpdateUtils = {
     return url.replace(/%(\w+)%/g, (match, name) => {
       let replacement = match;
       switch (name) {
+        case "ARCH":
+          replacement = UpdateUtils.ABI.substring(0, UpdateUtils.ABI.indexOf("-"));
+          break;
         case "PRODUCT":
           replacement = Services.appinfo.name;
           break;
@@ -89,6 +92,9 @@ export var UpdateUtils = {
         case "BUILD_TARGET":
           replacement = Services.appinfo.OS + "_" + this.ABI;
           break;
+        case "OS":
+          replacement = Services.appinfo.OS;
+          break;
         case "OS_VERSION":
           replacement = this.OSVersion;
           break;
@@ -110,6 +116,9 @@ export var UpdateUtils = {
         case "DISTRIBUTION_VERSION":
           replacement = getDistributionPrefValue(PREF_APP_DISTRIBUTION_VERSION);
           break;
+        case "DISPLAY_VERSION":
+          replacement = AppConstants.MOZ_APP_VERSION_DISPLAY;
+          break;
       }
       return encodeURIComponent(replacement);
     });
@@ -960,6 +969,8 @@ function getMemoryMB() {
  */
 ChromeUtils.defineLazyGetter(lazy, "gInstructionSet", function aus_gIS() {
   const CPU_EXTENSIONS = [
+    "hasAVX2",
+    "hasAVX",
     "hasSSE4_2",
     "hasSSE4_1",
     "hasSSE4A",
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 7eb76b2dd0209..466629f57d1bf 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -932,9 +932,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
 option("--disable-jxl", help="Disable jxl image support")
 
 
-@depends("--disable-jxl", milestone.is_nightly)
-def jxl(value, is_nightly):
-    if is_nightly and value:
+@depends("--disable-jxl")
+def jxl(value):
+    if value:
         return True
 
 
diff --git a/toolkit/mozapps/defaultagent/Policy.cpp b/toolkit/mozapps/defaultagent/Policy.cpp
index f8efdf24a2c6b..90786b3c1d155 100644
--- a/toolkit/mozapps/defaultagent/Policy.cpp
+++ b/toolkit/mozapps/defaultagent/Policy.cpp
@@ -30,7 +30,7 @@
 // The Firefox policy engine hardcodes the string "Mozilla" in its registry
 // key accesses rather than using the configured vendor name, so we should do
 // the same here to be sure we're compatible with it.
-#define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\Mozilla\\" MOZ_APP_BASENAME
+#define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\BrowserWorks\\" MOZ_APP_BASENAME
 
 namespace mozilla::default_agent {
 
diff --git a/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp b/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp
index 2407391e7aeab..ee57e33b2f7b0 100644
--- a/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp
+++ b/toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp
@@ -446,8 +446,8 @@ nsresult SetDefaultBrowserUserChoice(
   }
 
   nsTArray<nsString> browserDefaults = {
-      u"https"_ns, u"FirefoxURL"_ns,  u"http"_ns, u"FirefoxURL"_ns,
-      u".html"_ns, u"FirefoxHTML"_ns, u".htm"_ns, u"FirefoxHTML"_ns};
+      u"https"_ns, u"WaterfoxURL"_ns,  u"http"_ns, u"WaterfoxURL"_ns,
+      u".html"_ns, u"WaterfoxHTML"_ns, u".htm"_ns, u"WaterfoxHTML"_ns};
 
   browserDefaults.AppendElements(aExtraFileExtensions);
 
diff --git a/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp b/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp
index 7c491184d9080..81d903610c61c 100644
--- a/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp
+++ b/toolkit/mozapps/defaultagent/tests/gtest/SetDefaultBrowserTest.cpp
@@ -20,14 +20,14 @@ TEST(SetDefaultBrowserUserChoice, Hash)
 
   // length mod 8 = 0
   EXPECT_STREQ(
-      GenerateUserChoiceHash(L"https", sid, L"FirefoxURL-308046B0AF4A39CB",
+      GenerateUserChoiceHash(L"https", sid, L"WaterfoxURL-308046B0AF4A39CB",
                              (SYSTEMTIME){2021, 4, 1, 19, 23, 7, 56, 506})
           .get(),
       L"uzpIsMVyZ1g=");
 
   // length mod 8 = 2 (confirm that the incomplete last block is dropped)
   EXPECT_STREQ(
-      GenerateUserChoiceHash(L".html", sid, L"FirefoxHTML-308046B0AF4A39CB",
+      GenerateUserChoiceHash(L".html", sid, L"WaterfoxHTML-308046B0AF4A39CB",
                              (SYSTEMTIME){2021, 4, 1, 19, 23, 7, 56, 519})
           .get(),
       L"7fjRtUPASlc=");
@@ -48,7 +48,7 @@ TEST(SetDefaultBrowserUserChoice, Hash)
 
   // non-ASCII
   EXPECT_STREQ(
-      GenerateUserChoiceHash(L".html", sid, L"FirefoxHTML-ร€Bร‡Dร‹๐Ÿ˜€โ€ ",
+      GenerateUserChoiceHash(L".html", sid, L"WaterfoxHTML-ร€Bร‡Dร‹๐Ÿ˜€โ€ ",
                              (SYSTEMTIME){2021, 4, 2, 20, 0, 38, 55, 101})
           .get(),
       L"F3NsK3uNv5E=");
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
index e09ea87de86b0..2980d7822e98a 100644
--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
+++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
@@ -4171,7 +4171,9 @@ export var AddonManager = {
   AUTOUPDATE_DEFAULT: 1,
   // Indicates that the Addon should update automatically.
   AUTOUPDATE_ENABLE: 2,
-
+  // Constants for how Addon options should be shown.
+  // Options will be opened in a new window
+  OPTIONS_TYPE_DIALOG: 1,
   // Constants for how Addon options should be shown.
   // Options will be displayed in a new tab, if possible
   OPTIONS_TYPE_TAB: 3,
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html
index 8232f18c7a036..bad130e75f10a 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.html
+++ b/toolkit/mozapps/extensions/content/aboutaddons.html
@@ -401,6 +401,10 @@ <h1 class="header-name"></h1>
           <img class="card-heading-icon addon-icon" alt="" />
           <div class="card-contents">
             <div class="addon-name-container">
+              <!-- WATERFOX -->
+              <div class="addon-name">
+                <div class="addon-version-number"></div>
+              </div>
               <a
                 class="addon-badge addon-badge-recommended"
                 is="moz-support-link"
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index 4763221e86eb0..05d032b8b39e0 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -1591,8 +1591,10 @@ class AddonOptions extends HTMLElement {
   }
 
   update(card, addon, updateInstall) {
+    // Be robust if callers don't pass updateInstall: derive it from the addon.
+    const effectiveUpdateInstall = updateInstall || getUpdateInstall(addon);
     for (let el of this.items) {
-      this.setElementState(el, card, addon, updateInstall);
+      this.setElementState(el, card, addon, effectiveUpdateInstall);
     }
 
     // Update the separators visibility based on the updated visibility
@@ -3016,6 +3018,10 @@ class AddonCard extends HTMLElement {
     }
     nameContainer.prepend(nameHeading);
 
+    // WATERFOX
+    let collapsedVersion = this.card.querySelector(".addon-version-number");
+    collapsedVersion.textContent = addon.version;
+
     let panelType = addon.type == "plugin" ? "plugin-options" : "addon-options";
     this.options = document.createElement(panelType);
     this.options.render();
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
index b4170fce161f3..54e92ce086723 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
@@ -990,6 +990,7 @@ export class AddonWrapper {
 
     if (addon.optionsType) {
       switch (parseInt(addon.optionsType, 10)) {
+        case lazy.AddonManager.OPTIONS_TYPE_DIALOG:
         case lazy.AddonManager.OPTIONS_TYPE_TAB:
         case lazy.AddonManager.OPTIONS_TYPE_INLINE_BROWSER:
           return hasOptionsURL ? addon.optionsType : null;
@@ -2717,8 +2718,8 @@ export const XPIDatabase = {
     }
 
     if (this.isDisabledLegacy(aAddon)) {
-      logger.warn(`disabling legacy extension ${aAddon.id}`);
-      return false;
+      logger.warn(`enabling legacy extension ${aAddon.id}`);
+      return true;
     }
 
     if (lazy.AddonManager.checkCompatibility) {
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js b/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
index 22909e63622f7..b55cb81771c79 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
@@ -40,13 +40,13 @@ add_task(async function setup() {
 add_task(async function test_1() {
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     xpi1.path
   );
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID2,
     xpi2.path
   );
@@ -69,13 +69,13 @@ add_task(async function test_1() {
 add_task(async function test_2() {
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     null
   );
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID2,
     null
   );
@@ -91,13 +91,13 @@ add_task(async function test_2() {
 add_task(async function test_3() {
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     xpi2.path
   );
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID2,
     xpi1.path
   );
@@ -116,13 +116,13 @@ add_task(async function test_4() {
 
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     null
   );
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID2,
     null
   );
@@ -131,7 +131,7 @@ add_task(async function test_4() {
 
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     xpi1.path
   );
@@ -140,13 +140,13 @@ add_task(async function test_4() {
 
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID1,
     null
   );
   registry.setValue(
     Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-    "SOFTWARE\\Mozilla\\XPCShell\\Extensions",
+    "SOFTWARE\\BrowserWorks\\XPCShell\\Extensions",
     ID2,
     xpi1.path
   );
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index c7be519725238..f073027092e44 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -11,7 +11,7 @@ ifndef PACKAGE_NAME_MK_INCLUDED
 PACKAGE_NAME_MK_INCLUDED := 1
 
 ifndef MOZ_PKG_VERSION
-MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
+MOZ_PKG_VERSION = $(MOZ_APP_VERSION_DISPLAY)
 endif
 
 ifndef MOZ_PKG_PLATFORM
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
index a5e3977fb0d54..6110a33f8e181 100755
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -538,7 +538,7 @@
 
       ; Add our subdirectory, this is hardcoded as grandparent of the update directory in
       ; several other places.
-      StrCpy $0 "$0\Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38"
+      StrCpy $0 "$0\Waterfox-1de4eec8-1241-4177-a864-e594e8d1fb38"
 
       Exch $0   ; Restore original $0 and put our $0 on the stack.
     FunctionEnd
@@ -1205,7 +1205,7 @@
  *
  * @param   _KEY ($R1)
  *          Sub key containing all the installer prefs
- *          Usually "Software\Mozilla\${AppName}"
+ *          Usually "Software\BrowserWorks\${AppName}"
  * @param   _PREF ($R2)
  *          Name of the pref to look up
  * @return  _RESULT ($R3)
@@ -1670,7 +1670,7 @@
  * registry hive so you must call SetShellVarContext first.
  *
  * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla).
+ *          The registry subkey (typically this will be Software\BrowserWorks).
  * @return  _RESULT
  *          false if a second install isn't found, path to the main exe if a
  *          second install is found.
@@ -1788,7 +1788,7 @@
  * first.
  *
  * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla\App Name).
+ *          The registry subkey (typically this will be Software\BrowserWorks\App Name).
  * @return  _RESULT
  *          false if a single install location for this app name isn't found,
  *          path to the install directory if a single install location is found.
@@ -1904,7 +1904,7 @@
  * The shell context and the registry view should already have been set.
  *
  * @param   _KEY
- *          The registry subkey (typically Software\Mozilla\App Name).
+ *          The registry subkey (typically Software\BrowserWorks\App Name).
  * @return  _RESULT
  *          path to the install directory of the first location found, or
  *          the string "false" if no existing installation was found.
@@ -2606,7 +2606,7 @@
  * call SetShellVarContext first.
  *
  * @param   _KEY
- *          The registry subkey (typically this will be Software\Mozilla).
+ *          The registry subkey (typically this will be Software\BrowserWorks).
  *
  * $0  = loop counter
  * $1  = temporary value used for string searches
@@ -2853,7 +2853,7 @@
  *
  * @param   _KEY ($R1)
  *          The registry subkey
- *          (typically this will be Software\Mozilla\${AppName}).
+ *          (typically this will be Software\BrowserWorks\${AppName}).
  */
 !macro RegCleanPrefs
   !ifndef ${_MOZFUNC_UN}RegCleanPrefs
@@ -5657,7 +5657,7 @@
 !ifmacrodef InitHashAppModelId
       ; setup the application model id registration value
       !ifdef AppName
-      ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+      ${InitHashAppModelId} "$INSTDIR" "Software\BrowserWorks\${AppName}\TaskBarIDs"
       !endif
 !endif
 
@@ -5880,12 +5880,12 @@
         ; And verify that if we need to, we're going to clean up the registry
         ; correctly.
         ${If} "$R4" == "mms"
-          WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
+          WriteRegStr HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest" "Write Test"
           ${If} ${Errors}
             ; Nothing initialized so no need to call OnEndCommon
             Quit
           ${Endif}
-          DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
+          DeleteRegValue HKLM "Software\BrowserWorks" "${BrandShortName}InstallerTest"
         ${EndIf}
       !endif
 
@@ -5994,20 +5994,20 @@
       ${If} ${IsNativeAMD64}
       ${OrIf} ${IsNativeARM64}
         SetRegView 64
-        ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+        ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9
         SetRegView lastused
       ${EndIf}
 
       StrCmp "$R9" "false" +1 finish_get_install_dir
 
       SetRegView 32
-      ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+      ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9
       SetRegView lastused
 
       StrCmp "$R9" "false" +1 finish_get_install_dir
 
       SetShellVarContext current  ; Set SHCTX to HKCU
-      ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+      ${GetSingleInstallPath} "Software\BrowserWorks\${BrandFullNameInternal}" $R9
 
       finish_get_install_dir:
       StrCmp "$R9" "false" +2 +1
@@ -7782,11 +7782,11 @@
   StrCpy $R0 ""
   ; Look for an install-specific profile, which might be listed as
   ; either a relative or an absolute path (installs.ini doesn't say which).
-  ${If} ${FileExists} "$APPDATA\Mozilla\Firefox\installs.ini"
+  ${If} ${FileExists} "$APPDATA\Waterfox\installs.ini"
     ClearErrors
-    ReadINIStr $1 "$APPDATA\Mozilla\Firefox\installs.ini" "$AppUserModelID" "Default"
+    ReadINIStr $1 "$APPDATA\Waterfox\installs.ini" "$AppUserModelID" "Default"
     ${IfNot} ${Errors}
-      ${${_MOZFUNC_UN}GetLongPath} "$APPDATA\Mozilla\Firefox\$1" $2
+      ${${_MOZFUNC_UN}GetLongPath} "$APPDATA\Waterfox\$1" $2
       ${If} ${FileExists} $2
         StrCpy $R0 $2
       ${Else}
diff --git a/toolkit/mozapps/update/AppUpdater.sys.mjs b/toolkit/mozapps/update/AppUpdater.sys.mjs
index f1e3152ec1db1..f738f18cd9b31 100644
--- a/toolkit/mozapps/update/AppUpdater.sys.mjs
+++ b/toolkit/mozapps/update/AppUpdater.sys.mjs
@@ -254,6 +254,11 @@ export class AppUpdater {
         return;
       }
 
+      if (this.#updateDisabledByPref) {
+        this.#setStatus(AppUpdater.STATUS.NEVER_CHECKED);
+        return;
+      }
+
       if (this.aus.disabled) {
         LOG("AppUpdater:check - AUS disabled");
         this.#setStatus(AppUpdater.STATUS.UPDATE_DISABLED_BY_POLICY);
@@ -412,6 +417,10 @@ export class AppUpdater {
     return Services.sysinfo.getProperty("isPackagedApp");
   }
 
+  get #updateDisabledByPref() {
+    return !Services.prefs.getBoolPref("app.update.enabled", true);
+  }
+
   /**
    * Downloads an update mar or connects to an in-progress download.
    * Doesn't resolve until the update is ready to install, or a failure state
diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
index f5a9a91037cf8..66ff689f25ecf 100644
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
@@ -103,6 +103,7 @@ const PREF_APP_UPDATE_SERVICE_MAXERRORS = "app.update.service.maxErrors";
 const PREF_APP_UPDATE_SOCKET_MAXERRORS = "app.update.socket.maxErrors";
 const PREF_APP_UPDATE_SOCKET_RETRYTIMEOUT = "app.update.socket.retryTimeout";
 const PREF_APP_UPDATE_STAGING_ENABLED = "app.update.staging.enabled";
+const PREF_APP_UPDATE_URL_OVERRIDE = "app.update.url.override";
 const PREF_APP_UPDATE_URL_DETAILS = "app.update.url.details";
 const PREF_NETWORK_PROXY_TYPE = "network.proxy.type";
 
@@ -1252,7 +1253,7 @@ function isServiceInstalled() {
     );
     wrk.open(
       wrk.ROOT_KEY_LOCAL_MACHINE,
-      "SOFTWARE\\Mozilla\\MaintenanceService",
+      "Software\\BrowserWorks\\MaintenanceService",
       wrk.ACCESS_READ | wrk.WOW64_64
     );
     installed = wrk.readIntValue("Installed");
@@ -4013,6 +4014,15 @@ export class UpdateService {
    * See nsIUpdateService.idl
    */
   get canUsuallyCheckForUpdates() {
+    let prefEnabled = Services.prefs.getBoolPref("app.update.enabled", true);
+    if (!prefEnabled) {
+      LOG(
+        "UpdateService.canUsuallyCheckForUpdates - unable to automatically check " +
+          "the preference is disabled."
+      );
+      return false;
+    }
+
     if (this.disabled) {
       LOG(
         "UpdateService.canUsuallyCheckForUpdates - unable to automatically check " +
@@ -5349,7 +5359,7 @@ export class CheckerService {
     );
 
     let regPath =
-      "SOFTWARE\\Mozilla\\" + Services.appinfo.name + "\\32to64DidMigrate";
+      "SOFTWARE\\BrowserWorks\\" + Services.appinfo.name + "\\32to64DidMigrate";
     let regValHKCU = lazy.WindowsRegistry.readRegKey(
       wrk.ROOT_KEY_CURRENT_USER,
       regPath,
@@ -5420,8 +5430,19 @@ export class CheckerService {
       throw Components.Exception("", Cr.NS_ERROR_INVALID_ARG);
     }
 
-    let url = Services.appinfo.updateURL;
+    let url;
     let updatePin;
+    if (
+      Services.prefs
+        .getDefaultBranch(null)
+        .getCharPref(PREF_APP_UPDATE_URL_OVERRIDE, "")
+    ) {
+      url = Services.prefs
+        .getDefaultBranch(null)
+        .getCharPref(PREF_APP_UPDATE_URL_OVERRIDE, "");
+    } else {
+      url = Services.appinfo.updateURL;
+    }
 
     if (Services.policies) {
       let policies = Services.policies.getActivePolicies();
diff --git a/toolkit/mozapps/update/UpdateTelemetry.sys.mjs b/toolkit/mozapps/update/UpdateTelemetry.sys.mjs
index 2de95d586d77a..28b3e37bc3efb 100644
--- a/toolkit/mozapps/update/UpdateTelemetry.sys.mjs
+++ b/toolkit/mozapps/update/UpdateTelemetry.sys.mjs
@@ -465,7 +465,7 @@ export var AUSTLMY = {
       );
       wrk.open(
         wrk.ROOT_KEY_LOCAL_MACHINE,
-        "SOFTWARE\\Mozilla\\MaintenanceService",
+        "SOFTWARE\\BrowserWorks\\MaintenanceService",
         wrk.ACCESS_READ | wrk.WOW64_64
       );
       // Was the service at some point installed, but is now uninstalled?
diff --git a/toolkit/mozapps/update/common/commonupdatedir.cpp b/toolkit/mozapps/update/common/commonupdatedir.cpp
index 0ba9fcef94173..b9c0974c48e76 100644
--- a/toolkit/mozapps/update/common/commonupdatedir.cpp
+++ b/toolkit/mozapps/update/common/commonupdatedir.cpp
@@ -33,7 +33,7 @@
 #ifdef XP_WIN
 // This is the name of the old update directory
 // (i.e. C:\ProgramData\<OLD_ROOT_UPDATE_DIR_NAME>)
-#  define OLD_ROOT_UPDATE_DIR_NAME "Mozilla"
+#  define OLD_ROOT_UPDATE_DIR_NAME "Waterfox"
 // This is the name of the current update directory
 // (i.e. C:\ProgramData\<ROOT_UPDATE_DIR_NAME>)
 // It is really important that we properly set the permissions on this
@@ -43,7 +43,7 @@
 // this problem in the future, we are including a UUID in the root update
 // directory name to attempt to ensure that it will be created by this code and
 // won't already exist with the wrong permissions.
-#  define ROOT_UPDATE_DIR_NAME "Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38"
+#  define ROOT_UPDATE_DIR_NAME "Waterfox-1de4eec8-1241-4177-a864-e594e8d1fb38"
 // This describes the directory between the "Mozilla" directory and the install
 // path hash (i.e. C:\ProgramData\Mozilla\<UPDATE_PATH_MID_DIR_NAME>\<hash>)
 #  define UPDATE_PATH_MID_DIR_NAME "updates"
@@ -576,7 +576,7 @@ static HRESULT GetUpdateDirectory(const wchar_t* installPath,
   // The Windows installer caches this hash value in the registry
   bool gotHash = false;
   SimpleAutoString regPath;
-  regPath.AutoAllocAndAssignSprintf(L"SOFTWARE\\Mozilla\\%S\\TaskBarIDs",
+  regPath.AutoAllocAndAssignSprintf(L"Software\\Waterfox\\%S\\TaskBarIDs",
                                     MOZ_APP_BASENAME);
   if (regPath.Length() != 0) {
     gotHash = GetCachedHash(reinterpret_cast<const char16_t*>(installPath),
diff --git a/toolkit/mozapps/update/common/pathhash.cpp b/toolkit/mozapps/update/common/pathhash.cpp
index e70f69a7554fc..878760e9f8b19 100644
--- a/toolkit/mozapps/update/common/pathhash.cpp
+++ b/toolkit/mozapps/update/common/pathhash.cpp
@@ -119,7 +119,7 @@ BOOL CalculateRegistryPathFromFilePath(const LPCWSTR filePath,
   delete[] lowercasePath;
 
   LPCWSTR baseRegPath =
-      L"SOFTWARE\\Mozilla\\"
+      L"SOFTWARE\\BrowserWorks\\"
       L"MaintenanceService\\";
   wcsncpy(registryPath, baseRegPath, MAX_PATH);
   BinaryDataToHexString(hash, hashSize, registryPath + wcslen(baseRegPath));
diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp
index c62120414223f..b9886a70a6cbf 100644
--- a/toolkit/mozapps/update/common/updatehelper.cpp
+++ b/toolkit/mozapps/update/common/updatehelper.cpp
@@ -443,7 +443,7 @@ LaunchServiceSoftwareUpdateCommand(int argc, LPCWSTR* argv) {
   // 2) The command being executed, which is "software-update"
   // 3) The path to updater.exe (from argv[0])
   LPCWSTR* updaterServiceArgv = new LPCWSTR[argc + 2];
-  updaterServiceArgv[0] = L"MozillaMaintenance";
+  updaterServiceArgv[0] = L"WaterfoxMaintenance";
   updaterServiceArgv[1] = L"software-update";
 
   for (int i = 0; i < argc; ++i) {
diff --git a/toolkit/mozapps/update/common/updatehelper.h b/toolkit/mozapps/update/common/updatehelper.h
index b346893835770..b3b135314af83 100644
--- a/toolkit/mozapps/update/common/updatehelper.h
+++ b/toolkit/mozapps/update/common/updatehelper.h
@@ -24,9 +24,9 @@ void RemoveSecureOutputFiles(LPCWSTR patchDirPath);
 #define PATCH_DIR_PATH L"\\updates\\0"
 
 #ifdef MOZ_MAINTENANCE_SERVICE
-#  define SVC_NAME L"MozillaMaintenance"
+#  define SVC_NAME L"WaterfoxMaintenance"
 
-#  define BASE_SERVICE_REG_KEY L"SOFTWARE\\Mozilla\\MaintenanceService"
+#  define BASE_SERVICE_REG_KEY L"SOFTWARE\\BrowserWorks\\MaintenanceService"
 
 // The test only fallback key, as its name implies, is only present on machines
 // that will use automated tests.  Since automated tests always run from a
diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
index f0ef0dd8af67f..36f26926c825a 100644
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -2037,7 +2037,7 @@ function copyTestUpdaterToBinDir() {
     stripQuarantineBitFromPath(updater.path);
     updater.append("Contents");
     updater.append("MacOS");
-    updater.append("org.mozilla.updater");
+    updater.append("net.waterfox.updater");
   }
   return updater;
 }
@@ -2549,7 +2549,7 @@ function shouldRunServiceTest() {
   let isBinSigned = isBinarySigned(updaterBinPath);
 
   const REG_PATH =
-    "SOFTWARE\\Mozilla\\MaintenanceService\\" +
+    "SOFTWARE\\BrowserWorks\\MaintenanceService\\" +
     "3932ecacee736d366d6436db0f55bce4";
   let key = Cc["@mozilla.org/windows-registry-key;1"].createInstance(
     Ci.nsIWindowsRegKey
@@ -2580,7 +2580,7 @@ function shouldRunServiceTest() {
   }
 
   // Check to make sure the service is installed
-  let args = ["wait-for-service-stop", "MozillaMaintenance", "10"];
+  let args = ["wait-for-service-stop", "WaterfoxMaintenance", "10"];
   let exitValue = runTestHelperSync(args);
   Assert.notEqual(
     exitValue,
@@ -2952,7 +2952,7 @@ function waitForServiceStop(aFailTest) {
   debugDump("waiting for the maintenance service to stop if necessary");
   // Use the helper bin to ensure the service is stopped. If not stopped, then
   // wait for the service to stop (at most 120 seconds).
-  let args = ["wait-for-service-stop", "MozillaMaintenance", "120"];
+  let args = ["wait-for-service-stop", "WaterfoxMaintenance", "120"];
   let exitValue = runTestHelperSync(args);
   Assert.notEqual(exitValue, 0xee, "the maintenance service should exist");
   if (exitValue != 0) {
diff --git a/toolkit/mozapps/update/updater/Launchd.plist b/toolkit/mozapps/update/updater/Launchd.plist
index f0b5cef085daa..4952b1d841de2 100644
--- a/toolkit/mozapps/update/updater/Launchd.plist
+++ b/toolkit/mozapps/update/updater/Launchd.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>org.mozilla.updater</string>
+  <string>net.waterfox.updater</string>
   <key>RunAtLoad</key>
   <true/>
 </dict>
diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in
index 6befe667b444b..d4dcf638ed4a0 100644
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -30,7 +30,7 @@ libs::
 	rsync -a -C $(DIST)/bin/Info.plist $(DIST)/bin/updater.app/Contents
 	$(call py_action,preprocessor updater.app/Contents/Resources/English.lproj/InfoPlist.strings,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_APP_DISPLAYNAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings)
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS
-	$(NSINSTALL) $(DIST)/bin/org.mozilla.updater $(DIST)/bin/updater.app/Contents/MacOS
+	$(NSINSTALL) $(DIST)/bin/net.waterfox.updater $(DIST)/bin/updater.app/Contents/MacOS
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/Frameworks
 ifneq (,$(COMPILE_ENVIRONMENT))
 	$(NSINSTALL) $(DIST)/bin/UpdateSettings $(DIST)/bin/updater.app/Contents/Frameworks/UpdateSettings.framework
diff --git a/toolkit/mozapps/update/updater/launchchild_osx.mm b/toolkit/mozapps/update/updater/launchchild_osx.mm
index 6f91571ef22c3..4af7fec1989fd 100644
--- a/toolkit/mozapps/update/updater/launchchild_osx.mm
+++ b/toolkit/mozapps/update/updater/launchchild_osx.mm
@@ -193,7 +193,7 @@ id ConnectToUpdateServer() {
   while (!isConnected && currTry < numRetries) {
     @try {
       updateServer = (id)[NSConnection
-          rootProxyForConnectionWithRegisteredName:@"org.mozilla.updater.server"
+          rootProxyForConnectionWithRegisteredName:@"net.waterfox.updater.server"
                                               host:nil
                                    usingNameServer:[NSSocketPortNameServer
                                                        sharedInstance]];
@@ -237,14 +237,14 @@ void CleanupElevatedMacUpdate(bool aFailureOccurred) {
 
   NSFileManager* manager = [NSFileManager defaultManager];
   [manager
-      removeItemAtPath:@"/Library/PrivilegedHelperTools/org.mozilla.updater"
+      removeItemAtPath:@"/Library/PrivilegedHelperTools/net.waterfox.updater"
                  error:nil];
-  [manager removeItemAtPath:@"/Library/LaunchDaemons/org.mozilla.updater.plist"
+  [manager removeItemAtPath:@"/Library/LaunchDaemons/net.waterfox.updater.plist"
                       error:nil];
 
   // The following call will terminate the current process due to the "remove"
   // argument.
-  LaunchTask(@"/bin/launchctl", @[ @"remove", @"org.mozilla.updater" ]);
+  LaunchTask(@"/bin/launchctl", @[ @"remove", @"net.waterfox.updater" ]);
 }
 
 // Note: Caller is responsible for freeing aArgv.
@@ -327,7 +327,7 @@ - (BOOL)runServer {
   NSConnection* server = [NSConnection connectionWithReceivePort:serverPort
                                                         sendPort:serverPort];
   [server setRootObject:self];
-  if ([server registerName:@"org.mozilla.updater.server"
+  if ([server registerName:@"net.waterfox.updater.server"
             withNameServer:[NSSocketPortNameServer sharedInstance]] == NO) {
     NSLog(@"Unable to register as DirectoryServer.");
     NSLog(@"Is another copy running?");
diff --git a/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in b/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in
index 58be384061932..52ed5073514ed 100644
--- a/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in
+++ b/toolkit/mozapps/update/updater/macbuild/Contents/Info.plist.in
@@ -7,11 +7,11 @@
 	<key>CFBundleDisplayName</key>
 	<string>updater</string>
 	<key>CFBundleExecutable</key>
-	<string>org.mozilla.updater</string>
+	<string>net.waterfox.updater</string>
 	<key>CFBundleIconFile</key>
 	<string>updater.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.mozilla.updater</string>
+	<string>net.waterfox.updater</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build
index 9620dde22ce79..4a92bb0a157ca 100644
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-    Program("org.mozilla.updater")
+    Program("net.waterfox.updater")
 else:
     Program("updater")
 
diff --git a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in b/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
index e44bd7e186336..1c3fb1c68d319 100644
--- a/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
+++ b/toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
@@ -37,7 +37,7 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(NSINSTALL) $(srcdir)/../macos-frameworks/UpdateSettings/Info.plist  $(XPCSHELLTESTDIR)/data/updater-xpcshell.app/Contents/Frameworks/UpdateSettings.framework/Resources
 	rm -Rf $(XPCSHELLTESTDIR)/data/updater.app
 	mv $(XPCSHELLTESTDIR)/data/updater-xpcshell.app $(XPCSHELLTESTDIR)/data/updater.app
-	mv $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/org.mozilla.updater
+	mv $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/updater-xpcshell $(XPCSHELLTESTDIR)/data/updater.app/Contents/MacOS/net.waterfox.updater
 
 ifdef MOCHITESTBROWSERDIR
 	rsync -a -C $(XPCSHELLTESTDIR)/data/updater.app $(MOCHITESTBROWSERDIR)/
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index 40a86e679cdb6..17305ed0aa619 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -3376,7 +3376,7 @@ int NS_main(int argc, NS_tchar** argv) {
       // proceed with an install to `Program Files` or `Program Files(x86)`.
       isAdmin.unwrap() || isLocalSystem.unwrap();
 #elif defined(XP_MACOSX)
-        strstr(argv[0], "/Library/PrivilegedHelperTools/org.mozilla.updater") !=
+        strstr(argv[0], "/Library/PrivilegedHelperTools/net.waterfox.updater") !=
         0;
 #else
       false;
diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
index 4ebdcd3bd8739..79c53fc27df0f 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -75,7 +75,7 @@
 using namespace mozilla;
 
 #define DEV_EDITION_NAME "dev-edition-default"
-#define DEFAULT_NAME "default"
+#define DEFAULT_NAME "68-edition-default"
 #define COMPAT_FILE u"compatibility.ini"_ns
 #define PROFILE_DB_VERSION "2"
 #define INSTALL_PREFIX "Install"
@@ -1218,6 +1218,21 @@ nsresult nsToolkitProfileService::Init() {
     }
   }
 
+  // Safety net for nonโ€‘DevEdition builds:
+  // If we detected a first run but there is exactly one profile and it was
+  // classified as "dev-edition default" (due to a name collision), treat it as
+  // the normal default instead of creating a new profile.
+  if (!mUseDevEditionProfile && mDevEditionDefault && !mNormalDefault &&
+      nonDevEditionProfiles == 0 && mProfiles.getFirst() == mProfiles.getLast()) {
+    SetNormalDefault(mDevEditionDefault);
+    // For non-dedicated profiles, directly avoid first-run.
+    if (!mUseDedicatedProfile) {
+      mIsFirstRun = false;
+    }
+    // In dedicated-profile mode, keep mIsFirstRun as-is so the adoption path
+    // in SelectStartupProfile can run with mNormalDefault set.
+  }
+
   return NS_OK;
 }
 
diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
index 5ca00f92f725a..fbbea51d43503 100644
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
@@ -334,10 +334,10 @@ nsresult nsAlertsIconListener::InitAlertAsync(nsIAlertNotification* aAlert,
       } else {
         NS_WARNING(
             "brand.properties not present, using default application name");
-        appShortName.AssignLiteral("Mozilla");
+        appShortName.AssignLiteral("Waterfox");
       }
     } else {
-      appShortName.AssignLiteral("Mozilla");
+      appShortName.AssignLiteral("Waterfox");
     }
 
     if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE;
diff --git a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
index f02deb7bd712a..8011420220def 100644
--- a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
+++ b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
@@ -104,7 +104,7 @@ static void ProxyHasChangedWrapper(SCDynamicStoreRef aStore,
   // Register for notification of proxy setting changes
   // See:
   // http://developer.apple.com/documentation/Networking/Conceptual/CFNetwork/CFStreamTasks/chapter_4_section_5.html
-  mSystemDynamicStore = SCDynamicStoreCreate(NULL, CFSTR("Mozilla"),
+  mSystemDynamicStore = SCDynamicStoreCreate(NULL, CFSTR("BrowserWorks"),
                                              ProxyHasChangedWrapper, &mContext);
   if (!mSystemDynamicStore) return NS_ERROR_FAILURE;
 
diff --git a/toolkit/xre/MacLaunchHelper.mm b/toolkit/xre/MacLaunchHelper.mm
index d75abeff8cc2c..896bf20733e45 100644
--- a/toolkit/xre/MacLaunchHelper.mm
+++ b/toolkit/xre/MacLaunchHelper.mm
@@ -164,7 +164,7 @@ bool InstallPrivilegedHelper() {
     // then loaded. The executable is placed in
     // /Library/PrivilegedHelperTools.
     result = (BOOL)SMJobBless(kSMDomainSystemLaunchd,
-                              (CFStringRef) @"org.mozilla.updater", authRef,
+                              (CFStringRef) @"net.waterfox.updater", authRef,
                               &cfError);
     if (!result) {
       NSLog(@"Unable to install helper!");
@@ -185,7 +185,7 @@ void AbortElevatedUpdate() {
   while (currTry < numRetries) {
     @try {
       updateServer = (id)[NSConnection
-          rootProxyForConnectionWithRegisteredName:@"org.mozilla.updater.server"
+          rootProxyForConnectionWithRegisteredName:@"net.waterfox.updater.server"
                                               host:nil
                                    usingNameServer:[NSSocketPortNameServer
                                                        sharedInstance]];
diff --git a/toolkit/xre/PolicyChecks.h b/toolkit/xre/PolicyChecks.h
index a876ff917dbde..435fd96a713ba 100644
--- a/toolkit/xre/PolicyChecks.h
+++ b/toolkit/xre/PolicyChecks.h
@@ -12,7 +12,7 @@
 #  include <windows.h>
 #  include "mozilla/Maybe.h"
 
-#  define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\Mozilla\\" MOZ_APP_BASENAME
+#  define POLICY_REGKEY_NAME L"SOFTWARE\\Policies\\BrowserWorks\\" MOZ_APP_BASENAME
 
 // NB: This code must be able to run apart from XPCOM
 
diff --git a/toolkit/xre/dllservices/ModuleEvaluator.cpp b/toolkit/xre/dllservices/ModuleEvaluator.cpp
index 1d7bc73f9cac8..c458b112aa47b 100644
--- a/toolkit/xre/dllservices/ModuleEvaluator.cpp
+++ b/toolkit/xre/dllservices/ModuleEvaluator.cpp
@@ -175,6 +175,10 @@ Maybe<ModuleTrustFlags> ModuleEvaluator::GetTrust(
       return Some(ModuleTrustFlags::MicrosoftWindowsSignature);
     } else if (signedBy.EqualsLiteral("Mozilla Corporation")) {
       return Some(ModuleTrustFlags::MozillaSignature);
+    } else if (signedBy.EqualsLiteral("BrowserWorks Ltd")) {
+      return Some(ModuleTrustFlags::MozillaSignature);
+    } else if (signedBy.EqualsLiteral("BROWSERWORKS LTD")) {
+      return Some(ModuleTrustFlags::MozillaSignature);
     } else {
       // Being signed by somebody who is neither Microsoft nor us is an
       // automatic and immediate disqualification.
diff --git a/toolkit/xre/nsCommandLineServiceMac.mm b/toolkit/xre/nsCommandLineServiceMac.mm
index 3758fe471a5d0..6ab9228c4c2f2 100644
--- a/toolkit/xre/nsCommandLineServiceMac.mm
+++ b/toolkit/xre/nsCommandLineServiceMac.mm
@@ -61,7 +61,7 @@ void SetupMacCommandLine(int& argc, char**& argv, bool forRestart) {
     // Essentially, we are using the updater as a relauncher process.
     NSString* updaterPath = [[path stringByDeletingLastPathComponent]
         stringByAppendingPathComponent:
-            @"updater.app/Contents/MacOS/org.mozilla.updater"];
+            @"updater.app/Contents/MacOS/net.waterfox.updater"];
     AddToCommandLine(updaterPath.UTF8String);
     AddToCommandLine("--openAppBundle");
   }
@@ -76,7 +76,7 @@ void SetupMacCommandLine(int& argc, char**& argv, bool forRestart) {
   // versions of macOS and we may be able to switch to the NSWorkspace API once
   // we no longer support the older versions of macOS where these errors occur.
   // See bug 1911178.
-  if (![path hasSuffix:@"org.mozilla.updater"] && ![path hasSuffix:@".app"]) {
+  if (![path hasSuffix:@"net.waterfox.updater"] && ![path hasSuffix:@".app"]) {
     // Ensure that the path in the first argument points to the .app bundle.
     // This strips three last path components, for example:
     //
@@ -85,7 +85,7 @@ void SetupMacCommandLine(int& argc, char**& argv, bool forRestart) {
     path = [[[path stringByDeletingLastPathComponent]
         stringByDeletingLastPathComponent] stringByDeletingLastPathComponent];
   }
-  if (![path hasSuffix:@"org.mozilla.updater"] && ![path hasSuffix:@".app"]) {
+  if (![path hasSuffix:@"net.waterfox.updater"] && ![path hasSuffix:@".app"]) {
     // We were unable to obtain the path to the .app bundle and are unable to
     // build a valid command line.
     return;
diff --git a/toolkit/xre/nsUpdateDriver.h b/toolkit/xre/nsUpdateDriver.h
index 133de05f17b8a..1978154502cd3 100644
--- a/toolkit/xre/nsUpdateDriver.h
+++ b/toolkit/xre/nsUpdateDriver.h
@@ -29,11 +29,11 @@ typedef PRProcess* ProcessType;
 
 #ifdef XP_WIN
 #  define UPDATER_BIN "updater.exe"
-#  define MAINTENANCE_SVC_NAME L"MozillaMaintenance"
+#  define MAINTENANCE_SVC_NAME L"WaterfoxMaintenance"
 #  define MAYBE_WAIT_TIMEOUT_MS (60U * 1000U)
 #elif XP_MACOSX
 #  define UPDATER_APP "updater.app"
-#  define UPDATER_BIN "org.mozilla.updater"
+#  define UPDATER_BIN "net.waterfox.updater"
 #else
 #  define UPDATER_BIN "updater"
 #endif
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 9c94cb8808aa0..be0b96951a665 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -285,16 +285,16 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
   rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType,
                         getter_AddRefs(localDir));
   if (NS_SUCCEEDED(rv)) {
-    rv = localDir->AppendNative("Mozilla"_ns);
+    rv = localDir->AppendNative("Waterfox"_ns);
   }
 #  else
   constexpr auto dirname =
 #    ifdef HAVE_USR_LIB64_DIR
-      "/usr/lib64/mozilla"_ns
+      "/usr/lib64/waterfox"_ns
 #    elif defined(__OpenBSD__) || defined(__FreeBSD__)
-      "/usr/local/lib/mozilla"_ns
+      "/usr/local/lib/waterfox"_ns
 #    else
-      "/usr/lib/mozilla"_ns
+      "/usr/lib/waterfox"_ns
 #    endif
       ;
   rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
@@ -366,9 +366,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
     rv = GetUserDataDirectoryHome(getter_AddRefs(file), false);
     NS_ENSURE_SUCCESS(rv, rv);
 #  if defined(XP_MACOSX)
-    rv = file->AppendNative("Mozilla"_ns);
+    rv = file->AppendNative("Waterfox"_ns);
 #  else   // defined(XP_MACOSX)
-    rv = file->AppendNative(".mozilla"_ns);
+    rv = file->AppendNative(".waterfox"_ns);
 #  endif  // defined(XP_MACOSX)
   }
 #endif  // defined(XP_UNIX) || defined(XP_MACOSX)
@@ -398,9 +398,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
   else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) {
 #  ifdef ENABLE_SYSTEM_EXTENSION_DIRS
 #    if defined(__OpenBSD__) || defined(__FreeBSD__)
-    static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions";
+    static const char* const sysLExtDir = "/usr/local/share/waterfox/extensions";
 #    else
-    static const char* const sysLExtDir = "/usr/share/mozilla/extensions";
+    static const char* const sysLExtDir = "/usr/share/waterfox/extensions";
 #    endif
     rv = NS_NewNativeLocalFile(nsDependentCString(sysLExtDir),
                                getter_AddRefs(file));
@@ -932,7 +932,7 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
             nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
       return NS_ERROR_FAILURE;
     }
-  } else if (NS_FAILED(localDir->AppendNative("Mozilla"_ns))) {
+  } else if (NS_FAILED(localDir->AppendNative("Waterfox"_ns))) {
     return NS_ERROR_FAILURE;
   }
 
@@ -1192,7 +1192,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
 
 #if defined(XP_MACOSX) || defined(XP_WIN)
 
-  static const char* const sXR = "Mozilla";
+  static const char* const sXR = "Waterfox";
   rv = aFile->AppendNative(nsDependentCString(sXR));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1202,7 +1202,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
 
 #elif defined(XP_UNIX)
 
-  static const char* const sXR = ".mozilla";
+  static const char* const sXR = ".waterfox";
   rv = aFile->AppendNative(nsDependentCString(sXR));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1266,7 +1266,7 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
   // The parent of this directory is set in GetUserDataDirectoryHome
   // XXX: handle gAppData->profile properly
   // XXXsmaug ...and the rest of the profile creation!
-  rv = aFile->AppendNative(nsDependentCString("mozilla"));
+  rv = aFile->AppendNative(nsDependentCString("waterfox"));
   NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
   nsAutoCString folder;
diff --git a/tools/signing/macos/mach_commands.py b/tools/signing/macos/mach_commands.py
index 454a9bbc35802..5dc740a5ab0e1 100644
--- a/tools/signing/macos/mach_commands.py
+++ b/tools/signing/macos/mach_commands.py
@@ -37,7 +37,7 @@
     "Release channel entitlements, but the configuration used will be the "
     "Release configuration as defined in the repo working directory, not the "
     "configuration from the revision of the earlier 120 build.",
-    conditions=[conditions.is_firefox],
+#    conditions=[conditions.is_firefox],
 )
 @CommandArgument(
     "-v",
@@ -378,10 +378,10 @@ def auto_detect_channel(ctx, app):
     # The bundle IDs for different channels. We use these strings to
     # auto-detect the channel being signed. Different channels use
     # different entitlement files.
-    NIGHTLY_BUNDLEID = "org.mozilla.nightly"
+    NIGHTLY_BUNDLEID = "net.mozilla.nightly"
     DEVEDITION_BUNDLEID = "org.mozilla.firefoxdeveloperedition"
     # BETA uses the same bundle ID as Release
-    RELEASE_BUNDLEID = "org.mozilla.firefox"
+    RELEASE_BUNDLEID = "net.waterfox.waterfox"
 
     info_plist = os.path.join(app, "Contents/Info.plist")
 
diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh
index e055b1c24efd5..1dd3a5344a796 100755
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -92,14 +92,11 @@ make_add_instruction() {
 check_for_add_if_not_update() {
   add_if_not_file_chk="$1"
 
-  if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
-        "$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
-        "$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
-        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
-    ## "true"
+  if [ `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
+    ## "true" *giggle*
     return 0;
   fi
-  ## "false"
+  ## 'false'... because this is bash. Oh yay!
   return 1;
 }
 
diff --git a/tools/update-verify/release/updates/verify.sh b/tools/update-verify/release/updates/verify.sh
index e0679ee708b3f..36804bf1736d0 100755
--- a/tools/update-verify/release/updates/verify.sh
+++ b/tools/update-verify/release/updates/verify.sh
@@ -164,7 +164,7 @@ do
         case $updater_package_filename in
           *dmg)
             platform_dirname="*.app"
-            updater_bins="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater"
+            updater_bins="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/net.waterfox.updater"
             updater_platform="mac"
             mac_update_settings_dir_override=""
             ;;
diff --git a/waterfox/biome.json b/waterfox/biome.json
new file mode 100644
index 0000000000000..04055e7ea21f7
--- /dev/null
+++ b/waterfox/biome.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
+  "formatter": {
+    "enabled": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 80,
+    "attributePosition": "auto"
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "correctness": {
+        "noUnknownMediaFeatureName": "off"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "es5"
+    }
+  }
+}
diff --git a/waterfox/browser/app/profile/00-general.js b/waterfox/browser/app/profile/00-general.js
new file mode 100644
index 0000000000000..6bffdc9c2880d
--- /dev/null
+++ b/waterfox/browser/app/profile/00-general.js
@@ -0,0 +1,148 @@
+#filter dumbComments emptyLines substitution
+
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// 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/.
+
+#ifdef XP_UNIX
+  #ifndef XP_MACOSX
+    #define UNIX_BUT_NOT_MAC
+  #endif
+#endif
+
+// --- Waterfox Specific URLs and Services ---
+// Defines URLs for Waterfox support pages and services.
+pref("accessibility.support.url", "https://www.waterfox.com/support/accessibility-services");
+pref("app.support.baseURL", "https://www.waterfox.com/support/");
+// URL for updating system add-ons specific to Waterfox.
+pref("extensions.systemAddon.update.url", "https://aus1.waterfox.net/update/SystemAddons/%DISPLAY_VERSION%/%OS%_%ARCH%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+// Waterfox-specific relay for Oblivious HTTP (OHTTP) used with DNS-over-HTTPS (DoH).
+pref("network.trr.ohttp.relay_uri", "https://dooh.waterfox.net/");
+
+// --- Application Updates ---
+// Configuration for how Waterfox handles updates.
+pref("app.update.badgeWaitTime", 0); // Time (ms) to wait before showing update badge.
+pref("app.update.enabled", true); // Enable automatic application updates.
+pref("app.update.notifyDuringDownload", true); // Notify user during update download.
+pref("app.update.promptWaitTime", 3600); // Time (seconds) to wait before prompting for update.
+pref("app.update.url.override", "", sticky); // Override URL for application updates (sticky: user set).
+
+// --- Startup, Session, and Basic UI Elements ---
+// Defines browser behavior on startup and general UI settings.
+pref("browser.startup.page", 3); // 0=blank, 1=home, 2=last visited page, 3=resume previous session.
+pref("browser.privateTab.showNewTabButton", false); // Show new private tab button next to existing new tab buttons
+pref("browser.tabs.closeButtons", false); // Hide close button on tabs
+pref("browser.tabs.pinnedIconOnly", true); // Pinned tabs show only an icon, no text.
+pref("browser.tabs.warnOnClose", true); // Warn user when attempting to close multiple tabs.
+// Stores the state of toolbar customizations (e.g., button placements).
+// It's a JSON string, generally best modified through the UI.
+pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"sidebar-button\",\"back-button\",\"forward-button\",\"vertical-spacer\",\"stop-reload-button\",\"urlbar-container\",\"save-to-pocket-button\",\"downloads-button\",\"fxa-toolbar-menu-button\",\"unified-extensions-button\",\"reset-pbm-toolbar-button\"],\"TabsToolbar\":[\"firefox-view-button\",\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"vertical-tabs\":[],\"PersonalToolbar\":[\"import-button\",\"personal-bookmarks\"],\"status-bar\":[\"screenshot-button\",\"fullscreen-button\",\"status-text\"]},\"seen\":[\"developer-button\",\"screenshot-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"status-bar\",\"PersonalToolbar\",\"TabsToolbar\",\"vertical-tabs\"],\"currentVersion\":22,\"newElementCount\":4}");
+// Alternative smooth scroll physics. ("MSD" = Mass-Spring-Damper)
+pref("general.smoothScroll.msdPhysics.enabled", true);
+
+// --- URL Bar Behavior ---
+// Platform-specific settings for how clicks interact with the URL bar.
+#ifdef UNIX_BUT_NOT_MAC
+// On Linux (excluding macOS), a single click does not select all text in the URL bar.
+pref("browser.urlbar.clickSelectsAll", false);
+// On Linux (excluding macOS), a double click selects all text.
+pref("browser.urlbar.doubleClickSelectsAll", true);
+#else
+// On other operating systems (Windows, macOS), a single click selects all text.
+pref("browser.urlbar.clickSelectsAll", true);
+// On other operating systems, double click behavior might be different or not specifically set to select all.
+pref("browser.urlbar.doubleClickSelectsAll", false);
+#endif
+
+#ifdef XP_MACOSX
+// Whether to disable treating ctrl click as right click
+pref("dom.event.treat_ctrl_click_as_right_click.disabled", true);
+#endif
+
+// --- Top Sites and Partner Integrations ---
+// Settings related to "Top Sites" on the New Tab Page and partner integrations.
+pref("browser.partnerlink.attributionURL", "", locked); // URL for partner attribution (locked).
+pref("browser.partnerlink.campaign.topsites", "", locked); // Campaign info for partner top sites (locked).
+pref("browser.topsites.contile.enabled", false, locked); // Disable content tile suggestions (e.g., sponsored content) on Top Sites.
+pref("browser.topsites.contile.endpoint", "", locked); // Endpoint for content tile suggestions.
+pref("browser.topsites.useRemoteSetting", false, locked); // Do not use remote settings for Top Sites.
+
+// --- Network Configuration ---
+// Controls various aspects of network requests and connections.
+
+// DNS Prefetching
+// Disables prefetching of DNS records for links on a page.
+pref("network.dns.disablePrefetch", true);
+pref("network.dns.disablePrefetchFromHTTPS", true); // Also disable for links on HTTPS pages.
+
+// DNS-over-HTTPS (DoH) & Trusted Recursive Resolver (TRR)
+// Configuration for encrypted DNS lookups.
+pref("doh-rollout.enabled", false, locked); // Disable automatic rollout/enablement of DoH.
+pref("doh-rollout.disable-heuristics", true, locked); // Disable heuristics that might enable DoH.
+pref("network.trr.max-fails", 5); // Max number of TRR failures before fallback.
+pref("network.trr.mode", 2); // DoH mode: 0=Off, 1=Race, 2=TRR first, 3=TRR only, 4=Shadow, 5=Off by user choice.
+pref("network.trr.ohttp.config_uri", "https://dooh.cloudflare-dns.com/.well-known/doohconfig"); // Config URI for OHTTP.
+pref("network.trr.ohttp.uri", "https://dooh.cloudflare-dns.com/dns-query"); // URI for OHTTP DoH queries.
+pref("network.trr.request_timeout_mode_trronly_ms", 1500); // Timeout (ms) when TRR mode is TRR-only.
+pref("network.trr.use_ohttp", true); // Enable Oblivious HTTP for DoH requests.
+// Include an idempotency-key header for POST requests
+pref("network.http.idempotencyKey.enabled", true);
+// Disable requests to 0.0.0.0
+pref("network.socket.ip_addr_any.disabled", true);
+pref("network.http.http3.ecn_mark", true);
+pref("network.http.http3.retry_different_ip_family", true);
+pref("network.http.retry_with_another_half_open", true);
+
+// --- Extension System and Web Compatibility ---
+// Settings related to browser extensions and web compatibility measures.
+pref("extensions.experiments.enabled", true); // Allow Mozilla to run studies/experiments using the extension system.
+pref("extensions.install_origins.enabled", true); // Allow extensions to be installed from specified origins beyond default stores.
+pref("extensions.webcompat.enable_shims", true); // Enable web compatibility shims that fix site-specific issues.
+// Defines domains where WebExtension APIs might be restricted, typically for protecting Mozilla services.
+pref("extensions.webextensions.restrictedDomains", "accounts-static.cdn.mozilla.net,accounts.firefox.com,addons.cdn.mozilla.net,api.accounts.firefox.com,content.cdn.mozilla.net,discovery.addons.mozilla.org,install.mozilla.org,oauth.accounts.firefox.com,profile.accounts.firefox.com,support.mozilla.org,sync.services.mozilla.com");
+
+// --- Miscellaneous Features & Integrations ---
+// Various feature toggles and integration settings.
+pref("intl.multilingual.downloadEnabled", false, locked); // Disable automatic download of language packs for multilingual features.
+pref("messaging-system.rsexperimentloader.enabled", false, locked); // Disable loading of experiments via the Normandy/Shield messaging system.
+// Controls process separation for specific Mozilla domains. Empty means default behavior.
+pref("browser.tabs.remote.separatedMozillaDomains", "", locked);
+
+// Sign-On Services and Firefox Relay integration
+pref("signon.firefoxRelay.feature", "unavailable"); // Mark Firefox Relay feature as unavailable.
+pref("signon.management.page.mobileAndroidURL", "", locked); // URL for managing passwords on Android (locked).
+pref("signon.management.page.mobileAppleURL", "", locked); // URL for managing passwords on iOS (locked).
+pref("identity.mobilepromo.android", "", locked);
+pref("identity.mobilepromo.ios", "", locked);
+pref("signon.recipes.remoteRecipes.enabled", false, locked); // Disable fetching of remote recipes for password generation.
+
+// SVG Rendering
+pref("svg.context-properties.content.enabled", true); // Enable use of CSS context-properties within SVG content.
+
+// --- MathML Rendering ---
+// Whether to disable legacy names "thickmathspace", "mediummathspace",
+// "thickmathspace" etc for length attributes.
+pref("mathml.mathspace_names.disabled", true);
+// Whether to disable the MathML3 support for the mathvariant attribute. For
+// MathML Core, support is restricted to the <mi> element and to value "normal".
+// Corresponding automatic italicization on single-char <mi> element is also
+// implemented via text-transform: auto when that flag is enabled.
+pref("mathml.legacy_mathvariant_attribute.disabled", true);
+
+// --- Media Features ---
+// Use MediaDataDecoder API for VP8/VP9 in WebRTC. This includes hardware
+// acceleration for decoding.
+pref("media.navigator.mediadatadecoder_vpx_enabled", true);
+// HTMLMediaElement.allowedToPlay should be exposed to web content when
+// block autoplay rides the trains to release. Until then, Nightly only.
+pref("media.allowed-to-play.enabled", true);
+pref("media.webrtc.enable_pq_dtls", true);
+pref("media.webrtc.simulcast.vp9.enabled", true);
+
+// --- Security Settings (General) ---
+// General security preferences not fitting into more specific categories.
+// Disable priming for Man-in-the-Middle (MITM) detection for certificate errors (locked).
+pref("security.certerrors.mitm.priming.enabled", false, locked);
+// Configuration for Microsoft Family Safety integration on Windows.
+pref("security.family_safety.mode", 0); // 0=off, 1=parental controls, 2=filter inappropriate content.
diff --git a/waterfox/browser/app/profile/01-theme.js b/waterfox/browser/app/profile/01-theme.js
new file mode 100644
index 0000000000000..aadf0cef0042f
--- /dev/null
+++ b/waterfox/browser/app/profile/01-theme.js
@@ -0,0 +1,41 @@
+#filter dumbComments emptyLines substitution
+
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// 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/.
+
+// --- General Browser Appearance & UI Density ---
+// These preferences control the overall look and feel of the browser UI.
+pref("browser.uidensity", 1); // 0=normal, 1=compact, 2=touch
+pref("browser.theme.enableWaterfoxCustomizations", 1); // Enable Waterfox specific theme customizations
+
+// Toolbar and UI Element Positions
+pref("browser.bookmarks.toolbarposition", "top"); // Position of the bookmarks toolbar: "top" or "bottom"
+pref("browser.tabs.toolbarposition", "topabove"); // Position of the tab toolbar (e.g., "topabove", "top", "bottom")
+pref("browser.statusbar.enabled", false); // Show or hide the main status bar
+pref("browser.statusbar.appendStatusText", true); // Append status text instead of replacing it (if statusbar is enabled)
+
+// Tab Appearance (General Browser Settings)
+pref("browser.tabs.closeButtons", false); // Controls display of close buttons on tabs. Behavior can be complex with userChrome.css.
+
+// --- Custom Stylesheet Support ---
+// Enables loading of userChrome.css (for browser UI) and userContent.css (for web content) for custom styling.
+pref("toolkit.legacyUserProfileCustomizations.stylesheets", true, locked);
+
+// --- OS-Specific Visual Integration ---
+// These settings enhance visual integration with the underlying operating system.
+#ifdef XP_MACOSX
+// macOS specific visual settings for a more native look and feel.
+pref("widget.macos.sidebar-blend-mode.behind-window", true); // Blends sidebar with window background.
+pref("widget.macos.titlebar-blend-mode.behind-window", true); // Blends titlebar with window background.
+#endif
+
+#ifdef XP_WIN
+// Windows specific visual settings, e.g., for Mica effect (Windows 11).
+pref("widget.windows.mica", true); // Enable Mica effect for the main window.
+pref("widget.windows.mica.popups", 1); // Mica for popups: 0=none, 1=auto, 2=acrylic, 3=tabbed.
+pref("widget.windows.mica.toplevel-backdrop", 3); // Mica for other top-level windows (e.g., Picture-in-Picture).
+// Only load keyboard layout when first needed, which is more efficient for Windows.
+pref("ui.key.layout.load_when_first_needed", true);
+#endif
diff --git a/waterfox/browser/app/profile/02-privacy.js b/waterfox/browser/app/profile/02-privacy.js
new file mode 100644
index 0000000000000..8f09a78ef0af6
--- /dev/null
+++ b/waterfox/browser/app/profile/02-privacy.js
@@ -0,0 +1,219 @@
+#filter dumbComments emptyLines substitution
+
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// 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/.
+
+// --- Region detection ---
+pref("browser.region.network.scan", false, locked); // Already false by default, but better safe than sorry
+pref("browser.region.network.url", "", locked);
+pref("browser.region.update.enabled", false, locked);
+pref("browser.search.region", "US", locked); // Set a neutral region
+pref("browser.search.serpEventTelemetryCategorization.enabled", false, locked);
+
+// --- Tracking Protection & Fingerprinting Resistance ---
+// Lower the priority of network loads for resources on tracking protection lists.
+pref("privacy.trackingprotection.lower_network_priority", true);
+// Disable access to the Battery Status API to prevent fingerprinting.
+pref("dom.battery.enabled", false);
+// Disable UITour backend, which can be a fingerprinting vector or used for unwanted popups.
+pref("browser.uitour.enabled", false);
+pref("browser.uitour.url", ""); // Clear UITour URL
+// Enable Global Privacy Control (GPC) to signal websites not to sell or share personal data.
+pref("privacy.globalprivacycontrol.enabled", true);
+pref("privacy.globalprivacycontrol.functionality.enabled", true);
+// Block fingerprinting attempts via the mozAddonManager Web API.
+pref("privacy.resistFingerprinting.block_mozAddonManager", true);
+
+// --- Cookies & Site Data ---
+// Enforce that SameSite=None cookies must also be Secure.
+pref("network.cookie.sameSite.noneRequiresSecure", true);
+// Prevent media cache from writing to disk in Private Browsing mode, forcing it to memory.
+pref("browser.privatebrowsing.forceMediaMemoryCache", true);
+pref("dom.cookieStore.extra.enabled", true);
+// Whether to support CHIPS(Cookies Having Independent Partitioned State).
+pref("network.cookie.CHIPS.enabled", true);
+pref("network.cookie.sameSite.schemeful", true);
+
+// --- Certificate & Connection Security ---
+// OCSP (Online Certificate Status Protocol)
+pref("security.OCSP.enabled", 0); // 0=disable, 1=validate good certs, 2=validate all certs (old default)
+
+// CRLite (Compressed Revocation List)
+// Enables a more private way to check for revoked certificates.
+pref("security.remote_settings.crlite_filters.enabled", true);
+pref("security.pki.crlite_mode", 2); // 0=off, 1=check only, 2=check and enforce.
+
+// Intermediate Certificate Preloading
+// Disable preloading of intermediate certificates to prevent remote downloads.
+pref("security.remote_settings.intermediates.enabled", false);
+
+// SSL/TLS Settings
+// Display a warning on the padlock icon for connections with unsafe TLS negotiation.
+pref("security.ssl.treat_unsafe_negotiation_as_broken", true);
+// Disable TLS 1.3 0-RTT (Zero Round Trip Time Resumption) to improve forward secrecy.
+pref("security.tls.enable_0rtt_data", false);
+
+// Error Pages
+// Display more detailed technical information on "Insecure Connection" warning pages.
+pref("browser.xul.error_pages.expert_bad_cert", true);
+
+// --- History, Referrers, and URL Display ---
+// Set History section in preferences to show all options, allowing for custom history settings.
+pref("privacy.history.custom", true);
+
+// Referrer Policy
+// Control how much referrer information is sent with requests.
+// 2 = Send origin, path, and querystring for same-origin, but only origin for cross-origin.
+pref("network.http.referer.XOriginTrimmingPolicy", 2);
+// Default Referrer Policy for trackers (1 = strict-origin-when-cross-origin).
+pref("network.http.referer.defaultPolicy.trackers", 1);
+pref("network.http.referer.defaultPolicy.trackers.pbmode", 1); // Same for private browsing.
+
+// URL Bar
+// Disable trimming of "http://", "https://", "www." etc. from URLs in the address bar.
+pref("browser.urlbar.trimURLs", false);
+// Enable UI option to add custom search engines.
+pref("browser.urlbar.update2.engineAliasRefresh", true);
+// Disable Firefox Suggest (sponsored and non-sponsored suggestions based on browsing).
+pref("browser.urlbar.suggest.quicksuggest.sponsored", false);
+pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false);
+
+// --- HTTPS-Only Mode & Mixed Content ---
+// Display "Not Secure" text on HTTP sites for better visual indication.
+pref("security.insecure_connection_text.enabled", true);
+pref("security.insecure_connection_text.pbmode.enabled", true); // Also in private browsing.
+
+// HTTPS-First Policy (attempts to upgrade HTTP to HTTPS automatically)
+pref("dom.security.https_first", true);
+
+// HTTPS-Only Mode Settings
+pref("dom.security.https_only_mode_error_page_user_suggestions", true); // Show suggestions on HTTPS-Only error pages.
+pref("dom.security.https_only_mode.upgrade_local", false); // Do not attempt to upgrade local addresses (e.g., localhost).
+
+// Mixed Content Blocking
+// Block active mixed content (e.g., scripts) and passive mixed content (e.g., images).
+pref("security.mixed_content.block_display_content", true); // Blocks passive mixed content
+pref("security.mixed_content.upgrade_display_content", true); // Attempts to upgrade passive mixed content to HTTPS
+
+// --- Passwords, Forms & Paste Handling ---
+// Disable truncating user pastes into form fields (can interfere with long strings).
+pref("editor.truncate_user_pastes", false);
+// Enable the built-in reveal password button in password fields.
+pref("layout.forms.reveal-password-button.enabled", true);
+// Allow subresource HTTP authentication (1 = allow same-origin, 2 = allow cross-origin).
+pref("network.auth.subresource-http-auth-allow", 1);
+
+// --- PDF Viewer Security ---
+// Disable JavaScript execution within the built-in PDF viewer for security.
+pref("pdfjs.enableScripting", false);
+
+// --- Extensions & Add-ons Security/Privacy ---
+// Disable the prompt that appears after downloading a third-party extension (XPI file).
+pref("extensions.postDownloadThirdPartyPrompt", false);
+// Disable signing requirement for extensions (use with caution, for development or trusted sources only).
+pref("xpinstall.signatures.required", false, locked);
+// Disable the "Quarantined Domains" feature which restricts extension capabilities on certain domains.
+pref("extensions.quarantinedDomains.enabled", false, locked);
+// Disable personalized extension recommendations in about:addons and AMO.
+pref("browser.discovery.enabled", false, locked); // Also affects other "discovery" features.
+// Disable extension abuse reporting feature.
+pref("extensions.abuseReport.enabled", false);
+// Whether we block opening pickers from hidden extension pages in WebExtensions.
+// This includes background pages and devtools pages, but not background tabs.
+pref("browser.disable_pickers_in_hidden_extension_pages", true);
+
+
+// --- Container Tabs ---
+// Enable Container Tabs feature and its UI elements.
+pref("privacy.userContext.ui.enabled", true);
+pref("privacy.userContext.enabled", true);
+// Control behavior of the "+ Tab" button regarding containers (false = default new tab).
+pref("privacy.userContext.newTabContainerOnLeftClick.enabled", false);
+
+// --- WebRTC Privacy ---
+// Enable global mute toggles for microphone/camera in WebRTC.
+pref("privacy.webrtc.globalMuteToggles", true);
+// Force WebRTC connections to use a proxy if one is configured.
+pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true);
+// Force WebRTC to use only the default network interface for ICE candidates (can prevent IP leaks).
+pref("media.peerconnection.ice.default_address_only", true);
+
+// --- Geolocation Services ---
+// Clear the URL for Mozilla's geolocation service, effectively disabling it if not manually re-enabled.
+// (To use a specific provider, set this to its URL, or "" to rely on OS-level services if available)
+pref("geo.provider.network.url", "");
+
+// --- Safe Browsing ---
+// Disable Safe Browsing features for downloads and remote checks.
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+pref("browser.safebrowsing.downloads.remote.url", ""); // Clear remote check URL
+pref("browser.safebrowsing.provider.google4.gethashURL", ""); // Clear Google Safe Browsing v4 gethash URL
+pref("browser.safebrowsing.provider.google4.updateURL", ""); // Clear Google Safe Browsing v4 update URL
+pref("browser.safebrowsing.provider.google.gethashURL", ""); // Clear Google Safe Browsing v2 gethash URL (legacy)
+pref("browser.safebrowsing.provider.google.updateURL", ""); // Clear Google Safe Browsing v2 update URL (legacy)
+pref("browser.safebrowsing.downloads.enabled", false); // Disable Safe Browsing checks for downloaded files.
+
+// --- Telemetry, Experiments & Data Reporting ---
+// These settings aim to disable various forms of data collection and reporting to Mozilla or third parties.
+
+// Core Telemetry System
+pref("toolkit.telemetry.unified", false, locked); // Master switch for new telemetry system.
+pref("toolkit.telemetry.enabled", false, locked); // General telemetry enabled/disabled.
+pref("toolkit.telemetry.server", "data:,", locked); // Send telemetry data to a null void.
+pref("toolkit.telemetry.archive.enabled", false, locked); // Disable archiving of telemetry data.
+pref("toolkit.telemetry.newProfilePing.enabled", false, locked); // Disable ping sent for new profiles.
+pref("toolkit.telemetry.shutdownPingSender.enabled", false, locked); // Disable ping sent at shutdown.
+pref("toolkit.telemetry.updatePing.enabled", false, locked); // Disable ping sent for updates.
+pref("toolkit.telemetry.bhrPing.enabled", false, locked); // Disable Background Hang Reporter pings.
+pref("toolkit.telemetry.firstShutdownPing.enabled", false, locked); // Disable first shutdown ping.
+pref("toolkit.telemetry.dap_enabled", false, locked); // Disable Data Aggregation Platform related telemetry.
+
+// Telemetry Coverage (additional telemetry for measuring code coverage by telemetry)
+pref("toolkit.telemetry.coverage.opt-out", true, locked);
+pref("toolkit.coverage.opt-out", true, locked);
+pref("toolkit.coverage.endpoint.base", "", locked);
+
+// Health Reports & Data Reporting Policy
+pref("datareporting.healthreport.uploadEnabled", false, locked); // Disable Firefox Health Report (FHR).
+pref("datareporting.policy.dataSubmissionEnabled", false, locked); // General policy switch for data submission.
+
+// Studies, Normandy & Shield (Mozilla's system for deploying studies, features, and fixes)
+pref("app.shield.optoutstudies.enabled", false, locked); // Opt-out of Shield studies.
+pref("app.normandy.enabled", false, locked); // Disable Normandy (Shield's successor).
+pref("app.normandy.api_url", "", locked); // Clear Normandy API URL.
+
+// Crash Reporting
+pref("breakpad.reportURL", "", locked); // Clear URL for sending crash reports.
+pref("browser.tabs.crashReporting.sendReport", false, locked); // Don't send reports for tab crashes.
+pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false, locked); // Don't auto-submit unsent crash reports.
+
+// Component-Specific Telemetry
+pref("browser.newtabpage.activity-stream.feeds.telemetry", false, locked); // Disable telemetry for New Tab Page feeds.
+pref("browser.newtabpage.activity-stream.telemetry", false, locked); // Disable general New Tab Page telemetry.
+pref("dom.security.unexpected_system_load_telemetry_enabled", false, locked); // Telemetry for unexpected system load.
+pref("network.trr.confirmation_telemetry_enabled", false, locked); // Telemetry for TRR/DoH confirmation.
+pref("security.app_menu.recordEventTelemetry", false, locked); // Telemetry for app menu interactions.
+pref("security.certerrors.recordEventTelemetry", false, locked); // Telemetry for certificate error page interactions.
+pref("security.identitypopup.recordEventTelemetry", false, locked); // Telemetry for identity popup (site info) interactions.
+pref("security.protectionspopup.recordEventTelemetry", false, locked); // Telemetry for protections popup interactions.
+
+// --- Miscellaneous Privacy & Security Settings ---
+// Check bundled omni.ja JAR files for corruption (can be disabled for minor performance gain, security implications if disabled).
+pref("corroborator.enabled", false);
+// Allow the OS to check for captive portals
+pref("network.captive-portal-service.enabled", false);
+// Enforce Punycode display for Internationalized Domain Names (IDNs) to prevent homograph attacks.
+pref("network.IDN_show_punycode", true);
+// Clear the webchannel whitelist, restricting its use (WebChannel allows web pages to communicate with specific XPCOM components).
+pref("webchannel.allowObject.urlWhitelist", "");
+// Enable the HTML Sanitizer API, which provides a standards-based way to sanitize HTML fragments.
+pref("dom.security.sanitizer.enabled", true);
+pref("dom.w3c_pointer_events.getcoalescedevents_only_in_securecontext", true);
+
+// --- Content Blocking Reports ---
+// Disable various promotional features in the content blocking report.
+pref("browser.contentblocking.report.lockwise.enabled", false, locked);
+pref("browser.contentblocking.report.monitor.enabled", false, locked);
+pref("browser.contentblocking.report.show_mobile_app", false, locked);
diff --git a/waterfox/browser/app/profile/03-features.js b/waterfox/browser/app/profile/03-features.js
new file mode 100644
index 0000000000000..5f9c5275cb7c9
--- /dev/null
+++ b/waterfox/browser/app/profile/03-features.js
@@ -0,0 +1,285 @@
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// 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/.
+
+// --- Mozilla & Waterfox Services Integration ---
+// Controls for features and promotions related to Mozilla or Waterfox services.
+
+// Mozilla VPN Promotion
+pref("browser.privatebrowsing.vpnpromourl", ""); // Clear URL for VPN promo in private browsing context.
+pref("browser.vpn_promo.enabled", false, locked); // Disable the VPN promotion.
+pref("browser.promo.focus.enabled", false, locked); // Disable Focus mode promotion.
+pref("browser.promo.pin.enabled", false, locked); // Disable Pin mode promotion (assuming "pomo" was a typo).
+pref("browser.contentblocking.report.vpn-promo.url", "", locked); // Clear URL for VPN promo in content blocking report.
+
+// Firefox Accounts Toolbar Integration (Controls visibility of Monitor, Relay, VPN in FxA menu)
+pref("identity.fxaccounts.toolbar.pxiToolbarEnabled.monitorEnabled", false);
+pref("identity.fxaccounts.toolbar.pxiToolbarEnabled.relayEnabled", false);
+pref("identity.fxaccounts.toolbar.pxiToolbarEnabled.vpnEnabled", false);
+
+// --- Add-ons & Extension Recommendations ---
+// Settings related to the display and suggestion of extensions.
+
+// Disable "Recommendations" pane in about:addons (this pane sometimes uses Google Analytics).
+pref("extensions.getAddons.showPane", false, locked);
+// Disable recommendations in the "Extensions" and "Themes" panes of about:addons.
+pref("extensions.htmlaboutaddons.recommendations.enabled", false, locked);
+// Disable personalized extension recommendations in about:addons and on the AMO website.
+pref("browser.discovery.enabled", false, locked); // This is a broader switch impacting "discovery" features.
+
+// Disable Contextual Feature Recommender (CFR) for add-ons and features.
+// CFR suggests extensions or browser features based on user activity patterns.
+// [1] https://support.mozilla.org/en-US/kb/extension-recommendations
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
+
+// --- New Tab Page (Activity Stream) Configuration ---
+// These settings control the various sections and content sources for the New Tab Page (about:newtab).
+
+// Activity Stream Router (ASRouter) Provider Settings
+// These typically disable specific content providers that feed into the New Tab Page.
+pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{}", locked); // Contextual Feature Recommender provider.
+pref("browser.newtabpage.activity-stream.asrouter.providers.cfr-fxa", "{}", locked); // CFR FxA integration provider.
+pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{}", locked); // Message groups provider.
+pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{}", locked); // Messaging experiments provider.
+pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{}", locked); // Snippets provider (Mozilla news/tips) via ASRouter.
+pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "{}", locked); // Provider for the "What's New" panel content.
+pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false, locked); // Disable use of remote localization for ASRouter content.
+
+// General New Tab Page Content & Features
+pref("browser.newtabpage.activity-stream.discoverystream.enabled", false, locked); // Disable Pocket/Discovery Stream integration on NTP.
+pref("browser.newtabpage.activity-stream.discoverystream.config", "{}", locked); // Configuration for Discovery Stream (relevant if enabled elsewhere).
+pref("browser.newtabpage.activity-stream.showSearch", false); // Hide the search bar on the New Tab Page.
+pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts", false); // Show search shortcuts (e.g., @bookmarks) on Top Sites.
+pref("browser.newtabpage.activity-stream.feeds.topsites", true); // Show the Top Sites section.
+pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false, locked); // Hide sponsored Top Sites.
+pref("browser.newtabpage.activity-stream.system.showSponsored", false, locked); // Hide sponsored checkbox
+pref("browser.newtabpage.activity-stream.system.showSponsoredCheckboxes", false, locked); // Hide sponsored checkbox
+pref("browser.newtabpage.activity-stream.feeds.system.topstories", false, locked); // Disable system-provided top stories feed (Pocket integration).
+pref("browser.newtabpage.activity-stream.feeds.section.topstories", false, locked); // Disable the "Recommended by Pocket" section.
+pref("browser.newtabpage.activity-stream.showSponsored", false, locked); // Disable general sponsored content on the New Tab Page.
+
+// Weather Widget on New Tab Page
+pref("browser.newtabpage.activity-stream.showWeather", false); // Hide the weather widget.
+pref("browser.newtabpage.activity-stream.system.showWeather", true); // Show "Weather" as a configurable UI option in NTP settings.
+
+// Highlights Section (Recent Activity: Bookmarks, History, Downloads)
+pref("browser.newtabpage.activity-stream.feeds.section.highlights", true); // Show the Highlights section.
+pref("browser.newtabpage.activity-stream.section.highlights.includeBookmarks", true); // Include bookmarks in Highlights.
+pref("browser.newtabpage.activity-stream.section.highlights.includeDownloads", false); // Do not include downloads in Highlights.
+pref("browser.newtabpage.activity-stream.section.highlights.includeVisited", true); // Include recently visited sites in Highlights.
+pref("browser.newtabpage.activity-stream.section.highlights.includePocket", false, locked); // Do not include Pocket saves in Highlights.
+pref("browser.newtabpage.activity-stream.section.highlights.rows", 2); // Number of rows displayed for Highlights.
+
+// Other New Tab Page Settings
+pref("browser.newtabpage.activity-stream.feeds.snippets", false); // Disable Mozilla/Firefox related news/tips snippets feed directly on NTP.
+pref("browser.newtabpage.activity-stream.default.sites", "", locked); // Clear the list of default Top Sites (locked to prevent override).
+pref("browser.newtabpage.activity-stream.logowordmark.alwaysVisible", false); // Control visibility of Waterfox logo/wordmark on NTP.
+
+// --- Browser UI & Interaction ---
+// Miscellaneous settings affecting the browser's user interface and behavior.
+
+// "More from Mozilla" section in Preferences/Settings
+pref("browser.preferences.moreFromMozilla", false); // Hide this promotional section.
+
+// Warnings & Notices
+pref("browser.aboutConfig.showWarning", false); // Disable the warning dialog when accessing about:config..
+
+// Profile Management
+pref("browser.profiles.enabled", true); // Enable the new profile switcher UI.
+
+// --- Sidebar Revamp Features ---
+// Controls for an alternative sidebar implementation or major update.
+pref("sidebar.revamp", true);
+// Should the sidebar launcher default to visible or not with horizontal tabs
+pref("sidebar.revamp.defaultLauncherVisible", false);
+
+// Linux Specific UI
+#ifdef XP_UNIX
+  #ifndef XP_MACOSX
+    // Use native-style title bar buttons on GTK environments for better desktop integration.
+    pref("widget.gtk.non-native-titlebar-buttons.enabled", true);
+  #endif
+#endif
+
+// Cookie Banner Handling
+// Controls the browser's automated interaction with cookie consent banners.
+// 0 = disable all handling.
+// 1 = reject banners if a one-click "reject all" option is available; otherwise, keep banners on screen.
+// 2 = reject banners if a one-click "reject all" is available; otherwise, fall back to an "accept all" option.
+pref("cookiebanners.service.mode", 1);
+pref("cookiebanners.service.mode.privateBrowsing", 1); // Same setting for Private Browsing mode.
+pref("cookiebanners.ui.desktop.enabled", true); // Show a toggle in about:preferences
+
+// --- URL Bar (AwesomeBar) & Search Functionality ---\n// Settings for the address bar, search suggestions, and related features.
+
+// URL Bar Suggestions (what types of suggestions appear in the dropdown)
+pref("browser.urlbar.suggest.history", true); // Suggest from browsing history.
+pref("browser.urlbar.suggest.bookmark", true); // Suggest from bookmarks.
+pref("browser.urlbar.suggest.clipboard", true); // Suggest content from the clipboard (if enabled by user).
+pref("browser.urlbar.suggest.openpage", true); // Suggest currently open tabs.
+pref("browser.urlbar.suggest.engines", true); // Suggest installed search engines.
+pref("browser.urlbar.suggest.searches", true); // Suggest past search terms.
+pref("browser.urlbar.suggest.topsites", true); // Disable suggesting top sites when the URL bar is empty and focused.
+
+// URL Bar Quick Actions & Utilities
+pref("browser.urlbar.quickactions.enabled", false); // Disable quick actions (e.g., "view downloads", "manage extensions").
+pref("browser.urlbar.shortcuts.quickactions", false); // Disable shortcuts for quick actions (e.g., typing "downloads").
+pref("browser.urlbar.suggest.weather", false); // Disable weather forecast suggestions in the URL bar.
+pref("browser.urlbar.weather.ignoreVPN", false); // If weather suggestions are enabled, setting to true ignores VPN status for location.
+pref("browser.urlbar.suggest.calculator", true); // Enable the built-in calculator in the URL bar (e.g., "5*5").
+pref("browser.urlbar.unitConversion.enabled", true); // Enable unit conversion in the URL bar (e.g., "10ft to m").
+
+// URL Bar Feature Gates (Disabling specific third-party or experimental integrations)
+pref("browser.urlbar.trending.featureGate", false); // Disable trending search suggestions from search providers.
+pref("browser.urlbar.addons.featureGate", false); // Disable suggestions for add-ons.
+pref("browser.urlbar.fakespot.featureGate", false); // Disable Fakespot integration (product review analysis).
+pref("browser.urlbar.mdn.featureGate", false); // Disable MDN (Mozilla Developer Network) suggestions for web development terms.
+pref("browser.urlbar.weather.featureGate", false); // Master feature gate for weather suggestions.
+pref("browser.urlbar.clipboard.featureGate", false); // Master feature gate for clipboard suggestions.
+pref("browser.urlbar.yelp.featureGate", false); // Disable Yelp integration for local business suggestions.
+
+// Search Settings
+pref("browser.search.separatePrivateDefault.ui.enabled", true); // Enable UI to set a different default search engine for Private Windows.
+
+// --- Web Content Handling & Features ---
+// Settings related to how specific web content or browser features behave.
+
+// Text Fragments (Scroll-to-text links)
+pref("dom.text_fragments.create_text_fragment.enabled", true); // Allow creating and navigating to links that scroll to specific text on a page.
+
+// PDF Handling
+pref("browser.download.open_pdf_attachments_inline", true); // Open PDF attachments inline using the built-in PDF viewer by default.
+
+// Download Behaviors
+pref("browser.download.manager.addToRecentDocs", false); // Do not add downloaded files to the system's "Recent Documents" list (Windows).
+pref("browser.download.always_ask_before_handling_new_types", true); // Always ask the user how to handle new MIME types, rather than automatically saving.
+
+// JavaScript Pop-up Window Behavior
+// Controls how new windows opened by JavaScript are handled.
+// 0 = force all new windows into tabs.
+// 1 = let all JavaScript windows open as new windows.
+// 2 = default Firefox behavior (catches some popups, lets others open as new windows based on features).
+// [1] https://kb.mozillazine.org/About:config_entries (browser.link.open_newwindow.restriction)
+pref("browser.link.open_newwindow.restriction", 0);
+
+// --- Menus, Find Bar, and Text Selection ---
+// UI elements related to navigation and content interaction.
+
+// Bookmarks Menu
+pref("browser.bookmarks.openInTabClosesMenu", false); // Keep the Bookmarks Menu open when selecting an item to open in a new tab.
+
+// Context Menus
+pref("browser.menu.showViewImageInfo", true); // Restore "View Image Info" to the image context menu.
+
+// Find Bar
+pref("findbar.highlightAll", true); // Highlight all occurrences of the searched text in the Find Bar.
+
+// Text Selection Behavior
+pref("layout.word_select.eat_space_to_next_word", false); // When double-clicking a word, do not automatically select the space that follows it.
+
+// --- Tab Features & Behavior ---
+// Settings controlling tab previews, actions, and states.
+
+// Tab Previews (on hover)
+pref("browser.tabs.hoverPreview.enabled", true); // Enable previews of tab content when hovering over a tab.
+pref("browser.tabs.hoverPreview.showThumbnails", true); // Show thumbnails (screenshots) in tab hover previews.
+
+// Tab Actions (from context menu or elsewhere)
+pref("browser.tabs.duplicateTab", true); // Enable the "Duplicate Tab" option in the tab context menu.
+pref("browser.tabs.copyurl", true); // Enable "Copy URL" in the tab context menu.
+pref("browser.tabs.copyallurls", false); // Enable "Copy All URLs" in the tab context menu (copies URLs of all open tabs).
+pref("browser.tabs.copyurl.activetab", false); // If true, "Copy URL" might specifically target only the active tab (less common).
+pref("browser.tabs.unloadTab", false); // May enable an option to unload a tab from its context menu (often extension-dependent or for future features).
+
+// --- Source Viewer & Developer Tools ---
+// Settings for web development and inspection tools.
+
+// Enable `@-moz-document` rules, which can be used by user styles (e.g., via Stylus) to target specific sites.
+// [1] https://reddit.com/r/FirefoxCSS/comments/8x2q97/reenabling_mozdocument_rules_in_firefox_61/
+pref("layout.css.moz-document.content.enabled", true);
+// Wrap long lines in the View Source window.
+pref("view_source.wrap_long_lines", true);
+// Wrap long lines in the code editor within the DevTools debugger.
+pref("devtools.debugger.ui.editor-wrapping", true);
+pref("layout.dynamic-reflow-roots.enabled", true); // Enable dynamic reflow roots for improved rendering performance.
+
+// --- AI & Machine Learning Features ---
+// Controls for features utilizing AI or Machine Learning.
+pref("browser.ml.chat.enabled", false); // Disable built-in ML chat features.
+pref("browser.ml.enable", false); // Disable MLEngine completely
+pref("browser.ml.linkPreview.enabled", false); // Just in case
+pref("browser.ml.linkPreview.labs", 0, locked);
+pref("browser.ml.linkPreview.optin", false, locked);
+
+// --- Miscellaneous Feature Toggles ---
+// Various standalone feature settings.
+
+// Image Format Support
+pref("image.jxl.enabled", true); // Enable support for the JPEG XL image format.
+
+// Keyboard Shortcuts
+pref("browser.closeShortcut.disabled", false); // false = Ctrl+W (or Cmd+W) closes tab/window (default behavior). true = disables this shortcut.
+
+pref("browser.restart_menu.showpanelmenubtn", true); // If a restart menu is present, show its button in a panel menu.
+pref("browser.restart_menu.purgecache", false); // If true, purges caches upon restart initiated via this menu.
+pref("browser.restart_menu.requireconfirm", true); // Require confirmation before restarting via this menu.
+
+// --- Experimental Web Platform Features ---
+// These features are typically under development and might be unstable or change in future releases.
+// Use with caution.
+
+// Enable CSS Masonry Layout (if available in the current browser version).
+pref("layout.css.grid-template-masonry-value.enabled", true);
+// Enable the Prioritized Task Scheduling API for web pages.
+pref("dom.enable_web_task_scheduling", true); // Whether the scheduler interface will be exposed
+
+// --- DOM Experimental Features ---
+// https://whatpr.org/html/10168/interaction.html#closewatcher
+pref("dom.closewatcher.enabled", true);
+// WebCodecs API - H265
+pref("dom.media.webcodecs.h265.enabled", true);
+// Enable Screen Orientation lock
+pref("dom.screenorientation.allow-lock", true);
+// Whether allowing selection across the boundary
+// between shadow DOM and light DOM.
+// This is based on https://github.com/mfreed7/shadow-dom-selection
+pref("dom.shadowdom.selection_across_boundary.enabled", true);
+// When this pref is enabled:
+//  - Shadow DOM is not pierced by default anymore
+//  - The method accepts optional CaretPositionFromPointOptions to allow piercing
+//    certain ShadowRoots
+//
+// https://drafts.csswg.org/cssom-view/#dom-document-caretpositionfrompoint
+pref("dom.shadowdom.new_caretPositionFromPoint_behavior.enabled", true);
+pref("dom.webnotifications.actions.enabled", true);
+pref("dom.webgpu.enabled", true); // Enable WebGPU API.
+pref("dom.webgpu.workers.enabled", true); // Enable WebGPU in Web Workers.
+pref("dom.webshare.enabled", true); // Enable Web Share API.
+
+// --- CSS Experimental Features ---
+// Is support for shape() enabled?
+pref("layout.css.basic-shape-shape.enabled", true);
+// Whether to use tight bounds for floating ::first-letter (legacy Gecko behavior)
+// or loose bounds based on overall font metrics (WebKit/Blink-like behavior)?
+// Values mean:
+//     1   legacy Gecko behavior (tight bounds)
+//     0   loose typographic bounds (similar to webkit/blink)
+//    -1   auto behavior: use loose bounds if reduced line-height (<1em) or negative
+//         block-start margin is present; otherwise use tight bounds.
+pref("layout.css.floating-first-letter.tight-glyph-bounds", -1);
+// Is support for font-variant-emoji enabled?
+pref("layout.css.font-variant-emoji.enabled", true);
+// Whether @scope rule is enabled
+pref("layout.css.at-scope.enabled", true);
+// Whether the scroll-driven animations generated by CSS is enabled. This
+// also include animation-timeline property.
+pref("layout.css.scroll-driven-animations.enabled", true);
+
+// --- SVG Experimental Features ---
+// Is support for the new getBBox method from SVG 2 enabled?
+// See https://svgwg.org/svg2-draft/single-page.html#types-SVGBoundingBoxOptions
+pref("svg.new-getBBox.enabled", true);
+// Whether we use Moz2D Path::GetStrokedBounds to get the stroke bounds.
+pref("svg.Moz2D.strokeBounds.enabled", true);
diff --git a/waterfox/browser/app/profile/04-sidebar.js b/waterfox/browser/app/profile/04-sidebar.js
new file mode 100644
index 0000000000000..696a328fdbc74
--- /dev/null
+++ b/waterfox/browser/app/profile/04-sidebar.js
@@ -0,0 +1,28 @@
+#filter dumbComments emptyLines substitution
+
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// 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/.
+
+pref("browser.sidebar.enabled", false);
+pref("browser.sidebar.autoAttach", true);
+pref("browser.sidebar.syncParentTabAndOpenerTab", true);
+pref("browser.sidebar.faviconizePinnedTabs", true);
+pref("browser.sidebar.stickyActiveTab", false);
+pref("browser.sidebar.stickySoundPlayingTab", false);
+pref("browser.sidebar.stickySharingTab", false);
+pref("browser.sidebar.autoCollapseExpandSubtreeOnAttach", true);
+pref("browser.sidebar.autoCollapseExpandSubtreeOnSelect", true);
+pref("browser.sidebar.treeDoubleClickBehavior", "0");
+pref("browser.sidebar.successorTabControlLevel", "2");
+pref("browser.sidebar.dropLinksOnTabBehavior", "0");
+pref("browser.sidebar.autoAttachOnOpenedWithOwner", "5");
+pref("browser.sidebar.insertNewTabFromPinnedTabAt", "3");
+pref("browser.sidebar.autoAttachOnNewTabCommand", "-1");
+pref("browser.sidebar.autoAttachOnNewTabButtonMiddleClick", "3");
+pref("browser.sidebar.autoAttachOnDuplicated", "3");
+pref("browser.sidebar.autoAttachSameSiteOrphan", "3");
+pref("browser.sidebar.autoAttachOnOpenedFromExternal", "-1");
+pref("browser.sidebar.autoAttachOnAnyOtherTrigger", "-1");
+pref("browser.sidebar.insertNewTabFromFirefoxViewAt", "3");
diff --git a/waterfox/browser/branding/Assets.car b/waterfox/browser/branding/Assets.car
new file mode 100644
index 0000000000000..3ebcadf7b964a
Binary files /dev/null and b/waterfox/browser/branding/Assets.car differ
diff --git a/waterfox/browser/branding/LICENSE b/waterfox/browser/branding/LICENSE
new file mode 100644
index 0000000000000..3e7b64d216115
--- /dev/null
+++ b/waterfox/browser/branding/LICENSE
@@ -0,0 +1,8 @@
+These files are under the MPL 2, as below. However, please note that you 
+are not granted any trademark rights or licenses to the trademarks of
+Waterfox Limited or any party, including without limitation the
+Waterfox name or logo.
+
+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 https://mozilla.org/MPL/2.0/.
diff --git a/waterfox/browser/branding/PrivateBrowsing_150.png b/waterfox/browser/branding/PrivateBrowsing_150.png
new file mode 100644
index 0000000000000..da83daa230627
Binary files /dev/null and b/waterfox/browser/branding/PrivateBrowsing_150.png differ
diff --git a/waterfox/browser/branding/PrivateBrowsing_70.png b/waterfox/browser/branding/PrivateBrowsing_70.png
new file mode 100644
index 0000000000000..e053a26179f5e
Binary files /dev/null and b/waterfox/browser/branding/PrivateBrowsing_70.png differ
diff --git a/waterfox/browser/branding/VisualElements_150.png b/waterfox/browser/branding/VisualElements_150.png
new file mode 100644
index 0000000000000..3de159dced053
Binary files /dev/null and b/waterfox/browser/branding/VisualElements_150.png differ
diff --git a/waterfox/browser/branding/VisualElements_70.png b/waterfox/browser/branding/VisualElements_70.png
new file mode 100644
index 0000000000000..4e465dfe0a198
Binary files /dev/null and b/waterfox/browser/branding/VisualElements_70.png differ
diff --git a/waterfox/browser/branding/background.png b/waterfox/browser/branding/background.png
new file mode 100644
index 0000000000000..9009d985bbc90
Binary files /dev/null and b/waterfox/browser/branding/background.png differ
diff --git a/waterfox/browser/branding/branding-common.mozbuild b/waterfox/browser/branding/branding-common.mozbuild
new file mode 100644
index 0000000000000..674dd158267cb
--- /dev/null
+++ b/waterfox/browser/branding/branding-common.mozbuild
@@ -0,0 +1,34 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+@template
+def Branding():
+    JS_PREFERENCE_FILES += [
+        'pref/firefox-branding.js',
+    ]
+
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+        FINAL_TARGET_FILES['..'] += [
+            'firefox.VisualElementsManifest.xml',
+            'private_browsing.VisualElementsManifest.xml',
+        ]
+        FINAL_TARGET_FILES.VisualElements += [
+            'PrivateBrowsing_150.png',
+            'PrivateBrowsing_70.png',
+            'VisualElements_150.png',
+            'VisualElements_70.png',
+        ]
+    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+        FINAL_TARGET_FILES.chrome.icons.default += [
+            'default128.png',
+            'default16.png',
+            'default22.png',
+            'default24.png',
+            'default256.png',
+            'default32.png',
+            'default48.png',
+            'default64.png',
+        ]
diff --git a/waterfox/browser/branding/branding.nsi b/waterfox/browser/branding/branding.nsi
new file mode 100644
index 0000000000000..3c4264e4af1c9
--- /dev/null
+++ b/waterfox/browser/branding/branding.nsi
@@ -0,0 +1,76 @@
+# 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/.
+
+# NSIS branding defines for official release builds.
+# The nightly build branding.nsi is located in browser/installer/windows/nsis/
+# The unofficial build branding.nsi is located in browser/branding/unofficial/
+
+# BrandFullNameInternal is used for some registry and file system values
+# instead of BrandFullName and typically should not be modified.
+!define BrandFullNameInternal "Waterfox"
+!define BrandFullName         "Waterfox"
+!define CompanyName           "BrowserWorks"
+!define URLInfoAbout          "https://www.waterfox.com"
+!define URLUpdateInfo         "https://www.waterfox.com/releases/${AppVersion}"
+!define HelpLink              "https://www.waterfox.com/support/waterfox-help/"
+
+; The OFFICIAL define is a workaround to support different urls for Release and
+; Beta since they share the same branding when building with other branches that
+; set the update channel to beta.
+!define OFFICIAL
+!define URLStubDownloadX86 ""
+!define URLStubDownloadAMD64 "https://cdn.waterfox.net/waterfox/releases/latest/windows"
+!define URLStubDownloadAArch64 ""
+!define URLManualDownload "https://www.waterfox.com/download/"
+!define URLSystemRequirements "https://www.waterfox.com/support/desktop/system-requirements/"
+!define Channel "release"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "WATERFOX LIMITED"
+!define CertIssuerDownload "GlobalSign GCC R45 EV CodeSigning CA 2020"
+
+# Dialog units are used so the UI displays correctly with the system's DPI
+# settings. These are tweaked to look good with the en-US strings; ideally
+# we would customize them for each locale but we don't really have a way to
+# implement that and it would be a ton of work for the localizers.
+!define PROFILE_CLEANUP_LABEL_TOP "50u"
+!define PROFILE_CLEANUP_LABEL_LEFT "22u"
+!define PROFILE_CLEANUP_LABEL_WIDTH "175u"
+!define PROFILE_CLEANUP_LABEL_HEIGHT "100u"
+!define PROFILE_CLEANUP_LABEL_ALIGN "left"
+!define PROFILE_CLEANUP_CHECKBOX_LEFT "22u"
+!define PROFILE_CLEANUP_CHECKBOX_WIDTH "175u"
+!define PROFILE_CLEANUP_BUTTON_LEFT "22u"
+!define INSTALL_HEADER_TOP "70u"
+!define INSTALL_HEADER_LEFT "22u"
+!define INSTALL_HEADER_WIDTH "180u"
+!define INSTALL_HEADER_HEIGHT "100u"
+!define INSTALL_BODY_LEFT "22u"
+!define INSTALL_BODY_WIDTH "180u"
+!define INSTALL_INSTALLING_TOP "115u"
+!define INSTALL_INSTALLING_LEFT "270u"
+!define INSTALL_INSTALLING_WIDTH "150u"
+!define INSTALL_PROGRESS_BAR_TOP "100u"
+!define INSTALL_PROGRESS_BAR_LEFT "270u"
+!define INSTALL_PROGRESS_BAR_WIDTH "150u"
+!define INSTALL_PROGRESS_BAR_HEIGHT "12u"
+
+!define PROFILE_CLEANUP_CHECKBOX_TOP_MARGIN "12u"
+!define PROFILE_CLEANUP_BUTTON_TOP_MARGIN "12u"
+!define PROFILE_CLEANUP_BUTTON_X_PADDING "80u"
+!define PROFILE_CLEANUP_BUTTON_Y_PADDING "8u"
+!define INSTALL_BODY_TOP_MARGIN "20u"
+
+# Font settings that can be customized for each channel
+!define INSTALL_HEADER_FONT_SIZE 20
+!define INSTALL_HEADER_FONT_WEIGHT 600
+!define INSTALL_INSTALLING_FONT_SIZE 15
+!define INSTALL_INSTALLING_FONT_WEIGHT 600
+
+# UI Colors that can be customized for each channel
+!define COMMON_TEXT_COLOR 0x000000
+!define COMMON_BACKGROUND_COLOR 0xFFFFFF
+!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF
+# This color is written as 0x00BBGGRR because it's actually a COLORREF value.
+!define PROGRESS_BAR_BACKGROUND_COLOR 0xFFAA00
diff --git a/waterfox/browser/branding/configure.sh b/waterfox/browser/branding/configure.sh
new file mode 100644
index 0000000000000..02163744fd711
--- /dev/null
+++ b/waterfox/browser/branding/configure.sh
@@ -0,0 +1,14 @@
+# 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/.
+
+MOZ_APP_DISPLAYNAME=Waterfox
+MOZ_APP_NAME=waterfox
+MOZ_DISTRIBUTION_ID=net.waterfox
+MOZ_INCLUDE_SOURCE_INFO=1
+MOZ_REQUIRE_SIGNING=
+MOZ_TELEMETRY_REPORTING=
+MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65"
+MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c"
+MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3"
+MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c"
diff --git a/waterfox/browser/branding/content/about-logo-private.png b/waterfox/browser/branding/content/about-logo-private.png
new file mode 100644
index 0000000000000..ebb139302dd8e
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo-private.png differ
diff --git a/waterfox/browser/branding/content/about-logo-private@2x.png b/waterfox/browser/branding/content/about-logo-private@2x.png
new file mode 100644
index 0000000000000..85a182526e22b
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo-private@2x.png differ
diff --git a/waterfox/browser/branding/content/about-logo.png b/waterfox/browser/branding/content/about-logo.png
new file mode 100644
index 0000000000000..656881f071995
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo.png differ
diff --git a/waterfox/browser/branding/content/about-logo.svg b/waterfox/browser/branding/content/about-logo.svg
new file mode 100644
index 0000000000000..38393b8505226
--- /dev/null
+++ b/waterfox/browser/branding/content/about-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1419" height="1419"><path fill="#68edfc" d="M614.718994 191.63501c5.791016-6.072022 12.924011-11.394043 19.718018-16.312989 28.981994-20.984985 63.117981-35.830078 99.312988-36.60205 29.872009-.636963 60.557007 9.263061 82.296997 30.211059 9.559998 9.212036 17.825989 20.950928 22.077026 33.605957 3.164002 7.139038 4.552002 15.860962 4.971985 23.614991 1.008972 18.645019-4.499023 36.822021-14.075988 52.711059-19.775025 32.80896-54.786011 55.197998-89.164002 70.50293-16.020996 7.133056-32.520019 13.150024-48.53302 20.338989-20.298584 8.924561-39.88855 19.381104-58.599976 31.279053-17.957031 11.605957-35.963012 25.442993-49.314025 42.244018-5.817017 7.319947-10.458985 16.174988-16.77002 22.951966-1.396973 1.5-4.541992 4.52301-6.79895 4.244995-2.819031-.346985-5.486023-3.467957-7.055054-5.622009-4.448974-6.107972-6.966003-14.427979-9.084961-21.58899-10.652038-35.995971-11.437012-76.56604-5.129028-113.402954 7.178955-43.924927 26.596741-84.935791 56.025024-118.32605 6.031983-6.874023 12.645996-14.573974 20.122986-19.849975"/><linearGradient id="a" x1="427.141" x2="406.314" y1="596.232" y2="384.081" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#00dffe"/><stop offset="1" stop-color="#62fefa"/></linearGradient><path fill="url(#a)" d="M419.951996 382.072998c2.826996-.023926 5.778015.19104 8.588989.478027 14.093018 1.437989 27.669006 9 36.617005 19.903931 13.464996 16.407044 13.962005 38.019043 6.807006 57.261047-3.531006 9.492981-8.626983 18.383973-12.631988 27.685975-4.948181 11.512085-8.901947 23.426635-11.817993 35.613037-3.411011 14.164001-4.807007 29.151001-5.253022 43.704956-.221984 7.236999.080994 14.69104-.673004 21.882019-.299988 2.864013-.447998 5.999023-2.763 7.895019-6.842987.348999-15.384979-5.153991-21.264984-8.286987-7.081787-4.038452-13.746308-8.768189-19.895996-14.119995-27.334015-23.756043-44.638001-59.579041-46.933014-95.661072-1.674988-26.316955 5.277008-53.826965 23.022003-73.890991 12.333008-13.945923 27.730987-21.233032 46.197998-22.464966"/><path fill="#68edfc" d="M988.346985 98.922974c36.842956-6.212036 71.732971 18.659057 77.872986 55.514038 6.140014 36.85498-18.789917 71.697998-55.659973 77.770996-36.766968 6.05603-71.49701-18.800049-77.622986-55.557007-6.126038-36.756958 18.664978-71.532959 55.409973-77.729004"/><linearGradient id="b" x1="729.817" x2="432.834" y1="1172.043" y2="591.96" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#10b8f7"/><stop offset="1" stop-color="#2bffff"/></linearGradient><path fill="url(#b)" d="M713.786011 445.796997c14.122986-11.127991 31.753967-20.113037 47.825989-28.098999 60.896972-30.259033 130.79602-50.73706 199.351013-42.634033 37.917968 4.481079 76.226928 19.336059 100.416992 50.063049 7.589966 9.632019 15.689941 21.905945 14.209961 34.768982-.919922 8.02301-5.439942 14.947998-10.619995 20.917969-10.069947 11.61206-22.380005 21.48706-34.059937 31.43103-15.503845 12.95575-30.739075 26.229614-45.696045 39.812988-11.507629 10.632508-22.730957 21.568665-33.657959 32.796997-5.501037 5.648011-10.892029 12.453003-16.900024 17.43805-14.169983 15.827942-28.390015 31.68396-41.611023 48.32196-74.389954 88.343994-127.737 191.622986-183.544006 291.958985l-119.432984 213.336059-32.005981 56.900025c-11.255005 19.98999-21.619019 40.689941-37.137024 57.819946-19.177429 20.850708-43.837952 35.880859-71.158997 43.369995-4.436493 1.231445-8.906585 2.338501-13.404999 3.319946-1.514984.100098-2.705993.25-4.158996.740113-7.381989 2.439941-35.558991 2.899902-42.743988.619995-2.091004-.660034-3.906006-1.050049-6.091004-1.27002l-.764007-.060058c-6.75-1.630005-13.431-3.099976-20.057984-5.219971-28.213592-9.035889-53.118957-26.225342-71.574005-49.400025-18.52301-23.299926-28.999023-53.109985-40.960006-80.119995l-44.514008-100.569946c-7.944992-17.960083-15.306992-36.580078-24.225998-54.050049-2.871002-10.039978-9.054001-19.649963-12.645996-29.570007 2.893997 3.01001 5.326004 6.799988 7.979996 10.059997 6.758011 8.28003 14.327011 15.200013 23.397003 20.880005 21.854538 13.647461 48.268463 17.962769 73.330002 11.979981 17.604461-4.228638 33.65747-13.341553 46.312011-26.289978 15.718995-16.227967 28.517975-43.227967 39.957978-63.157959l40.757995-70.80304c8.853028-15.46997 17.416016-31.205993 26.731018-46.398987l79.286988-137.747985c21.476989-37.14502 41.997009-75.687012 66.027038-111.238038 25.64209-37.962036 56.244141-72.325744 90.992981-102.177978 15.602967-13.412964 32.580994-27.358032 50.388001-37.729004"/><path fill="#bafafc" d="M713.786011 445.796997c14.122986-11.127991 31.753967-20.113037 47.825989-28.098999 60.896972-30.259033 130.79602-50.73706 199.351013-42.634033 37.917968 4.481079 76.226928 19.336059 100.416992 50.063049 7.589966 9.632019 15.689941 21.905945 14.209961 34.768982-.919922 8.02301-5.439942 14.947998-10.619995 20.917969-10.069947 11.61206-22.380005 21.48706-34.059937 31.43103-15.503845 12.95575-30.739075 26.229614-45.696045 39.812988-11.507629 10.632508-22.730957 21.568665-33.657959 32.796997-5.501037 5.648011-10.892029 12.453003-16.900024 17.43805-20.937988 9.709961-40.307984 20.141968-63.18103 25.059997-15.880982 3.414002-34.821961 4.520996-48.915955-5.044006-10.351013-7.024048-14.434021-17.144043-16.893005-28.864014-21.507996 20.162964-50.903992 43.357972-80.588013 47.799012-12.460022 1.86499-24.973999.016967-35.198975-7.774048-14.222046-10.837952-20.47705-30.062989-22.693054-47.117981-4.912964-37.81897 5.827026-78.076966 25.229004-110.514954 6.347046-10.610046 13.842041-20.267029 21.371033-30.040039"/><linearGradient id="c" x1="782.06" x2="1178.071" y1="1081.194" y2="878.104" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#08a9f8"/><stop offset="1" stop-color="#0cdbfe"/></linearGradient><path fill="url(#c)" d="M709.500977 942.573975c55.807006-100.335999 109.154052-203.614991 183.544006-291.958985 12.299988 20.319031 23.429993 41.535034 34.968017 62.30304l65.731019 118.261963 60.975952 109.673034L1075.5 978.179016c7.01001 12.580994 13.359985 25.480957 23.109985 36.230957 10.829956 11.929993 26.640015 21.039978 42.01001 25.590027 24.703369 7.381836 51.338989 4.497925 73.890015-8 14.97998-8.289978 25.099975-19.400024 35.119995-33.064026l.579956.285034c-3.809937 9.359009-9.799927 19.158997-12.469971 28.778992-9.050049 17.530029-16.410034 36.339966-24.400024 54.410034l-45.880005 103.640015c-8.319946 18.809936-15.829956 39.349975-26.409912 56.98999-9.400025 15.669922-21.75 30.599976-35.920044 42.199951-20.940064 18.339966-48.790039 29.339966-76.209961 33.390015l-3.460083.530029c-15.439941 1.179932-29.613953.150025-44.90094-1.830078-5.176147-1.301269-10.33551-2.667969-15.477051-4.099976-26.805542-7.936767-50.855285-23.216186-69.428955-44.109985-15.080994-17.119995-25.216003-37.709961-36.23999-57.520019l-33.445007-60.140015Z"/><linearGradient id="d" x1="369.778" x2="49.934" y1="984.821" y2="474.81" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#008aed"/><stop offset="1" stop-color="#05d1ea"/></linearGradient><path fill="url(#d)" d="M3.24 560.663025c7.21-32.479004 21.826999-61.33905 46.606001-83.994019 24.467636-22.304992 55.532303-36.037048 88.497001-39.119995 9.660996-.844055 19.446991-.346008 29.119004.11499 42.470001 6.012024 79.031997 24.614991 105.294006 59.278992 13.880981 18.322998 22.097992 40.012024 31.363983 60.861023l27.347015 61.57898 95.623993 215.307006c-9.315002 15.192994-17.87799 30.929017-26.731018 46.398987l-40.757995 70.80304c-11.440003 19.929992-24.238983 46.929992-39.957978 63.157959-12.654541 12.948425-28.70755 22.06134-46.312011 26.289978-25.061539 5.982788-51.475464 1.66748-73.330002-11.979981-9.069992-5.679992-16.638992-12.599975-23.397003-20.880005-2.653992-3.260009-5.085999-7.049987-7.979996-10.059997-3.149994-6.415955-5.703995-13.313965-8.604004-19.867981l-20.319-45.832031L76.542 790.518982l-43.884999-98.696961C24.487 673.439026 15.065 654.888 8.633 635.835999c-5.295-15.685975-7.585-31.768982-7.881-48.281006-.034-8.982972 1.325-18 2.489-26.891968"/><linearGradient id="e" x1="1082.197" x2="1323.221" y1="1014.341" y2="449.013" gradientUnits="userSpaceOnUse"><stop offset=".00001" stop-color="#2f76eb"/><stop offset="1" stop-color="#7e94f3"/></linearGradient><path fill="url(#e)" d="m993.744019 831.179993 96.385986-217.276001 26.219971-58.914002c8.710083-19.474975 16.580078-39.518005 29.320068-56.80896 17.098999-23.127746 40.463257-40.875305 67.329956-51.144043 37.745972-14.480224 79.724731-13.202392 116.52002 3.546997 36.58789 16.546387 65.05017 47.022828 79.059936 84.65503 10.109253 26.768249 12.313355 55.877746 6.350098 83.862976-4.970093 23.28601-16.300049 45.109009-25.910034 66.760986l-37.390015 84.280029-68.280029 154.054016c-10.969971 24.776978-21.26001 50.083985-32.890015 74.53595-.079956.166016-.169922.325012-.25.488037l-.579956-.285034c-10.02002 13.664002-20.140015 24.774048-35.119995 33.064026-22.551026 12.497925-49.186646 15.381836-73.890015 8-15.369995-4.550049-31.180054-13.660034-42.01001-25.590027-9.75-10.75-16.099975-23.649963-23.109985-36.230957l-20.780029-37.325989Z"/></svg>
diff --git a/waterfox/browser/branding/content/about-logo@2x.png b/waterfox/browser/branding/content/about-logo@2x.png
new file mode 100644
index 0000000000000..ec9501eaed0a3
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo@2x.png differ
diff --git a/waterfox/browser/branding/content/about-wordmark.svg b/waterfox/browser/branding/content/about-wordmark.svg
new file mode 100644
index 0000000000000..72fbe2bc287b8
--- /dev/null
+++ b/waterfox/browser/branding/content/about-wordmark.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.3.11 -->
+<svg width="341" height="32" viewBox="0 0 341 32" xmlns="http://www.w3.org/2000/svg">
+    <title>about-wordmark</title>
+    <g id="Page-1">
+        <g id="about-wordmark" fill="#053361" fill-rule="evenodd" >
+            <path id="Browser" stroke="none" d="M 330.766998 10.686001 L 328.990997 10.686001 L 328.990997 30 L 330.841003 30 L 330.841003 19.936001 C 330.841003 15.163 333.394012 12.313999 337.686005 12.313999 C 337.834015 12.313999 337.981995 12.351 338.130005 12.351 L 338.130005 10.538 C 334.503998 10.538 331.950989 12.091999 330.766998 14.903999 Z M 323.256012 20.269001 C 323.256012 14.534 319.334015 10.538 314.042999 10.538 C 308.752014 10.538 304.792999 14.608 304.792999 20.343 C 304.792999 26.078001 308.899994 30.148001 314.746002 30.148001 C 317.669006 30.148001 320.333008 29.075001 322.035004 27.003 L 320.962006 25.782 C 319.481995 27.594999 317.225006 28.483 314.78299 28.483 C 310.15799 28.483 306.790985 25.375 306.605988 20.786999 L 323.218994 20.786999 C 323.218994 20.602001 323.256012 20.417 323.256012 20.269001 Z M 314.042999 12.166 C 318.149994 12.166 321.18399 15.163 321.442993 19.344 L 306.643005 19.344 C 306.938995 15.125999 309.936005 12.166 314.042999 12.166 Z M 294.100006 30.148001 C 299.020996 30.148001 301.721985 28.002001 301.721985 24.857 C 301.721985 17.493999 288.920013 21.601 288.920013 15.792 C 288.920013 13.719999 290.584991 12.166 294.359009 12.166 C 296.431 12.166 298.540009 12.721001 300.167999 13.905001 L 301.019012 12.424999 C 299.502014 11.278 296.838013 10.538 294.395996 10.538 C 289.511993 10.538 287.070007 12.906 287.070007 15.829 C 287.070007 23.414 299.872009 19.27 299.872009 24.894001 C 299.872009 27.077 298.243988 28.52 294.174011 28.52 C 291.325012 28.52 288.697998 27.447001 287.217987 26.188999 L 286.367004 27.669001 C 287.884003 29.075001 290.917999 30.148001 294.100006 30.148001 Z M 276.932007 27.890999 L 270.382996 10.686001 L 268.791992 10.686001 L 262.205994 27.927999 L 255.768005 10.686001 L 253.992004 10.686001 L 261.317993 30 L 263.019989 30 L 269.569 13.239 L 276.080994 30 L 277.820007 30 L 285.145996 10.686001 L 283.444 10.686001 Z M 242.707001 30.148001 C 248.257004 30.148001 252.363998 26.078001 252.363998 20.343 C 252.363998 14.608 248.257004 10.538 242.707001 10.538 C 237.156998 10.538 233.050003 14.608 233.050003 20.343 C 233.050003 26.078001 237.156998 30.148001 242.707001 30.148001 Z M 242.707001 28.483 C 238.266998 28.483 234.936996 25.190001 234.936996 20.343 C 234.936996 15.496 238.266998 12.202999 242.707001 12.202999 C 247.147003 12.202999 250.477005 15.496 250.477005 20.343 C 250.477005 25.190001 247.147003 28.483 242.707001 28.483 Z M 222.875 10.686001 L 221.098999 10.686001 L 221.098999 30 L 222.949005 30 L 222.949005 19.936001 C 222.949005 15.163 225.501999 12.313999 229.794006 12.313999 C 229.942001 12.313999 230.089996 12.351 230.238007 12.351 L 230.238007 10.538 C 226.612 10.538 224.059006 12.091999 222.875 14.903999 Z M 209.259003 16.643 C 211.848999 15.792 213.587997 13.794001 213.587997 10.723 C 213.587997 6.431 210.220993 4.1 204.671005 4.1 L 193.867004 4.1 L 193.867004 30 L 205.410995 30 C 211.774994 30 214.957001 27.521 214.957001 23.154999 C 214.957001 19.566 212.921997 17.346001 209.259003 16.643 Z M 204.597 5.728001 C 209.074005 5.728001 211.664001 7.466999 211.664001 10.871 C 211.664001 14.312 209.074005 16.050999 204.597 16.050999 L 195.753998 16.050999 L 195.753998 5.728001 Z M 195.753998 28.372 L 195.753998 17.679001 L 205.410995 17.679001 C 210.369003 17.679001 213.070007 19.306999 213.070007 23.007 C 213.070007 26.743999 210.369003 28.372 205.410995 28.372 Z"/>
+            <path id="Waterfox" stroke="none" d="M 146.200531 30.501001 C 139.827286 30.501001 135.167328 26.214588 135.167328 20.176783 C 135.167328 14.138975 139.827286 9.852564 146.200531 9.852564 C 152.573792 9.852564 157.194672 14.138975 157.194672 20.176783 C 157.194672 26.214588 152.573792 30.501001 146.200531 30.501001 Z M 123.204437 30.202173 L 123.204437 15.071314 L 120.110687 15.071314 L 120.110687 10.598658 L 123.204437 10.598658 L 123.204437 9.704126 C 123.204437 5.194407 125.962158 2.249048 130.95639 2.249048 C 132.596298 2.249048 134.311096 2.58567 135.391937 3.331079 L 133.864594 7.542017 C 133.231003 7.09477 132.409454 6.834986 131.514984 6.834986 C 129.800522 6.834986 128.870453 7.765903 128.870453 9.741236 L 128.870453 10.598658 L 134.013031 10.598658 L 134.013031 15.071314 L 129.01889 15.071314 L 129.01889 30.202173 L 123.204437 30.202173 Z M 157.903656 30.202173 L 165.6185 20.102564 L 158.163422 10.151392 L 164.686859 10.151392 L 168.934906 16.002954 L 173.296234 10.151392 L 179.483734 10.151392 L 172.028656 19.954126 L 179.780609 30.202173 L 173.184906 30.202173 L 168.786469 24.053736 L 164.239594 30.202173 L 157.903656 30.202173 Z M 146.200531 25.729517 C 149.107635 25.729517 151.306 23.642931 151.306 20.176783 C 151.306 16.710634 149.107635 14.624048 146.200531 14.624048 C 143.293442 14.624048 141.057953 16.710634 141.057953 20.176783 C 141.057953 23.642931 143.293442 25.729517 146.200531 25.729517 Z M 111.986046 10.151335 L 106.432755 10.151335 L 106.432755 30.202839 L 112.246948 30.202839 L 112.246948 20.736143 C 112.246948 16.897287 114.371361 15.145576 117.576622 15.145576 C 118.023865 15.145576 118.396568 15.182848 118.881081 15.220116 L 118.881081 9.853172 C 115.787636 9.853172 113.402321 10.859474 111.986046 12.797539 Z M 102.556625 20.251629 C 102.556625 13.803839 98.009628 9.853172 92.120895 9.853172 C 86.008545 9.853172 81.424286 14.176544 81.424286 20.177086 C 81.424286 26.140358 85.934006 30.501001 92.866302 30.501001 C 96.481544 30.501001 99.276825 29.382889 101.14035 27.258472 L 98.046906 23.904133 C 96.667892 25.208597 95.139809 25.842196 93.015388 25.842196 C 89.959213 25.842196 87.834801 24.314106 87.275742 21.816986 L 102.444817 21.816986 C 102.482086 21.33247 102.556625 20.698872 102.556625 20.251629 Z M 92.158173 14.251085 C 94.767097 14.251085 96.667892 15.890985 97.077873 18.425375 L 87.201202 18.425375 C 87.611176 15.853714 89.511971 14.251085 92.158173 14.251085 Z M 78.703537 25.134056 C 78.069939 25.618572 77.212723 25.879465 76.355499 25.879465 C 74.790138 25.879465 73.858383 24.947704 73.858383 23.233265 L 73.858383 15.071035 L 78.852623 15.071035 L 78.852623 10.598581 L 73.858383 10.598581 L 73.858383 5.716152 L 68.044189 5.716152 L 68.044189 10.598581 L 64.950745 10.598581 L 64.950745 15.071035 L 68.044189 15.071035 L 68.044189 23.307804 C 68.044189 28.078423 70.8022 30.501001 75.535553 30.501001 C 77.324532 30.501001 79.076241 30.091026 80.268898 29.233807 Z M 52.427868 9.853172 C 49.22261 9.853172 45.98008 10.710392 43.781124 12.275749 L 45.868267 16.33823 C 47.321815 15.182848 49.520771 14.474707 51.645187 14.474707 C 54.775909 14.474707 56.266727 15.928257 56.266727 18.425375 L 51.645187 18.425375 C 45.532833 18.425375 43.035713 20.885225 43.035713 24.425919 C 43.035713 27.892071 45.831001 30.501001 50.527077 30.501001 C 53.471439 30.501001 55.55859 29.531971 56.639431 27.705717 L 56.639431 30.202839 L 62.080917 30.202839 L 62.080917 18.760809 C 62.080917 12.685726 58.540222 9.853172 52.427868 9.853172 Z M 51.980625 26.587605 C 49.930748 26.587605 48.700825 25.618572 48.700825 24.165024 C 48.700825 22.823288 49.558044 21.816986 52.27879 21.816986 L 56.266727 21.816986 L 56.266727 23.866861 C 55.59586 25.693113 53.918686 26.587605 51.980625 26.587605 Z M 31.034632 22.599667 L 25.07136 4.113523 L 19.480791 4.113523 L 13.331166 22.450584 L 7.442436 4.113523 L 1.181 4.113523 L 9.753203 30.202839 L 16.200991 30.202839 L 22.126993 12.536644 L 27.866642 30.202839 L 34.3517 30.202839 L 42.886635 4.113523 L 37.109715 4.113523 Z"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/branding/content/about.png b/waterfox/browser/branding/content/about.png
new file mode 100644
index 0000000000000..e81cbc07468f9
Binary files /dev/null and b/waterfox/browser/branding/content/about.png differ
diff --git a/waterfox/browser/branding/content/aboutDialog.css b/waterfox/browser/branding/content/aboutDialog.css
new file mode 100644
index 0000000000000..91a69aa9b46f5
--- /dev/null
+++ b/waterfox/browser/branding/content/aboutDialog.css
@@ -0,0 +1,62 @@
+/* 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/. */
+
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/background.svg");
+  background-position: center;
+  background-size: cover;
+  color: #053361;
+  color-scheme: dark;
+}
+
+#clientBox {
+  padding: 10px 0 15px;
+}
+
+#leftBox {
+  background-image: url("chrome://branding/content/about-logo.png");
+  background-repeat: no-repeat;
+  background-size: 192px auto;
+  background-position: center 20%;
+  /* min-width and min-height create room for the logo */
+  min-width: 210px;
+  min-height: 210px;
+  margin-top: 20px;
+  margin-inline-start: 30px;
+}
+
+@media (min-resolution: 2dppx) {
+  #leftBox {
+    background-image: url("chrome://branding/content/about-logo@2x.png");
+  }
+}
+
+/* .text-link {
+  color: #fff !important;
+  text-decoration: underline;
+} */
+
+#rightBox {
+  margin-inline: 30px;
+}
+
+/* #bottomBox {
+  background-color: hsla(235, 43%, 10%, .5);
+  padding: 15px 10px 15px;
+} */
+
+#trademark {
+  font-size: xx-small;
+  text-align: center;
+  color: #053361;
+  margin-block: 10px;
+}
+
+@media (-moz-platform: macos) {
+  #checkForUpdatesButton,
+  #downloadAndInstallButton,
+  #updateButton {
+    color: #053361;
+  }
+}
diff --git a/waterfox/browser/branding/content/background.svg b/waterfox/browser/branding/content/background.svg
new file mode 100644
index 0000000000000..516a102be74b5
--- /dev/null
+++ b/waterfox/browser/branding/content/background.svg
@@ -0,0 +1,58 @@
+<svg width="1800" height="1361" viewBox="0 0 1800 1361" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_366_609" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="1800" height="1361">
+<rect width="1800" height="1360.85" fill="#B783FF"/>
+</mask>
+<g mask="url(#mask0_366_609)">
+<rect width="1800" height="1360.85" fill="#E2EEFB"/>
+<g filter="url(#filter0_f_366_609)">
+<ellipse cx="452.818" cy="495.186" rx="452.818" ry="495.186" transform="matrix(-0.530555 0.84765 -0.910775 -0.412903 983.496 54.0341)" fill="url(#paint0_linear_366_609)" fill-opacity="0.9"/>
+</g>
+<g filter="url(#filter1_f_366_609)">
+<ellipse cx="613.369" cy="566.147" rx="613.369" ry="566.147" transform="matrix(0.897507 -0.441 0.561397 0.827547 621.509 1120.15)" fill="url(#paint1_linear_366_609)" fill-opacity="0.8"/>
+</g>
+<g filter="url(#filter2_f_366_609)">
+<ellipse cx="168.881" cy="165.369" rx="168.881" ry="165.369" transform="matrix(0.801657 0.597784 -0.717314 0.69675 509.244 1074.04)" fill="url(#paint2_linear_366_609)"/>
+</g>
+<g filter="url(#filter3_f_366_609)">
+<ellipse cx="223.555" cy="262.654" rx="223.555" ry="262.654" transform="matrix(-0.0194398 -0.999811 0.999901 -0.0140817 1391.69 164.211)" fill="url(#paint3_linear_366_609)"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_366_609" x="-412.853" y="-395.577" width="1410.2" height="1257.96" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="97" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter1_f_366_609" x="570.072" y="493.082" width="1839.54" height="1650.16" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="142" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter2_f_366_609" x="132.005" y="923.023" width="788.005" height="734.387" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="107" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter3_f_366_609" x="1183.31" y="-490.545" width="933.33" height="855.088" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="102" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<linearGradient id="paint0_linear_366_609" x1="342.367" y1="120.523" x2="527.101" y2="1016.57" gradientUnits="userSpaceOnUse">
+<stop stop-color="#51A9FF"/>
+<stop offset="1" stop-color="#B783FF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_366_609" x1="833.368" y1="109.108" x2="305.578" y2="1038.54" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B783FF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_366_609" x1="127.688" y1="40.2491" x2="183.379" y2="341.925" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8DEDCF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+<linearGradient id="paint3_linear_366_609" x1="169.026" y1="63.9272" x2="273.641" y2="536.234" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8DEDCF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/waterfox/browser/branding/content/firefox-wordmark.svg b/waterfox/browser/branding/content/firefox-wordmark.svg
new file mode 100644
index 0000000000000..2911e1e58b357
--- /dev/null
+++ b/waterfox/browser/branding/content/firefox-wordmark.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.3.11 -->
+<svg width="197" height="38" viewBox="0 0 197 38" xmlns="http://www.w3.org/2000/svg">
+    <g id="Page-1">
+    <title>Waterfox</title>
+        <g id="firefox-wordmark">
+            <path id="Waterfox" fill="context-fill #20123a" fill-rule="evenodd" stroke="none" d="M 159.327484 34.668705 C 152.465225 34.668705 147.448578 30.054558 147.448578 23.553471 C 147.448578 17.05238 152.465225 12.436283 159.327484 12.436283 C 166.189758 12.436283 171.165375 17.05238 171.165375 23.553471 C 171.165375 30.054558 166.189758 34.668705 159.327484 34.668705 Z M 134.567719 34.348392 L 134.567719 18.055424 L 131.235687 18.055424 L 131.235687 13.239017 L 134.567719 13.239017 L 134.567719 12.276127 C 134.567719 7.420378 137.537933 4.250736 142.915375 4.250736 C 144.681107 4.250736 146.526993 4.610237 147.690765 5.412846 L 146.044281 9.948002 C 145.362076 9.46644 144.480057 9.186283 143.516937 9.186283 C 141.670944 9.186283 140.667328 10.190243 140.667328 12.317142 L 140.667328 13.239017 L 146.204437 13.239017 L 146.204437 18.055424 L 140.827484 18.055424 L 140.827484 34.348392 L 134.567719 34.348392 Z M 171.929047 34.348392 L 180.235687 23.471439 L 172.210297 12.758549 L 179.231781 12.758549 L 183.807953 19.057377 L 188.503265 12.758549 L 195.163422 12.758549 L 187.138031 23.311283 L 195.485687 34.348392 L 188.382172 34.348392 L 183.645844 27.725346 L 178.751312 34.348392 L 171.929047 34.348392 Z M 159.327484 29.531986 C 162.457642 29.531986 164.825531 27.285576 164.825531 23.553471 C 164.825531 19.821365 162.457642 17.573002 159.327484 17.573002 C 156.197327 17.573002 153.790375 19.821365 153.790375 23.553471 C 153.790375 27.285576 156.197327 29.531986 159.327484 29.531986 Z M 122.488136 12.757607 L 116.508728 12.757607 L 116.508728 34.347664 L 122.769051 34.347664 L 122.769051 24.154587 C 122.769051 20.021175 125.056473 18.135056 128.507675 18.135056 C 128.989243 18.135056 129.390533 18.175186 129.912231 18.215315 L 129.912231 12.436565 C 126.581421 12.436565 124.013084 13.520082 122.488136 15.606853 Z M 112.33519 23.632895 C 112.33519 16.690367 107.439301 12.436565 101.098724 12.436565 C 94.517372 12.436565 89.58136 17.091671 89.58136 23.552635 C 89.58136 29.973469 94.437111 34.668705 101.901329 34.668705 C 105.793968 34.668705 108.803734 33.464798 110.810242 31.177376 L 107.479439 27.565655 C 105.994614 28.970213 104.349274 29.652428 102.061852 29.652428 C 98.771179 29.652428 96.483757 28.007088 95.881805 25.318363 L 112.214798 25.318363 C 112.254929 24.796671 112.33519 24.114456 112.33519 23.632895 Z M 101.138863 17.17193 C 103.947975 17.17193 105.994614 18.937658 106.43605 21.666515 L 95.801544 21.666515 C 96.242973 18.897528 98.289619 17.17193 101.138863 17.17193 Z M 86.651848 28.889954 C 85.969643 29.411646 85.046646 29.692558 84.123642 29.692558 C 82.438171 29.692558 81.434921 28.689301 81.434921 26.843311 L 81.434921 18.054796 L 86.81237 18.054796 L 86.81237 13.23917 L 81.434921 13.23917 L 81.434921 7.982111 L 75.174606 7.982111 L 75.174606 13.23917 L 71.843803 13.23917 L 71.843803 18.054796 L 75.174606 18.054796 L 75.174606 26.923573 C 75.174606 32.060242 78.144241 34.668705 83.240784 34.668705 C 85.167038 34.668705 87.053154 34.227272 88.337318 33.304276 Z M 58.360046 12.436565 C 54.908852 12.436565 51.417519 13.35956 49.049839 15.045029 L 51.297131 19.419222 C 52.862209 18.175186 55.229889 17.412712 57.517315 17.412712 C 60.888252 17.412712 62.493458 18.977791 62.493458 21.666515 L 57.517315 21.666515 C 50.935955 21.666515 48.247231 24.315109 48.247231 28.12748 C 48.247231 31.859589 51.257 34.668705 56.313404 34.668705 C 59.483692 34.668705 61.730988 33.62532 62.894764 31.658937 L 62.894764 34.347664 L 68.753777 34.347664 L 68.753777 22.027687 C 68.753777 15.486462 64.941406 12.436565 58.360046 12.436565 Z M 57.878487 30.455032 C 55.671322 30.455032 54.347027 29.411646 54.347027 27.846567 C 54.347027 26.401878 55.270023 25.318363 58.199528 25.318363 L 62.493458 25.318363 L 62.493458 27.525526 C 61.771114 29.491905 59.965256 30.455032 57.878487 30.455032 Z M 35.325306 26.161098 L 28.904469 6.256512 L 22.884935 6.256512 L 16.263451 26.000576 L 9.922876 6.256512 L 3.181 6.256512 L 12.41095 34.347664 L 19.353476 34.347664 L 25.734182 15.325941 L 31.914236 34.347664 L 38.896893 34.347664 L 48.086712 6.256512 L 41.866528 6.256512 Z"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/branding/content/jar.mn b/waterfox/browser/branding/content/jar.mn
new file mode 100644
index 0000000000000..22ce3eadb3838
--- /dev/null
+++ b/waterfox/browser/branding/content/jar.mn
@@ -0,0 +1,22 @@
+# 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/.
+
+browser.jar:
+% content branding %content/branding/ contentaccessible=yes
+  content/branding/about.png
+  content/branding/about-logo.png
+  content/branding/about-logo.svg
+  content/branding/about-logo@2x.png
+  content/branding/about-logo-private.png
+  content/branding/about-logo-private@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/background.svg
+  content/branding/document.ico                  (../document.ico)
+  content/branding/firefox-wordmark.svg
+  content/branding/icon16.png                    (../default16.png)
+  content/branding/icon32.png                    (../default32.png)
+  content/branding/icon48.png                    (../default48.png)
+  content/branding/icon64.png                    (../default64.png)
+  content/branding/icon128.png                   (../default128.png)
+  content/branding/aboutDialog.css
diff --git a/waterfox/browser/branding/content/moz.build b/waterfox/browser/branding/content/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/branding/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/branding/default128.png b/waterfox/browser/branding/default128.png
new file mode 100644
index 0000000000000..81ae6d662b0fc
Binary files /dev/null and b/waterfox/browser/branding/default128.png differ
diff --git a/waterfox/browser/branding/default16.png b/waterfox/browser/branding/default16.png
new file mode 100644
index 0000000000000..4587920513f32
Binary files /dev/null and b/waterfox/browser/branding/default16.png differ
diff --git a/waterfox/browser/branding/default22.png b/waterfox/browser/branding/default22.png
new file mode 100644
index 0000000000000..d1ea4e55ea683
Binary files /dev/null and b/waterfox/browser/branding/default22.png differ
diff --git a/waterfox/browser/branding/default24.png b/waterfox/browser/branding/default24.png
new file mode 100644
index 0000000000000..a81087cb34ae5
Binary files /dev/null and b/waterfox/browser/branding/default24.png differ
diff --git a/waterfox/browser/branding/default256.png b/waterfox/browser/branding/default256.png
new file mode 100644
index 0000000000000..0494a311f0cc9
Binary files /dev/null and b/waterfox/browser/branding/default256.png differ
diff --git a/waterfox/browser/branding/default32.png b/waterfox/browser/branding/default32.png
new file mode 100644
index 0000000000000..ee57c61dacfd0
Binary files /dev/null and b/waterfox/browser/branding/default32.png differ
diff --git a/waterfox/browser/branding/default48.png b/waterfox/browser/branding/default48.png
new file mode 100644
index 0000000000000..78043b1148450
Binary files /dev/null and b/waterfox/browser/branding/default48.png differ
diff --git a/waterfox/browser/branding/default64.png b/waterfox/browser/branding/default64.png
new file mode 100644
index 0000000000000..d22c386a175ce
Binary files /dev/null and b/waterfox/browser/branding/default64.png differ
diff --git a/waterfox/browser/branding/disk.icns b/waterfox/browser/branding/disk.icns
new file mode 100644
index 0000000000000..c27dbfca00e40
Binary files /dev/null and b/waterfox/browser/branding/disk.icns differ
diff --git a/waterfox/browser/branding/document.icns b/waterfox/browser/branding/document.icns
new file mode 100644
index 0000000000000..3ce862865f01b
Binary files /dev/null and b/waterfox/browser/branding/document.icns differ
diff --git a/waterfox/browser/branding/document.ico b/waterfox/browser/branding/document.ico
new file mode 100644
index 0000000000000..49da579d40ec4
Binary files /dev/null and b/waterfox/browser/branding/document.ico differ
diff --git a/waterfox/browser/branding/document_pdf.ico b/waterfox/browser/branding/document_pdf.ico
new file mode 100644
index 0000000000000..1349047701865
Binary files /dev/null and b/waterfox/browser/branding/document_pdf.ico differ
diff --git a/waterfox/browser/branding/dsstore b/waterfox/browser/branding/dsstore
new file mode 100644
index 0000000000000..8ea7036745666
Binary files /dev/null and b/waterfox/browser/branding/dsstore differ
diff --git a/waterfox/browser/branding/firefox.VisualElementsManifest.xml b/waterfox/browser/branding/firefox.VisualElementsManifest.xml
new file mode 100644
index 0000000000000..85e09dd7a910f
--- /dev/null
+++ b/waterfox/browser/branding/firefox.VisualElementsManifest.xml
@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
+      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#20123a'/>
+</Application>
diff --git a/waterfox/browser/branding/firefox.icns b/waterfox/browser/branding/firefox.icns
new file mode 100644
index 0000000000000..236ac0d7c81d9
Binary files /dev/null and b/waterfox/browser/branding/firefox.icns differ
diff --git a/waterfox/browser/branding/firefox.ico b/waterfox/browser/branding/firefox.ico
new file mode 100644
index 0000000000000..2a037f1c7db4d
Binary files /dev/null and b/waterfox/browser/branding/firefox.ico differ
diff --git a/waterfox/browser/branding/firefox64.ico b/waterfox/browser/branding/firefox64.ico
new file mode 100644
index 0000000000000..2a037f1c7db4d
Binary files /dev/null and b/waterfox/browser/branding/firefox64.ico differ
diff --git a/waterfox/browser/branding/license.txt b/waterfox/browser/branding/license.txt
new file mode 100644
index 0000000000000..14e2f777f6c39
--- /dev/null
+++ b/waterfox/browser/branding/license.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/waterfox/browser/branding/locales/en-US/brand.ftl b/waterfox/browser/branding/locales/en-US/brand.ftl
new file mode 100644
index 0000000000000..8e9b01133a014
--- /dev/null
+++ b/waterfox/browser/branding/locales/en-US/brand.ftl
@@ -0,0 +1,27 @@
+# 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/.
+
+## Firefox and Mozilla Brand
+##
+## Firefox and Mozilla must be treated as a brand.
+##
+## They cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
+
+-brand-shorter-name = Waterfox
+-brand-short-name = Waterfox
+-brand-shortcut-name = Waterfox
+-brand-full-name = Waterfox
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Waterfox
+-vendor-short-name = BrowserWorks
+trademarkInfo = Waterfox and the Waterfox logos are trademarks of BrowserWorks.
diff --git a/waterfox/browser/branding/locales/en-US/brand.properties b/waterfox/browser/branding/locales/en-US/brand.properties
new file mode 100644
index 0000000000000..801900a9577f0
--- /dev/null
+++ b/waterfox/browser/branding/locales/en-US/brand.properties
@@ -0,0 +1,7 @@
+# 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/.
+
+brandShorterName=Waterfox
+brandShortName=Waterfox
+brandFullName=Waterfox
diff --git a/waterfox/browser/branding/locales/jar.mn b/waterfox/browser/branding/locales/jar.mn
new file mode 100644
index 0000000000000..2250233dd6245
--- /dev/null
+++ b/waterfox/browser/branding/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# 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/.
+
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.properties (%brand.properties)
diff --git a/waterfox/browser/branding/locales/moz.build b/waterfox/browser/branding/locales/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/branding/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/branding/moz.build b/waterfox/browser/branding/moz.build
new file mode 100644
index 0000000000000..9aaf458602b93
--- /dev/null
+++ b/waterfox/browser/branding/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DIRS += ["content", "locales"]
+
+DIST_SUBDIR = "browser"
+export("DIST_SUBDIR")
+
+include("branding-common.mozbuild")
+Branding()
diff --git a/waterfox/browser/branding/msix/Assets/Document44x44.png b/waterfox/browser/branding/msix/Assets/Document44x44.png
new file mode 100644
index 0000000000000..6b4855a22d2cb
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Document44x44.png differ
diff --git a/waterfox/browser/branding/msix/Assets/LargeTile.scale-200.png b/waterfox/browser/branding/msix/Assets/LargeTile.scale-200.png
new file mode 100644
index 0000000000000..c0183be2d94a1
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/LargeTile.scale-200.png differ
diff --git a/waterfox/browser/branding/msix/Assets/SmallTile.scale-200.png b/waterfox/browser/branding/msix/Assets/SmallTile.scale-200.png
new file mode 100644
index 0000000000000..8130df5fa0490
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/SmallTile.scale-200.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Square150x150Logo.scale-200.png b/waterfox/browser/branding/msix/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000..2201a29f8a527
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Square150x150Logo.scale-200.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 0000000000000..34782f67ad4bd
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 0000000000000..34782f67ad4bd
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Square44x44Logo.scale-200.png b/waterfox/browser/branding/msix/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000..c1c040fbd2d3a
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Square44x44Logo.scale-200.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Square44x44Logo.targetsize-256.png b/waterfox/browser/branding/msix/Assets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 0000000000000..2e0c0ba0356c4
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/waterfox/browser/branding/msix/Assets/StoreLogo.scale-200.png b/waterfox/browser/branding/msix/Assets/StoreLogo.scale-200.png
new file mode 100644
index 0000000000000..c398bbf5b2c3b
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/StoreLogo.scale-200.png differ
diff --git a/waterfox/browser/branding/msix/Assets/Wide310x150Logo.scale-200.png b/waterfox/browser/branding/msix/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000..2759c2989ba62
Binary files /dev/null and b/waterfox/browser/branding/msix/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/waterfox/browser/branding/newtab.ico b/waterfox/browser/branding/newtab.ico
new file mode 100644
index 0000000000000..a9b37c08c6e18
Binary files /dev/null and b/waterfox/browser/branding/newtab.ico differ
diff --git a/waterfox/browser/branding/newwindow.ico b/waterfox/browser/branding/newwindow.ico
new file mode 100644
index 0000000000000..55372077102c4
Binary files /dev/null and b/waterfox/browser/branding/newwindow.ico differ
diff --git a/waterfox/browser/branding/pbmode.ico b/waterfox/browser/branding/pbmode.ico
new file mode 100644
index 0000000000000..9d77ca2eddbfd
Binary files /dev/null and b/waterfox/browser/branding/pbmode.ico differ
diff --git a/waterfox/browser/branding/pref/firefox-branding.js b/waterfox/browser/branding/pref/firefox-branding.js
new file mode 100644
index 0000000000000..e5e9e12b5b621
--- /dev/null
+++ b/waterfox/browser/branding/pref/firefox-branding.js
@@ -0,0 +1,50 @@
+/* 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/. */
+
+// This file contains branding-specific prefs.
+
+pref(
+  "startup.homepage_override_url",
+  "https://www.waterfox.com/releases/%DISPLAY_VERSION%/?update"
+);
+pref("startup.homepage_welcome_url", "about:welcome");
+pref(
+  "startup.homepage_welcome_url.additional",
+  "https://www.waterfox.com/releases/%DISPLAY_VERSION%/?new"
+);
+// Interval: Time between checks for a new version (in seconds)
+pref("app.update.interval", 43200); // 12 hours
+// Give the user x seconds to react before showing the big UI. default=192 hours
+pref("app.update.promptWaitTime", 691200);
+// app.update.url.manual: URL user can browse to manually if for some reason
+// all update installation attempts fail.
+// app.update.url.details: a default value for the "More information about this
+// update" link supplied in the "An update is available" page of the update
+// wizard.
+pref(
+  "app.update.url.manual",
+  "https://www.waterfox.com/download/?reason=manual-update"
+);
+pref("app.update.url.details", "https://www.waterfox.com/releases/");
+pref(
+  "app.releaseNotesURL",
+  "https://www.waterfox.com/releases/%DISPLAY_VERSION%/?utm_source=waterfox-browser&utm_medium=waterfox-browser&utm_campaign=whatsnew"
+);
+pref(
+  "app.releaseNotesURL.aboutDialog",
+  "https://www.waterfox.com/releases/%DISPLAY_VERSION%/?utm_source=waterfox-browser&utm_medium=waterfox-desktop&utm_campaign=about-dialog"
+);
+
+// The number of days a binary is permitted to be old
+// without checking for an update.  This assumes that
+// app.update.checkInstallTime is true.
+pref("app.update.checkInstallTime.days", 2);
+
+// Give the user x seconds to reboot before showing a badge on the hamburger
+// button. default=immediately
+pref("app.update.badgeWaitTime", 0);
+
+// Number of usages of the web console.
+// If this is less than 5, then pasting code into the web console is disabled
+pref("devtools.selfxss.count", 0);
diff --git a/waterfox/browser/branding/private_browsing.VisualElementsManifest.xml b/waterfox/browser/branding/private_browsing.VisualElementsManifest.xml
new file mode 100644
index 0000000000000..fdff8c55ffe3b
--- /dev/null
+++ b/waterfox/browser/branding/private_browsing.VisualElementsManifest.xml
@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
+      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
+      ForegroundText='light'
+      BackgroundColor='#14171a'/>
+</Application>
diff --git a/waterfox/browser/branding/stubinstaller/bgstub.jpg b/waterfox/browser/branding/stubinstaller/bgstub.jpg
new file mode 100644
index 0000000000000..c10915e17c1d7
Binary files /dev/null and b/waterfox/browser/branding/stubinstaller/bgstub.jpg differ
diff --git a/waterfox/browser/branding/stubinstaller/installing_page.css b/waterfox/browser/branding/stubinstaller/installing_page.css
new file mode 100644
index 0000000000000..34c8fb64e7d83
--- /dev/null
+++ b/waterfox/browser/branding/stubinstaller/installing_page.css
@@ -0,0 +1,87 @@
+/* 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/. */
+
+body {
+  color: white;
+}
+
+/*
+ * We want to treat the two pieces of text in the left column as one unit and
+   center that unit vertically in the window. In order to make IE8 do that,
+   we have to wrap the two bits of text in a container and make that a
+   table-cell (which means we need an outer container that's display: table).
+   So that's what this mess is doing.
+ */
+#text_column {
+  position: fixed;
+  height: 100%;
+  margin-left: 30px;
+  width: 40%;
+  display: table;
+}
+
+#text_column_container {
+  display: table-cell;
+  vertical-align: middle;
+  padding-top: 60px;
+}
+
+#header {
+  font-size: 24px;
+  font-weight: 800;
+  margin-top: 0;
+}
+
+#content {
+  font-size: 22px;
+}
+
+#installing {
+  position: fixed;
+  right: 30px;
+  bottom: 55%;
+  margin-top: auto;
+  margin-bottom: auto;
+  width: 35%;
+}
+
+#label {
+  color: white;
+
+  position: relative;
+  top: 50px;
+
+  text-align: center;
+  font-size: 20px;
+}
+
+#progress_background {
+  width: 100%;
+  height: 20px;
+  background-color: white;
+}
+
+body.high-contrast #progress_background {
+  outline: solid;
+}
+
+#progress_bar {
+  margin: 0;
+  width: 0%;
+  height: 100%;
+  background-color: #00aaff;
+}
+
+/* In high contrast mode, fill the entire progress bar with its border. */
+body.high-contrast #progress_bar {
+  /* This border should be the height of progress_background. */
+  border-top: 20px solid;
+  box-sizing: border-box;
+}
+
+/* No blurb or footer for this layout. */
+#blurb,
+#footer {
+  visibility: hidden;
+}
diff --git a/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css b/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css
new file mode 100644
index 0000000000000..5754016600da8
--- /dev/null
+++ b/waterfox/browser/branding/stubinstaller/profile_cleanup_page.css
@@ -0,0 +1,75 @@
+/* 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/. */
+
+body {
+  color: white;
+}
+
+/*
+ * We want to treat the two pieces of text in the left column as one unit and
+   center that unit vertically in the window. In order to make IE8 do that,
+   we have to wrap the two bits of text in a container and make that a
+   table-cell (which means we need an outer container that's display: table).
+   So that's what this mess is doing.
+ */
+#profileRefreshForm {
+  position: fixed;
+  height: 100%;
+  margin-left: 30px;
+  width: 40%;
+  display: table;
+}
+
+#profileRefreshContainer {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+#refreshCheckboxContainer,
+#refreshButtonContainer {
+  margin-top: 20px;
+}
+
+#header {
+  font-size: 25px;
+  font-weight: 600;
+}
+
+#refreshCheckboxContainer {
+  position: relative;
+}
+
+#refreshCheckbox {
+  position: absolute;
+  top: 1px;
+}
+
+#checkboxLabel {
+  font-size: 14px;
+  display: block;
+}
+
+.checkboxLabel-ltr {
+  margin-left: 25px;
+}
+
+.checkboxLabel-rtl {
+  margin-right: 25px;
+}
+
+#refreshButton {
+  padding: 8px 70px;
+  font-size: 16px;
+  background: #005ccc;
+  color: white;
+}
+
+body.normal-contrast #refreshButton {
+  border: none;
+}
+
+/* No footer for this layout. */
+#footer {
+  visibility: hidden;
+}
diff --git a/waterfox/browser/branding/wizHeader.bmp b/waterfox/browser/branding/wizHeader.bmp
new file mode 100644
index 0000000000000..2a7505c7a4a53
Binary files /dev/null and b/waterfox/browser/branding/wizHeader.bmp differ
diff --git a/waterfox/browser/branding/wizHeaderRTL.bmp b/waterfox/browser/branding/wizHeaderRTL.bmp
new file mode 100644
index 0000000000000..bf19fd45a0d12
Binary files /dev/null and b/waterfox/browser/branding/wizHeaderRTL.bmp differ
diff --git a/waterfox/browser/branding/wizWatermark.bmp b/waterfox/browser/branding/wizWatermark.bmp
new file mode 100644
index 0000000000000..763314b91deeb
Binary files /dev/null and b/waterfox/browser/branding/wizWatermark.bmp differ
diff --git a/waterfox/browser/components/WaterfoxGlue.sys.mjs b/waterfox/browser/components/WaterfoxGlue.sys.mjs
new file mode 100644
index 0000000000000..96614d79f11fa
--- /dev/null
+++ b/waterfox/browser/components/WaterfoxGlue.sys.mjs
@@ -0,0 +1,483 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutPages: "resource:///modules/AboutPages.sys.mjs",
+  AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
+  BrowserUtils: "resource:///modules/BrowserUtils.sys.mjs",
+  ChromeManifest: "resource:///modules/ChromeManifest.sys.mjs",
+  Overlays: "resource:///modules/Overlays.sys.mjs",
+  PrefUtils: "resource:///modules/PrefUtils.sys.mjs",
+  PrivateTab: "resource:///modules/PrivateTab.sys.mjs",
+  StatusBar: "resource:///modules/StatusBar.sys.mjs",
+  TabFeatures: "resource:///modules/TabFeatures.sys.mjs",
+  TabGrouping: "resource:///modules/TabGrouping.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  UICustomizations: "resource:///modules/UICustomizations.sys.mjs",
+  SidebarPreferencesHandler: "resource:///modules/SidebarPreferencesHandler.sys.mjs",
+});
+
+const WATERFOX_CUSTOMIZATIONS_PREF =
+  "browser.theme.enableWaterfoxCustomizations";
+
+const WATERFOX_DEFAULT_THEMES = [
+  "default-theme@mozilla.org",
+  "firefox-compact-light@mozilla.org",
+  "firefox-compact-dark@mozilla.org",
+  "firefox-alpenglow@mozilla.org",
+];
+
+const WATERFOX_USERCHROME = "chrome://browser/skin/userChrome.css";
+const WATERFOX_USERCONTENT = "chrome://browser/skin/userContent.css";
+
+export const WaterfoxGlue = {
+  _addonManagersListeners: [],
+  stylesEnabled: false,
+
+  async init() {
+    // Set pref observers
+    this._setPrefObservers();
+
+    // Load always-on Waterfox custom CSS.
+    lazy.BrowserUtils.registerStylesheet(
+      "chrome://browser/skin/waterfox/general.css"
+    );
+
+    // Maybe load Waterfox stylesheets
+    (async () => {
+      let amInitialized = false;
+      while (!amInitialized) {
+        try {
+          const activeThemeId = await this.getActiveThemeId();
+          this.updateCustomStylesheets({ id: activeThemeId, type: "theme" });
+          amInitialized = true;
+        } catch (ex) {
+          await new Promise((res) => lazy.setTimeout(res, 500, {}));
+        }
+      }
+    })();
+
+    // Parse chrome.manifest
+    this.startupManifest = await this.getChromeManifest("startup");
+    this.privateManifest = await this.getChromeManifest("private");
+
+    // Initialize sidebar prefs handler early so it can observe pane loads
+    lazy.SidebarPreferencesHandler.init();
+
+    // Observe chrome-document-loaded topic to detect window open
+    Services.obs.addObserver(this, "chrome-document-loaded");
+    // Observe main-pane-loaded topic to detect about:preferences open
+    Services.obs.addObserver(this, "main-pane-loaded");
+    // Observe final-ui-startup to launch browser window dependant tasks
+    Services.obs.addObserver(this, "final-ui-startup");
+    // Observe browser shutdown
+    Services.obs.addObserver(this, "quit-application-granted");
+    // Listen for addon events
+    this.addAddonListener();
+
+    // Register about:cfg
+    lazy.AboutPages.init();
+    // Initialize automatic tab grouping
+    lazy.TabGrouping.init();
+  },
+
+  async _setPrefObservers() {
+    this.leptonListener = lazy.PrefUtils.addObserver(
+      WATERFOX_CUSTOMIZATIONS_PREF,
+      async (_) => {
+        const activeThemeId = await this.getActiveThemeId();
+        this.updateCustomStylesheets({ id: activeThemeId, type: "theme" });
+      }
+    );
+    this.pinnedTabListener = lazy.PrefUtils.addObserver(
+      "browser.tabs.pinnedIconOnly",
+      (isEnabled) => {
+        // Pref being true actually means we need to unload the sheet, so invert.
+        const uri = "chrome://browser/content/tabfeatures/pinnedtab.css";
+        lazy.BrowserUtils.registerOrUnregisterSheet(uri, !isEnabled);
+      }
+    );
+    this.styleSheetChanges = lazy.PrefUtils.addObserver(
+      "browser.tabs.closeButtons",
+      () => {
+        // Pref being true actually means we need to unload the sheet, so invert.
+        const uri = "chrome://browser/skin/waterfox/general.css";
+        lazy.BrowserUtils.unregisterStylesheet(uri);
+        lazy.BrowserUtils.registerStylesheet(uri);
+      }
+    );
+  },
+
+  async getChromeManifest(manifest) {
+    let uri;
+    let privateWindow = false;
+    switch (manifest) {
+      case "startup":
+        uri = "resource://waterfox/overlays/chrome.overlay";
+        break;
+      case "private":
+        uri = "resource://waterfox/overlays/chrome.overlay";
+        privateWindow = true;
+        break;
+      case "preferences-general":
+        uri = "resource://waterfox/overlays/preferences-general.overlay";
+        break;
+      case "preferences-other":
+        uri = "resource://waterfox/overlays/preferences-other.overlay";
+        break;
+    }
+    const chromeManifest = new lazy.ChromeManifest(async () => {
+      const res = await fetch(uri);
+      let text = await res.text();
+      if (privateWindow) {
+        const tArr = text.split("\n");
+        const indexPrivate = tArr.findIndex((overlay) =>
+          overlay.includes("private")
+        );
+        tArr.splice(indexPrivate, 1);
+        text = tArr.join("\n");
+      }
+      return text;
+    }, this.options);
+    await chromeManifest.parse();
+    return chromeManifest;
+  },
+
+  options: {
+    application: Services.appinfo.ID,
+    appversion: Services.appinfo.version,
+    platformversion: Services.appinfo.platformVersion,
+    os: Services.appinfo.OS,
+    osversion: Services.sysinfo.getProperty("version"),
+    abi: Services.appinfo.XPCOMABI,
+  },
+
+  async observe(subject, topic, data) {
+    switch (topic) {
+      case "chrome-document-loaded":
+        // Only load overlays in new browser windows
+        // baseURI for about:blank is also browser.xhtml, so use URL
+        if (subject.URL.includes("browser.xhtml")) {
+          const window = subject.defaultView;
+          // Do not load non-private overlays in private window
+          if (window.PrivateBrowsingUtils.isWindowPrivate(window)) {
+            lazy.Overlays.load(this.privateManifest, window);
+          } else {
+            lazy.Overlays.load(this.startupManifest, window);
+            // Only load in non-private browser windows
+            lazy.PrivateTab.init(window);
+          }
+
+          lazy.StatusBar.init(window);
+          // Load in all browser windows (private and normal)
+          lazy.TabFeatures.init(window);
+          lazy.UICustomizations.init(window);
+
+          // Attach userChrome.css to this chrome window if styles are enabled
+          if (this.stylesEnabled) {
+            try {
+              window.windowUtils.loadSheetUsingURIString(
+                WATERFOX_USERCHROME,
+                Ci.nsIStyleSheetService.USER_SHEET
+              );
+            } catch (_e) {}
+          }
+        }
+        break;
+      case "main-pane-loaded":
+        // Subject is preferences page content window
+        if (!subject.initialized) {
+          // If we are not loading directly on privacy, we need to wait until permissionsGroup
+          // exists before we attempt to load our overlay. If we are loading directly on privacy
+          // this exists before overlaying occurs, so we have no issues. Loading overlays on
+          // #general is fine regardless of which pane we refresh/initially load.
+          await lazy.Overlays.load(
+            await this.getChromeManifest("preferences-general"),
+            subject
+          );
+          if (
+            !subject.document.getElementById("permissionsGroup") &&
+            !subject.document.getElementById("homeContentsGroup")
+          ) {
+            subject.setTimeout(async () => {
+              await lazy.Overlays.load(
+                await this.getChromeManifest("preferences-other"),
+                subject
+              );
+              subject.privacyInitialized = true;
+            }, 500);
+          } else {
+            await lazy.Overlays.load(
+              await this.getChromeManifest("preferences-other"),
+              subject
+            );
+            subject.privacyInitialized = true;
+          }
+          subject.initialized = true;
+        }
+        break;
+      case "final-ui-startup":
+        this._beforeUIStartup();
+        this._delayedTasks();
+        break;
+      case "quit-application-granted":
+        this.shutdown();
+        break;
+    }
+  },
+
+  async _beforeUIStartup() {
+    this._migrateUI();
+
+    lazy.AddonManager.maybeInstallBuiltinAddon(
+      "addonstores@waterfox.net",
+      "1.0.0",
+      "resource://builtin-addons/addonstores/"
+    );
+  },
+
+  async _migrateUI() {
+    const currentUIVersion = Services.prefs.getIntPref(
+      "browser.migration.version",
+      128
+    );
+    const waterfoxUIVersion = 2;
+
+    if (
+      !Services.prefs.prefHasUserValue("browser.migration.waterfox_version")
+    ) {
+      // This is a new profile, nothing to migrate.
+      Services.prefs.setIntPref(
+        "browser.migration.waterfox_version",
+        waterfoxUIVersion
+      );
+      return;
+    }
+
+    async function enableTheme(id) {
+      const addon = await lazy.AddonManager.getAddonByID(id);
+      // If we found it, enable it.
+      addon?.enable();
+    }
+
+    if (currentUIVersion < 128) {
+      // Ensure the theme id is set correctly for G5
+      const DEFAULT_THEME = "default-theme@mozilla.org";
+      const themes = await AddonManager.getAddonsByTypes(["theme"]);
+      const activeTheme = themes.find((addon) => addon.isActive);
+      if (activeTheme) {
+        const themeId = activeTheme.id;
+        switch (themeId) {
+          case "lepton@waterfox.net":
+            enableTheme("default-theme@mozilla.org");
+            break;
+          case "australis-light@waterfox.net":
+            enableTheme("firefox-compact-light@mozilla.org");
+            break;
+          case "australis-dark@waterfox.net":
+            enableTheme("firefox-compact-dark@mozilla.org");
+            break;
+        }
+      } else {
+        // If no activeTheme detected, set default.
+        enableTheme(DEFAULT_THEME);
+      }
+    }
+    if (waterfoxUIVersion < 1) {
+      const themeEnablePref = "userChrome.theme.enable";
+      const enabled = lazy.PrefUtils.get(themeEnablePref);
+      lazy.PrefUtils.set(WATERFOX_CUSTOMIZATIONS_PREF, enabled ? 1 : 2);
+    }
+
+    if (waterfoxUIVersion < 2) {
+      // Migrate Windows Registry values
+      if ("@mozilla.org/windows-registry-key;1" in Components.classes) {
+        const regKey = Components.classes[
+          "@mozilla.org/windows-registry-key;1"
+        ].createInstance(Components.interfaces.nsIWindowsRegKey);
+
+        // Function to copy registry keys recursively
+        const copyRegistryKeys = (fromRoot, toRoot, path) => {
+          try {
+            regKey.open(fromRoot, path, regKey.ACCESS_READ);
+            const newKey = regKey.createChild(toRoot, path, regKey.ACCESS_ALL);
+
+            // Copy values
+            for (let i = 0; i < regKey.valueCount; i++) {
+              const name = regKey.getValueName(i);
+              const type = regKey.getValueType(name);
+
+              switch (type) {
+                case regKey.TYPE_STRING:
+                  newKey.writeStringValue(name, regKey.readStringValue(name));
+                  break;
+                case regKey.TYPE_BINARY:
+                  newKey.writeBinaryValue(name, regKey.readBinaryValue(name));
+                  break;
+                case regKey.TYPE_INT:
+                  newKey.writeIntValue(name, regKey.readIntValue(name));
+                  break;
+                case regKey.TYPE_INT64:
+                  newKey.writeInt64Value(name, regKey.readInt64Value(name));
+                  break;
+              }
+            }
+
+            // Recursively copy subkeys
+            for (let i = 0; i < regKey.childCount; i++) {
+              const childName = regKey.getChildName(i);
+              copyRegistryKeys(fromRoot, toRoot, `${path}\\${childName}`);
+            }
+
+            newKey.close();
+          } catch (e) {
+            Console.warn("Error copying registry key:", e);
+          } finally {
+            regKey.close();
+          }
+        };
+
+        // Copy from HKLM
+        copyRegistryKeys(
+          regKey.ROOT_KEY_LOCAL_MACHINE,
+          regKey.ROOT_KEY_LOCAL_MACHINE,
+          "SOFTWARE\\WaterfoxLimited",
+          "SOFTWARE\\BrowserWorks"
+        );
+        copyRegistryKeys(
+          regKey.ROOT_KEY_LOCAL_MACHINE,
+          regKey.ROOT_KEY_LOCAL_MACHINE,
+          "Software\\WaterfoxLimited",
+          "Software\\BrowserWorks"
+        );
+
+        // Copy from HKCU
+        copyRegistryKeys(
+          regKey.ROOT_KEY_CURRENT_USER,
+          regKey.ROOT_KEY_CURRENT_USER,
+          "SOFTWARE\\WaterfoxLimited",
+          "SOFTWARE\\BrowserWorks"
+        );
+        copyRegistryKeys(
+          regKey.ROOT_KEY_CURRENT_USER,
+          regKey.ROOT_KEY_CURRENT_USER,
+          "Software\\WaterfoxLimited",
+          "Software\\BrowserWorks"
+        );
+      }
+    }
+
+    lazy.PrefUtils.set("browser.migration.waterfox_version", 2);
+  },
+
+  async _delayedTasks() {
+    const tasks = [
+      {
+        task: () => {
+          // Reset prefs
+          Services.prefs.clearUserPref(
+            "startup.homepage_welcome_url.additional"
+          );
+          Services.prefs.clearUserPref("startup.homepage_override_url");
+        },
+      },
+    ];
+
+    for (const task of tasks) {
+      task.task();
+    }
+  },
+
+  async getActiveThemeId() {
+    // Try to get active theme from the pref
+    const activeThemeID = lazy.PrefUtils.get("extensions.activeThemeID", "");
+    if (activeThemeID) {
+      return activeThemeID;
+    }
+    // Otherwise just grab it from AddonManager
+    const themes = await lazy.AddonManager.getAddonsByTypes(["theme"]);
+    return themes.find((addon) => addon.isActive).id;
+  },
+
+  addAddonListener() {
+    const listener = {
+      onInstalled: (addon) => this.updateCustomStylesheets(addon),
+      onEnabled: (addon) => this.updateCustomStylesheets(addon),
+    };
+    this._addonManagersListeners.push(listener);
+    lazy.AddonManager.addAddonListener(listener);
+  },
+
+  removeAddonListeners() {
+    for (const listener of this._addonManagersListeners) {
+      lazy.AddonManager.removeAddonListener(listener);
+    }
+  },
+
+  shutdown() {
+    // Shutdown TabGrouping
+    lazy.TabGrouping.shutdown();
+  },
+
+  updateCustomStylesheets(addon) {
+    if (addon.type === "theme") {
+      // If any theme and WF on any theme, reload stylesheets for every theme enable.
+      // If WF theme and WF customisations, then reload stylesheets.
+      // If no customizations, unregister sheets for every theme enable.
+      if (
+        lazy.PrefUtils.get(WATERFOX_CUSTOMIZATIONS_PREF, 0) === 0 ||
+        (lazy.PrefUtils.get(WATERFOX_CUSTOMIZATIONS_PREF, 0) === 1 &&
+          WATERFOX_DEFAULT_THEMES.includes(addon.id))
+      ) {
+        this.loadWaterfoxStylesheets();
+      } else {
+        this.unloadWaterfoxStylesheets();
+      }
+    }
+  },
+
+  // Attach userChrome.css to all open browser windows (per-window).
+  attachUserChromeToAllWindows() {
+    lazy.BrowserUtils.executeInAllWindows((win, uri) => {
+      try {
+        win.windowUtils.loadSheetUsingURIString(
+          uri,
+          Ci.nsIStyleSheetService.USER_SHEET
+        );
+      } catch (_e) {}
+    }, WATERFOX_USERCHROME);
+  },
+
+  // Detach userChrome.css from all open browser windows.
+  detachUserChromeFromAllWindows() {
+    lazy.BrowserUtils.executeInAllWindows((win, uri) => {
+      try {
+        win.windowUtils.removeSheetUsingURIString(
+          uri,
+          Ci.nsIStyleSheetService.USER_SHEET
+        );
+      } catch (_e) {}
+    }, WATERFOX_USERCHROME);
+  },
+
+  loadWaterfoxStylesheets() {
+    // Register content sheet globally
+    lazy.BrowserUtils.registerStylesheet(WATERFOX_USERCONTENT);
+    // Attach chrome sheet to all current browser windows
+    this.attachUserChromeToAllWindows();
+    // Track enabled state so new windows can attach on open
+    this.stylesEnabled = true;
+  },
+
+  unloadWaterfoxStylesheets() {
+    // Detach chrome sheet from all windows
+    this.detachUserChromeFromAllWindows();
+    // Unregister content sheet globally
+    lazy.BrowserUtils.unregisterStylesheet(WATERFOX_USERCONTENT);
+    // Track disabled state so new windows don't attach on open
+    this.stylesEnabled = false;
+  },
+};
diff --git a/waterfox/browser/components/aboutcfg/aboutcfg.css b/waterfox/browser/components/aboutcfg/aboutcfg.css
new file mode 100644
index 0000000000000..89a5e62b7f34c
--- /dev/null
+++ b/waterfox/browser/components/aboutcfg/aboutcfg.css
@@ -0,0 +1,63 @@
+/* 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/. */
+
+#warningScreen {
+  font-size: 15px;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-inline-start: calc(48px + 4.6em);
+  padding-inline-end: 48px;
+}
+
+.title {
+  background-image: url("chrome://global/skin/icons/warning.svg");
+  fill: #fcd100;
+}
+
+#warningTitle {
+  font-weight: lighter;
+  line-height: 1.2;
+  margin: 0;
+  margin-bottom: 0.5em;
+}
+
+#warningText {
+  margin: 1em 0;
+}
+
+#warningButton {
+  margin-top: 0.6em;
+}
+
+#filterRow {
+  margin-top: 4px;
+  margin-inline-start: 4px;
+}
+
+#configTree {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+
+#configTreeBody::-moz-tree-cell-text(user) {
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked) {
+  font-style: italic;
+}
+
+#prefCol,
+#valueCol {
+  width: 40%;
+}
+
+#lockCol,
+#typeCol {
+  width: 70px;
+}
+
+.deck-selected {
+  max-width: 100vw;
+}
diff --git a/waterfox/browser/components/aboutcfg/aboutcfg.js b/waterfox/browser/components/aboutcfg/aboutcfg.js
new file mode 100644
index 0000000000000..19700bc529358
--- /dev/null
+++ b/waterfox/browser/components/aboutcfg/aboutcfg.js
@@ -0,0 +1,783 @@
+/* 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/. */
+
+const nsIPrefLocalizedString = Ci.nsIPrefLocalizedString;
+const _nsISupportsString = Ci.nsISupportsString;
+const nsIPrefBranch = Ci.nsIPrefBranch;
+const nsIClipboardHelper = Ci.nsIClipboardHelper;
+
+const nsClipboardHelper_CONTRACTID = "@mozilla.org/widget/clipboardhelper;1";
+
+const gPrefBranch = Services.prefs;
+const gClipboardHelper =
+  Cc[nsClipboardHelper_CONTRACTID].getService(nsIClipboardHelper);
+
+const gLockProps = ["default", "user", "locked"];
+// we get these from a string bundle
+const gLockStrs = [];
+const gTypeStrs = [];
+
+const PREF_IS_DEFAULT_VALUE = 0;
+const PREF_IS_MODIFIED = 1;
+const PREF_IS_LOCKED = 2;
+
+const gPrefHash = {};
+const gPrefArray = [];
+let gPrefView = gPrefArray; // share the JS array
+let gSortedColumn = "prefCol";
+let gSortFunction = null;
+let gSortDirection = 1; // 1 is ascending; -1 is descending
+let gFilter = null;
+
+const view = {
+  get rowCount() {
+    return gPrefView.length;
+  },
+  getCellText(index, col) {
+    if (!(index in gPrefView)) {
+      return "";
+    }
+
+    const value = gPrefView[index][col.id];
+
+    switch (col.id) {
+      case "lockCol":
+        return gLockStrs[value];
+      case "typeCol":
+        return gTypeStrs[value];
+      default:
+        return value;
+    }
+  },
+  getRowProperties(_index) {
+    return "";
+  },
+  getCellProperties(index, _col) {
+    if (index in gPrefView) {
+      return gLockProps[gPrefView[index].lockCol];
+    }
+
+    return "";
+  },
+  getColumnProperties(_col) {
+    return "";
+  },
+  treebox: null,
+  selection: null,
+  isContainer(_index) {
+    return false;
+  },
+  isContainerOpen(_index) {
+    return false;
+  },
+  isContainerEmpty(_index) {
+    return false;
+  },
+  isSorted() {
+    return true;
+  },
+  canDrop(_index, _orientation) {
+    return false;
+  },
+  drop(_row, _orientation) {},
+  setTree(out) {
+    this.treebox = out;
+  },
+  getParentIndex(_rowIndex) {
+    return -1;
+  },
+  hasNextSibling(_rowIndex, _afterIndex) {
+    return false;
+  },
+  getLevel(_index) {
+    return 1;
+  },
+  getImageSrc(_row, _col) {
+    return "";
+  },
+  toggleOpenState(_index) {},
+  cycleHeader(col) {
+      let index = this.selection.currentIndex;
+      if (col.id === gSortedColumn) {
+        gSortDirection = -gSortDirection;
+        gPrefArray.reverse();
+        if (gPrefView !== gPrefArray) {
+          gPrefView.reverse();
+        }
+        if (index >= 0) {
+          index = gPrefView.length - index - 1;
+        }
+      } else {
+        let pref = null;
+        if (index >= 0) {
+          pref = gPrefView[index];
+        }
+
+        const old = document.getElementById(gSortedColumn);
+        old.removeAttribute("sortDirection");
+        gSortFunction = gSortFunctions[col.id];
+        gPrefArray.sort(gSortFunction);
+        if (gPrefView !== gPrefArray) {
+          gPrefView.sort(gSortFunction);
+        }
+        gSortedColumn = col.id;
+        if (pref) {
+          index = getViewIndexOfPref(pref);
+        }
+      }
+      col.element.setAttribute(
+        "sortDirection",
+        gSortDirection > 0 ? "ascending" : "descending"
+      );
+      this.treebox.invalidate();
+      if (index >= 0) {
+        this.selection.select(index);
+        this.treebox.ensureRowIsVisible(index);
+      }
+    },
+  selectionChanged() {},
+  cycleCell(_row, _col) {},
+  isEditable(_row, _col) {
+    return false;
+  },
+  setCellValue(_row, _col, _value) {},
+  setCellText(_row, _col, _value) {},
+  isSeparator(_index) {
+    return false;
+  },
+};
+
+// find the index in gPrefView of a pref object
+// or -1 if it does not exist in the filtered view
+function getViewIndexOfPref(pref) {
+  let low = -1;
+  let high = gPrefView.length;
+  let index = (low + high) >> 1;
+  while (index > low) {
+    const mid = gPrefView[index];
+    if (mid === pref) {
+      return index;
+    }
+    if (gSortFunction(mid, pref) < 0) {
+      low = index;
+    } else {
+      high = index;
+    }
+    index = (low + high) >> 1;
+  }
+  return -1;
+}
+
+// find the index in gPrefView where a pref object belongs
+function getNearestViewIndexOfPref(pref) {
+  let low = -1;
+  let high = gPrefView.length;
+  let index = (low + high) >> 1;
+  while (index > low) {
+    if (gSortFunction(gPrefView[index], pref) < 0) {
+      low = index;
+    } else {
+      high = index;
+    }
+    index = (low + high) >> 1;
+  }
+  return high;
+}
+
+// find the index in gPrefArray of a pref object
+function getIndexOfPref(pref) {
+  let low = -1;
+  let high = gPrefArray.length;
+  let index = (low + high) >> 1;
+  while (index > low) {
+    const mid = gPrefArray[index];
+    if (mid === pref) {
+      return index;
+    }
+    if (gSortFunction(mid, pref) < 0) {
+      low = index;
+    } else {
+      high = index;
+    }
+    index = (low + high) >> 1;
+  }
+  return index;
+}
+
+function getNearestIndexOfPref(pref) {
+  let low = -1;
+  let  high = gPrefArray.length;
+  let index = (low + high) >> 1;
+  while (index > low) {
+    if (gSortFunction(gPrefArray[index], pref) < 0) {
+      low = index;
+    } else {
+      high = index;
+    }
+    index = (low + high) >> 1;
+  }
+  return high;
+}
+
+const gPrefListener = {
+  observe(_subject, topic, prefName) {
+    if (topic !== "nsPref:changed") {
+      return;
+    }
+
+    let arrayIndex = gPrefArray.length;
+    let viewIndex = arrayIndex;
+    let selectedIndex = view.selection.currentIndex;
+    let pref;
+    let updateView = false;
+    let updateArray = false;
+    let addedRow = false;
+    if (prefName in gPrefHash) {
+      pref = gPrefHash[prefName];
+      viewIndex = getViewIndexOfPref(pref);
+      arrayIndex = getIndexOfPref(pref);
+      fetchPref(prefName, arrayIndex);
+      // fetchPref replaces the existing pref object
+      pref = gPrefHash[prefName];
+      if (viewIndex >= 0) {
+        // Might need to update the filtered view
+        gPrefView[viewIndex] = gPrefHash[prefName];
+        view.treebox.invalidateRow(viewIndex);
+      }
+      if (gSortedColumn === "lockCol" || gSortedColumn === "valueCol") {
+        updateArray = true;
+        gPrefArray.splice(arrayIndex, 1);
+        if (gFilter?.test(`${pref.prefCol};${pref.valueCol}`)) {
+          updateView = true;
+          gPrefView.splice(viewIndex, 1);
+        }
+      }
+    } else {
+      fetchPref(prefName, arrayIndex);
+      pref = gPrefArray.pop();
+      updateArray = true;
+      addedRow = true;
+      if (gFilter?.test(`${pref.prefCol};${pref.valueCol}`)) {
+        updateView = true;
+      }
+    }
+    if (updateArray) {
+      // Reinsert in the data array
+      let newIndex = getNearestIndexOfPref(pref);
+      gPrefArray.splice(newIndex, 0, pref);
+
+      if (updateView) {
+        // View is filtered, reinsert in the view separately
+        newIndex = getNearestViewIndexOfPref(pref);
+        gPrefView.splice(newIndex, 0, pref);
+      } else if (gFilter) {
+        // View is filtered, but nothing to update
+        return;
+      }
+
+      if (addedRow) {
+        view.treebox.rowCountChanged(newIndex, 1);
+      }
+
+      // Invalidate the changed range in the view
+      const low = Math.min(viewIndex, newIndex);
+      const high = Math.max(viewIndex, newIndex);
+      view.treebox.invalidateRange(low, high);
+
+      if (selectedIndex === viewIndex) {
+        selectedIndex = newIndex;
+      } else if (selectedIndex >= low && selectedIndex <= high) {
+        selectedIndex += newIndex > viewIndex ? -1 : 1;
+      }
+      if (selectedIndex >= 0) {
+        view.selection.select(selectedIndex);
+        if (selectedIndex === newIndex) {
+          view.treebox.ensureRowIsVisible(selectedIndex);
+        }
+      }
+    }
+  },
+};
+
+class prefObject {
+  constructor(prefName, _prefIndex) {
+    this.prefCol = prefName;
+  }
+}
+
+prefObject.prototype = {
+  lockCol: PREF_IS_DEFAULT_VALUE,
+  typeCol: nsIPrefBranch.PREF_STRING,
+  valueCol: "",
+};
+
+function fetchPref(prefName, prefIndex) {
+  const pref = new prefObject(prefName);
+
+  gPrefHash[prefName] = pref;
+  gPrefArray[prefIndex] = pref;
+
+  if (gPrefBranch.prefIsLocked(prefName)) {
+    pref.lockCol = PREF_IS_LOCKED;
+  } else if (gPrefBranch.prefHasUserValue(prefName)) {
+    pref.lockCol = PREF_IS_MODIFIED;
+  }
+
+  try {
+    switch (gPrefBranch.getPrefType(prefName)) {
+      case gPrefBranch.PREF_BOOL:
+        pref.typeCol = gPrefBranch.PREF_BOOL;
+        // convert to a string
+        pref.valueCol = gPrefBranch.getBoolPref(prefName).toString();
+        break;
+      case gPrefBranch.PREF_INT:
+        pref.typeCol = gPrefBranch.PREF_INT;
+        // convert to a string
+        pref.valueCol = gPrefBranch.getIntPref(prefName).toString();
+        break;
+      default:
+        pref.valueCol = gPrefBranch.getStringPref(prefName);
+        // Try in case it's a localized string (will throw an exception if not)
+        if (
+          pref.lockCol === PREF_IS_DEFAULT_VALUE &&
+          /^chrome:\/\/.+\/locale\/.+\.properties/.test(pref.valueCol)
+        ) {
+          pref.valueCol = gPrefBranch.getComplexValue(
+            prefName,
+            nsIPrefLocalizedString
+          ).data;
+        }
+        break;
+    }
+  } catch (_e) {
+    // Also catch obscure cases in which you can't tell in advance
+    // that the pref exists but has no user or default value...
+  }
+}
+
+async function onConfigLoad() {
+  const configContext = document.getElementById("configContext");
+  configContext.addEventListener("popupshowing", function (event) {
+    if (event.target === this) {
+      updateContextMenu();
+    }
+  });
+
+  const commandListeners = {
+    toggleSelected: ModifySelected,
+    modifySelected: ModifySelected,
+    copyPref,
+    copyName,
+    copyValue,
+    resetSelected: ResetSelected,
+  };
+
+  configContext.addEventListener("command", (e) => {
+    if (e.target.id in commandListeners) {
+      commandListeners[e.target.id]();
+    }
+  });
+
+  const configString = document.getElementById("configString");
+  configString.addEventListener("command", () => {
+    NewPref(nsIPrefBranch.PREF_STRING);
+  });
+
+  const configInt = document.getElementById("configInt");
+  configInt.addEventListener("command", () => {
+    NewPref(nsIPrefBranch.PREF_INT);
+  });
+
+  const configBool = document.getElementById("configBool");
+  configBool.addEventListener("command", () => {
+    NewPref(nsIPrefBranch.PREF_BOOL);
+  });
+
+  const keyVKReturn = document.getElementById("keyVKReturn");
+  keyVKReturn.addEventListener("command", ModifySelected);
+
+  const textBox = document.getElementById("textbox");
+  textBox.addEventListener("command", FilterPrefs);
+
+  const configFocuSearch = document.getElementById("configFocuSearch");
+  configFocuSearch.addEventListener("command", () => {
+    textBox.focus();
+  });
+
+  const configFocuSearch2 = document.getElementById("configFocuSearch2");
+  configFocuSearch2.addEventListener("command", () => {
+    textBox.focus();
+  });
+
+  const warningButton = document.getElementById("warningButton");
+  warningButton.addEventListener("command", ShowPrefs);
+
+  const configTree = document.getElementById("configTree");
+  configTree.addEventListener("select", () => {
+    window.updateCommands("select");
+  });
+
+  const configTreeBody = document.getElementById("configTreeBody");
+  configTreeBody.addEventListener("dblclick", (event) => {
+    if (event.button === 0) {
+      ModifySelected();
+    }
+  });
+
+  gLockStrs[PREF_IS_DEFAULT_VALUE] = "default";
+  gLockStrs[PREF_IS_MODIFIED] = "modified";
+  gLockStrs[PREF_IS_LOCKED] = "locked";
+  gTypeStrs[nsIPrefBranch.PREF_STRING] = "string";
+  gTypeStrs[nsIPrefBranch.PREF_INT] = "integer";
+  gTypeStrs[nsIPrefBranch.PREF_BOOL] = "boolean";
+
+  const showWarning = gPrefBranch.getBoolPref("general.warnOnAboutConfig");
+
+  if (showWarning) {
+    document.getElementById("warningButton").focus();
+  } else {
+    ShowPrefs();
+  }
+}
+
+// Unhide the warning message
+function ShowPrefs() {
+  document.getElementById("configDeck").lastElementChild.style.visibility =
+    "visible";
+  gPrefBranch.getChildList("").forEach(fetchPref);
+
+  const descending = document.getElementsByAttribute(
+    "sortDirection",
+    "descending"
+  );
+  if (descending.item(0)) {
+    gSortedColumn = descending[0].id;
+    gSortDirection = -1;
+  } else {
+    const ascending = document.getElementsByAttribute(
+      "sortDirection",
+      "ascending"
+    );
+    if (ascending.item(0)) {
+      gSortedColumn = ascending[0].id;
+    } else {
+      document
+        .getElementById(gSortedColumn)
+        .setAttribute("sortDirection", "ascending");
+    }
+  }
+  gSortFunction = gSortFunctions[gSortedColumn];
+  gPrefArray.sort(gSortFunction);
+
+  gPrefBranch.addObserver("", gPrefListener);
+
+  const configTree = document.getElementById("configTree");
+  configTree.view = view;
+  configTree.controllers.insertControllerAt(0, configController);
+
+  document.getElementById("configDeck").setAttribute("selectedIndex", 1);
+  document.getElementById("configTreeKeyset").removeAttribute("disabled");
+  if (!document.getElementById("showWarningNextTime").checked) {
+    gPrefBranch.setBoolPref("general.warnOnAboutConfig", false);
+  }
+
+  // Process about:config?filter=<string>
+  const textbox = document.getElementById("textbox");
+  // About URIs don't support query params, so do this manually
+  const loc = document.location.href;
+  const matches = /[?&]filter=([^&]+)/i.exec(loc);
+  if (matches) {
+    textbox.value = decodeURIComponent(matches[1]);
+  }
+
+  // Even if we did not set the filter string via the URL query,
+  // textbox might have been set via some other mechanism
+  if (textbox.value) {
+    FilterPrefs();
+  }
+  textbox.focus();
+}
+
+function onConfigUnload() {
+  if (
+    document.getElementById("configDeck").getAttribute("selectedIndex") === 1
+  ) {
+    gPrefBranch.removeObserver("", gPrefListener);
+    const configTree = document.getElementById("configTree");
+    configTree.view = null;
+    configTree.controllers.removeController(configController);
+  }
+}
+
+function FilterPrefs() {
+  if (
+    document.getElementById("configDeck").getAttribute("selectedIndex") !== 1
+  ) {
+    return;
+  }
+
+  const substring = document.getElementById("textbox").value;
+  // Check for "/regex/[i]"
+  if (substring.charAt(0) === "/") {
+    const r = substring.match(/^\/(.*)\/(i?)$/);
+    try {
+      gFilter = RegExp(r[1], r[2]);
+    } catch (_e) {
+      return; // Do nothing on incomplete or bad RegExp
+    }
+  } else if (substring) {
+    gFilter = RegExp(
+      substring
+        .replace(/([^* \w])/g, "\\$1")
+        .replace(/^\*+/, "")
+        .replace(/\*+/g, ".*"),
+      "i"
+    );
+  } else {
+    gFilter = null;
+  }
+
+  const prefCol =
+    view.selection && view.selection.currentIndex < 0
+      ? null
+      : gPrefView[view.selection.currentIndex].prefCol;
+  const oldlen = gPrefView.length;
+  gPrefView = gPrefArray;
+  if (gFilter) {
+    gPrefView = [];
+    for (let i = 0; i < gPrefArray.length; ++i) {
+      if (gFilter.test(`${gPrefArray[i].prefCol};${gPrefArray[i].valueCol}`)) {
+        gPrefView.push(gPrefArray[i]);
+      }
+    }
+  }
+  view.treebox.invalidate();
+  view.treebox.rowCountChanged(oldlen, gPrefView.length - oldlen);
+  gotoPref(prefCol);
+}
+
+function prefColSortFunction(x, y) {
+  if (x.prefCol > y.prefCol) {
+    return gSortDirection;
+  }
+  if (x.prefCol < y.prefCol) {
+    return -gSortDirection;
+  }
+  return 0;
+}
+
+function lockColSortFunction(x, y) {
+  if (x.lockCol !== y.lockCol) {
+    return gSortDirection * (y.lockCol - x.lockCol);
+  }
+  return prefColSortFunction(x, y);
+}
+
+function typeColSortFunction(x, y) {
+  if (x.typeCol !== y.typeCol) {
+    return gSortDirection * (y.typeCol - x.typeCol);
+  }
+  return prefColSortFunction(x, y);
+}
+
+function valueColSortFunction(x, y) {
+  if (x.valueCol > y.valueCol) {
+    return gSortDirection;
+  }
+  if (x.valueCol < y.valueCol) {
+    return -gSortDirection;
+  }
+  return prefColSortFunction(x, y);
+}
+
+const gSortFunctions = {
+  prefCol: prefColSortFunction,
+  lockCol: lockColSortFunction,
+  typeCol: typeColSortFunction,
+  valueCol: valueColSortFunction,
+};
+
+const _gCategoryLabelForSortColumn = {
+  prefCol: "SortByName",
+  lockCol: "SortByStatus",
+  typeCol: "SortByType",
+  valueCol: "SortByValue",
+};
+
+const configController = {
+  supportsCommand: function supportsCommand(command) {
+    return command === "cmd_copy";
+  },
+  isCommandEnabled: function isCommandEnabled(_command) {
+    return view.selection && view.selection.currentIndex >= 0;
+  },
+  doCommand: function doCommand(_command) {
+    copyPref();
+  },
+  onEvent: function onEvent(_event) {},
+};
+
+function updateContextMenu() {
+  let lockCol = PREF_IS_LOCKED;
+  let typeCol = nsIPrefBranch.PREF_STRING;
+  let valueCol = "";
+  let copyDisabled = true;
+  const prefSelected = view.selection.currentIndex >= 0;
+
+  if (prefSelected) {
+    const prefRow = gPrefView[view.selection.currentIndex];
+    lockCol = prefRow.lockCol;
+    typeCol = prefRow.typeCol;
+    valueCol = prefRow.valueCol;
+    copyDisabled = false;
+  }
+
+  const copyPref = document.getElementById("copyPref");
+  copyPref.setAttribute("disabled", copyDisabled);
+
+  const copyName = document.getElementById("copyName");
+  copyName.setAttribute("disabled", copyDisabled);
+
+  const copyValue = document.getElementById("copyValue");
+  copyValue.setAttribute("disabled", copyDisabled);
+
+  const resetSelected = document.getElementById("resetSelected");
+  resetSelected.setAttribute("disabled", lockCol !== PREF_IS_MODIFIED);
+
+  const canToggle = typeCol === nsIPrefBranch.PREF_BOOL && valueCol !== "";
+  // indicates that a pref is locked or no pref is selected at all
+  const isLocked = lockCol === PREF_IS_LOCKED;
+
+  const modifySelected = document.getElementById("modifySelected");
+  modifySelected.setAttribute("disabled", isLocked);
+  modifySelected.hidden = canToggle;
+
+  const toggleSelected = document.getElementById("toggleSelected");
+  toggleSelected.setAttribute("disabled", isLocked);
+  toggleSelected.hidden = !canToggle;
+}
+
+function copyPref() {
+  const pref = gPrefView[view.selection.currentIndex];
+  gClipboardHelper.copyString(`${pref.prefCol};${pref.valueCol}`);
+}
+
+function copyName() {
+  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].prefCol);
+}
+
+function copyValue() {
+  gClipboardHelper.copyString(gPrefView[view.selection.currentIndex].valueCol);
+}
+
+function ModifySelected() {
+  if (view.selection.currentIndex >= 0) {
+    ModifyPref(gPrefView[view.selection.currentIndex]);
+  }
+}
+
+function ResetSelected() {
+  const entry = gPrefView[view.selection.currentIndex];
+  gPrefBranch.clearUserPref(entry.prefCol);
+}
+
+async function NewPref(type) {
+  const result = { value: "" };
+  const dummy = { value: 0 };
+
+  const [newTitle, newPrompt] = [
+    `New ${gTypeStrs[type]} value`,
+    "Enter the preference name",
+  ];
+
+  if (
+    Services.prompt.prompt(window, newTitle, newPrompt, result, null, dummy)
+  ) {
+    result.value = result.value.trim();
+    if (!result.value) {
+      return;
+    }
+
+    let pref;
+    if (result.value in gPrefHash) {
+      pref = gPrefHash[result.value];
+    } else {
+      pref = {
+        prefCol: result.value,
+        lockCol: PREF_IS_DEFAULT_VALUE,
+        typeCol: type,
+        valueCol: "",
+      };
+    }
+    if (ModifyPref(pref)) {
+      setTimeout(gotoPref, 0, result.value);
+    }
+  }
+}
+
+function gotoPref(pref) {
+  // make sure the pref exists and is displayed in the current view
+  const index = pref in gPrefHash ? getViewIndexOfPref(gPrefHash[pref]) : -1;
+  if (index >= 0) {
+    view.selection.select(index);
+    view.treebox.ensureRowIsVisible(index);
+  } else {
+    view.selection.clearSelection();
+    view.selection.currentIndex = -1;
+  }
+}
+
+async function ModifyPref(entry) {
+  if (entry.lockCol === PREF_IS_LOCKED) {
+    return false;
+  }
+
+  const [title] = [`Enter ${gTypeStrs[entry.typeCol]} value`];
+
+  if (entry.typeCol === nsIPrefBranch.PREF_BOOL) {
+    const check = { value: entry.valueCol === "false" };
+    if (
+      !entry.valueCol &&
+      !Services.prompt.select(
+        window,
+        title,
+        entry.prefCol,
+        [false, true],
+        check
+      )
+    ) {
+      return false;
+    }
+    gPrefBranch.setBoolPref(entry.prefCol, check.value);
+  } else {
+    const result = window.prompt(entry.prefCol, entry.valueCol);
+    if (result === null) {
+      return false;
+    }
+    if (entry.typeCol === nsIPrefBranch.PREF_INT) {
+      // | 0 converts to integer or 0; - 0 to float or NaN.
+      // Thus, this check should catch all cases.
+      const numResult = Number.parseInt(result);
+      const val = numResult | 0;
+      if (val !== numResult - 0) {
+        const [err_title, err_text] = [
+          "Invalid value",
+          "The text you entered is not a number.",
+        ];
+
+        Services.prompt.alert(window, err_title, err_text);
+        return false;
+      }
+      gPrefBranch.setIntPref(entry.prefCol, val);
+    } else {
+      gPrefBranch.setStringPref(entry.prefCol, result);
+    }
+  }
+
+  Services.prefs.savePrefFile(null);
+  return true;
+}
+
+window.onload = onConfigLoad;
+window.addEventListener("unload", onConfigUnload);
diff --git a/waterfox/browser/components/aboutcfg/aboutcfg.xhtml b/waterfox/browser/components/aboutcfg/aboutcfg.xhtml
new file mode 100644
index 0000000000000..e64909aee5631
--- /dev/null
+++ b/waterfox/browser/components/aboutcfg/aboutcfg.xhtml
@@ -0,0 +1,104 @@
+<?xml version="1.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/. -->
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/in-content/info-pages.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/aboutcfg/aboutcfg.css" type="text/css"?>
+
+<window id="config"
+        title="about:cfg"
+        csp="default-src chrome:; object-src 'none'"
+        data-l10n-id="config-window"
+        aria-describedby="warningTitle warningText"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        windowtype="Preferences:ConfigManager"
+        role="application"
+        width="750"
+        height="500">
+
+<html:link rel="icon" href="chrome://global/skin/icons/settings.svg"/>
+
+<script src="chrome://browser/content/aboutcfg/aboutcfg.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+
+<menupopup id="configContext">
+  <menuitem id="toggleSelected" label="Toggle" accesskey="T" default="true"/>
+  <menuitem id="modifySelected" label="Modify" accesskey="M" default="true"/>
+  <menuseparator/>
+  <menuitem id="copyPref" label="Copy" accesskey="C"/>
+  <menuitem id="copyName" label="Copy Name" accesskey="N"/>
+  <menuitem id="copyValue" label="Copy Value" accesskey="V"/>
+  <menu label="New" accesskey="w">
+    <menupopup>
+      <menuitem id="configString" label="String" accesskey="S"/>
+      <menuitem id="configInt" label="Integer" accesskey="I"/>
+      <menuitem id="configBool" label="Boolean" accesskey="B"/>
+    </menupopup>
+  </menu>
+  <menuitem id="resetSelected" label="Reset" accesskey="R"/>
+</menupopup>
+
+<keyset id="configTreeKeyset" disabled="true">
+  <key id="keyVKReturn" keycode="VK_RETURN"/>
+  <key id="configFocuSearch" modifiers="accel" key="r"/>
+  <key id="configFocuSearch2" modifiers="accel" key="f"/>
+</keyset>
+<deck id="configDeck" flex="1">
+  <vbox id="warningScreen" flex="1" align="center" style="overflow: auto;">
+    <spacer flex="1"/>
+    <vbox id="warningBox" class="container">
+      <hbox class="title" flex="1">
+        <label id="warningTitle" value="This might void your warranty!" class="title-text" flex="1"></label>
+      </hbox>
+      <vbox class="description" flex="1">
+        <label id="warningText">Changing these advanced settings can be harmful to the stability, security, and performance of this application. You should only continue if you are sure of what you are doing.</label>
+        <checkbox id="showWarningNextTime" label="Show this warning next time" checked="true"/>
+        <hbox class="button-container">
+          <button id="warningButton" label="I accept the risk!" class="primary"/>
+        </hbox>
+      </vbox>
+    </vbox>
+    <spacer flex="2"/>
+  </vbox>
+  <vbox flex="1">
+    <hbox id="filterRow" align="center">
+      <label value="Search:" accesskey="r" control="textbox"/>
+      <search-textbox id="textbox" flex="1"
+                      aria-controls="configTree"/>
+    </hbox>
+    <tree id="configTree" flex="1" seltype="single"
+          enableColumnDrag="true" context="configContext">
+      <treecols>
+        <!--
+          The below code may suggest that 'ordinal' is still a supported XUL
+          attribute. It is not. This is a crutch so that we can continue
+          persisting the CSS -moz-box-ordinal-group attribute, which is the
+          appropriate replacement for the ordinal attribute but cannot yet
+          be easily persisted. The code that synchronizes the attribute with
+          the CSS lives in toolkit/content/widget/tree.js and is specific to
+          tree elements.
+        -->
+        <treecol id="prefCol" label="Preference Name" flex="7"
+            ignoreincolumnpicker="true"
+            persist="hidden width ordinal sortDirection"/>
+        <splitter class="tree-splitter" />
+        <treecol id="lockCol" label="Status" flex="1"
+            persist="hidden width ordinal sortDirection"/>
+        <splitter class="tree-splitter" />
+        <treecol id="typeCol" label="Type" flex="1"
+            persist="hidden width ordinal sortDirection"/>
+        <splitter class="tree-splitter" />
+        <treecol id="valueCol" label="Value" flex="10"
+            persist="hidden width ordinal sortDirection"/>
+      </treecols>
+
+      <treechildren id="configTreeBody"/>
+    </tree>
+  </vbox>
+</deck>
+</window>
diff --git a/waterfox/browser/components/aboutcfg/jar.mn b/waterfox/browser/components/aboutcfg/jar.mn
new file mode 100644
index 0000000000000..bf702706bab5c
--- /dev/null
+++ b/waterfox/browser/components/aboutcfg/jar.mn
@@ -0,0 +1,8 @@
+# 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/.
+
+browser.jar:
+    content/browser/aboutcfg/aboutcfg.css    (aboutcfg.css)
+    content/browser/aboutcfg/aboutcfg.js     (aboutcfg.js)
+    content/browser/aboutcfg/aboutcfg.xhtml  (aboutcfg.xhtml)
diff --git a/waterfox/browser/components/aboutcfg/moz.build b/waterfox/browser/components/aboutcfg/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/components/aboutcfg/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/aboutpasswords/jar.mn b/waterfox/browser/components/aboutpasswords/jar.mn
new file mode 100644
index 0000000000000..ec0b475cc4333
--- /dev/null
+++ b/waterfox/browser/components/aboutpasswords/jar.mn
@@ -0,0 +1,8 @@
+# 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/.
+
+browser.jar:
+    content/browser/passwordManager.css    (passwordManager.css)
+    content/browser/passwordManager.js     (passwordManager.js)
+    content/browser/passwordManager.xhtml  (passwordManager.xhtml)
diff --git a/waterfox/browser/components/aboutpasswords/moz.build b/waterfox/browser/components/aboutpasswords/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/components/aboutpasswords/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/aboutpasswords/passwordManager.css b/waterfox/browser/components/aboutpasswords/passwordManager.css
new file mode 100644
index 0000000000000..19d28774b6722
--- /dev/null
+++ b/waterfox/browser/components/aboutpasswords/passwordManager.css
@@ -0,0 +1,22 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.contentPane {
+  margin: 9px 8px 5px;
+}
+
+.actionButtons {
+  margin: 0 3px 6px;
+}
+
+treechildren::-moz-tree-image(siteCol) {
+  list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
+  width: 16px;
+  height: 16px;
+  margin-inline-end: 5px;
+}
diff --git a/waterfox/browser/components/aboutpasswords/passwordManager.js b/waterfox/browser/components/aboutpasswords/passwordManager.js
new file mode 100644
index 0000000000000..eb7440b3c379a
--- /dev/null
+++ b/waterfox/browser/components/aboutpasswords/passwordManager.js
@@ -0,0 +1,854 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+});
+
+// Default value for signon table sorting
+let lastSignonSortColumn = "origin";
+let lastSignonSortAscending = true;
+
+let showingPasswords = false;
+
+// password-manager lists
+let signons = [];
+const deletedSignons = [];
+
+// Elements that would be used frequently
+let filterField;
+let togglePasswordsButton;
+let signonsIntro;
+let removeButton;
+let removeAllButton;
+let signonsTree;
+
+const signonReloadDisplay = {
+  async observe(_subject, topic, data) {
+    if (topic === "passwordmgr-storage-changed") {
+      switch (data) {
+        case "addLogin":
+        case "modifyLogin":
+        case "removeLogin":
+        case "removeAllLogins":
+          if (!signonsTree) {
+            return;
+          }
+          signons.length = 0;
+          await LoadSignons();
+          // apply the filter if needed
+          if (filterField && filterField.value !== "") {
+            await FilterPasswords();
+          }
+          signonsTree.ensureRowIsVisible(
+            signonsTree.view.selection.currentIndex
+          );
+          break;
+      }
+      Services.obs.notifyObservers(null, "passwordmgr-dialog-updated");
+    }
+  },
+};
+
+// Formatter for localization.
+const dateFormatter = new Services.intl.DateTimeFormat(undefined, {
+  dateStyle: "medium",
+});
+const dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, {
+  dateStyle: "medium",
+  timeStyle: "short",
+});
+
+function debounce(func, wait) {
+  let timeout;
+  return function executedFunction(...args) {
+    const later = () => {
+      clearTimeout(timeout);
+      func(...args);
+    };
+    clearTimeout(timeout);
+    timeout = setTimeout(later, wait);
+  };
+}
+
+async function _Startup() {
+  // be prepared to reload the display if anything changes
+  Services.obs.addObserver(signonReloadDisplay, "passwordmgr-storage-changed");
+
+  signonsTree = document.getElementById("signonsTree");
+  filterField = document.getElementById("filter");
+  togglePasswordsButton = document.getElementById("togglePasswords");
+  signonsIntro = document.getElementById("signonsIntro");
+  removeButton = document.getElementById("removeSignon");
+  removeAllButton = document.getElementById("removeAllSignons");
+
+  togglePasswordsButton.label = "Show Passwords";
+  togglePasswordsButton.accessKey = "P";
+  signonsIntro.textContent =
+    "Logins for the following sites are stored on your computer";
+  removeAllButton.label = "Remove All";
+  removeAllButton.accessKey = "A";
+
+  if (Services.policies && !Services.policies.isAllowed("passwordReveal")) {
+    togglePasswordsButton.hidden = true;
+  }
+
+  document
+    .getElementsByTagName("treecols")[0]
+    .addEventListener("click", (event) => {
+      const { target, button } = event;
+      const sortField = target.getAttribute("data-field-name");
+
+      if (target.nodeName !== "treecol" || button !== 0 || !sortField) {
+        return;
+      }
+
+      SignonColumnSort(sortField);
+    });
+
+  await LoadSignons();
+
+  // filter the table if requested by caller
+  if (window.arguments?.[0]?.filterString) {
+    await setFilter(window.arguments[0].filterString);
+  }
+
+  let lastHoveredRow = -1;
+  signonsTree.addEventListener(
+    "mousemove",
+    debounce((event) => {
+      const row = signonsTree.getRowAt(event.clientX, event.clientY);
+      if (row !== lastHoveredRow) {
+        lastHoveredRow = row;
+        signonsTree.invalidateRow(row);
+      }
+    }, 50)
+  );
+
+  FocusFilterBox();
+}
+
+async function _Shutdown() {
+  Services.obs.removeObserver(
+    signonReloadDisplay,
+    "passwordmgr-storage-changed"
+  );
+}
+
+async function setFilter(aFilterString) {
+  filterField.value = aFilterString;
+  await FilterPasswords();
+}
+
+const signonsTreeView = {
+  _filterSet: [],
+  _lastSelectedRanges: [],
+  selection: null,
+
+  setTree(_tree) {},
+
+  getImageSrc(row, column) {
+    if (column.element.getAttribute("id") !== "siteCol") {
+      return "";
+    }
+
+    const visibleLogins = this._getVisibleLoginsCached();
+    if (row < 0 || row >= visibleLogins.length) {
+      console.error(`Invalid row index in getImageSrc: ${row}`);
+      return "";
+    }
+
+    const signon = visibleLogins[row];
+    if (!signon) {
+      console.error(`No signon found for row ${row} in getImageSrc`);
+      return "";
+    }
+
+    return lazy.PlacesUtils.urlWithSizeRef(
+      window,
+      `page-icon:${signon.origin}`,
+      16
+    );
+  },
+
+  get rowCount() {
+    return this._getVisibleLoginsCached().length;
+  },
+
+  getCellText(row, column) {
+    const visibleLogins = this._getVisibleLoginsCached();
+    if (row < 0 || row >= visibleLogins.length) {
+      console.error(`Invalid row index: ${row}`);
+      return "";
+    }
+
+    const signon = visibleLogins[row];
+    if (!signon) {
+      console.error(`No signon found for row ${row}`);
+      return "";
+    }
+
+    let time;
+    switch (column.id) {
+      case "siteCol":
+        return signon.httpRealm
+          ? `${signon.origin} (${signon.httpRealm})`
+          : signon.origin;
+      case "userCol":
+        return signon.username || "";
+      case "passwordCol":
+        return signon.password || "";
+      case "timeCreatedCol":
+        time = new Date(signon.timeCreated);
+        return dateFormatter.format(time);
+      case "timeLastUsedCol":
+        time = new Date(signon.timeLastUsed);
+        return dateAndTimeFormatter.format(time);
+      case "timePasswordChangedCol":
+        time = new Date(signon.timePasswordChanged);
+        return dateFormatter.format(time);
+      case "timesUsedCol":
+        return signon.timesUsed;
+      default:
+        return "";
+    }
+  },
+
+  _cachedVisibleLogins: null,
+  _lastUpdateTime: 0,
+
+  _getVisibleLoginsCached() {
+    const now = Date.now();
+    if (now - this._lastUpdateTime > 100 || !this._cachedVisibleLogins) {
+      this._cachedVisibleLogins = this._filterSet.length
+        ? this._filterSet
+        : signons;
+      this._lastUpdateTime = now;
+    }
+    return this._cachedVisibleLogins;
+  },
+
+  invalidateCache() {
+    this._cachedVisibleLogins = null;
+    this._lastUpdateTime = 0;
+  },
+  isEditable(_row, col) {
+    if (col.id === "userCol" || col.id === "passwordCol") {
+      return true;
+    }
+    return false;
+  },
+  isSeparator(_index) {
+    return false;
+  },
+  isSorted() {
+    return false;
+  },
+  isContainer(_index) {
+    return false;
+  },
+  cycleHeader(_column) {},
+  getRowProperties(_row) {
+    return "";
+  },
+  getColumnProperties(_column) {
+    return "";
+  },
+  getCellProperties(_row, column) {
+    if (column.element.getAttribute("id") === "siteCol") {
+      return "ltr";
+    }
+
+    return "";
+  },
+  setCellText(row, col, value) {
+    const table = this._getVisibleLoginsCached();
+    function _editLogin(field) {
+      if (value === table[row][field]) {
+        return;
+      }
+      const existingLogin = table[row].clone();
+      table[row][field] = value;
+      table[row].timePasswordChanged = Date.now();
+      Services.logins.modifyLogin(existingLogin, table[row]);
+      this.invalidateCache();
+      signonsTree.invalidateRow(row);
+    }
+    if (col.id === "userCol") {
+      _editLogin("username");
+    } else if (col.id === "passwordCol") {
+      if (!value) {
+        return;
+      }
+      _editLogin("password");
+    }
+  },
+};
+
+function SortTree(column, ascending) {
+  const table = signonsTreeView._getVisibleLoginsCached();
+  // remember which item was selected so we can restore it after the sort
+  const selections = GetTreeSelections();
+  const selectedNumber =
+    selections.length && table[selections[0]]
+      ? table[selections[0]].number
+      : -1;
+  function compareFunc(a, b) {
+    let valA;
+    let valB;
+    switch (column) {
+      case "origin": {
+        let realmA = a.httpRealm;
+        let realmB = b.httpRealm;
+        realmA = realmA == null ? "" : realmA.toLowerCase();
+        realmB = realmB == null ? "" : realmB.toLowerCase();
+
+        valA = a[column].toLowerCase() + realmA;
+        valB = b[column].toLowerCase() + realmB;
+        break;
+      }
+      case "username":
+      case "password":
+        valA = a[column].toLowerCase();
+        valB = b[column].toLowerCase();
+        break;
+
+      default:
+        valA = a[column];
+        valB = b[column];
+    }
+
+    if (valA < valB) {
+      return -1;
+    }
+    if (valA > valB) {
+      return 1;
+    }
+    return 0;
+  }
+
+  // do the sort
+  table.sort(compareFunc);
+  if (!ascending) {
+    table.reverse();
+  }
+
+  // restore the selection
+  let selectedRow = -1;
+  const newLocal = selectedNumber >= 0 && false;
+  if (newLocal) {
+    for (let s = 0; s < table.length; s++) {
+      if (table[s].number === selectedNumber) {
+        // update selection
+        // note: we need to deselect before reselecting in order to trigger ...Selected()
+        signonsTree.view.selection.select(-1);
+        signonsTree.view.selection.select(s);
+        selectedRow = s;
+        break;
+      }
+    }
+  }
+
+  // display the results
+  signonsTree.invalidate();
+  if (selectedRow >= 0) {
+    signonsTree.ensureRowIsVisible(selectedRow);
+  }
+}
+
+async function LoadSignons() {
+  try {
+    signons = await Services.logins.getAllLogins();
+  } catch (e) {
+    console.error("Error loading logins:", e);
+    signons = [];
+  }
+
+  for (const login of signons) {
+    login.QueryInterface(Ci.nsILoginMetaInfo);
+  }
+
+  signonsTreeView.invalidateCache();
+  signonsTree.view = signonsTreeView;
+  signonsTree.invalidate();
+
+  // sort the table
+  SignonColumnSort(lastSignonSortColumn);
+
+  // disable "remove all signons" button if there are no signons
+  if (!signons.length) {
+    removeButton.setAttribute("disabled", "true");
+    removeAllButton.setAttribute("disabled", "true");
+    togglePasswordsButton.setAttribute("disabled", "true");
+  } else {
+    removeButton.removeAttribute("disabled");
+    removeAllButton.removeAttribute("disabled");
+    togglePasswordsButton.removeAttribute("disabled");
+  }
+
+  return true;
+}
+
+function GetTreeSelections() {
+  const selections = [];
+  const select = signonsTree.view.selection;
+  if (select) {
+    const count = select.getRangeCount();
+    const min = {};
+    const max = {};
+    for (let i = 0; i < count; i++) {
+      select.getRangeAt(i, min, max);
+      for (let k = min.value; k <= max.value; k++) {
+        if (k !== -1) {
+          selections[selections.length] = k;
+        }
+      }
+    }
+  }
+  return selections;
+}
+
+function _SignonSelected() {
+  const selections = GetTreeSelections();
+  if (selections.length) {
+    removeButton.removeAttribute("disabled");
+  } else {
+    removeButton.setAttribute("disabled", true);
+  }
+}
+
+async function DeleteSignon() {
+  const syncNeeded = !!signonsTreeView._filterSet.length;
+  const tree = signonsTree;
+  const view = signonsTreeView;
+  const table = view._getVisibleLoginsCached();
+
+  // Turn off tree selection notifications during the deletion
+  tree.view.selection.selectEventsSuppressed = true;
+
+  // remove selected items from list and place in deleted list
+  const selections = GetTreeSelections();
+  for (let s = selections.length - 1; s >= 0; s--) {
+    const i = selections[s];
+    deletedSignons.push(table[i]);
+  }
+
+  // Remove deleted items from the table
+  for (let s = selections.length - 1; s >= 0; s--) {
+    const i = selections[s];
+    table.splice(i, 1);
+  }
+
+  view.invalidateCache();
+  tree.rowCountChanged(0, -selections.length);
+
+  // update selection and/or buttons
+  if (table.length) {
+    // update selection
+    const nextSelection = Math.min(selections[0], table.length - 1);
+    tree.view.selection.select(nextSelection);
+  } else {
+    // disable buttons
+    removeButton.setAttribute("disabled", "true");
+    removeAllButton.setAttribute("disabled", "true");
+  }
+  tree.view.selection.selectEventsSuppressed = false;
+  await FinalizeSignonDeletions(syncNeeded);
+}
+
+async function _DeleteAllSignons() {
+  // Confirm the user wants to remove all passwords
+  const dummy = { value: false };
+  if (
+    Services.prompt.confirmEx(
+      window,
+      "Remove all passwords",
+      "Are you sure you wish to remove all passwords?",
+      Services.prompt.STD_YES_NO_BUTTONS + Services.prompt.BUTTON_POS_1_DEFAULT,
+      null,
+      null,
+      null,
+      null,
+      dummy
+    ) === 1
+  ) {
+    // 1 == "No" button
+    return;
+  }
+
+  const syncNeeded = !!signonsTreeView._filterSet.length;
+  const view = signonsTreeView;
+  const table = view._getVisibleLoginsCached();
+
+  // remove all items from table and place in deleted table
+  for (let i = 0; i < table.length; i++) {
+    deletedSignons.push(table[i]);
+  }
+  table.length = 0;
+
+  // clear out selections
+  view.selection.select(-1);
+
+  // update the tree view and notify the tree
+  view.invalidateCache();
+
+  signonsTree.rowCountChanged(0, -deletedSignons.length);
+  signonsTree.invalidate();
+
+  // disable buttons
+  removeButton.setAttribute("disabled", "true");
+  removeAllButton.setAttribute("disabled", "true");
+  await FinalizeSignonDeletions(syncNeeded);
+}
+
+async function _TogglePasswordVisible() {
+  if (showingPasswords || (await masterPasswordLogin(AskUserShowPasswords))) {
+    showingPasswords = !showingPasswords;
+    togglePasswordsButton.label = showingPasswords
+      ? "Hide Passwords"
+      : "Show Passwords";
+    togglePasswordsButton.accessKey = "P";
+    document.getElementById("passwordCol").hidden = !showingPasswords;
+    await FilterPasswords();
+  }
+
+  // Notify observers that the password visibility toggling is
+  // completed.  (Mostly useful for tests)
+  Services.obs.notifyObservers(null, "passwordmgr-password-toggle-complete");
+}
+
+async function AskUserShowPasswords() {
+  const dummy = { value: false };
+
+  // Confirm the user wants to display passwords
+  return (
+    Services.prompt.confirmEx(
+      window,
+      null,
+      "Are you sure you wish to show your passwords?",
+      Services.prompt.STD_YES_NO_BUTTONS,
+      null,
+      null,
+      null,
+      null,
+      dummy
+    ) === 0
+  ); // 0=="Yes" button
+}
+
+async function FinalizeSignonDeletions(syncNeeded) {
+  for (let s = 0; s < deletedSignons.length; s++) {
+    Services.logins.removeLogin(deletedSignons[s]);
+  }
+  // If the deletion has been performed in a filtered view, reflect the deletion in the unfiltered table.
+  // See bug 405389.
+  if (syncNeeded) {
+    try {
+      signons = await Services.logins.getAllLogins();
+    } catch (_e) {
+      signons = [];
+    }
+  }
+  deletedSignons.length = 0;
+}
+
+async function _HandleSignonKeyPress(e) {
+  // If editing is currently performed, don't do anything.
+  if (signonsTree.getAttribute("editing")) {
+    return;
+  }
+  if (
+    e.keyCode === KeyboardEvent.DOM_VK_DELETE ||
+    (AppConstants.platform === "macosx" &&
+      e.keyCode === KeyboardEvent.DOM_VK_BACK_SPACE)
+  ) {
+    await DeleteSignon();
+    e.preventDefault();
+  }
+}
+
+function getColumnByName(column) {
+  switch (column) {
+    case "origin":
+      return document.getElementById("siteCol");
+    case "username":
+      return document.getElementById("userCol");
+    case "password":
+      return document.getElementById("passwordCol");
+    case "timeCreated":
+      return document.getElementById("timeCreatedCol");
+    case "timeLastUsed":
+      return document.getElementById("timeLastUsedCol");
+    case "timePasswordChanged":
+      return document.getElementById("timePasswordChangedCol");
+    case "timesUsed":
+      return document.getElementById("timesUsedCol");
+  }
+  return undefined;
+}
+
+function SignonColumnSort(column) {
+  const sortedCol = getColumnByName(column);
+  const lastSortedCol = getColumnByName(lastSignonSortColumn);
+
+  // clear out the sortDirection attribute on the old column
+  lastSortedCol.removeAttribute("sortDirection");
+
+  // determine if sort is to be ascending or descending
+  lastSignonSortAscending =
+    column === lastSignonSortColumn ? !lastSignonSortAscending : true;
+
+  // sort
+  lastSignonSortColumn = column;
+  SortTree(lastSignonSortColumn, lastSignonSortAscending);
+
+  // set the sortDirection attribute to get the styling going
+  // first we need to get the right element
+  sortedCol.setAttribute(
+    "sortDirection",
+    lastSignonSortAscending ? "ascending" : "descending"
+  );
+}
+
+async function SignonClearFilter() {
+  const singleSelection = signonsTreeView.selection.count === 1;
+
+  signonsTreeView._filterSet = [];
+  await LoadSignons();
+
+  // Restore selection
+  if (singleSelection) {
+    signonsTreeView.selection.clearSelection();
+    for (let i = 0; i < signonsTreeView._lastSelectedRanges.length; ++i) {
+      const range = signonsTreeView._lastSelectedRanges[i];
+      signonsTreeView.selection.rangedSelect(range.min, range.max, true);
+    }
+  } else {
+    signonsTreeView.selection.select(0);
+  }
+  signonsTreeView._lastSelectedRanges = [];
+
+  signonsIntro.textContent =
+    "Logins for the following sites are stored on your computer";
+  removeAllButton.label = "Remove All";
+  removeAllButton.accessKey = "A";
+}
+
+function FocusFilterBox() {
+  if (filterField.getAttribute("focused") !== "true") {
+    filterField.focus();
+  }
+}
+
+function SignonMatchesFilter(aSignon, aFilterValue) {
+  if (aSignon.origin.toLowerCase().includes(aFilterValue)) {
+    return true;
+  }
+  if (aSignon.username?.toLowerCase().includes(aFilterValue)) {
+    return true;
+  }
+  if (aSignon.httpRealm?.toLowerCase().includes(aFilterValue)) {
+    return true;
+  }
+  if (
+    showingPasswords &&
+    aSignon.password &&
+    aSignon.password.toLowerCase().includes(aFilterValue)
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
+function _filterPasswords(filterValue, _view) {
+  const lowercaseFilter = filterValue.toLowerCase();
+  return signons.filter((s) => SignonMatchesFilter(s, lowercaseFilter));
+}
+
+function _SignonSaveState() {
+  // Save selection
+  const seln = signonsTreeView.selection;
+  signonsTreeView._lastSelectedRanges = [];
+  const rangeCount = seln.getRangeCount();
+  for (let i = 0; i < rangeCount; ++i) {
+    const min = {};
+    const max = {};
+    seln.getRangeAt(i, min, max);
+    signonsTreeView._lastSelectedRanges.push({
+      min: min.value,
+      max: max.value,
+    });
+  }
+}
+
+const debouncedFilterPasswords = debounce(async () => {
+  if (filterField.value === "") {
+    await SignonClearFilter();
+    return;
+  }
+
+  const newFilterSet = _filterPasswords(filterField.value, signonsTreeView);
+
+  const oldLength = signonsTreeView._filterSet.length;
+  signonsTreeView._filterSet = newFilterSet;
+  signonsTreeView.invalidateCache();
+
+  if (oldLength !== newFilterSet.length) {
+    signonsTree.rowCountChanged(0, newFilterSet.length - oldLength);
+  }
+
+  signonsTree.invalidate();
+
+  // if the view is not empty then select the first item
+  if (signonsTreeView.rowCount > 0) {
+    signonsTreeView.selection.select(0);
+  }
+
+  signonsIntro.textContent = "The following logins match your search:";
+  removeAllButton.label = "Remove All Shown";
+  removeAllButton.accessKey = "A";
+}, 250);
+
+async function FilterPasswords() {
+  debouncedFilterPasswords();
+}
+
+function _CopySiteUrl() {
+  // Copy selected site url to clipboard
+  const clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(
+    Ci.nsIClipboardHelper
+  );
+  const row = signonsTree.currentIndex;
+  const url = signonsTreeView.getCellText(row, { id: "siteCol" });
+  clipboard.copyString(url);
+}
+
+async function _CopyPassword() {
+  // Don't copy passwords if we aren't already showing the passwords & a master
+  // password hasn't been entered.
+  if (!showingPasswords && !(await masterPasswordLogin())) {
+    return;
+  }
+  // Copy selected signon's password to clipboard
+  const clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(
+    Ci.nsIClipboardHelper
+  );
+  const row = signonsTree.currentIndex;
+  const password = signonsTreeView.getCellText(row, { id: "passwordCol" });
+  clipboard.copyString(password);
+}
+
+function _CopyUsername() {
+  // Copy selected signon's username to clipboard
+  const clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(
+    Ci.nsIClipboardHelper
+  );
+  const row = signonsTree.currentIndex;
+  const username = signonsTreeView.getCellText(row, { id: "userCol" });
+  clipboard.copyString(username);
+}
+
+function _EditCellInSelectedRow(columnName) {
+  const row = signonsTree.currentIndex;
+  const columnElement = getColumnByName(columnName);
+  signonsTree.startEditing(
+    row,
+    signonsTree.columns.getColumnFor(columnElement)
+  );
+}
+
+function _LaunchSiteUrl() {
+  const row = signonsTree.currentIndex;
+  const url = signonsTreeView.getCellText(row, { id: "siteCol" });
+  window.openWebLinkIn(url, "tab");
+}
+
+function _UpdateContextMenu() {
+  const singleSelection = signonsTreeView.selection.count === 1;
+  const menuItems = new Map();
+  const menupopup = document.getElementById("signonsTreeContextMenu");
+  for (const menuItem of menupopup.querySelectorAll("menuitem")) {
+    menuItems.set(menuItem.id, menuItem);
+  }
+
+  if (!singleSelection) {
+    for (const menuItem of menuItems.values()) {
+      menuItem.setAttribute("disabled", "true");
+    }
+    return;
+  }
+
+  const selectedRow = signonsTree.currentIndex;
+
+  // Don't display "Launch Site URL" if we're not a browser.
+  if (window.openWebLinkIn) {
+    menuItems.get("context-launchsiteurl").removeAttribute("disabled");
+  } else {
+    menuItems.get("context-launchsiteurl").setAttribute("disabled", "true");
+    menuItems.get("context-launchsiteurl").setAttribute("hidden", "true");
+  }
+
+  // Disable "Copy Username" if the username is empty.
+  if (signonsTreeView.getCellText(selectedRow, { id: "userCol" }) !== "") {
+    menuItems.get("context-copyusername").removeAttribute("disabled");
+  } else {
+    menuItems.get("context-copyusername").setAttribute("disabled", "true");
+  }
+
+  menuItems.get("context-copysiteurl").removeAttribute("disabled");
+  menuItems.get("context-editusername").removeAttribute("disabled");
+  menuItems.get("context-copypassword").removeAttribute("disabled");
+
+  // Disable "Edit Password" if the password column isn't showing.
+  if (!document.getElementById("passwordCol").hidden) {
+    menuItems.get("context-editpassword").removeAttribute("disabled");
+  } else {
+    menuItems.get("context-editpassword").setAttribute("disabled", "true");
+  }
+}
+
+async function masterPasswordLogin(noPasswordCallback) {
+  // This does no harm if master password isn't set.
+  const tokendb = Cc["@mozilla.org/security/pk11tokendb;1"].createInstance(
+    Ci.nsIPK11TokenDB
+  );
+  const token = tokendb.getInternalKeyToken();
+
+  // If there is no master password, still give the user a chance to opt-out of displaying passwords
+  if (token.checkPassword("")) {
+    return noPasswordCallback ? noPasswordCallback() : true;
+  }
+
+  // So there's a master password. But since checkPassword didn't succeed, we're logged out (per nsIPK11Token.idl).
+  try {
+    // Relogin and ask for the master password.
+    token.login(true); // 'true' means always prompt for token password. User will be prompted until
+    // clicking 'Cancel' or entering the correct password.
+  } catch (_e) {
+    // An exception will be thrown if the user cancels the login prompt dialog.
+    // User is also logged out of Software Security Device.
+  }
+
+  return token.isLoggedIn();
+}
+
+function _escapeKeyHandler() {
+  // If editing is currently performed, don't do anything.
+  if (signonsTree.getAttribute("editing")) {
+    return;
+  }
+  window.close();
+}
+
+function _OpenMigrator() {
+    ChromeUtils.defineESModuleGetters(this, {
+      MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
+    });
+    MigrationUtils.showMigrationWizard(window, [
+    MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS,
+  ]);
+}
diff --git a/waterfox/browser/components/aboutpasswords/passwordManager.xhtml b/waterfox/browser/components/aboutpasswords/passwordManager.xhtml
new file mode 100644
index 0000000000000..9e6c6ce20cda5
--- /dev/null
+++ b/waterfox/browser/components/aboutpasswords/passwordManager.xhtml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/passwordManager.css" type="text/css"?>
+
+<window id="SignonViewerDialog"
+        windowtype="Toolkit:passwordManager"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        onload="_Startup();"
+        onunload="_Shutdown();"
+        title="Saved Logins"
+        style="min-width: 45em;"
+        persist="width height screenX screenY">
+
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/passwordManager.js"/>
+
+  <keyset>
+    <key keycode="VK_ESCAPE" oncommand="_escapeKeyHandler();"/>
+    <key key="w" modifiers="accel" oncommand="_escapeKeyHandler();"/>
+    <key key="f" modifiers="accel" oncommand="FocusFilterBox();"/>
+    <key key="k" modifiers="accel" oncommand="FocusFilterBox();"/>
+  </keyset>
+
+  <popupset id="signonsTreeContextSet">
+    <menupopup id="signonsTreeContextMenu"
+               onpopupshowing="_UpdateContextMenu()">
+      <menuitem id="context-copysiteurl"
+                label="Copy URL"
+                accesskey="y"
+                oncommand="_CopySiteUrl()"/>
+      <menuitem id="context-launchsiteurl"
+                label="Visit URL"
+                accesskey="V"
+                oncommand="_LaunchSiteUrl()"/>
+      <menuseparator/>
+      <menuitem id="context-copyusername"
+                label="Copy Username"
+                accesskey="U"
+                oncommand="_CopyUsername()"/>
+      <menuitem id="context-editusername"
+                label="Edit Username"
+                accesskey="d"
+                oncommand="_EditCellInSelectedRow('username')"/>
+      <menuseparator/>
+      <menuitem id="context-copypassword"
+                label="Copy Password"
+                accesskey="C"
+                oncommand="_CopyPassword()"/>
+      <menuitem id="context-editpassword"
+                label="Edit Password"
+                accesskey="E"
+                oncommand="_EditCellInSelectedRow('password')"/>
+    </menupopup>
+  </popupset>
+
+  <!-- saved signons -->
+  <vbox id="savedsignons" class="contentPane" flex="1">
+    <!-- filter -->
+    <hbox align="center">
+      <search-textbox id="filter" flex="1"
+                      aria-controls="signonsTree"
+                      oncommand="FilterPasswords();"
+                      accesskey="S"
+                      placeholder="Search"/>
+    </hbox>
+
+    <label control="signonsTree" id="signonsIntro"/>
+    <separator class="thin"/>
+    <tree id="signonsTree" flex="1"
+          width="750"
+          style="height: 20em;"
+          onkeypress="_HandleSignonKeyPress(event)"
+          onselect="_SignonSelected();"
+          editable="true"
+          context="signonsTreeContextMenu">
+      <treecols>
+        <treecol id="siteCol" label="Site" style="-moz-box-flex: 40"
+                 data-field-name="origin" persist="width"
+                 ignoreincolumnpicker="true"
+                 sortDirection="ascending"/>
+        <splitter class="tree-splitter"/>
+        <treecol id="userCol" label="Username" style="-moz-box-flex: 25"
+                 ignoreincolumnpicker="true"
+                 data-field-name="username" persist="width"/>
+        <splitter class="tree-splitter"/>
+        <treecol id="passwordCol" label="Password" style="-moz-box-flex: 15"
+                 ignoreincolumnpicker="true"
+                 data-field-name="password" persist="width"
+                 hidden="true"/>
+        <splitter class="tree-splitter"/>
+        <treecol id="timeCreatedCol" label="First Used" style="-moz-box-flex: 10"
+                 data-field-name="timeCreated" persist="width" />
+        <splitter class="tree-splitter"/>
+        <treecol id="timeLastUsedCol" label="Last Used" style="-moz-box-flex: 20"
+                 data-field-name="timeLastUsed" persist="width" />
+        <splitter class="tree-splitter"/>
+        <treecol id="timePasswordChangedCol" label="Last Changed" style="-moz-box-flex: 10"
+                 data-field-name="timePasswordChanged" persist="width hidden"/>
+        <splitter class="tree-splitter"/>
+        <treecol id="timesUsedCol" label="Times Used" flex="1"
+                 data-field-name="timesUsed" persist="width" />
+        <splitter class="tree-splitter"/>
+      </treecols>
+      <treechildren/>
+    </tree>
+    <separator class="thin"/>
+    <hbox id="SignonViewerButtons">
+      <button id="removeSignon" disabled="true"
+              label="Remove"
+              accesskey="R"
+              oncommand="DeleteSignon();"/>
+      <button id="removeAllSignons"
+              oncommand="_DeleteAllSignons();"/>
+      <spacer flex="1"/>
+      <button label="Import"
+              accesskey="I"
+              oncommand="_OpenMigrator();"/>
+      <button id="togglePasswords"
+              oncommand="_TogglePasswordVisible();"/>
+    </hbox>
+  </vbox>
+</window>
diff --git a/waterfox/browser/components/aboutwelcome/assets/float-doodle.svg b/waterfox/browser/components/aboutwelcome/assets/float-doodle.svg
new file mode 100644
index 0000000000000..ba4e9162beea1
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/float-doodle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 768" version="1.1"><g stroke="none" stroke-width="1" fill="#FFFFFF00" fill-rule="evenodd"><g transform="translate(1.000000, -20.000000)"><rect x="0" y="0" width="1024" height="768"></rect><path d="M795.0031,112.6652 C795.3651,115.7922 799.2471,113.4042 799.6101,115.0992 C799.8391,116.1642 795.8431,118.8072 794.9811,119.5352 C797.7651,121.2132 801.3191,117.3472 803.4061,115.7272 C804.4811,116.8942 804.8451,117.5072 803.8571,118.8422 C802.1151,121.1992 802.1941,118.0762 800.1221,119.7162 C800.9851,121.1662 801.7431,120.3352 802.8391,119.9452 C802.3621,122.7352 803.4311,120.9692 804.2681,122.7362 C804.9481,124.1732 804.8651,125.2352 805.0681,126.8402 C804.0841,129.1002 803.1011,131.3612 802.1171,133.6212 C800.9341,136.3402 801.2861,137.2142 798.3921,136.3052 C798.7181,135.7412 800.8831,132.9832 800.7071,132.3052 C800.5071,131.5302 797.5461,130.4582 796.7641,129.8072 C795.3881,128.6622 795.4031,127.6802 794.5251,126.4502 C794.8741,125.3062 794.6031,124.7712 793.7101,124.8482 L792.7241,127.4992 L792.7241,127.4992 C792.8061,129.3802 794.3951,129.2042 795.3321,131.0012 C796.7681,133.7512 795.9641,132.1282 794.7911,134.3412 C793.6391,136.5152 793.5101,139.2902 791.6161,140.3832 C792.6341,140.8302 793.6511,141.2772 794.6691,141.7232 C792.2931,144.3312 797.2351,143.0612 798.0521,142.8082 C797.2161,144.5832 796.3801,146.3582 795.5451,148.1332 C793.0401,146.7312 791.8041,144.0732 790.1361,141.8782 L786.3261,148.9602 L786.3261,148.9602 C787.5901,148.8432 788.8541,148.7272 790.1161,148.6102 C789.9401,148.9432 788.3221,151.2272 788.4601,151.7352 C789.0251,153.8062 793.3251,152.6382 792.8501,155.3472 C792.7881,155.6942 788.9341,159.5812 788.2731,159.9562 C790.2101,160.8262 791.0861,160.4652 790.3921,162.7502 L787.6941,161.1192 L787.6941,161.1192 C786.9281,162.4942 786.0411,163.8372 785.5531,165.3432 C785.6461,166.3282 785.4711,167.2612 785.0251,168.1432 C784.4951,168.9322 783.8981,169.6682 783.2341,170.3502 C782.7081,171.7352 782.5391,179.2952 783.1731,180.5282 C784.5871,178.7012 787.7481,181.9262 782.4131,181.9262 C780.0771,181.9262 780.2341,181.4402 779.3411,183.4922 C778.6391,185.1072 778.2591,186.5162 780.2501,186.6712 C778.7531,189.6202 779.0731,191.8922 778.9381,195.0352 C778.8281,197.5812 778.1141,200.1122 777.5851,202.6102 C778.0591,201.9292 778.5331,201.2492 779.0071,200.5682 C780.2841,203.2922 779.3111,205.5862 778.7041,208.5012 C777.3781,206.7502 777.2161,209.8742 776.0821,209.5512 C773.7691,208.8912 775.5011,208.4052 774.5611,206.8882 C773.7461,205.5742 773.8311,205.1972 772.3251,204.3942 C770.3271,203.3292 766.8251,203.2892 764.5651,202.9132 C760.7651,202.2792 756.9601,202.1202 753.1161,201.9532 C738.7261,201.3292 724.3861,201.1692 709.9981,201.9602 C696.7611,202.6882 683.2031,204.5442 670.2231,207.0582 C656.4041,209.7342 642.8881,212.2022 629.5041,216.7292 C626.9181,217.6042 624.3291,219.4292 621.7441,220.0702 C619.2911,220.6792 616.8331,220.6712 614.2761,221.5592 C608.1531,223.6852 601.8181,225.2972 595.6481,227.3262 C588.9991,229.5132 581.8031,231.3372 575.4751,234.3642 C572.7271,235.6792 570.2321,237.4622 567.4841,238.7942 C564.8961,240.0492 560.5441,241.1942 559.1771,244.0922 C558.6441,245.2222 558.7351,246.0412 559.0661,247.2122 C559.7301,249.5622 560.2541,249.3082 562.0581,249.1492 C564.5681,248.9272 567.8161,246.9742 570.2531,246.2062 C576.9251,244.1042 583.6771,242.4212 590.4621,240.7372 C602.6471,237.7122 614.8801,232.3562 626.9041,230.2612 C634.0351,229.0192 640.7911,225.6412 647.9611,224.3652 C649.5341,224.0862 654.0881,221.8412 655.3791,222.6172 C655.7211,222.8222 656.5591,225.2862 656.8541,225.8752 C657.9131,227.9912 659.1271,230.0342 660.5491,231.9292 C664.8351,237.6432 670.5841,242.2452 675.7151,247.1692 C681.5761,252.7942 686.6691,258.9992 692.0781,265.0372 C692.5481,264.4922 693.0171,263.9472 693.4861,263.4032 C692.9911,267.2162 695.8471,269.9662 698.1821,272.5552 C700.9531,275.6312 703.1821,278.5222 705.3671,282.0292 C707.1601,284.9052 709.4541,287.4232 711.4801,290.0432 C713.4721,292.6212 714.7981,295.7322 716.6311,298.5102 C720.8391,304.8912 724.9801,311.3952 729.2241,317.6902 C731.2221,320.6532 732.8001,323.9872 734.3811,327.3602 C735.6361,330.0372 739.4121,335.5112 739.4121,338.1082 C739.1411,339.3802 741.8991,347.0322 738.9511,343.4262 C738.4811,344.1542 738.0101,344.8822 737.5381,345.6102 C738.3451,345.2722 739.1501,344.9342 739.9571,344.5962 C737.5091,346.8132 742.0811,347.0982 742.1821,348.3372 C741.7741,348.7302 741.3671,349.1232 740.9601,349.5162 C740.2641,350.9502 739.3581,351.1362 738.2451,350.0742 C737.0181,350.1492 736.7731,349.4632 735.4051,349.9202 C736.7111,351.9592 738.3941,350.6702 739.0561,353.4882 C739.638453,355.970965 737.793165,356.503703 735.844474,357.972056 L735.722663,358.0642 L735.680112,358.210859 C735.255054,359.480777 734.050386,358.93995 732.7081,358.6632 C729.4981,358.0022 725.9511,356.7352 722.8251,355.7602 C716.0681,353.6532 709.2591,351.8772 702.2731,350.4362 C686.3331,347.1472 670.5211,347.3022 654.4361,346.2622 C654.8591,344.5002 654.8621,344.6552 654.3601,343.5632 C655.0041,344.9632 651.1191,343.1352 654.0471,346.2282 C646.5731,347.4502 638.5001,346.5312 630.9201,346.9382 C631.2731,346.1522 632.0841,345.2482 631.3261,344.6792 C627.7371,349.8682 615.7451,347.6432 609.8171,348.3862 C606.3371,348.8232 602.8981,349.6602 599.4291,350.2112 L597.968785,350.44011 C596.750651,350.633608 595.5331,350.846057 594.3431,351.1682 C592.8101,351.5812 590.2561,353.2782 588.8031,352.8842 C590.9301,348.5962 588.4771,352.3082 588.1431,352.3572 C587.1331,352.5062 585.3941,352.8462 583.9431,352.8462 C585.5971,346.2052 588.4341,340.0862 589.5771,333.2462 C590.2901,328.9822 592.2481,322.1142 588.0321,319.0922 C585.7221,317.4362 581.9361,317.0772 579.2611,316.5142 C576.3291,315.8972 571.2061,315.9222 568.6551,314.2652 C566.6631,312.9702 566.2421,311.7802 563.6331,310.7902 C560.6231,309.6482 559.2351,308.5142 556.1941,309.4372 C557.4311,307.8882 559.1641,306.7582 556.7361,305.1752 C555.7411,304.5282 553.7911,305.3992 553.4421,303.9832 C551.6401,305.2562 552.0671,306.2842 551.5851,308.0292 C551.6291,308.7672 551.8231,309.4712 552.1691,310.1392 C551.2151,310.5232 550.2621,310.9072 549.3081,311.2912 C549.9141,309.6622 548.1351,310.6332 547.7801,309.8322 C547.2511,308.6352 547.5651,306.8082 547.5651,305.5092 C545.5991,306.1302 543.5431,306.8982 542.6831,308.9442 C540.2761,307.5092 541.2321,307.4112 542.4661,305.2582 C540.4451,304.7802 540.0171,305.8202 539.7101,307.4942 C538.6441,307.1642 537.5761,306.8352 536.5101,306.5062 C538.9141,306.4892 539.4911,304.6112 539.5481,302.5712 C538.6131,302.8752 537.6781,303.1802 536.7421,303.4842 C536.5501,304.4712 536.3581,305.4582 536.1661,306.4452 C534.6931,307.6932 530.8611,305.4392 529.6181,304.7942 C525.2841,302.5472 523.6981,301.8972 524.3091,296.7912 C524.8201,292.5112 525.9511,288.2102 526.2021,283.9082 C526.4811,279.1292 525.9231,274.0182 525.5041,269.2542 C524.6921,260.0352 523.3851,250.9502 522.9271,241.6932 C522.6801,236.6812 522.4041,231.6682 522.2071,226.6532 C522.0511,222.6672 520.6751,218.2812 525.6481,217.9272 C525.0401,215.9972 526.8611,213.7652 528.7401,212.7082 C529.3971,211.2112 530.1151,211.0772 530.8961,212.3082 C531.5741,212.5212 532.2041,212.4212 532.7871,212.0062 C535.5251,211.3852 538.8091,207.5002 541.2671,206.0992 C543.6771,204.7262 548.9321,202.7302 550.6531,200.4182 C552.3171,198.1812 549.8001,198.4332 550.3091,196.3832 C551.0031,193.5812 553.5321,197.6052 553.9201,198.1652 C554.7651,197.3162 557.9931,195.7242 557.9551,194.4902 C557.1641,194.3492 556.3741,194.2082 555.5831,194.0672 C556.4471,193.5682 558.3641,192.0782 559.3691,191.8812 C561.0771,191.5462 560.4361,191.1132 561.8051,192.9962 C562.2811,192.2582 563.4391,189.8332 564.1641,189.3422 C564.5101,189.1072 566.5661,188.9512 566.9971,188.7992 C569.2351,188.0082 569.0091,186.2672 570.6541,185.4392 C571.4521,185.0382 572.4341,185.6542 573.1041,185.3622 C574.1741,184.8942 574.1771,183.2972 575.1481,182.7182 C575.9881,182.2162 578.1181,182.6332 579.1211,182.2682 C580.7831,181.6612 580.7101,181.0962 581.9501,179.9882 C583.6891,178.4352 585.2901,178.6602 587.2271,177.4832 C589.2351,176.2632 588.9271,173.5162 590.7491,172.9922 C593.1821,172.2932 593.8051,174.5972 595.1281,172.3212 C595.4261,171.8102 594.0761,171.0462 594.9231,170.2262 C595.9671,169.2162 596.3991,170.4212 596.8781,171.2062 L598.5301,168.0892 L598.5301,168.0892 C601.1781,169.5392 600.0661,167.6692 602.0871,166.6732 C602.9841,166.2312 603.7231,167.1042 604.7061,166.5702 C605.4291,166.1782 605.5541,165.3242 606.0731,164.7952 C607.0711,163.7782 607.6231,162.3822 609.1691,161.8982 C608.6101,162.0722 613.1901,161.9402 612.7811,161.7442 C612.3361,161.0902 611.8901,160.4362 611.4441,159.7822 C613.8411,159.7822 615.9341,160.0202 618.2531,159.3002 C619.0741,159.0462 620.3571,158.6542 621.0401,158.1322 C622.9171,156.6972 622.4941,157.0472 622.4941,154.4112 C625.0831,156.0592 628.3791,155.4832 630.9341,153.5722 C632.2681,152.5742 633.1231,151.3802 634.5861,150.4782 C635.2141,150.1532 635.8531,149.8492 636.5011,149.5672 C637.3131,148.7272 638.1261,148.7192 638.9411,149.5442 C640.0931,149.2352 640.0801,149.0222 640.9731,148.4632 C641.2291,147.9572 641.5011,147.4602 641.7931,146.9732 C642.7511,146.8732 643.6951,146.7002 644.6271,146.4542 C648.2441,145.4812 650.4281,143.0672 653.7851,145.2062 C654.2141,144.3312 654.6441,143.4552 655.0721,142.5792 C656.5011,144.8112 657.4781,142.6792 659.3741,141.7752 C660.1691,141.3962 661.2011,141.3022 661.9191,140.9562 L663.1331,141.2432 L663.1331,141.2432 C663.4761,140.1832 663.8181,139.1232 664.1601,138.0632 C664.8511,138.3322 667.5901,139.8032 668.4131,139.7252 C669.5931,139.6142 671.0031,137.6172 672.1461,137.2402 C673.8901,136.6652 673.2651,137.4252 674.9781,137.4372 C676.2951,137.4462 676.9161,137.6332 678.0541,136.5272 C674.2081,135.5282 679.0601,135.0572 680.6811,134.7192 C683.2061,134.1932 684.5071,134.7552 686.2611,132.7602 L684.4401,132.7602 C686.2371,131.1252 685.6321,131.7022 687.5241,131.8622 C688.1201,131.9112 690.7121,133.3342 690.7171,131.4362 C693.1621,132.8772 693.1891,132.8802 695.7101,132.2302 C696.8261,131.9422 697.7761,131.0052 699.0031,130.9832 C700.2001,130.9622 701.0581,131.5032 702.1261,131.3872 C702.7651,131.3192 705.0021,130.4802 705.7581,130.2052 C706.9571,129.7682 707.7471,128.8352 708.8941,128.4742 C710.1561,128.0752 711.7621,128.5492 713.0881,128.2582 C717.0311,127.3902 719.3451,125.0302 723.6141,126.3082 C724.0701,122.4872 728.8321,123.3372 731.3951,123.7312 C733.1791,124.0062 734.0881,124.7282 735.9351,123.8542 C737.4391,123.1432 738.2961,122.0152 739.9701,121.4472 C741.2541,121.0112 742.9841,120.6942 744.3251,120.4162 C745.1541,120.1542 746.0011,120.0702 746.8661,120.1652 C747.7351,120.287117 748.463774,120.665318 749.051351,121.298264 L749.159663,121.4232 C749.293248,121.107805 751.3131,119.611311 751.0811,119.7962 C752.5891,118.5892 753.2961,119.0502 754.2231,116.7002 L750.9911,116.0182 L750.9911,116.0182 C752.6551,115.9062 753.9051,115.7142 755.3851,116.3612 C756.4081,116.8082 758.1271,119.1772 759.1521,119.1792 C761.0051,119.1812 761.6531,116.5702 761.4691,115.2112 C763.0241,118.8322 764.3511,119.4352 767.8431,117.5842 C768.2531,117.3662 768.6641,117.1492 769.0741,116.9312 C769.9051,116.0602 770.7311,116.0762 771.5531,116.9802 L773.0171,117.7772 L773.0171,117.7772 C773.6041,116.8002 774.1901,115.8242 774.7781,114.8472 C776.0241,116.5632 777.2081,116.6472 779.2401,116.2462 C780.6411,115.9692 783.5171,113.4302 784.5501,113.4312 C785.1491,113.4312 785.9141,114.8912 786.9131,115.1762 C788.5661,115.6502 791.1351,114.4582 791.7241,112.8762 C792.0371,113.5362 792.3501,114.1972 792.6621,114.8582 C793.4431,114.1282 794.2271,113.4002 795.0031,112.6652 Z M735.669663,358.0522 L735.6671,358.1082 L735.6671,358.1082 L735.722663,358.0642 L735.7241,358.0622 L735.669663,358.0522 Z M733.6411,354.6072 L733.6411,357.6822 L734.682225,357.8722 L734.682225,357.8722 L735.669663,358.0522 L735.679742,357.883501 C735.72373,356.40466 734.965862,355.309105 733.6411,354.6072 Z M641.6211,342.3732 C641.2961,343.3692 640.9721,344.3662 640.6481,345.3622 C641.7411,345.4512 642.8351,345.5402 643.9291,345.6302 C643.1591,344.5442 642.3901,343.4592 641.6211,342.3732 Z M513.1937,263.5793 C515.5847,264.2773 515.5517,264.1923 516.0317,266.4043 C518.7627,278.9943 510.3127,293.4343 516.5167,305.4023 C498.3807,305.2553 480.2077,305.6173 462.1777,307.7423 C462.1777,300.8863 462.4027,294.0453 461.8847,287.2003 C461.6497,284.0933 461.2987,280.9973 460.9817,277.8983 C460.5807,273.9653 460.7077,274.1953 463.9267,273.5183 C465.6177,273.1623 466.2227,272.0903 467.8387,271.4373 C469.0517,270.9463 469.5957,271.5503 470.7917,271.7183 C472.9307,272.0203 472.9567,271.6613 474.9167,271.2433 C479.1237,270.3463 482.6967,270.6663 486.0207,267.5253 C487.7437,267.3763 487.1857,268.9723 488.3867,268.8163 C489.2597,268.7023 489.8157,267.0723 490.7067,266.6833 C493.4777,265.4703 498.0907,265.7663 501.1227,265.3873 C504.2197,265.0013 506.9607,263.6043 509.9257,263.1903 C511.1467,263.0203 512.0367,263.2413 513.1937,263.5793 Z M548.1781,299.9152 C547.592822,302.092006 545.025426,299.258221 544.985249,300.965517 L544.987663,301.1212 L544.993322,301.083018 C545.128489,300.79063 547.725162,304.227512 547.5721,304.1132 C548.9671,305.1642 549.7801,305.0652 551.3611,303.8592 C548.5311,303.7522 548.8431,302.0062 548.1781,299.9152 Z M556.0641,302.9912 C557.0971,303.5592 557.4131,302.1062 557.9481,301.2192 C556.7941,300.6442 556.6241,301.9822 556.0641,302.9912 Z M552.8671,293.5202 C553.2691,294.9342 553.2401,296.0182 553.2401,297.4782 C555.6291,297.1402 556.3801,296.9662 556.4241,294.4252 L555.1471,295.2282 C554.4771,293.9012 554.3291,293.7982 552.8671,293.5202 Z M534.3791,295.8872 C534.9201,295.5392 535.4611,295.1902 536.0021,294.8412 C535.2041,293.6932 533.7851,295.0582 534.3791,295.8872 Z M540.4211,274.7612 C541.1111,274.3992 541.8031,274.0372 542.4931,273.6752 C540.7011,271.3902 540.5701,272.1572 540.4211,274.7612 Z M537.9241,256.6372 L535.2081,256.6372 C535.7401,258.3832 537.9241,258.7592 537.9241,256.6372 Z M804.0266,155.0551 C804.6466,155.4171 805.2676,155.7791 805.8876,156.1401 C804.2756,157.6091 802.2936,159.0901 803.8636,160.8121 C805.1106,162.1791 810.9326,162.8311 812.6766,163.3291 C812.0716,164.0251 810.8246,165.9271 809.9996,166.4061 C809.3456,166.7851 808.7486,165.2841 807.4306,166.7791 C809.6166,167.9131 809.0306,167.0541 808.4626,169.4591 C808.1276,170.8781 806.9286,172.4021 806.2536,173.6751 C804.6086,176.7721 802.9256,179.8491 801.2006,182.9021 C797.6616,189.1631 793.9356,195.3201 790.0206,201.3541 C789.3606,197.9461 791.2486,194.1271 792.2276,190.8391 C793.4596,186.7011 794.6936,182.5651 795.9336,178.4301 C798.3266,170.4621 800.4746,162.5771 804.0266,155.0551 Z M709.0401,165.4522 C707.2711,165.9032 706.1121,166.1972 704.2831,166.6632 C706.9401,167.5092 706.9401,167.5092 709.0401,165.4522 Z M787.3651,150.0932 C785.1091,151.1492 784.8681,151.9162 786.6931,153.2082 C786.9101,152.2032 787.0691,151.4662 787.3651,150.0932 Z M787.0911,125.1042 C786.7851,126.4452 784.8881,125.1552 784.4681,126.1352 C783.5061,128.3772 786.5641,128.0732 787.6661,127.9382 C787.4751,126.9932 787.2821,126.0492 787.0911,125.1042 Z M799.8751,123.4022 C799.2711,126.2692 799.2711,126.2692 802.0671,126.7002 C801.3331,125.5962 800.7181,124.6702 799.8751,123.4022 Z M749.159663,121.4232 L749.1547,121.453632 C749.157395,121.471088 749.174396,121.479496 749.2081,121.4772 L749.2081,121.4772 L749.159663,121.4232 Z" fill="#7fbbca"></path><g transform="translate(-1.000045, 19.255000)" fill="#2d3d8b"><path d="M396.601745,402.4602 C396.177745,404.6432 395.117745,405.6712 396.228745,407.6762 C397.171745,409.3792 399.875745,410.4942 401.690745,410.0632 L396.601745,402.4602 Z M347.427745,324.8142 L338.474745,327.8832 C340.921745,330.2842 343.253745,332.8082 345.951745,334.9402 L347.427745,324.8142 Z M495.106745,332.6742 C490.836745,330.5222 486.053745,330.2792 481.372745,330.0032 C482.083745,333.8462 482.796745,337.6902 483.509745,341.5332 C487.374745,338.5802 491.241745,335.6272 495.106745,332.6742 L495.106745,332.6742 Z M392.573745,630.1692 C391.721745,628.6602 385.909745,617.0012 384.701745,617.6002 C384.060745,617.9172 384.010745,624.4082 383.916745,625.3312 C383.583745,628.6152 383.249745,631.8982 382.916745,635.1822 C386.354745,633.9682 390.026745,632.9612 392.573745,630.1692 L392.573745,630.1692 Z M351.965745,535.9152 C352.844745,538.4912 353.724745,541.0682 354.603745,543.6452 C355.021745,544.8702 355.266745,546.6772 356.006745,547.7582 C356.967745,549.1602 356.242745,549.9852 357.525745,548.4502 C358.903745,546.8012 359.315745,542.4032 359.913745,540.3832 C360.822745,537.3142 361.730745,534.2472 362.638745,531.1792 C358.357745,531.1432 355.762745,534.6682 351.965745,535.9152 L351.965745,535.9152 Z M262.003745,384.1752 C256.739745,387.7732 251.410745,391.3422 246.830745,395.8142 C250.859745,395.5632 256.469745,398.3352 260.264745,397.0332 C262.016745,397.4072 262.595745,396.7422 262.003745,395.0362 L262.003745,391.4922 L262.003745,384.1752 Z M340.055745,409.6272 L340.055745,430.6342 C344.970745,426.4462 350.143745,422.5562 354.872745,418.1522 C349.933745,415.3102 344.995745,412.4692 340.055745,409.6272 L340.055745,409.6272 Z M515.756745,464.0582 C514.205745,473.4102 514.119745,483.0342 513.694745,492.4982 C513.619745,494.1782 512.972745,496.7072 514.091745,498.1782 C515.214745,499.6532 518.413745,500.4702 520.039745,501.2582 C524.614745,503.4762 529.158745,505.7572 533.720745,508.0022 C527.732745,493.3542 521.744745,478.7062 515.756745,464.0582 L515.756745,464.0582 Z M631.907745,406.5452 C643.193745,400.9972 654.480745,395.4492 665.767745,389.9002 C654.701745,385.2152 643.634745,380.5312 632.569745,375.8462 C632.348745,386.0792 632.127745,396.3132 631.907745,406.5452 L631.907745,406.5452 Z M515.732745,432.6662 C517.795745,432.8142 518.121745,424.9572 518.462745,422.8792 C519.112745,418.9352 519.778745,414.9942 520.461745,411.0552 C521.828745,403.1812 523.264745,395.3192 524.776745,387.4722 C527.800745,371.7802 531.135745,356.1472 534.831745,340.6002 C530.859745,339.8842 527.210745,339.3692 523.331745,338.2132 C520.198745,337.2792 516.467745,337.7872 513.670745,335.8452 C513.307745,343.1302 515.126745,350.8752 515.799745,358.1602 C516.579745,366.5892 516.998745,374.9742 516.929745,383.4412 C516.793745,399.8502 516.170745,416.2632 515.732745,432.6662 L515.732745,432.6662 Z M255.950745,654.9852 C257.906745,654.4642 255.243745,627.6512 255.124745,623.7842 C254.784745,612.5892 254.718745,601.3862 254.918745,590.1882 C244.380745,596.7962 233.597745,602.8822 222.465745,608.3712 C225.326745,612.0822 228.007745,616.0842 231.173745,619.5382 C234.435745,623.0952 238.177745,626.0102 241.200745,629.8412 C247.286745,637.5562 251.455745,646.3142 255.950745,654.9852 L255.950745,654.9852 Z M509.537745,496.3672 C510.027745,488.3022 510.481745,480.2542 511.295745,472.2132 C511.642745,468.7912 514.949745,450.6082 509.654745,451.0352 C506.642745,451.2782 501.359745,455.6862 498.597745,457.2312 C494.949745,459.2712 491.296745,461.3052 487.630745,463.3142 C480.396745,467.2782 473.114745,471.1542 465.854745,475.0712 C480.415745,482.1702 494.976745,489.2692 509.537745,496.3672 L509.537745,496.3672 Z M478.099745,328.6682 C472.068745,328.2182 466.238745,327.7702 460.289745,326.6472 C457.081745,326.0412 453.873745,326.1252 450.648745,325.7162 C448.338745,325.4232 443.823745,323.5262 441.671745,324.1472 C438.967745,324.9272 437.985745,338.4782 437.613745,341.8792 C437.014745,347.3572 436.610745,354.0032 439.057745,359.1492 C443.773745,369.0692 456.480745,361.3262 462.662745,357.1652 C467.961745,353.5972 473.964745,349.9842 478.664745,345.6532 C482.827745,341.8162 479.090745,333.6262 478.099745,328.6682 L478.099745,328.6682 Z M509.376745,436.5432 C513.920745,434.7052 513.848745,432.3972 514.046745,427.6432 C514.286745,421.8672 514.426745,416.0842 514.591745,410.3052 C514.885745,400.0072 515.163745,389.7042 515.071745,379.4002 C514.982745,369.3352 514.489745,359.2862 513.337745,349.2832 C512.930745,345.7462 513.335745,339.7052 511.471745,336.6882 C509.770745,333.9362 504.490745,333.9072 501.609745,334.0772 C498.361745,334.2682 495.730745,337.3532 493.333745,339.3032 C490.678745,341.4642 485.223745,344.5062 484.788745,347.7282 C484.300745,351.3262 486.277745,356.4602 487.043745,359.9502 C489.844745,372.6872 493.252745,385.2992 496.842745,397.8332 C500.566745,410.8372 504.340745,423.9722 509.376745,436.5432 L509.376745,436.5432 Z M393.928745,406.0552 C394.221745,403.1932 395.286745,400.8032 393.846745,398.0772 C392.609745,395.7332 390.595745,393.3782 389.082745,391.1592 C384.752745,384.8032 379.896745,378.7152 375.179745,372.6432 C370.859745,367.0822 366.433745,361.5802 361.905745,356.1872 C359.383745,353.1842 356.783745,350.2462 354.199745,347.2962 C352.306745,345.1372 350.512745,342.1032 347.835745,340.9732 C345.862745,353.3702 344.232745,365.8212 342.960745,378.3102 C342.346745,384.3472 341.816745,390.3932 341.371745,396.4452 C341.245745,398.1532 339.920745,403.9222 340.767745,405.5132 C341.658745,407.1842 347.103745,409.4202 348.770745,410.4442 C353.430745,413.3082 357.051745,417.6232 361.483745,412.9152 C364.534745,409.6732 366.991745,405.1032 370.401745,402.2742 C372.178745,400.8002 373.851745,400.8692 375.844745,399.9942 C378.161745,398.9782 378.234745,397.9992 381.003745,399.3822 C385.668745,401.7112 388.502745,405.1532 393.928745,406.0552 L393.928745,406.0552 Z M160.379745,469.8402 C160.379745,478.4232 159.792745,485.4792 165.610745,492.4272 C170.694745,498.4992 175.977745,499.9042 183.128745,502.3002 C187.339745,503.7102 187.633745,502.4102 191.045745,500.0282 C194.288745,497.7662 197.819745,495.9512 201.017745,493.6172 C207.910745,488.5872 214.798745,483.3992 221.497745,478.1082 C223.749745,476.3292 223.417745,476.9362 223.075745,474.8012 C222.762745,472.8562 221.366745,470.3802 220.603745,468.5302 C219.223745,465.1832 217.597745,461.9442 215.970745,458.7112 C214.123745,455.0432 212.514745,451.0592 210.220745,447.6392 C209.268745,446.2202 208.138745,444.9362 207.027745,443.6422 C204.688745,440.9172 204.771745,441.0182 201.974745,443.2452 C196.069745,447.9482 190.575745,453.0392 183.929745,456.7162 C176.066745,461.0682 168.222745,465.4492 160.379745,469.8402 L160.379745,469.8402 Z M338.428745,403.3552 C339.281745,391.0332 340.243745,378.7792 341.720745,366.5132 C342.479745,360.2152 343.362745,353.9342 344.221745,347.6492 C344.571745,345.0902 345.921745,340.7952 345.169745,338.3092 C344.430745,335.8622 341.168745,333.5332 339.378745,331.7632 C338.897745,331.2872 337.418745,329.2902 336.782745,329.2002 C336.101745,329.1052 333.538745,330.9822 332.799745,331.4052 C330.185745,332.9042 327.618745,334.4802 325.090745,336.1202 C320.326745,339.2112 315.710745,342.5282 311.193745,345.9692 C301.721745,353.1842 292.688745,360.9482 283.417745,368.4162 C291.911745,375.8602 302.366745,381.6412 311.863745,387.6702 C317.478745,391.2352 323.122745,394.7612 328.839745,398.1602 C331.738745,399.8822 335.100745,402.5152 338.428745,403.3552 L338.428745,403.3552 Z M222.314745,623.6972 C215.455745,628.2322 208.905745,633.0192 201.148745,635.9292 C193.426745,638.8272 185.794745,639.9422 177.813745,641.6642 C173.788745,642.5332 170.005745,643.4832 165.897745,644.0912 C163.595745,644.4312 160.032745,644.3002 157.933745,645.2722 C156.064745,644.8742 155.398745,645.5112 155.937745,647.1842 C155.957745,647.7042 155.977745,648.2242 155.997745,648.7442 C156.526745,655.9772 161.175745,664.6812 165.230745,670.5612 C167.597745,673.9952 170.613745,677.1902 173.610745,680.0762 C176.994745,683.3352 178.945745,685.6332 183.662745,684.2682 C191.613745,681.9662 198.630745,677.3332 206.689745,675.2902 C213.064745,673.6742 218.359745,670.2872 224.576745,668.5342 C232.243745,666.3722 239.830745,663.9082 247.603745,662.1022 C244.131745,655.4002 241.026745,648.4222 236.581745,642.2832 C232.022745,635.9832 226.995745,629.9292 222.314745,623.6972 L222.314745,623.6972 Z M264.381745,398.1792 C278.725745,401.0342 294.272745,403.6772 307.110745,411.0822 C312.120745,413.9722 318.471745,418.4392 319.938745,424.4162 C321.692745,431.5602 314.796745,435.9852 309.036745,438.2152 C302.120745,440.8922 294.592745,441.9182 287.264745,442.7622 C283.385745,443.2092 279.488745,443.4532 275.591745,443.6742 C272.437745,443.8542 267.088745,443.1612 264.205745,444.4112 C262.399745,444.0512 261.773745,444.7832 262.327745,446.6082 C262.293745,447.2632 262.260745,447.9192 262.227745,448.5742 L261.928745,454.4642 C261.729745,458.3862 261.530745,462.3092 261.330745,466.2312 C260.897745,474.7752 260.463745,483.3202 260.030745,491.8642 C267.543745,487.2092 273.598745,480.5442 280.941745,475.5782 C284.432745,473.2172 287.898745,470.8512 291.375745,468.4982 C292.833745,467.5122 293.724745,466.1292 295.159745,465.2102 C297.062745,463.9912 298.749745,463.2582 300.534745,461.6612 C307.824745,455.1412 315.931745,449.5052 323.663745,443.5202 C327.175745,440.8002 331.020745,438.3002 334.362745,435.3832 C337.862745,432.3272 337.378745,429.8112 337.292745,425.4182 C337.202745,420.7672 338.909745,414.9922 338.117745,410.5072 C338.782745,408.9852 338.271745,408.0382 336.586745,407.6662 C335.460745,406.9462 334.335745,406.2262 333.209745,405.5062 C330.964745,404.0702 328.719745,402.6342 326.474745,401.1992 C317.543745,395.4882 308.613745,389.7762 299.682745,384.0652 C295.221745,381.2122 290.760745,378.3592 286.298745,375.5062 C285.052745,374.7102 280.988745,371.1102 279.590745,371.2162 C278.164745,371.3242 275.690745,374.1082 274.621745,374.9942 C272.981745,376.3522 271.389745,377.7812 269.617745,378.9702 C268.734745,379.5822 267.812745,380.1282 266.852745,380.6092 C265.317745,380.7572 264.784745,381.6002 265.251745,383.1372 C263.903745,387.4612 264.644745,393.6372 264.381745,398.1792 L264.381745,398.1792 Z M463.293745,602.0252 C460.045745,586.8402 455.856745,568.8592 443.187745,558.5302 C430.338745,548.0542 411.553745,552.1022 401.502745,564.4042 C396.468745,570.5662 393.347745,577.8512 391.029745,585.4002 C388.649745,593.1482 385.142745,603.2432 385.784745,611.4372 C386.065745,615.0292 389.143745,618.8902 390.902745,622.0242 C392.717745,625.2612 393.922745,629.9022 398.200745,628.7812 C404.833745,627.0422 411.579745,623.0502 417.786745,620.1932 C424.064745,617.3022 430.674745,614.9242 437.184745,612.1322 C441.506745,610.2792 445.993745,608.8692 450.304745,606.9892 C454.392745,605.2082 459.786745,604.7782 463.293745,602.0252 L463.293745,602.0252 Z M655.224745,511.5822 C664.284745,514.8252 668.993745,509.6342 675.368745,503.7902 C681.407745,498.2542 687.950745,492.9302 693.511745,486.9132 C699.247745,480.7092 703.781745,473.3772 708.191745,466.2112 C712.649745,458.9692 718.675745,451.1472 721.420745,443.0812 C722.816745,438.9782 723.412745,434.4322 724.292745,430.1912 C724.504745,429.1702 725.925745,425.3712 725.474745,424.5122 C724.852745,423.3312 720.896745,423.2062 719.810745,423.0342 C711.165745,421.6672 702.004745,421.5992 693.333745,422.8212 C676.556745,425.1852 662.525745,434.5942 657.222745,451.0462 C651.006745,470.3322 653.993745,491.7682 655.224745,511.5822 L655.224745,511.5822 Z M596.481745,344.3002 C596.341745,347.6392 604.345745,348.5672 606.420745,349.3462 C611.214745,351.1442 615.981745,353.0432 620.636745,355.1712 C630.223745,359.5532 640.446745,362.4082 649.626745,367.7062 C669.415745,379.1272 690.898745,387.1782 710.890745,398.1022 C714.005745,399.8052 720.092745,403.9062 723.650745,403.5592 C725.541745,403.3752 724.132745,404.8972 725.359745,401.8912 C725.800745,400.8092 725.947745,399.4022 726.194745,398.2432 C726.935745,394.7702 727.508745,391.2652 728.340745,387.8112 C729.709745,382.1262 731.107745,376.8522 731.684745,371.0092 C731.929745,368.5332 732.197745,366.0602 732.226745,363.5702 C732.256745,361.0462 732.837745,354.7222 731.698745,352.5372 C730.942745,351.0882 730.791745,351.5852 728.903745,351.1762 C727.821745,350.9422 726.686745,350.4552 725.643745,350.1302 C723.194745,349.3682 720.743745,348.6362 718.175745,348.4122 C715.638745,348.1902 714.019745,347.4182 711.640745,346.9702 C709.144745,346.5002 706.580745,347.0702 704.037745,346.4142 C701.292745,345.7052 699.982745,345.0582 697.114745,345.3292 C694.333745,345.5912 693.533745,344.9752 690.810745,344.2172 C688.537745,343.5852 685.829745,344.0272 683.460745,343.8352 C680.593745,343.6012 677.735745,343.2432 674.866745,343.0162 C661.966745,341.9952 648.913745,343.5092 635.983745,343.3892 C628.952745,343.3242 622.072745,344.3622 615.051745,344.0412 C608.915745,343.7612 602.572745,343.8272 596.481745,344.3002 L596.481745,344.3002 Z M630.040745,412.2892 C623.765745,414.6792 617.946745,418.5612 612.128745,421.9042 C605.419745,425.7592 598.998745,429.8552 592.789745,434.4782 C582.350745,442.2522 570.168745,451.5732 567.420745,465.1382 C564.601745,479.0602 576.691745,490.4672 588.026745,496.1632 C600.953745,502.6582 615.992745,506.0172 630.152745,508.4982 C628.638745,476.4492 628.994745,444.3472 630.040745,412.2892 L630.040745,412.2892 Z M442.308745,487.7412 C438.501745,488.7932 435.278745,491.0462 431.746745,492.7132 C428.583745,494.2062 425.522745,495.3322 422.567745,497.2542 C417.752745,500.3872 412.170745,503.0692 407.136745,505.4922 C394.680745,511.4852 382.587745,518.9282 370.255745,525.5702 C366.987745,527.3312 365.916745,528.4432 364.809745,532.0672 C363.607745,536.0032 362.474745,539.9662 361.316745,543.9162 C360.236745,547.6002 358.512745,551.5392 358.966745,555.4282 C359.362745,558.8112 361.112745,562.0022 362.431745,565.0882 C365.753745,572.8542 369.354745,580.4962 373.075745,588.0772 C376.414745,594.8832 379.461745,602.1042 383.747745,608.3602 C387.078745,590.9862 390.067745,571.5192 402.980745,558.2802 C415.883745,545.0512 436.468745,544.8642 448.902745,558.5202 C454.809745,565.0072 458.404745,573.1772 461.230745,581.3862 C462.714745,585.6992 463.711745,590.0942 464.666745,594.5482 C465.686745,599.3062 465.435745,601.8312 470.685745,600.3892 C474.854745,599.2442 479.274745,598.3302 483.361745,597.0242 C485.481745,596.3472 487.549745,595.5862 487.645745,593.9112 C487.767745,591.7962 484.919745,587.4652 484.078745,585.4752 C479.735745,575.2042 475.391745,564.9322 471.047745,554.6612 C466.330745,543.5082 461.612745,532.3552 456.893745,521.2032 C454.539745,515.6382 452.184745,510.0742 449.829745,504.5102 C447.681745,499.4382 445.892745,491.9062 442.308745,487.7412 L442.308745,487.7412 Z M630.393745,401.0082 C630.463745,395.9372 630.547745,390.8662 630.613745,385.7942 C630.653745,382.7722 632.000745,376.9282 629.368745,374.7692 C627.736745,373.4312 622.895745,372.4052 620.831745,371.4892 C616.758745,369.6832 612.348745,368.8772 608.251745,367.0832 C592.205745,360.0542 575.506745,354.2002 558.985745,348.5352 C555.423745,347.3132 551.782745,346.3132 548.196745,345.1102 C546.260745,344.4612 539.089745,340.6472 537.298745,341.6452 C535.729745,342.5182 534.546745,352.9182 534.044745,355.0772 C532.855745,360.1892 531.718745,365.3142 530.626745,370.4482 C526.385745,390.3802 522.828745,410.4522 519.520745,430.5582 C528.308745,427.2212 536.731745,421.4392 545.034745,416.9692 C553.659745,412.3262 562.254745,407.6942 570.938745,403.1582 C573.389745,401.8772 582.012745,395.9912 584.030745,398.3012 C587.267745,402.0082 579.554745,406.3562 577.529745,407.9442 C569.697745,414.0872 561.423745,419.4422 553.047745,424.8002 C544.368745,430.3542 535.336745,435.2602 526.612745,440.7122 C523.463745,442.6802 518.436745,445.0762 517.198745,448.4002 C515.606745,452.6762 516.755745,457.8732 518.205745,461.9582 C521.765745,471.9972 525.664745,481.9122 529.787745,491.7322 C531.662745,496.1972 533.585745,500.6422 535.544745,505.0702 C537.877745,510.3442 540.938745,511.4592 546.021745,513.8862 C567.675745,524.2262 590.167745,534.0392 610.966745,546.0042 C607.485745,550.0162 599.001745,543.4282 595.566745,541.7602 C589.204745,538.6702 582.836745,535.5902 576.479745,532.4912 C564.636745,526.7182 552.853745,520.8302 540.943745,515.1962 C548.576745,532.5572 557.584745,549.2842 567.572745,565.3992 C565.050745,566.2532 565.665745,566.2982 564.082745,564.7812 C562.749745,563.5042 561.854745,561.0022 560.951745,559.3982 C559.084745,556.0852 557.242745,552.7592 555.361745,549.4542 C551.459745,542.5952 547.415745,535.8402 543.852745,528.7942 C541.172745,523.4962 539.096745,514.2342 533.588745,511.5632 C526.725745,508.2332 519.771745,504.9922 512.908745,501.6152 C512.908745,528.0102 514.805745,553.8192 517.589745,580.0512 C517.730745,581.3742 518.998745,585.2782 516.441745,584.8962 C515.288745,584.7232 514.899745,577.4852 514.697745,575.9742 C513.767745,569.0452 512.978745,562.0992 512.333745,555.1392 C511.048745,541.2502 510.349745,527.3052 510.259745,513.3572 C508.612745,526.9182 506.965745,540.4792 505.318745,554.0402 L502.977745,573.3172 C502.567745,576.6922 502.157745,580.0672 501.747745,583.4422 C501.559745,584.9932 501.678745,587.0202 501.133745,588.4992 C500.276745,590.8262 500.564745,590.6482 497.877745,591.7092 C500.446745,574.0502 502.819745,556.3612 504.918745,538.6402 C505.943745,529.9932 506.903745,521.3392 507.788745,512.6772 C508.026745,510.3482 508.259745,508.0172 508.487745,505.6872 C508.602745,504.4992 509.627745,500.6792 509.058745,499.6922 C508.495745,498.7142 504.762745,497.6942 503.687745,497.1952 C501.334745,496.1032 498.981745,495.0122 496.630745,493.9142 C488.998745,490.3472 481.372745,486.7512 473.824745,483.0102 C470.522745,481.3732 467.059745,478.8442 463.468745,477.9712 C459.893745,477.1022 457.293745,479.5902 454.236745,481.1722 C451.857745,482.4032 446.252745,484.0422 444.663745,486.1332 C443.184745,488.0792 447.777745,495.8672 448.984745,498.7382 C452.387745,506.8382 455.791745,514.9392 459.195745,523.0392 C466.096745,539.4632 472.998745,555.8872 479.900745,572.3122 C481.587745,576.3262 483.274745,580.3412 484.961745,584.3562 C486.042745,586.9292 487.847745,594.2612 490.470745,594.5482 C491.631745,594.6752 493.537745,593.4122 494.659745,593.0492 C496.333745,592.5082 497.879745,592.5162 499.559745,592.2312 C502.637745,591.7092 505.833745,590.1212 508.856745,589.0072 C516.625745,586.1432 524.679745,584.2942 532.511745,581.6192 C540.379745,578.9322 548.119745,575.9132 555.956745,573.2252 C563.074745,570.7852 570.256745,568.0042 577.094745,564.8262 C584.315745,561.4692 591.721745,558.5092 598.757745,554.7872 C611.573745,548.0082 624.250745,541.6772 635.574745,533.3632 C638.236745,531.4082 641.072745,529.4452 643.706745,527.3522 C646.015745,525.5152 650.421745,523.2472 651.993745,520.8322 C652.592745,519.9112 653.107745,518.1052 652.407745,517.0122 C651.656745,515.8382 648.330745,515.9452 646.776745,515.7362 C641.875745,515.0782 636.975745,514.4192 632.075745,513.7612 C632.451745,516.9842 632.831745,520.2042 633.104745,523.4392 C633.295745,525.7222 634.645745,531.7562 632.825745,533.5452 C630.323745,531.1672 631.127745,524.0562 630.903745,520.8882 C630.783745,519.1952 631.214745,515.8812 630.456745,514.3792 C629.625745,512.7332 627.329745,512.7552 625.248745,512.3052 C616.424745,510.3962 607.680745,508.7942 599.141745,505.7692 C584.716745,500.6602 567.473745,492.0332 564.251745,475.3932 C560.892745,458.0462 575.652745,443.0162 588.079745,433.3412 C595.520745,427.5492 603.436745,422.5342 611.623745,417.8782 C615.450745,415.7032 619.274745,413.5272 623.125745,411.3982 C624.526745,410.6242 629.125745,409.0292 629.864745,407.6752 C630.620745,406.2902 630.233745,402.5862 630.393745,401.0082 L630.393745,401.0082 Z M321.774745,667.4132 C321.074745,667.7552 320.373745,668.0972 319.674745,668.4392 C327.459745,646.2542 335.172745,624.1692 341.681745,601.5672 C344.823745,590.6582 348.006745,579.7602 351.255745,568.8822 C352.658745,564.1902 356.103745,557.7282 355.146745,552.8672 C354.110745,547.6062 351.626745,542.0102 349.704745,537.0072 C337.401745,544.7412 324.840745,552.0782 312.332745,559.4612 C301.119745,566.0822 289.716745,571.9702 278.424745,578.5212 C272.638745,581.8772 266.669745,584.1442 260.630745,586.8862 C255.723745,589.1152 257.628745,595.9282 257.699745,600.4792 C257.947745,616.5472 257.935745,632.6722 258.910745,648.7172 C259.265745,654.5622 258.807745,661.2732 262.528745,666.1382 C267.287745,672.3582 271.701745,678.6992 276.041745,685.2472 C277.667745,687.7002 284.498745,700.9812 287.045745,700.6902 C288.708745,700.5012 290.239745,695.1232 291.071745,693.8482 C292.864745,691.0992 295.485745,688.7342 297.871745,686.5212 C308.175745,676.9612 319.609745,670.2272 331.492745,663.2402 C343.565745,656.1422 355.920745,649.5352 368.221745,642.8042 C371.000745,641.2832 373.993745,640.1862 376.754745,638.6322 C377.845745,638.0182 380.008745,637.0432 380.695745,635.9462 C381.722745,634.3042 381.374745,629.7552 381.588745,627.7922 C382.026745,623.7822 382.813745,619.6162 382.856263,615.5762 C382.896745,611.5862 380.497745,608.1572 378.758745,604.6782 C371.124745,589.4002 363.707745,574.0852 357.065745,558.3442 C351.828745,576.6222 346.330745,594.8142 341.193745,613.1192 C338.511745,622.6772 335.278745,632.0792 332.130745,641.4902 C330.523745,646.2972 328.906745,651.1002 327.301745,655.9082 C326.051745,659.6522 325.402745,665.1342 321.774745,667.4132 L321.774745,667.4132 Z M431.415745,322.9462 C427.368745,322.9912 423.700745,322.3962 419.742745,321.5512 C418.290745,321.2422 417.014745,321.1112 415.542745,320.9812 C413.873745,320.8342 412.357745,319.9302 410.894745,319.7532 C409.788745,319.6202 407.857745,320.0842 406.801745,320.4382 C404.353745,321.2582 404.431745,320.8442 404.329745,323.6862 C404.169745,328.0772 404.049745,332.4692 403.808745,336.8562 C402.859745,354.1252 401.025745,371.2262 398.512745,388.3282 C398.003745,391.7852 396.579745,396.3192 397.362745,399.7522 C398.068745,402.8472 400.742745,406.1532 402.508745,408.7492 C406.141745,414.0882 414.697745,416.7262 420.716745,418.2402 C427.063745,419.8372 433.653745,420.4252 439.683745,421.8492 C441.354745,422.2442 443.272745,421.5482 445.053745,421.9442 C446.700745,422.3102 447.979745,423.2142 449.501745,423.8682 C453.230745,425.4692 457.396745,425.7642 461.247745,427.0002 C468.883745,429.4512 477.059745,429.3042 484.702745,431.6582 C486.656745,432.2592 488.344745,433.7752 490.224745,434.2942 C491.943745,434.7682 493.713745,434.2102 495.512745,434.4752 C499.324745,435.0362 502.878745,436.3392 503.757745,440.4312 C506.088745,438.5862 506.412745,439.0712 506.009745,436.2172 C505.751745,434.3872 504.732745,432.1592 504.174745,430.3952 C502.752745,425.8972 501.322745,421.4022 499.901745,416.9042 C497.090745,408.0032 494.296745,399.0952 491.705745,390.1282 C489.386745,382.1072 487.278745,374.0252 485.436745,365.8812 C484.499745,361.7402 483.716745,357.5812 482.913745,353.4182 C482.679745,352.2102 482.911745,350.2902 481.697745,349.4862 C480.596745,348.7572 478.026745,351.3732 476.863745,352.2162 C468.740745,358.1002 450.109745,375.5032 439.953745,365.2372 C434.484745,359.7092 434.804745,349.9902 435.398745,342.8482 C435.762745,338.4582 436.533745,334.1252 437.395745,329.8092 C437.610745,328.7322 438.927745,325.2722 438.445745,324.5052 C437.924745,323.6802 432.502745,323.1882 431.415745,322.9462 L431.415745,322.9462 Z M716.834745,419.0012 C718.997745,419.2432 721.158745,419.4862 723.320745,419.7292 C723.122745,417.9822 723.300745,415.3552 722.639745,413.7282 C721.724745,411.4792 719.485745,411.2282 717.022745,410.2962 C713.126745,408.8232 709.153745,407.5422 705.300745,405.9562 C696.938745,402.5152 688.615745,399.0252 680.248745,395.5842 C676.581745,394.0752 672.272745,391.6062 668.290745,392.8382 C663.996745,394.1682 659.758745,396.8762 655.744745,398.8592 C651.199745,401.1052 646.656745,403.3562 642.114745,405.6072 C639.984745,406.6632 637.853745,407.7182 635.723745,408.7742 C632.376745,410.4322 631.931745,410.6002 631.667745,414.3872 C630.322745,433.7592 630.422745,453.8832 631.008745,473.2812 C631.308745,483.1802 630.972745,493.1332 631.682745,503.0152 C631.737745,503.7752 631.680745,508.0642 632.156745,508.6492 C632.826745,509.4732 637.543745,509.7512 638.670745,509.9582 C643.064745,510.7612 647.489745,511.0282 651.929745,511.4252 C650.883745,488.8932 647.041745,462.2562 658.612745,441.6462 C670.235745,420.9402 695.079745,416.4552 716.834745,419.0012 L716.834745,419.0012 Z M514.778745,197.3312 C516.081745,194.3632 518.325745,191.8572 520.243745,189.2532 C521.280745,187.8452 523.074745,186.1622 523.738745,184.5152 C524.683745,182.1712 524.678745,182.6732 523.266745,180.6202 C521.931745,178.6802 521.958745,178.5342 519.894745,178.1872 C518.156745,177.8952 516.305745,178.3912 514.530745,178.0732 C512.735745,177.7512 507.802745,176.2392 508.933745,173.3832 C508.884745,173.5082 511.738745,172.1012 511.960745,171.8572 C512.677745,171.0762 512.904745,169.4112 513.258745,168.4672 C514.398745,165.4412 514.798745,163.4822 513.528745,160.2602 C511.630745,155.4492 504.128745,154.0252 499.458745,155.6442 C497.123745,156.4522 495.792745,158.1662 494.743745,160.3202 C494.076745,161.6882 493.921745,163.6652 493.059745,164.8562 C491.759745,166.6492 491.679745,166.4502 488.984745,166.1332 C485.553745,165.7302 482.739745,164.4122 479.488745,163.4932 C475.947745,162.4912 473.644745,164.5292 470.550745,166.1722 C464.964745,169.1402 459.569745,170.1702 453.312745,170.6412 C446.344745,171.1662 439.886745,169.4862 432.987745,169.0532 C434.777745,177.2982 439.406745,183.9922 443.106745,191.4582 C443.756745,192.7712 444.807745,194.1132 444.832745,195.6322 C444.858745,197.0632 442.786745,199.0102 443.019745,200.1942 C443.518745,202.7202 449.077745,204.7422 451.183745,205.4532 C457.140745,207.4622 463.923745,211.3952 470.479745,209.8152 C474.074745,208.9492 476.008745,203.2732 479.391745,202.8562 C483.929745,202.2942 480.534745,208.1382 479.691745,210.1482 C486.132745,211.1272 494.296745,210.2972 500.461745,208.1132 C503.551745,207.0192 506.169745,205.3862 508.989745,203.7672 C512.501745,201.7512 513.231745,201.1972 514.778745,197.3312 L514.778745,197.3312 Z M402.063745,320.0412 C390.580745,320.2322 378.929745,318.5792 367.420745,320.0982 C364.754745,320.4492 362.123745,321.0152 359.503745,321.6172 C357.620745,322.0502 351.639745,322.4162 350.383745,323.8162 C349.239745,325.0932 349.231745,330.9722 348.995745,332.6292 C348.470745,336.3192 348.610745,337.5932 350.963745,340.4462 C358.705745,349.8342 366.768745,358.9422 374.397745,368.4342 C381.725745,377.5522 387.740745,387.7402 395.147745,396.7292 C399.103745,385.2142 399.340745,371.3952 400.426745,359.3212 C401.005745,352.8832 401.532745,346.4402 402.027745,339.9962 C402.498745,333.8582 404.100745,325.8932 402.063745,320.0412 L402.063745,320.0412 Z M253.434745,441.3982 C254.762745,441.3982 256.880745,441.8142 258.171745,441.3982 C259.946745,441.9632 260.539745,441.2972 259.952745,439.4012 C259.980745,438.7382 260.008745,438.0742 260.037745,437.4102 C260.222745,433.1332 260.426745,428.8572 260.624745,424.5802 C260.806745,420.6702 260.983745,416.7592 261.137745,412.8482 C261.243745,410.1782 262.592745,403.5592 261.513745,401.1482 C260.788745,399.5272 259.071745,399.8952 256.982745,399.6582 C254.995745,399.4332 253.002745,399.2252 251.026745,398.9172 C248.518745,398.5262 245.738745,397.6282 243.186745,398.1902 C240.622745,398.7552 238.758745,401.1222 236.746745,402.6282 C233.562745,405.0092 230.309745,407.3022 227.098745,409.6462 C221.262745,413.9082 215.485745,418.2482 209.698745,422.5752 C207.308745,424.3612 206.849745,423.7412 208.014745,426.3092 C208.735745,427.8952 210.374745,429.6902 211.372745,431.1232 C213.359745,433.9772 215.338745,438.3032 217.887745,440.6192 C221.596745,443.9892 231.887745,441.8492 236.814745,441.8252 C242.432745,441.7972 247.848745,441.8842 253.434745,441.3982 L253.434745,441.3982 Z M267.976745,441.1192 C272.848745,440.6422 277.770745,440.8482 282.612745,440.1932 C287.876745,439.4802 293.102745,438.4252 298.356745,437.6342 C303.594745,436.8472 319.529745,433.6622 317.956745,425.8442 C316.294745,417.5802 304.095745,412.6302 297.345745,409.8522 C286.803745,405.5132 275.797745,403.1902 264.708745,400.7372 C263.317745,408.1452 263.517745,416.0982 263.263745,423.6052 C263.125745,427.6822 263.004745,431.7642 263.006745,435.8452 C263.006745,436.8272 262.669745,438.8652 263.070745,439.7782 C264.012745,441.9272 265.108745,441.1192 267.976745,441.1192 L267.976745,441.1192 Z M251.954745,444.6692 L220.858745,444.6692 C225.460745,454.1952 229.810745,463.8992 234.771745,473.2452 C239.712745,482.5552 246.074745,491.3272 251.680745,500.2632 C253.100745,498.7182 255.365745,497.0422 256.330745,495.2032 C257.399745,493.1692 257.369745,490.1762 257.544745,487.8212 C257.998745,481.7092 258.205745,475.5432 258.359745,469.4172 C258.494745,464.0522 258.730745,458.7232 259.142745,453.3712 C259.232745,452.1972 260.527745,446.1002 259.786745,445.0982 C259.125745,444.2062 253.314745,444.6782 251.954745,444.6692 L251.954745,444.6692 Z M380.019745,257.6312 C385.265745,257.6302 390.517745,257.5642 395.762745,257.6522 C400.522745,257.7332 406.724745,256.9042 411.084745,259.3552 C419.967745,264.3472 402.210745,277.1682 398.609745,280.3952 C404.431745,282.5052 413.518745,278.3172 419.218745,276.3982 C426.266745,274.0262 433.453745,272.4332 440.642745,270.5752 C442.438745,270.1112 450.148745,269.2022 451.122745,267.8262 C452.088745,266.4612 449.924745,258.2262 449.707745,256.4892 C449.504745,254.8562 449.675745,252.3102 448.995745,250.7742 C449.412745,248.9292 448.764745,248.2822 447.051745,248.8362 C446.459745,248.8342 445.869745,248.8312 445.277745,248.8292 C440.903745,248.8642 436.525745,249.0672 432.154745,249.2122 C417.130745,249.7122 402.471745,250.3792 387.575745,252.7242 C380.650745,253.8142 373.664745,255.1552 366.775745,256.4932 C360.976745,257.6192 361.952745,258.5642 367.368745,258.5782 C371.604745,258.5892 375.804745,257.9602 380.019745,257.6312 L380.019745,257.6312 Z M810.998745,147.1512 C811.890745,146.1262 812.784745,145.1002 813.676745,144.0742 C811.501745,143.4532 809.326745,142.8312 807.151745,142.2102 C804.838745,141.5502 803.593745,141.7012 804.622745,139.1172 C805.910745,135.8802 811.794745,135.5092 814.622745,135.3872 C824.359745,134.9662 834.587745,138.0642 843.837745,140.7932 C848.350745,142.1252 851.888745,144.1862 855.707745,146.9272 C857.374745,148.1242 859.299745,149.2482 860.758745,150.6862 C862.274745,152.1802 862.905745,154.0942 864.387745,155.5922 C866.818745,158.0482 869.929745,159.2712 871.121745,162.8162 C872.489745,166.8852 870.856745,171.5432 868.831745,175.0912 C866.777745,178.6922 863.726745,181.4152 861.248745,184.6872 C859.281745,187.2832 855.174745,194.3762 861.592745,193.5542 C864.986745,193.1192 869.388745,187.3312 871.831745,185.0252 C875.332745,181.7182 878.776745,178.3352 882.484745,175.2552 C885.772745,172.5242 889.560745,169.7242 893.957745,169.2442 C898.591745,168.7382 900.906745,171.7042 903.165745,175.3112 C905.295745,178.7132 905.637745,182.0342 907.135745,185.5162 C907.858745,187.1952 908.778745,188.1312 909.203745,189.9612 C909.856745,192.7762 909.924745,195.8472 910.257745,198.7172 C910.781745,203.2242 911.274745,206.7682 910.401745,211.1842 C909.583745,215.3172 909.360745,219.7072 908.671745,223.9122 C907.891745,228.6742 907.242745,233.4582 906.473745,238.2222 C905.822745,242.2582 903.345745,248.0062 905.775745,251.7592 C911.613745,260.7782 918.617745,247.5012 920.461745,242.5412 C923.703745,233.8252 925.353745,224.2972 928.214745,215.4022 C929.746745,210.6452 931.083745,205.8432 931.961745,200.9182 C932.688745,196.8452 932.330745,191.8832 934.562745,188.2552 C936.297745,185.4372 939.383745,183.2972 942.770745,184.1572 C947.008745,185.2342 948.636745,191.3602 949.883745,195.0842 C953.174745,204.9062 951.963745,213.7522 950.623745,223.7692 C950.003745,228.4072 949.411745,233.0522 948.346745,237.6132 C947.627745,240.6902 944.650745,246.9182 949.076745,248.5912 C955.351745,250.9652 962.002745,232.9632 963.790745,228.8982 C968.472745,218.2512 970.265745,207.6922 972.195745,196.2842 C972.638745,193.6612 972.977745,190.9822 973.640745,188.4042 C974.217745,186.1602 975.941745,183.8922 976.096745,181.6482 C976.251745,179.4022 974.764745,177.8352 976.288745,175.6302 C977.556745,173.7952 979.847745,173.6842 981.917745,173.6682 C986.779745,173.6302 991.430745,175.7652 995.953745,177.3142 C1000.16374,178.7552 1006.39074,181.9172 1010.92774,180.8992 C996.688745,166.4422 982.485745,152.1492 965.502745,140.8902 C957.616745,135.6612 949.724745,130.6362 941.200745,126.3722 C932.566745,122.0532 922.672745,119.1362 913.425745,116.5232 C908.396745,115.1012 903.395745,113.4902 898.429745,111.8592 C894.008745,110.4072 889.558745,110.1322 885.229745,108.4852 C875.824745,104.9082 865.315745,103.5222 855.577745,100.9862 C851.277745,99.8672 846.930745,98.9072 842.620745,97.8702 C838.090745,96.7802 831.726745,94.8872 827.111745,95.0712 C823.169745,95.2282 821.839745,99.7452 819.943745,102.8872 C817.190745,107.4482 814.843745,112.1872 812.678745,117.0522 C808.244745,127.0202 803.563745,137.3182 800.391745,147.7322 C798.650745,153.4502 796.930745,159.1742 795.219745,164.9012 C793.739745,169.8592 790.036745,177.0112 791.020745,182.0992 C798.313745,170.8602 805.104745,159.1882 810.998745,147.1512 L810.998745,147.1512 Z M471.465745,248.6352 C467.596745,248.8112 463.726745,248.9862 459.857745,249.1622 C463.715745,261.8422 463.177745,275.3442 463.177745,288.4872 C481.206745,286.3622 499.380745,286.0002 517.516745,286.1472 C514.184745,279.7192 515.476745,271.3802 516.425745,264.4972 C516.981745,260.4682 517.291745,256.5872 517.210745,252.5222 C517.134745,248.7092 518.233745,245.5032 514.193745,244.3242 C510.988745,243.3892 508.962745,244.9472 505.909745,245.6582 C502.252745,246.5092 498.269745,246.6122 494.546745,247.0752 C486.797745,248.0382 479.325745,248.6032 471.465745,248.6352 L471.465745,248.6352 Z M367.576745,273.3292 C379.195745,270.1062 391.542745,271.2942 403.219745,268.8442 C400.563745,266.4202 395.559745,267.8562 392.032745,268.0582 C388.022745,268.2862 384.015745,268.4532 380.005745,268.6482 C376.094745,268.8392 365.246745,268.5432 363.835745,273.5192 C365.081745,273.4562 366.329745,273.3922 367.576745,273.3292 L367.576745,273.3292 Z M792.716745,93.6492 C777.512745,94.9832 761.589745,94.7762 746.495745,97.4292 C729.208745,100.4672 711.188745,102.3732 694.427745,107.7272 C677.986745,112.9802 661.218745,116.6572 645.010745,122.8252 C629.254745,128.8212 614.078745,135.2002 599.240745,143.2202 C591.978745,147.1452 584.911745,151.3062 577.988745,155.8142 C571.229745,160.2152 563.823745,163.8232 557.274745,168.4882 C551.444745,172.6412 546.415745,176.4502 541.331745,181.5382 C535.897745,186.9782 530.610745,192.5652 525.171745,197.9962 C520.631745,202.5272 523.505745,213.6052 523.793745,219.6352 C524.192745,227.9952 524.881745,236.2372 525.906745,244.5422 C526.881745,252.4562 527.885745,260.9622 526.596745,268.8592 C526.055745,272.1792 524.187745,277.9142 525.079745,281.2282 C525.792745,283.8822 530.526745,285.8282 532.941745,286.6932 C535.895745,287.7512 538.912745,287.3052 541.943745,288.6512 C545.328745,290.1562 548.182745,292.0322 551.777745,292.8232 C556.208745,293.7982 561.190745,294.6182 565.744745,294.6482 C569.955745,294.6752 574.180745,296.0392 578.379745,296.8792 C585.209745,298.2472 591.876745,298.6732 591.451745,306.9102 C590.960745,316.4142 587.189745,324.5692 584.943745,333.5912 C587.980745,333.5912 590.097745,333.7852 592.877745,332.7082 C596.123745,331.4522 599.586745,331.1182 602.997745,330.5762 C610.533745,329.3772 617.880745,328.9932 625.466745,328.2282 C639.362745,326.8262 653.499745,326.9942 667.406745,327.1422 C674.447745,327.2162 682.085745,327.7602 689.029745,328.8562 C696.153745,329.9812 703.531745,330.6842 710.435745,332.8412 C716.259745,334.6612 722.273745,335.9012 728.214745,337.5092 C730.892745,338.2332 734.099745,338.8212 736.629745,339.6312 C740.295745,340.8062 742.254745,343.3112 746.487745,343.255157 C745.296745,335.4142 742.498745,328.1412 740.810745,320.3662 C739.048745,312.2462 735.532745,305.0622 731.652745,297.4022 C729.921745,293.9852 728.640745,290.3592 726.971745,286.9132 C725.115745,283.0802 722.506745,279.9052 720.265745,276.3212 C715.680745,268.9902 710.786745,261.9382 706.282745,254.5552 C702.350745,248.1092 697.858745,241.9302 693.553745,235.7082 C688.821745,228.8672 682.245745,223.7042 676.874745,217.4282 C674.607745,214.7772 672.449745,212.3142 669.909745,209.8812 C667.570745,207.6412 664.252745,202.6832 660.671745,202.4512 C658.613745,202.3172 655.047745,203.4752 653.083745,204.0962 C649.449745,205.2472 645.594745,205.9972 641.841745,207.0102 C637.734745,208.1192 633.698745,209.5622 629.584745,210.6162 C627.938745,211.0372 625.983745,210.8372 624.422745,211.3142 C622.790745,211.8142 621.487745,212.9152 619.702745,213.4202 C610.896745,215.9182 602.143745,218.7542 593.272745,221.0282 C584.139745,223.3702 574.866745,225.3642 566.015745,228.6812 C564.327745,229.3142 562.449745,230.8102 561.152745,229.8272 C560.185745,229.0932 559.561745,227.0202 559.816745,225.8102 C560.665745,221.7822 567.108745,220.3272 570.210745,218.7102 C578.523745,214.3762 586.782745,211.3202 595.716745,208.3772 C600.117745,206.9292 604.502745,205.3832 608.964745,204.1322 C612.694745,203.0872 616.576745,201.3192 620.390745,200.7842 C623.782745,200.3082 626.191745,198.9722 629.558745,197.7892 C634.518745,196.0462 639.619745,194.6152 644.660745,193.1262 C653.275745,190.5802 662.407745,189.5102 671.222745,187.8032 C691.644745,183.8482 712.847745,181.8682 733.686745,182.1132 C744.192745,182.2372 755.182745,181.9302 765.565745,183.6582 C768.069745,184.0742 773.332745,183.9942 775.058745,186.2412 C775.985745,187.4472 775.483745,189.2422 775.721745,190.5492 C776.123745,192.7552 777.326745,193.7832 778.369745,195.7932 C780.586745,184.9172 783.133745,174.2722 785.995745,163.5552 C788.583745,153.8562 790.978745,143.9812 794.436745,134.4182 C798.095745,124.3002 802.531745,113.5722 808.000745,104.3122 C809.126745,102.4062 811.933745,99.3782 812.174745,97.2462 C812.424745,95.0462 809.341745,93.3422 807.223745,93.0972 C802.471745,92.5482 797.383745,93.4882 792.716745,93.6492 L792.716745,93.6492 Z M894.853745,249.0542 C896.400745,233.9672 900.922745,218.1862 898.396745,203.0392 C897.327745,196.6272 896.492745,190.5062 893.285745,184.7182 C891.663745,181.7912 891.013745,179.6412 887.917745,181.3672 C884.783745,183.1142 881.898745,187.4292 879.300745,189.9302 C874.525745,194.5272 869.524745,199.2612 863.806745,202.6752 C859.302745,205.3632 850.356745,207.9112 846.970745,202.0962 C843.744745,196.5542 848.047745,188.8202 851.136745,184.2482 C854.671745,179.0172 861.367745,174.1722 857.609745,167.7182 C855.992745,164.9402 853.665745,164.2122 851.219745,162.3892 C849.102745,160.8112 847.328745,158.7672 845.210745,157.1612 C839.074745,152.5062 832.344745,150.5122 825.259745,147.8522 C821.988745,146.6232 821.558745,145.4672 819.668745,148.2762 C817.616745,151.3272 816.492745,155.6032 815.008745,158.9772 C812.036745,165.7362 808.866745,172.1402 805.034745,178.4422 C801.167745,184.8022 797.740745,191.4462 794.085745,197.9322 C792.706745,200.3792 791.409745,202.8662 789.779745,205.1632 C788.891745,206.4132 787.792745,207.5272 787.071745,208.8952 C786.004745,210.9182 786.479745,212.7622 785.815745,214.7762 C782.949745,223.4662 778.769745,211.3352 777.970745,208.4992 C777.062745,205.2732 774.871745,202.7582 773.451745,199.7492 C772.278745,197.2642 771.478745,193.5712 768.646745,192.4012 C766.326745,191.4432 763.336745,192.7582 760.969745,192.8862 C756.619745,193.1222 752.237745,192.7702 747.868745,193.0422 C743.783745,193.2962 739.707745,193.6882 735.623745,193.9382 C731.535745,194.1892 727.452745,193.4982 723.418745,193.9282 C716.179745,194.7002 708.778745,194.5762 701.555745,195.6462 C693.079745,196.9002 684.690745,198.2382 676.190745,199.2822 C678.165745,203.0172 682.259745,204.6372 685.496745,207.3022 C688.389745,209.6842 690.680745,212.4332 693.594745,214.6992 C696.551745,216.9992 698.308745,220.4012 700.755745,223.1652 C703.153745,225.8722 705.373745,228.1422 707.474745,231.1712 C717.613745,245.7972 728.071745,259.8832 736.434745,275.6912 C740.667745,283.6922 744.709745,292.2522 747.601745,300.8362 C750.703745,310.0432 752.225745,319.9172 754.068745,329.4372 C754.986745,334.1822 755.467745,338.1872 754.461745,342.9592 C754.197745,344.0952 753.922745,345.2292 753.637745,346.3602 C752.755745,347.7142 753.081745,348.5922 754.617745,348.9952 C755.515745,350.3042 756.741745,350.7952 756.819745,352.5852 C756.879745,353.9452 756.122745,355.5212 754.951745,356.2882 C752.690745,357.7682 752.690745,355.7692 750.359745,356.2122 C749.485745,356.6852 748.611745,357.1572 747.738745,357.6292 C747.277745,356.9272 746.802745,356.2332 746.315745,355.5492 C744.829745,354.1362 743.647745,354.2652 741.705745,353.9212 C742.692745,365.2882 741.118745,375.4372 738.616745,386.5252 C737.412745,391.8572 735.349745,397.0762 734.309745,402.4172 C733.148745,408.3842 735.686745,411.1022 739.612745,415.0822 C738.616745,415.6022 736.870745,416.1672 736.048745,416.9442 C734.740745,418.1832 735.074745,418.3352 735.075745,420.2742 C735.077745,423.8242 734.396745,427.3232 733.838745,430.8142 C732.806745,437.2792 731.863745,443.9692 729.637745,450.1592 C725.594745,461.4022 719.059745,473.0782 712.401745,482.9812 C708.675745,488.5232 704.940745,494.8192 700.270745,499.6012 C695.583745,504.3992 690.937745,509.2412 686.261745,514.0542 C677.058745,523.5282 667.001745,530.0732 655.976745,537.1662 C651.610745,539.9762 647.011745,543.0542 643.256745,546.5522 C639.440745,550.1062 634.365745,552.5942 629.804745,555.1762 C627.769745,556.3282 626.321745,557.9832 624.124745,558.9282 C622.060745,559.8152 620.618745,560.1052 618.887745,561.2692 C614.592745,564.1572 609.953745,566.6262 605.224745,568.8042 C599.456745,571.4602 593.780745,574.5502 587.856745,576.8172 C585.157745,577.8502 582.618745,578.9762 580.004745,580.1842 C577.175745,581.4912 574.123745,582.3492 571.221745,583.7422 C568.769745,584.9192 566.286745,585.6032 563.790745,586.5652 C561.752745,587.3512 560.152745,588.6232 558.073745,589.4452 C553.756745,591.1502 549.827745,592.0682 545.633745,594.0782 C540.060745,596.7492 533.456745,597.9952 527.586745,599.9172 C521.032745,602.0642 514.233745,604.2002 507.507745,605.7222 C504.645745,606.3702 502.207745,607.2172 499.443745,608.1982 C497.642745,608.8372 495.577745,609.1872 493.582745,609.7942 C488.069745,611.4752 482.559745,613.0952 477.017745,614.5242 C466.189745,617.3172 455.127745,620.6702 444.626745,624.4612 C439.120745,626.4492 433.535745,628.8412 428.253745,631.3722 C422.282745,634.2322 415.848745,635.8832 409.855745,638.7152 C398.278745,644.1842 386.740745,649.8142 375.297745,655.5562 C369.288745,658.5722 363.363745,661.6792 357.496745,664.9592 C355.367745,666.1492 353.039745,666.6402 350.924745,667.8072 C348.158745,669.3342 345.888745,671.5752 343.055745,673.0882 C332.135745,678.9202 320.990745,684.4142 310.960745,691.7932 C305.711745,695.6552 300.071745,699.6102 295.535745,704.3122 C294.038745,705.8632 291.444745,708.2652 291.173745,710.5162 C290.774745,713.8462 291.148745,710.7822 292.301745,712.8362 C293.898745,713.0302 294.259745,713.6442 293.388745,714.6762 C292.986745,715.1602 292.471745,715.4072 291.844745,715.4172 C289.827745,715.8252 286.054745,713.6882 284.433745,712.7942 C281.624745,711.2462 280.133745,709.2892 278.329745,706.6902 C274.411745,701.0522 270.588745,695.3632 266.553745,689.8042 C262.924745,684.8052 259.372745,679.3012 255.243745,674.7102 C252.443745,671.5982 252.233745,672.9572 249.119745,674.7122 C246.802745,676.0172 244.111745,676.5742 241.710745,677.8032 C232.561745,682.4902 222.504745,685.9512 213.120745,689.2172 C210.983745,689.9612 209.844745,691.1412 207.966745,692.1682 C205.574745,693.4772 202.544745,694.1172 199.986745,695.0472 C192.939745,697.6092 185.927745,700.2692 178.930745,702.9652 C173.528745,705.0482 168.337745,706.6892 164.108745,710.5322 C162.425745,712.0622 160.388745,713.1582 158.650745,714.7052 C156.626745,716.5042 153.889745,719.4322 151.341745,720.4502 L149.789745,721.6622 C148.739745,720.9322 147.688745,720.2032 146.635745,719.4762 C145.591745,718.7532 144.546745,718.0332 143.504745,717.3082 C140.887745,715.4892 138.289745,713.6442 135.688745,711.8022 C129.789745,707.6212 123.852745,703.4812 118.365745,698.7612 C108.618745,690.3802 98.5047447,682.4482 88.3127447,674.5982 C77.6157447,666.3592 67.1867447,657.7372 56.1227447,649.9932 C46.0947447,642.9742 35.1537447,637.0462 25.4307447,629.6382 C20.5367447,625.9092 15.6547447,622.1562 10.6577447,618.5442 C10.3857447,618.3482 6.31974474,615.8532 6.27894682,615.5762 C6.20974474,615.0662 7.54774474,613.7352 7.94274474,613.3072 C9.81274474,611.2742 11.8847447,609.4642 13.7477447,607.4092 C22.4307447,597.8342 33.7677447,598.1682 45.7507447,597.7162 C51.1847447,597.5112 57.0777447,600.0172 62.2387447,601.7232 C68.5497447,603.8092 74.6377447,606.8712 80.7337447,609.5152 C93.2967447,614.9642 106.262745,619.6202 118.952745,624.6672 C123.942745,626.6512 128.913745,627.6192 133.986745,628.9832 C139.133745,630.3682 144.435745,629.0482 149.940745,629.1472 C152.797745,629.1982 155.498745,629.3652 158.375745,629.2032 C160.083745,629.1072 162.051745,628.7832 163.738745,628.8122 C165.105745,628.8362 166.524745,629.4002 167.782745,629.2572 C173.289745,628.6332 179.106745,627.7582 184.786745,627.0422 C190.425745,626.3312 196.244745,625.9782 201.809745,624.8652 C204.611745,624.3052 207.376745,623.5132 210.072745,622.5632 C212.412745,621.7382 216.666745,620.8012 218.586745,619.1302 C220.304745,617.6352 219.553745,617.6152 218.595745,615.1762 C218.216745,614.2122 217.824745,612.7502 217.262745,611.8212 C215.743745,609.3112 214.275745,608.5222 215.159745,605.3812 C216.716745,599.8452 222.023745,596.3112 226.566745,593.5842 C236.800745,587.4442 246.160745,579.5682 256.936745,574.3592 C279.140745,563.6272 299.376745,549.6862 321.030745,537.9002 C344.832745,524.9452 367.348745,509.7432 391.481745,497.3352 C413.945745,485.7862 436.306745,474.1692 458.956745,462.9832 C470.016745,457.5232 482.525745,452.5262 492.560745,445.3672 C487.000745,444.6772 481.424745,443.7862 475.845745,443.2922 C473.257745,443.0632 470.638745,443.2752 468.065745,442.8642 C465.187745,442.4042 462.466745,441.2402 459.594745,440.7562 C454.655745,439.9222 450.214745,438.2292 445.271745,437.6052 C439.971745,436.9352 434.780745,435.3772 429.455745,434.9412 C418.316745,434.0282 408.263745,429.9202 398.498745,424.7432 C396.081745,423.4612 394.095745,424.1942 391.779745,423.3222 C390.503745,422.8432 389.148745,420.9272 387.715745,419.8982 C383.768745,417.0642 380.380745,413.7182 376.629745,410.6222 C368.743745,428.3202 353.258745,440.3572 338.481745,452.2292 C330.996745,458.2412 322.872745,463.3382 315.310745,469.2372 C309.448745,473.8112 304.124745,477.9052 297.866745,481.5422 C291.857745,485.0322 286.212745,489.7462 280.483745,493.9392 C276.600745,496.7812 272.049745,498.9262 267.920745,501.3942 C264.546745,503.4102 257.959745,506.4172 257.039745,510.0742 C256.286745,513.0622 257.755745,516.6182 253.195745,515.2442 C249.112745,514.0152 246.152745,509.4822 243.774745,506.2892 C237.624745,498.0272 231.887745,489.4852 226.177745,480.9192 C223.110745,486.9052 217.820745,491.2162 212.930745,495.6542 C209.959745,498.3512 206.875745,500.8532 203.666745,503.2602 C202.110745,504.4282 200.536745,505.5732 198.977745,506.7382 C198.363745,507.1982 196.971745,507.9052 196.573745,508.5532 C195.643745,510.0692 196.208745,509.3822 196.353745,511.2152 C196.579745,514.0862 197.537745,516.3452 195.912745,519.0962 C194.386745,521.6792 191.059745,522.7822 188.727745,524.5462 C183.179745,528.7452 177.345745,533.2082 171.190745,536.4872 C169.793745,537.2312 168.472745,537.8762 167.171745,538.7872 C164.999745,540.3062 165.396745,540.8572 163.207745,539.4012 C159.784745,537.1222 156.827745,533.3392 153.738745,530.5912 C147.266745,524.8332 140.722745,519.1482 134.094745,513.5712 C121.463745,502.9412 108.459745,492.8402 95.9857447,482.0202 C84.1317447,471.7382 71.4237447,462.8872 59.1857447,453.1122 C55.8287447,450.4312 52.5127447,447.6952 49.1997447,444.9592 C46.2497447,442.5242 41.4627447,439.8402 39.2807447,436.7242 C36.1117447,432.1982 48.5077447,426.0132 52.2477447,425.0922 C58.6967447,423.5052 67.0357447,424.4132 73.4947447,425.7142 C80.2747447,427.0792 87.1787447,431.6452 93.5097447,434.4892 C100.645745,437.6942 107.913745,440.4652 115.102745,443.4912 C118.308745,444.8402 121.707745,445.9172 124.683745,447.7352 C127.841745,449.6642 130.660745,451.8632 134.018745,453.4812 C137.888745,455.3432 141.909745,457.0812 145.979745,458.4592 C147.823745,459.0832 149.808745,459.7102 151.746745,459.9622 C154.490745,460.3192 154.118745,459.0552 156.397745,458.3492 C158.334745,457.7492 158.794745,459.3342 160.536745,459.7752 C162.176745,460.1912 163.402745,459.7702 164.822745,458.8882 C167.988745,456.9232 170.806745,454.2132 173.973745,452.1672 C176.911745,450.2682 180.150745,448.4942 182.904745,446.3442 C184.132745,445.3862 185.040745,444.0732 186.250745,443.1002 C188.189745,441.5402 188.958745,442.1592 191.222745,441.0852 C193.073745,440.2062 194.752745,438.5702 196.513745,437.4862 C197.606745,436.8132 200.257745,435.9632 200.962745,434.8742 C202.814745,432.0152 199.653745,430.0292 196.822745,430.8722 C196.398745,428.4032 194.221745,422.5412 195.161745,420.2262 C195.993745,418.1782 198.177745,418.5612 200.014745,417.4772 C206.918745,413.4012 212.013745,405.9952 218.472745,401.2062 C224.561745,396.6912 229.933745,391.3012 235.965745,386.7032 C241.132745,382.7642 246.779745,378.9182 251.484745,374.6702 C257.047745,369.6482 264.169745,365.7412 270.217745,361.2582 C276.465745,356.6282 282.271745,351.4762 288.452745,346.7932 C294.399745,342.2882 300.240745,337.5822 306.351745,333.2932 C311.843745,329.4382 317.600745,325.9182 322.978745,322.0102 C325.924745,319.8702 329.145745,317.9902 332.508745,316.5852 C335.852745,315.1872 338.777745,313.5482 342.042745,312.0432 C348.531745,309.0522 356.981745,306.9852 364.037745,306.1282 C371.795745,305.1862 379.585745,304.3412 387.417745,304.3342 C391.589745,304.3312 395.641745,305.1252 399.788745,305.3772 C403.598745,305.6072 407.718745,306.5712 411.501745,306.4442 C413.214745,306.3872 414.703745,305.6622 416.362745,305.8962 C417.747745,306.0912 418.952745,306.9272 420.438745,307.0732 C423.747745,307.3992 427.074745,307.0742 430.420745,307.5022 C438.107745,308.4842 445.804745,309.8842 453.507745,310.6642 C461.714745,311.4952 469.850745,311.6522 478.014745,313.0522 C485.992745,314.4192 494.020745,315.8362 501.952745,317.4172 C518.809745,320.7772 535.842745,324.0582 552.432745,329.0472 C556.310745,330.2132 560.211745,331.3222 563.939745,332.9212 C565.748745,333.6962 567.486745,334.6362 569.373745,335.2162 C572.075745,336.0462 572.607745,336.3612 573.999745,334.0942 C576.395745,330.1922 577.715745,325.0312 579.454745,320.7862 C581.173745,316.5852 583.261745,312.3512 584.258745,307.9642 C581.359745,307.5052 577.702745,308.3972 574.711745,308.4992 C571.054745,308.6252 567.437745,308.5462 563.784745,308.5242 C556.421745,308.4802 550.664745,306.3052 543.697745,304.0222 C537.825745,302.0972 530.007745,300.9932 525.528745,296.5852 C523.126745,294.2222 522.327745,293.8062 518.717745,294.2302 C515.075745,294.6572 511.478745,295.3932 507.801745,295.5152 C493.943745,295.9752 480.148745,298.3932 466.227745,298.8712 C462.461745,299.0002 453.042745,300.7852 453.659745,294.3982 C453.787745,293.0722 454.803745,291.9222 455.001745,290.5572 C455.213745,289.0942 454.847745,287.6092 454.618745,286.1792 C454.073745,282.7962 453.504745,279.4152 452.961745,276.0312 C440.267745,280.1052 427.413745,283.4062 414.477745,286.6332 C409.113745,287.9712 400.495745,291.0482 394.952745,289.3612 C389.593745,287.7302 392.697745,280.1802 394.366745,276.5662 C383.719745,278.9962 372.363745,282.9702 361.506745,283.8822 C358.203745,284.1602 354.988745,284.8912 354.219745,280.8982 C353.607745,277.7162 355.905745,273.8252 357.077745,271.0302 C348.745745,270.2862 340.117745,270.3572 341.685745,259.6772 C343.122745,249.8782 351.262745,247.9272 359.929745,246.1372 C370.626745,243.9262 381.551745,243.1892 392.318745,241.4002 C401.686745,239.8432 411.907745,238.1072 421.474745,238.8932 C426.539745,239.3082 431.634745,239.4032 436.697745,239.8722 C439.086745,240.0932 441.383745,240.4632 443.695745,241.1152 C445.828745,241.7152 448.811745,243.5762 450.997745,243.6092 C454.297745,243.6612 458.275745,239.1992 461.824745,238.1682 C466.220745,236.8902 470.957745,236.6582 475.499745,236.3452 C480.647745,235.9922 485.803745,235.7952 490.947745,235.3782 C492.120745,235.2832 496.553745,235.5732 497.479745,234.8862 C498.827745,233.8852 497.930745,228.7512 497.836745,226.6422 C497.748745,224.6912 498.124745,221.0372 496.772745,220.2722 C495.502745,219.5542 491.800745,220.5392 490.550745,220.7392 C485.369745,221.5692 480.446745,221.4742 475.284745,221.2632 C472.900745,221.1662 470.610745,221.8012 468.249745,221.4882 C465.716745,221.1532 463.166745,220.3012 460.643745,219.8272 C455.178745,218.8002 450.199745,217.5222 445.490745,214.4602 C441.356745,211.7732 436.464745,209.9542 434.154745,205.2482 C432.462745,201.8022 431.774745,195.1522 436.749745,194.1722 C433.361745,189.2852 431.023745,183.7952 429.227745,178.1482 C428.901745,177.1242 428.685745,175.5822 428.198745,174.6892 C426.478745,171.5312 428.074745,174.3322 425.620745,173.0692 C423.195745,171.8222 421.447745,170.8352 419.552745,168.6662 C416.531745,165.2072 415.259745,160.9502 414.877745,156.4432 C414.359745,150.3222 413.391745,143.4202 414.285745,137.3302 C415.832745,126.7812 423.542745,118.8552 431.376745,112.4752 C435.629745,109.0112 441.228745,107.7212 446.216745,105.6192 C451.031745,103.5892 456.410745,101.4612 461.483745,100.9852 C466.062745,100.5552 470.526745,99.0602 475.110745,98.4572 C481.410745,97.6272 487.717745,97.9372 494.048745,97.6852 C496.962745,97.5692 499.869745,97.1582 502.770745,96.8452 C504.408745,96.6682 507.178745,96.8572 508.678745,96.2082 C511.133745,95.1442 509.807745,97.3782 510.684745,94.1242 C512.352745,87.9342 513.714745,82.1292 516.241745,76.1142 C518.595745,70.5102 521.454745,65.1522 525.233745,60.3612 C528.777745,55.8672 533.373745,52.5802 537.548745,48.7412 C540.642745,45.8972 544.151745,43.3282 547.680745,41.0282 C549.698745,39.7132 551.946745,39.0022 553.917745,37.8412 C556.365745,36.4012 558.525745,35.3092 561.279745,34.4272 C567.189745,32.5352 573.054745,30.5262 579.331745,30.6252 C586.098745,30.7312 592.882745,29.1562 599.470745,31.1532 C611.703745,34.8622 617.697745,48.1202 617.492745,60.2952 C621.676745,59.2512 625.333745,57.2412 629.765745,57.0692 C633.847745,56.9112 638.697745,57.2652 642.707745,58.0232 C650.489745,59.4942 658.493745,63.8202 663.133745,70.3762 C667.559745,76.6292 668.221745,84.9312 665.501745,92.0252 C664.199745,95.4212 662.134745,98.4422 659.934745,101.3112 C658.322745,103.4152 654.724745,105.7442 654.554745,108.5632 C684.675745,99.4582 714.919745,93.0402 746.078745,88.8862 C761.873745,86.7812 777.694745,87.8352 793.505745,86.6322 C800.259745,86.1182 807.599745,86.8372 814.581745,86.8642 C817.529745,86.8762 819.823745,86.4662 821.960745,84.5582 C824.124745,82.6282 825.853745,80.2642 828.375745,83.0502 C829.019745,83.7612 829.154745,85.4812 830.020745,86.0162 C831.070745,86.6642 834.123745,86.2192 835.379745,86.2962 C839.770745,86.5642 844.055745,87.3092 848.366745,88.1672 C856.276745,89.7422 864.135745,91.3342 871.951745,93.3332 C886.833745,97.1402 901.518745,100.8222 916.185745,105.3412 C931.151745,109.9522 946.275745,115.6412 960.074745,123.1052 C966.758745,126.7202 973.434745,131.2332 979.579745,135.7052 C982.436745,137.7852 984.997745,140.0352 987.481745,142.5432 C990.138745,145.2242 993.387745,147.0332 996.018745,149.7342 C1001.74174,155.6092 1007.44074,161.8412 1012.63274,168.2062 C1015.34374,171.5292 1017.82974,175.0342 1020.24374,178.5762 C1021.93774,181.0612 1026.40174,185.6112 1025.37374,188.8212 C1024.82574,190.5352 1022.91174,191.7342 1021.15874,191.3142 C1020.57374,191.1742 1020.08574,190.4142 1019.58674,190.3422 C1017.89374,190.1022 1019.43374,189.5062 1017.45774,190.3072 C1013.53174,191.9002 1012.27974,195.0952 1007.29174,194.3682 C998.812745,193.1312 990.837745,189.1272 983.126745,185.6362 C980.924745,194.0562 980.612745,202.7852 978.684745,211.3062 C976.804745,219.6192 973.669745,227.5472 969.884745,235.1722 C966.564745,241.8622 962.301745,248.9922 956.424745,253.7732 C951.940745,257.4212 940.873745,261.9532 937.579745,254.1862 C936.180745,250.8872 938.261745,245.7612 938.850745,242.3662 C939.641745,237.8102 940.513745,233.2412 940.989745,228.6392 C941.375745,224.9002 941.570745,221.1392 941.930745,217.3962 C942.241745,214.1762 943.101745,207.2632 941.290745,204.4192 C940.199745,202.7052 940.104745,204.3872 939.469745,206.0982 C938.699745,208.1732 938.059745,210.2312 937.496745,212.3682 C936.298745,216.9092 935.218745,221.4812 934.085745,226.0382 C932.061745,234.1802 929.832745,242.1442 925.614745,249.4652 C921.868745,255.9662 916.596745,263.0982 908.584745,264.1632 C904.833745,264.6612 899.943745,262.9462 897.080745,260.4192 C893.867745,257.5842 894.827745,252.9082 894.853745,249.0542 L894.853745,249.0542 Z"></path><path d="M711.906445,581.5344 C716.309445,580.6654 720.015445,577.1514 723.611445,574.5114 C728.197445,571.1444 732.548445,567.4754 737.001445,563.9384 C745.392445,557.2734 753.006445,549.9634 760.246445,542.0134 C774.531445,526.3294 785.285445,506.1404 790.174445,485.5134 C792.647445,475.0764 795.706445,462.8474 794.302445,452.0614 C793.814445,448.3144 793.070445,447.6274 789.396445,447.2014 C787.737445,447.0094 783.526445,446.5324 782.032445,447.1844 C778.160445,448.8764 776.070445,456.0754 774.922445,459.6934 C771.530445,470.3754 769.534445,481.4384 766.469445,492.2084 C763.465445,502.7644 758.623445,513.4754 753.835445,523.3464 C743.181445,545.3104 728.373445,563.6854 711.906445,581.5344 M799.249445,460.2714 C796.616445,490.1804 788.312445,518.6764 769.693445,542.7624 C760.843445,554.2114 750.435445,564.1724 739.154445,573.2204 C727.506445,582.5634 715.610445,591.3624 702.393445,598.3304 C698.876445,600.1854 695.354445,602.0334 691.793445,603.8024 C689.819445,604.7834 684.836445,608.3954 682.559445,607.8244 C680.735445,607.3654 680.259445,605.9544 679.974445,604.1184 C679.336445,599.9974 682.013445,597.9404 684.720445,595.2944 C695.595445,584.6624 706.504445,573.9924 716.672445,562.6824 C736.753445,540.3464 751.838445,513.5994 760.223445,484.7394 C762.806445,475.8534 765.111445,466.8684 767.899445,458.0454 C769.597445,452.6704 772.005445,443.1024 777.649445,440.4224 C780.675445,438.9854 784.202445,440.3834 787.384445,439.5224 C790.369445,438.7144 792.347445,437.0664 794.891445,439.8304 C799.355445,444.6804 799.554445,454.1934 799.249445,460.2714"></path><path d="M3.71014474,632.843 C1.48114474,633.633 1.38814474,634.416 0.367144736,632.123 C-0.146855264,630.967 -0.00785526377,629.384 0.113144736,628.183 C0.403144736,625.307 1.91714474,622.65 3.16114474,620.1 C14.8691447,629.758 27.0261447,638.462 39.5801447,646.995 C53.0061447,656.12 65.8251447,666.266 78.5231447,676.374 C89.8941447,685.427 101.402145,694.212 112.654145,703.378 C118.081145,707.799 124.268145,711.225 129.427145,715.781 C133.596145,719.463 140.510145,721.113 144.064145,725.444 C138.432145,728.81 130.913145,731.52 124.672145,728.608 C117.787145,725.396 112.506145,721.209 106.379145,716.856 C103.222145,714.613 99.9391447,712.577 96.7321447,710.407 C93.9131447,708.498 91.9221447,705.712 89.0681447,703.922 C83.0701447,700.159 76.9171447,696.013 71.2261447,691.716 C65.3801447,687.303 58.9181447,683.792 53.2781447,679.102 C47.4961447,674.293 41.0241447,671.107 34.9871447,666.729 C22.1931447,657.452 10.9271447,647.017 3.71014474,632.843"></path><path d="M348.892745,140.218 C348.733745,141.072 348.574745,141.926 348.415745,142.781025 C348.512745,142.803 356.168745,128.013 357.436745,126.227 C361.738745,120.172 367.336745,115.134 372.733745,110.077 C384.165745,99.365 397.545745,90.719 408.748745,79.816 C412.434745,76.229 419.038745,70.794 417.580745,64.729 C416.131745,58.701 403.899745,59.926 399.710745,61.67 C393.143745,64.405 387.809745,70.125 382.915745,75.109 C377.577745,80.546 372.196745,85.922 367.672745,92.075 C362.794745,98.71 358.163745,105.896 355.174745,113.596 C351.825745,122.222 350.517745,131.149 348.892745,140.218 M351.406745,166.682 C346.211745,168.284 352.724745,169.366 350.689745,172.142 C348.457745,175.186 344.705745,165.807 344.144745,164.036 C340.837745,153.573 342.316745,140.862 344.122745,130.239 C345.034745,124.88 345.623745,119.433 346.853745,114.132 C348.053745,108.963 350.666745,104.051 353.080745,99.349 C357.913745,89.941 364.313745,81.176 371.576745,73.505 C378.861745,65.809 386.981745,58.109 396.594745,53.371 C404.537745,49.458 417.127745,52.173 420.845745,60.72 C424.644745,69.454 419.506745,78.968 413.430745,85.109 C405.504745,93.118 396.868745,101.073 387.965745,107.979 C383.390745,111.529 379.555745,115.822 375.110745,119.526 C370.379745,123.469 366.286745,127.435 362.788745,132.534 C359.400745,137.475 355.913745,142.412 353.711745,148.021 C351.300745,154.163 351.406745,160.184 351.406745,166.682"></path><path d="M143.610545,543.3255 C131.672545,535.6385 119.694545,528.8895 109.298545,519.0865 C99.0345447,509.4075 90.0665447,498.4925 78.6425447,490.0945 C72.9425447,485.9045 67.0595447,481.9715 61.4605447,477.6445 C56.1465447,473.5375 50.0385447,470.0195 45.2355447,465.3355 C38.8335447,459.0895 26.8475447,447.4845 35.0265447,438.1725 C45.1785447,450.2465 59.1075447,459.7635 71.8065447,468.9295 C85.1965447,478.5945 97.4865447,489.8695 110.187545,500.3995 C122.422545,510.5425 134.616545,520.7795 146.555545,531.1915 C149.690545,533.9265 152.714545,536.7995 155.886545,539.4905 C156.274545,539.8195 159.562545,541.9025 159.562545,542.4565 C159.562545,543.7865 157.014545,544.6165 156.106545,544.9865 C154.673545,545.5705 150.797545,547.0225 149.172545,546.5315 C148.320545,546.2735 148.305545,545.5795 147.691545,545.1675 C147.338545,544.5015 146.926545,543.8745 146.458545,543.2845 C145.508545,543.2995 144.559545,543.3135 143.610545,543.3255"></path><path d="M846.392845,409.2981 C837.882845,409.0791 824.928845,409.0541 825.405845,420.6751 C825.641845,426.4291 828.761845,430.6551 831.324845,435.5771 C834.015845,440.7491 836.010845,446.0921 836.800845,451.8901 C839.995845,475.3571 831.423845,498.2831 823.670845,519.9771 C840.321845,506.5381 852.346845,487.8381 858.660845,467.3411 C861.721845,457.4011 862.912845,444.6251 861.923845,434.2751 C861.428845,429.0961 859.518845,424.4531 857.218845,419.8391 C856.063845,417.5211 854.908845,414.8741 853.066845,412.9981 C851.221845,411.1181 848.663845,410.4921 846.392845,409.2981 M816.706845,533.4181 C811.208845,524.3771 819.864845,511.0651 822.694845,502.2491 C826.078845,491.7091 829.200845,480.7351 830.646845,469.7421 C832.161845,458.2271 830.205845,449.2741 824.868845,439.1031 C820.095845,430.0101 817.262845,417.9001 822.568845,408.2791 C824.705845,404.4071 827.860845,403.9311 831.611845,402.3861 C836.215845,400.4911 837.483845,397.2851 843.133845,397.7931 C853.214845,398.6981 857.878845,408.2591 861.628845,416.4051 C870.372845,435.3951 867.995845,459.9021 860.538845,478.9711 C856.246845,489.9431 851.351845,501.3361 844.064845,510.6791 C840.491845,515.2601 836.291845,519.2311 831.933845,523.0531 C827.218845,527.1861 822.994845,532.1681 816.706845,533.4181"></path><path d="M241.030445,203.718 C227.740445,206.389 215.612445,212.379 213.483445,227.315 C211.548445,240.889 220.794445,253.447 232.148445,259.801 C244.428445,266.675 259.815445,267.817 272.051445,260.199 C284.932445,252.179 287.854445,236.107 280.014445,223.498 C271.266445,209.427 256.611445,205.274 241.030445,203.718 M249.571445,197.206 C265.397445,199.525 280.088445,210.788 285.419445,225.957 C290.915445,241.594 285.865445,258.786 271.315445,267.354 C241.910445,284.671 202.609445,255.812 209.706445,222.642 C211.508445,214.22 216.625445,207.698 223.577445,202.767 C231.252445,197.322 240.533445,197.174 249.571445,197.206"></path><path d="M812.253145,38.4099 C793.184145,29.7879 774.114145,21.1659 755.045145,12.5439 C754.263145,21.1879 753.481145,29.8309 752.698145,38.4749 C752.486145,40.8139 751.620145,43.9959 751.989145,46.3039 C752.384145,48.7669 751.541145,48.5039 754.752145,48.1539 C758.858145,47.7049 762.978145,46.6909 767.042145,45.9659 C774.348145,44.6619 782.118145,44.2899 789.269145,42.3719 C792.918145,41.3929 796.413145,41.2699 800.117145,40.6779 C804.185145,40.0279 808.144145,38.8239 812.253145,38.4099 M747.747145,55.1199 C747.747145,45.3829 748.829145,35.7769 749.720145,26.0849 C750.522145,17.3649 750.831145,9.0529 753.677145,0.7449 C756.336145,5.5739 763.699145,7.5039 768.255145,9.9889 C774.533145,13.4129 781.219145,15.9339 787.645145,19.0529 C793.957145,22.1159 800.037145,25.6329 806.356145,28.6889 C809.560145,30.2389 812.813145,31.6849 816.011145,33.2469 C818.013145,34.2249 822.761145,35.7989 824.006145,37.6149 C827.787145,43.1269 814.846145,43.6599 812.348145,44.1459 C804.857145,45.6069 797.279145,46.4299 789.802145,47.9319 C782.831145,49.3339 775.847145,50.6349 768.851145,51.9059 C761.927145,53.1639 754.793145,55.1199 747.747145,55.1199"></path><path d="M159.765845,296.1692 C167.273845,295.3882 174.750845,294.2642 182.250845,293.5222 C189.352845,292.8192 195.634845,292.0712 202.122845,288.8172 C193.261845,286.1452 184.380845,283.6152 175.444845,281.2012 C171.012845,280.0042 166.589845,278.7372 162.137845,277.6192 C158.693845,276.7532 155.691845,276.2552 154.367845,272.4962 C152.826845,268.1202 157.111845,268.7832 159.782845,269.8952 C163.466845,271.4282 167.479845,272.3812 171.297845,273.6562 C179.819845,276.5012 188.393845,279.1182 196.995845,281.7052 C199.669845,282.5092 215.163845,285.4832 209.580845,290.6522 C207.191845,292.8652 201.860845,294.0802 198.939845,295.6692 C195.192845,297.7072 191.113845,298.5192 186.945845,299.3302 C178.258845,301.0202 169.243845,301.6692 160.449845,303.1352 C155.958845,303.8842 151.468845,304.6332 146.978845,305.3822 C144.347845,305.8202 143.334845,305.7772 142.647845,302.8432 C142.147845,300.7112 142.799845,298.5782 143.279845,296.5132 C144.497845,291.2662 145.852845,286.0462 147.193845,280.8302 C147.703845,278.8402 148.606845,270.0922 150.381845,269.1352 C154.408845,266.9642 151.301845,279.0752 151.002845,280.5582 C149.872845,286.1522 148.530845,291.7072 147.926845,297.3842 C151.881845,297.0262 155.825845,296.6552 159.765845,296.1692"></path><path d="M266.223845,340.7054 C267.713845,344.4464 265.239845,345.2834 262.237845,346.5794 C258.343845,348.2604 254.513845,350.0344 250.548845,351.5484 C242.207845,354.7314 233.806845,357.6874 225.664845,361.3704 C210.135845,368.3934 194.396845,375.1374 179.108845,382.6574 C175.309845,384.5264 171.507845,386.3884 167.674845,388.1884 C163.710845,390.0504 159.164845,393.1834 154.923845,394.2474 C151.224845,395.1754 150.838845,392.5414 153.030845,390.1154 C155.856845,386.9864 160.225845,384.6504 163.774845,382.4754 C178.380845,373.5224 194.321845,366.2344 210.274845,360.0754 C228.713845,352.9554 247.202845,346.1244 266.223845,340.7054"></path><path d="M306.768745,128.4778 C306.234745,117.1038 307.755745,105.6988 306.848745,94.3548 C291.252745,108.1808 298.936745,129.5478 307.908745,144.5498 L306.768745,128.4778 Z M313.519745,127.8278 C313.618745,133.3838 313.933745,138.9368 313.393745,144.4648 C312.826745,150.2678 315.548745,153.2568 319.096745,157.5308 C316.083745,160.5888 309.169745,153.4588 307.260745,151.3568 C303.329745,147.0288 300.404745,141.2788 297.801745,136.0818 C292.257745,125.0108 288.439745,113.1578 292.876745,101.0028 C294.521745,96.4978 296.533745,90.3728 300.888745,87.7498 C305.670745,84.8698 309.328745,88.9318 311.312745,93.1098 C316.156745,103.3038 312.463745,116.8858 313.519745,127.8278 L313.519745,127.8278 Z"></path><path d="M478.740445,693.2073 C485.931445,693.7773 493.015445,694.3383 500.207445,694.7943 C498.966445,684.9363 497.724445,675.0773 496.483445,665.2183 C492.322445,666.1823 488.161445,667.1453 484.000445,668.1073 C482.033445,668.5623 479.016445,668.6823 477.275445,669.6643 C476.624445,669.8143 475.972445,669.9653 475.322445,670.1163 C475.304445,671.3953 475.290445,672.6753 475.278445,673.9553 C475.229445,677.7413 475.120445,681.5233 474.963445,685.3063 C474.897445,686.8913 474.344445,689.2123 474.723445,690.7823 C474.050445,692.3703 474.478445,693.0453 476.011445,692.8073 C476.921445,692.9403 477.830445,693.0743 478.740445,693.2073 M473.789445,700.3343 C468.152445,697.5273 469.693445,688.9513 469.702445,683.4923 C469.709445,680.0193 469.954445,676.5693 470.045445,673.1013 C470.108445,670.7173 469.563445,667.7673 470.383445,665.4643 C471.842445,661.3673 478.981445,661.4783 482.652445,661.7653 C485.374445,661.9773 487.652445,661.8403 490.442445,661.6613 C491.817445,661.5733 493.351445,661.8353 494.702445,661.4293 C494.994445,661.3413 497.743445,659.4243 497.621445,659.4193 C502.552445,659.6083 502.618445,671.4313 502.938445,674.4313 C503.729445,681.8263 504.445445,689.2343 505.089445,696.6443 C505.260445,698.6053 505.989445,700.8223 504.126445,701.9413 C502.446445,702.9513 497.993445,701.9533 496.135445,701.8963 C488.645445,701.6703 481.197445,700.5023 473.789445,700.3343"></path><path d="M825.672145,261.0188 C828.931145,263.9518 827.365145,266.9778 826.298145,270.6418 C825.656145,272.8408 822.130145,280.0608 823.103145,282.1178 C824.228145,284.4958 829.510145,285.0808 831.769145,285.8318 C835.703145,287.1398 839.655145,288.4538 843.378145,290.2978 C845.030145,291.1168 850.989145,292.9988 852.106145,294.5268 C852.746145,295.4028 852.979145,296.0888 852.498145,297.2178 C851.653145,299.1998 850.448145,298.1508 848.389145,297.7258 C838.980145,295.7818 829.651145,293.2958 820.925145,289.1958 C818.492145,294.8428 816.432145,300.6098 814.374145,306.4038 C813.771145,308.1018 813.195145,311.9598 810.904145,312.2348 C808.110145,312.5688 808.072145,308.8268 808.258145,306.8078 C808.528145,303.8598 810.056145,300.7168 810.978145,297.9258 C811.739145,295.6218 814.408145,290.8248 814.079145,288.4508 C813.854145,286.8168 812.858145,286.9308 811.083145,286.2888 C809.406145,285.6828 807.728145,285.0798 806.052145,284.4668 C803.365145,283.4838 800.689145,282.4978 798.074145,281.3318 C796.639145,280.6918 793.636145,279.9438 792.597145,278.6158 C791.994145,277.8458 791.322145,275.0708 792.083145,274.3028 C793.862145,272.5038 805.694145,277.3458 808.127145,278.0068 C809.741145,278.4458 811.363145,278.7808 812.929145,279.3558 C813.522145,279.5748 814.224145,280.4628 814.865145,280.4958 C817.587145,280.6338 817.803145,278.5408 818.647145,276.2958 C820.608145,271.0788 822.737145,265.7568 825.672145,261.0188"></path><path d="M147.291245,364.8142 C145.840245,361.2572 161.241245,356.9602 164.100245,355.7622 C171.078245,352.8412 178.554245,351.0742 185.779245,348.8432 C192.884245,346.6492 199.958245,344.2872 206.946245,341.7482 C209.107245,340.9622 224.669245,333.3852 225.483245,334.4932 C228.180245,338.1592 195.524245,349.6752 192.342245,350.8212 C177.566245,356.1412 162.309245,360.2262 147.291245,364.8142"></path><path d="M809.688745,86.6482 C805.696745,86.6882 799.938745,87.8202 796.275745,86.2002 C800.746745,86.3492 805.217745,86.4992 809.688745,86.6482"></path><path d="M249.571445,197.2063 L240.694445,197.1743 C243.656445,196.4873 246.616445,196.0723 249.571445,197.2063"></path><path d="M711.844945,194.8347 C713.937945,194.8237 716.031945,194.8127 718.110945,194.8007 C716.012945,194.8127 713.928945,194.8237 711.844945,194.8347"></path><path d="M894.853745,249.0545 C894.837745,251.2935 894.823745,253.5325 894.804745,255.7625 C894.818745,253.5205 894.835745,251.2875 894.853745,249.0545"></path><path d="M482.652545,661.7649 C480.429545,661.9259 478.206545,662.0859 475.985545,662.2459 C478.209545,662.0859 480.430545,661.9249 482.652545,661.7649"></path><path d="M495.179845,235.0345 C492.921845,235.2175 490.663845,235.4015 488.408845,235.5845 C490.665845,235.4005 492.922845,235.2175 495.179845,235.0345"></path><path d="M728.805845,194.0979 C730.403845,194.0949 732.000845,194.0919 733.585845,194.0889 C731.983845,194.0929 730.394845,194.0959 728.805845,194.0979"></path><path d="M407.346845,239.4031 C405.361845,239.5821 403.374845,239.7611 401.390845,239.9401 C403.375845,239.7611 405.361845,239.5821 407.346845,239.4031"></path><path d="M495.042145,97.679 C493.056145,97.691 491.070145,97.703 489.085145,97.715 C491.065145,96.665 493.052145,96.936 495.042145,97.679"></path><path d="M132.572445,441.1282 C130.920445,441.0402 129.574445,441.8422 128.642445,440.2662 C130.167445,439.0772 131.047445,440.4472 132.572445,441.1282"></path><path d="M438.957245,308.5139 L433.801245,307.9339 L438.957245,308.5139 Z"></path><path d="M473.789245,700.3347 C474.928245,700.3607 476.066245,700.3857 477.192245,700.4117 C476.049245,700.3847 474.919245,700.3597 473.789245,700.3347"></path><path d="M738.367445,89.8899 C736.593445,90.0489 734.817445,90.2079 733.043445,90.3669 C734.818445,90.2069 736.593445,90.0489 738.367445,89.8899"></path><path d="M175.869345,628.3308 C174.164345,628.3378 172.460345,628.3458 170.756345,628.3518 C172.461345,628.3448 174.165345,628.3378 175.869345,628.3308"></path><path d="M38.8293447,598.1101 C37.1083447,598.1131 35.3883447,598.1161 33.6683447,598.1191 C35.3893447,598.1161 37.1083447,598.1131 38.8293447,598.1101"></path><path d="M473.655445,236.4544 C471.908445,236.6264 470.161445,236.7974 468.414445,236.9694 C470.162445,236.7974 471.908445,236.6264 473.655445,236.4544"></path><path d="M424.911345,239.2888 C423.192345,239.0908 421.474345,238.8928 419.756345,238.6948 C421.459345,239.0278 423.351345,237.7128 424.911345,239.2888"></path><path d="M580.584245,308.2859 C581.654245,308.1649 583.156245,307.7899 584.259245,307.9649 C584.115245,308.5949 580.995245,308.2839 580.584245,308.2859"></path><path d="M471.550045,443.1233 C472.703045,443.1453 473.857045,443.1673 474.998045,443.1863 C473.841045,443.1653 472.696045,443.1443 471.550045,443.1233"></path><path d="M367.404445,305.8025 C365.720445,305.9655 364.037445,306.1285 362.353445,306.2905 C364.038445,306.1275 365.720445,305.9655 367.404445,305.8025"></path><path d="M178.869345,300.0633 C179.787345,300.0883 180.705345,300.1133 181.611345,300.1383 C180.689345,300.1133 179.779345,300.0883 178.869345,300.0633"></path><path d="M427.040245,307.0701 C425.600245,307.0411 424.159245,307.0121 422.720245,306.9841 C424.160245,307.0121 425.600245,307.0411 427.040245,307.0701"></path><path d="M159.765845,296.1692 C158.309845,296.3492 156.853845,296.5282 155.399845,296.7072 C156.856845,296.5272 158.310845,296.3482 159.765845,296.1692"></path><path d="M359.491445,283.8001 C360.390445,283.8361 361.289445,283.8721 362.177445,283.9111 C361.273445,283.8771 360.382445,283.8391 359.491445,283.8001"></path><path d="M428.089045,435.0305 C429.002045,434.9705 429.914045,434.9115 430.815045,434.8505 C429.899045,434.9095 428.994045,434.9705 428.089045,435.0305"></path><path d="M497.930845,316.6087 C496.462845,316.4257 494.993845,316.2427 493.527845,316.0597 C494.994845,316.2427 496.462845,316.4257 497.930845,316.6087"></path><path d="M143.610545,543.3255 C144.563545,543.3125 145.516545,543.3005 146.458545,543.2845 C145.502545,543.2975 144.555545,543.3115 143.610545,543.3255"></path><path d="M65.3644447,424.9065 C63.8464447,424.7535 62.3284447,424.5995 60.8094447,424.4465 C62.3274447,424.5995 63.8454447,424.7535 65.3644447,424.9065"></path><path d="M32.9738447,598.3176 C31.4818447,598.4896 29.9898447,598.6626 28.4968447,598.8346 C29.9908447,598.6616 31.4818447,598.4896 32.9738447,598.3176"></path><path d="M846.316645,194.5926 C846.199645,195.8826 846.082645,197.1726 845.962645,198.4576 C846.079645,197.1656 846.197645,195.8796 846.316645,194.5926"></path><path d="M184.786345,627.0418 C183.285345,627.2138 181.784345,627.3868 180.284345,627.5588 C181.785345,627.3858 183.286345,627.2138 184.786345,627.0418"></path><path d="M170.059745,628.53 C168.540745,629.591 167.022745,629.651 165.502745,628.534 C167.021745,628.532 168.540745,628.531 170.059745,628.53"></path><path d="M141.259945,629.7991 C139.786945,629.8001 138.314945,629.8011 136.842945,629.8021 C138.315945,629.8011 139.787945,629.8001 141.259945,629.7991"></path><path d="M313.519745,127.8279 C313.393745,126.5209 313.267745,125.2149 313.141745,123.9129 C313.267745,125.2219 313.393745,126.5249 313.519745,127.8279"></path><path d="M474.377145,98.6433 C472.897145,98.8263 471.417145,99.0083 469.938145,99.1903 C471.418145,99.0083 472.898145,98.8263 474.377145,98.6433"></path><path d="M479.622245,97.951 C478.118245,98.119 476.613245,98.288 475.110245,98.457 C476.614245,98.288 478.118245,98.119 479.622245,97.951"></path><path d="M246.022645,272.1057 C246.948645,272.0917 247.874645,272.0777 248.787645,272.0637 C247.857645,272.0777 246.940645,272.0917 246.022645,272.1057"></path><path d="M380.019745,257.6316 C384.931745,256.8216 389.842745,256.5516 394.752745,257.6286 L380.019745,257.6316 Z"></path><path d="M511.007045,202.3846 C512.029045,199.7146 512.283045,198.7126 514.779045,197.3306 C513.740045,199.9256 513.577045,201.3136 511.007045,202.3846"></path><path d="M630.773645,466.6238 C630.872645,469.3998 630.970645,472.1758 631.068645,474.9488 C630.969645,472.1718 630.871645,469.3978 630.773645,466.6238"></path><path d="M808.884945,93.0598 C806.662945,93.1098 804.441945,93.1608 802.229945,93.2108 C804.454945,93.1608 806.669945,93.1098 808.884945,93.0598"></path><path d="M512.908445,515.9627 C512.986445,518.2767 513.063445,520.5917 513.140445,522.9037 C513.062445,520.5877 512.985445,518.2757 512.908445,515.9627"></path><path d="M240.647645,441.8191 C242.891645,441.8351 245.136645,441.8511 247.380645,441.8671 C245.135645,441.8511 242.891645,441.8351 240.647645,441.8191"></path><path d="M431.416245,322.9461 C430.063245,322.9591 428.712245,322.9711 427.373245,322.9881 C428.729245,322.9761 430.072245,322.9611 431.416245,322.9461"></path><path d="M427.010945,249.3836 C425.898945,249.3456 424.785945,249.3076 423.685945,249.2736 C424.802945,249.3126 425.906945,249.3476 427.010945,249.3836"></path><path d="M267.976745,441.1189 C269.731745,440.9479 271.485745,440.7759 273.240745,440.6039 C271.485745,440.7759 269.731745,440.9479 267.976745,441.1189"></path><path d="M229.742345,441.9075 C231.461345,441.8815 233.180345,441.8545 234.898345,441.8275 C233.180345,441.8545 231.461345,441.8815 229.742345,441.9075"></path><path d="M248.093945,441.8631 C249.873945,441.7081 251.653945,441.5531 253.434945,441.3981 C251.654945,441.5521 249.873945,441.7081 248.093945,441.8631"></path><path d="M254.585145,444.6853 C253.700145,444.6803 252.815145,444.6743 251.942145,444.6693 C252.831145,444.6753 253.708145,444.6803 254.585145,444.6853"></path><path d="M629.997345,404.9129 C630.129345,403.6079 630.262345,402.3039 630.393345,401.0039 C630.262345,402.3099 630.129345,403.6109 629.997345,404.9129"></path><path d="M364.225745,273.0428 C365.341745,273.1378 366.458745,273.2328 367.576745,273.3288 C366.329745,273.3928 365.081745,273.4558 363.835745,273.5198 C363.842745,273.2638 363.972745,273.1048 364.225745,273.0428"></path><path d="M651.050045,492.4602 C650.979045,491.2722 650.907045,490.0832 650.838045,488.9022 C650.909045,490.0932 650.980045,491.2772 651.050045,492.4602"></path><path d="M384.264845,268.51 C383.368845,268.528 382.471845,268.545 381.586845,268.562 C382.487845,268.544 383.375845,268.527 384.264845,268.51"></path><path d="M712.353745,418.4768 C713.847745,418.6518 715.341745,418.8268 716.834745,419.0008 C715.340745,418.8268 713.847745,418.6518 712.353745,418.4768"></path><path d="M402.063645,320.0408 C401.143645,320.0548 400.224645,320.0678 399.316645,320.0838 C400.239645,320.0708 401.151645,320.0558 402.063645,320.0408"></path><path d="M348.892745,140.218 C349.857745,140.733 349.356745,142.997 348.415745,142.781 C348.574745,141.926 348.733745,141.072 348.892745,140.218"></path><path d="M846.392845,409.2981 C845.505845,409.2751 844.619845,409.2521 843.745845,409.2291 C844.634845,409.2531 845.513845,409.2761 846.392845,409.2981"></path><path d="M306.768745,128.4778 C306.674745,126.4828 306.581745,124.4888 306.488745,122.4998 C306.581745,124.4968 306.675745,126.4868 306.768745,128.4778"></path><path d="M474.645745,692.6072 C476.011745,692.8072 477.376745,693.0072 478.741745,693.2072 C477.374745,693.0072 476.010745,692.8072 474.645745,692.6072"></path><path d="M465.619345,179.0227 C460.804345,180.0137 455.859345,180.5317 451.157345,181.9907 C449.984345,182.3547 446.134345,184.5907 444.729345,184.0017 C442.594345,183.1047 443.674345,180.8037 444.573345,179.5757 C446.979345,176.2917 451.283345,174.4517 455.230345,174.4927 C459.169345,174.5347 464.577345,174.3907 465.619345,179.0227"></path><path d="M452.241445,187.8328 C457.543445,191.5438 461.593445,193.3718 462.042445,185.0308 C467.788445,185.8138 465.213445,195.0678 460.865445,195.7658 C456.133445,196.5248 452.976445,191.7978 452.241445,187.8328"></path></g></g></g></svg>
diff --git a/waterfox/browser/components/aboutwelcome/assets/laying-doodle.svg b/waterfox/browser/components/aboutwelcome/assets/laying-doodle.svg
new file mode 100644
index 0000000000000..988b219b40880
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/laying-doodle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 768" version="1.1"><g stroke="none" stroke-width="1" fill="#FFFFFF00" fill-rule="evenodd"><g transform="translate(-42.000000, -146.000000)"><rect x="0" y="0" width="1024" height="768"></rect><polyline fill="#7fbbca" points="218 458.457317 220.613419 491.231707 270.268371 503.030488 308.162939 520.073171 338.217252 546.292683 352.591054 534.493902 370.884984 493.853659 391.792332 489.920732 467.58147 497.786585 493.715655 505.652439 484.56869 550.22561 475.421725 583 627 573.823171 621.773163 497.786585 590.412141 428.304878 466.27476 368 373.498403 379.79878 308.162939 451.902439 279.415335 467.634146 228.453674 465.012195"></polyline><path d="M843.006191,157.210504 C853.218503,169.624798 838.172904,187.180458 829.640885,195.842626 C825.500864,200.048248 822.068473,204.908629 818.021149,209.218803 C814.022133,213.478007 809.003451,216.83022 805.411778,220.941744 C801.641239,225.259759 797.289714,229.985529 794.136718,234.843296 C792.141779,237.921059 789.182011,241.35822 788.191069,244.929992 C786.766673,250.06613 787.957369,247.099455 789.840027,250.003399 C791.763159,252.968767 792.41073,253.139972 793.063525,257.273713 C793.696735,261.292447 794.597591,264.232984 796.768784,267.666225 C800.34479,273.321204 804.20672,278.637695 806.729117,284.889931 C810.081867,293.20577 812.454121,301.648378 815.125355,310.203381 C816.167214,313.53991 816.865704,317.361302 818.547301,320.435143 C820.933917,324.801514 821.270758,324.43558 824.823264,321.71199 C835.428557,313.583038 846.153965,304.990135 857.209686,297.2428 C863.543094,292.80455 870.121953,288.459089 876.80526,284.571046 C881.393097,281.902345 891.248982,277.153051 893.545512,272.19988 C896.590144,265.631373 891.850858,259.603926 898.374883,253.555568 C902.621961,249.616555 909.546801,247.432716 915.08119,246.476061 C922.904275,245.124721 931.545963,247.05502 939.359909,247.754215 C947.260023,248.459943 954.985189,247.691483 962.732549,246.074841 C974.592513,243.600869 997.376333,229.911036 1005.06233,246.357133 C1008.42553,253.552954 1006.1525,261.526383 1005.51929,268.902557 C1004.96963,275.331225 1003.08306,282.155885 999.07882,287.443624 C994.501428,293.485447 987.839011,293.801718 980.908949,295.406598 C972.724216,297.300304 964.325367,297.99035 956.13019,299.838314 C952.093311,300.74792 948.111267,301.190961 943.966024,301.38177 C940.277737,301.552974 934.957465,300.057874 931.719606,300.529667 C928.650168,300.976629 929.698556,302.91477 927.54303,304.258268 C926.668285,304.803248 924.886158,304.412483 924.340422,304.851603 C922.841606,306.05657 922.408151,307.106015 921.315374,309.288547 C917.843815,316.22168 912.592739,322.979688 908.128933,329.331248 C904.370144,334.681718 900.014702,341.233235 895.592674,346.00736 C886.217245,356.130649 877.112073,367.285087 867.859369,377.863179 C863.151418,383.245015 857.504749,388.970568 852.034334,393.597013 C850.346208,395.02546 846.933401,396.310148 846.070407,398.309713 C844.839237,401.160074 848.188071,407.43322 848.970118,410.297956 C850.82797,417.109547 851.079949,424.144619 853.051387,430.852964 C854.937962,437.268562 855.623396,444.264427 856.041184,450.951862 C856.987736,466.067529 859.053176,480.404281 858.568803,495.529097 C858.149709,508.572013 857.671864,521.080404 853.142778,533.88677 C849.019731,545.543059 836.668866,558.23311 825.182301,562.527601 C818.344935,565.085215 811.993248,567.408892 805.112798,568.795519 C798.317212,570.165156 791.157366,571.567465 784.410086,573.495151 C771.892106,577.070844 758.697831,579.56834 745.696783,580.79291 C729.057061,582.35989 711.69796,582.510184 695.101323,581.933839 C687.532828,581.671151 679.754133,581.655468 672.284863,581.677685 C664.54403,581.701209 657.25232,583.226368 649.515404,584.037956 C622.210331,586.901386 593.35422,584.599926 566.064815,587.400624 C552.576783,588.784637 539.10964,591.449417 525.387908,591.608859 C513.102323,591.750005 500.645705,590.939724 488.631682,590.88614 C484.821976,590.869151 481.501865,591.17366 477.69477,590.29934 C475.686775,589.838002 472.864093,588.042314 470.836515,589.077383 C469.066137,589.980455 467.73052,593.790084 466.63252,595.411954 C464.234155,598.960202 461.310943,601.809255 458.224532,604.751099 C445.972892,616.428299 433.832227,620.360777 417.752603,624.639585 C410.370807,626.605171 406.72691,627.632399 400.529283,632.128153 C395.480573,635.790102 390.371806,638.420903 384.560633,640.57991 C373.162848,644.814284 359.721817,641.539179 349.009465,637.865468 C343.822363,636.08677 338.371532,634.468821 333.07215,632.356862 C325.853552,629.48167 319.896153,624.704931 312.782003,621.767007 C313.597995,629.357514 305.364956,631.907286 302.867366,637.008138 C301.253659,640.304153 302.231544,645.479498 300.510779,649.205486 C298.91535,652.660943 296.447788,655.928207 292.60022,656.832585 C287.356978,658.06369 277.98416,652.230972 274.301095,648.82779 C272.256544,646.938005 270.431332,641.906419 267.927213,641.068693 C264.661937,639.974813 258.675815,644.806442 255.585488,645.896401 C240.794479,651.117488 225.806326,653.579698 209.92515,651.500412 C193.833776,649.392373 179.08324,643.678583 163.993251,638.260153 C134.439956,627.649388 108.715951,610.181291 85.574399,589.147956 C84.287089,587.976969 82.4187923,586.934059 81.5309923,585.399752 C80.7554729,584.060174 80.8233634,580.897463 80.3167952,580.149913 C78.8088408,577.924253 76.5501731,578.317631 73.722269,578.104606 C64.9852726,577.444619 58.0447655,575.335273 51.2726793,569.480337 C40.613857,560.264041 36.6709805,538.777209 53.0104173,533.069954 C57.186994,531.61014 61.7839702,531.320007 66.1015505,532.219158 C67.8823729,532.590319 74.5069276,536.605133 76.1989699,536.33591 C78.7644508,535.928156 78.2657161,532.625606 78.9472331,530.861284 C80.675832,526.39036 83.1081429,522.453961 86.040494,518.660015 C90.9142549,512.35289 96.8533758,506.013092 102.947862,500.880874 C109.5685,495.303002 116.858904,492.827724 124.740741,489.739506 C130.050568,487.658913 140.415633,484.08714 146.040107,485.948174 C153.364457,488.372483 149.779312,496.377279 145.164057,499.17667 C138.572142,503.177107 130.661583,504.815966 123.982194,508.863452 C116.610843,513.330455 109.877924,519.448079 103.13195,524.816846 C97.7033137,529.137475 92.9992793,534.469649 87.4844746,538.612539 C86.0222158,539.71034 83.6342949,541.631491 83.1799502,542.237895 C83.021974,542.448307 83.2165067,544.156432 82.4932108,544.915744 C79.2853805,548.283639 80.0360937,547.90333 75.2054173,546.721887 C69.5104414,545.328726 55.9153511,542.177777 52.0756161,549.238987 C48.619724,555.593161 62.764467,561.318713 67.4084443,563.256854 C74.2262261,566.10068 75.8190437,568.957575 80.6901934,574.377312 C85.6801517,579.932966 93.9693314,583.708616 100.220488,587.850199 C113.732021,596.799887 128.919928,603.15014 143.389763,610.261013 C157.470532,617.17977 172.607522,622.160386 187.279723,627.001163 C196.138139,629.923404 206.753877,633.05867 216.050971,633.959128 C225.418566,634.867427 234.203869,633.339654 243.395211,631.551808 C247.070441,630.836931 249.844816,630.289337 253.688468,628.934076 C255.400094,628.330286 258.192748,628.241417 259.551865,627.185437 C261.659084,625.547885 260.783035,624.239672 261.156433,621.442895 C262.788418,609.178895 271.295631,622.870036 275.060948,626.952808 C277.965881,630.103757 280.826425,633.977424 284.650493,635.974376 C289.443308,638.474486 290.274967,637.295657 291.84559,633.172371 C294.785775,625.449867 295.891608,616.67269 307.002164,617.807084 C298.229916,610.301527 289.870235,603.925135 282.361797,594.906181 C274.953889,586.00877 268.027744,576.44745 260.924038,567.303033 C255.101115,559.807931 250.03021,549.465082 242.47216,543.552642 C240.082933,541.683767 232.819946,537.377514 230.05471,537.46769 C225.917301,537.602302 222.243375,544.362923 217.786097,544.924892 C212.862724,545.546979 210.596223,543.828399 209.190104,539.830575 C207.731762,535.683764 211.217683,530.910946 210.040042,527.895915 C209.71234,527.056882 207.616871,526.051872 206.969299,524.833836 C205.99533,523.004169 205.924828,520.596849 206.215974,518.571146 C206.650735,515.546966 207.720012,514.313248 207.491534,511.270772 C207.2265,507.735593 205.676766,505.150534 206.897491,501.453299 C208.178273,497.569176 212.119844,495.441534 214.579573,492.572877 C218.30311,488.231337 216.400868,484.957539 214.907275,479.379667 C211.708584,467.445007 207.978518,455.646266 204.732826,443.71814 C197.268778,446.079718 189.97054,448.757568 182.467324,450.958396 C175.250033,453.07689 166.318503,454.97713 159.622141,458.31758 C155.598318,460.324987 156.715902,458.480943 157.013576,462.938798 C157.204192,465.824445 158.423611,469.049887 158.990237,471.89502 C160.036013,477.151394 160.491663,490.714458 164.608183,493.225023 C167.100551,494.746261 171.111318,492.536284 173.851748,495.607511 C176.160028,498.189956 175.468066,501.947309 176.857212,504.81858 C177.720206,506.603813 179.390053,507.283404 180.429301,508.92357 C182.599189,512.35289 182.3681,515.235923 182.750637,519.079532 C182.990865,521.498614 182.618773,528.746711 183.822525,530.627348 C185.428398,533.135299 188.610117,532.700099 191.293101,533.481629 C198.053437,535.449828 204.279787,538.87392 210.020458,542.866516 C212.999811,546.510169 234.322678,567.842785 225.06214,570.557227 C220.590501,571.868053 212.678636,561.794427 209.460361,559.055153 C204.471708,554.811631 199.246744,552.024002 193.164009,549.683335 C178.318165,543.970851 164.886273,538.837327 148.719174,541.20936 C141.787806,542.224826 133.368068,545.294747 126.405366,544.619076 C119.398273,543.939486 121.213041,537.688557 125.594595,534.200427 C129.512666,531.082151 134.966108,531.959084 136.685567,526.730156 C138.420694,521.447644 136.55762,514.771972 139.342439,509.479005 C141.719916,504.958419 147.324806,500.266629 151.651525,497.647591 C153.5381,496.506662 156.772042,495.70945 157.757761,494.027463 C158.565921,492.647371 155.235365,484.736672 154.773187,483.092585 C152.511908,475.036821 150.046957,466.973215 148.131659,458.829887 C146.356059,451.282509 145.893881,447.370941 153.843608,444.631667 C165.976439,440.44957 178.696786,438.49444 190.834839,434.649524 C188.68323,429.044207 181.958145,433.760828 177.127468,433.566099 C171.210543,433.328243 164.364038,431.380954 158.729119,429.563048 C145.936966,425.434534 137.232609,415.141348 135.255948,401.868417 C134.821187,398.956631 136.190749,393.117378 135.130612,390.542775 C134.130531,388.110624 131.302627,386.927874 129.235881,385.194918 C123.909081,380.730529 119.190685,374.601143 116.317085,368.257424 C113.436958,361.89933 113.235897,354.757092 114.909661,348.04744 C115.831406,344.350204 116.352336,343.841818 115.049359,340.345846 C113.540099,336.302281 111.079065,332.701757 109.687308,328.545798 C107.407751,321.739435 106.164831,314.401161 106.288862,307.213181 C106.429866,299.149575 109.663808,295.532061 111.806278,288.422496 C113.497015,282.810644 111.19004,275.054161 111.576494,268.826757 C112.071312,260.858555 114.110641,254.457332 117.631813,247.364757 C123.04217,236.46778 131.60944,224.78666 142.760469,219.072869 C144.965608,217.942396 148.589921,217.875744 150.560053,216.562304 C153.008031,214.929979 153.199953,212.523966 154.158255,209.664458 C156.44434,202.845025 159.298356,197.320736 164.241313,192.107491 C180.272631,175.200056 208.364973,169.211816 230.894203,170.638956 C234.940221,170.896417 238.796929,172.811033 242.631441,171.685787 C245.288313,170.905565 248.103162,168.137539 250.842286,166.991383 C254.308623,165.540718 257.781487,164.692537 261.511553,164.321376 C268.877682,163.586895 274.869026,164.363197 281.658085,166.850238 C284.220955,167.789903 286.67546,168.815823 289.201774,169.835209 C293.190346,171.446624 292.963173,170.67947 296.714128,169.93192 C304.189927,168.443355 308.485312,169.545076 315.108561,172.735232 C316.873716,173.584721 319.66637,174.215956 321.183463,175.406547 C323.332461,177.093762 324.208511,182.220752 326.600349,183.177406 C327.926826,183.709317 332.028985,181.75288 333.739305,181.474509 C336.757825,180.981805 339.713677,181.415698 342.71653,181.383025 C348.034191,181.325521 353.654748,181.522864 358.510231,184.03735 C362.167183,185.929749 366.568321,189.581243 369.7174,192.013394 C374.074148,195.377368 376.7963,201.738076 382.236686,203.499785 C384.367406,204.189831 386.673075,203.491943 388.848185,204.080051 C391.683922,204.845897 394.407379,206.900353 396.703909,208.714337 C400.654619,211.83392 403.995619,219.085938 408.020748,220.353637 C410.706343,221.200511 414.881614,220.317043 417.954969,221.193977 C421.811676,222.294391 425.009062,223.888816 427.8683,226.807135 C433.321742,232.374552 434.862336,240.604135 435.096037,248.152821 C435.158705,250.187672 433.904035,255.924987 435.123454,257.73113 C436.205787,259.333396 440.284444,260.257378 441.945153,261.901465 C447.136171,267.041524 449.481008,275.606982 450.005854,282.648588 C450.606425,290.683442 448.531845,296.346263 447.103532,304.034787 C446.214426,308.827209 445.064203,305.757289 449.10761,308.580204 C451.884596,310.518345 453.802505,311.873606 455.602911,314.916082 C459.368228,321.27679 460.314779,328.775813 459.693319,336.025217 C458.916494,345.070309 454.329963,351.811327 452.267133,360.368943 C461.771815,360.368943 472.010238,362.880816 481.295582,364.633376 C484.721445,365.280294 487.375706,367.163545 490.416421,368.674327 C493.040654,369.977312 494.99773,370.128913 497.474431,370.992777 C503.465776,373.082519 502.307719,372.733575 506.476462,368.457381 C523.082239,351.423176 546.718608,341.139138 570.554733,341.473706 C583.849538,341.659286 596.710888,343.41446 609.140088,348.200348 C614.291939,350.182923 620.018249,352.32102 624.589113,355.431455 C629.883273,359.0359 630.670543,358.994079 637.669802,359.140452 C663.015186,359.665828 687.608552,373.278555 706.053902,389.778235 C707.701555,378.71136 725.675588,372.074895 734.379945,367.487657 C737.354075,365.920677 740.086671,365.103862 741.550235,362.167245 C742.919797,359.418823 742.838851,353.765151 743.754068,350.527946 C745.43436,344.582834 747.37577,337.308598 747.224322,331.039373 C746.789561,312.887764 742.589483,294.819798 742.045053,276.626368 C741.907966,272.057427 741.389648,266.92913 741.996746,262.404624 C742.486342,258.759665 744.149661,256.486956 741.757824,253.112527 C737.216988,246.707383 728.84425,245.107731 726.029402,236.675578 C721.492483,223.087683 729.285539,209.192665 739.926083,201.110762 C746.053209,196.458179 752.039331,195.472772 756.949648,188.950007 C761.371676,183.072854 765.109575,176.122731 770.150451,170.780102 C774.377946,166.301337 778.228125,160.300028 783.073163,156.572734 C788.039621,152.751342 795.332637,150.167591 801.263924,148.352299 C815.50267,143.992463 832.987107,145.032759 843.006191,157.210504 Z M397.940301,498.55589 C394.628024,498.697036 391.294857,499.069504 387.976052,499.065583 C385.957612,499.062969 381.266634,497.97301 379.447949,498.74147 C375.813192,500.279698 372.871701,508.696169 371.173131,512.054915 C365.670077,522.944051 361.336829,534.361176 355.968251,545.292133 C353.175597,550.978478 349.005548,554.717534 342.416245,554.809018 C335.033143,554.910956 331.558973,550.179959 326.873217,545.326112 C317.530427,535.64325 304.953696,527.31957 293.356156,520.585087 C280.829036,513.313465 265.891801,506.265325 251.629556,503.697255 C242.131401,501.987823 220.371162,494.612956 214.592628,506.526706 C217.545869,506.13202 228.817012,504.408212 229.294858,509.403204 C229.653894,513.151409 215.788547,513.791793 214.075616,519.668946 C217.701234,519.386654 230.215297,515.893296 231.095264,521.281667 C231.562664,524.146404 226.333783,525.589227 224.49421,526.55503 C220.849007,528.472261 218.654313,530.462677 215.784631,533.344404 C220.21188,533.344404 224.576462,529.584437 228.780456,529.976509 C230.514277,530.138565 232.599301,532.731465 234.176452,533.522143 C236.41423,534.642161 238.829568,535.200209 241.29713,535.506025 C246.669626,536.17124 249.921846,534.65523 254.205481,538.155123 C258.051744,541.296923 262.050761,545.445041 265.594127,548.942319 C273.156094,556.40867 279.381139,565.885041 285.868607,574.275373 C293.878391,584.633905 302.196293,592.856954 312.851199,600.616051 C321.524222,606.929711 330.314747,611.019018 340.14191,615.66768 C349.782373,620.22878 361.907371,625.517826 372.844284,625.768752 C381.568225,625.970015 392.472498,623.170624 400.41178,619.44725 C405.029645,617.281708 406.708632,617.284322 411.329108,616.426992 C418.500705,615.096562 426.801635,611.246419 433.440551,608.226161 C454.288184,598.740642 467.499431,578.068013 476.899666,557.833197 C482.249967,546.316747 485.592273,535.064291 487.822218,522.604255 C489.036415,515.816189 490.095247,514.223071 483.482442,511.415839 C476.803053,508.581161 469.584456,506.828601 462.632198,504.826422 C442.240216,498.954496 418.996828,497.659353 397.940301,498.55589 Z M447.75502,375.726388 C445.675218,376.66344 444.569385,386.666493 443.634584,388.894767 C439.468452,398.83901 432.077517,405.044197 421.238523,406.079266 C417.874022,406.400764 412.386635,403.337378 409.975213,404.785429 C406.746494,406.724877 406.162896,415.994757 402.688726,419.035926 C399.490034,421.836624 392.826312,424.796764 388.724154,425.873654 C385.556797,426.704846 382.415551,426.476138 379.259945,425.744271 C377.459538,425.327368 374.025841,423.103015 372.263297,423.942048 C369.26175,425.371803 367.847798,432.984527 364.421934,435.566972 C359.412392,439.342621 351.457443,442.139399 345.325095,442.068826 C339.000826,441.995639 331.377496,436.99934 325.746494,438.195158 C319.061882,439.614458 319.940543,445.832713 317.022553,450.693094 C310.824926,461.015033 303.782583,469.90591 292.640693,474.83425 C280.588808,480.16381 263.313265,480.842094 250.672559,478.130266 C243.801248,476.656076 236.905131,474.571562 231.105708,470.63255 C226.485449,467.493726 223.016932,463.313908 218.738017,459.767662 L218.03843,459.20047 L218.073624,459.325841 C218.168519,459.656226 218.264922,459.978657 218.363167,460.292314 C220.401191,466.790248 221.305963,478.319767 225.354592,483.619268 C228.9776,488.362028 241.556942,488.62733 247.613566,489.265099 C263.843333,490.975839 277.800072,494.775013 292.117152,502.917033 C305.820606,510.71011 318.337281,520.140739 330.201161,530.304542 C332.638694,532.39167 334.586632,535.738654 337.53465,537.082153 C342.34966,539.27514 341.960594,536.714913 343.233543,532.426956 C345.846025,523.63279 348.616483,514.94579 352.597222,506.656089 C354.301014,503.102614 358.179917,498.700956 359.011577,494.92792 C359.807986,491.307793 358.172083,487.358325 358.728264,483.471588 C360.131771,473.652808 364.564243,465.280772 370.119521,457.340015 C373.976229,451.828795 385.515018,442.445215 384.041009,456.316708 C382.952148,466.560232 375.473739,475.635383 373.634165,485.699862 C379.304335,484.642575 382.863368,484.951005 387.968218,485.27381 C394.933531,485.714238 402.854535,482.988033 410.035271,482.964509 C423.801393,482.921381 437.361232,483.819225 450.892349,486.272286 C457.159172,487.409294 463.125711,488.693982 469.167973,490.838614 C473.915092,492.523215 480.227611,497.889368 485.28546,498.298429 C488.951551,498.595097 487.673381,499.076038 488.67085,495.947307 C489.597818,493.04467 488.601654,487.822276 488.41626,484.777186 C487.995861,477.885874 486.344292,471.178836 485.487826,464.333266 C485.120956,461.395342 481.615451,449.149639 485.314183,446.776299 C490.975213,443.144409 493.340939,457.394905 494.061624,459.947291 C497.753827,473.032028 500.128692,485.923342 500.019023,499.604028 C499.922409,511.435442 499.136445,522.808133 496.923473,534.570281 C495.615274,541.51779 493.215603,548.190849 490.52348,554.705772 C489.105611,558.137706 480.787708,571.146642 481.944459,573.437647 C482.871427,575.273849 497.005725,572.077158 499.17953,571.891578 C506.916446,571.228977 514.672945,571.690314 522.419,571.230284 C533.867703,570.549386 545.40127,570.689225 556.364294,568.671363 C562.901375,567.466396 569.837965,568.61778 576.368517,568.659601 C583.571448,568.706649 590.532844,568.041435 597.782776,568.728867 C603.288441,569.249015 611.550203,572.155573 616.861336,570.947992 C622.299111,569.71166 620.693238,566.071928 620.7311,560.535877 C620.81988,547.159701 619.629183,531.766969 616.641998,518.760647 C615.066153,511.903314 612.947183,505.265542 611.816543,498.294509 C610.685904,491.320862 610.744656,483.783938 608.641353,477.031158 C604.909982,465.04945 594.653281,454.649097 586.156512,445.794813 C577.412988,436.683069 567.687661,430.067514 556.960948,423.532987 C547.844026,417.979946 538.21009,412.765394 528.332009,408.42124 C516.477268,403.206688 503.015348,399.991701 492.028823,393.126527 C482.885788,387.414043 469.661485,381.781281 459.113638,379.136105 C457.443791,378.717895 448.935272,375.195785 447.75502,375.726388 Z M773.407894,264.992296 C765.801537,266.061345 751.582375,262.345813 751.588903,272.833729 C751.591514,278.586726 753.500284,284.619401 754.042103,290.375013 C754.680536,297.167 754.239247,304.002115 755.273273,310.767964 C756.948343,321.719831 759.40546,331.833972 758.582939,343.086427 C757.686,355.317754 755.137492,367.070754 755.375109,379.477207 C755.59967,391.28379 754.963849,402.668243 760.573961,413.502488 C762.940993,418.076657 764.861513,423.450652 767.466162,427.730767 C770.518627,432.74667 773.162443,434.215631 778.618496,436.236107 C782.035221,437.501192 790.448431,439.147892 792.661403,442.557608 C795.857483,447.479414 791.589516,449.469831 787.386827,449.302547 C774.406669,448.786319 761.079224,442.994115 748.909836,438.763662 C743.183526,436.771938 737.672638,434.263987 732.045553,432.090603 C727.549107,430.353726 723.883015,429.753857 719.793913,426.791102 C709.828358,419.57045 702.135832,409.59092 692.308669,402.184688 C673.715787,388.173355 651.425479,379.807854 628.073728,377.326041 C622.065411,376.686964 617.4136,376.974483 611.396144,377.484176 C608.066894,377.766468 604.770284,377.856644 601.473673,378.468276 C599.570126,378.822447 592.41028,382.224322 590.923215,381.517286 C581.263168,376.924821 608.616547,362.944854 611.692513,362.180314 C607.807082,359.442348 599.73463,359.91414 595.072374,359.305123 C589.120198,358.526207 583.333831,357.766895 577.322902,358.094928 C568.920136,358.554959 559.982079,358.306647 551.734678,360.120631 C541.402253,362.392033 531.616869,365.880163 522.279302,370.774524 C519.161558,372.408156 514.776087,374.394652 514.805962,378.94791 C514.833533,383.226718 516.537325,382.526217 520.703457,383.473724 C531.927599,386.028724 542.314859,393.467629 552.31436,399.135677 C562.94707,405.160511 573.536696,411.930281 583.403027,419.149626 C602.317083,432.991061 613.111687,452.904378 621.511842,474.550652 C625.856839,485.745603 629.007224,498.819885 630.314118,510.751931 C631.769848,524.027475 630.555651,537.378821 631.5949,550.63999 C631.839045,553.773949 632.258138,566.279726 634.622559,568.228322 C636.416437,569.706432 645.319243,567.063869 647.828584,566.891358 C658.318985,566.168639 668.873361,566.240519 679.164007,565.647184 C700.913801,564.393862 723.210637,566.142501 745.158881,564.852585 C756.200241,564.203053 766.887786,562.65045 777.715029,560.422176 C787.778503,558.352038 800.318678,558.105033 809.498269,553.321759 C827.169406,544.114611 837.941815,521.91813 838.717334,503.123524 C839.558133,482.750176 838.166376,460.579834 833.887963,440.283593 C831.644963,429.641463 829.699636,419.512946 827.059737,408.996279 C824.105191,397.222368 820.787691,385.499427 817.54461,373.870583 C811.957998,353.85402 803.26278,335.205787 799.100565,314.689987 C796.810563,303.404859 793.566176,291.606117 790.17948,280.591519 C788.931338,276.532271 786.470304,268.820222 783.56537,265.735926 C780.512905,262.497414 777.950035,264.354527 773.407894,264.992296 Z M153.370985,508.778504 C148.789676,511.709892 145.486538,518.300616 145.695432,523.734729 C145.695432,530.907025 151.648914,527.851481 157.259027,528.111555 C160.674446,528.26969 173.304706,531.773504 175.525512,528.391232 C178.177161,524.351588 170.202628,526.155117 169.193409,523.988268 C167.152774,519.606215 176.509925,517.755637 175.36623,513.95777 C174.222535,510.161209 164.715241,518.92401 162.677218,514.514511 C160.790643,510.433046 170.39455,506.903094 168.920541,504.091941 C167.669787,501.709452 154.989914,507.740821 153.370985,508.778504 Z M173.264886,471.408982 C173.241385,474.465834 172.187775,478.531616 168.387208,477.908223 C163.641395,477.129307 162.202637,468.017563 161.769181,464.569946 C164.808591,453.218166 173.315804,464.44579 173.264886,471.408982 Z M311.067766,373.844445 C305.580378,374.704388 304.961529,377.161371 302.396048,380.931793 C301.224936,379.998662 300.499029,378.761023 300.219633,377.218874 C287.246003,383.063355 273.747526,387.629683 259.675896,389.789997 C243.997087,392.198624 227.641983,388.553665 211.711195,387.06902 C209.649671,386.876905 203.321485,384.32844 201.641193,385.339984 C200.250742,386.177711 200.274242,393.208862 200.160656,394.568043 C199.386442,403.831388 201.152903,412.01523 202.513326,421.081232 C202.87628,423.495087 202.519854,428.722708 204.422096,430.782391 C205.760324,432.230442 208.141717,431.703759 209.836371,433.890212 C214.404297,439.789665 215.82925,451.216408 217.932369,458.824401 L217.98443,459.00947 L217.994598,458.873404 C218.645385,451.116673 224.708566,455.101406 229.220439,457.134831 C236.00297,460.19299 243.110592,461.827928 250.447998,462.856463 C256.347951,463.683734 263.041702,465.661082 269.094409,465.34481 C275.451318,465.014163 283.270486,462.497064 289.458975,460.685693 C295.322371,458.971033 298.557619,455.259422 302.604943,450.480069 C306.470789,445.915048 310.677395,442.788931 314.850055,438.715307 C325.36004,428.453486 322.482523,407.191442 313.352545,397.147874 C320.739563,393.356542 333.549995,385.022406 322.315408,376.569342 C319.41178,374.38289 314.569353,373.295545 311.067766,373.844445 Z M217.98443,459.00947 L217.974102,459.148772 L217.974102,459.148772 L218.03843,459.20047 L217.98443,459.00947 Z M253.974653,441.392764 C256.88742,441.613631 258.980278,443.804004 258.213898,446.822955 C257.245152,450.636505 250.615375,453.025528 247.300486,453.237247 C238.515183,454.287999 246.825252,440.853012 253.974653,441.392764 Z M226.23012,426.719353 C226.544766,428.933251 226.232731,430.313343 228.151946,431.032141 C229.619427,431.582348 232.392496,430.450568 234.196819,431.215107 C235.997225,431.979647 236.054671,432.442292 237.160504,434.23798 C235.908445,438.156082 230.162551,442.587798 225.552519,440.231448 C219.819682,437.301366 219.285696,425.744402 220.857624,420.812141 C223.521024,412.453174 225.760108,423.416803 226.23012,426.719353 Z M735.97929,382.581107 C733.587453,383.450199 731.477622,385.913716 729.339068,387.254601 C723.649315,390.821146 717.425576,392.714851 711.976051,396.619885 C715.868009,400.818972 717.906032,406.513158 721.7066,410.55411 C724.085381,413.082972 726.977259,413.363956 729.837803,414.736207 C738.196179,418.747099 748.033786,424.38901 757.266906,426.30624 C751.860466,419.980818 748.430685,414.25788 745.220244,406.571969 C744.072632,403.823547 742.632568,400.91699 741.773491,398.062708 C740.541016,393.974708 741.204254,389.648851 740.159784,385.614435 C739.034367,381.259826 740.586711,380.908268 735.97929,382.581107 Z M210.459919,406.528449 C212.890925,409.398413 214.759222,415.866288 214.965504,419.530851 C212.401329,431.814454 203.815781,414.866505 204.076899,409.365741 C204.319738,404.292334 206.983138,402.42738 210.459919,406.528449 Z M233.720149,399.806904 C237.886281,403.36038 239.246704,409.295037 239.678854,414.198546 C240.148865,419.51373 238.934668,421.77337 233.640508,418.357119 C229.00567,415.365613 226.686945,407.401331 226.446717,402.734372 C226.446717,397.415267 229.68327,396.363208 233.720149,399.806904 Z M317.532908,384.593349 C318.573462,390.139856 306.290488,395.840577 308.295871,387.154884 C307.89375,381.612298 316.42838,378.717503 317.532908,384.593349 Z M897.479249,284.216874 C888.201739,295.543823 876.967153,302.735724 865.357862,311.294647 C855.073743,318.877312 845.281832,327.068995 834.147775,333.363051 C830.878582,335.212322 825.524365,336.287905 824.932933,339.722452 C824.378058,342.951816 830.370708,351.62444 831.755938,355.125639 C836.432555,366.933529 839.88453,379.051156 843.540177,391.235435 C854.436616,374.250892 865.427058,356.984059 878.783226,341.626614 C890.570076,328.074005 902.661129,313.892775 912.964831,299.289414 C906.728036,295.49024 901.560518,290.250857 897.479249,284.216874 Z M965.484729,258.095757 C955.152304,261.32512 943.249256,263.143025 932.480764,262.042611 C927.59917,261.543373 922.790688,261.127777 917.862093,260.823268 C914.172501,260.595867 907.931789,258.796258 904.757904,261.640084 C901.755051,264.328388 902.118004,269.678859 903.646848,273.020616 C904.635178,275.180931 906.007352,275.529874 906.902985,277.319028 C907.19152,277.895373 906.33636,278.891235 907.07924,280.246496 C909.12118,283.976404 916.06952,290.209036 919.812642,292.107969 C924.614595,294.545348 925.332669,291.71067 929.07579,289.254995 C936.957626,284.086184 950.198902,283.992087 959.432022,283.06157 C959.618721,285.048066 986.378058,275.498509 989.019263,273.745949 C993.958303,270.469537 999.745976,255.389156 994.490983,250.919539 C988.148436,245.524634 971.620994,256.175913 965.484729,258.095757 Z M785.532892,186.212041 C782.280671,191.395227 777.955258,196.96003 773.150693,200.837619 C767.724668,205.217059 760.682325,206.917342 754.479476,209.914076 C748.860224,212.627212 743.866349,215.345575 740.359539,220.581038 C737.93245,224.202473 733.485617,229.283721 735.513195,233.95068 C737.587775,238.724805 745.759452,242.073097 749.309346,246.222521 C754.197468,251.935005 754.203996,250.81368 761.525735,249.234938 C765.182688,248.445568 768.656858,248.199869 772.394757,248.33056 C773.906628,248.382836 779.011478,249.864867 780.352318,248.870312 C782.067861,247.596079 780.381041,242.305726 780.597768,240.24735 C780.929388,237.116005 782.041749,233.885335 783.096664,230.933036 C787.279769,219.212708 795.233412,211.48367 802.966411,202.596713 C811.262119,193.061532 822.62857,186.368869 830.804164,176.789253 C835.317582,171.500207 833.262586,167.761151 827.068876,165.284565 C823.921103,164.027322 820.232816,164.03255 817.002791,163.030153 C813.663096,161.993777 810.68766,159.952391 807.109043,159.911877 C791.901551,159.301552 791.417178,176.832381 785.532892,186.212041 Z" fill="#2d3d8b"></path></g></g></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/assets/loving-doodle.svg b/waterfox/browser/components/aboutwelcome/assets/loving-doodle.svg
new file mode 100644
index 0000000000000..fe41b4da60b07
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/loving-doodle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 768" version="1.1"><g id="react-group-21" stroke="none" stroke-width="1" fill="#FFFFFF00" fill-rule="evenodd"><g id="react-group-22"><rect id="react-rect-24" x="0" y="0" width="1024" height="768"></rect><path d="M448.995191,335.47311 C439.894531,342.070142 441.34344,355.050637 444.082634,364.481879 C448.116849,378.368566 456.152135,391.223987 465.317901,402.304782 C481.579056,421.962545 509.184075,444.03564 534.629936,426.77787 C557.290437,411.408002 571.584202,380.394519 576.518066,354.271878 C578.042734,346.198744 580.074047,334.170459 572.908817,328.100859 C562.316634,319.129793 543.632345,320.761647 530.845492,321.916806 C522.424304,322.676686 514.299053,325.258389 505.9773,324.046593 C486.641949,321.228902 465.122583,323.781107 448.995191,335.47311" id="react-path-25" fill="#7fbbca"></path><g id="react-group-23" transform="translate(89.999840, 82.000000)" fill="#2d3d8b"><path d="M751.022928,356.343236 C732.587841,379.728393 701.246059,383.423276 673.40974,383.193824 C656.694202,383.055444 639.946667,381.797007 623.559396,378.390713 C614.724633,376.553916 605.949123,374.121017 597.413,371.198464 C591.774394,369.267048 583.380481,368.301931 580.980696,362.260489 C574.651189,346.319505 579.308549,326.328814 581.914538,310.148916 C583.240641,301.919403 584.236108,293.640215 585.525473,285.403606 C586.350288,280.134494 586.74492,274.303581 588.953907,269.373916 C591.539749,263.598591 594.805826,264.751763 600.274965,266.347281 C607.809697,268.54718 615.545892,269.461439 623.292753,270.64418 C642.199502,273.531251 658.694615,279.352703 675.877075,287.604687 C692.867551,295.763236 709.348443,303.81652 724.503232,315.161373 C732.181359,320.910677 738.797654,327.150819 744.96125,334.477901 C749.722897,340.138499 756.829815,348.975941 751.022928,356.343236 M670.438747,460.21156 C670.290613,462.729616 641.398389,455.128139 637.596656,454.275383 C612.649559,448.679835 587.208285,442.307225 563.657212,432.197154 C541.673998,422.761246 522.305069,411.965185 505.006472,395.199829 C496.943195,387.385459 489.690512,379.155946 482.75069,370.391835 C479.272483,365.999134 474.520317,366.508895 470.641554,362.792723 C467.152681,359.447931 464.476773,356.836439 465.567046,351.835809 C474.285671,354.132692 490.383783,368.572779 499.421195,361.28118 C504.572733,357.125027 497.427892,352.783185 494.129818,350.375124 C487.929485,345.846408 482.627442,340.259139 477.698699,334.395109 C486.161347,336.035571 494.038567,339.205317 501.403832,343.616941 C504.675835,345.576743 515.891422,352.683835 518.502151,345.909093 C520.109118,341.737565 512.504466,336.49684 510.133123,334.189312 C504.310831,328.523982 498.025172,321.910093 494.934486,314.293241 C502.57706,312.520312 509.781155,318.426921 514.986021,323.238312 C520.763281,328.579571 527.845313,334.185763 532.689915,340.340748 C535.189247,343.515225 535.733198,347.264515 537.685023,350.68855 C539.882159,354.540738 543.395918,357.842951 546.754432,360.693357 C553.224963,366.186007 560.792877,370.229799 568.561069,373.574591 C586.312366,381.217464 605.338808,386.626139 624.259778,390.420373 C633.542501,392.282007 642.596504,393.139494 652.017881,393.455286 C659.340483,393.701296 662.580489,395.89055 665.37609,402.636906 C672.941634,420.892515 671.568128,440.975459 670.438747,460.21156 M453.156899,321.111743 C448.923798,325.072743 443.422661,327.557682 438.997577,331.366109 C435.103407,334.716814 430.611958,338.292241 426.266274,341.001901 C421.62669,343.893703 418.160334,341.866484 413.982931,339.249078 C409.079075,336.178682 403.441654,334.934439 398.390848,332.186931 C380.927525,322.682423 359.562922,299.393068 362.823075,278.009109 C364.204877,268.945763 368.890679,260.027895 377.399545,255.915505 C385.127445,252.181591 396.360808,250.109428 404.627918,253.230682 C409.291204,254.991784 412.628386,258.879454 415.61597,262.70089 C419.100102,267.156276 420.434501,266.453728 423.982627,262.156829 C430.33228,254.470195 440.802452,247.726205 451.152931,247.888241 C456.297359,247.96985 461.407419,249.054423 466.041077,251.189271 C466.669169,251.479043 467.018768,252.355454 467.649229,252.652322 C468.423086,253.016606 469.694676,252.258469 470.232702,252.599098 C471.589617,253.457769 472.944162,256.141408 473.726314,257.502743 C476.866773,262.965824 482.520785,273.680276 476.822925,278.279956 C476.81937,278.282322 477.076532,284.50354 476.998317,285.213185 C476.596575,288.924626 475.313135,291.989109 473.65995,295.383576 C468.695654,305.58117 461.367126,313.432205 453.156899,321.111743 M461.598217,407.391525 C457.58791,408.638134 453.268297,396.070327 457.115063,394.064398 C460.782882,392.150723 465.229298,406.264373 461.598217,407.391525 M398.610087,392.364799 C397.221175,397.112322 396.634561,402.499708 393.238125,406.363723 C390.128478,402.673571 389.821542,395.86453 392.837568,392.071479 C394.559488,389.907063 400.129359,387.177296 398.610087,392.364799 M526.945838,309.183799 C526.923321,309.304439 531.771479,311.622611 529.406062,314.158408 C526.174351,317.621474 526.618756,310.881032 526.945838,309.183799 M546.980782,270.491606 C546.925083,275.292352 536.763031,274.133266 536.835321,269.305317 C536.924202,263.363225 547.040036,265.403454 546.980782,270.491606 M534.850314,230.373027 C535.856446,225.977961 553.531898,219.864373 553.050756,227.523804 C552.809,231.364164 532.717172,239.716682 534.850314,230.373027 M353.645823,379.417332 C351.664372,381.799373 348.849809,382.738469 346.474911,384.566987 C343.983875,386.483027 342.203887,388.969149 340.029267,391.218723 C334.055284,397.394997 326.864225,402.470139 320.419766,408.143748 C308.571347,418.573159 297.221846,429.785545 284.085247,438.631266 C260.610019,454.436236 233.387571,463.08089 206.363031,470.650434 C204.124417,471.277286 197.675218,473.808352 195.460306,471.923063 C193.071186,469.889931 194.285892,462.73553 194.396105,460.030601 C194.844064,448.940038 196.136986,437.71819 195.997146,426.644185 C195.939077,422.095362 194.607049,415.629317 196.980762,411.467251 C199.630598,406.819078 207.029046,405.458926 211.605821,403.709652 C225.516277,398.39323 238.915964,389.424505 251.204047,381.118114 C266.309063,370.906327 281.564584,360.525408 297.109264,350.992515 C312.338713,341.653591 329.137207,335.400439 346.125313,330.066276 C346.912205,331.719748 338.806265,337.042083 337.879534,337.788393 C333.435488,341.366185 328.600366,345.075261 325.301106,349.797946 C322.965316,353.141555 320.570271,360.70755 327.019471,360.90152 C330.145709,360.996139 334.767516,357.97187 337.602225,356.993743 C342.284472,355.378119 347.108928,354.24387 352.006859,353.50584 C347.796274,358.142185 333.524369,366.469865 336.120877,374.180154 C338.640354,381.662175 353.21327,372.93118 358.229709,372.93118 C357.407264,375.540307 355.340486,377.380652 353.645823,379.417332 M181.481115,400.299809 C172.148618,403.581916 162.582661,405.448281 152.95034,407.566571 C143.769534,409.586692 135.283184,411.10888 125.879582,409.926139 C112.895858,408.293956 98.5279612,402.916032 96.8818866,388.16252 C94.9300616,370.682789 107.275029,354.619982 117.875559,342.079378 C130.776328,326.820835 145.262733,313.180281 160.962658,300.828916 C176.644808,288.489378 193.57129,277.610525 211.304811,268.42654 C224.795749,261.440088 240.032308,257.197596 254.297103,251.954505 C257.010934,250.957454 264.517224,247.451809 267.055663,250.356621 C269.107034,252.705545 266.314988,256.619236 265.379961,258.80021 C263.556125,263.052164 263.304888,267.332505 262.834412,271.897885 C260.730897,292.285977 258.199568,312.668154 257.034636,333.143769 C256.709924,338.850494 256.138716,344.819789 256.471723,350.530063 C256.65541,353.692713 258.301485,357.721129 257.205287,360.809266 C255.098217,366.745444 245.449304,370.67451 240.335689,373.326215 C231.180954,378.072555 221.487009,381.614865 212.238653,386.155408 C202.081341,391.141845 192.191858,396.531596 181.481115,400.299809 M310.913063,267.824525 C313.475204,267.473251 317.312489,266.775434 319.596136,268.434819 C322.57424,270.599236 321.793273,273.610494 319.042704,275.179992 C316.870455,276.420687 311.786466,276.760134 309.640288,275.634164 C305.98432,273.716941 306.602931,268.418261 310.913063,267.824525 M325.100828,315.034819 C323.030495,318.48251 315.464951,320.743911 316.123855,314.309799 C316.689138,308.800591 328.913227,308.685865 325.100828,315.034819 M322.292191,217.905753 C325.619892,219.194941 331.659054,220.298439 332.646225,224.578779 C333.564661,228.563434 329.789,228.299682 327.064504,227.203281 C324.823519,226.303215 314.840415,217.837154 322.292191,217.905753 M843.686618,369.895083 C841.743089,362.331454 843.223252,353.957647 842.150756,346.210692 C841.110257,338.701469 839.237832,331.800175 836.551258,324.722652 C830.602162,309.05488 823.786773,294.950692 814.143786,281.200144 C795.982452,255.30521 774.911749,232.496048 749.468105,213.581652 C724.349172,194.909718 696.534185,179.735149 667.069568,169.099941 C635.824963,157.821322 604.374153,153.895804 571.425405,151.733753 C561.585694,151.089159 551.755465,150.323926 541.971453,149.080865 C534.820687,148.17252 525.85675,147.053647 518.78657,149.244083 C514.344894,150.620794 511.863339,154.494271 516.702016,157.035982 C520.132819,158.838479 524.624268,159.053738 528.412965,159.532748 C523.836191,174.073368 516.389155,188.663662 504.586954,198.675565 C493.065617,208.450921 477.64774,211.801626 463.106822,214.280652 C455.221307,215.624246 446.392469,216.663875 438.384891,216.084332 C433.322234,215.718865 429.372366,213.374672 427.32929,218.589378 C425.911935,222.212114 425.241181,226.187307 423.372311,220.717129 C421.162139,214.249901 420.077792,214.291296 413.201964,212.454499 C399.141003,208.698114 383.021559,205.27053 370.754808,197.147464 C358.028245,188.719251 353.601976,175.084611 346.497427,162.389068 C344.739955,159.251256 339.440283,152.899936 342.148188,149.304403 C344.625003,146.016383 352.678799,146.344002 356.366765,146.001007 C360.258564,145.639088 364.174064,145.623713 368.078899,145.472322 C370.341215,145.384799 374.891918,146.312068 373.981778,142.932977 C372.608271,137.840093 357.896702,138.492966 354.243103,138.410175 C347.449046,138.257601 340.561367,138.414906 333.801677,139.162398 C300.28409,142.869109 266.465493,149.723093 234.031069,158.863317 C171.103379,176.594972 110.157141,209.269378 64.2329626,256.341291 C20.1503973,301.52555 6.1842424,376.717134 33.2846269,434.410063 C47.3681047,464.393733 77.9324748,476.710799 107.560633,486.658835 C123.188268,491.905474 139.73671,496.009586 156.349146,495.019631 C164.321172,494.54417 171.885531,492.397494 179.660834,490.780687 C183.051344,490.074591 186.909961,488.949804 190.392908,489.233662 C193.029709,489.448921 195.562222,491.868809 198.035482,490.58317 C199.790584,489.670093 200.553775,487.050322 202.698768,485.933814 C205.273944,484.594951 208.396627,484.11121 211.178007,483.435865 C218.909462,481.557672 226.395605,478.512114 233.952854,476.015347 C241.767264,473.432241 249.14201,470.106373 256.640004,466.74384 C260.426331,465.045423 269.18762,458.140581 271.654954,463.18852 C272.779594,465.492499 272.300822,469.936058 272.574575,472.352398 C273.054532,476.578332 273.61863,480.794804 274.234871,485.002997 C275.592971,494.267408 277.218899,503.492789 278.88512,512.707525 C281.892851,529.333317 285.768059,545.249464 292.24807,560.88885 C297.422125,573.37623 301.964532,587.530093 311.571967,597.463936 C315.765961,601.799865 321.488707,603.751388 327.504168,602.38887 C334.346813,600.838296 337.75273,594.622992 341.906432,589.597525 C351.04576,578.538895 366.134185,570.065738 380.067158,567.015449 C397.128739,563.280352 413.748285,568.743434 430.03364,573.386875 C447.259947,578.298799 464.796745,582.978906 481.70545,588.883149 C497.461075,594.386444 514.474067,602.513058 531.56172,601.805779 C546.462902,601.189571 560.381654,589.061743 571.12795,579.817439 C581.921648,570.532921 595.417327,556.938494 610.93712,558.03253 C618.643689,558.575408 625.666466,562.292763 633.172756,563.804307 C641.413795,565.463692 650.182194,565.699058 658.561887,566.317631 C668.964509,567.08523 692.237089,564.373205 696.08504,551.858621 C696.656248,550.001718 696.659803,546.179098 694.207875,545.436337 C691.95267,544.753895 690.800773,547.390225 688.664076,547.269586 C684.317207,547.024758 680.92077,539.445753 678.532836,536.511373 C668.895775,524.66622 655.676219,515.831144 644.862374,505.129703 C632.651321,493.048002 622.226182,478.409215 613.025229,463.971494 C617.184856,462.890469 621.67275,464.68587 625.698463,465.538626 C630.590469,466.574708 635.356856,467.82723 640.177757,469.154266 C645.490466,470.617317 650.87902,471.622647 656.271129,472.737972 C660.294472,473.568256 665.634438,473.818997 669.265519,475.836753 C672.435605,477.599038 674.204928,479.491423 678.140575,480.002368 C682.142587,480.521591 686.251255,480.083977 690.272228,480.056774 C701.146512,479.983444 711.99828,479.781195 722.821605,478.631571 C761.065287,474.568855 801.604466,458.392505 824.600922,426.289362 C830.855769,417.557185 835.894724,407.883545 839.079031,397.618535 C841.564142,389.604281 845.849387,378.310286 843.686618,369.895083" id="react-path-26"></path><path d="M484.989034,0.00833256279 C495.039381,0.150587946 504.459583,3.13083823 513.824114,6.51888728 C522.059831,9.4979521 530.839227,12.2541502 537.498397,18.2004252 C549.4759,28.8968446 552.595831,46.6076398 554.556152,61.760209 C557.000927,80.6683204 548.864706,96.5321666 542.017203,113.638376 C535.612698,129.637365 523.857878,142.598016 509.885704,152.474096 C502.565593,157.64745 494.475567,160.769956 486.011244,163.508372 C477.413074,166.289465 469.086151,170.014185 459.887448,170 C445.917643,169.979807 428.033118,163.344778 422.08227,149.58157 C419.373355,143.31522 422.011201,142.190217 427.432584,145.596048 C435.297559,150.537052 442.879441,155.869258 452.069853,158.061176 C469.893969,162.313427 491.241925,155.725817 506.871192,147.034013 C522.494537,138.34458 532.983143,125.291463 539.99292,109.0376 C547.065474,92.6402964 549.813478,76.4824558 547.085611,58.8048535 C544.774682,43.8241761 540.176515,30.1403937 526.67695,22.0081276 C497.533905,4.45499876 458.269442,5.86925436 432.352931,28.6810906 C428.798295,31.8083381 425.285115,34.8514178 421.62269,37.8375954 C419.293994,39.7355193 416.551914,42.0127909 416.890676,45.2953339 C417.17969,48.1060632 423.17318,58.9435525 415.956118,55.6147765 C410.105952,52.9154806 406.926796,47.6389913 399.840028,46.985802 C392.297234,46.2899361 383.299893,52.0844721 381.043451,59.3774314 C378.891243,66.3360905 382.728971,75.8565321 388.740228,79.8479811 C392.463061,82.3196683 396.559007,81.9379497 400.786431,81.838371 C402.884152,81.7885816 408.724843,81.1069412 410.113058,83.3249397 C412.569678,87.2476319 403.902809,91.3706671 401.106242,92.2384249 C394.300196,94.3497319 386.256365,91.8650046 382.344014,85.7895142 C378.366517,79.6132597 375.644572,72.4649267 375.096156,65.1067669 C374.572614,58.0568272 376.172852,50.9191634 380.331576,45.1305547 C384.755624,38.974453 393.773101,32.072696 401.857205,34.2112686 C405.365646,35.139485 408.184718,38.7646263 411.628014,39.4533795 C413.801542,39.8872584 412.88712,40.1978493 414.687536,38.5868071 C415.830563,37.5649392 416.910812,35.67887 417.966188,34.4673283 C424.033115,27.5015563 430.032527,20.0675271 437.458057,14.4923015 C450.772843,4.49530445 468.470219,-0.22638882 484.989034,0.00833256279 Z M448.169015,138.112527 C449.743918,134.421032 452.636596,141.006254 453.491773,142.107417 C455.184908,144.285568 459.166932,145.980223 458.994749,149.193057 C458.71122,154.497013 451.48182,153.513098 449.071255,150.746289 C446.327803,147.59631 446.614775,141.758091 448.169015,138.112527 Z M499.530214,113 C503.430488,119.077813 498.677255,125.638447 495.59385,131.017785 C492.645185,136.161102 489.907053,141.975339 486.474765,146.810752 C480.777141,154.839024 468.38096,146.15421 468.012828,137.903097 C467.731315,131.586868 472.205442,134.336441 475.077111,136.695442 C478.032994,139.125129 479.433339,139.730155 482.532384,137.076428 C488.765363,131.735429 491.566053,122.80501 495.875362,116.043099 C496.729525,114.702458 498.277844,113.896157 499.530214,113 Z M510.648087,114.954326 C511.654254,117.893528 509.544131,125.681747 515.40912,124.903046 C518.650298,124.473125 519.341891,119.82272 521.045542,117.793011 C526.775041,110.969994 525.018372,123.87487 523.520902,127.104722 C520.220815,134.223234 510.985047,139.127959 506.404276,130.09721 C504.700625,126.737776 504.707694,122.497914 505.573657,118.886583 C506.04493,116.919849 508.79245,109.52643 510.648087,114.954326 Z M458.347342,101.033714 C457.827955,104.463188 454.604254,111.295757 458.539924,113.74915 C462.002893,115.90876 468.033619,111.219013 470.700584,109.260855 C473.471426,107.225954 479.750757,101.388652 479.997029,108.652903 C480.123082,112.355776 476.416176,116.798505 473.771387,118.931734 C468.128159,123.481184 456.402851,127.561779 452.244253,118.998885 C449.978791,114.334319 451.218317,107.69361 452.715786,102.993071 C453.929635,99.1834762 459.600874,92.7502136 458.347342,101.033714 Z M532.360061,82.2578906 C534.656353,84.9246303 540.099501,90.8993576 537.139861,94.6971546 C533.679822,99.1361995 528.057548,90.9916405 525.840996,88.7247935 C523.84402,86.6827382 519.643204,80.8677313 521.434474,77.7833522 C524.399891,72.6793971 530.343439,79.9165074 532.360061,82.2578906 Z M496.265299,70.7749609 C503.771476,75.6651215 493.902418,79.1863211 489.62712,79.6241046 C484.452069,80.1518113 477.836237,80.5020382 473.083423,77.9628935 C466.346447,74.3636028 468.591714,68.9268043 475.121687,67.6252857 C481.817498,66.2918206 490.439838,66.9792591 496.265299,70.7749609 Z M398.680292,55.2075317 C404.200324,56.2816777 410.505179,57.6794903 412.385406,63.6975537 C414.326556,69.9171677 411.537273,71.9812828 405.89898,70.581099 C400.682364,69.2852473 392.89029,67.9810965 389.940936,62.8854234 C386.417003,56.7974101 393.561629,54.2128202 398.680292,55.2075317 Z" id="react-path-27"></path><path d="M94.9465301,188.850256 C93.0940857,194.832615 83.7180857,198.80041 79.0425301,202.436769 C62.6881598,215.159897 46.7071227,228.406718 31.9219375,242.927385 C24.2478635,250.464308 18.4392709,259.580564 11.7844561,267.963179 C10.1607523,270.00841 7.2843079,274.590718 4.09971531,274.160205 C0.605789386,273.68959 -0.100580984,267.671846 0.0108264232,265.043949 C0.392456053,256.082205 8.57734494,247.427128 14.414382,241.256051 C20.9803079,234.317128 28.0001598,227.555128 35.1693449,221.236615 C43.0626783,214.281179 51.6280116,208.302359 60.3569005,202.448564 C68.9281598,196.700923 77.1462338,190.06041 86.0600116,184.854154 C90.2591227,182.402 97.2315672,181.469026 94.9465301,188.850256 Z M666.622415,132.036121 C673.448893,132.251349 680.110177,134.490427 686.54803,136.568976 C700.709645,141.142261 714.197407,147.486118 727.497393,154.116548 C750.814855,165.738827 773.254051,179.801142 793.82262,195.789802 C798.122445,199.131177 802.53042,201.838761 807.205797,204.571317 C810.198324,206.321674 814.464873,208.457301 815.617673,212.024605 C818.546023,221.092694 803.765224,211.99131 801.667603,210.689244 L798.717103,208.859646 C754.953484,181.736233 711.240508,155.382994 661.73787,139.828304 C659.100691,138.9995 658.280658,136.647457 659.664018,134.315629 C661.163847,131.788788 664.086255,131.956452 666.622415,132.036121 Z M92.9548458,151.014682 C92.6384203,153.775693 89.5110414,154.40379 87.4019342,155.290026 C79.5317408,158.595864 71.4652684,161.415164 63.6164872,164.775723 C49.049016,171.012682 35.6711147,180.064183 20.4660342,184.797515 C16.9913009,185.881221 16.4785964,182.374344 17.4088399,179.98805 C18.4449552,177.324584 21.5568696,175.454567 23.8075356,173.914064 C30.3002073,169.46623 37.663644,166.268644 44.8736262,163.179309 C52.0217508,160.113766 59.3816189,157.795278 66.7105581,155.225789 C73.5220344,152.837115 81.427915,148.391661 88.7425793,148.063338 L89.0622956,148.047861 C91.3902535,147.930197 93.323509,147.772926 92.9548458,151.014682 Z M679.047418,109.069574 C672.087601,107.1119 678.663003,102.705966 682.799028,103.015502 C687.413199,103.361249 691.87313,105.539687 696.248822,106.853758 C709.627427,110.870727 722.028384,115.263812 734.52663,121.498933 C736.39057,122.42988 744.602111,126.842822 739.170463,128.796992 C735.405803,130.150777 726.61408,124.341999 723.382143,122.9485 C709.178942,116.824345 693.917413,113.25124 679.047418,109.069574 Z" id="react-path-28"></path><path d="M401.607928,123.331287 C402.477864,120.778749 413.237912,92.8769057 409.026389,92.0355134 C404.565477,91.1433068 398.602374,107.331835 397.308592,110.256619 C392.529211,121.058819 389.699283,132.649233 387.481706,144.236103 C385.937364,152.303778 384.580357,160.568802 385.121287,168.817283 C385.536936,175.156086 388.154941,176.115651 392.469498,180 C392.469498,160.746062 395.395435,141.554756 401.607928,123.331287" id="react-path-29"></path></g></g></g></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/assets/plant-doodle.svg b/waterfox/browser/components/aboutwelcome/assets/plant-doodle.svg
new file mode 100644
index 0000000000000..dc56c6f1014fe
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/plant-doodle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 768" version="1.1"><g stroke="none" stroke-width="1" fill="#FFFFFF00" fill-rule="evenodd"><g transform="translate(-118.000000, -4.000000)"><rect x="0" y="0" width="1024" height="768"></rect><path d="M510.9435,276.1544 C513.6565,276.5334 521.3245,279.7854 522.6235,282.1784 C520.8515,282.7504 519.5575,284.0104 518.0215,284.9844 C516.2515,286.1054 514.5315,286.3904 512.6475,287.1984 C508.0725,289.1594 503.6905,292.5954 499.4325,295.1834 C490.2255,300.7774 481.4625,306.9274 472.9055,313.4684 C465.6465,319.0174 459.1325,325.5394 452.2405,331.2404 C447.5515,335.1184 434.9945,346.4704 440.4065,352.8024 C444.1835,349.6034 448.0045,346.4644 451.8375,343.3334 C454.0145,341.5564 457.4655,337.0424 460.2725,336.8874 C456.9285,341.0964 453.3365,345.0604 449.7505,349.0634 C454.7715,349.6904 459.7815,342.7384 463.2535,339.6684 C465.4695,337.7084 468.0635,336.9854 470.4965,335.2364 C472.6725,333.6714 473.9885,331.6404 476.4315,330.4114 C481.4255,327.8964 485.7765,324.1514 490.1515,320.9044 C492.0775,319.4744 493.7845,317.7234 495.4155,316.3794 C496.4605,315.5184 500.5555,311.9164 501.5145,311.6834 C501.7625,312.2084 502.0115,312.7334 502.2605,313.2584 C503.3795,310.8474 504.0695,312.2074 505.8725,310.8584 C506.8495,310.1274 506.3495,309.0234 506.8505,308.5794 C507.6095,307.9074 510.3455,306.5214 511.3825,305.8644 C513.5015,304.5204 512.6745,303.6734 515.2895,304.8754 C514.7305,303.2974 515.2435,302.8724 516.8285,303.6014 L516.6045,300.1814 L516.6045,300.1814 C523.7655,300.1814 529.3495,297.2544 535.3275,293.2224 C537.5805,291.7034 537.5265,290.5764 540.0695,291.9054 C541.4655,292.6354 542.6035,294.6994 543.4825,295.9004 C545.4965,298.6484 546.5035,300.5794 547.1635,303.8944 C546.3025,303.0304 545.6455,302.9754 545.1945,303.7314 C545.8625,304.7394 547.1555,305.9594 547.0755,307.1764 C546.9785,308.6614 546.3055,307.0044 545.9305,307.9434 C545.5335,308.9394 544.2965,309.9404 544.1355,311.0124 C543.8165,313.1144 545.5455,313.0974 544.1565,315.4684 C542.9695,314.3944 542.6685,314.3064 541.2975,315.1344 C541.7245,315.8894 542.1515,316.6434 542.5785,317.3994 C539.7325,317.3994 542.9035,320.5784 542.0945,322.7044 C540.8235,326.0434 536.2555,326.4124 536.6445,330.7464 L538.6975,327.5194 C538.5515,329.7034 537.7565,330.4504 537.0095,332.2494 C536.5775,333.2874 536.2865,335.2614 535.4755,336.0994 C534.8005,335.0194 534.1255,333.9384 533.4515,332.8584 C533.9385,337.2984 533.2655,340.4844 530.6535,344.2644 C529.8535,345.4244 528.2845,346.2654 527.6945,347.3624 C526.9945,348.6634 527.9535,350.4574 527.2065,351.5644 C526.6045,352.4574 525.5505,352.5324 524.6745,352.9944 C523.9175,352.4594 523.3015,352.5874 522.8245,353.3794 C522.4895,353.8064 522.2935,354.2894 522.2355,354.8274 C522.4275,355.0714 522.6185,355.3154 522.8105,355.5604 C522.1045,357.1804 521.3685,357.3354 520.6015,356.0274 C519.1985,356.7764 518.9095,357.1394 518.0655,358.8764 C514.4775,359.4934 510.4345,362.7694 507.0655,364.5524 C502.7705,366.8274 498.9815,368.1504 494.5615,369.6114 C492.8435,370.1794 491.7585,371.4724 490.2385,372.1444 C488.5885,372.8754 486.7495,372.4424 485.4425,373.0154 C483.8095,373.7314 483.2465,375.2874 481.1015,375.5964 C478.9105,375.9104 476.6035,375.2004 474.7085,374.1264 C476.4305,377.2564 476.6675,377.0794 473.5315,378.8084 C473.5255,378.7914 472.5635,374.5674 471.6775,375.7524 C471.0135,376.6394 472.5105,378.5764 471.6765,379.6884 C471.1585,380.3774 469.2115,380.7844 468.5255,381.1094 C468.0755,381.0414 467.6255,380.9744 467.1765,380.9064 L465.1345,383.9204 L465.1345,383.9204 C463.3145,384.1364 461.4965,384.3514 459.6775,384.5664 C460.5065,382.0804 460.6085,382.1754 458.2565,381.0184 C458.6125,382.2414 458.9695,383.4644 459.3255,384.6874 C456.2545,385.1014 452.8735,385.5994 450.1715,385.4084 C449.6615,385.3714 449.4665,384.6654 448.6485,384.7354 C447.9785,384.7924 446.3675,385.4794 447.4965,385.9524 C442.1315,386.4534 436.9995,385.9774 431.6265,386.0434 C429.2605,386.0724 426.7925,386.6154 424.4435,386.3944 C421.9775,386.1634 419.5135,385.2714 416.9545,385.0844 C411.6125,384.6944 405.6715,384.6934 400.4395,383.6154 C397.3865,382.9854 397.1255,383.0264 399.3995,380.7114 C400.5985,379.4924 401.9275,378.4254 403.2325,377.3284 C410.6125,371.1284 417.9925,364.3924 423.8125,356.6614 C429.7695,348.7484 432.6155,339.0724 436.9105,330.2444 C444.9175,313.7814 449.8035,291.3504 468.7995,284.4984 C472.7595,283.0704 477.1075,282.8484 481.1725,281.4484 C485.9825,279.7904 490.8935,278.9684 495.8785,277.9264 C500.1785,277.0294 506.5715,275.5434 510.9435,276.1544 Z M462.1875,376.3204 C461.7195,377.5384 460.6735,378.7124 463.0945,378.8494 C462.7805,377.9754 462.5225,377.2574 462.1875,376.3204 Z M683.275032,263.294794 L683.4986,263.3151 C687.5226,263.6411 691.4476,264.2821 695.6556,264.7941 C696.6466,264.9141 698.7956,264.3871 699.6196,264.5701 C701.4556,264.9771 702.9346,266.2761 704.8386,266.6481 C708.3606,267.3351 712.0366,268.0061 715.5826,269.1311 C724.2586,271.8831 732.7366,275.6401 740.8486,279.7441 C758.1076,288.4751 773.8136,299.7691 790.1146,310.1331 C798.9326,315.7391 806.5346,321.0091 813.4516,328.9141 C816.0436,331.8751 818.6216,333.8801 820.0706,337.2971 C821.9486,341.7231 824.0846,345.9621 826.2726,350.2381 C822.2426,351.1321 819.7656,349.1871 816.0096,348.3341 C812.4336,347.5211 808.4626,347.2721 804.8136,346.6211 C796.9916,345.2261 789.1436,344.0601 781.2726,343.0551 C773.1266,342.0161 765.1596,339.8781 757.0266,338.7481 C750.3896,337.8271 743.5346,336.7251 737.3876,334.7291 C734.3626,333.7471 731.0486,333.4151 727.9376,332.7711 C723.8946,331.9331 720.0576,330.1531 716.0346,329.2171 C709.4966,327.6951 703.2386,326.2341 696.6086,324.6071 C693.6746,323.8861 689.5836,323.1991 686.8736,321.9391 C684.9096,321.0261 683.1206,318.5781 681.1906,316.6751 C678.4266,313.9511 676.0016,310.6991 673.5286,307.7141 C671.3476,305.0791 666.8816,301.4701 669.4186,297.7121 C666.5306,298.0601 667.5986,298.5111 666.3776,296.0221 C665.5526,294.3381 665.4496,291.8171 665.0516,290.0111 C666.7686,289.8941 666.0996,289.1131 665.9226,287.5871 C665.1736,287.3631 664.8336,287.8081 664.9016,288.9221 C662.0106,279.7761 667.3886,272.6151 674.2146,267.1401 C675.7736,265.8891 677.9956,263.8231 679.9486,263.2691 C682.557632,262.528777 681.159276,263.079922 683.275032,263.294794 Z M433.7245,347.9184 C434.3045,347.6614 434.7965,347.4444 435.4685,347.1484 C433.9965,346.4164 433.9965,346.4164 433.7245,347.9184 Z M769.9945,246.0078 C777.6635,245.9458 785.4215,248.0808 792.9875,249.6798 C797.4585,250.6248 801.0145,252.8168 805.2545,254.2068 C806.6505,254.6648 808.0985,254.6288 809.5075,254.9878 C811.8815,255.5928 813.4675,256.7438 815.5575,258.0898 C811.2325,260.6928 832.2605,275.4288 833.9415,277.2068 C837.3735,280.8378 839.7915,285.2528 841.7335,289.8218 C843.3185,293.5478 847.2785,300.1308 843.8725,303.7218 C844.5075,303.4708 845.1425,303.2198 845.7765,302.9688 C846.1755,303.3348 845.4745,307.7728 845.3625,308.4888 L846.8245,308.6508 C844.6645,312.1748 844.8435,312.7098 840.7095,311.8378 C840.6935,314.2838 841.4235,316.6898 840.8425,319.1078 C840.6265,320.0038 839.9405,320.7478 839.8535,321.5598 C839.7785,322.2558 840.5235,322.8328 840.4365,323.7948 C839.9595,329.0828 836.9145,334.7908 835.1635,339.7828 C829.3375,327.1008 825.0815,313.1478 816.5975,302.0018 C812.4825,296.5958 807.6665,292.1098 802.9335,287.2728 C798.2425,282.4798 794.1075,278.0038 788.4385,274.3928 C783.9135,271.5108 778.4205,268.4518 773.3445,266.8278 C770.5775,265.9428 767.7145,265.8928 764.8915,264.7658 C762.2025,263.6928 759.6585,262.8338 756.8525,262.1198 C749.6975,260.2988 742.6485,258.0278 735.5245,256.1778 C733.3745,255.6188 731.3925,254.5098 729.1725,253.9148 C725.7485,252.9978 721.8965,253.2028 718.7825,251.4248 C722.7795,249.3568 726.8855,249.7328 731.1755,249.1428 C735.6725,248.5238 740.1045,247.8058 744.6075,247.2648 C753.1065,246.2448 761.4695,246.0778 769.9945,246.0078 Z M766.5876,319.6901 C767.4756,320.4491 767.1106,320.4741 768.2386,319.1861 C767.7686,318.4141 767.2186,318.5821 766.5876,319.6901 Z M768.9146,319.2761 L769.8136,319.4151 C770.1516,316.8101 769.4836,316.8031 768.9146,319.2761 Z M528.0495,309.9954 C526.2985,310.8974 525.6705,311.6114 527.1965,312.9864 C527.4725,312.0204 527.6995,311.2214 528.0495,309.9954 Z M841.9665,307.5548 C842.1495,308.1628 842.3315,308.7658 842.6285,309.7478 C843.6005,307.6798 843.6005,307.6798 841.9665,307.5548 Z M710.2336,295.9441 C709.7606,296.8731 710.2756,297.5121 710.6386,298.4871 C711.7246,298.0861 710.6316,296.8351 710.2336,295.9441 Z M780.072,288.2483 C783.842,289.6833 791.252,294.0353 792.564,298.0823 C789.701,297.0993 787.883,294.8713 785.25,293.3033 C783.455,292.2343 779.366,291.0053 780.072,288.2483 Z M710.2016,291.0551 C713.5646,291.7981 716.3436,293.9751 719.9586,292.9601 C719.5766,291.6831 718.1376,290.7311 716.8316,290.6001 C715.8386,290.5001 714.8906,291.5981 713.8016,291.1241 C712.7976,290.6871 713.3986,288.9371 711.9726,288.8181 C710.7756,288.7191 709.9776,290.0411 710.2016,291.0551 Z M474.2505,289.3074 C474.8555,288.9864 475.4615,288.6644 476.4045,288.1634 C474.6635,287.2834 474.5585,288.4634 474.2505,289.3074 Z M779.8609,287.9993 C778.0509,288.1233 776.5199,287.4873 775.3869,286.1423 C777.2009,285.9853 778.6789,286.6343 779.8609,287.9993 Z M679.7546,272.8241 C680.9796,272.2021 682.0466,271.6601 683.2696,271.0391 C680.6876,270.0231 680.5276,270.1051 679.7546,272.8241 Z M681.6886,265.6111 C681.9656,266.3981 682.1576,266.9441 682.3506,267.4911 C683.5096,266.2651 683.3396,265.6621 681.6886,265.6111 Z M714.3235,18.0757 C717.1405,24.1147 719.1575,30.2407 721.2235,36.5757 L721.221028,36.5757 L721.818088,37.7213366 C727.379228,48.5139331 731.195052,59.2425276 734.8785,70.8297 C736.4425,75.7507 737.4625,80.8307 739.0055,85.8927 C739.8795,88.7607 740.8805,91.6287 741.5865,94.5437 C742.2245,97.1777 741.7745,99.3157 741.8545,101.9977 C741.9265,104.4527 742.9115,105.9607 743.4655,108.1737 C744.2005,111.1187 743.8685,114.8157 743.8555,117.8577 C743.8245,124.4267 742.8595,131.0037 742.8465,137.5497 C742.8335,143.4717 742.6815,149.2697 742.3645,155.1947 C742.1135,159.8957 741.5965,168.1987 737.5275,171.1927 C738.5395,172.0117 739.9145,172.4857 739.5175,173.9577 C738.7265,176.8827 736.6985,173.8817 736.4355,174.2047 C735.0825,175.8657 737.7395,175.5127 737.6885,176.7867 C737.6345,178.1177 736.5295,179.2917 735.7955,180.4647 C731.2425,187.7417 725.1155,193.1187 718.8925,198.9877 C717.6175,200.1897 716.3705,201.6857 714.8415,202.5757 C714.0725,203.0227 712.1305,203.4357 711.8375,203.6767 C710.3155,204.9317 710.9625,206.4407 708.9415,207.3487 C707.3845,208.0487 704.1215,206.8887 703.0655,207.4637 C702.6385,208.1077 702.2125,208.7527 701.7855,209.3967 C701.5215,210.7247 701.0445,211.0257 700.3545,210.2997 C699.7035,210.7717 697.0555,212.1037 695.8165,213.0997 C696.5795,213.1837 697.3435,213.2687 698.1065,213.3537 L695.5275,213.7517 C694.7265,214.1377 694.2085,213.8547 693.9755,212.9007 C692.6075,212.9657 692.8135,213.3167 692.7785,214.5517 C690.1685,214.5387 690.2655,213.7757 688.1775,213.3827 C687.3025,213.2187 685.9965,213.2627 685.1295,213.0297 C685.4025,212.4377 685.6765,211.8457 685.9495,211.2537 C684.1435,212.5677 682.4125,214.2227 682.0845,216.5457 C679.6225,216.7087 681.5685,212.5227 678.9445,215.1937 C678.2835,215.8677 678.6705,217.0537 678.2385,217.7407 C678.8195,218.9227 678.5105,219.5137 677.3115,219.5127 C676.2505,219.8487 675.1905,220.1837 674.1305,220.5197 C674.7745,219.7447 675.4205,218.9687 676.0655,218.1937 C674.3105,217.6127 671.9285,218.7847 673.0895,221.1907 C671.6905,221.3167 670.1555,221.6857 668.7675,221.5817 C667.2505,221.4667 665.5555,222.8577 666.8985,220.5977 L664.586,220.9122 L664.586,220.9122 L662.282028,221.2257 L662.257744,221.256798 C661.803018,221.828169 661.487283,222.366483 662.5165,222.6477 C660.7095,222.8407 658.5315,222.9637 657.3115,222.6897 C656.5995,222.5287 656.4815,220.2267 655.2205,221.7427 C655.8985,222.2437 656.5765,222.7437 657.2555,223.2447 C645.1345,228.2247 632.1005,229.6537 619.5655,232.7937 C619.6035,228.8217 621.6435,225.4537 623.3385,222.0067 C625.3565,217.9007 626.7695,213.5857 628.3195,209.2907 C631.3095,201.0157 634.1985,192.6417 637.8795,184.6617 C639.7325,180.6427 642.3275,177.0307 644.5485,173.2187 C646.7445,169.4487 648.1105,165.4407 649.7685,161.4227 C653.0615,153.4377 657.7635,146.2297 661.4075,138.4647 C665.0565,130.6917 670.2545,123.8637 674.6935,116.5557 C679.2535,109.0507 683.1155,101.1147 687.5455,93.5257 C692.4045,85.1997 697.5625,77.0437 702.3915,68.7047 C704.5255,65.0187 706.2145,61.2647 707.4265,57.1677 C707.8235,55.8237 708.5075,54.4027 708.1485,52.9647 C707.2605,49.3937 705.7035,51.4897 703.8105,53.0477 C703.1175,51.3047 701.7785,38.1067 698.1405,42.5657 C697.4235,43.4437 697.9805,44.8247 697.4725,45.6937 C696.9445,46.5957 695.9495,46.7467 695.2485,47.6507 C694.0205,49.2317 693.4395,51.2187 692.0965,52.7727 C688.8215,56.5617 685.0215,60.0757 682.0035,63.8577 C680.9755,65.1477 679.6365,66.2097 678.5235,67.6777 C676.9335,69.7777 675.7925,72.3557 673.5115,73.6977 C673.5225,72.1697 673.9315,71.2597 671.7975,71.3297 C674.1715,74.4727 672.9525,74.3567 670.9365,76.6627 C669.2535,78.5867 667.4195,81.8047 665.6665,84.1937 C661.7855,89.4847 658.2835,94.5067 654.7735,100.0017 C646.6635,112.7007 639.0785,125.5027 632.0365,138.8287 C625.1985,151.7697 618.5165,164.8567 613.1095,178.4717 C607.5895,192.3737 604.1415,206.9667 598.8445,220.8967 C602.0855,220.0767 601.5125,217.1237 602.6165,214.5677 C603.2815,213.0287 604.6515,211.8297 605.2385,210.3077 C605.7885,208.8807 605.2345,207.0547 605.6965,205.6107 C605.6935,205.6197 607.2345,203.0837 607.3845,202.7497 C607.9425,201.5037 608.2335,200.0607 608.7245,198.7667 C610.0235,195.3397 611.6915,192.0487 613.7735,189.0207 C614.2975,189.6117 614.8205,190.2037 615.3445,190.7947 C614.6125,192.8217 615.6095,194.6327 617.9155,194.8937 C616.9865,197.7617 617.2835,198.6747 614.2795,198.9857 C613.9125,199.9427 614.4715,200.4527 615.9565,200.5157 L615.299,201.926575 L615.299,201.926575 L614.651028,203.3157 L614.601735,203.783337 C614.107258,207.708047 611.72258,211.80694 610.2125,215.4607 C608.5055,219.5877 607.4875,223.8527 606.0905,228.0857 C605.0175,231.3357 604.8265,236.2247 603.1915,239.0747 C600.5925,243.6067 598.2585,237.3027 597.0775,234.7467 C593.3555,226.6877 589.8475,218.5577 586.3485,210.3987 C584.3555,205.7507 582.0745,201.2417 580.0465,196.6127 C579.308038,194.927162 578.485222,193.185386 578.145136,191.349621 L578.072028,190.8987 C578.171908,191.15909 579.095964,185.530289 577.5815,188.7527 C577.3685,187.9097 577.1565,187.0667 576.9435,186.2247 C577.5245,186.2737 578.1065,186.3237 578.6875,186.3737 C577.1725,183.2917 577.5385,180.0047 577.2585,176.7037 C577.1555,175.5037 575.4495,170.2557 578.0505,171.5467 C578.0505,166.9487 577.4465,162.1907 578.9845,157.7917 C580.8355,152.4937 584.7025,147.7917 587.8795,143.2317 C589.5825,146.9167 591.2095,140.6887 592.3315,139.5167 C592.1285,138.6947 592.3475,138.3337 592.9865,138.4327 C593.5145,138.3877 594.0405,138.3437 594.5675,138.2987 C595.2605,137.1957 595.4355,133.0347 595.4355,131.8877 C599.7555,133.8497 604.6445,124.6237 606.8285,122.0857 C609.7525,118.6907 620.5115,115.3357 619.4505,109.8557 C621.4015,111.6237 620.8835,109.8427 621.6905,108.3897 C622.5275,106.8787 623.9535,105.9587 625.3505,104.7437 C625.7855,104.3657 626.8005,103.6777 627.1665,103.4337 C627.7255,103.0617 628.3565,103.5127 629.0425,102.8597 C630.7955,101.1947 631.8915,98.1307 633.0465,96.0697 C635.1885,97.4717 641.4955,91.8947 643.2325,89.9227 C644.2745,88.7397 644.5175,87.0757 645.5085,86.0177 C647.0165,84.4077 648.4375,84.7517 648.7515,82.3167 C651.4125,84.5067 650.9715,79.4607 652.6445,77.8847 C653.3305,78.0057 654.0185,78.1267 654.7045,78.2487 C655.3345,77.3097 655.9585,76.3667 656.5765,75.4207 C659.1855,71.5327 662.1125,69.0567 665.4475,65.8777 C666.8005,64.5877 667.7725,62.9227 669.0935,61.6477 C670.5025,60.2887 672.2565,59.7287 673.7735,58.4917 C675.0995,57.4107 676.7415,55.6997 677.6905,54.2797 C678.4155,53.1927 678.5165,51.3627 679.1905,50.5737 C679.4965,51.3077 679.8035,52.0427 680.1085,52.7767 C684.0795,48.4077 686.6085,44.1887 690.7285,39.9917 C691.4855,42.1937 691.0995,43.5317 693.3275,43.3357 C694.5335,43.2307 695.5775,41.7647 696.4985,41.0857 C696.8075,40.8577 699.5435,39.1697 699.6255,38.8517 C700.0745,37.1077 697.1725,35.1257 697.7265,33.1487 C698.3945,30.7637 702.4285,28.4847 704.1805,26.9557 C707.5655,24.0017 710.9405,21.0327 714.3235,18.0757 Z M458.5437,42.122601 C458.9027,42.0708 462.2517,52.2248 462.6127,53.2098 C465.1157,60.0268 466.5567,67.1498 469.1387,74.0388 C474.3287,87.8918 480.9647,101.4648 488.0607,114.3088 C494.5407,126.0368 497.8417,139.0168 505.4787,150.3548 C510.5867,157.9378 516.2427,165.1058 521.5807,172.5198 C525.8087,178.3938 529.3477,184.2838 535.0777,188.8578 C540.8817,193.4928 545.7677,198.5768 549.8617,204.7458 C551.7547,207.5988 553.8947,210.3108 556.4457,212.6068 C559.2537,215.1318 562.5707,216.3088 563.3347,220.3478 C562.6587,220.3178 561.9837,220.2888 561.3087,220.2588 C561.7467,221.8878 562.1847,223.5158 562.6237,225.1438 C556.9107,222.9688 551.6847,222.2608 545.7307,221.3128 C547.0707,221.1908 548.4107,221.0698 549.7497,220.9478 C547.3977,219.2998 544.1427,219.0528 541.4197,218.0758 C538.6547,217.0838 536.2417,215.5908 533.5447,214.4868 C527.0907,211.8448 520.5657,209.4188 514.1167,206.6418 C512.1587,205.7978 509.6997,205.3188 508.1767,203.6898 C507.8997,203.3398 507.6237,202.9888 507.3477,202.6378 C507.2367,201.1728 506.6507,200.8768 505.5907,201.7488 L504.6567,202.1228 L504.6567,202.1228 C503.8107,201.5528 503.0557,200.8808 502.3917,200.1078 C498.2657,195.5318 495.8547,189.0448 493.1477,183.5868 C486.0357,169.2458 478.7657,154.3278 474.1377,138.9428 C470.0077,125.2148 468.6017,111.0908 466.2407,97.0608 C463.5977,81.3708 461.9607,65.3088 458.8297,49.7248 C458.5507,48.3388 456.6057,42.4038 458.5437,42.122601 Z M914.368,108.207 C915.888,114.563 916.448,120.862 916.354,127.413 C916.315,130.208 917.002,133.268 916.978615,135.672 C916.948,138.753 916.122,142.488 915.991,145.774 C915.739,152.116 914.935,158.203 914.321,164.432 C914.117,166.504 914.167,167.355 914.239,169.553 C914.309,171.686 914.186,174.338 912.557,175.804 L912.557,171.642 C911.083,174.545 909.221,177.066 905.847,177.745 C908.172,179.838 906.731,181.199 904.957,182.895 C905.74,183.112 906.524,183.328 907.307,183.544 C905.608,185.041 903.909,186.537 902.21,188.034 C901.993,187.726 901.746,187.444 901.47,187.188 C900.521,187.666 900.485,188.211 901.363,188.822 C899.642,190.265 897.854,192.24 895.721,193.054 C895.58,193.108 890.392,193.068 894.122,194.156 C892.451,195.409 890.78,196.663 889.109,197.916 C889.085,196.812 890.208,196.079 888.544,195.446 C886.795,198.714 886.426,199.364 883.113,201.026 C880.221,202.475 877.326,203.916 874.431,205.36 C874.103,203.573 873.069,201.74 871.393,200.902 C871.964,202.147 872.857,203.582 872.788,205.029 C872.669,207.482 871.85,207.263 869.605,208.357 C866.076,210.076 862.452,212.078 858.683,213.211 C851.505,215.369 844.153,216.506 836.853,218.034 C829.824,219.507 822.823,221.574 815.759,222.761 C808.772,223.934 800.537,223.809 793.465,223.405 C785.777,222.965 777.923,222.868 770.223,223.071 C765.929,223.184 761.489,223.305 757.33,223.953 C753.405,224.565 749.6,223.777 745.606,223.864 C741.951,223.944 740.903,222.915 737.783,221.484 C734.557,220.003 729.834,219.452 726.299,219.232 C725.083,219.156 723.792,220.135 722.793,219.028 C721.202,217.265 723.657,216.366 725.001,215.093 C728.835,211.464 731.018,209.298 736.022,207.74 C735.163,207.539 734.302,207.338 733.442,207.137 C751.77,202.203 768.426,193.935 785.93,186.874 C792.96,184.038 799.588,181.403 806.556,178.45 C814.569,175.053 822.647,171.626 830.313,167.489 C845.325,159.387 859.404,150.695 873.472,141.05 C887.892,131.164 899.661,117.895 914.368,108.207 Z M741.18,220.973 C740.238,221.488 740.476,222.076 741.897,222.739 C742.695,222.273 742.456,221.684 741.18,220.973 Z M662.3205,221.1787 L662.271028,221.1787 L662.2735,221.2267 L662.2735,221.2267 L662.282028,221.2257 L662.3205,221.1787 Z M659.5295,216.5187 L659.0755,221.1787 L659.0755,221.1787 L662.271028,221.1787 L662.265583,220.972365 C662.145795,219.134579 660.69263,217.887483 659.5295,216.5187 Z M528.5173,163.1105 C536.2373,168.6335 541.5083,177.8245 547.0713,185.3205 C552.8513,193.1125 559.1403,200.4435 562.9263,209.4055 C560.9923,208.8415 560.2603,206.1975 558.8013,204.8335 C557.2813,203.4125 556.5893,202.8845 555.5203,201.0665 C552.8513,196.5255 550.1073,192.6265 546.7123,188.5995 C539.7803,180.3745 533.1133,172.9915 528.5173,163.1105 Z M796.237,204.063 C793.917,204.063 794.597,205.597 794.413,207.657 L796.237,204.063 L796.237,204.063 Z M790.66,204.298 C789.678,207.058 792.549,207.156 790.66,204.298 Z M613.4415,200.7887 C611.7559,201.97646 612.90444,205.047564 614.552024,203.400493 L614.631028,203.3167 L613.4415,200.7887 L613.4415,200.7887 Z M614.6535,203.2937 L614.631028,203.3167 L614.6415,203.3367 L614.6415,203.3367 L614.651028,203.3157 L614.6535,203.2937 L614.6535,203.2937 Z M615.8025,195.7037 L614.8095,196.8027 C615.3145,197.6347 615.7895,197.4017 616.2335,196.1037 C616.0965,195.9637 615.9525,195.8307 615.8025,195.7037 Z M476.9753,58.5491 C483.7743,62.9781 490.3173,67.8061 496.7843,72.7071 C498.5283,74.0281 500.2523,75.3751 501.9813,76.7151 C502.5573,77.1621 503.1323,77.6101 503.7083,78.0581 C504.9973,78.5551 505.7333,79.4531 505.9143,80.7501 C508.1653,82.2451 510.7633,83.4411 513.3023,85.3291 C512.4733,85.9481 511.6433,86.5661 510.8133,87.1841 C513.1513,88.6511 516.4193,88.8111 516.9473,92.1151 C517.5733,91.2371 518.2003,90.3611 518.8273,89.4841 C526.9853,95.1471 536.2063,98.6741 544.5673,103.9731 C551.9773,108.6691 559.1333,114.9831 565.4313,120.9861 C568.4573,123.8711 572.0803,126.1001 575.3643,128.6751 C577.0233,129.9771 577.9483,130.1131 577.7733,131.8771 C577.6023,133.5881 575.1133,136.1581 574.1863,137.5831 C569.8193,144.2961 564.1503,151.9921 562.2453,159.8911 C560.2223,168.2861 565.3073,178.7411 567.5843,186.8081 C568.3133,189.3871 569.6563,192.3281 569.9253,194.9871 C570.1563,197.2791 571.1533,198.0271 568.5253,195.9301 C565.0433,193.1531 562.2823,188.1781 559.5973,184.5821 C553.9613,177.0361 548.6583,169.5731 542.5003,162.3991 C540.9513,160.5941 538.0673,158.2791 537.1163,156.1151 C536.7233,155.2201 537.0113,153.7071 536.6403,153.0531 C535.8833,151.7181 534.9453,152.0871 534.1953,151.0441 C533.3223,149.8321 532.9063,147.9611 532.3663,146.5911 C532.0113,147.6991 531.6563,148.8081 531.3013,149.9171 C519.2583,136.7551 510.6013,121.0211 502.2983,105.3821 C498.1503,97.5701 494.0043,89.7891 489.9913,81.9051 C487.8413,77.6801 485.7663,73.3791 483.3873,69.2771 C481.5823,66.1651 477.0753,62.1391 476.9753,58.5491 Z M673.3965,192.0177 L674.2205,191.8027 L674.2205,191.8027 C673.4835,189.1627 672.7925,189.4007 673.3965,192.0177 Z M616.3663,182.4877 C616.0793,184.2867 615.7933,186.0857 615.5073,187.8837 C617.6533,187.0647 616.7753,185.5287 617.2383,183.8767 C620.2683,184.3837 616.0183,186.8687 619.8923,186.8757 C619.5783,188.8757 619.7683,189.9537 618.2863,190.6277 C617.7443,190.8747 615.9253,190.5997 615.3443,190.7947 C614.8473,186.6917 612.5873,186.0367 616.3663,182.4877 Z M885.116,114.9694 C883.475,117.0604 882.135,118.5754 879.997,120.0794 C878.296,121.2754 876.685,122.1764 875.48,123.9534 C873.672,127.7834 867.716,130.3924 864.234,132.5204 C859.416,135.4654 854.428,138.3094 849.712,141.4114 C839.362,148.2174 828.488,153.3664 817.253,158.6304 C807.304,163.2914 797.468,168.2964 787.584,172.2134 C782.378,174.2764 777.261,176.6914 772.137,178.9864 C769.104,180.3454 766.082,181.7314 763.051,183.0974 C760.643,184.1834 756.485,187.3514 755.537,184.3424 C754.82,185.0764 754.297,185.8724 755.7,186.1084 C753.504,187.1294 751.308,188.1514 749.113,189.1724 C747.056,190.1294 746.419,191.2324 746.173,189.2014 C746.043,188.1284 748.851,185.0554 749.395,183.9984 C750.195,182.4444 750.821,180.8044 751.455,179.1784 C754.36,171.7264 756.099,163.9974 758.776,156.4774 C759.468,156.8384 760.161,157.1984 760.852,157.5594 C761.93,154.8024 762.263,157.2864 764.273,156.4144 C764.986,156.1064 765.069,154.4444 765.764,154.0864 C766.001,153.9654 766.993,154.8994 767.435,154.8184 C769.137,154.5104 771.426,154.2094 772.961,153.3914 C773.599,153.0524 774.667,151.5824 775.191,151.4624 C775.93,151.2934 776.941,152.3524 777.876,152.1654 C779.344,151.8704 779.845,150.0234 781.258,149.5004 C782.319,149.1074 783.998,149.3164 785.062,149.1454 C787.696,148.7224 791.31,149.1754 792.401,146.0424 C796.283,147.9604 800.176,145.3614 803.718,143.5974 C805.516,142.7014 807.126,142.6924 808.996,141.9654 C811.026,141.1774 812.452,139.9374 814.59,139.3374 C817.85,138.4224 820.744,136.7334 823.65,135.2974 C825.861,134.2054 831.335,129.3724 832.882,131.7504 C834.617,128.6854 841.1,127.4834 844.484,126.4824 C849.43,125.0204 854.332,123.5734 859.321,122.2264 C863.706,121.0434 867.868,119.2794 872.17,118.0034 C875.591,116.9904 881.738,114.1374 885.116,114.9694 Z M676.6205,184.8767 C675.4985,186.0917 674.6735,186.9857 673.7865,187.9467 C675.6895,188.4957 675.6895,188.4957 676.6205,184.8767 Z M622.6383,172.6933 C622.8463,173.5033 621.4883,174.3283 621.4793,175.0103 C622.5173,175.2453 622.8603,175.7753 622.5103,176.6023 C622.4393,177.1083 622.3663,177.6143 622.2953,178.1203 C622.2943,180.5173 621.2883,183.1183 620.7173,185.4143 C618.9823,184.1033 620.2743,182.4693 619.9553,180.8313 C619.4893,178.4413 619.0343,179.9623 618.0983,178.4933 C616.7033,176.3053 617.7653,176.7973 618.8843,174.7113 C619.3913,173.7683 619.6903,170.7283 619.7383,170.6633 C620.6893,169.3563 622.1913,170.9563 622.6383,172.6933 Z M735.2675,169.7807 L735.2675,172.0577 C736.4625,170.8057 736.4625,170.8057 735.2675,169.7807 Z M626.2125,161.8386 C627.3445,162.4736 627.0855,162.0856 627.1455,163.9076 C626.3215,163.4166 626.0115,162.7266 626.2125,161.8386 Z M909.394,159.064 C909.083,159.813 908.854,160.361 908.626,160.909 C909.51,160.704 910.57,160.367 909.394,159.064 Z M626.852028,160.1627 C626.847552,160.170668 626.847286,160.169151 626.850088,160.165332 L626.852028,160.1627 Z M627.2871,156.4747 C628.9171,156.8567 630.2431,156.4157 629.5591,158.5507 C629.771455,157.887442 627.120384,159.908208 626.86748,160.147152 L626.852028,160.1627 L627.0691,158.3222 C627.1416,157.70645 627.2141,157.0907 627.2871,156.4747 Z M493.3477,157.4958 C492.4277,157.8128 490.9727,157.4548 491.0767,159.6628 C492.0757,158.7098 492.7127,158.1028 493.3477,157.4958 Z M702.0465,154.3357 L702.0465,156.0867 L704.2245,155.4287 L704.2245,155.4287 L702.0465,154.3357 L702.0465,154.3357 Z M631.9615,152.279 C631.5235,153.594 631.2485,154.419 630.8825,155.517 C629.3665,153.868 629.9815,153.141 631.9615,152.279 Z M879.695,141.856 C878.562,142.036 878.521,144.034 878.266,145.024 L880.646,144.578 L880.646,144.578 C880.329,143.671 880.012,142.763 879.695,141.856 Z M528.9893,142.8381 C529.6753,143.3741 530.2693,143.8391 531.0013,144.4131 C530.9663,142.2451 530.9663,142.2451 528.9893,142.8381 Z M718.1975,121.9827 C718.1535,122.8837 720.0435,125.0177 720.1705,126.3487 C720.4805,129.5807 718.3855,132.2577 720.4185,135.2867 C720.8055,133.4997 721.3435,131.6817 721.5905,129.8677 C721.8365,128.0647 721.2065,127.2037 721.3205,125.6227 C721.4425,123.9197 723.1685,121.1257 721.3745,119.9297 C720.0945,119.0767 718.2795,120.3217 718.1975,121.9827 Z M706.5535,130.2047 C705.5225,132.0807 705.5225,132.0807 706.0535,133.3577 C706.2005,132.4267 706.3325,131.6017 706.5535,130.2047 Z M709.5815,126.3217 C708.0045,127.5937 708.2645,127.2707 708.9935,129.4467 C710.4335,128.2117 711.8955,127.0187 713.3825,125.8407 C711.9925,124.9867 710.7585,125.3727 709.5815,126.3217 Z M715.7885,120.8087 C715.6365,120.9077 715.5005,121.0247 715.3805,121.1617 C715.6865,121.6267 715.9915,122.0897 716.2965,122.5537 C717.3125,122.0327 717.1425,121.4507 715.7885,120.8087 Z M719.3935,113.7577 C717.4835,114.8737 718.1345,116.3467 718.5695,117.7457 C719.4295,116.5417 720.3505,115.3457 719.3935,113.7577 Z M742.0665,113.1357 C740.4945,114.4187 741.3155,115.2607 742.1105,116.5927 C742.3755,116.5257 742.6415,116.4587 742.9055,116.3917 C742.6265,115.3067 742.3475,114.2207 742.0665,113.1357 Z M539.5883,115.6231 C540.7473,115.3421 540.4503,115.6571 540.0563,113.8301 C538.9223,113.7431 538.7663,114.3411 539.5883,115.6231 Z M717.1235,104.4587 C716.0895,104.6857 716.1225,105.3757 717.2235,106.5287 C718.3895,106.2587 718.3565,105.5687 717.1235,104.4587 Z M713.6065,94.9307 C713.3255,96.0227 713.0445,97.1137 712.7645,98.2057 C714.8835,98.6507 714.0075,95.9987 713.6065,94.9307 Z M719.4765,92.7267 C719.2265,93.9007 718.9755,95.0747 718.7255,96.2487 C718.9215,96.3947 719.1185,96.5407 719.3155,96.6867 L721.6145,93.4787 L719.4765,92.7267 Z M714.1065,89.1607 C713.1525,89.2787 713.2505,90.8667 714.6105,90.6557 C714.4425,90.1567 714.2735,89.6587 714.1065,89.1607 Z M509.3273,84.8201 L507.2603,84.8201 C507.2603,86.0491 509.3623,85.6891 509.3273,84.8201 Z M724.0445,49.7937 C723.8175,50.8187 723.6605,51.5297 723.5035,52.2397 C724.2385,51.6387 725.2995,51.0957 724.0445,49.7937 Z M721.212028,36.5767 L721.2235,36.5757 C718.7245,36.6897 719.6495,38.7107 719.0725,40.2957 C721.198629,39.8998935 720.832666,38.2978436 721.178432,36.7221372 L721.212028,36.5767 Z M721.2155,36.5647 L721.212028,36.5767 L721.221028,36.5757 L721.2155,36.5647 L721.2155,36.5647 Z M704.9245,32.8507 C704.3435,34.5967 704.8155,34.7817 702.7325,33.9907 C703.8635,36.1117 706.3105,34.0007 707.8415,35.2447 C706.8685,34.4467 705.8975,33.6487 704.9245,32.8507 Z M704.9455,28.6167 C705.4915,30.5107 705.9635,31.6457 708.0365,31.1657 C706.9765,30.2907 706.1905,29.6437 704.9455,28.6167 Z" fill="#7fbbca"></path><g transform="translate(118.000000, 4.000000)" fill="#2d3d8b"><path d="M483.9361,299.0706 C484.6421,299.1956 486.3071,293.4456 486.6141,292.5806 C486.8141,292.0166 488.0661,289.5936 487.8491,289.0956 C487.6811,288.7076 484.2861,287.5016 483.9361,287.3456 L483.9361,299.0706 Z M205.7111,154.9066 C206.1581,148.8386 205.6341,142.6536 206.5731,136.6316 C206.9161,134.4276 210.9641,120.7606 205.9271,125.3746 C201.9791,128.9906 201.4441,135.7746 201.6521,140.6506 C201.8001,144.1286 200.2231,155.5346 205.7111,154.9066 L205.7111,154.9066 Z M521.4741,313.1096 C516.3081,308.0406 510.3221,303.1076 503.5861,300.2766 C499.6561,298.6246 499.6231,299.1366 497.9151,302.9206 C496.3841,306.3116 494.9501,309.5926 493.7321,313.1096 L521.4741,313.1096 Z M450.5851,312.3386 C444.5921,302.7886 434.4151,294.3286 424.7891,288.5026 C425.6761,290.7546 425.7101,293.0906 426.1191,295.4366 C426.5301,297.7966 427.5821,299.6316 428.2311,301.8756 C429.3981,305.9196 428.4901,310.6746 428.4901,314.8416 C435.8551,314.0076 443.2201,313.1726 450.5851,312.3386 L450.5851,312.3386 Z M470.7141,264.3216 C470.5321,256.4666 473.6931,249.2026 475.6131,241.7306 C465.2261,243.4686 463.8791,224.9006 457.6571,220.6826 C458.9021,229.1206 459.4551,237.4236 460.3881,245.8366 C460.8001,249.5496 460.9201,254.6576 462.1791,258.0796 C463.4901,261.6426 467.4681,262.6486 470.7141,264.3216 L470.7141,264.3216 Z M492.6441,278.9256 C494.7391,277.0046 496.3881,272.7206 497.9091,270.1076 C500.1151,266.3186 502.8491,263.1966 505.6541,259.8296 C510.8941,253.5376 516.9691,247.8966 522.0531,241.5626 C516.2861,242.1396 510.5271,243.4786 504.7831,244.8746 C501.7291,245.6156 498.6131,246.5986 495.7301,247.8406 C493.3431,248.8686 490.5741,248.9726 488.3661,249.9286 C483.9121,251.8596 484.8191,263.5986 484.2751,267.7836 C483.9901,269.9766 482.8791,272.2066 484.3021,274.1126 C485.8971,276.2486 490.3801,277.7346 492.6441,278.9256 L492.6441,278.9256 Z M290.3351,315.4376 C281.6791,313.9236 273.6151,311.7666 266.6191,306.1556 C260.6491,301.3676 255.3691,295.5586 250.3601,289.8276 C249.2041,288.5056 248.1611,287.1386 246.3741,286.6706 C245.0521,286.3236 243.7431,287.0656 242.4791,286.2536 C241.3631,285.5356 241.4341,284.0456 240.6031,283.2696 C239.2391,281.9966 241.2101,282.6996 239.0741,282.2746 C237.7101,282.0036 235.3321,283.1926 233.8901,283.5336 C230.3701,284.3676 226.7911,284.9096 223.2791,285.6876 C219.8411,286.4486 217.9321,289.1356 214.8481,290.8516 C211.7681,292.5636 208.7711,293.2926 206.0371,295.5866 C203.2061,297.9606 199.8321,299.3006 197.0431,301.4996 C194.7181,303.3336 194.7961,306.5006 192.2511,308.2836 C191.1621,309.0476 189.6691,309.1216 188.7091,310.0696 C187.5901,311.1746 187.1021,313.0236 186.1411,314.2916 C183.6641,317.5586 181.8231,319.2086 180.4751,323.2486 C179.1151,327.3256 180.7391,330.7086 180.1101,334.8856 C179.5481,338.6136 177.3961,341.9356 178.1071,345.6986 C178.7731,349.2226 180.6871,352.3036 180.0371,356.0616 C179.6711,358.1746 178.3691,359.7316 178.6921,361.8686 C178.9321,363.4566 180.1741,364.9856 180.7871,366.4566 C182.0711,369.5396 183.1931,373.5786 182.5421,376.9376 C182.2261,378.5746 180.8061,379.5456 180.4141,380.8736 C179.8611,382.7436 181.2231,385.0556 181.8351,387.3746 C182.9521,391.5986 183.3781,395.9636 184.3391,400.2196 C184.9121,402.7566 185.1861,407.1576 187.8371,408.2776 C191.0091,409.6176 193.6141,406.8776 196.4281,410.3426 C200.9871,415.9526 201.0241,424.3706 205.6201,430.2686 C207.6021,432.8136 210.3071,435.2406 213.6611,435.5866 C215.6151,435.7876 217.0091,434.8576 218.8851,435.5456 C220.3121,436.0686 221.4641,437.4106 222.2021,438.6756 C223.7401,441.3126 223.2381,444.6416 224.6651,447.3336 C225.5941,449.0826 229.0271,452.9316 230.7031,453.8446 C233.2991,455.2616 234.5691,454.5976 236.6651,457.3176 C239.0521,460.4166 240.8681,464.4226 243.8961,466.9956 C246.8201,469.4816 248.7661,468.1596 252.1181,468.4336 C255.4591,468.7066 256.5611,471.7676 258.4231,474.2166 C259.1241,475.1366 260.6811,477.8556 261.8041,478.1866 C263.4061,478.6596 262.9071,477.9256 264.3481,477.2786 C267.2421,475.9816 269.0991,475.1326 271.3381,478.1096 C273.6041,481.1236 274.1341,485.2566 276.4141,488.3626 C278.8801,491.7256 280.6671,491.2566 284.4251,491.7316 C287.7511,492.1516 290.2251,494.7046 292.6481,496.7846 C296.6631,500.2306 297.8311,500.2786 302.7031,499.0126 C305.5911,498.2626 307.1661,498.4756 309.0471,500.8706 C311.0591,503.4336 312.9151,508.9136 315.8291,510.3486 C318.1061,511.4696 320.4851,506.5956 323.7071,507.4696 C326.4991,508.2276 329.9351,512.5946 332.5001,514.2116 C334.9611,515.7616 338.6321,518.3946 341.6901,518.5056 C343.0891,518.5566 344.1891,517.5816 345.4961,517.5696 C347.0331,517.5566 349.3151,518.4406 350.7201,519.0616 C353.7591,520.4056 355.4571,523.3056 358.4281,524.9146 C362.9941,527.3876 364.8321,525.1056 369.1061,523.4656 C373.6241,521.7326 375.6291,524.0296 379.4571,525.6206 C382.3421,526.8196 386.6871,528.1526 389.8181,528.6016 C393.7411,529.1636 397.1941,526.2456 401.1721,526.2236 C403.1721,526.2116 404.3571,526.6066 405.9671,527.8136 C406.6721,528.3416 407.3001,529.0836 407.9331,529.6966 C409.8971,531.5996 408.9761,531.3356 411.2111,530.4896 C413.9091,529.4696 416.8491,527.7316 419.9481,528.3896 C422.2481,528.8786 424.6331,533.5736 426.5441,533.505353 C427.4451,533.4726 429.8781,530.4656 430.5991,529.8086 C432.3161,528.2426 433.4251,526.9406 435.9271,527.4896 C437.8121,527.9036 438.7851,529.4826 440.3521,529.0316 C441.6891,528.6486 443.5531,525.9656 443.9831,524.7976 C445.1421,521.6426 444.3831,517.3406 444.7731,513.9926 C445.3121,509.3596 446.4401,504.7976 447.1971,500.1956 C447.9151,495.8286 448.0071,491.4216 448.6251,487.0566 C449.0861,483.7966 451.1371,479.5936 446.9641,478.0216 C443.6961,476.7896 441.6881,477.4846 438.6731,475.0796 C435.2671,472.3636 432.9241,472.5756 428.7031,472.6646 C419.6341,472.8556 413.3301,466.8746 405.1371,463.9426 C397.6941,461.2786 390.5931,457.8676 383.1731,455.0696 C379.1511,453.5516 376.1771,451.4736 372.5281,449.4896 C369.2121,447.6876 364.8151,448.1396 361.1761,446.9416 C353.8371,444.5226 346.8771,441.4806 339.5381,439.2946 C335.4951,438.0906 331.3121,437.6306 327.2461,436.3466 C322.6401,434.8926 319.5511,432.1296 316.0991,428.8006 C312.1981,425.0396 301.3181,416.3466 303.7211,409.9736 C306.2391,403.2986 318.3881,416.8596 321.4291,418.7096 C324.0401,420.2966 326.9371,422.2256 329.7261,423.0066 C333.4981,424.0616 336.4891,422.6006 340.1971,424.1596 C347.8961,427.3976 355.3411,432.2936 363.3181,434.6646 C366.8851,435.7256 371.1381,435.5216 374.3231,437.4066 C377.6151,439.3546 380.6411,441.6136 384.1001,443.4226 C391.3061,447.1916 398.5271,450.6416 406.1531,453.4456 C403.6621,439.9996 401.0041,426.3486 397.7491,413.0376 C394.3371,399.0826 395.5241,384.5466 393.8971,370.3356 C387.8031,374.2546 381.5211,377.4066 375.3071,380.8056 C369.3051,384.0896 362.9601,385.6686 356.5431,387.7956 C349.4911,390.1346 342.0921,393.3906 334.7041,394.3206 C327.2891,395.2546 318.9911,396.1096 311.5171,395.6696 C297.0081,394.8156 282.6551,392.8726 268.3741,389.8076 C266.1511,389.3296 264.1901,388.4616 261.8731,388.5676 C260.4261,388.6336 258.3741,389.6956 257.0611,388.8996 C254.3011,387.2286 256.5501,382.7596 258.1591,381.1156 C260.3241,378.9046 262.6651,378.0846 264.7351,375.4806 C267.7161,371.7266 270.7151,368.0266 273.9131,364.4526 C279.9441,357.7126 286.9001,351.0276 291.1561,342.9676 C295.7521,334.2656 299.1861,325.1056 302.8631,316.0026 C298.7621,316.0556 294.4521,315.5696 290.3351,315.4376 L290.3351,315.4376 Z M492.8171,325.3056 C488.5321,325.6856 484.8431,325.3996 480.8581,325.7196 C475.1061,326.1816 468.5081,325.6486 462.8051,324.8666 C457.4471,324.1326 452.2041,325.4536 446.9361,324.9696 C441.4701,324.4676 435.7581,324.4216 430.0781,323.8976 C426.5301,323.5706 426.7551,324.4386 425.7871,327.7116 C424.7941,331.0666 423.5391,333.9646 421.8791,337.0486 C418.7731,342.8206 415.1351,348.0896 410.9491,353.1286 C409.0161,355.4536 407.0231,357.7266 405.0391,360.0086 C402.6891,362.7126 400.9241,363.7906 401.7131,367.5036 C403.0481,373.7786 405.0591,379.9586 405.9071,386.3186 C406.7191,392.4086 406.7021,398.5686 407.8011,404.6116 C408.9831,411.1046 410.4971,417.5436 411.5931,424.0476 C412.6301,430.2016 413.4131,436.4476 414.1731,442.6406 C414.8021,447.7636 414.3961,457.2706 419.2671,460.5636 C421.5641,462.1166 425.7071,462.3486 428.2901,462.0996 C430.9551,461.8426 433.5851,459.9156 436.2141,459.9816 C438.6041,460.0426 439.5791,461.6486 441.0791,463.2906 C443.5521,466.0006 443.6211,466.6586 446.9611,466.6776 C449.1031,466.6896 449.3981,465.9756 451.4881,467.4826 C453.6321,469.0286 455.0381,471.8886 457.8431,472.5546 C462.4271,473.6426 469.9761,467.6236 473.9281,465.6456 C485.8961,459.6556 499.5281,458.1476 511.6861,453.1376 C517.3981,450.7836 523.1711,447.6746 528.4801,444.4156 C531.1641,442.7676 533.7591,441.0406 536.0711,438.8866 C538.2301,436.8766 542.6781,433.7036 543.6751,431.0476 C536.9351,431.0476 530.5101,433.8966 523.6881,432.1696 C517.1091,430.5036 518.7901,421.8076 519.5101,416.8986 C510.1511,418.2926 492.3961,423.3646 494.5901,407.6016 C495.3771,401.9476 499.5571,397.5836 503.9211,394.2706 C507.2771,391.7226 513.1431,389.6386 514.9881,385.6136 C507.6661,384.6406 489.7881,387.4966 488.6971,376.8166 C487.5381,365.4736 498.7991,359.5186 507.5941,355.7366 C518.3161,351.1256 529.6691,346.8586 541.2451,344.9656 C546.3351,344.1326 551.5001,343.0516 556.6181,342.7986 C561.4321,342.5596 568.1101,343.3576 571.3631,338.9776 C564.7761,337.7956 558.9641,336.4186 552.9031,333.5446 C550.4351,332.3736 547.7721,330.6286 545.4461,329.1926 C542.8341,327.5806 541.6451,324.0016 539.0381,322.6626 C536.7531,321.4896 533.4341,323.0506 530.8841,323.3026 C526.8121,323.7046 522.7441,324.1246 518.6611,324.3926 C510.1201,324.9546 501.3671,325.6486 492.8171,325.3056 L492.8171,325.3056 Z M272.2551,227.7426 C276.0041,229.0906 279.7661,230.4046 283.5131,231.7586 C286.6931,232.9076 291.3221,233.7796 293.9251,236.0116 C301.6081,242.5966 289.0981,242.6066 285.2211,242.8426 C286.8901,248.6396 289.0771,254.4496 290.4241,260.3156 C290.8691,262.2526 291.9491,266.7646 290.2021,268.2886 C288.0881,270.1326 286.3011,267.6346 284.8241,265.9296 C276.7061,274.6976 265.5311,279.2486 255.0761,284.5686 C262.8591,291.6466 270.3311,299.6086 280.9871,301.9936 C286.0401,303.1256 290.8391,304.3756 295.9491,305.2396 C297.9181,305.5726 299.8751,306.4166 301.8031,306.9646 C302.6591,307.2076 304.3651,308.0616 305.2281,307.9346 C306.8411,307.6976 306.8151,306.6566 307.6671,304.7826 C311.9431,295.3896 316.1171,285.7876 323.1241,278.1006 C326.6901,274.1906 330.6891,271.2206 335.4541,268.8776 C340.3861,266.4526 346.0881,266.6306 351.1671,264.4746 C345.2051,255.8346 338.9091,247.1896 335.4401,237.1766 C334.4101,234.2016 334.9711,233.0986 332.2951,232.6646 C330.4401,232.3626 329.5191,233.4816 327.8641,231.9866 C323.8901,228.4006 328.6271,224.2266 331.0581,221.7236 C336.9061,215.7056 343.3021,209.2616 347.3561,201.8176 C349.0631,198.6836 350.5211,194.9976 349.3241,191.5816 C347.4741,186.3016 344.6151,181.0726 342.0251,176.1276 C337.2311,166.9716 332.7901,156.7826 326.7291,148.4006 C323.6151,144.0926 320.1301,139.9786 317.3941,135.4026 C315.1801,131.7006 315.0861,128.1036 310.1041,129.8856 C308.1791,130.5746 307.7001,130.8096 306.2451,132.0546 C304.6701,133.4006 304.7101,134.4016 302.3891,135.0276 C300.3481,135.5786 298.0321,135.2486 295.9531,135.6746 C293.0561,136.2696 291.7421,137.8016 289.4251,139.6616 C285.2551,143.0086 281.0821,141.8656 276.3401,143.1026 C274.5901,143.5596 274.3201,144.3366 272.9131,145.3556 C270.6541,146.9916 267.7481,147.2976 265.1021,147.9296 C262.4741,148.5576 259.4591,149.0026 257.1041,150.2896 C254.9051,151.4906 253.3061,153.3946 250.9391,154.4306 C248.8091,155.3616 245.3701,155.3356 244.5861,156.8906 C243.4971,159.0566 245.0351,163.5566 245.5231,165.7326 C246.6221,170.6246 256.4671,197.1056 246.4781,196.9646 C247.2041,200.5416 247.4211,203.5576 242.8921,202.0716 C239.0581,200.8146 233.8971,198.1206 229.8411,199.6176 C226.5161,200.8446 222.5731,205.8126 221.6741,209.2366 C220.3021,214.4686 222.5021,216.0206 226.7821,218.0856 C231.7441,220.4806 235.3311,220.8906 240.6231,219.0446 C242.6901,218.3236 244.8201,217.5506 246.5991,216.2536 C248.5671,214.8196 249.3851,213.0096 252.0311,212.9526 C253.8891,212.9136 255.9011,213.7896 256.7831,215.4646 C257.2951,216.4386 256.9221,217.4736 257.2161,218.4376 C257.7291,220.1216 257.4881,219.7546 258.7051,221.1716 C262.5111,225.6006 266.8271,227.0056 272.2551,227.7426 L272.2551,227.7426 Z M310.6701,552.5566 C314.8671,553.4006 318.9211,552.0916 323.1331,552.9286 C326.8551,553.6676 330.9461,556.1046 334.3091,557.8246 C341.3491,561.4276 349.9301,560.6796 357.7901,561.7106 C361.8571,562.2436 366.4591,561.5406 370.2921,562.9636 C374.0061,564.3426 377.1801,566.3016 381.1351,566.8546 C388.8091,567.9246 396.9221,566.9866 404.5011,566.8586 C412.3431,566.7276 419.6461,568.5436 427.7751,567.0256 C429.4091,566.7196 431.1311,567.3606 432.5251,567.0816 C433.5751,566.8706 434.6061,565.6896 435.6391,565.2676 C439.0141,563.8886 443.4261,563.9836 446.9831,563.7456 C455.2691,563.1936 463.0431,563.4856 471.0841,561.3586 C474.0881,560.5636 496.5441,557.6566 496.415654,556.6076 C485.3841,557.2366 473.9951,556.7206 463.2841,553.7556 C455.3141,551.5496 448.9961,547.5986 441.7731,543.7296 C439.8321,542.6906 437.8161,542.0336 435.5761,541.9246 C432.5211,541.7756 432.7771,542.1836 430.4701,544.3416 C426.1001,548.4326 422.8561,548.0356 418.5161,544.1446 C414.1641,540.2436 413.7561,544.7986 408.8981,545.1816 C403.8741,545.5776 403.2801,539.4496 398.2341,540.2496 C395.8971,540.6206 394.0451,542.3456 391.6351,542.1726 C389.4061,542.0116 388.0291,540.4526 386.0221,539.7366 C383.6791,538.9016 380.9561,539.1426 378.5201,538.5076 C375.7831,537.7926 373.5811,535.9876 370.7111,536.3316 C366.2481,536.8666 363.2711,540.3426 358.3551,539.3006 C353.1181,538.1896 350.2101,532.8886 344.6991,533.0366 C338.5951,533.2006 334.0421,533.5886 328.3471,530.8366 C326.4231,529.9076 325.1741,528.3926 323.3671,527.4046 C321.0851,526.1586 318.6751,527.2576 316.2861,526.6476 C311.7031,525.4796 308.8981,519.5096 306.3051,515.9516 C304.1731,513.0266 303.8681,513.0606 300.3281,512.5116 C297.7251,512.1086 295.1401,511.3886 292.7021,510.3926 C289.9541,509.2716 287.5201,507.2146 284.7181,506.2856 C282.2371,505.4626 279.6931,506.0626 277.3501,504.7716 C275.0661,503.5136 273.3541,500.5906 271.7371,498.6246 C270.9261,497.6376 270.1221,496.6456 269.3141,495.6556 C267.4961,493.4266 267.7481,493.2866 265.3051,492.8646 C262.9221,492.4536 261.0751,492.7626 258.8681,491.4306 C256.4431,489.9676 254.9491,487.4186 252.7141,485.7786 C250.7751,484.3566 248.6871,484.1926 246.4421,483.3766 C243.4901,482.3046 241.1891,480.5096 238.6061,478.7866 C238.3291,483.9256 239.4051,491.3186 235.7631,495.2636 C234.8121,496.2946 233.5441,496.8446 232.7571,498.1216 C231.3741,500.3616 231.6661,499.0616 232.1691,501.9726 C232.7491,505.3356 232.6511,506.8416 231.4301,509.8106 C231.1991,510.3726 229.8131,510.4896 229.5891,511.0896 C229.2721,511.9386 230.2411,514.3086 230.4571,515.2626 C230.8671,517.0766 231.1171,519.3886 232.1731,520.8726 C233.5941,522.8666 236.7001,524.9266 238.4291,526.8296 C240.4561,529.0586 242.4951,531.0846 244.9111,532.9016 C248.9071,535.9086 254.4521,540.3046 259.3241,541.6186 C262.0851,542.3646 264.9881,542.0396 267.7851,542.9086 C270.6261,543.7906 272.7401,545.6616 275.3891,546.7636 C286.5231,551.3946 298.8061,551.7056 310.6701,552.5566 L310.6701,552.5566 Z M460.7641,526.3296 C462.5511,527.3656 463.1581,526.5336 464.8161,526.6136 C466.2961,526.6856 468.0091,526.8866 469.6211,526.893739 C472.6631,526.9056 476.3851,526.1376 479.3381,525.3506 C484.9161,523.8636 490.5291,522.9106 496.0751,521.8466 C500.7981,520.9406 505.4191,518.8846 510.1561,517.1146 C516.3791,514.7896 522.9841,514.2876 529.5581,513.9226 C535.5711,513.5886 541.4661,512.9176 547.4591,512.4276 C553.4861,511.9356 559.3371,512.6996 565.2851,511.3586 C568.0561,510.7336 571.1081,510.2916 573.6431,509.0306 C576.5711,507.5756 579.2911,505.2306 582.1681,503.5936 C585.5961,501.6446 594.4171,498.9546 595.7821,494.8436 C593.0351,495.5016 586.9361,497.8206 584.5341,495.9616 C582.0661,494.0536 582.9721,489.0776 583.9481,486.6926 C585.4151,483.1056 588.5821,482.0626 591.3851,479.6886 C593.4081,477.9766 595.1591,475.9376 596.9521,473.9946 C597.8631,472.9906 598.7791,471.9906 599.6991,470.9936 C599.3181,469.9626 598.5741,469.9386 597.4641,470.9236 C592.2321,471.1446 577.9021,482.4296 577.3561,472.2936 C577.0641,466.8686 580.3121,464.3146 583.5431,460.5486 C586.7411,456.8226 589.2361,452.5996 591.9341,448.5166 C586.6771,449.3706 582.0311,452.1156 576.8921,453.5716 C571.4281,455.1196 565.5091,456.8886 559.9491,457.5206 C557.8261,457.7606 552.2711,459.7776 550.4941,458.7076 C549.0541,457.8416 548.7471,453.8586 548.7021,452.4066 C548.5311,446.8666 552.9061,442.4266 555.5191,437.8306 C549.4181,441.5496 545.1761,446.8066 539.6081,451.0916 C534.0871,455.3406 529.2601,459.2416 522.9941,462.4376 C517.2671,465.3576 510.8081,466.7886 504.6721,468.6196 C498.4111,470.4876 492.3321,472.3716 485.9541,473.7586 C478.9311,475.2856 471.9351,477.7836 464.8611,478.9496 C463.1281,479.2356 459.2881,478.2876 458.3041,479.4396 C457.4851,480.3986 458.0841,487.1646 457.9551,488.7026 C457.3191,496.2816 455.8121,503.8096 454.5821,511.3096 C453.9631,515.0746 452.2971,520.0196 452.5821,523.8316 C452.7781,526.4346 452.8151,526.4686 456.1291,526.5986 C457.7191,526.6606 459.2001,526.2176 460.7641,526.3296 L460.7641,526.3296 Z M533.8561,417.3956 C533.0001,417.5726 532.7661,417.9716 533.1541,418.5926 C545.2071,415.9456 556.9971,410.9466 569.4081,409.6496 C572.6891,409.3066 575.5161,407.9996 578.7671,407.7436 C580.2661,407.6256 581.7901,407.8286 583.2901,407.8486 C584.3391,407.8626 586.7431,408.5536 587.4721,408.4456 C590.2301,408.0416 593.1861,404.9816 595.3441,403.3596 C597.9131,401.4286 601.1551,399.4836 603.2241,396.9706 C611.3151,387.1446 613.3601,374.6926 608.0991,363.2176 C606.8381,360.4666 605.6751,357.2496 603.9141,354.7756 C602.3701,352.6066 598.5401,351.1916 597.8301,349.1106 C597.5151,348.1886 598.3771,346.2306 597.8301,345.4306 C597.3281,344.6956 593.6941,344.5386 592.8871,344.3666 C589.2761,343.5966 585.6531,342.7776 582.3761,340.9976 C581.4541,343.6316 581.7441,345.2166 579.1611,346.7776 C576.2361,348.5456 571.7891,348.1786 568.5771,349.1076 C561.5861,351.1296 554.0551,351.6606 546.9001,353.6546 C530.6851,358.1736 513.7421,363.5626 499.2221,372.2576 C505.7941,374.8346 514.0351,373.4856 520.9191,373.5316 C525.8171,373.5656 538.7061,370.5006 541.3021,375.9106 C544.6161,382.8146 535.7031,387.3376 531.2351,390.1726 C524.2331,394.6136 516.9721,398.6616 510.5801,403.9516 C514.2901,404.0876 517.7211,403.2296 521.2951,402.3666 C525.1481,401.4376 529.0881,401.3786 532.9241,400.4366 C538.8111,398.9916 546.5641,392.8356 552.9361,395.3306 C558.5251,397.5186 556.6731,405.9916 552.8321,408.8756 C550.3311,410.7546 547.1161,410.7176 544.2201,411.5526 C540.2531,412.6966 537.2531,415.1686 533.8561,417.3956 L533.8561,417.3956 Z M387.3001,81.3276 C375.2291,72.3536 363.5921,62.7666 350.9751,54.5496 C351.0861,58.4966 356.4431,63.5606 358.3621,67.0636 C361.1311,72.1206 363.7131,77.2916 366.3011,82.4436 C370.9331,91.6636 375.9461,100.6806 380.6141,109.8866 C390.1971,128.7866 404.2251,144.0596 417.8481,159.9676 C425.0941,168.4296 431.1701,177.5686 438.0241,186.3236 C439.4001,188.0816 440.7941,190.4716 442.5251,191.9306 C445.9051,194.7796 444.0291,191.3506 443.3371,188.9436 C441.7231,183.3176 440.1441,177.6826 438.5891,172.0406 C437.2341,167.1246 435.0681,161.9306 436.0681,156.7786 C437.0281,151.8336 439.9481,147.5696 442.3581,143.2466 C444.6671,139.1036 447.1701,135.1526 449.7561,131.1686 C450.9311,129.3596 452.3711,127.9936 451.4831,126.3526 C450.5301,124.5906 446.7331,122.6416 445.1111,121.4556 C436.1961,114.9376 428.6311,106.7266 419.4051,100.5006 C413.8071,96.7226 407.3791,94.0336 401.4081,90.9086 C396.3151,88.2436 391.8831,84.7736 387.3001,81.3276 L387.3001,81.3276 Z M689.5561,254.0876 C687.4651,252.7426 685.8801,251.5926 683.5071,250.9876 C682.1101,250.6316 680.6441,250.6626 679.2541,250.2076 C675.0461,248.8286 671.4331,246.6306 666.9881,245.6796 C659.4231,244.0626 651.6671,241.9456 643.9951,242.0076 C635.4591,242.0776 627.1191,242.3086 618.6071,243.2646 C614.1041,243.7716 609.6671,244.5146 605.1751,245.1426 C600.9041,245.7396 596.7601,245.3676 592.7831,247.4246 C595.6451,249.0596 599.1151,248.9866 602.2871,249.7196 C604.8231,250.3056 607.1171,251.4936 609.5251,252.1776 C616.2441,254.0846 623.0931,256.1406 629.8901,257.8726 C635.5611,259.3176 641.1811,261.1446 646.7491,262.6516 C651.9931,264.0706 657.8361,267.4616 662.4381,270.3926 C667.8331,273.8296 671.7831,277.9676 676.2341,282.5516 C680.9431,287.4026 685.8741,291.8596 690.0151,297.2336 C698.7991,308.6376 703.1821,322.7616 709.1641,335.7826 C712.1581,327.2446 714.4471,318.9356 717.7091,310.6646 C719.5531,305.9916 721.9761,301.6176 723.7881,296.8496 C724.5301,294.8946 725.2731,292.9386 726.0151,290.9836 C727.2651,287.6916 727.6231,287.0356 725.7801,283.9986 C723.6011,280.4066 721.0381,277.2686 717.5751,274.8626 C714.3491,272.6206 712.4841,269.7806 709.1371,267.8116 C702.3771,263.8326 696.5071,258.0506 689.5561,254.0876 L689.5561,254.0876 Z M630.0571,182.0006 C642.4251,177.3676 654.1561,170.6676 666.2441,165.7366 C667.3111,165.3016 668.3311,165.6546 669.4561,165.1666 C670.9571,164.5136 672.2711,163.1516 673.8051,162.4346 C676.7881,161.0406 679.9571,160.0056 682.9501,158.5856 C690.2831,155.1056 697.6231,151.6406 704.9671,148.1846 C716.6551,142.6866 727.2001,135.2116 738.2341,128.5206 C742.9521,125.6596 747.4981,122.2086 751.6241,119.0806 C756.2741,115.5556 759.9611,110.0056 765.1191,107.1296 C763.3161,106.2556 758.0271,108.4926 756.1161,109.0626 C753.3251,109.8966 750.3381,110.9826 747.3931,111.9416 C739.8721,114.3896 731.9151,115.8216 724.5491,118.5786 C716.5851,121.5596 707.9161,123.3696 699.7781,125.9366 C690.7931,128.7696 681.6211,130.9156 672.6191,133.6516 C664.7991,136.0276 657.3411,139.0536 649.5241,141.4856 C645.3381,142.7886 640.8501,143.8786 636.9701,145.9946 C633.5821,147.8436 633.5041,149.8956 632.4401,153.3936 C630.1361,160.9666 628.1211,168.6416 625.1361,175.9936 C624.8541,176.6906 619.6901,185.8076 619.8011,185.9636 C620.5281,186.9826 629.0191,182.6976 630.0571,182.0006 L630.0571,182.0006 Z M382.1701,237.6406 C385.8481,237.7186 389.0221,238.7436 392.6401,239.3276 C396.5071,239.9516 400.5231,239.1876 404.3131,240.1746 C407.3321,240.9606 410.2041,242.3116 413.2231,243.1356 C416.8981,244.1396 420.9331,243.4106 424.5071,244.7626 C428.0581,246.1056 431.5961,249.2356 434.9071,251.1786 C437.2171,252.5356 440.0531,256.9156 442.9041,254.1406 C444.5191,252.5676 442.6671,246.3976 442.1811,243.6886 C441.6421,240.6846 442.2891,235.6966 440.2001,233.2436 C437.4061,229.9626 432.1651,229.9926 428.4211,229.9696 C424.4971,229.9466 420.7451,229.1876 416.9511,228.2426 C408.0641,226.0306 399.0221,223.3296 390.8681,219.1216 C383.7641,215.4566 376.9761,210.7866 370.9071,205.5676 C364.4581,200.0226 360.5081,193.4336 356.4591,186.1006 C355.4911,189.6886 357.7481,194.4546 357.7281,198.1756 C357.7021,203.0276 356.4571,207.7566 354.3711,212.1196 C352.5811,215.8616 350.1891,219.6776 347.5241,222.8776 C346.0391,224.6606 344.2991,226.2036 342.7111,227.8916 C340.4521,230.2946 340.1951,230.6356 341.6421,233.6646 C343.5861,237.7326 346.5041,241.2136 348.8461,245.0416 C349.1751,245.5796 350.7431,249.2046 351.2111,249.4626 C353.1301,250.5236 355.0071,248.4606 356.6181,247.9086 C361.7651,246.1466 366.2271,248.1836 370.7011,244.2606 C374.0401,241.3336 377.2621,237.4606 382.1701,237.6406 L382.1701,237.6406 Z M436.9261,205.4056 C431.2151,191.8886 420.2151,179.8476 411.3211,168.2116 C407.3041,162.9566 402.1151,159.1606 397.8861,154.1646 C393.3481,148.8046 388.8751,143.5836 384.5011,138.0886 C380.0421,132.4866 376.0661,126.8046 372.8461,120.3726 C369.7161,114.1176 365.9461,108.3006 362.7491,102.0566 C356.2701,89.3976 350.4011,76.4826 343.6731,63.9316 C340.5421,58.0906 337.7911,52.4216 335.5031,46.1866 C334.8081,44.2936 332.3401,34.4626 331.8261,40.3116 C331.5141,43.8536 333.2941,48.2906 333.7921,51.8096 C334.8091,58.9826 335.8321,66.1586 336.7491,73.3456 C337.7491,81.1956 339.9271,88.8846 340.7731,96.7436 C342.2711,110.6696 344.6291,125.5646 349.4991,138.7616 C354.7681,153.0426 360.8701,166.8086 367.5701,180.4496 C370.5981,186.6156 373.4381,193.5136 378.6571,198.1236 C384.3651,203.1646 390.2111,207.4196 397.2081,210.5246 C403.5641,213.3446 411.0061,216.5316 417.9131,217.3656 C426.5501,218.4076 433.2301,219.0946 440.9191,223.7386 C440.0641,220.5376 440.6211,218.6946 440.2761,215.5396 C439.9091,212.1676 438.0331,208.5716 436.9261,205.4056 L436.9261,205.4056 Z M446.7281,280.2126 C446.7011,276.9516 446.0561,274.0046 445.6441,270.8266 C445.3041,268.2026 444.6671,266.9996 443.0651,264.9616 C442.7631,264.5776 442.4621,264.1946 442.1611,263.8116 C441.6441,262.3966 440.9151,262.3206 439.9711,263.5816 C439.2001,263.4726 438.5411,263.8416 437.6231,263.6276 C436.5741,263.3826 434.7151,261.9336 433.4761,261.5296 C430.2711,260.4826 428.2391,258.0426 425.0551,256.9716 C424.5301,256.7946 423.3361,257.4366 422.6071,257.2936 C421.8711,256.4376 420.9461,256.0576 419.8301,256.1536 C419.0011,256.2506 418.1711,256.2866 417.3381,256.2636 C412.8591,256.0096 409.8611,253.7046 405.7471,252.5006 C401.2561,251.1876 396.8511,252.5706 392.3641,252.2506 C388.8721,252.0016 386.2511,250.1886 382.6061,250.3126 C377.8391,250.4746 379.1061,252.5606 379.6801,256.7696 C380.1801,260.4306 379.7811,262.6936 383.9281,263.2916 C387.7461,263.8416 391.0671,262.0916 394.8861,263.3276 C398.9321,264.6356 402.2721,267.4646 405.1831,270.4516 C406.7561,272.0666 407.6471,273.6056 409.8701,274.0526 C411.4571,274.3716 413.7141,273.5386 415.3021,273.4276 C419.6311,273.1266 423.3661,274.3766 427.0691,276.5956 C434.6671,281.1506 441.2901,287.3236 447.6601,293.4096 C447.7701,289.0166 448.1921,284.4496 446.7281,280.2126 L446.7281,280.2126 Z M563.0031,243.7086 C569.7861,236.3906 581.9951,233.7336 591.1261,230.8756 C588.4781,227.9016 583.4151,224.8676 579.4541,224.9023 C575.3611,224.9396 569.9651,227.2746 566.1011,228.6456 C558.0551,231.4996 551.9081,237.8246 545.7001,243.3886 C530.7781,256.7646 518.5291,271.9246 505.7751,287.3076 C511.4741,290.8916 517.6131,295.1106 522.3511,299.8856 C524.5561,302.1076 527.1541,304.5006 528.9901,307.0526 C529.7091,308.0526 530.0761,309.2026 530.6821,310.2336 C531.8801,312.2716 530.6401,312.5076 533.4041,312.3466 C527.9391,299.8486 525.4261,283.1216 528.3431,269.7486 C530.0161,262.0796 535.4901,255.6776 541.9151,251.4436 C545.1651,249.3006 548.6871,247.3816 552.4141,246.2036 C554.7201,245.4746 561.8691,245.7926 563.0031,243.7086 L563.0031,243.7086 Z M797.7901,120.9876 C798.3961,116.5406 798.4241,112.0696 798.8181,107.6026 C799.1931,103.3376 800.1161,99.3716 799.2541,95.0556 C796.1241,96.2486 795.3461,96.9786 793.0551,99.2836 C790.3531,102.0016 787.7961,104.5026 784.6231,106.5916 C777.5921,111.2226 771.1071,116.9006 764.7501,122.4056 C751.7651,133.6536 738.3211,145.8876 722.7691,153.6106 C708.1761,160.8576 694.0471,168.7976 678.9271,175.1296 C671.8731,178.0836 665.0821,180.7106 657.9461,183.6916 C649.6091,187.1736 641.5811,191.3796 633.1021,194.4786 C629.0031,195.9766 624.9351,197.5656 620.8271,199.0336 C616.4791,200.5866 610.6731,201.2676 606.8751,203.6656 C603.7191,205.6566 600.9431,209.2556 598.2321,211.8216 C593.4541,216.3466 599.6011,215.1536 602.8861,215.5916 C607.0411,216.1466 610.4721,217.2586 614.0821,219.0466 C617.3011,220.6416 621.0181,219.6156 624.4821,219.9656 C628.4991,220.3706 631.8081,219.5576 635.7321,219.4896 C640.5761,219.4056 645.3651,219.0556 650.2161,219.1156 C658.5241,219.2196 666.9361,219.6536 675.1921,219.2566 C678.7841,219.0846 682.3981,219.3016 685.9951,219.1186 C690.1951,218.9056 693.8571,217.4176 697.9411,216.7096 C713.7911,213.9596 729.7291,211.1166 744.2871,204.0376 C759.7531,196.5166 772.7961,187.5756 784.9651,175.2736 C791.9491,168.2156 793.6201,161.4536 794.4151,151.6046 C795.2441,141.3356 796.7671,131.2356 797.7901,120.9876 L797.7901,120.9876 Z M511.8791,540.8296 C521.7031,539.4806 531.7661,537.6446 541.2571,534.6836 C545.9381,533.2226 550.6011,531.7596 555.3241,530.4366 C560.6271,528.9496 561.5751,527.9756 563.2941,522.7806 C556.7031,524.3406 550.4051,526.1376 543.6051,527.1856 C540.1891,527.7116 537.0711,529.0066 533.7381,529.5056 C529.8871,530.0816 525.8831,528.8656 522.0581,529.3046 C518.4481,529.7186 514.8761,532.0776 511.3411,533.0626 C508.2721,533.9176 505.2011,534.2046 502.1731,535.1476 C499.2311,536.0646 496.0511,537.0286 493.0121,537.6146 C490.1451,538.1676 487.3701,537.3046 484.8441,539.1756 C488.7081,540.8036 494.5941,541.3316 498.5771,540.9176 C501.0031,540.6656 503.5441,540.5376 505.9781,540.8306 C507.9351,541.0666 510.0411,542.0056 511.8791,540.8296 L511.8791,540.8296 Z M575.7641,435.8616 C575.7701,430.4066 576.4991,425.1986 577.2491,419.7976 C571.3441,418.8206 566.6491,422.8836 561.3601,424.6306 C565.6351,432.3006 566.1461,437.3116 563.6261,446.0336 C566.3621,444.8246 569.1261,443.8436 571.8691,442.7006 C572.7851,442.3186 574.0591,441.8726 574.7911,441.1806 C576.6681,439.4086 576.0121,438.5716 575.7641,435.8616 L575.7641,435.8616 Z M470.9431,309.5066 C470.8401,302.9526 470.8051,296.4026 470.4921,289.8536 C470.3531,286.9446 470.5011,283.8186 470.0201,280.9556 C469.4561,277.6036 467.0531,276.2926 464.4441,273.9706 C463.5491,280.4026 464.8521,288.1586 465.4261,294.7286 C465.7651,298.6126 465.7571,301.6206 466.8441,305.2746 C468.1151,309.5446 466.8331,311.4636 471.5051,312.7836 C471.3181,311.6916 471.1301,310.5986 470.9431,309.5066 L470.9431,309.5066 Z M392.0661,354.8766 C398.4461,351.2166 402.4451,345.7466 407.0871,340.2146 C413.1841,332.9496 417.2591,327.3356 419.6571,318.0046 C421.3501,311.4116 423.1541,300.9216 419.4391,294.6956 C417.7721,291.9016 414.6351,287.0526 411.6061,285.7646 C408.4401,284.4186 403.9201,286.7396 401.0331,287.9736 C393.3721,291.2476 386.6741,296.2096 379.2821,300.1426 C371.1631,304.4606 363.3911,310.1296 356.0201,315.6166 C341.4671,326.4486 328.1941,337.1246 314.4071,348.8026 C308.9951,342.4696 321.5511,331.1176 326.2411,327.2396 C333.1321,321.5396 339.6461,315.0176 346.9061,309.4676 C355.4621,302.9276 364.2251,296.7776 373.4321,291.1836 C377.6911,288.5956 382.0731,285.1596 386.6481,283.1976 C388.5321,282.3896 390.2511,282.1056 392.0211,280.9846 C393.5571,280.0106 394.8511,278.7506 396.6231,278.1786 C395.3551,275.8416 387.6071,272.4506 384.9441,272.1546 C379.7551,271.5776 373.0831,273.2786 368.0451,274.4046 C358.6951,276.4966 348.6981,278.1326 340.0021,281.9606 C335.9921,283.7256 333.2321,286.1376 329.9601,289.1516 C325.8501,292.9366 324.1311,297.4626 321.8351,302.5286 C317.0321,313.1316 311.8311,323.5916 307.2291,334.2776 C303.0041,344.0886 298.7811,352.3686 291.3051,360.1496 C288.1551,363.4286 284.9381,366.7176 281.5261,369.7246 C279.6651,371.3646 270.7471,377.2666 272.2711,379.4426 C272.8741,380.3046 279.6671,379.9666 280.9561,380.0916 C283.6631,380.3556 286.3351,380.7966 289.0491,380.9926 C294.4531,381.3846 299.2491,382.2126 304.6461,382.0676 C309.9751,381.9246 315.1661,382.5416 320.4831,382.0756 C325.5131,381.6336 330.4911,381.0086 335.4961,380.3516 C346.7121,378.8796 357.2901,373.7006 367.7441,369.6406 C372.3971,367.8326 376.4691,365.5166 380.8801,363.4686 C384.5251,361.7766 390.0031,358.1346 392.0661,354.8766 L392.0661,354.8766 Z M360.8151,255.1746 C359.2411,255.1346 356.2661,254.3456 355.6241,255.7766 C355.2661,256.5756 356.5851,259.1546 356.9151,260.1466 C357.5091,261.9306 357.5821,263.3916 359.1091,263.9136 C360.6441,264.4386 364.8551,263.1586 366.5081,263.0096 C368.6881,262.8146 370.6031,262.4176 372.7771,262.0336 C372.1041,260.1846 371.6621,257.2566 369.9661,256.0856 C368.0501,254.7616 362.9281,255.3286 360.8151,255.1746 L360.8151,255.1746 Z M653.8611,283.9996 C652.2731,282.1656 650.5961,282.4506 648.5361,281.8046 C645.9441,280.9906 643.5611,279.4066 641.1041,278.2616 C636.0401,275.8996 630.4831,275.0866 625.2881,273.0136 C615.3241,269.0376 605.6511,265.2736 595.6361,261.9676 C590.3571,260.2256 585.0071,258.7356 579.5301,257.7586 C574.4421,256.8526 567.2691,254.5276 562.1981,255.4076 C553.6801,256.8866 541.9901,266.2626 538.9891,274.2976 C537.2461,278.9666 538.5461,283.3516 539.4941,288.0146 C540.6571,293.7446 541.6751,299.6546 543.9531,305.0796 C547.8951,314.4676 558.6001,317.0356 567.2291,319.7376 C576.8061,322.7376 586.4191,324.0746 595.9881,326.9896 C600.8201,328.4626 605.7891,329.1466 610.5861,330.5926 C615.1981,331.9836 619.5661,332.5786 624.4521,333.5826 C637.2221,336.2056 650.1971,338.0676 663.0421,340.1476 C669.7541,341.2356 676.4181,342.4096 683.1141,343.5526 C685.9441,344.0356 688.8561,343.9436 691.6101,344.7896 C694.7621,345.7586 696.7671,347.0156 700.2731,346.2386 C694.2481,334.4626 690.3281,321.8386 682.0921,311.3226 C673.8461,300.7936 665.1061,291.0076 653.8611,283.9996 L653.8611,283.9996 Z M556.7981,212.5846 C561.9331,211.5466 567.0901,210.6956 572.1061,209.3536 C574.1221,208.8136 576.3011,207.8156 578.1881,206.9066 C580.2831,205.8996 580.8061,204.6156 582.4111,203.2596 C583.0741,203.5686 583.6931,203.5136 584.2701,203.0966 C584.5401,202.1966 585.0841,201.4946 585.9041,200.9906 C587.2801,199.5336 589.0281,198.4926 590.5461,197.1946 C594.3391,193.9536 597.8491,190.3016 601.4491,186.8486 C605.1731,183.2766 608.3831,179.5536 610.7511,174.9166 C611.3201,173.8036 612.7871,171.8146 613.1201,170.8656 C613.5681,169.5876 613.4401,168.0926 614.0511,166.8766 C614.5661,165.8546 615.9301,165.2196 616.5031,164.0886 C617.3651,162.3856 617.2091,159.9946 617.8481,158.1396 C619.2901,153.9556 621.0561,149.8506 622.2801,145.5956 C625.0781,135.8626 624.6651,124.3736 624.3001,114.3166 C624.1091,109.0236 622.4211,103.8486 621.0451,98.7736 C619.7291,93.9176 618.7761,88.6916 616.8511,84.0336 C615.4991,80.7626 613.3811,77.9776 612.0901,74.6496 C610.2871,69.9966 608.4281,65.5696 607.0401,60.6706 C604.2311,50.7566 600.0061,41.6596 595.2151,32.5656 C593.2001,26.2686 591.1361,20.1046 588.3241,14.0756 C582.9091,18.8076 577.0351,23.3016 572.0851,28.4906 C568.0371,32.7356 563.3591,37.4626 558.9451,41.2956 C553.9211,45.6576 549.2131,49.8396 543.8501,53.7566 C540.9231,55.8956 538.6321,58.6306 535.9891,61.0746 C533.2361,63.6186 530.1281,65.1056 527.5851,67.8756 C525.1791,70.4966 523.2681,71.6236 520.6641,73.5346 C518.7171,74.9646 517.2871,77.3806 515.3771,78.9786 C510.0311,83.4566 505.6171,88.8716 500.6571,93.7336 C489.5351,104.6346 479.1701,115.6406 469.4351,127.8876 C468.1041,128.6686 466.5421,131.5166 465.4811,132.9646 C463.5591,135.5886 462.2171,138.5946 460.4301,141.3086 C458.4661,144.2926 456.2301,147.1766 454.5301,150.3256 C453.6541,151.9486 453.3141,154.0956 452.2901,155.5706 C451.7131,156.4026 450.5631,156.8766 449.9381,157.7596 C445.5331,163.9836 446.9831,169.4926 449.0921,176.2746 C451.2461,183.1986 452.8121,189.9886 455.9141,196.5716 C459.2451,203.6436 462.1881,210.8736 465.2991,218.0416 C466.7591,221.4036 468.2891,224.7346 469.8311,228.0596 C470.7451,230.0316 472.0261,235.0996 474.1581,236.2766 C478.0251,238.4116 477.6961,232.0546 478.3231,229.5736 C479.1071,226.4656 480.3771,223.4946 481.2751,220.4186 C483.2431,213.6736 488.0701,206.1576 488.6541,199.2946 C493.5941,188.8976 494.8431,177.1176 500.3721,166.8396 C502.7331,162.4506 504.5561,158.1196 507.4051,153.8996 C510.4621,149.3696 512.9121,145.1526 514.8121,140.1376 C516.8511,134.7566 520.2311,128.7806 523.4841,124.0276 C524.9711,121.8556 526.6021,120.1306 527.9711,117.9286 C529.7811,115.0176 531.4851,112.0276 533.2651,109.0946 C540.2611,97.5666 548.1331,86.0286 556.1591,75.1856 C559.6411,70.4796 563.0961,65.6366 566.9921,61.7436 C568.9331,59.8046 578.2851,45.9586 580.7251,46.6496 C587.8751,48.6736 568.8941,76.9986 567.0991,80.0436 C560.4671,91.2916 554.6241,103.1176 547.6931,114.1676 C540.4571,125.7006 533.5201,137.1956 527.4281,149.3866 C524.1871,155.8706 522.1951,162.9586 518.5481,169.2186 C515.0621,175.2046 511.7221,180.8876 508.9701,187.2526 C505.9001,194.3536 503.5601,201.9176 500.9421,209.1996 C498.7401,215.3246 493.6281,222.1796 493.5651,228.7936 C498.6911,227.5096 503.9541,226.6636 509.1731,225.7236 C514.5671,224.7526 519.9191,222.7016 525.2431,221.2226 C535.9291,218.2556 547.1201,218.2476 556.7981,212.5846 L556.7981,212.5846 Z M338.2521,148.8686 C338.6671,150.3976 338.9331,151.9486 340.5841,152.6326 C339.7351,150.1076 338.9001,147.6006 337.8931,145.1336 C338.0131,146.3796 338.1331,147.6236 338.2521,148.8686 L338.2521,148.8686 Z M192.4051,652.8946 C190.7821,636.1806 190.3951,618.9876 193.0991,602.3806 C193.7171,598.5836 193.7301,594.2806 195.1001,590.6936 C196.6051,586.7546 196.1711,583.3686 197.1591,579.3046 C199.0851,571.3746 201.5461,563.4616 203.4781,555.5306 C205.4411,547.4706 208.6091,541.6676 212.8661,534.6656 C214.8771,531.3576 217.1451,528.5386 219.4551,525.5336 C220.6791,523.9396 221.0491,524.0736 221.3741,521.9256 C221.8031,519.1006 220.5671,516.6036 220.3121,513.9136 C219.9641,510.2446 220.9741,506.1836 222.4131,502.8586 C224.0421,499.0906 224.5661,495.0886 226.2351,491.3856 C227.7291,488.0716 230.3541,486.4396 230.8751,482.7996 C231.3311,479.6236 231.8861,475.7756 232.0501,472.6386 C232.2161,469.4516 230.2641,466.9846 227.7951,465.3356 C226.6721,464.5856 225.6311,464.4766 224.5231,463.4766 C223.3171,462.3896 222.1121,460.6026 220.9741,459.3586 C218.6701,456.8396 217.5651,451.5446 215.1771,450.1826 C213.6241,449.2966 211.0381,449.5426 209.3061,448.9876 C207.1931,448.3106 205.6151,447.2446 203.9981,445.7646 C201.3321,443.3256 199.0751,440.3446 197.3041,437.2056 C196.2921,435.4106 195.4501,433.5246 194.6661,431.6216 C194.2091,430.5106 193.3681,426.1836 192.4461,425.6096 C190.3581,424.3086 186.4051,427.1176 183.6021,425.3166 C180.1471,423.0956 178.2901,417.6176 177.3451,413.8446 C176.2851,409.6056 176.2151,405.1866 175.2741,400.9096 C174.2031,396.0456 173.0701,391.2096 172.1481,386.3116 C170.5071,377.5856 168.8071,368.0626 169.6211,359.2446 C169.7991,357.3086 170.3771,355.1046 170.2651,353.1836 C170.1601,351.3916 169.1811,349.6346 169.0031,347.7766 C168.6531,344.1016 170.5961,339.7586 169.6151,336.5386 C168.1791,331.8276 166.3841,329.5156 168.2951,324.3716 C169.6011,320.8606 172.9321,318.3696 174.0261,315.1336 C174.5621,313.5476 174.0951,311.7006 174.5501,310.0696 C175.1141,308.0526 176.4921,307.2696 177.4571,305.5796 C179.3431,302.2836 179.3121,299.8596 182.7851,297.6956 C187.1851,294.9536 187.9621,293.4226 190.6841,289.1586 C192.5271,286.2726 196.4131,283.9366 199.4501,282.4066 C203.0921,280.5736 206.4071,278.2756 210.1301,276.5736 C211.9991,275.7196 214.1451,275.1176 215.8981,274.0916 C216.7801,273.5756 217.4001,272.6956 218.3901,272.2306 C221.4051,270.8116 227.4391,271.1056 230.5201,271.4716 C234.7501,271.9746 239.0361,273.2936 240.2771,277.8096 C242.5931,275.6256 246.2391,274.9196 248.9891,273.5786 C252.2331,271.9976 255.8901,271.4476 259.1691,269.8116 C266.8201,265.9956 273.9401,262.1206 282.3491,260.0206 C280.7901,254.6656 280.3021,248.7236 275.6481,245.2926 C271.2681,242.0626 266.6921,239.3846 262.6611,235.6916 C260.6581,233.8556 258.5131,232.1316 256.6391,230.1596 C255.2851,228.7346 253.8011,225.5876 251.9001,225.2266 C250.6441,224.9876 247.4961,227.4556 246.2841,227.9436 C243.5951,229.0246 240.8891,230.0536 237.9911,230.3886 C227.8501,231.5616 217.4361,224.1456 215.2811,214.2876 C212.4591,201.3756 216.5991,193.8726 226.1251,185.6776 C224.6051,184.7826 223.0841,183.8876 221.5651,182.9916 C221.0601,182.6946 220.5541,182.3976 220.0491,182.0996 C218.8741,180.7196 218.0401,180.8836 217.5441,182.5916 C214.9541,184.3876 213.4111,187.4266 210.4931,189.1286 C207.7771,190.7126 205.3941,191.1736 202.2361,191.0746 C200.3971,191.0166 198.8031,191.0706 197.0671,190.3376 C196.0791,189.9056 195.1801,189.3326 194.3731,188.6186 C193.6531,187.1926 192.7111,187.0826 191.5471,188.2886 C189.0361,188.7626 187.1041,190.4016 184.5021,190.6646 C183.5351,190.7626 181.2081,191.0406 180.2251,190.8616 C178.6581,190.5786 178.4091,189.0026 177.1261,188.5526 C173.9911,187.4526 170.4061,190.5486 167.6001,189.5286 C165.4391,188.7436 162.4121,185.2206 161.4141,183.2246 C160.0481,180.4946 160.5301,177.0746 158.4721,174.7496 C156.7421,172.7946 154.2651,171.8406 152.5961,169.6906 C150.4691,166.9476 149.9651,164.0686 149.1901,160.8056 C148.2311,156.7686 145.9351,153.3336 144.5741,149.4016 C142.2791,142.7736 141.6241,135.5306 144.1411,128.8866 C145.3001,125.8256 147.0551,124.6666 148.7431,122.0636 C150.6781,119.0786 150.9491,115.0606 152.6821,111.8236 C153.9371,109.4786 155.0321,107.4566 157.2301,105.9926 C159.9391,104.1876 162.3701,104.2166 164.5481,101.4706 C166.4771,99.0416 167.7171,96.6756 170.5001,95.0126 C172.9311,93.5606 176.4161,94.0636 178.5601,92.7196 C180.8911,91.2586 181.4561,88.5586 184.3241,87.3506 C186.8591,86.2816 189.7291,86.1676 192.4271,86.3726 C195.7281,86.6236 199.2751,87.9876 202.5981,87.6276 C205.8961,87.2706 208.1851,84.8866 211.6731,84.4296 C215.2841,83.9576 218.7811,83.9576 222.0881,85.6956 C224.8641,87.1536 226.8981,90.9476 229.9641,91.5676 C232.6871,92.1186 234.2941,90.8196 237.1271,91.8326 C239.5541,92.6996 241.6221,93.4716 242.9341,95.9536 C243.3201,96.6836 243.4111,99.0176 243.9971,99.4946 C245.3331,100.5826 244.4941,99.8746 246.3181,99.6146 C249.8351,99.1136 253.7451,96.7056 257.1141,95.5006 C260.5071,94.2856 264.2161,93.0436 267.7681,92.4036 C268.9351,92.1936 270.8021,92.4356 271.8671,92.1216 C273.1481,91.7436 273.9481,90.7926 275.2491,90.2706 C281.8901,87.6086 288.8821,91.5186 295.4401,92.0996 C299.9151,92.4966 301.1651,93.2176 303.8461,96.8766 C306.1441,100.0126 307.8021,99.6506 310.8851,101.3096 C313.5681,102.7536 316.2381,107.1046 317.8111,109.6716 C319.8811,113.0486 318.7501,115.6446 319.4211,119.0636 C320.0021,122.0286 323.1061,122.9206 325.2341,125.0656 C328.2071,128.0606 330.8381,131.5766 333.6701,134.7286 C334.2341,130.3096 331.6921,125.6526 330.5261,121.4986 C329.1491,116.5986 329.1151,111.8486 328.2821,106.9156 C326.7331,97.7476 325.0791,88.4676 324.3791,79.1516 C323.6311,69.1966 323.0611,59.1096 321.9791,49.2236 C321.5081,44.9276 321.9701,40.7046 321.6891,36.4286 C321.5601,34.4736 321.3931,32.5716 321.3801,30.6116 C321.3681,28.5286 320.5431,23.7016 321.3871,21.9326 C322.8541,18.8556 326.6091,23.1336 328.8891,24.2076 C330.4771,24.9556 332.2781,25.0396 333.8331,25.8946 C336.2061,27.1976 337.1011,29.3656 338.6931,31.4096 C343.8121,37.9766 352.3381,42.5806 359.1611,47.1796 C375.6841,58.3196 391.1271,71.3656 408.0791,81.8106 C417.2071,87.4346 426.4591,92.3366 434.9941,98.9066 C442.1801,104.4406 452.3571,111.7446 455.2661,120.7726 C459.6211,117.9406 461.5491,112.7176 464.8511,108.9096 C468.6141,104.5676 472.2071,100.0846 475.9131,95.6836 C478.2871,92.8646 481.1511,91.1496 483.5251,88.5146 C487.1471,84.4936 490.8861,80.3086 494.8761,76.5476 C509.4651,62.7986 524.6941,50.0716 540.4271,37.5906 C544.9921,33.9686 549.6451,30.4526 554.1411,26.7466 C558.7211,22.9716 562.6941,18.3696 567.5301,15.0016 C571.7191,12.0836 575.2411,8.3786 579.5331,5.5966 C582.2131,3.8596 588.7071,-1.8534 592.3741,0.6056 C593.5971,1.4246 593.5291,2.9006 594.0021,4.1316 C595.0891,6.9616 596.7421,9.3316 598.3341,11.8986 C601.3251,16.7216 603.6761,21.9136 606.2881,26.9476 C608.9231,32.0296 611.8841,36.7986 613.8101,42.2186 C615.9141,48.1386 617.6641,54.1846 620.1061,59.9826 C625.0881,71.8086 630.1421,83.1296 632.7521,95.7576 C634.1731,102.6296 635.0011,109.5216 635.7381,116.5016 C636.1611,120.5046 636.3201,124.3726 635.9741,128.3926 C635.8041,130.3586 634.0631,135.5306 635.4361,137.1316 C646.2231,131.2326 656.4891,125.7176 668.2831,122.6036 C673.6681,121.1806 678.9561,118.4356 684.4171,116.8586 C690.9941,114.9586 697.9571,112.8276 704.2921,110.2686 C710.2261,107.8706 716.4571,106.3666 722.4751,104.1606 C729.0061,101.7666 736.0891,99.6376 742.8581,97.9446 C756.6821,94.4856 771.5211,91.2216 784.7841,86.0216 C788.4981,84.5656 792.0421,82.7546 795.7981,81.3806 C798.2091,80.4976 802.0621,78.2476 804.5991,78.5066 C810.0801,79.0636 810.2691,89.8976 810.247525,94.0966 C810.1701,107.2616 809.9411,120.4646 808.3461,133.7636 C806.6331,148.0556 806.8171,163.5206 801.2861,177.0946 C796.5061,188.8236 785.0031,198.5936 774.3221,204.9336 C767.3751,209.0576 760.1941,214.0536 752.7871,217.2156 C746.4061,219.9406 739.9441,222.0916 733.4961,224.5376 C719.6761,229.7796 705.1711,233.7496 690.4241,235.3176 C693.4171,237.2706 696.7421,239.0756 699.9111,240.7626 C703.6521,242.7546 706.2761,244.9866 709.6071,247.4256 C715.1821,251.5086 720.8261,255.8246 725.3951,261.0966 C731.5081,268.1496 735.8261,274.4196 737.0961,283.9676 C738.3401,293.3176 733.0971,302.3276 729.9611,310.8396 C726.2491,320.9136 722.5971,330.9356 719.4961,341.2196 C718.4921,344.5486 715.8641,349.8546 716.4081,353.4226 C716.6711,355.1456 718.0231,356.2036 718.0001,358.0896 C717.9491,362.3326 715.9301,362.0116 712.6961,361.5936 C708.3821,361.0366 703.9681,360.8656 699.6831,360.1256 C695.6161,359.4226 691.7131,359.5796 687.7111,358.9906 C683.6091,358.3866 679.7581,357.8536 675.5821,357.6366 C673.4441,357.5256 671.3061,357.4306 669.1651,357.3996 C667.0331,357.3676 666.1771,356.6746 664.3101,356.3666 C662.4121,356.0526 660.4031,356.8346 658.3791,356.5516 C656.2471,356.2536 654.0221,355.0206 651.9011,355.0086 C649.2121,354.9916 649.2151,355.2776 646.5861,354.5166 C644.6261,353.9496 642.7201,354.2976 640.7201,354.1196 C636.3251,353.7306 631.8501,352.8806 627.5311,351.9596 C624.6941,351.3536 621.9441,351.2056 619.0941,350.8136 C617.0461,350.5316 614.9911,349.1606 612.9361,349.2186 C618.5251,358.1336 620.5211,365.2436 620.4431,375.6826 C620.3691,385.4566 616.5161,394.1476 611.0251,402.1476 C606.0981,409.3236 600.4571,413.4096 592.3441,416.2786 C587.5701,417.9666 585.6081,417.3926 585.1451,422.7346 C584.7131,427.7236 584.3591,432.5816 583.5921,437.5366 C588.9281,435.0736 604.0771,424.2056 607.1581,432.8516 C610.6101,442.5416 602.4551,451.1816 597.8661,458.7166 C603.3291,457.9966 609.1241,455.5256 610.3691,462.6826 C610.9391,465.9686 609.5961,469.4296 608.3561,472.4076 C607.4931,474.4816 603.1201,479.9776 603.4741,481.7616 C603.6581,482.6856 606.1641,484.0026 606.7481,484.8456 C607.5881,486.0616 607.8981,487.4526 608.1261,488.8886 C608.6331,492.0656 608.0461,495.3706 606.4191,498.1726 C603.6921,502.8686 596.4771,506.9176 591.9471,509.5406 C586.2651,512.8306 581.5741,516.2636 574.9761,517.1446 C574.4151,517.2196 572.2061,517.4036 571.9531,517.6496 C571.4981,518.0916 571.4441,522.5736 571.2821,523.3926 C570.5781,526.9376 569.6211,530.9216 568.1781,534.2456 C565.8821,539.5386 558.1571,540.8716 553.1931,543.0856 C546.0031,546.2926 538.8671,548.5776 531.3881,550.9946 C527.6871,552.1906 523.9811,553.3616 520.1971,554.2666 C517.7021,554.8636 510.8871,554.9466 509.0841,556.6126 C507.9691,557.6416 507.6361,560.1496 506.5521,561.4536 C505.9901,562.1306 504.7821,561.6236 504.2941,562.0756 C502.9511,563.3216 502.4251,566.8576 501.2231,568.5076 C500.9861,568.8326 498.8241,570.8056 498.7471,571.3886 C498.6081,572.4456 500.6931,575.5446 501.1431,576.5256 C502.7941,580.1206 504.3611,583.7416 505.5781,587.5116 C507.7071,594.1076 507.5861,601.1156 509.5881,607.6376 C513.8171,621.4106 515.8111,635.7736 518.1271,650.0036 C519.3591,657.5626 520.8051,665.1216 522.1701,672.6546 C523.5181,680.0896 526.5841,687.0646 528.9601,694.1976 C533.3581,707.3996 533.5071,721.9626 532.1311,735.6646 C531.7501,739.4506 533.6331,749.8626 526.8661,746.5506 C520.9691,743.6666 521.4381,732.0356 519.8431,726.5696 C515.6251,712.1046 513.9081,696.8806 509.4911,682.3906 C504.9601,667.5286 502.4151,652.7856 499.9521,637.4716 C497.4081,621.6506 494.0891,606.0206 491.3551,590.2656 C490.7791,586.9486 490.5491,573.1256 486.5061,572.0026 C484.8181,571.5326 480.6521,572.9716 478.5891,573.0576 C473.9271,573.2526 469.5481,574.2306 465.0231,575.3416 C458.7251,576.8866 452.5651,575.7746 446.3371,577.0336 C442.7151,577.7666 439.0211,578.0426 435.3991,578.7726 C431.4721,579.5646 427.8531,581.1856 423.8891,581.8856 C417.0461,583.0936 410.2221,581.8616 403.3231,582.2546 C396.2401,582.6576 388.8141,583.4456 381.7261,582.9836 C374.4321,582.5086 369.5231,578.1616 362.3681,578.1096 C355.5221,578.0586 348.3741,578.9976 341.6181,577.7886 C338.6251,577.2536 335.1301,576.4996 332.2721,575.6646 C329.3101,574.7996 326.8081,572.6196 323.8021,571.6046 C316.1061,569.0046 308.1051,571.0106 300.0511,569.4956 C296.7741,568.8786 291.8801,568.3096 288.9001,566.9316 C287.1061,566.1026 286.9411,565.8166 285.2311,565.5036 C283.7551,565.2336 282.5741,565.0626 281.0971,564.5936 C277.4981,563.4496 274.5071,562.8416 271.0131,561.1456 C268.0801,559.7216 265.9651,557.4286 262.6291,556.7716 C261.0251,556.4556 259.3481,556.7876 257.7691,556.3686 C255.8381,555.8556 253.8731,554.4836 252.0041,553.7086 C248.3911,552.2096 245.1941,550.3496 242.1861,547.8316 C236.2051,542.8246 232.6041,537.2026 229.2741,530.2496 C224.8081,541.2576 221.9681,552.9506 218.1491,564.2296 C216.3281,569.6086 216.0841,574.9586 215.1401,580.5226 C214.0871,586.7266 212.8971,592.8106 211.6071,598.8766 C211.1511,601.0246 211.8541,603.2396 211.6741,605.4346 C211.4201,608.5286 210.4351,611.5706 210.1771,614.7206 C209.6701,620.9016 209.4661,627.2996 209.2971,633.4976 C208.9711,645.4596 211.6831,657.3686 211.5101,669.3466 C211.4751,671.8256 210.4421,674.3126 210.8621,676.8036 C211.4251,680.1466 212.7251,682.3566 212.8471,685.9116 C213.0591,692.0446 213.6031,698.1336 213.2341,704.2706 C212.6371,714.1986 210.1191,724.3656 206.3151,733.7826 C204.2801,738.8216 202.6551,744.2756 199.8731,748.9636 C197.8641,752.3466 195.1941,758.0566 190.4891,757.0836 C186.2431,756.2066 185.6901,753.1056 186.5851,749.4906 C187.9831,743.8506 188.9101,738.3046 189.9371,732.5896 C191.0581,726.3546 190.7811,720.1066 191.6561,713.8586 C192.5591,707.4126 194.4791,700.9076 194.6941,694.3726 C194.9351,687.0216 192.0371,679.5546 192.7321,672.1956 C193.0451,668.8796 193.8391,666.7856 193.3281,663.3526 C193.1061,661.8706 192.9501,660.3756 192.7521,658.8896 C192.4961,656.9556 193.3701,654.5366 192.4051,652.8946 L192.4051,652.8946 Z"></path><path d="M113.024,432.5198 C112.924,418.7788 112.64,405.1338 112.706,391.5738 C112.72,388.4898 111.662,377.8348 114.57,375.7958 C116.378,374.5288 118.902,376.1238 119.36,378.2578 C119.649,379.6068 117.343,379.1768 118.1,381.4468 C118.844,383.6778 119.633,382.3048 121.246,383.6658 C123.962,385.9558 122.295,395.6598 122.234,398.9898 C122.202,400.7558 122.697,402.5138 122.696,404.0818 C122.694,406.9958 121.765,410.1068 122.133,413.1318 C122.443,415.6798 123.162,418.5588 122.96,421.1488 C122.795,423.2488 121.992,424.5948 122.155,426.8488 C122.251,428.1718 122.753,429.1858 122.831,430.6498 C123.191,437.5048 123.912,444.2428 124.684,451.0908 C127.744,478.2208 133.169,504.7768 132.49,532.1988 C132.316,539.2498 133.007,546.2898 132.711,553.3498 C132.407,560.6088 131.677,567.8458 131.366,575.1068 C130.944,584.9518 131.399,594.2988 131.49,603.4948 C131.531,607.7028 131.19,613.1708 131.294,617.8748 C131.354,620.6428 131.749,623.7428 131.596,626.7768 C131.409,630.5278 130.783,634.4808 130.797,638.2078 C130.807,640.4858 131.427,642.5588 131.514,644.5958 C131.614,646.9158 131.285,648.7928 131.249,651.0828 C131.225,652.5188 131.682,654.0068 131.619,655.4448 C131.499,658.1928 131.081,657.0248 130.878,658.7028 C130.433,662.3948 130.857,666.3528 130.984,670.0508 C131.408,682.4368 130.761,694.9978 130.335,707.3518 C130.13,713.2848 129.986,719.4058 130.549,725.3128 C130.744,727.3518 132.049,730.7028 131.385,732.6008 C131.109,733.3888 130.594,733.7358 130.278,734.3918 C129.213,734.4338 128.841,734.9138 129.161,735.8308 C129.191,736.7658 129.219,737.7008 129.246,738.6358 C129.341,741.7788 129.357,744.9568 129.647,748.0908 C129.898,750.8058 131.827,754.2948 128.069,754.9148 C121.425,756.0088 121.435,745.9908 121.152,742.1098 C120.149,728.3288 119.188,714.1138 120.058,700.3018 C120.443,694.1768 120.096,688.4018 120.026,682.2718 C119.943,675.0408 120.927,667.7908 121.142,660.5548 C121.548,646.8578 122.175,633.3538 121.672,619.6548 C120.511,587.9948 120.753,556.1238 120.261,524.4288 C120.022,508.9708 118.432,493.4798 116.321,478.1778 C115.289,470.6958 113.992,463.1658 113.654,455.6128 C113.31,447.9128 113.503,440.2198 113.024,432.5198"></path><path d="M420.5611,631.53 C432.1811,640.417 410.6741,660.21 404.5871,666.295 C401.9731,668.908 399.7291,671.541 396.7851,673.849 C395.2331,675.065 387.9691,679.025 387.6591,680.906 C387.3261,682.921 393.1111,688.97 394.2931,690.66 C396.8711,694.344 399.5031,697.988 402.1221,701.642 C411.6841,714.982 422.4321,728.537 427.0091,744.528 C427.9761,747.905 429.5881,753.233 428.5371,756.754 C427.2051,761.219 424.2071,758.306 422.5291,755.55 C418.5241,748.976 416.5841,742.002 411.6571,735.828 C405.5841,728.221 398.9711,721.125 393.3061,713.181 C387.6921,705.308 384.0571,696.59 379.0031,688.432 C376.2921,690.634 373.1151,692.271 370.6101,694.478 C369.5021,695.454 368.9561,696.955 367.9801,698.033 C366.6701,699.48 365.3121,700.111 363.7471,701.299 C361.2391,703.201 356.9831,706.005 355.2811,708.556 C352.9671,712.022 352.8121,717.362 351.0771,721.228 C346.8971,730.538 340.1121,738.926 334.6961,747.556 C332.5391,750.995 329.6381,754.758 326.2071,757.038 C321.7671,759.988 318.8061,754.494 317.9761,750.559 C316.2811,742.517 323.3981,732.962 326.7711,726.066 C331.0091,717.399 337.0761,709.818 341.3631,701.204 C343.6671,696.573 344.7391,693.126 348.5481,689.442 C351.6591,686.434 355.1321,684.301 358.1301,681.288 C359.5591,679.853 361.1851,679.476 362.7621,678.355 C364.1971,677.335 364.6751,676.236 365.8681,674.848 C368.3831,671.918 371.3811,669.943 374.7151,668.396 C378.3271,666.719 381.7731,662.545 385.1091,659.979 C389.5701,656.549 394.1701,653.465 398.4341,649.779 C405.7621,643.444 412.9391,637.598 420.5611,631.53"></path><path d="M655.4371,528.2395 C657.1111,527.1775 656.9031,526.4555 655.7711,525.4275 C655.6551,526.4105 655.5741,527.0915 655.4371,528.2395 M660.5931,432.9155 C661.7941,429.9685 661.7941,429.9685 660.2711,429.4925 C660.3671,430.5115 660.4601,431.5045 660.5931,432.9155 M666.9001,441.8605 C666.7661,451.5825 666.1241,461.4055 666.2431,471.1035 C666.2921,475.1415 666.3501,479.2865 666.1441,483.3435 C665.9521,487.1475 666.1051,490.4535 666.0731,493.9985 C666.0621,495.1345 665.5011,496.6315 665.5141,498.0085 C665.5391,500.5715 665.2161,503.1035 665.0081,505.6585 C664.6001,510.6805 664.3731,515.7155 664.1291,520.7475 C663.9061,525.3855 663.9181,529.9875 663.8781,534.6285 C663.8401,538.9245 662.1551,541.4105 664.1571,545.5655 C660.7771,546.0345 662.5631,549.0565 662.2571,551.8715 C662.0281,553.9905 662.2771,555.4635 662.0801,557.4995 C661.8841,559.5245 661.1501,561.8435 661.5241,563.9115 C661.7131,564.9625 664.4831,566.5295 660.8491,565.8645 C660.3101,566.6515 660.7481,567.2035 662.1631,567.5205 C662.0401,568.1375 661.7011,568.6085 661.1461,568.9335 C661.2501,570.6105 660.7751,572.9245 660.4881,574.7695 C660.0731,577.4245 659.4771,580.1695 659.4111,582.8645 C659.3711,584.4685 660.0031,583.6175 660.6841,584.5455 C657.8391,586.5195 660.8221,588.9355 659.8781,591.6555 C660.3321,593.1885 659.7171,593.8155 658.0361,593.5345 C658.0891,594.2995 658.1421,595.0645 658.1961,595.8295 C658.2491,596.5875 658.3001,597.3445 658.3531,598.1015 C657.6011,598.3025 657.3071,598.7635 657.4701,599.4855 C657.4971,600.6995 658.5881,601.9985 658.4951,603.1745 C658.2111,603.6995 657.8871,604.1975 657.5221,604.6695 C657.1541,605.4475 657.3491,606.0985 658.1101,606.6235 C657.8141,608.0095 657.6011,609.0695 657.4651,610.2925 C657.3051,611.7455 656.7321,614.0275 658.2631,615.2895 C655.8451,616.1325 657.3371,616.9265 657.4411,618.7095 C657.5841,621.1825 656.9501,623.2545 656.9061,625.5875 C656.8971,626.0405 657.1571,627.0535 657.1011,627.4415 C657.3251,627.9025 657.4561,628.3915 657.4931,628.9095 L656.6171,629.7755 C656.4051,631.1845 656.9161,633.9945 656.1241,634.3565 C658.1281,635.1405 657.1601,637.8995 657.3761,639.6675 C657.3301,640.1985 657.1611,640.6895 656.8711,641.1385 C657.2261,641.3555 657.5681,641.5925 657.8961,641.8475 C655.5731,643.2205 656.4741,649.9115 656.5461,652.3515 C656.6831,657.0205 656.3691,661.7055 656.6641,666.3605 C657.1601,674.2175 656.8091,681.8605 656.9431,689.6755 C656.9751,691.5505 657.6251,693.8335 657.3701,695.6475 C657.1181,697.4415 656.5371,698.3195 656.6381,700.3525 C656.8271,704.1265 657.0441,707.6325 657.1011,711.4885 C657.1591,715.3725 657.1391,718.8925 657.4081,722.5515 C657.6451,725.7875 658.0981,731.0185 654.9421,733.0015 C655.7921,733.4455 657.5401,733.8385 657.2111,734.8745 C654.4101,734.6805 653.5071,736.2555 652.3151,733.3955 C651.6811,734.0745 651.0471,734.7535 650.4141,735.4325 C647.4841,729.9045 648.5181,722.8575 648.5041,716.8205 C648.4951,712.6135 648.5361,708.1155 648.4501,704.4015 C648.1731,692.4235 647.7861,680.3355 648.0651,668.3255 C648.6251,644.1785 645.8661,619.7815 647.0931,595.6205 C649.3541,551.1025 654.2061,506.3995 655.0881,461.8005 C655.3461,448.7785 656.0861,435.7105 656.3891,422.6685 C656.5251,416.8155 656.5991,410.9865 656.5621,405.0845 C656.5401,401.6795 656.1041,398.2015 656.4351,394.8215 C656.9911,389.1465 657.1351,392.9695 658.4971,393.3235 C659.8351,386.9125 662.8871,391.7765 663.3151,395.8365 C663.5331,397.9075 663.0881,400.0485 663.7141,402.0475 C664.3701,404.1415 665.2811,405.0025 665.4301,407.4085 C666.1391,418.8195 666.6111,430.4225 666.9001,441.8605"></path><path d="M173.1851,611.3757 L171.5091,612.9197 C174.4631,613.5507 176.4261,615.1467 178.9671,616.9847 C178.2831,618.1587 177.1381,616.2277 176.4671,616.7797 C174.9071,618.0627 176.8101,619.2627 176.6081,620.0987 C176.4711,620.6677 175.7791,621.9617 175.8131,622.5667 C175.8571,623.3327 177.5231,625.6007 177.7741,626.5917 C175.9271,625.7677 175.4661,625.1577 173.8151,626.2577 C177.0091,627.4317 176.3181,628.7677 176.3181,632.0137 L174.0801,631.4657 C177.2491,632.3517 174.2111,635.3047 176.9311,636.4647 C174.8511,639.4077 176.1191,640.7507 177.7991,643.6887 C176.6641,643.9587 175.3241,644.0267 175.2781,645.5767 C175.2171,647.6427 176.6911,646.6967 177.8641,647.7977 C174.9401,648.8067 176.2661,649.2977 176.4151,651.7267 C176.5661,654.1757 175.1871,659.7357 178.8751,658.9737 C178.7641,660.0067 177.3151,660.3637 177.3211,660.5677 C177.3841,662.6407 177.4131,664.6817 177.4291,666.7577 C177.4511,669.5157 177.6451,672.3747 177.9881,674.9327 C178.7741,680.8107 178.7211,686.8527 178.7531,692.6477 C178.7881,698.8467 180.4091,705.4387 179.6451,711.8277 C178.9661,717.5117 178.2961,722.5107 178.5581,728.2617 C178.7721,732.9697 181.2881,741.7127 178.7641,745.5707 C174.6321,751.8917 168.8321,742.2637 168.5571,738.1087 C167.6091,723.8077 167.8971,709.4187 167.2501,695.0607 C166.6121,680.8417 166.3551,666.7317 165.1221,652.3637 C163.8641,637.6847 163.6321,623.3267 163.4451,608.5817 C163.2711,594.9377 161.6721,581.4617 161.1251,567.8357 C160.5301,552.9827 160.6121,538.2477 161.2451,523.3977 C161.9061,507.8657 160.2571,492.3317 160.8861,476.8417 C161.0361,473.1627 161.1261,469.3847 161.1081,465.6317 C161.0901,461.9387 160.1371,456.7607 161.0981,453.1917 C161.6511,451.1367 161.5821,451.6107 162.2061,450.2657 C162.5301,449.5677 160.3901,448.7117 162.4701,448.1657 C164.8991,447.5267 164.2641,454.9457 163.8591,455.9827 C167.4771,455.7147 167.0641,457.4597 167.6641,461.0697 C168.0611,463.4577 168.2541,465.9327 168.3981,468.3457 C168.6681,472.9117 170.1361,477.1737 170.7101,481.5447 C170.7671,481.9727 170.3641,482.7557 170.4751,483.5837 C170.6701,485.0437 171.0931,486.5187 171.3881,487.9687 C172.0541,491.2397 172.0901,493.8987 171.9611,497.2247 C171.6891,504.2437 171.9721,511.4087 171.5161,518.3507 C171.1851,523.3847 171.7041,528.0617 171.5451,533.0827 C171.4561,535.9117 172.1331,537.8147 171.8881,540.6357 C171.6561,543.3207 171.8331,546.2747 171.8721,548.9907 C171.9441,554.0877 171.2251,560.0777 172.3011,564.8547 C172.9221,567.6117 172.8491,562.4667 173.4541,565.9827 C173.5121,566.3257 172.7731,566.8557 172.8321,567.2967 C173.2461,570.3577 173.8551,574.8577 172.2821,577.4677 L174.0131,577.5677 C173.3741,579.3577 172.7931,577.7487 172.4011,579.3497 C172.6321,579.8337 172.9491,580.2487 173.3511,580.5927 C173.9861,580.9657 173.8951,581.3917 173.0781,581.8707 C173.5321,583.3787 172.8631,585.5247 173.3931,587.2857 C173.7851,588.5847 174.6001,588.8567 174.8571,589.9707 C174.7201,590.4317 174.5821,590.8927 174.4451,591.3537 C174.6551,592.2307 175.0701,592.9997 175.6881,593.6597 C175.7221,595.1287 174.7451,597.1427 174.3701,598.5247 C173.8241,597.4787 173.2771,596.4317 172.7301,595.3847 L172.7301,599.6317 C173.7861,599.5587 174.8401,599.4847 175.8961,599.4107 C174.7171,600.4977 173.9971,601.6817 173.5021,603.1717 C172.6471,605.7497 172.2351,605.8107 174.9401,607.5007 C175.4981,607.8497 178.1711,608.7507 178.2701,609.3607 C178.4521,610.4997 177.2151,610.1687 176.9081,610.5487 C176.2911,611.3137 174.7241,612.6337 173.7541,611.4497 C175.4881,610.6657 174.6551,609.9567 174.0841,608.2547 C172.6931,608.9397 172.2371,610.0707 173.1851,611.3757"></path><path d="M87.9742,527.1912 C86.9462,516.9472 86.5822,506.3722 86.2022,496.0602 C86.0362,491.5582 84.9112,486.8632 85.2652,482.1792 C85.4642,479.5402 85.9222,476.8902 86.1702,474.2462 C86.5482,470.2292 87.2212,469.6102 90.8582,467.8512 C91.8442,470.0862 91.0282,471.1162 90.9302,473.1502 C90.8302,475.2182 91.0372,476.0352 91.7942,478.3762 C93.3192,483.0842 93.5542,488.2532 94.1612,493.1772 C95.2962,502.4002 95.7222,511.6252 96.9662,520.8522 C97.9772,528.3382 97.3162,535.8182 98.4332,542.9982 C99.5142,549.9482 98.9022,558.0452 98.6402,565.0562 C98.0282,581.4702 98.0402,597.4342 98.2352,613.8792 C98.3402,622.7542 97.5332,631.9682 97.6332,640.6092 C97.7222,648.2182 98.0012,655.8962 97.5182,663.5732 C97.2822,667.3282 97.6632,670.5202 97.4282,674.2562 C97.2432,677.2112 98.3642,680.6762 98.0202,683.5662 C97.9112,684.4802 97.1662,685.1652 97.0402,686.0122 C96.8252,687.4572 97.4122,690.0932 97.3432,691.7042 C97.1772,695.6412 97.3282,699.0852 96.9602,702.6942 C96.0622,711.5392 97.3062,721.1062 97.1062,730.0412 C97.0062,734.4682 97.1832,738.9282 96.6852,743.3322 C96.3052,746.6962 96.7872,753.7082 92.2222,752.8482 C85.9522,751.6672 87.5052,740.1252 87.2572,735.6062 C86.7352,726.0972 87.8642,716.5842 87.8432,707.0812 C87.8002,686.9802 87.7542,666.8862 87.8252,646.7872 C87.9632,607.0912 89.0852,566.7882 87.9742,527.1912"></path><path d="M12.897,626.4177 C12.437,628.5957 13.143,630.2287 13.019,632.2697 C12.927,633.7677 12.479,634.5957 12.339,636.0637 C12.414,636.4747 12.487,636.8857 12.561,637.2957 C13.622,638.1617 13.548,638.8497 12.343,639.3597 C12.417,640.2837 12.961,641.2917 12.986,642.1637 C13.164,648.4017 12.602,655.4317 12.479,661.8757 C12.414,665.3367 12.581,668.5317 12.753,671.8787 C12.881,674.3597 11.561,677.1257 11.712,679.7147 C11.807,681.3347 12.66,682.9187 12.644,684.7307 C12.629,686.3377 11.721,687.5247 11.631,689.4647 C11.525,691.7577 12.376,694.1727 12.49,696.3487 C12.588,698.2397 11.609,698.8617 11.595,700.5097 C11.729,700.7917 11.864,701.0737 11.999,701.3557 C13.303,702.1337 13.459,703.2027 12.467,704.5607 C12.217,704.9067 11.968,705.2527 11.718,705.5987 C11.556,706.4157 11.762,707.1347 12.336,707.7567 C12.396,709.0747 11.956,710.4827 11.968,711.5897 C12.006,714.7997 12.594,718.2597 12.841,721.4897 C13.442,729.3397 14.153,737.1867 13.76,745.0647 C13.687,746.5467 14.701,748.2987 12.393,749.3137 C11.881,749.5397 10.604,748.8577 10.147,748.9457 C8.776,749.2107 8.271,750.2797 6.936,749.4127 C5.418,748.4257 5.771,746.3397 5.758,744.8387 C5.624,729.7357 3.314,714.3077 2.818,699.0077 C2.309,683.3047 3.056,667.5537 3.145,651.8327 C3.241,634.7667 2.582,617.5957 2.87,600.5527 C3.119,585.7747 3.874,571.0547 3.22,556.1447 C2.825,547.1017 0.64,538.2857 0.482,529.2087 C0.419,525.5867 -0.052,522.9227 2.128,520.0587 C5.044,516.2277 8.248,516.7457 10.742,520.5637 C12.595,523.3987 13.204,527.5577 11.502,530.6507 C11.166,531.2617 9.12,532.8007 9.038,533.1577 C8.784,534.2537 9.574,534.3757 10.096,535.7397 C10.132,535.8327 9.885,537.5977 9.963,537.9997 C10.308,539.7677 10.81,541.2067 10.538,542.9787 C10.376,543.3527 10.213,543.7267 10.05,544.1007 C8.629,545.0067 8.789,545.9087 10.529,546.8047 C12.191,547.6467 12.412,548.6237 11.192,549.7327 C11.265,550.5377 11.337,551.3427 11.411,552.1477 C10.85,551.5047 10.291,550.8617 9.731,550.2187 C9.865,553.3947 11.507,555.1727 12.085,558.0877 C12.564,560.5087 11.328,563.3987 11.512,566.1997 C11.652,568.3127 11.854,569.7227 11.867,571.6757 C11.876,573.0467 12.906,574.5947 12.952,575.3227 C13.036,576.6677 12.065,577.8167 11.978,578.9917 C11.881,580.2987 12.101,580.8567 12.392,582.4597 C13.719,589.7757 12.553,598.3587 12.52,605.7987 C12.503,609.4287 12.359,613.1167 12.522,616.7437 C12.605,618.6077 12.837,620.6677 12.744,622.3267 C12.662,623.7887 12.438,624.7567 12.897,626.4177"></path><path d="M612.7974,634.3157 C611.8694,634.1437 611.5814,635.7947 612.4994,635.9647 C612.5994,635.4157 612.6984,634.8657 612.7974,634.3157 M621.5034,639.8387 C621.3654,642.3077 620.4384,642.3687 620.7604,645.3647 C620.9694,647.3127 620.4014,650.2487 622.3294,651.4747 C620.0794,652.7437 622.0314,661.9207 622.1024,664.4197 C622.2604,670.0087 622.2864,675.5967 622.3864,681.1857 C622.5774,691.9447 623.6104,702.5107 622.6894,713.2367 C622.2114,718.7947 622.0344,724.3787 621.8164,729.9507 C621.7074,732.7047 623.0834,740.5837 619.0004,740.4337 C611.7764,740.1667 615.2834,721.0577 615.2424,716.8297 C615.1454,706.7687 612.0414,697.1217 611.6414,687.1187 C611.2814,678.1537 610.4554,668.6697 609.6424,659.5597 C608.8084,650.2287 609.4714,640.8267 609.7064,631.4597 C609.9644,621.2187 609.8894,610.9797 610.2444,600.7447 C610.6654,588.6277 610.2184,576.5107 610.5434,564.3907 C610.6984,558.5967 611.0564,552.7147 611.5784,546.9347 C612.0094,542.1807 611.1944,534.6897 613.7434,530.5397 C617.4134,532.6557 615.5854,532.7627 616.1614,536.2027 C616.5814,538.7067 617.3684,539.2617 619.0964,536.7977 C619.1974,538.1947 618.3664,539.6107 618.4844,540.8467 C618.6254,542.3287 619.4984,542.9567 619.8214,544.4987 C620.2764,546.6787 618.3404,550.6687 621.0544,551.9227 C620.0094,553.1287 620.6124,553.9767 620.6834,555.3927 C620.7814,557.3697 620.4694,559.8637 620.5164,561.9747 C621.0794,561.3117 621.6444,560.6487 622.2074,559.9857 C623.5824,560.6177 622.9084,561.7327 622.7484,562.7917 C620.1284,560.8767 620.7324,564.7747 620.7034,565.7597 C620.6514,567.5857 620.6914,568.7547 620.4654,570.7347 C620.3104,572.0917 620.1974,576.1067 620.5774,577.3317 L622.8774,578.1357 C622.8234,579.1467 622.7714,580.1567 622.7184,581.1677 C621.2734,580.1987 623.0054,578.4587 620.1514,579.3547 C621.1894,580.8047 621.3354,580.6687 621.1294,582.6337 C621.5014,586.9127 621.7314,593.3187 621.5924,596.9897 C621.5534,598.0377 620.5384,599.9077 620.5314,601.3077 C620.5264,602.7307 621.1344,603.9617 621.2034,605.2697 C621.1824,604.8637 620.8084,607.7757 620.8004,607.8287 C620.5734,609.3357 620.5834,609.4567 620.4114,611.3897 C620.0754,615.1687 620.7554,619.0637 620.5664,622.7957 C620.4894,624.3007 620.1994,625.6157 619.9684,627.4557 C619.6564,629.9317 620.4564,632.3717 620.4464,634.7357 C620.4394,636.6127 619.6614,638.9007 621.5034,639.8387"></path><path d="M704.1949,563.9905 C706.4379,562.9375 706.4919,562.5615 704.7479,560.8025 C704.5559,561.9035 704.3939,562.8395 704.1949,563.9905 M705.5419,525.2345 C705.4909,526.3665 705.6059,526.6465 705.4009,527.8895 C706.3059,528.9175 706.2339,529.5225 705.1819,529.7035 C704.9229,529.9475 704.7399,530.2345 704.6329,530.5635 C704.5009,533.4285 705.3419,536.5225 707.2119,538.6535 C704.7879,540.0125 705.1119,542.5505 705.5279,544.8625 C706.0109,547.5445 705.4509,547.7675 704.9779,550.0775 C704.2229,553.7605 707.6799,553.4455 706.0209,557.2145 C705.0809,559.3525 704.5289,557.1565 705.6779,559.6585 C706.8629,562.2395 707.4539,560.8075 706.3369,563.8725 C706.1689,564.3315 706.9359,564.7675 706.8699,565.1945 C706.7439,566.0065 705.6459,565.2195 705.6129,566.4155 C705.5989,566.9315 706.4179,567.4345 706.4589,567.9465 C706.6079,569.8055 706.6329,571.6965 706.7199,573.5595 C705.1059,572.8555 704.9459,570.8735 704.3849,569.2585 C703.4999,569.4895 703.9649,573.0095 703.9649,573.8905 C704.5289,573.6625 705.0939,573.4345 705.6589,573.2065 C705.6239,575.1365 707.0379,575.0945 708.3919,575.8625 C705.1049,577.2875 707.3049,578.9585 706.7479,581.9285 C706.4179,583.6805 704.7089,585.4045 704.5469,587.3635 C704.4869,588.0855 705.4939,588.7285 705.6789,589.4505 C705.7899,589.8805 705.5109,591.3015 705.6649,591.9025 C705.6469,591.8335 706.8829,592.9575 707.0659,593.4615 C707.6419,595.0415 706.6249,596.4905 706.5599,597.9645 C706.4389,600.7195 706.7369,602.5045 706.4769,605.1725 C706.2209,607.7895 706.5899,610.9515 706.6289,613.4285 C706.6499,614.7795 707.0199,615.2695 707.1359,616.7805 C707.3369,619.3735 707.3909,622.2535 707.3879,624.6255 C707.3859,626.9485 707.5909,629.2925 707.7089,631.6135 C707.8149,633.7155 708.0409,636.1915 707.9709,638.0605 C707.9189,639.4525 707.8099,641.3965 708.1209,643.1825 C708.5199,645.4745 708.3929,647.6185 708.9899,649.8925 C709.9169,653.4265 709.5689,653.8035 708.5759,657.2115 C707.8189,659.8105 709.0309,661.9075 709.0899,664.3345 C709.1349,666.2535 707.4229,669.1245 710.4829,669.0395 C710.0819,671.5335 712.8279,671.5105 712.8289,674.6025 C712.2219,674.1325 711.6149,673.6625 711.0069,673.1945 C710.2049,674.3625 709.1079,673.1775 708.6809,674.2095 C708.1609,675.4695 708.8669,676.6685 710.3759,676.3855 C709.7999,677.3035 708.7139,678.0975 709.0219,679.3495 C709.9059,678.7805 710.7909,678.2115 711.6739,677.6425 C711.0929,679.2815 710.5509,680.3485 710.4299,682.0605 C710.2699,684.3345 711.9809,683.5575 709.8699,685.3555 C711.9339,686.8045 711.0549,688.5545 711.0259,690.9065 C711.0089,692.2615 710.7979,692.7935 711.1779,694.5505 C711.6009,696.4985 711.5159,697.3185 710.9689,699.0675 C710.4399,700.7615 708.8339,699.8215 710.2949,702.3825 C712.7989,699.5155 711.7819,703.5445 711.2929,704.8115 C710.1319,707.8215 710.0279,708.2465 713.0289,709.9215 C712.0709,710.7005 711.0729,711.4245 710.0359,712.0935 C710.4489,712.9435 711.1619,712.9085 712.1739,711.9895 C712.1559,712.5525 711.9649,713.7465 712.1009,714.3595 C712.0389,714.0815 710.9589,714.8315 710.9329,715.2535 C710.8609,716.4485 712.2759,718.1555 712.3259,719.6125 C712.4219,722.4705 712.7659,723.3605 712.6139,726.0535 C712.4789,728.4375 712.4989,730.8115 712.4989,733.2005 C712.4989,735.7445 713.3249,737.4055 710.2429,737.493725 C705.6719,737.6205 705.2809,732.1105 704.7289,728.8275 C703.0729,718.9685 704.1469,708.2295 703.3739,698.1945 C702.6829,689.2325 702.3569,680.2415 701.6169,671.2595 C700.1149,653.0335 698.6449,635.6005 697.7309,617.3615 C697.2729,608.2265 697.4089,598.6445 697.3689,589.2205 C697.3249,579.2265 697.5729,569.1975 697.4159,559.2545 C697.2479,548.6425 696.4239,537.8905 696.7329,527.1385 C697.0469,516.1745 696.7339,504.2775 700.2649,493.8555 C705.3909,503.3445 704.6569,514.6135 705.5419,525.2345"></path><path d="M47.7564,709.657 C46.8814,691.899 47.3364,674.031 47.4494,656.253 C47.5604,638.866 46.8604,621.134 49.2614,603.913 C50.3034,596.44 51.2794,588.772 51.2354,581.231 C51.2084,576.627 51.7564,571.986 51.7124,567.407 C51.6814,564.196 50.7594,561.072 50.9014,557.756 C51.2314,550.067 51.4124,541.465 52.7564,533.904 C53.1884,531.473 53.7124,530.36 55.8534,532.318 C58.0134,534.295 56.2004,538.962 58.8114,540.036 C59.2674,538.092 59.5714,538.738 59.6914,539.65 C59.7774,540.317 59.2054,541.521 59.1584,542.329 C59.1044,543.287 58.5094,546.789 58.7224,547.683 C59.0994,549.27 60.5694,548.908 61.2454,550.017 C61.8644,551.03 62.1434,554.386 62.1034,555.681 C62.0224,558.333 60.3064,560.734 60.6614,563.417 C60.8504,564.838 61.7564,565.663 61.6164,567.01 C61.4874,568.248 60.5324,569.003 60.2754,570.001 C59.8784,571.538 60.0924,571.183 60.3694,572.975 C60.5664,574.245 60.7774,575.313 60.7024,576.702 C60.5724,579.135 59.8964,579.345 62.3834,580.057 C58.8004,582.397 60.3874,587.181 60.0184,590.539 C59.8494,592.079 58.9794,594.365 59.5294,595.821 C60.3104,597.883 61.9334,597.138 61.5524,599.698 C60.5244,598.425 59.0654,599.512 57.7864,599.071 C58.2754,600.851 61.8834,601.01 61.6914,602.812 C61.6484,603.217 59.0484,603.93 58.6944,604.611 C58.3524,605.268 59.2864,606.833 59.1254,607.793 C58.4194,607.237 57.7134,606.681 57.0084,606.125 C57.2404,606.894 58.3054,610.871 58.2764,610.995 C58.1384,611.586 56.7194,611.583 56.3464,613.054 C57.3394,612.719 58.3314,612.385 59.3244,612.05 C59.4024,613.22 58.7554,613.665 58.4024,614.577 C59.3694,615.235 59.3124,615.789 58.2274,616.239 C57.6224,616.435 57.3234,616.793 57.3284,617.313 C57.4434,619.217 60.4584,619.726 55.8624,619.934 C56.3084,620.938 59.4404,626.574 56.9504,625.059 C57.3894,627.438 57.7544,629.714 57.8994,632.125 C58.0274,634.276 57.3364,635.455 57.0524,637.29 C56.6664,637.729 56.3524,638.215 56.1094,638.749 C56.2264,639.22 56.4754,639.61 56.8554,639.918 C57.0174,642.54 57.4704,642.668 55.5364,644.582 C58.7674,647.42 55.7574,645.788 55.6354,648.252 C55.5634,649.709 56.2344,652.294 56.3694,653.872 C56.5294,655.726 57.0764,657.825 56.8194,659.681 C56.5704,661.486 55.2534,662.155 56.3424,663.702 C54.3414,664.129 55.6994,666.366 55.7354,666.846 C56.1994,667.11 56.5214,667.481 56.6994,667.959 C56.4304,668.425 56.1604,668.89 55.8914,669.357 C55.9244,670.524 55.9534,671.553 55.9874,672.709 C56.0484,674.751 56.0974,675.964 56.4494,677.71 C56.5714,678.31 55.9164,679.066 56.2354,679.697 C56.8264,680.865 57.6074,679.443 58.1874,681.189 C56.2424,681.223 55.2674,682.831 55.2594,684.738 C55.2544,685.923 56.2124,687.681 56.1644,689.222 C56.1194,690.669 55.7504,692.081 55.7274,693.524 C55.7044,695.005 56.1254,696.356 56.1894,697.778 C56.4474,698.325 56.7074,698.871 56.9664,699.418 C56.2534,699.653 55.9314,700.087 56.0014,700.722 C55.8774,702.538 55.9444,703.666 55.5364,705.59 C54.7214,709.451 56.3114,714.749 56.1504,719.404 C56.1034,720.764 55.8134,722.152 55.9774,723.509 C56.1444,724.889 57.2844,726.294 57.3854,727.456 C57.5184,728.993 56.3444,731.037 56.5504,732.797 C57.0194,736.812 57.7104,741.164 57.6184,745.829 C57.5594,748.868 53.9134,756.321 50.7654,752.769 C49.4224,751.253 50.0484,743.755 49.9014,741.646 C49.6524,738.121 49.4284,734.595 49.1844,731.07 C48.6874,723.904 47.7374,716.84 47.7564,709.657"></path><path d="M546.4957,594.2937 C546.8387,594.2497 547.1827,594.2047 547.5247,594.1607 L546.7807,591.8317 C545.8967,592.0307 546.4247,593.5197 546.4957,594.2937 M542.7217,591.9347 C543.0157,586.9767 542.3297,578.9487 545.6627,575.0627 C546.9387,577.0267 546.3897,577.4137 546.6837,578.8737 C547.0527,580.6987 547.3867,582.5077 549.0507,583.4147 C550.2537,580.2397 552.4617,585.2027 552.6747,586.4457 C553.3357,590.3037 553.0117,594.8787 553.3787,598.8407 C554.0987,606.6077 554.6067,614.2377 554.5397,622.0227 C554.4907,627.6067 554.4977,633.4297 554.8127,639.0707 C554.9987,642.3927 554.8727,645.6687 554.9197,649.0737 C554.9447,650.9657 554.9717,652.8567 554.9967,654.7487 C555.0077,655.5037 554.4077,658.2057 554.4327,658.2527 C555.0747,659.5067 554.9757,660.5227 556.3097,662.0957 C553.8957,662.8077 555.0937,663.7687 555.2597,666.3557 C555.4597,669.4897 555.0907,672.6017 555.1207,675.7467 C555.1427,677.9587 555.3347,680.1847 555.3917,682.3797 C555.4277,683.7417 555.1677,685.2347 555.3387,686.6347 L555.0047,687.8967 C555.8877,688.1147 556.2227,688.5847 556.0077,689.3047 C555.7857,690.9647 555.0157,692.2627 554.9147,694.2347 C554.7507,697.4447 554.4377,700.6527 554.0247,703.8267 C553.7627,705.8447 552.8787,708.4397 552.7957,710.3797 C552.6837,712.9757 554.6207,714.0297 552.0147,715.6137 C554.9677,717.3317 555.7297,723.2577 551.7137,723.5977 C554.4797,725.3507 554.6497,724.9847 554.3497,727.9787 C554.0097,731.3637 553.0897,732.7817 553.8317,736.1677 C552.4427,735.0257 550.8937,737.8657 549.3137,738.1157 C547.0107,738.4807 546.1457,737.3327 545.2057,735.2537 C543.0547,730.4937 544.1497,723.3317 543.9507,718.2107 C543.4977,706.6047 543.0367,694.8747 542.9577,683.3387 C542.8797,671.9017 543.1287,660.3997 543.0817,648.9457 C543.0697,645.8407 542.8717,642.6957 543.0387,639.5917 C543.1327,637.8447 544.0237,635.7477 543.8497,634.0607 C543.6667,632.3047 543.0057,631.0087 543.0587,628.9527 C543.1277,626.3447 542.8347,623.7157 543.0847,621.1077 C543.4687,621.2287 545.8187,622.3337 546.0557,621.6377 C546.4447,620.4907 544.8647,620.6957 544.3657,619.9427 C542.9117,617.7497 542.9807,614.9487 542.7787,612.2457 C542.2757,605.5187 542.6797,598.6797 542.7217,591.9347"></path><path d="M752.064,723.8347 C750.965,726.5397 751.272,730.1427 750.2,732.5427 C748.977,735.2817 746.53,734.5817 744.909,732.2717 C743.244,729.8987 743.777,725.0097 743.529,722.2077 C743.204,718.5367 743.213,714.9767 743.351,711.2957 C743.845,698.1327 743.789,684.7157 744.116,671.6587 C744.469,657.5757 743.574,643.3647 744.005,629.2697 C744.449,614.7847 743.307,600.2227 745.554,585.8687 C748.432,587.9497 746.46,589.4737 746.994,592.6127 C747.334,594.6157 748.202,596.0697 748.753,598.4877 C751.71,597.7867 748.594,599.4177 749.566,600.5857 C749.943,601.0397 749.626,603.6287 751.154,601.5587 C750.291,604.8387 750.899,605.3587 751.758,608.2717 C752.549,610.9567 751.301,612.9227 750.967,615.0277 C750.895,615.4797 751.2,617.2447 751.231,618.0637 C751.284,619.4237 751.752,620.9507 752.031,621.9867 C752.386,623.3027 753.586,625.7837 753.64,627.6607 C753.842,634.7387 751.816,642.2847 752.585,649.4147 C752.871,652.0727 753.357,653.5357 753.107,656.1617 C752.81,659.2667 751.893,659.6457 752.84,662.5457 C752.937,662.8437 754.11902,665.7097 754.11902,665.5477 C754.125,666.8897 752.785,667.8897 752.726,669.3627 C752.617,672.0967 754.354,672.6257 752.981,675.5767 C751.947,677.7987 751.389,678.1757 751.442,681.1027 C751.49,683.8247 751.57,686.0607 751.669,688.6977 C751.806,692.3517 752.79,695.6537 752.727,699.4047 C752.676,702.4927 751.748,705.0637 751.596,707.9587 C751.437,711.0117 751.142,714.6107 751.351,717.6647 C751.411,718.5437 752.014,719.3327 751.971,720.1347 C751.891,721.6087 750.628,722.4127 752.064,723.8347"></path><path d="M61.774,498.2605 C55.648,499.8735 54.53,487.4245 54.554,483.7215 C54.576,480.3905 54.998,477.0175 55.277,473.6995 C55.413,472.0925 55.203,464.3705 56.788,463.5365 C61.769,460.9125 62.186,476.7285 62.389,478.6495 C63.144,485.7575 63.189,491.3305 61.774,498.2605"></path><path d="M786.7652,724.863 C785.0972,726.995 782.8272,725.568 781.4022,724.004 C779.1462,721.528 779.1002,718.542 779.2482,715.357 C779.4162,711.778 780.0172,708.267 780.8052,704.778 C781.6082,701.222 781.9822,696.592 783.4842,693.283 C784.2552,691.582 783.4222,690.862 785.7582,691.448 C786.6992,691.684 787.3242,692.34 787.8352,693.12 C789.2432,695.269 788.5772,699.602 788.4362,701.989 C787.9722,709.859 786.3382,716.866 786.7652,724.863"></path><path d="M588.4254,689.427 C587.7794,691.196 588.1164,691.834 586.0924,691.732 C586.9354,693.581 584.8754,695.106 583.4024,696.875 C582.5654,693.868 583.2794,690.641 583.2524,687.451 C583.2224,683.688 583.1974,679.942 583.0464,676.179 C582.7594,669.01 582.2244,662.191 584.1834,655.252 C585.4324,656.854 589.9064,662.69 584.5624,661.925 C586.1154,663.552 585.7614,664.043 587.9374,662.635 C589.7714,665.944 587.8214,669.389 587.5704,672.759 C587.3124,676.232 588.7414,679.144 588.4434,682.612 C588.1374,681.952 587.8294,681.292 587.5224,680.633 C585.7204,681.529 587.5034,681.786 587.1474,683.311 C586.6444,685.47 586.3464,686.378 584.8314,688.438 C586.8154,689.062 586.6114,689.352 587.1174,691.444 C587.5534,690.771 587.9894,690.099 588.4254,689.427"></path><path d="M702.3677,443.011 C704.6657,445.171 703.1887,444.885 703.8207,447.544 C703.9647,448.147 704.5597,449.354 704.6057,449.632 C704.7287,450.375 705.1797,451.606 704.9217,452.699 C704.9317,452.655 703.2977,456.12 703.2667,455.586 C703.2987,456.137 703.9467,457.019 704.0287,457.616 C704.3237,457.688 704.6187,457.76 704.9127,457.831 C704.9117,458.665 704.9097,459.499 704.9077,460.333 C704.9717,461.572 705.1107,463.103 704.5057,464.254 C703.8387,465.523 702.9667,464.149 702.5687,464.767 C701.8277,465.921 702.2767,472.084 699.2547,469.722 C697.5097,468.358 697.7887,459.16 697.8797,457.099 C698.0097,454.141 698.2327,450.992 698.7487,448.07 C698.6907,447.119 698.8957,446.239 699.3607,445.431 C699.4867,444.321 699.9997,444.167 700.8987,444.969 C701.5767,444.285 701.8717,444.012 702.3677,443.011"></path><path d="M582.1539,715.0613 C582.1499,712.3883 580.6889,701.1263 584.0339,700.8913 C587.1759,700.6703 585.5789,708.6163 585.6669,710.6113 C585.7049,711.4773 586.7889,712.3513 586.6639,713.5563 C586.5249,714.8903 585.4879,714.1533 585.1659,715.6253 C584.8649,717.0003 585.9319,719.5493 585.8479,721.1403 C585.7729,722.5753 584.6459,724.5663 587.0199,724.5553 C586.8439,725.5373 586.6699,726.5193 586.4949,727.5023 L585.2129,727.5023 C584.2049,729.6443 585.1879,729.1923 585.3729,730.7763 C585.4779,731.6833 585.8579,733.0433 585.6309,734.5463 C585.3389,736.4843 585.0459,737.8693 584.0839,739.5393 C581.8769,737.4063 583.1989,730.1093 582.7139,727.2763 C582.0289,723.2903 583.6679,718.5773 582.1539,715.0613"></path><path d="M118.4,218.509 C115.802,205.456 115.047,191.441 117.255,178.276 C121.615,181.915 119.501,192.289 119.526,197.361 C119.54,200.296 120.668,218.349 118.4,218.509"></path><path d="M118.1148,273.7908 C121.3228,277.5628 119.8748,280.6318 119.9768,283.9668 C120.1208,288.6388 121.2708,293.8448 119.2298,298.7398 C118.9208,299.4808 119.6588,300.6308 118.4128,300.7518 C115.8188,301.0038 116.8798,297.5768 116.8938,296.1418 C116.9238,293.1458 116.7718,290.1488 116.2728,287.1928 C115.8018,284.4118 115.4478,281.7168 115.1888,278.9368 C115.0868,277.8318 114.9268,269.5538 118.1148,273.7908"></path><path d="M7.1822,400.1467 C7.0612,391.4287 6.5832,382.7397 6.4332,374.0267 C6.3092,366.8957 4.9532,356.4987 8.0662,349.9987 C9.5732,358.0487 9.0182,366.7547 9.0102,374.9207 C9.0012,384.4287 8.7272,393.8677 8.2212,403.3597 C7.8752,402.2887 7.5292,401.2177 7.1822,400.1467"></path><path d="M176.9312,636.4651 C174.1202,635.2661 177.3472,632.3791 174.0792,631.4661 L176.3182,632.0141 C176.3182,628.5781 177.0942,627.4631 173.8152,626.2581 C175.4662,625.1571 175.9272,625.7681 177.7742,626.5911 C177.5222,625.5991 176.2582,623.8651 176.1962,622.9321 C175.1762,622.4471 175.1742,621.9261 176.1892,621.3721 C177.0882,620.9571 177.2282,620.5331 176.6082,620.0991 C176.7552,619.3251 175.1312,618.5441 176.2412,617.3071 C177.1052,616.3431 178.3682,618.0111 178.9672,616.9851 C177.3622,615.8231 175.4732,615.5251 176.4272,613.6051 C177.1562,612.1381 178.1632,612.6381 179.2102,613.7861 C181.2232,615.9951 179.1412,620.0991 179.1602,622.4221 C179.1652,623.2131 179.9882,624.1821 180.0012,624.6181 C180.0182,625.1611 179.9692,627.2571 179.9672,628.0871 C179.9602,631.4941 179.8632,632.7231 180.9732,635.9941 C179.2332,636.5691 178.9042,636.7051 176.9312,636.4651"></path><path d="M746.9732,544.9255 C745.1042,544.2615 745.5542,546.0375 745.2602,546.8275 C745.4282,547.1625 745.6842,547.4195 746.0292,547.5985 C745.7742,548.4295 745.5192,549.2605 745.2652,550.0925 C745.8692,550.1865 746.4722,550.2795 747.0762,550.3735 C747.0622,551.3035 746.6392,551.7045 745.8062,551.5765 C746.9032,552.6895 744.9072,554.9445 744.7372,556.2985 C744.6472,557.0105 745.2752,558.0375 745.0852,558.6835 C745.7842,559.8215 745.5572,560.3525 744.4072,560.2745 C743.4952,560.4735 742.5842,560.6745 741.6722,560.8735 C740.8432,556.5055 740.3072,540.6585 746.3972,539.3085 C746.6952,541.1885 746.8552,543.0245 746.9732,544.9255"></path><path d="M171.857,516.6096 C171.054,510.9256 171.809,504.9546 171.943,499.2386 C176.456,503.1806 173.92,513.4606 174.361,518.9406 C174.527,520.9946 175.459,524.0776 175.116,526.5926 C174.836,528.6406 173.548,529.5656 172.025,531.2516 C171.906,528.2056 172.19,526.5056 172.91,523.6876 C173.482,521.4456 174.407,516.6096 171.857,516.6096"></path><path d="M203.8062,487.5686 C203.5002,488.7766 202.9622,491.4746 200.9332,490.1076 C200.2712,489.6626 200.6262,483.7966 200.5762,482.8016 C200.3112,477.5986 200.0402,472.7786 201.6452,467.7336 C204.1692,468.3196 202.8672,473.8586 202.9362,475.5776 C203.0132,477.4706 203.4592,479.1256 203.6332,481.0186 C203.8252,483.1006 202.9802,485.6666 203.8062,487.5686"></path><path d="M56.3424,663.7024 C55.2534,662.1544 56.5714,661.4864 56.8204,659.6814 C57.0764,657.8254 56.5294,655.7254 56.3694,653.8724 C56.2344,652.2934 55.5634,649.7094 55.6354,648.2524 C55.7574,645.7874 58.7674,647.4194 55.5364,644.5814 C61.7954,638.3894 58.4654,648.6024 57.1544,651.8694 C61.5844,653.7124 59.2994,660.3424 58.8934,664.3434 C58.0424,664.1294 57.1934,663.9164 56.3424,663.7024"></path><path d="M61.1441,194.362 C61.5731,199.114 62.0961,203.832 62.6671,208.569 C63.0781,211.969 64.8521,217.413 60.9901,219.343 C60.4661,217.613 61.3071,216.184 61.2901,214.347 C61.2701,212.018 60.3071,209.754 59.9941,207.459 C59.4571,203.54 58.8731,197.68 61.1441,194.362"></path><path d="M56.2515,717.8425 C56.2025,716.8945 56.1545,715.9465 56.1055,714.9975 C58.1905,714.9925 57.8355,715.2375 57.8665,713.7445 C55.5205,713.8345 55.4725,712.4115 55.3975,710.0005 C55.2175,704.1515 55.0325,710.0305 55.9855,707.0785 C56.3595,705.9185 59.3675,702.6845 55.9455,702.5145 C56.7745,702.1565 57.7745,701.9935 58.7135,701.7995 L58.7135,720.6775 C57.8935,719.7325 57.0715,718.7875 56.2515,717.8425"></path><path d="M76.898,411.4383 C73.987,410.3903 74.863,397.1753 78.694,400.3893 C79.319,400.9143 79.254,402.0113 79.443,402.8853 C79.875,403.0983 80.218,403.3963 80.471,403.7783 C80.898,404.2733 80.581,404.7363 79.517,405.1683 C79.596,408.0903 79.888,410.0353 76.898,411.4383"></path><path d="M707.0816,554.8562 C706.1666,552.8402 705.0256,553.1442 705.1016,550.5892 C705.1326,549.5562 705.8136,548.6122 705.8726,547.9762 C705.9836,546.7692 705.5516,544.9642 705.1976,543.4542 C706.7856,543.8802 705.7046,541.8312 706.7076,541.8592 C708.5426,541.9132 708.6436,544.3732 708.8056,545.5032 C708.9986,546.8532 709.8286,556.5022 707.0816,554.8562"></path><path d="M712.4986,727.6165 C712.7856,724.0585 712.4366,722.9205 712.3256,719.6125 C712.2766,718.1515 710.7546,716.0905 711.0206,714.9285 C711.5556,712.6065 713.1476,716.9725 713.2256,717.1635 C713.7106,715.9735 714.1956,714.7835 714.6816,713.5935 C714.9616,718.2675 715.2416,722.9425 715.5216,727.6165 L712.4986,727.6165 Z"></path><path d="M178.2701,609.3611 C176.4041,608.2281 173.0091,607.4571 172.6981,605.3501 C172.3001,602.6621 174.1551,603.4081 175.9821,604.0571 C176.8111,601.0191 176.4131,600.4501 179.5511,600.4501 C179.3671,601.0421 179.1821,601.6331 178.9991,602.2251 C178.0221,603.3311 178.0571,604.1131 179.1021,604.5731 C179.8831,604.8131 179.9891,605.1751 179.4161,605.6591 C179.0411,606.2571 178.6641,606.8531 178.2881,607.4501 C178.9831,607.6241 179.6791,607.7971 180.3751,607.9701 C179.6731,608.4341 178.9711,608.8981 178.2701,609.3611"></path><path d="M61.7945,566.3503 C59.5055,562.3173 61.9725,559.8513 62.1035,555.6813 C62.1895,552.9553 59.9205,550.4813 63.4675,549.7453 C64.1555,554.1793 63.7765,558.6873 63.9125,563.1513 L61.7325,562.6113 C61.5305,563.8303 63.0205,565.2843 61.7945,566.3503"></path><path d="M657.5025,622.5442 C657.5445,620.9462 658.8785,620.8542 658.8785,620.7192 C658.8785,619.7602 658.1415,619.3282 658.0515,619.0842 C657.6425,617.9652 655.3425,616.3082 658.2635,615.2902 C655.2665,612.8182 659.3805,609.5652 661.1775,607.9882 C660.8945,610.2652 661.1625,617.6522 658.5475,617.3782 C661.5915,619.4802 660.9285,620.1992 658.6775,622.7932 C659.0395,622.5212 658.6485,622.4382 657.5025,622.5442"></path><path d="M56.9664,699.4182 C54.6154,695.5532 56.0804,690.1272 56.0044,685.8332 C58.3384,687.4462 58.3194,686.9772 58.6944,689.8182 C58.9574,691.8202 58.6944,694.2422 58.6944,696.2622 C58.6944,697.1512 59.3144,701.2762 58.0314,700.8992 C57.4454,700.7262 57.5734,699.6332 56.9664,699.4182"></path><path d="M173.8512,584.1707 C173.0182,583.0797 173.2682,582.4947 173.0782,581.8707 C174.0052,581.2447 173.9652,580.6887 172.9582,580.2037 C172.4062,579.8387 172.2632,579.4187 172.5302,578.9417 C174.8072,577.3777 175.7982,583.1297 175.7982,584.6317 C177.1222,584.3187 177.0592,583.5337 177.0342,582.4537 C178.0092,583.7927 177.2222,593.6007 175.6882,593.6597 C174.6722,592.2567 174.3872,590.0277 174.3832,588.9107 C174.3842,589.1897 173.7702,587.8137 173.7922,587.9147 C173.5052,586.6397 174.9422,585.9497 173.8512,584.1707"></path><path d="M176.9312,636.4651 C179.4912,636.7771 179.9142,640.1101 180.1062,642.8331 C180.1602,643.5961 180.3012,648.8111 177.8622,647.7981 C176.4232,647.2011 177.9372,644.7011 177.7992,643.6891 C177.3212,640.1861 174.3902,640.0591 176.9312,636.4651"></path><path d="M752.8101,634.7918 C753.0491,632.3518 753.8931,629.3428 753.7661,626.9338 C753.6931,625.5408 752.8901,623.7328 752.7251,622.2218 C753.8531,622.5328 754.1481,621.7408 754.3721,620.8408 C755.2291,626.0628 755.7501,631.3338 755.9491,636.6218 C754.8151,636.0508 753.7651,635.6158 752.8101,634.7918"></path><path d="M553.6578,706.6194 C553.7448,705.2094 554.7168,703.8144 555.9338,705.4224 C556.8408,706.6174 556.3418,710.0714 556.3978,711.5494 C556.5468,715.4674 556.1728,718.0334 552.0138,715.6144 C554.3468,714.1964 553.0588,714.2304 552.9268,711.8064 C552.6048,710.7704 552.7658,709.8104 553.4118,708.9254 C553.9938,709.7434 554.5228,709.8554 555.0008,709.2634 C554.5538,708.3824 554.1048,707.5004 553.6578,706.6194"></path><path d="M705.7291,573.1272 C706.0591,573.2712 706.3901,573.4162 706.7201,573.5602 C706.6321,571.6882 706.5441,569.8172 706.4581,567.9462 C708.3481,567.9502 708.5491,568.1402 709.3751,566.4562 C710.2401,566.7612 709.5631,574.5082 709.6941,576.0632 C709.9071,578.6032 710.5131,579.2772 707.5541,579.7312 C707.8331,578.4422 708.1131,577.1522 708.3921,575.8622 C708.0811,575.5912 707.7251,575.4002 707.3291,575.2892 C706.7711,574.2022 705.2851,575.3082 705.7291,573.1272"></path><path d="M697.4449,381.4158 C701.3519,381.3468 702.1429,382.5978 701.5039,387.5318 C697.4989,388.2798 696.3889,386.6788 697.4449,381.4158"></path><path d="M752.0435,685.4539 C751.8515,684.9309 751.6575,684.4089 751.4655,683.8859 C753.0755,683.8179 752.7925,681.9469 753.0935,680.5809 C752.1555,680.6359 751.9095,681.8859 751.5285,682.6689 C751.4515,681.0509 751.1335,679.2199 751.5245,677.6739 C751.8565,676.3649 753.2215,676.8929 752.9065,675.0579 C756.1975,674.0649 754.7075,677.6539 754.5895,679.5069 C754.4175,682.2079 755.2525,684.8179 752.0435,685.4539"></path><path d="M709.0894,664.3333 C708.0764,663.0383 711.0934,661.9403 711.3594,661.4123 C712.1534,659.8313 711.6704,657.4753 711.9554,655.6973 C711.6934,660.5013 713.6404,665.1523 712.9154,669.9723 C709.5324,668.5063 711.7174,665.5703 709.0894,664.3333"></path><path d="M660.5396,584.3547 C658.5026,584.5497 660.6046,569.6447 661.8846,568.2357 C662.3576,569.7777 663.0006,571.4697 663.0096,573.1147 C663.0216,575.4067 661.7846,576.1747 661.2356,578.1547 C660.7686,579.8387 660.3336,582.5767 660.5396,584.3547"></path><path d="M178.0347,672.9109 C177.1887,670.1509 176.0567,661.0159 178.7637,660.0149 C178.9647,662.1519 179.3067,664.2799 179.5147,666.4079 C179.7707,669.0269 178.8957,670.7739 178.7747,673.3219 C178.5287,673.1849 178.2817,673.0479 178.0347,672.9109"></path><path d="M61.7789,598.2063 C59.8549,596.1063 59.5609,596.1673 59.6629,593.4013 C59.7449,591.1543 59.9409,589.3203 62.2859,588.9063 C62.3439,592.0223 63.5529,595.3173 61.7789,598.2063"></path><path d="M173.2066,574.1819 C173.0506,571.5429 172.2476,568.3789 173.4536,565.9829 C176.6706,568.3819 176.8096,573.4799 176.4966,577.0929 C175.5236,575.4589 175.4056,574.4909 175.0926,572.6499 C174.4636,573.1609 173.8346,573.6709 173.2066,574.1819"></path><path d="M741.6724,560.8738 C743.2214,560.5348 744.7494,560.5818 745.2194,559.3748 C745.4754,558.7158 744.6544,557.0248 744.7364,556.2978 C744.9014,554.8388 747.0064,552.7938 745.8064,551.5768 C748.2524,551.2378 747.3464,558.2208 746.9554,559.6388 C746.5374,561.1528 747.0014,561.6898 745.1224,562.2488 C743.7494,562.6568 742.3234,562.2228 741.6724,560.8738"></path><path d="M178.8756,658.9734 C174.9406,659.7874 176.7346,653.3504 176.3766,650.8864 C177.5326,651.1334 180.0656,651.3524 179.4486,653.3504 C179.1206,654.4134 177.9966,653.8624 177.0126,654.2304 C178.2666,657.2274 181.6066,653.9334 178.8756,658.9734"></path><path d="M11.9654,548.4348 C11.0114,547.3518 10.0574,546.2698 9.1044,545.1878 C9.6774,544.7498 10.0744,544.2008 10.2944,543.5398 C10.7304,542.9108 10.6174,542.2818 9.9564,541.6548 C10.5404,541.1548 10.8144,540.5508 10.7774,539.8418 C10.5994,538.9178 10.1284,537.7348 9.7924,536.8378 C9.9164,537.1688 9.1884,533.1368 8.9074,534.1478 C9.9114,530.5248 11.2104,536.7028 11.2994,538.5538 C11.3614,539.8498 12.6224,548.3308 11.9654,548.4348"></path><path d="M621.5035,639.8386 C618.9545,638.5406 621.0245,635.4216 620.8465,633.2596 C620.5835,630.0756 619.0495,627.5266 620.8995,624.4016 C623.0585,626.5066 621.1515,628.7586 621.2235,631.0766 C621.2615,632.3086 622.0785,633.3396 622.1505,634.7486 C622.2395,636.4546 621.3115,638.0846 621.5035,639.8386"></path><path d="M171.8941,547.0105 C171.9221,545.1585 171.9511,543.3075 171.9801,541.4565 C175.7051,541.5805 174.8471,546.1585 175.0671,548.8215 C173.1611,549.5085 173.3281,547.2025 171.8941,547.0105"></path><path d="M554.9468,644.8543 C555.6478,640.8703 554.6808,636.9523 554.8968,632.8753 C557.3598,634.3403 557.8748,643.2973 554.9468,644.8543"></path><path d="M753.4664,653.573 C753.3174,652.083 754.3084,651.606 755.3004,650.566 C756.9594,652.755 755.8754,659.625 755.8754,662.323 C754.0734,661.477 754.9134,654.787 753.1694,658.259 C753.1274,656.861 753.0864,655.464 753.0464,654.066 C753.2004,654.73 753.6244,655.189 754.3184,655.442 C754.3194,653.789 754.5134,654.105 753.4664,653.573"></path><path d="M752.8257,650.3372 C752.2027,648.0872 752.8147,645.1522 752.8457,642.7802 C754.5127,644.0842 755.3707,643.7292 755.9037,645.2352 C756.0747,645.7182 755.1887,650.5722 755.2897,650.5722 C754.5707,649.1992 753.7497,649.1202 752.8257,650.3372"></path><path d="M175.6881,593.6594 C176.9561,593.6114 178.7601,593.4114 178.5851,595.5534 C178.4661,597.0134 175.2781,596.7544 176.8991,599.0584 C175.5251,599.5404 174.1851,599.5304 172.7301,599.6324 L172.7301,595.3854 C173.2771,596.4314 173.8241,597.4784 174.3701,598.5254 C174.8091,596.9034 175.2491,595.2814 175.6881,593.6594"></path><path d="M58.0885,624.9534 C57.3465,623.2804 56.6055,621.6074 55.8625,619.9344 C58.8625,619.7984 57.5575,619.8374 58.2345,618.3824 C57.9115,619.0754 55.6745,615.5044 58.7075,616.8764 C62.6895,618.6784 59.3305,622.5534 58.0885,624.9534"></path><path d="M553.4478,734.385 C552.7848,732.272 554.3188,731.74 554.5808,729.492 C554.8938,726.806 553.1528,727.115 556.3158,725.866 C556.6108,727.444 558.2818,731.448 557.2848,732.614 C556.3008,733.762 554.0078,732.254 553.4478,734.385"></path><path d="M56.8551,639.9182 C55.4771,638.0592 58.2201,633.5552 59.9501,632.6982 L59.9501,640.5502 C58.9181,640.3392 57.8861,640.1282 56.8551,639.9182"></path><path d="M92.5367,480.3259 C91.8817,478.5609 88.4277,472.0569 92.5337,472.9139 C95.3597,473.5049 94.0377,478.5549 92.5367,480.3259"></path><path d="M622.0855,595.5203 C619.9365,593.0533 621.1475,587.1473 621.1865,583.9913 C622.9425,585.9553 623.8065,587.8393 623.1855,590.7193 C623.0125,591.5193 622.2145,591.8733 622.1315,592.2473 C621.9265,593.1803 621.8845,594.0463 622.0855,595.5203"></path><path d="M586.2427,711.3108 C585.2217,710.1188 586.4887,708.1588 586.3547,706.5508 C586.2887,705.7598 583.7017,700.3088 586.3097,700.321777 C588.0457,700.3318 587.0917,705.6918 587.1887,706.5748 C587.3417,707.9538 589.6277,712.3218 586.2427,711.3108"></path><path d="M711.9058,704.0979 C712.0878,703.4869 712.2688,702.8749 712.4508,702.2639 C715.4948,703.8769 713.8328,707.5899 713.2128,710.1009 C712.0368,709.3209 710.6368,709.0559 710.3928,707.7529 C709.8538,704.8689 711.8128,705.5979 713.8008,705.7239 C713.1698,705.1819 712.5378,704.6399 711.9058,704.0979"></path><path d="M555.0357,657.5867 C555.0007,655.0647 554.9667,652.5417 554.9317,650.0197 C554.8967,647.4327 554.1997,646.4687 556.7007,645.6307 C556.9017,647.5717 555.9857,648.4637 555.8767,650.5297 C555.7167,653.5477 557.5647,655.1887 555.0357,657.5867"></path><path d="M749.8589,598.2258 C749.4909,598.3128 749.1219,598.4008 748.7539,598.4878 C748.2789,596.4058 747.2119,595.1698 746.7479,593.4998 C746.3119,591.9298 747.2729,588.8908 747.4709,587.2528 C747.8949,588.3188 748.6659,589.4688 748.7939,590.6068 C748.8649,591.2428 748.2819,593.0078 748.3579,593.3438 C748.4719,593.8448 749.8569,594.0178 749.9989,594.8548 C750.2009,596.0568 750.0329,597.0278 749.8589,598.2258"></path><path d="M11.6197,555.9553 C10.0217,554.4573 9.8177,552.2753 9.7307,550.2193 C10.2907,550.8623 10.8497,551.5053 11.4107,552.1483 C11.3377,551.3433 11.2657,550.5383 11.1917,549.7333 C15.8467,550.3003 14.1297,554.4483 11.6197,555.9553"></path><path d="M657.0123,633.9509 C655.9083,631.9539 655.6653,630.4609 657.4923,628.9089 C657.8753,630.5999 658.6353,630.9059 659.7743,629.8269 C660.6503,632.5499 660.3053,634.4719 657.0123,633.9509"></path><path d="M555.0533,631.2385 C554.9583,628.3835 556.0033,625.6245 555.1853,622.8205 C555.0173,623.4145 554.8483,624.0095 554.6803,624.6035 C554.5553,622.3115 554.4293,620.0185 554.3043,617.7265 C556.1243,617.7295 555.6463,620.9205 555.7823,622.1075 C556.1703,625.4845 556.2963,628.5715 556.0583,632.0215 C555.7233,631.7605 555.3883,631.4995 555.0533,631.2385"></path><path d="M621.1295,623.7927 C620.0075,621.7317 619.0445,610.5737 620.8095,608.7477 C621.8175,613.6917 622.2515,618.8247 621.1295,623.7927"></path><path d="M587.0201,724.554945 C584.7211,724.5659 585.7761,722.5589 585.8481,721.1399 C585.9161,719.8489 584.6751,716.2129 585.1231,715.2819 C586.1001,713.2419 586.8421,715.3309 587.3121,716.8759 C588.0441,719.2899 587.4271,722.1439 587.0201,724.554945"></path><path d="M171.8931,498.1126 C172.2411,493.0626 171.5851,488.9556 170.5741,483.9986 C173.7501,484.5986 173.5231,495.5996 173.0361,498.5346 C172.6551,498.3946 172.2741,498.2536 171.8931,498.1126"></path><path d="M59.3824,606.2664 C57.6764,604.5084 59.6964,603.1814 61.5244,604.5794 C63.0034,605.7134 62.3114,609.7294 62.3114,611.7524 L59.9204,611.2194 C61.6624,610.3484 61.5474,606.5094 59.3824,606.2664"></path><path d="M752.1021,719.8816 C751.5501,718.3396 751.0571,717.4016 751.3921,715.6286 C751.8141,713.3956 751.4021,713.6046 753.8811,713.3866 C753.8811,714.5976 754.8381,721.2316 752.1021,719.8816"></path><path d="M710.4576,673.9944 C710.6406,673.7274 710.8236,673.4614 711.0066,673.1944 C712.8666,674.6284 714.4216,675.9584 713.6776,678.5604 C711.3946,677.5154 711.1616,677.9724 709.0216,679.3494 C708.6956,678.0244 710.3996,675.6544 710.4576,673.9944"></path><path d="M657.4078,734.2883 C656.5858,733.8593 655.7638,733.4303 654.9418,733.0013 C657.7998,731.2063 657.0878,728.2053 657.3968,725.3563 C658.6208,726.1783 658.6228,728.7043 658.9438,730.1193 C659.5398,732.7463 659.5588,732.7613 657.4078,734.2883"></path><path d="M706.857,592.2092 C704.923,591.8592 704.791,591.1292 705.679,589.4512 C705.526,589.7412 708.161,587.8632 707.914,587.8792 C711.353,587.6562 709.149,590.4882 708.942,592.3832 C708.247,592.3252 707.551,592.2672 706.857,592.2092"></path><path d="M12.5435,604.5095 C12.5395,603.1555 11.8895,596.1585 14.3295,598.7995 C15.7295,600.3135 14.5425,603.2405 14.5135,604.9945 C13.8565,604.8325 13.1995,604.6715 12.5435,604.5095"></path><path d="M554.3013,702.5486 C554.4373,700.7026 554.2873,698.1006 554.7613,696.3126 C555.5053,693.5026 555.2273,693.5326 555.9163,696.1256 C556.2613,697.4226 556.9543,704.3826 554.3013,702.5486"></path><path d="M56.9244,728.3972 C57.6714,726.9272 55.8914,723.1382 56.0484,720.9632 C57.9314,723.1942 60.8914,726.2922 57.7274,729.0892 C57.4434,728.8782 57.1744,728.6482 56.9244,728.3972"></path><path d="M621.2759,567.5198 C620.9149,566.1658 619.3209,562.0968 622.0999,562.5818 C623.1239,562.7608 623.3979,564.1408 623.5049,565.0538 C623.7519,567.1958 623.5709,567.5198 621.2759,567.5198"></path><path d="M751.6334,615.9036 C750.4394,614.0376 751.8374,612.2366 752.0354,609.7876 C755.2104,609.4386 754.1544,615.3206 754.1544,617.0926 C752.3624,617.6746 753.4584,615.4636 752.5164,614.8386 C752.2224,615.1936 751.9274,615.5486 751.6334,615.9036"></path><path d="M658.1099,606.6238 C656.2249,605.0878 658.1779,605.2648 658.0789,603.8808 C658.0039,602.8228 658.0499,601.6968 657.6519,600.3688 C660.0309,599.7538 660.1129,601.9568 660.3859,603.3798 C660.9019,606.0558 660.5149,606.4508 658.1099,606.6238"></path><path d="M13.7965,731.6062 C13.6925,730.6062 12.4265,723.9232 14.4675,725.1362 C16.0525,726.0782 15.0415,730.1772 14.9675,731.6912 C14.5765,731.6632 14.1875,731.6342 13.7965,731.6062"></path><path d="M658.3531,598.1018 C658.2831,597.0908 658.2121,596.0808 658.1431,595.0698 C657.5461,593.8398 657.8101,593.2688 658.9351,593.3598 C660.0261,593.4518 660.3411,592.8838 659.8781,591.6548 L659.9691,588.5748 C661.2371,589.4768 661.7091,594.0138 661.0361,595.3308 C660.8481,595.6958 658.0591,597.9718 658.3531,598.1018"></path><path d="M753.7857,672.2302 C752.8297,672.1532 752.6067,669.4542 752.8257,668.6672 C753.4197,666.5282 753.8187,666.6062 755.8557,666.6062 C754.8067,668.5592 756.5107,671.1992 753.7857,672.2302"></path><path d="M60.6773,573.6165 C59.5023,571.1735 59.3983,571.0995 61.0863,568.9845 C63.3303,570.8155 63.2443,573.5415 62.5953,576.0955 C61.9563,575.2695 61.3173,574.4435 60.6773,573.6165"></path><path d="M621.0543,551.9226 C618.7793,550.8716 619.8083,547.3636 619.9663,545.4916 C622.5213,547.0516 623.5123,549.8436 621.0543,551.9226"></path><path d="M619.0963,536.7981 C615.8413,541.4391 616.4063,535.2321 616.6223,532.8691 C617.9413,533.5181 620.4183,535.2711 619.0963,536.7981"></path><path d="M203.8062,487.5686 C202.5462,484.6666 203.9712,480.5246 202.9322,477.2686 C207.6812,477.6296 204.6532,484.6106 203.8062,487.5686"></path><path d="M622.7183,581.1677 C622.7573,580.4177 622.7963,579.6687 622.8363,578.9187 C623.1303,578.0887 622.7723,577.6967 621.7583,577.7447 L620.5773,577.3317 C620.6623,575.9417 620.7473,574.5527 620.8333,573.1627 C622.0813,573.8217 624.0083,576.7987 624.2273,578.3967 C624.2953,578.8957 623.8273,582.2587 622.7183,581.1677"></path><path d="M662.2574,553.8372 C662.2574,552.1392 661.7544,549.5442 662.2574,547.8842 C661.5814,545.9752 662.2144,545.2022 664.1564,545.5652 C664.3274,545.7392 664.4494,545.9402 664.5234,546.1662 C664.6454,546.9762 663.6904,548.9712 663.5314,549.9822 C663.2304,551.9052 663.4934,553.9282 663.4254,555.8672 C663.0354,555.1912 662.6474,554.5142 662.2574,553.8372"></path><path d="M707.2115,538.6536 C704.8905,536.0076 705.1685,535.5336 707.5895,533.3186 C708.5655,534.8906 709.6425,538.5756 707.2115,538.6536"></path><path d="M172.0445,553.217 C171.9845,552.028 171.9245,550.839 171.8645,549.649 C172.3945,550.872 172.9245,552.094 173.4555,553.316 C174.0745,552.578 174.6935,551.841 175.3135,551.103 L175.3135,557.08 C174.2245,555.792 173.1345,554.505 172.0445,553.217"></path><path d="M12.567,681.4294 C11.142,678.7224 12.133,675.6284 12.478,672.6474 C13.416,675.1514 16.24,680.4784 12.567,681.4294"></path><path d="M699.2545,469.7219 C702.5935,470.0289 700.8685,469.0599 702.1875,466.5889 C702.4305,466.1319 702.7955,463.2909 704.2235,464.9809 C706.2465,467.3779 702.0345,471.6559 699.2545,469.7219"></path><path d="M51.5709,754.0803 C53.1379,753.1703 54.7059,752.2603 56.2739,751.3503 C57.1049,753.3093 57.2449,753.7343 54.9119,754.5123 C53.7919,754.8863 52.5569,754.8563 51.5709,754.0803"></path><path d="M14.4068,746.8411 C13.2198,744.7331 12.7178,739.7291 15.2298,739.3201 C15.4108,740.6091 15.2298,746.7741 14.4068,746.8411"></path><path d="M88.3443,556.8645 C88.3853,562.6215 88.3223,568.3785 88.2833,574.1355 C88.0443,568.3085 87.7413,562.6675 88.3443,556.8645"></path><path d="M584.0836,739.5393 C585.5406,737.0083 585.6496,734.3023 586.0686,731.4263 C586.9196,733.7883 586.0966,734.4263 585.8766,736.8933 C585.6496,739.4333 587.0636,740.4853 584.5926,741.9813 C584.4226,741.1673 584.2536,740.3533 584.0836,739.5393"></path><path d="M12.5426,615.8025 C12.5266,612.8965 12.5116,609.9915 12.4956,607.0865 C14.1916,609.7035 13.9126,612.9675 14.5446,615.8955 C13.8776,615.8645 13.2096,615.8335 12.5426,615.8025"></path><path d="M131.5572,587.4924 C130.4602,584.9014 131.0162,582.2424 131.1932,579.4584 C132.1842,580.5394 132.1722,581.4704 132.4922,582.9124 C132.9842,585.1384 134.0922,586.9024 131.5572,587.4924"></path><path d="M588.4254,689.427 C587.9894,690.099 587.5534,690.771 587.1174,691.444 C586.6114,689.352 586.8154,689.062 584.8314,688.438 C585.6034,687.388 586.3754,686.338 587.1484,685.288 C588.8464,686.173 588.6074,687.835 588.4254,689.427"></path><path d="M657.4254,717.8567 C657.3024,715.4307 657.1804,713.0047 657.0544,710.5797 C659.4114,712.8747 658.2664,715.7107 658.6584,718.5587 C658.2474,718.3247 657.8364,718.0907 657.4254,717.8567"></path><path d="M122.8521,416.1682 C121.9431,412.5252 122.1991,409.0992 122.2961,405.3512 C123.5411,405.1552 123.3541,415.0932 123.4941,416.5312 C123.2801,416.4102 123.0661,416.2892 122.8521,416.1682"></path><path d="M704.9586,518.238 C704.9506,517.983 703.8116,512.18 705.8506,513.11 C707.4176,513.825 706.8106,518.46 706.6236,519.736 C706.1926,519.083 705.6386,518.584 704.9586,518.238"></path><path d="M122.9303,428.7527 C121.5233,426.3167 121.8473,423.6167 122.9593,421.1487 C123.3833,423.8407 124.5203,426.4567 122.9303,428.7527"></path><path d="M710.2603,661.8489 C709.7943,662.5149 709.3283,663.1799 708.8623,663.8459 C707.9823,661.0689 707.7873,657.1379 709.7503,654.7399 C708.8433,657.1529 710.4063,659.4329 710.2603,661.8489"></path><path d="M556.316,725.866 C555.769,726.082 555.222,726.298 554.674,726.513 C555.314,724.553 552.869,724.33 551.713,723.598 C554.494,723.363 552.928,721.793 554.248,721.361 C557.234,720.384 556.247,724.065 556.316,725.866"></path><path d="M120.7271,290.3718 C120.0861,289.1278 120.2991,283.4658 120.7731,283.5118 C122.9361,283.7188 122.0341,289.6638 120.7271,290.3718"></path><path d="M621.2037,605.2693 C619.8667,602.7483 620.7557,599.9633 621.1617,597.3443 C623.6047,599.2673 622.0547,598.6253 621.9267,601.1363 C621.8367,602.8913 622.0647,603.7183 621.2037,605.2693"></path><path d="M543.0933,657.5325 C543.5773,663.0745 543.4813,668.4845 543.3523,674.0435 C543.1823,668.5355 542.9403,663.0415 543.0933,657.5325"></path><path d="M76.898,411.4383 C81.152,409.4423 77.624,406.0823 80.578,403.9263 C81.261,405.8323 78.998,414.7963 76.898,411.4383"></path><path d="M587.2535,659.6614 C585.9095,657.5454 586.2875,657.5334 586.1545,655.3734 C586.0855,654.2504 585.8945,654.1734 584.7145,653.7444 C587.0985,652.6864 587.1805,654.0654 587.5135,656.4984 C587.8315,656.6634 588.1495,656.8294 588.4685,656.9954 C588.0635,657.8844 587.6585,658.7724 587.2535,659.6614"></path><path d="M161.067,458.9309 C161.095,464.2129 161.563,469.6759 160.739,474.8999 C160.691,470.2589 159.317,463.2239 161.067,458.9309"></path><path d="M704.9586,518.238 C706.1736,518.986 708.4366,526.185 707.3256,526.606 C706.7606,525.024 707.0056,523.505 705.5426,525.238 C705.3476,522.905 705.1526,520.571 704.9586,518.238"></path><path d="M622.1744,573.8718 C620.1994,572.8278 620.5914,570.0728 622.6124,568.9668 C624.9434,570.1978 623.3204,572.6248 622.1744,573.8718"></path><path d="M705.7037,589.0325 C703.3907,586.2085 707.3887,581.8885 708.1037,583.3245 C708.5147,584.1475 706.4557,586.0075 706.3827,586.1605 C706.1327,586.6825 705.8547,587.9795 705.7037,589.0325"></path><path d="M711.3541,684.0789 C709.9121,682.2889 710.0131,680.4879 711.3071,678.6819 C710.3371,680.2469 716.3781,681.4099 711.3541,684.0789"></path><path d="M131.8092,657.6248 C131.6032,655.2478 130.1912,650.1658 131.5852,648.1098 C132.5562,652.0078 132.1232,653.8688 131.8092,657.6248"></path><path d="M707.2867,619.9817 C707.1347,617.4627 706.9647,617.1827 708.9967,615.7297 C710.2407,617.6317 708.0987,620.2097 711.0107,621.2237 C710.9557,621.2567 709.7847,622.0827 709.6677,622.1297 C708.8747,621.4137 708.0807,620.6977 707.2867,619.9817"></path><path d="M4.5172,478.5608 C7.2482,478.3808 7.0592,480.5028 7.8222,481.9358 C5.1262,482.5998 4.5052,481.9668 4.5172,478.5608"></path><path d="M60.4908,588.8171 C59.9238,586.1651 59.4918,583.3011 61.0888,580.8981 C61.3868,583.1831 61.6838,585.4671 61.9828,587.7531 C61.6178,587.2921 61.2538,586.8301 60.8888,586.3691 L60.4908,588.8171 Z"></path><path d="M707.2252,602.0774 C705.9202,601.1004 705.9932,597.6024 708.0922,597.9414 C711.6702,598.5184 708.6142,600.9414 707.2252,602.0774"></path><path d="M57.8345,630.5681 C57.6595,628.7061 57.2895,626.8991 56.9505,625.0591 C58.7555,626.1571 59.5905,628.8831 60.5695,630.7181 C59.6575,630.6681 58.7465,630.6181 57.8345,630.5681"></path><path d="M97.859,658.1716 C97.881,654.3616 97.904,650.5516 97.927,646.7446 C98.564,650.6226 98.948,654.3596 97.859,658.1716"></path><path d="M57.5396,735.719 C55.4186,734.054 56.1886,730.962 58.4846,730.764 C58.4346,732.562 59.3746,734.432 57.5396,735.719"></path><path d="M122.2203,400.8484 C122.2393,398.3704 122.2583,395.8934 122.2783,393.4154 C123.7823,394.4164 124.0653,400.2234 122.2203,400.8484"></path><path d="M706.8765,563.2244 C707.3095,561.5854 706.5435,561.5564 706.5875,560.4924 C706.6265,559.5544 705.1745,560.2604 706.1185,558.9614 C706.3545,558.6374 709.6305,560.8934 709.6315,560.8954 C710.0015,562.2704 707.8775,563.5554 706.8765,563.2244"></path><path d="M705.9127,529.3752 C705.5677,528.3862 705.2307,527.3952 704.8997,526.4002 C704.8537,526.2592 706.9207,527.8772 707.1497,528.3152 C707.9457,529.8302 707.7747,531.6312 707.7697,533.2972 C707.1507,531.9902 706.5317,530.6832 705.9127,529.3752"></path><path d="M647.2418,604.3987 C647.2318,608.8737 647.2228,613.3477 647.2128,617.8157 C647.2208,613.3397 647.2318,608.8697 647.2418,604.3987"></path><path d="M119.1734,300.3782 C119.2214,299.5752 119.5464,292.6722 121.1334,294.3412 C121.8444,295.0892 120.3484,300.0572 119.1734,300.3782"></path><path d="M585.8384,731.0691 C584.2724,730.3841 583.7034,727.7261 585.8544,727.5031 C589.2484,727.1501 586.7944,730.1581 585.8384,731.0691"></path><path d="M556.1422,721.366 C554.4012,721.992 553.7452,721.482 554.1742,719.835 C554.1252,718.818 554.0772,717.801 554.0272,716.784 C555.7052,714.812 556.2062,720.915 556.1422,721.366"></path><path d="M542.7213,591.9348 C542.6953,596.1598 542.6693,600.3838 542.6413,604.6028 C542.6673,600.3768 542.6943,596.1558 542.7213,591.9348"></path><path d="M169.8482,477.8367 C168.5692,476.3087 169.3482,474.4537 169.2632,472.7007 C172.4672,473.8417 171.1762,476.3417 169.8482,477.8367"></path><path d="M747.0757,550.3733 C746.4717,550.2803 745.8687,550.1863 745.2647,550.0923 C745.7407,548.5353 746.4017,545.5613 748.7387,546.8003 C748.1837,547.9913 747.6307,549.1823 747.0757,550.3733"></path><path d="M648.4839,708.3103 C648.4949,712.5653 648.5049,716.8213 648.5139,721.0723 C648.5039,716.8153 648.4939,712.5623 648.4839,708.3103"></path><path d="M752.064,723.8347 C750.896,722.6767 751.205,719.1417 753.356,721.0107 C754.805,722.2687 753.934,724.1987 752.064,723.8347"></path><path d="M663.8941,536.4666 C663.8681,533.4026 663.8421,530.3396 663.8141,527.2806 C663.9261,530.3456 664.7151,533.3996 663.8941,536.4666"></path><path d="M202.94,473.8855 C203.047,471.6245 201.782,467.3495 202.202,466.1855 C203.61,468.5235 205.322,471.5285 202.94,473.8855"></path><path d="M61.691,602.8118 C61.429,600.7318 58.352,601.1328 57.787,599.0708 C58.489,599.3128 65.062,600.1118 61.691,602.8118"></path><path d="M588.7369,664.0784 C588.4699,663.5974 588.2039,663.1164 587.9369,662.6344 C585.7609,664.0424 586.1159,663.5514 584.5619,661.9244 C585.9549,662.1234 586.8709,660.6404 587.7099,661.0694 C588.8849,661.6714 589.6169,662.8844 588.7369,664.0784"></path><path d="M555.4703,668.2258 C555.4173,667.7538 554.6553,662.3818 554.9343,662.3328 C555.5313,662.2308 556.4143,664.5178 556.4853,664.8118 C556.9593,666.7778 557.0203,666.4228 555.4703,668.2258"></path><path d="M59.484,543.1565 C58.95,541.4275 59.283,540.7455 59.955,539.0295 C61.488,541.0565 63.077,542.9365 59.484,543.1565"></path><path d="M547.2779,738.2908 C548.5549,738.0828 549.7839,738.2598 551.0119,737.8658 C552.1339,737.5058 551.7969,734.4948 553.8319,736.1668 C551.5109,739.5618 551.3549,739.4578 547.2779,738.2908"></path><path d="M131.4566,608.886 C131.4246,607.423 130.8546,605.784 132.0776,604.577 C133.8386,605.201 133.7306,609.226 131.4566,608.886"></path><path d="M90.858,467.8513 C89.619,468.4513 88.379,469.0503 87.139,469.6483 C86.722,466.7213 91.032,464.4933 90.858,467.8513"></path><path d="M11.6197,555.9553 C12.2837,555.9263 12.9427,555.8473 13.5977,555.7193 C13.5977,556.1913 14.1087,561.4553 12.3827,560.4033 C11.4097,559.8093 11.6247,556.9693 11.6197,555.9553"></path><path d="M583.4019,696.8748 C584.8239,695.1678 587.2439,697.8198 585.5739,699.4118 C583.3849,701.4988 582.4599,698.7318 583.4019,696.8748"></path><path d="M175.5894,575.5662 C177.5454,578.8592 174.6014,577.6012 172.2814,577.4682 C173.1954,575.9512 173.7204,574.4892 175.5894,575.5662"></path><path d="M666.108,482.2669 C666.107,480.0739 666.107,477.8809 666.105,475.6959 C666.291,476.5999 668.369,483.1169 666.108,482.2669"></path><path d="M657.524,638.9456 C657.372,637.5396 657.22,636.1326 657.07,634.7266 C657.622,635.4036 659.875,637.1056 659.439,638.1866 C659.015,639.2386 658.267,638.2446 657.524,638.9456"></path><path d="M656.8824,688.6013 C657.0884,685.5683 656.3674,684.1343 659.3614,683.3063 C658.5354,685.0713 657.7084,686.8363 656.8824,688.6013"></path><path d="M708.7525,645.783 C707.7985,643.871 707.2475,640.614 708.4935,638.782 C710.0455,639.889 708.8465,644.286 708.7525,645.783"></path><path d="M94.9293,500.095 C94.7633,498.503 94.5973,496.911 94.4313,495.319 C96.8893,496.878 96.1853,497.801 94.9293,500.095"></path><path d="M711.0504,686.1838 C710.6564,685.9078 710.2634,685.6318 709.8694,685.3558 C711.1414,684.2728 712.2624,684.8228 713.9024,685.0298 L713.1054,687.5408 C712.4204,687.0888 711.7354,686.6358 711.0504,686.1838"></path><path d="M173.0289,563.2991 C172.8969,562.3861 173.1779,561.5901 173.8739,560.9111 C174.9049,562.1271 176.6039,565.6361 172.9249,565.2491 C172.9599,564.5991 172.9949,563.9491 173.0289,563.2991"></path><path d="M619.8218,544.4988 C619.7378,543.4178 619.1568,541.3618 620.8518,541.1958 C621.6578,543.0108 622.1478,544.2398 619.8218,544.4988"></path><path d="M657.9468,725.7268 C656.9288,725.0408 657.4068,722.7198 657.4118,721.6168 C659.3338,722.4698 658.8878,724.4168 659.0508,726.4058 C658.6818,726.1798 658.3148,725.9538 657.9468,725.7268"></path><path d="M586.1314,697.0994 C585.4174,696.7894 584.7034,696.4784 583.9894,696.1684 C584.9714,695.6574 584.8054,693.3594 586.3704,693.7484 C587.6514,694.0664 586.5174,696.6984 586.1314,697.0994"></path><path d="M161.6256,509.24 C161.5556,512.603 161.4846,515.967 161.4166,519.326 C161.4866,515.961 161.5566,512.6 161.6256,509.24"></path><path d="M704.9127,457.8308 C702.7407,458.0078 703.7577,454.8738 704.2027,454.2238 C705.6047,455.4208 705.8127,456.2028 704.9127,457.8308"></path><path d="M707.3882,614.7293 C706.8652,613.8413 705.9662,613.0023 706.8342,611.9413 C707.6342,613.3623 707.9812,611.7943 708.6872,610.7523 C709.2032,613.2783 709.9172,613.4003 707.3882,614.7293"></path><path d="M743.2632,686.6067 C743.2412,689.6977 743.2182,692.7887 743.1952,695.8737 C742.3652,692.7747 742.6662,689.6897 743.2632,686.6067"></path><path d="M202.94,473.8855 C203.369,473.3625 203.901,472.9775 204.538,472.7295 C204.507,473.0855 204.42,477.1635 204.139,477.3615 C202.349,478.6195 202.939,474.4125 202.94,473.8855"></path><path d="M621.0543,551.9226 C621.4793,551.5646 621.9033,551.2056 622.3273,550.8476 C622.6133,551.8136 622.8993,552.7796 623.1863,553.7456 C621.5003,553.8226 619.2523,554.0036 621.0543,551.9226"></path><path d="M622.2076,559.9856 C621.6446,560.6486 621.0796,561.3116 620.5166,561.9746 C620.4726,559.9726 620.4286,557.9706 620.3846,555.9686 C622.1936,556.1156 621.2396,559.2066 622.2076,559.9856"></path><path d="M8.5347,352.5012 C8.3787,351.6672 8.2227,350.8332 8.0657,349.9992 C7.7637,350.6322 7.4597,351.2652 7.1547,351.8972 C7.2057,350.5582 7.2557,349.2192 7.3057,347.8802 C8.8387,349.0832 9.1787,350.7172 8.5347,352.5012"></path><path d="M543.316,617.9597 C543.129,619.7897 546.436,620.5397 546.055,621.6377 C545.853,622.2197 544.185,621.6147 543.774,621.3247 C542.712,620.5747 543.205,619.4647 543.316,617.9597"></path><path d="M168.3726,467.7063 C168.2146,466.0933 168.0556,464.4803 167.8966,462.8673 C168.9396,462.9343 169.1096,466.1263 170.1806,467.5123 C169.5776,467.5773 168.9756,467.6423 168.3726,467.7063"></path><path d="M657.8961,641.8479 C657.7501,641.3949 655.6421,639.8549 658.2771,640.3939 C659.5941,640.6629 661.0681,641.9939 659.1381,643.2699 C658.7241,642.7959 658.3101,642.3219 657.8961,641.8479"></path><path d="M61.1304,549.8547 C58.4914,548.8857 58.2324,548.2737 59.3284,545.6247 C59.9294,547.0367 60.5294,548.4457 61.1304,549.8547"></path><path d="M706.066,534.7131 C705.856,534.8951 705.646,535.0781 705.436,535.2601 C705.004,533.2651 704.099,531.4811 705.182,529.7041 C705.472,531.3741 705.769,533.0441 706.066,534.7131"></path><path d="M657.1265,676.6438 C657.0775,674.4008 657.0295,672.1578 656.9815,669.9168 C657.9175,672.1428 658.2775,674.3768 657.1265,676.6438"></path><path d="M131.0806,672.8806 C130.9946,670.3656 130.9076,667.8506 130.8226,665.3366 C132.7956,666.4546 131.3116,670.8656 131.0806,672.8806"></path><path d="M662.4322,564.4006 C660.9312,563.6316 661.5432,562.3036 661.6082,560.7266 C663.1072,561.2116 663.7542,563.0116 662.4322,564.4006"></path><path d="M59.1138,538.7444 C59.0118,539.1754 58.9118,539.6054 58.8108,540.0364 C56.6368,539.1414 57.7568,537.3054 57.4368,535.6164 C57.9968,536.6584 58.5558,537.7014 59.1138,538.7444"></path><path d="M709.6197,622.0979 C710.5567,624.1439 710.5987,626.3279 710.0827,628.4949 C709.0597,626.9269 710.7847,624.1589 708.3247,623.5389 C709.7767,622.9399 710.2087,622.4599 709.6197,622.0979"></path><path d="M12.4381,578.1819 C12.6081,577.2289 12.7801,576.2759 12.9521,575.3229 C13.4271,576.1439 13.9031,576.9639 14.3771,577.7849 L12.4381,578.1819 Z"></path><path d="M743.8677,645.4876 C743.8257,648.4086 743.7847,651.3286 743.7407,654.2446 C743.7817,651.3226 743.8247,648.4046 743.8677,645.4876"></path><path d="M169.8482,477.8367 C170.1322,477.5157 170.4152,477.1957 170.6992,476.8757 C172.2662,478.3417 171.0462,479.9037 170.7062,481.5487 C169.4952,480.5997 169.9312,479.1227 169.8482,477.8367"></path><path d="M12.5504,584.2146 C12.2944,581.3796 11.7954,580.9256 14.3344,579.6566 C13.7244,581.7486 12.4844,582.8716 14.8454,584.4756 C14.0794,584.3886 13.3154,584.3016 12.5504,584.2146"></path><path d="M59.9215,611.219 L59.9205,611.219 C59.0375,612.452 57.7795,612.571 56.3465,613.054 C56.7815,611.339 57.6625,611.235 58.7475,610.054 C59.1395,610.442 59.5305,610.831 59.9215,611.219"></path><path d="M704.9371,449.7952 C703.1781,448.7362 703.8251,446.3082 703.8221,444.3752 C705.0191,445.9502 705.2701,447.8892 704.9371,449.7952"></path><path d="M666.3843,474.3548 C666.3133,472.7288 666.2423,471.1028 666.1723,469.4798 C667.9183,471.6258 667.9363,472.0458 666.3843,474.3548"></path><path d="M555.8599,694.2229 C553.8649,694.2469 554.6229,690.7409 555.9699,689.9189 C557.0479,691.3169 555.9779,692.7669 555.8599,694.2229"></path><path d="M7.1822,400.1467 C7.8452,402.1947 8.2212,403.7297 8.2212,405.8697 C6.7232,404.2177 7.0612,402.1657 7.1822,400.1467"></path><path d="M657.275,627.8572 C656.705,626.1762 656.948,625.4422 657.464,623.7142 C658.1,624.2892 658.736,624.8632 659.372,625.4392 C658.747,626.2052 657.963,627.0982 657.275,627.8572"></path><path d="M711.0259,690.9055 C711.0859,689.6515 711.1469,688.3985 711.2089,687.1445 C712.9539,689.0135 715.2119,691.2025 711.0259,690.9055"></path><path d="M703.4468,500.2844 C702.2648,499.3704 701.6968,498.1744 701.7888,496.6774 C703.9538,497.5364 704.0408,497.7264 703.4468,500.2844"></path><path d="M647.6773,652.8811 C648.4333,655.2711 647.9253,657.7101 647.9593,660.1231 C647.8643,657.7061 647.7713,655.2941 647.6773,652.8811"></path><path d="M8.0679,749.887 C9.3019,748.109 10.9349,749.347 12.3929,749.314 C11.0199,750.056 9.7339,751.401 8.0679,749.887"></path><path d="M587.3472,683.9768 C586.8682,682.3808 585.8842,681.4468 587.5222,680.6328 C588.2672,682.2298 588.4492,682.4878 588.3522,684.3848 C588.0172,684.2488 587.6822,684.1128 587.3472,683.9768"></path><path d="M173.1851,611.3757 C172.2371,610.0707 172.6931,608.9397 174.0841,608.2547 C174.6131,609.8307 175.4471,611.6677 173.1851,611.3757"></path><path d="M57.8482,680.179 C57.4072,680.126 54.3112,678.588 56.4502,677.71 C58.7032,676.784 58.5682,679.14 57.8482,680.179"></path><path d="M582.9664,699.7493 C584.4234,699.1793 585.1444,699.5373 585.1284,700.8233 C582.5024,700.9853 582.7734,701.3893 582.1374,703.9333 C581.9884,702.4593 581.5074,700.8083 582.9664,699.7493"></path><path d="M121.2476,571.405 C121.1916,574.143 121.1366,576.882 121.0826,579.618 C121.1386,576.878 121.1926,574.141 121.2476,571.405"></path><path d="M754.1187,665.5476 C752.8457,664.4186 751.9477,663.2086 753.6107,661.9786 C754.3527,663.4716 755.5297,664.3956 754.1187,665.5476"></path><path d="M532.5972,721.5501 C532.6792,718.9491 532.7602,716.3471 532.8412,713.7521 C532.7602,716.3551 532.6792,718.9521 532.5972,721.5501"></path><path d="M586.1304,697.0994 C586.3534,696.8684 590.6284,698.9844 585.5704,699.4134 C585.7584,698.6424 585.9444,697.8704 586.1304,697.0994"></path><path d="M56.44,670.8767 C53.89,668.1597 60.194,666.8157 58.377,671.0947 C57.92,670.2917 57.465,669.4887 57.009,668.6857 C56.819,669.4157 56.629,670.1467 56.44,670.8767"></path><path d="M118.1148,273.7908 C117.4508,272.8258 116.5978,272.6118 115.5578,273.1498 C115.8808,272.2698 116.2018,271.3898 116.5238,270.5088 C117.6478,271.2788 118.6718,272.3258 118.1148,273.7908"></path><path d="M657.8961,641.8479 C659.5711,643.7649 658.7851,643.9309 657.4711,645.9079 C657.7021,645.5599 655.7951,643.0889 657.8961,641.8479"></path><path d="M56.4996,667.5564 L54.9706,666.1354 C56.5496,665.0384 58.0166,665.1074 58.4886,667.0094 C57.8256,667.1914 57.1626,667.3744 56.4996,667.5564"></path><path d="M584.7144,653.7444 C586.6774,654.4574 586.2544,655.2994 585.6374,657.1174 C584.4644,655.6124 584.0294,655.6864 584.7144,653.7444"></path><path d="M131.4566,608.886 C133.1946,609.146 133.1876,613.165 131.4366,612.554 C131.4436,611.331 131.4496,610.109 131.4566,608.886"></path><path d="M650.4136,735.4324 C651.0476,734.7534 651.6816,734.0744 652.3146,733.3954 C652.9216,734.8504 652.5066,737.7744 650.4136,735.4324"></path><path d="M663.066,543.2986 C662.527,541.5536 662.433,539.8746 663.777,538.4086 C664.875,540.2356 663.762,541.7366 663.066,543.2986"></path><path d="M697.2554,603.9358 C697.3554,606.3558 697.4554,608.7758 697.5544,611.1908 C697.4534,608.7698 697.3544,606.3528 697.2554,603.9358"></path><path d="M160.6402,556.3196 C160.7442,558.7036 160.8482,561.0886 160.9512,563.4656 C160.8462,561.0796 160.7432,558.6996 160.6402,556.3196"></path><path d="M657.6255,656.3879 C658.1475,654.6359 658.5725,653.2089 658.9915,651.8049 C659.7865,655.4409 659.7865,655.4409 657.6255,656.3879"></path><path d="M588.6666,680.0271 C588.0276,678.9981 587.4706,677.8181 588.3706,676.7141 C589.2506,677.7431 591.0586,679.4771 588.6666,680.0271"></path><path d="M666.2925,488.8645 C665.2395,487.0505 665.8385,485.1925 666.1445,483.3435 C666.3545,485.1805 667.8615,486.9815 666.2925,488.8645"></path><path d="M707.1255,596.0769 C707.0985,594.9149 707.0715,593.7519 707.0465,592.5899 C707.7285,593.6559 708.4105,594.7209 709.0935,595.7859 C708.4375,595.8829 707.7805,595.9799 707.1255,596.0769"></path><path d="M12.4879,710.5491 C12.3679,708.3491 12.1089,708.0661 13.5129,706.1871 L13.5129,710.7151 L12.4879,710.5491 Z"></path><path d="M131.4273,641.7151 C130.3163,640.0071 130.7753,638.2071 131.1143,636.4211 C131.7383,638.1591 132.1203,639.9051 131.4273,641.7151"></path><path d="M130.3306,723.5403 C130.3056,721.1233 130.2796,718.7073 130.2546,716.2943 C130.2806,718.7123 130.3056,721.1263 130.3306,723.5403"></path><path d="M665.5621,499.3675 C665.7831,497.5225 664.5751,495.6015 666.0731,493.9985 C666.0811,494.8565 666.4641,499.9555 665.5621,499.3675"></path><path d="M712.3004,701.9329 C710.9804,701.6139 710.5364,700.7039 710.9694,699.2029 C713.0294,700.0179 714.2214,700.1639 712.3004,701.9329"></path><path d="M161.3092,500.7195 C161.3792,503.1175 161.4502,505.5155 161.5182,507.9065 C161.4472,505.5065 161.3772,503.1125 161.3092,500.7195"></path><path d="M704.1509,510.6834 C704.0539,508.2224 703.9589,505.7614 703.8619,503.3044 C703.9589,505.7664 704.0539,508.2254 704.1509,510.6834"></path><path d="M653.6783,735.45 C654.6063,733.73 655.9903,734.79 657.2113,734.875 C656.0013,736.137 654.7773,736.335 653.6783,735.45"></path><path d="M659.483,658.0129 C659.404,659.4699 659.326,660.9269 659.247,662.3829 C657.974,661.4489 657.513,657.9469 659.483,658.0129"></path><path d="M582.8121,670.717 C582.9161,673.146 583.0211,675.575 583.1241,677.998 C583.0201,675.567 582.9161,673.142 582.8121,670.717"></path><path d="M582.7994,727.8328 C583.4544,729.9098 583.5744,732.0058 583.0314,734.1208 C582.9534,732.0198 582.8764,729.9268 582.7994,727.8328"></path><path d="M697.2281,550.3694 C698.2271,552.5824 697.6641,554.8104 697.2931,557.0334 C697.2721,554.8094 697.2501,552.5894 697.2281,550.3694"></path><path d="M556.3101,662.0955 C555.4441,661.0745 553.9521,660.2725 555.0651,658.5545 C556.0931,659.5205 557.1121,660.4895 556.3101,662.0955"></path><path d="M97.1529,705.7717 C97.0839,703.7257 96.5029,701.6267 97.7789,699.7227 C97.9179,700.9517 97.5179,704.8047 97.1529,705.7717"></path><path d="M752.899,685.2844 C753.299,685.1434 753.7,685.0024 754.100001,684.8614 C754.101,688.3054 753.537,689.3004 752.899,685.2844"></path><path d="M555.2232,677.5139 C555.1552,676.3359 555.0862,675.1589 555.0192,673.9819 C555.3202,674.4769 557.9092,678.2689 555.2232,677.5139"></path><path d="M164.2672,453.8621 C164.1382,452.2781 164.0082,450.6941 163.8812,449.1101 C165.0292,451.3801 165.7872,451.8191 164.2672,453.8621"></path><path d="M582.1539,715.0613 C582.9249,716.8513 583.3589,718.6433 582.1789,720.4363 C582.1719,718.6413 582.1629,716.8513 582.1539,715.0613"></path><path d="M167.5865,460.4705 C167.2555,459.0455 166.9255,457.6195 166.5955,456.1955 C169.1455,456.3285 167.8555,458.3875 167.5865,460.4705"></path><path d="M59.0845,615.4822 C58.3035,614.5072 57.6655,613.5652 59.3915,613.0652 C60.2305,614.4622 62.1435,616.7872 59.0845,615.4822"></path><path d="M543.0816,648.946 C543.0786,651.148 543.0766,653.351 543.0736,655.548 C543.0766,653.344 543.0796,651.145 543.0816,648.946"></path><path d="M706.5172,606.6599 C706.5032,606.1639 706.4902,605.6679 706.4772,605.1719 C708.2582,605.9229 708.3142,605.4089 709.6412,603.9809 C709.5482,605.9029 708.4052,606.8449 706.5172,606.6599"></path><path d="M712.8922,695.0208 C712.4892,694.3708 712.0852,693.7208 711.6812,693.0718 C712.8252,692.5028 713.7732,691.8818 714.8432,691.1788 C714.2702,692.7408 714.0482,693.8608 712.8922,695.0208"></path><path d="M200.3404,191.0779 C202.2364,191.0739 204.1324,191.0709 206.0164,191.0699 C204.1154,191.0749 202.2284,191.0759 200.3404,191.0779"></path><path d="M12.4674,704.5608 C12.6524,703.8568 12.8364,703.1538 13.0204,702.4498 C15.0364,703.8478 14.3344,705.6008 12.4674,704.5608"></path><path d="M656.5494,400.0974 C656.5544,402.0934 656.5594,404.0894 656.5644,406.0804 C656.5594,404.0834 656.5544,402.0904 656.5494,400.0974"></path><path d="M98.8082,585.4744 C98.0202,583.4694 98.1282,581.4674 98.8282,579.4734 C98.8212,581.4764 98.8142,583.4754 98.8082,585.4744"></path><path d="M87.4713,515.7043 C87.4613,517.7603 87.4513,519.8163 87.4413,521.8663 C87.4503,519.8083 87.4603,517.7563 87.4713,515.7043"></path><path d="M47.7564,709.657 C47.7504,711.677 47.7454,713.697 47.7384,715.712 C47.7434,713.69 47.7494,711.674 47.7564,709.657"></path><path d="M547.5904,581.0793 C546.7204,578.4443 547.9094,578.5693 550.0094,577.1213 C549.6424,577.8643 548.5664,581.1633 547.5904,581.0793"></path><path d="M13.0982,621.8523 C12.8992,620.4633 12.7002,619.0743 12.5002,617.6853 C13.0352,618.7753 12.9852,619.8853 14.2692,620.1313 C13.8782,620.7053 13.4892,621.2793 13.0982,621.8523"></path><path d="M712.8287,672.8806 C712.4647,672.3096 712.0997,671.7386 711.7337,671.1676 C713.0787,670.8036 714.8027,671.9056 712.8287,672.8806"></path><path d="M12.484,657.5813 C12.482,655.9733 12.479,654.3653 12.478,652.7573 C13.2,653.5383 13.573,658.0363 12.484,657.5813"></path><path d="M666.0093,492.8562 C664.9623,491.8202 665.4493,489.8962 666.8523,490.1382 C666.5713,491.0442 666.2903,491.9502 666.0093,492.8562"></path><path d="M616.2642,531.988 C615.4232,531.506 614.5832,531.023 613.7432,530.54 C614.2652,529.988 614.7862,529.436 615.3082,528.884 C615.5002,529.292 617.2732,531.798 616.2642,531.988"></path><path d="M743.8873,669.3845 C744.0203,671.4025 744.6643,673.4505 743.5333,675.3885 C743.6513,673.3835 743.7693,671.3845 743.8873,669.3845"></path><path d="M131.3248,592.0701 C131.3808,591.3661 131.4358,590.6631 131.4928,589.9601 C133.1698,590.8711 134.6358,591.4751 131.3248,592.0701"></path><path d="M702.3677,443.011 C701.8337,444.088 701.6637,445.794 699.7687,444.512 C699.6577,442.315 701.5437,443.583 702.3677,443.011"></path><path d="M659.4459,689.4641 L659.4459,693.0181 C657.3869,692.0591 658.2309,691.0831 659.4459,689.4641"></path><path d="M751.48,606.7542 C750.226,606.1512 750.217,604.9452 750.566,603.7902 C752.113,604.5182 751.673,605.0672 751.48,606.7542"></path><path d="M131.4,596.2752 L133.178,594.2242 L133.178,597.6402 C132.023,597.6942 131.429,597.2392 131.4,596.2752"></path><path d="M88.2642,535.7336 C88.2422,537.7376 88.2192,539.7406 88.1962,541.7396 C88.2182,539.7346 88.2422,537.7346 88.2642,535.7336"></path><path d="M746.9732,544.9255 C746.9062,543.8425 746.8392,542.7585 746.7722,541.6755 C748.1672,542.7175 748.0202,544.3735 747.4912,545.8215 C747.3182,545.5225 747.1462,545.2245 746.9732,544.9255"></path><path d="M12.272,574.9534 C11.321,573.3964 11.795,571.6154 12.415,570.0594 C13.433,571.8284 12.777,572.9754 12.272,574.9534"></path><path d="M75.6754,402.7229 C75.6004,404.4989 75.5244,406.2759 75.4464,408.0469 C75.5214,406.2679 75.5984,404.4949 75.6754,402.7229"></path><path d="M86.5543,500.7034 C86.6683,502.4524 86.7833,504.2014 86.8963,505.9444 C86.7823,504.1934 86.6683,502.4484 86.5543,500.7034"></path><path d="M95.5338,510.7546 C95.4048,509.3616 95.2758,507.9686 95.1458,506.5756 C96.6828,507.6176 95.8118,509.0446 95.5338,510.7546"></path><path d="M659.0806,390.5296 C658.8856,391.4616 658.6906,392.3926 658.4966,393.3236 C657.3466,393.0236 658.8586,390.8896 656.8876,391.6786 C656.9496,390.1956 658.0306,390.3976 659.0806,390.5296"></path><path d="M620.7437,556.1204 C619.4797,555.0004 622.2747,554.8184 622.7507,554.8184 C623.1367,555.8764 622.4677,556.3104 620.7437,556.1204"></path><path d="M98.8209,560.2747 C98.7159,558.4677 98.6109,556.6597 98.5069,554.8567 C98.6119,556.6647 98.7169,558.4697 98.8209,560.2747"></path><path d="M130.2554,709.0549 C130.3354,707.3509 130.4144,705.6469 130.4914,703.9499 C130.4104,705.6559 130.3334,707.3549 130.2554,709.0549"></path><path d="M657.4302,705.2293 C657.2442,704.7353 657.0592,704.2423 656.8722,703.7493 C658.1272,703.2923 658.7732,703.9263 658.6222,705.1913 C658.2262,705.2373 657.8282,705.2493 657.4302,705.2293"></path><path d="M699.5211,639.4436 C699.6171,641.0646 699.7121,642.6856 699.8101,644.3046 C698.8741,642.7336 698.5841,641.1256 699.5211,639.4436"></path><path d="M621.8179,654.9075 C621.1629,653.6395 620.6899,652.3995 622.3299,651.4745 C622.1599,652.6195 621.9889,653.7635 621.8179,654.9075"></path><path d="M162.983,591.1736 C162.982,592.9846 162.982,594.7956 162.981,596.6006 C162.157,594.7876 162.253,592.9806 162.983,591.1736"></path><path d="M173.0289,563.2991 C172.9949,563.9491 172.9599,564.5991 172.9249,565.2491 C171.6619,564.2871 171.8479,563.7881 171.8639,562.1741 C172.2529,562.5491 172.6409,562.9241 173.0289,563.2991"></path><path d="M659.7672,588.384 C659.0692,586.931 659.6632,583.32 661.8422,584.942 C660.4712,585.577 659.6362,586.856 659.7672,588.384"></path><path d="M163.4449,608.5818 C163.4249,610.3288 163.4059,612.0758 163.3849,613.8168 C163.4049,612.0678 163.4239,610.3248 163.4449,608.5818"></path><path d="M697.2252,582.7991 C697.2752,584.6141 697.3242,586.4291 697.3752,588.2401 C697.3272,586.4241 697.2762,584.6111 697.2252,582.7991"></path><path d="M166.3785,455.7966 C165.5385,455.8586 164.6985,455.9216 163.8585,455.9836 C164.4815,454.3886 166.8675,453.1036 166.3785,455.7966"></path><path d="M209.2867,637.0447 C209.2917,635.2707 209.2977,633.4957 209.3037,631.7267 C209.2977,633.5027 209.2917,635.2737 209.2867,637.0447"></path><path d="M171.7974,539.8157 C172.0604,538.8827 172.0514,537.6987 173.0174,537.3957 C173.9004,538.9237 173.4894,539.7187 171.7974,539.8157"></path><path d="M554.7037,613.9192 C554.5507,612.7832 554.3967,611.6482 554.2437,610.5122 C556.2077,609.8812 554.8667,613.2562 554.7037,613.9192"></path><path d="M173.0172,537.3953 C173.4292,535.6083 173.5782,535.1033 175.4252,535.5833 C174.7222,536.1533 173.7032,536.9983 173.0172,537.3953"></path><path d="M88.1178,580.0115 C88.1438,581.7915 88.1708,583.5705 88.1968,585.3445 C88.1698,583.5635 88.1438,581.7875 88.1178,580.0115"></path><path d="M57.3902,741.6638 C57.3702,740.7318 57.3522,739.7998 57.3332,738.8678 C57.6892,739.3498 59.9742,742.5598 57.3902,741.6638"></path><path d="M57.901,677.8484 C56.524,678.1434 55.799,677.5414 55.727,676.0424 C56.776,676.4474 58.117,676.2234 57.901,677.8484"></path><path d="M112.6754,393.4802 C112.7204,395.2242 112.7654,396.9672 112.8084,398.7052 C112.7634,396.9592 112.7194,395.2202 112.6754,393.4802"></path><path d="M130.9918,678.7571 C131.0678,677.1821 131.1428,675.6061 131.2188,674.0361 C131.1418,675.6131 131.0668,677.1851 130.9918,678.7571"></path><path d="M61.0797,579.6838 C59.8237,579.2108 60.5587,577.8508 60.7027,576.7028 C62.1687,577.4838 61.2837,578.0378 61.0797,579.6838"></path><path d="M56.3375,675.53 C56.3105,675.257 55.5455,672.011 57.0505,672.622 C58.4225,673.178 56.3675,675.49 56.3375,675.53"></path><path d="M621.3033,580.9636 C620.9193,580.4266 620.5353,579.8906 620.1523,579.3546 C622.0143,578.7696 623.3073,580.5546 621.3033,580.9636"></path><path d="M131.9722,619.2712 C130.7312,617.9942 131.5902,616.4192 131.6372,614.9522 C132.8682,615.8042 132.0692,617.9452 131.9722,619.2712"></path><path d="M57.3844,674.1482 C57.1484,673.4452 57.9374,671.8022 58.6204,671.8542 C58.7344,672.7402 58.8474,673.6272 58.9604,674.5132 L57.3844,674.1482 Z"></path><path d="M161.3013,572.2117 C161.4073,573.7547 161.5133,575.2987 161.6183,576.8377 C161.5133,575.2927 161.4063,573.7517 161.3013,572.2117"></path><path d="M698.191,612.5652 C697.987,613.8332 697.782,615.1012 697.576,616.3682 C697.31,614.5972 696.618,613.5582 698.191,612.5652"></path><path d="M209.6959,627.7068 C209.7829,626.1828 209.8699,624.6588 209.9559,623.1398 C209.8689,624.6648 209.7819,626.1858 209.6959,627.7068"></path><path d="M174.1148,532.9534 C173.7018,530.0234 174.4018,530.1384 174.9848,532.9774 C174.6948,532.9694 174.4048,532.9614 174.1148,532.9534"></path><path d="M179.232,691.9104 C179.219,690.3224 179.207,688.7334 179.195,687.1474 C179.209,688.7374 179.22,690.3244 179.232,691.9104"></path><path d="M97.7174,678.7488 L97.7524,677.2418 C99.8184,677.7188 98.2474,679.2278 98.8044,680.4638 L97.7174,678.7488 Z"></path><path d="M12.897,626.4177 C12.765,625.9407 12.633,625.4637 12.501,624.9877 C13.484,625.4717 14.591,624.8757 14.615,626.5287 C14.043,626.4917 13.469,626.4547 12.897,626.4177"></path><path d="M547.5904,581.0793 C548.9794,581.1993 549.5104,582.1993 549.0504,583.4143 C548.0884,582.8913 546.9714,582.4483 547.5904,581.0793"></path><path d="M12.4859,663.4363 C12.4789,661.8763 12.4719,660.3163 12.4649,658.7593 C13.0299,660.3183 13.4099,661.8743 12.4859,663.4363"></path><path d="M175.8013,611.2263 C176.6023,610.0553 177.3353,610.9343 178.4313,609.7923 C180.2423,611.4233 176.2893,611.2533 175.8013,611.2263"></path><path d="M700.5132,658.217 C700.6492,659.745 700.7842,661.273 700.9192,662.796 C700.7842,661.266 700.6482,659.742 700.5132,658.217"></path><path d="M12.066,690.7141 C11.066,689.4061 12.048,688.3051 12.441,687.1441 C13.722,688.4841 12.54,689.5621 12.066,690.7141"></path><path d="M98.6676,547.6643 C98.5896,546.1073 98.5116,544.5503 98.4336,542.9983 C98.5126,544.5563 98.5906,546.1103 98.6676,547.6643"></path><path d="M703.2164,695.8918 C703.3214,697.4278 703.4264,698.9628 703.5314,700.4928 C703.4264,698.9548 703.3204,697.4238 703.2164,695.8918"></path><path d="M555.3228,682.1912 C555.2608,681.1522 555.1998,680.1142 555.1388,679.0762 C556.2938,680.0522 556.6518,681.0722 555.3228,682.1912"></path><path d="M752.8101,634.7918 C754.0241,635.8388 753.6861,636.9318 753.1891,638.3778 C753.0621,637.1828 752.9361,635.9868 752.8101,634.7918"></path><path d="M710.9937,635.033 C710.9087,636.742 710.8597,637.714 710.8097,638.726 C709.1357,637.809 709.8897,636.783 710.9937,635.033"></path><path d="M705.7037,589.0325 C705.7917,588.4195 705.5987,585.4175 706.7957,586.2065 C708.4677,587.3075 705.5177,590.5735 705.7037,589.0325"></path><path d="M98.6822,553.5457 C98.6202,552.0137 98.5592,550.4817 98.4972,548.9527 C98.5592,550.4867 98.6202,552.0167 98.6822,553.5457"></path><path d="M584.5923,741.9817 C585.0423,741.7097 585.4913,741.4367 585.9423,741.1647 L585.9423,743.4227 C585.0663,743.7767 584.6163,743.2957 584.5923,741.9817"></path><path d="M704.5054,464.2542 C705.0024,462.4802 706.4694,462.2432 706.3414,464.2542 L704.5054,464.2542 Z"></path><path d="M80.3658,403.6301 C79.1028,403.0261 78.9388,401.9641 79.1648,400.7431 C81.0198,401.1031 80.5178,402.4391 80.3658,403.6301"></path><path d="M647.2203,593.1824 C647.1353,594.8084 647.0513,596.4334 646.9663,598.0554 C647.0513,596.4284 647.1353,594.8054 647.2203,593.1824"></path><path d="M662.0992,558.7893 C662.0862,557.9293 662.0742,557.0693 662.0612,556.2133 C663.6512,558.0933 663.6522,558.1273 662.0992,558.7893"></path><path d="M582.1216,721.6877 C582.2326,722.9977 582.3446,724.3067 582.4546,725.6107 C582.3436,724.2987 582.2326,722.9937 582.1216,721.6877"></path><path d="M12.5035,643.0769 C12.9125,641.6019 13.5565,641.8019 14.4325,643.6769 C13.9165,644.4509 13.2745,644.2499 12.5035,643.0769"></path><path d="M620.6246,643.8567 C620.1016,642.2387 620.2816,641.7137 621.4076,641.5827 C622.2036,642.7067 621.1916,643.2057 620.6246,643.8567"></path><path d="M752.8189,693.866 C752.6109,693.16 752.4029,692.455 752.1949,691.75 C752.8089,691.571 753.4239,691.39 754.0379,691.207 L752.8189,693.866 Z"></path><path d="M752.2027,706.4392 C751.9257,705.2632 751.5797,704.0792 752.6657,703.0952 C752.5127,704.2122 752.3567,705.3252 752.2027,706.4392"></path><path d="M786.7652,724.863 C786.6962,723.558 786.6252,722.254 786.5562,720.953 C786.6262,722.259 786.6962,723.561 786.7652,724.863"></path><path d="M753.1451,724.0447 C753.3981,723.8307 753.6501,723.6157 753.9021,723.4007 C754.0621,724.4017 754.2221,725.4027 754.3831,726.4027 C752.6721,725.9847 753.9791,724.9257 753.1451,724.0447"></path><path d="M122.4029,392.2459 C122.3139,391.5509 122.2239,390.8549 122.1349,390.1599 C123.7479,390.6399 123.8369,391.3349 122.4029,392.2459"></path><path d="M609.5953,650.0994 C609.5793,651.4694 609.5643,652.8394 609.5463,654.2044 C609.5623,652.8324 609.5783,651.4664 609.5953,650.0994"></path><path d="M708.2886,638.4314 C707.0286,637.7754 708.0056,636.8114 707.9536,635.9914 C709.0846,636.4284 709.1446,636.8704 708.2886,638.4314"></path><path d="M122.3619,387.5491 C122.3049,386.6261 122.2479,385.7031 122.1929,384.7811 C123.9059,385.8291 123.9309,386.2581 122.3619,387.5491"></path><path d="M649.9078,546.9119 C649.8098,548.2869 649.7128,549.6609 649.6148,551.0299 C649.7128,549.6539 649.8098,548.2829 649.9078,546.9119"></path><path d="M611.5787,546.9348 C611.4607,548.3268 611.3417,549.7198 611.2237,551.1088 C611.3427,549.7148 611.4607,548.3248 611.5787,546.9348"></path><path d="M698.23,452.9841 C698.113,454.3571 697.996,455.7301 697.879,457.0991 C697.997,455.7251 698.113,454.3541 698.23,452.9841"></path><path d="M160.9527,544.843 C160.8647,546.267 160.7767,547.692 160.6897,549.112 C160.7777,547.686 160.8657,546.264 160.9527,544.843"></path><path d="M160.9293,488.1526 C160.9553,489.4726 160.9823,490.7936 161.0083,492.1086 C160.9823,490.7866 160.9553,489.4696 160.9293,488.1526"></path><path d="M656.5318,420.6131 C656.4368,421.9841 656.3418,423.3541 656.2468,424.7211 C656.3428,423.3491 656.4368,421.9811 656.5318,420.6131"></path><path d="M666.9,441.8601 C666.866,440.5111 666.832,439.1621 666.797,437.8181 C666.832,439.1681 666.866,440.5141 666.9,441.8601"></path><path d="M13.1012,633.7825 L13.0192,632.2695 C14.9802,631.6455 14.7002,634.9695 13.1012,633.7825"></path><path d="M612.2418,539.7019 C612.1218,541.0609 612.0018,542.4209 611.8818,543.7759 C612.0018,542.4149 612.1218,541.0579 612.2418,539.7019"></path><path d="M752.523,660.9016 C751.234,658.6006 753.39,659.8276 754.334,660.9016 L752.523,660.9016 Z"></path><path d="M200.9332,490.1077 C201.6822,490.0867 202.4302,490.0657 203.1792,490.0477 C201.9152,491.8787 201.1662,491.8997 200.9332,490.1077"></path><path d="M619.0963,536.7981 C619.2833,536.5821 619.4713,536.3651 619.6593,536.1491 C620.3233,537.1071 620.6943,538.2331 619.2203,538.5231 C619.1793,537.9481 619.1383,537.3731 619.0963,536.7981"></path><path d="M191.4488,624.3752 C191.4148,625.6852 191.3808,626.9952 191.3438,628.2982 C190.6048,626.9652 190.5628,625.6572 191.4488,624.3752"></path><path d="M655.9576,433.761 C655.8836,435.097 655.8086,436.432 655.7296,437.761 C655.8056,436.424 655.8816,435.093 655.9576,433.761"></path><path d="M743.5572,698.6335 C743.5962,699.9735 743.6342,701.3145 743.6742,702.6515 C743.6362,701.3095 743.5972,699.9715 743.5572,698.6335"></path><path d="M710.2955,668.0808 C710.5195,668.4298 710.7425,668.7788 710.9665,669.1278 C709.5275,669.1278 708.4895,669.0058 708.6865,667.1948 C709.2225,667.4898 709.7585,667.7858 710.2955,668.0808"></path><path d="M658.6773,622.7927 C659.2803,623.3397 661.7713,625.3267 659.3503,625.4177 C659.3983,625.6297 658.6063,622.5587 658.6773,622.7927"></path><path d="M166.0074,668.178 C166.0124,669.467 166.0164,670.755 166.0194,672.037 C166.0134,670.746 166.0104,669.462 166.0074,668.178"></path><path d="M87.9742,527.1912 C88.0112,528.4992 88.0472,529.8072 88.0822,531.1082 C88.0442,529.7982 88.0092,528.4952 87.9742,527.1912"></path><path d="M85.8844,492.1175 C87.2134,493.3345 85.9954,494.7575 86.2014,496.0595 C86.0954,494.7415 85.9894,493.4295 85.8844,492.1175"></path><path d="M622.1744,573.8718 C622.5964,573.4128 623.0184,572.9528 623.4404,572.4928 C623.8764,573.6868 623.5544,574.9338 622.7324,575.8718 C622.5464,575.2048 622.3604,574.5388 622.1744,573.8718"></path><path d="M635.4361,137.1316 C634.4121,135.9366 634.9001,134.7226 635.3911,133.5146 C635.4071,134.7236 635.4211,135.9276 635.4361,137.1316"></path><path d="M751.5347,712.4187 C751.6157,711.5277 751.6967,710.6377 751.7757,709.7507 C753.2227,710.7807 752.2877,711.5917 751.5347,712.4187"></path><path d="M547.1968,577.4177 C546.6848,576.6327 546.1738,575.8477 545.6628,575.0627 C547.3258,574.6657 547.6748,575.2007 547.1968,577.4177"></path><path d="M701.8492,674.0818 C701.9592,675.3858 702.0702,676.6898 702.1792,677.9878 C702.0692,676.6818 701.9582,675.3818 701.8492,674.0818"></path><path d="M178.4976,677.2971 C178.2296,676.3301 178.4426,675.4961 179.1366,674.7941 C179.4506,676.0951 179.5526,676.4781 178.4976,677.2971"></path><path d="M713.4088,709.9338 C713.5748,708.6858 712.9088,707.9888 714.1718,707.2678 L714.1718,710.5888 C713.9168,710.3708 713.6628,710.1518 713.4088,709.9338"></path><path d="M658.7232,610.1404 C658.4592,610.5644 658.1952,610.9884 657.9302,611.4124 C657.6212,610.6664 657.3122,609.9214 656.9992,609.1764 C657.4112,609.7904 658.8212,608.6104 658.7232,610.1404"></path><path d="M405.4615,582.1589 C406.4625,582.1579 407.4645,582.1559 408.4545,582.1569 C407.4495,582.1589 406.4555,582.1589 405.4615,582.1589"></path><path d="M651.8804,519.1311 C651.7814,520.5101 651.6824,521.8881 651.5824,523.2621 C651.6824,521.8821 651.7814,520.5061 651.8804,519.1311"></path><path d="M556.0445,688.6902 C555.0015,688.2802 554.5485,687.6692 555.3385,686.6352 C555.7385,687.2652 557.3165,687.4862 556.0445,688.6902"></path><path d="M666.4986,431.323 C666.3826,429.922 666.2666,428.521 666.1506,427.123 C666.2686,428.525 666.3836,429.924 666.4986,431.323"></path><path d="M554.15,606.74 C554.014,606.17 553.878,605.601 553.742,605.031 C555.324,605.54 555.46,606.11 554.15,606.74"></path><path d="M211.6861,606.4304 C211.6701,605.1024 211.6551,603.7754 211.6391,602.4514 C212.4311,603.7704 212.4761,605.0954 211.6861,606.4304"></path><path d="M633.0748,353.1936 C634.0838,353.1896 635.0918,353.1856 636.0898,353.1826 C635.0778,353.1856 634.0758,353.1896 633.0748,353.1936"></path><path d="M555.2877,684.7146 C555.3457,683.9986 555.4027,683.2816 555.4607,682.5686 C557.6117,683.4636 555.9727,684.0506 555.2877,684.7146"></path><path d="M610.232,601.7639 C610.128,603.1649 610.024,604.5659 609.92,605.9609 C610.025,604.5589 610.128,603.1609 610.232,601.7639"></path><path d="M98.0142,644.2859 C97.9722,643.3269 97.9312,642.3679 97.8912,641.4099 C99.1402,642.2629 98.4632,642.9099 98.0142,644.2859"></path><path d="M97.5357,687.3181 C97.2197,686.4471 96.3757,685.5801 97.5157,684.7031 C97.5207,685.5781 97.5287,686.4481 97.5357,687.3181"></path><path d="M611.3336,680.6585 C611.4106,681.7605 611.4876,682.8615 611.5636,683.9575 C611.4866,682.8545 611.4096,681.7565 611.3336,680.6585"></path><path d="M657.2828,681.4666 C656.3648,679.8856 656.8018,679.3066 658.5918,679.7286 C658.1548,680.3076 657.7198,680.8876 657.2828,681.4666"></path><path d="M113.024,432.5198 C113.093,433.6338 113.163,434.7478 113.231,435.8558 C113.161,434.7398 113.092,433.6298 113.024,432.5198"></path><path d="M178.8795,682.0798 C178.7895,680.8998 178.6995,679.7198 178.6105,678.5418 C178.7005,679.7238 178.7905,680.9018 178.8795,682.0798"></path><path d="M2.8629,678.5828 C2.8509,679.7048 2.8399,680.8258 2.8259,681.9408 C2.8379,680.8178 2.8499,679.7008 2.8629,678.5828"></path><path d="M543.3755,677.9456 C543.3105,679.0806 543.2455,680.2156 543.1785,681.3456 C543.2425,680.2086 543.3095,679.0766 543.3755,677.9456"></path><path d="M588.7398,669.4368 C588.6998,668.5428 588.6598,667.6488 588.6208,666.7598 C589.8268,667.6028 590.3238,668.4738 588.7398,669.4368"></path><path d="M702.5308,687.9661 C702.6598,689.0481 702.7898,690.1301 702.9178,691.2051 C702.7888,690.1221 702.6598,689.0441 702.5308,687.9661"></path><path d="M192.4049,652.8948 C193.0579,654.0058 193.1869,655.1148 192.3949,656.2168 C192.3989,655.1058 192.4019,653.9998 192.4049,652.8948"></path><path d="M698.9537,446.3508 C698.8167,447.4968 698.6807,448.6438 698.5437,449.7858 C698.6807,448.6368 698.8167,447.4938 698.9537,446.3508"></path><path d="M161.7047,449.0169 C161.5437,449.7689 163.3267,450.8369 161.3357,451.2889 C161.4587,450.5299 161.5817,449.7729 161.7047,449.0169"></path><path d="M13.7955,648.9094 L13.7955,646.3244 C15.0695,646.3994 14.1855,648.9394 13.7955,648.9094"></path><path d="M586.7847,693.2507 C586.5537,692.7447 586.3227,692.2387 586.0927,691.7317 C587.8437,691.3797 588.0747,691.8867 586.7847,693.2507"></path><path d="M191.0855,639.6502 C191.2015,640.7272 191.3185,641.8042 191.4335,642.8752 C191.3155,641.7962 191.2005,640.7232 191.0855,639.6502"></path><path d="M13.2926,638.5227 C13.0486,638.1137 12.8046,637.7057 12.5616,637.2957 C13.7186,636.1607 14.3586,637.6317 13.2926,638.5227"></path><path d="M712.8922,695.0208 C713.1762,694.7358 713.4612,694.4508 713.7462,694.1658 C714.1212,695.2728 713.9132,695.6008 713.2732,696.5978 C713.1462,696.0718 713.0192,695.5458 712.8922,695.0208"></path><path d="M12.4781,698.3347 C12.4811,697.6717 12.4851,697.0087 12.4901,696.3487 C13.6611,697.5477 13.6611,697.5937 12.4781,698.3347"></path><path d="M191.3785,632.9265 C191.2755,634.0735 191.1745,635.2215 191.0715,636.3645 C191.1745,635.2145 191.2755,634.0705 191.3785,632.9265"></path><path d="M707.7193,631.7727 C708.3023,631.5177 709.5223,631.3557 710.3333,631.2397 C709.5653,631.9427 708.6943,632.1207 707.7193,631.7727"></path><path d="M658.3355,697.9104 C658.4185,698.4854 658.9965,700.1614 658.2915,700.3364 C658.0515,699.5834 657.8105,698.8314 657.5695,698.0784 C657.8245,698.0224 658.0805,697.9664 658.3355,697.9104"></path><path d="M698.1978,620.345 C698.2068,621.504 698.2158,622.663 698.2228,623.82 C698.2148,622.659 698.2058,621.502 698.1978,620.345"></path><path d="M14.2818,620.1399 C13.9878,619.1609 13.6928,618.1819 13.3988,617.2029 C13.2908,617.1299 16.2678,620.1399 14.2818,620.1399"></path><path d="M121.6148,608.5681 C121.6648,609.7351 121.7148,610.9011 121.7648,612.0661 C121.7168,610.8981 121.6658,609.7331 121.6148,608.5681"></path><path d="M98.2037,610.6545 C98.1137,609.4445 98.0237,608.2355 97.9337,607.0275 C98.0247,608.2375 98.1147,609.4465 98.2037,610.6545"></path><path d="M688.607,359.2019 C689.402,359.1759 690.197,359.1499 690.981,359.1249 C690.182,359.1519 689.394,359.1769 688.607,359.2019"></path><path d="M744.3394,603.2366 C744.2904,604.3676 744.2414,605.4986 744.1934,606.6246 C744.2424,605.4926 744.2904,604.3646 744.3394,603.2366"></path><path d="M655.1998,467.5799 C655.1658,468.7329 655.1318,469.8849 655.0958,471.0349 C655.1288,469.8809 655.1648,468.7309 655.1998,467.5799"></path><path d="M621.1304,582.8782 C621.8894,582.1722 623.1614,582.2272 623.5624,584.0232 C622.7514,583.6412 621.9414,583.2592 621.1304,582.8782"></path><path d="M543.4029,582.6863 C543.2909,583.8193 543.1789,584.9513 543.0679,586.0793 C543.1799,584.9443 543.2919,583.8153 543.4029,582.6863"></path><path d="M655.233,472.8811 C655.13,474.0651 655.028,475.2501 654.926,476.4321 C655.029,475.2471 655.131,474.0641 655.233,472.8811"></path><path d="M647.9136,579.3127 C647.8006,580.4787 647.6876,581.6437 647.5766,582.8047 C647.6886,581.6387 647.8016,580.4757 647.9136,579.3127"></path><path d="M160.9674,476.1546 C160.8594,477.0716 160.7514,477.9876 160.6444,478.9006 C160.7514,477.9816 160.8594,477.0686 160.9674,476.1546"></path><path d="M175.9967,577.8337 C176.6837,578.5037 176.5447,577.2217 177.2317,579.0667 C177.1157,579.2217 176.9697,579.3387 176.7927,579.4177 C175.8867,579.0527 175.6207,578.5247 175.9967,577.8337"></path><path d="M665.7007,420.8133 C665.6277,419.6303 665.5547,418.4483 665.4827,417.2703 C665.5547,418.4543 665.6277,419.6333 665.7007,420.8133"></path><path d="M712.1734,711.9895 C711.1614,712.9085 710.4484,712.9435 710.0354,712.0935 C710.9444,710.7715 711.6564,710.7375 712.1734,711.9895"></path><path d="M648.5933,568.76 C648.4853,569.914 648.3763,571.069 648.2693,572.219 C648.3773,571.063 648.4853,569.911 648.5933,568.76"></path><path d="M662.1627,567.5208 C660.7477,567.2038 660.3097,566.6508 660.8497,565.8648 C662.5587,565.6088 662.9967,566.1608 662.1627,567.5208"></path><path d="M743.189,715.6204 C743.206,716.7274 743.223,717.8354 743.239,718.9364 C743.222,717.8274 743.206,716.7244 743.189,715.6204"></path><path d="M706.273,567.6277 C705.24,566.0617 705.308,565.6697 706.648,565.4497 C706.52,566.1767 706.396,566.9017 706.273,567.6277"></path><path d="M697.5367,561.4797 C697.5297,562.5767 697.5227,563.6737 697.5147,564.7647 C697.5197,563.6657 697.5277,562.5727 697.5367,561.4797"></path><path d="M610.9195,558.8333 C610.7945,559.9803 610.6705,561.1263 610.5465,562.2683 C610.6715,561.1203 610.7955,559.9773 610.9195,558.8333"></path><path d="M654.5963,482.7444 C654.4743,483.9004 654.3513,485.0564 654.2293,486.2074 C654.3523,485.0504 654.4743,483.8974 654.5963,482.7444"></path><path d="M114.6109,276.928 C114.8689,277.822 115.1259,278.716 115.3819,279.605 C115.1239,278.709 114.8669,277.819 114.6109,276.928"></path><path d="M168.3121,726.2444 C168.2971,727.3654 168.2831,728.4864 168.2671,729.6014 C167.9001,728.4734 167.1971,727.3464 168.3121,726.2444"></path><path d="M117.7867,488.3064 C117.8587,489.3524 117.9327,490.3984 118.0057,491.4384 C117.9327,490.3914 117.8587,489.3484 117.7867,488.3064"></path><path d="M650.6099,535.6819 C650.4929,536.8359 650.3769,537.9899 650.2599,539.1389 C650.3779,537.9829 650.4939,536.8329 650.6099,535.6819"></path><path d="M132.4234,533.8801 C132.4684,532.7581 132.5124,531.6371 132.5574,530.5211 C132.5124,531.6441 132.4674,532.7621 132.4234,533.8801"></path><path d="M651.2769,526.4905 C651.1709,527.6295 651.0649,528.7685 650.9599,529.9035 C651.0649,528.7625 651.1709,527.6265 651.2769,526.4905"></path><path d="M220.5172,510.5364 C220.4502,511.6634 220.3822,512.7914 220.3122,513.9134 C220.3782,512.7834 220.4482,511.6604 220.5172,510.5364"></path><path d="M119.6246,510.01 C119.7346,511.109 119.8456,512.209 119.9556,513.303 C119.8456,512.202 119.7346,511.106 119.6246,510.01"></path><path d="M565.0904,63.0491 C568.0504,58.6721 571.7224,52.7251 576.5984,50.3401 C574.9084,52.7251 568.0614,63.3021 565.0904,63.0491"></path><path d="M798.9468,105.489 C797.8798,104.247 797.9528,101.253 797.5048,99.628 C796.5798,96.269 795.8658,96.347 799.2548,95.055 C799.9468,98.524 799.8118,102.064 798.9468,105.489"></path><path d="M360.815,255.1751 C359.039,255.4151 357.317,255.7111 355.567,256.0941 C355.966,254.2841 359.193,255.1331 360.815,255.1751"></path><path d="M304.024,552.0798 C306.24,552.2388 308.456,552.3978 310.67,552.5568 C308.455,552.3978 306.24,552.2388 304.024,552.0798"></path><path d="M614.8726,166.1526 C615.5616,164.6006 616.2526,163.0486 616.9436,161.4956 C617.0336,163.3946 616.3696,164.9586 614.8726,166.1526"></path><path d="M575.7642,435.8611 C575.7662,434.0491 575.7692,432.2381 575.7712,430.4301 C575.7682,432.2421 575.7662,434.0511 575.7642,435.8611"></path><path d="M294.7525,315.5789 C293.2735,315.5299 291.7925,315.4809 290.3235,315.4349 C291.8085,315.4849 293.2805,315.5319 294.7525,315.5789"></path><path d="M468.2896,311.8753 C470.6436,311.8753 470.4766,311.8003 470.9426,309.5003 C471.1306,310.5953 471.3166,311.6893 471.5056,312.7843 C470.4336,312.4813 469.3616,312.1783 468.2896,311.8753"></path><path d="M211.3873,434.9666 C213.4103,434.9766 215.4343,434.9866 217.4573,434.9966 C215.4303,435.8386 213.4063,435.9526 211.3873,434.9666"></path><path d="M496.4302,325.4505 C495.2182,325.4025 494.0062,325.3545 492.8052,325.3055 C494.0222,325.3535 495.2262,325.4025 496.4302,325.4505"></path><path d="M318.4361,395.5735 C317.2081,395.5765 315.9821,395.5805 314.7671,395.5835 C315.9981,395.5795 317.2161,395.5765 318.4361,395.5735"></path><path d="M477.2398,325.4602 C476.2128,325.4532 475.1858,325.4462 474.1698,325.4382 C475.2008,325.4442 476.2198,325.4522 477.2398,325.4602"></path><path d="M533.856,417.3958 L536.976,417.7528 C535.702,418.0328 534.428,418.3128 533.154,418.5928 C532.766,417.9718 533.001,417.5728 533.856,417.3958"></path><path d="M378.7427,566.6521 C380.3387,566.7871 381.9327,566.9221 383.5277,567.0561 C381.9327,566.9221 380.3387,566.7871 378.7427,566.6521"></path><path d="M338.8502,147.4783 C338.6512,147.9433 338.4532,148.4073 338.2532,148.8723 L337.8932,145.1343 C338.2122,145.9163 338.5312,146.6973 338.8502,147.4783"></path><path d="M460.7642,526.3298 C462.3852,526.3328 464.0062,526.3368 465.6262,526.3398 C464.0042,527.1118 462.3832,527.2678 460.7642,526.3298"></path><path d="M797.7896,120.988 C797.9086,120.046 796.3016,118.868 798.1736,118.167 C798.0456,119.11 797.9176,120.049 797.7896,120.988"></path><path d="M268.2925,227.2043 C269.6135,227.3843 270.9365,227.5633 272.2565,227.7433 C270.9345,227.5633 269.6135,227.3833 268.2925,227.2043"></path><path d="M382.1705,237.6409 C383.4255,236.9439 384.6695,236.7669 385.8875,237.7209 C384.6485,237.6939 383.4085,237.6669 382.1705,237.6409"></path><path d="M559.4898,244.9426 C560.6598,244.5316 561.8298,244.1206 563.0018,243.7086 C562.2038,245.1776 560.7918,244.9016 559.4898,244.9426"></path><path d="M569.4078,409.6492 C570.7808,409.5182 572.1528,409.3862 573.5268,409.2532 L569.4078,409.6492 Z"></path><path d="M459.522,478.9431 C459.161,479.5841 458.799,480.2241 458.439,480.8601 C458.117,478.9031 458.117,478.9031 459.522,478.9431"></path><path d="M415.3023,273.4275 C416.5683,272.1535 417.8723,272.8175 419.1743,273.3495 C417.8833,273.3755 416.5923,273.4015 415.3023,273.4275"></path><path d="M446.7281,280.2122 C446.7191,279.2072 446.7101,278.2022 446.7031,277.2032 C446.7111,278.2112 446.7201,279.2112 446.7281,280.2122"></path><path d="M292.0992,550.8337 C293.4352,550.9717 294.7702,551.1097 296.1052,551.2487 C294.7692,551.1097 293.4342,550.9717 292.0992,550.8337"></path><path d="M527.4947,286.2991 C527.3907,285.2061 527.2857,284.1131 527.1817,283.0261 C527.2857,284.1201 527.3907,285.2101 527.4947,286.2991"></path><path d="M507.8287,540.8289 C509.1797,540.8289 510.5287,540.8289 511.8797,540.8299 C510.5287,541.6939 509.1797,541.7999 507.8287,540.8289"></path><path d="M433.2193,527.4197 C434.4463,526.5997 435.6523,526.5867 436.8303,527.5137 C435.6263,527.4817 434.4223,527.4507 433.2193,527.4197"></path><path d="M660.5933,432.9153 C660.4603,431.5043 660.3663,430.5113 660.2713,429.4923 C661.7943,429.9683 661.7943,429.9683 660.5933,432.9153"></path><path d="M655.4371,528.2395 C655.5741,527.0915 655.6551,526.4105 655.7711,525.4275 C656.9031,526.4555 657.1111,527.1775 655.4371,528.2395"></path><path d="M612.7974,634.3157 C612.6984,634.8657 612.5994,635.4157 612.4994,635.9647 C611.5814,635.7947 611.8694,634.1437 612.7974,634.3157"></path><path d="M705.6588,573.2063 C705.0948,573.4353 704.5288,573.6633 703.9648,573.8913 C703.9648,573.0093 703.4998,569.4893 704.3858,569.2583 C704.7078,570.1883 705.6588,572.1743 705.6588,573.2063"></path><path d="M704.1949,563.9905 C704.3939,562.8395 704.5559,561.9035 704.7479,560.8025 C706.4919,562.5615 706.4379,562.9375 704.1949,563.9905"></path><path d="M59.3824,606.2664 C60.8704,606.4334 59.0044,609.7144 58.4814,610.3634 C56.3754,609.7644 57.4714,607.6574 57.0084,606.1244 C57.7134,606.6814 58.4194,607.2374 59.1254,607.7934 C59.2114,607.2844 59.2964,606.7754 59.3824,606.2664"></path><path d="M546.4957,594.2937 C546.4247,593.5197 545.8967,592.0307 546.7807,591.8317 L547.5247,594.1607 C547.1827,594.2047 546.8387,594.2497 546.4957,594.2937"></path><path d="M265.7525,178.5969 C269.6235,182.9359 273.6995,189.4369 280.3285,187.0869 C279.2435,184.5169 277.2145,181.2069 277.7385,178.2699 C278.3325,174.9489 280.5765,175.3259 282.4885,177.6239 C285.7635,181.5569 287.8805,190.5459 284.5665,194.9809 C281.4565,199.1429 273.6925,196.3939 270.6585,193.4469 C267.9105,190.7769 261.3365,182.0679 265.7525,178.5969"></path><path d="M301.19,184.9055 C302.556,183.4635 305.822,184.9055 306.462,182.4825 C307.207,179.6735 300.05,181.0585 299.578,177.6935 C299.198,174.9835 303.068,172.5845 305.322,172.3185 C309.179,171.8635 311.593,175.2035 312.881,178.3895 C315.711,185.3905 311.851,191.7505 304.288,192.6335 C297.267,193.4525 295.742,185.5155 299.707,180.9255 C300.201,182.2515 300.696,183.5785 301.19,184.9055"></path><path d="M270.2388,154.427 C273.4578,154.427 275.8888,153.736 276.2108,157.82 C276.4288,160.593 274.7708,161.854 272.7798,163.604 C270.5158,165.594 268.0018,167.001 265.6008,168.747 C264.2008,169.765 262.2148,172.938 260.2978,172.968 C255.6948,173.039 256.2108,164.633 257.1068,162.084 C258.9958,156.715 265.2208,155.132 270.2388,154.427"></path><path d="M310.9947,162.8884 C314.9687,164.2504 316.3757,169.5694 320.7577,170.0504 C320.2977,167.6774 316.7117,155.8134 322.5797,159.0634 C326.9667,161.4934 327.9887,171.1864 326.5637,175.1804 C321.8927,188.2664 306.5587,171.4884 310.9947,162.8884"></path><path d="M292.3677,204.5461 C298.6047,205.4621 303.4577,207.5381 309.3967,204.7451 C312.0877,203.4801 314.8507,200.7891 316.4817,204.4041 C317.6917,207.0881 316.6977,209.8581 314.9207,211.9791 C309.4407,218.5151 289.9227,214.7101 292.3677,204.5461"></path><path d="M304.5601,141.8391 C314.5891,141.8391 307.1501,150.7911 300.8311,149.6051 C298.3971,149.1491 297.2151,146.4111 298.2001,144.0491 C298.7601,142.7061 304.5601,140.3151 304.5601,141.8391"></path><path d="M270.2388,154.427 C268.9608,154.606 267.6818,154.786 266.4048,154.966 C267.6828,154.786 268.9618,154.606 270.2388,154.427"></path></g></g></g></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/assets/qr-play-google-com.svg b/waterfox/browser/components/aboutwelcome/assets/qr-play-google-com.svg
new file mode 100644
index 0000000000000..27e0ea5234c6d
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/qr-play-google-com.svg
@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="328" height="328" viewBox="0 0 328 328"
+		 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<rect x="0" y="0" width="328" height="328" fill="#ffffff"/>
+<defs>
+<rect id="p" width="8" height="8"/>
+</defs>
+<g fill="#000000">
+<use xlink:href="#p" x="32" y="32"/>
+<use xlink:href="#p" x="32" y="40"/>
+<use xlink:href="#p" x="32" y="48"/>
+<use xlink:href="#p" x="32" y="56"/>
+<use xlink:href="#p" x="32" y="64"/>
+<use xlink:href="#p" x="32" y="72"/>
+<use xlink:href="#p" x="32" y="80"/>
+<use xlink:href="#p" x="32" y="96"/>
+<use xlink:href="#p" x="32" y="104"/>
+<use xlink:href="#p" x="32" y="128"/>
+<use xlink:href="#p" x="32" y="144"/>
+<use xlink:href="#p" x="32" y="152"/>
+<use xlink:href="#p" x="32" y="176"/>
+<use xlink:href="#p" x="32" y="184"/>
+<use xlink:href="#p" x="32" y="208"/>
+<use xlink:href="#p" x="32" y="216"/>
+<use xlink:href="#p" x="32" y="240"/>
+<use xlink:href="#p" x="32" y="248"/>
+<use xlink:href="#p" x="32" y="256"/>
+<use xlink:href="#p" x="32" y="264"/>
+<use xlink:href="#p" x="32" y="272"/>
+<use xlink:href="#p" x="32" y="280"/>
+<use xlink:href="#p" x="32" y="288"/>
+<use xlink:href="#p" x="40" y="32"/>
+<use xlink:href="#p" x="40" y="80"/>
+<use xlink:href="#p" x="40" y="96"/>
+<use xlink:href="#p" x="40" y="104"/>
+<use xlink:href="#p" x="40" y="112"/>
+<use xlink:href="#p" x="40" y="120"/>
+<use xlink:href="#p" x="40" y="144"/>
+<use xlink:href="#p" x="40" y="160"/>
+<use xlink:href="#p" x="40" y="168"/>
+<use xlink:href="#p" x="40" y="176"/>
+<use xlink:href="#p" x="40" y="184"/>
+<use xlink:href="#p" x="40" y="192"/>
+<use xlink:href="#p" x="40" y="208"/>
+<use xlink:href="#p" x="40" y="224"/>
+<use xlink:href="#p" x="40" y="240"/>
+<use xlink:href="#p" x="40" y="288"/>
+<use xlink:href="#p" x="48" y="32"/>
+<use xlink:href="#p" x="48" y="48"/>
+<use xlink:href="#p" x="48" y="56"/>
+<use xlink:href="#p" x="48" y="64"/>
+<use xlink:href="#p" x="48" y="80"/>
+<use xlink:href="#p" x="48" y="96"/>
+<use xlink:href="#p" x="48" y="104"/>
+<use xlink:href="#p" x="48" y="120"/>
+<use xlink:href="#p" x="48" y="128"/>
+<use xlink:href="#p" x="48" y="144"/>
+<use xlink:href="#p" x="48" y="160"/>
+<use xlink:href="#p" x="48" y="184"/>
+<use xlink:href="#p" x="48" y="192"/>
+<use xlink:href="#p" x="48" y="200"/>
+<use xlink:href="#p" x="48" y="216"/>
+<use xlink:href="#p" x="48" y="224"/>
+<use xlink:href="#p" x="48" y="240"/>
+<use xlink:href="#p" x="48" y="256"/>
+<use xlink:href="#p" x="48" y="264"/>
+<use xlink:href="#p" x="48" y="272"/>
+<use xlink:href="#p" x="48" y="288"/>
+<use xlink:href="#p" x="56" y="32"/>
+<use xlink:href="#p" x="56" y="48"/>
+<use xlink:href="#p" x="56" y="56"/>
+<use xlink:href="#p" x="56" y="64"/>
+<use xlink:href="#p" x="56" y="80"/>
+<use xlink:href="#p" x="56" y="96"/>
+<use xlink:href="#p" x="56" y="104"/>
+<use xlink:href="#p" x="56" y="112"/>
+<use xlink:href="#p" x="56" y="128"/>
+<use xlink:href="#p" x="56" y="136"/>
+<use xlink:href="#p" x="56" y="144"/>
+<use xlink:href="#p" x="56" y="160"/>
+<use xlink:href="#p" x="56" y="176"/>
+<use xlink:href="#p" x="56" y="216"/>
+<use xlink:href="#p" x="56" y="224"/>
+<use xlink:href="#p" x="56" y="240"/>
+<use xlink:href="#p" x="56" y="256"/>
+<use xlink:href="#p" x="56" y="264"/>
+<use xlink:href="#p" x="56" y="272"/>
+<use xlink:href="#p" x="56" y="288"/>
+<use xlink:href="#p" x="64" y="32"/>
+<use xlink:href="#p" x="64" y="48"/>
+<use xlink:href="#p" x="64" y="56"/>
+<use xlink:href="#p" x="64" y="64"/>
+<use xlink:href="#p" x="64" y="80"/>
+<use xlink:href="#p" x="64" y="104"/>
+<use xlink:href="#p" x="64" y="120"/>
+<use xlink:href="#p" x="64" y="128"/>
+<use xlink:href="#p" x="64" y="144"/>
+<use xlink:href="#p" x="64" y="160"/>
+<use xlink:href="#p" x="64" y="168"/>
+<use xlink:href="#p" x="64" y="176"/>
+<use xlink:href="#p" x="64" y="184"/>
+<use xlink:href="#p" x="64" y="224"/>
+<use xlink:href="#p" x="64" y="240"/>
+<use xlink:href="#p" x="64" y="256"/>
+<use xlink:href="#p" x="64" y="264"/>
+<use xlink:href="#p" x="64" y="272"/>
+<use xlink:href="#p" x="64" y="288"/>
+<use xlink:href="#p" x="72" y="32"/>
+<use xlink:href="#p" x="72" y="80"/>
+<use xlink:href="#p" x="72" y="112"/>
+<use xlink:href="#p" x="72" y="136"/>
+<use xlink:href="#p" x="72" y="160"/>
+<use xlink:href="#p" x="72" y="176"/>
+<use xlink:href="#p" x="72" y="200"/>
+<use xlink:href="#p" x="72" y="208"/>
+<use xlink:href="#p" x="72" y="240"/>
+<use xlink:href="#p" x="72" y="288"/>
+<use xlink:href="#p" x="80" y="32"/>
+<use xlink:href="#p" x="80" y="40"/>
+<use xlink:href="#p" x="80" y="48"/>
+<use xlink:href="#p" x="80" y="56"/>
+<use xlink:href="#p" x="80" y="64"/>
+<use xlink:href="#p" x="80" y="72"/>
+<use xlink:href="#p" x="80" y="80"/>
+<use xlink:href="#p" x="80" y="96"/>
+<use xlink:href="#p" x="80" y="112"/>
+<use xlink:href="#p" x="80" y="128"/>
+<use xlink:href="#p" x="80" y="144"/>
+<use xlink:href="#p" x="80" y="160"/>
+<use xlink:href="#p" x="80" y="176"/>
+<use xlink:href="#p" x="80" y="192"/>
+<use xlink:href="#p" x="80" y="208"/>
+<use xlink:href="#p" x="80" y="224"/>
+<use xlink:href="#p" x="80" y="240"/>
+<use xlink:href="#p" x="80" y="248"/>
+<use xlink:href="#p" x="80" y="256"/>
+<use xlink:href="#p" x="80" y="264"/>
+<use xlink:href="#p" x="80" y="272"/>
+<use xlink:href="#p" x="80" y="280"/>
+<use xlink:href="#p" x="80" y="288"/>
+<use xlink:href="#p" x="88" y="112"/>
+<use xlink:href="#p" x="88" y="120"/>
+<use xlink:href="#p" x="88" y="128"/>
+<use xlink:href="#p" x="88" y="152"/>
+<use xlink:href="#p" x="88" y="160"/>
+<use xlink:href="#p" x="88" y="184"/>
+<use xlink:href="#p" x="88" y="192"/>
+<use xlink:href="#p" x="88" y="200"/>
+<use xlink:href="#p" x="96" y="32"/>
+<use xlink:href="#p" x="96" y="48"/>
+<use xlink:href="#p" x="96" y="56"/>
+<use xlink:href="#p" x="96" y="64"/>
+<use xlink:href="#p" x="96" y="80"/>
+<use xlink:href="#p" x="96" y="96"/>
+<use xlink:href="#p" x="96" y="120"/>
+<use xlink:href="#p" x="96" y="168"/>
+<use xlink:href="#p" x="96" y="184"/>
+<use xlink:href="#p" x="96" y="192"/>
+<use xlink:href="#p" x="96" y="200"/>
+<use xlink:href="#p" x="96" y="208"/>
+<use xlink:href="#p" x="96" y="216"/>
+<use xlink:href="#p" x="96" y="232"/>
+<use xlink:href="#p" x="96" y="264"/>
+<use xlink:href="#p" x="96" y="272"/>
+<use xlink:href="#p" x="96" y="280"/>
+<use xlink:href="#p" x="96" y="288"/>
+<use xlink:href="#p" x="104" y="32"/>
+<use xlink:href="#p" x="104" y="56"/>
+<use xlink:href="#p" x="104" y="64"/>
+<use xlink:href="#p" x="104" y="72"/>
+<use xlink:href="#p" x="104" y="88"/>
+<use xlink:href="#p" x="104" y="104"/>
+<use xlink:href="#p" x="104" y="128"/>
+<use xlink:href="#p" x="104" y="152"/>
+<use xlink:href="#p" x="104" y="184"/>
+<use xlink:href="#p" x="104" y="192"/>
+<use xlink:href="#p" x="104" y="216"/>
+<use xlink:href="#p" x="104" y="224"/>
+<use xlink:href="#p" x="104" y="232"/>
+<use xlink:href="#p" x="104" y="248"/>
+<use xlink:href="#p" x="104" y="256"/>
+<use xlink:href="#p" x="104" y="264"/>
+<use xlink:href="#p" x="104" y="288"/>
+<use xlink:href="#p" x="112" y="64"/>
+<use xlink:href="#p" x="112" y="80"/>
+<use xlink:href="#p" x="112" y="136"/>
+<use xlink:href="#p" x="112" y="184"/>
+<use xlink:href="#p" x="112" y="200"/>
+<use xlink:href="#p" x="112" y="208"/>
+<use xlink:href="#p" x="112" y="224"/>
+<use xlink:href="#p" x="112" y="232"/>
+<use xlink:href="#p" x="112" y="240"/>
+<use xlink:href="#p" x="112" y="272"/>
+<use xlink:href="#p" x="112" y="288"/>
+<use xlink:href="#p" x="120" y="48"/>
+<use xlink:href="#p" x="120" y="56"/>
+<use xlink:href="#p" x="120" y="64"/>
+<use xlink:href="#p" x="120" y="88"/>
+<use xlink:href="#p" x="120" y="104"/>
+<use xlink:href="#p" x="120" y="112"/>
+<use xlink:href="#p" x="120" y="120"/>
+<use xlink:href="#p" x="120" y="160"/>
+<use xlink:href="#p" x="120" y="168"/>
+<use xlink:href="#p" x="120" y="184"/>
+<use xlink:href="#p" x="120" y="200"/>
+<use xlink:href="#p" x="120" y="208"/>
+<use xlink:href="#p" x="120" y="224"/>
+<use xlink:href="#p" x="120" y="256"/>
+<use xlink:href="#p" x="120" y="264"/>
+<use xlink:href="#p" x="128" y="48"/>
+<use xlink:href="#p" x="128" y="56"/>
+<use xlink:href="#p" x="128" y="72"/>
+<use xlink:href="#p" x="128" y="80"/>
+<use xlink:href="#p" x="128" y="88"/>
+<use xlink:href="#p" x="128" y="112"/>
+<use xlink:href="#p" x="128" y="136"/>
+<use xlink:href="#p" x="128" y="144"/>
+<use xlink:href="#p" x="128" y="152"/>
+<use xlink:href="#p" x="128" y="168"/>
+<use xlink:href="#p" x="128" y="184"/>
+<use xlink:href="#p" x="128" y="216"/>
+<use xlink:href="#p" x="128" y="224"/>
+<use xlink:href="#p" x="128" y="232"/>
+<use xlink:href="#p" x="128" y="240"/>
+<use xlink:href="#p" x="128" y="264"/>
+<use xlink:href="#p" x="128" y="272"/>
+<use xlink:href="#p" x="128" y="288"/>
+<use xlink:href="#p" x="136" y="48"/>
+<use xlink:href="#p" x="136" y="56"/>
+<use xlink:href="#p" x="136" y="64"/>
+<use xlink:href="#p" x="136" y="120"/>
+<use xlink:href="#p" x="136" y="128"/>
+<use xlink:href="#p" x="136" y="160"/>
+<use xlink:href="#p" x="136" y="176"/>
+<use xlink:href="#p" x="136" y="200"/>
+<use xlink:href="#p" x="136" y="216"/>
+<use xlink:href="#p" x="136" y="224"/>
+<use xlink:href="#p" x="136" y="240"/>
+<use xlink:href="#p" x="136" y="256"/>
+<use xlink:href="#p" x="136" y="272"/>
+<use xlink:href="#p" x="144" y="40"/>
+<use xlink:href="#p" x="144" y="48"/>
+<use xlink:href="#p" x="144" y="56"/>
+<use xlink:href="#p" x="144" y="64"/>
+<use xlink:href="#p" x="144" y="72"/>
+<use xlink:href="#p" x="144" y="80"/>
+<use xlink:href="#p" x="144" y="88"/>
+<use xlink:href="#p" x="144" y="96"/>
+<use xlink:href="#p" x="144" y="128"/>
+<use xlink:href="#p" x="144" y="176"/>
+<use xlink:href="#p" x="144" y="192"/>
+<use xlink:href="#p" x="144" y="208"/>
+<use xlink:href="#p" x="144" y="216"/>
+<use xlink:href="#p" x="144" y="224"/>
+<use xlink:href="#p" x="144" y="232"/>
+<use xlink:href="#p" x="144" y="240"/>
+<use xlink:href="#p" x="144" y="256"/>
+<use xlink:href="#p" x="144" y="272"/>
+<use xlink:href="#p" x="144" y="280"/>
+<use xlink:href="#p" x="144" y="288"/>
+<use xlink:href="#p" x="152" y="48"/>
+<use xlink:href="#p" x="152" y="64"/>
+<use xlink:href="#p" x="152" y="96"/>
+<use xlink:href="#p" x="152" y="120"/>
+<use xlink:href="#p" x="152" y="136"/>
+<use xlink:href="#p" x="152" y="168"/>
+<use xlink:href="#p" x="152" y="176"/>
+<use xlink:href="#p" x="152" y="184"/>
+<use xlink:href="#p" x="152" y="224"/>
+<use xlink:href="#p" x="152" y="232"/>
+<use xlink:href="#p" x="152" y="248"/>
+<use xlink:href="#p" x="152" y="264"/>
+<use xlink:href="#p" x="152" y="272"/>
+<use xlink:href="#p" x="160" y="32"/>
+<use xlink:href="#p" x="160" y="72"/>
+<use xlink:href="#p" x="160" y="80"/>
+<use xlink:href="#p" x="160" y="104"/>
+<use xlink:href="#p" x="160" y="112"/>
+<use xlink:href="#p" x="160" y="136"/>
+<use xlink:href="#p" x="160" y="144"/>
+<use xlink:href="#p" x="160" y="152"/>
+<use xlink:href="#p" x="160" y="200"/>
+<use xlink:href="#p" x="160" y="208"/>
+<use xlink:href="#p" x="160" y="232"/>
+<use xlink:href="#p" x="160" y="240"/>
+<use xlink:href="#p" x="160" y="248"/>
+<use xlink:href="#p" x="160" y="256"/>
+<use xlink:href="#p" x="160" y="272"/>
+<use xlink:href="#p" x="160" y="288"/>
+<use xlink:href="#p" x="168" y="32"/>
+<use xlink:href="#p" x="168" y="40"/>
+<use xlink:href="#p" x="168" y="56"/>
+<use xlink:href="#p" x="168" y="64"/>
+<use xlink:href="#p" x="168" y="88"/>
+<use xlink:href="#p" x="168" y="96"/>
+<use xlink:href="#p" x="168" y="104"/>
+<use xlink:href="#p" x="168" y="112"/>
+<use xlink:href="#p" x="168" y="128"/>
+<use xlink:href="#p" x="168" y="144"/>
+<use xlink:href="#p" x="168" y="184"/>
+<use xlink:href="#p" x="168" y="192"/>
+<use xlink:href="#p" x="168" y="208"/>
+<use xlink:href="#p" x="168" y="224"/>
+<use xlink:href="#p" x="168" y="240"/>
+<use xlink:href="#p" x="168" y="272"/>
+<use xlink:href="#p" x="168" y="280"/>
+<use xlink:href="#p" x="168" y="288"/>
+<use xlink:href="#p" x="176" y="32"/>
+<use xlink:href="#p" x="176" y="48"/>
+<use xlink:href="#p" x="176" y="72"/>
+<use xlink:href="#p" x="176" y="80"/>
+<use xlink:href="#p" x="176" y="112"/>
+<use xlink:href="#p" x="176" y="120"/>
+<use xlink:href="#p" x="176" y="144"/>
+<use xlink:href="#p" x="176" y="152"/>
+<use xlink:href="#p" x="176" y="160"/>
+<use xlink:href="#p" x="176" y="184"/>
+<use xlink:href="#p" x="176" y="192"/>
+<use xlink:href="#p" x="176" y="208"/>
+<use xlink:href="#p" x="176" y="224"/>
+<use xlink:href="#p" x="176" y="240"/>
+<use xlink:href="#p" x="176" y="248"/>
+<use xlink:href="#p" x="176" y="256"/>
+<use xlink:href="#p" x="176" y="264"/>
+<use xlink:href="#p" x="176" y="280"/>
+<use xlink:href="#p" x="176" y="288"/>
+<use xlink:href="#p" x="184" y="32"/>
+<use xlink:href="#p" x="184" y="56"/>
+<use xlink:href="#p" x="184" y="64"/>
+<use xlink:href="#p" x="184" y="72"/>
+<use xlink:href="#p" x="184" y="88"/>
+<use xlink:href="#p" x="184" y="96"/>
+<use xlink:href="#p" x="184" y="104"/>
+<use xlink:href="#p" x="184" y="120"/>
+<use xlink:href="#p" x="184" y="128"/>
+<use xlink:href="#p" x="184" y="136"/>
+<use xlink:href="#p" x="184" y="144"/>
+<use xlink:href="#p" x="184" y="160"/>
+<use xlink:href="#p" x="184" y="192"/>
+<use xlink:href="#p" x="184" y="200"/>
+<use xlink:href="#p" x="184" y="216"/>
+<use xlink:href="#p" x="184" y="232"/>
+<use xlink:href="#p" x="184" y="240"/>
+<use xlink:href="#p" x="184" y="288"/>
+<use xlink:href="#p" x="192" y="32"/>
+<use xlink:href="#p" x="192" y="48"/>
+<use xlink:href="#p" x="192" y="56"/>
+<use xlink:href="#p" x="192" y="64"/>
+<use xlink:href="#p" x="192" y="72"/>
+<use xlink:href="#p" x="192" y="80"/>
+<use xlink:href="#p" x="192" y="88"/>
+<use xlink:href="#p" x="192" y="96"/>
+<use xlink:href="#p" x="192" y="104"/>
+<use xlink:href="#p" x="192" y="112"/>
+<use xlink:href="#p" x="192" y="120"/>
+<use xlink:href="#p" x="192" y="144"/>
+<use xlink:href="#p" x="192" y="160"/>
+<use xlink:href="#p" x="192" y="168"/>
+<use xlink:href="#p" x="192" y="176"/>
+<use xlink:href="#p" x="192" y="184"/>
+<use xlink:href="#p" x="192" y="200"/>
+<use xlink:href="#p" x="192" y="208"/>
+<use xlink:href="#p" x="192" y="216"/>
+<use xlink:href="#p" x="192" y="224"/>
+<use xlink:href="#p" x="192" y="240"/>
+<use xlink:href="#p" x="192" y="248"/>
+<use xlink:href="#p" x="192" y="256"/>
+<use xlink:href="#p" x="192" y="264"/>
+<use xlink:href="#p" x="200" y="32"/>
+<use xlink:href="#p" x="200" y="40"/>
+<use xlink:href="#p" x="200" y="96"/>
+<use xlink:href="#p" x="200" y="112"/>
+<use xlink:href="#p" x="200" y="152"/>
+<use xlink:href="#p" x="200" y="160"/>
+<use xlink:href="#p" x="200" y="176"/>
+<use xlink:href="#p" x="200" y="192"/>
+<use xlink:href="#p" x="200" y="200"/>
+<use xlink:href="#p" x="200" y="240"/>
+<use xlink:href="#p" x="200" y="248"/>
+<use xlink:href="#p" x="200" y="256"/>
+<use xlink:href="#p" x="200" y="264"/>
+<use xlink:href="#p" x="200" y="288"/>
+<use xlink:href="#p" x="208" y="32"/>
+<use xlink:href="#p" x="208" y="48"/>
+<use xlink:href="#p" x="208" y="56"/>
+<use xlink:href="#p" x="208" y="80"/>
+<use xlink:href="#p" x="208" y="88"/>
+<use xlink:href="#p" x="208" y="96"/>
+<use xlink:href="#p" x="208" y="112"/>
+<use xlink:href="#p" x="208" y="128"/>
+<use xlink:href="#p" x="208" y="144"/>
+<use xlink:href="#p" x="208" y="152"/>
+<use xlink:href="#p" x="208" y="160"/>
+<use xlink:href="#p" x="208" y="200"/>
+<use xlink:href="#p" x="208" y="216"/>
+<use xlink:href="#p" x="208" y="224"/>
+<use xlink:href="#p" x="208" y="232"/>
+<use xlink:href="#p" x="208" y="240"/>
+<use xlink:href="#p" x="208" y="248"/>
+<use xlink:href="#p" x="208" y="264"/>
+<use xlink:href="#p" x="208" y="272"/>
+<use xlink:href="#p" x="208" y="280"/>
+<use xlink:href="#p" x="216" y="32"/>
+<use xlink:href="#p" x="216" y="40"/>
+<use xlink:href="#p" x="216" y="48"/>
+<use xlink:href="#p" x="216" y="56"/>
+<use xlink:href="#p" x="216" y="88"/>
+<use xlink:href="#p" x="216" y="104"/>
+<use xlink:href="#p" x="216" y="112"/>
+<use xlink:href="#p" x="216" y="120"/>
+<use xlink:href="#p" x="216" y="152"/>
+<use xlink:href="#p" x="216" y="168"/>
+<use xlink:href="#p" x="216" y="184"/>
+<use xlink:href="#p" x="216" y="192"/>
+<use xlink:href="#p" x="216" y="200"/>
+<use xlink:href="#p" x="216" y="208"/>
+<use xlink:href="#p" x="216" y="216"/>
+<use xlink:href="#p" x="216" y="224"/>
+<use xlink:href="#p" x="216" y="232"/>
+<use xlink:href="#p" x="216" y="240"/>
+<use xlink:href="#p" x="216" y="248"/>
+<use xlink:href="#p" x="216" y="256"/>
+<use xlink:href="#p" x="216" y="264"/>
+<use xlink:href="#p" x="216" y="280"/>
+<use xlink:href="#p" x="216" y="288"/>
+<use xlink:href="#p" x="224" y="40"/>
+<use xlink:href="#p" x="224" y="48"/>
+<use xlink:href="#p" x="224" y="56"/>
+<use xlink:href="#p" x="224" y="64"/>
+<use xlink:href="#p" x="224" y="80"/>
+<use xlink:href="#p" x="224" y="88"/>
+<use xlink:href="#p" x="224" y="96"/>
+<use xlink:href="#p" x="224" y="112"/>
+<use xlink:href="#p" x="224" y="136"/>
+<use xlink:href="#p" x="224" y="144"/>
+<use xlink:href="#p" x="224" y="184"/>
+<use xlink:href="#p" x="224" y="208"/>
+<use xlink:href="#p" x="224" y="216"/>
+<use xlink:href="#p" x="224" y="224"/>
+<use xlink:href="#p" x="224" y="232"/>
+<use xlink:href="#p" x="224" y="240"/>
+<use xlink:href="#p" x="224" y="248"/>
+<use xlink:href="#p" x="224" y="256"/>
+<use xlink:href="#p" x="224" y="264"/>
+<use xlink:href="#p" x="224" y="272"/>
+<use xlink:href="#p" x="224" y="280"/>
+<use xlink:href="#p" x="232" y="96"/>
+<use xlink:href="#p" x="232" y="112"/>
+<use xlink:href="#p" x="232" y="128"/>
+<use xlink:href="#p" x="232" y="152"/>
+<use xlink:href="#p" x="232" y="160"/>
+<use xlink:href="#p" x="232" y="168"/>
+<use xlink:href="#p" x="232" y="176"/>
+<use xlink:href="#p" x="232" y="208"/>
+<use xlink:href="#p" x="232" y="224"/>
+<use xlink:href="#p" x="232" y="256"/>
+<use xlink:href="#p" x="232" y="264"/>
+<use xlink:href="#p" x="232" y="280"/>
+<use xlink:href="#p" x="232" y="288"/>
+<use xlink:href="#p" x="240" y="32"/>
+<use xlink:href="#p" x="240" y="40"/>
+<use xlink:href="#p" x="240" y="48"/>
+<use xlink:href="#p" x="240" y="56"/>
+<use xlink:href="#p" x="240" y="64"/>
+<use xlink:href="#p" x="240" y="72"/>
+<use xlink:href="#p" x="240" y="80"/>
+<use xlink:href="#p" x="240" y="104"/>
+<use xlink:href="#p" x="240" y="120"/>
+<use xlink:href="#p" x="240" y="152"/>
+<use xlink:href="#p" x="240" y="160"/>
+<use xlink:href="#p" x="240" y="168"/>
+<use xlink:href="#p" x="240" y="176"/>
+<use xlink:href="#p" x="240" y="184"/>
+<use xlink:href="#p" x="240" y="200"/>
+<use xlink:href="#p" x="240" y="208"/>
+<use xlink:href="#p" x="240" y="224"/>
+<use xlink:href="#p" x="240" y="240"/>
+<use xlink:href="#p" x="240" y="256"/>
+<use xlink:href="#p" x="240" y="272"/>
+<use xlink:href="#p" x="240" y="288"/>
+<use xlink:href="#p" x="248" y="32"/>
+<use xlink:href="#p" x="248" y="80"/>
+<use xlink:href="#p" x="248" y="112"/>
+<use xlink:href="#p" x="248" y="120"/>
+<use xlink:href="#p" x="248" y="128"/>
+<use xlink:href="#p" x="248" y="136"/>
+<use xlink:href="#p" x="248" y="144"/>
+<use xlink:href="#p" x="248" y="168"/>
+<use xlink:href="#p" x="248" y="176"/>
+<use xlink:href="#p" x="248" y="184"/>
+<use xlink:href="#p" x="248" y="200"/>
+<use xlink:href="#p" x="248" y="208"/>
+<use xlink:href="#p" x="248" y="224"/>
+<use xlink:href="#p" x="248" y="256"/>
+<use xlink:href="#p" x="248" y="264"/>
+<use xlink:href="#p" x="248" y="280"/>
+<use xlink:href="#p" x="256" y="32"/>
+<use xlink:href="#p" x="256" y="48"/>
+<use xlink:href="#p" x="256" y="56"/>
+<use xlink:href="#p" x="256" y="64"/>
+<use xlink:href="#p" x="256" y="80"/>
+<use xlink:href="#p" x="256" y="96"/>
+<use xlink:href="#p" x="256" y="112"/>
+<use xlink:href="#p" x="256" y="128"/>
+<use xlink:href="#p" x="256" y="160"/>
+<use xlink:href="#p" x="256" y="168"/>
+<use xlink:href="#p" x="256" y="176"/>
+<use xlink:href="#p" x="256" y="184"/>
+<use xlink:href="#p" x="256" y="224"/>
+<use xlink:href="#p" x="256" y="232"/>
+<use xlink:href="#p" x="256" y="240"/>
+<use xlink:href="#p" x="256" y="248"/>
+<use xlink:href="#p" x="256" y="256"/>
+<use xlink:href="#p" x="256" y="288"/>
+<use xlink:href="#p" x="264" y="32"/>
+<use xlink:href="#p" x="264" y="48"/>
+<use xlink:href="#p" x="264" y="56"/>
+<use xlink:href="#p" x="264" y="64"/>
+<use xlink:href="#p" x="264" y="80"/>
+<use xlink:href="#p" x="264" y="96"/>
+<use xlink:href="#p" x="264" y="128"/>
+<use xlink:href="#p" x="264" y="136"/>
+<use xlink:href="#p" x="264" y="160"/>
+<use xlink:href="#p" x="264" y="168"/>
+<use xlink:href="#p" x="264" y="176"/>
+<use xlink:href="#p" x="264" y="184"/>
+<use xlink:href="#p" x="264" y="200"/>
+<use xlink:href="#p" x="264" y="216"/>
+<use xlink:href="#p" x="264" y="224"/>
+<use xlink:href="#p" x="264" y="232"/>
+<use xlink:href="#p" x="264" y="248"/>
+<use xlink:href="#p" x="264" y="256"/>
+<use xlink:href="#p" x="264" y="264"/>
+<use xlink:href="#p" x="272" y="32"/>
+<use xlink:href="#p" x="272" y="48"/>
+<use xlink:href="#p" x="272" y="56"/>
+<use xlink:href="#p" x="272" y="64"/>
+<use xlink:href="#p" x="272" y="80"/>
+<use xlink:href="#p" x="272" y="96"/>
+<use xlink:href="#p" x="272" y="104"/>
+<use xlink:href="#p" x="272" y="112"/>
+<use xlink:href="#p" x="272" y="136"/>
+<use xlink:href="#p" x="272" y="144"/>
+<use xlink:href="#p" x="272" y="152"/>
+<use xlink:href="#p" x="272" y="160"/>
+<use xlink:href="#p" x="272" y="168"/>
+<use xlink:href="#p" x="272" y="192"/>
+<use xlink:href="#p" x="272" y="208"/>
+<use xlink:href="#p" x="272" y="248"/>
+<use xlink:href="#p" x="272" y="256"/>
+<use xlink:href="#p" x="272" y="264"/>
+<use xlink:href="#p" x="272" y="272"/>
+<use xlink:href="#p" x="272" y="288"/>
+<use xlink:href="#p" x="280" y="32"/>
+<use xlink:href="#p" x="280" y="80"/>
+<use xlink:href="#p" x="280" y="104"/>
+<use xlink:href="#p" x="280" y="112"/>
+<use xlink:href="#p" x="280" y="120"/>
+<use xlink:href="#p" x="280" y="136"/>
+<use xlink:href="#p" x="280" y="160"/>
+<use xlink:href="#p" x="280" y="176"/>
+<use xlink:href="#p" x="280" y="200"/>
+<use xlink:href="#p" x="280" y="208"/>
+<use xlink:href="#p" x="280" y="216"/>
+<use xlink:href="#p" x="280" y="264"/>
+<use xlink:href="#p" x="280" y="272"/>
+<use xlink:href="#p" x="288" y="32"/>
+<use xlink:href="#p" x="288" y="40"/>
+<use xlink:href="#p" x="288" y="48"/>
+<use xlink:href="#p" x="288" y="56"/>
+<use xlink:href="#p" x="288" y="64"/>
+<use xlink:href="#p" x="288" y="72"/>
+<use xlink:href="#p" x="288" y="80"/>
+<use xlink:href="#p" x="288" y="96"/>
+<use xlink:href="#p" x="288" y="104"/>
+<use xlink:href="#p" x="288" y="112"/>
+<use xlink:href="#p" x="288" y="160"/>
+<use xlink:href="#p" x="288" y="168"/>
+<use xlink:href="#p" x="288" y="184"/>
+<use xlink:href="#p" x="288" y="200"/>
+<use xlink:href="#p" x="288" y="208"/>
+<use xlink:href="#p" x="288" y="224"/>
+<use xlink:href="#p" x="288" y="248"/>
+<use xlink:href="#p" x="288" y="280"/>
+</g>
+<g></g></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/assets/roller-skating-doodle.svg b/waterfox/browser/components/aboutwelcome/assets/roller-skating-doodle.svg
new file mode 100644
index 0000000000000..782095caabd86
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/assets/roller-skating-doodle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 768" version="1.1"><g id="react-group-132" stroke="none" stroke-width="1" fill="#FFFFFF00" fill-rule="evenodd"><g id="react-group-133"><rect id="react-rect-135" x="0" y="0" width="1024" height="768"></rect><path d="M436.795377,309.520335 C426.166155,310.198683 415.450187,309.922319 404.811929,309.584042 C403.763736,309.549945 401.258012,309.062719 400.619156,309.689025 C399.884517,310.410443 400.040842,314.383625 399.918854,315.367948 C399.000782,322.823498 398.080902,330.279945 397.162829,337.735495 C396.739937,341.158641 396.317949,344.582685 395.895961,348.005831 C395.77578,348.979386 394.583912,353.187658 395.15319,354.032004 C396.187829,355.568158 403.599278,355.918996 405.551989,356.294959 L428.811036,360.775109 C431.001398,361.196833 436.59116,361.296432 437.606823,363.026399 C438.2511,364.12378 437.858028,367.096489 437.933931,368.341922 L438.566462,378.619436 C439.395077,392.079624 440.223691,405.539812 441.051403,419 C457.512555,417.676503 473.973706,416.353903 490.433051,415.030407 C494.438776,414.708281 498.4445,414.387052 502.449321,414.064927 C503.402635,413.98776 505.401431,414.188752 506.180347,413.662045 C507.880047,412.510827 509.329445,407.585624 510.246614,405.816176 C512.584265,401.304622 514.921917,396.793965 517.260472,392.282411 C519.513184,387.93506 521.765896,383.587709 524.018608,379.240358 C524.596018,378.127723 526.035476,376.271239 526,375.054519 C525.958669,373.683466 523.913789,371.228491 523.274933,370.056635 C521.402643,366.621824 519.531256,363.187013 517.658063,359.752202 C508.387878,342.744145 499.118597,325.736088 489.848412,308.728929 C489.377629,307.866637 488.329436,304.732417 487.410459,304.255958 C485.624916,303.331753 479.380034,305.19093 477.456238,305.410765 C463.936353,306.954097 450.380322,308.653557 436.795377,309.520335" id="react-path-136" fill="#7fbbca"></path><g id="react-group-134" transform="translate(49.000000, 38.000000)" fill="#2d3d8b"><path d="M231,242.303017 C234.285882,246.202011 237.571764,250.101006 240.858545,254 C249.572063,243.244989 258.285582,232.489978 267,221.734968 C262.631107,219.782776 258.263113,217.830585 253.895119,215.878394 C250.01785,214.146206 250.51307,214.969646 248.060342,218.404389 C242.373861,226.371197 236.686481,234.337107 231,242.303017" id="react-path-137"></path><path d="M399.041236,495.998768 C399.026893,501.665547 399.014343,507.333221 399,513 C416.333632,512.146359 433.667264,511.292718 451,510.439078 C450.212923,508.06159 449.424949,505.684101 448.637871,503.307508 C448.022911,501.4499 447.244798,495.836809 445.74953,494.591245 C444.11621,493.230252 436.933008,494.634195 434.739411,494.712938 C422.840019,495.141548 410.939731,495.570158 399.041236,495.998768" id="react-path-138"></path><path d="M357.748116,67 C337.499347,79.7922723 317.249674,92.5854404 297,105.377713 C301.47126,110.606599 305.940709,115.835485 310.411063,121.064371 C311.482029,122.316724 311.672142,123.109522 312.897008,122.987691 C314.321945,122.846152 316.720075,120.609296 317.906919,119.869351 C332.262207,110.934468 346.615684,101.999585 360.970066,93.0655985 C365.312774,90.3620217 369.656387,87.6584448 374,84.9548679 C368.582705,78.9699119 363.164505,72.984956 357.748116,67" id="react-path-139"></path><path d="M828.22508,266.94377 C827.493267,260.997359 824.495017,254.952128 822.301398,249.444513 C819.716386,242.955046 816.993022,236.519976 814.205032,230.11573 C812.439214,226.0614 811.799333,227.057757 807.18272,227.239078 C801.787873,227.44941 796.393026,227.660648 791,227.871887 C795.153313,242.95142 799.306626,258.030046 803.459939,273.108672 C804.179009,275.718783 805.341354,285.504659 807.60688,286.826487 C808.391486,287.284322 811.101197,286.695029 811.990478,286.662392 C814.53544,286.566292 817.079492,286.471098 819.624454,286.375905 C823.083273,286.246261 826.541181,286.116617 830,285.986972 C829.517586,279.63259 829.003314,273.270048 828.22508,266.94377" id="react-path-140"></path><path d="M485.63592,648.752431 C476.355035,646.407145 466.258427,648.628948 456.905513,648.694745 C451.397126,648.733503 445.899543,648.365756 440.392957,648.649678 C438.548125,648.74522 430.109974,648.500056 429.82276,649.609605 C429.602173,650.461372 431.280439,652.607462 431.929597,652.960787 C433.75192,653.954965 435.033129,652.677766 436.871659,652.204563 C441.854237,650.919252 447.68045,651.712431 452.799883,651.468168 C458.15611,651.213089 463.510536,650.894015 468.866762,650.647949 C474.203181,650.401883 481.010784,651.508729 485.63592,648.752431 M30.9247819,167.676689 C30.2125991,166.045264 29.9199829,163.455715 28.2840334,162.434497 C26.7687318,161.487188 23.593171,162.178516 21.8419757,162.15418 C18.1180971,162.103705 10.032887,162.247919 7.60012108,165.637858 C4.64244676,169.758784 13.3435014,172.697152 16.2453536,172.618736 C21.2873555,172.481732 25.8746768,168.608675 30.9247819,167.676689 M123.619285,115.949695 C124.002838,114.905943 122.655903,114.216418 121.682616,113.883824 C119.206633,113.038367 117.577887,114.445358 115.399022,115.503531 C109.896937,118.176906 103.914962,119.943532 98.127464,121.875103 C93.0881632,123.556102 88.4135072,125.912204 83.4723454,127.805018 C79.9690544,129.147113 72.5753188,128.885725 70.5576177,132.272059 C66.5744362,138.960902 77.008679,133.944044 78.847209,133.295079 C84.1233038,131.434714 89.7388334,130.28821 94.9104868,128.161949 C99.8876629,126.115907 104.962978,124.034713 109.888834,121.81922 C112.136126,120.807917 114.370813,119.949841 116.662223,119.066528 C118.805974,118.240901 121.33868,116.167819 123.619285,115.949695 M274.189668,231.882735 C272.875146,231.076937 267.487407,226.578349 265.676788,227.171431 C264.263227,227.635621 262.681298,232.803904 261.799848,234.161322 C257.387196,240.955622 252.627907,247.469605 247.896528,254.042176 C249.996162,255.171555 252.095796,256.300032 254.19633,257.429411 C258.477529,247.283028 266.732907,239.690141 274.189668,231.882735 M355.890806,268.147244 C362.64889,268.163468 369.343948,267.316208 376.093928,267.409947 C383.657831,267.515404 391.090282,267.720008 398.646082,267.102591 C406.082134,266.494186 413.489375,266.464442 420.924527,266.011969 C423.262756,265.870459 436.287327,264.876281 428.657698,261.151945 C426.090778,259.899082 423.004353,261.460203 420.215946,262.022639 C416.986364,262.675209 413.726169,262.919472 410.460573,263.312456 C407.348937,263.687414 404.044625,264.722152 400.905979,264.645538 C397.613372,264.565319 395.14099,263.976744 391.831276,264.452651 C384.969652,265.44052 378.137739,264.887999 371.279716,264.251653 C366.551039,263.8127 356.169917,261.153747 355.890806,268.147244 M539.798725,652.953576 C544.149252,649.445562 551.027984,650.965221 556.196035,649.846658 C561.903401,648.610921 557.408817,642.56293 555.220948,639.343344 C552.940343,635.984952 549.504579,629.275378 545.669956,634.244464 C541.664266,639.436182 541.191578,646.755963 539.798725,652.953576 M402.884065,500.54241 C402.739107,503.695297 401.177887,506.939219 404.456989,508.021728 C407.603738,509.060072 413.005883,507.481826 416.266978,507.200608 C420.517566,506.832861 424.699726,506.131619 428.937709,505.694469 C430.82936,505.498878 432.730015,505.353762 434.63247,505.527721 C435.94159,505.646698 439.099143,507.069913 440.269608,506.481338 C441.708379,505.757563 442.405256,501.857465 441.230289,500.353129 C439.957184,498.722605 432.26633,500.338707 429.513938,500.547818 C420.549078,501.227428 411.811109,500.141314 402.884065,500.54241 M402.334846,490.426672 C406.462985,488.726745 411.366332,489.522629 415.712358,489.499194 C420.826388,489.473055 425.880095,489.751569 430.98152,490.084163 C433.238717,490.231082 439.823031,491.903969 441.717383,490.459121 C442.713178,489.700192 443.07062,483.191617 442.226985,482.194735 C440.849438,480.565113 436.525021,482.526428 434.754018,482.790521 C430.010035,483.495369 425.168812,483.477342 420.383412,483.433176 C415.903234,483.392616 411.409549,483.194321 406.932972,483.183505 C401.628066,483.170886 402.345651,485.881215 402.334846,490.426672 M260.351173,223.612941 C258.664804,222.634987 253.130306,218.142709 251.063086,218.825024 C249.303787,219.405487 247.436446,224.766656 246.385728,226.45126 C244.384234,229.660932 242.270194,232.808411 240.195771,235.972114 C238.870445,237.99472 235.334741,241.649654 235.938881,244.384319 C236.260308,245.839983 239.204477,248.354721 240.690967,247.913064 C242.225177,247.457888 244.75158,241.751505 245.603318,240.625731 C250.211347,234.538983 256.000646,229.959275 260.351173,223.612941 M797.030856,230.20444 C802.937201,241.781249 803.697103,254.871408 806.896974,267.296379 C807.64247,270.187877 808.790425,273.04242 809.422476,275.951044 C809.774516,277.571653 809.126259,280.348682 810.032919,281.727732 C812.304521,285.181666 822.811692,284.084735 825.078793,281.044516 C826.410421,279.258962 825.375911,277.406708 824.809586,275.552652 C824.044282,273.04873 824.410727,270.868389 823.966851,268.368973 C823.079099,263.360227 818.565607,258.304612 816.423656,253.68164 C814.085428,248.631432 813.009501,242.5555 809.65927,238.044294 C807.41648,235.025707 801.125682,228.796547 797.030856,230.20444 M411.900244,681.803663 C419.803582,680.764419 432.234818,678.414625 431.820653,667.793236 C431.40919,657.235842 417.567995,655.361055 409.862735,654.435379 C407.604639,654.164076 407.358841,654.034283 405.066531,655.403418 C403.490905,656.343516 401.922483,657.34851 400.453099,658.44544 C397.591763,660.581616 394.351377,663.491141 393.740934,667.218181 C392.190519,676.684053 404.964791,680.963615 411.900244,681.803663 M366.725708,82.067427 C370.311832,82.4468911 365.541738,78.9623111 364.637779,78.5404841 C361.89439,77.2596801 358.84578,77.4922258 355.933123,77.9789493 C348.885125,79.1570006 342.646548,85.0742969 336.624057,88.7328355 C330.246825,92.605893 323.952426,96.9855035 317.302385,100.366429 C314.261878,101.913129 311.74808,103.225479 309.221677,105.532008 C307.934166,106.708257 307.487588,107.523969 305.757101,107.523068 C304.79732,107.523068 302.65717,105.279633 301.635265,106.577563 C298.782932,110.200048 313.154438,111.371789 314.654434,111.126625 C322.147209,109.900803 328.64779,107.057977 335.077242,103.202045 C341.641749,99.2667947 348.613217,96.0715448 355.211036,92.2408503 C358.062469,90.5841876 360.504238,88.3876223 363.105371,86.4199974 C363.477218,86.137878 364.150686,85.1878657 364.527035,84.8273298 C365.132075,85.0048937 365.638076,84.8480606 366.045038,84.3568304 C366.256622,83.5888888 366.483512,82.8254539 366.725708,82.067427 M511.681461,648.850677 C504.393068,651.437523 492.478637,653.452017 489.059079,662.001226 C485.185742,671.686123 502.595954,678.591288 509.427867,679.116769 C516.605516,679.668389 529.361781,676.763371 530.362078,667.838303 C530.936506,662.700666 526.86419,659.422493 523.058378,656.859983 C519.168834,654.239788 513.61633,653.678254 511.681461,648.850677 M45.3323023,109.457343 C40.1804568,110.048622 36.6789665,110.556978 32.5751371,113.900048 C29.1699852,116.675273 26.3644713,119.47844 24.9770204,123.758903 C21.7690467,133.65201 29.6975947,142.146237 39.8824384,140.994325 C41.0051842,140.867236 42.1018196,140.451718 43.2416722,140.566188 C44.2887879,140.671645 45.0207786,141.423362 45.90583,141.573886 C47.9919582,141.928113 48.3962187,141.562169 50.1077983,139.938856 C53.5993846,136.626432 57.1035759,132.986821 59.0375438,128.517077 C63.695093,117.752374 56.6912122,109.65023 45.3323023,109.457343 M162.460707,88.8391936 C162.961306,77.6977313 146.001272,75.86711 138.180767,76.7143695 C129.301441,77.6770005 114.733657,86.692202 118.1154,97.7525437 C121.091982,107.487916 137.883649,106.746113 145.14143,104.766771 C146.693647,104.344042 149.106605,103.424676 150.634511,103.735638 C152.929523,104.200729 153.041167,106.089938 155.203826,104.380096 C156.563365,103.304797 157.790553,100.174444 158.750334,98.6322514 C160.662693,95.5595838 161.651286,92.3562218 162.460707,88.8391936 M400.840253,546.378247 C400.60616,548.763192 399.694998,551.830452 402.262818,552.96614 C403.850148,553.667383 408.252896,552.89854 409.847429,552.955324 C416.501071,553.192377 423.330282,552.66329 429.942508,553.191475 C431.898084,553.348308 437.742305,555.332158 439.481795,554.00178 C441.183471,552.701146 439.855444,548.6334 439.741999,546.811792 C439.279215,539.381146 440.27501,532.157808 440.594637,524.767722 C440.680171,522.782972 441.499496,517.960803 439.977892,516.490718 C438.124957,514.700657 434.013924,515.736296 431.806248,515.959829 C424.917613,516.657466 417.830899,517.678684 410.90625,517.694007 C409.005595,517.697612 404.797324,516.349208 403.14877,517.060365 C400.616064,518.151887 401.212101,521.962752 401.072545,524.39637 C400.649377,531.731474 400.368466,539.035932 400.840253,546.378247 M245.971564,213.718032 C236.940078,207.027386 227.578161,200.682855 218.546675,194.176983 C215.330598,191.861441 212.940149,188.554425 209.926653,186.293865 C208.036802,184.874254 207.460574,184.256836 204.877448,185.626873 C201.891863,187.210527 199.116961,189.698225 196.362767,191.663146 C194.049749,193.312598 191.725926,194.94853 189.410207,196.591673 C187.263755,198.114036 186.545269,198.46015 188.065973,200.988409 C190.741836,205.436521 196.298842,209.451089 199.931784,213.109627 C208.897544,222.138349 217.655321,231.478934 227.728521,239.278228 C231.191296,229.176011 238.35544,220.961199 245.971564,213.718032 M347.216762,57.7772185 C331.537937,51.5823095 330.348565,30.6063277 324.865388,17.2358518 C323.167314,26.3889584 327.671802,41.2646718 320.066483,48.4528574 C315.389126,52.8730282 312.67905,46.6348548 310.167953,43.2395075 C306.343234,38.0694219 302.237604,33.126474 298.586654,27.8247928 C299.707599,34.2207006 302.920075,41.3989715 302.319536,47.9030401 C301.847749,53.0091305 298.583953,60.003528 293.833667,54.2133206 C290.571672,50.236609 286.395814,46.5167793 282.591804,42.9898364 C278.018888,38.7499335 272.801316,36.0107616 267.830443,32.394586 C269.755407,41.9596049 273.424364,50.4502266 278.833712,58.5451601 C281.608613,62.6985343 284.646419,66.6878646 287.265559,70.9439915 C289.406609,74.4231635 290.416811,78.7504963 293.253837,81.7059898 C295.904489,84.4667938 299.801237,86.6714712 302.974096,88.7923239 C307.49299,91.8118125 308.576121,90.9528356 312.73127,88.0829694 C320.774164,82.5289131 329.506731,78.0817021 337.601845,72.5979502 C336.10365,70.6168052 333.7105,68.6599963 333.788831,65.9631873 C333.851856,63.7801421 335.522919,61.7926877 337.759407,62.0540763 C339.511503,62.2586804 340.321825,64.0947098 342.271999,63.4754893 C343.920554,62.9509094 346.174148,59.0147582 347.216762,57.7772185 M887.10622,224.821638 C879.840335,225.678812 873.057042,228.268362 865.610185,227.79606 C862.596689,227.604976 860.346695,228.161102 859.02317,225.136206 C857.96615,222.719713 859.04838,219.047655 855.726961,218.389677 C853.266284,217.902953 850.220375,220.188751 848.400752,221.482174 C845.131554,223.806729 842.235104,225.869896 838.533735,227.512138 C831.971929,230.423465 825.311085,232.953526 818.138837,233.271699 C819.874726,238.540932 821.701552,243.818277 824.104606,248.826122 C826.40772,253.626658 828.67392,257.710629 829.359092,263.058279 C829.651708,265.346781 829.651708,267.840788 831.8981,268.846683 C834.102175,269.834552 838.030435,269.020642 840.416382,269.063005 C845.878851,269.161251 851.344921,269.289241 856.80829,269.30186 C860.972444,269.309972 865.113188,270.302347 869.167498,270.244661 C874.206798,270.171653 879.909663,267.981397 884.824714,266.941251 C894.138912,264.970922 907.171587,263.748705 914.594134,257.396061 C907.724406,256.315355 900.725927,257.050848 893.976848,258.530848 C890.887721,259.209557 883.800107,262.740106 881.729285,259.205051 C879.262306,254.993991 884.090022,249.180348 887.496975,247.223539 C891.340601,245.014355 897.076779,245.25321 899.785954,241.271992 C894.669223,241.703734 889.277882,241.893015 884.331318,243.398253 C880.539913,244.551067 875.648271,247.835549 874.148275,242.147193 C871.71731,232.930993 880.767703,228.560396 887.10622,224.821638 M344.86863,303.724931 C346.15344,291.525296 348.508775,279.195868 348.717658,266.913309 C348.806794,261.607121 342.811313,262.556232 338.614747,261.048291 C332.514825,258.857133 326.535551,256.263077 320.546373,253.790702 C314.576103,251.326439 308.573419,248.949605 302.582441,246.535817 C297.143381,244.345561 291.923109,241.033137 286.439031,239.086243 C283.454346,238.026267 283.222054,239.061005 281.489766,241.800177 C279.805197,244.464538 278.035095,247.073016 276.202867,249.638229 C272.354739,255.02734 268.234703,260.214551 264.023731,265.322444 C276.694462,272.950484 289.919813,279.999863 302.993904,286.91314 C316.336302,293.968829 330.849164,298.240278 344.86863,303.724931 M615.526892,257.443832 C622.229153,257.460057 628.754944,256.495623 635.428394,256.291019 C642.024413,256.089119 648.403445,256.378449 654.945443,256.549703 C661.228137,256.713747 667.388383,257.988242 673.653971,258.284783 C675.178276,258.35689 676.762005,258.35058 678.277307,258.520032 C679.801612,258.690385 680.70467,259.256427 682.119132,259.496183 C685.594512,260.08566 688.978956,259.251019 692.485848,259.438498 C705.414981,260.128924 718.154139,262.785173 731.087774,263.458473 C744.382453,264.150702 757.359305,265.182737 770.592759,266.777207 C777.587637,267.61996 784.594219,268.114795 791.620608,268.607828 C793.06118,268.708778 796.146705,269.616428 796.936319,267.972384 C797.8952,265.975916 794.643108,259.155477 794.04347,257.041835 C793.265561,254.295452 792.626308,251.486877 791.580993,248.823418 C790.96875,247.266804 789.679438,242.185049 788.437845,241.197181 C786.707358,239.819934 784.122431,241.143101 782.102029,241.435135 C778.009004,242.026414 773.848452,242.378838 769.732918,242.784441 C763.640199,243.386536 757.542978,244.825975 751.454761,245.008947 C744.582332,245.214453 737.744117,244.919715 730.879792,244.663734 C717.131333,244.149069 703.050643,244.414964 689.373312,243.010677 C673.567537,241.387364 657.689732,240.727583 641.847042,239.536012 C638.091651,239.252991 634.326356,239.181785 630.567364,238.95645 C627.878896,238.79511 622.389417,236.907704 619.877419,237.782905 C617.324006,238.672528 617.808398,241.693819 617.519383,244.04181 C616.968364,248.52237 616.254381,252.989411 615.526892,257.443832 M450.950549,381.774656 C441.413962,383.241136 432.057447,383.81529 422.415519,384.092001 C418.163131,384.213682 413.937753,384.418286 409.702472,384.843718 C406.161366,385.199748 404.175177,385.354778 404.044625,389.232342 C403.468397,406.238823 402.543729,423.062332 402.020622,440.075122 C401.725304,449.680702 402.06564,459.297998 402.032326,468.907183 C402.018821,472.554004 401.271524,475.183212 405.279916,475.608645 C410.149949,476.126014 415.259478,475.447305 420.158323,475.493273 C424.668214,475.536538 429.179005,475.647402 433.687995,475.745648 C436.583545,475.807841 441.952376,477.249083 442.924762,473.742871 C443.234485,472.620703 442.676264,470.652177 442.705075,469.411933 C442.759096,467.104503 443.043609,464.773638 443.183165,462.467109 C443.501891,457.175343 443.734184,451.878168 444.055611,446.586402 C445.371034,424.90377 448.905837,403.399603 450.950549,381.774656 M341.747991,111.848598 C348.038789,116.675273 355.19393,119.995809 361.9187,124.216784 C365.14288,126.241193 368.254515,128.41162 371.41387,130.533374 C374.66326,132.716419 378.438459,134.038685 381.508678,136.463289 C387.450137,141.156566 394.801555,144.147212 401.329147,148.219465 C407.962081,152.357517 414.572505,156.502779 421.355799,160.391159 C424.35759,162.111817 427.640294,163.145654 430.718616,164.697761 C434.408281,166.559028 437.75581,168.997152 441.496795,170.775496 C449.503674,174.583657 457.499749,178.396325 465.473315,182.278395 C481.125129,189.897421 497.167699,196.936886 513.146343,203.841149 C516.551495,205.312136 520.131316,205.958397 523.720141,206.827289 C525.414614,207.237398 527.563767,207.450114 529.091674,208.264926 C529.566162,208.519103 530.069462,208.555157 530.446712,208.981491 C531.167898,209.799006 530.555655,210.943708 530.999531,211.552112 C533.487219,214.958276 540.397463,205.386947 542.004601,203.0678 C544.485986,199.484072 543.479386,198.90361 539.647465,197.4173 C535.78223,195.917471 531.880981,194.503268 528.057163,192.900686 C521.014567,189.948798 513.810807,186.609334 507.082435,182.993158 C500.083957,179.230965 492.795563,176.124948 485.870914,172.201415 C478.10443,167.801074 470.39827,163.310599 462.543552,159.066189 C449.29119,151.905044 437.116556,142.876322 424.242345,135.103167 C417.132222,130.811888 410.449768,125.704896 403.571938,120.980073 C396.858872,116.368818 390.496946,111.220364 383.641624,106.91196 C379.870927,104.542337 375.949871,102.570205 372.425871,99.8328362 C369.792326,97.787696 367.164182,95.6893767 363.862571,97.4064292 C360.295355,99.2613867 356.928018,102.380023 353.463443,104.534225 C349.55409,106.96604 345.651941,109.409572 341.747991,111.848598 M633.784341,191.662245 C631.744131,190.593256 624.245954,187.740515 627.766352,184.24602 C630.271146,181.759224 636.192797,185.063536 638.621061,185.886459 C638.569741,182.447847 638.575143,180.076422 637.468604,176.798249 C636.356662,173.503852 636.665485,171.012548 639.374661,168.515837 C640.613553,167.373839 645.109037,166.388675 645.630344,164.890648 C646.440666,162.563388 642.407965,163.301585 641.032219,162.976202 C633.759131,161.256445 634.198506,153.632011 634.018434,147.794934 C633.805049,140.932132 632.198812,134.333423 626.895706,129.872692 C624.499855,127.858197 623.635512,127.854592 620.68414,129.177759 C619.596508,129.665384 618.616919,130.449549 617.416742,130.665871 C615.719569,130.971425 614.582417,129.865481 613.071617,129.940292 C610.731588,130.055664 608.34294,133.926919 606.065035,135.163557 C603.114564,136.766139 600.210911,136.287528 597.296454,137.434032 C594.703424,138.453448 592.196829,141.218758 589.778469,142.689745 C586.484961,144.692522 587.234959,146.658345 587.445643,150.593594 C587.621212,153.877176 587.515871,156.031378 584.287189,157.249088 C583.246376,157.642072 581.415048,157.46541 580.529097,158.097249 C579.219977,159.030136 579.929459,159.731378 579.508091,161.291598 C578.439367,165.239466 576.174968,162.830185 573.28482,162.302901 C569.765323,161.660246 565.888384,164.144338 567.726914,167.921854 C568.384175,169.273864 569.796835,170.505094 571.210397,170.92602 C572.882361,171.422658 574.968489,170.054424 576.510801,170.671842 C580.443563,172.248285 577.300415,175.981635 577.487689,178.526117 C579.874537,177.230892 580.685759,173.518273 583.153639,177.633791 C584.936346,180.608213 584.226865,185.126629 583.783889,188.374157 C582.756581,195.887726 580.453467,205.092209 575.566326,211.119469 C574.862247,211.987459 573.810629,213.617983 572.488004,213.412478 C571.386867,213.242124 571.255415,211.814402 570.303737,211.449359 C568.262626,210.663391 565.136585,211.827021 564.355075,213.717131 C563.03425,216.911479 563.172005,221.597545 563.067564,224.978471 C562.946916,228.869555 562.490435,233.271699 563.434009,237.088874 C565.045649,243.608265 571.111357,245.877839 577.009599,247.31818 C580.297705,248.119471 583.901836,249.055062 587.229557,247.928387 C590.859798,246.69896 593.354689,243.400957 595.914405,240.7393 C597.838469,238.738326 601.571351,236.46064 601.821651,233.566438 C601.939597,232.211724 600.976215,230.344147 600.756528,228.956985 C600.408089,226.755012 600.30995,224.529604 600.368474,222.301492 C600.475616,218.208507 601.620871,214.047922 601.271532,209.954938 C600.91229,205.768214 597.799754,205.467167 596.105281,202.242173 C595.09508,200.317812 594.858286,197.321758 597.314461,196.667385 C598.741528,196.28702 601.414689,197.37043 602.960603,197.480394 C605.319539,197.648043 607.709088,197.684998 610.074327,197.708433 C614.432958,197.752599 617.717462,197.529066 621.662828,195.630844 C625.723441,193.678542 629.350081,192.460832 633.784341,191.662245 M532.721915,650.362224 C532.88578,646.792918 533.382778,643.223612 534.488417,639.817449 C535.42839,636.921444 537.44429,634.385975 537.783725,631.394428 C538.491406,625.149945 536.421484,619.283124 530.402594,617.030675 C524.566477,614.845827 518.243267,614.88098 512.149647,615.291089 C508.611242,615.529043 505.613052,614.317642 502.141274,614.478081 C498.485822,614.646631 495.260742,614.145486 491.631401,613.760614 C484.889524,613.044049 479.145243,610.075937 472.597844,608.82037 C469.394372,608.205656 468.286032,609.572989 466.325953,611.828141 C464.165996,614.311333 461.73413,616.399737 458.997044,618.224049 C454.790573,621.028118 447.265386,626.179275 446.863826,617.486753 C446.527093,610.191308 453.834394,604.785973 458.346085,600.061149 C453.77497,598.118762 454.165725,590.905339 448.855417,593.807653 C446.550502,595.067726 444.730879,596.930796 442.601534,598.442343 C440.809823,599.714133 436.69789,603.254597 434.340754,602.978787 C431.014834,602.590309 430.659192,597.862781 431.15799,595.239882 C432.06285,590.476301 437.041826,587.733524 440.57663,584.935765 C442.712278,583.244851 445.906746,581.913572 447.721867,579.928822 C449.651333,577.817884 449.221862,575.452768 449.157037,572.801026 C449.128225,571.594132 450.033085,567.047773 449.541489,566.005824 C448.784289,564.398735 446.161547,564.824168 444.293306,564.658321 C440.825129,564.34826 437.383062,563.739856 433.92839,563.41267 C431.220115,563.156689 428.618082,563.767798 425.908006,563.866945 C419.062588,564.117517 412.137939,563.761488 405.283517,563.741659 C404.040124,563.738053 398.828854,562.847529 397.962711,563.923729 C397.215414,564.851208 397.926696,569.149698 397.923095,570.26105 C397.899686,577.159004 397.923095,584.047945 398.129277,590.943195 C398.533537,604.548921 398.078857,618.518787 395.285047,631.891967 C394.779046,634.314769 393.186314,636.99986 395.641589,638.192333 C397.530539,639.109897 402.572541,637.683977 404.632559,637.549678 C411.313211,637.112528 418.065892,637.543368 424.70963,637.057546 C436.276523,636.212089 448.240473,636.989044 460.037857,637.263052 C475.733789,637.628996 491.341486,639.326219 507.032015,639.728216 C513.852223,639.903076 520.789478,638.658326 527.52055,638.863831 C530.166701,638.944952 530.915798,639.614647 531.065258,642.450263 C531.241728,645.820373 529.776846,647.62846 532.721915,650.362224 M203.374751,169.227895 C197.345958,159.043656 191.662901,148.658418 185.64041,138.471474 C182.91953,133.871036 179.864617,129.497734 176.827711,125.104604 C175.271893,122.853958 173.552211,120.579878 172.362838,118.101193 C171.272506,115.831619 170.948377,113.22224 169.665367,111.043702 C167.238004,116.410279 162.027635,119.354055 156.57507,121.274811 C152.337988,122.76743 148.204447,124.904506 143.783691,125.825676 C132.222201,128.237661 120.78496,133.433886 109.439555,137.201486 C85.3486903,145.199075 59.5984665,149.591304 36.4043575,159.982852 C44.3184997,167.817298 41.8596235,184.520929 55.0651666,187.047385 C60.3187525,188.05328 65.8055309,186.436276 70.8340274,185.050917 C77.1833484,183.301416 83.5371711,181.565436 89.8927945,179.834863 C96.7886325,177.955569 103.753798,176.497201 110.706358,174.856763 C114.197945,174.032938 117.71204,173.461489 121.210829,172.718785 C124.125286,172.100465 124.1604,171.494765 125.687406,168.749284 C128.269632,164.108285 133.060434,159.360928 137.112042,165.483729 C138.761497,167.977737 138.412159,171.10809 139.858133,173.579564 C141.093423,175.690502 143.734172,176.78563 145.590709,178.212451 C146.87912,174.574643 148.417831,169.64792 151.264762,166.853766 C154.370995,163.805434 157.45652,166.25798 158.574764,169.840806 C159.918097,174.146507 157.938211,179.385996 157.072067,183.622293 C156.648899,185.692671 155.84578,188.072208 156.331974,190.195765 C156.97843,193.01786 159.437306,195.927385 160.902188,198.376326 C174.594825,188.170454 188.582778,177.748261 203.374751,169.227895 M471.062734,340.689781 C467.053442,335.254702 462.814559,330.438843 459.805565,324.350292 C456.588587,317.842618 453.987455,310.833799 450.556192,304.491972 C447.14924,298.19431 444.013294,291.77677 440.902559,285.310558 C438.731797,280.797549 436.261217,269.962542 430.044248,270.233845 C426.938915,270.369948 423.770557,271.48851 420.647217,271.794966 C416.985463,272.155502 413.307503,272.134771 409.650251,272.581836 C401.627165,273.563395 393.817465,275.318304 385.71965,275.79331 C378.761687,276.201617 371.713689,276.410728 364.746722,276.107877 C362.848769,276.025855 357.906707,274.546757 356.147408,275.394016 C354.095493,276.381885 354.780666,280.235113 354.607797,282.207244 C353.953237,289.62437 352.951139,297.047806 351.823892,304.405443 C351.631215,305.660108 349.691845,311.929828 350.55979,312.989804 C351.897721,314.624835 357.649204,313.531509 359.524649,313.676625 C366.923787,314.246272 374.194173,315.936284 381.5645,316.753799 C385.302784,317.168416 389.04647,317.263958 392.805463,317.277478 C396.457313,317.290097 401.784728,316.282399 405.249304,317.533458 C407.476788,318.338355 408.74089,320.231169 408.021504,322.642253 C407.22919,325.300304 404.650566,325.894287 402.260117,326.391827 C400.507121,326.755968 395.421902,326.553167 394.318063,328.164762 C393.123289,329.909756 395.21572,333.197844 395.806354,334.852704 C396.937203,338.025421 396.295248,339.387345 396.211515,342.489757 C396.12238,345.755312 398.013131,348.628783 397.76103,351.931292 C397.515233,355.158991 397.38108,357.735921 397.695304,361.026713 C397.971714,363.918212 397.779038,367.084619 398.185099,369.893194 C399.124172,376.392756 413.177852,372.461111 417.539183,372.363766 C426.554463,372.161866 435.604856,373.620234 444.585922,373.188492 C447.228471,373.061403 453.354503,373.540916 455.217343,371.297481 C457.106293,369.025203 457.406112,363.839795 458.624296,361.027615 C461.804358,353.679892 466.54474,347.238917 471.062734,340.689781 M551.333205,196.023829 C550.675944,203.565339 550.310399,209.373574 545.794206,215.719908 C540.972791,222.496181 535.42839,221.888678 527.814967,222.634086 C520.982154,223.30288 515.620525,225.560737 510.131946,229.600542 C503.677283,234.351505 496.714819,238.296669 489.836088,242.386048 C476.750292,250.165513 461.142595,252.317011 446.283096,254.628948 C442.546612,255.211214 435.649874,256.883199 440.046319,261.311482 C444.772296,266.072359 447.419347,273.097402 450.594908,279.053456 C457.875198,292.709657 463.455614,307.378963 471.759611,320.458306 C475.114343,325.741961 479.128136,332.118039 484.277281,335.848685 C489.165322,339.389148 498.977417,332.813874 503.952793,330.63894 C510.420061,327.812339 517.206055,325.66715 523.298774,322.178964 C528.98183,318.925127 534.765727,316.118355 540.738698,313.439573 C546.603627,310.808562 552.283982,308.190169 558.427121,306.270315 C565.655191,304.010656 573.292924,303.209365 580.635339,301.240839 C588.167729,299.222739 594.11279,297.082958 600.200107,292.090436 C603.02903,289.771289 606.475598,287.45124 607.615451,283.785491 C608.781414,280.035015 607.922473,275.251604 607.746003,271.406489 C607.560529,267.386513 606.935681,263.270093 607.017614,259.249216 C607.100447,255.195891 609.087535,252.015062 610.288612,248.248363 C612.182964,242.304928 614.33842,231.529409 608.339338,227.526559 C607.91617,233.876498 605.676981,239.573868 603.580049,245.529922 C601.559647,251.26695 598.24273,254.775866 593.283561,258.120739 C591.397312,259.393431 589.356201,261.165465 587.122414,261.743224 C584.753574,262.357036 581.439358,262.042468 578.97688,262.068607 C573.437881,262.127194 567.436999,260.676037 563.171105,256.942687 C554.535776,249.384051 552.651328,235.836913 553.485059,225.091139 C553.96585,218.910651 554.984154,212.684195 557.816679,207.107605 C558.790866,205.190455 560.728435,203.144414 559.647106,200.899176 C558.515356,198.548482 553.449045,197.125266 551.333205,196.023829 M380.95946,327.710487 C370.773715,326.381011 360.167504,325.298502 350.275277,322.424129 C346.674747,321.377673 342.333223,320.053605 342.295408,315.737088 C342.282803,314.412118 343.274997,312.019061 342.704171,310.772508 C342.118938,309.496211 338.47159,309.409682 336.78432,309.074384 C317.16283,305.183299 298.937794,297.576892 281.422239,288.052434 C263.706806,278.418012 247.342808,267.050313 230.626772,255.823223 C214.317696,244.870141 200.767316,231.493356 187.210634,217.426144 C185.327986,215.472039 183.395819,213.567508 181.451047,211.674694 C180.032083,210.29294 178.061201,207.478957 176.19566,206.729042 C172.842729,205.380638 168.155468,210.48763 165.190591,212.00819 C161.33436,213.98573 156.734433,214.284975 154.189123,210.117179 C152.508155,207.363586 154.071176,206.860638 154.311571,204.270187 C154.50965,202.140321 153.051971,200.932526 151.769862,199.449822 C150.78127,201.784292 149.465847,206.05484 146.100311,205.523951 C143.07511,205.048044 142.742878,200.878445 142.527693,198.500711 C142.276493,195.729091 143.139936,192.208457 141.264491,189.965022 C139.788805,188.200198 136.905861,186.910381 135.016911,188.509358 C131.217402,191.725339 133.68168,201.303878 128.319151,203.691527 C120.757949,207.05713 121.495342,191.6992 121.335078,188.629236 C104.407457,190.501319 88.4972404,197.89501 71.550712,200.315108 C64.6539737,201.300272 56.6876108,200.976691 50.668721,197.039639 C45.1342236,193.420759 39.3863415,185.457421 37.020202,179.346337 C31.3434481,183.553791 25.4082916,186.779687 18.1189975,184.903097 C10.7090554,182.994059 4.19046731,178.883048 1.4677863,171.435277 C-1.26569901,163.959564 -0.475185142,158.266701 6.34862418,154.047529 C9.14063272,152.320562 11.3483093,151.475105 14.4212293,150.641365 C17.8236802,149.718393 22.1336915,149.049599 25.346167,147.587626 C22.0337518,142.748332 18.2657558,138.007284 16.7603581,132.224288 C15.0622839,125.702192 15.9095202,118.364384 18.5430659,112.197417 C23.3032558,101.051448 36.6843687,93.5937615 48.7374542,96.140948 C59.2563306,98.3636522 66.6995859,107.469889 69.686972,117.429695 C71.0447111,121.958026 69.8526378,124.758489 75.391637,122.308648 C81.6815343,119.526211 87.18632,115.432326 93.6832995,112.977076 C99.3195373,110.846308 105.466278,109.056247 110.688351,105.9971 C113.391224,104.414347 113.264274,104.278244 112.162236,101.373226 C110.793693,97.7651625 109.948257,94.4058687 110.253479,90.4850402 C111.125925,79.258852 120.417614,71.3009221 130.361162,67.6072313 C141.633638,63.4196062 155.611688,65.0735649 164.058841,74.1230173 C168.162671,78.5197533 170.963683,84.2982433 171.322025,90.3480366 C171.482289,93.0295227 169.883254,97.106283 170.774608,99.5786583 C171.550716,101.730157 175.223274,103.379609 176.640437,105.436466 C178.887729,108.701119 179.929443,112.608428 182.159628,115.928964 C184.093596,118.804238 186.052774,121.656077 187.911112,124.582728 C192.425504,131.68799 196.657184,138.968113 200.346849,146.538466 C202.035019,150.001414 203.619649,153.513936 205.166463,157.042681 C206.228885,159.462779 207.104932,163.883851 209.015491,165.811817 C210.944957,167.760514 213.821599,167.136787 215.478257,169.603754 C217.565286,172.709771 215.582698,175.456154 213.928742,178.161976 C226.504935,181.845752 234.227301,192.494182 244.290597,200.297982 C254.45023,208.17389 265.601158,214.995231 276.522494,221.74897 C287.890407,228.779421 299.051239,235.479982 311.427553,240.588777 C322.960232,245.349654 334.107557,250.961396 345.608724,255.781762 C347.220364,256.457767 348.476362,257.353698 350.070896,256.304539 C351.545681,255.332894 351.841899,252.200738 353.383311,250.931652 C357.288161,247.715671 366.473608,249.500324 371.121253,249.427315 C377.824415,249.32276 384.623914,248.944197 391.321674,249.290312 C393.588774,249.406585 395.780244,250.310629 398.001426,250.011384 C401.405678,249.553503 404.58484,248.857669 408.127746,248.714356 C411.077318,248.594477 414.020586,248.376353 416.974659,248.48181 C418.375615,248.532285 420.744456,249.133479 422.000454,248.179861 C423.567076,246.992796 422.622601,244.14276 423.693127,242.414891 C424.387302,241.295427 425.759447,240.988971 426.431114,240.105658 C426.344679,240.218326 427.500738,238.224562 427.180211,238.477839 C429.244731,236.849117 435.019624,236.356084 437.459592,236.936547 C438.163672,237.104197 438.278918,238.29036 439.16577,238.293064 C440.04902,238.295768 440.117448,237.403441 440.741395,237.189824 C441.388752,236.967193 441.562521,236.07036 442.428665,235.934257 C443.386646,235.782832 444.612933,236.859933 445.650144,236.920323 C446.817908,236.987022 447.932551,236.212771 449.019282,235.910823 C450.464356,235.510628 451.578098,235.804464 452.780976,235.662053 C454.975147,235.401566 457.334083,235.154598 459.612888,234.887802 C462.928004,234.500226 466.156686,233.465487 469.39077,232.678618 C470.807933,232.333405 472.225096,231.931407 473.687276,231.820542 C475.375446,231.691651 477.572319,232.486632 479.165051,232.110774 C480.528192,231.789897 479.418052,231.303173 480.599321,230.893965 C481.876027,230.451407 483.256275,230.329726 484.55099,229.88176 C487.52487,228.85243 490.26916,227.141687 492.941421,225.511163 C499.164692,221.712015 504.733403,216.978178 510.885545,213.077179 C509.480988,211.03294 504.251711,210.686826 502.039533,209.963951 C498.994524,208.968872 496.007138,207.80344 493.028756,206.628092 C486.258067,203.954718 479.536899,201.152453 472.818431,198.352891 C460.072971,193.043098 447.254581,187.919882 435.073645,181.404997 C423.631002,175.285801 411.41045,170.516811 400.064145,164.178589 C394.291953,160.954496 388.513459,157.56005 382.901531,154.062852 C377.674055,150.805409 372.048622,148.583607 366.632971,145.604678 C356.053771,139.784727 346.337113,132.544263 335.717397,126.847795 C333.209001,125.502996 330.424195,122.654762 327.71772,121.922874 C325.391197,121.293739 323.03136,122.591668 320.929025,123.502022 C318.701541,124.466455 316.611811,126.049208 314.112419,126.103288 C311.360026,126.162777 308.209675,124.680073 305.613044,123.781437 C300.787128,122.112155 296.595064,117.484676 294.840267,112.666113 C293.983127,110.310011 293.586069,107.69252 293.269143,105.213835 C292.893694,102.276369 293.885888,98.8224342 293.170104,96.0282805 C291.808763,90.7139806 285.520667,85.724163 282.004771,81.9123966 C277.638937,77.1794609 273.854735,71.8822864 270.408166,66.4526149 C262.703807,54.3142707 257.358385,39.9162673 261.65309,25.6291288 C262.30765,23.4514917 263.474513,19.8533429 265.402179,18.4039883 C268.077141,16.390395 269.222396,18.7401881 271.536314,19.9074233 C274.410255,21.3576791 277.136538,22.2022346 279.831308,24.1725636 C283.096904,26.5602129 285.783571,29.4724421 288.794366,32.1431122 C288.809672,25.9761447 287.849891,20.5699081 289.18062,14.3939272 C289.863991,11.2239148 291.392798,4.62971221 295.425499,4.0645721 C299.60946,3.47779984 302.608551,11.0598709 304.429074,13.8260831 C307.814418,18.9664244 311.59682,23.7894941 315.363015,28.6504201 C315.851909,21.1089093 314.850712,3.18035768 324.332376,0.214048116 C332.827249,-2.44490454 337.219193,20.4500299 339.27651,25.5732458 C341.196072,30.3530512 343.890842,35.0751708 346.8071,39.321383 C349.862013,43.7703967 353.192435,41.5035269 357.926515,41.7126377 C362.303152,41.9064258 364.271334,44.9340265 364.222714,49.226207 C364.16149,54.6567798 359.846077,58.6235767 356.860491,62.7210678 C363.322357,65.8451118 371.689379,69.908352 375.549211,76.3412148 C376.405451,77.7662331 376.994285,79.402165 377.047406,81.0840652 C377.097826,82.7470373 375.577123,85.7917635 376.366736,87.328548 C376.943865,88.4525188 378.892239,88.8599244 379.929451,89.4719342 C382.075002,90.7383167 383.980159,92.3760513 386.100501,93.6884022 C399.996618,102.29079 413.061705,112.56967 426.467128,121.652472 C438.572434,129.852862 451.394425,137.158222 463.637486,145.354106 C479.205567,155.775397 495.574966,164.641878 512.239683,173.209113 C516.083309,175.185752 519.647824,177.380514 523.337489,179.593304 C527.122592,181.862878 531.640586,183.396057 535.68139,185.233889 C538.513015,186.521002 541.601241,188.970844 544.573321,189.773037 C548.109025,190.727555 549.598216,186.976179 553.718252,187.948725 C557.273763,188.787872 561.148902,189.159224 563.28455,192.358981 C565.156393,195.164852 564.981724,199.457032 567.996121,201.270528 C571.491308,203.372453 572.470897,201.119103 573.279418,198.199663 C574.197783,194.878226 576.793513,191.079979 573.608049,188.688725 C570.599054,186.429967 566.335861,186.181197 562.815464,185.345655 C561.030955,184.922927 558.664816,183.378931 556.965841,183.239224 C554.843699,183.064364 554.346701,185.041903 552.543285,185.044608 C551.584404,185.045509 550.740769,184.11803 549.826907,183.823292 C549.620725,183.756593 549.07961,184.512817 548.831111,184.443414 C547.937957,184.192841 547.865928,183.894498 546.994382,183.536666 C543.889049,182.26127 539.782519,180.250381 540.719791,176.373718 C541.22219,174.294327 544.629143,170.949454 542.251299,169.042219 C540.016612,167.248553 537.01662,170.988212 535.784931,167.245849 C534.910684,164.587797 537.043631,163.874838 534.330854,161.687286 C532.336562,160.078394 530.499833,159.641244 531.603671,156.691159 C532.313153,154.791134 536.006419,151.90234 534.947599,149.611134 C533.448504,146.369014 527.74564,149.647188 528.295758,143.78938 C528.688314,139.593642 533.963508,136.56514 533.998622,132.437004 C534.023832,129.482412 531.22192,129.503142 530.493531,127.583289 C529.774145,125.685968 530.431406,125.693179 531.482123,124.360998 C532.261833,123.371327 532.768734,123.042338 533.351265,121.876004 C534.059846,120.458197 535.283432,118.622167 534.82335,116.972715 C534.410086,115.490011 532.674196,114.608501 532.238423,112.96626 C530.59257,106.778561 543.662159,92.7212645 546.991681,101.239828 C549.464063,98.3798763 552.70535,92.3922754 557.073884,92.8717882 C559.715533,93.1620197 558.586485,93.9155398 559.503949,95.4415083 C560.169313,96.549255 562.015046,97.1116911 562.538154,98.3095718 C563.573565,95.0935911 562.475128,89.1339317 565.353571,86.7742239 C568.159085,84.4740045 569.921985,88.5210206 571.114959,90.7725677 C571.882964,88.6481095 572.37636,84.6614832 575.024311,83.8989497 C577.857736,83.0850398 579.626038,86.6300095 581.006286,88.4353933 C582.492776,86.3226526 585.280283,80.0961967 588.490958,80.8551249 C590.899414,81.4238704 592.091487,85.4447476 593.216934,87.3006064 C595.852281,85.5700338 600.004729,81.4022382 603.416184,81.8429934 C606.738503,82.2711299 606.445887,85.3861605 610.33183,84.1116659 C613.149048,83.1868912 616.077911,80.73074 619.068898,80.5468667 C622.22195,80.3530786 623.889412,82.563164 627.390903,82.0268668 C631.107578,81.4581213 631.675704,80.592835 634.098566,83.6276464 C635.295141,85.1256733 634.978215,85.7827501 637.053539,86.0964163 C638.809236,86.3623116 640.346146,85.2022872 642.186477,85.9332738 C643.547818,86.4731764 644.498595,87.7341509 645.068521,89.0302777 C645.741989,90.5607528 644.962279,93.2133961 645.633946,94.4175861 C646.926859,96.7340296 651.814,94.6897908 654.008171,96.2986825 C656.967646,98.4700103 654.181039,101.76621 655.756665,104.171886 C657.021667,106.103458 660.586182,105.611326 662.005146,108.218001 C663.290856,110.57861 662.989237,113.699049 661.497344,115.886601 C660.870695,116.805968 659.109596,117.5676 658.697232,118.399536 C657.846395,120.115688 658.560378,119.91559 659.054674,121.669598 C660.00185,125.024385 659.243749,126.289866 656.658823,128.584677 C655.163329,129.912351 654.850905,129.531084 654.750966,131.548283 C654.674435,133.104897 655.998861,134.547942 655.753064,136.290232 C655.353305,139.120439 652.569399,140.898783 651.731167,143.681219 C650.651638,147.262242 647.702067,149.221755 645.479084,152.169137 C648.107228,153.754593 651.560999,155.068747 652.835905,158.044971 C654.227858,161.291598 653.970356,165.912767 652.983564,169.206263 C652.037288,172.362755 650.011484,174.37725 648.06311,176.882074 C645.691569,179.932208 645.894149,182.350503 645.747391,186.073036 C645.436768,193.942635 642.060427,201.089359 634.341662,203.588774 C631.280447,204.580248 628.515449,206.038616 625.408315,206.963391 C621.609707,208.094572 618.830304,208.186509 614.889439,207.962977 C612.42426,207.82417 609.540415,207.29238 608.683275,209.90266 C608.253804,211.2078 608.410467,216.287752 608.995699,217.446875 C609.996897,219.431625 612.833923,219.168434 614.543702,220.884585 C617.626526,223.979787 616.75498,226.618008 621.958146,226.690116 C638.813738,226.925365 655.61711,225.62383 672.472702,226.844245 C680.784802,227.44634 688.919532,228.883075 697.264945,229.305804 C706.449492,229.769994 715.658348,229.925024 724.835692,230.482954 C733.499832,231.009336 741.976698,232.144123 750.685856,231.695256 C758.819685,231.276133 766.632087,230.718203 774.732603,229.819568 C777.503903,229.512211 781.796808,229.953867 783.755085,227.834817 C784.840016,226.660371 785.090316,224.645877 786.173446,223.352454 C787.173743,222.158179 788.530581,221.293794 789.758669,220.361808 C792.736151,218.102149 795.542566,216.069628 799.470825,216.144439 C802.911991,216.210237 805.656281,218.696132 808.461795,220.524049 C811.716587,222.646705 813.065323,223.621955 816.924255,222.799031 C820.772383,221.979713 824.300884,220.460054 828.054474,219.342393 C835.973118,216.985389 843.392964,213.594548 850.605728,209.573671 C854.158538,207.592526 856.662433,206.261247 860.753657,207.45372 C864.948422,208.675937 866.141396,209.879225 866.191816,214.235401 C866.207122,215.618056 865.680413,218.07601 867.269544,218.874597 C868.422902,219.454159 870.96281,217.837155 871.942399,217.411723 C876.269517,215.534232 880.518304,213.578324 885.042601,212.207386 C889.17074,210.955425 893.351099,209.844974 897.496345,208.649798 C900.964522,207.64931 905.588758,206.200857 909.04433,208.063025 C917.773296,212.766217 904.928796,224.717083 901.593872,228.692893 C905.752623,227.696011 914.680568,228.264756 916.868437,232.729093 C919.457865,238.012747 914.267304,243.252236 911.337541,247.092845 C915.44047,248.961323 923.723759,247.354234 924.879818,253.237279 C925.851303,258.17572 920.713863,263.150215 917.366334,266.03901 C908.698593,273.516525 895.258057,278.752409 883.812712,278.850655 C880.908159,278.875892 878.078335,278.309851 875.189989,278.171946 C873.075949,278.071897 871.168992,278.802884 869.115277,278.805588 C866.220628,278.809193 863.653708,278.240448 860.668123,278.648755 C857.226957,279.119254 853.813701,279.697013 850.357229,280.086392 C847.150156,280.446928 843.941282,280.775917 840.723404,281.026489 C838.603062,281.193237 835.404092,280.72454 833.43411,281.436599 C830.884298,282.357768 831.627993,283.278938 831.420911,285.731483 C831.165209,288.74286 829.640004,291.464906 827.421523,293.473092 C819.360622,300.768537 805.633772,299.017233 801.583064,288.308414 C800.597172,285.703542 801.906292,284.342519 801.534445,281.994528 C801.160796,279.632116 798.963024,279.712336 796.811169,279.552798 C790.261069,279.067878 783.626334,279.022811 777.048323,278.569437 C764.315467,277.692433 751.19996,275.905977 738.472506,276.209729 C725.190433,276.526099 711.823726,275.726611 698.555158,275.005539 C692.3643,274.669339 685.950153,272.498011 679.856534,272.966708 C673.383864,273.463346 666.509634,272.068973 660.002751,271.392968 C645.457476,269.88052 629.221329,269.442469 615.779893,263.398985 C616.842314,277.970046 618.607915,292.762836 606.784421,303.630291 C601.829754,308.18386 595.604682,313.399914 589.108603,315.3414 C580.735278,317.843519 572.708592,319.918404 564.187608,321.775164 C548.343118,325.228197 532.600367,333.491681 518.305391,340.915116 C511.581522,344.406907 503.691689,345.76793 496.402395,347.724739 C492.930617,348.657626 489.019464,349.887054 485.378418,349.757261 C481.790493,349.62927 479.300105,347.191146 476.132647,345.735482 C473.102944,352.874094 469.01172,359.40971 465.962209,366.455483 C464.449608,369.950879 463.257535,373.667104 461.495536,377.04803 C460.152202,379.62496 457.977839,381.01032 457.772557,383.998262 C457.272859,391.252245 458.599986,398.818993 458.244345,406.154999 C457.856291,414.156193 456.612897,422.276364 455.880006,430.286571 C454.295377,447.597705 455.03457,465.027816 453.74886,482.362384 C452.573893,498.198025 453.307685,513.911984 451.551087,529.762046 C451.063994,534.161486 450.522879,538.55642 450.170839,542.970281 C449.940348,545.866286 448.336811,552.534399 449.846711,555.130257 C450.506673,556.265044 452.093102,556.386725 453.153724,556.955471 C454.808581,557.84329 456.313978,559.200708 457.551069,560.614009 C460.162106,563.597444 460.786054,567.149625 461.38119,570.950575 C464.761132,569.133474 478.930058,559.802803 476.807915,570.021294 C476.150654,573.190405 473.275813,574.898444 471.007812,576.920149 C469.344852,578.401952 467.759323,579.973889 465.99012,581.332208 C464.797146,582.247969 462.268943,583.383657 461.692714,584.879882 C460.665406,587.554157 465.976615,591.372233 468.48321,591.342489 C472.004508,591.301928 476.400053,586.018274 479.383838,584.33367 C487.303382,579.861221 486.587598,589.519979 483.602013,593.717519 C481.349318,596.885729 483.254475,596.642367 486.352605,597.285022 C491.195628,598.290918 495.668604,599.148993 500.591758,599.762806 C510.000494,600.937252 519.25887,599.421198 528.595577,601.593427 C537.891768,603.757544 543.419062,609.557666 544.7732,619.122685 C545.488984,624.175597 546.160651,621.639226 550.403135,622.824488 C554.322392,623.919616 556.53457,628.400177 558.789965,631.437692 C563.292653,637.500104 571.710095,652.770604 564.814257,659.91823 C561.886295,662.953041 554.776172,662.182395 550.921741,662.700666 C548.442157,663.03326 545.457472,664.189679 542.955378,663.59119 C540.576634,663.022444 538.994706,660.894381 537.278624,659.334161 C537.256116,668.928023 537.198493,677.261812 529.595874,684.188609 C523.461739,689.77962 515.258582,692.345735 507.032916,691.779693 C498.972015,691.226271 490.694129,687.946295 485.5855,681.465661 C482.88983,678.046879 480.971168,673.852944 480.276092,669.54454 C479.954665,667.559789 479.862828,665.473187 480.173451,663.478522 C480.358025,662.294162 481.485272,660.145367 480.769488,659.000666 C479.51529,656.996987 473.36945,658.662663 471.340945,658.867267 C465.985618,659.408071 460.645598,660.083175 455.31098,660.797937 C450.901029,661.389216 446.401943,662.015648 441.976686,661.180106 C438.173576,660.461738 436.720399,660.051628 437.404671,664.552018 C438.780417,673.605977 436.489007,681.636916 429.043951,687.203591 C421.593493,692.773871 414.717463,693.877111 405.605845,692.410631 C397.28114,691.070339 389.665916,683.209754 387.241254,675.388827 C384.013472,664.980154 387.341193,655.498059 395.11488,648.391895 C390.399708,646.003345 387.272766,644.592748 385.609806,639.075646 C383.871216,633.308874 385.496361,627.243758 386.318387,621.460761 C388.083988,609.0421 387.396115,596.955132 388.002956,584.495911 C388.269462,578.998639 389.404813,573.403121 389.42282,567.92027 C389.432724,564.794424 389.259855,564.90619 386.041978,564.880952 C384.045885,564.865629 381.930045,565.005337 381.090011,562.678979 C379.060606,557.068138 388.580085,557.542243 390.974136,555.307821 C393.829169,552.645263 391.857386,542.138344 391.773653,538.441048 C391.502646,526.430694 392.690217,514.699756 392.922509,502.72185 C393.028752,497.311106 393.358282,491.621849 392.910805,486.230034 C392.731634,484.077634 391.500845,482.33895 391.582777,480.197366 C391.687219,477.454589 392.215729,474.89208 392.074373,472.038437 C390.83278,446.937924 390.559971,421.374123 393.78055,396.439456 C393.973227,394.945936 395.028446,391.584839 394.463921,390.08501 C393.608582,387.813633 390.894004,388.61853 388.996951,387.786593 C383.690244,385.461136 382.378423,381.768347 382.088508,376.361209 C381.91744,373.156945 381.747272,369.951781 381.580706,366.746616 C381.495172,365.10077 381.411439,363.454022 381.322304,361.807274 C381.217862,359.899137 382.002974,357.753047 381.957956,356.150464 C381.94265,355.635799 381.721162,354.866956 381.71666,354.563205 C381.101716,354.261256 380.863121,353.817797 380.997275,353.231926 C380.969363,352.681207 381.057599,352.144009 381.261079,351.622133 C381.293492,351.933997 380.891933,349.854605 380.856819,350.038479 C380.912641,349.753655 381.953454,348.067248 381.849013,347.862644 C381.36282,346.908125 380.332811,348.06815 379.988874,346.288905 C379.70166,344.795385 380.674046,343.038673 380.348117,341.290074 C379.47567,336.622035 380.298597,332.434409 380.95946,327.710487" id="react-path-141"></path><path d="M122.656724,401 C181.615893,401.136151 240.713029,402.589889 299.523408,404.330861 C306.004291,404.523229 312.505914,405.071345 318.990403,405.348917 C320.117592,405.39635 323.828296,404.924654 324.664219,406.133321 C326.024059,408.103553 322.910314,410.108043 321.443165,411.006637 C316.395165,414.096819 309.713192,413.557486 303.992485,413.752489 C296.099461,414.01952 288.201928,414.050264 280.305297,413.940465 C252.867727,413.559243 225.418435,411.473942 198.039479,409.851552 C181.174035,408.852821 164.256289,408.24146 147.3674,407.744291 C139.030714,407.49922 130.687716,407.363069 122.351932,407.088132 C120.101162,407.014347 116,407.716182 116,404.757759 C116,401.675483 120.497933,401.166894 122.656724,401" id="react-path-142"></path><path d="M193.167517,434.163089 C234.887903,435.960854 276.637171,437.19295 318.361167,438.858136 C321.066285,438.966851 326.824027,438.168728 327.839462,441.48761 C328.896417,444.938187 324.497102,448.400255 321.586188,449.294718 C317.806062,450.456989 312.993352,449.805587 309.048049,449.916953 C303.738904,450.067209 298.694223,450.020364 293.40313,449.662402 C273.241557,448.296843 253.114283,446.52471 232.948196,445.1565 C221.532,444.382241 210.123927,443.464798 198.72488,442.481065 C195.684893,442.21856 186.657,443.033476 184.527746,440.556025 C183.216255,439.029605 184.606273,436.671475 185.902419,435.494177 C188.037089,433.556763 190.491282,433.99604 193.167517,434.163089" id="react-path-143"></path><path d="M316.267573,479.773392 C302.709655,480.502344 289.001412,479.428237 275.673929,477.189565 C273.858346,476.883932 269.66099,476.84968 268.500708,475.163429 C266.728331,472.588385 270.058852,470.341807 272.299302,470.114339 C278.506672,469.483752 285.887826,471.64953 292.151905,472.031571 C298.704029,472.431177 305.346167,471.732964 311.914493,471.681147 C315.66898,471.651286 319.423467,471.624939 323.178854,471.612643 C325.381498,471.606495 328.548193,471.048803 330.722933,471.54853 C336.808784,472.946713 329.069374,478.071333 326.359051,478.661521 C325.418404,478.867032 316.299078,480.218667 316.267573,479.773392" id="react-path-144"></path><path d="M612.132406,154.520572 C612.222387,152.929871 611.808841,148.908984 613.777499,148.155122 C617.616654,146.685358 617.363074,156.110389 618.859108,157.43715 C624.350628,162.301938 622.870953,143.557805 628.104347,149.602819 C632.356139,154.515275 628.940527,166.351073 622.959116,168.55881 C618.552812,170.18482 615.554381,167.055501 613.84203,163.431847 C613.802039,163.347987 611.421654,154.482614 612.132406,154.520572" id="react-path-145"></path><path d="M617.105065,133.060287 C619.755188,132.55562 623.205514,135.30883 621.582346,137.974846 C620.395175,139.924816 612.351127,142.947534 610.17202,142.998617 C607.497383,143.062031 607.724136,140.93415 608.57862,138.767517 C609.914625,135.376647 613.480516,133.021535 617.105065,133.060287" id="react-path-146"></path><path d="M134,90.3519859 C134.814508,86.9602851 136.016492,82.9418767 140.030597,86.2113377 C142.726746,88.4080067 144.698287,93.8248759 144.968891,97.2129278 C145.292536,101.26965 143.065674,103.333132 139.466016,101.057099 C135.813315,98.7482243 134.41984,94.4908097 134,90.3519859" id="react-path-147"></path><path d="M47,133.003347 C45.6940013,142.072603 37.6494569,133.631997 38.0118739,128.099342 C38.2000341,125.219804 39.8489849,122.859702 42.980972,124.586714 C45.7848372,126.134366 46.7608604,130.201946 47,133.003347" id="react-path-148"></path><path d="M505,663.088905 C505.598248,660.836848 505.729371,656.20242 508.333617,655.214048 C512.187173,653.753056 513.858989,660.156826 513.987381,662.734669 C514.126699,665.528174 513.150562,671.463912 509.151314,670.971103 C505.871421,670.567311 505.654704,665.534598 505,663.088905" id="react-path-149"></path><path d="M408,666.682509 C408.737109,663.925865 408.880263,658.946449 412.192365,658.111749 C415.837899,657.192558 416.954678,662.163618 416.999135,664.975042 C417.040926,667.600772 415.571153,674.402786 411.854486,673.981258 C408.993186,673.65722 408.611738,668.909923 408,666.682509" id="react-path-150"></path></g></g></g></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/jar.mn b/waterfox/browser/components/aboutwelcome/jar.mn
new file mode 100644
index 0000000000000..96f588d8391c3
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/jar.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+browser.jar:
+% content onboarding %content/onboarding/ contentaccessible=yes
+    content/onboarding/assets/  (./assets/*)
\ No newline at end of file
diff --git a/waterfox/browser/components/aboutwelcome/modules/WaterfoxWelcomeConfig.sys.mjs b/waterfox/browser/components/aboutwelcome/modules/WaterfoxWelcomeConfig.sys.mjs
new file mode 100644
index 0000000000000..3ed1c3ff50147
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/modules/WaterfoxWelcomeConfig.sys.mjs
@@ -0,0 +1,407 @@
+/* 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/. */
+
+/**
+ * WaterfoxWelcomeConfig - Custom configuration system for about:welcome
+ *
+ * This module provides Waterfox-specific configuration overrides for the
+ * about:welcome onboarding experience, replacing Nimbus experiment configuration.
+ */
+
+const lazy = {};
+
+ChromeUtils.defineLazyGetter(lazy, "log", () => {
+  const { Logger } = ChromeUtils.importESModule(
+    "resource://messaging-system/lib/Logger.sys.mjs"
+  );
+  return new Logger("WaterfoxWelcomeConfig");
+});
+
+// Simplified Waterfox-specific welcome configuration for testing
+const WATERFOX_WELCOME_CONFIG = {
+  template: "multistage",
+  backdrop: "linear-gradient(135deg, #667eea 0%, #764ba2 100%)",
+
+  screens: [
+    {
+      id: "AW_WATERFOX_WELCOME",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        logo: {},
+        background: "url('chrome://onboarding/content/assets/loving-doodle.svg') center center / 400px no-repeat var(--mr-screen-background-color)",
+        title: {
+          raw: "Welcome to Waterfox",
+        },
+        subtitle: {
+          raw: "The privacy-focused browser that puts you in control of your web experience",
+        },
+        primary_button: {
+          label: {
+            raw: "Let's Get Started",
+          },
+          action: {
+            navigate: true,
+          },
+        },
+      },
+    },
+    {
+      id: "AW_IMPORT_SETTINGS",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        background: "url('chrome://activity-stream/content/data/content/assets/mr-import.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
+        title: {
+          raw: "Import your data",
+        },
+        subtitle: {
+          raw: "Bring your bookmarks, passwords, and more from your previous browser",
+        },
+        tiles: {
+          type: "migration-wizard",
+        },
+        migrate_start: {
+          action: {},
+        },
+        migrate_close: {
+          action: {
+            navigate: true,
+          },
+        },
+        secondary_button: {
+          label: {
+            raw: "Skip",
+          },
+          action: {
+            navigate: true,
+          },
+          has_arrow_icon: true,
+        },
+      },
+    },
+    {
+      id: "AW_CHOOSE_THEME",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        title: {
+          raw: "Choose your theme",
+        },
+        background: "url('chrome://onboarding/content/assets/plant-doodle.svg') center center / 400px no-repeat var(--mr-screen-background-color)",
+        subtitle: {
+          raw: "Make Waterfox look the way you want",
+        },
+        tiles: {
+          type: "theme",
+          action: {
+            theme: "<event>",
+          },
+          data: [
+            {
+              theme: "automatic",
+              label: "Automatic",
+              tooltip: "Follow your system appearance",
+              description: "Adapts to your system settings",
+            },
+            {
+              theme: "light",
+              label: "Light",
+              tooltip: "Use a light appearance",
+              description: "Bright and clean interface",
+            },
+            {
+              theme: "dark",
+              label: "Dark",
+              tooltip: "Use a dark appearance",
+              description: "Easy on the eyes",
+            },
+            {
+              theme: "alpenglow",
+              label: "Alpenglow",
+              tooltip: "Use a colorful appearance",
+              description: "Vibrant and dynamic",
+            },
+          ],
+        },
+        primary_button: {
+          label: {
+            raw: "Save and Continue",
+          },
+          action: {
+            navigate: true,
+          },
+        },
+      },
+    },
+    {
+      id: "AW_ADDON_RECOMMENDATIONS",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        title: {
+          raw: "Recommended Extensions",
+        },
+        background: "url('chrome://onboarding/content/assets/float-doodle.svg') center center / 400px no-repeat var(--mr-screen-background-color)",
+        subtitle: {
+          raw: "Enhance your Waterfox experience with these popular extensions",
+        },
+        tiles: {
+          type: "addons-picker",
+          data: [
+            {
+              id: "sponsorBlocker@ajay.app",
+              name: "SponsorBlock",
+              type: "extension",
+              description: "Skip sponsorships, subscription begging and more on YouTube videos. Report sponsors on videos you watch to save others' time.",
+              icon: "https://addons.mozilla.org/user-media/addon_icons/2590/2590937-64.png",
+              author: {
+                name: "Ajay Ramachandran",
+                byLine: "by",
+                id: "13574006",
+              },
+              install_label: "Add to Waterfox",
+              install_complete_label: "Added",
+              action: {
+                type: "INSTALL_ADDON_FROM_URL",
+                data: {
+                  url: "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock",
+                },
+              },
+            },
+            {
+              id: "password-manager-firefox-extension@apple.com",
+              name: "iCloud Passwords",
+              type: "extension",
+              description: "Access your iCloud Keychain passwords and passkeys in Firefox.",
+              icon: "https://addons.mozilla.org/user-media/addon_icons/2819/2819247-64.png",
+              author: {
+                name: "Apple Inc.",
+                byLine: "by",
+                id: "4757635",
+              },
+              install_label: "Add to Waterfox",
+              install_complete_label: "Added",
+              action: {
+                type: "INSTALL_ADDON_FROM_URL",
+                data: {
+                  url: "https://addons.mozilla.org/firefox/downloads/latest/icloud-passwords",
+                },
+              },
+            },
+            {
+              id: "@testpilot-containers",
+              name: "Multi-Account Containers",
+              type: "extension",
+              description: "Multi-Account Containers lets you keep parts of your online life separated into color-coded tabs.",
+              icon: "https://addons.mozilla.org/user-media/addon_icons/782/782160-64.png",
+              author: {
+                name: "Mozilla Firefox",
+                byLine: "by",
+                id: "4757636",
+              },
+              install_label: "Add to Waterfox",
+              install_complete_label: "Added",
+              action: {
+                type: "INSTALL_ADDON_FROM_URL",
+                data: {
+                  url: "https://addons.mozilla.org/firefox/downloads/latest/multi-account-containers",
+                },
+              },
+            },
+          ],
+        },
+        primary_button: {
+          label: {
+            raw: "Continue",
+          },
+          action: {
+            navigate: true,
+          },
+        },
+      },
+    },
+    {
+      id: "AW_SET_DEFAULT_AND_PIN",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        background: "url('chrome://activity-stream/content/data/content/assets/mr-pintaskbar.svg') var(--mr-secondary-position) no-repeat var(--mr-screen-background-color)",
+        title: {
+          raw: "Make Waterfox your default",
+        },
+        subtitle: {
+          raw: "Set Waterfox as your default browser and pin it for easy access",
+        },
+        tiles: {
+          type: "multiselect",
+          data: [
+            {
+              id: "checkbox-1",
+              defaultValue: true,
+              label: {
+                raw: "Set as default browser",
+              },
+              action: {
+                type: "SET_DEFAULT_BROWSER",
+              },
+            },
+            {
+              id: "checkbox-2",
+              defaultValue: true,
+              label: {
+                raw: "Pin Waterfox to taskbar",
+              },
+              action: {
+                type: "MULTI_ACTION",
+                data: {
+                  actions: [
+                    {
+                      type: "PIN_FIREFOX_TO_TASKBAR",
+                    },
+                    {
+                      type: "PIN_FIREFOX_TO_START_MENU",
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+        primary_button: {
+          label: {
+            raw: "Continue",
+          },
+          action: {
+            type: "MULTI_ACTION",
+            collectSelect: true,
+            navigate: true,
+            data: {
+              actions: [],
+            },
+          },
+        },
+        secondary_button: {
+          label: {
+            raw: "Skip",
+          },
+          action: {
+            navigate: true,
+          },
+          has_arrow_icon: true,
+        },
+      },
+    },
+    {
+      id: "AW_MOBILE_DOWNLOAD",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        title: {
+          raw: "Get Waterfox for Android",
+        },
+        subtitle: {
+          raw: "Scan the QR code to download Waterfox for your Android device",
+        },
+        background: "url('chrome://onboarding/content/assets/laying-doodle.svg') center center / 400px no-repeat var(--mr-screen-background-color)",
+        tiles: {
+          type: "mobile_downloads",
+          data: {
+            QR_code: {
+              image_url: "chrome://onboarding/content/assets/qr-play-google-com.svg",
+              alt_text: "QR code to download Waterfox for Android",
+            },
+          },
+        },
+        primary_button: {
+          label: {
+            raw: "Continue",
+          },
+          action: {
+            navigate: true,
+          },
+        },
+      },
+    },
+    {
+      id: "AW_WATERFOX_FINISH",
+      content: {
+        fullscreen: true,
+        position: "split",
+        progress_bar: true,
+        background: "url('chrome://onboarding/content/assets/roller-skating-doodle.svg') center center / 80% no-repeat var(--mr-screen-background-color)",
+        title: {
+          raw: "You're all set!",
+        },
+        subtitle: {
+          raw: "Welcome to Waterfox - your privacy-focused browsing journey begins now!",
+        },
+        primary_button: {
+          label: {
+            raw: "Start Browsing",
+          },
+          action: {
+            navigate: true,
+            type: "OPEN_URL",
+            data: {
+              args: "about:home",
+            },
+          },
+        },
+      },
+    },
+  ],
+};
+
+export const WaterfoxWelcomeConfig = {
+  /**
+   * Get the complete Waterfox welcome configuration
+   * @returns {Object} The merged configuration object
+   */
+  getConfig() {
+    let config = Cu.cloneInto(WATERFOX_WELCOME_CONFIG, {});
+
+    try {
+      lazy.log.debug("Generated Waterfox welcome config", config);
+    } catch (e) {
+      lazy.log.error("Error generating Waterfox welcome config:", e);
+    }
+
+    return config;
+  },
+
+  /**
+   * Get feature variables (Nimbus compatibility method)
+   * @returns {Object} Feature configuration variables
+   */
+  getAllVariables() {
+    return this.getConfig();
+  },
+
+  /**
+   * Get enrollment metadata (Nimbus compatibility method)
+   * @returns {Object} Empty metadata object
+   */
+  getEnrollmentMetadata() {
+    return {
+      slug: "waterfox-default",
+      branch: "control",
+      source: "waterfox-config",
+    };
+  },
+
+  /**
+   * Check if Waterfox welcome customization is enabled
+   * @returns {Boolean} True if enabled
+   */
+  isEnabled() {
+    return true;
+  },
+};
diff --git a/waterfox/browser/components/aboutwelcome/moz.build b/waterfox/browser/components/aboutwelcome/moz.build
new file mode 100644
index 0000000000000..542af1b62208c
--- /dev/null
+++ b/waterfox/browser/components/aboutwelcome/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
+
+EXTRA_JS_MODULES.aboutwelcome += [
+    "modules/WaterfoxWelcomeConfig.sys.mjs",
+]
diff --git a/waterfox/browser/components/addonstores/AddonStores.sys.mjs b/waterfox/browser/components/addonstores/AddonStores.sys.mjs
new file mode 100644
index 0000000000000..5d9aae67a9aba
--- /dev/null
+++ b/waterfox/browser/components/addonstores/AddonStores.sys.mjs
@@ -0,0 +1,47 @@
+/* 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/. */
+
+const CRX_CONTENT_TYPE = "application/x-chrome-extension";
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  StoreHandler: "resource:///modules/StoreHandler.sys.mjs",
+});
+
+export function ExtensionCompatibilityHandler() {}
+
+ExtensionCompatibilityHandler.prototype = {
+  /**
+   * Handles a new request for an application/x-xpinstall file.
+   *
+   * @param  aMimetype
+   *         The mimetype of the file
+   * @param  aContext
+   *         The context passed to nsIChannel.asyncOpen
+   * @param  aRequest
+   *         The nsIRequest dealing with the content
+   */
+  async handleContent(aMimetype, _aContext, aRequest) {
+    const uri = aRequest.URI;
+    if (aMimetype === CRX_CONTENT_TYPE) {
+      // attempt install
+      try {
+        return new lazy.StoreHandler().attemptInstall(uri);
+      } catch (ex) {
+        this.log(ex);
+      }
+    }
+    return undefined;
+  },
+
+  classID: Components.ID("{478ebd10-5998-11eb-be34-0800200c9a66}"),
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIContentHandler]),
+
+  log(aMsg) {
+    const msg = `addon_stores.js: ${aMsg.join ? aMsg.join("") : aMsg}`;
+    Services.console.logStringMessage(msg);
+    dump(`${msg}\n`);
+  },
+};
diff --git a/waterfox/browser/components/addonstores/StoreHandler.sys.mjs b/waterfox/browser/components/addonstores/StoreHandler.sys.mjs
new file mode 100644
index 0000000000000..58235ae6206b8
--- /dev/null
+++ b/waterfox/browser/components/addonstores/StoreHandler.sys.mjs
@@ -0,0 +1,577 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
+  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
+  FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+  NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
+});
+
+ChromeUtils.defineLazyGetter(lazy, "PopupNotifications", () => {
+  // eslint-disable-next-line no-shadow
+  const { PopupNotifications } = ChromeUtils.importESModule(
+    "resource://gre/modules/PopupNotifications.sys.mjs"
+  );
+  try {
+    const win = lazy.BrowserWindowTracker.getTopWindow();
+    const gBrowser = win.gBrowser;
+    const document = win.document;
+    const gURLBar = win.gURLBar;
+    const shouldSuppress = () => {
+      return (
+        win.windowState === win.STATE_MINIMIZED ||
+        (gURLBar.getAttribute("pageproxystate") !== "valid" &&
+          gURLBar.focused) ||
+        gBrowser?.selectedBrowser.hasAttribute("tabmodalChromePromptShowing") ||
+        gBrowser?.selectedBrowser.hasAttribute("tabDialogShowing")
+      );
+    };
+    return new PopupNotifications(
+      gBrowser,
+      document.getElementById("notification-popup"),
+      document.getElementById("notification-popup-box"),
+      { shouldSuppress }
+    );
+  } catch (ex) {
+    console.error(ex);
+    return null;
+  }
+});
+
+const ZipReader = Components.Constructor(
+  "@mozilla.org/libjar/zip-reader;1",
+  "nsIZipReader",
+  "open"
+);
+
+const zw = Cc["@mozilla.org/zipwriter;1"].createInstance(Ci.nsIZipWriter);
+
+const ReusableStreamInstance = Components.Constructor(
+  "@mozilla.org/scriptableinputstream;1",
+  "nsIScriptableInputStream",
+  "init"
+);
+
+const uuidGenerator = Services.uuid;
+
+export class StoreHandler {
+  // init vars
+  constructor() {
+    this.uuidString = this._getUUID().slice(1, -1);
+    const profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path;
+    this.xpiPath = PathUtils.join(
+      profileDir,
+      "extensions",
+      "tmp",
+      this.uuidString,
+      "extension.xpi"
+    );
+    this.manifestPath = PathUtils.join(
+      profileDir,
+      "extensions",
+      "tmp",
+      this.uuidString,
+      "new_manifest.json"
+    );
+    this.nsiFileXpi = this._getNsiFile(this.xpiPath);
+    this.nsiManifest = this._getNsiFile(this.manifestPath);
+  }
+
+  /**
+   * Remove dir if it exists
+   *
+   * @param dir string absolute path to directory to remove
+   */
+  flushDir(dir) {
+    return new Promise((resolve) => {
+      const nsiDir = this._getNsiFile(dir);
+      if (nsiDir.exists()) {
+        // remove all files
+        nsiDir.remove(true);
+      }
+      resolve();
+    });
+  }
+
+  /**
+   * Return extension UUID, set and return if not already set
+   */
+  _getUUID() {
+    if (!this._extensionUUID) {
+      this._setUUID();
+    }
+    return this._extensionUUID;
+  }
+
+  /**
+   * Set extension UUID
+   */
+  _setUUID() {
+    const uuid = uuidGenerator.generateUUID();
+    const uuidString = uuid.toString();
+    this._extensionUUID = uuidString;
+  }
+
+  /**
+   * Reset extension UUID
+   */
+  _resetUUID() {
+    return new Promise((resolve) => {
+      this._extensionUUID = undefined;
+      resolve();
+    });
+  }
+
+  /**
+   * Display prompt in event of failed installation
+   *
+   * @param msg string message to display
+   */
+  _installFailedMsg(
+    msg = "Encountered an error during extension installation"
+  ) {
+    const anchorID = "addons-notification-icon";
+    const win = lazy.BrowserWindowTracker.getTopWindow();
+    const browser = win.gBrowser.selectedBrowser;
+    const action = {
+      label: "OK",
+      accessKey: "failed_accessKey",
+      callback: () => {},
+    };
+    const options = {
+      persistent: true,
+      hideClose: true,
+    };
+    lazy.PopupNotifications.show(
+      browser,
+      "addon-install-failed",
+      msg,
+      anchorID,
+      action,
+      null,
+      options
+    );
+  }
+
+  /**
+   * Get an nsiFile object from a given path
+   *
+   * @param path string path to file
+   */
+  _getNsiFile(path) {
+    const nsiFile = new lazy.FileUtils.File(path);
+    return nsiFile;
+  }
+
+  /**
+   * Attempt to install a crx extension
+   *
+   * @param uri object uri of request
+   * @param retry bool is this a retry attempt or not
+   */
+  attemptInstall(uri, retry = false) {
+    const channel = lazy.NetUtil.newChannel({
+      uri: uri.spec,
+      loadUsingSystemPrincipal: true,
+    });
+    lazy.NetUtil.asyncFetch(channel, (aInputStream, aResult) => {
+      // Check that we had success.
+      if (!Components.isSuccessCode(aResult)) {
+        if (!retry) {
+          this.attemptInstall(uri, true);
+          return false;
+        }
+        this._installFailedMsg(
+          "The add-on could not be downloaded because of a connection failure."
+        );
+        return false;
+      }
+      // write nsiInputStream to nsiOutputStream
+      // this was originally in a separate function but had error
+      // passing input stream between funcs
+      const aOutputStream = lazy.FileUtils.openAtomicFileOutputStream(
+        this.nsiFileXpi
+      );
+      lazy.NetUtil.asyncCopy(
+        aInputStream,
+        aOutputStream,
+        async (aResultInner) => {
+          // Check that we had success.
+          if (!Components.isSuccessCode(aResultInner)) {
+            // delete any tmp files
+            this._cleanup(this.nsiFileXpi);
+            this._installFailedMsg(
+              "This add-on could not be installed because of a filesystem error."
+            );
+            return false;
+          }
+          try {
+            await this._removeChromeHeaders(this.xpiPath);
+            const manifest = this._amendManifest(this.nsiFileXpi);
+            // Notify tests
+            Services.obs.notifyObservers(null, "waterfox-test-stores");
+            if (Array.isArray(manifest)) {
+              this._cleanup(this.nsiFileXpi);
+              this._installFailedMsg(
+                "This add-on could not be installed because not all of its features are supported."
+              );
+              Services.console.logStringMessage(
+                `CRX: Unsupported APIs: ${manifest.join(",")}`
+              );
+              return false;
+            }
+            this._writeTmpManifest(this.nsiManifest, manifest);
+            this._replaceManifestInXpi(this.nsiFileXpi, this.nsiManifest);
+            await this._installXpi(this.nsiFileXpi);
+            // this._cleanup(this.nsiFileXpi);
+            this._resetUUID();
+          } catch (e) {
+            // delete any tmp files
+            this._cleanup(this.nsiFileXpi);
+            this._installFailedMsg(
+              "There was an issue while attempting to install the add-on."
+            );
+            Services.console.logStringMessage(
+              `CRX: Error installing add-on: ${e}`
+            );
+            return false;
+          }
+        }
+      );
+    });
+  }
+
+  /**
+   * Remove Chrome headers from crx addon
+   *
+   * @param path string path to downloaded extension file
+   */
+   async _removeChromeHeaders(path) {
+       let i; // Declare i at the root of the function scope to be used in the loop and after.
+       try {
+         // read using IOUtils to enable data manipulation
+         const arrayBuffer = await IOUtils.read(path);
+         // determine Chrome ext headers
+         let locOfPk = arrayBuffer.slice(0, 3000);
+         for (i = 0; i < locOfPk.length; i++) { // Initialize and use the function-scoped i
+           if (
+             locOfPk[i] === 80 &&
+             locOfPk[i + 1] === 75 &&
+             locOfPk[i + 2] === 3 &&
+             locOfPk[i + 3] === 4
+           ) {
+             locOfPk = null;
+             break;
+           }
+         }
+         if (i === 3000) {
+           Services.console.logStringMessage("CRX: Magic not found");
+           return false;
+         }
+         // remove Chrome ext headers
+         const zipBuffer = arrayBuffer.slice(i);
+         // overwrite .zip with headers removed as ZipReader only compatible with nsiFile type, not Uint8Array
+         await IOUtils.write(path, zipBuffer);
+         return true;
+       } catch (_e) {
+         Services.console.logStringMessage("CRX: Error removing Chrome headers");
+         return false;
+       }
+     }
+
+  /**
+   * Check API compatibility and maybe add id and remove update_url from manifest
+   *
+   * @param file nsiFile tmp extension file
+   */
+   _amendManifest(file) {
+       try {
+         // unzip nsiFile object
+         const zr = new ZipReader(file);
+         let manifest = this._parseManifest(zr);
+         // only manifest version 2 currently supported
+         if (manifest.manifest_version !== 2 || !manifest.manifest_version) {
+           this._installFailedMsg(
+             "Manifest version not supported, must be manifest_version: 2"
+           );
+           return false;
+         }
+         // ensure locale properties set correctly
+         manifest = this._localeCheck(manifest, zr);
+         // check API compatibility
+         const unsupportedApis = this._manifestCompatCheck(manifest);
+         if (unsupportedApis.length) {
+           return unsupportedApis;
+         }
+         manifest.applications = {
+           gecko: {
+             id: this._getUUID(),
+           },
+         };
+         // cannot allow auto update of crx extensions
+         manifest.update_url = undefined;
+         manifest = JSON.stringify(manifest);
+         // close zipReader
+         zr.close();
+         return manifest;
+       } catch (e) {
+         Services.console.logStringMessage(`CRX: Error updating manifest: ${e}`);
+         return false;
+       }
+     }
+
+  /**
+   * Parse manifest file into JS Object
+   *
+   * @param zr nsiZipReader ZipReader object
+   */
+  _parseManifest(zr) {
+    const entryPointer = "manifest.json";
+    let manifest;
+    if (zr.hasEntry(entryPointer)) {
+      const entry = zr.getEntry(entryPointer);
+      const inputStream = zr.getInputStream(entryPointer);
+      const rsi = new ReusableStreamInstance(inputStream);
+      const fileContents = rsi.read(entry.realSize);
+      manifest = JSON.parse(fileContents);
+    }
+    return manifest;
+  }
+
+  /**
+   * Check support for APIs in manifest
+   *
+   * @param manifest Object manifest to compatibility check
+   */
+   _manifestCompatCheck(manifest) {
+       const unsupported = {
+         externally_connectable: "",
+         storage: "",
+         chrome_settings_overrides: {
+           search_provider: {
+             alternate_urls: "",
+             image_url: "",
+             image_url_post_params: "",
+             instant_url: "",
+             instant_url_post_params: "",
+             prepopulated_id: "",
+           },
+           startup_pages: "",
+         },
+         chrome_url_overrides: {
+           bookmarks: "",
+           history: "",
+         },
+         commands: {
+           global: "",
+         },
+         incognito: "split",
+         offline_enabled: "",
+         optional_permissions: [
+           "background",
+           "contentSettings",
+           "contextMenus",
+           "debugger",
+           "pageCapture",
+           "tabCapture",
+         ],
+         options_page: "",
+         permissions: [
+           "background",
+           "contentSettings",
+           "debugger",
+           "pageCapture",
+           "tabCapture",
+         ],
+         version_name: "",
+       };
+       const unsupportedInManifest = [];
+
+       for (const arr of Object.entries(manifest)) {
+         const manifestKey = arr[0];
+         const manifestValue = arr[1];
+
+         if (
+           Object.keys(unsupported).includes(manifestKey) &&
+           unsupported[manifestKey] === ""
+         ) {
+           // if manifest key is in unsupported list and
+           // no value associated with unsupported key
+           // we know it's unsupported in it's entirety
+           unsupportedInManifest.push(manifestKey);
+         } else if (
+           Object.keys(unsupported).includes(manifestKey) &&
+           typeof unsupported[manifestKey] === "string" &&
+           unsupported[manifestKey] === manifestValue
+         ) {
+           // if key is unsupported and value matches
+           // value in unsupported, we know the kv pair
+           // only is unsupported
+           unsupportedInManifest.push(`${manifestKey}: ${manifestValue}`);
+         } else if (
+           Object.keys(unsupported).includes(manifestKey) &&
+           Array.isArray(unsupported[manifestKey]) &&
+           Array.isArray(manifestValue)
+         ) {
+           // if value in unsupported is an array, we know
+           // key is permissions related so we need to check
+           // each permission against the unsupported array
+           const permissionArr = []; // Changed var to let, scoped within this block
+           for (const value of manifestValue) {
+             if (unsupported[manifestKey].includes(value)) {
+               permissionArr.push(`${manifestKey}.${value}`);
+             }
+           }
+           if (permissionArr.length) {
+             unsupportedInManifest.push(...permissionArr);
+           }
+         } else if (
+           Object.keys(unsupported).includes(manifestKey) &&
+           typeof unsupported[manifestKey] === "object" &&
+           unsupported[manifestKey] !== null &&
+           !Array.isArray(unsupported[manifestKey]) &&
+           typeof manifestValue === "object" &&
+           manifestValue !== null &&
+           !Array.isArray(manifestValue)
+         ) {
+           // if value in unsupported is object we need to
+           // identify if this is the final layer or if there
+           // is another object for one of the keys here
+           for (const key of Object.keys(manifestValue)) {
+             if (
+               Object.keys(unsupported[manifestKey]).includes(key) &&
+               typeof unsupported[manifestKey][key] === "string"
+             ) {
+               // if object value in unsupported is string we know that
+               // it is unsupported in it's entirety
+               unsupportedInManifest.push(`${manifestKey}.${key}`);
+               // TODO: need to rewrite this to be recursive so we don't have to go down the nesting
+             } else if (
+               Object.keys(unsupported[manifestKey]).includes(key) &&
+               typeof unsupported[manifestKey][key] === "object" &&
+               unsupported[manifestKey][key] !== null &&
+               !Array.isArray(unsupported[manifestKey][key]) &&
+               typeof manifestValue[key] === "object" &&
+               manifestValue[key] !== null &&
+               !Array.isArray(manifestValue[key])
+             ) {
+               // if object value in unsupported is another object
+               // we have to dig through the extra layer
+               for (const value of Object.keys(manifestValue[key])) {
+                 if (
+                   Object.keys(unsupported[manifestKey][key]).includes(value)
+                 ) {
+                   unsupportedInManifest.push(
+                     `${manifestKey}.${key}.${value}`
+                   );
+                 }
+               }
+             }
+           }
+         }
+       }
+       return unsupportedInManifest;
+     }
+
+  /**
+   * Ensure manifest compliance based on extension contents
+   *
+   * @param manifest
+   * @param zr
+   */
+   _localeCheck(manifest, zr) {
+       const entryPointer = "_locales/";
+       if (zr.hasEntry(entryPointer)) {
+         if (!manifest.default_locale) {
+           if (zr.hasEntry("_locales/en/")) {
+             manifest.default_locale = "en";
+           } else {
+             manifest.default_locale = "en-US";
+           }
+         }
+       } else if (manifest.default_locale) {
+         manifest.default_locale = undefined;
+       }
+       return manifest;
+     }
+
+  /**
+   * Write amended manifest to temporary manifest.json
+   *
+   * @param file nsiFile tmp manifest.json
+   * @param manifest string JSON string of amended manifest
+   */
+  _writeTmpManifest(file, manifest) {
+    const manifestOutputStream =
+      lazy.FileUtils.openAtomicFileOutputStream(file);
+    manifestOutputStream.write(manifest, manifest.length);
+  }
+
+  /**
+   * Replace the manifest in the tmp extension file with the amended version
+   *
+   * @param xpiFile nsiFile tmp extension file
+   * @param manifestFile nsiFile tmp manifest.json
+   */
+  _replaceManifestInXpi(xpiFile, manifestFile) {
+    try {
+      const pr = {
+        PR_RDONLY: 0x01,
+        PR_WRONLY: 0x02,
+        PR_RDWR: 0x04,
+        PR_CREATE_FILE: 0x08,
+        PR_APPEND: 0x10,
+        PR_TRUNCATE: 0x20,
+        PR_SYNC: 0x40,
+        PR_EXCL: 0x80,
+      };
+      zw.open(xpiFile, pr.PR_RDWR);
+      zw.removeEntry("manifest.json", false);
+      zw.addEntryFile(
+        "manifest.json",
+        Ci.nsIZipWriter.COMPRESSION_NONE,
+        manifestFile,
+        false
+      );
+      zw.close();
+      return true;
+    } catch (_e) {
+      Services.console.logStringMessage("CRX: Error replacing manifest");
+      return false;
+    }
+  }
+
+  /**
+   * Silently install extension
+   *
+   * @param xpiFile nsiFile tmp extension file to install
+   */
+  async _installXpi(xpiFile) {
+    const install = await lazy.AddonManager.getInstallForFile(xpiFile);
+    const win = lazy.BrowserWindowTracker.getTopWindow();
+    const browser = win.gBrowser.selectedBrowser;
+    const document = win.document;
+    await lazy.AddonManager.installAddonFromAOM(
+      browser,
+      document.documentURI,
+      install
+    );
+  }
+
+  /**
+   * Remove tmp files
+   *
+   * @param zipFile nsiFile tmp extension file
+   */
+  _cleanup(zipFile) {
+    return new Promise((resolve) => {
+      const parent = zipFile.parent;
+      parent.remove(true);
+      resolve();
+    });
+  }
+}
diff --git a/waterfox/browser/components/addonstores/components.conf b/waterfox/browser/components/addonstores/components.conf
new file mode 100644
index 0000000000000..071ad7cad6b31
--- /dev/null
+++ b/waterfox/browser/components/addonstores/components.conf
@@ -0,0 +1,14 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+Classes = [
+    {
+        'cid': '{478ebd10-5998-11eb-be34-0800200c9a66}',
+        'contract_ids': ['@mozilla.org/uriloader/content-handler;1?type=application/x-chrome-extension'],
+        'esModule': 'resource:///modules/AddonStores.sys.mjs',
+        'constructor': 'ExtensionCompatibilityHandler',
+    },
+]
\ No newline at end of file
diff --git a/waterfox/browser/components/addonstores/extension/background.js b/waterfox/browser/components/addonstores/extension/background.js
new file mode 100644
index 0000000000000..7f424338694e7
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/background.js
@@ -0,0 +1,20 @@
+// Handle install request from Chrome Web store button click
+function handleMessage(request, _sender, _sendResponse) {
+  browser.wf.attemptInstallChromeExtension(request.downloadURL);
+}
+
+browser.runtime.onMessage.addListener(handleMessage);
+
+// Send message to content script to add new element to indicate crx install attempt succeeded
+browser.wf.onCrxInstall.addListener((_data) => {
+  browser.tabs
+    .query({
+      currentWindow: true,
+      active: true,
+    })
+    .then((tabs) => {
+      for (const tab of tabs) {
+        browser.tabs.sendMessage(tab.id, { update: true });
+      }
+    });
+});
diff --git a/waterfox/browser/components/addonstores/extension/cws.js b/waterfox/browser/components/addonstores/extension/cws.js
new file mode 100644
index 0000000000000..57289148926ac
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/cws.js
@@ -0,0 +1,142 @@
+/* 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/. */
+/* globals browser */
+
+function _uninit() {
+  updateInstallClickHandlers(document.body, false);
+  unwatchAddingInstallHandlers();
+}
+
+function init() {
+  (function initInstallHandlers() {
+    if (document.body) {
+      updateInstallClickHandlers(document.body, true);
+      watchForAddingInstallHandlers();
+      replaceButtonText();
+      return;
+    }
+    window.requestAnimationFrame(initInstallHandlers);
+  })();
+}
+
+let gObserver;
+init();
+
+function hideElements() {
+  const elementsToHide = Array.from(
+    document.querySelectorAll(
+      '[aria-labelledby="promo-header"], [aria-label="info"]'
+    )
+  );
+
+  for (const element of elementsToHide) {
+    element.style.display = "none";
+  }
+}
+
+function replaceButtonText() {
+  const buttons = Array.from(document.querySelectorAll("button")).filter(
+    (button) => button.textContent.includes("Add to Chrome")
+  );
+
+  for (const button of buttons) {
+    button.textContent = button.textContent.replace(
+      "Add to Chrome",
+      "Add to Waterfox"
+    );
+    button.style.color = "white"; // Add this line
+  }
+}
+
+function updateInstallClickHandlers(node, addHandlers) {
+  if (node.nodeType === Node.ELEMENT_NODE) {
+    const buttons = Array.from(node.querySelectorAll("button")).filter(
+      (button) => button.textContent.includes("Add to Chrome")
+    );
+
+    for (const button of buttons) {
+      if (addHandlers) {
+        button.removeAttribute("disabled");
+        button.addEventListener("click", handleInstall, true);
+      } else {
+        button.setAttribute("disabled", "");
+        button.removeEventListener("click", handleInstall, true);
+      }
+    }
+  }
+}
+
+/**
+ * If return is truthy, the return value is returned.
+ *
+ */
+function _parentNodeUntil(node, maxDepth, predicate) {
+  let curNode = node;
+  let rez;
+  let depth = 0;
+  while (!rez && depth++ < maxDepth) {
+    rez = predicate(curNode);
+    if (!rez) {
+      curNode = curNode.parentNode;
+    }
+  }
+  return rez;
+}
+
+function handleInstall(e) {
+  e.preventDefault();
+  e.stopPropagation();
+
+  // Extract the extension ID from the URL of the page
+  const urlParts = window.location.pathname.split("/");
+  const extId = urlParts[urlParts.length - 1];
+
+  if (!extId) {
+    alert(
+      "Addon Stores Compatibility encountered an error. Failed to determine extension ID."
+    );
+  } else {
+    const downloadURL = buildDownloadURL(extId);
+    browser.runtime.sendMessage({
+      downloadURL,
+    });
+  }
+}
+
+function watchForAddingInstallHandlers() {
+  gObserver = new MutationObserver((mutations) => {
+    for (const mutation of mutations) {
+      if (mutation.type === "childList") {
+        for (const node of mutation.addedNodes) {
+          updateInstallClickHandlers(node, true);
+          hideElements();
+        }
+      }
+    }
+  });
+
+  gObserver.observe(document.body, {
+    childList: true,
+    subtree: true,
+  });
+}
+
+function unwatchAddingInstallHandlers() {
+  gObserver.disconnect();
+}
+
+function buildDownloadURL(extId) {
+  const baseUrl =
+    "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=49.0&acceptformat=crx3&x=id%3D***%26installsource%3Dondemand%26uc";
+  return baseUrl.replace("***", extId);
+}
+
+browser.runtime.onMessage.addListener((_request) => {
+  const ID = "waterfox-extension-test";
+  if (!document.getElementById(ID)) {
+    const el = document.createElement("div");
+    el.setAttribute("id", ID);
+    document.body.appendChild(el);
+  }
+});
diff --git a/waterfox/browser/components/addonstores/extension/experiments/api.js b/waterfox/browser/components/addonstores/extension/experiments/api.js
new file mode 100644
index 0000000000000..4dc66acc93db9
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/experiments/api.js
@@ -0,0 +1,35 @@
+const { StoreHandler } = ChromeUtils.importESModule(
+  "resource:///modules/StoreHandler.sys.mjs"
+);
+
+this.total = class extends ExtensionAPI {
+  getAPI(context) {
+    const EventManager = ExtensionCommon.EventManager;
+
+    return {
+      wf: {
+        onCrxInstall: new EventManager({
+          context,
+          name: "wf.onCrxInstall",
+          register: (fire) => {
+            const observer = (_subject, _topic, data) => {
+              fire.sync(data);
+            };
+            Services.obs.addObserver(observer, "waterfox-test-stores");
+            return () => {
+              Services.obs.removeObserver(observer, "waterfox-test-stores");
+            };
+          },
+        }).api(),
+
+        attemptInstallChromeExtension(uri) {
+          try {
+            new StoreHandler().attemptInstall({ spec: uri });
+          } catch (ex) {
+            console.error(ex);
+          }
+        },
+      },
+    };
+  }
+};
diff --git a/waterfox/browser/components/addonstores/extension/experiments/schema.json b/waterfox/browser/components/addonstores/extension/experiments/schema.json
new file mode 100644
index 0000000000000..fef49d12123d4
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/experiments/schema.json
@@ -0,0 +1,34 @@
+[
+  {
+    "namespace": "wf",
+    "description": "Helper functions for Waterfox extensions.",
+    "events": [
+      {
+        "name": "onCrxInstall",
+        "type": "function",
+        "async": true,
+        "description": "Fired when the waterfox-test-stores observer is notified.",
+        "parameters": [
+          {
+            "name": "data",
+            "type": "object"
+          }
+        ]
+      }
+    ],
+    "functions": [
+      {
+        "name": "attemptInstallChromeExtension",
+        "type": "function",
+        "async": true,
+        "description": "Attempt to install the Chrome extension at the given URI.",
+        "parameters": [
+          {
+            "name": "uri",
+            "type": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/waterfox/browser/components/addonstores/extension/manifest.json b/waterfox/browser/components/addonstores/extension/manifest.json
new file mode 100644
index 0000000000000..c167e017e230f
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/manifest.json
@@ -0,0 +1,49 @@
+{
+  "manifest_version": 2,
+  "name": "Addon Store Compatibility",
+  "description": "Allow installing addons from certain other browser web stores.",
+  "version": "1.0.0",
+  "hidden": true,
+
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "addonstores@waterfox.net",
+      "strict_min_version": "72.0a1"
+    }
+  },
+
+  "content_scripts": [
+    {
+      "matches": [
+        "http://chromewebstore.google.com/*",
+        "https://chromewebstore.google.com/*"
+      ],
+      "js": ["cws.js"],
+      "run_at": "document_start",
+      "all_frames": true
+    },
+    {
+      "matches": ["http://addons.opera.com/*", "https://addons.opera.com/*"],
+      "js": ["ows.js"],
+      "run_at": "document_start",
+      "all_frames": true
+    }
+  ],
+
+  "background": {
+    "scripts": ["background.js"]
+  },
+
+  "permissions": ["tabs", "menus"],
+
+  "experiment_apis": {
+    "total": {
+      "schema": "experiments/schema.json",
+      "parent": {
+        "scopes": ["addon_parent"],
+        "script": "experiments/api.js",
+        "paths": [["wf"]]
+      }
+    }
+  }
+}
diff --git a/waterfox/browser/components/addonstores/extension/ows.js b/waterfox/browser/components/addonstores/extension/ows.js
new file mode 100644
index 0000000000000..4e8c3bf1141e9
--- /dev/null
+++ b/waterfox/browser/components/addonstores/extension/ows.js
@@ -0,0 +1,51 @@
+/* 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/. */
+
+"use-strict";
+
+function init() {
+  const style = document.createElement("style");
+  style.setAttribute("id", "wf-addons-store-style");
+  style.textContent = `
+		a.btn-install.btn-with-plus
+		{
+			border-radius: 2px;
+			box-shadow: 1px 1px 5px rgba(0,0,0,0.3);
+			background: linear-gradient(top,#28bd00 0%,#21a100 100%);
+			width: 150px;
+			/* to get "Add to Waterfox" to be over "Add to Opera" */
+			display: flex;
+			color: transparent;
+		}
+		a.btn-install.btn-with-plus::before {
+			border-right: 1px solid #71BD4C; /* override btn-gray border-right */
+			color: white; /* override color:transparent i set above */
+		}
+		a.btn-install.btn-with-plus::after
+		{
+			display: block;
+			content: "Add To Waterfox";
+			color: white; /* override color:transparent i set above */
+			position: absolute; /* so it overlaps Add to opera */
+		}
+		.site-message.site-message--top
+		{
+			display: none;
+		}
+	`;
+
+  document.documentElement.insertBefore(
+    style,
+    document.documentElement.firstChild
+  );
+}
+
+function _uninit() {
+  const style = document.getElementById("wf-addons-store-style");
+  if (style) {
+    style.remove(style);
+  }
+}
+
+init();
diff --git a/waterfox/browser/components/addonstores/jar.mn b/waterfox/browser/components/addonstores/jar.mn
new file mode 100644
index 0000000000000..9eddf29e8ba2a
--- /dev/null
+++ b/waterfox/browser/components/addonstores/jar.mn
@@ -0,0 +1,3 @@
+browser.jar:
+%   resource builtin-addons %builtin-addons/  contentaccessible=yes
+    builtin-addons/addonstores/ (extension/**)
\ No newline at end of file
diff --git a/waterfox/browser/components/addonstores/moz.build b/waterfox/browser/components/addonstores/moz.build
new file mode 100644
index 0000000000000..1c2e4fa9e3728
--- /dev/null
+++ b/waterfox/browser/components/addonstores/moz.build
@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "AddonStores.sys.mjs",
+    "StoreHandler.sys.mjs",
+]
+
+JAR_MANIFESTS += ["jar.mn"]
+
+XPCOM_MANIFESTS += [
+    "components.conf",
+]
diff --git a/waterfox/browser/components/chrome.overlay b/waterfox/browser/components/chrome.overlay
new file mode 100644
index 0000000000000..5ee6e1a97601f
--- /dev/null
+++ b/waterfox/browser/components/chrome.overlay
@@ -0,0 +1,3 @@
+overlay   chrome://browser/content/browser.xhtml                 chrome://browser/content/overlays/tabfeatures.xhtml
+overlay   chrome://browser/content/browser.xhtml                 chrome://browser/content/overlays/privatetab.xhtml
+overlay   chrome://browser/content/browser.xhtml                 chrome://browser/content/overlays/statusbar.xhtml
diff --git a/waterfox/browser/components/genMozBuild.py b/waterfox/browser/components/genMozBuild.py
new file mode 100644
index 0000000000000..85401235a5832
--- /dev/null
+++ b/waterfox/browser/components/genMozBuild.py
@@ -0,0 +1,98 @@
+import os
+import io
+import argparse
+import json
+
+skipFiles = [
+    "manifest.json.template",
+    "test",
+    "moz.build",
+]
+
+def getFullFileList(outputLoc, dirName):
+    result = {dirName: []}
+    for entry in os.listdir(outputLoc):
+        if entry in skipFiles:
+            continue
+        if os.path.isdir(os.path.join(outputLoc, entry)):
+            result.update(getFullFileList(os.path.join(outputLoc, entry), os.path.join(dirName, entry)))
+        elif dirName:
+            result[dirName].append(os.path.join(dirName, entry))
+        else:
+            result[dirName].append(entry)
+
+    return result
+
+def rewriteMozBuild(outputLoc, fileList, extension_id):
+    mozBuildFile = os.path.join(outputLoc, "moz.build")
+    print("Rewriting %s" % mozBuildFile)
+
+    with io.open(mozBuildFile, "w", encoding="UTF-8") as buildFile:
+        insertion_text = ''
+
+        for dir in sorted(fileList.keys()):
+            if not fileList[dir]:
+                continue
+
+            if not dir:
+                mozBuildPathName = ""
+            else:
+                mozBuildPathName = '["' + '"]["'.join(dir.split(os.sep)) + '"]'
+
+            sorted_files = sorted(fileList[dir], key=lambda s: s.lower())  # Sort the files
+
+            insertion_text += \
+                "FINAL_TARGET_FILES.features['%s']%s += [\n" % (extension_id, mozBuildPathName) + \
+                "  '" + \
+                "',\n  '".join(sorted_files) + "'\n]\n\n"  # Use the sorted files
+
+        new_contents = "# AUTOMATIC INSERTION START\n" + insertion_text + "# AUTOMATIC INSERTION END\n"
+        buildFile.write(new_contents)
+
+def replace_locale_strings_in_manifest(manifest_path, locale_path):
+    # Load the manifest file
+    with open(manifest_path, 'r') as f:
+        manifest_data = json.load(f)
+
+    # Load the messages file
+    with open(locale_path, 'r') as f:
+        messages_data = json.load(f)
+
+    # Recursive function to replace placeholders in nested objects
+    def replace_placeholders(obj):
+        if isinstance(obj, dict):
+            for key in obj:
+                obj[key] = replace_placeholders(obj[key])
+        elif isinstance(obj, str) and obj.startswith('__MSG_') and obj.endswith('__'):
+            # Extract the message key from the placeholder
+            message_key = obj[6:-2]
+
+            # Replace the placeholder with the message from the messages file
+            if message_key in messages_data:
+                return messages_data[message_key]['message']
+        return obj
+
+    # Replace placeholders in the manifest data
+    manifest_data = replace_placeholders(manifest_data)
+
+    # Write the modified manifest data back to the file
+    with open(manifest_path, 'w') as f:
+        json.dump(manifest_data, f, indent=2)
+
+def main(directory, extension_id):
+    outputLoc = directory
+    fileList = getFullFileList(outputLoc, "")
+    rewriteMozBuild(outputLoc, fileList, extension_id)
+
+    # Call the function with the paths to the manifest.json and messages.json files
+    manifest_path = os.path.join(directory, 'manifest.json')
+    locale_path = os.path.join(directory, '_locales', 'en', 'messages.json')
+    if os.path.exists(manifest_path) and os.path.exists(locale_path):
+        replace_locale_strings_in_manifest(manifest_path, locale_path)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Generate moz.build file")
+    parser.add_argument("directory", help="The directory to list files for")
+    parser.add_argument("extension_id", help="The ID of the extension")
+    args = parser.parse_args()
+    main(args.directory, args.extension_id)
\ No newline at end of file
diff --git a/waterfox/browser/components/jar.mn b/waterfox/browser/components/jar.mn
new file mode 100644
index 0000000000000..3968295ec3243
--- /dev/null
+++ b/waterfox/browser/components/jar.mn
@@ -0,0 +1,3 @@
+browser.jar:
+%   resource waterfox %waterfox/ contentaccessible=yes
+    waterfox/overlays/chrome.overlay                      (chrome.overlay)
diff --git a/waterfox/browser/components/moz.build b/waterfox/browser/components/moz.build
new file mode 100644
index 0000000000000..e38685dd1ab33
--- /dev/null
+++ b/waterfox/browser/components/moz.build
@@ -0,0 +1,27 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DIRS += [
+    "aboutcfg",
+    "aboutwelcome",
+    "aboutpasswords",
+    "addonstores",
+    "preferences",
+    "privatetab",
+    "search",
+    "sidebar",
+    "statusbar",
+    "tabfeatures",
+    "tabgrouping",
+    "uicustomizations",
+    "utils",
+]
+
+EXTRA_JS_MODULES += [
+    "WaterfoxGlue.sys.mjs",
+]
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/preferences/content/general.js b/waterfox/browser/components/preferences/content/general.js
new file mode 100644
index 0000000000000..5aa4def99736d
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/general.js
@@ -0,0 +1,234 @@
+const _gMainPaneOverlay = {
+  init() {
+    // Initialize prefs
+    window.Preferences.addAll(this.preferences);
+
+    // Delayed initialization for Overlay dependent code
+    this.delayedInit();
+  },
+
+  get preferences() {
+    return [
+      // Tab Toolbar Position
+      { id: "browser.tabs.toolbarposition", type: "wstring" },
+
+      // Tab Context Menu
+      { id: "browser.tabs.duplicateTab", type: "bool" },
+      { id: "browser.tabs.copyurl", type: "bool" },
+      { id: "browser.tabs.activetab", type: "bool" },
+      { id: "browser.tabs.copyallurls", type: "bool" },
+      { id: "browser.tabs.unloadTab", type: "bool" },
+
+      // Additional Tab Prefs
+      { id: "browser.tabs.pinnedIconOnly", type: "bool" },
+      { id: "browser.tabs.insertAfterCurrent", type: "bool" },
+      { id: "browser.tabs.insertRelatedAfterCurrent", type: "bool" },
+
+      // Dark Theme
+      { id: "ui.systemUsesDarkTheme", type: "int" },
+
+      // Restart Menu Item
+      { id: "browser.restart_menu.purgecache", type: "bool" },
+      { id: "browser.restart_menu.requireconfirm", type: "bool" },
+      { id: "browser.restart_menu.showpanelmenubtn", type: "bool" },
+
+      // Status Bar
+      { id: "browser.statusbar.enabled", type: "bool" },
+      { id: "browser.statusbar.appendStatusText", type: "bool" },
+
+      // Bookmarks Toolbar Position
+      { id: "browser.bookmarks.toolbarposition", type: "wstring" },
+
+      // Geolocation API
+      { id: "geo.provider.network.url", type: "wstring" },
+
+      // Referer
+      { id: "network.http.sendRefererHeader", type: "int" },
+
+      // WebRTC P2P
+      { id: "media.peerconnection.enabled", type: "bool" },
+
+      // Images
+      { id: "permissions.default.image", type: "int" },
+
+      // Scripts
+      { id: "javascript.enabled", type: "bool" },
+    ];
+  },
+
+  delayedInit() {
+    if (!window.initialized) {
+      setTimeout(() => {
+        this.delayedInit();
+      }, 500);
+    } else if (!document.initialized) {
+      // Select the correct radio button based on current pref value
+      this.showRelevantElements();
+      this.setDynamicThemeGroupValue();
+      this.setEventListener("dynamicThemeGroup", "command", (event) => {
+        this.updateDynamicThemePref(event.target.value);
+      });
+      if (document.readyState === "complete") {
+        this.tocGenerate();
+      } else {
+        document.addEventListener("readystatechange", () => {
+          if (document.readyState === "complete") {
+            this.tocGenerate();
+          }
+        });
+      }
+      document.initialized = true;
+    }
+  },
+
+  tocGenerate() {
+      const contentSelector = "#mainPrefPane";
+      const headingSelector =
+        "#mainPrefPane > hbox:not([hidden]) > h1, #mainPrefPane > groupbox:not([hidden]) > h2, #mainPrefPane > groupbox:not([hidden]) label:not([hidden]) > h2";
+      const headerTarget = headingSelector.replaceAll(":not([hidden])", "");
+      const specialCharRegex = /[!@#$%^&*():]/gi;
+      const createHeadingId = () => {
+        const content = document.querySelector(contentSelector);
+        const headings = content?.querySelectorAll(headerTarget);
+        const headingMap = {};
+
+        let count = 0;
+        /**
+         * @param {Element} heading
+         * @returns {string}
+         */
+        const getHeadingId = (heading) => {
+          const id = heading.id;
+          if (id) {
+            return id;
+          }
+
+          if (heading instanceof HTMLElement) {
+            const i18nId = heading.dataset.l10nId;
+            if (i18nId) {
+              return i18nId;
+            }
+          }
+
+          return (
+            heading.textContent
+              ?.trim()
+              .toLowerCase()
+              .split(" ")
+              .join("-")
+              .replace(specialCharRegex, "") ?? `${count++}`
+          );
+        };
+        /**
+         * @param {string} headingText
+         * @param {number} count
+         * @returns {string}
+         */
+        const createId = (headingText, count) =>
+          `${headingText}${count > 0 ? `-${count}` : ""}`;
+        if (headings) {
+          for (const heading of headings) {
+            const id = getHeadingId(heading);
+            headingMap[id] = !Number.isNaN(headingMap[id]) ? ++headingMap[id] : 0;
+            heading.id = createId(id, headingMap[id]);
+          }
+        }
+      };
+
+      createHeadingId();
+      tocbot.init({
+        tocSelector: ".toc",
+        contentSelector,
+        headingSelector,
+        scrollContainer: ".main-content",
+        headingsOffset: 100, // 90 + margins
+        hasInnerContainers: false,
+
+        /**
+         * @param {MouseEvent} e
+         */
+        onClick(e) {
+          e.preventDefault();
+
+          /** @type {HTMLLinkElement} */
+          const link = e.target;
+          const targetSelector = link?.getAttribute("href");
+          if (targetSelector) {
+            const target = document.querySelector(targetSelector);
+            if (target) {
+              target.scrollIntoView({ behavior: "smooth", block: "start" });
+            }
+          }
+        },
+      });
+      const tocRefresh = () => {
+        createHeadingId();
+        tocbot.refresh();
+      };
+      window.addEventListener("hashchange", tocRefresh);
+    },
+
+  showRelevantElements() {
+    const idsGeneral = [
+      "dynamicThemeGroup",
+      "restartGroup",
+      "statusBarGroup",
+      "bookmarksBarPositionGroup",
+      "geolocationGroup",
+    ];
+
+    const idsPrivacy = ["webrtc", "refheader", "dohBox"];
+    const win = Services.wm.getMostRecentWindow("navigator:browser");
+    const uri = win.gBrowser.currentURI.spec;
+    if (
+      (uri === "about:preferences" || uri === "about:preferences#general") &&
+      document.visibilityState === "visible"
+    ) {
+      for (const id of idsGeneral) {
+        const el = document.getElementById(id);
+        if (el) {
+          el.removeAttribute("hidden");
+        }
+      }
+    } else if (
+      uri === "about:preferences#privacy" &&
+      document.visibilityState === "visible"
+    ) {
+      for (const id of idsPrivacy) {
+        const el = document.getElementById(id);
+        if (el) {
+          el.removeAttribute("hidden");
+        }
+      }
+    }
+  },
+
+  setEventListener(aId, aEventType, aCallback) {
+    document
+      .getElementById(aId)
+      ?.addEventListener(aEventType, aCallback.bind(_gMainPaneOverlay));
+  },
+
+  async setDynamicThemeGroupValue() {
+    const radiogroup = document.getElementById("dynamicThemeRadioGroup");
+    radiogroup.disabled = true;
+
+    radiogroup.value = Services.prefs.getIntPref("ui.systemUsesDarkTheme", -1);
+
+    radiogroup.disabled = false;
+  },
+
+  async updateDynamicThemePref(value) {
+    switch (value) {
+      case "1":
+        Services.prefs.setIntPref("ui.systemUsesDarkTheme", 1);
+        break;
+      case "0":
+        Services.prefs.setIntPref("ui.systemUsesDarkTheme", 0);
+        break;
+      case "-1":
+        Services.prefs.clearUserPref("ui.systemUsesDarkTheme");
+        break;
+    }
+  },
+};
diff --git a/waterfox/browser/components/preferences/content/preferences-general.xhtml b/waterfox/browser/components/preferences/content/preferences-general.xhtml
new file mode 100644
index 0000000000000..bbb719480ef65
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/preferences-general.xhtml
@@ -0,0 +1,132 @@
+#filter substitution
+<?xml version="1.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/. -->
+<?xml-stylesheet href="chrome://browser/content/overlays/tocbot.css" type="text/css"?>
+
+<overlay id="preferences-overlay" xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <script>
+        /* eslint-env mozilla/browser-window */
+        /* globals gMainPaneOverlay */
+        Services.scriptloader.loadSubScript("chrome://browser/content/overlays/tocbot.js", this);
+        Services.scriptloader.loadSubScript("chrome://browser/content/overlays/general.js", this);
+        _gMainPaneOverlay.init();
+    </script>
+    <richlistbox id="categories">
+        <richlistitem id="category-theme" class="category" data-l10n-id="category-theme" data-l10n-attrs="tooltiptext"
+            value="paneTheme" align="center">
+            <image class="category-icon" />
+            <label class="category-name" flex="1" data-l10n-id="pane-theme-title"></label>
+        </richlistitem>
+    </richlistbox>
+
+    <vbox id="mainPrefPane">
+#include ./preferences-theme.xhtml
+        <!-- Tab Bar Position preferences -->
+        <vbox id="tabPositionSettingsContainer" insertafter="browserContainersbox">
+            <label>
+                <html:h2 data-l10n-id="tab-position-header" />
+            </label>
+            <radiogroup id="tabPositionGroup" preference="browser.tabs.toolbarposition">
+                <radio id="tabBarTopAbove" value="topabove" data-l10n-id="tab-bar-top-above" />
+                <radio id="tabBarTopBelow" value="topbelow" data-l10n-id="tab-bar-top-below" />
+                <radio id="tabBarBottomAbove" value="bottomabove" data-l10n-id="tab-bar-bottom-above" />
+                <radio id="tabBarBottomBelow" value="bottombelow" data-l10n-id="tab-bar-bottom-below" />
+            </radiogroup>
+        </vbox>
+
+        <!-- Tab Feature preferences -->
+        <vbox id="tabContextMenuSettingsContainer" insertafter="tabPositionSettingsContainer">
+            <label>
+                <html:h2 data-l10n-id="tab-feature-header" />
+            </label>
+            <checkbox id="duplicateTab" preference="browser.tabs.duplicateTab" data-l10n-id="show-duplicate-tab" />
+            <checkbox id="copyUrl" preference="browser.tabs.copyurl" data-l10n-id="show-copy-url" />
+            <checkbox id="copyActiveTab" preference="browser.tabs.activetab" data-l10n-id="enable-copy-active-tab" />
+            <checkbox id="copyAllUrls" preference="browser.tabs.copyallurls" data-l10n-id="show-copy-all-urls" />
+            <checkbox id="unloadTab" preference="browser.tabs.unloadTab" data-l10n-id="show-unload-tab" />
+        </vbox>
+
+        <!-- Additional Tab preferences -->
+        <vbox id="tabAdditionalSettingsContainer" insertafter="tabContextMenuSettingsContainer">
+            <label>
+                <html:h2 data-l10n-id="tab-additional-header" />
+            </label>
+            <checkbox id="pinnedTabIconOnly" preference="browser.tabs.pinnedIconOnly" data-l10n-id="pinned-icon-only" />
+            <checkbox id="openNewTabAtEnd" preference="browser.tabs.insertAfterCurrent"
+                data-l10n-id="insert-after-current" />
+            <checkbox id="openRelatedNewTabAtEnd" preference="browser.tabs.insertRelatedAfterCurrent"
+                data-l10n-id="insert-related-after-current" />
+        </vbox>
+        <!-- Dynamic Theme preferences -->
+        <groupbox id="dynamicThemeGroup" hidden="true" data-category="paneGeneral" insertafter="languagesGroup">
+            <label>
+                <html:h2 data-l10n-id="dynamic-theme-header" />
+            </label>
+            <radiogroup id="dynamicThemeRadioGroup">
+                <radio value="1" data-l10n-id="dynamic-theme-dark" />
+                <radio value="0" data-l10n-id="dynamic-theme-light" />
+                <radio value="-1" data-l10n-id="dynamic-theme-auto" />
+            </radiogroup>
+        </groupbox>
+
+        <!-- Restart Menu Item preferences -->
+        <groupbox id="restartGroup" hidden="true" data-category="paneGeneral" insertafter="dynamicThemeGroup">
+            <label>
+                <html:h2 data-l10n-id="restart-header" />
+            </label>
+            <checkbox id="browser.restart_menu.showpanelmenubtn" data-l10n-id="restart-show-button"
+                preference="browser.restart_menu.showpanelmenubtn" />
+            <checkbox id="browser.restart_menu.purgecache" data-l10n-id="restart-purge-cache"
+                preference="browser.restart_menu.purgecache" />
+            <checkbox id="browser.restart_menu.requireconfirm" data-l10n-id="restart-require-confirmation"
+                preference="browser.restart_menu.requireconfirm" />
+        </groupbox>
+
+        <!-- Status Bar preferences -->
+        <groupbox id="statusBarGroup" hidden="true" data-category="paneGeneral" insertafter="restartGroup">
+            <label>
+                <html:h2 data-l10n-id="statusbar-header" />
+            </label>
+            <vbox id="statusBarContainer">
+                <checkbox id="showStatusBar" preference="browser.statusbar.enabled" data-l10n-id="statusbar-enabled" />
+                <checkbox id="showStatusLinks" preference="browser.statusbar.appendStatusText"
+                    data-l10n-id="statusbar-show-links" />
+            </vbox>
+        </groupbox>
+
+        <!-- Bookmarks Toolbar Position preferences -->
+        <groupbox id="bookmarksBarPositionGroup" hidden="true" data-category="paneGeneral" insertafter="statusBarGroup">
+            <label>
+                <html:h2 data-l10n-id="bookmarks-bar-position-header" />
+            </label>
+            <radiogroup id="bookmarksBarPositionRadioGroup" preference="browser.bookmarks.toolbarposition">
+                <radio value="top" data-l10n-id="bookmarks-position-top" />
+                <radio value="bottom" data-l10n-id="bookmarks-position-bottom" />
+            </radiogroup>
+        </groupbox>
+#ifdef XP_LINUX
+        <!-- Geolocation API preferences -->
+        <groupbox id="geolocationGroup" hidden="true" data-category="paneGeneral"
+            insertafter="bookmarksBarPositionGroup">
+            <label>
+                <html:h2 data-l10n-id="geolocation-api-header" />
+            </label>
+            <label data-l10n-id="geolocation-description" />
+            <radiogroup id="geolocationRadioGroup" preference="geo.provider.network.url">
+                <radio value="https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"
+                    data-l10n-id="geolocation-api-enabled" />
+                <radio value=" " data-l10n-id="geolocation-api-disabled" />
+            </radiogroup>
+        </groupbox>
+#endif
+      <!-- TOC Placeholder -->
+      <html:nav class="toc" />
+    </vbox>
+
+    <!-- Browsing -->
+    <hbox data-subcategory="cfraddons" delete="true" />
+    <hbox data-subcategory="cfrfeatures" delete="true" />
+</overlay>
diff --git a/waterfox/browser/components/preferences/content/preferences-other.xhtml b/waterfox/browser/components/preferences/content/preferences-other.xhtml
new file mode 100644
index 0000000000000..f52af556d9e76
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/preferences-other.xhtml
@@ -0,0 +1,84 @@
+<?xml version="1.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/. -->
+
+
+<overlay id="preferences-overlay" xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <html:style>
+        /* Hide sponsored shortcuts checkbox */
+        checkbox[data-l10n-id="home-prefs-shortcuts-by-option-sponsored"],
+        checkbox[preference="browser.newtabpage.activity-stream.showSponsoredTopSites"] {
+            display: none !important;
+        }
+
+        /* Hide mission message about sponsors */
+        .mission-message {
+            display: none !important;
+        }
+    </html:style>
+
+    <!-- Home -->
+    <vbox data-subcategory="topstories" delete="true" />
+    <vbox data-subcategory="snippets" delete="true" />
+
+    <!-- Sync -->
+    <label class="fxaMobilePromo" delete="true" />
+
+    <!-- Privacy -->
+    <script>
+        /* eslint-env mozilla/browser-window */
+        /* globals gPrivacyPaneOverlay */
+        Services.scriptloader.loadSubScript("chrome://browser/content/overlays/privacy.js", this);
+        _gPrivacyPaneOverlay.init();
+    </script>
+    <vbox id="mainPrefPane">
+        <!-- WebRTC peer connection -->
+        <groupbox id="webrtc" data-category="panePrivacy" hidden="true" insertafter="trackingGroup">
+            <label>
+                <html:h2 data-l10n-id="webrtc-header" />
+            </label>
+            <hbox align="center">
+                <checkbox id="enableWebRTCP2P" class="tail-with-learn-more" data-l10n-id="enable-webrtc-p2p"
+                    preference="media.peerconnection.enabled" />
+                <label class="learnMore" is="text-link" href="https://bugzilla.mozilla.org/show_bug.cgi?id=959893"
+                    data-l10n-id="content-blocking-learn-more" />
+            </hbox>
+        </groupbox>
+
+        <!-- HTTP Referrer Header-->
+        <groupbox id="refheader" data-category="panePrivacy" hidden="true" insertafter="webrtc">
+            <label>
+                <html:h2 data-l10n-id="ref-header" />
+            </label>
+
+            <hbox align="center">
+                <label id="historyModeLabel" control="doNotsendSecureXSiteReferrer"
+                    data-l10n-id="history-remember-label" />
+                <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+                <hbox>
+                    <menulist id="doNotsendSecureXSiteReferrer" preference="network.http.sendRefererHeader">
+                        <menupopup>
+                            <menuitem data-l10n-id="send-referrer-header-0" value="0" />
+                            <menuitem data-l10n-id="send-referrer-header-1" value="1" />
+                            <menuitem data-l10n-id="send-referrer-header-2" value="2" />
+                        </menupopup>
+                    </menulist>
+                </hbox>
+            </hbox>
+        </groupbox>
+
+        <groupbox id="permissionsGroup">
+            <hbox id="imagePermissions" data-subcategory="permissions-images" insertafter="addonInstallBox">
+                <checkbox id="loadImages" class="tail-with-learn-more" data-l10n-id="load-images" flex="1" />
+            </hbox>
+
+            <hbox id="javascriptPermissions" data-subcategory="permissions-scripts" insertafter="imagePermissions">
+                <checkbox id="enableJavaScript" class="tail-with-learn-more" data-l10n-id="enable-javascript"
+                    preference="javascript.enabled" flex="1" />
+            </hbox>
+        </groupbox>
+    </vbox>
+</overlay>
diff --git a/waterfox/browser/components/preferences/content/preferences-theme.xhtml b/waterfox/browser/components/preferences/content/preferences-theme.xhtml
new file mode 100644
index 0000000000000..eb54a2882903d
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/preferences-theme.xhtml
@@ -0,0 +1,485 @@
+<!-- Theme panel -->
+
+<script>
+    /* eslint-env mozilla/browser-window */
+    /* globals register_module _gThemePane gotoPref */
+    Services.scriptloader.loadSubScript("chrome://browser/content/overlays/theme.js", this);
+
+    // Register the pane
+    register_module("paneTheme", _gThemePane);
+
+    // This ensure that we actually render the Theme page when refreshing on
+    // about:preferences#theme. It is needed because the regular gotoPref in
+    // preferences.js cannot function properly as we do not register_module
+    // until this file is loaded, which has not been done when preferences.js
+    // is init'd.
+    if (location.href.includes("#theme")) {
+        setTimeout(() => {
+            gotoPref("paneTheme");
+        }, 0);
+    }
+</script>
+
+<html:template id="template-paneTheme">
+    <hbox id="firefoxThemeCategory" class="subcategory" hidden="true" data-category="paneTheme">
+        <!-- Theme -->
+        <html:h1 data-l10n-id="theme-header" />
+    </hbox>
+    <groupbox id="themeGroup" data-category="paneTheme" hidden="true">
+        <hbox>
+            <vbox id="waterfoxUserChromeCustomizations">
+                <!-- <checkbox id="enableWaterfoxTheme" preference="userChrome.theme.enable" data-l10n-id="enable-waterfox-theme" /> -->
+                <hbox>
+                    <menulist id="enableWaterfoxTheme" preference="browser.theme.enableWaterfoxCustomizations">
+                        <menupopup>
+                            <menuitem data-l10n-id="enable-waterfox-theme-0" value="0" />
+                            <menuitem data-l10n-id="enable-waterfox-theme-1" value="1" />
+                            <menuitem data-l10n-id="enable-waterfox-theme-2" value="2" />
+                        </menupopup>
+                    </menulist>
+                </hbox>
+            </vbox>
+            <vbox id="waterfoxUserChromePresetsWrapper" style="height: 0; z-index: 1;">
+                <vbox id="waterfoxUserChromePresets">
+                    <html:h2 style="-moz-box-flex: 1;" class="presets-header" data-l10n-id="preset-title" />
+                    <button id="waterfoxDefaults" is="highlightable-button"
+                        class="themepage-button check-theme-page-controlled" data-l10n-id="waterfox-defaults" />
+                    <button id="leptonStyle" is="highlightable-button"
+                        class="themepage-button check-theme-page-controlled" data-l10n-id="lepton-style" />
+                    <button id="protonStyle" is="highlightable-button"
+                        class="themepage-button check-theme-page-controlled" data-l10n-id="proton-style" />
+                </vbox>
+            </vbox>
+        </hbox>
+    </groupbox>
+    <groupbox id="themeGroup" data-category="paneTheme" hidden="true">
+        <label>
+            <!-- Appearance -->
+            <html:h2 data-l10n-id="appearance-header" />
+        </label>
+
+        <hbox>
+            <menulist id="accentColor">
+                <menupopup>
+                    <menuitem data-l10n-id="enable-default-accent-color" value="0" />
+                    <menuitem data-l10n-id="enable-cyan-accent-color" value="1" />
+                    <menuitem data-l10n-id="enable-system-accent-color" value="2" />
+                </menupopup>
+            </menulist>
+        </hbox>
+
+        <checkbox id="enablePanelTransparency" preference="userChrome.theme.transparent.panel"
+        data-l10n-id="enable-panel-transparency" />
+
+        <checkbox id="enableMenuTransparency" preference="userChrome.theme.transparent.menu"
+        data-l10n-id="enable-menu-transparency" />
+    </groupbox>
+    <groupbox id="themeIconGroup"  data-category="paneTheme" hidden="true">
+        <!-- Icons -->
+        <label>
+            <html:h2 data-l10n-id="icons-header" />
+        </label>
+        <checkbox id="hideAllIcons" preference="userChrome.icon.disabled" data-l10n-id="hide-all-icons" />
+        <checkbox id="hideTabIcons" preference="userChrome.hidden.tab_icon" data-l10n-id="hide-tab-icons" />
+        <!-- <checkbox id="showMenuIcons" preference="userChrome.icon.menu.full" data-l10n-id="show-menu-icons" /> This does not do what one would expect, i.e. show/remove all icons -->
+#ifdef XP_MACOSX
+        <hbox>
+            <checkbox id="showMacMenuIcons" preference="userChrome.icon.global_menu.mac"
+                data-l10n-id="show-mac-menu-icons" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="showMacMenuIconsImage" class="info-popup" />
+            </div>
+        </hbox>
+#endif
+    </groupbox>
+    <groupbox id="themeFontGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="font-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="monospaceFont" preference="userContent.page.monospace"
+                data-l10n-id="monospace-font" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="monospaceFontImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="monospaceFontTheme" preference="userChrome.theme.monospace"
+                data-l10n-id="monospace-font-theme" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="monospaceFontThemeImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="themeAnimationGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <!-- Animation-->
+            <html:h2 data-l10n-id="animation-header" />
+        </label>
+
+        <!-- Panels -->
+        <checkbox id="disablePanelAnimate" preference="userChrome.decoration.disable_panel_animate"
+            data-l10n-id="disable-panel-animate" />
+
+        <!-- Sidebar -->
+        <checkbox id="disableSidebarAnimate" preference="userChrome.decoration.disable_sidebar_animate"
+            data-l10n-id="disable-sidebar-animate" />
+    </groupbox>
+
+
+    <hbox id="firefoxInterfaceComponentCategory" class="subcategory" hidden="true" data-category="paneTheme">
+        <!-- Interface Components -->
+        <html:h1 data-l10n-id="interface-component-header"/>
+    </hbox>
+    <groupbox id="tabbarComponentGroup"  data-category="paneTheme" hidden="true">
+        <!-- Tab Bar -->
+        <label>
+            <html:h2 data-l10n-id="tab-bar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="tabContextLine" preference="userChrome.tab.photon_like_contextline"
+                data-l10n-id="tab-context-line" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="contextLineImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="dragSpace" preference="userChrome.padding.drag_space" data-l10n-id="drag-space" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="dragSpaceImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="closeButtonHover" preference="userChrome.tab.close_button_at_hover"
+                data-l10n-id="close-button-hover" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="closeButtonHoverImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="navbarComponentGroup"  data-category="paneTheme" hidden="true">
+        <!-- Nav Bar -->
+        <label>
+            <html:h2 data-l10n-id="nav-bar-header" />
+        </label>
+
+        <checkbox id="compactNavBarPopup" preference="userChrome.padding.urlView_expanding"
+            data-l10n-id="compact-navbar-popup" />
+
+        <!-- Full Screen -->
+        <!-- <label>
+            <html:h2 data-l10n-id="full-screen-header" />
+        </label> -->
+    </groupbox>
+    <groupbox id="pannelComponentGroup"  data-category="paneTheme" hidden="true">
+        <!-- Panels -->
+        <label>
+            <html:h2 data-l10n-id="panels-header" />
+        </label>
+
+        <checkbox id="compactContextMenu" preference="userChrome.padding.menu_compact"
+            data-l10n-id="compact-context-menu" />
+        <checkbox id="compactBookmarkMenu" preference="userChrome.padding.bookmark_menu.compact"
+            data-l10n-id="compact-bookmark-menu" />
+        <checkbox id="compactPanelHeader" preference="userChrome.padding.panel_header"
+            data-l10n-id="compact-panel-header" />
+
+        <hbox>
+            <checkbox id="removePanelStrip" preference="userChrome.panel.remove_strip"
+                data-l10n-id="remove-panel-strip" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="removePanelStripImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="fullPanelStrip" preference="userChrome.panel.full_width_separator"
+                data-l10n-id="full-panel-strip" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="fullPanelStripImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+
+    <hbox id="firefoxRoundingCategory" class="subcategory" hidden="true" data-category="paneTheme">
+        <!-- Rounding -->
+        <html:h1 data-l10n-id="rounding-header"/>
+    </hbox>
+    <groupbox id="roundingTabbarGroup"  data-category="paneTheme" hidden="true">
+        <hbox>
+            <checkbox id="squareTabCorners" preference="userChrome.tab.squareTabCorners"
+                data-l10n-id="square-tab-edges" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="squareTabEdgesImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="roundingNavbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="nav-bar-header" />
+        </label>
+        <hbox>
+            <checkbox id="squareButtonEdges" preference="userChrome.rounding.square_button"
+                data-l10n-id="square-button-edges" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="squareButtonEdgesImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="roundingPannelGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="panels-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="squareMenuPanel" preference="userChrome.rounding.square_panel"
+                data-l10n-id="square-menu-panel" />
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="squareMenuPanelImage" class="info-popup" />
+            </div>
+        </hbox>
+        <checkbox id="squarePanelItem" preference="userChrome.rounding.square_panelitem"
+            data-l10n-id="square-panel-item" />
+
+        <!-- MacOS uses native context menus, so we cannot modify them with userChrome. Moz listed allowing this as a WONTFIX. -->
+#ifndef XP_MACOSX
+        <hbox>
+            <checkbox id="squareMenuPopup" preference="userChrome.rounding.square_menupopup"
+                data-l10n-id="square-menu-popup" />
+
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="squareMenuPopupImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <checkbox id="squareMenuItem" preference="userChrome.rounding.square_menuitem"
+            data-l10n-id="square-menu-item" />
+#endif
+
+        <hbox>
+            <checkbox id="squareField" preference="userChrome.rounding.square_field"
+                data-l10n-id="square-field" />
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="squareFieldImage" class="info-popup" />
+            </div>
+        </hbox>
+        <checkbox id="squareCheckbox" preference="userChrome.rounding.square_checklabel"
+            data-l10n-id="square-checkbox" />
+    </groupbox>
+
+
+    <hbox id="firefoxAutohideCategory" class="subcategory" hidden="true" data-category="paneTheme">
+        <!-- Auto Hide & Hidden -->
+        <html:h1 data-l10n-id="autohide-hidden-header"/>
+    </hbox>
+    <groupbox id="autohideTabbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="tab-bar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="autoHideTabs" preference="userChrome.autohide.tab" data-l10n-id="auto-hide-tabs" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="autoHideTabsImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <vbox class="indent">
+            <hbox>
+                <checkbox id="autoBlurTabs" preference="userChrome.autohide.tab.blur"
+                    data-l10n-id="auto-blur-tabs" />
+
+                <div class="popup-container">
+                    <img class="preferences-info-button" />
+                    <img id="autoBlurTabsImage" class="info-popup" />
+                </div>
+            </hbox>
+        </vbox>
+
+        <checkbox id="autoHideTabBar" preference="userChrome.autohide.tabbar" data-l10n-id="auto-hide-tabbar" />
+    </groupbox>
+    <groupbox id="autohideNavbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="nav-bar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="autoHideBack" preference="userChrome.autohide.back_button"
+                data-l10n-id="auto-hide-back" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="autoHideBackImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="autoHideForward" preference="userChrome.autohide.forward_button"
+                data-l10n-id="auto-hide-forward" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="autoHideForwardImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <checkbox id="autoHidePageAction" preference="userChrome.autohide.page_action"
+            data-l10n-id="auto-hide-pageaction" />
+
+        <hbox>
+            <checkbox id="hideNavBarIconBox" preference="userChrome.hidden.urlbar_iconbox"
+                data-l10n-id="hide-urlbar-iconbox" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="hideNavBarIconBoxImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="autohideBookmarkbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="bookmark-header" />
+        </label>
+
+        <checkbox id="autoHideBookmarkBar" preference="userChrome.autohide.bookmarkbar"
+            data-l10n-id="auto-hide-bookmarkbar" />
+
+        <hbox>
+            <checkbox id="hideBookmbarkBarIcon" preference="userChrome.hidden.bookmarkbar_icon"
+                data-l10n-id="hide-bookmarkbar-icon" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="hideBookmbarkBarIconImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="hideBookmarkBarLabel" preference="userChrome.hidden.bookmarkbar_label"
+                data-l10n-id="hide-bookmarkbar-label" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="hideBookmarkBarLabelImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="autohidePannelGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="panels-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="hideDisabledMenuItems" preference="userChrome.hidden.disabled_menu"
+                data-l10n-id="hide-disabled-menuitems" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="hideDisabledMenuItemsImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+    <groupbox id="autohideSidebarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="sidebar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="autoHideSidebar" preference="userChrome.autohide.sidebar"
+                data-l10n-id="auto-hide-sidebar" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="autoHideSidebarImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <hbox>
+            <checkbox id="hideSidebarHeader" preference="userChrome.hidden.sidebar_header"
+                data-l10n-id="hide-sidebar-header" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="hideSidebarHeaderImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+
+    <hbox id="firefoxCenterCategory" class="subcategory" hidden="true" data-category="paneTheme">
+        <!-- Center -->
+        <html:h1 data-l10n-id="center-header"/>
+    </hbox>
+    <groupbox id="centerTabbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="tab-bar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="centerTabContent" preference="userChrome.centered.tab"
+                data-l10n-id="center-tab-content" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="centerTabContentImage" class="info-popup" />
+            </div>
+        </hbox>
+
+        <vbox class="indent">
+            <hbox>
+                <checkbox id="centerTabLabel" preference="userChrome.centered.tab.label"
+                    data-l10n-id="center-tab-label" />
+
+                <div class="popup-container">
+                    <img class="preferences-info-button" />
+                    <img id="centerTabLabelImage" class="info-popup" />
+                </div>
+            </hbox>
+        </vbox>
+    </groupbox>
+    <groupbox id="centerNavbarGroup"  data-category="paneTheme" hidden="true">
+        <label>
+            <html:h2 data-l10n-id="nav-bar-header" />
+        </label>
+
+        <hbox>
+            <checkbox id="centerNavBarText" preference="userChrome.centered.urlbar"
+                data-l10n-id="center-navbar-text" />
+
+            <div class="popup-container">
+                <img class="preferences-info-button" />
+                <img id="centerNavBarTextImage" class="info-popup" />
+            </div>
+        </hbox>
+    </groupbox>
+</html:template>
diff --git a/waterfox/browser/components/preferences/content/privacy.js b/waterfox/browser/components/preferences/content/privacy.js
new file mode 100644
index 0000000000000..62e0f670bea37
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/privacy.js
@@ -0,0 +1,74 @@
+const _gPrivacyPaneOverlay = {
+  init() {
+    // Ensure load images automatically checkbox value is correct.
+    this.initLoadImages();
+    Preferences.get("permissions.default.image").on(
+      "change",
+      this.loadImagesReadPref.bind(this)
+    );
+    if (!window.privacyInitialized) {
+      setTimeout(() => {
+        this.delayedInit();
+      }, 500);
+    }
+  },
+
+  delayedInit() {
+    this.updatePrivacyDefaults();
+  },
+
+  // Update privacy item default values
+  async updatePrivacyDefaults() {
+    const webRtc = document.getElementById("enableWebRTCP2P");
+    webRtc.checked = Preferences.get(webRtc.getAttribute("preference")).value;
+
+    const refHeader = document.getElementById("doNotsendSecureXSiteReferrer");
+    refHeader.value = Preferences.get(
+      refHeader.getAttribute("preference")
+    ).value;
+
+    const imagePermissions = document.getElementById("loadImages");
+    imagePermissions.checked = !!Preferences.get("permissions.default.image")
+      .value;
+
+    const javascriptPermissions = document.getElementById("enableJavaScript");
+    javascriptPermissions.checked = Preferences.get(
+      javascriptPermissions.getAttribute("preference")
+    ).value;
+  },
+
+  /**
+   * Selects the right item of the Load Images Automatically checkbox.
+   */
+  initLoadImages() {
+    const liaCheckbox = document.getElementById("loadImages");
+    // If it doesn't exist yet, try again.
+    if (!liaCheckbox) {
+      setTimeout(() => {
+        this.initLoadImages();
+      }, 500);
+      return;
+    }
+
+    // Create event listener for when the user clicks
+    // on one of the radio buttons
+    setEventListener("loadImages", "command", this.syncToLoadImagesPref);
+
+    this.loadImagesReadPref();
+  },
+
+  loadImagesReadPref() {
+    const enabledPref = Preferences.get("permissions.default.image");
+    const liaCheckbox = document.getElementById("loadImages");
+    if (enabledPref.value === 1) {
+      liaCheckbox.checked = true;
+    } else {
+      liaCheckbox.checked = false;
+    }
+  },
+
+  syncToLoadImagesPref() {
+    const value = document.getElementById("loadImages").checked ? 1 : 2;
+    Services.prefs.setIntPref("permissions.default.image", value);
+  },
+};
diff --git a/waterfox/browser/components/preferences/content/theme.js b/waterfox/browser/components/preferences/content/theme.js
new file mode 100644
index 0000000000000..e9bec1b30ca15
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/theme.js
@@ -0,0 +1,446 @@
+/* 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/. */
+
+const { PrefUtils } = ChromeUtils.importESModule(
+  "resource:///modules/PrefUtils.sys.mjs"
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "styleSheetService",
+  "@mozilla.org/content/style-sheet-service;1",
+  "nsIStyleSheetService"
+);
+
+const _gThemePane = {
+  WATERFOX_THEME_PREF: "browser.theme.enableWaterfoxCustomizations",
+  WATERFOX_CUSTOMIZATIONS_PREF: "browser.theme.enableWaterfoxCustomizations",
+  WATERFOX_DEFAULT_THEMES: [
+    "default-theme@mozilla.org",
+    "firefox-compact-light@mozilla.org",
+    "firefox-compact-dark@mozilla.org",
+    "firefox-alpenglow@mozilla.org",
+  ],
+
+  _prefObservers: [],
+
+  get preferences() {
+    return [
+      // == Theme ==============================================================
+      { id: "browser.theme.enableWaterfoxCustomizations", type: "int" },
+
+      // Appearance
+      { id: "userChrome.theme.proton_color.dark_blue_accent", type: "bool" },
+      { id: "userContent.page.proton_color.dark_blue_accent", type: "bool" },
+
+      { id: "userContent.page.proton_color.system_accent", type: "bool" },
+      { id: "widget.non-native-theme.use-theme-accent", type: "bool" },
+
+      { id: "userChrome.theme.transparent.panel", type: "bool" },
+      { id: "userChrome.theme.transparent.menu", type: "bool" },
+
+      // Icons
+      { id: "userChrome.icon.disabled", type: "bool" },
+      { id: "userChrome.hidden.tab_icon", type: "bool" },
+      { id: "userChrome.icon.menu.full", type: "bool" },
+      { id: "userChrome.icon.global_menu.mac", type: "bool" },
+
+      // Fonts
+      { id: "userContent.page.monospace", type: "bool" },
+      { id: "userChrome.theme.monospace", type: "bool" },
+
+      // Animations
+      { id: "userChrome.decoration.disable_panel_animate", type: "bool" },
+      { id: "userChrome.decoration.disable_sidebar_animate", type: "bool" },
+
+      // == Interface Components ===============================================
+      // Tab Bar
+      { id: "userChrome.tab.photon_like_contextline", type: "bool" },
+      { id: "userChrome.padding.drag_space", type: "bool" },
+      { id: "userChrome.tab.close_button_at_hover", type: "bool" },
+
+      // Nav Bar
+      { id: "userChrome.padding.urlView_expanding", type: "bool" },
+
+      // Panels
+      { id: "userChrome.padding.menu_compact", type: "bool" },
+      { id: "userChrome.padding.bookmark_menu.compact", type: "bool" },
+      { id: "userChrome.padding.panel_header", type: "bool" },
+      { id: "userChrome.panel.remove_strip", type: "bool" },
+      { id: "userChrome.panel.full_width_separator", type: "bool" },
+
+      // == Rounding ===========================================================
+      // Tab Bar
+      { id: "userChrome.rounding.square_tab", type: "bool" },
+      { id: "userChrome.tab.bottom_rounded_corner", type: "bool" },
+      { id: "userChrome.tab.squareTabCorners", type: "bool" },
+
+      // Nav Bar
+      { id: "userChrome.rounding.square_button", type: "bool" },
+
+      // Panels
+      { id: "userChrome.rounding.square_panel", type: "bool" },
+      { id: "userChrome.rounding.square_panelitem", type: "bool" },
+      { id: "userChrome.rounding.square_menupopup", type: "bool" },
+      { id: "userChrome.rounding.square_menuitem", type: "bool" },
+      { id: "userChrome.rounding.square_field", type: "bool" },
+      { id: "userChrome.rounding.square_checklabel", type: "bool" },
+
+      // == Autohide & Hidden ==================================================
+      // Tab Bar
+      { id: "userChrome.autohide.tab", type: "bool" },
+      { id: "userChrome.autohide.tab.blur", type: "bool" },
+      { id: "userChrome.autohide.tabbar", type: "bool" },
+
+      // Nav Bar
+      { id: "userChrome.autohide.back_button", type: "bool" },
+      { id: "userChrome.autohide.forward_button", type: "bool" },
+      { id: "userChrome.autohide.page_action", type: "bool" },
+      { id: "userChrome.hidden.urlbar_iconbox", type: "bool" },
+
+      // Bookmarks Bar
+      { id: "userChrome.autohide.bookmarkbar", type: "bool" },
+      { id: "userChrome.hidden.bookmarkbar_icon", type: "bool" },
+      { id: "userChrome.hidden.bookmarkbar_label", type: "bool" },
+
+      // Panels
+      { id: "userChrome.hidden.disabled_menu", type: "bool" },
+
+      // Sidebar
+      { id: "userChrome.autohide.sidebar", type: "bool" },
+      { id: "userChrome.hidden.sidebar_header", type: "bool" },
+
+      // == Center =============================================================
+      // Tab Bar
+      { id: "userChrome.centered.tab", type: "bool" },
+      { id: "userChrome.centered.tab.label", type: "bool" },
+
+      // Nav Bar
+      { id: "userChrome.centered.urlbar", type: "bool" },
+    ];
+  },
+
+  get nestedPrefs() {
+    return [
+      {
+        id: "autoBlurTabs",
+        pref: "userChrome.autohide.tab",
+      },
+      {
+        id: "centerTabLabel",
+        pref: "userChrome.centered.tab",
+      },
+    ];
+  },
+
+  get presets() {
+    return [
+      {
+        id: "waterfoxDefaults",
+        on: [
+          { id: "userChrome.tab.connect_to_window", value: true },
+          { id: "userChrome.tab.color_like_toolbar", value: true },
+
+          { id: "userChrome.tab.lepton_like_padding", value: false },
+          { id: "userChrome.tab.photon_like_padding", value: true },
+
+          { id: "userChrome.tab.dynamic_separator", value: false },
+          { id: "userChrome.tab.static_separator", value: true },
+          {
+            id: "userChrome.tab.static_separator.selected_accent",
+            value: false,
+          },
+          { id: "userChrome.tab.bar_separator", value: false },
+
+          { id: "userChrome.tab.newtab_button_like_tab", value: false },
+          { id: "userChrome.tab.newtab_button_smaller", value: true },
+          { id: "userChrome.tab.newtab_button_proton", value: false },
+
+          { id: "userChrome.icon.panel_full", value: false },
+          { id: "userChrome.icon.panel_photon", value: true },
+
+          { id: "userChrome.tab.box_shadow", value: false },
+          { id: "userChrome.tab.bottom_rounded_corner", value: false },
+
+          { id: "userChrome.tab.photon_like_contextline", value: true },
+          { id: "userChrome.rounding.square_tab", value: true },
+        ],
+      },
+      {
+        id: "leptonStyle",
+        on: [
+          { id: "userChrome.tab.connect_to_window", value: true },
+          { id: "userChrome.tab.color_like_toolbar", value: true },
+
+          { id: "userChrome.tab.lepton_like_padding", value: true },
+          { id: "userChrome.tab.photon_like_padding", value: false },
+
+          { id: "userChrome.tab.dynamic_separator", value: true },
+          { id: "userChrome.tab.static_separator", value: false },
+          {
+            id: "userChrome.tab.static_separator.selected_accent",
+            value: false,
+          },
+          { id: "userChrome.tab.bar_separator", value: false },
+
+          { id: "userChrome.tab.newtab_button_like_tab", value: true },
+          { id: "userChrome.tab.newtab_button_smaller", value: false },
+          { id: "userChrome.tab.newtab_button_proton", value: false },
+
+          { id: "userChrome.icon.panel_full", value: true },
+          { id: "userChrome.icon.panel_photon", value: false },
+
+          { id: "userChrome.tab.box_shadow", value: true },
+          { id: "userChrome.tab.bottom_rounded_corner", value: true },
+
+          { id: "userChrome.tab.photon_like_contextline", value: false },
+          { id: "userChrome.rounding.square_tab", value: false },
+        ],
+      },
+      {
+        id: "protonStyle",
+        on: [
+          { id: "userChrome.tab.connect_to_window", value: false },
+          { id: "userChrome.tab.color_like_toolbar", value: false },
+
+          { id: "userChrome.tab.lepton_like_padding", value: false },
+          { id: "userChrome.tab.photon_like_padding", value: false },
+
+          { id: "userChrome.tab.dynamic_separator", value: true },
+          { id: "userChrome.tab.static_separator", value: false },
+          {
+            id: "userChrome.tab.static_separator.selected_accent",
+            value: false,
+          },
+          { id: "userChrome.tab.bar_separator", value: false },
+
+          { id: "userChrome.tab.newtab_button_like_tab", value: false },
+          { id: "userChrome.tab.newtab_button_smaller", value: false },
+          { id: "userChrome.tab.newtab_button_proton", value: true },
+
+          { id: "userChrome.icon.panel_full", value: true },
+          { id: "userChrome.icon.panel_photon", value: false },
+
+          { id: "userChrome.tab.box_shadow", value: false },
+          { id: "userChrome.tab.bottom_rounded_corner", value: false },
+
+          { id: "userChrome.tab.photon_like_contextline", value: false },
+          { id: "userChrome.rounding.square_tab", value: false },
+        ],
+      },
+    ];
+  },
+
+  get accentPrefs() {
+    return {
+      0: [
+        { id: "userChrome.theme.proton_color.dark_blue_accent", value: true },
+        { id: "userContent.page.proton_color.dark_blue_accent", value: true },
+
+        { id: "userContent.page.proton_color.system_accent", value: false },
+        { id: "widget.non-native-theme.use-theme-accent", value: false },
+      ],
+
+      1: [
+        { id: "userChrome.theme.proton_color.dark_blue_accent", value: false },
+        { id: "userContent.page.proton_color.dark_blue_accent", value: false },
+
+        { id: "userContent.page.proton_color.system_accent", value: false },
+        { id: "widget.non-native-theme.use-theme-accent", value: false },
+      ],
+
+      2: [
+        { id: "userChrome.theme.proton_color.dark_blue_accent", value: false },
+        { id: "userContent.page.proton_color.dark_blue_accent", value: false },
+
+        { id: "userContent.page.proton_color.system_accent", value: true },
+        { id: "widget.non-native-theme.use-theme-accent", value: true },
+      ],
+    };
+  },
+
+  init() {
+    // Initialize prefs
+    window.Preferences.addAll(this.preferences);
+    const _userChromeEnabled = PrefUtils.get(this.WATERFOX_THEME_PREF);
+    for (const pref of this.preferences) {
+      this._prefObservers.push(
+        PrefUtils.addObserver(pref.id, (_) => {
+          this.refreshTheme();
+        })
+      );
+    }
+
+    // Init presets
+    for (const preset of this.presets) {
+      const button = document.getElementById(preset.id);
+      if (button) {
+        button.addEventListener("click", (_event) => {
+          for (const pref of preset.on) {
+            PrefUtils.set(pref.id, pref.value);
+          }
+        });
+      }
+    }
+
+    // Init default button
+    const defaultButton = document.getElementById("waterfoxDefaults");
+    if (defaultButton) {
+      defaultButton.addEventListener("click", this);
+    }
+
+    // Init popups
+    const popups = document.getElementsByClassName("popup-container");
+    for (const popup of popups) {
+      popup.addEventListener("mouseover", this);
+      popup.addEventListener("mouseout", this);
+    }
+
+    // Init AccentColor
+    this.initAccentColor();
+
+    // Init Tab Rounding
+    this.initTabRounding();
+
+    // Init Nested Prefs
+    for (const el of this.nestedPrefs) {
+      this.initNestedPrefs(el.id, el.pref);
+    }
+
+    // Register unload listener
+    window.addEventListener("unload", this);
+  },
+
+  destroy() {
+    window.removeEventListener("unload", this);
+    for (const obs of this._prefObservers) {
+      PrefUtils.removeObserver(obs);
+    }
+  },
+
+  // nsIDOMEventListener
+  handleEvent(event) {
+    switch (event.type) {
+      case "mouseover":
+      case "mouseout":
+        event.target.nextElementSibling?.classList.toggle("show");
+        break;
+      case "click":
+        switch (event.target.id) {
+          case "waterfoxDefaults":
+            this.preferences.map((pref) => {
+              Services.prefs.clearUserPref(pref.id);
+            });
+            this.refreshTheme();
+            break;
+        }
+        break;
+      case "unload":
+        this.destroy();
+        break;
+    }
+  },
+
+  async refreshTheme() {
+    // Only refresh theme if Waterfox customizations should be applied
+    if (
+      PrefUtils.get(this.WATERFOX_CUSTOMIZATIONS_PREF, 0) === 0 ||
+      (PrefUtils.get(this.WATERFOX_CUSTOMIZATIONS_PREF, 0) === 1 &&
+        this.WATERFOX_DEFAULT_THEMES.includes(
+          PrefUtils.get("extensions.activeThemeID", "")
+        ))
+    ) {
+      const userChromeSheet = "chrome://browser/skin/userChrome.css";
+      const userContentSheet = "chrome://browser/skin/userContent.css";
+
+      this.unregisterStylesheet(userChromeSheet);
+      this.unregisterStylesheet(userContentSheet);
+      this.registerStylesheet(userContentSheet);
+    }
+  },
+
+  registerStylesheet(uri) {
+    const url = Services.io.newURI(uri);
+    const type = styleSheetService.USER_SHEET;
+    styleSheetService.loadAndRegisterSheet(url, type);
+  },
+
+  unregisterStylesheet(uri) {
+    const url = Services.io.newURI(uri);
+    const type = styleSheetService.USER_SHEET;
+    styleSheetService.unregisterSheet(url, type);
+  },
+
+  async initAccentColor() {
+    let menulist = document.getElementById("accentColor");
+    // If it doesn't exist yet, try again.
+    while (!menulist) {
+      const wait = (ms) => new Promise((res) => setTimeout(res, ms, {}));
+      await wait(500);
+      menulist = document.getElementById("accentColor");
+    }
+
+    menulist?.addEventListener("command", () => {
+      if (["0", "1", "2"].includes(menulist.value)) {
+        for (const pref of this.accentPrefs[menulist.value]) {
+          PrefUtils.set(pref.id, pref.value);
+        }
+      }
+    });
+  },
+
+  async initTabRounding() {
+    let checkbox = document.getElementById("squareTabCorners");
+    // If it doesn't exist yet, try again.
+    while (!checkbox) {
+      const wait = (ms) => new Promise((res) => setTimeout(res, ms, {}));
+      await wait(500);
+      checkbox = document.getElementById("squareTabCorners");
+    }
+
+    // Update the checkbox initially, and observe pref changes.
+    this.updateTabRoundingCheckbox();
+    this._prefObservers.push(
+      PrefUtils.addObserver("userChrome.tab.squareTabCorners", (square) => {
+        PrefUtils.set("userChrome.rounding.square_tab", square);
+        PrefUtils.set("userChrome.tab.bottom_rounded_corner", !square);
+      })
+    );
+  },
+
+  updateTabRoundingCheckbox() {
+    const checkbox = document.getElementById("squareTabCorners");
+    const enabled = PrefUtils.get(
+      "userChrome.tab.squareTabCorners",
+      PrefUtils.get("userChrome.rounding.square_tab", false) &&
+        PrefUtils.set("userChrome.tab.bottom_rounded_corner", true)
+    );
+
+    checkbox.checked = enabled;
+  },
+
+  async initNestedPrefs(id, controllingPref) {
+    let checkbox = document.getElementById(id);
+    // If it doesn't exist yet, try again.
+    while (!checkbox) {
+      const wait = (ms) => new Promise((res) => setTimeout(res, ms, {}));
+      await wait(500);
+      checkbox = document.getElementById(id);
+    }
+    const enabled = PrefUtils.get(controllingPref, false);
+
+    checkbox.setAttribute("disabled", !enabled);
+
+    this._prefObservers.push(
+      PrefUtils.addObserver(controllingPref, (enabled, pref) => {
+        // We need this as observer fires for pref and pref.<some sub path>
+        if (pref !== controllingPref) {
+          return;
+        }
+        const checkbox = document.getElementById(id);
+        checkbox.setAttribute("disabled", !enabled);
+      })
+    );
+  },
+};
diff --git a/waterfox/browser/components/preferences/content/tocbot.css b/waterfox/browser/components/preferences/content/tocbot.css
new file mode 100644
index 0000000000000..9c946cbc3b3a4
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/tocbot.css
@@ -0,0 +1,104 @@
+.toc {
+  overflow-y: auto;
+}
+.toc > .toc-list {
+  overflow: hidden;
+  position: relative;
+}
+.toc > .toc-list li {
+  list-style: none;
+}
+.toc-list {
+  margin: 0;
+  padding-left: 10px;
+}
+a.toc-link {
+  color: currentColor;
+  height: 100%;
+}
+.is-collapsible {
+  max-height: 1000px;
+  overflow: hidden;
+  transition: all 300ms ease-in-out;
+}
+.is-collapsed {
+  max-height: 0;
+}
+.is-position-fixed {
+  position: fixed !important;
+  top: 0;
+}
+.is-active-link {
+  font-weight: 700;
+}
+.toc-link::before {
+  background-color: #eee;
+  content: " ";
+  display: inline-block;
+  height: inherit;
+  left: 0;
+  margin-top: -1px;
+  position: absolute;
+  width: 2px;
+}
+.is-active-link::before {
+  background-color: #54bc4b;
+} /*# sourceMappingURL=tocbot.css.map */
+
+/* Patched version */
+.toc {
+  --uc-toc-margin: 0.5em;
+  display: block;
+  position: fixed;
+  width: 300px;
+  height: calc(100vh - 90px); /* .main-content inline style scroll-padding-top: 90px; */
+  transform: translateX(calc(var(--main-pane-width, 664px) + max(60px, 8vw)));
+  scrollbar-width: none;
+}
+@media (max-width: 1280px) {
+  .toc {
+    display: none;
+  }
+}
+.toc-list > .toc-list-item:only-child:not(:has(.toc-list)) {
+  /* If only one exists, remove it. */
+  display: none;
+}
+
+.toc-list-item {
+  cursor: pointer;
+}
+.toc-list-item > .toc-list:not(.is-collapsed) {
+  margin-top: var(--uc-toc-margin);
+}
+.toc-list-item:not(:last-child) {
+  margin-bottom: var(--uc-toc-margin);
+}
+
+.toc-link {
+  font-size: 1.14em; /* as h2 */
+  text-decoration: none;
+}
+.toc-link::before {
+  background-color: #eeeeef;
+}
+.is-active-link::before {
+  background-color: var(--in-content-accent-color, AccentColor);
+}
+
+.toc-list-item:hover:not(:has(> .toc-list:hover)) > .toc-link {
+  font-weight: 700;
+}
+.toc-list-item:hover:not(:has(> .toc-list:hover))
+  > .toc-link:not(.is-active-link)::before {
+  background-color: #d1d1d6;
+}
+@media (prefers-color-scheme: dark) {
+  .toc-link:not(.is-active-link)::before {
+    background-color: #2c2b32;
+  }
+  .toc-list-item:hover:not(:has(> .toc-list:hover))
+    > .toc-link:not(.is-active-link)::before {
+    background-color: #57575d;
+  }
+}
diff --git a/waterfox/browser/components/preferences/content/tocbot.js b/waterfox/browser/components/preferences/content/tocbot.js
new file mode 100644
index 0000000000000..858eec4e4ba18
--- /dev/null
+++ b/waterfox/browser/components/preferences/content/tocbot.js
@@ -0,0 +1,1363 @@
+/******/ (() => {
+  // webpackBootstrap
+  /******/ var __webpack_modules__ = {
+    /***/ "./src/js/build-html.js":
+      /*!******************************!*\
+  !*** ./src/js/build-html.js ***!
+  \******************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ default: () =>
+            /* export default binding */ __WEBPACK_DEFAULT_EXPORT__,
+          /* harmony export */
+        });
+        /* eslint no-var: off */
+
+        /**
+         * This file is responsible for building the DOM and updating DOM state.
+         *
+         * @author Tim Scanlin
+         */
+
+        /* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(
+          options
+        ) {
+          var forEach = [].forEach;
+          var some = [].some;
+          // if (typeof window === 'undefined') return
+          var body = typeof window !== "undefined" && document.body;
+          var tocElement;
+          var currentlyHighlighting = true;
+          var SPACE_CHAR = " ";
+
+          /**
+           * Create link and list elements.
+           * @param {Object} d
+           * @param {HTMLElement} container
+           * @return {HTMLElement}
+           */
+          function createEl(d, container) {
+            var link = container.appendChild(createLink(d));
+            if (d.children.length) {
+              var list = createList(d.isCollapsed);
+              d.children.forEach((child) => {
+                createEl(child, list);
+              });
+              link.appendChild(list);
+            }
+          }
+
+          /**
+           * Render nested heading array data into a given element.
+           * @param {HTMLElement} parent Optional. If provided updates the {@see tocElement} to match.
+           * @param {Array} data
+           * @return {HTMLElement}
+           */
+          function render(parent, data) {
+            var collapsed = false;
+            var container = createList(collapsed);
+
+            data.forEach((d) => {
+              createEl(d, container);
+            });
+
+            // Return if no TOC element is provided or known.
+            tocElement = parent || tocElement;
+            if (tocElement === null) {
+              return;
+            }
+
+            // Remove existing child if it exists.
+            if (tocElement.firstChild) {
+              tocElement.removeChild(tocElement.firstChild);
+            }
+
+            // Just return the parent and don't append the list if no links are found.
+            if (data.length === 0) {
+              return tocElement;
+            }
+
+            // Append the Elements that have been created
+            return tocElement.appendChild(container);
+          }
+
+          /**
+           * Create link element.
+           * @param {Object} data
+           * @return {HTMLElement}
+           */
+          function createLink(data) {
+            var item = document.createElement("li");
+            var a = document.createElement("a");
+            if (options.listItemClass) {
+              item.setAttribute("class", options.listItemClass);
+            }
+
+            if (options.onClick) {
+              a.onclick = options.onClick;
+            }
+
+            if (options.includeTitleTags) {
+              a.setAttribute("title", data.textContent);
+            }
+
+            if (options.includeHtml && data.childNodes.length) {
+              forEach.call(data.childNodes, (node) => {
+                a.appendChild(node.cloneNode(true));
+              });
+            } else {
+              // Default behavior. Set to textContent to keep tests happy.
+              a.textContent = data.textContent;
+            }
+            a.setAttribute("href", `${options.basePath}#${data.id}`);
+            a.setAttribute(
+              "class",
+              options.linkClass +
+                SPACE_CHAR +
+                "node-name--" +
+                data.nodeName +
+                SPACE_CHAR +
+                options.extraLinkClasses
+            );
+            item.appendChild(a);
+            return item;
+          }
+
+          /**
+           * Create list element.
+           * @param {Boolean} isCollapsed
+           * @return {HTMLElement}
+           */
+          function createList(isCollapsed) {
+            var listElement = options.orderedList ? "ol" : "ul";
+            var list = document.createElement(listElement);
+            var classes =
+              options.listClass + SPACE_CHAR + options.extraListClasses;
+            if (isCollapsed) {
+              // No plus/equals here fixes compilation issue.
+              classes = classes + SPACE_CHAR + options.collapsibleClass;
+              classes = classes + SPACE_CHAR + options.isCollapsedClass;
+            }
+            list.setAttribute("class", classes);
+            return list;
+          }
+
+          /**
+           * Update fixed sidebar class.
+           * @return {HTMLElement}
+           */
+          function updateFixedSidebarClass() {
+            if (
+              options.scrollContainer &&
+              document.querySelector(options.scrollContainer)
+            ) {
+              var top;
+              top = document.querySelector(options.scrollContainer).scrollTop;
+            } else {
+              top = document.documentElement.scrollTop || body.scrollTop;
+            }
+            var posFixedEl = document.querySelector(
+              options.positionFixedSelector
+            );
+
+            if (options.fixedSidebarOffset === "auto") {
+              options.fixedSidebarOffset = tocElement.offsetTop;
+            }
+
+            if (top > options.fixedSidebarOffset) {
+              if (
+                posFixedEl.className.indexOf(options.positionFixedClass) === -1
+              ) {
+                posFixedEl.className += SPACE_CHAR + options.positionFixedClass;
+              }
+            } else {
+              posFixedEl.className = posFixedEl.className.replace(
+                SPACE_CHAR + options.positionFixedClass,
+                ""
+              );
+            }
+          }
+
+          /**
+           * Get top position of heading
+           * @param {HTMLElement} obj
+           * @return {int} position
+           */
+          function getHeadingTopPos(obj) {
+            var position = 0;
+            if (obj !== null) {
+              position = obj.offsetTop;
+              if (options.hasInnerContainers) {
+                position += getHeadingTopPos(obj.offsetParent);
+              }
+            }
+            return position;
+          }
+
+          /**
+           * Update className only when changed.
+           * @param {HTMLElement} obj
+           * @param {string} className
+           * @return {HTMLElement} obj
+           */
+          function updateClassname(obj, className) {
+            if (obj && obj.className !== className) {
+              obj.className = className;
+            }
+            return obj;
+          }
+
+          /**
+           * Update TOC highlighting and collapsed groupings.
+           */
+          function updateToc(headingsArray) {
+            // If a fixed content container was set
+            if (
+              options.scrollContainer &&
+              document.querySelector(options.scrollContainer)
+            ) {
+              var top;
+              top = document.querySelector(options.scrollContainer).scrollTop;
+            } else {
+              top = document.documentElement.scrollTop || body.scrollTop;
+            }
+
+            // Add fixed class at offset
+            if (options.positionFixedSelector) {
+              updateFixedSidebarClass();
+            }
+
+            // Get the top most heading currently visible on the page so we know what to highlight.
+            var headings = headingsArray;
+            var topHeader;
+            // Using some instead of each so that we can escape early.
+            if (
+              currentlyHighlighting &&
+              tocElement !== null &&
+              headings.length > 0
+            ) {
+              some.call(headings, (heading, i) => {
+                if (
+                  getHeadingTopPos(heading) >
+                  top + options.headingsOffset + 10
+                ) {
+                  // Don't allow negative index value.
+                  var index = i === 0 ? i : i - 1;
+                  topHeader = headings[index];
+                  return true;
+                } else if (i === headings.length - 1) {
+                  // This allows scrolling for the last heading on the page.
+                  topHeader = headings[headings.length - 1];
+                  return true;
+                }
+              });
+
+              var oldActiveTocLink = tocElement.querySelector(
+                `.${options.activeLinkClass}`
+              );
+              var activeTocLink = tocElement.querySelector(
+                "." +
+                  options.linkClass +
+                  ".node-name--" +
+                  CSS.escape(topHeader.nodeName) +
+                  '[href="' +
+                  options.basePath +
+                  "#" +
+                  topHeader.id.replace(
+                    /([ #;&,.+*~':"!^$[\]()=>|/\\@])/g,
+                    "\\$1"
+                  ) +
+                  '"]'
+              );
+              // Performance improvement to only change the classes
+              // for the toc if a new link should be highlighted.
+              if (oldActiveTocLink === activeTocLink) {
+                return;
+              }
+
+              // Remove the active class from the other tocLinks.
+              var tocLinks = tocElement.querySelectorAll(
+                `.${options.linkClass}`
+              );
+              forEach.call(tocLinks, (tocLink) => {
+                updateClassname(
+                  tocLink,
+                  tocLink.className.replace(
+                    SPACE_CHAR + options.activeLinkClass,
+                    ""
+                  )
+                );
+              });
+              var tocLis = tocElement.querySelectorAll(
+                `.${options.listItemClass}`
+              );
+              forEach.call(tocLis, (tocLi) => {
+                updateClassname(
+                  tocLi,
+                  tocLi.className.replace(
+                    SPACE_CHAR + options.activeListItemClass,
+                    ""
+                  )
+                );
+              });
+
+              // Add the active class to the active tocLink.
+              if (
+                activeTocLink &&
+                activeTocLink.className.indexOf(options.activeLinkClass) === -1
+              ) {
+                activeTocLink.className += SPACE_CHAR + options.activeLinkClass;
+              }
+              var li = activeTocLink?.parentNode;
+              if (
+                li &&
+                li.className.indexOf(options.activeListItemClass) === -1
+              ) {
+                li.className += SPACE_CHAR + options.activeListItemClass;
+              }
+
+              var tocLists = tocElement.querySelectorAll(
+                `.${options.listClass}.${options.collapsibleClass}`
+              );
+
+              // Collapse the other collapsible lists.
+              forEach.call(tocLists, (list) => {
+                if (list.className.indexOf(options.isCollapsedClass) === -1) {
+                  list.className += SPACE_CHAR + options.isCollapsedClass;
+                }
+              });
+
+              // Expand the active link's collapsible list and its sibling if applicable.
+              if (
+                activeTocLink?.nextSibling &&
+                activeTocLink.nextSibling.className.indexOf(
+                  options.isCollapsedClass
+                ) !== -1
+              ) {
+                updateClassname(
+                  activeTocLink.nextSibling,
+                  activeTocLink.nextSibling.className.replace(
+                    SPACE_CHAR + options.isCollapsedClass,
+                    ""
+                  )
+                );
+              }
+              removeCollapsedFromParents(activeTocLink?.parentNode.parentNode);
+            }
+          }
+
+          /**
+           * Remove collapsed class from parent elements.
+           * @param {HTMLElement} element
+           * @return {HTMLElement}
+           */
+          function removeCollapsedFromParents(element) {
+            if (
+              element &&
+              element.className.indexOf(options.collapsibleClass) !== -1 &&
+              element.className.indexOf(options.isCollapsedClass) !== -1
+            ) {
+              updateClassname(
+                element,
+                element.className.replace(
+                  SPACE_CHAR + options.isCollapsedClass,
+                  ""
+                )
+              );
+              return removeCollapsedFromParents(element.parentNode.parentNode);
+            }
+            return element;
+          }
+
+          /**
+           * Disable TOC Animation when a link is clicked.
+           * @param {Event} event
+           */
+          function disableTocAnimation(event) {
+            var target = event.target || event.srcElement;
+            if (
+              typeof target.className !== "string" ||
+              target.className.indexOf(options.linkClass) === -1
+            ) {
+              return;
+            }
+            // Bind to tocLink clicks to temporarily disable highlighting
+            // while smoothScroll is animating.
+            currentlyHighlighting = false;
+          }
+
+          /**
+           * Enable TOC Animation.
+           */
+          function enableTocAnimation() {
+            currentlyHighlighting = true;
+          }
+
+          return {
+            enableTocAnimation,
+            disableTocAnimation,
+            render,
+            updateToc,
+          };
+        }
+
+        /***/
+      },
+
+    /***/ "./src/js/default-options.js":
+      /*!***********************************!*\
+  !*** ./src/js/default-options.js ***!
+  \***********************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+          /* harmony export */
+        });
+        /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = {
+          // Where to render the table of contents.
+          tocSelector: ".js-toc",
+          // Where to grab the headings to build the table of contents.
+          contentSelector: ".js-toc-content",
+          // Which headings to grab inside of the contentSelector element.
+          headingSelector: "h1, h2, h3",
+          // Headings that match the ignoreSelector will be skipped.
+          ignoreSelector: ".js-toc-ignore",
+          // For headings inside relative or absolute positioned containers within content
+          hasInnerContainers: false,
+          // Main class to add to links.
+          linkClass: "toc-link",
+          // Extra classes to add to links.
+          extraLinkClasses: "",
+          // Class to add to active links,
+          // the link corresponding to the top most heading on the page.
+          activeLinkClass: "is-active-link",
+          // Main class to add to lists.
+          listClass: "toc-list",
+          // Extra classes to add to lists.
+          extraListClasses: "",
+          // Class that gets added when a list should be collapsed.
+          isCollapsedClass: "is-collapsed",
+          // Class that gets added when a list should be able
+          // to be collapsed but isn't necessarily collapsed.
+          collapsibleClass: "is-collapsible",
+          // Class to add to list items.
+          listItemClass: "toc-list-item",
+          // Class to add to active list items.
+          activeListItemClass: "is-active-li",
+          // How many heading levels should not be collapsed.
+          // For example, number 6 will show everything since
+          // there are only 6 heading levels and number 0 will collapse them all.
+          // The sections that are hidden will open
+          // and close as you scroll to headings within them.
+          collapseDepth: 0,
+          // Smooth scrolling enabled.
+          scrollSmooth: true,
+          // Smooth scroll duration.
+          scrollSmoothDuration: 420,
+          // Smooth scroll offset.
+          scrollSmoothOffset: 0,
+          // Callback for scroll end.
+          scrollEndCallback: (_e) => {},
+          // Headings offset between the headings and the top of the document (this is meant for minor adjustments).
+          headingsOffset: 1,
+          // Timeout between events firing to make sure it's
+          // not too rapid (for performance reasons).
+          throttleTimeout: 50,
+          // Element to add the positionFixedClass to.
+          positionFixedSelector: null,
+          // Fixed position class to add to make sidebar fixed after scrolling
+          // down past the fixedSidebarOffset.
+          positionFixedClass: "is-position-fixed",
+          // fixedSidebarOffset can be any number but by default is set
+          // to auto which sets the fixedSidebarOffset to the sidebar
+          // element's offsetTop from the top of the document on init.
+          fixedSidebarOffset: "auto",
+          // includeHtml can be set to true to include the HTML markup from the
+          // heading node instead of just including the innerText.
+          includeHtml: false,
+          // includeTitleTags automatically sets the html title tag of the link
+          // to match the title. This can be useful for SEO purposes or
+          // when truncating titles.
+          includeTitleTags: false,
+          // onclick function to apply to all links in toc. will be called with
+          // the event as the first parameter, and this can be used to stop,
+          // propagation, prevent default or perform action
+          onClick: (_e) => {},
+          // orderedList can be set to false to generate unordered lists (ul)
+          // instead of ordered lists (ol)
+          orderedList: true,
+          // If there is a fixed article scroll container, set to calculate titles' offset
+          scrollContainer: null,
+          // prevent ToC DOM rendering if it's already rendered by an external system
+          skipRendering: false,
+          // Optional callback to change heading labels.
+          // For example it can be used to cut down and put ellipses on multiline headings you deem too long.
+          // Called each time a heading is parsed. Expects a string and returns the modified label to display.
+          // Additionally, the attribute `data-heading-label` may be used on a heading to specify
+          // a shorter string to be used in the TOC.
+          // function (string) => string
+          headingLabelCallback: false,
+          // ignore headings that are hidden in DOM
+          ignoreHiddenElements: false,
+          // Optional callback to modify properties of parsed headings.
+          // The heading element is passed in node parameter and information parsed by default parser is provided in obj parameter.
+          // Function has to return the same or modified obj.
+          // The heading will be excluded from TOC if nothing is returned.
+          // function (object, HTMLElement) => object | void
+          headingObjectCallback: null,
+          // Set the base path, useful if you use a `base` tag in `head`.
+          basePath: "",
+          // Only takes affect when `tocSelector` is scrolling,
+          // keep the toc scroll position in sync with the content.
+          disableTocScrollSync: false,
+          // Offset for the toc scroll (top) position when scrolling the page.
+          // Only effective if `disableTocScrollSync` is false.
+          tocScrollOffset: 0,
+        };
+
+        /***/
+      },
+
+    /***/ "./src/js/index-esm.js":
+      /*!*****************************!*\
+  !*** ./src/js/index-esm.js ***!
+  \*****************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ _buildHtml: () => /* binding */ _buildHtml,
+          /* harmony export */ _headingsArray: () =>
+            /* binding */ _headingsArray,
+          /* harmony export */ _options: () => /* binding */ _options,
+          /* harmony export */ _parseContent: () => /* binding */ _parseContent,
+          /* harmony export */ _scrollListener: () =>
+            /* binding */ _scrollListener,
+          /* harmony export */ destroy: () => /* binding */ destroy,
+          /* harmony export */ init: () => /* binding */ init,
+          /* harmony export */ refresh: () => /* binding */ refresh,
+          /* harmony export */
+        });
+        /* harmony import */ var _build_html_js__WEBPACK_IMPORTED_MODULE_0__ =
+          __webpack_require__(/*! ./build-html.js */ "./src/js/build-html.js");
+        /* harmony import */ var _default_options_js__WEBPACK_IMPORTED_MODULE_1__ =
+          __webpack_require__(
+            /*! ./default-options.js */ "./src/js/default-options.js"
+          );
+        /* harmony import */ var _parse_content_js__WEBPACK_IMPORTED_MODULE_2__ =
+          __webpack_require__(
+            /*! ./parse-content.js */ "./src/js/parse-content.js"
+          );
+        /* harmony import */ var _scroll_smooth_index_js__WEBPACK_IMPORTED_MODULE_3__ =
+          __webpack_require__(
+            /*! ./scroll-smooth/index.js */ "./src/js/scroll-smooth/index.js"
+          );
+        /* harmony import */ var _update_toc_scroll_js__WEBPACK_IMPORTED_MODULE_4__ =
+          __webpack_require__(
+            /*! ./update-toc-scroll.js */ "./src/js/update-toc-scroll.js"
+          );
+        /* eslint no-var: off */
+        /**
+         * Tocbot
+         * Tocbot creates a table of contents based on HTML headings on a page,
+         * this allows users to easily jump to different sections of the document.
+         * Tocbot was inspired by tocify (http://gregfranko.com/jquery.tocify.js/).
+         * The main differences are that it works natively without any need for jquery or jquery UI).
+         *
+         * @author Tim Scanlin
+         */
+
+        // For testing purposes.
+        let _options = {}; // Object to store current options.
+        let _buildHtml;
+        let _parseContent;
+        let _headingsArray;
+        let _scrollListener;
+
+        let clickListener;
+
+        /**
+         * Initialize tocbot.
+         * @param {object} customOptions
+         */
+        function init(customOptions) {
+          // Merge defaults with user options.
+          // Set to options variable at the top.
+          _options = extend(
+            _default_options_js__WEBPACK_IMPORTED_MODULE_1__.default,
+            customOptions || {}
+          );
+
+          // Init smooth scroll if enabled (default).
+          if (_options.scrollSmooth) {
+            _options.duration = _options.scrollSmoothDuration;
+            _options.offset = _options.scrollSmoothOffset;
+            (0, _scroll_smooth_index_js__WEBPACK_IMPORTED_MODULE_3__.default)(
+              _options
+            );
+          }
+
+          // Pass options to these modules.
+          _buildHtml = (0, _build_html_js__WEBPACK_IMPORTED_MODULE_0__.default)(
+            _options
+          );
+          _parseContent = (0,
+          _parse_content_js__WEBPACK_IMPORTED_MODULE_2__.default)(_options);
+
+          // Destroy it if it exists first.
+          destroy();
+
+          const contentElement = getContentElement(_options);
+          if (contentElement === null) {
+            return;
+          }
+
+          const tocElement = getTocElement(_options);
+          if (tocElement === null) {
+            return;
+          }
+
+          // Get headings array.
+          _headingsArray = _parseContent.selectHeadings(
+            contentElement,
+            _options.headingSelector
+          );
+
+          // Return if no headings are found.
+          if (_headingsArray === null) {
+            return;
+          }
+
+          // Build nested headings array.
+          const nestedHeadingsObj =
+            _parseContent.nestHeadingsArray(_headingsArray);
+          const nestedHeadings = nestedHeadingsObj.nest;
+
+          // Render.
+          if (!_options.skipRendering) {
+            _buildHtml.render(tocElement, nestedHeadings);
+          } else {
+            // No need to attach listeners if skipRendering is true, this was causing errors.
+            return this;
+          }
+
+          // Update Sidebar and bind listeners.
+          _scrollListener = throttle((e) => {
+            _buildHtml.updateToc(_headingsArray);
+            !_options.disableTocScrollSync &&
+              (0, _update_toc_scroll_js__WEBPACK_IMPORTED_MODULE_4__.default)(
+                _options
+              );
+            const isTop =
+              e?.target?.scrollingElement &&
+              e.target.scrollingElement.scrollTop === 0;
+            if (
+              (e && (e.eventPhase === 0 || e.currentTarget === null)) ||
+              isTop
+            ) {
+              _buildHtml.updateToc(_headingsArray);
+              if (_options.scrollEndCallback) {
+                _options.scrollEndCallback(e);
+              }
+            }
+          }, _options.throttleTimeout);
+          _scrollListener();
+          if (
+            _options.scrollContainer &&
+            document.querySelector(_options.scrollContainer)
+          ) {
+            document
+              .querySelector(_options.scrollContainer)
+              .addEventListener("scroll", _scrollListener, false);
+            document
+              .querySelector(_options.scrollContainer)
+              .addEventListener("resize", _scrollListener, false);
+          } else {
+            document.addEventListener("scroll", _scrollListener, false);
+            document.addEventListener("resize", _scrollListener, false);
+          }
+
+          // Bind click listeners to disable animation.
+          let timeout = null;
+          clickListener = throttle((event) => {
+            if (_options.scrollSmooth) {
+              _buildHtml.disableTocAnimation(event);
+            }
+            _buildHtml.updateToc(_headingsArray);
+            // Timeout to re-enable the animation.
+            timeout && clearTimeout(timeout);
+            timeout = setTimeout(() => {
+              _buildHtml.enableTocAnimation();
+            }, _options.scrollSmoothDuration);
+          }, _options.throttleTimeout);
+
+          if (
+            _options.scrollContainer &&
+            document.querySelector(_options.scrollContainer)
+          ) {
+            document
+              .querySelector(_options.scrollContainer)
+              .addEventListener("click", clickListener, false);
+          } else {
+            document.addEventListener("click", clickListener, false);
+          }
+        }
+
+        /**
+         * Destroy tocbot.
+         */
+        function destroy() {
+          const tocElement = getTocElement(_options);
+          if (tocElement === null) {
+            return;
+          }
+
+          if (!_options.skipRendering) {
+            // Clear HTML.
+            if (tocElement) {
+              tocElement.innerHTML = "";
+            }
+          }
+
+          // Remove event listeners.
+          if (
+            _options.scrollContainer &&
+            document.querySelector(_options.scrollContainer)
+          ) {
+            document
+              .querySelector(_options.scrollContainer)
+              .removeEventListener("scroll", _scrollListener, false);
+            document
+              .querySelector(_options.scrollContainer)
+              .removeEventListener("resize", _scrollListener, false);
+            if (_buildHtml) {
+              document
+                .querySelector(_options.scrollContainer)
+                .removeEventListener("click", clickListener, false);
+            }
+          } else {
+            document.removeEventListener("scroll", _scrollListener, false);
+            document.removeEventListener("resize", _scrollListener, false);
+            if (_buildHtml) {
+              document.removeEventListener("click", clickListener, false);
+            }
+          }
+        }
+
+        /**
+         * Refresh tocbot.
+         */
+        function refresh(customOptions) {
+          destroy();
+          init(customOptions || _options);
+        }
+
+        // From: https://github.com/Raynos/xtend
+        const hasOwnProperty = Object.prototype.hasOwnProperty;
+        function extend() {
+          const target = {};
+          for (let i = 0; i < arguments.length; i++) {
+            const source = arguments[i];
+            for (const key in source) {
+              if (hasOwnProperty.call(source, key)) {
+                target[key] = source[key];
+              }
+            }
+          }
+          return target;
+        }
+
+        // From: https://remysharp.com/2010/07/21/throttling-function-calls
+        function throttle(fn, threshold, scope) {
+          threshold || (threshold = 250);
+          let last;
+          let deferTimer;
+          return function () {
+            const context = scope || this;
+            const now = Date.now();
+            const args = arguments;
+            if (last && now < last + threshold) {
+              // hold on to it
+              clearTimeout(deferTimer);
+              deferTimer = setTimeout(() => {
+                last = now;
+                fn.apply(context, args);
+              }, threshold);
+            } else {
+              last = now;
+              fn.apply(context, args);
+            }
+          };
+        }
+
+        function getContentElement(options) {
+          try {
+            return (
+              options.contentElement ||
+              document.querySelector(options.contentSelector)
+            );
+          } catch (_e) {
+            console.warn(
+              `Contents element not found: ${options.contentSelector}`
+            ); // eslint-disable-line
+            return null;
+          }
+        }
+
+        function getTocElement(options) {
+          try {
+            return (
+              options.tocElement || document.querySelector(options.tocSelector)
+            );
+          } catch (_e) {
+            console.warn(`TOC element not found: ${options.tocSelector}`); // eslint-disable-line
+            return null;
+          }
+        }
+
+        /***/
+      },
+
+    /***/ "./src/js/parse-content.js":
+      /*!*********************************!*\
+  !*** ./src/js/parse-content.js ***!
+  \*********************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ default: () => /* binding */ parseContent,
+          /* harmony export */
+        });
+        /* eslint no-var: off */
+        /**
+         * This file is responsible for parsing the content from the DOM and making
+         * sure data is nested properly.
+         *
+         * @author Tim Scanlin
+         */
+
+        function parseContent(options) {
+          var reduce = [].reduce;
+
+          /**
+           * Get the last item in an array and return a reference to it.
+           * @param {Array} array
+           * @return {Object}
+           */
+          function getLastItem(array) {
+            return array[array.length - 1];
+          }
+
+          /**
+           * Get heading level for a heading dom node.
+           * @param {HTMLElement} heading
+           * @return {Number}
+           */
+          function getHeadingLevel(heading) {
+            return +heading.nodeName
+              .replace(/^html:/, "")
+              .toUpperCase()
+              .replace("H", "");
+          }
+
+          /**
+           * Determine whether the object is an HTML Element.
+           * Also works inside iframes. HTML Elements might be created by the parent document.
+           * @param {Object} maybeElement
+           * @return {Number}
+           */
+          function isHTMLElement(maybeElement) {
+            try {
+              return (
+                maybeElement instanceof window.HTMLElement ||
+                maybeElement instanceof window.parent.HTMLElement
+              );
+            } catch (_e) {
+              return maybeElement instanceof window.HTMLElement;
+            }
+          }
+
+          /**
+           * Get important properties from a heading element and store in a plain object.
+           * @param {HTMLElement} heading
+           * @return {Object}
+           */
+          function getHeadingObject(heading) {
+            // each node is processed twice by this method because nestHeadingsArray() and addNode() calls it
+            // first time heading is real DOM node element, second time it is obj
+            // that is causing problem so I am processing only original DOM node
+            if (!isHTMLElement(heading)) return heading;
+
+            if (
+              options.ignoreHiddenElements &&
+              (!heading.offsetHeight || !heading.offsetParent)
+            ) {
+              return null;
+            }
+
+            const headingLabel =
+              heading.getAttribute("data-heading-label") ||
+              (options.headingLabelCallback
+                ? String(options.headingLabelCallback(heading.innerText))
+                : (heading.innerText || heading.textContent).trim());
+            var obj = {
+              id: heading.id,
+              children: [],
+              nodeName: heading.nodeName,
+              headingLevel: getHeadingLevel(heading),
+              textContent: headingLabel,
+            };
+
+            if (options.includeHtml) {
+              obj.childNodes = heading.childNodes;
+            }
+
+            if (options.headingObjectCallback) {
+              return options.headingObjectCallback(obj, heading);
+            }
+
+            return obj;
+          }
+
+          /**
+           * Add a node to the nested array.
+           * @param {Object} node
+           * @param {Array} nest
+           * @return {Array}
+           */
+          function addNode(node, nest) {
+            var obj = getHeadingObject(node);
+            var level = obj.headingLevel;
+            var array = nest;
+            var lastItem = getLastItem(array);
+            var lastItemLevel = lastItem ? lastItem.headingLevel : 0;
+            var counter = level - lastItemLevel;
+
+            while (counter > 0) {
+              lastItem = getLastItem(array);
+              // Handle case where there are multiple h5+ in a row.
+              if (lastItem && level === lastItem.headingLevel) {
+                break;
+              } else if (lastItem && lastItem.children !== undefined) {
+                array = lastItem.children;
+              }
+              counter--;
+            }
+
+            if (level >= options.collapseDepth) {
+              obj.isCollapsed = true;
+            }
+
+            array.push(obj);
+            return array;
+          }
+
+          /**
+           * Select headings in content area, exclude any selector in options.ignoreSelector
+           * @param {HTMLElement} contentElement
+           * @param {Array} headingSelector
+           * @return {Array}
+           */
+          function selectHeadings(contentElement, headingSelector) {
+            var selectors = headingSelector;
+            if (options.ignoreSelector) {
+              selectors = headingSelector
+                .split(",")
+                .map(function mapSelectors(selector) {
+                  return `${selector.trim()}:not(${options.ignoreSelector})`;
+                });
+            }
+            try {
+              return contentElement.querySelectorAll(selectors);
+            } catch (_e) {
+              console.warn(`Headers not found with selector: ${selectors}`); // eslint-disable-line
+              return null;
+            }
+          }
+
+          /**
+           * Nest headings array into nested arrays with 'children' property.
+           * @param {Array} headingsArray
+           * @return {Object}
+           */
+          function nestHeadingsArray(headingsArray) {
+            return reduce.call(
+              headingsArray,
+              function reducer(prev, curr) {
+                var currentHeading = getHeadingObject(curr);
+                if (currentHeading) {
+                  addNode(currentHeading, prev.nest);
+                }
+                return prev;
+              },
+              {
+                nest: [],
+              }
+            );
+          }
+
+          return {
+            nestHeadingsArray,
+            selectHeadings,
+          };
+        }
+
+        /***/
+      },
+
+    /***/ "./src/js/scroll-smooth/index.js":
+      /*!***************************************!*\
+  !*** ./src/js/scroll-smooth/index.js ***!
+  \***************************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ default: () => /* binding */ initSmoothScrolling,
+          /* harmony export */
+        });
+        /* eslint no-var: off */
+        /* globals location, requestAnimationFrame */
+
+        function initSmoothScrolling(options) {
+          // if (isCssSmoothSCrollSupported()) { return }
+
+          var duration = options.duration;
+          var offset = options.offset;
+          if (typeof window === "undefined" || typeof location === "undefined")
+            return;
+
+          var pageUrl = location.hash
+            ? stripHash(location.href)
+            : location.href;
+
+          delegatedLinkHijacking();
+
+          function delegatedLinkHijacking() {
+            document.body.addEventListener("click", onClick, false);
+
+            function onClick(e) {
+              if (
+                !isInPageLink(e.target) ||
+                e.target.className.indexOf("no-smooth-scroll") > -1 ||
+                (e.target.href.charAt(e.target.href.length - 2) === "#" &&
+                  e.target.href.charAt(e.target.href.length - 1) === "!") ||
+                e.target.className.indexOf(options.linkClass) === -1
+              ) {
+                return;
+              }
+
+              // Don't prevent default or hash doesn't change.
+              // e.preventDefault()
+
+              jump(e.target.hash, {
+                duration,
+                offset,
+                callback: () => {
+                  setFocus(e.target.hash);
+                },
+              });
+            }
+          }
+
+          function isInPageLink(n) {
+            return (
+              n.tagName.toLowerCase() === "a" &&
+              (n.hash.length > 0 || n.href.charAt(n.href.length - 1) === "#") &&
+              (stripHash(n.href) === pageUrl ||
+                `${stripHash(n.href)}#` === pageUrl)
+            );
+          }
+
+          function stripHash(url) {
+            return url.slice(0, url.lastIndexOf("#"));
+          }
+
+          // function isCssSmoothSCrollSupported () {
+          //   return 'scrollBehavior' in document.documentElement.style
+          // }
+
+          // Adapted from:
+          // https://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
+          function setFocus(hash) {
+            var element = document.getElementById(hash.substring(1));
+
+            if (element) {
+              if (
+                !/^(?:a|select|input|button|textarea)$/i.test(element.tagName)
+              ) {
+                element.tabIndex = -1;
+              }
+
+              element.focus();
+            }
+          }
+        }
+
+        function jump(target, options) {
+          var start = window.pageYOffset;
+          var opt = {
+            duration: options.duration,
+            offset: options.offset || 0,
+            callback: options.callback,
+            easing: options.easing || easeInOutQuad,
+          };
+          // This makes ids that start with a number work: ('[id="' + decodeURI(target).split('#').join('') + '"]')
+          // DecodeURI for nonASCII hashes, they was encoded, but id was not encoded, it lead to not finding the tgt element by id.
+          // And this is for IE: document.body.scrollTop
+          // Handle decoded and non-decoded URIs since sometimes URLs automatically transform them (support for internation chars).
+          var tgt =
+            document.querySelector(
+              `[id="${decodeURI(target).split("#").join("")}"]`
+            ) || document.querySelector(`[id="${target.split("#").join("")}"]`);
+          var distance =
+            typeof target === "string"
+              ? opt.offset +
+                (target
+                  ? tgt?.getBoundingClientRect().top || 0 // handle non-existent links better.
+                  : -(
+                      document.documentElement.scrollTop ||
+                      document.body.scrollTop
+                    ))
+              : target;
+          var duration =
+            typeof opt.duration === "function"
+              ? opt.duration(distance)
+              : opt.duration;
+          var timeStart;
+          var timeElapsed;
+
+          requestAnimationFrame((time) => {
+            timeStart = time;
+            loop(time);
+          });
+          function loop(time) {
+            timeElapsed = time - timeStart;
+
+            window.scrollTo(
+              0,
+              opt.easing(timeElapsed, start, distance, duration)
+            );
+
+            if (timeElapsed < duration) {
+              requestAnimationFrame(loop);
+            } else {
+              end();
+            }
+          }
+
+          function end() {
+            window.scrollTo(0, start + distance);
+
+            if (typeof opt.callback === "function") {
+              opt.callback();
+            }
+          }
+
+          // Robert Penner's easeInOutQuad - http://robertpenner.com/easing/
+          function easeInOutQuad(t, b, c, d) {
+            t /= d / 2;
+            if (t < 1) return (c / 2) * t * t + b;
+            t--;
+            return (-c / 2) * (t * (t - 2) - 1) + b;
+          }
+        }
+
+        /***/
+      },
+
+    /***/ "./src/js/update-toc-scroll.js":
+      /*!*************************************!*\
+  !*** ./src/js/update-toc-scroll.js ***!
+  \*************************************/
+      /***/ (
+        __unused_webpack___webpack_module__,
+        __webpack_exports__,
+        __webpack_require__
+      ) => {
+        __webpack_require__.r(__webpack_exports__);
+        /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+          /* harmony export */ default: () => /* binding */ updateTocScroll,
+          /* harmony export */
+        });
+        /* eslint no-var: off */
+
+        const SCROLL_LEEWAY = 30;
+        function updateTocScroll(options) {
+          var toc =
+            options.tocElement || document.querySelector(options.tocSelector);
+          if (toc && toc.scrollHeight > toc.clientHeight) {
+            var activeItem = toc.querySelector(
+              `.${options.activeListItemClass}`
+            );
+            if (activeItem) {
+              // Determine container top and bottom
+              var cTop = toc.scrollTop;
+              var cBottom = cTop + toc.clientHeight;
+
+              // Determine element top and bottom
+              var eTop = activeItem.offsetTop;
+              var eBottom = eTop + activeItem.clientHeight;
+
+              // Check if out of view
+              // Above scroll view
+              if (eTop < cTop + options.tocScrollOffset) {
+                toc.scrollTop -= cTop - eTop + options.tocScrollOffset;
+                // Below scroll view
+              } else if (
+                eBottom >
+                cBottom - options.tocScrollOffset - SCROLL_LEEWAY
+              ) {
+                toc.scrollTop +=
+                  eBottom -
+                  cBottom +
+                  options.tocScrollOffset +
+                  2 * SCROLL_LEEWAY;
+              }
+            }
+          }
+        }
+
+        /***/
+      },
+
+    /******/
+  };
+  /************************************************************************/
+  /******/ // The module cache
+  /******/ var __webpack_module_cache__ = {};
+  /******/
+  /******/ // The require function
+  /******/ function __webpack_require__(moduleId) {
+    /******/ // Check if module is in cache
+    /******/ var cachedModule = __webpack_module_cache__[moduleId];
+    /******/ if (cachedModule !== undefined) {
+      /******/ return cachedModule.exports;
+      /******/
+    }
+    /******/ // Create a new module (and put it into the cache)
+    /******/ var module = (__webpack_module_cache__[moduleId] = {
+      /******/ // no module.id needed
+      /******/ // no module.loaded needed
+      /******/ exports: {},
+      /******/
+    });
+    /******/
+    /******/ // Execute the module function
+    /******/ __webpack_modules__[moduleId](
+      module,
+      module.exports,
+      __webpack_require__
+    );
+    /******/
+    /******/ // Return the exports of the module
+    /******/ return module.exports;
+    /******/
+  }
+  /******/
+  /************************************************************************/
+  /******/ /* webpack/runtime/define property getters */
+  /******/ (() => {
+    /******/ // define getter functions for harmony exports
+    /******/ __webpack_require__.d = (exports, definition) => {
+      /******/ for (var key in definition) {
+        /******/ if (
+          __webpack_require__.o(definition, key) &&
+          !__webpack_require__.o(exports, key)
+        ) {
+          /******/ Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key],
+          });
+          /******/
+        }
+        /******/
+      }
+      /******/
+    };
+    /******/
+  })();
+  /******/
+  /******/ /* webpack/runtime/hasOwnProperty shorthand */
+  /******/ (() => {
+    /******/ __webpack_require__.o = (obj, prop) => Object.hasOwn(obj, prop);
+    /******/
+  })();
+  /******/
+  /******/ /* webpack/runtime/make namespace object */
+  /******/ (() => {
+    /******/ // define __esModule on exports
+    /******/ __webpack_require__.r = (exports) => {
+      /******/ if (typeof Symbol !== "undefined" && Symbol.toStringTag) {
+        /******/ Object.defineProperty(exports, Symbol.toStringTag, {
+          value: "Module",
+        });
+        /******/
+      }
+      /******/ Object.defineProperty(exports, "__esModule", { value: true });
+      /******/
+    };
+    /******/
+  })();
+  /******/
+  /************************************************************************/
+  var __webpack_exports__ = {};
+  // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+  (() => {
+    /*!******************************!*\
+  !*** ./src/js/index-dist.js ***!
+  \******************************/
+    __webpack_require__.r(__webpack_exports__);
+    /* harmony import */ var _index_esm_js__WEBPACK_IMPORTED_MODULE_0__ =
+      __webpack_require__(/*! ./index-esm.js */ "./src/js/index-esm.js");
+    /* globals define */
+
+    ((root, factory) => {
+      if (typeof define === "function" && define.amd) {
+        define([], factory(root));
+      } else if (typeof exports === "object") {
+        module.exports = factory(root);
+      } else {
+        root.tocbot = factory(root);
+      }
+    })(typeof global !== "undefined" ? global : window || global, (root) => {
+      // Just return if its not a browser.
+      const supports =
+        !!root &&
+        !!root.document &&
+        !!root.document.querySelector &&
+        !!root.addEventListener; // Feature test
+      if (typeof window === "undefined" && !supports) {
+        return;
+      }
+
+      // Make tocbot available globally.
+      root.tocbot = _index_esm_js__WEBPACK_IMPORTED_MODULE_0__;
+
+      return _index_esm_js__WEBPACK_IMPORTED_MODULE_0__;
+    });
+  })();
+
+  /******/
+})();
+//# sourceMappingURL=main.js.map
diff --git a/waterfox/browser/components/preferences/images/autoblur_tab.png b/waterfox/browser/components/preferences/images/autoblur_tab.png
new file mode 100644
index 0000000000000..9268723097062
Binary files /dev/null and b/waterfox/browser/components/preferences/images/autoblur_tab.png differ
diff --git a/waterfox/browser/components/preferences/images/autohide_back.png b/waterfox/browser/components/preferences/images/autohide_back.png
new file mode 100644
index 0000000000000..4f217ed8bdbbb
Binary files /dev/null and b/waterfox/browser/components/preferences/images/autohide_back.png differ
diff --git a/waterfox/browser/components/preferences/images/autohide_forward.png b/waterfox/browser/components/preferences/images/autohide_forward.png
new file mode 100644
index 0000000000000..00acdbed7a57c
Binary files /dev/null and b/waterfox/browser/components/preferences/images/autohide_forward.png differ
diff --git a/waterfox/browser/components/preferences/images/autohide_sidebar.png b/waterfox/browser/components/preferences/images/autohide_sidebar.png
new file mode 100644
index 0000000000000..1113c74ce06cb
Binary files /dev/null and b/waterfox/browser/components/preferences/images/autohide_sidebar.png differ
diff --git a/waterfox/browser/components/preferences/images/autohide_tab.png b/waterfox/browser/components/preferences/images/autohide_tab.png
new file mode 100644
index 0000000000000..2accc8b5d61d0
Binary files /dev/null and b/waterfox/browser/components/preferences/images/autohide_tab.png differ
diff --git a/waterfox/browser/components/preferences/images/bookmarkbar_icon.png b/waterfox/browser/components/preferences/images/bookmarkbar_icon.png
new file mode 100644
index 0000000000000..3dac12af1e9a4
Binary files /dev/null and b/waterfox/browser/components/preferences/images/bookmarkbar_icon.png differ
diff --git a/waterfox/browser/components/preferences/images/bookmarkbar_label.png b/waterfox/browser/components/preferences/images/bookmarkbar_label.png
new file mode 100644
index 0000000000000..d879c066926b3
Binary files /dev/null and b/waterfox/browser/components/preferences/images/bookmarkbar_label.png differ
diff --git a/waterfox/browser/components/preferences/images/close_button_hover.png b/waterfox/browser/components/preferences/images/close_button_hover.png
new file mode 100644
index 0000000000000..7d0c68b9ec80f
Binary files /dev/null and b/waterfox/browser/components/preferences/images/close_button_hover.png differ
diff --git a/waterfox/browser/components/preferences/images/disabled_menu.png b/waterfox/browser/components/preferences/images/disabled_menu.png
new file mode 100644
index 0000000000000..8601a528fed97
Binary files /dev/null and b/waterfox/browser/components/preferences/images/disabled_menu.png differ
diff --git a/waterfox/browser/components/preferences/images/drag_space.png b/waterfox/browser/components/preferences/images/drag_space.png
new file mode 100644
index 0000000000000..b7d086988c9ef
Binary files /dev/null and b/waterfox/browser/components/preferences/images/drag_space.png differ
diff --git a/waterfox/browser/components/preferences/images/full_panel_separator.png b/waterfox/browser/components/preferences/images/full_panel_separator.png
new file mode 100644
index 0000000000000..2b01e02e19995
Binary files /dev/null and b/waterfox/browser/components/preferences/images/full_panel_separator.png differ
diff --git a/waterfox/browser/components/preferences/images/hide_iconbox.png b/waterfox/browser/components/preferences/images/hide_iconbox.png
new file mode 100644
index 0000000000000..0e2e77d7df002
Binary files /dev/null and b/waterfox/browser/components/preferences/images/hide_iconbox.png differ
diff --git a/waterfox/browser/components/preferences/images/mac_icons.png b/waterfox/browser/components/preferences/images/mac_icons.png
new file mode 100644
index 0000000000000..d8abd88baf4b0
Binary files /dev/null and b/waterfox/browser/components/preferences/images/mac_icons.png differ
diff --git a/waterfox/browser/components/preferences/images/monospace_font.png b/waterfox/browser/components/preferences/images/monospace_font.png
new file mode 100644
index 0000000000000..5ddd38f9635a9
Binary files /dev/null and b/waterfox/browser/components/preferences/images/monospace_font.png differ
diff --git a/waterfox/browser/components/preferences/images/monospace_theme.png b/waterfox/browser/components/preferences/images/monospace_theme.png
new file mode 100644
index 0000000000000..c732fe0c196fa
Binary files /dev/null and b/waterfox/browser/components/preferences/images/monospace_theme.png differ
diff --git a/waterfox/browser/components/preferences/images/navbar_center.png b/waterfox/browser/components/preferences/images/navbar_center.png
new file mode 100644
index 0000000000000..f356b844e9df7
Binary files /dev/null and b/waterfox/browser/components/preferences/images/navbar_center.png differ
diff --git a/waterfox/browser/components/preferences/images/no_panel_separator.png b/waterfox/browser/components/preferences/images/no_panel_separator.png
new file mode 100644
index 0000000000000..1b0c83d02425f
Binary files /dev/null and b/waterfox/browser/components/preferences/images/no_panel_separator.png differ
diff --git a/waterfox/browser/components/preferences/images/panel_separator.png b/waterfox/browser/components/preferences/images/panel_separator.png
new file mode 100644
index 0000000000000..c7c635d1f993d
Binary files /dev/null and b/waterfox/browser/components/preferences/images/panel_separator.png differ
diff --git a/waterfox/browser/components/preferences/images/sidebar_no_header.png b/waterfox/browser/components/preferences/images/sidebar_no_header.png
new file mode 100644
index 0000000000000..fabad60108c5b
Binary files /dev/null and b/waterfox/browser/components/preferences/images/sidebar_no_header.png differ
diff --git a/waterfox/browser/components/preferences/images/square_button.png b/waterfox/browser/components/preferences/images/square_button.png
new file mode 100644
index 0000000000000..e9cc4ec7a61e5
Binary files /dev/null and b/waterfox/browser/components/preferences/images/square_button.png differ
diff --git a/waterfox/browser/components/preferences/images/square_field.png b/waterfox/browser/components/preferences/images/square_field.png
new file mode 100644
index 0000000000000..3e23727161478
Binary files /dev/null and b/waterfox/browser/components/preferences/images/square_field.png differ
diff --git a/waterfox/browser/components/preferences/images/square_panel.png b/waterfox/browser/components/preferences/images/square_panel.png
new file mode 100644
index 0000000000000..5c1c4f0b8c618
Binary files /dev/null and b/waterfox/browser/components/preferences/images/square_panel.png differ
diff --git a/waterfox/browser/components/preferences/images/square_popup.png b/waterfox/browser/components/preferences/images/square_popup.png
new file mode 100644
index 0000000000000..5f3809567d9b3
Binary files /dev/null and b/waterfox/browser/components/preferences/images/square_popup.png differ
diff --git a/waterfox/browser/components/preferences/images/tab_center.png b/waterfox/browser/components/preferences/images/tab_center.png
new file mode 100644
index 0000000000000..48b0f166ff702
Binary files /dev/null and b/waterfox/browser/components/preferences/images/tab_center.png differ
diff --git a/waterfox/browser/components/preferences/images/tab_contextline.png b/waterfox/browser/components/preferences/images/tab_contextline.png
new file mode 100644
index 0000000000000..0b31ae1d7077b
Binary files /dev/null and b/waterfox/browser/components/preferences/images/tab_contextline.png differ
diff --git a/waterfox/browser/components/preferences/images/tab_label.png b/waterfox/browser/components/preferences/images/tab_label.png
new file mode 100644
index 0000000000000..7d5f063e5c000
Binary files /dev/null and b/waterfox/browser/components/preferences/images/tab_label.png differ
diff --git a/waterfox/browser/components/preferences/images/tab_square.png b/waterfox/browser/components/preferences/images/tab_square.png
new file mode 100644
index 0000000000000..9d8f992d693b2
Binary files /dev/null and b/waterfox/browser/components/preferences/images/tab_square.png differ
diff --git a/waterfox/browser/components/preferences/jar.mn b/waterfox/browser/components/preferences/jar.mn
new file mode 100644
index 0000000000000..28f6848b5e20a
--- /dev/null
+++ b/waterfox/browser/components/preferences/jar.mn
@@ -0,0 +1,14 @@
+browser.jar:
+%  content browser %content/browser/ contentaccessible=yes
+*    content/browser/overlays/preferences-general.xhtml            (content/preferences-general.xhtml)
+     content/browser/overlays/preferences-other.xhtml            (content/preferences-other.xhtml)
+     content/browser/overlays/general.js                           (content/general.js)
+     content/browser/overlays/privacy.js                           (content/privacy.js)
+     content/browser/overlays/theme.js                             (content/theme.js)
+     content/browser/overlays/tocbot.js                            (content/tocbot.js)
+     content/browser/overlays/tocbot.css                           (content/tocbot.css)
+     content/browser/overlays/images                               (images/**)
+
+%   resource waterfox %waterfox/ contentaccessible=yes
+    waterfox/overlays/preferences-general.overlay                  (preferences-general.overlay)
+    waterfox/overlays/preferences-other.overlay                  (preferences-other.overlay)
diff --git a/waterfox/browser/components/preferences/moz.build b/waterfox/browser/components/preferences/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/components/preferences/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/preferences/preferences-general.overlay b/waterfox/browser/components/preferences/preferences-general.overlay
new file mode 100644
index 0000000000000..5be7340da5004
--- /dev/null
+++ b/waterfox/browser/components/preferences/preferences-general.overlay
@@ -0,0 +1 @@
+overlay   about:preferences                 chrome://browser/content/overlays/preferences-general.xhtml
\ No newline at end of file
diff --git a/waterfox/browser/components/preferences/preferences-other.overlay b/waterfox/browser/components/preferences/preferences-other.overlay
new file mode 100644
index 0000000000000..111de72b4aac0
--- /dev/null
+++ b/waterfox/browser/components/preferences/preferences-other.overlay
@@ -0,0 +1 @@
+overlay   about:preferences                 chrome://browser/content/overlays/preferences-other.xhtml
diff --git a/waterfox/browser/components/privatetab/PrivateTab.sys.mjs b/waterfox/browser/components/privatetab/PrivateTab.sys.mjs
new file mode 100644
index 0000000000000..2f9cf64fab3b1
--- /dev/null
+++ b/waterfox/browser/components/privatetab/PrivateTab.sys.mjs
@@ -0,0 +1,1353 @@
+/* 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/. */
+
+// Lazy load modules for better performance
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  BrowserUtils: "resource:///modules/BrowserUtils.sys.mjs",
+  PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
+  ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.sys.mjs",
+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
+  ContentSearch: "resource:///actors/ContentSearchParent.sys.mjs",
+  UrlbarProviderSearchSuggestions: "resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs",
+  UrlbarProviderRecentSearches: "resource:///modules/UrlbarProviderRecentSearches.sys.mjs",
+  UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
+  UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
+});
+
+// Preferences controlling visibility
+const PREF_SHOW_NEWTAB_BUTTON = "browser.privateTab.showNewTabButton";
+
+// CSS constant for better maintainability and performance
+const PRIVATE_TAB_STYLES = {
+  getCSS(btnId, btn2Id, containerUserContextId) {
+    return `
+      #private-browsing-indicator-with-label[enabled="true"] {
+        display: inherit !important;
+      }
+      #main-window:not([privatebrowsingmode]) #private-browsing-indicator-with-label label {
+        display: none;
+      }
+      .privatetab-icon {
+        list-style-image: url(chrome://browser/skin/privatebrowsing/favicon.svg) !important;
+      }
+      #${btnId}, [id^="${btn2Id}"] {
+        list-style-image: url(chrome://browser/skin/privateBrowsing.svg) !important;
+      }
+      /* Ensure private tab button icon shows properly in vertical mode */
+      #vertical-tabs [id^="${btn2Id}"] > .toolbarbutton-icon {
+        list-style-image: url(chrome://browser/skin/privateBrowsing.svg) !important;
+        width: 16px !important;
+        height: 16px !important;
+      }
+      /* Container for vertical stacking - match native sidebar alignment */
+      #newtab-buttons-container-vertical {
+        display: flex !important;
+        flex-direction: column !important;
+        align-items: start !important;
+        width: 100% !important;
+        max-width: 100% !important;
+        overflow-x: hidden !important;
+      }
+      /* Match native vertical new tab button styling for both buttons */
+      #newtab-buttons-container-vertical > toolbarbutton {
+        appearance: none;
+        min-height: var(--tab-min-height);
+        line-height: var(--tab-label-line-height);
+        border-radius: var(--border-radius-medium);
+        padding: 0 calc(var(--tab-inline-padding) - var(--tab-inner-inline-margin));
+        width: var(--tab-collapsed-background-width);
+        margin-inline: var(--tab-inner-inline-margin);
+        margin-block: var(--tab-block-margin);
+      }
+      /* When expanded, make buttons full width */
+      #tabbrowser-tabs[expanded] #newtab-buttons-container-vertical > toolbarbutton {
+        width: 100%;
+      }
+      /* Handle collapsed state - hide text and center buttons */
+      #tabbrowser-tabs[orient="vertical"]:not([expanded]) #newtab-buttons-container-vertical {
+        align-items: center !important;
+      }
+      #tabbrowser-tabs[orient="vertical"]:not([expanded]) #newtab-buttons-container-vertical > toolbarbutton > .toolbarbutton-text {
+        display: none !important;
+      }
+      #tabbrowser-tabs[orient="vertical"]:not([expanded]) #newtab-buttons-container-vertical > toolbarbutton {
+        justify-content: center !important;
+      }
+      /* Text alignment and spacing for expanded state */
+      #newtab-buttons-container-vertical > toolbarbutton > .toolbarbutton-text {
+        text-align: left !important;
+        margin-inline-start: 5px !important;
+      }
+      /* Match native sidebar button padding using space variables */
+      #newtab-buttons-container-vertical > toolbarbutton {
+        padding-inline: var(--space-medium) !important;
+        padding-block: var(--space-xxsmall) !important;
+      }
+      /* Hover styles for buttons - combined selector */
+      #newtab-buttons-container-vertical > toolbarbutton:is(:hover, :hover:active) {
+        background-color: var(--toolbarbutton-hover-background) !important;
+      }
+      #newtab-buttons-container-vertical > toolbarbutton:hover:active {
+        background-color: var(--toolbarbutton-active-background) !important;
+      }
+      .tabbrowser-tab[usercontextid="${containerUserContextId}"] .tab-label {
+        text-decoration: underline !important;
+        text-decoration-color: -moz-nativehyperlinktext !important;
+        text-decoration-style: dashed !important;
+      }
+      .tabbrowser-tab[usercontextid="${containerUserContextId}"][pinned] .tab-icon-image,
+      .tabbrowser-tab[usercontextid="${containerUserContextId}"][pinned] .tab-throbber {
+        border-bottom: 1px dashed -moz-nativehyperlinktext !important;
+      }
+    `;
+  }
+};
+
+export const PrivateTab = {
+  config: {
+    longPressDuration: 1000,
+    doubleclickTime: 450,
+    doubleclickTimeEnter: 900,
+  },
+
+  openTabs: new Set(),
+  container: null,
+
+  BTN_ID: "privateTab-button",
+  BTN2_ID: "newPrivateTab-button",
+  _currentStyleURI: null,
+
+  get style() {
+    return PRIVATE_TAB_STYLES.getCSS(
+      this.BTN_ID,
+      this.BTN2_ID,
+      this.container?.userContextId
+    );
+  },
+
+  init(aWindow) {
+    // Only init in non-private windows
+    if (lazy.PrivateBrowsingUtils.isWindowPrivate(aWindow)) {
+      return;
+    }
+
+    // Wait for XUL elements to be available
+    if (!aWindow.document.getElementById("toggleTabPrivateState")) {
+      lazy.setTimeout(() => this.init(aWindow), 50);
+      return;
+    }
+
+    aWindow.PrivateTab = this;
+    this.initContainer("Private");
+    this.initObservers(aWindow);
+    this.createToolbarButton(aWindow);
+    this.observeTabsOrientation(aWindow);
+    this.initListeners(aWindow);
+    this.initPrivateTabListeners(aWindow);
+    this.initCustomFunctions(aWindow);
+    this.overridePlacesUIUtils();
+    this.overrideContentSearchParent();
+    this.overrideUrlbarProviders();
+    this.overrideUrlbarUtils();
+    this.overrideUrlbarSearchUtils();
+    this.overrideUrlbarHandoff(aWindow);
+    this.overrideSessionStore(aWindow);
+
+    // Clean up observers on window unload
+    aWindow.addEventListener("unload", () => {
+      this.cleanupObservers(aWindow);
+    }, { once: true });
+
+    // Update private browsing indicator
+    const privateIndicator = aWindow.document.getElementById("private-browsing-indicator-with-label");
+    if (privateIndicator && aWindow.gBrowser.selectedTab?.userContextId === this.container.userContextId) {
+      privateIndicator.setAttribute("enabled", "true");
+    }
+
+    this.applyStyle();
+    this.updateUIVisibility(aWindow);
+  },
+
+  initContainer(aName) {
+    try {
+      lazy.ContextualIdentityService.ensureDataReady();
+      this.container = lazy.ContextualIdentityService._identities.find(
+        (container) => container.name === aName
+      );
+      if (!this.container) {
+        try {
+          lazy.ContextualIdentityService.create(aName, "fingerprint", "purple");
+        } catch (createEx) {
+          if (createEx.message?.includes("Component is not available")) {
+            console.error("PrivateTab initContainer create error:", createEx.message);
+            console.error("Stack:", new Error().stack);
+          }
+          throw createEx;
+        }
+        this.container = lazy.ContextualIdentityService._identities.find(
+          (container) => container.name === aName
+        );
+      } else if (!this.config.neverClearData) {
+        this.clearData();
+      }
+    } catch (ex) {
+      if (ex.message?.includes("Component is not available")) {
+        console.error("PrivateTab initContainer error:", ex.message);
+        console.error("Stack:", new Error().stack);
+      }
+    }
+    return this.container;
+  },
+
+  clearData() {
+    if (!this.container?.userContextId) {
+      return;
+    }
+
+    try {
+      if (Services && Services.clearData && Services.clearData.deleteDataFromOriginAttributesPattern) {
+        try {
+          Services.clearData.deleteDataFromOriginAttributesPattern({
+            userContextId: this.container.userContextId,
+          });
+        } catch (innerEx) {
+          console.error("PrivateTab clearData error:", innerEx.message);
+        }
+      }
+    } catch (ex) {
+      console.error("PrivateTab clearData outer error:", ex.message);
+      console.error("  Full error:", ex);
+      console.error("  Stack:", new Error().stack);
+    }
+  },
+
+  // Robust startup cleanup for crash scenarios and improper shutdowns
+  cleanupStartupTabs(aWindow) {
+    const { gBrowser } = aWindow;
+    if (!gBrowser) return;
+
+    // Check and clean up private tabs
+    const doCleanup = () => {
+      try {
+        // Don't run if browser is still initializing
+        if (!gBrowser.tabs || gBrowser.tabs.length === 0) return;
+
+        const privateTabs = [];
+        for (let tab of gBrowser.tabs) {
+          if (this.isPrivate(tab)) {
+            privateTabs.push(tab);
+          }
+        }
+
+        if (privateTabs.length === 0) return;
+
+        // If ALL tabs are private, create a regular tab first
+        if (privateTabs.length === gBrowser.tabs.length) {
+          try {
+            const principal = Services.scriptSecurityManager.getSystemPrincipal();
+            const newTab = gBrowser.addTab("about:home", {
+              userContextId: 0,
+              triggeringPrincipal: principal
+            });
+            gBrowser.selectedTab = newTab;
+          } catch (ex) {
+            // Fallback without principal if Services aren't ready
+            const newTab = gBrowser.addTab("about:home");
+            gBrowser.selectedTab = newTab;
+          }
+        }
+
+        // Remove all private tabs
+        for (let tab of privateTabs) {
+          if (gBrowser.tabs.length > 1) {
+            try {
+              gBrowser.removeTab(tab);
+            } catch (ex) {
+              // Tab might already be closing
+            }
+          }
+        }
+
+        if (privateTabs.length > 0) {
+          this.clearData();
+        }
+      } catch (ex) {
+        // Cleanup failed, will retry
+      }
+    };
+
+    // Wait longer for session restore to be ready
+    aWindow.setTimeout(() => {
+      doCleanup();
+      // Run again after session restore completes
+      aWindow.setTimeout(doCleanup, 2000);
+    }, 1000);
+  },
+
+  initObservers(aWindow) {
+    this.setPrivateObserver(aWindow);
+    // Clean up startup tabs after session restore
+    this.cleanupStartupTabs(aWindow);
+    // Observe preference changes that control visibility
+    this.initPrefObservers(aWindow);
+  },
+
+  cleanupPrivateTabButtons(aWindow) {
+    const doc = aWindow.document;
+    // Remove all existing private tab buttons
+    doc.querySelectorAll(`[id^="${this.BTN2_ID}"]`).forEach(btn => btn.remove());
+
+    // Clean up vertical container if it exists
+    const verticalContainer = doc.getElementById("newtab-buttons-container-vertical");
+    if (verticalContainer) {
+      // Move the new tab button back to its original position
+      const newTabButton = verticalContainer.querySelector("#tabs-newtab-button");
+      if (newTabButton && verticalContainer.parentNode) {
+        verticalContainer.parentNode.insertBefore(newTabButton, verticalContainer);
+      }
+      verticalContainer.remove();
+    }
+  },
+
+  createToolbarButton(aWindow) {
+    const doc = aWindow.document;
+
+    // Clean up any existing buttons first
+    this.cleanupPrivateTabButtons(aWindow);
+
+    // Respect preference controlling visibility of the new private tab button
+    const showNewTabButton = Services.prefs.getBoolPref(PREF_SHOW_NEWTAB_BUTTON, true);
+    if (!showNewTabButton) {
+      return;
+    }
+
+    // Find all instances of new tab buttons
+    doc.querySelectorAll("#tabs-newtab-button").forEach((tabsNewTabButton, index) => {
+      // Check if this button is in vertical tabs mode
+      const closestTabs = tabsNewTabButton.closest("tabs");
+      const isVerticalMode = tabsNewTabButton.closest("#vertical-tabs") !== null ||
+                            (closestTabs?.getAttribute("orient") === "vertical");
+
+      // Create unique ID for each location
+      const buttonId = isVerticalMode ? `${this.BTN2_ID}-vertical-${index}` : this.BTN2_ID;
+
+      // Only create if it doesn't already exist
+      if (!doc.getElementById(buttonId)) {
+        // Create the private tab button
+        const btn2 = doc.createXULElement("toolbarbutton");
+        btn2.id = buttonId;
+        // Use same class as the new tab button for consistent styling in vertical mode
+        if (isVerticalMode) {
+          btn2.className = tabsNewTabButton.className || "toolbarbutton-1";
+        } else {
+          // For horizontal mode, use standard toolbar button styling
+          btn2.className = "toolbarbutton-1 chromeclass-toolbar-additional";
+        }
+        btn2.setAttribute("label", "New Private Tab");
+        btn2.setAttribute("tooltiptext", "Open a new private tab (Ctrl+Alt+P)");
+
+        if (isVerticalMode) {
+          // Create the button structure to match native sidebar buttons
+          const icon = doc.createXULElement("image");
+          icon.className = "toolbarbutton-icon";
+          icon.setAttribute("label", "New Private Tab");
+
+          const text = doc.createXULElement("label");
+          text.className = "toolbarbutton-text";
+          text.setAttribute("crop", "end");
+          text.setAttribute("flex", "1");
+          text.setAttribute("value", "New Private Tab");
+
+          // Clear any existing content and add new elements
+          while (btn2.firstChild) {
+            btn2.removeChild(btn2.firstChild);
+          }
+          btn2.appendChild(icon);
+          btn2.appendChild(text);
+
+          // Find or create the vertical container
+          let container = doc.getElementById("newtab-buttons-container-vertical");
+          if (!container) {
+            container = doc.createXULElement("vbox");
+            container.id = "newtab-buttons-container-vertical";
+
+            // Find the periphery container
+            const periphery = tabsNewTabButton.parentNode;
+            if (periphery && periphery.id === "tabbrowser-arrowscrollbox-periphery") {
+              // Find the spacer element
+              const spacer = periphery.querySelector(".closing-tabs-spacer");
+
+              // Insert container before spacer or at end
+              if (spacer) {
+                periphery.insertBefore(container, spacer);
+              } else {
+                periphery.appendChild(container);
+              }
+
+              // Move the new tab button into the container
+              container.appendChild(tabsNewTabButton);
+            }
+          }
+
+          // Add the private tab button to the container
+          if (container) {
+            container.appendChild(btn2);
+          } else {
+            // Fallback
+            tabsNewTabButton.insertAdjacentElement("afterend", btn2);
+          }
+        } else {
+          // For horizontal tabs toolbar, keep side-by-side placement
+          tabsNewTabButton.insertAdjacentElement("afterend", btn2);
+        }
+      }
+    });
+  },
+
+  observeTabsOrientation(aWindow) {
+    const doc = aWindow.document;
+
+    // Unified handler for orientation/visibility changes
+    const handleOrientationChange = () => {
+      this.updateUIVisibility(aWindow);
+    };
+
+    // Watch for changes to tabs orientation
+    const tabsElement = doc.querySelector("tabs#tabbrowser-tabs");
+    if (tabsElement) {
+      this.orientationObserver = new aWindow.MutationObserver(mutations => {
+        if (mutations.some(m => m.attributeName === 'orient')) {
+          handleOrientationChange();
+        }
+      });
+      this.orientationObserver.observe(tabsElement, {
+        attributes: true,
+        attributeFilter: ['orient']
+      });
+    }
+
+    // Watch for changes to vertical-tabs visibility
+    const verticalTabsBox = doc.querySelector("#vertical-tabs");
+    if (verticalTabsBox) {
+      this.verticalTabsObserver = new aWindow.MutationObserver(mutations => {
+        if (mutations.some(m => m.attributeName === 'collapsed' || m.attributeName === 'hidden')) {
+          handleOrientationChange();
+        }
+      });
+      this.verticalTabsObserver.observe(verticalTabsBox, {
+        attributes: true,
+        attributeFilter: ['collapsed', 'hidden']
+      });
+    }
+  },
+
+  cleanupObservers(aWindow) {
+    // Disconnect all observers
+    ['orientationObserver', 'verticalTabsObserver'].forEach(observerName => {
+      if (this[observerName]) {
+        this[observerName].disconnect();
+        this[observerName] = null;
+      }
+    });
+
+    // Remove pref observers
+    if (this.prefObserver) {
+      try {
+        Services.prefs.removeObserver(PREF_SHOW_NEWTAB_BUTTON, this.prefObserver);
+      } catch (ex) {
+        // Silently ignore
+      }
+      this.prefObserver = null;
+    }
+  },
+
+  applyStyle() {
+    try {
+      const css = this.style;
+      const uri = `data:text/css;charset=UTF-8,${encodeURIComponent(css)}`;
+      if (this._currentStyleURI && this._currentStyleURI !== uri) {
+        lazy.BrowserUtils.unregisterStylesheet(this._currentStyleURI);
+      }
+      // Register the new stylesheet and remember it
+      lazy.BrowserUtils.registerStylesheet(uri);
+      this._currentStyleURI = uri;
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  updateUIVisibility(aWindow) {
+    try {
+      const doc = aWindow.document;
+
+      const showNewTabButton = Services.prefs.getBoolPref(PREF_SHOW_NEWTAB_BUTTON, true);
+
+      // Rebuild New Private Tab buttons according to pref
+      if (showNewTabButton) {
+        this.createToolbarButton(aWindow);
+        this.initPrivateTabButtonListeners(aWindow);
+      } else {
+        this.cleanupPrivateTabButtons(aWindow);
+      }
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  initPrefObservers(aWindow) {
+    // Observe preferences for visibility changes of toolbar and new tab buttons
+    if (!this.prefObserver) {
+      this.prefObserver = {
+        observe: (subject, topic, data) => {
+          if (topic !== "nsPref:changed") {
+            return;
+          }
+          if (data === PREF_SHOW_NEWTAB_BUTTON) {
+            try {
+              // Re-apply styles and update UI based on new pref values
+              this.applyStyle();
+              this.updateUIVisibility(aWindow);
+            } catch (e) {
+              // No-op
+            }
+          }
+        },
+      };
+    }
+
+    try {
+      Services.prefs.addObserver(PREF_SHOW_NEWTAB_BUTTON, this.prefObserver);
+    } catch (ex) {
+      // Pref service may not be available in some early/late lifecycle stages
+    }
+  },
+
+  initPrivateTabButtonListeners(aWindow) {
+    const doc = aWindow.document;
+
+    // Handler for private tab button clicks
+    const handleClick = (e) => {
+      if (e.button === 0) {
+        this.browserOpenTabPrivate(aWindow);
+      } else if (e.button === 2) {
+        doc.getElementById("toolbar-context-menu")?.openPopup(
+          e.currentTarget, "after_start", 14, -10, false, false
+        );
+        e.preventDefault();
+      }
+    };
+
+    // Attach listeners to all private tab buttons
+    doc.querySelectorAll(`[id^="${this.BTN2_ID}"]`).forEach(btn2 => {
+      // Remove any existing listeners by cloning
+      const newBtn2 = btn2.cloneNode(true);
+      btn2.parentNode?.replaceChild(newBtn2, btn2);
+      newBtn2.addEventListener("click", handleClick);
+    });
+  },
+
+  initListeners(aWindow) {
+    const doc = aWindow.document;
+
+    // Keyboard shortcuts
+    doc.getElementById("togglePrivateTab-key")?.addEventListener("command", () => {
+      this.togglePrivate(aWindow);
+    });
+
+    doc.getElementById("newPrivateTab-key")?.addEventListener("command", () => {
+      this.browserOpenTabPrivate(aWindow);
+    });
+
+    // Menu items
+    doc.getElementById("menu_newPrivateTab")?.addEventListener("command", () => {
+      this.browserOpenTabPrivate(aWindow);
+    });
+
+    // Toggle tab private state menu item
+    doc.getElementById("toggleTabPrivateState")?.addEventListener("command", () => {
+      if (aWindow.TabContextMenu?.contextTab) {
+        this.togglePrivate(aWindow, aWindow.TabContextMenu.contextTab);
+      } else {
+        this.togglePrivate(aWindow);
+      }
+    });
+
+    // Context menu - open link in private tab
+    doc.getElementById("openLinkInPrivateTab")?.addEventListener("command", () => {
+      this.openLink(aWindow);
+    });
+
+    // Places context menu items
+    doc.getElementById("openPrivate")?.addEventListener("command", (event) => {
+      this.openPrivateTab(event);
+    });
+
+    doc.getElementById("openAllPrivate")?.addEventListener("command", (event) => {
+      this.openAllPrivate(event);
+    });
+
+    doc.getElementById("openAllLinksPrivate")?.addEventListener("command", (event) => {
+      this.openAllPrivate(event);
+    });
+
+    // Context menu popup listeners
+    doc.getElementById("contentAreaContextMenu")?.addEventListener(
+      "popupshowing",
+      this.contentContext.bind(this)
+    );
+
+    doc.getElementById("contentAreaContextMenu")?.addEventListener(
+      "popuphidden",
+      this.hideContext.bind(this)
+    );
+
+    doc.getElementById("tabContextMenu")?.addEventListener(
+      "popupshowing",
+      this.tabContext.bind(this)
+    );
+
+    doc.getElementById("placesContext")?.addEventListener(
+      "popupshowing",
+      this.placesContext.bind(this)
+    );
+
+    // Initialize private tab button listeners
+    this.initPrivateTabButtonListeners(aWindow);
+  },
+
+  setPrivateObserver(aWindow) {
+    // Handle browser shutdown
+    const shutdownObserver = () => {
+      try {
+        // Close all private tabs before shutdown
+        this.closeAllPrivateTabs();
+        // Clear data after closing tabs
+        this.clearData();
+      } catch (ex) {
+        // Silently fail during shutdown
+      }
+    };
+
+    // Use multiple shutdown events to ensure cleanup happens
+    try {
+      Services.obs.addObserver(shutdownObserver, "quit-application-requested");
+      Services.obs.addObserver(shutdownObserver, "quit-application");
+      Services.obs.addObserver(shutdownObserver, "sessionstore-windows-restored");
+    } catch (ex) {
+      // Silently fail if observer service is unavailable
+    }
+
+    // Also handle window close directly with beforeunload for earlier intervention
+    const cleanupHandler = () => {
+      try {
+        // If this is the last window, clean up
+        if (Services && Services.wm) {
+          const windows = Services.wm.getEnumerator("navigator:browser");
+          let windowCount = 0;
+          while (windows.hasMoreElements()) {
+            windows.getNext();
+            windowCount++;
+          }
+
+          if (windowCount <= 1) {
+            try {
+              this.closeAllPrivateTabs();
+              this.clearData();
+            } catch (ex) {
+              // Silently fail
+            }
+          }
+        }
+      } catch (ex) {
+        // Silently fail
+      }
+    };
+
+    aWindow.addEventListener("beforeunload", cleanupHandler);
+    aWindow.addEventListener("unload", cleanupHandler);
+  },
+
+  closeTabs() {
+    if (!this.container?.userContextId) return;
+    try {
+      lazy.ContextualIdentityService._forEachContainerTab((tab, tabbrowser) => {
+        if (tab.userContextId == this.container.userContextId) {
+          tabbrowser.removeTab(tab);
+        }
+      });
+    } catch (ex) {
+      // Service might not be available
+    }
+  },
+
+  closeAllPrivateTabs() {
+    // Close private tabs in all windows before shutdown
+    try {
+      if (!Services || !Services.wm) return;
+
+      const windows = Services.wm.getEnumerator("navigator:browser");
+      const windowList = [];
+      while (windows.hasMoreElements()) {
+        windowList.push(windows.getNext());
+      }
+
+      for (let win of windowList) {
+        if (!win || !win.gBrowser) continue;
+
+        const tabsToClose = [];
+        for (let tab of win.gBrowser.tabs) {
+          if (this.isPrivate(tab)) {
+            tabsToClose.push(tab);
+          }
+        }
+
+        if (tabsToClose.length === 0) continue;
+
+        // If ALL tabs are private, create a regular tab first
+        if (tabsToClose.length === win.gBrowser.tabs.length) {
+          try {
+            const principal = Services.scriptSecurityManager?.getSystemPrincipal();
+            if (principal) {
+              win.gBrowser.addTab("about:blank", {
+                userContextId: 0,
+                triggeringPrincipal: principal
+              });
+            } else {
+              win.gBrowser.addTab("about:blank");
+            }
+          } catch (ex) {
+            // Window might be closing, try without options
+            try {
+              win.gBrowser.addTab("about:blank");
+            } catch (ex2) {
+              // Give up
+            }
+          }
+        }
+
+        // Now close the private tabs
+        for (let tab of tabsToClose) {
+          if (win.gBrowser && win.gBrowser.tabs.length > 1) {
+            try {
+              win.gBrowser.removeTab(tab);
+            } catch (ex) {
+              // Tab might already be closing
+            }
+          }
+        }
+      }
+    } catch (ex) {
+      // Window manager might not be available during shutdown
+    }
+  },
+
+  placesContext(aEvent) {
+    const win = aEvent.view || aEvent.target.ownerGlobal;
+    const doc = win.document;
+    const openPrivate = doc.getElementById("openPrivate");
+    const openAllPrivate = doc.getElementById("openAllPrivate");
+    const openAllLinksPrivate = doc.getElementById("openAllLinksPrivate");
+    const openTab = doc.getElementById("placesContext_open:newtab");
+    const openAll = doc.getElementById("placesContext_openBookmarkContainer:tabs");
+    const openAllLinks = doc.getElementById("placesContext_openLinks:tabs");
+
+    if (openPrivate && openTab) {
+      openPrivate.disabled = openTab.disabled;
+      openPrivate.hidden = openTab.hidden;
+    }
+    if (openAllPrivate && openAll) {
+      openAllPrivate.disabled = openAll.disabled;
+      openAllPrivate.hidden = openAll.hidden;
+    }
+    if (openAllLinksPrivate && openAllLinks) {
+      openAllLinksPrivate.disabled = openAllLinks.disabled;
+      openAllLinksPrivate.hidden = openAllLinks.hidden;
+    }
+  },
+
+  isPrivate(aTab) {
+    // Ensure we have a valid container before checking
+    if (!this.container?.userContextId) return false;
+    // Use == not === to handle string/number comparison
+    return aTab.getAttribute("usercontextid") == this.container.userContextId;
+  },
+
+  contentContext(aEvent) {
+    const win = aEvent.view || aEvent.target?.ownerGlobal;
+    if (!win) {
+      return;
+    }
+    const gContextMenu = win.gContextMenu;
+
+    // Don't show private tab options in the sidebar
+    if (gContextMenu.browser == win.SidebarController.treeVerticalTabsBrowser) {
+      return;
+    }
+
+    const tab = win.gBrowser.getTabForBrowser(gContextMenu.browser);
+    const openLinkInPrivateTab = win.document.getElementById("openLinkInPrivateTab");
+
+    if (openLinkInPrivateTab) {
+      gContextMenu.showItem(
+        "openLinkInPrivateTab",
+        gContextMenu.onSaveableLink || gContextMenu.onPlainTextLink
+      );
+    }
+
+    const isPrivate = this.isPrivate(tab);
+    if (isPrivate) {
+      gContextMenu.showItem("context-openlinkincontainertab", false);
+    }
+  },
+
+  hideContext(aEvent) {
+    if (aEvent.target === aEvent.currentTarget) {
+      const win = aEvent.view || aEvent.target?.ownerGlobal;
+      const openLink = win?.document.getElementById("openLinkInPrivateTab");
+      if (openLink) {
+        openLink.hidden = true;
+      }
+    }
+  },
+
+  tabContext(aEvent) {
+    const win = aEvent.view || aEvent.target?.ownerGlobal;
+    if (!win) {
+      return;
+    }
+    const toggleTab = win.document.getElementById("toggleTabPrivateState");
+    if (toggleTab && win.TabContextMenu?.contextTab) {
+      toggleTab.setAttribute(
+        "checked",
+        win.TabContextMenu.contextTab.userContextId == this.container?.userContextId
+      );
+    }
+  },
+
+  openLink(aWindow) {
+    if (!this.container?.userContextId) return;
+    const { gContextMenu } = aWindow;
+    aWindow.openLinkIn(
+      gContextMenu.linkURL,
+      "tab",
+      gContextMenu._openLinkInParameters({
+        userContextId: this.container.userContextId,
+        triggeringPrincipal: aWindow.document.nodePrincipal,
+      })
+    );
+  },
+
+  overridePlacesUIUtils() {
+    const originalOpenTabset = lazy.PlacesUIUtils.openTabset;
+    lazy.PlacesUIUtils.openTabset = function (
+      aEvent,
+      aWindow,
+      aTabs,
+      loadInBackground
+    ) {
+      return originalOpenTabset.call(
+        this,
+        aEvent,
+        aWindow,
+        aTabs,
+        loadInBackground,
+        aEvent.userContextId || 0
+      );
+    };
+  },
+
+  // Prevent saving search form history for Private container tabs (urlbar/searchbar)
+  // and ensure in-page search uses the private default engine in PrivateTab container tabs.
+  overrideContentSearchParent() {
+    if (this._contentSearchPatched) {
+      return;
+    }
+    this._contentSearchPatched = true;
+    try {
+      const originalAddFormHistoryEntry =
+        lazy.ContentSearch.addFormHistoryEntry.bind(lazy.ContentSearch);
+      // Block writing form history entries coming from PrivateTab container tabs.
+      lazy.ContentSearch.addFormHistoryEntry = async (browser, entry = null) => {
+        try {
+          const win = browser?.ownerGlobal;
+          const tab =
+            win?.gBrowser?.getTabForBrowser &&
+            win.gBrowser.getTabForBrowser(browser);
+          if (tab && this.isPrivate(tab)) {
+            // Do not store form history for searches from Private container tabs
+            return false;
+          }
+        } catch (e) {
+          // Ignore and fall through to original
+        }
+        return originalAddFormHistoryEntry(browser, entry);
+      };
+
+      // When ContentSearch is asked for the current engine from a PrivateTab
+      // container tab, force it to use the default private engine instead of
+      // the normal default engine, while keeping the normal behavior elsewhere.
+      if (typeof lazy.ContentSearch._onMessageGetEngine == "function") {
+        const originalOnMessageGetEngine =
+          lazy.ContentSearch._onMessageGetEngine.bind(lazy.ContentSearch);
+
+        lazy.ContentSearch._onMessageGetEngine = async eventItem => {
+          const actor = eventItem?.actor;
+          try {
+            const bc = actor?.browsingContext;
+            const browser =
+              bc?.top?.embedderElement || bc?.embedderElement || null;
+            const win = browser?.ownerGlobal || null;
+            const privateContainerId =
+              win?.PrivateTab?.container?.userContextId;
+
+            if (
+              privateContainerId &&
+              browser?.getAttribute("usercontextid") ==
+                privateContainerId
+            ) {
+              const state = await lazy.ContentSearch.currentStateObj();
+              return lazy.ContentSearch._reply(actor, "Engine", {
+                isPrivateEngine: true,
+                engine: state.currentPrivateEngine,
+              });
+            }
+          } catch (e) {
+            // Fall through to original handler on any failure
+          }
+
+          return originalOnMessageGetEngine(eventItem);
+        };
+      }
+    } catch (e) {
+      // Silently ignore if actor is unavailable
+    }
+  },
+
+  // Helper to detect Private container queries in urlbar contexts
+  _isPrivateQueryContext(queryContext) {
+    return !!this.container?.userContextId &&
+      queryContext?.userContextId == this.container.userContextId;
+  },
+
+  // Suppress urlbar suggestions providers that leak search data in Private container tabs
+  overrideUrlbarProviders() {
+    if (this._urlbarProvidersPatched) {
+      return;
+    }
+    this._urlbarProvidersPatched = true;
+
+    // Disable remote and local search suggestions provider for Private container
+    try {
+      const prov = lazy.UrlbarProviderSearchSuggestions;
+      if (prov && typeof prov.isActive == "function") {
+        const origIsActive = prov.isActive.bind(prov);
+        prov.isActive = async queryContext => {
+          if (this._isPrivateQueryContext(queryContext)) {
+            return false;
+          }
+          return origIsActive(queryContext);
+        };
+      }
+    } catch (e) {
+      // No-op
+    }
+
+    // Disable recent searches provider for Private container
+    try {
+      const recent = lazy.UrlbarProviderRecentSearches;
+      if (recent && typeof recent.isActive == "function") {
+        const origRecentActive = recent.isActive.bind(recent);
+        recent.isActive = async queryContext => {
+          if (this._isPrivateQueryContext(queryContext)) {
+            return false;
+          }
+          return origRecentActive(queryContext);
+        };
+      }
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  // Prevent urlbar form/input history writes from Private container tabs
+  overrideUrlbarUtils() {
+    if (this._urlbarUtilsPatched) {
+      return;
+    }
+    this._urlbarUtilsPatched = true;
+
+    // Block saving form history (search terms) when Private container is active
+    try {
+      const origAddToFormHistory =
+        lazy.UrlbarUtils.addToFormHistory.bind(lazy.UrlbarUtils);
+      lazy.UrlbarUtils.addToFormHistory = (input, value, source) => {
+        try {
+          const win = input?.window || input?.ownerGlobal;
+          const uci = parseInt(
+            win?.gBrowser?.selectedBrowser?.getAttribute("usercontextid") || 0
+          );
+          if (uci == this.container?.userContextId) {
+            return Promise.resolve();
+          }
+        } catch (e) {
+          // No-op
+        }
+        return origAddToFormHistory(input, value, source);
+      };
+    } catch (e) {
+      // No-op
+    }
+
+    // Block saving adaptive input history when Private container is active
+    try {
+      const origAddToInputHistory =
+        lazy.UrlbarUtils.addToInputHistory.bind(lazy.UrlbarUtils);
+      lazy.UrlbarUtils.addToInputHistory = async (url, input) => {
+        try {
+          const win = lazy.BrowserUtils.mostRecentWindow;
+          const uci = parseInt(
+            win?.gBrowser?.selectedBrowser?.getAttribute("usercontextid") || 0
+          );
+          if (uci == this.container?.userContextId) {
+            return;
+          }
+        } catch (e) {
+          // No-op
+        }
+        return origAddToInputHistory(url, input);
+      };
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  // Make UrlbarSearchUtils treat PrivateTab container tabs as private for default engine selection
+  overrideUrlbarSearchUtils() {
+    if (this._urlbarSearchUtilsPatched) {
+      return;
+    }
+    this._urlbarSearchUtilsPatched = true;
+
+    try {
+      const origGetDefaultEngine =
+        lazy.UrlbarSearchUtils.getDefaultEngine.bind(lazy.UrlbarSearchUtils);
+      lazy.UrlbarSearchUtils.getDefaultEngine = (isPrivate = false) => {
+        try {
+          // If not already marked as private, check if the active tab is a PrivateTab container tab.
+          if (!isPrivate) {
+            const win = lazy.BrowserUtils.mostRecentWindow;
+            const tab = win?.gBrowser?.selectedTab;
+            if (tab && win.PrivateTab?.isPrivate?.(tab)) {
+              isPrivate = true;
+            }
+          }
+        } catch (e) {
+          // No-op
+        }
+        return origGetDefaultEngine(isPrivate);
+      };
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  // Ensure urlbar handoff uses the private default engine in PrivateTab container tabs
+  overrideUrlbarHandoff(aWindow) {
+    try {
+      const gURLBar = aWindow.gURLBar;
+      if (!gURLBar || gURLBar._privateTabHandoffPatched) {
+        return;
+      }
+      gURLBar._privateTabHandoffPatched = true;
+      const originalHandoff = gURLBar.handoff.bind(gURLBar);
+      gURLBar.handoff = (searchString, searchEngine, newtabSessionId) => {
+        try {
+          const win = gURLBar.window || aWindow;
+          const tab = win.gBrowser?.selectedTab;
+          if (tab && win.PrivateTab?.isPrivate?.(tab)) {
+            const defaultEngine = Services.search.defaultEngine;
+            const privateEngine = Services.search.defaultPrivateEngine;
+            if (privateEngine) {
+              if (!searchEngine || searchEngine == defaultEngine) {
+                searchEngine = privateEngine;
+              }
+            }
+          }
+        } catch (e) {
+          // No-op
+        }
+        return originalHandoff(searchString, searchEngine, newtabSessionId);
+      };
+    } catch (e) {
+      // No-op
+    }
+  },
+
+  openAllPrivate(event) {
+    if (!this.container?.userContextId) return;
+    event.userContextId = this.container.userContextId;
+    lazy.PlacesUIUtils.openSelectionInTabs(event);
+  },
+
+  openPrivateTab(event) {
+    if (!this.container?.userContextId) return;
+    const view = event.target.parentElement._view;
+    if (view && view.selectedNode) {
+      lazy.PlacesUIUtils._openNodeIn(view.selectedNode, "tab", view.ownerWindow, {
+        aPrivate: false,
+        userContextId: this.container.userContextId,
+      });
+    }
+  },
+
+  togglePrivate(aWindow, aTab = aWindow.gBrowser.selectedTab) {
+    const { gBrowser, gURLBar } = aWindow;
+
+    // Check if container is properly initialized
+    if (!this.container?.userContextId) {
+      console.error("PrivateTab: Container not initialized for toggle");
+      return null;
+    }
+
+    aTab.isToggling = true;
+    const shouldSelect = aTab === gBrowser.selectedTab;
+
+    const newTab = gBrowser.duplicateTab(aTab);
+    const newBrowser = newTab.linkedBrowser;
+
+    // Update tab state cache after duplication with the new container ID
+    aWindow.addEventListener("SSWindowStateReady", () => {
+      try {
+        const newContextId = parseInt(newTab.getAttribute("usercontextid")) || 0;
+        lazy.TabStateCache.update(newBrowser.permanentKey, {
+          userContextId: newContextId
+        });
+      } catch (ex) {
+        if (ex.message?.includes("Component is not available")) {
+          console.error("PrivateTab TabStateCache.update error:", ex.message);
+          console.error("Stack:", new Error().stack);
+        }
+      }
+    }, { once: true });
+
+    if (shouldSelect) {
+      const focusUrlbar = gURLBar.focused;
+      gBrowser.selectedTab = newTab;
+      if (focusUrlbar) {
+        gURLBar.focus();
+      }
+    }
+
+    gBrowser.removeTab(aTab);
+    return newTab;
+  },
+
+  browserOpenTabPrivate(aWindow) {
+    if (!this.container?.userContextId) {
+      console.warn("PrivateTab: Container not initialized");
+      return;
+    }
+
+    try {
+      aWindow.openTrustedLinkIn(aWindow.BROWSER_NEW_TAB_URL, "tab", {
+        userContextId: this.container.userContextId,
+      });
+    } catch (ex) {
+      console.error("PrivateTab browserOpenTabPrivate error:", ex.message);
+      console.error("Full error:", ex);
+      console.error("Stack:", new Error().stack);
+      throw ex;
+    }
+  },
+
+  initPrivateTabListeners(aWindow) {
+    const { gBrowser } = aWindow;
+
+    gBrowser.tabContainer.addEventListener(
+      "TabSelect",
+      this.onTabSelect.bind(this)
+    );
+
+    // Add initial check for selected tab
+    if (gBrowser.selectedTab && this.isPrivate(gBrowser.selectedTab)) {
+      this.toggleMask(aWindow);
+    }
+
+    gBrowser.privateListener = (e) => {
+      try {
+        const browser = e.target;
+        if (!browser) return;
+
+        const tab = gBrowser.getTabForBrowser(browser);
+        if (!tab) return;
+
+        const isPrivate = this.isPrivate(tab);
+
+        // Exit early for non-private tabs - no need to process or log
+        if (!isPrivate) {
+          // Only handle cleanup if we're observing private tabs
+          if (this.observePrivateTabs && this.openTabs.has(tab)) {
+            this.openTabs.delete(tab);
+            if (!this.openTabs.size) {
+              this.clearData();
+            }
+          }
+          return;
+        }
+
+        if (this.observePrivateTabs) {
+          this.openTabs.add(tab);
+        }
+
+        // Prevent history storage for private tabs
+        // NOTE: This will generate NS_ERROR_NOT_AVAILABLE errors in the console.
+        // These errors are harmless and expected - they occur because Firefox's
+        // internal components try to access the history service after we disable it.
+        // The errors don't affect functionality and private tabs still work correctly.
+        try {
+          if (browser.browsingContext && !browser.browsingContext.closed) {
+            browser.browsingContext.useGlobalHistory = false;
+          }
+        } catch (ex) {
+          // Silently ignore errors - the property might not be available yet
+        }
+      } catch (ex) {
+        console.error("PrivateTab privateListener error:", ex.message);
+        console.error("  Full error:", ex);
+        console.error("  Event type:", e?.type);
+        console.error("  Stack:", new Error().stack);
+      }
+    };
+
+    aWindow.addEventListener("XULFrameLoaderCreated", gBrowser.privateListener);
+
+    if (this.observePrivateTabs) {
+      gBrowser.tabContainer.addEventListener(
+        "TabClose",
+        this.onTabClose.bind(this)
+      );
+    }
+  },
+
+  onTabSelect(aEvent) {
+    const tab = aEvent.target;
+    const win = tab.ownerGlobal;
+    const prevTab = aEvent.detail.previousTab;
+
+    if (tab.userContextId != prevTab.userContextId) {
+      this.toggleMask(win);
+    }
+    // Clear any existing urlbar view data when switching into a Private container tab
+    if (this.isPrivate(tab)) {
+      try {
+        win.gURLBar?.view?.clear?.();
+      } catch (e) {
+        // No-op
+      }
+    }
+  },
+
+  onTabClose(aEvent) {
+    try {
+      const tab = aEvent.target;
+      if (this.isPrivate(tab)) {
+        this.openTabs.delete(tab);
+        if (!this.openTabs.size) {
+          // Silently try to clear data
+          try {
+            this.clearData();
+          } catch (ex) {
+            // Silently fail
+          }
+        }
+      }
+    } catch (ex) {
+      // Silently fail if any component is unavailable
+    }
+  },
+
+  toggleMask(aWindow) {
+    const { gBrowser } = aWindow;
+    const privateIndicator = aWindow.document.getElementById(
+      "private-browsing-indicator-with-label"
+    );
+    if (!privateIndicator) return;
+
+    if (gBrowser.selectedTab.isToggling) {
+      privateIndicator.setAttribute(
+        "enabled",
+        gBrowser.selectedTab.userContextId == this.container?.userContextId ? "false" : "true"
+      );
+    } else {
+      privateIndicator.setAttribute(
+        "enabled",
+        gBrowser.selectedTab.userContextId == this.container?.userContextId ? "true" : "false"
+      );
+    }
+  },
+
+  get observePrivateTabs() {
+    return !this.config.neverClearData && !this.config.doNotClearDataUntilFxIsClosed;
+  },
+
+  initCustomFunctions(aWindow) {
+    const { MozElements } = aWindow;
+
+    // Store original getAttribute
+    if (!this.orig_getAttribute) {
+      this.orig_getAttribute = MozElements.MozTab.prototype.getAttribute;
+    }
+
+    // Override getAttribute to handle toggling
+    MozElements.MozTab.prototype.getAttribute = function (att) {
+      if (att == "usercontextid" && this.isToggling) {
+        delete this.isToggling;
+        const currentId = PrivateTab.orig_getAttribute.call(this, att);
+        // If current tab is private, return 0 (regular), otherwise return private container ID
+        return currentId == PrivateTab.container?.userContextId ? "0" : String(PrivateTab.container?.userContextId || 0);
+      } else {
+        return PrivateTab.orig_getAttribute.call(this, att);
+      }
+    };
+  },
+
+  // Session store override to prevent private tab persistence
+  overrideSessionStore(aWindow) {
+    const { gBrowser } = aWindow;
+    if (!gBrowser) return;
+
+    // Mark private tabs as not restorable when they're created
+    gBrowser.addEventListener("TabOpen", (e) => {
+      const tab = e.target;
+      if (this.isPrivate(tab)) {
+        // Delete from cache to prevent session storage
+        try {
+          if (lazy.TabStateCache && tab.linkedBrowser?.permanentKey) {
+            lazy.TabStateCache.delete(tab.linkedBrowser.permanentKey);
+          }
+        } catch (ex) {
+          // TabStateCache might not be available - silently continue
+        }
+      }
+    });
+
+    // Clear private tab state periodically
+    gBrowser.addEventListener("TabSelect", (e) => {
+      const tab = e.target;
+      if (this.isPrivate(tab)) {
+        try {
+          if (lazy.TabStateCache && tab.linkedBrowser?.permanentKey) {
+            lazy.TabStateCache.delete(tab.linkedBrowser.permanentKey);
+          }
+        } catch (ex) {
+          // TabStateCache might not be available - silently continue
+        }
+      }
+    });
+  },
+};
diff --git a/waterfox/browser/components/privatetab/content/privatetab.xhtml b/waterfox/browser/components/privatetab/content/privatetab.xhtml
new file mode 100644
index 0000000000000..3c37eda19cd42
--- /dev/null
+++ b/waterfox/browser/components/privatetab/content/privatetab.xhtml
@@ -0,0 +1,41 @@
+<?xml version="1.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/. -->
+
+
+<overlay id="tabfeature-overlay" xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <keyset id="privateTab-keyset" insertbefore="mainPopupSet">
+        <key id="togglePrivateTab-key" modifiers="alt control" key="T" />
+        <key id="newPrivateTab-key" modifiers="alt control" key="P" />
+    </keyset>
+
+    <popupset id="mainPopupSet">
+        <menupopup id="tabContextMenu">
+            <menuitem id="toggleTabPrivateState" data-l10n-id="private-tab"
+                data-l10n-args="{&quot;isPrivate&quot;:false}" class="privatetab-icon" acceltext="Ctrl+Alt+T"
+                insertafter="context_pinTab" />
+        </menupopup>
+        <menupopup id="placesContext">
+            <menuitem id="openAllPrivate" data-l10n-id="open-all-private" class="privatetab-icon"
+                insertafter="placesContext_openBookmarkLinks:tabs" />
+            <menuitem id="openPrivate" data-l10n-id="open-private-tab" class="privatetab-icon"
+                insertafter="placesContext_open:newtab" />
+            <menuitem id="openAllLinksPrivate" data-l10n-id="open-all-links-private" class="privatetab-icon"
+                insertafter="placesContext_openLinks:tabs" />
+        </menupopup>
+    </popupset>
+
+    <menupopup id="menu_FilePopup">
+        <menuitem id="menu_newPrivateTab" data-l10n-id="new-private-tab" acceltext="Ctrl+Alt+P"
+            insertafter="menu_newNavigatorTab" />
+    </menupopup>
+
+    <menupopup id="contentAreaContextMenu">
+        <menuitem id="openLinkInPrivateTab" data-l10n-id="open-link-private" class="privatetab-icon"
+            insertafter="context-openlinkintab" />
+    </menupopup>
+
+</overlay>
diff --git a/waterfox/browser/components/privatetab/jar.mn b/waterfox/browser/components/privatetab/jar.mn
new file mode 100644
index 0000000000000..2a83e1533f595
--- /dev/null
+++ b/waterfox/browser/components/privatetab/jar.mn
@@ -0,0 +1,3 @@
+browser.jar:
+%  content browser %content/browser/ contentaccessible=yes
+     content/browser/overlays/privatetab.xhtml            (content/privatetab.xhtml)
\ No newline at end of file
diff --git a/waterfox/browser/components/privatetab/moz.build b/waterfox/browser/components/privatetab/moz.build
new file mode 100644
index 0000000000000..05073c049e17e
--- /dev/null
+++ b/waterfox/browser/components/privatetab/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "PrivateTab.sys.mjs",
+]
+
+BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/privatetab/test/browser/browser.ini b/waterfox/browser/components/privatetab/test/browser/browser.ini
new file mode 100644
index 0000000000000..836e8cfbfd195
--- /dev/null
+++ b/waterfox/browser/components/privatetab/test/browser/browser.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+tags = waterfox_privatetab
+firefox-appdir = browser
+support-files = 
+    head.js
+    ../../../../../../browser/components/sessionstore/test/browser_formdata_sample.html
+    ../../../../../../browser/components/urlbar/tests/browser/searchSuggestionEngine.xml
+
+[browser_privatetab.js]
diff --git a/waterfox/browser/components/privatetab/test/browser/browser_privatetab.js b/waterfox/browser/components/privatetab/test/browser/browser_privatetab.js
new file mode 100644
index 0000000000000..53f4ecc883121
--- /dev/null
+++ b/waterfox/browser/components/privatetab/test/browser/browser_privatetab.js
@@ -0,0 +1,193 @@
+requestLongerTimeout(2);
+
+async function togglePrivate(tab, skip = false) {
+  if (skip) {
+    return PrivateTab.togglePrivate(window, tab);
+  }
+  await openTabContextMenu(tab);
+  const openPrivate = document.getElementById("toggleTabPrivateState");
+  openPrivate.click();
+  return gBrowser.selectedTab;
+}
+
+// Test elements exist in correct locations
+add_task(async function testButtonsExist() {
+  const b1 = document.getElementById("openAllPrivate");
+  ok(b1, "Multiple bookmark context menu item added.");
+  const b2 = document.getElementById("openAllLinksPrivate");
+  ok(b2, "Multiple link context menu item added.");
+  const b3 = document.getElementById("openPrivate");
+  ok(b3, "New private tab item added.");
+  const b4 = document.getElementById("menu_newPrivateTab");
+  ok(b4, "Menu item added.");
+  const b5 = document.getElementById("openLinkInPrivateTab");
+  ok(b5, "Link context menu item added.");
+  const b6 = document.getElementById("toggleTabPrivateState");
+  ok(b6, "Tab context menu item added.");
+});
+
+// Test container exists
+add_task(async function testContainer() {
+  ContextualIdentityService.ensureDataReady();
+  const container = ContextualIdentityService._identities.find(
+    (c) => c.name === "Private"
+  );
+  ok(container, "Found Private container.");
+});
+
+// Test clicking context menu item changes userContextId to match private container
+add_task(async function testTogglePrivateTab() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  is(tab.userContextId, 0, "Tab is not private");
+  // Toggling private opens a duplicate tab in new container
+  tab = await togglePrivate(tab);
+  is(
+    tab.userContextId,
+    window.PrivateTab.container.userContextId,
+    "Tab is private"
+  );
+  // Cleanup
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Test autofill not stored from private tab
+add_task(async function testAutofillNotStored() {
+  const URL =
+    "http://mochi.test:8888/browser/browser/components/" +
+    "sessionstore/test/browser_formdata_sample.html";
+
+  const OUTER_VALUE = `browser_formdata_${Math.random()}`;
+  const INNER_VALUE = `browser_formdata_${Math.random()}`;
+
+  // Creates a tab, loads a page with some form fields,
+  // modifies their values and closes the tab.
+  async function createAndRemoveTab() {
+    // Create a new tab.
+    let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
+    // Toggle to a private tab
+    tab = await togglePrivate(tab, true);
+    const browser = tab.linkedBrowser;
+    await promiseBrowserLoaded(browser);
+
+    // Modify form data.
+    await setPropertyOfFormField(browser, "#txt", "value", OUTER_VALUE);
+    await setPropertyOfFormField(
+      browser.browsingContext.children[0],
+      "#txt",
+      "value",
+      INNER_VALUE
+    );
+
+    // Remove the tab.
+    await promiseRemoveTabAndSessionState(tab);
+  }
+
+  await createAndRemoveTab();
+  const [
+    {
+      state: { formdata },
+    },
+  ] = JSON.parse(SessionStore.getClosedTabData(window));
+  ok(!formdata, "Form data not stored in private tab");
+});
+
+// Test tab history not stored from private tab
+add_task(async function testTabHistoryNotStored() {
+  // Open a new tab
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URI1);
+  // Make it private
+  tab = await togglePrivate(tab, true);
+  const browser = tab.linkedBrowser;
+  await promiseBrowserLoaded(browser);
+  // Open a new URL
+  BrowserTestUtils.loadURI(browser, URI2);
+  await promiseBrowserLoaded(browser, false, URI2);
+  // Remove tab to save state
+  BrowserTestUtils.removeTab(tab);
+  // Verify only non-private data stored
+  const closedTabData = JSON.parse(SessionStore.getClosedTabData(window)).filter(
+    (data) => {
+      return (
+        data.state.entries[0].url === URI1 || data.state.entries[0].url === URI2
+      );
+    }
+  );
+  const privateData = closedTabData.filter((data) => {
+    return data.state.isPrivate === true;
+  });
+  const oneClosedTabWithNoPrivateData =
+    closedTabData.length === 1 && privateData.length === 0;
+  is(
+    oneClosedTabWithNoPrivateData,
+    true,
+    "Tab data not stored in private mode"
+  );
+});
+
+// Test private->non-private tab is restored on restart
+add_task(async function testRestoreConvertedPrivateTab() {});
+
+/**
+ * START OF SEARCH SUGGESTION BLOCK
+ */
+
+// Test search suggestions not stored from private tab
+const SUGGEST_URLBAR_PREF = "browser.urlbar.suggest.searches";
+const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml";
+
+async function getSuggestionResults() {
+  await UrlbarTestUtils.promiseSearchComplete(window);
+
+  const results = [];
+  const matchCount = UrlbarTestUtils.getResultCount(window);
+  for (let i = 0; i < matchCount; i++) {
+    const result = await UrlbarTestUtils.getDetailsOfResultAt(window, i);
+    if (
+      result.type === UrlbarUtils.RESULT_TYPE.SEARCH &&
+      result.searchParams.suggestion
+    ) {
+      result.index = i;
+      results.push(result);
+    }
+  }
+  return results;
+}
+
+// Must run first.
+add_task(async function prepare() {
+  const suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
+  Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
+  const engine = await SearchTestUtils.promiseNewSearchEngine(
+    getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME
+  );
+  const oldDefaultEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engine);
+  await UrlbarTestUtils.formHistory.clear();
+  registerCleanupFunction(async () => {
+    Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
+    await Services.search.setDefault(oldDefaultEngine);
+
+    // Clicking suggestions causes visits to search results pages, so clear that
+    // history now.
+    await PlacesUtils.history.clear();
+    await UrlbarTestUtils.formHistory.clear();
+  });
+});
+
+add_task(async function testSearchSuggestionsNotStored() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  tab = await togglePrivate(tab, true);
+  gURLBar.focus();
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "foo",
+  });
+  const results = await getSuggestionResults();
+  ok(!results.length, "Suggestion not be stored in private tab");
+  // Cleanup
+  BrowserTestUtils.removeTab(tab);
+});
+
+/**
+ * END OF SEARCH SUGGESTION BLOCK
+ */
diff --git a/waterfox/browser/components/privatetab/test/browser/head.js b/waterfox/browser/components/privatetab/test/browser/head.js
new file mode 100644
index 0000000000000..5867dcee23153
--- /dev/null
+++ b/waterfox/browser/components/privatetab/test/browser/head.js
@@ -0,0 +1,75 @@
+const { TabStateFlusher } = ChromeUtils.importESModule(
+  "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
+);
+
+const { TabStateCache } = ChromeUtils.importESModule(
+  "resource:///modules/sessionstore/TabStateCache.sys.mjs"
+);
+
+const { SearchTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/SearchTestUtils.sys.mjs"
+);
+
+SearchTestUtils.init(this);
+
+const { UrlbarTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/UrlbarTestUtils.sys.mjs"
+);
+
+UrlbarTestUtils.init(this);
+
+const { PrivateTab } = ChromeUtils.importESModule(
+  "resource:///modules/PrivateTab.sys.mjs"
+);
+
+const _URI1 = "https://test1.example.com/";
+const _URI2 = "https://example.com/";
+
+const _OS = AppConstants.platform;
+
+function _promiseBrowserLoaded(
+  aBrowser,
+  ignoreSubFrames = true,
+  wantLoad = null
+) {
+  return BrowserTestUtils.browserLoaded(aBrowser, !ignoreSubFrames, wantLoad);
+}
+
+// Removes the given tab immediately and returns a promise that resolves when
+// all pending status updates (messages) of the closing tab have been received.
+function _promiseRemoveTabAndSessionState(tab) {
+  const sessionUpdatePromise = BrowserTestUtils.waitForSessionStoreUpdate(tab);
+  BrowserTestUtils.removeTab(tab);
+  return sessionUpdatePromise;
+}
+
+function _setPropertyOfFormField(browserContext, selector, propName, newValue) {
+  return SpecialPowers.spawn(
+    browserContext,
+    [selector, propName, newValue],
+    (selectorChild, propNameChild, newValueChild) => {
+      const node = content.document.querySelector(selectorChild);
+      node[propNameChild] = newValueChild;
+
+      const event = node.ownerDocument.createEvent("UIEvents");
+      event.initUIEvent("input", true, true, node.ownerGlobal, 0);
+      node.dispatchEvent(event);
+    }
+  );
+}
+
+/**
+ * Helper for opening the toolbar context menu.
+ */
+async function _openTabContextMenu(tab) {
+  info("Opening tab context menu");
+  const contextMenu = document.getElementById("tabContextMenu");
+  const openTabContextMenuPromise = BrowserTestUtils.waitForPopupEvent(
+    contextMenu,
+    "shown"
+  );
+
+  EventUtils.synthesizeMouseAtCenter(tab, { type: "contextmenu" });
+  await openTabContextMenuPromise;
+  return contextMenu;
+}
diff --git a/waterfox/browser/components/search/content/BrowserSearchEngineIcons.json b/waterfox/browser/components/search/content/BrowserSearchEngineIcons.json
new file mode 100644
index 0000000000000..d0c17c5514dfb
--- /dev/null
+++ b/waterfox/browser/components/search/content/BrowserSearchEngineIcons.json
@@ -0,0 +1,10 @@
+[
+  ["bing", "chrome://browser/content/search/bing/favicon.ico"],
+  ["ddg", "chrome://browser/content/search/ddg/favicon.ico"],
+  ["ecosia", "chrome://browser/content/search/ecosia/favicon.ico"],
+  ["google", "chrome://browser/content/search/google/favicon.ico"],
+  ["mojeek", "chrome://browser/content/search/mojeek/favicon.ico"],
+  ["qwant", "chrome://browser/content/search/qwant/favicon.ico"],
+  ["startpage", "chrome://browser/content/search/startpage/favicon.ico"],
+  ["wps", "chrome://browser/content/search/wps/favicon.svg"]
+]
diff --git a/waterfox/browser/components/search/content/BrowserSearchEngines.json b/waterfox/browser/components/search/content/BrowserSearchEngines.json
new file mode 100644
index 0000000000000..6336362f88ea1
--- /dev/null
+++ b/waterfox/browser/components/search/content/BrowserSearchEngines.json
@@ -0,0 +1,402 @@
+[
+  {
+    "aliases": [
+      "bing",
+      "b"
+    ],
+    "name": "Bing",
+    "urls": {
+      "search": {
+        "base": "https://www.bing.com/search",
+        "params": [
+          {
+            "name": "PC",
+            "value": "IS45"
+          },
+          {
+            "name": "PTAG",
+            "value": "SYS1000000"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "2b86db12-a65d-4cdc-84f8-cdcf705ad5ca",
+    "identifier": "bing",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "duckduckgo",
+      "ddg"
+    ],
+    "name": "DuckDuckGo",
+    "urls": {
+      "search": {
+        "base": "https://duckduckgo.com/",
+        "params": [
+          {
+            "name": "t",
+            "value": "waterfox"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "c8ef2865-c592-4eea-8e13-abdefc4e586d",
+    "identifier": "ddg",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "ecosia",
+      "e"
+    ],
+    "name": "Ecosia",
+    "urls": {
+      "search": {
+        "base": "https://www.ecosia.org/search",
+        "params": [
+          {
+            "name": "tt",
+            "value": "57226k1p"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "6e24cbe0-e421-4462-ad7d-197db4cde98f",
+    "identifier": "ecosia",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "google",
+      "g"
+    ],
+    "name": "Google",
+    "urls": {
+      "search": {
+        "base": "https://www.google.com/search",
+        "params": [],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "cc42ee69-382f-44b9-9222-980755a6849f",
+    "identifier": "google",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "mojeek",
+      "m"
+    ],
+    "name": "Mojeek",
+    "urls": {
+      "search": {
+        "base": "https://www.mojeek.com/search",
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "db59d254-ecf4-42a1-b15c-63563debb60a",
+    "identifier": "mojeek",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "qwant",
+      "q"
+    ],
+    "name": "Qwant",
+    "urls": {
+      "search": {
+        "base": "https://www.qwant.com/",
+        "params": [],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "d7e41317-0461-4801-9ebc-fa4de57dcd57",
+    "identifier": "qwant",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "startpage",
+      "sp"
+    ],
+    "name": "Startpage",
+    "urls": {
+      "search": {
+        "base": "https://www.startpage.com/sp/search",
+        "method": "POST",
+        "params": [
+          {
+            "name": "segment",
+            "value": "startpage.waterfox.1"
+          }
+        ],
+        "searchTermParamName": "query"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "7debf7f1-bac9-4585-b94e-cce2a4eecacc",
+    "identifier": "startpage",
+    "recordType": "engine",
+    "variants": []
+  },
+  {
+    "aliases": [
+      "wps",
+      "w"
+    ],
+    "name": "Waterfox Private Search",
+    "urls": {
+      "search": {
+        "base": "https://search.waterfox.net/search",
+        "params": [],
+        "searchTermParamName": "q"
+      },
+      "suggestions": {
+        "base": "https://www.google.com/complete/search",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "experimentConfig": "search_rich_suggestions",
+            "name": "channel"
+          }
+        ],
+        "searchTermParamName": "q"
+      },
+      "trending": {
+        "base": "https://www.google.com/complete/search",
+        "method": "GET",
+        "params": [
+          {
+            "name": "client",
+            "value": "firefox"
+          },
+          {
+            "name": "channel",
+            "value": "ftr"
+          }
+        ],
+        "searchTermParamName": "q"
+      }
+    },
+    "id": "9b2df7d1-77d2-43e8-b20c-6b6ae4b6844b",
+    "identifier": "wps",
+    "recordType": "engine",
+    "variants": []
+  }
+]
diff --git a/waterfox/browser/components/search/extensions/bing/favicon.ico b/waterfox/browser/components/search/extensions/bing/favicon.ico
new file mode 100644
index 0000000000000..fdc021cfebd13
Binary files /dev/null and b/waterfox/browser/components/search/extensions/bing/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/ddg/favicon.ico b/waterfox/browser/components/search/extensions/ddg/favicon.ico
new file mode 100644
index 0000000000000..560000b03e2c0
Binary files /dev/null and b/waterfox/browser/components/search/extensions/ddg/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/ecosia/favicon.ico b/waterfox/browser/components/search/extensions/ecosia/favicon.ico
new file mode 100644
index 0000000000000..07ace433025d1
Binary files /dev/null and b/waterfox/browser/components/search/extensions/ecosia/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/google/favicon.ico b/waterfox/browser/components/search/extensions/google/favicon.ico
new file mode 100644
index 0000000000000..82339b3b1dbbc
Binary files /dev/null and b/waterfox/browser/components/search/extensions/google/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/mojeek/favicon.ico b/waterfox/browser/components/search/extensions/mojeek/favicon.ico
new file mode 100644
index 0000000000000..a89d560d839f7
Binary files /dev/null and b/waterfox/browser/components/search/extensions/mojeek/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/qwant/favicon.ico b/waterfox/browser/components/search/extensions/qwant/favicon.ico
new file mode 100644
index 0000000000000..1767c9ab6f7a9
Binary files /dev/null and b/waterfox/browser/components/search/extensions/qwant/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/startpage/favicon.ico b/waterfox/browser/components/search/extensions/startpage/favicon.ico
new file mode 100644
index 0000000000000..f0726fbba18ce
Binary files /dev/null and b/waterfox/browser/components/search/extensions/startpage/favicon.ico differ
diff --git a/waterfox/browser/components/search/extensions/wps/favicon.svg b/waterfox/browser/components/search/extensions/wps/favicon.svg
new file mode 100644
index 0000000000000..719adf511e6d8
--- /dev/null
+++ b/waterfox/browser/components/search/extensions/wps/favicon.svg
@@ -0,0 +1,29 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 -5.5 36 36" fill="none">
+  <path fill="url(#a)" d="M7.05391 17.5532c1.13727 0 1.70832-.649 2.29389-1.9641l2.2044-4.9161-3.67316-8.22905C6.95229.363673 4.51806-.568696 2.43952.35883.363413 1.28636-.568176 3.72505.358573 5.8029L5.21009 16.6814c.39684.5739 1.09129.8718 1.8414.8718h.00242Z"/>
+  <path fill="url(#b)" d="M28.3765 17.5532c-1.1373 0-1.7083-.6491-2.2939-1.9641l-2.2044-4.9161 3.6707-8.22907c.9268-2.077848 3.361-3.010217 5.4395-2.082691 2.0762.927531 3.0077 3.363791 2.081 5.444071L30.2179 16.6838c-.3969.5739-1.0913.8718-1.8414.8718v-.0024Z"/>
+  <path fill="url(#c)" d="M28.3758 17.5556c-1.1373 0-1.7084-.6491-2.2939-1.9641L21.4917 5.35485c-.6848-1.5378-2.1971-2.44838-3.7796-2.44111-1.5801-.00727-3.0924.90331-3.7796 2.44111L9.34232 15.5915c-.58557 1.315-1.15662 1.9641-2.29389 1.9641-.75011 0-1.44457-.2955-1.8414-.8718.32666.7967 1.20018 3.0659 2.14628 5.0856.0363.0775.0726.1526.10889.2252v-.0024c.40409.5522 1.15178.8694 1.88496.8694 1.13724 0 1.70834-.649 2.29384-1.964 0 0 2.9206-6.5242 3.8934-8.7013.2637-.5909.8662-2.0125 2.1753-2.0125 1.309 0 1.8849 1.3634 2.1753 2.0125.9727 2.1747 3.8933 8.7013 3.8933 8.7013.5856 1.315 1.1566 1.964 2.2939 1.964.7332 0 1.4809-.3172 1.885-.8694v.0024c.0363-.0726.0725-.1477.1088-.2252.9461-2.0197 1.8197-4.2889 2.1463-5.0856-.3968.5739-1.0913.8718-1.8414.8718h.0049Z"/>
+  <path fill="url(#d)" d="M27.9621 21.997c-.438.8791-.9122 1.5112-1.3986 1.9616-.7259.6394-1.6115 1.0027-2.6859 1.0414h-.0338c-1.1736-.0242-2.3351-.5376-3.1215-1.4409-.2492-.3028-.467-.6466-.6485-1.0244 0 0-1.2485-2.8407-2.3568-5.3448v.0048-.0048c-1.1106 2.5041-2.3568 5.3448-2.3568 5.3448-.1814.3778-.3968.7216-.6484 1.0244-.7864.9033-1.9503 1.4167-3.1215 1.4409h-.0338c-1.0744-.0387-1.96001-.4044-2.68592-1.0414-.48636-.4504-.96063-1.0825-1.3986-1.9616.4041.5498 1.15179.867 1.88496.867 1.13726 0 1.70836-.649 2.29386-1.964 0 0 2.9206-6.5242 3.8933-8.7013.2904-.649.8687-2.0125 2.1754-2.0125 1.3066 0 1.8849 1.3635 2.1753 2.0125.9727 2.1747 3.8933 8.7013 3.8933 8.7013.5856 1.315 1.1566 1.964 2.2939 1.964.7332 0 1.4809-.3172 1.8849-.867h-.0048Z"/>
+  <defs>
+    <radialGradient id="a" cx="0" cy="0" r="1" gradientTransform="matrix(9.99099 0 0 9.99936 1.71119 1.00786)" gradientUnits="userSpaceOnUse">
+      <stop offset=".1" stop-color="#00BAE6"/>
+      <stop offset=".78" stop-color="#0084E7"/>
+    </radialGradient>
+    <radialGradient id="b" cx="0" cy="0" r="1" gradientTransform="matrix(-9.99099 0 0 -9.99936 33.7216 1.00784)" gradientUnits="userSpaceOnUse">
+      <stop offset=".14" stop-color="#788CF3"/>
+      <stop offset=".46" stop-color="#587EEF"/>
+      <stop offset="1" stop-color="#1A65E8"/>
+    </radialGradient>
+    <linearGradient id="c" x1="5.20945" x2="30.2196" y1="12.8889" y2="12.8889" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#788CF3"/>
+      <stop offset=".25" stop-color="#57ABF6"/>
+      <stop offset=".51" stop-color="#39CAFA"/>
+      <stop offset=".86" stop-color="#39CAFA"/>
+    </linearGradient>
+    <linearGradient id="d" x1="7.46715" x2="27.9621" y1="17.5943" y2="17.5943" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#679BF5"/>
+      <stop offset=".19" stop-color="#529DF4"/>
+      <stop offset=".51" stop-color="#34A2F3"/>
+      <stop offset=".86" stop-color="#4DAFF7"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/waterfox/browser/components/search/jar.mn b/waterfox/browser/components/search/jar.mn
new file mode 100644
index 0000000000000..bdeb5014a7eef
--- /dev/null
+++ b/waterfox/browser/components/search/jar.mn
@@ -0,0 +1,8 @@
+# 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/.
+
+browser.jar:
+        content/browser/search/BrowserSearchEngineIcons.json        (content/BrowserSearchEngineIcons.json)
+        content/browser/search/BrowserSearchEngines.json            (content/BrowserSearchEngines.json)
+        content/browser/search/                                     (extensions/**)
diff --git a/waterfox/browser/components/search/moz.build b/waterfox/browser/components/search/moz.build
new file mode 100644
index 0000000000000..d988c0ff9b162
--- /dev/null
+++ b/waterfox/browser/components/search/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/sidebar/SidebarPreferencesHandler.sys.mjs b/waterfox/browser/components/sidebar/SidebarPreferencesHandler.sys.mjs
new file mode 100644
index 0000000000000..195a33a92f0ce
--- /dev/null
+++ b/waterfox/browser/components/sidebar/SidebarPreferencesHandler.sys.mjs
@@ -0,0 +1,610 @@
+/* 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/. */
+
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
+});
+
+const SIDEBAR_ADDON_ID = "sidebar@waterfox.net";
+const SIDEBAR_ADDON_URI = "resource://builtin-addons/sidebar/";
+
+const SIDEBAR_COMPONENT_PREF = "browser.sidebar.enabled";
+const CONTAINERS_CONTROLLER_PREF = "privacy.userContext.extension";
+
+export const SidebarPreferencesHandler = {
+  _initialized: false,
+  _sidebarPrefObserver: null,
+
+  init() {
+    if (this._initialized) {
+      return;
+    }
+    this._initialized = true;
+
+    // Watch for about:preferences being loaded so we can patch the UI.
+    Services.obs.addObserver(this, "main-pane-loaded");
+
+    // Monitor the sidebar component pref and sync the built-in add-on state.
+    this._monitorSidebarPref();
+  },
+
+  uninit() {
+    if (!this._initialized) {
+      return;
+    }
+    this._initialized = false;
+
+    try {
+      Services.obs.removeObserver(this, "main-pane-loaded");
+    } catch (_) {}
+
+    if (this._sidebarPrefObserver) {
+      try {
+        Services.prefs.removeObserver(SIDEBAR_COMPONENT_PREF, this._sidebarPrefObserver);
+      } catch (_) {}
+      this._sidebarPrefObserver = null;
+    }
+  },
+
+  observe(subject, topic, _data) {
+    switch (topic) {
+      case "main-pane-loaded": {
+        // subject is the about:preferences content window
+        this._ensureTreeCategory(subject);
+        this._patchPreferences(subject);
+        break;
+      }
+    }
+  },
+
+  async _monitorSidebarPref() {
+    let addon = await lazy.AddonManager.getAddonByID(SIDEBAR_ADDON_ID);
+
+    const syncAddonStateWithPref = async () => {
+      try {
+        const enabled = Services.prefs.getBoolPref(SIDEBAR_COMPONENT_PREF, false);
+        if (!enabled) {
+          if (addon?.isActive) {
+            await addon.disable({ allowSystemAddons: true });
+          }
+        } else {
+          if (addon && !addon.isActive) {
+            await addon.enable({ allowSystemAddons: true });
+          }
+        }
+      } catch (_) {
+        // Ignore transient failures.
+      }
+    };
+
+    // Initial sync and observer
+    await syncAddonStateWithPref();
+    this._sidebarPrefObserver = syncAddonStateWithPref;
+    Services.prefs.addObserver(SIDEBAR_COMPONENT_PREF, syncAddonStateWithPref);
+  },
+
+  _ensureTreeCategory(prefsWin) {
+    const doc = prefsWin.document;
+    const categories = doc.getElementById("categories");
+    if (!categories) {
+      return;
+    }
+    // Bail out if already present
+    if (doc.getElementById("category-tree")) {
+      return;
+    }
+    // Insert before search category (like previous overlay did)
+    const before = doc.getElementById("category-search");
+    const item = doc.createXULElement("richlistitem");
+    item.id = "category-tree";
+    item.className = "category";
+    item.setAttribute("data-l10n-id", "category-tree");
+    item.setAttribute("data-l10n-attrs", "tooltiptext");
+    item.setAttribute("value", "paneTree");
+    item.setAttribute("align", "center");
+    if (before && before.parentNode === categories) {
+      categories.insertBefore(item, before);
+    } else {
+      categories.appendChild(item);
+    }
+    const img = doc.createXULElement("image");
+    img.className = "category-icon";
+    const label = doc.createXULElement("label");
+    label.className = "category-name";
+    label.setAttribute("flex", "1");
+    doc.l10n.setAttributes(label, "pane-tree-title");
+    item.appendChild(img);
+    item.appendChild(label);
+
+    // Ensure the preferences framework knows about our pane so gotoPref works.
+    if (!prefsWin.gCategoryModules?.has("paneTree")) {
+      prefsWin.register_module("paneTree", {
+        init() {
+          // No-op: our pane is already injected and bound via data-category="paneTree".
+        },
+      });
+      console.log("[SidebarPrefs] paneTree registered with preferences");
+    }
+
+    // Wire category selection to navigate to our pane
+    categories.addEventListener("select", () => {
+      const sel = categories.selectedItem;
+      if (sel && sel.getAttribute("value") === "paneTree") {
+        prefsWin.gotoPref("paneTree");
+      }
+    }, { capture: true });
+  },
+
+  _patchPreferences(prefsWin) {
+    // Wait until the Containers UI has been constructed in about:preferences.
+    const startedAt = Date.now();
+    const timer = prefsWin.setInterval(() => {
+      if (Date.now() - startedAt > 5000) {
+        prefsWin.clearInterval(timer);
+        // Still attempt to inject pane even if containers box wasn't found
+        this._injectTreePreferences(prefsWin);
+        return;
+      }
+      const doc = prefsWin.document;
+      if (!doc || doc.readyState === "uninitialized") {
+        return;
+      }
+      const containersBox = doc.getElementById("browserContainersbox");
+      if (!containersBox) {
+        return;
+      }
+      prefsWin.clearInterval(timer);
+      this._hideContainersControlledBannerForBuiltin(prefsWin);
+      this._injectTreePreferences(prefsWin);
+
+      // Handle initial navigation: allow about:preferences#tree to go to our pane.
+      const hash = String(doc.location.hash || "").replace(/^#/, "");
+      if (hash === "tree" || hash === "paneTree") {
+        prefsWin.gotoPref("paneTree");
+      }
+    }, 100);
+  },
+
+  _hideContainersControlledBannerForBuiltin(prefsWin) {
+    try {
+      const controller = Services.prefs.getCharPref(CONTAINERS_CONTROLLER_PREF, "");
+      if (controller !== SIDEBAR_ADDON_ID) {
+        // Some other extension controls containers; do not modify UI.
+        return;
+      }
+
+      const doc = prefsWin.document;
+      const banner = doc.getElementById("browserContainersExtensionContent");
+      const checkbox = doc.getElementById("browserContainersCheckbox");
+
+      // Hide the โ€œcontrolled by extensionโ€ info row.
+      if (banner) {
+        banner.hidden = true;
+      }
+
+      // Optional UX: Ensure the checkbox is enabled so it doesn't look disabled
+      // without an explanation banner.
+      if (checkbox) {
+        checkbox.disabled = false;
+      }
+
+      // Keep the state enforced if prefs code tries to flip it back.
+      const target = doc.getElementById("browserContainersbox") || doc;
+      const mo = new prefsWin.MutationObserver(() => {
+        const b = doc.getElementById("browserContainersExtensionContent");
+        const c = doc.getElementById("browserContainersCheckbox");
+        if (b && !b.hidden) {
+          b.hidden = true;
+        }
+        if (c && c.disabled) {
+          c.disabled = false;
+        }
+      });
+      mo.observe(target, { childList: true, subtree: true, attributes: true });
+    } catch (_) {
+      // Ignore unexpected contexts.
+    }
+  },
+
+  _injectTreePreferences(prefsWin) {
+    const doc = prefsWin.document;
+
+    // Avoid duplicating UI if called more than once
+    if (doc.getElementById("treePreferencesInjected")) {
+      return;
+    }
+
+    // Insert our pane elements into the main pane container. We rely on data-category="paneTree"
+    // so the preferences framework shows/hides it appropriately.
+    const mainPane = doc.getElementById("mainPrefPane");
+    if (!mainPane) {
+      return;
+    }
+
+    // Helper to create XUL nodes
+    const xul = (name, attrs = {}) => {
+      const el = doc.createXULElement(name);
+      for (const [k, v] of Object.entries(attrs)) {
+        if (v !== undefined && v !== null) {
+          el.setAttribute(k, v);
+        }
+      }
+      return el;
+    };
+
+    // Root container
+    const group = xul("groupbox", {
+      id: "treePreferencesInjected",
+      "data-category": "paneTree",
+      hidden: "true",
+    });
+
+    const label = xul("label");
+    const h2 = doc.createElementNS("http://www.w3.org/1999/xhtml", "h2");
+    label.appendChild(h2);
+    group.appendChild(label);
+    doc.l10n.setAttributes(h2, "tree-header");
+
+    // A small helper to add checkbox bound to a pref with l10n id.
+    const addCheckbox = (parent, id, pref, l10nId) => {
+      const box = xul("vbox", { id });
+      const cb = xul("checkbox", { id: `${id}-checkbox`, preference: pref });
+      doc.l10n.setAttributes(cb, l10nId);
+      box.appendChild(cb);
+      parent.appendChild(box);
+    };
+
+    // Appearance section
+    const appearance = xul("groupbox", {
+      id: "treeAppearanceGroup",
+      "data-category": "paneTree",
+      hidden: "true",
+    });
+    {
+      const l = xul("label");
+      const h = doc.createElementNS("http://www.w3.org/1999/xhtml", "h2");
+      l.appendChild(h);
+      doc.l10n.setAttributes(h, "tree-appearance-header");
+      appearance.appendChild(l);
+      addCheckbox(
+        appearance,
+        "tree_faviconizePinnedTabsBox",
+        "browser.sidebar.faviconizePinnedTabs",
+        "tree-faviconize-pinned-tabs"
+      );
+    }
+    group.appendChild(appearance);
+
+    // Auto-sticky section
+    const sticky = xul("groupbox", {
+      id: "treeAutoStickyGroup",
+      "data-category": "paneTree",
+      hidden: "true",
+    });
+    {
+      const l = xul("label");
+      const h = doc.createElementNS("http://www.w3.org/1999/xhtml", "h2");
+      l.appendChild(h);
+      doc.l10n.setAttributes(h, "tree-auto-sticky-header");
+      sticky.appendChild(l);
+
+      addCheckbox(
+        sticky,
+        "tree_stickyActiveTabBox",
+        "browser.sidebar.stickyActiveTab",
+        "tree-sticky-active-tab"
+      );
+      addCheckbox(
+        sticky,
+        "tree_stickySoundPlayingTabBox",
+        "browser.sidebar.stickySoundPlayingTab",
+        "tree-sticky-sound-playing-tab"
+      );
+      addCheckbox(
+        sticky,
+        "tree_stickySharingTabBox",
+        "browser.sidebar.stickySharingTab",
+        "tree-sticky-sharing-tab"
+      );
+    }
+    group.appendChild(sticky);
+
+    // Behavior section
+    const behavior = xul("groupbox", {
+      id: "treeBehaviorGroup",
+      "data-category": "paneTree",
+      hidden: "true",
+    });
+    {
+      const l = xul("label");
+      const h = doc.createElementNS("http://www.w3.org/1999/xhtml", "h2");
+      l.appendChild(h);
+      doc.l10n.setAttributes(h, "tree-behavior-header");
+      behavior.appendChild(l);
+
+      addCheckbox(
+        behavior,
+        "tree_autoCollapseExpandSubtreeOnAttachBox",
+        "browser.sidebar.autoCollapseExpandSubtreeOnAttach",
+        "tree-auto-collapse-expand-subtree-on-attach"
+      );
+      addCheckbox(
+        behavior,
+        "tree_autoCollapseExpandSubtreeOnSelecthBox",
+        "browser.sidebar.autoCollapseExpandSubtreeOnSelect",
+        "tree-auto-collapse-expand-subtree-on-select"
+      );
+
+      // Double-click behavior menulist
+      const dbl = xul("hbox", {
+        id: "tree_treeDoubleClickBehaviorBox",
+        align: "center",
+      });
+      const dblCaption = xul("label", {
+        id: "tree_treeDoubleClickBehaviorCaption",
+        control: "tree_treeDoubleClickBehavior",
+      });
+      doc.l10n.setAttributes(dblCaption, "tree-tree-double-click-behavior-caption");
+      dbl.appendChild(dblCaption);
+
+      const dblList = xul("menulist", {
+        id: "tree_treeDoubleClickBehavior",
+        preference: "browser.sidebar.treeDoubleClickBehavior",
+      });
+      const dblPopup = xul("menupopup", { class: "in-menulist" });
+      const dblOptions = [
+        ["1", "tree-tree-double-click-behavior-toggle-collapsed"],
+        ["4", "tree-tree-double-click-behavior-toggle-sticky"],
+        ["3", "tree-tree-double-click-behavior-toggle-close"],
+        ["0", "tree-tree-double-click-behavior-toggle-none"],
+      ];
+      for (const [value, l10nId] of dblOptions) {
+        const item = xul("menuitem", { value });
+        doc.l10n.setAttributes(item, l10nId);
+        dblPopup.appendChild(item);
+      }
+      dblList.appendChild(dblPopup);
+      dbl.appendChild(dblList);
+      behavior.appendChild(dbl);
+
+      // Successor control menulist
+      const suc = xul("hbox", {
+        id: "tree_successorTabControlLevelBox",
+        align: "center",
+      });
+      const sucCaption = xul("label", {
+        id: "tree_successorTabControlLevelCaption",
+        control: "tree_successorTabControlLevel",
+      });
+      doc.l10n.setAttributes(sucCaption, "tree-successor-tab-control-level-caption");
+      suc.appendChild(sucCaption);
+
+      const sucList = xul("menulist", {
+        id: "tree_successorTabControlLevel",
+        preference: "browser.sidebar.successorTabControlLevel",
+      });
+      const sucPopup = xul("menupopup", { class: "in-menulist" });
+      const sucOptions = [
+        ["2", "tree-successor-tab-control-level-in-tree"],
+        ["1", "tree-successor-tab-control-level-simulate-default"],
+        ["0", "tree-successor-tab-control-level-never"],
+      ];
+      for (const [value, l10nId] of sucOptions) {
+        const item = xul("menuitem", { value });
+        doc.l10n.setAttributes(item, l10nId);
+        sucPopup.appendChild(item);
+      }
+      sucList.appendChild(sucPopup);
+      suc.appendChild(sucList);
+      behavior.appendChild(suc);
+
+      // Drop links behavior menulist
+      const drop = xul("hbox", {
+        id: "tree_dropLinksOnTabBehaviorBox",
+        align: "center",
+      });
+      const dropCaption = xul("label", {
+        id: "tree_dropLinksOnTabBehaviorCaption",
+        control: "tree_dropLinksOnTabBehavior",
+      });
+      doc.l10n.setAttributes(dropCaption, "tree-drop-links-on-tab-behavior-caption");
+      drop.appendChild(dropCaption);
+
+      const dropList = xul("menulist", {
+        id: "tree_dropLinksOnTabBehavior",
+        preference: "browser.sidebar.dropLinksOnTabBehavior",
+      });
+      const dropPopup = xul("menupopup", { class: "in-menulist" });
+      const dropOptions = [
+        ["0", "tree-drop-links-on-tab-behavior-ask"],
+        ["1", "tree-drop-links-on-tab-behavior-load"],
+        ["2", "tree-drop-links-on-tab-behavior-newtab"],
+      ];
+      for (const [value, l10nId] of dropOptions) {
+        const item = xul("menuitem", { value });
+        doc.l10n.setAttributes(item, l10nId);
+        dropPopup.appendChild(item);
+      }
+      dropList.appendChild(dropPopup);
+      drop.appendChild(dropList);
+      behavior.appendChild(drop);
+    }
+    group.appendChild(behavior);
+
+    // Auto-attach section
+    const autoAttach = xul("groupbox", {
+      id: "treeAutoAttachGroup",
+      "data-category": "paneTree",
+      hidden: "true",
+    });
+    {
+      const l = xul("label");
+      const h = doc.createElementNS("http://www.w3.org/1999/xhtml", "h2");
+      l.appendChild(h);
+      doc.l10n.setAttributes(h, "tree-auto-attach-header");
+      autoAttach.appendChild(l);
+
+      const addMenu = (rootId, captionL10n, pref, options) => {
+        const box = xul("vbox", { id: rootId });
+        const cap = xul("label", { id: `${rootId}Caption`, control: `${rootId}Menu` });
+        doc.l10n.setAttributes(cap, captionL10n);
+        box.appendChild(cap);
+        const hb = xul("hbox", { id: `${rootId}MenulistBox`, align: "center", class: "sub" });
+        const list = xul("menulist", { id: `${rootId.replace(/Box$/, "")}`, preference: pref });
+        const popup = xul("menupopup", { class: "in-menulist" });
+        for (const [value, l10nId] of options) {
+          const item = xul("menuitem", { value });
+          doc.l10n.setAttributes(item, l10nId);
+          popup.appendChild(item);
+        }
+        list.appendChild(popup);
+        hb.appendChild(list);
+        box.appendChild(hb);
+        autoAttach.appendChild(box);
+      };
+
+      addMenu(
+        "tree_autoAttachOnOpenedWithOwnerBox",
+        "tree-auto-attach-on-opened-with-owner-caption",
+        "browser.sidebar.autoAttachOnOpenedWithOwner",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["5", "tree-auto-attach-child-next-to-last-related-tab"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_insertNewTabFromPinnedTabAtBox",
+        "tree-insert-new-tab-from-pinned-tab-at-caption",
+        "browser.sidebar.insertNewTabFromPinnedTabAt",
+        [
+          ["-1", "tree-insert-new-tab-from-pinned-tab-at-no-control"],
+          ["3", "tree-insert-new-tab-from-pinned-tab-at-next-to-last-related-tab"],
+          ["0", "tree-insert-new-tab-from-pinned-tab-at-top"],
+          ["1", "tree-insert-new-tab-from-pinned-tab-at-end"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachOnNewTabCommandBox",
+        "tree-auto-attach-on-new-tab-command-caption",
+        "browser.sidebar.autoAttachOnNewTabCommand",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachOnNewTabButtonMiddleClickBox",
+        "tree-auto-attach-on-new-tab-button-middle-click-caption",
+        "browser.sidebar.autoAttachOnNewTabButtonMiddleClick",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachOnDuplicatedBox",
+        "tree-auto-attach-on-duplicated-caption",
+        "browser.sidebar.autoAttachOnDuplicated",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachSameSiteOrphanBox",
+        "tree-auto-attach-same-site-orphan-caption",
+        "browser.sidebar.autoAttachSameSiteOrphan",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachOnOpenedFromExternalBox",
+        "tree-auto-attach-on-opened-from-external-caption",
+        "browser.sidebar.autoAttachOnOpenedFromExternal",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+      addMenu(
+        "tree_autoAttachOnAnyOtherTriggerBox",
+        "tree-auto-attach-on-any-other-trigger-caption",
+        "browser.sidebar.autoAttachOnAnyOtherTrigger",
+        [
+          ["-1", "tree-auto-attach-no-control"],
+          ["0", "tree-auto-attach-independent"],
+          ["6", "tree-auto-attach-child-top"],
+          ["7", "tree-auto-attach-child-end"],
+          ["2", "tree-auto-attach-sibling"],
+          ["3", "tree-auto-attach-next-sibling"],
+        ]
+      );
+    }
+    group.appendChild(autoAttach);
+ 
+    // Insert into DOM as a top-level pane element
+    mainPane.appendChild(group);
+ 
+    // Register preferences with the Preferences binding so widgets reflect pref values
+    const toRegister = [
+      ["browser.sidebar.faviconizePinnedTabs", "bool"],
+      ["browser.sidebar.stickyActiveTab", "bool"],
+      ["browser.sidebar.stickySoundPlayingTab", "bool"],
+      ["browser.sidebar.stickySharingTab", "bool"],
+      ["browser.sidebar.autoCollapseExpandSubtreeOnAttach", "bool"],
+      ["browser.sidebar.autoCollapseExpandSubtreeOnSelect", "bool"],
+      ["browser.sidebar.treeDoubleClickBehavior", "unichar"],
+      ["browser.sidebar.successorTabControlLevel", "unichar"],
+      ["browser.sidebar.dropLinksOnTabBehavior", "unichar"],
+      ["browser.sidebar.autoAttachOnOpenedWithOwner", "unichar"],
+      ["browser.sidebar.insertNewTabFromPinnedTabAt", "unichar"],
+      ["browser.sidebar.autoAttachOnNewTabCommand", "unichar"],
+      ["browser.sidebar.autoAttachOnNewTabButtonMiddleClick", "unichar"],
+      ["browser.sidebar.autoAttachOnDuplicated", "unichar"],
+      ["browser.sidebar.autoAttachSameSiteOrphan", "unichar"],
+      ["browser.sidebar.autoAttachOnOpenedFromExternal", "unichar"],
+      ["browser.sidebar.autoAttachOnAnyOtherTrigger", "unichar"],
+    ];
+    for (const [id, type] of toRegister) {
+      prefsWin.Preferences.add({ id, type });
+    }
+ 
+    // Reveal inner sections for our dedicated category.
+    // The root group visibility is controlled by about:preferences
+    // category gating (search() on data-category), so we intentionally
+    // leave its "hidden" state unchanged here.
+    appearance.hidden = false;
+    sticky.hidden = false;
+    behavior.hidden = false;
+    autoAttach.hidden = false;
+  },
+};
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/_locales/en/messages.json b/waterfox/browser/components/sidebar/_locales/en/messages.json
new file mode 100644
index 0000000000000..bd9d38c5da9a2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/_locales/en/messages.json
@@ -0,0 +1,1042 @@
+{
+  "extensionName": { "message": "Tree Vertical Tabs" },
+  "extensionDescription": { "message": "Tree Vertical Tabs for Waterfox." },
+
+  "sidebarTitle": { "message": "Tree Vertical Tabs" },
+  "sidebarToggleDescription": { "message": "Toggle Tree Vertical Tabs" },
+
+  "command_tabMoveUp":             { "message": "Move Current Tab Up" },
+  "command_treeMoveUp":            { "message": "Move Current Tree Up" },
+  "command_tabMoveDown":           { "message": "Move Current Tab Down" },
+  "command_treeMoveDown":          { "message": "Move Current Tree Down" },
+  "command_focusPrevious":         { "message": "Focus to Previous Tab (expand tree)" },
+  "command_focusPreviousSilently": { "message": "Focus to Previous Tab (don't expand tree)" },
+  "command_focusNext":             { "message": "Focus to Next Tab (expand tree)" },
+  "command_focusNextSilently":     { "message": "Focus to Next Tab (don't expand tree)" },
+  "command_focusParent":           { "message": "Focus to Parent Tab" },
+  "command_focusParentOrCollapse": { "message": "Collapse Tree or Focus to Parent Tab" },
+  "command_focusFirstChild":       { "message": "Focus to First Child Tab" },
+  "command_focusFirstChildOrExpand": { "message": "Expand Tree or Focus to First Child Tab" },
+  "command_focusLastChild":        { "message": "Focus to Last Child Tab" },
+  "command_focusPreviousSibling":  { "message": "Focus to Previous Sibling Tab" },
+  "command_focusNextSibling":      { "message": "Focus to Next Sibling Tab" },
+  "command_simulateUpOnTree":      { "message": "Simulate Up Key on Tree" },
+  "command_simulateDownOnTree":    { "message": "Simulate Down Key on Tree" },
+  "command_simulateLeftOnTree":    { "message": "Simulate Left Key on Tree" },
+  "command_simulateRightOnTree":   { "message": "Simulate Right Key on Tree" },
+  "command_tabbarUp":              { "message": "Scroll Tabs Up by Lines" },
+  "command_tabbarPageUp":          { "message": "Scroll Tabs Up by Page" },
+  "command_tabbarHome":            { "message": "Scroll Tabs to Top" },
+  "command_tabbarDown":            { "message": "Scroll Tabs Down by Lines" },
+  "command_tabbarPageDown":        { "message": "Scroll Tabs Down by Page" },
+  "command_tabbarEnd":             { "message": "Scroll Tabs to End" },
+  "command_toggleTreeCollapsed":   { "message": "Toggle Tree Collapsed" },
+  "command_toggleTreeCollapsedRecursively": { "message": "Toggle Tree Collapsed Recursively" },
+  "command_toggleSubPanel":        { "message": "Toggle Sub Panel" },
+  "command_switchSubPanel":        { "message": "Switch Sub Panel contents" },
+  "command_increaseSubPanel":      { "message": "Increase Size of the Sub Panel" },
+  "command_decreaseSubPanel":      { "message": "Decrease Size of the Sub Panel" },
+
+  "tab_closebox_aria_label": { "message": "Close tab #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_closebox_tab_tooltip": { "message": "Close tab" },
+  "tab_closebox_tab_tooltip_multiselected": { "message": "Close tabs" },
+  "tab_closebox_tree_tooltip": { "message": "Close tree" },
+  "tab_soundButton_aria_label": { "message": "Mute tab #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_sharingState_sharingCamera_tooltip": { "message": "You are sharing your camera" },
+  "tab_sharingState_sharingMicrophone_tooltip": { "message": "You are sharing your microphone" },
+  "tab_sharingState_sharingScreen_tooltip": { "message": "You are sharing a window or a screen" },
+  "tab_soundButton_muted_tooltip": { "message": "Unmute tab" },
+  "tab_soundButton_muted_tooltip_multiselected": { "message": "Unmute tabs" },
+  "tab_soundButton_playing_tooltip": { "message": "Mute tab" },
+  "tab_soundButton_playing_tooltip_multiselected": { "message": "Mute tabs" },
+  "tab_soundButton_autoplayBlocked_tooltip": { "message": "Play tab" },
+  "tab_soundButton_autoplayBlocked_tooltip_multiselected": { "message": "Play tabs" },
+  "tab_twisty_aria_label": { "message": "Toggle tree #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_twisty_expanded_tooltip": { "message": "Collapse tree" },
+  "tab_twisty_collapsed_tooltip": { "message": "Expand tree" },
+  "tab_tree_tooltip": { "message": "$TREE$\n  ...and $COUNT$ more tab(s)",
+    "placeholders": {
+      "tree": { "content": "$1", "example": "* Tree\n  * Style\n    * Tab" },
+      "count": { "content": "$2", "example": "3" }
+    }},
+  "tabbar_newTabButton_tooltip": { "message": "Open a new tab" },
+
+  "tabbar_newTabAction_tooltip":           { "message": "Open a new tab asโ€ฆ" },
+  "tabbar_newTabAction_independent_label": { "message": "&Independent Tab" },
+  "tabbar_newTabAction_independent_command": { "message": "Independent Tab" },
+  "tabbar_newTabAction_child_label":       { "message": "&Child Tab" },
+  "tabbar_newTabAction_child_command":       { "message": "Child Tab" },
+  "tabbar_newTabAction_childTop_command":    { "message": "First Child Tab" },
+  "tabbar_newTabAction_childEnd_command":    { "message": "Last Child Tab" },
+  "tabbar_newTabAction_sibling_label":     { "message": "&Sibling Tab" },
+  "tabbar_newTabAction_sibling_command":     { "message": "Sibling Tab" },
+  "tabbar_newTabAction_nextSibling_label": { "message": "&Next Sibling Tab" },
+  "tabbar_newTabAction_nextSibling_command": { "message": "Next Sibling Tab" },
+
+  "tabbar_newTabWithContexualIdentity_tooltip": { "message": "New Container Tab" },
+  "tabbar_newTabWithContexualIdentity_default": { "message": "&No Container" },
+
+  "groupTab_label": { "message": "$TITLE$ and more",
+    "placeholders": {
+      "title": { "content": "$1", "example": "title" }
+    }},
+  "groupTab_label_default": { "message": "Group" },
+  "groupTab_temporary_label": { "message": "Close this tab when there are no more children" },
+  "groupTab_temporaryAggressive_label": { "message": "Close this tab when there is one or less child" },
+  "groupTab_fromPinnedTab_label": { "message": "Tabs from $TITLE$",
+    "placeholders": {
+      "title": { "content": "$1", "example": "title" }
+    }},
+  "groupTab_options_label": { "message": "There is an option to deactivate opening of this type tab." },
+  "groupTab_options_dismiss": { "message": "Dismiss this hint" },
+
+  "bookmarkFolder_label_default": { "message": "%ANY(\"%GROUP%\", \"$TITLE$ and more\")% (%YEAR%.%MONTH%.%DATE%)",
+    "placeholders": {
+      "title": { "content": "$1", "example": "Title" }
+    }},
+
+  "bookmark_notification_notPermitted_title": { "message": "Permission error" },
+  "bookmark_notification_notPermitted_message": { "message": "Failed to get permissions to create bookmarks. Please click here to grant extra permissions." },
+  "bookmark_notification_notPermitted_message_linux": { "message": "Failed to get permissions to create bookmarks. Please click the button to grant extra permissions." },
+
+  "bookmarkContext_notification_notPermitted_title": { "message": "Permission error" },
+  "bookmarkContext_notification_notPermitted_message": { "message": "Failed to get permissions to open a context menu for bookmarks. Please click here to grant extra permissions." },
+  "bookmarkContext_notification_notPermitted_message_linux": { "message": "Failed to get permissions to open a context menu for bookmarks. Please click the button to grant extra permissions." },
+
+  "dropLinksOnTabBehavior_message": { "message": "How to open this?" },
+  "dropLinksOnTabBehavior_save":    { "message": "Do same choice hereafter" },
+  "dropLinksOnTabBehavior_load":    { "message": "Load to this tab" },
+  "dropLinksOnTabBehavior_newtab":  { "message": "Open new child tab" },
+
+  "tabDragBehaviorNotification_message_duration_single":  { "message": "8s" },
+  "tabDragBehaviorNotification_message_duration_both":  { "message": "16s" },
+  "tabDragBehaviorNotification_message_base":  { "message": "Dropping to outside of sidebar will $RESULT$.",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_inverted_base_with_shift":  { "message": "Shift-drag will $RESULT$.",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_inverted_base_without_shift":  { "message": "Dragging without Shift key will $RESULT$.",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_tree_tearoff":  { "message": "detach tabs from window" },
+  "tabDragBehaviorNotification_message_tab_tearoff":   { "message": "detach the tab from window" },
+  "tabDragBehaviorNotification_message_tree_bookmark": { "message": "create links or bookmarks at the place tabs are dropped to" },
+  "tabDragBehaviorNotification_message_tab_bookmark":  { "message": "create a link or a bookmark at the place the tab is dropped to" },
+
+  "tabsHighlightingNotification_message": { "message": "Highlighting tabs... $PROGRESS$ %",
+    "placeholders": {
+      "progress": { "content": "$1", "example": "50" }
+    }},
+
+  "blank_allUrlsPermissionRequiredMessage": { "message": "This message is here due to Firefox tried to restore a dialog which is provided by Tree Style Tab extension. Please grant the \"Access your data for all websites\" permission via the \"Permissions\" tab of Tree Style Tab's details page in the Add-on Manager, if you don't want this message to appear anymore." },
+
+  "warnOnCloseTabs_title":     { "message": "Close tabs?" },
+  "warnOnCloseTabs_message":   { "message": "You are about to close $NUMBER$ tabs. Are you sure you want to continue?",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+  "warnOnCloseTabs_warnAgain": { "message": "Warn me when I attempt to close multiple tabs" },
+  "warnOnCloseTabs_close":     { "message": "Close tabs" },
+  "warnOnCloseTabs_cancel":    { "message": "Cancel" },
+
+  "warnOnCloseTabs_fromOutside_title":     { "message": "Close with descendant tabs?" },
+  "warnOnCloseTabs_fromOutside_message":   { "message": "The closed tab had $NUMBER$ descendant tabs. Are you sure you want to close them also?\n(*Canceling will restore the closed parent tab.)",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+
+  "warnOnCloseTabs_notification_message": { "message": "If not, click here to cancel the operation.\nOtherwise rest tabs are closed at $TIMEOUT$ seconds later.",
+    "placeholders": {
+      "TIMEOUT": { "content": "$1", "example": "10" }
+    }},
+  "warnOnCloseTabs_notification_message_linux": { "message": "If not, click the button to cancel the operation.\nOtherwise rest tabs are closed at $TIMEOUT$ seconds later.",
+    "placeholders": {
+      "TIMEOUT": { "content": "$1", "example": "10" }
+    }},
+
+  "warnOnAutoGroupNewTabs_title":     { "message": "Group tabs?" },
+  "warnOnAutoGroupNewTabs_message":   { "message": "$NUMBER$ tabs are opened in a time. Do you want them to be grouped in a tree?",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+  "warnOnAutoGroupNewTabs_warnAgain": { "message": "Ask me when multiple tabs are opened in a time" },
+  "warnOnAutoGroupNewTabs_close":     { "message": "Group tabs" },
+  "warnOnAutoGroupNewTabs_cancel":    { "message": "Keep tabs flat" },
+
+  "bookmarkDialog_dialogTitle_single":   { "message": "New Bookmark" },
+  "bookmarkDialog_dialogTitle_multiple": { "message": "New Bookmarks" },
+  "bookmarkDialog_title":    { "message": "Name" },
+  "bookmarkDialog_title_accessKey": { "message": "n" },
+  "bookmarkDialog_url":      { "message": "URL" },
+  "bookmarkDialog_url_accessKey": { "message": "u" },
+  "bookmarkDialog_parentId":      { "message": "Location" },
+  "bookmarkDialog_parentId_accessKey": { "message": "l" },
+  "bookmarkDialog_showAllFolders_label":      { "message": "Chooseโ€ฆ" },
+  "bookmarkDialog_showAllFolders_tooltip":      { "message": "Show all the bookmarks folders" },
+  "bookmarkDialog_newFolder":      { "message": "New Folder" },
+  "bookmarkDialog_newFolder_accessKey": { "message": "o" },
+  "bookmarkDialog_newFolder_defaultTitle":   { "message": "New Folder" },
+  "bookmarkDialog_saveContainerRedirectKey": { "message": "Save container information for Container Bookmarks" },
+  "bookmarkDialog_accept":   { "message": "Save" },
+  "bookmarkDialog_cancel":   { "message": "Cancel" },
+
+  "bookmarkFolderChooser_unspecified":   { "message": "(unspecified)" },
+  "bookmarkFolderChooser_blank":         { "message": "(no name)" },
+  "bookmarkFolderChooser_useThisFolder": { "message": "Use this folder" },
+
+  "syncDeviceDefaultName": { "message": "$BROWSER$ on $PLATFORM$",
+    "placeholders": {
+      "PLATFORM": { "content": "$1", "example": "Firefox" },
+      "BROWSER":  { "content": "$2", "example": "Windows" }
+    }},
+  "syncDeviceMissingDeviceName": { "message": "an unnamed device" },
+  "syncDeviceUnknownDevice":     { "message": "an unknown device" },
+  "syncAvailable_notification_title":   { "message": "Tabs are sendable to other devices from TST now." },
+  "syncAvailable_notification_message": { "message": "Tabs can be transferred between your devices. Please click here to set an identifiable name to this device." },
+  "syncAvailable_notification_message_linux": { "message": "Tabs can be transferred between your devices. Please click the button to set an identifiable name to this device." },
+  "sentTabs_notification_title":            { "message": "\u200b" },
+  "sentTabs_notification_message":          { "message": "Tabs is sent to $DEVICE$",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "sentTabs_notification_title_multiple":   { "message": "\u200b" },
+  "sentTabs_notification_message_multiple": { "message": "Tabs are sent to $DEVICE$",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "sentTabsToAllDevices_notification_title":            { "message": "\u200b" },
+  "sentTabsToAllDevices_notification_message":          { "message": "Tab is sent to all devices" },
+  "sentTabsToAllDevices_notification_title_multiple":   { "message": "\u200b" },
+  "sentTabsToAllDevices_notification_message_multiple": { "message": "Tabs are sent to all devices" },
+  "receiveTabs_notification_title":            { "message": "Tab from $DEVICE$",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "receiveTabs_notification_message":          { "message": "$URL$",
+    "placeholders": {
+      "URL": { "content": "$1", "example": "http://example.com/" }
+    }},
+  "receiveTabs_notification_title_multiple":   { "message": "Tabs from $DEVICE$",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "receiveTabs_notification_message_multiple": { "message": "$URL$\nand $REST$ more tab(s)",
+    "placeholders": {
+      "URL": { "content": "$1", "example": "http://example.com/" },
+      "ALL": { "content": "$2", "example": "4" },
+      "REST": { "content": "$3", "example": "3" }
+    }},
+
+  "sidebarPositionRighsideNotification_message":   { "message": "TST detected the sidebar position as \"Right Side\". Do you want the appearance to be switched to the one matching to the current position?" },
+  "sidebarPositionRighsideNotification_rightside": { "message": "Apply appearance for Right Side" },
+  "sidebarPositionRighsideNotification_leftside":  { "message": "Keep appearance for Left Side" },
+
+  "sidebarPositionOptionNotification_title":   { "message": "Saved the appearance option for the sidebar position" },
+  "sidebarPositionOptionNotification_message": { "message": "Please see the \"Appearance\" section of the Tree Vertical Tabs's options page if you need to change the option." },
+
+  "startup_notification_title_installed":   { "message": "For newcomer of Tree Vertical Tabs" },
+  "startup_notification_message_installed": { "message": "Some extra permissions are required for more natural user experiences. Please click here to grant them." },
+  "startup_notification_message_installed_linux": { "message": "Some extra permissions are required for more natural user experiences. Please click the button to grant them." },
+  "startup_notification_title_updated":     { "message": "Noticeable Changes on Tree Vertical Tabs" },
+  "startup_notification_message_updated":   { "message": "Some changes may affect to your use case. Please click here to see the changelog." },
+  "startup_notification_message_updated_linux":   { "message": "Some changes may affect to your use case. Please click the button to see the changelog." },
+
+  "message_startup_description_1": { "message": "Tree Vertical Tabs's vertical tab bar is available as one of choosable sidebar panels. If you don't see it yet, hit the " },
+  "message_startup_description_key": { "message": "\"F1\" key" },
+  "message_startup_description_2": { "message": " or click the " },
+  "message_startup_description_3": { "message": " button in the toolbar, to activate the sidebar panel." },
+  "message_startup_description_sync_before": { "message": "Tabs can be sent via Firefox Sync only to devices with TST installed. Please activate Firefox Sync with Firefox's options at first, and install TST to other devices also. Moreover," },
+  "message_startup_description_sync_link":   { "message": "the device name should be configured manually" },
+  "message_startup_description_sync_after":  { "message": "." },
+
+  "message_startup_history_before":     { "message": "Changed behaviors may be (or not) restored with workaround options. See " },
+  "message_startup_history_uri":        { "message": "https://addons.mozilla.org/firefox/addon/tree-style-tab/versions/" },
+  "message_startup_history_link_label": { "message": "the changelog" },
+  "message_startup_history_after":      { "message": " for more details." },
+
+  "message_startup_requestPermissions_description": { "message": "โš There are some features requiring extra permissions. If you want to activate them, please grant permissions manually." },
+  "message_startup_requestPermissions_bookmarks": { "message": "Read and modify bookmarks" },
+  "message_startup_requestPermissions_bookmarks_contextMenuItems": { "message": "\"Bookmark This Tree\" in the context menu on tabs" },
+  "message_startup_requestPermissions_bookmarks_migrationForImportedBookmarks": { "message": "Auto migration of bookmarked internal URLs imported from other environments" },
+  "message_startup_requestPermissions_bookmarks_detectTabsFromBookmarks": { "message": "Detection of tabs opened from bookmarks" },
+  "message_startup_requestPermissions_allUrls":   { "message": "Run script on web contents" },
+  "message_startup_requestPermissions_allUrls_tabPreviewPanel":   { "message": "Show tab preview image on tab hover" },
+  "message_startup_requestPermissions_allUrls_skipCollapsedTabsWithCtrlTab":   { "message": "Don't expand collapsed tree and skip collapsed descendants, while switching focus of tabs via keyboard shortcuts" },
+  "message_startup_requestPermissions_allUrls_preventBlankDialogRestoration":   { "message": "Don't restore blank window which was for a closed dialog, by actions to restore closed tabs" },
+  "message_startup_requestPermissions_clipboardRead": { "message": "Read clipboard contents" },
+  "message_startup_requestPermissions_clipboardRead_newTabButtonMiddleClick": { "message": "Allow to open a new tab with the URL in the clipboard, by middle click on the \"New Tab\" button (*you may need to activate \"dom.events.asyncClipboard.clipboardItem\")" },
+
+
+  "message_startup_userChromeCss_notify": { "message": "How to hide top tab bar and sidebar header?" },
+  "message_startup_userChromeCss_description_1": { "message": "Due to restrictions of WebExtensions, Tree Vertical Tabs cannot control the browser's top tab bar and the sidebar header. If you need to control them, see " },
+  "message_startup_userChromeCss_description_link_label": { "message": "customization examples by userChrome.css" },
+  "message_startup_userChromeCss_description_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#for-userchromecss" },
+  "message_startup_userChromeCss_description_2": { "message": ". But " },
+  "message_startup_userChromeCss_description_note": { "message": "note that it is very low level customization, thus there is no guarantee and it can cause troubles on future versions of the browser. Please try it at your own risk, only when you know what you are doing and if you are confident that you can resolve such troubles by yourself" },
+  "message_startup_userChromeCss_description_3": { "message": "." },
+
+  "api_requestedPermissions_title": { "message": "Request for Extra Permissions" },
+  "api_requestedPermissions_message": { "message": "โš The extension \"$NAME$\" is requesting to do following operation:\n\n$PERMISSIONS$\n\nvia Tree Vertical Tabs's API. Click here if you grant that.",
+    "placeholders": {
+      "NAME":        { "content": "$1", "example": "foobar" },
+      "PERMISSIONS": { "content": "$2", "example": "tabs" }
+    }},
+  "api_requestedPermissions_message_linux": { "message": "โš The extension \"$NAME$\" is requesting to do following operation:\n\n$PERMISSIONS$\n\nvia Tree Vertical Tabs's API. Click the button if you grant that.",
+    "placeholders": {
+      "NAME":        { "content": "$1", "example": "foobar" },
+      "PERMISSIONS": { "content": "$2", "example": "tabs" }
+    }},
+  "api_requestedPermissions_type_activeTab": { "message": "Access active browser tab" },
+  "api_requestedPermissions_type_tabs":      { "message": "Access browser tabs" },
+  "api_requestedPermissions_type_cookies":   { "message": "Detect container of browser tabs" },
+
+
+  "guessNewOrphanTabAsOpenedByNewTabCommandTitle": { "message": "New Tab|New Private Tab" },
+
+
+  "context_menu_label": { "message": "Tree of tabs" },
+
+  "context_reloadTree_label": { "message": "&Reload this Tree" },
+  "context_reloadTree_label_multiselected": { "message": "&Reload Selected Trees" },
+  "context_reloadTree_command": { "message": "Reload this Tree" },
+  "context_reloadDescendants_label": { "message": "R&eload Descendants" },
+  "context_reloadDescendants_label_multiselected": { "message": "R&eload Descendants of Selected tabs" },
+  "context_reloadDescendants_command": { "message": "Reload Descendants" },
+  "context_toggleMuteTree_label_mute":                        { "message": "&Mute this Tree" },
+  "context_toggleMuteTree_label_multiselected_mute":          { "message": "&Mute Selected Trees" },
+  "context_toggleMuteTree_label_unmute":                      { "message": "Un&mute this Tree" },
+  "context_toggleMuteTree_label_multiselected_unmute":        { "message": "Un&mute Selected Trees" },
+  "context_toggleMuteTree_command":                           { "message": "Mute/Unmute this Tree" },
+  "context_toggleMuteDescendants_label_mute":                 { "message": "Mu&te Descendants" },
+  "context_toggleMuteDescendants_label_multiselected_mute":   { "message": "Mu&te Descendants of Selected tabs" },
+  "context_toggleMuteDescendants_label_unmute":               { "message": "Unmu&te Descendants" },
+  "context_toggleMuteDescendants_label_multiselected_unmute": { "message": "Unmu&te Descendants of Selected tabs" },
+  "context_toggleMuteDescendants_command":                    { "message": "Mute/Unmute Descendants" },
+  "context_unblockAutoplayTree_label":                        { "message": "P&lay this Tree" },
+  "context_unblockAutoplayTree_label_multiselected":          { "message": "P&lay Selected Trees" },
+  "context_unblockAutoplayTree_command":                      { "message": "Play this Tree" },
+  "context_unblockAutoplayDescendants_label":                 { "message": "Pl&ay Descendants" },
+  "context_unblockAutoplayDescendants_label_multiselected":   { "message": "Pl&ay Descendants of Selected tabs" },
+  "context_unblockAutoplayDescendants_command":               { "message": "Play Descendants" },
+  "context_closeTree_label": { "message": "&Close this Tree" },
+  "context_closeTree_label_multiselected": { "message": "&Close Selected Trees" },
+  "context_closeTree_command": { "message": "Close this Tree" },
+  "context_closeDescendants_label": { "message": "C&lose Descendants" },
+  "context_closeDescendants_label_multiselected": { "message": "C&lose Descendants of Selected tabs" },
+  "context_closeDescendants_command": { "message": "Close Descendants" },
+  "context_closeOthers_label": { "message": "Cl&ose Other Tabs except this Tree" },
+  "context_closeOthers_label_multiselected": { "message": "Cl&ose Other Tabs except Selected Trees" },
+  "context_closeOthers_command": { "message": "Close Other Tabs except this Tree" },
+  "context_toggleSticky_label_stick":                 { "message": "Stic&k Tab to Edges" },
+  "context_toggleSticky_label_multiselected_stick":   { "message": "Stic&k Selected Tabs to Edges" },
+  "context_toggleSticky_label_unstick":               { "message": "Unstic&k Tab to Edges" },
+  "context_toggleSticky_label_multiselected_unstick": { "message": "Unstic&k Selected Tabs to Edges" },
+  "context_toggleSticky_command":                   { "message": "Stick/Unstick Tab to Edges" },
+  "context_collapseTree_label": { "message": "Collap&se this Tree" },
+  "context_collapseTree_label_multiselected": { "message": "Collap&se Selected Trees" },
+  "context_collapseTree_command": { "message": "Collapse this Tree" },
+  "context_collapseTreeRecursively_label": { "message": "Co&llapse this Tree Recursively" },
+  "context_collapseTreeRecursively_label_multiselected": { "message": "Co&llapse Selected Trees Recursively" },
+  "context_collapseTreeRecursively_command": { "message": "Collapse this Tree Recursively" },
+  "context_collapseAll_label": { "message": "Colla&pse All" },
+  "context_collapseAll_command": { "message": "Collapse All" },
+  "context_expandTree_label": { "message": "Exp&and this Tree" },
+  "context_expandTree_label_multiselected": { "message": "Exp&and Selected Trees" },
+  "context_expandTree_command": { "message": "Expand this Tree" },
+  "context_expandTreeRecursively_label": { "message": "Expand this Tree Rec&ursively" },
+  "context_expandTreeRecursively_label_multiselected": { "message": "Expand Selected Trees Rec&ursively" },
+  "context_expandTreeRecursively_command": { "message": "Expand this Tree Recursively" },
+  "context_expandAll_label": { "message": "E&xpand All" },
+  "context_expandAll_command": { "message": "Expand All" },
+  "context_bookmarkTree_label": { "message": "&Bookmark this Treeโ€ฆ" },
+  "context_bookmarkTree_label_multiselected": { "message": "&Bookmark Selected Treesโ€ฆ" },
+  "context_bookmarkTree_command": { "message": "Bookmark this Treeโ€ฆ" },
+  "context_sendTreeToDevice_label": { "message": "Sen&d this Tree to Device" },
+  "context_sendTreeToDevice_label_multiselected": { "message": "Sen&d Selected Trees to Device" },
+  "context_sendTreeToDevice_command": { "message": "Send this Tree to Device" },
+  "context_topLevel_prefix": { "message": "Top level item: " },
+
+  "context_collapsed_label": { "message": "Collapsed (for testing of a checkbox type menu)" },
+  "context_pinnedTab_label": { "message": "Pinned (for testing of a radio type menu)" },
+  "context_unpinnedTab_label": { "message": "Unpinned (for testing of a radio type menu)" },
+
+  "context_openAllBookmarksWithStructure_label": { "message": "Open &All as a Tree" },
+  "context_openAllBookmarksWithStructureRecursively_label": { "message": "Open &All as a Tree including subfolders" },
+
+  "config_showTreeCommandsInTabsContextMenuGlobally_label": { "message": "Show commands for tree of tabs in tab context menu globally ex. on the native tab bar" },
+
+
+  "config_title": { "message": "Tree Vertical Tabs Options" },
+
+  "config_recommended_choice": { "message": "(Recommended)" },
+  "config_firefoxCompatible_choice": { "message": "(simulates the browser's default behavior)" },
+
+  "config_showExpertOptions_label": { "message": "Unlock Expert Options" },
+  "config_openOptionsInTab_label": { "message": "Open this options page in more wide space" },
+
+  "config_appearance_caption": { "message": "Appearance" },
+
+  "config_sidebarPosition_caption": { "message": "Style of contents for the sidebar position:" },
+  "config_sidebarPosition_left": { "message": "Left side" },
+  "config_sidebarPosition_right": { "message": "Right side" },
+  "config_sidebarPosition_auto": { "message": "Auto detect when the sidebar become shown" },
+  "config_sidebarPosition_description": { "message": "*This configuration won't change the position of the sidebar itself. You need to click the switcher in the sidebar header and click \"Move Sidebar to Right\" manually." },
+
+  "config_style_caption": { "message": "Theme" },
+  "config_style_proton": { "message": "Proton" },
+  "config_style_photon": { "message": "Photon" },
+  "config_style_sidebar": { "message": "Sidebar" },
+  "config_style_highcontrast": { "message": "High Contrast" },
+  "config_style_none": { "message": "No Decoration" },
+  "config_style_none_info": { "message": " (*Please decorate everything by yourself via \"Advanced\" => \"User Style Sheet\")" },
+
+  "config_colorScheme_caption": { "message": "Color scheme:" },
+  "config_colorScheme_photon": { "message": "Photon" },
+  "config_colorScheme_systemColor": { "message": "System Color" },
+
+  "config_maxTreeLevel_before": { "message": "Indent tabs until" },
+  "config_maxTreeLevel_after": { "message": "level(s) (*Negative value means \"infinite\")" },
+
+  "config_faviconizePinnedTabs_label": { "message": "Show pinned tabs only with their icon" },
+  "config_maxFaviconizedPinnedTabsInOneRow_label_before": { "message": "Show " },
+  "config_maxFaviconizedPinnedTabsInOneRow_label_after": { "message": " or less tabs for each row (*0 or less means auto-calculation)" },
+  "config_maxPinnedTabsRowsAreaPercentage_label_before": { "message": "Maximum height of the area for pinned tabs:" },
+  "config_maxPinnedTabsRowsAreaPercentage_label_after":  { "message": "% of the sidebar" },
+  "config_fadeOutPendingTabs_label": { "message": "Show icon in gray for tabs pended to load (*simulation of the browser's built-in behavior for \"browser.tabs.fadeOutUnloadedTabs\"=\"true\")" },
+  "config_fadeOutDiscardedTabs_label": { "message": "Show icon in gray for tabs intentionally unloaded (*simulation of the browser's built-in behavior for \"browser.tabs.fadeOutExplicitlyUnloadedTabs\"=\"true\")" },
+  "config_animation_label": { "message": "Enable animation effects" },
+  "config_animationForce_label": { "message": "Enable animations regardless \"reduce animations\" platform settings" },
+  "config_tabPreviewTooltip_label": { "message": "Show tab preview image on tab hover, instead of legacy tooltip (*You need to allow executing scripts on webpages)" },
+  "config_tabPreviewTooltipRenderIn_label_before": { "message": "\u200b" },
+  "config_tabPreviewTooltipRenderIn_content": { "message": "in the conetnt area (and show nothing if impossible)" },
+  "config_tabPreviewTooltipRenderIn_sidebar": { "message": "in the sidebar always" },
+  "config_tabPreviewTooltipRenderIn_anywhere": { "message": "in the conetnt area if possible, otherwise in the sidebar" },
+  "config_tabPreviewTooltipRenderIn_label_after": { "message": "\u200b" },
+  "config_inContentUIOffsetTop_label_before": { "message": "Shift tab preview " },
+  "config_inContentUIOffsetTop_label_after": { "message": "px vertically when the height of the sidebar header cannot be detected due to privacy protection (ex. \"privacy.resistFingerprinting\"=\"true\")" },
+  "config_showCollapsedDescendantsByTooltip_label": { "message": "Show collapsed descendants in the tooltip on a parent tab" },
+  "config_showCollapsedDescendantsByLegacyTooltipOnSidebar_label": { "message": "and use legacy tooltip (can become wider than the sidebar) for that if needed" },
+  "config_shiftTabsForScrollbarDistance_label_before": { "message": "Shift tabs aside " },
+  "config_shiftTabsForScrollbarDistance_label_after": { "message": " to keep in-tab buttons touchable avoiding covered with the auto-shown scrollbar" },
+  "config_shiftTabsForScrollbarDistance_placeholder": { "message": "(CSS length)" },
+  "config_shiftTabsForScrollbarOnlyOnHover_label": { "message": "Shift tabs only when the mouse cursor is near the scrollbar" },
+  "config_suppressGapFromShownOrHiddenToolbar_caption": { "message": "Suppress visual gap of the sidebar contents produced by temporarily shown/hidden toolbars on following cases" },
+  "config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label": { "message": "Fullscreen windows" },
+  "config_suppressGapFromShownOrHiddenToolbarOnNewTab_label": { "message": "Blank new tabs on Firefox 85 and later" },
+  "config_suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation_label": { "message": "Only when triggered by a mouse operation in the sidebar" },
+  "config_showDialogInSidebar_label": { "message": "Show dialogs in the sidebar if possible" },
+  "config_outOfScreenTabsRenderingPages_label": { "message": "Number of pages to pre-render tabs:" },
+  "config_outOfScreenTabsRenderingPages_description": { "message": "* \"-1\" will pre-render all tabs for better scrolling performance, and as a trade off you may need to wait long time on initialization." },
+  "config_renderHiddenTabs_label": { "message": "Show hidden tabs which are hidden by other extensions" },
+
+
+  "config_context_caption": { "message": "Context Menu" },
+  "config_emulateDefaultContextMenu_label": { "message": "Simulate Tab Context Menu on the sidebar" },
+  "config_extraItems_tabs_caption": { "message": "Additional Tab Context Menu Items" },
+  "config_extraItems_tabs_topLevel": { "message": "Top Level" },
+  "config_extraItems_tabs_subMenu": { "message": "Sub Menu" },
+  "config_extraItems_tabs_middleClick": { "message": "Action on Middle Click" },
+  "config_extraItems_bookmarks_caption": { "message": "Additional Bookmarks Context Menu Items" },
+  "config_openAllBookmarksWithStructureDiscarded_label": { "message": "Keep tabs pended until they become active" },
+  "config_suppressGroupTabForStructuredTabsFromBookmarks_label": { "message": "Suppress top-level group tab when opened tabs are already organized as a tree" },
+
+  "config_sendTabsToDevice_caption": { "message": "Send Tabs to Other Devices with the context menu via Firefox Sync" },
+  "config_syncRequirements_description": { "message": "This feature depends on Firefox Sync, and tabs can be sent only to devices with TST installed. Please activate Firefox Sync with ther browser's options at first, and install TST to other devices also." },
+  "config_syncDeviceInfo_name_label": { "message": "Name and icon of this device:" },
+  "config_syncDeviceInfo_name_description_before": { "message": "TST cannot detect the name of this device you configured for Firefox Sync, due to restrictions of WebExtensions API. Please set an identifiable name for this device manually. (It is recommended to copy " },
+  "config_syncDeviceInfo_name_description_link": { "message": "the device name for Firefox Sync" },
+  "config_syncDeviceInfo_name_description_href": { "message": "https://accounts.firefox.com/settings/clients" },
+  "config_syncDeviceInfo_name_description_after": { "message": ".)" },
+  "config_syncDeviceExpirationDays_label_before": { "message": "Expire unused devices automatically when they are not connected over " },
+  "config_syncDeviceExpirationDays_label_after": { "message": " days (\"0\" means \"no expiration\")" },
+  "config_syncUnsendableUrlPattern_label": { "message": "Matching rule to treat unsendable URL of tabs (*This must be synchronized to the \"services.sync.engine.tabs.filteredUrls\" of the browser itself):" },
+  "config_otherDevices_caption": { "message": "Active other devices:" },
+  "config_removeDeviceButton_label": { "message": "Delete" },
+  "config_removeDeviceButton_tooltip": { "message": "Delete this device from the list" },
+
+  "config_autoAttachOnContextNewTabCommand_before": { "message": "For the \"New Tab\" context menu command, open new blank tab as" },
+  "config_autoAttachOnContextNewTabCommand_noControl": { "message": "(no control)" },
+  "config_autoAttachOnContextNewTabCommand_independent": { "message": "Independent tab" },
+  "config_autoAttachOnContextNewTabCommand_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnContextNewTabCommand_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnContextNewTabCommand_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnContextNewTabCommand_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnContextNewTabCommand_nextSiblingWithInheritedContainer": { "message": "Next Sibling, same container" },
+  "config_autoAttachOnContextNewTabCommand_after": { "message": "\u200b" },
+
+
+  "config_newTabWithOwner_caption": { "message": "Tabs opened from Existing Tabs" },
+
+  "config_autoAttachOnOpenedWithOwner_before": { "message": "When a tab is opened from existing tab, open it as" },
+  "config_autoAttachOnOpenedWithOwner_noControl": { "message": "(no control)" },
+  "config_autoAttachOnOpenedWithOwner_independent": { "message": "Independent tab" },
+  "config_autoAttachOnOpenedWithOwner_childNextToLastRelatedTab": { "message": "Child of the parent tab, next to the recently opened child" },
+  "config_autoAttachOnOpenedWithOwner_childTop": { "message": "First Child of the parent tab" },
+  "config_autoAttachOnOpenedWithOwner_childEnd": { "message": "Last Child of the parent tab" },
+  "config_autoAttachOnOpenedWithOwner_sibling": { "message": "Sibling of the parent tab" },
+  "config_autoAttachOnOpenedWithOwner_nextSibling": { "message": "Next Sibling of the parent tab" },
+  "config_autoAttachOnOpenedWithOwner_after": { "message": "\u200b" },
+
+  "config_insertNewTabFromFirefoxViewAt_caption": { "message": "Insertion position of new child tabs from Firefox View (will appear as root tabs)" },
+  "config_insertNewTabFromFirefoxViewAt_noControl": { "message": "No control (respect the decision by the browser or other tab extensions)" },
+  "config_insertNewTabFromFirefoxViewAt_nextToLastRelatedTab": { "message": "Next to the recently opened child, or near the opener" },
+  "config_insertNewTabFromFirefoxViewAt_top": { "message": "The top of the tree (near the opener)" },
+  "config_insertNewTabFromFirefoxViewAt_end": { "message": "The end of the tree" },
+
+  "config_autoGroupNewTabsFromFirefoxView_label": { "message": "Auto-group tabs opened from Firefox View (a new tab for grouping will be opened with a title like \"Tabs from ...\")" },
+  "config_groupTabTemporaryStateForChildrenOfFirefoxView_label": { "message": "Default state of group tabs for tabs opened from Firefox View:" },
+
+  "config_insertNewTabFromPinnedTabAt_caption": { "message": "Insertion position of new child tabs from pinned tabs (will appear as root tabs)" },
+  "config_insertNewTabFromPinnedTabAt_noControl": { "message": "No control (respect the decision by the browser or other tab extensions)" },
+  "config_insertNewTabFromPinnedTabAt_nextToLastRelatedTab": { "message": "Next to the recently opened child, or near the opener" },
+  "config_insertNewTabFromPinnedTabAt_top": { "message": "The top of the tree (near the opener)" },
+  "config_insertNewTabFromPinnedTabAt_end": { "message": "The end of the tree" },
+
+  "config_autoGroupNewTabsFromPinned_label": { "message": "Auto-group tabs opened from same pinned tab (a new tab for grouping will be opened with a title like \"Tabs from ...\")" },
+  "config_groupTabTemporaryStateForChildrenOfPinned_label": { "message": "Default state of group tabs for tabs opened from same pinned tab:" },
+
+
+  "config_newTab_caption": { "message": "New Tabs not from Existing Tabs" },
+
+  "config_newTabButton_caption": { "message": "Special actions on the \"New Tab\" button" },
+  "config_longPressOnNewTabButton_before":               { "message": "Long-press on the \"New Tab\" button to " },
+  "config_longPressOnNewTabButton_newTabAction":         { "message": "specify where the new tab is opened in" },
+  "config_longPressOnNewTabButton_contextualIdentities": { "message": "choose container" },
+  "config_longPressOnNewTabButton_none":                 { "message": "(nothing)" },
+  "config_longPressOnNewTabButton_after":                { "message": "\u200b" },
+  "config_showNewTabActionSelector_label":               { "message": "Show selector button on the \"New Tab\" button, to specify where the new tab is opened in, when the button is pointed" },
+  "config_showContextualIdentitiesSelector_label":       { "message": "Show container selector button on the \"New Tab\" button, when the button is pointed" },
+
+  "config_newTabAction_caption": { "message": "Basic control for New Blank Tabs" },
+  "config_autoAttachOnNewTabCommand_before": { "message": "Open new blank tab as" },
+  "config_autoAttachOnNewTabCommand_noControl": { "message": "(no control)" },
+  "config_autoAttachOnNewTabCommand_independent": { "message": "Independent tab" },
+  "config_autoAttachOnNewTabCommand_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnNewTabCommand_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnNewTabCommand_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnNewTabCommand_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnNewTabCommand_after": { "message": "\u200b" },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandTitle_before": { "message": "Guess a newly opened tab as opened by \"New Blank Tab\" action, when it is opened with title(s) " },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_before": { "message": " or URL(s) " },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_after": { "message": "(*You can list multiple values with a separator \"|\")" },
+
+  "config_autoAttachOnNewTabButtonMiddleClick_before": { "message": "For middle click, open new blank tab as" },
+  "config_autoAttachOnNewTabButtonMiddleClick_noControl": { "message": "(no control)" },
+  "config_autoAttachOnNewTabButtonMiddleClick_independent": { "message": "Independent tab" },
+  "config_autoAttachOnNewTabButtonMiddleClick_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnNewTabButtonMiddleClick_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnNewTabButtonMiddleClick_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnNewTabButtonMiddleClick_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnNewTabButtonMiddleClick_nextSiblingWithInheritedContainer": { "message": "Same to Ctrl-click (next sibling, same container)" },
+  "config_autoAttachOnNewTabButtonMiddleClick_after": { "message": "\u200b" },
+
+  "config_middleClickPasteURLOnNewTabButton_label": { "message": "Open new tab with URL in the clipboard (*simulation of the browser's built-in behavior for \"browser.tabs.searchclipboardfor.middleclick\"=\"true\", and you may need to activate \"dom.events.asyncClipboard.clipboardItem\")" },
+
+  "config_autoAttachOnNewTabButtonAccelClick_before": { "message": "For Ctrl/โŒ˜-click, open new blank tab as" },
+  "config_autoAttachOnNewTabButtonAccelClick_noControl": { "message": "(no control)" },
+  "config_autoAttachOnNewTabButtonAccelClick_independent": { "message": "Independent tab" },
+  "config_autoAttachOnNewTabButtonAccelClick_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnNewTabButtonAccelClick_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnNewTabButtonAccelClick_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnNewTabButtonAccelClick_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnNewTabButtonAccelClick_nextSiblingWithInheritedContainer": { "message": "Next Sibling, same container" },
+  "config_autoAttachOnNewTabButtonAccelClick_after": { "message": "\u200b" },
+
+  "config_autoAttachWithURL_caption": { "message": "Non-blank new tabs" },
+
+  "config_duplicateTabAction_caption": { "message": "Duplicate Tabs (middle click on the \"Reload\" button, etc.)" },
+
+  "config_autoAttachOnDuplicated_before": { "message": "Duplicate the tab as" },
+  "config_autoAttachOnDuplicated_noControl": { "message": "(no control)" },
+  "config_autoAttachOnDuplicated_independent": { "message": "Independent tab" },
+  "config_autoAttachOnDuplicated_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnDuplicated_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnDuplicated_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnDuplicated_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnDuplicated_after": { "message": "\u200b" },
+
+  "config_fromExternal_caption": { "message": "New tab from Other Applications" },
+  "config_autoAttachOnOpenedFromExternal_before": { "message": "Open as" },
+  "config_autoAttachOnOpenedFromExternal_noControl": { "message": "(no control)" },
+  "config_autoAttachOnOpenedFromExternal_independent": { "message": "Independent tab" },
+  "config_autoAttachOnOpenedFromExternal_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnOpenedFromExternal_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnOpenedFromExternal_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnOpenedFromExternal_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnOpenedFromExternal_after": { "message": "\u200b" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_label": { "message": "Container:" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_default": { "message": "(no control)" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_parent": { "message": "Inherit from the parent tab on the tree" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_lastActive": { "message": "Inherit from the current tab" },
+
+  "config_sameSiteOrphan_caption": { "message": "New tab with the same website as the current tab from the location bar, bookmarks, histories, or other cases" },
+  "config_autoAttachSameSiteOrphan_before": { "message": "Open as" },
+  "config_autoAttachSameSiteOrphan_noControl": { "message": "(no control)" },
+  "config_autoAttachSameSiteOrphan_independent": { "message": "Independent tab" },
+  "config_autoAttachSameSiteOrphan_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachSameSiteOrphan_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachSameSiteOrphan_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachSameSiteOrphan_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachSameSiteOrphan_after": { "message": "\u200b" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_label": { "message": "Container:" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_default": { "message": "(no control)" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_parent": { "message": "Inherit from the parent tab on the tree" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_lastActive": { "message": "Inherit from the current tab" },
+
+  "config_anyOtherTrigger_caption": { "message": "Tabs from any other trigger" },
+  "config_autoAttachOnAnyOtherTrigger_before": { "message": "Open as" },
+  "config_autoAttachOnAnyOtherTrigger_noControl": { "message": "(no control)" },
+  "config_autoAttachOnAnyOtherTrigger_independent": { "message": "Independent tab" },
+  "config_autoAttachOnAnyOtherTrigger_childTop": { "message": "First Child of the current tab" },
+  "config_autoAttachOnAnyOtherTrigger_childEnd": { "message": "Last Child of the current tab" },
+  "config_autoAttachOnAnyOtherTrigger_sibling": { "message": "Sibling of the current tab" },
+  "config_autoAttachOnAnyOtherTrigger_nextSibling": { "message": "Next Sibling of the current tab" },
+  "config_autoAttachOnAnyOtherTrigger_after": { "message": "\u200b" },
+  "config_autoAttachOnAnyOtherTrigger_caution": { "message": "*CAUTION: This option has a risk breaking behavior of other extensions." },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_label": { "message": "Container:" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_default": { "message": "(no control)" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_parent": { "message": "Inherit from the parent tab on the tree" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_lastActive": { "message": "Inherit from the current tab" },
+
+  "config_inheritContextualIdentityToUnopenableURLTabs_label": { "message": "Reopen tab with inherited container anyway, even if it has a URL unable to open by extension's permission" },
+
+  "config_groupTab_caption": { "message": "Auto-grouping of tabs" },
+
+  "config_tabBunchesDetectionTimeout_before": { "message": "Detect tabs opened from a bookmark folder within" },
+  "config_tabBunchesDetectionTimeout_after": { "message": "msec, and:" },
+  "config_autoGroupNewTabsFromBookmarks_label": { "message": "Group tabs under a tab with a title like \"... and more\"" },
+  "config_restoreTreeForTabsFromBookmarks_label": { "message": "Restore tree structure" },
+  "config_requireBookmarksPermission_tooltiptext": { "message": "This feature needs a right to access bookmarks. Click here to request an required permission." },
+  "config_requestPermissions_bookmarks_autoGroupNewTabs_before": { "message": "(" },
+  "config_requestPermissions_bookmarks_autoGroupNewTabs_after": { "message": "Allow to detect bookmarks corresponding to tabs)" },
+  "config_tabsFromSameFolderMinThresholdPercentage_before": { "message": "Treat all new tabs as opened from one bookmark folder, if over " },
+  "config_tabsFromSameFolderMinThresholdPercentage_after": { "message":  "% tabs have corresponding bookmark in common bookmark folder" },
+  "config_autoGroupNewTabsFromOthers_label": { "message": "Auto-group tabs opened at a time from non-bookmark triggers also" },
+  "config_tabBunchesDetectionDelayOnNewWindow_before": { "message": "But don't group new tabs opened within" },
+  "config_tabBunchesDetectionDelayOnNewWindow_after": { "message": "msec when a new window is opened, as a part of tabs opened as \"home page\"." },
+  "config_warnOnAutoGroupNewTabs_label": { "message": "Confirm to group tabs" },
+  "config_warnOnAutoGroupNewTabsWithListing_label": { "message": "List tabs to be grouped in the confirmation dialog" },
+
+  "config_renderTreeInGroupTabs_label": { "message": "Render tree in group tabs" },
+
+  "config_groupTabTemporaryState_caption": { "message": "Default state of group tabs for each context" },
+  "config_groupTabTemporaryState_option_default": { "message": "Check to nothing" },
+  "config_groupTabTemporaryState_option_checked_before": { "message": "Check to the \"" },
+  "config_groupTabTemporaryState_option_checked_after": { "message": "\"" },
+  "config_groupTabTemporaryStateForNewTabsFromBookmarks_label": { "message": "For tabs opened from bookmarks:" },
+  "config_groupTabTemporaryStateForNewTabsFromOthers_label": { "message": "For tabs opened at a time from non-bookmark triggers:" },
+  "config_groupTabTemporaryStateForOrphanedTabs_label": { "message": "Opened to replace a closed parent tab:" },
+  "config_groupTabTemporaryStateForAPI_label": { "message": "Opened to group tabs from other addons via API:" },
+
+  "config_inheritContextualIdentityToChildTabMode_label": { "message": "Container:" },
+  "config_inheritContextualIdentityToChildTabMode_default": { "message": "(no control)" },
+  "config_inheritContextualIdentityToChildTabMode_parent": { "message": "Inherit from the parent tab on the tree" },
+  "config_inheritContextualIdentityToChildTabMode_lastActive": { "message": "Inherit from the current tab" },
+
+
+  "config_treeBehavior_caption": { "message": "Tree Behavior" },
+
+  "config_successorTabControlLevel_caption": { "message": "When the current tab is closed as a last child" },
+  "config_successorTabControlLevel_inTree": { "message": "Focus to the previous tab in the tree" },
+  "config_successorTabControlLevel_simulateDefault": { "message": "Focus to the next tab always (the browser's default)" },
+  "config_successorTabControlLevel_never": { "message": "Never control focus (respect the browser or other extension's control)" },
+  "config_successorTabControlLevel_legacyDescription": { "message": "*The browser's built-in behavior for \"browser.tabs.selectOwnerOnClose\"=\"true\" works prior to this config." },
+  "config_simulateSelectOwnerOnClose_label": { "message": "Move focus back to the opener tab if possible, when the current tab is closed (*simulation of the browser's built-in behavior for \"browser.tabs.selectOwnerOnClose\"=\"true\", prior to the config above)" },
+
+  "config_fixupTreeOnTabVisibilityChanged_caption": { "message": "When visibility of tabs are changed by other extensions" },
+  "config_fixupTreeOnTabVisibilityChanged_fix":     { "message": "Fix up tree structure with visible tabs automatically (*Recommended if you use another extension to switch tab groups)" },
+  "config_fixupTreeOnTabVisibilityChanged_keep":    { "message": "Keep tree structure including hidden tabs (*Recommended if you use another extension which changes temporary visibility of tabs)" },
+
+  "config_autoCollapseExpandSubtreeOnAttach_label": { "message": "When a new tree appears, collapse others automatically" },
+  "config_autoCollapseExpandSubtreeOnSelect_label": { "message": "When a tab gets focus, expand its tree and collapse others automatically" },
+  "config_autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove_label": { "message": "Except focus moving caused by closing of the current tab" },
+  "config_unfocusableCollapsedTab_label": { "message": "When a tab under a collapsed tree gets focus, expand its tree automatically" },
+  "config_autoDiscardTabForUnexpectedFocus_label": { "message": "Keep tabs pending (unloaded) when tabs are accidentaly focused and the focus is redirected immediately" },
+  "config_avoidDiscardedTabToBeActivatedIfPossible_label": { "message": "Avoid pending (unloaded) tabs to be activated accidentally on current tab closes or tree collapsing" },
+
+  "config_treeDoubleClickBehavior_caption":             { "message": "Double-click on a tab" },
+  "config_treeDoubleClickBehavior_toggleCollapsed":     { "message": "Collapse/expand tree" },
+  "config_treeDoubleClickBehavior_toggleSticky":        { "message": "Stick to tab bar edges / Unstick from tab bar edges" },
+  "config_treeDoubleClickBehavior_close":               { "message": "Close tab" },
+  "config_treeDoubleClickBehavior_close_note":          { "message": " (*simulation of the browser's built-in behavior for \"browser.tabs.closeTabByDblclick\"=\"true\")" },
+  "config_treeDoubleClickBehavior_none":                { "message": "Do nothing" },
+
+  "config_parentTabOperationBehaviorMode_caption":           { "message": "When a parent tab is Closed or Moved" },
+  "config_parentTabOperationBehaviorMode_noteForPermanentlyConsistentBehaviors": { "message": "Whether you configured this section, there are some permanently consistent behaviors in the sidebar;\n๏ฝฅ Close a parent tab with Collapsed Tree: Close Entire Tree\n๏ฝฅ Move a parent tab with Collapsed Tree: Move Entire Tree\n๏ฝฅ Move a parent tab with Expanded Tree: Behave according to the section \"Drag and Drop\"" },
+
+  "config_parentTabOperationBehaviorMode_parallel": { "message": "Recommended preset using the browser's native tab bar as the Solo Tab Operation UI" },
+  "config_closeParentBehavior_insideSidebar":       { "message": "When a parent tab with Expanded Tree is Closed via the sidebar," },
+  "config_closeParentBehavior_outsideSidebar":      { "message": "When a parent tab (whether its Tree is Expanded or Collapsed) is Closed via the browser's native tab bar, keyboard shortcuts or other extensions," },
+  "config_moveParentBehavior_outsideSidebar":       { "message": "When a parent tab (whether its Tree is Expanded or Collapsed) is Moved via the browser's native tab bar, keyboard shortcuts or other extensions," },
+
+  "config_parentTabOperationBehaviorMode_consistent":         { "message": "Recommended preset using Consistent Tab Behaviors controlled under TST" },
+  "config_parentTabOperationBehaviorMode_consistent_caption": { "message": "When a parent tab with Expanded Tree is closed/moved," },
+  "config_parentTabOperationBehaviorMode_consistent_notes":   { "message": "Tabs behave as configured above consistently, even via the browser's native tab bar, keyboard shortcuts or other extensions." },
+
+  "config_parentTabOperationBehaviorMode_custom":                { "message": "Custom" },
+  "config_closeParentBehavior_insideSidebar_expanded_caption":   { "message": "Close: When a parent tab with Expanded Tree is Closed via the sidebar," },
+  "config_closeParentBehavior_outsideSidebar_collapsed_caption": { "message": "Close: When a parent tab with Collapsed Tree is Closed via the browser's native tab bar, keyboard shortcuts or other extensions," },
+  "config_closeParentBehavior_outsideSidebar_expanded_caption":  { "message": "Close: When a parent tab with Expanded Tree is Closed via the browser's native tab bar, keyboard shortcuts or other extensions," },
+  "config_closeParentBehavior_noSidebar_collapsed_caption":      { "message": "if the sidebar is closed," },
+  "config_closeParentBehavior_noSidebar_expanded_caption":       { "message": "if the sidebar is closed," },
+  "config_moveParentBehavior_outsideSidebar_collapsed_caption":  { "message": "Move: When a parent tab with Collapsed Tree is Moved via the browser's native tab bar, keyboard shortcuts or other extensions," },
+  "config_moveParentBehavior_outsideSidebar_expanded_caption":   { "message": "Move: When a parent tab with Expanded Tree is Moved via the browser's native tab bar, keyboard shortcuts or other extensions," },
+  "config_moveParentBehavior_noSidebar_collapsed_caption":       { "message": "if the sidebar is closed," },
+  "config_moveParentBehavior_noSidebar_expanded_caption":        { "message": "if the sidebar is closed," },
+
+  "config_parentTabOperationBehavior_entireTree":           { "message": "Close/Move Entire Tree" },
+  "config_closeParentBehavior_entireTree":                  { "message": "Close Entire Tree" },
+  "config_moveParentBehavior_entireTree":                   { "message": "Move Entire Tree" },
+  "config_parentTabOperationBehavior_replaceWithGroupTab":  { "message": "Replace closed/moved parent with a Group Tab" },
+  "config_closeParentBehavior_replaceWithGroupTab":         { "message": "Replace closed parent with a Group Tab" },
+  "config_moveParentBehavior_replaceWithGroupTab":          { "message": "Replace moved parent with a Group Tab" },
+  "config_parentTabOperationBehavior_promoteFirst":         { "message": "Promote the First Child to the new parent always" },
+  "config_closeParentBehavior_promoteFirst":                { "message": "Promote the First Child to the new parent always" },
+  "config_moveParentBehavior_promoteFirst":                 { "message": "Promote the First Child to the new parent always" },
+  "config_parentTabOperationBehavior_promoteAll":           { "message": "Promote All Children to the parent level always" },
+  "config_closeParentBehavior_promoteAll":                  { "message": "Promote All Children to the parent level always" },
+  "config_moveParentBehavior_promoteAll":                   { "message": "Promote All Children to the parent level always" },
+  "config_parentTabOperationBehavior_promoteIntelligently": { "message": "Promote the First Child on the root level, otherwise Promote All Children" },
+  "config_closeParentBehavior_promoteIntelligently":        { "message": "Promote the First Child on the root level, otherwise Promote All Children" },
+  "config_moveParentBehavior_promoteIntelligently":         { "message": "Promote the First Child on the root level, otherwise Promote All Children" },
+  "config_parentTabOperationBehavior_detach":               { "message": "Liberate All Children from the tree" },
+  "config_closeParentBehavior_detach":                      { "message": "Liberate All Children from the tree" },
+  "config_moveParentBehavior_detach":                       { "message": "Liberate All Children from the tree" },
+
+  "config_warnOnCloseTabs_label": { "message": "Warn me when I attempt to close multiple tabs" },
+  "config_warnOnCloseTabsByClosebox_label": { "message": "Warn me when I attempt to close multiple tabs by a normal click on a closebox" },
+  "config_warnOnCloseTabsWithListing_label": { "message": "List closing tabs in the confirmation dialog" },
+
+  "config_insertNewChildAt_caption": { "message": "Default insertion position of new child tabs on un-controlled cases" },
+  "config_insertNewChildAt_noControl": { "message": "No control (respect the decision by the browser or other tab extensions)" },
+  "config_insertNewChildAt_nextToLastRelatedTab": { "message": "Next to the recently opened child, or next to the parent" },
+  "config_insertNewChildAt_top": { "message": "The top of the tree (next to the parent)" },
+  "config_insertNewChildAt_end": { "message": "The end of the tree" },
+
+
+  "config_drag_caption": { "message": "Drag and Drop" },
+
+  "config_tabDragBehavior_caption":       { "message": "When a parent tab is dragged from the sidebar" },
+  "config_tabDragBehavior_description":   { "message": "Due to the browser's restrictions, you need to decide it when you start dragging: how tabs are treated on dropped outside of TST's sidebar." },
+  "config_tabDragBehavior_label":         { "message": "Drag" },
+  "config_tabDragBehaviorShift_label":    { "message": "Shift-Drag" },
+  "config_tabDragBehavior_label_behaviorInsideSidebar":  { "message": "Behavior for Dropping Inside Sidebar" },
+  "config_tabDragBehavior_label_behaviorOutsideSidebar": { "message": "Behavior for Dropping Outside Sidebar" },
+  "config_tabDragBehavior_moveEntireTreeAlways":         { "message": "Move Entire Tree always" },
+  "config_tabDragBehavior_detachEntireTreeAlways":       { "message": "Detach Entire Tree always from the window (but impossible to create bookmarks)" },
+  "config_tabDragBehavior_bookmarkEntireTreeAlways":     { "message": "Create links or bookmarks from Entire Tree always (but impossible to detach from the window)" },
+  "config_tabDragBehavior_moveSoloTabIfExpanded":        { "message": "Move Solo Tab if expanded or Entire Tree if collapsed" },
+  "config_tabDragBehavior_detachSoloTabIfExpanded":      { "message": "Detach Solo Tab if expanded or Entire Tree if collapsed, from the window (but impossible to create bookmark)" },
+  "config_tabDragBehavior_bookmarkSoloTabIfExpanded":    { "message": "Create link or bookmark from Solo Tab if expanded or Entire Tree if collapsed (but impossible to detach from the window)" },
+  "config_tabDragBehavior_doNothing":                    { "message": "Do nothing" },
+  "config_tabDragBehavior_noteForDragstartOutsideSidebar": { "message": "When a parent tabs is dragged from the browser's native tab bar, it will behave according to the section \"Tree Behavior\" => \"When a parent tab is Closed or Moved\"." },
+  "config_showTabDragBehaviorNotification_label": { "message": "Show notification about what will happen on tabs dropped outside the sidebar, while tab dragging." },
+
+  "config_dropLinksOnTabBehavior_caption": { "message": "When a link or URL string is dropped on a tab" },
+  "config_dropLinksOnTabBehavior_ask":     { "message": "Always ask me how to treat it" },
+  "config_dropLinksOnTabBehavior_load":    { "message": "Load to the tab" },
+  "config_dropLinksOnTabBehavior_newtab":  { "message": "Open new child tab" },
+  "config_simulateTabsLoadInBackgroundInverted_label": { "message": "When you open a dropped link in a new tab, switch to it immediately (*simulation of the browser's built-in option \"When you open a link, image or media in a new tab, switch to it immediately\" (\"browser.tabs.loadInBackground\"))" },
+  "config_tabsLoadInBackgroundDiscarded_label": { "message": "Keep tabs pended until they become active" },
+
+  "config_insertDroppedTabsAt_caption": { "message": "Insertion position of children dropped onto a parent" },
+  "config_insertDroppedTabsAt_inherit": { "message": "Treat same as new children opened from the parent" },
+  "config_insertDroppedTabsAt_first": { "message": "The top of the tree (next to the parent)" },
+  "config_insertDroppedTabsAt_end": { "message": "The end of the tree" },
+
+  "config_autoCreateFolderForBookmarksFromTree_label":  { "message": "Auto-group bookmark items under a folder when they are guessed to be created from multiple tree item tabs (ex. drag and drop of multiselected tabs)" },
+  "config_autoExpandOnLongHoverDelay_before":  { "message": "Expand collapsed tree with hovering over " },
+  "config_autoExpandOnLongHoverDelay_after":  { "message": "msec while dragging" },
+  "config_autoExpandOnLongHoverRestoreIniitalState_label":  { "message": "Collapse such trees automatically after a drag action is finished" },
+  "config_autoExpandIntelligently_label":  { "message": "Collapse other trees when collapsed tree is auto-expanded" },
+  "config_ignoreTabDropNearSidebarArea_label":  { "message": "Don't detach tab from window if it is dropped near the sidebar area (recommended to uncheck this if you use \"privacy.resistFingerprinting\"=\"true\")" },
+
+
+  "config_more_caption": { "message": "More..." },
+
+  "config_shortcuts_caption": { "message": "Keyboard shortcuts" },
+
+  "config_requestPermissions_allUrls_ctrlTabTracking":   { "message": "Don't expand collapsed tree and skip collapsed descendants, while switching focus of tabs via keyboard shortcuts (*You need to allow executing scripts on webpages)" },
+  "config_autoExpandOnTabSwitchingShortcutsDelay_before": { "message": "Expand active collapsed tree when the Tab key is pressed over " },
+  "config_autoExpandOnTabSwitchingShortcutsDelay_after": { "message": "msec" },
+  "config_accelKey_label":   { "message": "Accelerator key for keyboard shortcuts (*You need to match this to the config \"ui.key.accelKey\"):" },
+  "config_accelKey_auto":    { "message": "Default (macOS=โŒ˜, others=Ctrl)" },
+  "config_accelKey_alt":     { "message": "Alt" },
+  "config_accelKey_control": { "message": "Ctrl/Control" },
+  "config_accelKey_meta":    { "message": "Meta/โŒ˜" },
+
+  "config_shortcuts_resetAll": { "message": "Reset All Shortcuts" },
+
+
+  "config_advanced_caption": { "message": "Advanced" },
+
+  "config_bookmarkTreeFolderName_before": { "message": "Folder name for \"Bookmark this Tree\":" },
+  "config_bookmarkTreeFolderName_after": { "message": "\u200b" },
+  "config_bookmarkTreeFolderName_description": { "message": "Available placeholders: %TITLE% (title of the first tab), %URL% (URL of the first tab), %YEAR% (year, four digits), %SHORT_YEAR% (year, two digits), %MONTH% (month, two digits), %DATE% (date, two digits), %HOURS% (hours, two digits), %MINUTES% (minutes, two digits), %SECONDS% (seconds, two digits), %MILLISECONDS% (milliseconds, three digits), %GROUP% (title of the first tab if it is group tab - otherwise blank), %ANY(value1, value2, ...)% (the first effective value from the given list)" },
+
+  "config_defaultBookmarkParentId_label":  { "message": "Default location to create new bookmarks" },
+
+  "config_tabGroupsEnabled_label": { "message": "Activate native tab groups management (*corresponding to a built-in preference \"browser.tabs.groups.enabled\"=\"true\" of the browser itself)" },
+
+  "config_undoMultipleTabsClose_label": { "message": "Restore the set of tabs most recently closed, when one of them is restored via the \"Reopen Closed Tab\" command" },
+
+  "config_scrollLines_label_before": { "message": "Scroll up or down " },
+  "config_scrollLines_label_after":  { "message": "lines via \"Scroll Tabs Up/Down by Lines\" shortcut commands" },
+
+  "config_userStyleRules_label": { "message": "User Style Sheet (extra style rules for contents provided by Tree Vertical Tabs, ex. the sidebar)" },
+  "config_userStyleRules_description_before": { "message": "For more options, see " },
+  "config_userStyleRules_description_link_label": { "message": "code snippets at TST wiki" },
+  "config_userStyleRules_description_after": { "message": " also." },
+  "config_userStyleRules_description_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#for-version-2x" },
+  "config_userStyleRules_themeRules_description": { "message": "Following custom properties are also available via \"var()\", based on the current browser theme:" },
+  "config_userStyleRules_themeRules_description_alphaVariations": { "message": "You can change the opacity of the color with a number suffix like \"--theme-colors-tab_background_text-30\" per 10% (for example, this case means 30% opacity.)" },
+  "config_userStyleRules_import": { "message": "Load from File" },
+  "config_userStyleRules_export": { "message": "Save as File" },
+  "config_userStyleRules_overwrite_title":     { "message": "Replace current style rules?" },
+  "config_userStyleRules_overwrite_message":   { "message": "Do you want the current style rules to be replaced with the loaded file completely?" },
+  "config_userStyleRules_overwrite_overwrite": { "message": "Replace All" },
+  "config_userStyleRules_overwrite_append":    { "message": "Append to the last" },
+  "config_tooLargeUserStyleRulesCaution": { "message": "Too long style rules! Please shorten more." },
+  "config_userStyleRulesTheme_label":     { "message": "Theme:" },
+  "config_userStyleRulesTheme_auto":      { "message": "Auto" },
+  "config_userStyleRulesTheme_separator": { "message": "-----------------" },
+  "config_userStyleRulesTheme_default":   { "message": "Default" },
+
+
+  "config_addons_caption": { "message": "Extra Features via Other Extensions" },
+
+  "config_addons_description_before": { "message": "There are " },
+  "config_addons_description_link_label": { "message": "extensions which extend TST itself" },
+  "config_addons_description_after": { "message": ". Check them out if you need more features on TST's sidebar." },
+  "helper_addons_list_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Helper-addons-extending-functionality-of-TST" },
+
+  "config_theme_description_before": { "message": "Currently there are available built-in themes only \"Plain\", \"Sidebar\" and \"High Contrast\". If you want to use non-built-in theme, see " },
+  "config_theme_description_link_label": { "message": "the code snippets" },
+  "config_theme_description_after": { "message": " for examples." },
+  "helper_theme_list_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#restore-old-built-in-themes" },
+
+  "config_externaladdonpermissions_label": { "message": "Permissions for API Call from Other Extensions" },
+  "config_externaladdonpermissions_description": { "message": "Extensions allowed here may access detailed tab data or tabs in private windows, <em>through Tree Vertical Tabs's permissions</em>, even if the extension ifself is forbidden by the browser to access them. <em>Please don't give permission for extensions if you cannot trust them.</em>" },
+  "config_externalAddonPermissions_header_name": { "message": "Extension Name" },
+  "config_externalAddonPermissions_header_permissions": { "message": "Allowed Special Operations" },
+  "config_externalAddonPermissions_header_incognito": { "message": "Notify Messages from Private Windows" },
+
+  "addon_containerBookmarks_label": { "message": "Container Bookmarks" },
+  "addon_containerBookmarks_uri": { "message": "https://addons.mozilla.org/firefox/addon/container-bookmarks/" },
+  "config_containerRedirectKey_label": { "message": "Redirect Key (*Please set a value same to the one in the extension's options page):" },
+
+
+  "config_debug_caption": { "message": "Development" },
+
+  "config_link_startupPage_label": { "message": "Page for Initial Startup" },
+  "config_link_groupPage_label":   { "message": "Page for Group Tab" },
+  "config_link_tabbarPage_label":   { "message": "Page for Tab Bar" },
+
+  "config_runTests_label": { "message": "Run Automated Tests" },
+  "config_runTestsParameters_label": { "message": " / Tests to run (array of test names or regular expressions, like \"testInheritMutedState,/^testHidden/,...\"):" },
+  "config_runBenchmark_label": { "message": "Run Benchmark" },
+  "config_enableLinuxBehaviors_label": { "message": "Activate Linux specific behaviors" },
+  "config_enableMacOSBehaviors_label": { "message": "Activate macOS specific behaviors" },
+  "config_enableWindowsBehaviors_label": { "message": "Activate Windows specific behaviors" },
+  "config_debug_label": { "message": "Debug mode" },
+  "config_log_caption":               { "message": "Detailed logging" },
+  "config_logTimestamp_label": { "message": "Log with timestamp" },
+  "config_logFor_common":     { "message": "Logs from common modules" },
+  "config_logFor_background": { "message": "Logs from background modules" },
+  "config_logFor_sidebar":    { "message": "Logs from sidebar modules" },
+  "config_loggingQueries_label": { "message": "Log querying of tabs" },
+  "config_loggingConnectionMessages_label": { "message": "Log internal messages" },
+  "config_showLogsButton_label": { "message": "Show Logs" },
+  "config_simulateSVGContextFill_label": { "message": "Activate workaround for the Bug 1388193 and Bug 1421329 to simulate SVG icons (*This may increase CPU usage. To deactivate this option, you need to activate \"svg.context-properties.content.enabled\" via \"about:config\", until these bugs are fixed.)" },
+  "config_staticARIALabel_label": { "message": "Use static ARIA label for tab elements" },
+  "config_staticARIALabel_description": { "message": "*Please try checking this if your speech recognition system misses tab elements after some tab operations." },
+  "config_useCachedTree_label": { "message": "Optimize tree restoration with cache" },
+  "config_useCachedTree_description": { "message": "*Please try unchecking and re-checking this to refresh the cache, when the behavior around tree is unstable." },
+  "config_persistCachedTree_label": { "message": "Persist tree cache" },
+  "config_persistCachedTree_description": { "message": "*Initialization process at the browser startup may be optimized, but it will broat the size of browser's session file and increase disk I/O." },
+  "config_acceleratedTabCreation_label": { "message": "Accelerate operations around newly opened tabs (*NOTE: You'll see unstable behavior around tabs.)" },
+  "config_maximumAcceptableDelayForTabDuplication_before": { "message": "Abort tab duplication when it takes" },
+  "config_maximumAcceptableDelayForTabDuplication_after": { "message": "milliseconds or more." },
+  "config_delayForDuplicatedTabDetection_label_before": { "message": "Delay to detect duplicated tabs:" },
+  "config_delayForDuplicatedTabDetection_label_after": { "message": "msec (please increase this if duplicated tabs are not detected correctly)" },
+  "config_delayForDuplicatedTabDetection_autoDetect": { "message": "Auto detect" },
+  "config_delayForDuplicatedTabDetection_test": { "message": "Test detection" },
+  "config_delayForDuplicatedTabDetection_test_resultMessage": { "message": "$PERCENTAGE$% successfully detected.",
+    "placeholders": {
+      "percentage": { "content": "$1", "example": "50" }
+    }},
+  "config_labelOverflowStyle_caption": { "message": "Too long label of tabs:" },
+  "config_labelOverflowStyle_fade":    { "message": "Fade Out (Better Visibility)" },
+  "config_labelOverflowStyle_crop":    { "message": "Crop with \"..\" (Better Performance)" },
+
+  "config_requestPermissions_bookmarks": { "message": "Allow to read and create bookmarks" },
+  "config_requestPermissions_bookmarks_context": { "message": "Allow to open the context menu on bookmarks" },
+  "config_requestPermissions_tabHide":   { "message": "Allow to show/hide individual tabs (*You must uncheck and re-check this before running tests, to ensure the permission is truly granted.)" },
+
+  "config_requestPermissions_fallbackToToolbarButton_title": { "message": "Click the \"Tree Vertical Tabs\" toolbar button" },
+  "config_requestPermissions_fallbackToToolbarButton_message": { "message": "Due to the browser's bug, you cannot request permission from this screen. Please click the \"Tree Vertical Tabs\" toolbar button to grant permissions." },
+
+  "config_all_caption": { "message": "All Configs" },
+
+  "config_terms_delimiter": { "message": " " },
+
+
+  "tabContextMenu_newTab_label":      { "message": "Ne&w Tab" },
+  "tabContextMenu_newTabNext_label":  { "message": "Ne&w Tab Below" },
+  "tabContextMenu_newGroup_label":               { "message": "Add Tab to New &Group" },
+  "tabContextMenu_newGroup_label_multiselected": { "message": "Add Tabs to New &Group" },
+  "tabContextMenu_addToGroup_label":               { "message": "Add Tab to &Group" },
+  "tabContextMenu_addToGroup_label_multiselected": { "message": "Add Tabs to &Group" },
+  "tabContextMenu_addToGroup_newGroup_label":      { "message": "New &Group" },
+  "tabContextMenu_addToGroup_unnamed_label":       { "message": "Unnamed group" },
+  "tabContextMenu_removeFromGroup_label":               { "message": "&Remove from Group" },
+  "tabContextMenu_removeFromGroup_label_multiselected": { "message": "&Remove from Groups" },
+
+
+  "tabContextMenu_reload_label":      { "message": "&Reload Tab" },
+  "tabContextMenu_unblockAutoplay_label": { "message": "P&lay Tab" },
+  "tabContextMenu_mute_label":        { "message": "&Mute Tab" },
+  "tabContextMenu_unmute_label":      { "message": "Un&mute Tab" },
+
+  "tabContextMenu_pin_label":         { "message": "&Pin Tab" },
+  "tabContextMenu_unpin_label":       { "message": "Un&pin Tab" },
+  "tabContextMenu_unload_label":      { "message": "&Unload Tab" },
+  "tabContextMenu_duplicate_label":   { "message": "&Duplicate Tab" },
+  "tabContextMenu_selectAllTabs_label": { "message": "&Select All Tabs" },
+  "tabContextMenu_bookmark_label":    { "message": "&Bookmark Tabโ€ฆ" },
+  "tabContextMenu_reopenInContainer_label":             { "message": "Op&en in New Container Tab" },
+  "tabContextMenu_reopenInContainer_noContainer_label": { "message": "&No Container" },
+  "tabContextMenu_moveTab_label":     { "message": "Mo&ve Tab" },
+  "tabContextMenu_moveTabToStart_label": { "message": "Move to &Start" },
+  "tabContextMenu_moveTabToEnd_label":   { "message": "Move to &End" },
+  "tabContextMenu_tearOff_label":     { "message": "Move to New &Window" },
+  "tabContextMenu_sendTabsToDevice_label": { "message": "Se&nd Tab to Device" },
+  "tabContextMenu_sendTabsToAllDevices_label": { "message": "Send to All Devices" },
+  "tabContextMenu_manageSyncDevices_label": { "message": "Manage Devicesโ€ฆ" },
+  "tabContextMenu_shareTabURL_label":   { "message": "S&hare" },
+  "tabContextMenu_shareTabURL_more_label":   { "message": "Moreโ€ฆ" },
+
+
+  "tabContextMenu_closeDuplicatedTabs_label": { "message": "Close D&uplicate Tabs" },
+  "tabContextMenu_closeMultipleTabs_label":  { "message": "Close &Multiple Tabs" },
+  "tabContextMenu_closeTabsToTop_label":  { "message": "Close Tabs to the &Top" },
+  "tabContextMenu_closeTabsToBottom_label":  { "message": "Close Tabs to the &Bottom" },
+  "tabContextMenu_closeOther_label":  { "message": "Cl&ose Other Tabs" },
+
+  "tabContextMenu_undoClose_label":   { "message": "Re&open Closed Tab" },
+  "tabContextMenu_undoClose_label_multiple": { "message": "Re&open Closed Tabs" },
+  "tabContextMenu_close_label":       { "message": "&Close Tab" },
+
+  "tabContextMenu_reload_label_multiselected":      { "message": "&Reload Tabs" },
+  "tabContextMenu_unblockAutoplay_label_multiselected": { "message": "P&lay Tab" },
+  "tabContextMenu_mute_label_multiselected":        { "message": "&Mute Tabs" },
+  "tabContextMenu_unmute_label_multiselected":      { "message": "Un&mute Tabs" },
+
+  "tabContextMenu_pin_label_multiselected":         { "message": "&Pin Tabs" },
+  "tabContextMenu_unpin_label_multiselected":       { "message": "Un&pin Tabs" },
+
+  "tabContextMenu_unload_label_multiselected":      { "message": "&Unload %S Tabs" },
+
+  "tabContextMenu_duplicate_label_multiselected":   { "message": "&Duplicate Tabs" },
+
+  "tabContextMenu_moveTab_label_multiselected": { "message": "Mo&ve Tabs" },
+  "tabContextMenu_sendTabsToDevice_label_multiselected": { "message": "Se&nd %S Tabs to Device" },
+
+  "tabContextMenu_reloadSelected_label":               { "message": "&Reload Selected Tab" },
+  "tabContextMenu_reloadSelected_label_multiselected": { "message": "&Reload Selected Tabs" },
+
+  "tabContextMenu_bookmark_label_multiselected":         { "message": "&Bookmark Selected Tabsโ€ฆ" },
+  "tabContextMenu_bookmarkSelected_label":               { "message": "Bookmark Selected &Tabโ€ฆ" },
+  "tabContextMenu_bookmarkSelected_label_multiselected": { "message": "Bookmark Selected &Tabsโ€ฆ" },
+
+  "tabContextMenu_close_label_multiselected":       { "message": "&Close %S Tabs" },
+
+  "tabGroupMenu_tab-group-editor-title-create":                 { "message": "Create tab group" },
+  "tabGroupMenu_tab-group-editor-title-edit":                   { "message": "Manage tab group" },
+  "tabGroupMenu_tab-group-editor-name-label":                   { "message": "Name" },
+  "tabGroupMenu_tab-group-editor-name-field_placeholder":       { "message": "Example: Shopping" },
+  "tabGroupMenu_tab-group-editor-cancel_label":                 { "message": "Cancel" },
+  "tabGroupMenu_tab-group-editor-cancel_accesskey":             { "message": "C" },
+  "tabGroupMenu_tab-group-editor-color-selector_aria-label":    { "message": "Tab group color" },
+  "tabGroupMenu_tab-group-editor-color-selector2-blue":         { "message": "Blue" },
+  "tabGroupMenu_tab-group-editor-color-selector2-blue_title":   { "message": "Blue" },
+  "tabGroupMenu_tab-group-editor-color-selector2-purple":       { "message": "Purple" },
+  "tabGroupMenu_tab-group-editor-color-selector2-purple_title": { "message": "Purple" },
+  "tabGroupMenu_tab-group-editor-color-selector2-cyan":         { "message": "Cyan" },
+  "tabGroupMenu_tab-group-editor-color-selector2-cyan_title":   { "message": "Cyan" },
+  "tabGroupMenu_tab-group-editor-color-selector2-orange":       { "message": "Orange" },
+  "tabGroupMenu_tab-group-editor-color-selector2-orange_title": { "message": "Orange" },
+  "tabGroupMenu_tab-group-editor-color-selector2-yellow":       { "message": "Yellow" },
+  "tabGroupMenu_tab-group-editor-color-selector2-yellow_title": { "message": "Yellow" },
+  "tabGroupMenu_tab-group-editor-color-selector2-pink":         { "message": "Pink" },
+  "tabGroupMenu_tab-group-editor-color-selector2-pink_title":   { "message": "Pink" },
+  "tabGroupMenu_tab-group-editor-color-selector2-green":        { "message": "Green" },
+  "tabGroupMenu_tab-group-editor-color-selector2-green_title":  { "message": "Green" },
+  "tabGroupMenu_tab-group-editor-color-selector2-gray":         { "message": "Gray" },
+  "tabGroupMenu_tab-group-editor-color-selector2-gray_title":   { "message": "Gray" },
+  "tabGroupMenu_tab-group-editor-color-selector2-red":          { "message": "Red" },
+  "tabGroupMenu_tab-group-editor-color-selector2-red_title":    { "message": "Red" },
+  "tabGroupMenu_tab-group-editor-action-new-tab_label":         { "message": "New tab in group" },
+  "tabGroupMenu_tab-group-editor-action-new-window_label":      { "message": "Move group to new window" },
+  "tabGroupMenu_tab-group-editor-action-save_label":            { "message": "Save and close group" },
+  "tabGroupMenu_tab-group-editor-action-ungroup_label":         { "message": "Ungroup tabs" },
+  "tabGroupMenu_tab-group-editor-action-delete_label":          { "message": "Delete group" },
+  "tabGroupMenu_tab-group-editor-done_label":                   { "message": "Done" },
+  "tabGroupMenu_tab-group-editor-done_accesskey":               { "message": "D" },
+
+
+  "tryConfirmUsingTST_title":   { "message": "Conflicting Features Detected" },
+  "tryConfirmUsingTST_message": { "message": "\"Tree Style Tab\" extension has been detected: it may conflict with Waterfox's Tree Vertical Tabs. Please choose which one to enable." },
+  "tryConfirmUsingTST_WS":      { "message": "Waterfox's Tree Vertical Tabs" },
+  "tryConfirmUsingTST_TST":     { "message": "Tree Style Tab" },
+  "tryConfirmUsingTST_both":    { "message": "Activate Both" },
+  "tryConfirmUsingTST_ask":     { "message": "Confirm again when conflictiong features are detected" },
+  "howToActivateAgain_title":   { "message": "Tree Vertical Tabs disabled" },
+  "howToActivateAgain_message": { "message": "Deactivating Waterfox's Tree Vertical Tabs. You can activate it again via the Add-ons Manager." },
+
+  "tabsSidebarButton_label": { "message": "Tree Vertical Tabs" },
+  "tabsSidebarButton_tooltiptext": { "message": "Toggle Tree Vertical Tabs" },
+
+  "preferencesCategoryName": { "message": "Tree Vertical Tabs" },
+  "preferencesCategoryTooltipText": { "message": "Tree Vertical Tabs" },
+
+  "preferences_appearanceGroup_caption": { "message": "Appearance" },
+  "preferences_faviconizePinnedTabs_accesskey": { "message": "S" },
+  "config_autoStickyTab_caption":       { "message": "Tabs sticked to edges of the tab bar when they are scrolled out" },
+  "config_stickyActiveTab_label":          { "message": "Active Tab" },
+  "preferences_stickyActiveTab_accesskey": { "message": "k" },
+  "config_stickySoundPlayingTab_label":          { "message": "Sound Playing Tabs" },
+  "preferences_stickySoundPlayingTab_accesskey": { "message": "y" },
+  "config_stickySharingTab_label":          { "message": "Tabs Sharing Camera/Microphone/Screen" },
+  "preferences_stickySharingTab_accesskey": { "message": "g" },
+
+  "preferences_treeBehaviorGroup_caption": { "message": "Tree view of tabs" },
+  "preferences_autoCollapseExpandSubtreeOnAttach_accesskey": { "message": "c" },
+  "preferences_autoCollapseExpandSubtreeOnSelect_accesskey": { "message": "x" },
+  "preferences_treeDoubleClickBehavior_accesskey": { "message": "D" },
+  "preferences_successorTabControlLevel_accesskey": { "message": "h" },
+  "preferences_dropLinksOnTabBehavior_accesskey": { "message": "l" },
+
+  "preferences_autoAttachGroup_caption": { "message": "Auto-organizing of tabs tree" },
+  "preferences_autoAttachOnOpenedWithOwner_accesskey": { "message": "o" },
+  "preferences_insertNewTabFromPinnedTabAt_accesskey": { "message": "p" },
+  "preferences_autoAttachOnNewTabCommand_accesskey": { "message": "n" },
+  "preferences_autoAttachOnNewTabButtonMiddleClick_accesskey": { "message": "m" },
+  "preferences_autoAttachOnDuplicated_accesskey": { "message": "u" },
+  "preferences_autoAttachSameSiteOrphan_accesskey": { "message": "w" },
+  "preferences_autoAttachOnOpenedFromExternal_accesskey": { "message": "A" },
+  "preferences_autoAttachOnAnyOtherTrigger_accesskey": { "message": "t" }
+}
diff --git a/waterfox/browser/components/sidebar/_locales/ja/messages.json b/waterfox/browser/components/sidebar/_locales/ja/messages.json
new file mode 100644
index 0000000000000..e09437ff751fa
--- /dev/null
+++ b/waterfox/browser/components/sidebar/_locales/ja/messages.json
@@ -0,0 +1,1036 @@
+{
+  "extensionName": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+  "extensionDescription": { "message": "Waterfox็”จใฎใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใƒใƒผใงใ™ใ€‚" },
+
+  "sidebarTitle": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+  "sidebarToggleDescription": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใฎ่กจ็คบใƒป้ž่กจ็คบใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+
+  "command_tabMoveUp":             { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‚’ๅ˜ไฝ“ใง1ใคไธŠใซ็งปๅ‹•" },
+  "command_treeMoveUp":            { "message": "็พๅœจใฎใ‚ฟใƒ–ใจใใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’1ใคไธŠใซ็งปๅ‹•" },
+  "command_tabMoveDown":           { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‚’ๅ˜ไฝ“ใง1ใคไธ‹ใซ็งปๅ‹•" },
+  "command_treeMoveDown":          { "message": "็พๅœจใฎใ‚ฟใƒ–ใจใใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’1ใคไธ‹ใซ็งปๅ‹•" },
+  "command_focusPrevious":         { "message": "ๅ‰ใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™๏ผˆใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹๏ผ‰" },
+  "command_focusPreviousSilently": { "message": "ๅ‰ใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™๏ผˆใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ—ใชใ„๏ผ‰" },
+  "command_focusNext":             { "message": "ๆฌกใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™๏ผˆใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹๏ผ‰" },
+  "command_focusNextSilently":     { "message": "ๆฌกใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™๏ผˆใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ—ใชใ„๏ผ‰" },
+  "command_focusParent":           { "message": "่ฆชใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusParentOrCollapse": { "message": "ใƒ„ใƒชใƒผใ‚’ๆŠ˜ใ‚ŠใŸใŸใ‚€ใ‹ใ€่ฆชใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusFirstChild":       { "message": "ๆœ€ๅˆใฎๅญใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusFirstChildOrExpand": { "message": "ใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹ใ‹ใ€ๆœ€ๅˆใฎๅญใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusLastChild":        { "message": "ๆœ€ๅพŒใฎๅญใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusPreviousSibling":  { "message": "ๅŒ้šŽๅฑคใฎๅ‰ใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_focusNextSibling":      { "message": "ๅŒ้šŽๅฑคใฎๆฌกใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "command_simulateUpOnTree":      { "message": "ใƒ„ใƒชใƒผไธŠใงใฎโ†‘ใ‚ญใƒผใ‚’ๆจกๅ€ฃ" },
+  "command_simulateDownOnTree":    { "message": "ใƒ„ใƒชใƒผไธŠใงใฎโ†“ใ‚ญใƒผใ‚’ๆจกๅ€ฃ" },
+  "command_simulateLeftOnTree":    { "message": "ใƒ„ใƒชใƒผไธŠใงใฎโ†ใ‚ญใƒผใ‚’ๆจกๅ€ฃ" },
+  "command_simulateRightOnTree":   { "message": "ใƒ„ใƒชใƒผไธŠใงใฎโ†’ใ‚ญใƒผใ‚’ๆจกๅ€ฃ" },
+  "command_tabbarUp":              { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’ๆ•ฐ่กŒไธŠใซใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_tabbarPageUp":          { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’1ใƒšใƒผใ‚ธไธŠใซใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_tabbarHome":            { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’ๅ…ˆ้ ญใพใงใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_tabbarDown":            { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’ๆ•ฐ่กŒไธ‹ใซใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_tabbarPageDown":        { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’1ใƒšใƒผใ‚ธไธ‹ใซใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_tabbarEnd":             { "message": "ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’ๆœซๅฐพใพใงใ‚นใ‚ฏใƒญใƒผใƒซ" },
+  "command_toggleTreeCollapsed":   { "message": "ใƒ„ใƒชใƒผใฎๆŠ˜ใ‚ŠใŸใŸใฟ็Šถๆ…‹ใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+  "command_toggleTreeCollapsedRecursively": { "message": "ใƒ„ใƒชใƒผใฎๆŠ˜ใ‚ŠใŸใŸใฟ็Šถๆ…‹ใ‚’ๅ†ๅธฐ็š„ใซๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+  "command_toggleSubPanel":        { "message": "ใ‚ตใƒ–ใƒ‘ใƒใƒซใฎ่กจ็คบใƒป้ž่กจ็คบใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+  "command_switchSubPanel":        { "message": "ใ‚ตใƒ–ใƒ‘ใƒใƒซใฎๅ†…ๅฎนใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+  "command_increaseSubPanel":      { "message": "ใ‚ตใƒ–ใƒ‘ใƒใƒซใฎ้ซ˜ใ•ใ‚’ๅบƒใ’ใ‚‹" },
+  "command_decreaseSubPanel":      { "message": "ใ‚ตใƒ–ใƒ‘ใƒใƒซใฎ้ซ˜ใ•ใ‚’็ธฎใ‚ใ‚‹" },
+
+  "tab_closebox_aria_label": { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹ #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_closebox_tab_tooltip": { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "tab_closebox_tab_tooltip_multiselected": { "message": "้ธๆŠžใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "tab_closebox_tree_tooltip": { "message": "ใƒ„ใƒชใƒผใ‚’้–‰ใ˜ใ‚‹" },
+  "tab_sharingState_sharingCamera_tooltip": { "message": "ใ‚ซใƒกใƒฉใ‚’ๅ…ฑๆœ‰ใ—ใฆใ„ใพใ™" },
+  "tab_sharingState_sharingMicrophone_tooltip": { "message": "ใƒžใ‚คใ‚ฏใ‚’ๅ…ฑๆœ‰ใ—ใฆใ„ใพใ™" },
+  "tab_sharingState_sharingScreen_tooltip": { "message": "ใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใพใŸใฏ็”ป้ขใ‚’ๅ…ฑๆœ‰ใ—ใฆใ„ใพใ™" },
+  "tab_soundButton_aria_label": { "message": "ใ‚ฟใƒ–ใ‚’ใƒŸใƒฅใƒผใƒˆ #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_soundButton_muted_tooltip": { "message": "ใ‚ฟใƒ–ใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค" },
+  "tab_soundButton_muted_tooltip_multiselected": { "message": "้ธๆŠžใ•ใ‚ŒใŸใ‚ฟใƒ–ใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค" },
+  "tab_soundButton_playing_tooltip": { "message": "ใ‚ฟใƒ–ใ‚’ใƒŸใƒฅใƒผใƒˆ" },
+  "tab_soundButton_playing_tooltip_multiselected": { "message": "้ธๆŠžใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ใƒŸใƒฅใƒผใƒˆ" },
+  "tab_soundButton_autoplayBlocked_tooltip": { "message": "ใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ" },
+  "tab_soundButton_autoplayBlocked_tooltip_multiselected": { "message": "้ธๆŠžใ•ใ‚ŒใŸใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ" },
+  "tab_twisty_aria_label": { "message": "ใƒ„ใƒชใƒผใ‚’้–‹้–‰ #$ID$",
+    "placeholders": {
+      "id": { "content": "$1", "example": "1" }
+    }},
+  "tab_twisty_expanded_tooltip": { "message": "ใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€" },
+  "tab_twisty_collapsed_tooltip": { "message": "ใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹" },
+  "tab_tree_tooltip": { "message": "$TREE$\n  ...๏ผˆ็œ็•ฅใ•ใ‚ŒใŸใ‚ฟใƒ–๏ผš$COUNT$ๅ€‹๏ผ‰",
+    "placeholders": {
+      "tree": { "content": "$1", "example": "* Tree\n  * Style\n    * Tab" },
+      "count": { "content": "$2", "example": "3" }
+    }},
+  "tabbar_newTabButton_tooltip": { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’้–‹ใ" },
+
+  "tabbar_newTabAction_tooltip":           { "message": "้–ขไฟ‚ใ‚’ๆŒ‡ๅฎšใ—ใฆๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’้–‹ใ..." },
+  "tabbar_newTabAction_independent_label": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–(&I)" },
+  "tabbar_newTabAction_independent_command": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–" },
+  "tabbar_newTabAction_child_label":       { "message": "ๅญใ‚ฟใƒ–(&C)" },
+  "tabbar_newTabAction_child_command":       { "message": "ๅญใ‚ฟใƒ–" },
+  "tabbar_newTabAction_childTop_command":    { "message": "ๆœ€ๅˆใฎๅญใ‚ฟใƒ–" },
+  "tabbar_newTabAction_childEnd_command":    { "message": "ๆœ€ๅพŒใฎๅญใ‚ฟใƒ–" },
+  "tabbar_newTabAction_sibling_label":     { "message": "ๅŒ้šŽๅฑคใฎใ‚ฟใƒ–(&S)" },
+  "tabbar_newTabAction_sibling_command":     { "message": "ๅŒ้šŽๅฑคใฎใ‚ฟใƒ–" },
+  "tabbar_newTabAction_nextSibling_label": { "message": "ๅŒ้šŽๅฑคใฎ้šฃใฎใ‚ฟใƒ–(&N)" },
+  "tabbar_newTabAction_nextSibling_command": { "message": "ๅŒ้šŽๅฑคใฎ้šฃใฎใ‚ฟใƒ–" },
+
+  "tabbar_newTabWithContexualIdentity_tooltip": { "message": "ๆ–ฐใ—ใ„ใ‚ณใƒณใƒ†ใƒŠใƒผใ‚ฟใƒ–" },
+  "tabbar_newTabWithContexualIdentity_default": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผใชใ—(&N)" },
+
+  "groupTab_label": { "message": "$TITLE$ ใชใฉ",
+    "placeholders": {
+      "title": { "content": "$1", "example": "ใ‚ฟใ‚คใƒˆใƒซ" }
+    }},
+  "groupTab_label_default": { "message": "ใ‚ฐใƒซใƒผใƒ—" },
+  "groupTab_temporary_label": { "message": "ๅญใ‚ฟใƒ–ใŒใ™ในใฆใชใใชใฃใŸใ‚‰ใ“ใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "groupTab_temporaryAggressive_label": { "message": "ๅญใ‚ฟใƒ–ใŒ1ใคไปฅไธ‹ใซใชใฃใŸใ‚‰ใ“ใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "groupTab_fromPinnedTab_label": { "message": "$TITLE$ ใ‹ใ‚‰้–‹ใ„ใŸใ‚ฟใƒ–",
+    "placeholders": {
+      "title": { "content": "$1", "example": "title" }
+    }},
+  "groupTab_options_label": { "message": "ใ‚ชใƒ—ใ‚ทใƒงใƒณ่จญๅฎšใงใ“ใฎใ‚ฟใƒ–ใ‚’้–‹ใ‹ใชใ„ใ‚ˆใ†ใซใงใใพใ™" },
+  "groupTab_options_dismiss": { "message": "ใ“ใฎใƒ’ใƒณใƒˆๆƒ…ๅ ฑใ‚’่กจ็คบใ—ใชใ„" },
+
+  "bookmarkFolder_label_default": { "message": "%ANY(\"%GROUP%\", \"$TITLE$ ใชใฉ\")% (%YEAR%.%MONTH%.%DATE%)",
+    "placeholders": {
+      "title": { "content": "$1", "example": "ใ‚ฟใ‚คใƒˆใƒซ" }
+    }},
+
+  "bookmark_notification_notPermitted_title": { "message": "ๆจฉ้™ใฎใ‚จใƒฉใƒผ" },
+  "bookmark_notification_notPermitted_message": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏไฝœๆˆใซๅฟ…่ฆใชๆจฉ้™ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“ใงใ—ใŸใ€‚ใ“ใฎ้€š็Ÿฅใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆ่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "bookmark_notification_notPermitted_message_linux": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏไฝœๆˆใซๅฟ…่ฆใชๆจฉ้™ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“ใงใ—ใŸใ€‚ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆ่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+
+  "bookmarkContext_notification_notPermitted_title": { "message": "ๆจฉ้™ใฎใ‚จใƒฉใƒผ" },
+  "bookmarkContext_notification_notPermitted_message": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใซ้–ขใ™ใ‚‹ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใ‚’้–‹ใใฎใซๅฟ…่ฆใชๆจฉ้™ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“ใงใ—ใŸใ€‚ใ“ใฎ้€š็Ÿฅใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆ่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "bookmarkContext_notification_notPermitted_message_linux": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใซ้–ขใ™ใ‚‹ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใ‚’้–‹ใใฎใซๅฟ…่ฆใชๆจฉ้™ใ‚’ๅ–ๅพ—ใงใใพใ›ใ‚“ใงใ—ใŸใ€‚ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆ่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+
+  "dropLinksOnTabBehavior_message": { "message": "ใฉใฎใ‚ˆใ†ใซ้–‹ใใพใ™ใ‹๏ผŸ" },
+  "dropLinksOnTabBehavior_save":    { "message": "ไปŠๅพŒใ‚‚ๅŒใ˜ๅ‹•ไฝœใ‚’่กŒใ†" },
+  "dropLinksOnTabBehavior_load":    { "message": "ใ“ใฎใ‚ฟใƒ–ใซ่ชญใฟ่พผใ‚€" },
+  "dropLinksOnTabBehavior_newtab":  { "message": "ๆ–ฐใ—ใ„ๅญใ‚ฟใƒ–ใง้–‹ใ" },
+
+  "tabDragBehaviorNotification_message_duration_single":  { "message": "8s" },
+  "tabDragBehaviorNotification_message_duration_both":  { "message": "16s" },
+  "tabDragBehaviorNotification_message_base":  { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผๅค–ใธใฎใƒ‰ใƒญใƒƒใƒ—ใงใ€$RESULT$ใ€‚",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_inverted_base_with_shift":  { "message": "Shiftใ‚ญใƒผใ‚’ๆŠผใ—ใชใŒใ‚‰ใƒ‰ใƒฉใƒƒใ‚ฐ้–‹ๅง‹ใ™ใ‚‹ใจใ€$RESULT$ใ€‚",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_inverted_base_without_shift":  { "message": "Shiftใ‚ญใƒผใ‚’ๆŠผใ•ใšใซใƒ‰ใƒฉใƒƒใ‚ฐ้–‹ๅง‹ใ™ใ‚‹ใจใ€$RESULT$ใ€‚",
+    "placeholders": {
+      "result": { "content": "$1", "example": "something happen" }
+    }},
+  "tabDragBehaviorNotification_message_tree_tearoff":  { "message": "ใ™ในใฆใฎใ‚ฟใƒ–ใŒใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใ‹ใ‚‰ๅˆ‡ใ‚Š้›ขใ•ใ‚Œใพใ™" },
+  "tabDragBehaviorNotification_message_tab_tearoff":   { "message": "ใ“ใฎใ‚ฟใƒ–ใŒใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใ‹ใ‚‰ๅˆ‡ใ‚Š้›ขใ•ใ‚Œใพใ™" },
+  "tabDragBehaviorNotification_message_tree_bookmark": { "message": "ใƒ‰ใƒญใƒƒใƒ—ไฝ็ฝฎใซใ™ในใฆใฎใ‚ฟใƒ–ใ‹ใ‚‰ใƒชใƒณใ‚ฏใพใŸใฏใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใŒไฝœๆˆใ•ใ‚Œใพใ™" },
+  "tabDragBehaviorNotification_message_tab_bookmark":  { "message": "ใƒ‰ใƒญใƒƒใƒ—ไฝ็ฝฎใซใ“ใฎใ‚ฟใƒ–ใ‹ใ‚‰ใƒชใƒณใ‚ฏใพใŸใฏใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใŒไฝœๆˆใ•ใ‚Œใพใ™" },
+
+  "tabsHighlightingNotification_message": { "message": "ใ‚ฟใƒ–ใ‚’้ธๆŠžไธญ... $PROGRESS$ % ",
+    "placeholders": {
+      "progress": { "content": "$1", "example": "50" }
+    }},
+
+  "blank_allUrlsPermissionRequiredMessage": { "message": "ใ“ใฎใƒกใƒƒใ‚ปใƒผใ‚ธใฏTree Style TabใŒๆไพ›ใ™ใ‚‹ใƒ€ใ‚คใ‚ขใƒญใ‚ฐใ‚’FirefoxใŒ้–‹ใ็›ดใใ†ใจใ—ใŸใŸใ‚ใซ่กจ็คบใ•ใ‚Œใฆใ„ใพใ™ใ€‚ใ“ใฎใƒกใƒƒใ‚ปใƒผใ‚ธใ‚’่กจ็คบใ—ใŸใใชใ„ๅ ดๅˆใฏใ€ๆ‹กๅผตๆฉŸ่ƒฝ็ฎก็†็”ป้ขใฎTree Style Tabใฎ่ฉณ็ดฐใƒšใƒผใ‚ธใฎใ€Œๆจฉ้™ใ€ใ‚ฟใƒ–ใงใ€Œใ™ในใฆใฎใ‚ฆใ‚งใƒ–ใ‚ตใ‚คใƒˆใฎไฟๅญ˜ใ•ใ‚ŒใŸใƒ‡ใƒผใ‚ฟใธใฎใ‚ขใ‚ฏใ‚ปใ‚นใ€ใฎๆจฉ้™ใ‚’่จฑๅฏใ—ใฆใใ ใ•ใ„ใ€‚" },
+
+  "warnOnCloseTabs_title":     { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใพใ™ใ‹๏ผŸ" },
+  "warnOnCloseTabs_message":   { "message": "่ค‡ๆ•ฐ ($NUMBER$) ใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚ˆใ†ใจใ—ใฆใ„ใพใ™ใ€‚ใ™ในใฆใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใฆใ‚ˆใ‚ใ—ใ„ใงใ™ใ‹๏ผŸ",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+  "warnOnCloseTabs_warnAgain": { "message": "ๅŒๆ™‚ใซ่ค‡ๆ•ฐใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹ใจใใฏ็ขบ่ชใ™ใ‚‹" },
+  "warnOnCloseTabs_close":     { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "warnOnCloseTabs_cancel":    { "message": "ใ‚ญใƒฃใƒณใ‚ปใƒซ" },
+
+  "warnOnCloseTabs_fromOutside_title":     { "message": "้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใพใ™ใ‹๏ผŸ" },
+  "warnOnCloseTabs_fromOutside_message":   { "message": "ไปŠ้–‰ใ˜ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใซใฏ $NUMBER$ ๅ€‹ใฎใ‚ฟใƒ–ใŒใ‚ใ‚Šใพใ™ใ€‚ใใ‚Œใ‚‰ใ‚‚ใ™ในใฆ้–‰ใ˜ใฆใ‚ˆใ‚ใ—ใ„ใงใ™ใ‹๏ผŸ\n๏ผˆโ€ปใ‚ญใƒฃใƒณใ‚ปใƒซใ™ใ‚‹ใจไปŠ้–‰ใ˜ใŸ่ฆชใ‚ฟใƒ–ใ‚’ๅพฉๅ…ƒใ—ใพใ™๏ผ‰",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+
+  "warnOnCloseTabs_notification_message": { "message": "ๆ“ไฝœใ‚’ๅ–ใ‚Šๆถˆใ™ๅ ดๅˆใฏใ“ใฎ้€š็Ÿฅใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใใ ใ•ใ„ใ€‚\n็ถš่กŒใ—ใฆๅ•้กŒใŒใชใ‘ใ‚Œใฐใ€$TIMEOUT$ ็ง’ๅพŒใซๆฎ‹ใ‚Šใฎใ‚ฟใƒ–ใ‚‚้–‰ใ˜ใ‚‰ใ‚Œใพใ™ใ€‚",
+    "placeholders": {
+      "TIMEOUT": { "content": "$1", "example": "10" }
+    }},
+  "warnOnCloseTabs_notification_message_linux": { "message": "ๆ“ไฝœใ‚’ๅ–ใ‚Šๆถˆใ™ๅ ดๅˆใฏใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใใ ใ•ใ„ใ€‚\n็ถš่กŒใ—ใฆๅ•้กŒใŒใชใ‘ใ‚Œใฐใ€$TIMEOUT$ ็ง’ๅพŒใซๆฎ‹ใ‚Šใฎใ‚ฟใƒ–ใ‚‚้–‰ใ˜ใ‚‰ใ‚Œใพใ™ใ€‚",
+    "placeholders": {
+      "TIMEOUT": { "content": "$1", "example": "10" }
+    }},
+
+  "warnOnAutoGroupNewTabs_title":     { "message": "ใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใพใ™ใ‹๏ผŸ" },
+  "warnOnAutoGroupNewTabs_message":   { "message": "$NUMBER$ ๅ€‹ใฎใ‚ฟใƒ–ใŒไธ€ๅบฆใซ้–‹ใ‹ใ‚Œใพใ—ใŸใ€‚ใ‚ฐใƒซใƒผใƒ—ใจใ—ใฆ1ใคใฎใƒ„ใƒชใƒผใซใพใจใ‚ใพใ™ใ‹๏ผŸ",
+    "placeholders": {
+      "NUMBER": { "content": "$1", "example": "10" }
+    }},
+  "warnOnAutoGroupNewTabs_warnAgain": { "message": "่ค‡ๆ•ฐใฎใ‚ฟใƒ–ใŒไธ€ๅบฆใซ้–‹ใ‹ใ‚ŒใŸใจใใฏ็ขบ่ชใ™ใ‚‹" },
+  "warnOnAutoGroupNewTabs_close":     { "message": "ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹" },
+  "warnOnAutoGroupNewTabs_cancel":    { "message": "ใใฎใพใพใซใ™ใ‚‹" },
+
+  "bookmarkDialog_dialogTitle_single":   { "message": "ๆ–ฐใ—ใ„ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ" },
+  "bookmarkDialog_dialogTitle_multiple": { "message": "ๆ–ฐใ—ใ„ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ" },
+  "bookmarkDialog_title":    { "message": "ๅๅ‰(N)" },
+  "bookmarkDialog_title_accessKey": { "message": "n" },
+  "bookmarkDialog_url":      { "message": "URL" },
+  "bookmarkDialog_url_accessKey": { "message": "u" },
+  "bookmarkDialog_parentId": { "message": "ไฟๅญ˜ๅ ดๆ‰€(L)" },
+  "bookmarkDialog_parentId_accessKey": { "message": "l" },
+  "bookmarkDialog_showAllFolders_label":      { "message": "้ธๆŠž..." },
+  "bookmarkDialog_showAllFolders_tooltip":      { "message": "ใ™ในใฆใฎใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใƒ•ใ‚ฉใƒซใƒ€ใƒผใ‚’่กจ็คบใ—ใพใ™" },
+  "bookmarkDialog_newFolder":      { "message": "ๆ–ฐใ—ใ„ใƒ•ใ‚ฉใƒซใƒ€ใƒผ(O)" },
+  "bookmarkDialog_newFolder_accessKey": { "message": "o" },
+  "bookmarkDialog_newFolder_defaultTitle":   { "message": "ๆ–ฐใ—ใ„ใƒ•ใ‚ฉใƒซใƒ€ใƒผ" },
+  "bookmarkDialog_saveContainerRedirectKey": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผใฎๆƒ…ๅ ฑใ‚’Container Bookmarksๅฝขๅผใงไฟๅญ˜ใ™ใ‚‹" },
+  "bookmarkDialog_accept":   { "message": "ไฟๅญ˜" },
+  "bookmarkDialog_cancel":   { "message": "ใ‚ญใƒฃใƒณใ‚ปใƒซ" },
+
+  "bookmarkFolderChooser_unspecified":   { "message": "(้ธๆŠžใ•ใ‚Œใฆใ„ใพใ›ใ‚“)" },
+  "bookmarkFolderChooser_blank":         { "message": "(ๅๅ‰ใชใ—)" },
+  "bookmarkFolderChooser_useThisFolder": { "message": "ใ“ใฎใƒ•ใ‚ฉใƒซใƒ€ใƒผใ‚’้ธๆŠž" },
+
+  "syncDeviceDefaultName": { "message": "$PLATFORM$ ใฎ $BROWSER$",
+    "placeholders": {
+      "PLATFORM": { "content": "$1", "example": "Firefox" },
+      "BROWSER":  { "content": "$2", "example": "Windows" }
+    }},
+  "syncDeviceMissingDeviceName": { "message": "ๅๅ‰ใŒ่จญๅฎšใ•ใ‚Œใฆใ„ใชใ„็ซฏๆœซ" },
+  "syncDeviceUnknownDevice":     { "message": "ไธๆ˜Žใช็ซฏๆœซ" },
+  "syncAvailable_notification_title":   { "message": "ใ‚ฟใƒ–ใ‚’TSTใ‹ใ‚‰ไป–ใฎ็ซฏๆœซใซ้€ใ‚Œใพใ™" },
+  "syncAvailable_notification_message": { "message": "ไป–ใฎ็ซฏๆœซใจใฎ้–“ใงใ‚ฟใƒ–ใ‚’้€ๅ—ไฟกใงใใพใ™ใ€‚ใ“ใ“ใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใ€ใ“ใฎ็ซฏๆœซใซๅˆ†ใ‹ใ‚Šใ‚„ใ™ใ„ๅๅ‰ใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "syncAvailable_notification_message_linux": { "message": "ไป–ใฎ็ซฏๆœซใจใฎ้–“ใงใ‚ฟใƒ–ใ‚’้€ๅ—ไฟกใงใใพใ™ใ€‚ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใ€ใ“ใฎ็ซฏๆœซใซๅˆ†ใ‹ใ‚Šใ‚„ใ™ใ„ๅๅ‰ใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "sentTabs_notification_title":            { "message": "\u200b" },
+  "sentTabs_notification_message":          { "message": "$DEVICE$ ใซใ‚ฟใƒ–ใ‚’้€ไฟกใ—ใพใ—ใŸ",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "sentTabs_notification_title_multiple":   { "message": "\u200b" },
+  "sentTabs_notification_message_multiple": { "message": "$DEVICE$ ใซใ‚ฟใƒ–ใ‚’้€ไฟกใ—ใพใ—ใŸ",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "sentTabsToAllDevices_notification_title":            { "message": "\u200b" },
+  "sentTabsToAllDevices_notification_message":          { "message": "ใ™ในใฆใฎ็ซฏๆœซใซใ‚ฟใƒ–ใ‚’้€ไฟกใ—ใพใ—ใŸ" },
+  "sentTabsToAllDevices_notification_title_multiple":   { "message": "\u200b" },
+  "sentTabsToAllDevices_notification_message_multiple": { "message": "ใ™ในใฆใฎ็ซฏๆœซใซใ‚ฟใƒ–ใ‚’้€ไฟกใ—ใพใ—ใŸ" },
+  "receiveTabs_notification_title":            { "message": "$DEVICE$ ใ‹ใ‚‰ใฎใ‚ฟใƒ–",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "receiveTabs_notification_message":          { "message": "$URL$",
+    "placeholders": {
+      "URL": { "content": "$1", "example": "http://example.com/" }
+    }},
+  "receiveTabs_notification_title_multiple":   { "message": "$DEVICE$ ใ‹ใ‚‰ใฎใ‚ฟใƒ–",
+    "placeholders": {
+      "DEVICE": { "content": "$1", "example": "Firefox on Device X" }
+    }},
+  "receiveTabs_notification_message_multiple": { "message": "$URL$\nใ‚’ๅซใ‚€ $ALL$ ๅ€‹ใฎใ‚ฟใƒ–",
+    "placeholders": {
+      "URL": { "content": "$1", "example": "http://example.com/" },
+      "ALL": { "content": "$2", "example": "4" },
+      "REST": { "content": "$3", "example": "3" }
+    }},
+
+  "sidebarPositionRighsideNotification_message":   { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒๅณๅดใซ็ฝฎใ‹ใ‚Œใฆใ„ใ‚‹ใ“ใจใ‚’ๆคœๅ‡บใ—ใพใ—ใŸใ€‚็พๅœจใฎไฝ็ฝฎใซๅˆใ‚ใ›ใฆ่กจ็คบใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใพใ™ใ‹๏ผŸ" },
+  "sidebarPositionRighsideNotification_rightside": { "message": "ๅณๅด็”จใฎ่กจ็คบใซๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹" },
+  "sidebarPositionRighsideNotification_leftside":  { "message": "ๅทฆๅด็”จใฎ่กจ็คบใ‚’็ถญๆŒใ™ใ‚‹" },
+
+  "sidebarPositionOptionNotification_title":   { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใฎๅ†…ๅฎนใฎ่กจ็คบ่จญๅฎšใ‚’ไฟๅญ˜ใ—ใพใ—ใŸ" },
+  "sidebarPositionOptionNotification_message": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใฎๅ†…ๅฎนใฎ่กจ็คบใ‚’ๅค‰ๆ›ดใ™ใ‚‹ใซใฏใ€Tabs Sidebarใฎ่จญๅฎš็”ป้ขใฎใ€Œๅค–่ฆณใ€ใ‚’ๅ‚็…งใ—ใฆไธ‹ใ•ใ„" },
+
+  "startup_notification_title_installed":   { "message": "Tabs Sidebarใ‚’ไฝฟใ„ๅง‹ใ‚ใ‚‹ๆ–นใธ" },
+  "startup_notification_message_installed": { "message": "ใ‚ˆใ‚Š่‡ช็„ถใชๆ“ไฝœๆ„Ÿใ‚’ๅพ—ใ‚‹ใŸใ‚ใซใฏใ€่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚ใ“ใ“ใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๆจฉ้™ใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "startup_notification_message_installed_linux": { "message": "ใ‚ˆใ‚Š่‡ช็„ถใชๆ“ไฝœๆ„Ÿใ‚’ๅพ—ใ‚‹ใŸใ‚ใซใฏใ€่ฟฝๅŠ ใฎๆจฉ้™ใ‚’่จฑๅฏใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๆจฉ้™ใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "startup_notification_title_updated":     { "message": "Tabs Sidebarใฎๅ‹•ไฝœใŒๅค‰ใ‚ใ‚Šใพใ—ใŸ" },
+  "startup_notification_message_updated":   { "message": "ๆ“ไฝœๆ„Ÿใซๅฝฑ้Ÿฟใ™ใ‚‹ๅคงใใชๅค‰ๆ›ดใŒใ‚ใ‚Šใพใ—ใŸใ€‚ใ“ใ“ใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๅค‰ๆ›ดๅฑฅๆญดใ‚’็ขบ่ชใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "startup_notification_message_updated_linux":   { "message": "ๆ“ไฝœๆ„Ÿใซๅฝฑ้Ÿฟใ™ใ‚‹ๅคงใใชๅค‰ๆ›ดใŒใ‚ใ‚Šใพใ—ใŸใ€‚ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๅค‰ๆ›ดๅฑฅๆญดใ‚’็ขบ่ชใ—ใฆใใ ใ•ใ„ใ€‚" },
+
+  "message_startup_description_1": { "message": "Tabs Sidebarใฎ็ธฆๅž‹ใ‚ฟใƒ–ใƒใƒผใฏๅˆ‡ใ‚Šๆ›ฟใˆๅฏ่ƒฝใชใ‚ตใ‚คใƒ‰ใƒใƒผใƒ‘ใƒใƒซใฎไธ€ใคใซใชใฃใฆใ„ใพใ™ใ€‚ใ‚‚ใ—่กจ็คบใ•ใ‚Œใฆใ„ใชใ„ๅ ดๅˆใฏใ€" },
+  "message_startup_description_key": { "message": "ใ€ŒF1ใ€ใ‚ญใƒผ" },
+  "message_startup_description_2": { "message": "ใ‚’ๆŠผใ™ใ‹ใƒ„ใƒผใƒซใƒใƒผไธŠใฎใ€Œ" },
+  "message_startup_description_3": { "message": "ใ€ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใ€Œใƒ„ใƒชใƒผๅž‹ใ‚ฟใƒ–ใ€ใ‚ตใ‚คใƒ‰ใƒใƒผใƒ‘ใƒใƒซใ‚’่กจ็คบใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "message_startup_description_sync_before": { "message": "Firefox Sync็ตŒ็”ฑใงใฎใ‚ฟใƒ–ใฎไป–ใฎ็ซฏๆœซใธใฎ้€ไฟกใฏใ€TSTใŒๅ‹•ไฝœใ—ใฆใ„ใ‚‹็ซฏๆœซใซๅฏพใ—ใฆใฎใฟ่กŒใˆใพใ™ใ€‚ไบ‹ๅ‰ใซใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎ่จญๅฎš็”ป้ขใ‹ใ‚‰Firefox Syncใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใŠใใ€ไป–ใฎ็ซฏๆœซใงใ‚‚TSTใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใŠใ„ใฆใใ ใ•ใ„ใ€‚ใพใŸใ€" },
+  "message_startup_description_sync_link":   { "message": "็ซฏๆœซๅใฏๆ‰‹ๅ‹•ใง่จญๅฎšใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™" },
+  "message_startup_description_sync_after":  { "message": "ใ€‚" },
+
+  "message_startup_history_before":     { "message": "ๆ›ดๆ–ฐใซใ‚ˆใฃใฆๅค‰ๆ›ดใ•ใ‚ŒใŸๅ‹•ไฝœใฏใ€่จญๅฎšใงๅ…ƒใฎๅ‹•ไฝœใซๆˆปใ›ใ‚‹ๅ ดๅˆใŒใ‚ใ‚Šใพใ™ใ€‚่ฉณ็ดฐใฏ" },
+  "message_startup_history_uri":        { "message": "https://addons.mozilla.org/firefox/addon/tree-style-tab/versions/" },
+  "message_startup_history_link_label": { "message": "ๅค‰ๆ›ดๅฑฅๆญด" },
+  "message_startup_history_after":      { "message": "ใ‚’ๅ‚็…งใ—ใฆใใ ใ•ใ„ใ€‚" },
+
+  "message_startup_requestPermissions_description": { "message": "โš ไปฅไธ‹ใฎๆฉŸ่ƒฝใซใฏ่ฟฝๅŠ ใฎๆจฉ้™ใŒๅฟ…่ฆใงใ™ใ€‚ๆฉŸ่ƒฝใ‚’ไฝฟใ„ใŸใ„ๅ ดๅˆใฎใฟๆจฉ้™ใ‚’ไป˜ไธŽใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "message_startup_requestPermissions_bookmarks": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎๆ“ไฝœใ‚’่จฑๅฏใ™ใ‚‹" },
+  "message_startup_requestPermissions_bookmarks_contextMenuItems": { "message": "ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใฎใ€Œใ“ใฎใƒ„ใƒชใƒผใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ€ๆฉŸ่ƒฝ" },
+  "message_startup_requestPermissions_bookmarks_migrationForImportedBookmarks": { "message": "ไป–ใฎ็’ฐๅขƒใ‹ใ‚‰ใ‚คใƒณใƒใƒผใƒˆใ•ใ‚ŒใŸใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎๅ†…้ƒจURLใฎ่‡ชๅ‹•็งป่กŒ" },
+  "message_startup_requestPermissions_bookmarks_detectTabsFromBookmarks": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใฎๆคœๅ‡บ" },
+  "message_startup_requestPermissions_allUrls":   { "message": "ใ‚ณใƒณใƒ†ใƒณใƒ„้ ˜ๅŸŸๅ†…ใฎWebใƒšใƒผใ‚ธไธŠใงใฎใ‚นใ‚ฏใƒชใƒ—ใƒˆใฎๅฎŸ่กŒ" },
+  "message_startup_requestPermissions_allUrls_tabPreviewPanel":   { "message": "ใƒ„ใƒผใƒซใƒใƒƒใƒ—ใฎไปฃใ‚ใ‚Šใซใ‚ฟใƒ–ใฎใƒ—ใƒฌใƒ“ใƒฅใƒผ็”ปๅƒใ‚’่กจ็คบใ™ใ‚‹" },
+  "message_startup_requestPermissions_allUrls_skipCollapsedTabsWithCtrlTab":   { "message": "ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใงใฎใ‚ฟใƒ–ๅˆ‡ใ‚Šๆ›ฟใˆไธญใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸๅญๅญซใ‚ฟใƒ–ใซใฏใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ›ใšใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใ‚‚ๅฑ•้–‹ใ—ใชใ„" },
+  "message_startup_requestPermissions_allUrls_preventBlankDialogRestoration":   { "message": "ใ‚ฟใƒ–ใ‚’้–‹ใใชใŠใ™ๆ“ไฝœใงใƒ€ใ‚คใ‚ขใƒญใ‚ฐ็”จใฎ็ฉบใฎใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใŒๅพฉๅ…ƒใ•ใ‚Œใชใ„ใ‚ˆใ†ใซใ™ใ‚‹" },
+  "message_startup_requestPermissions_clipboardRead": { "message": "ใ‚ฏใƒชใƒƒใƒ—ใƒœใƒผใƒ‰ใฎ่ชญใฟๅ–ใ‚Š" },
+  "message_startup_requestPermissions_clipboardRead_newTabButtonMiddleClick": { "message": "ใ€Œๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ€ใƒœใ‚ฟใƒณใฎไธญใƒœใ‚ฟใƒณใ‚ฏใƒชใƒƒใ‚ฏใงใ‚ฏใƒชใƒƒใƒ—ใƒœใƒผใƒ‰ๅ†…ใฎURLใ‚’้–‹ใ๏ผˆโ€ป\"dom.events.asyncClipboard.clipboardItem\"ใฎๆœ‰ๅŠนๅŒ–ใŒๅฟ…่ฆ๏ผ‰" },
+
+  "message_startup_userChromeCss_notify": { "message": "ใ‚ฟใƒ–ใƒใƒผใจใ‚ตใ‚คใƒ‰ใƒใƒผใฎใƒ˜ใƒƒใƒ€ใƒผใ‚’้š ใ—ใŸใ„ๅ ดๅˆ" },
+  "message_startup_userChromeCss_description_1": { "message": "WebExtensionsใฎไป•ๆง˜ไธŠใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎใ‚ฟใƒ–ใƒใƒผใจใ‚ตใ‚คใƒ‰ใƒใƒผใฎใƒ˜ใƒƒใƒ€ใƒผใฏTabs Sidebarใ‹ใ‚‰ๅˆถๅพกใงใใพใ›ใ‚“ใ€‚ใ“ใ‚Œใ‚‰ใ‚’้š ใ—ใŸใ„ๅ ดๅˆใฏ" },
+  "message_startup_userChromeCss_description_link_label": { "message": "userChrome.cssใงใฎใ‚ซใ‚นใ‚ฟใƒžใ‚คใ‚บไพ‹" },
+  "message_startup_userChromeCss_description_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#for-userchromecss" },
+  "message_startup_userChromeCss_description_2": { "message": "ใ‚’ๅ‚็…งใ—ใฆไธ‹ใ•ใ„ใ€‚ใŸใ ใ—ใ€" },
+  "message_startup_userChromeCss_description_note": { "message": "ใ“ใฎๆ–นๆณ•ใฏไฝŽใƒฌใ‚คใƒคใฎใ‚ซใ‚นใ‚ฟใƒžใ‚คใ‚บๆ‰‹ๆฎตใฎใŸใ‚ใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎๅฐ†ๆฅใฎใƒใƒผใ‚ธใƒงใƒณใงไฝฟใˆใชใใชใฃใŸใ‚Šใ€ใƒˆใƒฉใƒ–ใƒซใฎๅŽŸๅ› ใซใชใฃใŸใ‚Šใ™ใ‚‹ๆใ‚ŒใŒใ‚ใ‚Šใพใ™ใ€‚่‡ชๅทฑใฎ่ฒฌไปปใจๅˆคๆ–ญใซๅŸบใฅใ„ใฆใ€ใƒˆใƒฉใƒ–ใƒซใ‚’่‡ชๅทฑ่งฃๆฑบใงใใ‚‹่‡ชไฟกใŒใ‚ใ‚‹ๅ ดๅˆใซใ ใ‘ใ“ใฎๆ–นๆณ•ใ‚’ไฝฟใฃใฆไธ‹ใ•ใ„ใ€‚" },
+  "message_startup_userChromeCss_description_3": { "message": "\u200b" },
+
+  "api_requestedPermissions_title": { "message": "ใ‚ขใ‚ฏใ‚ปใ‚นๆจฉใฎ่ฆๆฑ‚" },
+  "api_requestedPermissions_message": { "message": "โš ๆ‹กๅผตๆฉŸ่ƒฝใ€Œ$NAME$ใ€ใŒTabs SidebarใฎAPIใ‚’็ตŒ็”ฑใ—ใฆไปฅไธ‹ใฎใ“ใจใ‚’ใ—ใ‚ˆใ†ใจใ—ใฆใ„ใพใ™ใ€‚\n\n$PERMISSIONS$\n\n่จฑๅฏใ™ใ‚‹ๅ ดๅˆใฏใ“ใฎ้€š็Ÿฅใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๆ‹กๅผตๆฉŸ่ƒฝใซ่จฑๅฏใ‚’ไธŽใˆใฆใใ ใ•ใ„ใ€‚",
+    "placeholders": {
+      "NAME":        { "content": "$1", "example": "foobar" },
+      "PERMISSIONS": { "content": "$2", "example": "tabs" }
+    }},
+  "api_requestedPermissions_message_linux": { "message": "โš ๆ‹กๅผตๆฉŸ่ƒฝใ€Œ$NAME$ใ€ใŒTabs SidebarใฎAPIใ‚’็ตŒ็”ฑใ—ใฆไปฅไธ‹ใฎใ“ใจใ‚’ใ—ใ‚ˆใ†ใจใ—ใฆใ„ใพใ™ใ€‚\n\n$PERMISSIONS$\n\n่จฑๅฏใ™ใ‚‹ๅ ดๅˆใฏใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๆ‹กๅผตๆฉŸ่ƒฝใซ่จฑๅฏใ‚’ไธŽใˆใฆใใ ใ•ใ„ใ€‚",
+    "placeholders": {
+      "NAME":        { "content": "$1", "example": "foobar" },
+      "PERMISSIONS": { "content": "$2", "example": "tabs" }
+    }},
+  "api_requestedPermissions_type_activeTab": { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎ็พๅœจใฎใ‚ฟใƒ–ใธใฎใ‚ขใ‚ฏใ‚ปใ‚น" },
+  "api_requestedPermissions_type_tabs":      { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎใ‚ฟใƒ–ใธใฎใ‚ขใ‚ฏใ‚ปใ‚น" },
+  "api_requestedPermissions_type_cookies":   { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎใ‚ฟใƒ–ใฎใ‚ณใƒณใƒ†ใƒŠใƒผใฎ่ญ˜ๅˆฅ" },
+
+
+  "guessNewOrphanTabAsOpenedByNewTabCommandTitle": { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–|ๆ–ฐใ—ใ„ใƒ—ใƒฉใ‚คใƒ™ใƒผใƒˆใ‚ฟใƒ–" },
+
+
+  "context_menu_label": { "message": "ใ‚ฟใƒ–ใฎใƒ„ใƒชใƒผใ‚’ๆ“ไฝœ" },
+
+  "context_reloadTree_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+  "context_reloadTree_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+  "context_toggleMuteTree_label_mute":                        { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใƒŸใƒฅใƒผใƒˆ(&M)" },
+  "context_toggleMuteTree_label_multiselected_mute":          { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ใƒŸใƒฅใƒผใƒˆ(&M)" },
+  "context_toggleMuteTree_label_unmute":                      { "message": "ใ“ใฎใƒ„ใƒชใƒผใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค(&M)" },
+  "context_toggleMuteTree_label_multiselected_unmute":        { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค(&M)" },
+  "context_toggleMuteTree_command":                           { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใƒŸใƒฅใƒผใƒˆ/ใƒŸใƒฅใƒผใƒˆ่งฃ้™ค" },
+  "context_toggleMuteDescendants_label_mute":                 { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆใƒŸใƒฅใƒผใƒˆ(&T)" },
+  "context_toggleMuteDescendants_label_multiselected_mute":   { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆใƒŸใƒฅใƒผใƒˆ(&T)" },
+  "context_toggleMuteDescendants_label_unmute":               { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆใƒŸใƒฅใƒผใƒˆ่งฃ้™ค(&T)" },
+  "context_toggleMuteDescendants_label_multiselected_unmute": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆใƒŸใƒฅใƒผใƒˆ่งฃ้™ค(&T)" },
+  "context_toggleMuteDescendants_command":                    { "message": "ใ“ใฎใ‚ฟใƒ–้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆใƒŸใƒฅใƒผใƒˆ/ใƒŸใƒฅใƒผใƒˆ่งฃ้™ค" },
+  "context_unblockAutoplayTree_label":                        { "message": "ใ“ใฎใƒ„ใƒชใƒผใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&L)" },
+  "context_unblockAutoplayTree_label_multiselected":          { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&L)" },
+  "context_unblockAutoplayTree_command":                      { "message": "ใ“ใฎใƒ„ใƒชใƒผใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ" },
+  "context_unblockAutoplayDescendants_label":                 { "message": "ใ“ใฎใ‚ฟใƒ–้…ไธ‹ใฎใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&A)" },
+  "context_unblockAutoplayDescendants_label_multiselected":   { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&A)" },
+  "context_unblockAutoplayDescendants_command":               { "message": "ใ“ใฎใ‚ฟใƒ–้…ไธ‹ใฎใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ" },
+  "context_reloadTree_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†่ชญใฟ่พผใฟ" },
+  "context_reloadDescendants_label": { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆๅ†่ชญใฟ่พผใฟ(&E)" },
+  "context_reloadDescendants_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆๅ†่ชญใฟ่พผใฟ(&E)" },
+  "context_reloadDescendants_command": { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆๅ†่ชญใฟ่พผใฟ" },
+  "context_closeTree_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’้–‰ใ˜ใ‚‹(&C)" },
+  "context_closeTree_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’้–‰ใ˜ใ‚‹(&C)" },
+  "context_closeTree_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’้–‰ใ˜ใ‚‹" },
+  "context_closeDescendants_label": { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&L)" },
+  "context_closeDescendants_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&L)" },
+  "context_closeDescendants_command": { "message": "ใ“ใฎใ‚ฟใƒ–ใฎ้…ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹" },
+  "context_closeOthers_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผไปฅๅค–ใฎไป–ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&O)" },
+  "context_closeOthers_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผไปฅๅค–ใฎไป–ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&O)" },
+  "context_closeOthers_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผไปฅๅค–ใฎไป–ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹" },
+  "context_toggleSticky_label_stick":                 { "message": "ใ‚ฟใƒ–ใ‚’็ซฏใซ่ฒผใ‚Šไป˜ใ‘(&K)" },
+  "context_toggleSticky_label_multiselected_stick":   { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’็ซฏใซ่ฒผใ‚Šไป˜ใ‘(&K)" },
+  "context_toggleSticky_label_unstick":               { "message": "ใ‚ฟใƒ–ใฎ่ฒผใ‚Šไป˜ใ‘ใ‚’่งฃ้™ค(&K)" },
+  "context_toggleSticky_label_multiselected_unstick": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใฎ่ฒผใ‚Šไป˜ใ‘ใ‚’่งฃ้™ค(&K)" },
+  "context_toggleSticky_command":                   { "message": "ใ‚ฟใƒ–ใ‚’็ซฏใซ่ฒผใ‚Šไป˜ใ‘/ใ‚ฟใƒ–ใฎ่ฒผใ‚Šไป˜ใ‘ใ‚’่งฃ้™ค" },
+  "context_collapseTree_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€(&S)" },
+  "context_collapseTree_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€(&S)" },
+  "context_collapseTree_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€" },
+  "context_collapseTreeRecursively_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซใŸใŸใ‚€(&L)" },
+  "context_collapseTreeRecursively_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซใŸใŸใ‚€(&L)" },
+  "context_collapseTreeRecursively_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซใŸใŸใ‚€" },
+  "context_collapseAll_label": { "message": "ใ™ในใฆใฎใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€(&P)" },
+  "context_collapseAll_command": { "message": "ใ™ในใฆใฎใƒ„ใƒชใƒผใ‚’ใŸใŸใ‚€" },
+  "context_expandTree_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹(&A)" },
+  "context_expandTree_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹(&A)" },
+  "context_expandTree_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹" },
+  "context_expandTreeRecursively_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซๅฑ•้–‹(&U)" },
+  "context_expandTreeRecursively_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซๅฑ•้–‹(&U)" },
+  "context_expandTreeRecursively_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ๅ†ๅธฐ็š„ใซๅฑ•้–‹" },
+  "context_expandAll_label": { "message": "ใ™ในใฆใฎใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹(&X)" },
+  "context_expandAll_command": { "message": "ใ™ในใฆใฎใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹" },
+  "context_bookmarkTree_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&B)" },
+  "context_bookmarkTree_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&B)" },
+  "context_bookmarkTree_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ..." },
+  "context_sendTreeToDevice_label": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’็ซฏๆœซใซ้€ไฟก(&D)" },
+  "context_sendTreeToDevice_label_multiselected": { "message": "้ธๆŠžใ—ใŸใƒ„ใƒชใƒผใ‚’็ซฏๆœซใซ้€ไฟก(&D)" },
+  "context_sendTreeToDevice_command": { "message": "ใ“ใฎใƒ„ใƒชใƒผใ‚’็ซฏๆœซใซ้€ไฟก" },
+  "context_topLevel_prefix": { "message": "ใƒˆใƒƒใƒ—ใƒฌใƒ™ใƒซใฎ้ …็›ฎ: " },
+
+  "context_openAllBookmarksWithStructure_label": { "message": "ใƒ„ใƒชใƒผใจใ—ใฆใ™ในใฆ้–‹ใ(&A)" },
+  "context_openAllBookmarksWithStructureRecursively_label": { "message": "ใ‚ตใƒ–ใƒ•ใ‚ฉใƒซใƒ€ใƒผใ‚‚ๅซใ‚ใฆใƒ„ใƒชใƒผใจใ—ใฆใ™ในใฆ้–‹ใ(&A)" },
+
+  "config_showTreeCommandsInTabsContextMenuGlobally_label": { "message": "ใƒใ‚คใƒ†ใ‚ฃใƒ–ใฎใ‚ฟใƒ–ใƒใƒผไธŠใชใฉใ€ใ‚ฟใƒ–ใฎใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผๅ…จ่ˆฌใซใƒ„ใƒชใƒผๆ“ไฝœ็”จใฎใ‚ณใƒžใƒณใƒ‰ใ‚’่กจ็คบใ™ใ‚‹" },
+
+
+
+  "config_title": { "message": "Tabs Sidebarใฎ่จญๅฎš" },
+
+  "config_recommended_choice": { "message": "๏ผˆๆŽจๅฅจ๏ผ‰" },
+  "config_firefoxCompatible_choice": { "message": "๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผๆ—ขๅฎšใฎๆŒ™ๅ‹•ใฎๅ†็พ๏ผ‰" },
+
+  "config_showExpertOptions_label": { "message": "ไธŠ็ดš่€…ๅ‘ใ‘ใฎ่จญๅฎšใ‚’ใ‚ขใƒณใƒญใƒƒใ‚ฏ" },
+  "config_openOptionsInTab_label": { "message": "ใ“ใฎ่จญๅฎš็”ป้ขใ‚’ใ‚ˆใ‚Šๅบƒใ„ใ‚นใƒšใƒผใ‚นใง้–‹ใ" },
+
+  "config_appearance_caption": { "message": "ๅค–่ฆณ" },
+
+  "config_sidebarPosition_caption": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใฎไฝ็ฝฎใซๅˆใ‚ใ›ใŸใ‚นใ‚ฟใ‚คใƒซ:" },
+  "config_sidebarPosition_left": { "message": "ๅทฆๅด็”จ" },
+  "config_sidebarPosition_right": { "message": "ๅณๅด็”จ" },
+  "config_sidebarPosition_auto": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒ่กจ็คบใ•ใ‚ŒใŸๆ™‚ใซ่‡ชๅ‹•ใงๅˆคๅฎš" },
+  "config_sidebarPosition_description": { "message": "โ€ปใ“ใฎ่จญๅฎšใฏใ‚ตใ‚คใƒ‰ใƒใƒผ่‡ชไฝ“ใฎไฝ็ฝฎใ‚’ๅค‰ๆ›ดใ—ใพใ›ใ‚“ใ€‚ใ‚ตใ‚คใƒ‰ใƒใƒผใ‚’ใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใฎๅณๅดใซ็งปๅ‹•ใ™ใ‚‹ใซใฏใ€ใ‚ตใ‚คใƒ‰ใƒใƒผใฎใƒ˜ใƒƒใƒ€ไธŠใฎๅˆ‡ใ‚Šๆ›ฟใˆใƒกใƒ‹ใƒฅใƒผใ‹ใ‚‰ใ€Œใ‚ตใ‚คใƒ‰ใƒใƒผใ‚’ๅณๅดใซ็งปๅ‹•ใ€ใ‚’้ธๆŠžใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+
+  "config_style_caption": { "message": "ใƒ†ใƒผใƒž" },
+  "config_style_proton": { "message": "Proton" },
+  "config_style_photon": { "message": "Photon" },
+  "config_style_sidebar": { "message": "Sidebar" },
+  "config_style_highcontrast": { "message": "ใƒใ‚คใ‚ณใƒณใƒˆใƒฉใ‚นใƒˆ" },
+  "config_style_none": { "message": "่ฃ…้ฃพ็„กใ—" },
+  "config_style_none_info": { "message": "๏ผˆโ€ปใ€Œ่ฉณ็ดฐ่จญๅฎšใ€โ†’ใ€Œใƒฆใƒผใ‚ถใƒผใ‚นใ‚ฟใ‚คใƒซใ‚ทใƒผใƒˆใ€ใงใŠๅฅฝใฟใฎ่ฃ…้ฃพใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„)" },
+
+  "config_colorScheme_caption": { "message": "้…่‰ฒ:" },
+  "config_colorScheme_photon": { "message": "Photon" },
+  "config_colorScheme_systemColor": { "message": "ใ‚ทใ‚นใƒ†ใƒ ใ‚ซใƒฉใƒผ" },
+
+  "config_maxTreeLevel_before": { "message": "ใƒ„ใƒชใƒผใ‚’" },
+  "config_maxTreeLevel_after": { "message": "้šŽๅฑคใพใงใ‚คใƒณใƒ‡ใƒณใƒˆ่กจ็คบใ™ใ‚‹๏ผˆโ€ป่ฒ ใฎๅ€คใ‚’ๆŒ‡ๅฎšใ—ใŸๅ ดๅˆใฏ็„กๅˆถ้™๏ผ‰" },
+
+  "config_faviconizePinnedTabs_label": { "message": "ใƒ”ใƒณ็•™ใ‚ใ•ใ‚ŒใŸใ‚ฟใƒ–ใฏใ‚ขใ‚คใ‚ณใƒณใฎใฟ่กจ็คบใ™ใ‚‹" },
+  "config_maxFaviconizedPinnedTabsInOneRow_label_before": { "message": "ไธ€่กŒใซ" },
+  "config_maxFaviconizedPinnedTabsInOneRow_label_after": { "message": "ๅ€‹ใพใงใ‚ฟใƒ–ใ‚’่กจ็คบ๏ผˆโ€ป0ไปฅไธ‹ใง่‡ชๅ‹•ๆŠ˜ใ‚Š่ฟ”ใ—๏ผ‰" },
+  "config_maxPinnedTabsRowsAreaPercentage_label_before": { "message": "ใƒ”ใƒณ็•™ใ‚ใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‚’่กจ็คบใ™ใ‚‹้ ˜ๅŸŸใฎๆœ€ๅคงใฎ้ซ˜ใ•๏ผšใ‚ตใ‚คใƒ‰ใƒใƒผใฎ" },
+  "config_maxPinnedTabsRowsAreaPercentage_label_after":  { "message": "%ใพใง" },
+  "config_fadeOutPendingTabs_label": { "message": "่ชญใฟ่พผใฟใ‚’ไฟ็•™ไธญใฎใ‚ฟใƒ–ใฎใ‚ขใ‚คใ‚ณใƒณใ‚’็ฐ่‰ฒใง่กจ็คบ๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.fadeOutUnloadedTabs\"=\"true\"ใฎๅ†็พ๏ผ‰" },
+  "config_fadeOutDiscardedTabs_label": { "message": "ๆ„ๅ›ณ็š„ใซ่งฃๆ”พใ—ใŸ็”ฐๅคซใฎใ‚ขใ‚คใ‚ณใƒณใ‚’็ฐ่‰ฒใง่กจ็คบ๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.fadeOutExplicitlyUnloadedTabs\"=\"true\"ใฎๅ†็พ๏ผ‰" },
+  "config_animation_label": { "message": "ใ‚ขใƒ‹ใƒกใƒผใ‚ทใƒงใƒณๅŠนๆžœใ‚’ๆœ‰ๅŠนใซใ™ใ‚‹" },
+  "config_animationForce_label": { "message": "ใ‚ขใƒ‹ใƒกใƒผใ‚ทใƒงใƒณใ‚’ๆŠ‘ๅˆถใ™ใ‚‹ใƒ—ใƒฉใƒƒใƒˆใƒ•ใ‚ฉใƒผใƒ ใฎ่จญๅฎšใ‚’็„ก่ฆ–ใ—ใฆๆœ‰ๅŠนใซใ™ใ‚‹" },
+  "config_tabPreviewTooltip_label": { "message": "ใ‚ฟใƒ–ใฎไธŠใซใ‚ซใƒผใ‚ฝใƒซใ‚’ไน—ใ›ใŸใจใใ€ใƒ„ใƒผใƒซใƒใƒƒใƒ—ใฎไปฃใ‚ใ‚Šใซใ‚ฟใƒ–ใฎใƒ—ใƒฌใƒ“ใƒฅใƒผ็”ปๅƒใ‚’่กจ็คบใ™ใ‚‹๏ผˆโ€ปWebใƒšใƒผใ‚ธๅ†…ใงใฎใ‚นใ‚ฏใƒชใƒ—ใƒˆใฎๅฎŸ่กŒใ‚’่จฑๅฏใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™๏ผ‰" },
+  "config_tabPreviewTooltipRenderIn_label_before": { "message": "่กจ็คบๅ…ˆ๏ผš" },
+  "config_tabPreviewTooltipRenderIn_content": { "message": "ใ‚ณใƒณใƒ†ใƒณใƒ„้ ˜ๅŸŸๅ†…๏ผˆไธๅฏ่ƒฝใชๅ ดๅˆใฏไฝ•ใ‚‚่กจ็คบใ—ใชใ„๏ผ‰" },
+  "config_tabPreviewTooltipRenderIn_sidebar": { "message": "ๅธธใซใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…" },
+  "config_tabPreviewTooltipRenderIn_anywhere": { "message": "ๅฏ่ƒฝใชๅ ดๅˆใฏใ‚ณใƒณใƒ†ใƒณใƒ„้ ˜ๅŸŸๅ†…ใ€ใใ‚Œไปฅๅค–ใฎๅ ดๅˆใฏใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…" },
+  "config_tabPreviewTooltipRenderIn_label_after": { "message": "\u200b" },
+  "config_inContentUIOffsetTop_label_before": { "message": "ใƒ—ใƒฉใ‚คใƒใ‚ทใƒผๅ„ชๅ…ˆๆ™‚๏ผˆ\"privacy.resistFingerprinting\"=\"true\"ใซ่จญๅฎšใ—ใฆใ„ใ‚‹ๅ ดๅˆใชใฉ๏ผ‰ใงใ‚ตใ‚คใƒ‰ใƒใƒผใฎใƒ˜ใƒƒใƒ€ใƒผใฎ้ซ˜ใ•ใ‚’ๆคœๅ‡บใงใใชใ„ๅ ดๅˆใซใ€ใƒ—ใƒฌใƒ“ใƒฅใƒผใฎ่กจ็คบไฝ็ฝฎใ‚’็ธฆๆ–นๅ‘ใซ" },
+  "config_inContentUIOffsetTop_label_after": { "message": "ใƒ”ใ‚ฏใ‚ปใƒซใšใ‚‰ใ™" },
+  "config_showCollapsedDescendantsByTooltip_label": { "message": "่ฆชใ‚ฟใƒ–ไธŠใฎใƒ„ใƒผใƒซใƒใƒƒใƒ—ใงใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸๅญๅญซใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’่กจ็คบใ™ใ‚‹" },
+  "config_showCollapsedDescendantsByLegacyTooltipOnSidebar_label": { "message": "ใใฎ้š›ใฏๅฟ…่ฆใซๅฟœใ˜ใฆใƒใ‚คใƒ†ใ‚ฃใƒ–ใฎใƒ„ใƒผใƒซใƒใƒƒใƒ—๏ผˆใ‚ตใ‚คใƒ‰ใƒใƒผใฎๅน…ใ‚ˆใ‚Šๅบƒใ่กจ็คบใงใใ‚‹๏ผ‰ใ‚’ไฝฟ็”จใ™ใ‚‹" },
+  "config_shiftTabsForScrollbarDistance_label_before": { "message": "่‡ชๅ‹•็š„ใซ่กจ็คบใ•ใ‚Œใ‚‹ใ‚นใ‚ฏใƒญใƒผใƒซใƒใƒผใซ่ฆ†ใ‚ใ‚Œใฆใ‚ฟใƒ–ๅ†…ใฎใƒœใ‚ฟใƒณใซ่งฆใ‚Œใชใใชใ‚‰ใชใ„ใ‚ˆใ†ใ€" },
+  "config_shiftTabsForScrollbarDistance_label_after": { "message": "ใถใ‚“ใ ใ‘ใ‚ฟใƒ–ใ‚’ใšใ‚‰ใ—ใฆ่กจ็คบใ™ใ‚‹" },
+  "config_shiftTabsForScrollbarDistance_placeholder": { "message": "(CSS้•ทใ•)" },
+  "config_shiftTabsForScrollbarOnlyOnHover_label": { "message": "ใ‚นใ‚ฏใƒญใƒผใƒซใƒใƒผใซใƒžใ‚ฆใ‚นใ‚ซใƒผใ‚ฝใƒซใŒ่ฟ‘ไป˜ใ„ใŸๆ™‚ใ ใ‘ใ‚ฟใƒ–ใ‚’ใšใ‚‰ใ™" },
+  "config_suppressGapFromShownOrHiddenToolbar_caption": { "message": "ไปฅไธ‹ใฎๅ ด้ขใงใƒ„ใƒผใƒซใƒใƒผใฎ่กจ็คบใƒป้ž่กจ็คบใŒไธ€ๆ™‚็š„ใซๅˆ‡ใ‚Šๆ›ฟใ‚ใฃใŸๅ ดๅˆใซใ€ใ‚ตใ‚คใƒ‰ใƒใƒผใฎๅ†…ๅฎนใ‚’ใšใ‚‰ใ—ใฆ่ฆ–่ฆš็š„ใชใ‚ฌใ‚ฟใคใใ‚’ๆŠ‘ๅˆถใ™ใ‚‹" },
+  "config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label": { "message": "ใƒ•ใƒซใ‚นใ‚ฏใƒชใƒผใƒณใƒขใƒผใƒ‰ใฎใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆ" },
+  "config_suppressGapFromShownOrHiddenToolbarOnNewTab_label": { "message": "Firefox 85ไปฅ้™ใงใฎๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–" },
+  "config_suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation_label": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใ‚’ใƒžใ‚ฆใ‚นใงๆ“ไฝœใ—ใŸๅ ดๅˆใฎใฟๆŠ‘ๅˆถใ™ใ‚‹" },
+  "config_showDialogInSidebar_label": { "message": "ๅฏ่ƒฝใงใ‚ใ‚Œใฐใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใงใƒ€ใ‚คใ‚ขใƒญใ‚ฐใ‚’่กจ็คบใ™ใ‚‹" },
+  "config_outOfScreenTabsRenderingPages_label": { "message": "ใ‚ฟใƒ–ใ‚’ไบ‹ๅ‰ใซใƒฌใƒณใƒ€ใƒชใƒณใ‚ฐใ—ใฆใŠใใƒšใƒผใ‚ธๆ•ฐ:" },
+  "config_outOfScreenTabsRenderingPages_description": { "message": "โ€ปใ€Œ-1ใ€ใ‚’ๆŒ‡ๅฎšใ™ใ‚‹ใจใ™ในใฆใฎใ‚ฟใƒ–ใ‚’ไบ‹ๅ‰ใซใƒฌใƒณใƒ€ใƒชใƒณใ‚ฐใ™ใ‚‹ใ‚ˆใ†ใซใชใ‚Šใ€ใ‚นใ‚ฏใƒญใƒผใƒซใฎๅฟœ็ญ”ๆ€งใŒๅ‘ไธŠใ—ใพใ™ใŒใ€ๅผ•ใๆ›ฟใˆใจใ—ใฆใ€ๅˆๆœŸๅŒ–ๅ‡ฆ็†ใซ้•ทใ„ๆ™‚้–“ใ‚’่ฆใ™ใ‚‹ใ‚ˆใ†ใซใชใ‚Šใพใ™" },
+  "config_renderHiddenTabs_label": { "message": "ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใŒ้š ใ—ใŸใ‚ฟใƒ–ใ‚’่กจ็คบใ™ใ‚‹" },
+
+
+  "config_context_caption": { "message": "ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผ" },
+  "config_emulateDefaultContextMenu_label": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผไธŠใงใ‚ฟใƒ–ใฎใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใ‚’ๅ†็พใ™ใ‚‹" },
+  "config_extraItems_tabs_caption": { "message": "ใ‚ฟใƒ–ใฎใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใซ่ฟฝๅŠ ใ™ใ‚‹้ …็›ฎ" },
+  "config_extraItems_tabs_topLevel": { "message": "ใƒˆใƒƒใƒ—ใƒฌใƒ™ใƒซ" },
+  "config_extraItems_tabs_subMenu": { "message": "ใ‚ตใƒ–ใƒกใƒ‹ใƒฅใƒผ" },
+  "config_extraItems_tabs_middleClick": { "message": "ใƒŸใƒ‰ใƒซใ‚ฏใƒชใƒƒใ‚ฏๆ™‚ใฎๅ‹•ไฝœ" },
+  "config_extraItems_bookmarks_caption": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใซ่ฟฝๅŠ ใ™ใ‚‹้ …็›ฎ" },
+  "config_openAllBookmarksWithStructureDiscarded_label": { "message": "่ชญใฟ่พผใฟใ‚’ไฟ็•™ใ—ใŸ็Šถๆ…‹ใงใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_suppressGroupTabForStructuredTabsFromBookmarks_label": { "message": "1ใคใฎใƒ„ใƒชใƒผใซใพใจใพใฃใŸ็Šถๆ…‹ใงใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚Œใ‚‹ๅ ดๅˆใ€ๆœ€ไธŠไฝใฎใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใ‚’้–‹ใใ“ใจใ‚’ๆŠ‘ๅˆถใ™ใ‚‹" },
+
+  "config_sendTabsToDevice_caption": { "message": "Firefox Syncใซใ‚ˆใ‚‹ใ€ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใ‹ใ‚‰ใฎไป–ใฎ็ซฏๆœซใธใฎใ‚ฟใƒ–้€ไฟก" },
+  "config_syncRequirements_description": { "message": "ใ“ใฎๆฉŸ่ƒฝใฏFirefox Syncใซไพๅญ˜ใ—ใ€TSTใŒๅ‹•ไฝœใ—ใฆใ„ใ‚‹็ซฏๆœซใซๅฏพใ—ใฆใฎใฟใ‚ฟใƒ–ใ‚’้€ไฟกใงใใพใ™ใ€‚ไบ‹ๅ‰ใซใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎ่จญๅฎš็”ป้ขใ‹ใ‚‰Firefox Syncใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใŠใใ€ไป–ใฎ็ซฏๆœซใงใ‚‚TSTใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใŠใ„ใฆใใ ใ•ใ„ใ€‚" },
+  "config_syncDeviceInfo_name_label": { "message": "ใ“ใฎ็ซฏๆœซใฎ่กจ็คบๅใจใ‚ขใ‚คใ‚ณใƒณ:" },
+  "config_syncDeviceInfo_name_description_before": { "message": "WebExtensions APIใฎๅˆถ็ด„ใซใ‚ˆใ‚Šใ€TSTใฏFirefox Syncใง่จญๅฎšๆธˆใฟใฎ็ซฏๆœซๅใ‚’่‡ชๅ‹•่ช่ญ˜ใ—ใพใ›ใ‚“ใ€‚ๅˆ†ใ‹ใ‚Šใ‚„ใ™ใ„็ซฏๆœซๅใ‚’ๆ‰‹ๅ‹•ใง่จญๅฎšใ—ใฆใใ ใ•ใ„ใ€‚๏ผˆ" },
+  "config_syncDeviceInfo_name_description_link": { "message": "Firefox SyncใจๅŒใ˜็ซฏๆœซๅ" },
+  "config_syncDeviceInfo_name_description_href": { "message": "https://accounts.firefox.com/settings/clients" },
+  "config_syncDeviceInfo_name_description_after": { "message": "ใซ่จญๅฎšใ™ใ‚‹ใ“ใจใ‚’ๆŽจๅฅจใ—ใพใ™๏ผ‰" },
+  "config_syncDeviceExpirationDays_label_before": { "message": "\u200b" },
+  "config_syncDeviceExpirationDays_label_after": { "message": "ๆ—ฅไปฅไธŠๆŽฅ็ถšๆŽฅ็ถšใ—ใฆใ„ใชใ„็ซฏๆœซใฏ่‡ชๅ‹•็š„ใซ็ซฏๆœซไธ€่ฆงใ‹ใ‚‰ๅ‰Š้™คใ™ใ‚‹๏ผˆ\"0\"=่‡ชๅ‹•ๅ‰Š้™คใ—ใชใ„๏ผ‰" },
+  "config_syncUnsendableUrlPattern_label": { "message": "้€ไฟกใงใใชใ„ใ‚ฟใƒ–ใ‚’่ญ˜ๅˆฅใ™ใ‚‹ใŸใ‚ใฎใƒžใƒƒใƒใƒณใ‚ฐใƒซใƒผใƒซ๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎ \"services.sync.engine.tabs.filteredUrls\" ใจๅŒใ˜ๅ†…ๅฎนใ‚’่จญๅฎšใ—ใฆใใ ใ•ใ„๏ผ‰" },
+  "config_otherDevices_caption": { "message": "ไฝฟ็”จๅฏ่ƒฝใชไป–ใฎ็ซฏๆœซ:" },
+  "config_removeDeviceButton_label": { "message": "ๅ‰Š้™ค" },
+  "config_removeDeviceButton_tooltip": { "message": "ใ“ใฎ็ซฏๆœซใ‚’ไธ€่ฆงใ‹ใ‚‰ๅ‰Š้™คใ™ใ‚‹" },
+
+  "config_autoAttachOnContextNewTabCommand_before": { "message": "ใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใฎใ€Œๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ€ใ‚ณใƒžใƒณใƒ‰ใงใ€ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใ‚’" },
+  "config_autoAttachOnContextNewTabCommand_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnContextNewTabCommand_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnContextNewTabCommand_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnContextNewTabCommand_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnContextNewTabCommand_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnContextNewTabCommand_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnContextNewTabCommand_nextSiblingWithInheritedContainer": { "message": "Ctrl-ใ‚ฏใƒชใƒƒใ‚ฏใจๅŒๆง˜ใซ๏ผˆๅŒ้šŽๅฑคใง้šฃใซใ€ๅŒใ˜ใ‚ณใƒณใƒ†ใƒŠใƒผใง๏ผ‰" },
+  "config_autoAttachOnContextNewTabCommand_after": { "message": "้–‹ใ" },
+                                          
+
+  "config_newTabWithOwner_caption": { "message": "ๆ—ขๅญ˜ใฎใ‚ฟใƒ–ใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–" },
+
+  "config_autoAttachOnOpenedWithOwner_before": { "message": "ๆ—ขๅญ˜ใฎใ‚ฟใƒ–ใ‹ใ‚‰ใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚ŒใŸๅ ดๅˆใ€" },
+  "config_autoAttachOnOpenedWithOwner_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnOpenedWithOwner_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnOpenedWithOwner_childNextToLastRelatedTab": { "message": "่ฆชใฎใ‚ฟใƒ–ใฎๅญใจใ—ใฆใ€็›ด่ฟ‘ใซ้–‹ใ„ใŸๅญใ‚ฟใƒ–ใฎ้šฃใซ" },
+  "config_autoAttachOnOpenedWithOwner_childTop": { "message": "่ฆชใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnOpenedWithOwner_childEnd": { "message": "่ฆชใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnOpenedWithOwner_sibling": { "message": "่ฆชใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnOpenedWithOwner_nextSibling": { "message": "่ฆชใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnOpenedWithOwner_after": { "message": "้–‹ใ" },
+
+  "config_insertNewTabFromFirefoxViewAt_caption": { "message": "Firefox Viewใ‹ใ‚‰๏ผˆๆœ€ไธŠไฝใฎใ‚ฟใƒ–ใจใ—ใฆ่กจใ‚Œใ‚‹๏ผ‰ๆ–ฐใ—ใ„ๅญใ‚ฟใƒ–ใ‚’้–‹ใไฝ็ฝฎ" },
+  "config_insertNewTabFromFirefoxViewAt_noControl": { "message": "ๅˆถๅพกใ—ใชใ„๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผใ‚„ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใฎๅˆคๆ–ญใซไปปใ›ใ‚‹๏ผ‰" },
+  "config_insertNewTabFromFirefoxViewAt_nextToLastRelatedTab": { "message": "็›ด่ฟ‘ใซ้–‹ใ„ใŸๅญใ‚ฟใƒ–ใฎ้šฃใ€ใ‚‚ใ—ใใฏ่ฆชใ‚ฟใƒ–ใฎ่ฟ‘ใ" },
+  "config_insertNewTabFromFirefoxViewAt_top": { "message": "ใƒ„ใƒชใƒผใฎๅ…ˆ้ ญ๏ผˆ่ฆชใ‚ฟใƒ–ใฎ่ฟ‘ใ๏ผ‰" },
+  "config_insertNewTabFromFirefoxViewAt_end": { "message": "ใƒ„ใƒชใƒผใฎๆœซๅฐพ" },
+
+  "config_autoGroupNewTabsFromFirefoxView_label": { "message": "Firefox Viewใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’่‡ชๅ‹•็š„ใซใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹๏ผˆใ€Œ๏ฝžใ‹ใ‚‰้–‹ใ„ใŸใ‚ฟใƒ–ใ€ใจใ„ใ†ใ‚ฟใ‚คใƒˆใƒซใฎใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚Œใพใ™๏ผ‰" },
+  "config_groupTabTemporaryStateForChildrenOfFirefoxView_label": { "message": "Firefox Viewใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ใพใจใ‚ใ‚‹ใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใฎๅˆๆœŸ็Šถๆ…‹:" },
+
+  "config_insertNewTabFromPinnedTabAt_caption": { "message": "ใƒ”ใƒณ็•™ใ‚ใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‹ใ‚‰๏ผˆๆœ€ไธŠไฝใฎใ‚ฟใƒ–ใจใ—ใฆ่กจใ‚Œใ‚‹๏ผ‰ๆ–ฐใ—ใ„ๅญใ‚ฟใƒ–ใ‚’้–‹ใไฝ็ฝฎ" },
+  "config_insertNewTabFromPinnedTabAt_noControl": { "message": "ๅˆถๅพกใ—ใชใ„๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผใ‚„ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใฎๅˆคๆ–ญใซไปปใ›ใ‚‹๏ผ‰" },
+  "config_insertNewTabFromPinnedTabAt_nextToLastRelatedTab": { "message": "็›ด่ฟ‘ใซ้–‹ใ„ใŸๅญใ‚ฟใƒ–ใฎ้šฃใ€ใ‚‚ใ—ใใฏ่ฆชใ‚ฟใƒ–ใฎ่ฟ‘ใ" },
+  "config_insertNewTabFromPinnedTabAt_top": { "message": "ใƒ„ใƒชใƒผใฎๅ…ˆ้ ญ๏ผˆ่ฆชใ‚ฟใƒ–ใฎ่ฟ‘ใ๏ผ‰" },
+  "config_insertNewTabFromPinnedTabAt_end": { "message": "ใƒ„ใƒชใƒผใฎๆœซๅฐพ" },
+
+  "config_autoGroupNewTabsFromPinned_label": { "message": "ๅŒใ˜ใƒ”ใƒณ็•™ใ‚ใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’่‡ชๅ‹•็š„ใซใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹๏ผˆใ€Œ๏ฝžใ‹ใ‚‰้–‹ใ„ใŸใ‚ฟใƒ–ใ€ใจใ„ใ†ใ‚ฟใ‚คใƒˆใƒซใฎใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚Œใพใ™๏ผ‰" },
+  "config_groupTabTemporaryStateForChildrenOfPinned_label": { "message": "ๅŒใ˜ใƒ”ใƒณ็•™ใ‚ใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ใพใจใ‚ใ‚‹ใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใฎๅˆๆœŸ็Šถๆ…‹:" },
+
+
+  "config_newTab_caption": { "message": "ๆ—ขๅญ˜ใฎใ‚ฟใƒ–ไปฅๅค–ใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸๆ–ฐใ—ใ„ใ‚ฟใƒ–" },
+
+  "config_newTabButton_caption": { "message": "ใ€Œๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ€ใƒœใ‚ฟใƒณใฎ็‰นๆฎŠๆ“ไฝœ" },
+  "config_longPressOnNewTabButton_before":               { "message": "ใƒœใ‚ฟใƒณใฎ้•ทๆŠผใ—ใง" },
+  "config_longPressOnNewTabButton_newTabAction":         { "message": "้–ขไฟ‚ใ‚’ๆŒ‡ๅฎšใ—ใฆๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_longPressOnNewTabButton_contextualIdentities": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_longPressOnNewTabButton_none":                 { "message": "ไฝ•ใ‚‚ใ—ใชใ„" },
+  "config_longPressOnNewTabButton_after":                { "message": "\u200b" },
+  "config_showNewTabActionSelector_label":               { "message": "ใƒœใ‚ฟใƒณใ‚’ใƒใ‚คใƒณใƒˆใ—ใŸๆ™‚ใซใ€้–ขไฟ‚ใ‚’ๆŒ‡ๅฎšใ—ใฆๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’้–‹ใใŸใ‚ใฎใƒœใ‚ฟใƒณใ‚’่กจ็คบใ™ใ‚‹" },
+  "config_showContextualIdentitiesSelector_label":       { "message": "ใƒœใ‚ฟใƒณใ‚’ใƒใ‚คใƒณใƒˆใ—ใŸๆ™‚ใซใ€ใ‚ณใƒณใƒ†ใƒŠใƒผใ‚ฟใƒ–ใ‚’้ธๆŠžใ™ใ‚‹ใŸใ‚ใฎใƒœใ‚ฟใƒณใ‚’่กจ็คบใ™ใ‚‹" },
+
+  "config_newTabAction_caption": { "message": "ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใฎๅŸบๆœฌ็š„ใชๅ–ใ‚Šๆ‰ฑใ„" },
+  "config_autoAttachOnNewTabCommand_before": { "message": "ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใ‚’" },
+  "config_autoAttachOnNewTabCommand_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnNewTabCommand_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnNewTabCommand_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabCommand_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabCommand_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnNewTabCommand_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnNewTabCommand_after": { "message": "้–‹ใ" },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandTitle_before": { "message": "ใ‚ฟใ‚คใƒˆใƒซใŒ" },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_before": { "message": "ใพใŸใฏURLใŒ" },
+  "config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_after": { "message": "ใงใ‚ใ‚‹ใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚ŒใŸๅ ดๅˆใ€ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚ŒใŸใจใฟใชใ™๏ผˆโ€ปใ€Œ|ใ€ใงๅŒบๅˆ‡ใฃใฆ่ค‡ๆ•ฐใฎๅ€คใ‚’ๅˆ—ๆŒ™ๅฏ่ƒฝ๏ผ‰" },
+
+  "config_autoAttachOnNewTabButtonMiddleClick_before": { "message": "ไธญใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸๆ™‚ใ€ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใ‚’" },
+  "config_autoAttachOnNewTabButtonMiddleClick_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnNewTabButtonMiddleClick_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonMiddleClick_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonMiddleClick_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonMiddleClick_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnNewTabButtonMiddleClick_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnNewTabButtonMiddleClick_nextSiblingWithInheritedContainer": { "message": "Ctrl-ใ‚ฏใƒชใƒƒใ‚ฏใจๅŒๆง˜ใซ๏ผˆๅŒ้šŽๅฑคใง้šฃใซใ€ๅŒใ˜ใ‚ณใƒณใƒ†ใƒŠใƒผใง๏ผ‰" },
+  "config_autoAttachOnNewTabButtonMiddleClick_after": { "message": "้–‹ใ" },
+
+  "config_middleClickPasteURLOnNewTabButton_label": { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’ใ‚ฏใƒชใƒƒใƒ—ใƒœใƒผใƒ‰ๅ†…ใฎURLใง้–‹ใ๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.searchclipboardfor.middleclick\"=\"true\"ใฎๅ†็พ๏ผš\"dom.events.asyncClipboard.clipboardItem\"ใฎๆœ‰ๅŠนๅŒ–ใŒๅฟ…่ฆ๏ผ‰" },
+
+  "config_autoAttachOnNewTabButtonAccelClick_before": { "message": "Ctrl/โŒ˜-ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸๆ™‚ใ€ๆ–ฐใ—ใ„็ฉบใฎใ‚ฟใƒ–ใ‚’" },
+  "config_autoAttachOnNewTabButtonAccelClick_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnNewTabButtonAccelClick_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonAccelClick_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonAccelClick_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnNewTabButtonAccelClick_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnNewTabButtonAccelClick_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnNewTabButtonAccelClick_nextSiblingWithInheritedContainer": { "message": "ๅŒ้šŽๅฑคใง้šฃใซใ€ๅŒใ˜ใ‚ณใƒณใƒ†ใƒŠใƒผใง" },
+  "config_autoAttachOnNewTabButtonAccelClick_after": { "message": "้–‹ใ" },
+
+  "config_autoAttachWithURL_caption": { "message": "็ฉบใงใชใ„ๆ–ฐใ—ใ„ใ‚ฟใƒ–" },
+
+  "config_duplicateTabAction_caption": { "message": "่ค‡่ฃฝใ•ใ‚ŒใŸใ‚ฟใƒ–๏ผˆใ€Œๅ†่ชญใฟ่พผใฟใ€ใƒœใ‚ฟใƒณใฎไธญใ‚ฏใƒชใƒƒใ‚ฏใชใฉ๏ผ‰" },
+
+  "config_autoAttachOnDuplicated_before": { "message": "่ค‡่ฃฝใ•ใ‚ŒใŸใ‚ฟใƒ–ใ‚’" },
+  "config_autoAttachOnDuplicated_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnDuplicated_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnDuplicated_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnDuplicated_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnDuplicated_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnDuplicated_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnDuplicated_after": { "message": "้–‹ใ" },
+
+  "config_fromExternal_caption": { "message": "ไป–ใฎใ‚ขใƒ—ใƒชใ‚ฑใƒผใ‚ทใƒงใƒณใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–" },
+  "config_autoAttachOnOpenedFromExternal_before": { "message": "\u200b" },
+  "config_autoAttachOnOpenedFromExternal_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnOpenedFromExternal_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnOpenedFromExternal_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnOpenedFromExternal_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnOpenedFromExternal_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnOpenedFromExternal_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnOpenedFromExternal_after": { "message": "้–‹ใ" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_label": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผ:" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_default": { "message": "๏ผˆๅˆถๅพกใ—ใชใ„๏ผ‰" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_parent": { "message": "ใƒ„ใƒชใƒผไธŠใงใฎ่ฆชใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+  "config_inheritContextualIdentityToTabsFromExternalMode_lastActive": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+
+  "config_sameSiteOrphan_caption": { "message": "ใƒญใ‚ฑใƒผใ‚ทใƒงใƒณใƒใƒผใ€ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ€ๅฑฅๆญดใ€ใŠใ‚ˆใณใใฎไป–ใฎใใฃใ‹ใ‘ใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ€็พๅœจใฎใ‚ฟใƒ–ใจๅŒใ˜Webใ‚ตใ‚คใƒˆใฎใ‚ฟใƒ–" },
+  "config_autoAttachSameSiteOrphan_before": { "message": "\u200b" },
+  "config_autoAttachSameSiteOrphan_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachSameSiteOrphan_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachSameSiteOrphan_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachSameSiteOrphan_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachSameSiteOrphan_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachSameSiteOrphan_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachSameSiteOrphan_after": { "message": "้–‹ใ" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_label": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผ:" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_default": { "message": "๏ผˆๅˆถๅพกใ—ใชใ„๏ผ‰" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_parent": { "message": "ใƒ„ใƒชใƒผไธŠใงใฎ่ฆชใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+  "config_inheritContextualIdentityToSameSiteOrphanMode_lastActive": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+
+  "config_anyOtherTrigger_caption": { "message": "ใใ‚Œไปฅๅค–ใฎๅฅ‘ๆฉŸใง้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–" },
+  "config_autoAttachOnAnyOtherTrigger_before": { "message": "\u200b" },
+  "config_autoAttachOnAnyOtherTrigger_noControl": { "message": "(ๅˆถๅพกใ›ใšๆ—ขๅฎšใฎไฝ็ฝฎใซ)" },
+  "config_autoAttachOnAnyOtherTrigger_independent": { "message": "็‹ฌ็ซ‹ใ—ใŸใ‚ฟใƒ–ใจใ—ใฆ" },
+  "config_autoAttachOnAnyOtherTrigger_childTop": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅˆใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnAnyOtherTrigger_childEnd": { "message": "็พๅœจใฎใ‚ฟใƒ–ใฎๆœ€ๅพŒใฎๅญใจใ—ใฆ" },
+  "config_autoAttachOnAnyOtherTrigger_sibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใซ" },
+  "config_autoAttachOnAnyOtherTrigger_nextSibling": { "message": "็พๅœจใฎใ‚ฟใƒ–ใจๅŒ้šŽๅฑคใง้šฃใซ" },
+  "config_autoAttachOnAnyOtherTrigger_after": { "message": "้–‹ใ" },
+  "config_autoAttachOnAnyOtherTrigger_caution": { "message": "โ€ป่ญฆๅ‘Š๏ผšใ“ใฎใ‚ชใƒ—ใ‚ทใƒงใƒณใฏไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใฎๅ‹•ไฝœใ‚’ๅฆจใ’ใ‚‹ๅฑ้™บๆ€งใŒใ‚ใ‚Šใพใ™" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_label": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผ:" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_default": { "message": "๏ผˆๅˆถๅพกใ—ใชใ„๏ผ‰" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_parent": { "message": "ใƒ„ใƒชใƒผไธŠใงใฎ่ฆชใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+  "config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_lastActive": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+
+  "config_inheritContextualIdentityToUnopenableURLTabs_label": { "message": "ๆ‹กๅผตๆฉŸ่ƒฝใฎๆจฉ้™ใง้–‹ใ‘ใชใ„URLใฎใ‚ฟใƒ–ใ‚’ใ€ใ‚ณใƒณใƒ†ใƒŠใƒผใ‚’็ถ™ๆ‰ฟใ™ใ‚‹ใŸใ‚ใซๅฎ‰ๅ…จใชURLใงๅผทๅˆถ็š„ใซ้–‹ใใชใŠใ™" },
+
+  "config_groupTab_caption": { "message": "ใ‚ฟใƒ–ใ‚’่‡ชๅ‹•็š„ใซใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹" },
+
+  "config_tabBunchesDetectionTimeout_before": { "message": "1ใคใฎใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใƒ•ใ‚ฉใƒซใƒ€ใƒผใ‹ใ‚‰" },
+  "config_tabBunchesDetectionTimeout_after": { "message": "ใƒŸใƒช็ง’ไปฅๅ†…ใซ้€ฃ็ถšใ—ใฆ้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ๆคœๅ‡บใ—ใฆใ€" },
+  "config_autoGroupNewTabsFromBookmarks_label": { "message": "ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹๏ผˆใ€Œ๏ฝžใชใฉใ€ใจใ„ใ†ใ‚ฟใ‚คใƒˆใƒซใฎใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚Œใพใ™๏ผ‰" },
+  "config_restoreTreeForTabsFromBookmarks_label": { "message": "ใƒ„ใƒชใƒผๆง‹้€ ใ‚’ๅพฉๅ…ƒใ™ใ‚‹" },
+  "config_requireBookmarksPermission_tooltiptext": { "message": "ใ“ใฎๆฉŸ่ƒฝใฏใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใธใฎใ‚ขใ‚ฏใ‚ปใ‚นๆจฉใ‚’ๅฟ…่ฆใจใ—ใพใ™ใ€‚ใ“ใ“ใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๅฟ…่ฆใชๆจฉ้™ใ‚’ไธŽใˆใฆใใ ใ•ใ„ใ€‚" },
+  "config_requestPermissions_bookmarks_autoGroupNewTabs_before": { "message": "(" },
+  "config_requestPermissions_bookmarks_autoGroupNewTabs_after": { "message": "ใ‚ฟใƒ–ใจใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎๅฏพๅฟœ้–ขไฟ‚ใฎๆคœๅ‡บใ‚’่จฑๅฏใ™ใ‚‹)" },
+  "config_tabsFromSameFolderMinThresholdPercentage_before": { "message": "้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใฎURLใฎใ†ใก" },
+  "config_tabsFromSameFolderMinThresholdPercentage_after": { "message":  "%ไปฅไธŠใŒๅ…ฑ้€šใฎใƒ•ใ‚ฉใƒซใƒ€ใƒผๅ†…ใซใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ•ใ‚Œใฆใ„ใ‚Œใฐใ€้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ™ในใฆใŒใใฎใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใƒ•ใ‚ฉใƒซใƒ€ใƒผใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใจๅˆคๆ–ญใ™ใ‚‹" },
+  "config_autoGroupNewTabsFromOthers_label": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏไปฅๅค–ใ‹ใ‚‰้€ฃ็ถšใ—ใฆ้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚‚่‡ชๅ‹•็š„ใซใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹" },
+  "config_tabBunchesDetectionDelayOnNewWindow_before": { "message": "ใŸใ ใ—ใ€ๆ–ฐใ—ใ„ใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใŒ้–‹ใ‹ใ‚Œใฆใ‹ใ‚‰" },
+  "config_tabBunchesDetectionDelayOnNewWindow_after": { "message": "ใƒŸใƒช็ง’ไปฅๅ†…ใซ้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใฏใ€Œใƒ›ใƒผใƒ ใƒšใƒผใ‚ธใ€ใฎไธ€้ƒจใจ่ฆ‹ใชใ—ใฆใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใชใ„" },
+  "config_warnOnAutoGroupNewTabs_label": { "message": "่‡ชๅ‹•็š„ใซใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ™ใ‚‹ๅ‰ใซ็ขบ่ชใ™ใ‚‹" },
+  "config_warnOnAutoGroupNewTabsWithListing_label": { "message": "ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใ‚ˆใ†ใจใ—ใฆใ„ใ‚‹ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’็ขบ่ชใฎใƒ€ใ‚คใ‚ขใƒญใ‚ฐใซ่กจ็คบใ™ใ‚‹" },
+
+  "config_renderTreeInGroupTabs_label": { "message": "ใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใซใƒ„ใƒชใƒผใ‚’่กจ็คบใ™ใ‚‹" },
+
+  "config_groupTabTemporaryState_caption": { "message": "ๅ ดๅˆใ”ใจใฎใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใฎๅˆๆœŸ็Šถๆ…‹" },
+  "config_groupTabTemporaryState_option_default": { "message": "ไฝ•ใ‚‚ใƒใ‚งใƒƒใ‚ฏใ—ใชใ„" },
+  "config_groupTabTemporaryState_option_checked_before": { "message": "ใ€Œ" },
+  "config_groupTabTemporaryState_option_checked_after": { "message": "ใ€ใ‚’ใƒใ‚งใƒƒใ‚ฏๆธˆใฟใซใ™ใ‚‹" },
+  "config_groupTabTemporaryStateForNewTabsFromBookmarks_label": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ‹ใ‚‰้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใŸๅ ดๅˆ:" },
+  "config_groupTabTemporaryStateForNewTabsFromOthers_label": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏไปฅๅค–ใ‹ใ‚‰้€ฃ็ถšใ—ใฆ้–‹ใ‹ใ‚ŒใŸใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใŸๅ ดๅˆ:" },
+  "config_groupTabTemporaryStateForOrphanedTabs_label": { "message": "้–‰ใ˜ใ‚‰ใ‚ŒใŸ่ฆชใ‚ฟใƒ–ใ‚’็ฝฎใๆ›ใˆใ‚‹ๅฝขใง้–‹ใ‹ใ‚ŒใŸๅ ดๅˆ:" },
+  "config_groupTabTemporaryStateForAPI_label": { "message": "ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใ‹ใ‚‰API็ตŒ็”ฑใงใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ๅŒ–ใ—ใŸๅ ดๅˆ:" },
+
+  "config_inheritContextualIdentityToChildTabMode_label": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผ:" },
+  "config_inheritContextualIdentityToChildTabMode_default": { "message": "๏ผˆๅˆถๅพกใ—ใชใ„๏ผ‰" },
+  "config_inheritContextualIdentityToChildTabMode_parent": { "message": "ใƒ„ใƒชใƒผไธŠใงใฎ่ฆชใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+  "config_inheritContextualIdentityToChildTabMode_lastActive": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‹ใ‚‰็ถ™ๆ‰ฟ" },
+
+
+  "config_treeBehavior_caption": { "message": "ใƒ„ใƒชใƒผใฎๆŒ™ๅ‹•" },
+
+  "config_successorTabControlLevel_caption": { "message": "็พๅœจใฎใ‚ฟใƒ–ใŒๆœ€ๅพŒใฎๅญใ‚ฟใƒ–ใ ใฃใŸๆ™‚ใซใ€็พๅœจใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸๅพŒใฏ" },
+  "config_successorTabControlLevel_inTree": { "message": "ใƒ„ใƒชใƒผๅ†…ใฎ1ใคๅ‰ใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™" },
+  "config_successorTabControlLevel_simulateDefault": { "message": "ๆฌกใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’็งปใ™๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผๆ—ขๅฎšใฎๅ‹•ไฝœ๏ผ‰" },
+  "config_successorTabControlLevel_never": { "message": "ใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’ๅˆถๅพกใ—ใชใ„๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผใพใŸใฏไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใซใ‚ˆใ‚‹ๅˆถๅพกใ‚’ๅฐŠ้‡๏ผ‰" },
+  "config_successorTabControlLevel_legacyDescription": { "message": "โ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.selectOwnerOnClose\"=\"true\"ใฎๆŒ™ๅ‹•ใฎๆ–นใŒใ€ใ“ใฎ่จญๅฎšใ‚ˆใ‚Šใ‚‚ๅ„ชๅ…ˆ็š„ใซๅๆ˜ ใ•ใ‚Œใพใ™ใ€‚" },
+  "config_simulateSelectOwnerOnClose_label": { "message": "็พๅœจใฎใ‚ฟใƒ–ใŒ้–‰ใ˜ใ‚‰ใ‚ŒใŸๆ™‚ใ€ๅฏ่ƒฝใงใ‚ใ‚Œใฐใใฎใ‚ฟใƒ–ใ‚’้–‹ใ„ใŸๅ…ƒใฎใ‚ฟใƒ–ใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ‚’ๆˆปใ™๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.selectOwnerOnClose\"=\"true\"ใฎๆŒ™ๅ‹•ใฎๅ†็พใ€‚ไธŠ่จ˜ใฎ่จญๅฎšใ‚ˆใ‚Šใ‚‚ๅ„ชๅ…ˆ็š„ใซๅๆ˜ ใ•ใ‚Œใพใ™ใ€‚๏ผ‰" },
+
+  "config_fixupTreeOnTabVisibilityChanged_caption": { "message": "ใ‚ฟใƒ–ใฎ่กจ็คบใƒป้ž่กจ็คบใŒไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใซใ‚ˆใฃใฆๅˆ‡ใ‚Šๆ›ฟใˆใ‚‰ใ‚ŒใŸๅ ดๅˆ" },
+  "config_fixupTreeOnTabVisibilityChanged_fix":     { "message": "่กจ็คบไธญใฎใ‚ฟใƒ–ใซๅŸบใฅใ„ใฆใƒ„ใƒชใƒผๆง‹้€ ใ‚’่‡ชๅ‹•็š„ใซไฟฎๆญฃใ™ใ‚‹๏ผˆโ€ปใ‚ฟใƒ–ใฎใ‚ฐใƒซใƒผใƒ—ใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹ๆ‹กๅผตๆฉŸ่ƒฝใจใฎไฝต็”จๆ™‚ใซๆŽจๅฅจ๏ผ‰" },
+  "config_fixupTreeOnTabVisibilityChanged_keep":    { "message": "้ž่กจ็คบใฎใ‚ฟใƒ–ใ‚‚ๅซใ‚ใฆใƒ„ใƒชใƒผๆง‹้€ ใ‚’็ถญๆŒใ™ใ‚‹๏ผˆโ€ปไธ€ๆ™‚็š„ใซใ‚ฟใƒ–ใ‚’้ž่กจ็คบใซใ™ใ‚‹ๆ‹กๅผตๆฉŸ่ƒฝใจใฎไฝต็”จๆ™‚ใซๆŽจๅฅจ๏ผ‰" },
+
+  "config_autoCollapseExpandSubtreeOnAttach_label": { "message": "ๆ–ฐใ—ใ„ใƒ„ใƒชใƒผใŒไฝœใ‚‰ใ‚ŒใŸๆ™‚ใฏใ€่‡ชๅ‹•็š„ใซไป–ใฎใƒ„ใƒชใƒผใ‚’ๆŠ˜ใ‚ŠใŸใŸใ‚€" },
+  "config_autoCollapseExpandSubtreeOnSelect_label": { "message": "ใ‚ฟใƒ–ใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใŸๆ™‚ใฏใ€ใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ•ใ‚ŒใŸใ‚ฟใƒ–ใฎใƒ„ใƒชใƒผใ‚’่‡ชๅ‹•็š„ใซๅฑ•้–‹ใ—ใฆใ€ไป–ใฎใƒ„ใƒชใƒผใ‚’ๆŠ˜ใ‚ŠใŸใŸใ‚€" },
+  "config_autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove_label": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใฆใ‚ฟใƒ–ใฎใƒ•ใ‚ฉใƒผใ‚ซใ‚นใŒๅˆ‡ใ‚Šๆ›ฟใ‚ใฃใŸๅ ดๅˆใ‚’้™คใ" },
+  "config_unfocusableCollapsedTab_label": { "message": "ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผ้…ไธ‹ใฎใ‚ฟใƒ–ใŒใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ•ใ‚ŒใŸๆ™‚ใซใ€ใใฎใ‚ฟใƒ–ใŒๅซใพใ‚Œใ‚‹ใƒ„ใƒชใƒผใ‚’่‡ชๅ‹•็š„ใซๅฑ•้–‹ใ™ใ‚‹" },
+  "config_autoDiscardTabForUnexpectedFocus_label": { "message": "ๅพ…ๆฉŸ็Šถๆ…‹ใฎใ‚ฟใƒ–ใŒๆ„ๅ›ณใ›ใšใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ•ใ‚ŒใŸๅพŒใซใ™ใๅˆฅใฎใ‚ฟใƒ–ใธใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ—็›ดใ•ใ‚ŒใŸๅ ดๅˆใ€ใ‚ฟใƒ–ใ‚’ๅพ…ๆฉŸ็Šถๆ…‹ใซๆˆปใ™" },
+  "config_avoidDiscardedTabToBeActivatedIfPossible_label": { "message": "็พๅœจใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸใ‚Šใƒ„ใƒชใƒผใ‚’ๆŠ˜ใ‚ŠใŸใŸใ‚“ใ ใ‚Šใ—ใŸๆ™‚ใซใ€ใชใ‚‹ในใๅพ…ๆฉŸ็Šถๆ…‹ใฎใ‚ฟใƒ–ใŒ้ธๆŠžใ•ใ‚Œใชใ„ใ‚ˆใ†ใซใ™ใ‚‹" },
+
+  "config_treeDoubleClickBehavior_caption":             { "message": "ใ‚ฟใƒ–ใฎใƒ€ใƒ–ใƒซใ‚ฏใƒชใƒƒใ‚ฏ" },
+  "config_treeDoubleClickBehavior_toggleCollapsed":     { "message": "ใƒ„ใƒชใƒผใ‚’้–‹้–‰ใ™ใ‚‹" },
+  "config_treeDoubleClickBehavior_toggleSticky":        { "message": "ใ‚ฟใƒ–ใƒใƒผ็ซฏใซ่ฒผใ‚Šไป˜ใ‘ใ‚‹/่ฒผใ‚Šไป˜ใ‘ใ‚’่งฃ้™ค" },
+  "config_treeDoubleClickBehavior_close":               { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹" },
+  "config_treeDoubleClickBehavior_close_note":          { "message": "๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎๆฉŸ่ƒฝใงใ‚ใ‚‹\"browser.tabs.closeTabByDblclick\"=\"true\"ใฎๅ†็พ๏ผ‰" },
+  "config_treeDoubleClickBehavior_none":                { "message": "ไฝ•ใ‚‚ใ—ใชใ„" },
+
+  "config_parentTabOperationBehaviorMode_caption": { "message": "่ฆชใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸใ‚Š็งปๅ‹•ใ—ใŸใ‚Šใ—ใŸๆ™‚ใฎๆŒ™ๅ‹•" },
+  "config_parentTabOperationBehaviorMode_noteForPermanentlyConsistentBehaviors": { "message": "ใ“ใ“ใงใฎ่จญๅฎšใซ้–ขใ‚ใ‚‰ใšใ€ใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใงใฎไปฅไธ‹ใฎๅ‹•ไฝœใฏๅธธใซๅ›บๅฎšใงใ™;\n๏ฝฅ ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹: ๅญๅญซใ‚ฟใƒ–ใ‚‚ไธ€็ท’ใซ้–‰ใ˜ใ‚‹\n๏ฝฅ ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’็งปๅ‹•: ๅญๅญซใ‚ฟใƒ–ใ‚‚ไธ€็ท’ใซ็งปๅ‹•\n๏ฝฅ ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’็งปๅ‹•: ใ€Œใƒ‰ใƒฉใƒƒใ‚ฐ๏ผ†ใƒ‰ใƒญใƒƒใƒ—ใ€ใงใฎ่จญๅฎšใซๅพ“ใ†" },
+
+  "config_parentTabOperationBehaviorMode_parallel": { "message": "ใ‚ฟใƒ–ใ‚’ๅ€‹ๅˆฅใซๆ“ไฝœใ™ใ‚‹UIใจใ—ใฆใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ‚’ไฝฟใ†ๅ ดๅˆใฎๆŽจๅฅจๅ‹•ไฝœ" },
+  "config_closeParentBehavior_insideSidebar":       { "message": "ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใง้–‰ใ˜ใŸๆ™‚ใฏใ€" },
+  "config_closeParentBehavior_outsideSidebar":      { "message": "ใƒ„ใƒชใƒผใฎ้–‹้–‰็Šถๆ…‹ใซ้–ขใ‚ใ‚‰ใšใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใงใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸๆ™‚ใฏใ€" },
+  "config_moveParentBehavior_outsideSidebar":       { "message": "ใƒ„ใƒชใƒผใฎ้–‹้–‰็Šถๆ…‹ใซ้–ขใ‚ใ‚‰ใšใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใงใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’็งปๅ‹•ใ—ใŸๆ™‚ใฏใ€" },
+
+  "config_parentTabOperationBehaviorMode_consistent":         { "message": "ใ‚ฟใƒ–ใฎๆŒฏใ‚‹่ˆžใ„ใ‚’ๅ…จ้ข็š„ใซTSTใงๅˆถๅพกใ™ใ‚‹ๅ ดๅˆใฎๆŽจๅฅจๅ‹•ไฝœ" },
+  "config_parentTabOperationBehaviorMode_consistent_caption": { "message": "ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸ/็งปๅ‹•ใ—ใŸๆ™‚ใฏใ€" },
+  "config_parentTabOperationBehaviorMode_consistent_notes":   { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใงใฎๆ“ไฝœใซๅฏพใ—ใฆใ‚‚ใ€ๅธธใซใ“ใฎ้€šใ‚Šๅ‹•ไฝœใ—ใพใ™ใ€‚" },
+
+  "config_parentTabOperationBehaviorMode_custom":                { "message": "ใ‚ซใ‚นใ‚ฟใƒ " },
+  "config_closeParentBehavior_insideSidebar_expanded_caption":   { "message": "้–‰ใ˜ใ‚‹๏ผšๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ€ใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใง้–‰ใ˜ใŸๅ ดๅˆใฏใ€" },
+  "config_closeParentBehavior_outsideSidebar_collapsed_caption": { "message": "้–‰ใ˜ใ‚‹๏ผšๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใง้–‰ใ˜ใŸๅ ดๅˆใฏใ€" },
+  "config_closeParentBehavior_noSidebar_collapsed_caption":      { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒ้ž่กจ็คบใฎๆ™‚ใฏใ€" },
+  "config_closeParentBehavior_outsideSidebar_expanded_caption":  { "message": "้–‰ใ˜ใ‚‹๏ผšๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใง้–‰ใ˜ใŸๅ ดๅˆใฏใ€" },
+  "config_closeParentBehavior_noSidebar_expanded_caption":       { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒ้ž่กจ็คบใฎๆ™‚ใฏใ€" },
+  "config_moveParentBehavior_outsideSidebar_collapsed_caption":  { "message": "็งปๅ‹•๏ผšๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใง็งปๅ‹•ใ—ใŸๅ ดๅˆใฏใ€" },
+  "config_moveParentBehavior_noSidebar_collapsed_caption":       { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒ้ž่กจ็คบใฎๆ™‚ใฏใ€" },
+  "config_moveParentBehavior_outsideSidebar_expanded_caption":   { "message": "็งปๅ‹•๏ผšๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใฎ่ฆชใ‚ฟใƒ–ใ‚’ใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผใ€ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใ€ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใง็งปๅ‹•ใ—ใŸๅ ดๅˆใฏใ€" },
+  "config_moveParentBehavior_noSidebar_expanded_caption":        { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใŒ้ž่กจ็คบใฎๆ™‚ใฏใ€" },
+
+  "config_parentTabOperationBehavior_entireTree":           { "message": "ใƒ„ใƒชใƒผๅ…จไฝ“ใ‚’้–‰ใ˜ใ‚‹/็งปๅ‹•ใ™ใ‚‹" },
+  "config_closeParentBehavior_entireTree":                  { "message": "ใƒ„ใƒชใƒผๅ…จไฝ“ใ‚’้–‰ใ˜ใ‚‹" },
+  "config_moveParentBehavior_entireTree":                   { "message": "ใƒ„ใƒชใƒผๅ…จไฝ“ใ‚’็งปๅ‹•ใ™ใ‚‹" },
+  "config_parentTabOperationBehavior_replaceWithGroupTab":  { "message": "้–‰ใ˜ใŸ/็งปๅ‹•ใ—ใŸ่ฆชใฎไปฃใ‚ใ‚Šใซใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_closeParentBehavior_replaceWithGroupTab":         { "message": "้–‰ใ˜ใŸ่ฆชใฎไปฃใ‚ใ‚Šใซใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_moveParentBehavior_replaceWithGroupTab":          { "message": "็งปๅ‹•ใ—ใŸ่ฆชใฎไปฃใ‚ใ‚Šใซใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใฎใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "config_parentTabOperationBehavior_promoteFirst":         { "message": "ๅธธใซๆœ€ๅˆใฎๅญใ‚ฟใƒ–ใ‚’ๆ–ฐใ—ใ„่ฆชใซๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_closeParentBehavior_promoteFirst":                { "message": "ๅธธใซๆœ€ๅˆใฎๅญใ‚ฟใƒ–ใ‚’ๆ–ฐใ—ใ„่ฆชใซๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_moveParentBehavior_promoteFirst":                 { "message": "ๅธธใซๆœ€ๅˆใฎๅญใ‚ฟใƒ–ใ‚’ๆ–ฐใ—ใ„่ฆชใซๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_parentTabOperationBehavior_promoteAll":           { "message": "ๅธธใซใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_closeParentBehavior_promoteAll":                  { "message": "ๅธธใซใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_moveParentBehavior_promoteAll":                   { "message": "ๅธธใซใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผใ•ใ›ใ‚‹" },
+  "config_parentTabOperationBehavior_promoteIntelligently": { "message": "ๆœ€ไธŠไฝ้šŽๅฑคใงใฏๆœ€ๅˆใฎๅญใ‚’ๆ˜‡ๆ ผใ•ใ›ใ€ใใ‚Œไปฅๅค–ใฏใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผ" },
+  "config_closeParentBehavior_promoteIntelligently":        { "message": "ๆœ€ไธŠไฝ้šŽๅฑคใงใฏๆœ€ๅˆใฎๅญใ‚’ๆ˜‡ๆ ผใ•ใ›ใ€ใใ‚Œไปฅๅค–ใฏใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผ" },
+  "config_moveParentBehavior_promoteIntelligently":         { "message": "ๆœ€ไธŠไฝ้šŽๅฑคใงใฏๆœ€ๅˆใฎๅญใ‚’ๆ˜‡ๆ ผใ•ใ›ใ€ใใ‚Œไปฅๅค–ใฏใ™ในใฆใฎๅญใ‚ฟใƒ–ใ‚’ๆ˜‡ๆ ผ" },
+  "config_parentTabOperationBehavior_detach":               { "message": "ๅญๅญซใฎใ‚ฟใƒ–ใ‚’ใƒ„ใƒชใƒผใ‹ใ‚‰่งฃๆ”พใ™ใ‚‹" },
+  "config_closeParentBehavior_detach":                      { "message": "ๅญๅญซใฎใ‚ฟใƒ–ใ‚’ใƒ„ใƒชใƒผใ‹ใ‚‰่งฃๆ”พใ™ใ‚‹" },
+  "config_moveParentBehavior_detach":                       { "message": "ๅญๅญซใฎใ‚ฟใƒ–ใ‚’ใƒ„ใƒชใƒผใ‹ใ‚‰่งฃๆ”พใ™ใ‚‹" },
+
+  "config_warnOnCloseTabs_label": { "message": "ๅŒๆ™‚ใซ่ค‡ๆ•ฐใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹ใจใใฏ็ขบ่ชใ™ใ‚‹" },
+  "config_warnOnCloseTabsByClosebox_label": { "message": "ใ‚ฏใƒญใƒผใ‚บใƒœใƒƒใ‚ฏใ‚นใฎ้€šๅธธใฎใ‚ฏใƒชใƒƒใ‚ฏๆ“ไฝœใงๅŒๆ™‚ใซ่ค‡ๆ•ฐใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹ใจใใฏ็ขบ่ชใ™ใ‚‹" },
+  "config_warnOnCloseTabsWithListing_label": { "message": "้–‰ใ˜ใ‚ˆใ†ใจใ—ใฆใ„ใ‚‹ใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’็ขบ่ชใฎใƒ€ใ‚คใ‚ขใƒญใ‚ฐใซ่กจ็คบใ™ใ‚‹" },
+
+  "config_insertNewChildAt_caption": { "message": "ๅญใ‚ฟใƒ–ใฎๆŒฟๅ…ฅไฝ็ฝฎใŒๆœชๅˆถๅพกใฎๅ ดๅˆใฎๆ—ขๅฎšใฎๆŒฟๅ…ฅไฝ็ฝฎ" },
+  "config_insertNewChildAt_noControl": { "message": "ๅˆถๅพกใ—ใชใ„๏ผˆใƒ–ใƒฉใ‚ฆใ‚ถใƒผใ‚„ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใฎๅˆคๆ–ญใซไปปใ›ใ‚‹๏ผ‰" },
+  "config_insertNewChildAt_nextToLastRelatedTab": { "message": "็›ด่ฟ‘ใซ้–‹ใ„ใŸๅญใ‚ฟใƒ–ใฎ้šฃใ€ใ‚‚ใ—ใใฏ่ฆชใ‚ฟใƒ–ใฎ้šฃ" },
+  "config_insertNewChildAt_top": { "message": "ใƒ„ใƒชใƒผใฎๅ…ˆ้ ญ๏ผˆ่ฆชใ‚ฟใƒ–ใฎ้šฃ๏ผ‰" },
+  "config_insertNewChildAt_end": { "message": "ใƒ„ใƒชใƒผใฎๆœซๅฐพ" },
+
+
+  "config_drag_caption": { "message": "ใƒ‰ใƒฉใƒƒใ‚ฐ๏ผ†ใƒ‰ใƒญใƒƒใƒ—" },
+
+  "config_tabDragBehavior_caption":       { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใง่ฆชใ‚ฟใƒ–ใ‚’ใƒ‰ใƒฉใƒƒใ‚ฐ้–‹ๅง‹ใ—ใŸๆ™‚ใฎๅ‹•ไฝœ" },
+  "config_tabDragBehavior_description":   { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎๅˆถ้™ใฎใŸใ‚ใ€ใ‚ฟใƒ–ใƒใƒผๅค–ใธใฎใƒ‰ใƒญใƒƒใƒ—ๅพŒใซใ‚ฟใƒ–ใ‚’ใฉใ†ๅ–ใ‚Šๆ‰ฑใ†ใ‹ใฏใ€ใƒ‰ใƒฉใƒƒใ‚ฐๆ“ไฝœ้–‹ๅง‹ๆ™‚ใซๆฑบๅฎšใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚" },
+  "config_tabDragBehavior_label":         { "message": "้€šๅธธใฎใƒ‰ใƒฉใƒƒใ‚ฐ" },
+  "config_tabDragBehaviorShift_label":    { "message": "Shift-ใƒ‰ใƒฉใƒƒใ‚ฐ" },
+  "config_tabDragBehavior_label_behaviorInsideSidebar":  { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผๅ†…ใธใฎใƒ‰ใƒญใƒƒใƒ—" },
+  "config_tabDragBehavior_label_behaviorOutsideSidebar": { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผๅค–ใธใฎใƒ‰ใƒญใƒƒใƒ—" },
+  "config_tabDragBehavior_moveEntireTreeAlways":         { "message": "ๅธธใซใƒ„ใƒชใƒผๅ…จไฝ“ใ‚’็งปๅ‹•ใ™ใ‚‹" },
+  "config_tabDragBehavior_detachEntireTreeAlways":       { "message": "ๅธธใซใƒ„ใƒชใƒผๅ…จไฝ“ใ‚’ๅˆฅใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใซๅˆ‡ใ‚Š้›ขใ™๏ผˆใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎไฝœๆˆใฏใงใใพใ›ใ‚“๏ผ‰" },
+  "config_tabDragBehavior_bookmarkEntireTreeAlways":     { "message": "ๅธธใซใƒ„ใƒชใƒผๅ…จไฝ“ใฎใ‚ฟใƒ–ใ‹ใ‚‰ใƒชใƒณใ‚ฏใ‹ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ‚’ไฝœๆˆใ™ใ‚‹๏ผˆๅˆฅใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใธใฎๅˆ‡ใ‚Š้›ขใ—ใฏใงใใพใ›ใ‚“๏ผ‰" },
+  "config_tabDragBehavior_moveSoloTabIfExpanded":        { "message": "ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใงใฏใ‚ฟใƒ–ๅ˜ไฝ“ใ‚’็งปๅ‹•ใ—ใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚Œใฆใ„ใ‚‹ใƒ„ใƒชใƒผใงใฏๅ…จไฝ“ใ‚’็งปๅ‹•ใ™ใ‚‹" },
+  "config_tabDragBehavior_detachSoloTabIfExpanded":      { "message": "ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใงใฏใ‚ฟใƒ–ๅ˜ไฝ“ใ‚’ใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚Œใฆใ„ใ‚‹ใƒ„ใƒชใƒผใงใฏๅ…จไฝ“ใ‚’ๅˆฅใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใซๅˆ‡ใ‚Š้›ขใ™๏ผˆใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎไฝœๆˆใฏใงใใพใ›ใ‚“๏ผ‰" },
+  "config_tabDragBehavior_bookmarkSoloTabIfExpanded":    { "message": "ๅฑ•้–‹็Šถๆ…‹ใฎใƒ„ใƒชใƒผใงใฏใ‚ฟใƒ–ๅ˜ไฝ“ใ‹ใ‚‰ใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚Œใฆใ„ใ‚‹ใƒ„ใƒชใƒผใงใฏๅ…จไฝ“ใ‹ใ‚‰ใƒชใƒณใ‚ฏใ‹ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ‚’ไฝœๆˆใ™ใ‚‹๏ผˆๅˆฅใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใธใฎๅˆ‡ใ‚Š้›ขใ—ใฏใงใใพใ›ใ‚“๏ผ‰" },
+  "config_tabDragBehavior_doNothing":                    { "message": "ไฝ•ใ‚‚ใ—ใชใ„" },
+  "config_tabDragBehavior_noteForDragstartOutsideSidebar": { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ช่บซใฎใ‚ฟใƒ–ใƒใƒผไธŠใง่ฆชใ‚ฟใƒ–ใ‚’ใƒ‰ใƒฉใƒƒใ‚ฐ้–‹ๅง‹ใ—ใŸๆ™‚ใฎๅ‹•ไฝœใฏใ€ใ€Œใƒ„ใƒชใƒผใฎๆŒ™ๅ‹•ใ€โ†’ใ€Œ่ฆชใ‚ฟใƒ–ใ‚’้–‰ใ˜ใŸใ‚Š็งปๅ‹•ใ—ใŸใ‚Šใ—ใŸๆ™‚ใฎๆŒ™ๅ‹•ใ€ใงใฎๆŒ‡ๅฎšใซๆบ–ใ˜ใพใ™" },
+  "config_showTabDragBehaviorNotification_label": { "message": "ใ‚ฟใƒ–ใฎใƒ‰ใƒฉใƒƒใ‚ฐไธญใ€ใ‚ตใ‚คใƒ‰ใƒใƒผๅค–ใซใƒ‰ใƒญใƒƒใƒ—ใ—ใŸๆ™‚ใฎๆ“ไฝœ่ชฌๆ˜Žใ‚’่กจ็คบใ™ใ‚‹" },
+
+  "config_dropLinksOnTabBehavior_caption": { "message": "ใ‚ฟใƒ–ใซใƒชใƒณใ‚ฏใ‚„URLๆ–‡ๅญ—ๅˆ—ใ‚’ใƒ‰ใƒญใƒƒใƒ—ใ—ใŸใจใ" },
+  "config_dropLinksOnTabBehavior_ask":     { "message": "ใฉใ†ใ™ใ‚‹ใ‹ๅธธใซ่จŠใญใ‚‹" },
+  "config_dropLinksOnTabBehavior_load":    { "message": "ใใฎใ‚ฟใƒ–ใซ่ชญใฟ่พผใ‚€" },
+  "config_dropLinksOnTabBehavior_newtab":  { "message": "ๆ–ฐใ—ใ„ๅญใ‚ฟใƒ–ใง้–‹ใ" },
+  "config_simulateTabsLoadInBackgroundInverted_label": { "message": "ใƒ‰ใƒญใƒƒใƒ—ใ•ใ‚ŒใŸใƒชใƒณใ‚ฏใ‚’ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใง้–‹ใ„ใŸใจใใ€ใ™ใใซใใฎใ‚ฟใƒ–ใซๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ็ต„ใฟ่พผใฟใฎ่จญๅฎš้ …็›ฎใ€Œใƒชใƒณใ‚ฏใ€็”ปๅƒใ€ใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใง้–‹ใ„ใŸใจใใ€ใ™ใใซใใฎใ‚ฟใƒ–ใซๅˆ‡ใ‚Šๆ›ฟใˆใ‚‹ใ€๏ผˆ\"browser.tabs.loadInBackground\"๏ผ‰ใฎๅ†็พ๏ผ‰" },
+  "config_tabsLoadInBackgroundDiscarded_label": { "message": "่ชญใฟ่พผใฟใ‚’ไฟ็•™ใ—ใŸ็Šถๆ…‹ใงใ‚ฟใƒ–ใ‚’้–‹ใ" },
+
+  "config_insertDroppedTabsAt_caption": { "message": "่ฆชใ‚ฟใƒ–ใซใƒ‰ใƒญใƒƒใƒ—ใ•ใ‚ŒใŸๅญใ‚ฟใƒ–ใฎๆŒฟๅ…ฅไฝ็ฝฎ" },
+  "config_insertDroppedTabsAt_inherit": { "message": "่ฆชใ‚ฟใƒ–ใ‹ใ‚‰ๆ–ฐใ—ใ„ๅญใ‚ฟใƒ–ใ‚’้–‹ใ„ใŸใจใใจๅŒๆง˜ใซๆ‰ฑใ†" },
+  "config_insertDroppedTabsAt_first": { "message": "ใƒ„ใƒชใƒผใฎๅ…ˆ้ ญ๏ผˆ่ฆชใ‚ฟใƒ–ใฎ้šฃ๏ผ‰" },
+  "config_insertDroppedTabsAt_end": { "message": "ใƒ„ใƒชใƒผใฎๆœซๅฐพ" },
+
+  "config_autoCreateFolderForBookmarksFromTree_label":  { "message": "ใƒ„ใƒชใƒผๆง‹้€ ใ‚’ๆŒใฃใŸใ‚ฟใƒ–ใ‚’่ค‡ๆ•ฐ้ธๆŠžใ—ใฆใฎใƒ‰ใƒฉใƒƒใ‚ฐ๏ผ†ใƒ‰ใƒญใƒƒใƒ—ใชใฉใฎๆ“ไฝœใง่ค‡ๆ•ฐใฎใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใŒไฝœๆˆใ•ใ‚ŒใŸใจๆŽจๆธฌใงใใ‚‹ๅ ดๅˆใซใ€ไฝœๆˆใ•ใ‚ŒใŸใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ‚’่‡ชๅ‹•็š„ใซ1ใคใฎใƒ•ใ‚ฉใƒซใƒ€ใƒผใซใพใจใ‚ใ‚‹" },
+  "config_autoExpandOnLongHoverDelay_before":  { "message": "ใƒ‰ใƒฉใƒƒใ‚ฐๆ“ไฝœไธญใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใฎไธŠใง" },
+  "config_autoExpandOnLongHoverDelay_after":  { "message": "ใƒŸใƒช็ง’ไปฅไธŠ็ตŒ้Žใ—ใŸใ‚‰ใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹" },
+  "config_autoExpandOnLongHoverRestoreIniitalState_label":  { "message": "ใƒ‰ใƒฉใƒƒใ‚ฐๆ“ไฝœใฎ็ต‚ไบ†ๅพŒใ€ใƒ„ใƒชใƒผใ‚’ๆŠ˜ใ‚ŠใŸใŸใ‚“ใ ็Šถๆ…‹ใซ่‡ชๅ‹•็š„ใซๆˆปใ™" },
+  "config_autoExpandIntelligently_label":  { "message": "ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใ‚’่‡ชๅ‹•ๅฑ•้–‹ใ—ใŸใจใใซใ€ไป–ใฎใƒ„ใƒชใƒผใ‚’่‡ชๅ‹•็š„ใซๆŠ˜ใ‚ŠใŸใŸใ‚€" },
+  "config_ignoreTabDropNearSidebarArea_label":  { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใฎ่ฟ‘ใใซใ‚ฟใƒ–ใ‚’ใƒ‰ใƒญใƒƒใƒ—ใ—ใŸๅ ดๅˆใฏใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใ‹ใ‚‰ๅˆ‡ใ‚Š้›ขใ•ใชใ„๏ผˆ\"privacy.resistFingerprinting\"=\"true\" ใซ่จญๅฎšใ—ใฆใ„ใ‚‹ใจใใฏใƒใ‚งใƒƒใ‚ฏใ‚’ๅค–ใ™ใ“ใจใ‚’ใŠใ™ใ™ใ‚ใ—ใพใ™๏ผ‰" },
+
+
+  "config_more_caption": { "message": "ใใฎไป–..." },
+
+  "config_shortcuts_caption": { "message": "ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆ" },
+
+  "config_requestPermissions_allUrls_ctrlTabTracking":   { "message": "ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใงใฎใ‚ฟใƒ–ๅˆ‡ใ‚Šๆ›ฟใˆไธญใฏใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸๅญๅญซใ‚ฟใƒ–ใซใฏใƒ•ใ‚ฉใƒผใ‚ซใ‚นใ›ใšใ€ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใ‚‚ๅฑ•้–‹ใ—ใชใ„๏ผˆโ€ปWebใƒšใƒผใ‚ธๅ†…ใงใฎใ‚นใ‚ฏใƒชใƒ—ใƒˆใฎๅฎŸ่กŒใ‚’่จฑๅฏใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™๏ผ‰" },
+  "config_autoExpandOnTabSwitchingShortcutsDelay_before": { "message": "ๆŠ˜ใ‚ŠใŸใŸใพใ‚ŒใŸใƒ„ใƒชใƒผใซใƒ•ใ‚ฉใƒผใ‚ซใ‚นใŒใ‚ใ‚‹็Šถๆ…‹ใงTabใ‚ญใƒผใ‚’" },
+  "config_autoExpandOnTabSwitchingShortcutsDelay_after": { "message": "ใƒŸใƒช็ง’ไปฅไธŠๆŠผใ—็ถšใ‘ใŸใ‚‰ใƒ„ใƒชใƒผใ‚’ๅฑ•้–‹ใ™ใ‚‹" },
+  "config_accelKey_label":   { "message": "ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใฎใ‚ขใ‚ฏใ‚ปใƒฉใƒฌใƒผใ‚ฟใ‚ญใƒผ๏ผˆโ€ปใ€Œui.key.accelKeyใ€ใฎ่จญๅฎšใจไธ€่‡ดใ•ใ›ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™๏ผ‰:" },
+  "config_accelKey_auto":    { "message": "ๆ—ขๅฎš๏ผˆmacOS=โŒ˜, ใใ‚Œไปฅๅค–=Ctrl๏ผ‰" },
+  "config_accelKey_alt":     { "message": "Alt" },
+  "config_accelKey_control": { "message": "Ctrl/Control" },
+  "config_accelKey_meta":    { "message": "Meta/โŒ˜" },
+
+  "config_shortcuts_resetAll": { "message": "ใ™ในใฆๅˆๆœŸๅ€คใซๆˆปใ™" },
+
+
+  "config_advanced_caption": { "message": "่ฉณ็ดฐ่จญๅฎš" },
+
+  "config_bookmarkTreeFolderName_before": { "message": "ใƒ„ใƒชใƒผใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใ™ใ‚‹ๆ™‚ใฎใƒ•ใ‚ฉใƒซใƒ€ใƒผๅ:" },
+  "config_bookmarkTreeFolderName_after": { "message": "\u200b" },
+  "config_bookmarkTreeFolderName_description": { "message": "ไปฅไธ‹ใฎใƒ—ใƒฌใƒผใ‚นใƒ›ใƒซใƒ€ใ‚’ไฝฟ็”จใงใใพใ™: %TITLE%๏ผˆ1ใค็›ฎใฎใ‚ฟใƒ–ใฎใ‚ฟใ‚คใƒˆใƒซ๏ผ‰, %URL%๏ผˆ1ใค็›ฎใฎใ‚ฟใƒ–ใฎURL๏ผ‰, %YEAR%๏ผˆ4ๆกใฎๅนด๏ผ‰, %SHORT_YEAR%๏ผˆ2ๆกใฎๅนด๏ผ‰, %MONTH%๏ผˆ2ๆกใฎๆœˆ๏ผ‰, %DATE%๏ผˆ2ๆกใฎๆ—ฅ๏ผ‰, %HOURS%๏ผˆ2ๆกใฎๆ™‚้–“๏ผ‰, %MINUTES%๏ผˆ2ๆกใฎๅˆ†๏ผ‰, %SECONDS%๏ผˆ2ๆกใฎ็ง’๏ผ‰, %MILLISECONDS%๏ผˆ3ๆกใฎใƒŸใƒช็ง’๏ผ‰, %GROUP%๏ผˆๆœ€ๅˆใฎใ‚ฟใƒ–ใŒใ‚ฐใƒซใƒผใƒ—ใ‚ฟใƒ–ใ ใฃใŸๅ ดๅˆใฏใใฎใ‚ฟใ‚คใƒˆใƒซใ€ใใ‚Œไปฅๅค–ใฎๅ ดๅˆใฏ็ฉบ๏ผ‰, %ANY(ๅ€ค1, ๅ€ค2, ...)%๏ผˆไธŽใˆใ‚‰ใ‚ŒใŸใƒชใ‚นใƒˆใฎไธญใงๆœ€ๅˆใซๆœ‰ๅŠนใชๅ€ค๏ผ‰" },
+
+  "config_defaultBookmarkParentId_label":  { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎไฝœๆˆๅ…ˆใƒ•ใ‚ฉใƒซใƒ€ใƒผใฎๆ—ขๅฎšๅ€ค" },
+
+  "config_tabGroupsEnabled_label": { "message": "ใƒใ‚คใƒ†ใ‚ฃใƒ–ใฎใ‚ฟใƒ–ใ‚ฐใƒซใƒผใƒ—ใฎ็ฎก็†ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹๏ผˆโ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎ่จญๅฎšใงใ‚ใ‚‹\"browser.tabs.groups.enabled\"=\"true\"ใซๅฏพๅฟœ)" },
+
+  "config_undoMultipleTabsClose_label": { "message": "ๆœ€ๅพŒใซใพใจใ‚ใฆ้–‰ใ˜ใŸใ‚ฟใƒ–็พคใฎใ†ใกใฎ1ใคใŒใ€Œ้–‰ใ˜ใŸใ‚ฟใƒ–ใ‚’ๅ…ƒใซๆˆปใ™ใ€ใงๅพฉๅ…ƒใ•ใ‚ŒใŸใจใใ€ใ‚ฟใƒ–็พคๅ…จไฝ“ใ‚’ๅพฉๅ…ƒใ™ใ‚‹" },
+
+  "config_scrollLines_label_before": { "message": "ใ‚ญใƒผใƒœใƒผใƒ‰ใ‚ทใƒงใƒผใƒˆใ‚ซใƒƒใƒˆใฎใ€Œใ‚ฟใƒ–ใฎไธ€่ฆงใ‚’ๆ•ฐ่กŒไธŠ/ไธ‹ใซใ‚นใ‚ฏใƒญใƒผใƒซใ€ใง" },
+  "config_scrollLines_label_after":  { "message": "่กŒๅˆ†ใ‚นใ‚ฏใƒญใƒผใƒซใ™ใ‚‹" },
+
+  "config_userStyleRules_label": { "message": "ใƒฆใƒผใ‚ถใƒผใ‚นใ‚ฟใ‚คใƒซใ‚ทใƒผใƒˆ๏ผˆใ‚ตใ‚คใƒ‰ใƒใƒผใชใฉใ€ใƒ„ใƒชใƒผๅž‹ใ‚ฟใƒ–ใŒๆไพ›ใ™ใ‚‹ใƒšใƒผใ‚ธ็”จใฎ่ฟฝๅŠ ใฎใ‚นใ‚ฟใ‚คใƒซๆŒ‡ๅฎš๏ผ‰" },
+  "config_userStyleRules_description_before": { "message": "\u200b" },
+  "config_userStyleRules_description_link_label": { "message": "็›ฎ็š„ๅˆฅใฎๆŒ‡ๅฎšไพ‹" },
+  "config_userStyleRules_description_after": { "message": "ใ‚‚ๅ‚็…งใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "config_userStyleRules_description_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#for-version-2x" },
+  "config_userStyleRules_themeRules_description": { "message": "็พๅœจใฎใƒ–ใƒฉใ‚ฆใ‚ถใฎใƒ†ใƒผใƒžใซๅŸบใฅใ„ใฆใ€ใ€Œvar()ใ€ใงไปฅไธ‹ใฎใ‚ซใ‚นใ‚ฟใƒ ใƒ—ใƒญใƒ‘ใƒ†ใ‚ฃใ‚‚ไฝฟ็”จใงใใพใ™๏ผš" },
+  "config_userStyleRules_themeRules_description_alphaVariations": { "message": "ใ€Œ--theme-colors-tab_background_text-30ใ€ใฎใ‚ˆใ†ใซใ‚ซใ‚นใ‚ฟใƒ ใƒ—ใƒญใƒ‘ใƒ†ใ‚ฃๅใฎๅพŒใซไธ้€ๆ˜Žๅบฆใ‚’ๆŒ‡ๅฎšใ™ใ‚‹ใจใ€10%ๅˆปใฟใงไธ้€ๆ˜Žๅบฆใ‚’ๅค‰ใˆใ‚‰ใ‚Œใพใ™๏ผˆใ“ใฎไพ‹ใงใฏไธ้€ๆ˜Žๅบฆ30%๏ผ‰" },
+  "config_userStyleRules_import": { "message": "ใƒ•ใ‚กใ‚คใƒซใ‹ใ‚‰่ชญใฟ่พผใฟ" },
+  "config_userStyleRules_export": { "message": "ใƒ•ใ‚กใ‚คใƒซใซไฟๅญ˜" },
+  "config_userStyleRules_overwrite_title":     { "message": "็พๅœจใฎๅ†…ๅฎนใ‚’็ฝฎใๆ›ใˆใพใ™ใ‹๏ผŸ" },
+  "config_userStyleRules_overwrite_message":   { "message": "่ชญใฟ่พผใ‚“ใ ๅ†…ๅฎนใง็พๅœจใฎใ‚นใ‚ฟใ‚คใƒซๆŒ‡ๅฎšใ‚’ใ™ในใฆ็ฝฎใๆ›ใˆใพใ™ใ‹๏ผŸ" },
+  "config_userStyleRules_overwrite_overwrite": { "message": "ใ™ในใฆ็ฝฎใๆ›ใˆใ‚‹" },
+  "config_userStyleRules_overwrite_append":    { "message": "ๆœ€ๅพŒใซ่ฟฝๅŠ ใ™ใ‚‹" },
+  "config_tooLargeUserStyleRulesCaution": { "message": "ใ‚นใ‚ฟใ‚คใƒซๆŒ‡ๅฎšใŒ้•ทใ™ใŽใพใ™๏ผ ใ‚‚ใฃใจ็Ÿญใใ—ใฆใใ ใ•ใ„" },
+  "config_userStyleRulesTheme_label":     { "message": "ใƒ†ใƒผใƒž:" },
+  "config_userStyleRulesTheme_auto":      { "message": "่‡ชๅ‹•" },
+  "config_userStyleRulesTheme_separator": { "message": "-----------------" },
+  "config_userStyleRulesTheme_default":   { "message": "ๆ—ขๅฎš" },
+
+
+  "config_addons_caption": { "message": "ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใซใ‚ˆใ‚‹ๆฉŸ่ƒฝ่ฟฝๅŠ " },
+
+  "config_addons_description_before": { "message": "\u200b" },
+  "config_addons_description_link_label": { "message": "TST่‡ชไฝ“ใ‚’ๆ‹กๅผตใ™ใ‚‹ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝ" },
+  "config_addons_description_after": { "message": "ใ‚’็ต„ใฟๅˆใ‚ใ›ใ‚‹ใจใ€TSTใฎใ‚ตใ‚คใƒ‰ใƒใƒผใซใ•ใ‚‰ใซๆฉŸ่ƒฝใ‚’่ฟฝๅŠ ใงใใพใ™ใ€‚" },
+  "helper_addons_list_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/TST%E3%81%AE%E6%A9%9F%E8%83%BD%E3%82%92%E6%8B%A1%E5%BC%B5%E3%81%99%E3%82%8B%E3%82%A2%E3%83%89%E3%82%AA%E3%83%B3" },
+
+  "config_theme_description_before": { "message": "็ต„ใฟ่พผใฟใฎใƒ†ใƒผใƒžใฏ็พๅœจใ€ŒPlainใ€ใ€ŒSidebarใ€ใ€Œใƒใ‚คใ‚ณใƒณใƒˆใƒฉใ‚นใƒˆใ€ใฎใฟๅˆฉ็”จๅฏ่ƒฝใงใ™ใ€‚ไป–ใฎใƒ†ใƒผใƒžใ‚’ไฝฟ็”จใ—ใŸใ„ๅ ดๅˆใ€" },
+  "config_theme_description_link_label": { "message": "ใ‚ณใƒผใƒ‰ใ‚นใƒ‹ใƒšใƒƒใƒˆ" },
+  "config_theme_description_after": { "message": "ใซใ‚ใ‚‹ไพ‹ใ‚’ๅ‚็…งใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+  "helper_theme_list_link_uri": { "message": "https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#restore-old-built-in-themes" },
+
+  "config_externaladdonpermissions_label": { "message": "ไป–ใฎๆ‹กๅผตๆฉŸ่ƒฝใ‹ใ‚‰ใฎAPIๅ‘ผใณๅ‡บใ—ใซไธŽใˆใ‚‹่จฑๅฏ" },
+  "config_externaladdonpermissions_description": { "message": "ใ“ใ“ใงใƒใ‚งใƒƒใ‚ฏใ‚’ๅ…ฅใ‚ŒใŸๆ‹กๅผตๆฉŸ่ƒฝใฏใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่‡ชไฝ“ใŒใใฎๆ‹กๅผตๆฉŸ่ƒฝใซใ‚ฟใƒ–ใฎ่ฉณ็ดฐๆƒ…ๅ ฑใ‚„ใƒ—ใƒฉใ‚คใƒ™ใƒผใƒˆใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใฎใ‚ฟใƒ–ใธใฎใ‚ขใ‚ฏใ‚ปใ‚นใ‚’็ฆๆญขใ—ใฆใ„ใฆใ‚‚ใ€<em>Tabs Sidebarใฎๆจฉ้™ใง</em>ใใ‚Œใ‚‰ใซใ‚ขใ‚ฏใ‚ปใ‚นใงใใ‚‹ใ‚ˆใ†ใซใชใ‚Šใพใ™ใ€‚<em>ไฟก็”จใงใใชใ„ๆ‹กๅผตๆฉŸ่ƒฝใซๅฏพใ—ใฆใฏ็ตถๅฏพใซๆจฉ้™ใ‚’ไธŽใˆใชใ„ใงไธ‹ใ•ใ„ใ€‚<em>" },
+  "config_externalAddonPermissions_header_name": { "message": "ๆ‹กๅผตๆฉŸ่ƒฝๅ" },
+  "config_externalAddonPermissions_header_permissions": { "message": "่จฑๅฏใ™ใ‚‹็‰นๅˆฅใชๆ“ไฝœ" },
+  "config_externalAddonPermissions_header_incognito": { "message": "ใƒ—ใƒฉใ‚คใƒ™ใƒผใƒˆใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใ‹ใ‚‰ใฎใƒกใƒƒใ‚ปใƒผใ‚ธใ‚’้€š็Ÿฅใ™ใ‚‹" },
+
+  "addon_containerBookmarks_label": { "message": "Container Bookmarks" },
+  "addon_containerBookmarks_uri": { "message": "https://addons.mozilla.org/firefox/addon/container-bookmarks/" },
+  "config_containerRedirectKey_label": { "message": "ใƒชใƒ€ใ‚คใƒฌใ‚ฏใƒˆใ‚ญใƒผ๏ผˆโ€ปContainer Bookmarksใฎ่จญๅฎš็”ป้ขใฎๅ€คใจๆƒใˆใฆไธ‹ใ•ใ„๏ผ‰:" },
+
+
+  "config_debug_caption": { "message": "้–‹็™บ็”จ" },
+
+  "config_link_startupPage_label": { "message": "ๅˆๅ›ž่ตทๅ‹•ๆ™‚็”จใฎใƒšใƒผใ‚ธ" },
+  "config_link_groupPage_label":   { "message": "ใ‚ฐใƒซใƒผใƒ—ๅŒ–็”จใ‚ฟใƒ–ใฎใƒšใƒผใ‚ธ" },
+  "config_link_tabbarPage_label":   { "message": "ใ‚ฟใƒ–ใƒใƒผใฎใƒšใƒผใ‚ธ" },
+
+  "config_runTests_label": { "message": "่‡ชๅ‹•ใƒ†ใ‚นใƒˆใ‚’ๅฎŸ่กŒ" },
+  "config_runTestsParameters_label": { "message": " / ๅฎŸ่กŒใ™ใ‚‹ใƒ†ใ‚นใƒˆใฎๆŒ‡ๅฎš๏ผˆใƒ†ใ‚นใƒˆๅใพใŸใฏๆญฃ่ฆ่กจ็พใฎ้…ๅˆ—ใ€‚ไพ‹๏ผšใ€ŒtestInheritMutedState,/^testHidden/,...ใ€๏ผ‰:" },
+  "config_runBenchmark_label": { "message": "ใƒ™ใƒณใƒใƒžใƒผใ‚ฏใ‚’ๅฎŸ่กŒ" },
+  "config_enableLinuxBehaviors_label": { "message": "Linuxๅฐ‚็”จใฎๆŒ™ๅ‹•ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹" },
+  "config_enableMacOSBehaviors_label": { "message": "macOSๅฐ‚็”จใฎๆŒ™ๅ‹•ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹" },
+  "config_enableWindowsBehaviors_label": { "message": "Windowsๅฐ‚็”จใฎๆŒ™ๅ‹•ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹" },
+  "config_debug_label": { "message": "ใƒ‡ใƒใƒƒใ‚ฐใƒขใƒผใƒ‰" },
+  "config_log_caption":               { "message": "่ฉณ็ดฐใชใƒญใ‚ฐ" },
+  "config_logTimestamp_label": { "message": "ๆ—ฅๆ™‚ใ‚’ใƒญใ‚ฐใซไป˜ไธŽใ™ใ‚‹" },
+  "config_logFor_common":     { "message": "ๅ…ฑ้€šใƒขใ‚ธใƒฅใƒผใƒซใ‹ใ‚‰ใฎใƒญใ‚ฐ" },
+  "config_logFor_background": { "message": "ใƒใƒƒใ‚ฏใ‚ฐใƒฉใ‚ฆใƒณใƒ‰ใƒขใ‚ธใƒฅใƒผใƒซใ‹ใ‚‰ใฎใƒญใ‚ฐ" },
+  "config_logFor_sidebar":    { "message": "ใ‚ตใ‚คใƒ‰ใƒใƒผใƒขใ‚ธใƒฅใƒผใƒซใ‹ใ‚‰ใฎใƒญใ‚ฐ" },
+  "config_loggingQueries_label": { "message": "ใ‚ฟใƒ–ใฎๆคœ็ดขๅ‡ฆ็†ใฎใƒญใ‚ฐใ‚’ๅŽ้›†" },
+  "config_loggingConnectionMessages_label": { "message": "ๅ†…้ƒจ้€šไฟกใฎใƒญใ‚ฐใ‚’ๅŽ้›†" },
+  "config_showLogsButton_label": { "message": "ใƒญใ‚ฐใ‚’่กจ็คบ" },
+  "config_simulateSVGContextFill_label": { "message": "Bug 1388193ใŠใ‚ˆใณBug 1421329ใ‚’ๅ›ž้ฟใ—ใฆๆ“ฌไผผ็š„ใซSVGใ‚ขใ‚คใ‚ณใƒณใ‚’่กจ็คบใ™ใ‚‹๏ผˆโ€ปCPU่ฒ ่ทใŒ้ซ˜ใพใ‚‹ๅฏ่ƒฝๆ€งใŒใ‚ใ‚Šใพใ™ใ€‚ใ“ใฎใ‚ชใƒ—ใ‚ทใƒงใƒณใ‚’็„กๅŠนใซใ™ใ‚‹ๅ ดๅˆใ€ใ“ใ‚Œใ‚‰ใฎBugใŒไฟฎๆญฃใ•ใ‚Œใ‚‹ใพใงใฏ\"about:config\"ใง\"svg.context-properties.content.enabled\"ใ‚’ๆœ‰ๅŠนๅŒ–ใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚๏ผ‰" },
+  "config_staticARIALabel_label": { "message": "ใ‚ฟใƒ–่ฆ็ด ใฎARIAใƒฉใƒ™ใƒซใ‚’ๅ›บๅฎšใ™ใ‚‹" },
+  "config_staticARIALabel_description": { "message": "โ€ปไฝ•ใ‚‰ใ‹ใฎใ‚ฟใƒ–ๆ“ไฝœใฎใ‚ใจใง้Ÿณๅฃฐ่ช่ญ˜ใ‚ทใ‚นใƒ†ใƒ ใŒใ‚ฟใƒ–่ฆ็ด ใ‚’่ฆ‹ๅคฑใฃใฆใ—ใพใ†ๅ ดๅˆใ€ใ“ใฎใƒใ‚งใƒƒใ‚ฏใ‚’ONใซใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "config_useCachedTree_label": { "message": "ใ‚ญใƒฃใƒƒใ‚ทใƒฅใ‚’ไฝฟใฃใฆใƒ„ใƒชใƒผใฎๅˆๆœŸๅŒ–ใ‚’้ซ˜้€ŸๅŒ–ใ™ใ‚‹" },
+  "config_useCachedTree_description": { "message": "โ€ปใ‚ญใƒฃใƒƒใ‚ทใƒฅใฎไธๆ•ดๅˆใงๅ‹•ไฝœใŒไธๅฎ‰ๅฎšใซใชใฃใฆใ„ใ‚‹ๅ ดๅˆใ€ใ“ใฎใƒใ‚งใƒƒใ‚ฏใ‚’OFFใซใ—ใฆๅ†ๅบฆONใซใ™ใ‚‹ใ“ใจใงใ‚ญใƒฃใƒƒใ‚ทใƒฅใŒๅˆทๆ–ฐใ•ใ‚Œ็ŠถๆณใŒๆ”นๅ–„ใ™ใ‚‹ใ‹ใ‚‚ใ—ใ‚Œใพใ›ใ‚“ใ€‚" },
+  "config_persistCachedTree_label": { "message": "ใ‚ญใƒฃใƒƒใ‚ทใƒฅใ‚’ๆฐธ็ถšๅŒ–ใ™ใ‚‹" },
+  "config_persistCachedTree_description": { "message": "โ€ปใƒ–ใƒฉใ‚ฆใ‚ถใƒผ่ตทๅ‹•ๆ™‚ใ‚„ๆ‹กๅผตๆฉŸ่ƒฝๆ›ดๆ–ฐๆ™‚ใชใฉใฎๅˆๆœŸๅŒ–ๅ‡ฆ็†ใ‚’็Ÿญ็ธฎใงใใพใ™ใŒใ€ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎใ‚ปใƒƒใ‚ทใƒงใƒณใƒ•ใ‚กใ‚คใƒซใŒ่‚ฅๅคงๅŒ–ใ—ใƒ‡ใ‚ฃใ‚นใ‚ฏI/OใŒๅข—ๅŠ ใ—ใพใ™" },
+  "config_acceleratedTabCreation_label": { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใŒ้–‹ใ‹ใ‚ŒใŸๆ™‚ใฎๅ‡ฆ็†ใ‚’้ซ˜้€ŸๅŒ–ใ™ใ‚‹๏ผˆโ€ปๅ‹•ไฝœใŒไธๅฎ‰ๅฎšใซใชใ‚Šใพใ™๏ผ‰" },
+  "config_maximumAcceptableDelayForTabDuplication_before": { "message": "\u200b" },
+  "config_maximumAcceptableDelayForTabDuplication_after": { "message": "ใƒŸใƒช็ง’ไปฅๅ†…ใซใ‚ฟใƒ–ใฎ่ค‡่ฃฝใ‚’ๅฎŒไบ†ใงใใชใ‹ใฃใŸๅ ดๅˆใฏๅ‡ฆ็†ใ‚’ไธญๆ–ญใ™ใ‚‹" },
+  "config_delayForDuplicatedTabDetection_label_before": { "message": "่ค‡่ฃฝใ•ใ‚ŒใŸใ‚ฟใƒ–ใฎๆคœๅ‡บใฎๅพ…ใกๆ™‚้–“:" },
+  "config_delayForDuplicatedTabDetection_label_after": { "message": "ใƒŸใƒช็ง’๏ผˆ่ค‡่ฃฝใ•ใ‚ŒใŸใ‚ฟใƒ–ใฎๆคœๅ‡บใซๅคฑๆ•—ใ™ใ‚‹ๅ ดๅˆใซๆ•ฐๅญ—ใ‚’ๅข—ใ‚„ใ—ใฆไธ‹ใ•ใ„๏ผ‰" },
+  "config_delayForDuplicatedTabDetection_autoDetect": { "message": "่‡ชๅ‹•่จญๅฎš" },
+  "config_delayForDuplicatedTabDetection_test": { "message": "ๆคœๅ‡บ็Ž‡ใ‚’ใƒ†ใ‚นใƒˆ" },
+  "config_delayForDuplicatedTabDetection_test_resultMessage": { "message": "่ญ˜ๅˆฅใฎๆˆๅŠŸ็Ž‡ใฏ $PERCENTAGE$% ใงใ—ใŸ",
+    "placeholders": {
+      "percentage": { "content": "$1", "example": "50" }
+    }},
+  "config_labelOverflowStyle_caption": { "message": "ใ‚ฟใƒ–ใฎใƒฉใƒ™ใƒซใŒ้•ทใ™ใŽใ‚‹ๅ ดๅˆ:" },
+  "config_labelOverflowStyle_fade":    { "message": "ใƒ•ใ‚งใƒผใƒ‰ใ‚ขใ‚ฆใƒˆใ™ใ‚‹๏ผˆ่ฆ–่ชๆ€งใ‚’้‡่ฆ–๏ผ‰" },
+  "config_labelOverflowStyle_crop":    { "message": "ใ€Œ..ใ€ใงๅˆ‡ใ‚Šๅ–ใ‚‹๏ผˆๅ‹•ไฝœ้€Ÿๅบฆใ‚’้‡่ฆ–๏ผ‰" },
+
+  "config_requestPermissions_bookmarks": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏใฎ่ชญใฟๅ–ใ‚Šใจไฝœๆˆใ‚’่จฑๅฏใ™ใ‚‹" },
+  "config_requestPermissions_bookmarks_context": { "message": "ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ็”จใฎใ‚ณใƒณใƒ†ใ‚ญใ‚นใƒˆใƒกใƒ‹ใƒฅใƒผใ‚’้–‹ใใ“ใจใ‚’่จฑๅฏใ™ใ‚‹" },
+  "config_requestPermissions_tabHide":   { "message": "ๅ€‹ใ€…ใฎใ‚ฟใƒ–ใฎ่กจ็คบใƒป้ž่กจ็คบใฎๅˆถๅพกใ‚’่จฑๅฏใ™ใ‚‹๏ผˆโ€ปใ“ใฎๆ“ไฝœใŒ่จฑๅฏใ•ใ‚Œใฆใ„ใ‚‹ใ“ใจใ‚’็ขบใ‹ใ‚ใ‚‹ใŸใ‚ใ€ใƒ†ใ‚นใƒˆๅฎŸ่กŒๅ‰ใซใฏๅฟ…ใšใƒใ‚งใƒƒใ‚ฏใƒœใƒƒใ‚ฏใ‚นใ‚’ไธ€ๆ—ฆOFFใซใ—ใฆใ‹ใ‚‰ๅ†ๅบฆONใซใ—ใฆไธ‹ใ•ใ„๏ผ‰" },
+
+  "config_requestPermissions_fallbackToToolbarButton_title": { "message": "ใƒ„ใƒผใƒซใƒใƒผใฎใ€Œใƒ„ใƒชใƒผๅž‹ใ‚ฟใƒ–ใ€ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆไธ‹ใ•ใ„" },
+  "config_requestPermissions_fallbackToToolbarButton_message": { "message": "ใƒ–ใƒฉใ‚ฆใ‚ถใƒผใฎใƒใ‚ฐใฎใŸใ‚ใ€ๆจฉ้™ใ‚’ใ“ใฎ็”ป้ขใ‹ใ‚‰่ฆๆฑ‚ใ™ใ‚‹ใ“ใจใŒใงใใพใ›ใ‚“ใ€‚ใƒ„ใƒผใƒซใƒใƒผไธŠใฎใ€Œใƒ„ใƒชใƒผๅž‹ใ‚ฟใƒ–ใ€ใƒœใ‚ฟใƒณใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆๆจฉ้™ใ‚’ๆ‰ฟ่ชใ—ใฆไธ‹ใ•ใ„ใ€‚" },
+
+  "config_all_caption": { "message": "ใ™ในใฆใฎ่จญๅฎš" },
+
+  "config_terms_delimiter": { "message": "\u200b" },
+
+
+  "tabContextMenu_newTab_label":      { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–(&W)" },
+  "tabContextMenu_newTabNext_label":  { "message": "ๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’ไธ‹้šฃใซ้–‹ใ(&W)" },
+  "tabContextMenu_newGroup_label":               { "message": "ใ“ใฎใ‚ฟใƒ–ใ‚’ๆ–ฐใ—ใ„ใ‚ฐใƒซใƒผใƒ—ใซ่ฟฝๅŠ (&G)" },
+  "tabContextMenu_newGroup_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ๆ–ฐใ—ใ„ใ‚ฐใƒซใƒผใƒ—ใซ่ฟฝๅŠ (&G)" },
+  "tabContextMenu_addToGroup_label":               { "message": "ใ“ใฎใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ใซ่ฟฝๅŠ (&G)" },
+  "tabContextMenu_addToGroup_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ใซ่ฟฝๅŠ (&G)" },
+  "tabContextMenu_addToGroup_newGroup_label":      { "message": "ๆ–ฐใ—ใ„ใ‚ฐใƒซใƒผใƒ—(&G)" },
+  "tabContextMenu_addToGroup_unnamed_label":       { "message": "็„กๅใฎใ‚ฐใƒซใƒผใƒ—" },
+  "tabContextMenu_removeFromGroup_label":               { "message": "ใ“ใฎใ‚ฟใƒ–ใ‚’ใ‚ฐใƒซใƒผใƒ—ใ‹ใ‚‰้™คๅค–(&R)" },
+  "tabContextMenu_removeFromGroup_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ๅ„ใ‚ฐใƒซใƒผใƒ—ใ‹ใ‚‰้™คๅค–(&R)" },
+
+  "tabContextMenu_reload_label":      { "message": "ใ‚ฟใƒ–ใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+  "tabContextMenu_unblockAutoplay_label": { "message": "ใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&L)" },
+  "tabContextMenu_mute_label":        { "message": "ใ‚ฟใƒ–ใ‚’ใƒŸใƒฅใƒผใƒˆ(&M)" },
+  "tabContextMenu_unmute_label":      { "message": "ใ‚ฟใƒ–ใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค(&M)" },
+
+  "tabContextMenu_pin_label":         { "message": "ใ‚ฟใƒ–ใ‚’ใƒ”ใƒณ็•™ใ‚(&P)" },
+  "tabContextMenu_unpin_label":       { "message": "ใ‚ฟใƒ–ใฎใƒ”ใƒณ็•™ใ‚ใ‚’ๅค–ใ™(&P)" },
+  "tabContextMenu_unload_label":      { "message": "ใ‚ฟใƒ–ใ‚’่งฃๆ”พ(&U)" },
+  "tabContextMenu_duplicate_label":   { "message": "ใ‚ฟใƒ–ใ‚’่ค‡่ฃฝ(&D)" },
+  "tabContextMenu_selectAllTabs_label": { "message": "ใ™ในใฆใฎใ‚ฟใƒ–ใ‚’้ธๆŠž(&S)" },
+  "tabContextMenu_bookmark_label":    { "message": "ใ‚ฟใƒ–ใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&B)" },
+  "tabContextMenu_reopenInContainer_label":             { "message": "ๆ–ฐใ—ใ„ใ‚ณใƒณใƒ†ใƒŠใƒผใ‚ฟใƒ–ใง้–‹ใ(&E)" },
+  "tabContextMenu_reopenInContainer_noContainer_label": { "message": "ใ‚ณใƒณใƒ†ใƒŠใƒผใชใ—(&N)" },
+  "tabContextMenu_moveTab_label":     { "message": "ใ‚ฟใƒ–ใ‚’็งปๅ‹•(&V)" },
+  "tabContextMenu_moveTabToStart_label": { "message": "ๅ…ˆ้ ญใธ็งปๅ‹•(&S)" },
+  "tabContextMenu_moveTabToEnd_label":   { "message": "ๆœซๅฐพใธ็งปๅ‹•(&E)" },
+  "tabContextMenu_tearOff_label":     { "message": "ๆ–ฐใ—ใ„ใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใธ็งปๅ‹•(&W)" },
+  "tabContextMenu_sendTabsToDevice_label": { "message": "%S ๅ€‹ใฎใ‚ฟใƒ–ใ‚’็ซฏๆœซใธ้€ไฟก(&N)" },
+  "tabContextMenu_sendTabsToAllDevices_label": { "message": "ใ™ในใฆใฎ็ซฏๆœซใซ้€ไฟก" },
+  "tabContextMenu_manageSyncDevices_label": { "message": "็ซฏๆœซใ‚’็ฎก็†..." },
+  "tabContextMenu_shareTabURL_label":   { "message": "ๅ…ฑๆœ‰(&H)" },
+  "tabContextMenu_shareTabURL_more_label":   { "message": "ใใฎไป–..." },
+
+  "tabContextMenu_closeDuplicatedTabs_label": { "message": "้‡่ค‡ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹(&U)" },
+  "tabContextMenu_closeMultipleTabs_label":  { "message": "่ค‡ๆ•ฐใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹(&M)" },
+  "tabContextMenu_closeTabsToTop_label":  { "message": "ไธŠใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&T)" },
+  "tabContextMenu_closeTabsToBottom_label":  { "message": "ไธ‹ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&B)" },
+  "tabContextMenu_closeOther_label":  { "message": "ไป–ใฎใ‚ฟใƒ–ใ‚’ใ™ในใฆ้–‰ใ˜ใ‚‹(&O)" },
+
+  "tabContextMenu_undoClose_label":   { "message": "้–‰ใ˜ใŸใ‚ฟใƒ–ใ‚’้–‹ใใชใŠใ™(&U)" },
+  "tabContextMenu_undoClose_label_multiple":  { "message": "้–‰ใ˜ใŸใ‚ฟใƒ–ใ‚’้–‹ใใชใŠใ™(&U)" },
+  "tabContextMenu_close_label":       { "message": "ใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹(&C)" },
+
+  "tabContextMenu_reload_label_multiselected":      { "message": "ใ‚ฟใƒ–ใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+  "tabContextMenu_unblockAutoplay_label_multiselected": { "message": "ใ‚ฟใƒ–ใฎใƒกใƒ‡ใ‚ฃใ‚ขใ‚’ๅ†็”Ÿ(&L)" },
+  "tabContextMenu_mute_label_multiselected":        { "message": "ใ‚ฟใƒ–ใ‚’ใƒŸใƒฅใƒผใƒˆ(&M)" },
+  "tabContextMenu_unmute_label_multiselected":      { "message": "ใ‚ฟใƒ–ใฎใƒŸใƒฅใƒผใƒˆใ‚’่งฃ้™ค(&M)" },
+
+  "tabContextMenu_unload_label_multiselected":      { "message": "%S ๅ€‹ใฎใ‚ฟใƒ–ใ‚’่งฃๆ”พ(&U)" },
+
+  "tabContextMenu_duplicate_label_multiselected":   { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’่ค‡่ฃฝ(&D)" },
+
+  "tabContextMenu_pin_label_multiselected":         { "message": "ใ‚ฟใƒ–ใ‚’ใƒ”ใƒณ็•™ใ‚(&P)" },
+  "tabContextMenu_unpin_label_multiselected":       { "message": "ใ‚ฟใƒ–ใฎใƒ”ใƒณ็•™ใ‚ใ‚’ๅค–ใ™(&P)" },
+
+  "tabContextMenu_moveTab_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’็งปๅ‹•(&V)" },
+  "tabContextMenu_sendTabsToDevice_label_multiselected": { "message": "%S ๅ€‹ใฎใ‚ฟใƒ–ใ‚’็ซฏๆœซใธ้€ไฟก(&N)" },
+
+  "tabContextMenu_reloadSelected_label":               { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+  "tabContextMenu_reloadSelected_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ๅ†่ชญใฟ่พผใฟ(&R)" },
+
+  "tabContextMenu_bookmark_label_multiselected": { "message": "ใ‚ฟใƒ–ใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&B)" },
+  "tabContextMenu_bookmarkSelected_label":       { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&T)" },
+  "tabContextMenu_bookmarkSelected_label_multiselected": { "message": "้ธๆŠžใ—ใŸใ‚ฟใƒ–ใ‚’ใƒ–ใƒƒใ‚ฏใƒžใƒผใ‚ฏ...(&T)" },
+
+  "tabContextMenu_close_label_multiselected":       { "message": "%S ๅ€‹ใฎใ‚ฟใƒ–ใ‚’้–‰ใ˜ใ‚‹(&C)" },
+
+  "tabGroupMenu_tab-group-editor-title-create":                 { "message": "ใ‚ฟใƒ–ใ‚ฐใƒซใƒผใƒ—ใ‚’ไฝœๆˆ" },
+  "tabGroupMenu_tab-group-editor-title-edit":                   { "message": "ใ‚ฟใƒ–ใ‚ฐใƒซใƒผใƒ—ใฎ็ฎก็†" },
+  "tabGroupMenu_tab-group-editor-name-label":                   { "message": "ใ‚ฐใƒซใƒผใƒ—ๅ" },
+  "tabGroupMenu_tab-group-editor-name-field_placeholder":       { "message": "ไพ‹: ใ‚ทใƒงใƒƒใƒ”ใƒณใ‚ฐ" },
+  "tabGroupMenu_tab-group-editor-cancel_label":                 { "message": "ใ‚ญใƒฃใƒณใ‚ปใƒซ" },
+  "tabGroupMenu_tab-group-editor-cancel_accesskey":             { "message": "C" },
+  "tabGroupMenu_tab-group-editor-color-selector_aria-label":    { "message": "ใ‚ฟใƒ–ใ‚ฐใƒซใƒผใƒ—ใฎ่‰ฒ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-blue":         { "message": "้’" },
+  "tabGroupMenu_tab-group-editor-color-selector2-blue_title":   { "message": "้’" },
+  "tabGroupMenu_tab-group-editor-color-selector2-purple":       { "message": "็ดซ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-purple_title": { "message": "็ดซ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-cyan":         { "message": "ใ‚ทใ‚ขใƒณ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-cyan_title":   { "message": "ใ‚ทใ‚ขใƒณ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-orange":       { "message": "ใ‚ชใƒฌใƒณใ‚ธ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-orange_title": { "message": "ใ‚ชใƒฌใƒณใ‚ธ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-yellow":       { "message": "้ป„" },
+  "tabGroupMenu_tab-group-editor-color-selector2-yellow_title": { "message": "้ป„" },
+  "tabGroupMenu_tab-group-editor-color-selector2-pink":         { "message": "ใƒ”ใƒณใ‚ฏ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-pink_title":   { "message": "ใƒ”ใƒณใ‚ฏ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-green":        { "message": "็ท‘" },
+  "tabGroupMenu_tab-group-editor-color-selector2-green_title":  { "message": "็ท‘" },
+  "tabGroupMenu_tab-group-editor-color-selector2-gray":         { "message": "ใ‚ฐใƒฌใƒผ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-gray_title":   { "message": "ใ‚ฐใƒฌใƒผ" },
+  "tabGroupMenu_tab-group-editor-color-selector2-red":          { "message": "่ตค" },
+  "tabGroupMenu_tab-group-editor-color-selector2-red_title":    { "message": "่ตค" },
+  "tabGroupMenu_tab-group-editor-action-new-tab_label":         { "message": "ใ‚ฐใƒซใƒผใƒ–ๅ†…ใซๆ–ฐใ—ใ„ใ‚ฟใƒ–ใ‚’้–‹ใ" },
+  "tabGroupMenu_tab-group-editor-action-new-window_label":      { "message": "ใ‚ฐใƒซใƒผใƒ—ใ‚’ๆ–ฐใ—ใ„ใ‚ฆใ‚ฃใƒณใƒ‰ใ‚ฆใธ็งปๅ‹•" },
+  "tabGroupMenu_tab-group-editor-action-save_label":            { "message": "ใ‚ฐใƒซใƒผใƒ—ใ‚’ไฟๅญ˜ใ—ใฆ้–‰ใ˜ใ‚‹" },
+  "tabGroupMenu_tab-group-editor-action-ungroup_label":         { "message": "ใ‚ฐใƒซใƒผใƒ—ใ‚’่งฃๆ”พ" },
+  "tabGroupMenu_tab-group-editor-action-delete_label":          { "message": "ใ‚ฐใƒซใƒผใƒ—ใ‚’ๅ‰Š้™ค" },
+  "tabGroupMenu_tab-group-editor-done_label":                   { "message": "ๅฎŒไบ†" },
+  "tabGroupMenu_tab-group-editor-done_accesskey":               { "message": "D" },
+
+
+  "tryConfirmUsingTST_title":   { "message": "็ซถๅˆใฎๆคœๅ‡บ" },
+  "tryConfirmUsingTST_message": { "message": "ใ€ŒTree Style Tabใ€ๆ‹กๅผตๆฉŸ่ƒฝใŒๆคœๅ‡บใ•ใ‚Œใพใ—ใŸ๏ผšWaterfoxใฎใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใจ็ซถๅˆใ™ใ‚‹ๆใ‚ŒใŒใ‚ใ‚Šใพใ™ใ€‚ใฉใกใ‚‰ใฎๆฉŸ่ƒฝใ‚’ๆœ‰ๅŠนใซใ™ใ‚‹ใ‹้ธๆŠžใ—ใฆใใ ใ•ใ„ใ€‚" },
+  "tryConfirmUsingTST_WS":      { "message": "Waterfoxใฎใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+  "tryConfirmUsingTST_TST":     { "message": "Tree Style Tab" },
+  "tryConfirmUsingTST_both":    { "message": "ไธกๆ–นๆœ‰ๅŠนใซใ™ใ‚‹" },
+  "tryConfirmUsingTST_ask":     { "message": "็ซถๅˆใ‚’ๆคœๅ‡บใ—ใŸๅ ดๅˆใฏๅ†ๅบฆ็ขบ่ชใ™ใ‚‹" },
+  "howToActivateAgain_title":   { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–็„กๅŠนๅŒ–" },
+  "howToActivateAgain_message": { "message": "Waterfoxใฎใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใ‚’็„กๅŠนๅŒ–ใ—ใพใ™ใ€‚ๆฉŸ่ƒฝใ‚’ใ‚‚ใ†ไธ€ๅบฆไฝฟ็”จใ™ใ‚‹ๅ ดๅˆใฏใ€ใ‚ขใƒ‰ใ‚ชใƒณใƒžใƒใƒผใ‚ธใƒฃใƒผใงใ€Œใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใ€ใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใใ ใ•ใ„ใ€‚" },
+
+  "tabsSidebarButton_label": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+  "tabsSidebarButton_tooltiptext": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–ใฎ่กจ็คบใ‚’ๅˆ‡ใ‚Šๆ›ฟใˆใพใ™" },
+
+  "preferencesCategoryName": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+  "preferencesCategoryTooltipText": { "message": "ใƒ„ใƒชใƒผๅž‚็›ดใ‚ฟใƒ–" },
+
+  "preferences_appearanceGroup_caption": { "message": "ใ‚ฟใƒ–ใฎๅค–่ฆณ" },
+  "preferences_faviconizePinnedTabs_accesskey": { "message": "S" },
+  "config_autoStickyTab_caption":       { "message": "ไปฅไธ‹ใฎใ‚ฟใƒ–ใŒ็”ป้ขๅค–ใซใ‚นใ‚ฏใƒญใƒผใƒซใ‚ขใ‚ฆใƒˆใ—ใŸใจใใซใ‚ฟใƒ–ใƒใƒผใฎ็ซฏใซ่ฒผใ‚Šไป˜ใ‘ใ‚‹" },
+  "config_stickyActiveTab_label":          { "message": "็พๅœจใฎใ‚ฟใƒ–" },
+  "preferences_stickyActiveTab_accesskey": { "message": "K" },
+  "config_stickySoundPlayingTab_label":          { "message": "้Ÿณๅฃฐใ‚’ๅ†็”Ÿไธญใฎใ‚ฟใƒ–" },
+  "preferences_stickySoundPlayingTab_accesskey": { "message": "Y" },
+  "config_stickySharingTab_label":          { "message": "ใ‚ซใƒกใƒฉ/ใƒžใ‚คใ‚ฏ/็”ป้ขใ‚’ๅ…ฑๆœ‰ไธญใฎใ‚ฟใƒ–" },
+  "preferences_stickySharingTab_accesskey": { "message": "G" },
+
+  "preferences_treeBehaviorGroup_caption": { "message": "ใ‚ฟใƒ–ใฎใƒ„ใƒชใƒผ่กจ็คบ" },
+  "preferences_autoCollapseExpandSubtreeOnAttach_accesskey": { "message": "C" },
+  "preferences_autoCollapseExpandSubtreeOnSelect_accesskey": { "message": "X" },
+  "preferences_treeDoubleClickBehavior_accesskey": { "message": "D" },
+  "preferences_successorTabControlLevel_accesskey": { "message": "H" },
+  "preferences_dropLinksOnTabBehavior_accesskey": { "message": "L" },
+
+  "preferences_autoAttachGroup_caption": { "message": "ใ‚ฟใƒ–ใฎใƒ„ใƒชใƒผใฎ่‡ชๅ‹•ๅฝขๆˆ" },
+  "preferences_autoAttachOnOpenedWithOwner_accesskey": { "message": "O" },
+  "preferences_insertNewTabFromPinnedTabAt_accesskey": { "message": "P" },
+  "preferences_autoAttachOnNewTabCommand_accesskey": { "message": "N" },
+  "preferences_autoAttachOnNewTabButtonMiddleClick_accesskey": { "message": "M" },
+  "preferences_autoAttachOnDuplicated_accesskey": { "message": "U" },
+  "preferences_autoAttachSameSiteOrphan_accesskey": { "message": "W" },
+  "preferences_autoAttachOnOpenedFromExternal_accesskey": { "message": "A" },
+  "preferences_autoAttachOnAnyOtherTrigger_accesskey": { "message": "T" }
+}
diff --git a/waterfox/browser/components/sidebar/addon-jar.mn b/waterfox/browser/components/sidebar/addon-jar.mn
new file mode 100644
index 0000000000000..fcfd9ee54121e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/addon-jar.mn
@@ -0,0 +1,15 @@
+# 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/.
+
+browser.jar:
+%   resource builtin-addons %builtin-addons/  contentaccessible=yes
+    builtin-addons/sidebar/_locales/ (./_locales/**)
+    builtin-addons/sidebar/background/ (./background/**)
+    builtin-addons/sidebar/common/ (./common/**)
+    builtin-addons/sidebar/experiments/ (./experiments/**)
+    builtin-addons/sidebar/extlib/ (./extlib/**)
+    builtin-addons/sidebar/options/ (./options/**)
+    builtin-addons/sidebar/resources/ (./resources/**)
+    builtin-addons/sidebar/sidebar/ (./sidebar/**)
+    builtin-addons/sidebar/manifest.json (./manifest.json)
diff --git a/waterfox/browser/components/sidebar/background/api-tabs-listener.js b/waterfox/browser/components/sidebar/background/api-tabs-listener.js
new file mode 100644
index 0000000000000..3e9594a77a917
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/api-tabs-listener.js
@@ -0,0 +1,1402 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  toLines,
+  configs,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab, TabGroup } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/api-tabs-listener', ...args);
+}
+function logUpdated(...args) {
+  internalLogger('common/tabs-update', ...args);
+}
+
+let mAppIsActive = false;
+
+export function init() {
+  browser.tabs.onActivated.addListener(onActivated);
+  browser.tabs.onUpdated.addListener(onUpdated);
+  browser.tabs.onHighlighted.addListener(onHighlighted);
+  browser.tabs.onCreated.addListener(onCreated);
+  browser.tabs.onRemoved.addListener(onRemoved);
+  browser.tabs.onMoved.addListener(onMoved);
+  browser.tabs.onAttached.addListener(onAttached);
+  browser.tabs.onDetached.addListener(onDetached);
+  browser.windows.onCreated.addListener(onWindowCreated);
+  browser.windows.onRemoved.addListener(onWindowRemoved);
+  browser.tabGroups.onCreated.addListener(onGroupCreated);
+  browser.tabGroups.onUpdated.addListener(onGroupUpdated);
+  browser.tabGroups.onRemoved.addListener(onGroupRemoved);
+  browser.tabGroups.onMoved.addListener(onGroupMoved);
+
+  browser.windows.getAll({}).then(windows => {
+    mAppIsActive = windows.some(win => win.focused);
+  });
+}
+
+let mPromisedStartedResolver;
+let mPromisedStarted = new Promise((resolve, _reject) => {
+  mPromisedStartedResolver = resolve;
+});
+
+export function destroy() {
+  mPromisedStartedResolver = undefined;
+  mPromisedStarted = undefined;
+  browser.tabs.onActivated.removeListener(onActivated);
+  browser.tabs.onUpdated.removeListener(onUpdated);
+  browser.tabs.onHighlighted.removeListener(onHighlighted);
+  browser.tabs.onCreated.removeListener(onCreated);
+  browser.tabs.onRemoved.removeListener(onRemoved);
+  browser.tabs.onMoved.removeListener(onMoved);
+  browser.tabs.onAttached.removeListener(onAttached);
+  browser.tabs.onDetached.removeListener(onDetached);
+  browser.windows.onCreated.removeListener(onWindowCreated);
+  browser.windows.onRemoved.removeListener(onWindowRemoved);
+  browser.tabGroups.onCreated.removeListener(onGroupCreated);
+  browser.tabGroups.onUpdated.removeListener(onGroupUpdated);
+  browser.tabGroups.onRemoved.removeListener(onGroupRemoved);
+  browser.tabGroups.onMoved.removeListener(onGroupMoved);
+}
+
+export function start() {
+  if (!mPromisedStartedResolver)
+    return;
+  mPromisedStartedResolver();
+  mPromisedStartedResolver = undefined;
+  mPromisedStarted = undefined;
+}
+
+
+const mTabOperationQueue = [];
+
+function addTabOperationQueue(metric = null) {
+  let onCompleted;
+  const previous = mTabOperationQueue[mTabOperationQueue.length - 1];
+  const queue = new Promise((resolve, _aReject) => {
+    onCompleted = resolve;
+  });
+  queue.then(() => {
+    mTabOperationQueue.splice(mTabOperationQueue.indexOf(queue), 1);
+    if (metric)
+      metric.add('TabOperationQueue proceeded');
+  });
+  mTabOperationQueue.push(queue);
+  return [onCompleted, previous];
+}
+
+function warnTabDestroyedWhileWaiting(tabId, tab) {
+  if (configs.debug)
+    console.log(`WARNING: tab ${tabId} is destroyed while waiting. `, tab, new Error().stack);
+}
+
+
+async function onActivated(activeInfo) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  TabsStore.activeTabInWindow.set(activeInfo.windowId, Tab.get(activeInfo.tabId));
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    const win = Window.init(activeInfo.windowId);
+
+    const byInternalOperation = win.internallyFocusingTabs.has(activeInfo.tabId);
+    win.internallyFocusingTabs.delete(activeInfo.tabId);
+    const byMouseOperation = win.internallyFocusingByMouseTabs.has(activeInfo.tabId);
+    win.internallyFocusingByMouseTabs.delete(activeInfo.tabId);
+    const silently = win.internallyFocusingSilentlyTabs.has(activeInfo.tabId);
+    win.internallyFocusingSilentlyTabs.delete(activeInfo.tabId);
+    const byTabDuplication = parseInt(win.duplicatingTabsCount) > 0;
+
+    if (!Tab.isTracked(activeInfo.tabId))
+      await Tab.waitUntilTracked(activeInfo.tabId);
+
+    const newActiveTab = Tab.get(activeInfo.tabId);
+    if (!newActiveTab ||
+        !TabsStore.ensureLivingItem(newActiveTab)) {
+      warnTabDestroyedWhileWaiting(activeInfo.tabId);
+      onCompleted();
+      return;
+    }
+
+    log('tabs.onActivated: ', newActiveTab);
+    const oldActiveTabs = TabsInternalOperation.setTabActive(newActiveTab);
+    const byActiveTabRemove = !activeInfo.previousTabId;
+
+    if (!TabsStore.ensureLivingItem(newActiveTab)) { // it can be removed while waiting
+      onCompleted();
+      warnTabDestroyedWhileWaiting(activeInfo.tabId);
+      return;
+    }
+
+    let focusOverridden = Tab.onActivating.dispatch(newActiveTab, {
+      ...activeInfo,
+      byActiveTabRemove,
+      byTabDuplication,
+      byInternalOperation,
+      byMouseOperation,
+      silently
+    });
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_ACTIVATING,
+      windowId: activeInfo.windowId,
+      tabId:    activeInfo.tabId,
+      byActiveTabRemove,
+      byTabDuplication,
+      byInternalOperation,
+      byMouseOperation,
+      silently
+    });
+    // don't do await if not needed, to process things synchronously
+    if (focusOverridden instanceof Promise)
+      focusOverridden = await focusOverridden;
+    focusOverridden = focusOverridden === false;
+    if (focusOverridden) {
+      onCompleted();
+      return;
+    }
+
+    if (!TabsStore.ensureLivingItem(newActiveTab)) { // it can be removed while waiting
+      onCompleted();
+      warnTabDestroyedWhileWaiting(activeInfo.tabId);
+      return;
+    }
+
+    const onActivatedReuslt = Tab.onActivated.dispatch(newActiveTab, {
+      ...activeInfo,
+      oldActiveTabs,
+      byActiveTabRemove,
+      byTabDuplication,
+      byInternalOperation,
+      byMouseOperation,
+      silently
+    });
+    // don't do await if not needed, to process things synchronously
+    if (onActivatedReuslt instanceof Promise)
+      await onActivatedReuslt;
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED,
+      windowId: activeInfo.windowId,
+      tabId:    activeInfo.tabId,
+      byActiveTabRemove,
+      byTabDuplication,
+      byInternalOperation,
+      byMouseOperation,
+      silently
+    });
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+async function onUpdated(tabId, changeInfo, tab) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  if (!Tab.isTracked(tabId))
+    await Tab.waitUntilTracked(tabId);
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    const updatedTab = Tab.get(tabId);
+    if (!updatedTab ||
+        !TabsStore.ensureLivingItem(updatedTab)) {
+      onCompleted();
+      warnTabDestroyedWhileWaiting(tabId, updatedTab);
+      return;
+    }
+
+    logUpdated('tabs.onUpdated ', tabId, changeInfo, tab, updatedTab);
+
+    if ('url' in changeInfo) {
+      changeInfo.previousUrl = updatedTab.url;
+      // On Linux (and possibly on some other environments) the initial page load
+      // sometimes produces "onUpdated" event with unchanged URL unexpectedly,
+      // so we should ignure such invalid (uneffective) URL changes.
+      // See also: https://github.com/piroor/treestyletab/issues/3078
+      if (changeInfo.url == 'about:blank' &&
+          changeInfo.previousUrl == changeInfo.url &&
+          changeInfo.status == 'loading') {
+        delete changeInfo.url;
+        delete changeInfo.previousUrl;
+      }
+    }
+    const oldState = {};
+    for (const key of Object.keys(changeInfo)) {
+      if (key == 'index')
+        continue;
+      if (key in updatedTab)
+        oldState[key] = updatedTab[key];
+      updatedTab[key] = changeInfo[key];
+    }
+    if (changeInfo.url ||
+        changeInfo.status == 'complete') {
+      // On some edge cases internally changed "favIconUrl" is not
+      // notified, so we need to check actual favIconUrl manually.
+      // Known cases are:
+      //  * Transition from "about:privatebrowsing" to "about:blank"
+      //    https://github.com/piroor/treestyletab/issues/1916
+      //  * Reopen tab by Ctrl-Shift-T
+      browser.tabs.get(tabId).then(tab => {
+        if (tab.favIconUrl != updatedTab.favIconUrl)
+          onUpdated(tabId, { favIconUrl: tab.favIconUrl }, tab);
+      }).catch(ApiTabs.createErrorSuppressor(
+        ApiTabs.handleMissingTabError // the tab can be closed while waiting
+      ));
+    }
+
+    TabsUpdate.updateTab(updatedTab, changeInfo, { tab, old: oldState });
+
+    const onUpdatedResult = Tab.onUpdated.dispatch(updatedTab, changeInfo);
+    // don't do await if not needed, to process things synchronously
+    if (onUpdatedResult instanceof Promise)
+      await onUpdatedResult;
+
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+const mTabsHighlightedTimers = new Map();
+const mLastHighlightedCount  = new Map();
+async function onHighlighted(highlightInfo) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  // ignore internally highlighted tabs - they are already handled
+  const win = TabsStore.windows.get(highlightInfo.windowId);
+  const unifiedHighlightedTabs = new Set([...win.highlightingTabs, ...highlightInfo.tabIds]);
+  if (unifiedHighlightedTabs.size == win.highlightingTabs.size) {
+    log(`Internal highlighting is in progress: ${Math.ceil(highlightInfo.tabIds.length / win.highlightingTabs.size * 100)} %`);
+    if (highlightInfo.tabIds.length == win.highlightingTabs.size) {
+      win.highlightingTabs.clear();
+      log('Internal highlighting done.');
+    }
+    return;
+  }
+
+  let timer = mTabsHighlightedTimers.get(highlightInfo.windowId);
+  if (timer)
+    clearTimeout(timer);
+  if ((mLastHighlightedCount.get(highlightInfo.windowId) || 0) <= 1 &&
+      highlightInfo.tabIds.length == 1) {
+    // simple active tab switching
+    TabsUpdate.updateTabsHighlighted(highlightInfo);
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_HIGHLIGHTED_TABS_CHANGED,
+      windowId: highlightInfo.windowId,
+      tabIds:   highlightInfo.tabIds
+    });
+    return;
+  }
+  timer = setTimeout(() => {
+    mTabsHighlightedTimers.delete(highlightInfo.windowId);
+    TabsUpdate.updateTabsHighlighted(highlightInfo);
+    mLastHighlightedCount.set(highlightInfo.windowId, highlightInfo.tabIds.length);
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_HIGHLIGHTED_TABS_CHANGED,
+      windowId: highlightInfo.windowId,
+      tabIds:   highlightInfo.tabIds
+    });
+  }, configs.delayToApplyHighlightedState);
+  mTabsHighlightedTimers.set(highlightInfo.windowId, timer);
+}
+
+async function onCreated(tab) {
+  const metric = new MetricsData(`tab ${tab.id} (tabs.onCreated)`);
+
+  if (mPromisedStarted) {
+    await mPromisedStarted;
+    metric.add('mPromisedStarted resolved');
+  }
+
+  log('tabs.onCreated: ', dumpTab(tab));
+
+  // Cache the initial index for areTabsFromOtherDeviceWithInsertAfterCurrent()@handle-tab-bunches.js
+  // See also: https://github.com/piroor/treestyletab/issues/2419
+  tab.$indexOnCreated = tab.index;
+  // Cache the initial windowId for Tab.onUpdated listner@handle-new-tabs.js
+  tab.$windowIdOnCreated = tab.windowId;
+
+  return onNewTabTracked(tab, { trigger: 'tabs.onCreated', metric });
+}
+
+async function onNewTabTracked(tab, info) {
+  const win                  = Window.init(tab.windowId);
+  const bypassTabControl     = win.bypassTabControlCount > 0;
+  const isNewTabCommandTab   = win.toBeOpenedNewTabCommandTab > 0;
+  const positionedBySelf     = win.toBeOpenedTabsWithPositions > 0;
+  const openedWithCookieStoreId = win.toBeOpenedTabsWithCookieStoreId > 0;
+  const duplicatedInternally = win.duplicatingTabsCount > 0;
+  const maybeOrphan          = win.toBeOpenedOrphanTabs > 0;
+  const activeTab            = Tab.getActiveTab(win.id);
+  const fromExternal         = !mAppIsActive && !tab.openerTabId;
+  const initialOpenerTabId   = tab.openerTabId;
+  const metric               = info.metric || new MetricsData(`tab ${tab.id}`);
+
+  // New tab's index can become invalid because the value of "index" is same to
+  // the one given to browser.tabs.create() (new tab) or the original index
+  // (restored tab) instead of its actual index.
+  // (By the way, any pinned tab won't be opened after the first unpinned tab,
+  // and any unpinned tab won't be opened before the last pinned tab. On such
+  // cases Firefox automatically fixup the index regardless they are newly
+  // opened ore restored, so we don't need to care such cases.)
+  // See also:
+  //   https://github.com/piroor/treestyletab/issues/2131
+  //   https://github.com/piroor/treestyletab/issues/2216
+  //   https://bugzilla.mozilla.org/show_bug.cgi?id=1541748
+  tab.index = Math.max(0, Math.min(tab.index, win.tabs.size));
+  tab.reindexedBy = `onNewTabTracked (${tab.index})`;
+
+  // New tab from a bookmark or external apps always have its URL as the title
+  // (but the scheme part is missing.)
+  tab.$possibleInitialUrl = tab.title;
+
+  // We need to track new tab after getting old active tab. Otherwise, this
+  // operation updates the latest active tab in the window amd it becomes
+  // impossible to know which tab was previously active.
+  tab = Tab.track(tab);
+  metric.add('tracked');
+
+  if (isNewTabCommandTab)
+    tab.$isNewTabCommandTab = true;
+
+  if (info.trigger == 'tabs.onCreated')
+    tab.$TST.addState(Constants.kTAB_STATE_CREATING);
+  if (tab.$TST.isNewTabCommandTab)
+    tab.$TST.addState(Constants.kTAB_STATE_NEW_TAB_COMMAND_TAB);
+  if (fromExternal)
+    tab.$TST.addState(Constants.kTAB_STATE_FROM_EXTERNAL);
+  if (tab.$TST.hasFirefoxViewOpener)
+    tab.$TST.addState(Constants.kTAB_STATE_FROM_FIREFOX_VIEW);
+
+  const mayBeReplacedWithContainer = tab.$TST.mayBeReplacedWithContainer;
+  log(`onNewTabTracked(${dumpTab(tab)}): `, tab, { win, positionedBySelf, mayBeReplacedWithContainer, duplicatedInternally, maybeOrphan, activeTab });
+
+  Tab.onBeforeCreate.dispatch(tab, {
+    positionedBySelf,
+    openedWithCookieStoreId,
+    mayBeReplacedWithContainer,
+    maybeOrphan,
+    activeTab,
+    fromExternal
+  });
+  metric.add('Tab.onBeforeCreate proceeded');
+
+  if (Tab.needToWaitTracked(tab.windowId, { exceptionTabId: tab.id })) {
+    await Tab.waitUntilTrackedAll(tab.windowId, { exceptionTabId: tab.id });
+    metric.add('Tab.waitUntilTrackedAll resolved');
+  }
+
+  const [onCompleted, previous] = addTabOperationQueue(metric);
+  if (!configs.acceleratedTabOperations && previous) {
+    await previous;
+    metric.add('previous resolved');
+  }
+
+  log(`onNewTabTracked(${dumpTab(tab)}): start to create tab element`);
+
+  // Cached tree information may be expired when there are multiple new tabs
+  // opened at just same time and some of others are attached on listeners of
+  // "onCreating" and other points. Thus we need to refresh cached information
+  // dynamically.
+  // See also: https://github.com/piroor/treestyletab/issues/2419
+  let treeForActionDetection;
+  const onTreeModified = (_child, _info) => {
+    if (!treeForActionDetection ||
+        !TabsStore.ensureLivingItem(tab))
+      return;
+    treeForActionDetection = Tree.snapshotForActionDetection(tab);
+    log('Tree modification is detected while waiting. Cached tree for action detection is updated: ', treeForActionDetection);
+  };
+  // We should refresh ceched information only when tabs are creaetd and
+  // attached, because the cacheed information was originally introduced for
+  // failsafe around problems from tabs closed while waiting.
+  Tree.onAttached.addListener(onTreeModified);
+  metric.add('Tree.onAttached proceeded');
+
+  try {
+    tab = Tab.init(tab, { inBackground: false });
+    metric.add('init');
+
+    const nextTab = Tab.getTabAt(win.id, tab.index);
+    metric.add('nextTab');
+
+    // We need to update "active" state of a new active tab immediately.
+    // Attaching of initial child tab (this new tab may become it) to an
+    // existing tab may produce collapsing of existing tree, and a
+    // collapsing tree may have the old active tab. On such cases TST
+    // tries to move focus to a nearest visible ancestor, instead of this
+    // new active tab.
+    // See also: https://github.com/piroor/treestyletab/issues/2155
+    if (tab.active) {
+      TabsInternalOperation.setTabActive(tab);
+      metric.add('setTabActive');
+    }
+
+    const uniqueId = await tab.$TST.promisedUniqueId;
+    metric.add('uniqueId resolved');
+
+    if (!TabsStore.ensureLivingItem(tab)) { // it can be removed while waiting
+      onCompleted(uniqueId);
+      tab.$TST.rejectOpened();
+      Tab.untrack(tab.id);
+      warnTabDestroyedWhileWaiting(tab.id, tab);
+      metric.add('untracked');
+      log('  tab is untracked while tracking, metric: ', metric);
+      return;
+    }
+
+    TabsUpdate.updateTab(tab, tab, {
+      forceApply: true
+    });
+    metric.add('TabsUpdate.updateTab proceeded');
+
+    const duplicated = duplicatedInternally || uniqueId.duplicated;
+    const restored   = uniqueId.restored;
+    const skipFixupTree = !nextTab;
+    log(`onNewTabTracked(${dumpTab(tab)}): `, { duplicated, restored, skipFixupTree });
+    if (duplicated)
+      tab.$TST.addState(Constants.kTAB_STATE_DUPLICATED);
+
+    const maybeNeedToFixupTree = (
+      (info.mayBeReplacedWithContainer ||
+       (!duplicated &&
+        !restored &&
+        !skipFixupTree)) &&
+      !info.positionedBySelf
+    );
+    // Tabs can be removed and detached while waiting, so cache them here for `detectTabActionFromNewPosition()`.
+    // This operation takes too much time so it should be skipped if unnecessary.
+    // See also: https://github.com/piroor/treestyletab/issues/2278#issuecomment-521534290
+    treeForActionDetection = maybeNeedToFixupTree ? Tree.snapshotForActionDetection(tab) : null;
+
+    if (bypassTabControl)
+      win.bypassTabControlCount--;
+    if (isNewTabCommandTab)
+      win.toBeOpenedNewTabCommandTab--;
+    if (positionedBySelf)
+      win.toBeOpenedTabsWithPositions--;
+    if (openedWithCookieStoreId)
+      win.toBeOpenedTabsWithCookieStoreId--;
+    if (maybeOrphan)
+      win.toBeOpenedOrphanTabs--;
+    if (duplicatedInternally)
+      win.duplicatingTabsCount--;
+
+    if (restored) {
+      win.restoredCount = win.restoredCount || 0;
+      win.restoredCount++;
+      if (!win.promisedAllTabsRestored) {
+        log(`onNewTabTracked(${dumpTab(tab)}): Maybe starting to restore window`);
+        win.promisedAllTabsRestored = (new Promise((resolve, _aReject) => {
+          let lastCount = win.restoredCount;
+          const timer = setInterval(() => {
+            if (lastCount != win.restoredCount) {
+              lastCount = win.restoredCount;
+              return;
+            }
+            clearTimeout(timer);
+            win.promisedAllTabsRestored = null;
+            win.restoredCount   = 0;
+            log('All tabs are restored');
+            resolve(lastCount);
+          }, 200);
+        })).then(async lastCount => {
+          await Tab.onWindowRestoring.dispatch({
+            windowId: tab.windowId,
+            restoredCount: lastCount,
+          });
+          metric.add('Tab.onWindowRestoring proceeded');
+          return lastCount;
+        });
+      }
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_NOTIFY_TAB_RESTORING,
+        tabId:    tab.id,
+        windowId: tab.windowId
+      });
+      await win.promisedAllTabsRestored;
+      log(`onNewTabTracked(${dumpTab(tab)}): continued for restored tab`);
+      metric.add('win.promisedAllTabsRestored resolved');
+    }
+    if (!TabsStore.ensureLivingItem(tab)) {
+      log(`onNewTabTracked(${dumpTab(tab)}):  => aborted`);
+      onCompleted(uniqueId);
+      tab.$TST.rejectOpened();
+      Tab.untrack(tab.id);
+      warnTabDestroyedWhileWaiting(tab.id, tab);
+      Tree.onAttached.removeListener(onTreeModified);
+      metric.add('untracked');
+      log('  tab is untracked while tracking after updated, metric: ', metric);
+      return;
+    }
+
+    let moved = Tab.onCreating.dispatch(tab, {
+      bypassTabControl,
+      positionedBySelf,
+      openedWithCookieStoreId,
+      mayBeReplacedWithContainer,
+      maybeOrphan,
+      restored,
+      duplicated,
+      duplicatedInternally,
+      activeTab,
+      fromExternal
+    });
+    metric.add('Tab.onCreating proceeded');
+    // don't do await if not needed, to process things synchronously
+    if (moved instanceof Promise) {
+      moved = await moved;
+      metric.add('moved resolved');
+    }
+    moved = moved === false;
+
+    if (!TabsStore.ensureLivingItem(tab)) {
+      log(`onNewTabTracked(${dumpTab(tab)}):  => aborted`);
+      onCompleted(uniqueId);
+      tab.$TST.rejectOpened();
+      Tab.untrack(tab.id);
+      warnTabDestroyedWhileWaiting(tab.id, tab);
+      Tree.onAttached.removeListener(onTreeModified);
+      metric.add('untracked');
+      log('  tab is untracked while tracking after moved, metric: ', metric);
+      return;
+    }
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_CREATING,
+      windowId: tab.windowId,
+      tabId:    tab.id,
+      tab:      tab.$TST.sanitized,
+      order:    win.order,
+      maybeMoved: moved
+    });
+    log(`onNewTabTracked(${dumpTab(tab)}): moved = `, moved);
+    metric.add('kCOMMAND_NOTIFY_TAB_CREATING notified');
+
+    if (TabsStore.ensureLivingItem(tab)) { // it can be removed while waiting
+      win.openingTabs.add(tab.id);
+      setTimeout(() => { // because window.requestAnimationFrame is decelerate for an invisible document.
+        if (!TabsStore.windows.get(tab.windowId)) // it can be removed while waiting
+          return;
+        win.openingTabs.delete(tab.id);
+      }, 0);
+    }
+
+    if (!TabsStore.ensureLivingItem(tab)) { // it can be removed while waiting
+      onCompleted(uniqueId);
+      tab.$TST.rejectOpened();
+      Tab.untrack(tab.id);
+      warnTabDestroyedWhileWaiting(tab.id, tab);
+      Tree.onAttached.removeListener(onTreeModified);
+      metric.add('untracked');
+      log('  tab is untracked while tracking after notified to sidebar, metric: ', metric);
+      return;
+    }
+
+    log(`onNewTabTracked(${dumpTab(tab)}): uniqueId = `, uniqueId);
+
+    Tab.onCreated.dispatch(tab, {
+      bypassTabControl,
+      positionedBySelf,
+      mayBeReplacedWithContainer,
+      movedBySelfWhileCreation: moved,
+      skipFixupTree,
+      restored,
+      duplicated,
+      duplicatedInternally,
+      originalTab: duplicated && Tab.get(uniqueId.originalTabId),
+      treeForActionDetection,
+      fromExternal
+    });
+    tab.$TST.resolveOpened();
+    metric.add('Tab.onCreated proceeded');
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_CREATED,
+      windowId: tab.windowId,
+      tabId:    tab.id,
+      collapsed: tab.$TST.collapsed, // it may be really collapsed by some reason (for example, opened under a collapsed tree), not just for "created" animation!
+      active:   tab.active,
+      maybeMoved: moved
+    });
+    metric.add('kCOMMAND_NOTIFY_TAB_CREATED notified');
+
+    if (!duplicated &&
+        restored) {
+      tab.$TST.addState(Constants.kTAB_STATE_RESTORED);
+      Tab.onRestored.dispatch(tab);
+      checkRecycledTab(win.id);
+    }
+
+    onCompleted(uniqueId);
+    tab.$TST.removeState(Constants.kTAB_STATE_CREATING);
+    metric.add('remove creating state');
+
+    if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_NEW_TAB_PROCESSED)) {
+      const cache = {};
+      TSTAPI.broadcastMessage({
+        type:      TSTAPI.kNOTIFY_NEW_TAB_PROCESSED,
+        tab,
+        originalTab: duplicated && Tab.get(uniqueId.originalTabId),
+        restored,
+        duplicated,
+        fromExternal,
+      }, { tabProperties: ['tab', 'originalTab'], cache }).catch(_error => {});
+      TSTAPI.clearCache(cache);
+      metric.add('API broadcaster');
+    }
+
+    // tab can be changed while creating!
+    const renewedTab = await browser.tabs.get(tab.id).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    metric.add('renewedTab');
+    if (!renewedTab) {
+      log(`onNewTabTracked(${dumpTab(tab)}): tab ${tab.id} is closed while tracking`);
+      onCompleted(uniqueId);
+      tab.$TST.rejectOpened();
+      Tab.untrack(tab.id);
+      warnTabDestroyedWhileWaiting(tab.id, tab);
+      Tree.onAttached.removeListener(onTreeModified);
+      metric.add('untracked');
+      log('  tab is untracked while tracking after created, metric: ', metric);
+      return;
+    }
+
+    const updatedOpenerTabId = tab.openerTabId;
+    const changedProps = {};
+    for (const key of Object.keys(renewedTab)) {
+      const value = renewedTab[key];
+      if (tab[key] == value)
+        continue;
+      if (key == 'openerTabId' &&
+          info.trigger == 'tabs.onAttached' &&
+          value != tab.openerTabId &&
+          tab.openerTabId == tab.$TST.temporaryMetadata.get('updatedOpenerTabId')) {
+        log(`openerTabId of ${tab.id} is different from the raw value but it has been updated by TST while attaching, so don't detect as updated for now`);
+        continue;
+      }
+      changedProps[key] = value;
+    }
+
+    // When the active tab is duplicated, Firefox creates a duplicated tab
+    // with its `openerTabId` filled with the ID of the source tab.
+    // It is the `initialOpenerTabId`.
+    // On the other hand, TST may attach the duplicated tab to any other
+    // parent while it is initializing, based on a configuration
+    // `configs.autoAttachOnDuplicated`. It is the `updatedOpenerTabId`.
+    // At this scenario `renewedTab.openerTabId` becomes `initialOpenerTabId`
+    // and `updatedOpenerTabId` is lost.
+    // Thus we need to re-apply `updatedOpenerTabId` as the `openerTabId` of
+    // the tab again, to keep the tree structure managed by TST.
+    // See also: https://github.com/piroor/treestyletab/issues/2388
+    if ('openerTabId' in changedProps) {
+      log(`openerTabId of ${tab.id} is changed while creating: ${tab.openerTabId} (changed by someone) => ${changedProps.openerTabId} (original) `, configs.debug && new Error().stack);
+      if (duplicated &&
+          tab.active &&
+          changedProps.openerTabId == initialOpenerTabId &&
+          changedProps.openerTabId != updatedOpenerTabId) {
+        log(`restore original openerTabId of ${tab.id} for duplicated active tab: ${updatedOpenerTabId}`);
+        delete changedProps.openerTabId;
+        browser.tabs.update(tab.id, { openerTabId: updatedOpenerTabId });
+      }
+      metric.add('changed openerTabId handled');
+    }
+
+    if (Object.keys(renewedTab).length > 0) {
+      onUpdated(tab.id, changedProps, renewedTab);
+      metric.add('onUpdated notified');
+    }
+
+    const currentActiveTab = Tab.getActiveTab(tab.windowId);
+    if (renewedTab.active &&
+        currentActiveTab.id != tab.id) {
+      onActivated({
+        tabId:         tab.id,
+        windowId:      tab.windowId,
+        previousTabId: currentActiveTab.id
+      });
+      metric.add('onActivated notified');
+    }
+
+    tab.$TST.memorizeNeighbors('newly tracked');
+    tab.$TST.unsafePreviousTab?.$TST?.memorizeNeighbors('unsafePreviousTab');
+    tab.$TST.unsafeNextTab?.$TST?.memorizeNeighbors('unsafeNextTab');
+
+    Tree.onAttached.removeListener(onTreeModified);
+    metric.add('Tree.onAttached proceeded');
+
+    log('metric on finish: ', metric);
+    return tab;
+  }
+  catch(error) {
+    console.log(error, error.stack);
+    onCompleted();
+    tab.$TST.removeState(Constants.kTAB_STATE_CREATING);
+    Tree.onAttached.removeListener(onTreeModified);
+    metric.add('error handled ', error);
+    log('metric on error: ', metric);
+  }
+}
+
+// "Recycled tab" is an existing but reused tab for session restoration.
+function checkRecycledTab(windowId) {
+  const possibleRecycledTabs = Tab.getRecycledTabs(windowId);
+  log(`Detecting recycled tabs`);
+  for (const tab of possibleRecycledTabs) {
+    if (!TabsStore.ensureLivingItem(tab))
+      continue;
+    const currentId = tab.$TST.uniqueId.id;
+    tab.$TST.updateUniqueId().then(uniqueId => {
+      if (!TabsStore.ensureLivingItem(tab) ||
+          !uniqueId.restored ||
+          uniqueId.id == currentId ||
+          Constants.kTAB_STATE_RESTORED in tab.$TST.states)
+        return;
+      log('A recycled tab is detected: ', dumpTab(tab));
+      tab.$TST.addState(Constants.kTAB_STATE_RESTORED);
+      Tab.onRestored.dispatch(tab);
+    });
+  }
+}
+
+async function onRemoved(tabId, removeInfo) {
+  Tree.markTabIdAsUnattachable(tabId);
+
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  log('tabs.onRemoved: ', tabId, removeInfo);
+  const win                 = Window.init(removeInfo.windowId);
+  const byInternalOperation = win.internalClosingTabs.has(tabId);
+  const preventEntireTreeBehavior = win.keepDescendantsTabs.has(tabId);
+
+  win.internalMovingTabs.delete(tabId);
+  win.alreadyMovedTabs.delete(tabId);
+  win.internalClosingTabs.delete(tabId);
+  win.keepDescendantsTabs.delete(tabId);
+  win.highlightingTabs.delete(tabId);
+  win.tabsToBeHighlightedAlone.delete(tabId);
+
+  win.internallyFocusingTabs.delete(tabId);
+  win.internallyFocusingByMouseTabs.delete(tabId);
+  win.internallyFocusingSilentlyTabs.delete(tabId);
+
+  if (Tab.needToWaitTracked(removeInfo.windowId))
+    await Tab.waitUntilTrackedAll(removeInfo.windowId);
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    const oldTab = Tab.get(tabId);
+    if (!oldTab) {
+      onCompleted();
+      return;
+    }
+
+    log('tabs.onRemoved, tab is found: ', oldTab, `openerTabId=${oldTab.openerTabId}`);
+
+    const nearestTabs = [oldTab.$TST.unsafePreviousTab, oldTab.$TST.unsafeNextTab];
+
+    // remove from "highlighted tabs" cache immediately, to prevent misdetection for "multiple highlighted".
+    TabsStore.removeHighlightedTab(oldTab);
+    TabsStore.removeGroupTab(oldTab);
+
+    TabsStore.addRemovedTab(oldTab);
+
+    removeInfo = {
+      ...removeInfo,
+      byInternalOperation,
+      preventEntireTreeBehavior,
+      oldChildren: oldTab.$TST.children,
+      oldParent:   oldTab.$TST.parent,
+      context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE
+    };
+
+    if (!removeInfo.isWindowClosing) {
+      SidebarConnection.sendMessage({
+        type:            Constants.kCOMMAND_NOTIFY_TAB_REMOVING,
+        windowId:        oldTab.windowId,
+        tabId:           oldTab.id,
+        isWindowClosing: removeInfo.isWindowClosing,
+        byInternalOperation,
+        preventEntireTreeBehavior,
+      });
+    }
+
+    const onRemovingResult = Tab.onRemoving.dispatch(oldTab, {
+      ...removeInfo,
+      byInternalOperation,
+      preventEntireTreeBehavior,
+    });
+    // don't do await if not needed, to process things synchronously
+    if (onRemovingResult instanceof Promise)
+      await onRemovingResult;
+
+    // The removing tab may be attached to tree/someone attached to the removing tab.
+    // We need to clear them by onRemoved handlers.
+    removeInfo.oldChildren = oldTab.$TST.children;
+    removeInfo.oldParent   = oldTab.$TST.parent;
+    oldTab.$TST.addState(Constants.kTAB_STATE_REMOVING);
+    TabsStore.addRemovingTab(oldTab);
+
+    TabsStore.windows.get(removeInfo.windowId).detachTab(oldTab.id, {
+      toBeRemoved: true
+    });
+
+    const onRemovedReuslt = Tab.onRemoved.dispatch(oldTab, removeInfo);
+    // don't do await if not needed, to process things synchronously
+    if (onRemovedReuslt instanceof Promise)
+      await onRemovedReuslt;
+
+    SidebarConnection.sendMessage({
+      type:            Constants.kCOMMAND_NOTIFY_TAB_REMOVED,
+      windowId:        oldTab.windowId,
+      tabId:           oldTab.id,
+      isWindowClosing: removeInfo.isWindowClosing,
+      byInternalOperation,
+      preventEntireTreeBehavior,
+    });
+    oldTab.$TST.destroy();
+
+    for (const tab of nearestTabs) {
+      tab?.$TST?.memorizeNeighbors('neighbor of closed tab');
+    }
+
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+  finally {
+    Tree.clearUnattachableTabId(tabId);
+  }
+}
+
+async function onMoved(tabId, moveInfo) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  const win = Window.init(moveInfo.windowId);
+
+  // Cancel in-progress highlighting, because tabs.highlight() uses old indices of tabs.
+  win.tabsMovedWhileHighlighting = true;
+
+  // Firefox may move the tab between TabsMove.moveTabsInternallyBefore/After()
+  // and TabsMove.syncTabsPositionToApiTabs(). We should treat such a movement
+  // as an "internal" operation also, because we need to suppress "move back"
+  // and other fixup operations around tabs moved by foreign triggers, on such
+  // cases. Don't mind, the tab will be rearranged again by delayed
+  // TabsMove.syncTabsPositionToApiTabs() anyway!
+  const internalExpectedIndex = win.internalMovingTabs.get(tabId);
+  const maybeInternalOperation = internalExpectedIndex < 0 || internalExpectedIndex == moveInfo.toIndex;
+  if (maybeInternalOperation)
+    log(`tabs.onMoved: ${tabId} is detected as moved internally`);
+
+  if (!Tab.isTracked(tabId))
+    await Tab.waitUntilTracked(tabId);
+  if (Tab.needToWaitMoved(moveInfo.windowId))
+    await Tab.waitUntilMovedAll(moveInfo.windowId);
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    const finishMoving = Tab.get(tabId).$TST.startMoving();
+    const completelyMoved = () => { finishMoving(); onCompleted() };
+
+    /* When a tab is pinned, tabs.onMoved may be notified before
+       tabs.onUpdated(pinned=true) is notified. As the result,
+       descendant tabs are unexpectedly moved to the top of the
+       tab bar to follow their parent pinning tab. To avoid this
+       problem, we have to wait for a while with this "async" and
+       do following processes after the tab is completely pinned. */
+    const movedTab = Tab.get(tabId);
+    if (!movedTab) {
+      if (win.internalMovingTabs.has(tabId))
+        win.internalMovingTabs.delete(tabId);
+      completelyMoved();
+      warnTabDestroyedWhileWaiting(tabId, movedTab);
+      return;
+    }
+
+    let oldPreviousTab = movedTab.hidden ? movedTab.$TST.unsafePreviousTab : movedTab.$TST.previousTab;
+    let oldNextTab     = movedTab.hidden ? movedTab.$TST.unsafeNextTab : movedTab.$TST.nextTab;
+    if (movedTab.index != moveInfo.toIndex ||
+        (oldPreviousTab?.index == movedTab.index - 1) ||
+        (oldNextTab?.index == movedTab.index + 1)) {
+      // already moved
+      oldPreviousTab = Tab.getTabAt(moveInfo.windowId, moveInfo.toIndex < moveInfo.fromIndex ? moveInfo.fromIndex : moveInfo.fromIndex - 1);
+      oldNextTab     = Tab.getTabAt(moveInfo.windowId, moveInfo.toIndex < moveInfo.fromIndex ? moveInfo.fromIndex + 1 : moveInfo.fromIndex);
+      if (oldPreviousTab?.id == movedTab.id)
+        oldPreviousTab = Tab.getTabAt(moveInfo.windowId, moveInfo.toIndex < moveInfo.fromIndex ? moveInfo.fromIndex - 1 : moveInfo.fromIndex - 2);
+      if (oldNextTab?.id == movedTab.id)
+        oldNextTab = Tab.getTabAt(moveInfo.windowId, moveInfo.toIndex < moveInfo.fromIndex ? moveInfo.fromIndex : moveInfo.fromIndex - 1);
+    }
+
+    const expectedIndex = win.alreadyMovedTabs.get(tabId);
+    const alreadyMoved = expectedIndex < 0 || expectedIndex == moveInfo.toIndex;
+    if (win.alreadyMovedTabs.has(tabId))
+      win.alreadyMovedTabs.delete(tabId);
+
+    const extendedMoveInfo = {
+      ...moveInfo,
+      byInternalOperation: maybeInternalOperation,
+      alreadyMoved,
+      oldPreviousTab,
+      oldNextTab,
+      // Multiselected tabs can be moved together in bulk, by drag and drop
+      // in the horizontal tab bar, or addons like
+      // https://addons.mozilla.org/firefox/addon/move-tab-hotkeys/
+      movedInBulk: !maybeInternalOperation && (movedTab.$TST.multiselected || movedTab.$TST.movedInBulk),
+    };
+    log('tabs.onMoved: ', movedTab, extendedMoveInfo);
+
+    let canceled = Tab.onMoving.dispatch(movedTab, extendedMoveInfo);
+    // don't do await if not needed, to process things synchronously
+    if (canceled instanceof Promise)
+      await canceled;
+    canceled = canceled === false;
+    if (!canceled &&
+        TabsStore.ensureLivingItem(movedTab)) { // it is removed while waiting
+      let newNextIndex = extendedMoveInfo.toIndex;
+      if (extendedMoveInfo.fromIndex < newNextIndex)
+        newNextIndex++;
+      const nextTab = Tab.getTabAt(moveInfo.windowId, newNextIndex);
+      extendedMoveInfo.nextTab = nextTab;
+      if (!alreadyMoved &&
+          movedTab.$TST.nextTab != nextTab) {
+        if (nextTab) {
+          if (nextTab.index > movedTab.index)
+            movedTab.index = nextTab.index - 1;
+          else
+            movedTab.index = nextTab.index;
+        }
+        else {
+          movedTab.index = win.tabs.size - 1
+        }
+        movedTab.reindexedBy = `tabs.onMoved (${movedTab.index})`;
+        win.trackTab(movedTab);
+        log('Tab nodes rearranged by tabs.onMoved listener:\n'+(!configs.debug ? '' :
+          toLines(Array.from(win.getOrderedTabs()),
+                  tab => ` - ${tab.index}: ${tab.id}${tab.id == movedTab.id ? '[MOVED]' : ''}`)),
+            { moveInfo });
+      }
+      const onMovedResult = Tab.onMoved.dispatch(movedTab, extendedMoveInfo);
+      // don't do await if not needed, to process things synchronously
+      if (onMovedResult instanceof Promise)
+        await onMovedResult;
+      if (!alreadyMoved)
+        SidebarConnection.sendMessage({
+          type:      Constants.kCOMMAND_NOTIFY_TAB_MOVED,
+          windowId:  movedTab.windowId,
+          tabId:     movedTab.id,
+          fromIndex: moveInfo.fromIndex,
+          toIndex:   movedTab.index,
+          nextTabId: nextTab?.id,
+        });
+    }
+    if (win.internalMovingTabs.has(tabId))
+      win.internalMovingTabs.delete(tabId);
+    completelyMoved();
+
+    movedTab.$TST.memorizeNeighbors('moved');
+    movedTab.$TST.unsafePreviousTab?.$TST?.memorizeNeighbors('unsafePreviousTab');
+    movedTab.$TST.unsafeNextTab?.$TST?.memorizeNeighbors('unsafeNextTab');
+
+    oldPreviousTab?.$TST?.memorizeNeighbors('oldPreviousTab');
+    oldNextTab?.$TST?.memorizeNeighbors('oldNextTab');
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+const mTreeInfoForTabsMovingAcrossWindows = new Map();
+
+async function onAttached(tabId, attachInfo) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    log('tabs.onAttached, id: ', tabId, attachInfo);
+    let tab = Tab.get(tabId);
+    let attachedTab = await browser.tabs.get(tabId).catch(error => {
+      console.error(error);
+      return null;
+    });
+    if (!attachedTab) {
+      // We sometimes fail to get window and tab via API if it is opened
+      // as a popup window but not exposed to API yet. So for safety
+      // we should retry for a while.
+      // See also: https://github.com/piroor/treestyletab/issues/3311
+      const newWindow = await browser.windows.get(attachInfo.newWindowId, { populate: true }).then(_error => null);
+      attachedTab = newWindow?.tabs.find(tab => tab.id == tabId);
+      if (!newWindow || !attachedTab) {
+        if (!('$TST_retryCount' in attachInfo))
+          attachInfo.$TST_retryCount = 0;
+        if (attachInfo.$TST_retryCount < 10) {
+          attachInfo.$TST_retryCount++;
+          setTimeout(() => onAttached(tabId, attachInfo), 0); // because window.requestAnimationFrame is decelerate for an invisible document.
+          return;
+        }
+        console.log(`tabs.onAttached: the tab ${tabId} or the window ${attachInfo.newWindowId} is already closed. `);
+        onCompleted();
+        return;
+      }
+    }
+
+    if (!tab) {
+      log(`tabs.onAttached: Moved tab ${tabId} is not tracked yet.`);
+      const newWindow = await browser.windows.get(attachInfo.newWindowId, { populate: true }).then(_error => null);
+      attachedTab = newWindow?.tabs.find(tab => tab.id == tabId);
+      if (!attachedTab) {
+        console.log(`tabs.onAttached: the tab ${tabId} is already closed.`);
+        onCompleted();
+        return;
+      }
+      onWindowCreated(newWindow);
+      await onNewTabTracked(attachedTab, { trigger: 'tabs.onAttached' });
+      tab = Tab.get(tabId);
+    }
+
+    tab.windowId = attachInfo.newWindowId
+    tab.index    = attachedTab.index;
+    tab.reindexedBy = `tabs.onAttached (${tab.index})`;
+
+    if (tab.groupId != -1) {
+      // tabGroups.onMoved may be notified after all tabs are moved across windows,
+      // but we need to use group information in the destination window, thus we
+      // simulate native events here.
+      TabsStore.addNativelyGroupedTab(tab, attachInfo.newWindowId);
+      if (TabGroup.getMembers(tab.groupId, { windowId: attachInfo.newWindowId }).length == 1) {
+        const group = TabGroup.get(tab.groupId);
+        if (group) {
+          TabsStore.windows.get(attachInfo.newWindowId).tabGroups.set(group.id, group);
+          SidebarConnection.sendMessage({
+            type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_CREATED,
+            windowId: attachInfo.newWindowId,
+            group:    group.$TST.sanitized,
+          });
+        }
+      }
+    }
+
+    TabsInternalOperation.clearOldActiveStateInWindow(attachInfo.newWindowId);
+    const info = {
+      ...attachInfo,
+      ...mTreeInfoForTabsMovingAcrossWindows.get(tabId)
+    };
+    mTreeInfoForTabsMovingAcrossWindows.delete(tabId);
+
+    const win = TabsStore.windows.get(attachInfo.newWindowId);
+    await onNewTabTracked(tab, { trigger: 'tabs.onAttached' });
+    const byInternalOperation = win.toBeAttachedTabs.has(tab.id);
+    if (byInternalOperation)
+      win.toBeAttachedTabs.delete(tab.id);
+    info.byInternalOperation = info.byInternalOperation || byInternalOperation;
+
+    if (!byInternalOperation) { // we should process only tabs attached by others.
+      const onAttachedResult = Tab.onAttached.dispatch(tab, info);
+      // don't do await if not needed, to process things synchronously
+      if (onAttachedResult instanceof Promise)
+        await onAttachedResult;
+    }
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_ATTACHED_TO_WINDOW,
+      windowId: attachInfo.newWindowId,
+      tabId
+    });
+
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+async function onDetached(tabId, detachInfo) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    log('tabs.onDetached, id: ', tabId, detachInfo);
+    const oldTab = Tab.get(tabId);
+    if (!oldTab) {
+      onCompleted();
+      return;
+    }
+
+    const oldWindow           = TabsStore.windows.get(detachInfo.oldWindowId);
+    const byInternalOperation = oldWindow.toBeDetachedTabs.has(tabId);
+    if (byInternalOperation)
+      oldWindow.toBeDetachedTabs.delete(tabId);
+
+    const descendants = oldTab.$TST.descendants;
+    const info = {
+      ...detachInfo,
+      byInternalOperation,
+      trigger:     'tabs.onDetached',
+      windowId:    detachInfo.oldWindowId,
+      structure:   TreeBehavior.getTreeStructureFromTabs([oldTab, ...descendants]),
+      descendants
+    };
+    const alreadyMovedAcrossWindows = Array.from(mTreeInfoForTabsMovingAcrossWindows.values(), info => info.descendants.map(tab => tab.id)).some(tabIds => tabIds.includes(tabId));
+    if (!alreadyMovedAcrossWindows)
+      mTreeInfoForTabsMovingAcrossWindows.set(tabId, info);
+
+    if (oldTab.groupId != -1) {
+      TabsStore.removeNativelyGroupedTab(oldTab, detachInfo.oldWindowId);
+      if (TabGroup.getMembers(oldTab.groupId, { windowId: detachInfo.oldWindowId }).length == 0) {
+        const group = TabGroup.get(oldTab.groupId);
+        if (group) {
+          TabsStore.windows.get(detachInfo.oldWindowId).tabGroups.delete(group.id);
+          SidebarConnection.sendMessage({
+            type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_REMOVED,
+            windowId: detachInfo.oldWindowId,
+            group:    group.$TST.sanitized,
+          });
+        }
+      }
+    }
+
+    if (!byInternalOperation) // we should process only tabs detached by others.
+      Tab.onDetached.dispatch(oldTab, info);
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW,
+      windowId: detachInfo.oldWindowId,
+      tabId,
+      wasPinned: oldTab.pinned
+    });
+    // We need to notify this to some conetnt scripts, to destroy themselves.
+    try {
+      browser.tabs.sendMessage(tabId, {
+        type: Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW,
+      }).catch(_error => {});
+    }
+    catch (_error) {
+    }
+
+    TabsStore.addRemovedTab(oldTab);
+    oldWindow.detachTab(oldTab.id, {
+      toBeDetached: true
+    });
+    if (!TabsStore.getCurrentWindowId() && // only in the background page - the sidebar has no need to destroy itself manually.
+        oldWindow.tabs &&
+        oldWindow.tabs.size == 0) { // not destroyed yet case
+      if (oldWindow.delayedDestroy)
+        clearTimeout(oldWindow.delayedDestroy);
+      oldWindow.delayedDestroy = setTimeout(() => {
+        // the last tab can be removed with browser.tabs.closeWindowWithLastTab=false,
+        // so we should not destroy the window immediately.
+        if (oldWindow.tabs &&
+            oldWindow.tabs.size == 0)
+          oldWindow.destroy();
+      }, (configs.collapseDuration, 1000) * 5);
+    }
+
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+async function onWindowCreated(win) {
+  const trackedWindow = TabsStore.windows.get(win.id) || new Window(win.id);
+  trackedWindow.incognito = win.incognito;
+}
+
+async function onWindowRemoved(windowId) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  mTabsHighlightedTimers.delete(windowId);
+  mLastHighlightedCount.delete(windowId);
+
+  const [onCompleted, previous] = addTabOperationQueue();
+  if (!configs.acceleratedTabOperations && previous)
+    await previous;
+
+  try {
+    log('onWindowRemoved ', windowId);
+    const win = TabsStore.windows.get(windowId);
+    if (win &&
+        !TabsStore.getCurrentWindowId()) // skip destructor on sidebar
+      win.destroy();
+
+    onCompleted();
+  }
+  catch(e) {
+    console.log(e);
+    onCompleted();
+  }
+}
+
+
+browser.windows.onFocusChanged.addListener(windowId => {
+  mAppIsActive = windowId > 0;
+});
+
+
+async function onGroupCreated(group) {
+  log('onGroupCreated ', group);
+
+  const trackedGroup = TabGroup.init(group);
+  TabsStore.windows.get(trackedGroup.windowId).tabGroups.set(group.id, trackedGroup);
+
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_CREATED,
+    windowId: trackedGroup.windowId,
+    group:    trackedGroup.$TST.sanitized,
+  });
+}
+
+async function onGroupUpdated(group) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  log('onGroupUpdated ', group);
+
+  const trackedGroup = TabGroup.get(group.id);
+  trackedGroup.$TST.apply(group);
+
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_UPDATED,
+    windowId: trackedGroup.windowId,
+    group:    trackedGroup.$TST.sanitized,
+  });
+}
+
+async function onGroupRemoved(group) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  log('onGroupRemoved ', group);
+
+  const trackedGroup = TabGroup.get(group.id);
+  if (trackedGroup.windowId == group.windowId) {
+    trackedGroup.$TST.destroy();
+  }
+  else {
+    log('onGroupRemoved: => moved to another window, no need to destroy');
+  }
+
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_REMOVED,
+    windowId: group.windowId,
+    group,
+  });
+}
+
+async function onGroupMoved(group) {
+  if (mPromisedStarted)
+    await mPromisedStarted;
+
+  log('onGroupMoved ', group);
+  const trackedGroup = TabGroup.get(group.id);
+  if (!trackedGroup) {
+    return;
+  }
+
+  const oldWindowId = trackedGroup.windowId;
+  const newWindowId = group.windowId;
+  if (newWindowId == oldWindowId) {
+    return;
+  }
+
+  const members = trackedGroup.$TST.members;
+  for (const tab of members) {
+    TabsStore.removeNativelyGroupedTab(tab, oldWindowId);
+    TabsStore.addNativelyGroupedTab(tab, newWindowId);
+  }
+
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_REMOVED,
+    windowId: oldWindowId,
+    group:    trackedGroup.$TST.sanitized,
+  });
+
+  TabsStore.windows.get(oldWindowId).tabGroups.delete(group.id);
+  trackedGroup.windowId = newWindowId;
+  TabsStore.windows.get(newWindowId).tabGroups.set(group.id, trackedGroup);
+
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_GROUP_CREATED,
+    windowId: newWindowId,
+    group:    trackedGroup.$TST.sanitized,
+  });
+}
diff --git a/waterfox/browser/components/sidebar/background/auto-sticky-tabs.js b/waterfox/browser/components/sidebar/background/auto-sticky-tabs.js
new file mode 100644
index 0000000000000..06463789c7572
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/auto-sticky-tabs.js
@@ -0,0 +1,66 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+configs.$addObserver(key => {
+  switch (key) {
+    case 'stickyActiveTab':
+      updateAutoStickyActive();
+      break;
+
+    case 'stickySoundPlayingTab':
+      updateAutoStickySoundPlaying();
+      break;
+
+    case 'stickySharingTab':
+      updateAutoStickySharing();
+      break;
+
+    default:
+      break;
+  }
+});
+configs.$loaded.then(() => {
+  updateAutoStickyActive();
+  updateAutoStickySoundPlaying();
+  updateAutoStickySharing();
+});
+
+function updateAutoStickyActive() {
+  if (configs.stickyActiveTab)
+    Tab.registerAutoStickyState(Constants.kTAB_STATE_ACTIVE);
+  else
+    Tab.unregisterAutoStickyState(Constants.kTAB_STATE_ACTIVE);
+}
+
+function updateAutoStickySoundPlaying() {
+  if (configs.stickySoundPlayingTab)
+    Tab.registerAutoStickyState(Constants.kTAB_STATE_SOUND_PLAYING);
+  else
+    Tab.unregisterAutoStickyState(Constants.kTAB_STATE_SOUND_PLAYING);
+}
+
+function updateAutoStickySharing() {
+  if (configs.stickySharingTab)
+    Tab.registerAutoStickyState([
+      Constants.kTAB_STATE_SHARING_CAMERA,
+      Constants.kTAB_STATE_SHARING_MICROPHONE,
+      Constants.kTAB_STATE_SHARING_SCREEN,
+    ]);
+  else
+    Tab.unregisterAutoStickyState([
+      Constants.kTAB_STATE_SHARING_CAMERA,
+      Constants.kTAB_STATE_SHARING_MICROPHONE,
+      Constants.kTAB_STATE_SHARING_SCREEN,
+    ]);
+}
diff --git a/waterfox/browser/components/sidebar/background/background-cache.js b/waterfox/browser/components/sidebar/background/background-cache.js
new file mode 100644
index 0000000000000..cafbe55e3476e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/background-cache.js
@@ -0,0 +1,614 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import { SequenceMatcher } from '/extlib/diff.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  wait,
+  mapAndFilter,
+  configs
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as CacheStorage from '/common/cache-storage.js';
+import * as Constants from '/common/constants.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as UniqueId from '/common/unique-id.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab } from '/common/TreeItem.js';
+
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/background-cache', ...args);
+}
+
+const kCONTENTS_VERSION = 5;
+
+let mActivated = false;
+const mCaches = {};
+
+export function activate() {
+  mActivated = true;
+  configs.$addObserver(onConfigChange);
+
+  if (!configs.persistCachedTree) {
+    // clear obsolete cache
+    browser.windows.getAll().then(windows => {
+      for (const win of windows) {
+        browser.sessions.removeWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_TABS).catch(ApiTabs.createErrorSuppressor());
+        browser.sessions.removeWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY).catch(ApiTabs.createErrorSuppressor());
+      }
+    });
+  }
+}
+
+
+// ===================================================================
+// restoring tabs from cache
+// ===================================================================
+
+export async function restoreWindowFromEffectiveWindowCache(windowId, options = {}) {
+  MetricsData.add('restoreWindowFromEffectiveWindowCache: start');
+  log(`restoreWindowFromEffectiveWindowCache for ${windowId} start`);
+  const owner = options.owner || getWindowCacheOwner(windowId);
+  if (!owner) {
+    log(`restoreWindowFromEffectiveWindowCache for ${windowId} fail: no owner`);
+    return false;
+  }
+  cancelReservedCacheTree(windowId); // prevent to break cache before loading
+  const tabs = options.tabs || await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+  if (configs.debug)
+    log(`restoreWindowFromEffectiveWindowCache for ${windowId} tabs: `, () => tabs.map(dumpTab));
+  const actualSignature = getWindowSignature(tabs);
+  let cache = options.caches?.get(`window-${owner.windowId}`) || await MetricsData.addAsync('restoreWindowFromEffectiveWindowCache: window cache', getWindowCache(owner, Constants.kWINDOW_STATE_CACHED_TABS));
+  if (!cache) {
+    log(`restoreWindowFromEffectiveWindowCache for ${windowId} fail: no cache`);
+    return false;
+  }
+  const promisedPermanentStates = Promise.all(tabs.map(tab => Tab.get(tab.id).$TST.getPermanentStates())); // don't await at here for better performance
+  MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: start');
+  let cachedSignature = cache?.signature;
+  log(`restoreWindowFromEffectiveWindowCache for ${windowId}: got from the owner `, {
+    owner, cachedSignature, cache
+  });
+  const signatureGeneratedFromCache = getWindowSignature(cache.tabs).join('\n');
+  if (cache &&
+      cache.tabs &&
+      cachedSignature &&
+      cachedSignature.join('\n') != signatureGeneratedFromCache) {
+    log(`restoreWindowFromEffectiveWindowCache for ${windowId}: cache is broken.`, {
+      cachedSignature: cachedSignature.join('\n'),
+      signatureGeneratedFromCache
+    });
+    cache = cachedSignature = null;
+    TabsInternalOperation.clearCache(owner);
+    MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: signature failed.');
+  }
+  else {
+    MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: signature passed.');
+  }
+  if (options.ignorePinnedTabs &&
+      cache &&
+      cache.tabs &&
+      cachedSignature) {
+    cache.tabs      = trimTabsCache(cache.tabs, cache.pinnedTabsCount);
+    cachedSignature = trimSignature(cachedSignature, cache.pinnedTabsCount);
+  }
+  MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: matching actual signature of got cache');
+  const signatureMatchResult = matcheSignatures({
+    actual: actualSignature,
+    cached: cachedSignature
+  });
+  log(`restoreWindowFromEffectiveWindowCache for ${windowId}: verify cache`, {
+    cache, actualSignature, cachedSignature,
+    ...signatureMatchResult,
+  });
+  if (!cache ||
+      cache.version != kCONTENTS_VERSION ||
+      !signatureMatchResult.matched) {
+    log(`restoreWindowFromEffectiveWindowCache for ${windowId}: no effective cache`);
+    TabsInternalOperation.clearCache(owner);
+    MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: actual signature failed.');
+    return false;
+  }
+  MetricsData.add('restoreWindowFromEffectiveWindowCache: validity check: actual signature passed.');
+  cache.offset = signatureMatchResult.offset;
+
+  log(`restoreWindowFromEffectiveWindowCache for ${windowId}: restore from cache`);
+
+  const permanentStates = await MetricsData.addAsync('restoreWindowFromEffectiveWindowCache: permanentStatus', promisedPermanentStates); // await at here for better performance
+  const restored = await MetricsData.addAsync('restoreWindowFromEffectiveWindowCache: restoreTabsFromCache', restoreTabsFromCache(windowId, { cache, tabs, permanentStates }));
+  if (restored) {
+    MetricsData.add(`restoreWindowFromEffectiveWindowCache: window ${windowId} succeeded`);
+    // Now we reload the sidebar if it is opened, because it is the easiest way
+    // to synchronize state of tabs completely.
+    log('reload sidebar for a tree restored from cache');
+    browser.runtime.sendMessage({
+      type: Constants.kCOMMAND_RELOAD,
+      windowId,
+    }).catch(ApiTabs.createErrorSuppressor());
+  }
+  else {
+    MetricsData.add(`restoreWindowFromEffectiveWindowCache: window ${windowId} failed`);
+  }
+
+  log(`restoreWindowFromEffectiveWindowCache for ${windowId}: restored = ${restored}`);
+  return restored;
+}
+
+function getWindowSignature(tabs) {
+  return tabs.map(tab => `${tab.cookieStoreId},${tab.incognito},${tab.pinned},${tab.url}`);
+}
+
+function trimSignature(signature, ignoreCount) {
+  if (!ignoreCount || ignoreCount < 0)
+    return signature;
+  return signature.slice(ignoreCount);
+}
+
+function trimTabsCache(cache, ignoreCount) {
+  if (!ignoreCount || ignoreCount < 0)
+    return cache;
+  return cache.slice(ignoreCount);
+}
+
+function matcheSignatures(signatures) {
+  const operations = (new SequenceMatcher(signatures.cached, signatures.actual)).operations();
+  log('matcheSignatures: operations ', operations);
+  let matched = false;
+  let offset  = 0;
+  for (const operation of operations) {
+    const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+    if (tag == 'equal' &&
+        fromEnd - fromStart == signatures.cached.length) {
+      matched = true;
+      break;
+    }
+    offset += toEnd - toStart;
+  }
+  log('matcheSignatures: ', { matched, offset });
+  return { matched, offset };
+}
+
+
+async function restoreTabsFromCache(windowId, params = {}) {
+  if (!params.cache ||
+      params.cache.version != kCONTENTS_VERSION)
+    return false;
+
+  return (await restoreTabsFromCacheInternal({
+    windowId,
+    tabs:         params.tabs,
+    permanentStates: params.permanentStates,
+    offset:       params.cache.offset || 0,
+    cache:        params.cache.tabs
+  })).length > 0;
+}
+
+async function restoreTabsFromCacheInternal(params) {
+  MetricsData.add('restoreTabsFromCacheInternal: start');
+  log(`restoreTabsFromCacheInternal: restore tabs for ${params.windowId} from cache`);
+  const offset = params.offset || 0;
+  const win    = TabsStore.windows.get(params.windowId);
+  const tabs   = params.tabs.slice(offset).map(tab => Tab.get(tab.id));
+  if (offset > 0 &&
+      tabs.length <= offset) {
+    log('restoreTabsFromCacheInternal: missing window');
+    return [];
+  }
+  log(`restoreTabsFromCacheInternal: there is ${win.tabs.size} tabs`);
+  if (params.cache.length != tabs.length) {
+    log('restoreTabsFromCacheInternal: Mismatched number of restored tabs?');
+    return [];
+  }
+  try {
+    await MetricsData.addAsync('rebuildAll: fixupTabsRestoredFromCache', fixupTabsRestoredFromCache(tabs, params.permanentStates, params.cache));
+  }
+  catch(e) {
+    log(String(e), e.stack);
+    throw e;
+  }
+  log('restoreTabsFromCacheInternal: done');
+  if (configs.debug)
+    Tab.dumpAll();
+  return tabs;
+}
+
+async function fixupTabsRestoredFromCache(tabs, permanentStates, cachedTabs) {
+  MetricsData.add('fixupTabsRestoredFromCache: start');
+  if (tabs.length != cachedTabs.length)
+    throw new Error(`fixupTabsRestoredFromCache: Mismatched number of tabs restored from cache, tabs=${tabs.length}, cachedTabs=${cachedTabs.length}`);
+  log('fixupTabsRestoredFromCache start ', () => ({ tabs: tabs.map(dumpTab), cachedTabs }));
+  const idMap = new Map();
+  let remappedCount = 0;
+  // step 1: build a map from old id to new id
+  tabs = tabs.map((tab, index) => {
+    const cachedTab = cachedTabs[index];
+    const oldId     = cachedTab.id;
+    tab = Tab.get(tab.id);
+    log(`fixupTabsRestoredFromCache: remap ${oldId} => ${tab.id}`);
+    idMap.set(oldId, tab);
+    if (oldId != tab.id)
+      remappedCount++;
+    return tab;
+  });
+  if (remappedCount && remappedCount < tabs.length)
+    throw new Error(`fixupTabsRestoredFromCache: not a window restoration, only ${remappedCount} tab(s) are restored (maybe restoration of closed tabs)`);
+  MetricsData.add('fixupTabsRestoredFromCache: step 1 done.');
+  // step 2: restore information of tabs
+  // Do this from bottom to top, to reduce post operations for modified trees.
+  // (Attaching a tab to an existing tree will trigger "update" task for
+  // existing ancestors, but attaching existing subtree to a solo tab won't
+  // trigger such tasks.)
+  // See also: https://github.com/piroor/treestyletab/issues/2278#issuecomment-519387792
+  for (let i = tabs.length - 1; i > -1; i--) {
+    fixupTabRestoredFromCache(tabs[i], permanentStates[i], cachedTabs[i], idMap);
+  }
+  // step 3: restore collapsed/expanded state of tabs and finalize the
+  // restoration process
+  // Do this from top to bottom, because a tab can be placed under an
+  // expanded parent but the parent can be placed under a collapsed parent.
+  for (const tab of tabs) {
+    fixupTabRestoredFromCachePostProcess(tab);
+  }
+  MetricsData.add('fixupTabsRestoredFromCache: step 2 done.');
+}
+
+function fixupTabRestoredFromCache(tab, permanentStates, cachedTab, idMap) {
+  tab.$TST.clear();
+  const tabStates = new Set([...cachedTab.$TST.states, ...permanentStates]);
+  for (const state of Constants.kTAB_TEMPORARY_STATES) {
+    tabStates.delete(state);
+  }
+  tab.$TST.states = tabStates;
+  tab.$TST.attributes = cachedTab.$TST.attributes;
+
+  log('fixupTabRestoredFromCache children: ', cachedTab.$TST.childIds);
+  const childIds = mapAndFilter(cachedTab.$TST.childIds, oldId => {
+    const tab = idMap.get(oldId);
+    return tab?.id || undefined;
+  });
+  tab.$TST.children = childIds;
+  if (childIds.length > 0)
+    tab.$TST.setAttribute(Constants.kCHILDREN, `|${childIds.join('|')}|`);
+  else
+    tab.$TST.removeAttribute(Constants.kCHILDREN);
+  log('fixupTabRestoredFromCache children: => ', tab.$TST.childIds);
+
+  log('fixupTabRestoredFromCache parent: ', cachedTab.$TST.parentId);
+  const parentTab = idMap.get(cachedTab.$TST.parentId) || null;
+  tab.$TST.parent = parentTab;
+  if (parentTab)
+    tab.$TST.setAttribute(Constants.kPARENT, parentTab.id);
+  else
+    tab.$TST.removeAttribute(Constants.kPARENT);
+  log('fixupTabRestoredFromCache parent: => ', tab.$TST.parentId);
+
+  if (tab.discarded) {
+    tab.$TST.addState(Constants.kTAB_STATE_PENDING);
+  }
+
+  tab.$TST.temporaryMetadata.set('treeStructureAlreadyRestoredFromSessionData', true);
+}
+
+function fixupTabRestoredFromCachePostProcess(tab) {
+  const parentTab = tab.$TST.parent;
+  if (parentTab &&
+      (parentTab.$TST.collapsed ||
+       parentTab.$TST.subtreeCollapsed)) {
+    tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED);
+    tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED_DONE);
+  }
+  else {
+    tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED);
+    tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED_DONE);
+  }
+
+  TabsStore.updateIndexesForTab(tab);
+  TabsUpdate.updateTab(tab, tab, { forceApply: true, onlyApply: true });
+}
+
+
+// ===================================================================
+// updating cache
+// ===================================================================
+
+async function updateWindowCache(owner, key, value) {
+  if (!owner)
+    return;
+
+  if (configs.persistCachedTree) {
+    try {
+      if (value)
+        await CacheStorage.setValue({
+          windowId: owner.windowId,
+          key,
+          value,
+          store: CacheStorage.BACKGROUND,
+        });
+      else
+        await CacheStorage.deleteValue({
+          windowId: owner.windowId,
+          key,
+          store: CacheStorage.BACKGROUND,
+        });
+      return;
+    }
+    catch(error) {
+      console.log(`BackgroundCache.updateWindowCache for ${owner.windowId}/${key} failed: `, error.message, error.stack, error);
+    }
+  }
+
+  const storageKey = `backgroundCache-${await UniqueId.ensureWindowId(owner.windowId)}-${key}`;
+  if (value)
+    mCaches[storageKey] = value;
+  else
+    delete mCaches[storageKey];
+}
+
+export function markWindowCacheDirtyFromTab(tab, akey) {
+  const win = TabsStore.windows.get(tab.windowId);
+  if (!win) // the window may be closed
+    return;
+  if (win.markWindowCacheDirtyFromTabTimeout)
+    clearTimeout(win.markWindowCacheDirtyFromTabTimeout);
+  win.markWindowCacheDirtyFromTabTimeout = setTimeout(() => {
+    win.markWindowCacheDirtyFromTabTimeout = null;
+    updateWindowCache(win.lastWindowCacheOwner, akey, true);
+  }, 100);
+}
+
+async function getWindowCache(owner, key) {
+  if (configs.persistCachedTree) {
+    try {
+      const value = await CacheStorage.getValue({
+        windowId: owner.windowId,
+        key,
+        store: CacheStorage.BACKGROUND,
+      });
+      return value;
+    }
+    catch(error) {
+      console.log(`BackgroundCache.getWindowCache for ${owner.windowId}/${key} failed: `, error.message, error.stack, error);
+    }
+  }
+
+  const storageKey = `backgroundCache-${await UniqueId.ensureWindowId(owner.windowId)}-${key}`;
+  return mCaches[storageKey];
+}
+
+function getWindowCacheOwner(windowId) {
+  const tab = Tab.getFirstTab(windowId);
+  if (!tab)
+    return null;
+  return {
+    id:       tab.id,
+    windowId: tab.windowId
+  };
+}
+
+export async function reserveToCacheTree(windowId, trigger) {
+  if (!mActivated ||
+      !configs.useCachedTree)
+    return;
+
+  const win = TabsStore.windows.get(windowId);
+  if (!win)
+    return;
+
+  // If there is any opening (but not resolved its unique id yet) tab,
+  // we are possibly restoring tabs. To avoid cache breakage before
+  // restoration, we must wait until we know whether there is any other
+  // restoring tab or not.
+  if (Tab.needToWaitTracked(windowId))
+    await Tab.waitUntilTrackedAll(windowId);
+
+  if (win.promisedAllTabsRestored) // not restored yet
+    return;
+
+  if (!trigger && configs.debug)
+    trigger = new Error().stack;
+
+  log('reserveToCacheTree for window ', windowId, trigger);
+  TabsInternalOperation.clearCache(win.lastWindowCacheOwner);
+
+  if (trigger)
+    reserveToCacheTree.triggers.add(trigger);
+
+  if (win.waitingToCacheTree)
+    clearTimeout(win.waitingToCacheTree);
+  win.waitingToCacheTree = setTimeout(() => {
+    const triggers = [...reserveToCacheTree.triggers];
+    reserveToCacheTree.triggers.clear();
+    cacheTree(windowId, triggers);
+  }, 500);
+}
+reserveToCacheTree.triggers = new Set();
+
+function cancelReservedCacheTree(windowId) {
+  const win = TabsStore.windows.get(windowId);
+  if (win?.waitingToCacheTree) {
+    clearTimeout(win.waitingToCacheTree);
+    delete win.waitingToCacheTree;
+  }
+}
+
+async function cacheTree(windowId, triggers) {
+  if (Tab.needToWaitTracked(windowId))
+    await Tab.waitUntilTrackedAll(windowId);
+  const win = TabsStore.windows.get(windowId);
+  if (!win ||
+      !configs.useCachedTree)
+    return;
+  const signature = getWindowSignature(Tab.getAllTabs(windowId));
+  if (win.promisedAllTabsRestored) // not restored yet
+    return;
+  //log('save cache for ', windowId);
+  win.lastWindowCacheOwner = getWindowCacheOwner(windowId);
+  if (!win.lastWindowCacheOwner)
+    return;
+  const firstTab = Tab.getFirstTab(windowId);
+  if (firstTab.incognito) { // never save cache for incognito windows
+    updateWindowCache(win.lastWindowCacheOwner, Constants.kWINDOW_STATE_CACHED_TABS, null);
+    return;
+  }
+  log('cacheTree for window ', windowId, triggers/*{ stack: configs.debug && new Error().stack }*/);
+  updateWindowCache(win.lastWindowCacheOwner, Constants.kWINDOW_STATE_CACHED_TABS, {
+    version:         kCONTENTS_VERSION,
+    tabs:            TabsStore.windows.get(windowId).export(true).tabs,
+    pinnedTabsCount: Tab.getPinnedTabs(windowId).length,
+    signature
+  });
+}
+
+
+// update cache on events
+
+Tab.onCreated.addListener((tab, _info = {}) => {
+  if (!tab.$TST.previousTab) { // it is a new cache owner
+    const win = TabsStore.windows.get(tab.windowId);
+    if (win.lastWindowCacheOwner)
+      TabsInternalOperation.clearCache(win.lastWindowCacheOwner);
+  }
+  reserveToCacheTree(tab.windowId, 'tab created');
+});
+
+// Tree restoration for "Restore Previous Session"
+Tab.onWindowRestoring.addListener(async ({ windowId, restoredCount }) => {
+  if (!configs.useCachedTree)
+    return;
+
+  log('Tabs.onWindowRestoring ', { windowId, restoredCount });
+  if (restoredCount == 1) {
+    log('Tabs.onWindowRestoring: single tab restored');
+    return;
+  }
+
+  log('Tabs.onWindowRestoring: continue ', windowId);
+  MetricsData.add('Tabs.onWindowRestoring restore start');
+
+  const tabs = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+  try {
+    await restoreWindowFromEffectiveWindowCache(windowId, {
+      ignorePinnedTabs: true,
+      owner: tabs[tabs.length - 1],
+      tabs
+    });
+    MetricsData.add('Tabs.onWindowRestoring restore end');
+  }
+  catch(e) {
+    log('Tabs.onWindowRestoring: FATAL ERROR while restoring tree from cache', String(e), e.stack);
+  }
+});
+
+Tab.onRemoved.addListener((tab, info) => {
+  if (!tab.$TST.previousTab) // the tab was the cache owner
+    TabsInternalOperation.clearCache(tab);
+  wait(0).then(() => {
+  // "Restore Previous Session" closes some tabs at first, so we should not clear the old cache yet.
+  // See also: https://dxr.mozilla.org/mozilla-central/rev/5be384bcf00191f97d32b4ac3ecd1b85ec7b18e1/browser/components/sessionstore/SessionStore.jsm#3053
+    reserveToCacheTree(info.windowId, 'tab removed');
+  });
+});
+
+Tab.onMoved.addListener((tab, info) => {
+  if (info.fromIndex == 0) // the tab is not the cache owner anymore
+    TabsInternalOperation.clearCache(tab);
+  reserveToCacheTree(info.windowId, 'tab moved');
+});
+
+Tab.onUpdated.addListener((tab, info) => {
+  markWindowCacheDirtyFromTab(tab, Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY);
+  if ('url' in info)
+    reserveToCacheTree(tab.windowId, 'tab updated');
+});
+
+Tab.onStateChanged.addListener((tab, state, _has) => {
+  if (state == Constants.kTAB_STATE_STICKY)
+    markWindowCacheDirtyFromTab(tab, Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY);
+});
+
+Tree.onSubtreeCollapsedStateChanging.addListener(tab => {
+  reserveToCacheTree(tab.windowId, 'subtree collapsed/expanded');
+});
+
+Tree.onAttached.addListener((tab, _info) => {
+  wait(0).then(() => {
+    // "Restore Previous Session" closes some tabs at first and it causes tree changes, so we should not clear the old cache yet.
+    // See also: https://dxr.mozilla.org/mozilla-central/rev/5be384bcf00191f97d32b4ac3ecd1b85ec7b18e1/browser/components/sessionstore/SessionStore.jsm#3053
+    reserveToCacheTree(tab.windowId, 'tab attached to tree');
+  });
+});
+
+Tree.onDetached.addListener((tab, _info) => {
+  TabsInternalOperation.clearCache(tab);
+  wait(0).then(() => {
+    // "Restore Previous Session" closes some tabs at first and it causes tree changes, so we should not clear the old cache yet.
+    // See also: https://dxr.mozilla.org/mozilla-central/rev/5be384bcf00191f97d32b4ac3ecd1b85ec7b18e1/browser/components/sessionstore/SessionStore.jsm#3053
+    reserveToCacheTree(tab.windowId, 'tab detached from tree');
+  });
+});
+
+Tab.onPinned.addListener(tab => {
+  reserveToCacheTree(tab.windowId, 'tab pinned');
+});
+
+Tab.onUnpinned.addListener(tab => {
+  if (tab.$TST.previousTab) // the tab was the cache owner
+    TabsInternalOperation.clearCache(tab);
+  reserveToCacheTree(tab.windowId, 'tab unpinned');
+});
+
+Tab.onShown.addListener(tab => {
+  reserveToCacheTree(tab.windowId, 'tab shown');
+});
+
+Tab.onHidden.addListener(tab => {
+  reserveToCacheTree(tab.windowId, 'tab hidden');
+});
+
+browser.windows.onRemoved.addListener(async windowId => {
+  try {
+    CacheStorage.clearForWindow(windowId);
+  }
+  catch(_error) {
+  }
+
+  const storageKeyPart = `Cache-${await UniqueId.ensureWindowId(windowId)}-`;
+  for (const key in mCaches) {
+    if (key.includes(storageKeyPart))
+      delete mCaches[key];
+  }
+});
+
+function onConfigChange(key) {
+  switch (key) {
+    case 'useCachedTree':
+    case 'persistCachedTree':
+      browser.windows.getAll({
+        populate:    true,
+        windowTypes: ['normal']
+      }).then(windows => {
+        for (const win of windows) {
+          const owner = win.tabs[win.tabs.length - 1];
+          if (configs[key]) {
+            reserveToCacheTree(win.id, 'config change');
+          }
+          else {
+            TabsInternalOperation.clearCache(owner);
+            location.reload();
+          }
+        }
+      }).catch(ApiTabs.createErrorSuppressor());
+      break;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/background/background.html b/waterfox/browser/components/sidebar/background/background.html
new file mode 100644
index 0000000000000..36585f26eb12d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/background.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <script type="module" src="./index-ws.js"></script>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/waterfox/browser/components/sidebar/background/background.js b/waterfox/browser/components/sidebar/background/background.js
new file mode 100644
index 0000000000000..d2efe29e4b4ee
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/background.js
@@ -0,0 +1,928 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  wait,
+  configs,
+  sanitizeForHTMLText,
+  waitUntilStartupOperationsUnblocked,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as Dialog from '/common/dialog.js';
+import * as Permissions from '/common/permissions.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as Sync from '/common/sync.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TSTAPI from '/common/tst-api.js';
+import * as UniqueId from '/common/unique-id.js';
+import '/common/bookmark.js'; // we need to load this once in the background page to register the global listener
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab, TabGroup } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as ApiTabsListener from './api-tabs-listener.js';
+import * as BackgroundCache from './background-cache.js';
+import * as Commands from './commands.js';
+import * as ContextMenu from './context-menu.js';
+import * as Migration from './migration.js';
+import * as NativeTabGroups from './native-tab-groups.js';
+import * as TabContextMenu from './tab-context-menu.js';
+import * as Tree from './tree.js';
+import * as TreeStructure from './tree-structure.js';
+import './browser-action-menu.js';
+import './duplicated-tab-detection.js';
+import './successor-tab.js';
+
+function log(...args) {
+  internalLogger('background/background', ...args);
+}
+
+// This needs to be large enough for bulk updates on multiple tabs.
+const DELAY_TO_PROCESS_RESERVED_UPDATE_TASKS = 250;
+
+export const onInit    = new EventListenerManager();
+export const onBuilt   = new EventListenerManager();
+export const onReady   = new EventListenerManager();
+export const onDestroy = new EventListenerManager();
+export const onTreeCompletelyAttached = new EventListenerManager();
+
+export const instanceId = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+
+const mDarkModeMatchMedia = window.matchMedia('(prefers-color-scheme: dark)');
+
+let mInitialized = false;
+const mPreloadedCaches = new Map();
+
+async function getAllWindows() {
+  const [windows, tabGroups] = await Promise.all([
+    browser.windows.getAll({
+      populate:    true,
+      // We need to track all type windows because
+      // popup windows can be destination of tabs.move().
+      // See also: https://github.com/piroor/treestyletab/issues/3311
+      windowTypes: ['normal', 'panel', 'popup'],
+    }).catch(ApiTabs.createErrorHandler()),
+    browser.tabGroups.query({}),
+  ]);
+
+  const groupsByWindow = new Map();
+  for (const group of tabGroups) {
+    const groupsInWindow = groupsByWindow.get(group.windowId) || [];
+    groupsInWindow.push(group);
+    groupsByWindow.set(group.windowId, groupsInWindow)
+  }
+
+  for (const win of windows) {
+    win.tabGroups = groupsByWindow.get(win.id) || [];
+  }
+
+  return windows;
+}
+
+log('init: Start queuing of messages notified via WE APIs');
+ApiTabsListener.init();
+const promisedRestored = waitUntilCompletelyRestored(); // this must be called synchronosly
+
+export async function init() {
+  log('init: start');
+  MetricsData.add('init: start');
+  window.addEventListener('pagehide', destroy, { once: true });
+
+  onInit.dispatch();
+  SidebarConnection.init();
+
+  // Read caches from existing tabs at first, for better performance.
+  // Those promises will be resolved while waiting for waitUntilCompletelyRestored().
+  getAllWindows()
+    .then(windows => {
+      for (const win of windows) {
+        browser.sessions.getWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_TABS)
+          .catch(ApiTabs.createErrorSuppressor())
+          .then(cache => mPreloadedCaches.set(`window-${win.id}`, cache));
+        const tab = win.tabs[0];
+        browser.sessions.getTabValue(tab.id, Constants.kWINDOW_STATE_CACHED_TABS)
+          .catch(ApiTabs.createErrorSuppressor())
+          .then(cache => mPreloadedCaches.set(`tab-${tab.id}`, cache));
+      }
+    });
+
+  let promisedWindows;
+  log('init: Getting existing windows and tabs');
+  await MetricsData.addAsync('init: waiting for waitUntilCompletelyRestored, ContextualIdentities.init and configs.$loaded', Promise.all([
+    promisedRestored.then(() => {
+      // don't wait at here for better performance
+      promisedWindows = getAllWindows();
+    }),
+    ContextualIdentities.init(),
+    configs.$loaded.then(waitUntilStartupOperationsUnblocked),
+  ]));
+  MetricsData.add('init: prepare');
+  EventListenerManager.debug = configs.debug;
+
+  Migration.migrateConfigs();
+  Migration.migrateBookmarkUrls();
+  configs.grantedRemovingTabIds = []; // clear!
+  MetricsData.add('init: Migration.migrateConfigs');
+
+  updatePanelUrl();
+
+  const windows = await MetricsData.addAsync('init: getting all tabs across windows', promisedWindows); // wait at here for better performance
+  const restoredFromCache = await MetricsData.addAsync('init: rebuildAll', rebuildAll(windows));
+  mPreloadedCaches.clear();
+  await MetricsData.addAsync('init: TreeStructure.loadTreeStructure', TreeStructure.loadTreeStructure(windows, restoredFromCache));
+
+  log('init: Start to process messages including queued ones');
+  ApiTabsListener.start();
+
+  Migration.tryNotifyNewFeatures();
+
+  ContextualIdentities.startObserve();
+  onBuilt.dispatch(); // after this line, this master process may receive "kCOMMAND_PING_TO_BACKGROUND" requests from sidebars.
+  MetricsData.add('init: started listening');
+
+  TabContextMenu.init();
+  ContextMenu.init().then(() => updateIconForBrowserTheme());
+  MetricsData.add('init: started initializing of context menu');
+
+  Permissions.clearRequest();
+
+  for (const windowId of restoredFromCache.keys()) {
+    if (!restoredFromCache[windowId])
+      BackgroundCache.reserveToCacheTree(windowId, 'initialize');
+    TabsUpdate.completeLoadingTabs(windowId);
+  }
+
+  for (const tab of Tab.getAllTabs(null, { iterator: true })) {
+    updateSubtreeCollapsed(tab);
+  }
+  for (const tab of Tab.getActiveTabs()) {
+    for (const ancestor of tab.$TST.ancestors) {
+      Tree.collapseExpandTabAndSubtree(ancestor, {
+        collapsed: false,
+        justNow:   true
+      });
+    }
+  }
+
+  // we don't need to await that for the initialization of TST itself.
+  MetricsData.addAsync('init: initializing API for other addons', TSTAPI.initAsBackend());
+
+  mInitialized = true;
+  UniqueId.readyToDetectDuplicatedTab();
+  Tab.broadcastState.enabled = true;
+  onReady.dispatch();
+  BackgroundCache.activate();
+  TreeStructure.startTracking();
+
+  Sync.init();
+
+  await NativeTabGroups.startToMaintainTree();
+
+  await MetricsData.addAsync('init: exporting tabs to sidebars', notifyReadyToSidebars());
+
+  log(`Startup metrics for ${TabsStore.tabs.size} tabs: `, MetricsData.toString());
+}
+
+async function notifyReadyToSidebars() {
+  log('notifyReadyToSidebars: start');
+  const promisedResults = [];
+  for (const win of TabsStore.windows.values()) {
+    // Send PING to all windows whether they are detected as opened or not, because
+    // the connection may be established before this background page starts listening
+    // of messages from sidebar pages.
+    // See also: https://github.com/piroor/treestyletab/issues/2200
+    TabsUpdate.completeLoadingTabs(win.id); // failsafe
+    log(`notifyReadyToSidebars: to ${win.id}`);
+    promisedResults.push(browser.runtime.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_BACKGROUND_READY,
+      windowId: win.id,
+      exported: win.export(true), // send tabs together to optimizie further initialization tasks in the sidebar
+    }).catch(ApiTabs.createErrorSuppressor()));
+  }
+  return Promise.all(promisedResults);
+}
+
+async function updatePanelUrl(theme) {
+  const url = new URL(Constants.kSHORTHAND_URIS.tabbar);
+  url.searchParams.set('style', configs.style);
+  url.searchParams.set('reloadMaskImage', !!configs.enableWorkaroundForBug1763420_reloadMaskImage);
+  if (!theme)
+    theme = await browser.theme.getCurrent();
+  if (browser.sidebarAction)
+    browser.sidebarAction.setPanel({ panel: url.href });
+/*
+  const url = new URL(Constants.kSHORTHAND_URIS.tabbar);
+  url.searchParams.set('style', configs.style);
+  if (browser.sidebarAction)
+    browser.sidebarAction.setPanel({ panel: url.href });
+*/
+}
+
+async function waitUntilCompletelyRestored() {
+  log('waitUntilCompletelyRestored');
+  const initialTabs = await browser.tabs.query({});
+  await Promise.all([
+    MetricsData.addAsync('waitUntilCompletelyRestored: existing tabs ', Promise.all(
+      initialTabs.map(tab => waitUntilPersistentIdBecomeAvailable(tab.id).catch(_error => {}))
+    )),
+    MetricsData.addAsync('waitUntilCompletelyRestored: opening tabs ', new Promise((resolve, _reject) => {
+      let promises = [];
+      let timeout;
+      let resolver;
+      let onNewTabRestored = async (tab, _info = {}) => {
+        clearTimeout(timeout);
+        log('new restored tab is detected.');
+        promises.push(waitUntilPersistentIdBecomeAvailable(tab.id).catch(_error => {}));
+        // Read caches from restored tabs while waiting, for better performance.
+        browser.sessions.getWindowValue(tab.windowId, Constants.kWINDOW_STATE_CACHED_TABS)
+          .catch(ApiTabs.createErrorSuppressor())
+          .then(cache => mPreloadedCaches.set(`window-${tab.windowId}`, cache));
+        browser.sessions.getTabValue(tab.id, Constants.kWINDOW_STATE_CACHED_TABS)
+          .catch(ApiTabs.createErrorSuppressor())
+          .then(cache => mPreloadedCaches.set(`tab-${tab.id}`, cache));
+        //uniqueId = uniqueId?.id || '?'; // not used
+        timeout = setTimeout(resolver, 100);
+      };
+      browser.tabs.onCreated.addListener(onNewTabRestored);
+      resolver = (async () => {
+        log(`timeout: all ${promises.length} tabs are restored. `, promises);
+        browser.tabs.onCreated.removeListener(onNewTabRestored);
+        timeout = resolver = onNewTabRestored = undefined;
+        await Promise.all(promises);
+        promises = undefined;
+        resolve();
+      });
+      timeout = setTimeout(resolver, 500);
+    })),
+  ]);
+}
+async function waitUntilPersistentIdBecomeAvailable(tabId, retryCount = 0) {
+  if (retryCount > 10) {
+    console.log(`could not get persistent ID for ${tabId}`);
+    return false;
+  }
+  const uniqueId = await browser.sessions.getTabValue(tabId, Constants.kPERSISTENT_ID);
+  if (!uniqueId)
+    return wait(100).then(() => waitUntilPersistentIdBecomeAvailable(tabId, retryCount + 1));
+  return true;
+}
+
+function destroy() {
+  browser.runtime.sendMessage({
+    type:  TSTAPI.kUNREGISTER_SELF
+  }).catch(ApiTabs.createErrorSuppressor());
+
+  // This API doesn't work as expected because it is not notified to
+  // other addons actually when browser.runtime.sendMessage() is called
+  // on pagehide or something unloading event.
+  TSTAPI.broadcastMessage({
+    type: TSTAPI.kNOTIFY_SHUTDOWN
+  }).catch(ApiTabs.createErrorSuppressor());
+
+  onDestroy.dispatch();
+  ApiTabsListener.destroy();
+  ContextualIdentities.endObserve();
+}
+
+async function rebuildAll(windows) {
+  if (!windows)
+    windows = await getAllWindows();
+  const restoredFromCache = new Map();
+  await Promise.all(windows.map(async win => {
+    await MetricsData.addAsync(`rebuildAll: tabs in window ${win.id}`, async () => {
+      let trackedWindow = TabsStore.windows.get(win.id);
+      if (!trackedWindow)
+        trackedWindow = Window.init(win.id, win.tabGroups.map(TabGroup.init));
+
+      for (const tab of win.tabs) {
+        Tab.track(tab);
+        Tab.init(tab, { existing: true });
+        tryStartHandleAccelKeyOnTab(tab);
+      }
+      try {
+        if (configs.useCachedTree) {
+          log(`trying to restore window ${win.id} from cache`);
+          const restored = await MetricsData.addAsync(`rebuildAll: restore tabs in window ${win.id} from cache`, BackgroundCache.restoreWindowFromEffectiveWindowCache(win.id, {
+            owner: win.tabs[win.tabs.length - 1],
+            tabs:  win.tabs,
+            caches: mPreloadedCaches
+          }));
+          restoredFromCache.set(win.id, restored);
+          log(`window ${win.id}: restored from cache?: `, restored);
+          if (restored)
+            return;
+        }
+      }
+      catch(e) {
+        log(`failed to restore tabs for ${win.id} from cache `, e);
+      }
+      try {
+        log(`build tabs for ${win.id} from scratch`);
+        Window.init(win.id, win.tabGroups.map(TabGroup.init));
+        const promises = [];
+        for (let tab of win.tabs) {
+          tab = Tab.get(tab.id);
+          tab.$TST.clear(); // clear dirty restored states
+          promises.push(
+            tab.$TST.getPermanentStates()
+              .then(states => {
+                tab.$TST.states = new Set(states);
+                tab.$TST.addState(Constants.kTAB_STATE_PENDING);
+              })
+              .catch(console.error)
+              .then(() => {
+                TabsUpdate.updateTab(tab, tab, { forceApply: true });
+              })
+          );
+          tryStartHandleAccelKeyOnTab(tab);
+        }
+        await Promise.all(promises);
+      }
+      catch(e) {
+        log(`failed to build tabs for ${win.id}`, e);
+      }
+      restoredFromCache.set(win.id, false);
+    });
+    for (const tab of Tab.getGroupTabs(win.id, { iterator: true })) {
+      if (!tab.discarded)
+        tab.$TST.temporaryMetadata.set('shouldReloadOnSelect', true);
+    }
+  }));
+  return restoredFromCache;
+}
+
+export async function reload(options = {}) {
+  mPreloadedCaches.clear();
+  for (const win of TabsStore.windows.values()) {
+    win.clear();
+  }
+  TabsStore.clear();
+  const windows = await getAllWindows();
+  await MetricsData.addAsync('reload: rebuildAll', rebuildAll(windows));
+  await MetricsData.addAsync('reload: TreeStructure.loadTreeStructure', TreeStructure.loadTreeStructure(windows));
+  if (!options.all)
+    return;
+  for (const win of TabsStore.windows.values()) {
+    if (!SidebarConnection.isOpen(win.id))
+      continue;
+    log('reload all sidebars: ', new Error().stack);
+    browser.runtime.sendMessage({
+      type: Constants.kCOMMAND_RELOAD
+    }).catch(ApiTabs.createErrorSuppressor());
+  }
+}
+
+export async function tryStartHandleAccelKeyOnTab(tab) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+  const granted = await Permissions.isGranted(Permissions.ALL_URLS);
+  if (!granted ||
+      /^(about|chrome|resource):/.test(tab.url))
+    return;
+  try {
+    //log(`tryStartHandleAccelKeyOnTab: initialize tab ${tab.id}`);
+    if (browser.scripting) // Manifest V3
+      browser.scripting.executeScript({
+        target: {
+          tabId: tab.id,
+          allFrames: true,
+        },
+        files:  ['/common/handle-accel-key.js'],
+      }).catch(ApiTabs.createErrorSuppressor(ApiTabs.handleMissingTabError, ApiTabs.handleMissingHostPermissionError));
+    else
+      browser.tabs.executeScript(tab.id, {
+        file:            '/common/handle-accel-key.js',
+        allFrames:       true,
+        matchAboutBlank: true,
+        runAt:           'document_start'
+      }).catch(ApiTabs.createErrorSuppressor(ApiTabs.handleMissingTabError, ApiTabs.handleMissingHostPermissionError));
+  }
+  catch(error) {
+    console.log(error);
+  }
+}
+
+export function reserveToUpdateInsertionPosition(tabOrTabs) {
+  const tabs = Array.isArray(tabOrTabs) ? tabOrTabs : [tabOrTabs] ;
+  for (const tab of tabs) {
+    if (!TabsStore.ensureLivingItem(tab))
+      continue;
+    const reserved = reserveToUpdateInsertionPosition.reserved.get(tab.windowId) || {
+      timer: null,
+      tabs:  new Set()
+    };
+    if (reserved.timer)
+      clearTimeout(reserved.timer);
+    reserved.tabs.add(tab);
+    reserved.timer = setTimeout(() => {
+      reserveToUpdateInsertionPosition.reserved.delete(tab.windowId);
+      for (const tab of reserved.tabs) {
+        if (!tab.$TST)
+          continue;
+        updateInsertionPosition(tab);
+      }
+    }, DELAY_TO_PROCESS_RESERVED_UPDATE_TASKS);
+    reserveToUpdateInsertionPosition.reserved.set(tab.windowId, reserved);
+  }
+}
+reserveToUpdateInsertionPosition.reserved = new Map();
+
+async function updateInsertionPosition(tab) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+
+  const prev = tab.hidden ? tab.$TST.unsafePreviousTab : tab.$TST.previousTab;
+  if (prev)
+    browser.sessions.setTabValue(
+      tab.id,
+      Constants.kPERSISTENT_INSERT_AFTER,
+      prev.$TST.uniqueId.id
+    ).catch(ApiTabs.createErrorSuppressor(
+      ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+    ));
+  else
+    browser.sessions.removeTabValue(
+      tab.id,
+      Constants.kPERSISTENT_INSERT_AFTER
+    ).catch(ApiTabs.createErrorSuppressor(
+      ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+    ));
+
+  // This code should be removed after legacy data are cleared enough, maybe after Firefox 128 is released.
+  browser.sessions.removeTabValue(
+    tab.id,
+    Constants.kPERSISTENT_INSERT_AFTER_LEGACY
+  ).catch(ApiTabs.createErrorSuppressor(
+    ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+  ));
+
+  const next = tab.hidden ? tab.$TST.unsafeNextTab : tab.$TST.nextTab;
+  if (next)
+    browser.sessions.setTabValue(
+      tab.id,
+      Constants.kPERSISTENT_INSERT_BEFORE,
+      next.$TST.uniqueId.id
+    ).catch(ApiTabs.createErrorSuppressor(
+      ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+    ));
+  else
+    browser.sessions.removeTabValue(
+      tab.id,
+      Constants.kPERSISTENT_INSERT_BEFORE
+    ).catch(ApiTabs.createErrorSuppressor(
+      ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+    ));
+}
+
+
+export function reserveToUpdateAncestors(tabOrTabs) {
+  const tabs = Array.isArray(tabOrTabs) ? tabOrTabs : [tabOrTabs] ;
+  for (const tab of tabs) {
+    if (!TabsStore.ensureLivingItem(tab))
+      continue;
+    const reserved = reserveToUpdateAncestors.reserved.get(tab.windowId) || {
+      timer: null,
+      tabs:  new Set()
+    };
+    if (reserved.timer)
+      clearTimeout(reserved.timer);
+    reserved.tabs.add(tab);
+    reserved.timer = setTimeout(() => {
+      reserveToUpdateAncestors.reserved.delete(tab.windowId);
+      for (const tab of reserved.tabs) {
+        if (!tab.$TST)
+          continue;
+        updateAncestors(tab);
+      }
+    }, DELAY_TO_PROCESS_RESERVED_UPDATE_TASKS);
+    reserveToUpdateAncestors.reserved.set(tab.windowId, reserved);
+  }
+}
+reserveToUpdateAncestors.reserved = new Map();
+
+async function updateAncestors(tab) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+
+  const ancestors = tab.$TST.ancestors.map(ancestor => ancestor.$TST.uniqueId.id);
+  log(`updateAncestors: save persistent ancestors for ${tab.id}: `, ancestors);
+  browser.sessions.setTabValue(
+    tab.id,
+    Constants.kPERSISTENT_ANCESTORS,
+    ancestors
+  ).catch(ApiTabs.createErrorSuppressor(
+    ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+  ));
+}
+
+export function reserveToUpdateChildren(tabOrTabs) {
+  const tabs = Array.isArray(tabOrTabs) ? tabOrTabs : [tabOrTabs] ;
+  for (const tab of tabs) {
+    if (!TabsStore.ensureLivingItem(tab))
+      continue;
+    const reserved = reserveToUpdateChildren.reserved.get(tab.windowId) || {
+      timer: null,
+      tabs:  new Set()
+    };
+    if (reserved.timer)
+      clearTimeout(reserved.timer);
+    reserved.tabs.add(tab);
+    reserved.timer = setTimeout(() => {
+      reserveToUpdateChildren.reserved.delete(tab.windowId);
+      for (const tab of reserved.tabs) {
+        if (!tab.$TST)
+          continue;
+        updateChildren(tab);
+      }
+    }, DELAY_TO_PROCESS_RESERVED_UPDATE_TASKS);
+    reserveToUpdateChildren.reserved.set(tab.windowId, reserved);
+  }
+}
+reserveToUpdateChildren.reserved = new Map();
+
+async function updateChildren(tab) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+
+  const children = tab.$TST.children.map(child => child.$TST.uniqueId.id);
+  log(`updateChildren: save persistent children for ${tab.id}: `, children);
+  browser.sessions.setTabValue(
+    tab.id,
+    Constants.kPERSISTENT_CHILDREN,
+    children
+  ).catch(ApiTabs.createErrorSuppressor(
+    ApiTabs.handleMissingTabError // The tab can be closed while waiting.
+  ));
+}
+
+function reserveToUpdateSubtreeCollapsed(tab) {
+  if (!mInitialized ||
+      !TabsStore.ensureLivingItem(tab))
+    return;
+  const reserved = reserveToUpdateSubtreeCollapsed.reserved.get(tab.windowId) || {
+    timer: null,
+    tabs:  new Set()
+  };
+  if (reserved.timer)
+    clearTimeout(reserved.timer);
+  reserved.tabs.add(tab);
+  reserved.timer = setTimeout(() => {
+    reserveToUpdateSubtreeCollapsed.reserved.delete(tab.windowId);
+    for (const tab of reserved.tabs) {
+      if (!tab.$TST)
+        continue;
+      updateSubtreeCollapsed(tab);
+    }
+  }, DELAY_TO_PROCESS_RESERVED_UPDATE_TASKS);
+  reserveToUpdateSubtreeCollapsed.reserved.set(tab.windowId, reserved);
+}
+reserveToUpdateSubtreeCollapsed.reserved = new Map();
+
+async function updateSubtreeCollapsed(tab) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+  tab.$TST.toggleState(Constants.kTAB_STATE_SUBTREE_COLLAPSED, tab.$TST.subtreeCollapsed, { permanently: true });
+}
+
+export async function confirmToCloseTabs(tabs, { windowId, configKey, messageKey, titleKey, minConfirmCount } = {}) {
+  if (!windowId)
+    windowId = tabs[0].windowId;
+
+  const grantedIds = new Set(configs.grantedRemovingTabIds);
+  let count = 0;
+  const tabIds = [];
+  tabs = tabs.map(tab => Tab.get(tab?.id)).filter(tab => {
+    if (tab && !grantedIds.has(tab.id)) {
+      count++;
+      tabIds.push(tab.id);
+      return true;
+    }
+    return false;
+  });
+  if (!configKey)
+    configKey = 'warnOnCloseTabs';
+  const shouldConfirm = configs[configKey];
+  const deltaFromLastConfirmation = Date.now() - configs.lastConfirmedToCloseTabs;
+  log('confirmToCloseTabs ', { tabIds, count, windowId, configKey, grantedIds, shouldConfirm, deltaFromLastConfirmation, minConfirmCount });
+  if (count <= (typeof minConfirmCount == 'number' ? minConfirmCount : 1) ||
+      !shouldConfirm ||
+      deltaFromLastConfirmation < 500) {
+    log('confirmToCloseTabs: skip confirmation and treated as granted');
+    return true;
+  }
+
+  const win = await browser.windows.get(windowId);
+  const listing = configs.warnOnCloseTabsWithListing ?
+    Dialog.tabsToHTMLList(tabs, {
+      maxHeight: Math.round(win.height * 0.8),
+      maxWidth: Math.round(win.width * 0.75)
+    }) :
+    '';
+
+  const result = await Dialog.show(win, {
+    content: `
+      <div>${sanitizeForHTMLText(browser.i18n.getMessage(messageKey || 'warnOnCloseTabs_message', [count]))}</div>${listing}
+    `.trim(),
+    buttons: [
+      browser.i18n.getMessage('warnOnCloseTabs_close'),
+      browser.i18n.getMessage('warnOnCloseTabs_cancel')
+    ],
+    checkMessage: browser.i18n.getMessage('warnOnCloseTabs_warnAgain'),
+    checked: true,
+    modal:   !configs.debug, // for popup
+    type:    'common-dialog', // for popup
+    url:     ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'), // for popup
+    title:   browser.i18n.getMessage(titleKey || 'warnOnCloseTabs_title'), // for popup
+    onShownInPopup(container) {
+      setTimeout(() => { // because window.requestAnimationFrame is decelerate for an invisible document.
+        // this need to be done on the next tick, to use the height of
+        // the box for calculation of dialog size
+        const style = container.querySelector('ul').style;
+        style.height = '0px'; // this makes the box shrinkable
+        style.maxHeight = 'none';
+        style.minHeight = '0px';
+      }, 0);
+    }
+  });
+
+  log('confirmToCloseTabs: result = ', result);
+  switch (result.buttonIndex) {
+    case 0:
+      if (!result.checked)
+        configs[configKey] = false;
+      configs.grantedRemovingTabIds = Array.from(new Set((configs.grantedRemovingTabIds || []).concat(tabIds)));
+      log('confirmToCloseTabs: granted ', configs.grantedRemovingTabIds);
+      reserveToClearGrantedRemovingTabs();
+      return true;
+    default:
+      return false;
+  }
+}
+Commands.onTabsClosing.addListener((tabIds, options = {}) => {
+  return confirmToCloseTabs(tabIds.map(Tab.get), options);
+});
+
+function reserveToClearGrantedRemovingTabs() {
+  const lastGranted = configs.grantedRemovingTabIds.join(',');
+  setTimeout(() => {
+    if (configs.grantedRemovingTabIds.join(',') == lastGranted)
+      configs.grantedRemovingTabIds = [];
+  }, 1000);
+}
+
+Tab.onCreated.addListener((tab, info = {}) => {
+  if (!info.duplicated)
+    return;
+  // Duplicated tab has its own tree structure information inherited
+  // from the original tab, but they must be cleared.
+  reserveToUpdateAncestors(tab);
+  reserveToUpdateChildren(tab);
+  reserveToUpdateInsertionPosition([
+    tab,
+    tab.hidden ? tab.$TST.unsafePreviousTab : tab.$TST.previousTab,
+    tab.hidden ? tab.$TST.unsafeNextTab : tab.$TST.nextTab
+  ]);
+});
+
+Tab.onUpdated.addListener((tab, changeInfo) => {
+  if (!mInitialized)
+    return;
+
+  // Loading of "about:(unknown type)" won't report new URL via tabs.onUpdated,
+  // so we need to see the complete tab object.
+  const status = changeInfo.status || tab?.status;
+  const url = changeInfo.url ? changeInfo.url :
+    status == 'complete' && tab ? tab.url : '';
+  if (tab &&
+      Constants.kSHORTHAND_ABOUT_URI.test(url)) {
+    const shorthand = RegExp.$1;
+    const oldUrl = tab.url;
+    wait(100).then(() => { // redirect with delay to avoid infinite loop of recursive redirections.
+      if (tab.url != oldUrl)
+        return;
+      browser.tabs.update(tab.id, {
+        url: url.replace(Constants.kSHORTHAND_ABOUT_URI, Constants.kSHORTHAND_URIS[shorthand] || 'about:blank')
+      }).catch(ApiTabs.createErrorSuppressor(ApiTabs.handleMissingTabError));
+      if (shorthand == 'group')
+        tab.$TST.addState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+    });
+  }
+
+  if (changeInfo.status || changeInfo.url)
+    tryStartHandleAccelKeyOnTab(tab);
+});
+
+Tab.onShown.addListener(tab => {
+  if (!mInitialized)
+    return;
+
+  if (configs.fixupTreeOnTabVisibilityChanged) {
+    reserveToUpdateAncestors(tab);
+    reserveToUpdateChildren(tab);
+  }
+  reserveToUpdateInsertionPosition([
+    tab,
+    tab.hidden ? tab.$TST.unsafePreviousTab : tab.$TST.previousTab,
+    tab.hidden ? tab.$TST.unsafeNextTab : tab.$TST.nextTab
+  ]);
+});
+
+Tab.onMutedStateChanged.addListener((root, toBeMuted) => {
+  if (!mInitialized)
+    return;
+
+  // Spread muted state of a parent tab to its collapsed descendants
+  if (!root.$TST.subtreeCollapsed ||
+      // We don't need to spread muted state to descendants of multiselected
+      // tabs here, because tabs.update() was called with all multiselected tabs.
+      root.$TST.multiselected ||
+      // We should not spread muted state to descendants of collapsed tab
+      // recursively, because they were already controlled from a visible
+      // ancestor.
+      root.$TST.collapsed)
+    return;
+
+  const tabs = root.$TST.descendants;
+  for (const tab of tabs) {
+    const playing = tab.$TST.soundPlaying;
+    const muted   = tab.$TST.muted;
+    log(`tab ${tab.id}: playing=${playing}, muted=${muted}`);
+    if (configs.spreadMutedStateOnlyToSoundPlayingTabs &&
+        !playing &&
+        playing != toBeMuted)
+      continue;
+
+    log(` => set muted=${toBeMuted}`);
+    browser.tabs.update(tab.id, {
+      muted: toBeMuted
+    }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+
+    const add = [];
+    const remove = [];
+    if (toBeMuted) {
+      add.push(Constants.kTAB_STATE_MUTED);
+      tab.$TST.addState(Constants.kTAB_STATE_MUTED);
+    }
+    else {
+      remove.push(Constants.kTAB_STATE_MUTED);
+      tab.$TST.removeState(Constants.kTAB_STATE_MUTED);
+    }
+
+    if (tab.audible && !toBeMuted) {
+      add.push(Constants.kTAB_STATE_SOUND_PLAYING);
+      tab.$TST.addState(Constants.kTAB_STATE_SOUND_PLAYING);
+    }
+    else {
+      remove.push(Constants.kTAB_STATE_SOUND_PLAYING);
+      tab.$TST.removeState(Constants.kTAB_STATE_SOUND_PLAYING);
+    }
+
+    // tabs.onUpdated is too slow, so users will be confused
+    // from still-not-updated tabs (in other words, they tabs
+    // are unresponsive for quick-clicks).
+    Tab.broadcastState(tab, { add, remove });
+  }
+});
+
+Tab.onTabInternallyMoved.addListener((tab, info = {}) => {
+  reserveToUpdateInsertionPosition([
+    tab,
+    tab.hidden ? tab.$TST.unsafePreviousTab : tab.$TST.previousTab,
+    tab.hidden ? tab.$TST.unsafeNextTab : tab.$TST.nextTab,
+    info.oldPreviousTab,
+    info.oldNextTab
+  ]);
+});
+
+Tab.onMoved.addListener((tab, moveInfo) => {
+  if (moveInfo.movedInBulk)
+    return;
+  reserveToUpdateInsertionPosition([
+    tab,
+    moveInfo.oldPreviousTab,
+    moveInfo.oldNextTab,
+    tab.hidden ? tab.$TST.unsafePreviousTab : tab.$TST.previousTab,
+    tab.hidden ? tab.$TST.unsafeNextTab : tab.$TST.nextTab
+  ]);
+});
+
+Tree.onAttached.addListener(async (tab, attachInfo) => {
+  await tab.$TST.opened;
+
+  if (!TabsStore.ensureLivingItem(tab) || // not removed while waiting
+      tab.$TST.parent != attachInfo.parent) // not detached while waiting
+    return;
+
+  if (attachInfo.newlyAttached)
+    reserveToUpdateAncestors([tab].concat(tab.$TST.descendants));
+  reserveToUpdateChildren(tab.$TST.parent);
+  reserveToUpdateInsertionPosition([
+    tab,
+    tab.$TST.nextTab,
+    tab.$TST.previousTab
+  ]);
+});
+
+Tree.onDetached.addListener((tab, detachInfo) => {
+  reserveToUpdateAncestors([tab].concat(tab.$TST.descendants));
+  reserveToUpdateChildren(detachInfo.oldParentTab);
+});
+
+Tree.onSubtreeCollapsedStateChanging.addListener((tab, _info) => { reserveToUpdateSubtreeCollapsed(tab); });
+
+
+const BASE_ICONS = {
+  '16': '/resources/16x16.svg',
+  '20': '/resources/20x20.svg',
+  '24': '/resources/24x24.svg',
+  '32': '/resources/32x32.svg',
+};
+async function updateIconForBrowserTheme(theme) {
+  // generate icons with theme specific color
+  const toolbarIcons = {};
+  const menuIcons    = {};
+  const sidebarIcons = {};
+
+  if (!theme) {
+    const win = await browser.windows.getLastFocused();
+    theme = await browser.theme.getCurrent(win.id);
+  }
+
+  log('updateIconForBrowserTheme: ', theme);
+  if (theme.colors) {
+    const toolbarIconColor = theme.colors.icons || theme.colors.toolbar_text || theme.colors.tab_text || theme.colors.tab_background_text || theme.colors.bookmark_text || theme.colors.textcolor;
+    const menuIconColor    = theme.colors.popup_text || toolbarIconColor;
+    const sidebarIconColor = theme.colors.sidebar_text || toolbarIconColor;
+    log(' => ', { toolbarIconColor, menuIconColor, sidebarIconColor }, theme.colors);
+    await Promise.all(Array.from(Object.entries(BASE_ICONS), async ([size, url]) => {
+      const response = await fetch(url);
+      const body = await response.text();
+      const toolbarIconSource = body.replace(/transparent\s*\/\*\s*TO BE REPLACED WITH THEME COLOR\s*\*\//g, toolbarIconColor);
+      toolbarIcons[size] = `data:image/svg+xml,${escape(toolbarIconSource)}#toolbar-theme`;
+      const menuIconSource = body.replace(/transparent\s*\/\*\s*TO BE REPLACED WITH THEME COLOR\s*\*\//g, menuIconColor);
+      menuIcons[size] = `data:image/svg+xml,${escape(menuIconSource)}#default-theme`;
+      const sidebarIconSource = body.replace(/transparent\s*\/\*\s*TO BE REPLACED WITH THEME COLOR\s*\*\//g, sidebarIconColor);
+      sidebarIcons[size] = `data:image/svg+xml,${escape(sidebarIconSource)}#default-theme`;
+    }));
+  }
+  else {
+    for (const [size, url] of Object.entries(BASE_ICONS)) {
+      toolbarIcons[size] = `${url}#toolbar`;
+      menuIcons[size] = sidebarIcons[size] = `${url}#default`;
+    }
+  }
+
+  log('updateIconForBrowserTheme: applying icons: ', {
+    toolbarIcons,
+    menuIcons,
+    sidebarIcons,
+  });
+
+  await Promise.all([
+    ...ContextMenu.getItemIdsWithIcon().map(id => browser.menus.update(id, { icons: menuIcons })),
+    browser.menus.refresh().catch(ApiTabs.createErrorSuppressor()),
+    browser.action?.setIcon({ path: toolbarIcons }), // Manifest v2
+    browser.browserAction?.setIcon({ path: toolbarIcons }), // Manifest v3
+    browser.sidebarAction?.setIcon({ path: sidebarIcons }),
+  ]);
+}
+
+browser.theme.onUpdated.addListener(updateInfo => {
+  updateIconForBrowserTheme(updateInfo.theme);
+});
+
+mDarkModeMatchMedia.addListener(async _event => {
+  updateIconForBrowserTheme();
+});
+
+
+
+configs.$addObserver(key => {
+  switch (key) {
+    case 'style':
+      updatePanelUrl();
+      break;
+
+    case 'debug':
+      EventListenerManager.debug = configs.debug;
+      break;
+
+    case 'testKey': // for tests/utils.js
+      browser.runtime.sendMessage({
+        type:  Constants.kCOMMAND_NOTIFY_TEST_KEY_CHANGED,
+        value: configs.testKey
+      });
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/browser-action-menu.js b/waterfox/browser/components/sidebar/background/browser-action-menu.js
new file mode 100644
index 0000000000000..08594937f90af
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/browser-action-menu.js
@@ -0,0 +1,2443 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  sanitizeAccesskeyMark,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+
+function log(...args) {
+  internalLogger('background/browser-action-menu', ...args);
+}
+
+const delimiter = browser.i18n.getMessage('config_terms_delimiter');
+
+function indent(level = 1) {
+  let result = '';
+  for (let i = 0, maxi = level; i < maxi; i++) {
+    result += '\u00A0\u00A0\u00A0';
+  }
+  return result;
+}
+
+const mItems = [
+  {
+    title:    browser.i18n.getMessage('config_appearance_caption'),
+    children: [
+      {
+        title:    browser.i18n.getMessage('config_sidebarPosition_caption'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_sidebarPosition_left'),
+            key:   'sidebarPosition',
+            value: Constants.kTABBAR_POSITION_LEFT,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_sidebarPosition_right'),
+            key:   'sidebarPosition',
+            value: Constants.kTABBAR_POSITION_RIGHT,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_sidebarPosition_auto'),
+            key:   'sidebarPosition',
+            value: Constants.kTABBAR_POSITION_AUTO,
+            type:  'radio'
+          },
+        ]
+      },
+      {
+        title:    browser.i18n.getMessage('config_style_caption'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_style_proton'),
+            key:   'style',
+            value: 'proton',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_style_photon'),
+            key:   'style',
+            value: 'photon',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_style_sidebar'),
+            key:   'style',
+            value: 'sidebar',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_style_highcontrast'),
+            key:   'style',
+            value: 'highcontrast',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_style_none'),
+            key:   'style',
+            value: 'none',
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: browser.i18n.getMessage('config_animation_label'),
+        key:   'animation',
+        type:  'checkbox'
+      },
+      {
+        title:  indent() + browser.i18n.getMessage('config_animationForce_label'),
+        key:    'animationForce',
+        type:   'checkbox',
+        expert: true
+      },
+      {
+        title:    browser.i18n.getMessage('config_labelOverflowStyle_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_labelOverflowStyle_fade'),
+            key:   'labelOverflowStyle',
+            value: 'fade',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_labelOverflowStyle_crop'),
+            key:   'labelOverflowStyle',
+            value: 'crop',
+            type:  'radio'
+          }
+        ],
+      },
+      {
+        title: browser.i18n.getMessage('config_faviconizePinnedTabs_label'),
+        key:   'faviconizePinnedTabs',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: browser.i18n.getMessage('config_tabPreviewTooltip_label'),
+        key:   'tabPreviewTooltip',
+        type:  'checkbox',
+        permissions: Permissions.ALL_URLS,
+        get canRevoke() {
+          return !configs.tabPreviewTooltip && !configs.skipCollapsedTabsForTabSwitchingShortcuts;
+        },
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_before') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_anywhere') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_after'),
+        key:   'tabPreviewTooltipRenderIn',
+        value: Constants.kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE,
+        type:  'radio',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_before') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_content') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_after'),
+        key:   'tabPreviewTooltipRenderIn',
+        value: Constants.kIN_CONTENT_PANEL_RENDER_IN_CONTENT,
+        type:  'radio',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_before') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_sidebar') + browser.i18n.getMessage('config_tabPreviewTooltipRenderIn_label_after'),
+        key:   'tabPreviewTooltipRenderIn',
+        value: Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR,
+        type:  'radio',
+        expert: true
+      },
+      {
+        title: browser.i18n.getMessage('config_showCollapsedDescendantsByTooltip_label'),
+        key:   'showCollapsedDescendantsByTooltip',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        dynamicTitle: true,
+        get title() {
+          return browser.i18n.getMessage('config_shiftTabsForScrollbarDistance_label_before') + configs.shiftTabsForScrollbarDistance + browser.i18n.getMessage('config_shiftTabsForScrollbarDistance_label_after')
+        },
+        enabled: false,
+        expert:  true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_shiftTabsForScrollbarOnlyOnHover_label'),
+        key:   'shiftTabsForScrollbarOnlyOnHover',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title:   browser.i18n.getMessage('config_suppressGapFromShownOrHiddenToolbar_caption'),
+        enabled: false,
+        expert:  true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label'),
+        key:   'suppressGapFromShownOrHiddenToolbarOnFullScreen',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_suppressGapFromShownOrHiddenToolbarOnNewTab_label'),
+        key:   'suppressGapFromShownOrHiddenToolbarOnNewTab',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation_label'),
+        key:   'suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation',
+        type:  'checkbox',
+        expert: true
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_showDialogInSidebar_label'),
+        key:   'showDialogInSidebar',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: browser.i18n.getMessage('config_renderHiddenTabs_label'),
+        key:   'renderHiddenTabs',
+        type:  'checkbox',
+        expert: true,
+      },
+    ]
+  },
+  {
+    title:    browser.i18n.getMessage('config_context_caption'),
+    children: [
+      {
+        title: browser.i18n.getMessage('config_extraItems_tabs_topLevel'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleSticky_command'),
+        key:   'context_topLevel_toggleSticky',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_reloadTree_command'),
+        key:   'context_topLevel_reloadTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_reloadDescendants_command'),
+        key:   'context_topLevel_reloadDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_unblockAutoplayTree_command'),
+        key:   'context_topLevel_unblockAutoplayTree',
+        type:  'checkbox',
+        get visible() {
+          return configs.exposeUnblockAutoplayFeatures;
+        },
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_unblockAutoplayDescendants_command'),
+        key:   'context_topLevel_unblockAutoplayDescendants',
+        type:  'checkbox',
+        get visible() {
+          return configs.exposeUnblockAutoplayFeatures;
+        },
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleMuteTree_command'),
+        key:   'context_topLevel_toggleMuteTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleMuteDescendants_command'),
+        key:   'context_topLevel_toggleMuteDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeTree_command'),
+        key:   'context_topLevel_closeTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeDescendants_command'),
+        key:   'context_topLevel_closeDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeOthers_command'),
+        key:   'context_topLevel_closeOthers',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseTree_command'),
+        key:   'context_topLevel_collapseTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseTreeRecursively_command'),
+        key:   'context_topLevel_collapseTreeRecursively',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseAll_command'),
+        key:   'context_topLevel_collapseAll',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandTree_command'),
+        key:   'context_topLevel_expandTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandTreeRecursively_command'),
+        key:   'context_topLevel_expandTreeRecursively',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandAll_command'),
+        key:   'context_topLevel_expandAll',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_bookmarkTree_command'),
+        key:   'context_topLevel_bookmarkTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_sendTreeToDevice_command'),
+        key:   'context_topLevel_sendTreeToDevice',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title:       browser.i18n.getMessage('config_requestPermissions_bookmarks'),
+        type:        'checkbox',
+        permissions: Permissions.BOOKMARKS
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_extraItems_tabs_subMenu'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleSticky_command'),
+        key:   'context_toggleSticky',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_reloadTree_command'),
+        key:   'context_reloadTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_reloadDescendants_command'),
+        key:   'context_reloadDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_unblockAutoplayTree_command'),
+        key:   'context_unblockAutoplayTree',
+        type:  'checkbox',
+        get visible() {
+          return configs.exposeUnblockAutoplayFeatures;
+        },
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_unblockAutoplayDescendants_command'),
+        key:   'context_unblockAutoplayDescendants',
+        type:  'checkbox',
+        get visible() {
+          return configs.exposeUnblockAutoplayFeatures;
+        },
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleMuteTree_command'),
+        key:   'context_toggleMuteTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_toggleMuteDescendants_command'),
+        key:   'context_toggleMuteDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeTree_command'),
+        key:   'context_closeTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeDescendants_command'),
+        key:   'context_closeDescendants',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_closeOthers_command'),
+        key:   'context_closeOthers',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseTree_command'),
+        key:   'context_collapseTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseTreeRecursively_command'),
+        key:   'context_collapseTreeRecursively',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_collapseAll_command'),
+        key:   'context_collapseAll',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandTree_command'),
+        key:   'context_expandTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandTreeRecursively_command'),
+        key:   'context_expandTreeRecursively',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_expandAll_command'),
+        key:   'context_expandAll',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_bookmarkTree_command'),
+        key:   'context_bookmarkTree',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('context_sendTreeToDevice_command'),
+        key:   'context_sendTreeToDevice',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_showTreeCommandsInTabsContextMenuGlobally_label'),
+        key:   'showTreeCommandsInTabsContextMenuGlobally',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_extraItems_bookmarks_caption'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        title: indent() + sanitizeAccesskeyMark(browser.i18n.getMessage('context_openAllBookmarksWithStructure_label')),
+        key:   'context_openAllBookmarksWithStructure',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + sanitizeAccesskeyMark(browser.i18n.getMessage('context_openAllBookmarksWithStructureRecursively_label')),
+        key:   'context_openAllBookmarksWithStructureRecursively',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: indent() + browser.i18n.getMessage('config_openAllBookmarksWithStructureDiscarded_label'),
+        key:   'openAllBookmarksWithStructureDiscarded',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_suppressGroupTabForStructuredTabsFromBookmarks_label'),
+        key:   'suppressGroupTabForStructuredTabsFromBookmarks',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_before'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_nextSiblingWithInheritedContainer') + delimiter + browser.i18n.getMessage('config_autoAttachOnContextNewTabCommand_after') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'autoAttachOnContextNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+            type:  'radio'
+          }
+        ]
+      },
+    ]
+  },
+  {
+    title:    browser.i18n.getMessage('config_newTabWithOwner_caption'),
+    children: [
+      {
+        title:   browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_before'),
+        children: [
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after'),
+            key:   'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_DO_NOTHING,
+            type:   'radio',
+          },
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:   'radio',
+          },
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:   'radio',
+          },
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:   'radio',
+          },
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_childNextToLastRelatedTab') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB,
+            type:   'radio',
+          },
+          {
+            title:  browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:   'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedWithOwner_after'),
+            key:    'autoAttachOnOpenedWithOwner',
+            value:  Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:   'radio',
+          },
+        ],
+      },
+      {
+        title:    browser.i18n.getMessage('config_insertNewTabFromFirefoxViewAt_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromFirefoxViewAt_noControl'),
+            key:   'insertNewTabFromFirefoxViewAt',
+            value: Constants.kINSERT_NO_CONTROL,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromFirefoxViewAt_nextToLastRelatedTab') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'insertNewTabFromFirefoxViewAt',
+            value: Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromFirefoxViewAt_top'),
+            key:   'insertNewTabFromFirefoxViewAt',
+            value: Constants.kINSERT_TOP,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromFirefoxViewAt_end'),
+            key:   'insertNewTabFromFirefoxViewAt',
+            value: Constants.kINSERT_END,
+            type:  'radio',
+          },
+        ],
+      },
+      //{ type: 'separator' },
+      {
+        title: browser.i18n.getMessage('config_autoGroupNewTabsFromFirefoxView_label'),
+        key:   'autoGroupNewTabsFromFirefoxView',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: browser.i18n.getMessage('config_groupTabTemporaryStateForChildrenOfFirefoxView_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForChildrenOfFirefoxView',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForChildrenOfFirefoxView',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForChildrenOfFirefoxView',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          }
+        ],
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title:   browser.i18n.getMessage('config_insertNewTabFromPinnedTabAt_caption'),
+        expert:  true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromPinnedTabAt_noControl'),
+            key:   'insertNewTabFromPinnedTabAt',
+            value: Constants.kINSERT_NO_CONTROL,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromPinnedTabAt_nextToLastRelatedTab') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'insertNewTabFromPinnedTabAt',
+            value: Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromPinnedTabAt_top'),
+            key:   'insertNewTabFromPinnedTabAt',
+            value: Constants.kINSERT_TOP,
+            type:  'radio',
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewTabFromPinnedTabAt_end'),
+            key:   'insertNewTabFromPinnedTabAt',
+            value: Constants.kINSERT_END,
+            type:  'radio',
+          },
+        ],
+      },
+      //{ type: 'separator' },
+      {
+        title: browser.i18n.getMessage('config_autoGroupNewTabsFromPinned_label'),
+        key:   'autoGroupNewTabsFromPinned',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: browser.i18n.getMessage('config_groupTabTemporaryStateForChildrenOfPinned_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForChildrenOfPinned',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForChildrenOfPinned',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForChildrenOfPinned',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          }
+        ]
+      },
+    ]
+  },
+  {
+    title:    browser.i18n.getMessage('config_newTab_caption'),
+    children: [
+      {
+        title: browser.i18n.getMessage('config_newTabAction_caption'),
+        enabled: false
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_before'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabCommand_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabCommand_after'),
+            key:   'autoAttachOnNewTabCommand',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_inheritContextualIdentityToChildTabMode_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToChildTabMode_default'),
+            key:   'inheritContextualIdentityToChildTabMode',
+            value: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToChildTabMode_parent'),
+            key:   'inheritContextualIdentityToChildTabMode',
+            value: Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToChildTabMode_lastActive'),
+            key:   'inheritContextualIdentityToChildTabMode',
+            value: Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE,
+            type:  'radio'
+          }
+        ]
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_newTabButton_caption'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_before'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_nextSiblingWithInheritedContainer') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonMiddleClick_after') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'autoAttachOnNewTabButtonMiddleClick',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+            type:  'radio'
+          }
+        ],
+      },
+      {
+        title:       indent() + browser.i18n.getMessage('config_middleClickPasteURLOnNewTabButton_label'),
+        expert:      true,
+        key:         'middleClickPasteURLOnNewTabButton',
+        type:        'checkbox',
+        permissions: Permissions.CLIPBOARD_READ,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_before'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_nextSiblingWithInheritedContainer') + delimiter + browser.i18n.getMessage('config_autoAttachOnNewTabButtonAccelClick_after') + ' ' + browser.i18n.getMessage('config_firefoxCompatible_choice'),
+            key:   'autoAttachOnNewTabButtonAccelClick',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title:    indent() + browser.i18n.getMessage('config_longPressOnNewTabButton_before'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_longPressOnNewTabButton_newTabAction') + delimiter + browser.i18n.getMessage('config_longPressOnNewTabButton_after'),
+            key:   'longPressOnNewTabButton',
+            value: 'newtab-action-selector',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_longPressOnNewTabButton_contextualIdentities') + delimiter + browser.i18n.getMessage('config_longPressOnNewTabButton_after'),
+            key:   'longPressOnNewTabButton',
+            value: 'contextual-identities-selector',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_longPressOnNewTabButton_none') + delimiter + browser.i18n.getMessage('config_longPressOnNewTabButton_after'),
+            key:   'longPressOnNewTabButton',
+            value: '',
+            type:  'radio'
+          }
+        ],
+      },
+      {
+        title: browser.i18n.getMessage('config_showNewTabActionSelector_label'),
+        key:   'showNewTabActionSelector',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: browser.i18n.getMessage('config_showContextualIdentitiesSelector_label'),
+        key:   'showContextualIdentitiesSelector',
+        type:  'checkbox',
+        expert: true,
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_autoAttachWithURL_caption'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        title:    indent() + browser.i18n.getMessage('config_autoAttachOnDuplicated_before'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnDuplicated_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnDuplicated_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:   'autoAttachOnDuplicated',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title:    indent() + browser.i18n.getMessage('config_sameSiteOrphan_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_independent') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachSameSiteOrphan_before') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachSameSiteOrphan_after'),
+            key:   'autoAttachSameSiteOrphan',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          { type: 'separator' },
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToSameSiteOrphanMode_label'),
+            children: [
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToSameSiteOrphanMode_default'),
+                key:   'inheritContextualIdentityToSameSiteOrphanMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToSameSiteOrphanMode_parent'),
+                key:   'inheritContextualIdentityToSameSiteOrphanMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToSameSiteOrphanMode_lastActive'),
+                key:   'inheritContextualIdentityToSameSiteOrphanMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE,
+                type:  'radio'
+              }
+            ]
+          }
+        ]
+      },
+      {
+        title:    indent() + browser.i18n.getMessage('config_fromExternal_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnOpenedFromExternal_after'),
+            key:   'autoAttachOnOpenedFromExternal',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          { type: 'separator' },
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromExternalMode_label'),
+            children: [
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromExternalMode_default'),
+                key:   'inheritContextualIdentityToTabsFromExternalMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromExternalMode_parent'),
+                key:   'inheritContextualIdentityToTabsFromExternalMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromExternalMode_lastActive'),
+                key:   'inheritContextualIdentityToTabsFromExternalMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE,
+                type:  'radio'
+              }
+            ]
+          }
+        ]
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title:    indent() + browser.i18n.getMessage('config_anyOtherTrigger_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_noControl') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after') + ' ' + browser.i18n.getMessage('config_recommended_choice'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_DO_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_independent') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_OPEN_AS_ORPHAN,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_childTop') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_childEnd') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_sibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_OPEN_AS_SIBLING,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_before') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_nextSibling') + delimiter + browser.i18n.getMessage('config_autoAttachOnAnyOtherTrigger_after'),
+            key:   'autoAttachOnAnyOtherTrigger',
+            value: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+            type:  'radio'
+          },
+          { type: 'separator' },
+          {
+            title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_label'),
+            get enabled() {
+              return configs.autoAttachOnAnyOtherTrigger != Constants.kNEWTAB_DO_NOTHING;
+            },
+            children: [
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_default'),
+                key:   'inheritContextualIdentityToTabsFromAnyOtherTriggerMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_parent'),
+                key:   'inheritContextualIdentityToTabsFromAnyOtherTriggerMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_lastActive'),
+                key:   'inheritContextualIdentityToTabsFromAnyOtherTriggerMode',
+                value: Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE,
+                type:  'radio'
+              }
+            ]
+          }
+        ]
+      },
+      { type: 'separator',
+        expert: true, },
+      {
+        title: browser.i18n.getMessage('config_groupTab_caption'),
+        enabled: false,
+        expert: true,
+      },
+      {
+        dynamicTitle: true,
+        get title() {
+          return indent() + browser.i18n.getMessage('config_tabBunchesDetectionTimeout_before') + delimiter + configs.tabBunchesDetectionTimeout + delimiter + browser.i18n.getMessage('config_tabBunchesDetectionTimeout_after');
+        },
+        enabled: false,
+        expert: true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_autoGroupNewTabsFromBookmarks_label'),
+        key:   'autoGroupNewTabsFromBookmarks',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_restoreTreeForTabsFromBookmarks_label'),
+        key:   'restoreTreeForTabsFromBookmarks',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoGroupNewTabsFromOthers_label'),
+        key:   'autoGroupNewTabsFromOthers',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_warnOnAutoGroupNewTabs_label'),
+        key:   'warnOnAutoGroupNewTabs',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent(4) + browser.i18n.getMessage('config_warnOnAutoGroupNewTabsWithListing_label'),
+        key:   'warnOnAutoGroupNewTabsWithListing',
+        type:  'checkbox',
+        expert: true
+      },
+      { type: 'separator',
+        expert: true },
+      {
+        title: indent() + browser.i18n.getMessage('config_renderTreeInGroupTabs_label'),
+        key:   'renderTreeInGroupTabs',
+        type:  'checkbox',
+        expert: true
+      },
+      { type: 'separator',
+        expert: true },
+      {
+        title: browser.i18n.getMessage('config_groupTabTemporaryState_caption'),
+        enabled: false,
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_groupTabTemporaryStateForNewTabsFromBookmarks_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForNewTabsFromBookmarks',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForNewTabsFromBookmarks',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForNewTabsFromBookmarks',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_groupTabTemporaryStateForNewTabsFromOthers_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForNewTabsFromOthers',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForNewTabsFromOthers',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForNewTabsFromOthers',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_groupTabTemporaryStateForOrphanedTabs_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForOrphanedTabs',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForOrphanedTabs',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForOrphanedTabs',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_groupTabTemporaryStateForAPI_label'),
+        expert: true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_groupTabTemporaryState_option_default'),
+            key:   'groupTabTemporaryStateForAPI',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporary_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForAPI',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_before')}${browser.i18n.getMessage('groupTab_temporaryAggressive_label')}${browser.i18n.getMessage('config_groupTabTemporaryState_option_checked_after')}`,
+            key:   'groupTabTemporaryStateForAPI',
+            value: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+            type:  'radio'
+          },
+        ],
+      },
+    ],
+  },
+  {
+    title:    browser.i18n.getMessage('config_treeBehavior_caption'),
+    children: [
+      {
+        title: browser.i18n.getMessage('config_autoCollapseExpandSubtreeOnAttach_label'),
+        key:   'autoCollapseExpandSubtreeOnAttach',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: browser.i18n.getMessage('config_autoCollapseExpandSubtreeOnSelect_label'),
+        key:   'autoCollapseExpandSubtreeOnSelect',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove_label'),
+        key:   'autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: browser.i18n.getMessage('config_unfocusableCollapsedTab_label'),
+        key:   'unfocusableCollapsedTab',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: browser.i18n.getMessage('config_autoDiscardTabForUnexpectedFocus_label'),
+        key:   'autoDiscardTabForUnexpectedFocus',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: browser.i18n.getMessage('config_avoidDiscardedTabToBeActivatedIfPossible_label'),
+        key:   'avoidDiscardedTabToBeActivatedIfPossible',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title:       browser.i18n.getMessage('config_requestPermissions_allUrls_ctrlTabTracking'),
+        key:         'skipCollapsedTabsForTabSwitchingShortcuts',
+        type:        'checkbox',
+        permissions: Permissions.ALL_URLS,
+        get canRevoke() {
+          return !configs.tabPreviewTooltip && !configs.skipCollapsedTabsForTabSwitchingShortcuts;
+        },
+      },
+      {
+        dynamicTitle: true,
+        get title() {
+          return indent() + browser.i18n.getMessage('config_autoExpandOnTabSwitchingShortcutsDelay_before') + delimiter + configs.autoExpandOnTabSwitchingShortcutsDelay + delimiter + browser.i18n.getMessage('config_autoExpandOnTabSwitchingShortcutsDelay_after');
+        },
+        key:   'autoExpandOnTabSwitchingShortcuts',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title:   indent() + browser.i18n.getMessage('config_accelKey_label'),
+        enabled: false,
+        expert:  true
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_accelKey_auto'),
+        key:   'accelKey',
+        value: '',
+        type:  'radio',
+        expert: true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_accelKey_alt'),
+        key:   'accelKey',
+        value: 'alt',
+        type:  'radio',
+        expert: true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_accelKey_control'),
+        key:   'accelKey',
+        value: 'control',
+        type:  'radio',
+        expert: true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_accelKey_meta'),
+        key:   'accelKey',
+        value: 'meta',
+        type:  'radio',
+        expert: true,
+      },
+      { type: 'separator', expert: true },
+      {
+        title:    browser.i18n.getMessage('config_treeDoubleClickBehavior_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_treeDoubleClickBehavior_toggleCollapsed'),
+            key:   'treeDoubleClickBehavior',
+            value: Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_COLLAPSED,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_treeDoubleClickBehavior_toggleSticky'),
+            key:   'treeDoubleClickBehavior',
+            value: Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_STICKY,
+            type:  'radio'
+          },
+          {
+            title: `${browser.i18n.getMessage('config_treeDoubleClickBehavior_close')}${browser.i18n.getMessage('config_treeDoubleClickBehavior_close_note')}`,
+            key:   'treeDoubleClickBehavior',
+            value: Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_CLOSE,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_treeDoubleClickBehavior_none'),
+            key:   'treeDoubleClickBehavior',
+            value: Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_NONE,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title:    browser.i18n.getMessage('config_successorTabControlLevel_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_successorTabControlLevel_inTree'),
+            key:   'successorTabControlLevel',
+            value: Constants.kSUCCESSOR_TAB_CONTROL_IN_TREE,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_successorTabControlLevel_simulateDefault'),
+            key:   'successorTabControlLevel',
+            value: Constants.kSUCCESSOR_TAB_CONTROL_SIMULATE_DEFAULT,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_successorTabControlLevel_never'),
+            key:   'successorTabControlLevel',
+            value: Constants.kSUCCESSOR_TAB_CONTROL_NEVER,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: browser.i18n.getMessage('config_simulateSelectOwnerOnClose_label'),
+        key:   'simulateSelectOwnerOnClose',
+        type:  'checkbox',
+        get visible() {
+          return typeof browser.tabs.moveInSuccession == 'function';
+        },
+        expert: true,
+      },
+      {
+        title:    browser.i18n.getMessage('config_parentTabOperationBehaviorMode_caption'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_parentTabOperationBehaviorMode_parallel'),
+            key:   'parentTabOperationBehaviorMode',
+            value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL,
+            type:  'radio'
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_closeParentBehavior_insideSidebar'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteFirst'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteAll'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_closeParentBehavior_outsideSidebar'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteFirst'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteAll'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              }
+            ]
+          },
+          { type: 'separator',
+            expert: true, },
+          {
+            title: browser.i18n.getMessage('config_parentTabOperationBehaviorMode_consistent'),
+            key:   'parentTabOperationBehaviorMode',
+            value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CONSISTENT,
+            type:  'radio'
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_parentTabOperationBehaviorMode_consistent_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteFirst'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteAll'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_parentTabOperationBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              }
+            ]
+          },
+          { type: 'separator',
+            expert: true, },
+          {
+            title: browser.i18n.getMessage('config_parentTabOperationBehaviorMode_custom'),
+            key:   'parentTabOperationBehaviorMode',
+            value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM,
+            type:  'radio',
+            expert: true,
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_closeParentBehavior_insideSidebar_expanded_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_entireTree'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteFirst'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteAll'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_detach'),
+                key:   'closeParentBehavior_insideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_closeParentBehavior_outsideSidebar_collapsed_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_entireTree'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteFirst'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteAll'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_detach'),
+                key:   'closeParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent(2) + browser.i18n.getMessage('config_closeParentBehavior_noSidebar_collapsed_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_entireTree'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteFirst'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteAll'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_detach'),
+                key:   'closeParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_closeParentBehavior_outsideSidebar_expanded_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_entireTree'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteFirst'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteAll'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_detach'),
+                key:   'closeParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent(2) + browser.i18n.getMessage('config_closeParentBehavior_noSidebar_expanded_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_entireTree'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_replaceWithGroupTab'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteFirst'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteAll'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_promoteIntelligently'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_closeParentBehavior_detach'),
+                key:   'closeParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_moveParentBehavior_outsideSidebar_collapsed_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_entireTree'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_replaceWithGroupTab'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteFirst'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteAll'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteIntelligently'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_detach'),
+                key:   'moveParentBehavior_outsideSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent(2) + browser.i18n.getMessage('config_moveParentBehavior_noSidebar_collapsed_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_entireTree'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_replaceWithGroupTab'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteFirst'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteAll'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteIntelligently'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_detach'),
+                key:   'moveParentBehavior_noSidebar_collapsed',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent() + browser.i18n.getMessage('config_moveParentBehavior_outsideSidebar_expanded_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_entireTree'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_replaceWithGroupTab'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteFirst'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteAll'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteIntelligently'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_detach'),
+                key:   'moveParentBehavior_outsideSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          },
+          {
+            title: indent(2) + browser.i18n.getMessage('config_moveParentBehavior_noSidebar_expanded_caption'),
+            expert: true,
+            children: [
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_entireTree'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_replaceWithGroupTab'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteFirst'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteAll'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_promoteIntelligently'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY,
+                type:  'radio'
+              },
+              {
+                title: browser.i18n.getMessage('config_moveParentBehavior_detach'),
+                key:   'moveParentBehavior_noSidebar_expanded',
+                value: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+                type:  'radio'
+              }
+            ]
+          }
+        ]
+      },
+      {
+        title:    browser.i18n.getMessage('config_fixupTreeOnTabVisibilityChanged_caption'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_fixupTreeOnTabVisibilityChanged_fix'),
+            key:   'fixupTreeOnTabVisibilityChanged',
+            value: true,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_fixupTreeOnTabVisibilityChanged_keep'),
+            key:   'fixupTreeOnTabVisibilityChanged',
+            value: false,
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title:    browser.i18n.getMessage('config_insertNewChildAt_caption'),
+        expert:   true,
+        children: [
+          {
+            title: browser.i18n.getMessage('config_insertNewChildAt_noControl'),
+            key:   'insertNewChildAt',
+            value: Constants.kINSERT_NO_CONTROL,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewChildAt_nextToLastRelatedTab'),
+            key:   'insertNewChildAt',
+            value: Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewChildAt_top'),
+            key:   'insertNewChildAt',
+            value: Constants.kINSERT_TOP,
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_insertNewChildAt_end'),
+            key:   'insertNewChildAt',
+            value: Constants.kINSERT_END,
+            type:  'radio'
+          }
+        ]
+      },
+    ]
+  },
+  {
+    title:    browser.i18n.getMessage('config_more_caption'),
+    children: [
+      {
+        title:    browser.i18n.getMessage('config_drag_caption'),
+        enabled:  false,
+      },
+      //{ type: 'separator' },
+      {
+        title: indent() + browser.i18n.getMessage('config_tabDragBehavior_caption'),
+        enabled: false,
+      },
+      // These options are too complex to put in the menu UI, so I simply redirect to the options page.
+      {
+        title: indent(2) + browser.i18n.getMessage('config_tabDragBehavior_label') + '...',
+        url:   `${Constants.kSHORTHAND_URIS.options}#tabDragBehaviorConfigsGroup`,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_tabDragBehaviorShift_label') + '...',
+        url:   `${Constants.kSHORTHAND_URIS.options}#tabDragBehaviorConfigsGroup`,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_showTabDragBehaviorNotification_label'),
+        key:   'showTabDragBehaviorNotification',
+        type:  'checkbox',
+        expert:  true,
+      },
+      //{ type: 'separator' },
+      {
+        title:   indent() + browser.i18n.getMessage('config_dropLinksOnTabBehavior_caption'),
+        enabled: false,
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_dropLinksOnTabBehavior_ask'),
+        key:   'dropLinksOnTabBehavior',
+        value: Constants.kDROPLINK_ASK,
+        type:  'radio',
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_dropLinksOnTabBehavior_load'),
+        key:   'dropLinksOnTabBehavior',
+        value: Constants.kDROPLINK_LOAD,
+        type:  'radio',
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_dropLinksOnTabBehavior_newtab'),
+        key:   'dropLinksOnTabBehavior',
+        value: Constants.kDROPLINK_NEWTAB,
+        type:  'radio',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_simulateTabsLoadInBackgroundInverted_label'),
+        type:  'checkbox',
+        key:   'simulateTabsLoadInBackgroundInverted',
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_tabsLoadInBackgroundDiscarded_label'),
+        type:  'checkbox',
+        key:   'tabsLoadInBackgroundDiscarded',
+        expert:  true,
+      },
+      //{ type: 'separator', expert: true },
+      {
+        title:   indent() + browser.i18n.getMessage('config_insertDroppedTabsAt_caption'),
+        enabled: false,
+        expert:  true,
+      },
+      {
+        title:  indent(2) + browser.i18n.getMessage('config_insertDroppedTabsAt_inherit'),
+        key:    'insertDroppedTabsAt',
+        value:  Constants.kINSERT_INHERIT,
+        type:   'radio',
+        expert: true,
+      },
+      {
+        title:  indent(2) + browser.i18n.getMessage('config_insertDroppedTabsAt_first'),
+        key:    'insertDroppedTabsAt',
+        value:  Constants.kINSERT_TOP,
+        type:   'radio',
+        expert: true,
+      },
+      {
+        title:  indent(2) + browser.i18n.getMessage('config_insertDroppedTabsAt_end'),
+        key:    'insertDroppedTabsAt',
+        value:  Constants.kINSERT_END,
+        type:   'radio',
+        expert: true,
+      },
+      //{ type: 'separator', expert: true },
+      {
+        dynamicTitle: true,
+        get title() {
+          return indent() + browser.i18n.getMessage('config_autoExpandOnLongHoverDelay_before') + delimiter + configs.autoExpandOnLongHoverDelay +     delimiter + browser.i18n.getMessage('config_autoExpandOnLongHoverDelay_after');
+        },
+        key:    'autoExpandOnLongHover',
+        type:   'checkbox',
+        expert: true,
+      },
+      {
+        title:  indent(2) + browser.i18n.getMessage('config_autoExpandOnLongHoverRestoreIniitalState_label'),
+        key:    'autoExpandOnLongHoverRestoreIniitalState',
+        type:   'checkbox',
+        expert: true,
+      },
+      {
+        title:  indent(2) + browser.i18n.getMessage('config_autoExpandIntelligently_label'),
+        key:    'autoExpandIntelligently',
+        type:   'checkbox',
+        expert: true,
+      },
+      {
+        title:  indent() + browser.i18n.getMessage('config_ignoreTabDropNearSidebarArea_label'),
+        key:    'ignoreTabDropNearSidebarArea',
+        type:   'checkbox',
+        expert: true,
+      },
+      { type: 'separator' },
+      {
+        title:   browser.i18n.getMessage('config_advanced_caption'),
+        enabled: false
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_warnOnCloseTabs_label'),
+        key:   'warnOnCloseTabs',
+        type:  'checkbox'
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_warnOnCloseTabsByClosebox_label'),
+        key:   'warnOnCloseTabsByClosebox',
+        type:  'checkbox',
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_warnOnCloseTabsWithListing_label'),
+        key:   'warnOnCloseTabsWithListing',
+        type:  'checkbox',
+        expert: true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_useCachedTree_label'),
+        key:   'useCachedTree',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_persistCachedTree_label'),
+        key:   'persistCachedTree',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_tabGroupsEnabled_label'),
+        key:   'tabGroupsEnabled',
+        type:  'checkbox',
+        expert: true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_undoMultipleTabsClose_label'),
+        key:   'undoMultipleTabsClose',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title:       indent() + browser.i18n.getMessage('config_requestPermissions_bookmarks_context'),
+        type:        'checkbox',
+        permissions: Permissions.BOOKMARKS
+      },
+      { type: 'separator' },
+      {
+        title:   browser.i18n.getMessage('config_debug_caption'),
+        enabled: false
+      },
+      {
+        title:    indent() + browser.i18n.getMessage('config_colorScheme_caption'),
+        children: [
+          {
+            title: browser.i18n.getMessage('config_colorScheme_photon'),
+            key:   'colorScheme',
+            value: 'photon',
+            type:  'radio'
+          },
+          {
+            title: browser.i18n.getMessage('config_colorScheme_systemColor'),
+            key:   'colorScheme',
+            value: 'system-color',
+            type:  'radio'
+          }
+        ]
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_enableLinuxBehaviors_label'),
+        key:   'enableLinuxBehaviors',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_enableMacOSBehaviors_label'),
+        key:   'enableMacOSBehaviors',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_enableWindowsBehaviors_label'),
+        key:   'enableWindowsBehaviors',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_loggingQueries_label'),
+        key:   'loggingQueries',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent(2) + browser.i18n.getMessage('config_loggingConnectionMessages_label'),
+        key:   'loggingConnectionMessages',
+        type:  'checkbox',
+        expert:  true,
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_debug_label'),
+        key:   'debug',
+        type:  'checkbox'
+      },
+      { type: 'separator' },
+      {
+        title: browser.i18n.getMessage('config_showExpertOptions_label'),
+        key:   'showExpertOptions',
+        type:  'checkbox'
+      }
+    ]
+  }
+];
+
+const mItemsById = new Map();
+const mUpdatableItemsById = new Map();
+const mExpertItems = new Set();
+
+const MENU_CONTEXT = browser.browserAction ?
+  'browser_action' : // Manifest V2
+  'action'; // Manifest V3
+
+function createItem(id, item, parent) {
+  if (item.visible === false)
+    return;
+
+  const parentId = parent ? parent.id : null ;
+  item.id = id;
+  mItemsById.set(id, item);
+
+  if (item.dynamicTitle) {
+    item.lastTitle = item.title;
+    mUpdatableItemsById.set(id, item);
+  }
+  if (item.type == 'checkbox' || item.type == 'radio') {
+    mUpdatableItemsById.set(id, item);
+  }
+
+  const params = {
+    id,
+    title:    item.title?.replace(/^:|:$/g, ''),
+    type:     item.type || 'normal',
+    contexts: [MENU_CONTEXT],
+    parentId
+  };
+  if ('enabled' in item)
+    params.enabled = item.enabled;
+  log('create: ', params);
+  id = browser.menus.create(params);
+  if (item.expert)
+    mExpertItems.add(id);
+  if (item.children) {
+    for (let i = 0, maxi = item.children.length; i < maxi; i++) {
+      const child = item.children[i];
+      createItem(`${id}:${i}`, child, item);
+    }
+  }
+}
+
+if (browser.action/* Manifest V2 */ || browser.browserAction/* Manifest V3 */) {
+  for (let i = 0, maxi = mItems.length; i < maxi; i++) {
+    createItem(`browserActionItem:${i}`, mItems[i]);
+  }
+
+  browser.menus.onShown.addListener((info, _tab) => {
+    if (!info.contexts.includes(MENU_CONTEXT))
+      return;
+
+    let updated = false;
+    for (const item of mUpdatableItemsById.values()) {
+      const params = {};
+      if (item.dynamicTitle) {
+        const title = item.title;
+        if (title != item.lastTitle) {
+          item.lastTitle = title;
+          params.title = title;
+        }
+      }
+      if (item.type == 'checkbox' || item.type == 'radio') {
+        const checkedFromConfigs = 'value' in item ? configs[item.key] == item.value : configs[item.key];
+        params.checked = checkedFromConfigs;
+        if (item.permissions) {
+          Permissions.isGranted(item.permissions)
+            .then(async granted => {
+              const checked = granted && (!('key' in item) || checkedFromConfigs);
+              if (checked == granted &&
+                  params.checked == granted)
+                return;
+              item.checked = checked;
+              await browser.menus.update(item.id, { checked }).catch(ApiTabs.createErrorSuppressor());
+              await browser.menus.refresh().catch(ApiTabs.createErrorSuppressor());
+            });
+          delete params.checked;
+        }
+      }
+      if ('visible' in item)
+        params.visible = item.visible;
+      if ('checked' in params || 'title' in params) {
+        browser.menus.update(item.id, params).catch(ApiTabs.createErrorSuppressor());
+        updated = true;
+      }
+    }
+    if (updated)
+      browser.menus.refresh().catch(ApiTabs.createErrorSuppressor());
+  });
+
+  browser.menus.onClicked.addListener((info, _tab) => {
+    const item = mItemsById.get(info.menuItemId);
+    log('onClicked ', { id: info.menuItemId, item });
+    if (!item)
+      return;
+
+    if (item.url) {
+      browser.tabs.create({ url: item.url });
+      return;
+    }
+    if (item.key) {
+      if (info.checked)
+        configs[item.key] = 'value' in item ? item.value : true;
+      else if (!('value' in item))
+        configs[item.key] = false;
+    }
+    if (item.permissions) {
+      if (!info.checked) {
+        if (item.canRevoke !== false)
+          browser.permissions.remove(item.permissions).catch(ApiTabs.createErrorSuppressor());
+      }
+      else {
+        browser.permissions.request(item.permissions)
+          .then(async granted => {
+            if (granted === undefined)
+              granted = await Permissions.isGranted(item.permissions);
+            if (granted) {
+              browser.runtime.sendMessage({
+                type:        Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED,
+                permissions: item.permissions
+              }).catch(_error => {});
+            }
+          })
+          .catch(ApiTabs.createErrorHandler());
+      }
+    }
+  });
+
+
+  function updateExpertOptionsVisibility() {
+    for (const id of mExpertItems) {
+      browser.menus.update(id, { visible: configs.showExpertOptions });
+    }
+    browser.menus.refresh();
+  }
+  configs.$addObserver(key => {
+    if (key == 'showExpertOptions')
+      updateExpertOptionsVisibility();
+  });
+  configs.$loaded.then(updateExpertOptionsVisibility);
+}
diff --git a/waterfox/browser/components/sidebar/background/commands.js b/waterfox/browser/components/sidebar/background/commands.js
new file mode 100644
index 0000000000000..f99b9e0a63819
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/commands.js
@@ -0,0 +1,1566 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  wait,
+  countMatched,
+  configs,
+  getWindowParamsFromSource,
+  tryRevokeObjectURL,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+import * as UserOperationBlocker from '/common/user-operation-blocker.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import * as NativeTabGroups from './native-tab-groups.js';
+import * as TabsGroup from './tabs-group.js';
+import * as TabsMove from './tabs-move.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/commands', ...args);
+}
+
+export const onTabsClosing = new EventListenerManager();
+export const onMoveUp      = new EventListenerManager();
+export const onMoveDown    = new EventListenerManager();
+
+export function reloadTree(tabs) {
+  for (const tab of Tab.uniqTabsAndDescendantsSet(tabs)) {
+    browser.tabs.reload(tab.id)
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+}
+
+export function reloadDescendants(rootTabs) {
+  const rootTabsSet = new Set(rootTabs);
+  for (const tab of Tab.uniqTabsAndDescendantsSet(rootTabs)) {
+    if (rootTabsSet.has(tab))
+      continue;
+    browser.tabs.reload(tab.id)
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+}
+
+function isUnmuted(tab) {
+  return !tab.mutedInfo || !tab.mutedInfo.muted;
+}
+
+export function toggleMuteTree(tabs) {
+  const tabsToUpdate = [];
+  let shouldMute = false;
+  for (const tab of Tab.uniqTabsAndDescendantsSet(tabs)) {
+    if (!shouldMute && isUnmuted(tab))
+      shouldMute = true;
+    tabsToUpdate.push(tab);
+  }
+  for (const tab of tabsToUpdate) {
+    if (shouldMute != isUnmuted(tab))
+      continue;
+    browser.tabs.update(tab.id, { muted: shouldMute })
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+}
+
+export function toggleMuteDescendants(rootTabs) {
+  const rootTabsSet = new Set(rootTabs);
+  const tabsToUpdate = [];
+  let shouldMute = false;
+  for (const tab of Tab.uniqTabsAndDescendantsSet(rootTabs)) {
+    if (rootTabsSet.has(tab))
+      continue;
+    if (!shouldMute && isUnmuted(tab))
+      shouldMute = true;
+    tabsToUpdate.push(tab);
+  }
+  for (const tab of tabsToUpdate) {
+    if (shouldMute != isUnmuted(tab))
+      continue;
+    browser.tabs.update(tab.id, { muted: shouldMute })
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+}
+
+export function getUnmutedState(rootTabs) {
+  let hasUnmutedTab        = false;
+  let hasUnmutedDescendant = false;
+  const rootTabsSet = new Set(rootTabs);
+  for (const tab of Tab.uniqTabsAndDescendantsSet(rootTabs)) {
+    if (!isUnmuted(tab))
+      continue;
+    hasUnmutedTab = true;
+    if (!rootTabsSet.has(tab))
+      hasUnmutedDescendant = true;
+    if (hasUnmutedTab && hasUnmutedDescendant)
+      break;
+  }
+  return { hasUnmutedTab, hasUnmutedDescendant };
+}
+
+export function getAutoplayBlockedState(rootTabs) {
+  let hasAutoplayBlockedTab        = false;
+  let hasAutoplayBlockedDescendant = false;
+  const rootTabsSet = new Set(rootTabs);
+  for (const tab of Tab.uniqTabsAndDescendantsSet(rootTabs)) {
+    if (!tab.$TST.autoplayBlocked)
+      continue;
+    hasAutoplayBlockedTab = true;
+    if (!rootTabsSet.has(tab))
+      hasAutoplayBlockedDescendant = true;
+    if (hasAutoplayBlockedTab && hasAutoplayBlockedDescendant)
+      break;
+  }
+  return { hasAutoplayBlockedTab, hasAutoplayBlockedDescendant };
+}
+
+export function getMenuItemTitle(item, { multiselected, unmuted, hasUnmutedTab, hasUnmutedDescendant, sticky } = {}) {
+  const muteTabSuffix        = unmuted ? 'Mute' : 'Unmute';
+  const muteTreeSuffix       = hasUnmutedTab ? 'Mute' : 'Unmute';
+  const muteDescendantSuffix = hasUnmutedDescendant ? 'Mute' : 'Unmute';
+  const stickySuffix         = sticky ? 'Unstick' : 'Stick';
+  return multiselected && (
+    item[`titleMultiselected${muteTabSuffix}`] ||
+    item[`titleMultiselected${muteTreeSuffix}Tree`] ||
+    item[`titleMultiselected${muteDescendantSuffix}Descendant`] ||
+    item[`titleMultiselected${stickySuffix}`] ||
+    item.titleMultiselected
+  ) || (
+    item[`title${muteTabSuffix}`] ||
+    item[`title${muteTreeSuffix}Tree`] ||
+    item[`title${muteDescendantSuffix}Descendant`] ||
+    item[`title${stickySuffix}`] ||
+    item.title
+  );
+}
+
+export async function closeTree(tabs) {
+  tabs = Tab.uniqTabsAndDescendantsSet(tabs);
+  const windowId = tabs[0].windowId;
+  const canceled = (await onTabsClosing.dispatch(tabs.map(tab => tab.id), { windowId })) === false;
+  if (canceled)
+    return;
+  tabs.reverse(); // close bottom to top!
+  TabsInternalOperation.removeTabs(tabs);
+}
+
+export async function closeDescendants(rootTabs) {
+  const rootTabsSet = new Set(rootTabs);
+  const tabs     = Tab.uniqTabsAndDescendantsSet(rootTabs).filter(tab => !rootTabsSet.has(tab));
+  const windowId = rootTabs[0].windowId;
+  const canceled = (await onTabsClosing.dispatch(tabs.map(tab => tab.id), { windowId })) === false;
+  if (canceled)
+    return;
+  tabs.reverse(); // close bottom to top!
+  TabsInternalOperation.removeTabs(tabs);
+}
+
+export async function closeOthers(exceptionRoots) {
+  const exceptionTabs = Tab.uniqTabsAndDescendantsSet(exceptionRoots);
+  const windowId      = exceptionTabs[0].windowId;
+  const tabs          = Tab.getNormalTabs(windowId, { iterator: true, reversed: true }); // except pinned or hidden tabs, close bottom to top!
+  const closeTabs     = [];
+  for (const tab of tabs) {
+    if (!exceptionTabs.includes(tab))
+      closeTabs.push(tab);
+  }
+  const canceled = (await onTabsClosing.dispatch(closeTabs.map(tab => tab.id), { windowId })) === false;
+  if (canceled)
+    return;
+  TabsInternalOperation.removeTabs(closeTabs);
+}
+
+export function collapseTree(rootTabs, { recursively } = {}) {
+  rootTabs = Array.isArray(rootTabs) && rootTabs || [rootTabs];
+  const rootTabsSet = new Set(rootTabs);
+  const tabs = (
+    recursively ?
+      Tab.uniqTabsAndDescendantsSet(rootTabs) :
+      rootTabs
+  ).filter(tab => tab.$TST.hasChild && !tab.$TST.subtreeCollapsed);
+  const cache = {};
+  for (const tab of tabs) {
+    TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_COLLAPSE_TREE_FROM_COLLAPSE_COMMAND,
+      {
+        tab,
+        recursivelyCollapsed: !rootTabsSet.has(tab),
+      },
+      { tabProperties: ['tab'], cache }
+    ).then(allowed => {
+      if (!allowed)
+        return;
+      Tree.collapseExpandSubtree(tab, {
+        collapsed: true,
+        broadcast: true
+      });
+    });
+  }
+  TSTAPI.clearCache(cache);
+}
+
+export function collapseAll(windowId) {
+  const cache = {};
+  for (const tab of Tab.getNormalTabs(windowId, { iterator: true })) {
+    if (!tab.$TST.hasChild || tab.$TST.subtreeCollapsed)
+      continue;
+    TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_COLLAPSE_TREE_FROM_COLLAPSE_ALL_COMMAND,
+      { tab },
+      { tabProperties: ['tab'], cache }
+    ).then(allowed => {
+      if (!allowed)
+        return;
+      Tree.collapseExpandSubtree(tab, {
+        collapsed: true,
+        broadcast: true,
+      });
+    });
+  }
+  TSTAPI.clearCache(cache);
+}
+
+export function expandTree(rootTabs, { recursively } = {}) {
+  rootTabs = Array.isArray(rootTabs) && rootTabs || [rootTabs];
+  const rootTabsSet = new Set(rootTabs);
+  const tabs = (
+    recursively ?
+      Tab.uniqTabsAndDescendantsSet(rootTabs) :
+      rootTabs
+  ).filter(tab => tab.$TST.hasChild && tab.$TST.subtreeCollapsed);
+  const cache = {};
+  for (const tab of tabs) {
+    TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_EXPAND_COMMAND,
+      {
+        tab,
+        recursivelyExpanded: !rootTabsSet.has(tab),
+      },
+      { tabProperties: ['tab'], cache }
+    ).then(allowed => {
+      if (!allowed)
+        return;
+      Tree.collapseExpandSubtree(tab, {
+        collapsed: false,
+        broadcast: true,
+      });
+    });
+  }
+  TSTAPI.clearCache(cache);
+}
+
+export function expandAll(windowId) {
+  const cache = {};
+  for (const tab of Tab.getNormalTabs(windowId, { iterator: true })) {
+    if (!tab.$TST.hasChild || !tab.$TST.subtreeCollapsed)
+      continue;
+    TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_EXPAND_ALL_COMMAND,
+      { tab },
+      { tabProperties: ['tab'], cache }
+    ).then(allowed => {
+      if (!allowed)
+        return;
+      Tree.collapseExpandSubtree(tab, {
+        collapsed: false,
+        broadcast: true,
+      });
+    });
+  }
+  TSTAPI.clearCache(cache);
+}
+
+export async function bookmarkTree(rootTabs, { parentId, index, showDialog } = {}) {
+  const tabs = Tab.uniqTabsAndDescendantsSet(rootTabs);
+
+  if (tabs.length > 1) {
+    const tabsSet = new Set(tabs);
+    const rootGroupTabs = tabs.filter(tab => tab.$TST.isGroupTab && !tabsSet.has(tab.$TST.parent));
+    if (rootGroupTabs.length == 1)
+      tabs.splice(tabs.indexOf(rootGroupTabs[0]), 1);
+  }
+
+  const options = { parentId, index, showDialog };
+  const topLevelTabs = rootTabs.filter(tab => tab.$TST.ancestorIds.length == 0);
+  if (topLevelTabs.length == 1 &&
+      topLevelTabs[0].$TST.isGroupTab)
+    options.title = topLevelTabs[0].title;
+
+  const tab = tabs[0];
+  if (configs.showDialogInSidebar &&
+      SidebarConnection.isOpen(tab.windowId)) {
+    return SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_BOOKMARK_TABS_WITH_DIALOG,
+      windowId: tab.windowId,
+      tabIds:   tabs.map(tab => tab.id),
+      options
+    });
+  }
+  else {
+    return Bookmark.bookmarkTabs(tabs, {
+      ...options,
+      showDialog: true
+    });
+  }
+}
+
+export function toggleSticky(tabs, shouldStick = undefined) {
+  const uniqueTabs = [...new Set(tabs)];
+  if (shouldStick === undefined)
+    shouldStick = uniqueTabs.some(tab => !tab.$TST.sticky);
+  for (const tab of uniqueTabs) {
+    tab.$TST.toggleState(Constants.kTAB_STATE_STICKY, !!shouldStick, { permanently: true });
+  }
+}
+
+
+export async function openNewTabAs(options = {}) {
+  log('openNewTabAs ', options);
+  let activeTabs;
+  if (!options.baseTab) {
+    activeTabs = await browser.tabs.query({
+      active:        true,
+      currentWindow: true,
+    }).catch(ApiTabs.createErrorHandler());
+    if (activeTabs.length == 0)
+      activeTabs = await browser.tabs.query({
+        currentWindow: true,
+      }).catch(ApiTabs.createErrorHandler());
+  }
+  const activeTab = options.baseTab || Tab.get(activeTabs[0].id);
+  log('activeTab ', activeTab);
+
+  let parent, insertBefore, insertAfter;
+  let isOrphan = false;
+  switch (options.as) {
+    case Constants.kNEWTAB_DO_NOTHING:
+    default:
+      break;
+
+    case Constants.kNEWTAB_OPEN_AS_ORPHAN:
+      isOrphan    = true;
+      insertAfter = Tab.getLastTab(activeTab.windowId);
+      break;
+
+    case Constants.kNEWTAB_OPEN_AS_CHILD:
+    case Constants.kNEWTAB_OPEN_AS_CHILD_TOP:
+    case Constants.kNEWTAB_OPEN_AS_CHILD_END: {
+      parent = activeTab;
+      const insertAt = options.as == Constants.kNEWTAB_OPEN_AS_CHILD_TOP ?
+        Constants.kINSERT_TOP :
+        options.as == Constants.kNEWTAB_OPEN_AS_CHILD_END ?
+          Constants.kINSERT_END :
+          undefined;
+      const refTabs = Tree.getReferenceTabsForNewChild(null, parent, { insertAt });
+      insertBefore = refTabs.insertBefore;
+      insertAfter  = refTabs.insertAfter;
+      log('detected reference tabs: ',
+          { parent, insertBefore, insertAfter });
+    }; break;
+
+    case Constants.kNEWTAB_OPEN_AS_SIBLING:
+      parent      = activeTab.$TST.parent;
+      insertAfter = parent?.$TST.lastDescendant;
+      break;
+
+    case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER:
+      options.cookieStoreId = activeTab.cookieStoreId;
+    case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING: {
+      parent       = activeTab.$TST.parent;
+      const refTabs = Tree.getReferenceTabsForNewNextSibling(activeTab, options);
+      insertBefore = refTabs.insertBefore;
+      insertAfter  = refTabs.insertAfter;
+    }; break;
+  }
+
+  log('options.cookieStoreId: ', options.cookieStoreId);
+  if (!options.cookieStoreId) {
+    switch (configs.inheritContextualIdentityToChildTabMode) {
+      case Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT:
+        if (parent) {
+          options.cookieStoreId = parent.cookieStoreId;
+          log(' => inherit from parent tab: ', options.cookieStoreId);
+        }
+        break;
+
+      case Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE:
+        options.cookieStoreId = activeTab.cookieStoreId;
+        log(' => inherit from active tab: ', options.cookieStoreId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  TabsOpen.openNewTab({
+    parent, insertBefore, insertAfter,
+    isOrphan,
+    windowId:      activeTab.windowId,
+    inBackground:  !!options.inBackground,
+    cookieStoreId: options.cookieStoreId,
+    url:           options.url,
+  });
+}
+
+export async function indent(tab, options = {}) {
+  const newParent = tab.$TST.previousSiblingTab;
+  if (!newParent ||
+      newParent == tab.$TST.parent)
+    return false;
+
+  if (!options.followChildren)
+    Tree.detachAllChildren(tab, {
+      broadcast: true,
+      behavior:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD
+    });
+  const insertAfter = newParent.$TST.lastDescendant || newParent;
+  await Tree.attachTabTo(tab, newParent, {
+    broadcast:   true,
+    forceExpand: true,
+    insertAfter
+  });
+  return true;
+}
+
+export async function outdent(tab, options = {}) {
+  const parent = tab.$TST.parent;
+  if (!parent)
+    return false;
+
+  const newParent = parent.$TST.parent;
+  if (!options.followChildren)
+    Tree.detachAllChildren(tab, {
+      broadcast: true,
+      behavior:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD
+    });
+  if (newParent) {
+    const insertAfter = parent.$TST.lastDescendant || parent;
+    await Tree.attachTabTo(tab, newParent, {
+      broadcast:   true,
+      forceExpand: true,
+      insertAfter
+    });
+  }
+  else {
+    await Tree.detachTab(tab, {
+      broadcast: true,
+    });
+    const insertAfter = parent.$TST.lastDescendant || parent;
+    await Tree.moveTabSubtreeAfter(tab, insertAfter, {
+      broadcast: true,
+    });
+  }
+  return true;
+}
+
+// drag and drop helper
+async function performTreeItemsDragDrop(params = {}) {
+  const windowId = params.windowId || TabsStore.getCurrentWindowId();
+  const destinationWindowId = params.destinationWindowId || windowId;
+
+  switch (params.items[0].type) {
+    case 'group':
+      return performNativeTabGroupItemDragDrop(params.items[0], {
+        windowId,
+        destinationWindowId,
+        ...params,
+      });
+
+    case 'tab':
+    default:
+      return performTabsDragDrop(params.items, {
+        windowId,
+        destinationWindowId,
+        ...params,
+      });
+  }
+}
+
+async function performTreeItemsDragDropWithMessage(message) {
+  const draggedTabIds = message.import ? [] : message.items.map(item => item.type == TreeItem.TYPE_TAB && item.id || null);
+  await Tab.waitUntilTracked(draggedTabIds.concat([
+    message.droppedOn?.type == TreeItem.TYPE_TAB && message.droppedOn.id,
+    message.droppedBefore?.type == TreeItem.TYPE_TAB && message.droppedBefore.id,
+    message.droppedAfter?.type == TreeItem.TYPE_TAB && message.droppedAfter.id,
+    message.attachToId,
+    message.insertBefore?.type == TreeItem.TYPE_TAB && message.insertBefore.id,
+    message.insertAfter?.type == TreeItem.TYPE_TAB && message.insertAfter.id,
+  ]));
+  log('perform tabs dragdrop requested: ', message);
+  return performTreeItemsDragDrop({
+    ...message,
+    items:         message.import ? message.items : message.items.map(TreeItem.get),
+    droppedOn:     TreeItem.get(message.droppedOn),
+    droppedBefore: TreeItem.get(message.droppedBefore),
+    droppedAfter:  TreeItem.get(message.droppedAfter),
+    attachTo:      Tab.get(message.attachToId),
+    insertBefore:  TreeItem.get(message.insertBefore),
+    insertAfter:   TreeItem.get(message.insertAfter),
+  });
+}
+
+async function performTabsDragDrop(tabs, params) {
+  log('performTabsDragDrop ', () => ({
+    tabs:                tabs.map(tab => `${tab.groupId}/#${tab.id}`),
+    droppedOn:           dumpTab(params.droppedOn),
+    droppedBefore:       dumpTab(params.droppedBefore),
+    droppedAfter:        dumpTab(params.droppedAfter),
+    groupId:             params.groupId,
+    attachTo:            dumpTab(params.attachTo),
+    insertBefore:        dumpTab(params.insertBefore),
+    insertAfter:         dumpTab(params.insertAfter),
+    nextGroupColor:      params.nextGroupColor,
+    canCreateGroup:      params.canCreateGroup,
+    windowId:            params.windowId,
+    destinationWindowId: params.destinationWindowId,
+    action:              params.action,
+    allowedActions:      params.allowedActions
+  }));
+
+  const createGroup = params.canCreateGroup && params.nextGroupColor;
+  const beforeIndices = tabs.map(tab => tab.index).join(',');
+
+  if (!(params.allowedActions & Constants.kDRAG_BEHAVIOR_MOVE) &&
+      !params.duplicate) {
+    log(' => not allowed action');
+    return tabs;
+  }
+
+  const nativeTabGroupIdFromPositionDeterminedByBrowser = (params.insertAfter && params.insertAfter.groupId != -1) ?
+    params.insertAfter.groupId :
+    params.insertBefore ?
+      params.insertBefore.groupId :
+      -1;
+  const nativeTabGroupId = params.groupId || (
+    params.attachTo ? params.attachTo.groupId :
+      nativeTabGroupIdFromPositionDeterminedByBrowser
+  );
+  const draggedGroupParams = nativeTabGroupId == tabs[0].groupId ?
+    tabs[0]?.$TST?.nativeTabGroup?.$TST?.createParams :
+    null;
+
+  log('performTabsDragDrop: nativeTabGroupId = ', nativeTabGroupId, ', nativeTabGroupIdFromPositionDeterminedByBrowser = ', nativeTabGroupIdFromPositionDeterminedByBrowser, ', draggedGroupParams = ', draggedGroupParams, ', createGroup = ', createGroup);
+
+  let blockedWindowId = null;
+  if ((params.groupId &&
+       tabs[0].groupId != params.groupId) ||
+      (tabs[0].groupId != (params.droppedOn || params.droppedBefore || params.droppedAfter)?.groupId)) {
+    blockedWindowId = tabs[0].windowId;
+    UserOperationBlocker.blockIn(blockedWindowId, { throbber: true });
+  }
+
+  if ((params.droppedOn?.type == TreeItem.TYPE_GROUP ||
+       params.droppedAfter?.type == TreeItem.TYPE_GROUP ||
+       params.droppedBefore?.type == TreeItem.TYPE_GROUP) &&
+      tabs.some(tab => tab.groupId != -1 && tab.groupId != nativeTabGroupId)) {
+    log('performTabsDragDrop: remove from group');
+    await NativeTabGroups.removeTabsFromGroup(tabs);
+  }
+
+  const { windowId, destinationWindowId } = params;
+  const isAcrossWindows = windowId != destinationWindowId;
+
+  if (!isAcrossWindows) {
+    // On in-window tab move, we need to apply final group at first.
+    // Otherwise tab move after group modifications may break groups.
+    await NativeTabGroups.matchTabsGrouped(tabs, nativeTabGroupId);
+  }
+
+  const movedTabs = await moveTabsWithStructure(tabs, {
+    ...params,
+    ...(createGroup ? { attachTo: null } : {}),
+    windowId,
+    destinationWindowId,
+    // TST automatically optimize rearrangement of tabs, but we need to disable it here to avoid unexpected group modifications by moved other tabs.
+    doNotOptimize: TabsStore.windows.get(destinationWindowId).tabGroups.size > 0 || nativeTabGroupId != -1,
+    broadcast: true
+  });
+  log('performTabsDragDrop: movedTabs = ', movedTabs, { isAcrossWindows });
+
+  if (isAcrossWindows) {
+    // On tab move across windows, we need to apply final group after
+    // tabs are moved to the destination window.
+    await NativeTabGroups.matchTabsGrouped(tabs, draggedGroupParams || nativeTabGroupId);
+  }
+
+  if (createGroup) {
+    await NativeTabGroups.addTabsToGroup([params.droppedOn, ...tabs], {
+      title:    '',
+      color:    params.nextGroupColor,
+      windowId: params.destinationWindowId,
+    });
+  }
+  else if (nativeTabGroupId != -1 &&
+           !isAcrossWindows) {
+    await NativeTabGroups.rejectGroupFromTree(TabGroup.get(nativeTabGroupId))
+  }
+
+  const afterIndices = movedTabs.map(tab => tab.index).join(',');
+  if (beforeIndices != afterIndices /* Firefox's automatic group maintenance won't happen if tabs were not moved */ &&
+      nativeTabGroupId != nativeTabGroupIdFromPositionDeterminedByBrowser) {
+    // Automatic group maintenance done by Firefox based on tabs' destination position
+    // may change groups. We need to override the result with the given group id.
+    log('performTabsDragDrop: final group id = ', nativeTabGroupId);
+    let onGroupModified;
+    const toBeModifiedTabs = new Set(movedTabs.map(tab => tab.id));
+    const startAt = Date.now();
+    await Promise.race([
+      new Promise((resolve, _reject) => {
+        onGroupModified = (tabId, updateInfo, _tab) => {
+          if (updateInfo.groupId != nativeTabGroupId) {
+            log(`performTabsDragDrop: tab group modifications detected (${updateInfo.groupId}) with delay ${Date.now() - startAt} msec.`);
+            toBeModifiedTabs.delete(tabId);
+          }
+          if (toBeModifiedTabs.size == 0) {
+            log('performTabsDragDrop: all members have been updated');
+            resolve();
+          }
+        };
+        browser.tabs.onUpdated.addListener(onGroupModified, {
+          properties: ['groupId'],
+          windowId:   destinationWindowId,
+        });
+      }),
+      wait(configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove).then(() => {
+        log('performTabsDragDrop: tab group modifications detection timeout');
+      }),
+    ]);
+    browser.tabs.onUpdated.removeListener(onGroupModified);
+    log('performTabsDragDrop: match group with ', draggedGroupParams || nativeTabGroupId);
+    await NativeTabGroups.matchTabsGrouped(movedTabs, draggedGroupParams || nativeTabGroupId);
+  }
+
+  if (blockedWindowId) {
+    UserOperationBlocker.unblockIn(blockedWindowId, { throbber: true });
+  }
+
+  log('performTabsDragDrop: finish');
+
+  if (movedTabs.length == 0)
+    return movedTabs;
+
+  if (windowId != destinationWindowId) {
+    // Firefox always focuses to the dropped (mvoed) tab if it is dragged from another window.
+    // TST respects Firefox's the behavior.
+    await browser.tabs.update(movedTabs[0].id, { active: true })
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+  return movedTabs;
+}
+
+async function performNativeTabGroupItemDragDrop(group, { droppedOn, droppedBefore, droppedAfter, groupId, attachTo, windowId, destinationWindowId }) {
+  log('performNativeTabGroupItemDragDrop ', () => ({ group, groupId, droppedOn, droppedBefore, droppedAfter, attachTo, windowId, destinationWindowId }));
+
+  if (droppedOn?.type == TreeItem.TYPE_GROUP) {
+    log('performNativeTabGroupItemDragDrop: dropping onto another group, merge to it: ', droppedOn);
+    const members = group.$TST.members;
+    const firstMember = droppedOn.$TST.firstMember;
+    if (group.$TST.firstMember.index < firstMember.index) {
+      await NativeTabGroups.moveGroupBefore(group, firstMember);
+    }
+    else{
+      await NativeTabGroups.moveGroupAfter(group, droppedOn.$TST.lastMember);
+    }
+    await NativeTabGroups.addTabsToGroup(members, droppedOn.id);
+    return;
+  }
+
+  let insertAfter  = droppedAfter;
+  let insertBefore = droppedBefore;
+  const firstMember = group.$TST.firstMember;
+
+  if (groupId) {
+    if (groupId != group.id) {
+      const dropTargetGroup = TabGroup.get(groupId);
+      const dropTargetFirstMember = dropTargetGroup.$TST.firstMember;
+      if (firstMember.index < dropTargetFirstMember.index) {
+        log('performNativeTabGroupItemDragDrop: dropping into another group, move to below the target group');
+        insertAfter = dropTargetGroup.$TST.lastMember;
+        if (insertAfter) {
+          insertBefore = null;
+        }
+      }
+      else {
+        log('performNativeTabGroupItemDragDrop: dropping into another group, move to above the target group');
+        insertBefore = dropTargetFirstMember;
+        if (insertBefore) {
+          insertAfter = null;
+        }
+      }
+    }
+    else if (droppedOn ||
+             droppedBefore?.$TST.parent ||
+             (droppedAfter?.$TST.parent &&
+              droppedAfter.$TST.rootTab == droppedAfter.$TST.unsafeNextTab?.$TST.rootTab)) {
+      const root = (droppedOn || droppedBefore || droppedAfter).$TST.rootTab;
+      if (root) {
+        if (firstMember.index < root.index) {
+          log('performNativeTabGroupItemDragDrop: dropping into ungrouped tree, move to below the target tree');
+          insertAfter = root.$TST.lastDescendant || root;
+          if (insertAfter) {
+            insertBefore = null;
+          }
+        }
+        else {
+          log('performNativeTabGroupItemDragDrop: dropping into ungrouped tree, move to above the target tree');
+          insertBefore = root;
+          if (insertBefore) {
+            insertAfter = null;
+          }
+        }
+      }
+    }
+  }
+
+  const { promisedMoved, finish } = NativeTabGroups.waitUntilMoved(group, destinationWindowId);
+
+  if (insertAfter) {
+    if (insertAfter.groupId == -1) {
+      insertAfter = insertAfter.$TST.rootTab.$TST.lastDescendant || insertAfter;
+    }
+    log('performNativeTabGroupItemDragDrop: move the group below the specified tab ', insertAfter.id);
+    await NativeTabGroups.moveGroupAfter(group, insertAfter);
+  }
+  else if (insertBefore) {
+    if (insertBefore.groupId == -1) {
+      insertBefore = insertBefore.$TST.rootTab;
+    }
+    log('performNativeTabGroupItemDragDrop: move the group above the specified tab ', insertBefore.id);
+    await NativeTabGroups.moveGroupBefore(group, insertBefore);
+  }
+  else {
+    finish();
+    throw new Error('performNativeTabGroupItemDragDrop: no hint to move specified group');
+  }
+
+  await Promise.race([
+    promisedMoved,
+    wait(configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove).then(() => {
+      if (finish.done) {
+        return;
+      }
+      log('performNativeTabGroupItemDragDrop: tab group modifications detection timeout');
+    }),
+  ]);
+}
+
+// useful utility for general purpose
+export async function moveTabsWithStructure(tabs, params = {}) {
+  log('moveTabsWithStructure ', () => tabs.map(dumpTab));
+
+  let movedTabs = tabs.filter(tab => !!tab);
+  if (!movedTabs.length)
+    return [];
+
+  let movedRoots = params.import ? [] : Tab.collectRootTabs(movedTabs);
+
+  const movedWholeTree = Tree.getWholeTree(movedRoots);
+  log('=> movedTabs: ', () => ['moved', movedTabs.map(dumpTab).join(' / '), 'whole', movedWholeTree.map(dumpTab).join(' / ')]);
+
+  const movedTabsSet = new Set(movedTabs);
+  while (movedTabsSet.has(params.insertBefore)) {
+    params.insertBefore = params.insertBefore?.$TST.nextTab;
+  }
+  while (movedTabsSet.has(params.insertAfter)) {
+    params.insertAfter = params.insertAfter?.$TST.previousTab;
+  }
+
+  const windowId = params.windowId || tabs[0].windowId;
+  const destinationWindowId = params.destinationWindowId ||
+    params.insertBefore?.windowId ||
+      params.insertAfter?.windowId ||
+        windowId;
+
+  // Basically tabs should not be moved between regular window and private browsing window,
+  // so there are some codes to prevent shch operations. This is for failsafe.
+  if (movedTabs[0].incognito != Tab.getFirstTab(destinationWindowId).incognito)
+    return [];
+
+  if (!params.import &&
+      movedWholeTree.length != movedTabs.length) {
+    log('=> partially moved');
+    if (!params.duplicate)
+      await Tree.detachTabsFromTree(movedTabs, {
+        insertBefore: params.insertBefore,
+        insertAfter:  params.insertAfter,
+        partial:      true,
+        broadcast:    params.broadcast,
+      });
+  }
+
+  if (params.import) {
+    const win = TabsStore.windows.get(destinationWindowId);
+    const initialIndex = params.insertBefore ? params.insertBefore.index :
+      params.insertAfter ? params.insertAfter.index+1 :
+        win.tabs.size;
+    win.toBeOpenedOrphanTabs += tabs.length;
+    movedTabs = [];
+    let index = 0;
+    for (const tab of tabs) {
+      let importedTab;
+      const createParams = {
+        url:      tab.url,
+        windowId: destinationWindowId,
+        index:    initialIndex + index,
+        active:   index == 0
+      };
+      try {
+        importedTab = await browser.tabs.create(createParams);
+      }
+      catch(error) {
+        console.log(error);
+      }
+      if (!importedTab)
+        importedTab = await browser.tabs.create({
+          ...createParams,
+          url: `about:blank?${tab.url}`
+        });
+      movedTabs.push(importedTab);
+      index++;
+    }
+    await wait(100); // wait for all imported tabs are tracked
+    movedTabs = movedTabs.map(tab => Tab.get(tab.id));
+    await Tree.applyTreeStructureToTabs(movedTabs, params.structure, {
+      broadcast: true
+    });
+    movedRoots = Tab.collectRootTabs(movedTabs);
+    for (const tab of movedTabs) {
+      tryRevokeObjectURL(tab.url);
+    }
+  }
+  else if (params.duplicate ||
+           windowId != destinationWindowId) {
+    movedTabs = await Tree.moveTabs(movedTabs, {
+      destinationWindowId,
+      duplicate:    params.duplicate,
+      insertBefore: params.insertBefore,
+      insertAfter:  params.insertAfter,
+      broadcast:    params.broadcast,
+    });
+    movedRoots = Tab.collectRootTabs(movedTabs);
+  }
+
+  log('try attach/detach');
+  let shouldExpand = false;
+  if (!params.attachTo) {
+    log('=> detach');
+    detachTabsWithStructure(movedRoots, {
+      broadcast: params.broadcast
+    });
+    shouldExpand = true;
+  }
+  else {
+    log('=> attach');
+    await attachTabsWithStructure(movedRoots, params.attachTo, {
+      insertBefore: params.insertBefore,
+      insertAfter:  params.insertAfter,
+      draggedTabs:  movedTabs,
+      broadcast:    params.broadcast
+    });
+    shouldExpand = !params.attachTo.$TST.subtreeCollapsed;
+  }
+
+  log('=> moving tabs ', () => movedTabs.map(dumpTab));
+  if (params.insertBefore)
+    await TabsMove.moveTabsBefore(
+      movedTabs,
+      params.insertBefore,
+      {
+        doNotOptimize: !!params.doNotOptimize,
+        broadcast:     !!params.broadcast,
+      }
+    );
+  else if (params.insertAfter)
+    await TabsMove.moveTabsAfter(
+      movedTabs,
+      params.insertAfter,
+      {
+        doNotOptimize: !!params.doNotOptimize,
+        broadcast:     !!params.broadcast,
+      }
+    );
+  else
+    log('=> already placed at expected position');
+
+  /*
+  const treeStructure = getTreeStructureFromTabs(movedTabs);
+
+  const newTabs;
+  const replacedGroupTabs = Tab.doAndGetNewTabs(() => {
+    newTabs = moveTabsInternal(movedTabs, {
+      duplicate:    params.duplicate,
+      insertBefore: params.insertBefore,
+      insertAfter:  params.insertAfter
+    });
+  }, windowId);
+  log('=> opened group tabs: ', replacedGroupTabs);
+  params.draggedTab.ownerDocument.defaultView.setTimeout(() => {
+    if (!TabsStore.ensureLivingItem(tab)) // it was removed while waiting
+      return;
+    log('closing needless group tabs');
+    replacedGroupTabs.reverse().forEach(function(tab) {
+      log(' check: ', tab.label+'('+tab.index+') '+getLoadingURI(tab));
+      if (tab.$TST.isGroupTab &&
+        !tab.$TST.hasChild)
+        removeTab(tab);
+    }, this);
+  }, 0);
+  */
+
+  if (shouldExpand) {
+    log('=> expand dropped tabs');
+    // Collapsed tabs may be moved to the root level,
+    // then we need to expand them.
+    await Promise.all(movedRoots.map(tab => {
+      if (!tab.$TST.collapsed)
+        return;
+      return Tree.collapseExpandTabAndSubtree(tab, {
+        collapsed: false,
+        broadcast: params.broadcast
+      });
+    }));
+  }
+
+  log('=> finished');
+
+  return movedTabs;
+}
+
+async function attachTabsWithStructure(tabs, parent, options = {}) {
+  log('attachTabsWithStructure: start ', () => ['tabs', ...tabs.map(dumpTab), 'parent', dumpTab(parent), 'insertBefore', dumpTab(options.insertBefore), 'insertAfter', dumpTab(options.insertAfter)]);
+  if (parent &&
+      !options.insertBefore &&
+      !options.insertAfter) {
+    const refTabs = Tree.getReferenceTabsForNewChild(
+      tabs[0],
+      parent,
+      { ignoreTabs: tabs }
+    );
+    options.insertBefore = refTabs.insertBefore;
+    options.insertAfter  = refTabs.insertAfter;
+  }
+
+  if (options.insertBefore)
+    await TabsMove.moveTabsBefore(
+      options.draggedTabs || tabs,
+      options.insertBefore,
+      { broadcast: options.broadcast }
+    );
+  else if (options.insertAfter)
+    await TabsMove.moveTabsAfter(
+      options.draggedTabs || tabs,
+      options.insertAfter,
+      { broadcast: options.broadcast }
+    );
+
+  const memberOptions = {
+    ...options,
+    insertBefore: null,
+    insertAfter:  null,
+    dontMove:     true,
+    forceExpand:  options.draggedTabs.some(tab => tab.active)
+  };
+  return Promise.all(tabs.map(async tab => {
+    if (parent)
+      await Tree.attachTabTo(tab, parent, memberOptions);
+    else
+      await Tree.detachTab(tab, memberOptions);
+    // The tree can remain being collapsed by other addons like TST Lock Tree Collapsed.
+    const collapsed = parent?.$TST.subtreeCollapsed;
+    return Tree.collapseExpandTabAndSubtree(tab, {
+      ...memberOptions,
+      collapsed,
+    });
+  }));
+}
+
+function detachTabsWithStructure(tabs, options = {}) {
+  log('detachTabsWithStructure: start ', () => tabs.map(dumpTab));
+  for (const tab of tabs) {
+    Tree.detachTab(tab, options);
+    Tree.collapseExpandTabAndSubtree(tab, {
+      ...options,
+      collapsed: false
+    });
+  }
+}
+
+export async function moveUp(tab, options = {}) {
+  const previousTab = tab.$TST.nearestVisiblePrecedingTab;
+  if (!previousTab)
+    return false;
+  const moved = await moveBefore(tab, {
+    ...options,
+    referenceTabId: previousTab.id
+  });
+  if (moved && !options.followChildren)
+    await onMoveUp.dispatch(tab);
+  return moved;
+}
+
+export async function moveDown(tab, options = {}) {
+  const nextTab = options.followChildren ? tab.$TST.nearestFollowingForeignerTab : tab.$TST.nearestVisibleFollowingTab;
+  if (!nextTab)
+    return false;
+  const moved = await moveAfter(tab, {
+    ...options,
+    referenceTabId: nextTab.id
+  });
+  if (moved && !options.followChildren)
+    await onMoveDown.dispatch(tab);
+  return moved;
+}
+
+export async function moveBefore(tab, options = {}) {
+  const insertBefore = Tab.get(options.referenceTabId || options.referenceTab) || null;
+  if (!insertBefore)
+    return false;
+
+  if (!options.followChildren) {
+    Tree.detachAllChildren(tab, {
+      broadcast: true,
+      behavior:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD
+    });
+    await TabsMove.moveTabBefore(
+      tab,
+      insertBefore,
+      { broadcast: true }
+    );
+  }
+  else {
+    const referenceTabs = TreeBehavior.calculateReferenceItemsFromInsertionPosition(tab, {
+      context: Constants.kINSERTION_CONTEXT_MOVED,
+      insertBefore
+    });
+    if (!referenceTabs.insertBefore &&
+        !referenceTabs.insertAfter)
+      return false;
+    await moveTabsWithStructure([tab].concat(tab.$TST.descendants), {
+      attachTo:     referenceTabs.parent,
+      insertBefore: referenceTabs.insertBefore,
+      insertAfter:  referenceTabs.insertAfter,
+      broadcast:    true
+    });
+  }
+  return true;
+}
+
+export async function moveAfter(tab, options = {}) {
+  const insertAfter = Tab.get(options.referenceTabId || options.referenceTab) || null;
+  if (!insertAfter)
+    return false;
+
+  if (!options.followChildren) {
+    Tree.detachAllChildren(tab, {
+      broadcast: true,
+      behavior:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD
+    });
+    await TabsMove.moveTabAfter(
+      tab,
+      insertAfter,
+      { broadcast: true }
+    );
+  }
+  else {
+    const referenceTabs = TreeBehavior.calculateReferenceItemsFromInsertionPosition(tab, {
+      context: Constants.kINSERTION_CONTEXT_MOVED,
+      insertAfter
+    });
+    if (!referenceTabs.insertBefore && !referenceTabs.insertAfter)
+      return false;
+    await moveTabsWithStructure([tab].concat(tab.$TST.descendants), {
+      attachTo:     referenceTabs.parent,
+      insertBefore: referenceTabs.insertBefore,
+      insertAfter:  referenceTabs.insertAfter,
+      broadcast:    true
+    });
+  }
+  return true;
+}
+
+
+/* commands to simulate Firefox's native tab cocntext menu */
+
+export async function unloadTabs(tabs) {
+  tabs = filterUnloadableTabs(tabs);
+  if (tabs.length == 0) {
+    return;
+  }
+  if (tabs.some(tab => tab.active)) {
+    await TabsInternalOperation.blurTab(tabs, { keepDiscarded: true });
+  }
+  return browser.tabs.discard(tabs.map(tab => tab.id));
+}
+
+// Only remote browsers can be unloadable.
+// See also:
+//   https://searchfox.org/mozilla-central/rev/b7b6aa5e8ffc27bc70d4c129c95adc5921766b93/browser/components/tabbrowser/content/tabbrowser.js#1983
+//   https://searchfox.org/mozilla-central/rev/b7b6aa5e8ffc27bc70d4c129c95adc5921766b93/toolkit/modules/E10SUtils.sys.mjs#394
+export function filterUnloadableTabs(tabs) {
+  return tabs.filter(tab => !/^(about|chrome):/i.test(tab.url));
+}
+
+export async function duplicateTab(sourceTab, options = {}) {
+  /*
+    Due to difference between Firefox's "duplicate tab" implementation,
+    TST sometimes fails to detect duplicated tabs based on its
+    session information. Thus we need to duplicate as an internally
+    duplicated tab. For more details, see also:
+    https://github.com/piroor/treestyletab/issues/1437#issuecomment-334952194
+  */
+  const isMultiselected = options.multiselected === false ? false : sourceTab.$TST.multiselected;
+  const sourceTabs = isMultiselected ? Tab.getSelectedTabs(sourceTab.windowId) : [sourceTab];
+  log('source tabs: ', sourceTabs);
+  const duplicatedTabs = await Tree.moveTabs(sourceTabs, {
+    duplicate:           true,
+    destinationWindowId: options.destinationWindowId || sourceTabs[0].windowId,
+    insertAfter:         sourceTabs[sourceTabs.length-1]
+  });
+  await Tree.behaveAutoAttachedTabs(duplicatedTabs, {
+    baseTabs:  sourceTabs,
+    behavior:  typeof options.behavior == 'number' ? options.behavior : configs.autoAttachOnDuplicated,
+    broadcast: true
+  });
+  return duplicatedTabs;
+}
+
+export async function moveTabToStart(tab, options = {}) {
+  const isMultiselected = options.multiselected === false ? false : tab.$TST.multiselected;
+  return moveTabsToStart(isMultiselected ? Tab.getSelectedTabs(tab.windowId) : [tab].concat(tab.$TST.descendants));
+}
+
+export async function moveTabsToStart(movedTabs) {
+  if (movedTabs.length === 0)
+    return;
+  const tab       = movedTabs[0];
+  const allTabs   = tab.pinned ? Tab.getPinnedTabs(tab.windowId) : Tab.getUnpinnedTabs(tab.windowId);
+  const movedTabsSet = new Set(movedTabs);
+  let firstOtherTab;
+  for (const tab of allTabs) {
+    if (movedTabsSet.has(tab))
+      continue;
+    firstOtherTab = tab;
+    break;
+  }
+  if (firstOtherTab)
+    await moveTabsWithStructure(movedTabs, {
+      insertBefore: firstOtherTab,
+      broadcast:    true
+    });
+}
+
+export async function moveTabToEnd(tab, options = {}) {
+  const isMultiselected = options.multiselected === false ? false : tab.$TST.multiselected;
+  return moveTabsToEnd(isMultiselected ? Tab.getSelectedTabs(tab.windowId) : [tab].concat(tab.$TST.descendants));
+}
+
+export async function moveTabsToEnd(movedTabs) {
+  if (movedTabs.length === 0)
+    return;
+  const tab       = movedTabs[0];
+  const allTabs   = tab.pinned ? Tab.getPinnedTabs(tab.windowId) : Tab.getUnpinnedTabs(tab.windowId);
+  const movedTabsSet = new Set(movedTabs);
+  let lastOtherTabs;
+  for (let i = allTabs.length - 1; i > -1; i--) {
+    const tab = allTabs[i];
+    if (movedTabsSet.has(tab))
+      continue;
+    lastOtherTabs = tab;
+    break;
+  }
+  if (lastOtherTabs)
+    await moveTabsWithStructure(movedTabs, {
+      insertAfter: lastOtherTabs,
+      broadcast:   true
+    });
+}
+
+export async function openTabInWindow(tab, options = {}) {
+  if (options.multiselected !== false && tab.$TST.multiselected) {
+    return openTabsInWindow(Tab.getSelectedTabs(tab.windowId));
+  }
+  else if (options.withTree) {
+    return openTabsInWindow([tab, ...tab.$TST.descendants]);
+  }
+  else {
+    const sourceWindow = await browser.windows.get(tab.windowId);
+    const sourceParams = getWindowParamsFromSource(sourceWindow, options);
+    const windowParams = {
+      //active: true,  // not supported in Firefox...
+      tabId:     tab.id,
+      ...sourceParams,
+      left: sourceParams.left + 20,
+      top:  sourceParams.top + 20,
+    };
+    const win = await browser.windows.create(windowParams).catch(ApiTabs.createErrorHandler());
+    return win.id;
+  }
+}
+
+export async function openTabsInWindow(tabs) {
+  const movedTabs = await Tree.openNewWindowFromTabs(tabs);
+  return movedTabs.length > 0 ? movedTabs[0].windowId : null;
+}
+
+
+export async function restoreTabs(count) {
+  const toBeRestoredTabSessions = (await browser.sessions.getRecentlyClosed({
+    maxResults: browser.sessions.MAX_SESSION_RESULTS
+  }).catch(ApiTabs.createErrorHandler())).filter(session => session.tab).slice(0, count);
+  log('restoreTabs: toBeRestoredTabSessions = ', toBeRestoredTabSessions);
+  const promisedRestoredTabs = [];
+  for (const session of toBeRestoredTabSessions.reverse()) {
+    log('restoreTabs: Tabrestoring session = ', session);
+    promisedRestoredTabs.push(Tab.doAndGetNewTabs(async () => {
+      browser.sessions.restore(session.tab.sessionId).catch(ApiTabs.createErrorSuppressor());
+      await Tab.waitUntilTrackedAll();
+    }));
+  }
+  const restoredTabs = Array.from(new Set((await Promise.all(promisedRestoredTabs)).flat()));
+  log('restoreTabs: restoredTabs = ', restoredTabs);
+  await Promise.all(restoredTabs.map(tab => tab && Tab.get(tab.id).$TST.opened));
+
+  if (restoredTabs.length > 0) {
+    // Parallelly restored tabs can have ghost "active" state, so we need to clear them
+    const activeTab = Tab.getActiveTab(restoredTabs[0].windowId);
+    if (restoredTabs.some(tab => tab.id == activeTab.id))
+      await TabsInternalOperation.setTabActive(activeTab);
+  }
+
+  return TreeItem.sort(restoredTabs);
+}
+
+
+export async function bookmarkTab(tab, options = {}) {
+  if (options.multiselected !== false && tab.$TST.multiselected)
+    return bookmarkTabs(Tab.getSelectedTabs(tab.windowId));
+
+  if (configs.showDialogInSidebar &&
+      SidebarConnection.isOpen(tab.windowId)) {
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_BOOKMARK_TAB_WITH_DIALOG,
+      windowId: tab.windowId,
+      tabId:    tab.id
+    });
+  }
+  else {
+    Bookmark.bookmarkTab(tab, {
+      showDialog: true
+    });
+  }
+}
+
+export async function bookmarkTabs(tabs) {
+  if (tabs.length == 0)
+    return;
+  if (configs.showDialogInSidebar &&
+      SidebarConnection.isOpen(tabs[0].windowId)) {
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_BOOKMARK_TABS_WITH_DIALOG,
+      windowId: tabs[0].windowId,
+      tabIds:   tabs.map(tab => tab.id)
+    });
+  }
+  else {
+    Bookmark.bookmarkTabs(tabs, {
+      showDialog: true
+    });
+  }
+}
+
+export async function reopenInContainer(sourceTabOrTabs, cookieStoreId, options = {}) {
+  let sourceTabs;
+  if (Array.isArray(sourceTabOrTabs)) {
+    sourceTabs = sourceTabOrTabs;
+  }
+  else {
+    const isMultiselected = options.multiselected === false ? false : sourceTabOrTabs.$TST.multiselected;
+    sourceTabs = isMultiselected ? Tab.getSelectedTabs(sourceTabOrTabs.windowId) : [sourceTabOrTabs];
+  }
+  if (sourceTabs.length === 0)
+    return [];
+  const tabs = await TabsOpen.openURIsInTabs(sourceTabs.map(tab => tab.url), {
+    isOrphan: true,
+    windowId: sourceTabs[0].windowId,
+    cookieStoreId
+  });
+  await Tree.behaveAutoAttachedTabs(tabs, {
+    baseTabs:  sourceTabs,
+    behavior:  configs.autoAttachOnDuplicated,
+    broadcast: true
+  });
+  return tabs;
+}
+
+
+SidebarConnection.onMessage.addListener(async (windowId, message) => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NEW_TAB_AS: {
+      const baseTab = Tab.get(message.baseTabId);
+      if (baseTab)
+        openNewTabAs({
+          baseTab,
+          as:            message.as,
+          cookieStoreId: message.cookieStoreId,
+          inBackground:  message.inBackground,
+          url:           message.url,
+        });
+    }; break;
+
+    case Constants.kCOMMAND_PERFORM_TABS_DRAG_DROP:
+      performTreeItemsDragDropWithMessage(message);
+      break;
+
+    case Constants.kCOMMAND_TOGGLE_MUTED_FROM_SOUND_BUTTON: {
+      await Tab.waitUntilTracked(message.tabId);
+      const root = Tab.get(message.tabId);
+      log('toggle muted state from sound button: ', message, root);
+      if (!root)
+        break;
+
+      const multiselected = root.$TST.multiselected;
+      const tabs = multiselected ?
+        Tab.getSelectedTabs(root.windowId, { iterator: true }) :
+        [root] ;
+      const toBeMuted = (!multiselected && root.$TST.subtreeCollapsed) ?
+        !root.$TST.maybeMuted :
+        !root.$TST.muted ;
+
+      log('  toBeMuted: ', toBeMuted);
+      if (!multiselected &&
+          root.$TST.subtreeCollapsed) {
+        const tabsInTree = [root, ...root.$TST.descendants];
+        let toBeUpdatedTabs = tabsInTree.filter(tab =>
+          // The "audible" possibly become "false" when the tab is
+          // really audible but muted.
+          // However, we can think more simply and robustly.
+          //  - We need to mute "audible" tabs.
+          //  - We need to unmute "muted" tabs.
+          // So, tabs which any of "audible" or "muted" is "true"
+          // have enough reason to be updated.
+          (tab.audible || tab.mutedInfo.muted) &&
+            // And we really need to update only tabs not been the
+            // expected state.
+            (tab.$TST.muted != toBeMuted)
+        );
+        // but if there is no target tab, we should update all of the tab and descendants.
+        if (toBeUpdatedTabs.length == 0)
+          toBeUpdatedTabs = tabsInTree.filter(tab =>
+            tab.$TST.muted != toBeMuted
+          );
+        log('  toBeUpdatedTabs: ', toBeUpdatedTabs);
+        for (const tab of toBeUpdatedTabs) {
+          browser.tabs.update(tab.id, {
+            muted: toBeMuted
+          }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+      else {
+        log('  tabs: ', tabs);
+        for (const tab of tabs) {
+          browser.tabs.update(tab.id, {
+            muted: toBeMuted
+          }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+    }; break;
+
+    case Constants.kCOMMAND_TOGGLE_STICKY:
+      toggleSticky([Tab.get(message.tabId)]);
+      return;
+
+    case Constants.kCOMMAND_NEW_WINDOW_FROM_NATIVE_TAB_GROUP:
+      NativeTabGroups.moveGroupToNewWindow(message);
+      return;
+  }
+});
+
+browser.runtime.onMessage.addListener((message, sender) => {
+  switch (message.type) {
+    // for automated tests
+    case Constants.kCOMMAND_PERFORM_TABS_DRAG_DROP:
+      performTreeItemsDragDropWithMessage(message);
+      break;
+
+    case Constants.kCOMMAND_UPDATE_NATIVE_TAB_GROUP: {
+      const updates = {};
+      if ('title' in message) {
+        updates.title = message.title;
+      }
+      if ('color' in message) {
+        updates.color = message.color;
+      }
+      browser.tabGroups.update(message.groupId, updates);
+    }; break;
+
+    case Constants.kCOMMAND_INVOKE_NATIVE_TAB_GROUP_MENU_PANEL_COMMAND:
+      switch (message.command) {
+        case 'addNewTabInGroup': (async () => {
+          const windowId = message.windowId || sender.tab?.windowId;
+          const lastMember = TabGroup.getLastMember(message.groupId);
+          const tab = await TabsOpen.openNewTab({
+            insertAfter:  lastMember.$TST?.lastDescendant || lastMember,
+            windowId,
+            inBackground: false,
+          });
+          NativeTabGroups.addTabsToGroup([tab], message.groupId);
+        })(); break;
+
+        case 'moveGroupToNewWindow':
+          NativeTabGroups.moveGroupToNewWindow({
+            windowId: message.windowId || sender.tab?.windowId,
+            groupId:  message.groupId,
+          });
+          break;
+
+        case 'saveAndCloseGroup':
+        case 'deleteGroup': (async () => {
+          const windowId = message.windowId || sender.tab?.windowId;
+          const members = TabGroup.getMembers(message.groupId);
+          const canceled = (await browser.runtime.sendMessage({
+            type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+            tabs: members.map(tab => tab.$TST.sanitized),
+            windowId,
+          }).catch(ApiTabs.createErrorHandler())) === false;
+          if (canceled)
+            return;
+          TabsInternalOperation.removeTabs(members);
+        })(); break;
+
+        case 'ungroupTabs':
+        case 'cancel': {
+          const members = TabGroup.getMembers(message.groupId);
+          NativeTabGroups.removeTabsFromGroup(members);
+        }; break;
+
+        case 'done':
+          break;
+      }
+      break;
+  }
+});
+
+
+async function collectBookmarkItems(root, { recursively,  grouped } = {}) {
+  let items = await browser.bookmarks.getChildren(root.id);
+  if (recursively) {
+    let expandedItems = [];
+    for (const item of items) {
+      switch (item.type) {
+        case 'bookmark':
+          expandedItems.push(item);
+          break;
+        case 'folder':
+          expandedItems = expandedItems.concat(await collectBookmarkItems(item, { recursively }));
+          break;
+      }
+    }
+    items = expandedItems;
+  }
+  else {
+    items = items.filter(item => item.type == 'bookmark');
+  }
+  if (grouped ||
+      countMatched(items, item => !Bookmark.BOOKMARK_TITLE_DESCENDANT_MATCHER.test(item.title)) > 1) {
+    for (const item of items) {
+      item.title = Bookmark.BOOKMARK_TITLE_DESCENDANT_MATCHER.test(item.title) ?
+        item.title.replace(Bookmark.BOOKMARK_TITLE_DESCENDANT_MATCHER, '>$1 ') :
+        `> ${item.title}`;
+    }
+    items.unshift({
+      title: '',
+      url:   TabsGroup.makeGroupTabURI({
+        title: root.title,
+        ...TabsGroup.temporaryStateParams(configs.groupTabTemporaryStateForNewTabsFromBookmarks),
+      }),
+      group: true,
+      discarded: false,
+    });
+  }
+  return items;
+}
+
+export async function openBookmarksWithStructure(items, { activeIndex = 0, discarded } = {}) {
+  if (typeof discarded == 'undefined')
+    discarded = configs.openAllBookmarksWithStructureDiscarded;
+
+  const structure = Bookmark.getTreeStructureFromBookmarks(items);
+
+  const windowId = TabsStore.getCurrentWindowId() || (await browser.windows.getCurrent()).id;
+  const tabs = await TabsOpen.openURIsInTabs(
+    // we need to isolate it - unexpected parameter like "index" will break the behavior.
+    items.map(bookmark => ({
+      url:           bookmark.url,
+      title:         bookmark.title,
+      cookieStoreId: bookmark.cookieStoreId,
+    })),
+    {
+      windowId,
+      isOrphan:     true,
+      inBackground: true,
+      fixPositions: true,
+      discarded,
+    }
+  );
+
+  if (tabs.length > activeIndex)
+    TabsInternalOperation.activateTab(tabs[activeIndex]);
+  if (tabs.length == structure.length)
+    await Tree.applyTreeStructureToTabs(tabs, structure);
+
+  // tabs can be opened at middle of an existing tree due to browser.tabs.insertAfterCurrent=true
+  const referenceTabs = TreeBehavior.calculateReferenceItemsFromInsertionPosition(tabs, {
+    context:      Constants.kINSERTION_CONTEXT_CREATED,
+    insertAfter:  tabs[0].$TST.previousTab,
+    insertBefore: tabs[tabs.length - 1].$TST.nextTab
+  });
+  if (referenceTabs.parent)
+    await Tree.attachTabTo(tabs[0], referenceTabs.parent, {
+      insertAfter:  referenceTabs.insertAfter,
+      insertBefore: referenceTabs.insertBefore
+    });
+}
+
+export async function openAllBookmarksWithStructure(id, { discarded, recursively, grouped } = {}) {
+  if (typeof discarded == 'undefined')
+    discarded = configs.openAllBookmarksWithStructureDiscarded;
+  if (typeof grouped == 'undefined')
+    grouped = !configs.suppressGroupTabForStructuredTabsFromBookmarks;
+
+  let item = await browser.bookmarks.get(id);
+  if (Array.isArray(item))
+    item = item[0];
+  if (!item)
+    return;
+
+  if (item.type != 'folder') {
+    item = await browser.bookmarks.get(item.parentId);
+    if (Array.isArray(item))
+      item = item[0];
+  }
+
+  const items = await collectBookmarkItems(item, {
+    recursively,
+    grouped,
+  });
+  const activeIndex = items.findIndex(item => !item.group);
+
+  openBookmarksWithStructure(items, { activeIndex, discarded });
+}
diff --git a/waterfox/browser/components/sidebar/background/context-menu.js b/waterfox/browser/components/sidebar/background/context-menu.js
new file mode 100644
index 0000000000000..75c86f7da7e78
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/context-menu.js
@@ -0,0 +1,764 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+} from '/common/common.js';
+
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as Sync from '/common/sync.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Commands from './commands.js';
+import * as TabContextMenu from './tab-context-menu.js';
+
+function log(...args) {
+  internalLogger('background/context-menu', ...args);
+}
+
+export async function init() {
+  return Promise.all([
+    addTabItems(),
+    addBookmarkItems(),
+  ]);
+}
+
+const SAFE_CREATE_PROPERTIES = [
+  'checked',
+  'contexts',
+  'documentUrlPatterns',
+  'enabled',
+  'icons',
+  'id',
+  'parentId',
+  'title',
+  'type',
+  'viewTypes',
+  'visible'
+];
+
+function getSafeCreateParams(params) {
+  const safeParams = {};
+  for (const property of SAFE_CREATE_PROPERTIES) {
+    if (property in params)
+      safeParams[property] = params[property];
+  }
+  return safeParams;
+}
+
+const manifest = browser.runtime.getManifest();
+
+const kROOT_TAB_ITEM = 'ws';
+const kROOT_BOOKMARK_ITEM = 'ws-bookmark';
+
+const mTabItemsById = {
+  'reloadTree': {
+    title:              browser.i18n.getMessage('context_reloadTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_reloadTree_label_multiselected')
+  },
+  'reloadDescendants': {
+    title:              browser.i18n.getMessage('context_reloadDescendants_label'),
+    titleMultiselected: browser.i18n.getMessage('context_reloadDescendants_label_multiselected')
+  },
+  // This item won't be handled by the onClicked handler, so you may need to handle it with something experiments API.
+  'unblockAutoplayTree': {
+    title:                browser.i18n.getMessage('context_unblockAutoplayTree_label'),
+    titleMultiselected:   browser.i18n.getMessage('context_unblockAutoplayTree_label_multiselected'),
+    requireAutoplayBlockedTab: true,
+  },
+  // This item won't be handled by the onClicked handler, so you may need to handle it with something experiments API.
+  'unblockAutoplayDescendants': {
+    title:                browser.i18n.getMessage('context_unblockAutoplayDescendants_label'),
+    titleMultiselected:   browser.i18n.getMessage('context_unblockAutoplayDescendants_label_multiselected'),
+    requireAutoplayBlockedDescendant: true,
+  },
+  'toggleMuteTree': {
+    titleMuteTree:                browser.i18n.getMessage('context_toggleMuteTree_label_mute'),
+    titleMultiselectedMuteTree:   browser.i18n.getMessage('context_toggleMuteTree_label_multiselected_mute'),
+    titleUnmuteTree:              browser.i18n.getMessage('context_toggleMuteTree_label_unmute'),
+    titleMultiselectedUnmuteTree: browser.i18n.getMessage('context_toggleMuteTree_label_multiselected_unmute')
+  },
+  'toggleMuteDescendants': {
+    titleMuteDescendant:                browser.i18n.getMessage('context_toggleMuteDescendants_label_mute'),
+    titleMultiselectedMuteDescendant:   browser.i18n.getMessage('context_toggleMuteDescendants_label_multiselected_mute'),
+    titleUnmuteDescendant:              browser.i18n.getMessage('context_toggleMuteDescendants_label_unmute'),
+    titleMultiselectedUnmuteDescendant: browser.i18n.getMessage('context_toggleMuteDescendants_label_multiselected_unmute')
+  },
+  'separatorAfterReload': {
+    type: 'separator'
+  },
+  'closeTree': {
+    title:              browser.i18n.getMessage('context_closeTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeTree_label_multiselected')
+  },
+  'closeDescendants': {
+    title:              browser.i18n.getMessage('context_closeDescendants_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeDescendants_label_multiselected'),
+    requireTree:        true,
+  },
+  'closeOthers': {
+    title:              browser.i18n.getMessage('context_closeOthers_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeOthers_label_multiselected')
+  },
+  'separatorAfterClose': {
+    type: 'separator'
+  },
+  'toggleSticky': {
+    titleStick:                browser.i18n.getMessage('context_toggleSticky_label_stick'),
+    titleMultiselectedStick:   browser.i18n.getMessage('context_toggleSticky_label_multiselected_stick'),
+    titleUnstick:              browser.i18n.getMessage('context_toggleSticky_label_unstick'),
+    titleMultiselectedUnstick: browser.i18n.getMessage('context_toggleSticky_label_multiselected_unstick'),
+    requireNormal: true,
+  },
+  'separatorAfterToggleSticky': {
+    type: 'separator'
+  },
+  'collapseTree': {
+    title:              browser.i18n.getMessage('context_collapseTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_collapseTree_label_multiselected'),
+    requireTree: true,
+  },
+  'collapseTreeRecursively': {
+    title:              browser.i18n.getMessage('context_collapseTreeRecursively_label'),
+    titleMultiselected: browser.i18n.getMessage('context_collapseTreeRecursively_label_multiselected'),
+    requireTree:        true,
+  },
+  'collapseAll': {
+    title:               browser.i18n.getMessage('context_collapseAll_label'),
+    hideOnMultiselected: true
+  },
+  'expandTree': {
+    title:              browser.i18n.getMessage('context_expandTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_expandTree_label_multiselected'),
+    requireTree:       true,
+  },
+  'expandTreeRecursively': {
+    title:              browser.i18n.getMessage('context_expandTreeRecursively_label'),
+    titleMultiselected: browser.i18n.getMessage('context_expandTreeRecursively_label_multiselected'),
+    requireTree:        true,
+  },
+  'expandAll': {
+    title:               browser.i18n.getMessage('context_expandAll_label'),
+    hideOnMultiselected: true
+  },
+  'separatorAfterCollapseExpand': {
+    type: 'separator'
+  },
+  'bookmarkTree': {
+    title:              browser.i18n.getMessage('context_bookmarkTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_bookmarkTree_label_multiselected')
+  },
+  'sendTreeToDevice': {
+    title:              browser.i18n.getMessage('context_sendTreeToDevice_label'),
+    titleMultiselected: browser.i18n.getMessage('context_sendTreeToDevice_label_multiselected')
+  },
+  'separatorAfterBookmark': {
+    type: 'separator'
+  },
+  'collapsed': {
+    title:       browser.i18n.getMessage('context_collapsed_label'),
+    requireTree: true,
+    type:        'checkbox'
+  },
+  'pinnedTab': {
+    title: browser.i18n.getMessage('context_pinnedTab_label'),
+    type: 'radio'
+  },
+  'unpinnedTab': {
+    title: browser.i18n.getMessage('context_unpinnedTab_label'),
+    type: 'radio'
+  }
+};
+const mTabItems = [];
+const mGroupedTabItems = [];
+const mGroupedTabItemsById = {};
+for (const id of Object.keys(mTabItemsById)) {
+  const item = mTabItemsById[id];
+  item.id = id;
+  item.configKey = `context_${id}`;
+  item.checked = false; // initialize as unchecked
+  item.enabled = true;
+  // Access key is not supported by WE API.
+  // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=1320462
+  item.titleWithoutAccesskey = item.title?.replace(/\(&[a-z]\)|&([a-z])/i, '$1');
+  item.titleMultiselectedWithoutAccesskey = item.titleMultiselected?.replace(/\(&[a-z]\)|&([a-z])/i, '$1');
+  item.type = item.type || 'normal';
+  item.contexts = ['tab'];
+  item.lastVisible = item.visible = false;
+  item.lastTitle = item.title;
+  mTabItems.push(item);
+
+  const groupedItem = {
+    ...item,
+    id:       `grouped:${id}`,
+    parentId: kROOT_TAB_ITEM
+  };
+  mGroupedTabItems.push(groupedItem);
+  mGroupedTabItemsById[groupedItem.id] = groupedItem;
+}
+
+const mTabSeparator = {
+  id:        `separatprBefore${kROOT_TAB_ITEM}`,
+  type:      'separator',
+  contexts:  ['tab'],
+  viewTypes: ['sidebar'],
+  documentUrlPatterns: [`moz-extension://${location.host}/*`],
+  visible:   false,
+  lastVisible: false
+};
+const mTabRootItem = {
+  id:       kROOT_TAB_ITEM,
+  type:     'normal',
+  contexts: ['tab'],
+  title:    browser.i18n.getMessage('context_menu_label'),
+  icons:    manifest.icons,
+  visible:  false,
+  lastVisible: false
+};
+
+const mAllTabItems = [
+  mTabSeparator,
+  mTabRootItem,
+  ...mTabItems,
+  ...mGroupedTabItems
+];
+
+function addTabItems() {
+  const promises = [];
+  if (addTabItems.done) {
+    for (const item of mAllTabItems) {
+      promises.push(browser.menus.remove(item.id));
+    }
+  }
+
+  for (const item of mAllTabItems) {
+    const params = getSafeCreateParams(item);
+    promises.push(browser.menus.create(params));
+    if (item.id == mTabSeparator.id ||
+        addTabItems.done)
+      continue;
+    promises.push(TabContextMenu.onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params
+    }, browser.runtime));
+  }
+
+  addTabItems.done = true;
+  return Promise.all(promises);
+}
+addTabItems.done = false;
+
+
+const mBookmarkItemsById = {
+  openAllBookmarksWithStructure: {
+    title: browser.i18n.getMessage('context_openAllBookmarksWithStructure_label')
+  },
+  openAllBookmarksWithStructureRecursively: {
+    title: browser.i18n.getMessage('context_openAllBookmarksWithStructureRecursively_label')
+  }
+};
+const mBookmarkItems = [];
+const mGroupedBookmarkItems = []
+for (const id of Object.keys(mBookmarkItemsById)) {
+  const item = mBookmarkItemsById[id];
+  item.id        = id;
+  item.contexts  = ['bookmark'];
+  item.configKey = `context_${id}`;
+  const groupedItem = {
+    ...item,
+    id:            `grouped:${id}`,
+    parentId:      kROOT_BOOKMARK_ITEM,
+    ungroupedItem: item
+  };
+  item.icons = manifest.icons;
+
+  mBookmarkItems.push(item);
+
+  mBookmarkItemsById[groupedItem.id] = groupedItem;
+  mGroupedBookmarkItems.push(groupedItem);
+}
+
+const mBookmarkSeparator = {
+  id:        `separatprBefore${kROOT_BOOKMARK_ITEM}`,
+  type:      'separator',
+  contexts:  ['bookmark'],
+  viewTypes: ['sidebar'],
+  documentUrlPatterns: [`moz-extension://${location.host}/*`],
+  visible:   false,
+  lastVisible: false
+};
+const mBookmarkRootItem = {
+  id:       kROOT_BOOKMARK_ITEM,
+  type:     'normal',
+  contexts: ['bookmark'],
+  title:    manifest.name,
+  icons:    manifest.icons,
+  visible:  false,
+  lastVisible: false
+};
+
+const mAllBookmarkItems = [
+  mBookmarkSeparator,
+  mBookmarkRootItem,
+  ...mBookmarkItems,
+  ...mGroupedBookmarkItems
+];
+
+function addBookmarkItems() {
+  const promises = [];
+  if (addBookmarkItems.done) {
+    for (const item of mAllBookmarkItems) {
+      promises.push(browser.menus.remove(item.id));
+    }
+  }
+  for (const item of mAllBookmarkItems) {
+    promises.push(browser.menus.create(getSafeCreateParams(item)));
+  }
+  addBookmarkItems.done = true;
+  return Promise.all(promises);
+}
+addBookmarkItems.done = false;
+
+
+// Re-register items to put them after
+// top level items added by other addons.
+TabContextMenu.onTopLevelItemAdded.addListener(reserveToRefreshItems);
+
+function reserveToRefreshItems() {
+  if (reserveToRefreshItems.invoked)
+    return;
+  reserveToRefreshItems.invoked = true;
+  setTimeout(() => { // because window.requestAnimationFrame is decelerate for an invisible document.
+    reserveToRefreshItems.invoked = false;
+    addTabItems();
+    addBookmarkItems();
+  }, 0);
+}
+
+function updateItem(id, params) {
+  log('updateItem ', id, params);
+  browser.menus.update(id, params).catch(ApiTabs.createErrorSuppressor());
+  TabContextMenu.onMessageExternal({
+    type:   TSTAPI.kCONTEXT_MENU_UPDATE,
+    params: [id, params]
+  }, browser.runtime);
+}
+
+function updateItemsVisibility(items, { forceVisible = null, multiselected = false, hasUnmutedTab = false, hasUnmutedDescendant = false, hasAutoplayBlockedTab = false, hasAutoplayBlockedDescendant = false, sticky = false, hidden = false } = {}) {
+  log('updateItemsVisibility ', items, { forceVisible, multiselected, hasUnmutedTab, hasUnmutedDescendant, hasAutoplayBlockedTab, hasAutoplayBlockedDescendant, sticky });
+  let updated = false;
+  let visibleItemsCount = 0;
+  let visibleNormalItemsCount = 0;
+  let lastSeparator;
+  for (const item of items) {
+    if (item.type == 'separator') {
+      if (lastSeparator) {
+        if (lastSeparator.lastVisible) {
+          updateItem(lastSeparator.id, { visible: false });
+          lastSeparator.lastVisible = false;
+          updated = true;
+        }
+      }
+      lastSeparator = item;
+    }
+    else {
+      const title = Commands.getMenuItemTitle(item, { multiselected, hasUnmutedTab, hasUnmutedDescendant, sticky });
+      let visible = !hidden && (!(item.configKey in configs) || configs[item.configKey] || false);
+      log('checking ', item.id, {
+        config: visible,
+        multiselected: item.hideOnMultiselected && multiselected,
+        lastVisible: item.lastVisible,
+        forceVisible,
+      });
+      if (forceVisible !== null && forceVisible !== undefined)
+        visible = forceVisible;
+      if ((item.hideOnMultiselected && multiselected) ||
+          (item.requireAutoplayBlockedTab && !hasAutoplayBlockedTab) ||
+          (item.requireAutoplayBlockedDescendant && !hasAutoplayBlockedDescendant))
+        visible = false;
+      if (visible) {
+        if (lastSeparator) {
+          updateItem(lastSeparator.id, { visible: visibleNormalItemsCount > 0 });
+          lastSeparator.lastVisible = true;
+          lastSeparator = null;
+          updated = true;
+          visibleNormalItemsCount = 0;
+        }
+        visibleNormalItemsCount++;
+        visibleItemsCount++;
+      }
+      const updatedParams = {};
+      if (visible !== item.lastVisible) {
+        updatedParams.visible = visible;
+        item.lastVisible = visible;
+      }
+      if (title !== item.lastTitle) {
+        updatedParams.title = title;
+        item.lastTitle = title;
+      }
+      if (Object.keys(updatedParams).length == 0)
+        continue;
+      updateItem(item.id, updatedParams);
+      updated = true;
+    }
+  }
+  if (lastSeparator?.lastVisible) {
+    updateItem(lastSeparator.id, { visible: false });
+    lastSeparator.lastVisible = false;
+    updated = true;
+  }
+  return { updated, visibleItemsCount };
+}
+
+async function updateItems({ multiselected, hasUnmutedTab, hasUnmutedDescendant, hasAutoplayBlockedTab, hasAutoplayBlockedDescendant, sticky, hidden } = {}) {
+  let updated = false;
+
+  const groupedItems = updateItemsVisibility(mGroupedTabItems, { multiselected, hasUnmutedTab, hasUnmutedDescendant, hasAutoplayBlockedTab, hasAutoplayBlockedDescendant, sticky, hidden });
+  if (groupedItems.updated)
+    updated = true;
+
+  const separatorVisible = !hidden && configs.emulateDefaultContextMenu && groupedItems.visibleItemsCount > 0;
+  if (separatorVisible != mTabSeparator.lastVisible) {
+    updateItem(mTabSeparator.id, { visible: separatorVisible });
+    mTabSeparator.lastVisible = separatorVisible;
+    updated = true;
+  }
+
+  const grouped = !hidden && configs.emulateDefaultContextMenu && groupedItems.visibleItemsCount > 1;
+  if (grouped != mTabRootItem.lastVisible) {
+    updateItem(mTabRootItem.id, { visible: grouped });
+    mTabRootItem.lastVisible = grouped;
+    updated = true;
+  }
+
+  const topLevelItems = updateItemsVisibility(mTabItems, { forceVisible: grouped ? false : null, multiselected, hasUnmutedTab, hasUnmutedDescendant, hasAutoplayBlockedTab, hasAutoplayBlockedDescendant, sticky, hidden });
+  if (topLevelItems.updated)
+    updated = true;
+
+  if (mGroupedTabItemsById['grouped:sendTreeToDevice'].lastVisible &&
+      await TabContextMenu.updateSendToDeviceItems('grouped:sendTreeToDevice', {
+        manage: navigator.userAgent.includes('Fennec'), // see also https://github.com/piroor/treestyletab/issues/3174
+      }))
+    updated = true;
+
+  return updated;
+}
+
+export function onClick(info, tab) {
+  if (info.bookmarkId)
+    return onBookmarkItemClick(info);
+  else
+    return onTabItemClick(info, tab);
+}
+browser.menus.onClicked.addListener(onClick);
+
+function onTabItemClick(info, tab) {
+  // Extra context menu commands won't be available on the blank area of the tab bar.
+  if (!tab)
+    return;
+
+  log('context menu item clicked: ', info, tab);
+
+  const contextTab = Tab.get(tab.id);
+  const contextTabs = contextTab.$TST.multiselected ? Tab.getSelectedTabs(contextTab.windowId) : [contextTab];
+
+  const itemId = info.menuItemId.replace(/^(?:grouped:|context_topLevel_)/, '');
+  if (mTabItemsById[itemId] &&
+      mTabItemsById[itemId].type == 'checkbox')
+    mTabItemsById[itemId].checked = !mTabItemsById[itemId].checked;
+
+  const inverted = info.button == 1;
+  switch (itemId) {
+    case 'reloadTree':
+      if (inverted)
+        Commands.reloadDescendants(contextTabs);
+      else
+        Commands.reloadTree(contextTabs);
+      break;
+    case 'reloadDescendants':
+      if (inverted)
+        Commands.reloadTree(contextTabs);
+      else
+        Commands.reloadDescendants(contextTabs);
+      break;
+
+    case 'toggleMuteTree':
+      if (inverted)
+        Commands.toggleMuteDescendants(contextTabs);
+      else
+        Commands.toggleMuteTree(contextTabs);
+      break;
+    case 'toggleMuteDescendants':
+      if (inverted)
+        Commands.toggleMuteTree(contextTabs);
+      else
+        Commands.toggleMuteDescendants(contextTabs);
+      break;
+
+    case 'closeTree':
+      if (inverted)
+        Commands.closeDescendants(contextTabs);
+      else
+        Commands.closeTree(contextTabs);
+      break;
+    case 'closeDescendants':
+      if (inverted)
+        Commands.closeTree(contextTabs);
+      else
+        Commands.closeDescendants(contextTabs);
+      break;
+    case 'closeOthers':
+      Commands.closeOthers(contextTabs);
+      break;
+
+    case 'toggleSticky':
+      Commands.toggleSticky(contextTabs, !contextTab.$TST.sticky);
+      break;
+
+    case 'collapseTree':
+      Commands.collapseTree(contextTabs, { recursively: inverted });
+      break;
+    case 'collapseTreeRecursively':
+      Commands.collapseTree(contextTabs, { recursively: !inverted });
+      break;
+    case 'collapseAll':
+      Commands.collapseAll(contextTab.windowId);
+      break;
+    case 'expandTree':
+      Commands.expandTree(contextTabs, { recursively: inverted });
+      break;
+    case 'expandTreeRecursively':
+      Commands.expandTree(contextTabs, { recursively: !inverted });
+      break;
+    case 'expandAll':
+      Commands.expandAll(contextTab.windowId);
+      break;
+
+    case 'bookmarkTree':
+      Commands.bookmarkTree(contextTabs);
+      break;
+
+    case 'sendTreeToDevice:all':
+      Sync.sendTabsToAllDevices(contextTabs, { recursively: true });
+      break;
+
+    case 'collapsed':
+      if (info.wasChecked)
+        Commands.expandTree(contextTab);
+      else
+        Commands.collapseTree(contextTab);
+      break;
+    case 'pinnedTab': {
+      const tabs = Tab.getPinnedTabs(contextTab.windowId);
+      if (tabs.length > 0)
+        browser.tabs.update(tabs[0].id, { active: true })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    }; break;
+    case 'unpinnedTab': {
+      const tabs = Tab.getUnpinnedTabs(tab.windowId);
+      if (tabs.length > 0)
+        browser.tabs.update(tabs[0].id, { active: true })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    }; break;
+
+    default: {
+      const sendToDeviceMatch = info.menuItemId.match(/^sendTreeToDevice:device:(.+)$/);
+      if (contextTab &&
+          sendToDeviceMatch)
+        Sync.sendTabsToDevice(
+          contextTabs,
+          { to: sendToDeviceMatch[1],
+            recursively: true }
+        );
+    }; break;
+  }
+}
+TabContextMenu.onTSTItemClick.addListener(onTabItemClick);
+
+async function onBookmarkItemClick(info) {
+  switch (info.menuItemId.replace(/^grouped:/, '')) {
+    case 'openAllBookmarksWithStructure':
+      Commands.openAllBookmarksWithStructure(info.bookmarkId, { recursively: false });
+      break;
+
+    case 'openAllBookmarksWithStructureRecursively':
+      Commands.openAllBookmarksWithStructure(info.bookmarkId, { recursively: true });
+      break;
+  }
+}
+
+async function onShown(info, tab) {
+  if (info.contexts.includes('tab'))
+    await onTabContextMenuShown(info, tab);
+  else if (info.contexts.includes('bookmark'))
+    onBookmarkContextMenuShown(info);
+}
+browser.menus.onShown.addListener(onShown);
+
+let mLastContextTabId = null;
+async function onTabContextMenuShown(info, tab) {
+  const contextTabId = tab?.id;
+  mLastContextTabId = contextTabId;
+
+  tab = tab && Tab.get(contextTabId);
+  const multiselected = tab?.$TST.multiselected;
+  const contextTabs      = multiselected ? Tab.getSelectedTabs(tab.windowId) : tab ? [tab] : [];
+  const hasChild         = contextTabs.length > 0 && contextTabs.some(tab => tab.$TST.hasChild);
+  const subtreeCollapsed = contextTabs.length > 0 && contextTabs.some(tab => tab.$TST.subtreeCollapsed);
+  const grouped          = contextTabs.length > 0 && contextTabs.some(tab => tab.$TST.isGroupTab);
+  const { hasUnmutedTab, hasUnmutedDescendant } = Commands.getUnmutedState(contextTabs);
+  const { hasAutoplayBlockedTab, hasAutoplayBlockedDescendant } = Commands.getAutoplayBlockedState(contextTabs);
+
+  let updated = await updateItems({
+    multiselected,
+    hasUnmutedTab,
+    hasUnmutedDescendant,
+    hasAutoplayBlockedTab,
+    hasAutoplayBlockedDescendant,
+    sticky: tab?.$TST.sticky,
+    hidden: !configs.showTreeCommandsInTabsContextMenuGlobally && info.viewType != 'sidebar',
+  });
+  if (mLastContextTabId != contextTabId)
+    return; // Skip further operations if the menu was already reopened on a different context tab.
+
+  for (const item of mTabItems) {
+    let newVisible;
+    let newEnabled;
+    if (item.id == 'sendTreeToDevice' &&
+        item.visible) {
+      newVisible = contextTabs.filter(Sync.isSendableTab).length > 0;
+      newEnabled = (
+        hasChild &&
+        Sync.getOtherDevices().length > 0
+      );
+    }
+    else if (item.requireTree) {
+      newEnabled = hasChild;
+      switch (item.id) {
+        case 'collapseTree':
+          if (subtreeCollapsed)
+            newEnabled = false;
+          break;
+        case 'expandTree':
+          if (!subtreeCollapsed)
+            newEnabled = false;
+          break;
+      }
+    }
+    else if (item.requireMultiselected) {
+      newEnabled = multiselected;
+    }
+    else if (item.requireGrouped) {
+      newEnabled = grouped;
+    }
+    else if (item.requireNormal) {
+      newEnabled = tab?.pinned;
+    }
+    else {
+      continue;
+    }
+
+    if ((newVisible === undefined ||
+         newVisible == !!item.visible) &&
+        (newEnabled === undefined ||
+         newEnabled == !!item.enabled))
+      continue;
+
+    const params = {};
+    if (newVisible !== undefined &&
+        newVisible != !!item.visible)
+      params.visible = item.visible = !!newVisible;
+    if (newEnabled !== undefined &&
+        newEnabled != !!item.enabled)
+      params.enabled = item.enabled = !!newEnabled;
+
+    updateItem(item.id, params);
+    updateItem(`grouped:${item.id}`, params);
+    updated = true;
+  }
+
+  {
+    const canExpand = hasChild && subtreeCollapsed;
+    mTabItemsById.collapsed.checked = canExpand;
+    const params = {
+      checked: canExpand
+    };
+    updateItem('collapsed', params);
+    updateItem(`grouped:collapsed`, params);
+    updated = true;
+  }
+
+  if (updated)
+    browser.menus.refresh().catch(ApiTabs.createErrorSuppressor());
+}
+TabContextMenu.onTSTTabContextMenuShown.addListener(onTabContextMenuShown);
+
+let mLastContextItemId = null;
+async function onBookmarkContextMenuShown(info) {
+  const contextItemId = info.bookmarkId;
+  mLastContextItemId = contextItemId;
+
+  let isFolder = true;
+  if (info.bookmarkId) {
+    const item = await Bookmark.getItemById(info.bookmarkId);
+    if (mLastContextItemId != contextItemId)
+      return; // Skip further operations if the menu was already reopened on a different context item.
+    isFolder = (
+      item.type == 'folder' ||
+      (item.type == 'bookmark' &&
+       /^place:parent=([^&]+)$/.test(item.url))
+    );
+  }
+
+  let visibleItemCount = 0;
+
+  mBookmarkItemsById.openAllBookmarksWithStructure.visible = !!(
+    isFolder &&
+    configs[mBookmarkItemsById.openAllBookmarksWithStructure.configKey] &&
+    ++visibleItemCount
+  );
+  mBookmarkItemsById.openAllBookmarksWithStructureRecursively.visible = !!(
+    isFolder &&
+    configs[mBookmarkItemsById.openAllBookmarksWithStructureRecursively.configKey] &&
+    ++visibleItemCount
+  );
+
+  for (const item of mGroupedBookmarkItems) {
+    item.visible = !!(
+      visibleItemCount > 1 &&
+      item.ungroupedItem.visible
+    );
+    if (item.visible)
+      item.ungroupedItem.visible = false;
+  }
+  for (const item of [...mBookmarkItems, ...mGroupedBookmarkItems]) {
+    browser.menus.update(item.id, {
+      visible: !!item.visible,
+    });
+  }
+
+  browser.menus.update(mBookmarkSeparator.id, {
+    visible: visibleItemCount > 0
+  });
+  browser.menus.update(mBookmarkRootItem.id, {
+    visible: visibleItemCount > 1
+  });
+  browser.menus.refresh().catch(ApiTabs.createErrorSuppressor());
+}
+
+
+export function getItemIdsWithIcon() {
+  return [
+    kROOT_TAB_ITEM,
+    kROOT_BOOKMARK_ITEM,
+    ...Object.keys(mBookmarkItemsById),
+  ];
+}
diff --git a/waterfox/browser/components/sidebar/background/duplicated-tab-detection.js b/waterfox/browser/components/sidebar/background/duplicated-tab-detection.js
new file mode 100644
index 0000000000000..93b46d35ffc5b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/duplicated-tab-detection.js
@@ -0,0 +1,61 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+async function doTest() {
+  const win = await browser.windows.getLastFocused({ populate: true });
+  const tab = win.tabs.find(tab => tab.active);
+
+  const maxTry = 10;
+  const promises = [];
+  const duplicatedTabIds = [];
+  for (let i = 0; i < maxTry; i++) {
+    promises.push(browser.tabs.duplicate(tab.id).then(async duplicated => {
+      await Tab.waitUntilTracked(duplicated.id);
+      const tracked = Tab.get(duplicated.id);
+      const uniqueId = await tracked.$TST.promisedUniqueId;
+      duplicatedTabIds.push(duplicated.id);
+      return uniqueId?.duplicated;
+    }));
+  }
+  const successCount = (await Promise.all(promises)).filter(result => !!result).length;
+  await browser.tabs.remove(duplicatedTabIds);
+  return successCount / maxTry;
+}
+
+async function autoDetectSuitableDelay() {
+  configs.delayForDuplicatedTabDetection = 0;
+  let successRate = await doTest();
+  if (successRate == 1)
+    return;
+
+  configs.delayForDuplicatedTabDetection = 10;
+  while (successRate < 1) {
+    configs.delayForDuplicatedTabDetection = Math.round(configs.delayForDuplicatedTabDetection * (1 / Math.max(successRate, 0.5)));
+    successRate = await doTest();
+  }
+}
+
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!message || !message.type)
+    return;
+
+  switch (message.type) {
+    case Constants.kCOMMAND_TEST_DUPLICATED_TAB_DETECTION:
+      return doTest();
+
+    case Constants.kCOMMAND_AUTODETECT_DUPLICATED_TAB_DETECTION_DELAY:
+      autoDetectSuitableDelay();
+      return;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-autoplay-blocking.js b/waterfox/browser/components/sidebar/background/handle-autoplay-blocking.js
new file mode 100644
index 0000000000000..177dc9f8c85a8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-autoplay-blocking.js
@@ -0,0 +1,150 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Background from './background.js';
+
+function log(...args) {
+  if (configs.debug)
+    console.log(...args);
+}
+
+function uniqTabsAndDescendantsSet(tabs) {
+  if (!Array.isArray(tabs))
+    tabs = [tabs];
+  return Array.from(new Set(tabs.map(tab => [tab].concat(tab.$TST.descendants)).flat())).sort(Tab.compare);
+}
+
+function unblockAutoplayTree(tabs) {
+  const tabsToUpdate = [];
+  let shouldUnblockAutoplay = false;
+  for (const tab of uniqTabsAndDescendantsSet(tabs)) {
+    if (!shouldUnblockAutoplay && tab.$TST.autoplayBlocked)
+      shouldUnblockAutoplay = true;
+    tabsToUpdate.push(tab);
+  }
+  browser.waterfoxBridge.unblockAutoplay(tabsToUpdate.map(tab => tab.id));
+}
+
+function unblockAutoplayDescendants(rootTabs) {
+  const rootTabsSet = new Set(rootTabs);
+  const tabsToUpdate = [];
+  let shouldUnblockAutoplay = false;
+  for (const tab of uniqTabsAndDescendantsSet(rootTabs)) {
+    if (rootTabsSet.has(tab))
+      continue;
+    if (!shouldUnblockAutoplay && tab.$TST.autoplayBlocked)
+      shouldUnblockAutoplay = true;
+    tabsToUpdate.push(tab);
+  }
+  browser.waterfoxBridge.unblockAutoplay(tabsToUpdate.map(tab => tab.id));
+}
+
+browser.menus.onClicked.addListener((info, contextTab) => {
+  contextTab = contextTab && Tab.get(contextTab.id);
+  const contextTabs = contextTab.$TST.multiselected ? Tab.getSelectedTabs(contextTab.windowId) : [contextTab];
+  const inverted    = info.button == 1;
+
+  switch (info.menuItemId.replace(/^grouped:/, '')) {
+    case 'context_unblockAutoplay':
+      browser.waterfoxBridge.unblockAutoplay(contextTabs.map(tab => tab.id));
+      break;
+
+    case 'context_topLevel_unblockAutoplayTree':
+    case 'unblockAutoplayTree':
+      if (inverted)
+        unblockAutoplayDescendants(contextTabs);
+      else
+        unblockAutoplayTree(contextTabs);
+      break;
+
+    case 'context_topLevel_unblockAutoplayDescendants':
+    case 'unblockAutoplayDescendants':
+      if (inverted)
+        unblockAutoplayTree(contextTabs);
+      else
+        unblockAutoplayDescendants(contextTabs);
+      break;
+  }
+});
+
+SidebarConnection.onMessage.addListener(async (windowId, message) => {
+  switch (message.type) {
+    case Constants.kCOMMAND_UNBLOCK_AUTOPLAY_FROM_SOUND_BUTTON: {
+      await Tab.waitUntilTracked(message.tabId);
+      const root = Tab.get(message.tabId);
+      log('unblock autoplay from sound button: ', message, root);
+      if (!root)
+        break;
+
+      const multiselected = root.$TST.multiselected;
+      const tabs = multiselected ?
+        Tab.getSelectedTabs(root.windowId, { iterator: true }) :
+        [root] ;
+
+      if (!multiselected &&
+          root.$TST.subtreeCollapsed) {
+        const tabsInTree = [root, ...root.$TST.descendants];
+        const toBeUpdatedTabs = tabsInTree.filter(tab => tab.$TST.autoplayBlocked);
+        log('  toBeUpdatedTabs: ', toBeUpdatedTabs);
+        browser.waterfoxBridge.unblockAutoplay(toBeUpdatedTabs.map(tab => tab.id));
+      }
+      else {
+        log('  tabs: ', tabs);
+        browser.waterfoxBridge.unblockAutoplay(tabs.map(tab => tab.id));
+      }
+    }; break;
+  }
+});
+
+browser.commands.onCommand.addListener(async command => {
+  let activeTabs = await browser.tabs.query({
+    active:        true,
+    currentWindow: true,
+  }).catch(ApiTabs.createErrorHandler());
+  if (activeTabs.length == 0)
+    activeTabs = await browser.tabs.query({
+      currentWindow: true,
+    }).catch(ApiTabs.createErrorHandler());
+  const activeTab = Tab.get(activeTabs[0].id);
+  const selectedTabs = activeTab.$TST.multiselected ? Tab.getSelectedTabs(activeTab.windowId) : [activeTab];
+
+  switch (command) {
+    case 'unblockAutoplayTree':
+      unblockAutoplayTree(selectedTabs);
+      return;
+
+    case 'unblockAutoplayDescendants':
+      unblockAutoplayDescendants(selectedTabs);
+      return;
+  }
+});
+
+
+Background.onReady.addListener(() => {
+  browser.waterfoxBridge.listAutoplayBlockedTabs().then(tabs => {
+    for (const tab of tabs) {
+      Tab.get(tab.id)?.$TST.addState(Constants.kTAB_STATE_AUTOPLAY_BLOCKED);
+    }
+  });
+});
+
+browser.waterfoxBridge.onAutoplayBlocked.addListener(tab => {
+  Tab.get(tab.id)?.$TST.addState(Constants.kTAB_STATE_AUTOPLAY_BLOCKED);
+});
+
+browser.waterfoxBridge.onAutoplayUnblocked.addListener(tab => {
+  Tab.get(tab.id)?.$TST.removeState(Constants.kTAB_STATE_AUTOPLAY_BLOCKED);
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-chrome-menu-commands.js b/waterfox/browser/components/sidebar/background/handle-chrome-menu-commands.js
new file mode 100644
index 0000000000000..665c9c5c6da43
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-chrome-menu-commands.js
@@ -0,0 +1,32 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import * as Commands from './commands.js';
+
+browser.waterfoxBridge.onMenuCommand.addListener(async info => {
+  switch (info.itemId) {
+    case 'tabs-sidebar-newTab': {
+      const behavior = info.button == 1 ?
+        configs.autoAttachOnNewTabButtonMiddleClick :
+        (info.ctrlKey || info.metaKey) ?
+          configs.autoAttachOnNewTabButtonAccelClick :
+          configs.autoAttachOnNewTabCommand;
+      const win       = await browser.windows.getLastFocused({ populate: true }).catch(ApiTabs.createErrorHandler());
+      const activeTab = TabsStore.activeTabInWindow.get(win.id);
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      behavior,
+      });
+    }; break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-misc.js b/waterfox/browser/components/sidebar/background/handle-misc.js
new file mode 100644
index 0000000000000..8b47caa0a0597
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-misc.js
@@ -0,0 +1,1161 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  wait,
+  mapAndFilterUniq,
+  configs,
+  loadUserStyleRules,
+  doProgressively,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as BrowserTheme from '/common/browser-theme.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as Permissions from '/common/permissions.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import * as Background from './background.js';
+import * as Commands from './commands.js';
+import * as Migration from './migration.js';
+import * as TabsGroup from './tabs-group.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/handle-misc', ...args);
+}
+
+
+/* message observer */
+
+// We cannot start listening of messages of browser.runtime.onMessage(External)
+// at here and wait processing until promises are resolved like ApiTabsListener
+// and BackgroundConnection, because making listeners asynchornous (async
+// functions) will break things - those listeners must not return Promise for
+// unneeded cases.
+// So we simply ignore messages delivered before completely initialized, for now.
+// See also: https://github.com/piroor/treestyletab/issues/2200
+
+const PHASE_LOADING                = 0;
+const PHASE_BACKGROUND_INITIALIZED = 1;
+const PHASE_BACKGROUND_BUILT       = 2;
+const PHASE_BACKGROUND_READY       = 3;
+let mInitializationPhase = PHASE_LOADING;
+
+Background.onInit.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_INITIALIZED;
+});
+
+Background.onBuilt.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_BUILT;
+});
+
+Background.onReady.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_READY;
+});
+
+if (browser.sidebarAction)
+  (browser.action || browser.browserAction)?.onClicked.addListener(onToolbarButtonClick);
+browser.commands.onCommand.addListener(onShortcutCommand);
+browser.runtime.onMessage.addListener(onMessage);
+TSTAPI.onMessageExternal.addListener(onMessageExternal);
+
+
+Background.onReady.addListener(() => {
+  Bookmark.startTracking();
+});
+
+Background.onDestroy.addListener(() => {
+  browser.runtime.onMessage.removeListener(onMessage);
+  TSTAPI.onMessageExternal.removeListener(onMessageExternal);
+  if (browser.sidebarAction)
+    (browser.action || browser.browserAction)?.onClicked.removeListener(onToolbarButtonClick);
+});
+
+
+function onToolbarButtonClick(tab) {
+  if (mInitializationPhase < PHASE_BACKGROUND_INITIALIZED ||
+      Permissions.requestPostProcess()) {
+    return;
+  }
+
+  if (Migration.isInitialStartup()) {
+    Migration.openInitialStartupPage();
+    return;
+  }
+
+  if (typeof browser.sidebarAction.toggle == 'function')
+    browser.sidebarAction.toggle();
+  else if (SidebarConnection.isSidebarOpen(tab.windowId))
+    browser.sidebarAction.close();
+  else
+    browser.sidebarAction.open();
+}
+
+async function onShortcutCommand(command) {
+  if (mInitializationPhase < PHASE_BACKGROUND_INITIALIZED)
+    return;
+
+  let activeTabs = command.tab ? [command.tab] : await browser.tabs.query({
+    active:        true,
+    currentWindow: true,
+  }).catch(ApiTabs.createErrorHandler());
+  if (activeTabs.length == 0)
+    activeTabs = await browser.tabs.query({
+      currentWindow: true,
+    }).catch(ApiTabs.createErrorHandler());
+  const activeTab = Tab.get(activeTabs[0].id);
+  const selectedTabs = activeTab.$TST.multiselected ? Tab.getSelectedTabs(activeTab.windowId) : [activeTab];
+  log('onShortcutCommand ', { command, activeTab, selectedTabs });
+
+  switch (command) {
+    case '_execute_browser_action':
+      return;
+
+    case 'reloadTree':
+      Commands.reloadTree(selectedTabs);
+      return;
+    case 'reloadDescendants':
+      Commands.reloadDescendants(selectedTabs);
+      return;
+    case 'toggleMuteTree':
+      Commands.toggleMuteTree(selectedTabs);
+      return;
+    case 'toggleMuteDescendants':
+      Commands.toggleMuteDescendants(selectedTabs);
+      return;
+    case 'closeTree':
+      Commands.closeTree(selectedTabs);
+      return;
+    case 'closeDescendants':
+      Commands.closeDescendants(selectedTabs);
+      return;
+    case 'closeOthers':
+      Commands.closeOthers(selectedTabs);
+      return;
+    case 'toggleSticky':
+      Commands.toggleSticky(selectedTabs);
+      return;
+    case 'collapseTree':
+      Commands.collapseTree(selectedTabs);
+      return;
+    case 'collapseTreeRecursively':
+      Commands.collapseTree(selectedTabs, { recursively: true });
+      return;
+    case 'collapseAll':
+      Commands.collapseAll(activeTab.windowId);
+      return;
+    case 'expandTree':
+      Commands.expandTree(selectedTabs);
+      return;
+    case 'expandTreeRecursively':
+      Commands.expandTree(selectedTabs, { recursively: true });
+      return;
+    case 'expandAll':
+      Commands.expandAll(activeTab.windowId);
+      return;
+    case 'bookmarkTree':
+      Commands.bookmarkTree(selectedTabs);
+      return;
+
+    case 'newIndependentTab':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_ORPHAN
+      });
+      return;
+    case 'newChildTab':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_CHILD
+      });
+      return;
+    case 'newChildTabTop':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_CHILD_TOP
+      });
+      return;
+    case 'newChildTabEnd':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_CHILD_END
+      });
+      return;
+    case 'newSiblingTab':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_SIBLING
+      });
+      return;
+    case 'newNextSiblingTab':
+      Commands.openNewTabAs({
+        baseTab: activeTab,
+        as:      Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING
+      });
+      return;
+
+    case 'newContainerTab':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SHOW_CONTAINER_SELECTOR,
+        windowId: activeTab.windowId
+      });
+      return;
+
+    case 'tabMoveUp':
+      Commands.moveUp(activeTab, { followChildren: false });
+      return;
+    case 'treeMoveUp':
+      Commands.moveUp(activeTab, { followChildren: true });
+      return;
+    case 'tabMoveDown':
+      Commands.moveDown(activeTab, { followChildren: false });
+      return;
+    case 'treeMoveDown':
+      Commands.moveDown(activeTab, { followChildren: true });
+      return;
+
+    case 'focusPrevious':
+      focusPrevious(activeTab);
+      return;
+    case 'focusPreviousSilently':
+      focusPreviousSilently(activeTab);
+      return;
+    case 'focusNext':
+      focusNext(activeTab);
+      return;
+    case 'focusNextSilently':
+      focusNextSilently(activeTab);
+      return;
+    case 'focusParent':
+      TabsInternalOperation.activateTab(activeTab.$TST.parent);
+      return;
+    case 'focusParentOrCollapse':
+      collapseOrFocusToParent(activeTab);
+      return;
+    case 'focusFirstChild':
+      TabsInternalOperation.activateTab(activeTab.$TST.firstChild);
+      return;
+    case 'focusFirstChildOrExpand':
+      expandOrFocusToFirstChild(activeTab);
+      return;
+    case 'focusLastChild':
+      TabsInternalOperation.activateTab(activeTab.$TST.lastChild);
+      return;
+    case 'focusPreviousSibling':
+      TabsInternalOperation.activateTab(
+        activeTab.$TST.previousSiblingTab ||
+          (activeTab.$TST.parent ?
+            activeTab.$TST.parent.$TST.lastChild :
+            Tab.getLastRootTab(activeTab.windowId))
+      );
+      return;
+    case 'focusNextSibling':
+      TabsInternalOperation.activateTab(
+        activeTab.$TST.nextSiblingTab ||
+          (activeTab.$TST.parent ?
+            activeTab.$TST.parent.$TST.firstChild :
+            Tab.getFirstVisibleTab(activeTab.windowId))
+      );
+      return;
+
+    case 'simulateUpOnTree':
+      if (SidebarConnection.isOpen(activeTab.windowId)) {
+        if (configs.faviconizePinnedTabs &&
+            (activeTab.pinned ||
+             activeTab == Tab.getFirstNormalTab(activeTab.windowId))) {
+          const nextActiveId = await browser.runtime.sendMessage({
+            type:     Constants.kCOMMAND_GET_ABOVE_TAB,
+            windowId: activeTab.windowId,
+            tabId:    activeTab.id,
+          });
+          log(`simulateUpOnTree: nextActiveId = ${nextActiveId}`);
+          const nextActive = (
+            Tab.get(nextActiveId) ||
+            Tab.getLastVisibleTab(activeTab.windowId)
+          );
+          TabsInternalOperation.activateTab(nextActive, {
+            silently: true,
+          });
+        }
+        else {
+          focusPreviousSilently(activeTab);
+        }
+      }
+      else {
+        focusPrevious(activeTab);
+      }
+      return;
+    case 'simulateDownOnTree':
+      if (SidebarConnection.isOpen(activeTab.windowId)) {
+        if (configs.faviconizePinnedTabs &&
+            activeTab.pinned) {
+          const nextActiveId = await browser.runtime.sendMessage({
+            type:     Constants.kCOMMAND_GET_BELOW_TAB,
+            windowId: activeTab.windowId,
+            tabId:    activeTab.id,
+          });
+          log(`simulateDownOnTree: nextActiveId = ${nextActiveId}`);
+          const nextActive = (
+            Tab.get(nextActiveId) ||
+            Tab.getFirstNormalTab(activeTab.windowId)
+          );
+          TabsInternalOperation.activateTab(nextActive, {
+            silently: true,
+          });
+        }
+        else {
+          focusNextSilently(activeTab);
+        }
+      }
+      else {
+        focusNext(activeTab);
+      }
+      return;
+    case 'simulateLeftOnTree':
+      if (SidebarConnection.isOpen(activeTab.windowId)) {
+        if (configs.faviconizePinnedTabs &&
+            activeTab.pinned) {
+          const nextActiveId = await browser.runtime.sendMessage({
+            type:     Constants.kCOMMAND_GET_LEFT_TAB,
+            windowId: activeTab.windowId,
+            tabId:    activeTab.id,
+          });
+          log(`simulateLeftOnTree: nextActiveId = ${nextActiveId}`);
+          TabsInternalOperation.activateTab(Tab.get(nextActiveId), {
+            silently: true,
+          });
+        }
+        else if (await isSidebarRightSide(activeTab.windowId)) {
+          expandOrFocusToFirstChild(activeTab);
+        }
+        else {
+          collapseOrFocusToParent(activeTab);
+        }
+      }
+      else {
+        focusPrevious(activeTab);
+      }
+      return;
+    case 'simulateRightOnTree':
+      if (SidebarConnection.isOpen(activeTab.windowId)) {
+        if (configs.faviconizePinnedTabs &&
+            activeTab.pinned) {
+          const nextActiveId = await browser.runtime.sendMessage({
+            type:     Constants.kCOMMAND_GET_RIGHT_TAB,
+            windowId: activeTab.windowId,
+            tabId:    activeTab.id,
+          });
+          log(`simulateRightOnTree: nextActiveId = ${nextActiveId}`);
+          TabsInternalOperation.activateTab(Tab.get(nextActiveId), {
+            silently: true,
+          });
+        }
+        else if (await isSidebarRightSide(activeTab.windowId)) {
+          collapseOrFocusToParent(activeTab);
+        }
+        else {
+          expandOrFocusToFirstChild(activeTab);
+        }
+      }
+      else {
+        focusNext(activeTab);
+      }
+      return;
+
+    case 'tabbarUp':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        by:       'lineup'
+      });
+      return;
+    case 'tabbarPageUp':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        by:       'pageup'
+      });
+      return;
+    case 'tabbarHome':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        to:       'top'
+      });
+      return;
+
+    case 'tabbarDown':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        by:       'linedown'
+      });
+      return;
+    case 'tabbarPageDown':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        by:       'pagedown'
+      });
+      return;
+    case 'tabbarEnd':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SCROLL_TABBAR,
+        windowId: activeTab.windowId,
+        to:       'bottom'
+      });
+      return;
+
+    case 'toggleTreeCollapsed':
+      if (activeTab.$TST.subtreeCollapsed)
+        Commands.expandTree(selectedTabs);
+      else
+        Commands.collapseTree(selectedTabs);
+      return;
+    case 'toggleTreeCollapsedRecursively':
+      if (activeTab.$TST.subtreeCollapsed)
+        Commands.expandTree(selectedTabs, { recursively: true });
+      else
+        Commands.collapseTree(selectedTabs, { recursively: true });
+      return;
+
+    case 'toggleSubPanel':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_TOGGLE_SUBPANEL,
+        windowId: activeTab.windowId
+      });
+      return;
+    case 'switchSubPanel':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_SWITCH_SUBPANEL,
+        windowId: activeTab.windowId
+      });
+      return;
+    case 'increaseSubPanel':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_INCREASE_SUBPANEL,
+        windowId: activeTab.windowId
+      });
+      return;
+    case 'decreaseSubPanel':
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_DECREASE_SUBPANEL,
+        windowId: activeTab.windowId
+      });
+      return;
+  }
+}
+
+function focusPrevious(activeTab) {
+  const nextActive = activeTab.$TST.nearestVisiblePrecedingTab ||
+    (!SidebarConnection.isOpen(activeTab.windowId) && activeTab.$TST.previousTab) ||
+    Tab.getLastVisibleTab(activeTab.windowId);
+  TabsInternalOperation.activateTab(nextActive);
+}
+
+function focusPreviousSilently(activeTab) {
+  const nextActive = activeTab.$TST.nearestVisiblePrecedingTab ||
+    (!SidebarConnection.isOpen(activeTab.windowId) && activeTab.$TST.previousTab) ||
+    Tab.getLastVisibleTab(activeTab.windowId);
+  TabsInternalOperation.activateTab(nextActive, {
+    silently: true,
+  });
+}
+
+function focusNext(activeTab) {
+  const nextActive = activeTab.$TST.nearestVisibleFollowingTab ||
+    (!SidebarConnection.isOpen(activeTab.windowId) && activeTab.$TST.nextTab) ||
+    Tab.getFirstVisibleTab(activeTab.windowId);
+  TabsInternalOperation.activateTab(nextActive);
+}
+
+function focusNextSilently(activeTab) {
+  const nextActive = activeTab.$TST.nearestVisibleFollowingTab ||
+    (!SidebarConnection.isOpen(activeTab.windowId) && activeTab.$TST.nextTab) ||
+    Tab.getFirstVisibleTab(activeTab.windowId);
+  TabsInternalOperation.activateTab(nextActive, {
+    silently: true,
+  });
+}
+
+async function isSidebarRightSide(windowId) {
+  const position = await browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_GET_SIDEBAR_POSITION,
+    windowId,
+  });
+  return position == Constants.kTABBAR_POSITION_RIGHT;
+}
+
+function collapseOrFocusToParent(activeTab) {
+  if (!activeTab.$TST.subtreeCollapsed && activeTab.$TST.hasChild)
+    Commands.collapseTree(activeTab);
+  else
+    TabsInternalOperation.activateTab(activeTab.$TST.parent);
+}
+
+function expandOrFocusToFirstChild(activeTab) {
+  if (activeTab.$TST.subtreeCollapsed && activeTab.$TST.hasChild)
+    Commands.expandTree(activeTab);
+  else
+    TabsInternalOperation.activateTab(activeTab.$TST.firstChild, {
+      silently: true,
+    });
+}
+
+// This must be synchronous and return Promise on demando, to avoid
+// blocking to other listeners.
+function onMessage(message, sender) {
+  if (mInitializationPhase < PHASE_BACKGROUND_BUILT ||
+      !message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case Constants.kCOMMAND_GET_INSTANCE_ID:
+      return Promise.resolve(Background.instanceId);
+
+    case Constants.kCOMMAND_RELOAD:
+      return Background.reload({ all: message.all });
+
+    case Constants.kCOMMAND_REQUEST_UNIQUE_ID:
+      return (async () => {
+        if (!Tab.get(message.tabId))
+          await Tab.waitUntilTracked(message.tabId);
+        const tab = Tab.get(message.tabId);
+        return tab ? tab.$TST.promisedUniqueId : {};
+      })();
+
+    case Constants.kCOMMAND_GET_THEME_DECLARATIONS:
+      return browser.theme.getCurrent().then(theme => BrowserTheme.generateThemeDeclarations(theme));
+
+    case Constants.kCOMMAND_GET_CONTEXTUAL_IDENTITIES_COLOR_INFO:
+      return Promise.resolve(ContextualIdentities.getColorInfo());
+
+    case Constants.kCOMMAND_GET_CONFIG_VALUE:
+      if (Array.isArray(message.keys)) {
+        const values = {};
+        for (const key of message.keys) {
+          values[key] = configs[key];
+        }
+        return Promise.resolve(values);
+      }
+      return Promise.resolve(configs[message.key]);
+
+    case Constants.kCOMMAND_SET_CONFIG_VALUE:
+      return Promise.resolve(configs[message.key] = message.value);
+
+    case Constants.kCOMMAND_GET_USER_STYLE_RULES:
+      return Promise.resolve(loadUserStyleRules());
+
+    case Constants.kCOMMAND_PING_TO_BACKGROUND: // return tabs as the pong, to optimizie further initialization tasks in the sidebar
+      TabsUpdate.completeLoadingTabs(message.windowId); // don't wait here for better perfomance
+      return Promise.resolve(TabsStore.windows.get(message.windowId).export(true));
+
+    case Constants.kCOMMAND_PULL_TABS:
+      if (message.windowId) {
+        TabsUpdate.completeLoadingTabs(message.windowId); // don't wait here for better perfomance
+        return Promise.resolve(TabsStore.windows.get(message.windowId).export(true).tabs);
+      }
+      return Promise.resolve(message.tabIds.map(id => {
+        const tab = Tab.get(id);
+        return tab?.$TST.export(true);
+      }));
+
+    case Constants.kCOMMAND_PULL_TABS_ORDER:
+      return Promise.resolve(TabsStore.windows.get(message.windowId).order);
+
+    case Constants.kCOMMAND_PULL_TREE_STRUCTURE:
+      return (async () => {
+        while (mInitializationPhase < PHASE_BACKGROUND_READY) {
+          await wait(10);
+        }
+        const structure = TreeBehavior.getTreeStructureFromTabs(
+          message.windowId ?
+            Tab.getAllTabs(message.windowId) :
+            message.tabIds.map(id => Tab.get(id))
+        );
+        return { structure };
+      })();
+
+    case Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED:
+      return (async () => {
+        const grantedPermission = JSON.stringify(message.permissions);
+        if (grantedPermission == JSON.stringify(Permissions.ALL_URLS)) {
+          const tabs = await browser.tabs.query({}).catch(ApiTabs.createErrorHandler());
+          await Tab.waitUntilTracked(tabs.map(tab => tab.id));
+          for (const tab of tabs) {
+            Background.tryStartHandleAccelKeyOnTab(Tab.get(tab.id));
+          }
+        }
+        else if (grantedPermission == JSON.stringify(Permissions.BOOKMARKS)) {
+          Migration.migrateBookmarkUrls();
+          Bookmark.startTracking();
+        }
+      })();
+
+    case Constants.kCOMMAND_SIMULATE_SIDEBAR_MESSAGE: {
+      SidebarConnection.onMessage.dispatch(message.message.windowId, message.message);
+    }; break;
+
+    case Constants.kCOMMAND_CONFIRM_TO_CLOSE_TABS:
+      log('kCOMMAND_CONFIRM_TO_CLOSE_TABS: ', { message });
+      return Background.confirmToCloseTabs(message.tabs, message);
+
+    default:
+      if (TSTAPI.INTERNAL_CALL_PREFIX_MATCHER.test(message.type)) {
+        return onMessageExternal({
+          ...message,
+          type: message.type.replace(TSTAPI.INTERNAL_CALL_PREFIX_MATCHER, ''),
+        }, sender);
+      }
+      break;
+  }
+}
+
+// This must be synchronous and return Promise on demando, to avoid
+// blocking to other listeners.
+function onMessageExternal(message, sender) {
+  if (mInitializationPhase < PHASE_BACKGROUND_INITIALIZED)
+    return;
+
+  switch (message.type) {
+    case TSTAPI.kGET_VERSION:
+      return Promise.resolve(browser.runtime.getManifest().version);
+
+    case TSTAPI.kGET_TREE:
+      return (async () => {
+        const tabs = await (message.rendered ?
+          TSTAPI.getTargetRenderedTabs(message, sender) :
+          TSTAPI.getTargetTabs(message, sender));
+        const cache = {};
+        const treeItems = Array.from(tabs, tab => TSTAPI.exportTab(tab, {
+          interval: message.interval,
+          cache,
+        }));
+        const result = TSTAPI.formatTabResult(
+          treeItems,
+          {
+            ...message,
+            // This must return an array of root tabs if just the window id is specified.
+            // See also: https://github.com/piroor/treestyletab/issues/2763
+            ...((message.window || message.windowId) && !message.tab && !message.tabs ? { tab: '*' } : {})
+          },
+          sender.id
+        );
+        TSTAPI.clearCache(cache);
+        return result;
+      })();
+
+    case TSTAPI.kGET_LIGHT_TREE:
+      return (async () => {
+        const tabs = await (message.rendered ?
+          TSTAPI.getTargetRenderedTabs(message, sender) :
+          TSTAPI.getTargetTabs(message, sender));
+        const cache = {};
+        const treeItems = Array.from(tabs, tab => TSTAPI.exportTab(tab, {
+          light:    true,
+          interval: message.interval,
+          cache,
+        }));
+        const result = TSTAPI.formatTabResult(
+          treeItems,
+          {
+            ...message,
+            // This must return an array of root tabs if just the window id is specified.
+            // See also: https://github.com/piroor/treestyletab/issues/2763
+            ...((message.window || message.windowId) && !message.tab && !message.tabs ? { tab: '*' } : {})
+          },
+          sender.id
+        );
+        TSTAPI.clearCache(cache);
+        return result;
+      })();
+
+    case TSTAPI.kSTICK_TAB:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await doProgressively(
+          tabs,
+          tab => Commands.toggleSticky(tab, true),
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kUNSTICK_TAB:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await doProgressively(
+          tabs,
+          tab => Commands.toggleSticky(tab, false),
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kTOGGLE_STICKY_STATE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        let firstTabIsSticky = undefined;
+        await doProgressively(
+          tabs,
+          tab => {
+            if (firstTabIsSticky === undefined)
+              firstTabIsSticky = tab.$TST.sticky;
+            Commands.toggleSticky(tab, !firstTabIsSticky);
+          },
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kCOLLAPSE_TREE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await doProgressively(
+          tabs,
+          tab => Commands.collapseTree(tab, {
+            recursively: !!message.recursively
+          }),
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kEXPAND_TREE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await doProgressively(
+          tabs,
+          tab => Commands.expandTree(tab, {
+            recursively: !!message.recursively
+          }),
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kTOGGLE_TREE_COLLAPSED:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await doProgressively(
+          tabs,
+          tab => Tree.collapseExpandSubtree(tab, {
+            collapsed: !tab.$TST.subtreeCollapsed,
+            broadcast: true
+          }),
+          message.interval
+        );
+        return true;
+      })();
+
+    case TSTAPI.kATTACH:
+      return (async () => {
+        await Tab.waitUntilTracked([
+          message.child,
+          message.parent,
+          message.insertBefore,
+          message.insertAfter
+        ]);
+        const child  = Tab.get(message.child);
+        const parent = Tab.get(message.parent);
+        if (!child ||
+            !parent ||
+            child.windowId != parent.windowId)
+          return false;
+        await Tree.attachTabTo(child, parent, {
+          broadcast:    true,
+          insertBefore: Tab.get(message.insertBefore),
+          insertAfter:  Tab.get(message.insertAfter)
+        });
+        if (child.$TST.collapsed &&
+            !parent.$TST.collapsed &&
+            !parent.$TST.subtreeCollapsed) {
+          await Tree.collapseExpandTabAndSubtree(child, {
+            collapsed: false,
+            bradcast:  true
+          });
+        }
+        return true;
+      })();
+
+    case TSTAPI.kDETACH:
+      return (async () => {
+        await Tab.waitUntilTracked(message.tab);
+        const tab = Tab.get(message.tab);
+        if (!tab)
+          return false;
+        await Tree.detachTab(tab, {
+          broadcast: true
+        });
+        if (tab.$TST.collapsed) {
+          await Tree.collapseExpandTabAndSubtree(tab, {
+            collapsed: false,
+            bradcast:  true
+          });
+        }
+        return true;
+      })();
+
+    case TSTAPI.kINDENT:
+    case TSTAPI.kDEMOTE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.indent(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kOUTDENT:
+    case TSTAPI.kPROMOTE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.outdent(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kMOVE_UP:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.moveUp(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kMOVE_TO_START:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await Commands.moveTabsToStart(Array.from(tabs));
+        return true;
+      })();
+
+    case TSTAPI.kMOVE_DOWN:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.moveDown(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kMOVE_TO_END:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await Commands.moveTabsToEnd(Array.from(tabs));
+        return true;
+      })();
+
+    case TSTAPI.kMOVE_BEFORE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.moveBefore(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kMOVE_AFTER:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const results = await doProgressively(
+          tabs,
+          tab => Commands.moveAfter(tab, message),
+          message.interval
+        );
+        return TSTAPI.formatResult(results, message);
+      })();
+
+    case TSTAPI.kFOCUS:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const tabsArray = await doProgressively(
+          tabs,
+          tab => {
+            TabsInternalOperation.activateTab(tab, {
+              silently: message.silently
+            });
+            return tab;
+          },
+          message.interval
+        );
+        return TSTAPI.formatResult(tabsArray.map(() => true), message);
+      })();
+
+    case TSTAPI.kCREATE:
+      return (async () => {
+        const windowId = message.params.windowId;
+        const win = TabsStore.windows.get(windowId);
+        if (!win)
+          throw new Error(`invalid windowId ${windowId}: it must be valid window id`);
+        win.bypassTabControlCount++;
+        const tab = await TabsOpen.openURIInTab(message.params, { windowId });
+        return TSTAPI.exportTab(tab, { addonId: sender.id });
+      })();
+
+    case TSTAPI.kDUPLICATE:
+      return (async () => {
+        const tabs   = await TSTAPI.getTargetTabs(message, sender);
+        let behavior = configs.autoAttachOnDuplicated;
+        switch (String(message.as || 'sibling').toLowerCase()) {
+          case 'child':
+            behavior = behavior == Constants.kNEWTAB_OPEN_AS_CHILD_TOP ?
+              Constants.kNEWTAB_OPEN_AS_CHILD_TOP :
+              behavior == Constants.kNEWTAB_OPEN_AS_CHILD_END ?
+                Constants.kNEWTAB_OPEN_AS_CHILD_END :
+                Constants.kNEWTAB_OPEN_AS_CHILD;
+            break;
+          case 'first-child':
+            behavior = Constants.kNEWTAB_OPEN_AS_CHILD_TOP;
+            break;
+          case 'last-child':
+            behavior = Constants.kNEWTAB_OPEN_AS_CHILD_END;
+            break;
+          case 'sibling':
+            behavior = Constants.kNEWTAB_OPEN_AS_SIBLING;
+            break;
+          case 'nextsibling':
+            behavior = Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING;
+            break;
+          case 'orphan':
+            behavior = Constants.kNEWTAB_OPEN_AS_ORPHAN;
+            break;
+          default:
+            break;
+        }
+        const tabsArray = await doProgressively(
+          tabs,
+          async tab => {
+            return Commands.duplicateTab(tab, {
+              destinationWindowId: tab.windowId,
+              behavior,
+              multiselected: false
+            });
+          },
+          message.interval
+        );
+        return TSTAPI.formatResult(tabsArray.map(() => true), message);
+      })();
+
+    case TSTAPI.kGROUP_TABS:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const temporaryStateParams = (message.temporary && !message.temporaryAggressive) ?
+          {
+            temporary:           true,
+            temporaryAggressive: false,
+          } :
+          (!message.temporary && message.temporaryAggressive) ?
+            {
+              temporary:           false,
+              temporaryAggressive: true,
+            } :
+            (message.temporaryAggressive === false && message.temporary === false) ?
+              {
+                temporary:           false,
+                temporaryAggressive: false,
+              } :
+              {};
+        const tab = await TabsGroup.groupTabs(Array.from(tabs), {
+          title:     message.title,
+          broadcast: true,
+          ...TabsGroup.temporaryStateParams(configs.groupTabTemporaryStateForAPI),
+          ...temporaryStateParams,
+        });
+        if (!tab)
+          return null;
+        return TSTAPI.exportTab(tab, { addonId: sender.id });
+      })();
+
+    case TSTAPI.kOPEN_IN_NEW_WINDOW:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const windowId = await Commands.openTabsInWindow(Array.from(tabs), {
+          multiselected: false
+        });
+        return windowId;
+      })();
+
+    case TSTAPI.kREOPEN_IN_CONTAINER:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        const reopenedTabs = await Commands.reopenInContainer(
+          Array.from(tabs),
+          message.containerId || 'firefox-default'
+        );
+        const cache = {};
+        const result = await TSTAPI.formatTabResult(
+          reopenedTabs.map(tab => TSTAPI.exportTab(tab, {
+            interval: message.interval,
+            addonId:  sender.id,
+            cache,
+          })),
+          message
+        );
+        TSTAPI.clearCache(cache);
+        return result;
+      })();
+
+    case TSTAPI.kGET_TREE_STRUCTURE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        return Promise.resolve(TreeBehavior.getTreeStructureFromTabs(Array.from(tabs)));
+      })();
+
+    case TSTAPI.kSET_TREE_STRUCTURE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        await Tree.applyTreeStructureToTabs(
+          Array.from(tabs),
+          message.structure,
+          { broadcast: true }
+        );
+        return Promise.resolve(true);
+      })();
+
+    case TSTAPI.kADD_TAB_STATE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        let states = message.state || message.states;
+        if (!Array.isArray(states))
+          states = [states];
+        states = mapAndFilterUniq(states, state => state && String(state) || undefined);
+        if (states.length == 0)
+          return true;
+        const tabsArray = await doProgressively(
+          tabs,
+          tab => {
+            for (const state of states) {
+              tab.$TST.addState(state);
+            }
+            return tab;
+          },
+          message.interval
+        );
+        Tab.broadcastState(tabsArray, {
+          add: states
+        });
+        return true;
+      })();
+
+    case TSTAPI.kREMOVE_TAB_STATE:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        let states = message.state || message.states;
+        if (!Array.isArray(states))
+          states = [states];
+        states = mapAndFilterUniq(states, state => state && String(state) || undefined);
+        if (states.length == 0)
+          return true;
+        const tabsArray = await doProgressively(
+          tabs,
+          tab => {
+            for (const state of states) {
+              tab.$TST.removeState(state);
+            }
+            return tab;
+          },
+          message.interval
+        );
+        Tab.broadcastState(tabsArray, {
+          remove: states
+        });
+        return true;
+      })();
+
+    case TSTAPI.kGRANT_TO_REMOVE_TABS:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        configs.grantedRemovingTabIds = mapAndFilterUniq(configs.grantedRemovingTabIds.concat(tabs), tab => {
+          tab = TabsStore.ensureLivingItem(tab);
+          return tab?.id || undefined;
+        });
+        return true;
+      })();
+
+    case TSTAPI.kSTART_CUSTOM_DRAG:
+      return (async () => {
+        SidebarConnection.sendMessage({
+          type:     Constants.kNOTIFY_TAB_MOUSEDOWN_EXPIRED,
+          windowId: message.windowId || (await browser.windows.getLastFocused({ populate: false }).catch(ApiTabs.createErrorHandler())).id,
+          button:   message.button || 0
+        });
+      })();
+
+    case TSTAPI.kOPEN_ALL_BOOKMARKS_WITH_STRUCTURE:
+      return Commands.openAllBookmarksWithStructure(
+        message.id || message.bookmarkId,
+        { discarded: message.discarded }
+      );
+
+    case TSTAPI.kSET_TOOLTIP_TEXT:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        for (const tab of tabs) {
+          tab.$TST.registerTooltipText(sender.id, message.text || '', !!message.force);
+        }
+        return true;
+      })();
+
+    case TSTAPI.kCLEAR_TOOLTIP_TEXT:
+      return (async () => {
+        const tabs = await TSTAPI.getTargetTabs(message, sender);
+        for (const tab of tabs) {
+          tab.$TST.unregisterTooltipText(sender.id);
+        }
+        return true;
+      })();
+
+    case TSTAPI.kREGISTER_AUTO_STICKY_STATES:
+      TreeItem.registerAutoStickyState(sender.id, message.state || message.states);
+      break;
+
+    case TSTAPI.kUNREGISTER_AUTO_STICKY_STATES:
+      TreeItem.unregisterAutoStickyState(sender.id, message.state || message.states);
+      break;
+  }
+}
+
+Tab.onStateChanged.addListener((tab, state, added) => {
+  switch (state) {
+    case Constants.kTAB_STATE_STICKY:
+      if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_STICKY_STATE_CHANGED)) {
+        TSTAPI.broadcastMessage({
+          type:   TSTAPI.kNOTIFY_TAB_STICKY_STATE_CHANGED,
+          tab,
+          sticky: !!added,
+        }, { tabProperties: ['tab'] }).catch(_error => {});
+      }
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-moved-tabs.js b/waterfox/browser/components/sidebar/background/handle-moved-tabs.js
new file mode 100644
index 0000000000000..ab99fe996f60b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-moved-tabs.js
@@ -0,0 +1,296 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  configs,
+  wait,
+  isMacOS,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Commands from './commands.js';
+import * as NativeTabGroups from './native-tab-groups.js';
+import * as TabsGroup from './tabs-group.js';
+import * as Tree from './tree.js';
+import * as TreeStructure from './tree-structure.js';
+
+function log(...args) {
+  internalLogger('background/handle-moved-tabs', ...args);
+}
+function logApiTabs(...args) {
+  internalLogger('common/api-tabs', ...args);
+}
+
+
+let mMaybeTabMovingByShortcut = false;
+
+
+Tab.onCreated.addListener((tab, info = {}) => {
+  if (!info.mayBeReplacedWithContainer &&
+      (info.duplicated ||
+       info.restored ||
+       info.skipFixupTree ||
+       // do nothing for already attached tabs
+       (tab.openerTabId &&
+        tab.$TST.parent == Tab.get(tab.openerTabId)))) {
+    log('skip to fixup tree for replaced/duplicated/restored tab ', tab, info);
+    return;
+  }
+  // if the tab is opened inside existing tree by someone, we must fixup the tree.
+  if (!(info.positionedBySelf ||
+        info.movedBySelfWhileCreation) &&
+      (tab.$TST.nearestCompletelyOpenedNormalFollowingTab ||
+       tab.$TST.nearestCompletelyOpenedNormalPrecedingTab ||
+       (info.treeForActionDetection?.target &&
+        (info.treeForActionDetection.target.next ||
+         info.treeForActionDetection.target.previous)))) {
+    tryFixupTreeForInsertedTab(tab, {
+      toIndex:   tab.index,
+      fromIndex: Tab.getLastTab(tab.windowId).index,
+      treeForActionDetection: info.treeForActionDetection,
+      isTabCreating: true
+    });
+  }
+  else {
+    log('no need to fixup tree for newly created tab ', tab, info);
+  }
+});
+
+Tab.onMoving.addListener((tab, moveInfo) => {
+  // avoid TabMove produced by browser.tabs.insertRelatedAfterCurrent=true or something.
+  const win              = TabsStore.windows.get(tab.windowId);
+  const isNewlyOpenedTab = win.openingTabs.has(tab.id);
+  const positionControlled = configs.insertNewChildAt != Constants.kINSERT_NO_CONTROL;
+  if (!isNewlyOpenedTab ||
+      !positionControlled ||
+      moveInfo.byInternalOperation ||
+      moveInfo.alreadyMoved ||
+      !moveInfo.movedInBulk)
+    return true;
+
+  // if there is no valid opener, it can be a restored initial tab in a restored window
+  // and can be just moved as a part of window restoration process.
+  if (!tab.$TST.openerTab)
+    return true;
+
+  log('onTabMove for new child tab: move back '+moveInfo.toIndex+' => '+moveInfo.fromIndex);
+  moveBack(tab, moveInfo);
+  return false;
+});
+
+async function tryFixupTreeForInsertedTab(tab, moveInfo = {}) {
+  const internalGroupMoveCount = NativeTabGroups.internallyMovingNativeTabGroups.get(tab.groupId);
+  if (internalGroupMoveCount) {
+    log('ignore internal move of tab groups ', internalGroupMoveCount);
+    return;
+  }
+  const parentTabOperationBehavior = TreeBehavior.getParentTabOperationBehavior(tab, {
+    context: Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE,
+    ...moveInfo,
+  });
+  log('tryFixupTreeForInsertedTab ', {
+    tab: tab.id,
+    parentTabOperationBehavior,
+    moveInfo,
+    childIds: tab.$TST.childIds,
+    parentId: tab.$TST.parentId,
+  });
+  if (!moveInfo.isTabCreating &&
+      parentTabOperationBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE) {
+    if (tab.$TST.hasChild)
+      tab.$TST.temporaryMetadata.set('childIdsBeforeMoved', tab.$TST.childIds.slice(0));
+    tab.$TST.temporaryMetadata.set('parentIdBeforeMoved', tab.$TST.parentId);
+    const replacedGroupTab = (parentTabOperationBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB) ?
+      await TabsGroup.tryReplaceTabWithGroup(tab, { insertBefore: tab.$TST.firstChild }) :
+      null;
+    if (!replacedGroupTab && tab.$TST.hasChild) {
+      if (tab.$TST.isGroupTab)
+        await TabsGroup.clearTemporaryState(tab);
+      await Tree.detachAllChildren(tab, {
+        behavior:  parentTabOperationBehavior,
+        nearestFollowingRootTab: tab.$TST.firstChild.$TST.nearestFollowingRootTab,
+        broadcast: true
+      });
+    }
+    if (tab.$TST.parentId)
+      await Tree.detachTab(tab, {
+        broadcast: true
+      });
+    // Pinned tab is moved at first, so Tab.onPinned handler cannot know tree information
+    // before the pinned tab was moved. Thus we cache tree information for the handler.
+    wait(100).then(() => {
+      tab.$TST.temporaryMetadata.delete('childIdsBeforeMoved');
+      tab.$TST.temporaryMetadata.delete('parentIdBeforeMoved');
+    });
+  }
+
+  log('The tab can be placed inside existing tab unexpectedly, so now we are trying to fixup tree.');
+  const action = Tree.detectTabActionFromNewPosition(tab, {
+    isMovingByShortcut: mMaybeTabMovingByShortcut,
+    ...moveInfo,
+  });
+  log(' => action: ', action);
+  if (!action.action) {
+    log('no action');
+    return;
+  }
+
+  // When multiple tabs are moved at once by outside of TST (e.g. moving of multiselected tabs)
+  // Tree.detectTabActionFromNewPosition() may be called for other tabs asynchronously
+  // before this operation finishes. Thus we need to memorize the calculated "parent"
+  // and Tree.detectTabActionFromNewPosition() will use it.
+  if (action.parent)
+    tab.$TST.temporaryMetadata.set('goingToBeAttachedTo', action.parent);
+
+  // notify event to helper addons with action and allow or deny
+  const cache = {};
+  const allowed = await TSTAPI.tryOperationAllowed(
+    TSTAPI.kNOTIFY_TRY_FIXUP_TREE_ON_TAB_MOVED,
+    {
+      tab,
+      fromIndex:    moveInfo.fromIndex,
+      toIndex:      moveInfo.toIndex,
+      action:       action.action,
+      parent:       action.parent,
+      insertBefore: action.insertBefore,
+      insertAfter:  action.insertAfter,
+    },
+    { tabProperties: ['tab', 'parent', 'insertBefore', 'insertAfter'], cache }
+  );
+  TSTAPI.clearCache(cache);
+
+  if (!allowed) {
+    log('no action - canceled by a helper addon');
+  }
+  else {
+    log('action: ', action);
+    switch (action.action) {
+      case 'invalid':
+        moveBack(tab, moveInfo);
+        break;
+
+      default:
+        log('tryFixupTreeForInsertedTab: apply action for unattached tab: ', tab, action);
+        await action.apply();
+        break;
+    }
+  }
+
+  if (tab.$TST.temporaryMetadata.get('goingToBeAttachedTo') == action.parent)
+    tab.$TST.temporaryMetadata.delete('goingToBeAttachedTo');
+}
+
+function reserveToEnsureRootTabVisible(tab) {
+  reserveToEnsureRootTabVisible.tabIds.add(tab.id);
+  if (reserveToEnsureRootTabVisible.reserved)
+    clearTimeout(reserveToEnsureRootTabVisible.reserved);
+  reserveToEnsureRootTabVisible.reserved = setTimeout(() => {
+    delete reserveToEnsureRootTabVisible.reserved;
+    const tabs = Array.from(reserveToEnsureRootTabVisible.tabIds, Tab.get);
+    reserveToEnsureRootTabVisible.tabIds.clear();
+    for (const tab of tabs) {
+      if (!tab.$TST ||
+          tab.$TST.parent ||
+          !tab.$TST.collapsed)
+        continue;
+      Tree.collapseExpandTabAndSubtree(tab, {
+        collapsed: false,
+        broadcast: true
+      });
+    }
+  }, 150);
+}
+reserveToEnsureRootTabVisible.tabIds = new Set();
+
+Tab.onMoved.addListener((tab, moveInfo = {}) => {
+  if (moveInfo.byInternalOperation ||
+      !moveInfo.movedInBulk ||
+      tab.$TST.duplicating) {
+    log('internal move');
+    tab.$TST.nativeTabGroup?.$TST.reindex();
+  }
+  else {
+    log('process moved tab');
+    tryFixupTreeForInsertedTab(tab, moveInfo).then(() => {
+      tab.$TST.nativeTabGroup?.$TST.reindex();
+    });
+  }
+  reserveToEnsureRootTabVisible(tab);
+});
+
+function onMessage(message, _sender) {
+  if (!message ||
+      typeof message.type != 'string')
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case Constants.kNOTIFY_TAB_MOUSEDOWN:
+      mMaybeTabMovingByShortcut = false;
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_MAY_START_TAB_SWITCH:
+      if (message.modifier != (configs.accelKey || (isMacOS() ? 'meta' : 'control')))
+        return;
+      mMaybeTabMovingByShortcut = true;
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_MAY_END_TAB_SWITCH:
+      if (message.modifier != (configs.accelKey || (isMacOS() ? 'meta' : 'control')))
+        return;
+      mMaybeTabMovingByShortcut = false;
+      break;
+  }
+}
+browser.runtime.onMessage.addListener(onMessage);
+
+
+Commands.onMoveUp.addListener(async tab => {
+  await tryFixupTreeForInsertedTab(tab, {
+    toIndex:   tab.index,
+    fromIndex: tab.index + 1,
+  });
+});
+
+Commands.onMoveDown.addListener(async tab => {
+  await tryFixupTreeForInsertedTab(tab, {
+    toIndex:   tab.index,
+    fromIndex: tab.index - 1,
+  });
+});
+
+TreeStructure.onTabAttachedFromRestoredInfo.addListener((tab, moveInfo) => { tryFixupTreeForInsertedTab(tab, moveInfo); });
+
+function moveBack(tab, moveInfo) {
+  log('Move back tab from unexpected move: ', dumpTab(tab), moveInfo);
+  const id  = tab.id;
+  const win = TabsStore.windows.get(tab.windowId);
+  const index = moveInfo.fromIndex;
+  win.internalMovingTabs.set(id, index);
+  logApiTabs(`handle-moved-tabs:moveBack: browser.tabs.move() `, tab.id, {
+    windowId: moveInfo.windowId,
+    index:    moveInfo.fromIndex
+  });
+  // Because we need to use the raw "fromIndex" directly,
+  // we cannot use TabsMove.moveTabInternallyBefore/After here.
+  return browser.tabs.move(tab.id, {
+    windowId: moveInfo.windowId,
+    index:    moveInfo.fromIndex
+  }).catch(ApiTabs.createErrorHandler(e => {
+    if (win.internalMovingTabs.get(id) == index)
+      win.internalMovingTabs.delete(id);
+    ApiTabs.handleMissingTabError(e);
+  }));
+}
diff --git a/waterfox/browser/components/sidebar/background/handle-new-tabs.js b/waterfox/browser/components/sidebar/background/handle-new-tabs.js
new file mode 100644
index 0000000000000..1e223e8091172
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-new-tabs.js
@@ -0,0 +1,598 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  configs,
+  isFirefoxViewTab,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as TabsMove from './tabs-move.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/handle-new-tabs', ...args);
+}
+
+
+Tab.onBeforeCreate.addListener(async (tab, info) => {
+  const activeTab = info.activeTab || Tab.getActiveTab(tab.windowId);
+
+  // Special case, when all these conditions are true:
+  // 1) A new blank tab is configured to be opened as a child of the active tab.
+  // 2) The active tab is pinned.
+  // 3) Tabs opened from a pinned parent are configured to be placed near the
+  //    opener pinned tab.
+  // then we fakely attach the new blank tab to the active pinned tab.
+  // See also https://github.com/piroor/treestyletab/issues/3296
+  const shouldAttachToPinnedOpener = (
+    !tab.openerTabId &&
+    !tab.pinned &&
+    tab.$TST.isNewTabCommandTab &&
+    Constants.kCONTROLLED_NEWTAB_POSITION.has(configs.autoAttachOnNewTabCommand) &&
+    (
+      (activeTab?.pinned &&
+       Constants.kCONTROLLED_INSERTION_POSITION.has(configs.insertNewTabFromPinnedTabAt)) ||
+      (isFirefoxViewTab(activeTab) &&
+       Constants.kCONTROLLED_INSERTION_POSITION.has(configs.insertNewTabFromFirefoxViewAt))
+    )
+  );
+  if (shouldAttachToPinnedOpener)
+    tab.openerTabId = activeTab.id;
+});
+
+// this should return false if the tab is / may be moved while processing
+Tab.onCreating.addListener((tab, info = {}) => {
+  if (info.duplicatedInternally)
+    return true;
+
+  log('Tabs.onCreating ', dumpTab(tab), tab.openerTabId, info);
+
+  const activeTab = info.activeTab || Tab.getActiveTab(tab.windowId);
+  const opener = tab.$TST.openerTab;
+  if (opener) {
+    tab.$TST.setAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID, opener.$TST.uniqueId.id);
+    if (!info.bypassTabControl)
+      TabsStore.addToBeGroupedTab(tab);
+  }
+  else {
+    let dontMove = false;
+    if (!info.maybeOrphan &&
+        !info.bypassTabControl &&
+        activeTab &&
+        !info.restored) {
+      let autoAttachBehavior = configs.autoAttachOnNewTabCommand;
+      if (tab.$TST.nextTab &&
+          activeTab == tab.$TST.previousTab) {
+        // New tab opened with browser.tabs.insertAfterCurrent=true may have
+        // next tab. In this case the tab is expected to be placed next to the
+        // active tab always, so we should change the behavior specially.
+        // See also:
+        //   https://github.com/piroor/treestyletab/issues/2054
+        //   https://github.com/piroor/treestyletab/issues/2194#issuecomment-505272940
+        dontMove = true;
+        switch (autoAttachBehavior) {
+          case Constants.kNEWTAB_OPEN_AS_ORPHAN:
+          case Constants.kNEWTAB_OPEN_AS_SIBLING:
+          case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING:
+            if (activeTab.$TST.hasChild)
+              autoAttachBehavior = Constants.kNEWTAB_OPEN_AS_CHILD;
+            else
+              autoAttachBehavior = Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING;
+            break;
+
+          case Constants.kNEWTAB_OPEN_AS_CHILD:
+          default:
+            break;
+        }
+      }
+      if (tab.$TST.isNewTabCommandTab) {
+        if (!info.positionedBySelf) {
+          log('behave as a tab opened by new tab command');
+          return handleNewTabFromActiveTab(tab, {
+            activeTab,
+            autoAttachBehavior,
+            dontMove,
+            openedWithCookieStoreId: info.openedWithCookieStoreId,
+            inheritContextualIdentityMode: configs.inheritContextualIdentityToChildTabMode,
+            context: TSTAPI.kNEWTAB_CONTEXT_NEWTAB_COMMAND,
+          }).then(moved => !moved);
+        }
+        return false;
+      }
+      else if (activeTab != tab) {
+        tab.$TST.temporaryMetadata.set('possibleOpenerTab', activeTab.id);
+      }
+      if (!info.fromExternal)
+        tab.$TST.temporaryMetadata.set('isNewTab', true);
+    }
+    if (info.fromExternal &&
+        !info.bypassTabControl) {
+      log('behave as a tab opened from external application');
+      // we may need to reopen the tab with loaded URL
+      if (configs.inheritContextualIdentityToTabsFromExternalMode != Constants.kCONTEXTUAL_IDENTITY_DEFAULT)
+        tab.$TST.temporaryMetadata.set('fromExternal', true);
+      return notifyToTryHandleNewTab(tab, {
+        context: TSTAPI.kNEWTAB_CONTEXT_FROM_EXTERNAL,
+        activeTab,
+      }).then(allowed => {
+        if (!allowed) {
+          log(' => handling is canceled by someone');
+          return true;
+        }
+        return Tree.behaveAutoAttachedTab(tab, {
+          baseTab:   activeTab,
+          behavior:  configs.autoAttachOnOpenedFromExternal,
+          dontMove,
+          broadcast: true
+        }).then(moved => !moved);
+      });
+    }
+    log('behave as a tab opened with any URL ', tab.title, tab.url);
+    if (!info.restored &&
+        !info.positionedBySelf &&
+        !info.bypassTabControl &&
+        configs.autoAttachOnAnyOtherTrigger != Constants.kNEWTAB_DO_NOTHING) {
+      if (configs.inheritContextualIdentityToTabsFromAnyOtherTriggerMode != Constants.kCONTEXTUAL_IDENTITY_DEFAULT)
+        tab.$TST.temporaryMetadata.set('anyOtherTrigger', true);
+      log('controlled as a new tab from other unknown trigger');
+      return notifyToTryHandleNewTab(tab, {
+        context: TSTAPI.kNEWTAB_CONTEXT_UNKNOWN,
+        activeTab,
+      }).then(allowed => {
+        if (!allowed) {
+          log(' => handling is canceled by someone');
+          return true;
+        }
+        return Tree.behaveAutoAttachedTab(tab, {
+          baseTab:   activeTab,
+          behavior:  configs.autoAttachOnAnyOtherTrigger,
+          dontMove,
+          broadcast: true
+        }).then(moved => !moved);
+      });
+    }
+    if (info.positionedBySelf)
+      tab.$TST.temporaryMetadata.set('positionedBySelf', true);
+    return true;
+  }
+
+  log(`opener: ${dumpTab(opener)}, positionedBySelf = ${info.positionedBySelf}`);
+  if (!info.bypassTabControl &&
+      opener &&
+      (opener.pinned || isFirefoxViewTab(opener)) &&
+      opener.windowId == tab.windowId) {
+    return handleTabsFromPinnedOpener(tab, opener, { activeTab }).then(moved => !moved);
+  }
+  else if (!info.maybeOrphan || info.bypassTabControl) {
+    if (info.fromExternal &&
+        !info.bypassTabControl &&
+        configs.inheritContextualIdentityToTabsFromExternalMode != Constants.kCONTEXTUAL_IDENTITY_DEFAULT)
+      tab.$TST.temporaryMetadata.set('fromExternal', true);
+    return notifyToTryHandleNewTab(tab, {
+      context: info.fromExternal && !info.bypassTabControl ?
+        TSTAPI.kNEWTAB_CONTEXT_FROM_EXTERNAL :
+        info.duplicated ?
+          TSTAPI.kNEWTAB_CONTEXT_DUPLICATED :
+          TSTAPI.kNEWTAB_CONTEXT_WITH_OPENER,
+      activeTab,
+      openerTab: opener,
+    }).then(allowed => {
+      if (!allowed) {
+        log(' => handling is canceled by someone');
+        return true;
+      }
+      const behavior = info.fromExternal && !info.bypassTabControl ?
+        configs.autoAttachOnOpenedFromExternal :
+        info.duplicated ?
+          configs.autoAttachOnDuplicated :
+          configs.autoAttachOnOpenedWithOwner;
+      return Tree.behaveAutoAttachedTab(tab, {
+        baseTab:   opener,
+        behavior,
+        dontMove:  info.positionedBySelf || info.mayBeReplacedWithContainer,
+        broadcast: true
+      }).then(moved => !moved);
+    });
+  }
+  return true;
+});
+
+async function notifyToTryHandleNewTab(tab, { context, activeTab, openerTab } = {}) {
+  const cache = {};
+  const result = TSTAPI.tryOperationAllowed(
+    TSTAPI.kNOTIFY_TRY_HANDLE_NEWTAB,
+    { tab,
+      activeTab,
+      openerTab,
+      context },
+    { tabProperties: ['tab', 'activeTab', 'openerTab'], cache }
+  );
+  TSTAPI.clearCache(cache);
+  return result;
+}
+
+async function handleNewTabFromActiveTab(tab, { url, activeTab, autoAttachBehavior, dontMove, openedWithCookieStoreId, inheritContextualIdentityMode, context } = {}) {
+  log('handleNewTabFromActiveTab: activeTab = ', dumpTab(activeTab), { url, activeTab, autoAttachBehavior, dontMove, inheritContextualIdentityMode, context });
+  if (activeTab &&
+      activeTab.$TST.ancestors.includes(tab)) {
+    log(' => ignore restored ancestor tab');
+    return false;
+  }
+
+  const allowed = await notifyToTryHandleNewTab(tab, {
+    context,
+    activeTab,
+  });
+  if (!allowed) {
+    log(' => handling is canceled by someone');
+    return false;
+  }
+
+  const moved = await Tree.behaveAutoAttachedTab(tab, {
+    baseTab:   activeTab,
+    behavior:  autoAttachBehavior,
+    broadcast: true,
+    dontMove:  dontMove || false
+  });
+  if (openedWithCookieStoreId) {
+    log('handleNewTabFromActiveTab: do not reopen tab opened with contextual identity explicitly');
+    return moved;
+  }
+  if (tab.cookieStoreId && tab.cookieStoreId != 'firefox-default') {
+    log('handleNewTabFromActiveTab: do not reopen tab opened with non-default contextual identity ', tab.cookieStoreId);
+    return moved;
+  }
+
+  const parent = tab.$TST.parent;
+  let cookieStoreId = null;
+  switch (inheritContextualIdentityMode) {
+    case Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT:
+      if (parent)
+        cookieStoreId = parent.cookieStoreId;
+      break;
+
+    case Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE:
+      cookieStoreId = activeTab.cookieStoreId
+      break;
+
+    default:
+      return moved;
+  }
+  if ((tab.cookieStoreId || 'firefox-default') == (cookieStoreId || 'firefox-default')) {
+    log('handleNewTabFromActiveTab: no need to reopen with inherited contextual identity ', cookieStoreId);
+    return moved;
+  }
+
+  if (!configs.inheritContextualIdentityToUnopenableURLTabs &&
+      !TabsOpen.isOpenable(url)) {
+    log('handleNewTabFromActiveTab: not openable URL, skip reopening ', cookieStoreId, url);
+    return moved;
+  }
+
+  log('handleNewTabFromActiveTab: reopen with inherited contextual identity ', cookieStoreId);
+  // We need to prevent grouping of this original tab and the reopened tab
+  // by the "multiple tab opened in XXX msec" feature.
+  const win = TabsStore.windows.get(tab.windowId);
+  win.openedNewTabs.delete(tab.id);
+  await TabsOpen.openURIInTab(url || null, {
+    windowId: activeTab.windowId,
+    parent,
+    insertBefore: tab,
+    active: tab.active,
+    cookieStoreId
+  });
+  TabsInternalOperation.removeTab(tab);
+  return moved;
+}
+
+async function handleTabsFromPinnedOpener(tab, opener, { activeTab } = {}) {
+  const allowed = await notifyToTryHandleNewTab(tab, {
+    context: TSTAPI.kNEWTAB_CONTEXT_FROM_PINNED,
+    activeTab,
+    openerTab: opener,
+  });
+  if (!allowed) {
+    log('handleTabsFromPinnedOpener: handling is canceled by someone');
+    return false;
+  }
+
+  const parent = Tab.getGroupTabForOpener(opener);
+  if (parent) {
+    log('handleTabsFromPinnedOpener: attach to corresponding group tab');
+    tab.$TST.setAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER, true);
+    tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+    // it could be updated already...
+    const lastRelatedTab = opener.$TST.lastRelatedTabId == tab.id ?
+      opener.$TST.previousLastRelatedTab :
+      opener.$TST.lastRelatedTab;
+    // If there is already opened group tab, it is more natural that
+    // opened tabs are treated as a tab opened from unpinned tabs.
+    const insertAt = configs.autoAttachOnOpenedWithOwner == Constants.kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB ?
+      Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB :
+      configs.autoAttachOnOpenedWithOwner == Constants.kNEWTAB_OPEN_AS_CHILD_TOP ?
+        Constants.kINSERT_TOP :
+        configs.autoAttachOnOpenedWithOwner == Constants.kNEWTAB_OPEN_AS_CHILD_END ?
+          Constants.kINSERT_END :
+          undefined;
+    return Tree.attachTabTo(tab, parent, {
+      lastRelatedTab,
+      insertAt,
+      forceExpand:    true, // this is required to avoid the group tab itself is active from active tab in collapsed tree
+      broadcast:      true
+    });
+  }
+
+  if ((configs.autoGroupNewTabsFromPinned ||
+       configs.autoGroupNewTabsFromFirefoxView) &&
+      tab.$TST.needToBeGroupedSiblings.length > 0) {
+    log('handleTabsFromPinnedOpener: controlled by auto-grouping');
+    return false;
+  }
+
+  switch (isFirefoxViewTab(opener) ? configs.insertNewTabFromFirefoxViewAt : configs.insertNewTabFromPinnedTabAt) {
+    case Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB: {
+      // it could be updated already...
+      const lastRelatedTab = opener.$TST.lastRelatedTab != tab ?
+        opener.$TST.lastRelatedTab :
+        opener.$TST.previousLastRelatedTab;
+      if (lastRelatedTab) {
+        log(`handleTabsFromPinnedOpener: place after last related tab ${dumpTab(lastRelatedTab)}`);
+        tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+        return TabsMove.moveTabAfter(tab, lastRelatedTab.$TST.lastDescendant || lastRelatedTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+      }
+      const lastPinnedTab = Tab.getLastPinnedTab(tab.windowId);
+      if (lastPinnedTab) {
+        log(`handleTabsFromPinnedOpener: place after last pinned tab ${dumpTab(lastPinnedTab)}`);
+        tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+        return TabsMove.moveTabAfter(tab, lastPinnedTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+      }
+      const firstNormalTab = Tab.getFirstNormalTab(tab.windowId);
+      if (firstNormalTab) {
+        log(`handleTabsFromPinnedOpener: place before first unpinned tab ${dumpTab(firstNormalTab)}`);
+        tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+        return TabsMove.moveTabBefore(tab, firstNormalTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+      }
+    };
+    case Constants.kINSERT_TOP: {
+      const lastPinnedTab = Tab.getLastPinnedTab(tab.windowId);
+      if (lastPinnedTab) {
+        log(`handleTabsFromPinnedOpener: opened from pinned opener: place after last pinned tab ${dumpTab(lastPinnedTab)}`);
+        tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+        return TabsMove.moveTabAfter(tab, lastPinnedTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+      }
+      const firstNormalTab = Tab.getFirstNormalTab(tab.windowId);
+      if (firstNormalTab) {
+        log(`handleTabsFromPinnedOpener: opened from pinned opener: place before first pinned tab ${dumpTab(firstNormalTab)}`);
+        tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+        return TabsMove.moveTabBefore(tab, firstNormalTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+      }
+    }; break;
+
+    case Constants.kINSERT_END: {
+      const lastTab = Tab.getLastTab(tab.windowId);
+      log('handleTabsFromPinnedOpener: opened from pinned opener: place after the last tab ', lastTab);
+      tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+      return TabsMove.moveTabAfter(tab, lastTab, {
+        delayedMove: true,
+        broadcast:   true
+      });
+    };
+  }
+
+  return Promise.resolve(false);
+}
+
+Tab.onCreated.addListener((tab, info = {}) => {
+  if (!info.duplicated ||
+      info.bypassTabControl)
+    return;
+  const original = info.originalTab;
+  log('duplicated ', dumpTab(tab), dumpTab(original));
+  if (info.duplicatedInternally) {
+    log('duplicated by internal operation');
+    tab.$TST.addState(Constants.kTAB_STATE_DUPLICATING, { broadcast: true });
+    TabsStore.addDuplicatingTab(tab);
+  }
+  else {
+    // On old versions of Firefox, duplicated tabs had no openerTabId so they were
+    // not handled by Tab.onCreating listener. Today they are already handled before
+    // here, so this is just a failsafe (or for old versions of Firefox).
+    // See also: https://github.com/piroor/treestyletab/issues/2830#issuecomment-831414189
+    Tree.behaveAutoAttachedTab(tab, {
+      baseTab:   original,
+      behavior:  configs.autoAttachOnDuplicated,
+      dontMove:  info.positionedBySelf || info.movedBySelfWhileCreation || info.mayBeReplacedWithContainer,
+      broadcast: true
+    });
+  }
+});
+
+Tab.onUpdated.addListener((tab, changeInfo) => {
+  if ('openerTabId' in changeInfo &&
+      configs.syncParentTabAndOpenerTab &&
+      !tab.$TST.updatingOpenerTabIds.includes(changeInfo.openerTabId) /* accept only changes from outside of TST */) {
+    Tab.waitUntilTrackedAll(tab.windowId).then(() => {
+      const parent = tab.$TST.openerTab;
+      if (!parent ||
+          parent.windowId != tab.windowId ||
+          parent == tab.$TST.parent)
+        return;
+      Tree.attachTabTo(tab, parent, {
+        insertAt:    Constants.kINSERT_NEAREST,
+        forceExpand: tab.active,
+        broadcast:   true
+      });
+    });
+  }
+
+  if (tab.$TST.temporaryMetadata.has('openedCompletely') &&
+      tab.windowId == tab.$windowIdOnCreated && // Don't treat tab as "opened from active tab" if it is moved across windows while loading
+      (changeInfo.url || changeInfo.status == 'complete') &&
+      (tab.$TST.temporaryMetadata.has('isNewTab') ||
+       tab.$TST.temporaryMetadata.has('fromExternal') ||
+       tab.$TST.temporaryMetadata.has('anyOtherTrigger'))) {
+    log('loaded tab ', dumpTab(tab), {
+      isNewTab: tab.$TST.temporaryMetadata.has('isNewTab'),
+      fromExternal: tab.$TST.temporaryMetadata.has('fromExternal'),
+      anyOtherTrigger: tab.$TST.temporaryMetadata.has('anyOtherTrigger'),
+    });
+    tab.$TST.temporaryMetadata.delete('isNewTab');
+    const possibleOpenerTab = Tab.get(tab.$TST.temporaryMetadata.get('possibleOpenerTab'));
+    tab.$TST.temporaryMetadata.delete('possibleOpenerTab');
+    log('possibleOpenerTab ', dumpTab(possibleOpenerTab));
+
+    if (tab.$TST.temporaryMetadata.has('fromExternal')) {
+      tab.$TST.temporaryMetadata.delete('fromExternal');
+      log('behave as a tab opened from external application (delayed)');
+      handleNewTabFromActiveTab(tab, {
+        url:                           tab.url,
+        activeTab:                     possibleOpenerTab,
+        autoAttachBehavior:            configs.autoAttachOnOpenedFromExternal,
+        inheritContextualIdentityMode: configs.inheritContextualIdentityToTabsFromExternalMode,
+        context:                       TSTAPI.kNEWTAB_CONTEXT_FROM_EXTERNAL,
+      });
+      return;
+    }
+
+    if (tab.$TST.temporaryMetadata.has('anyOtherTrigger')) {
+      tab.$TST.temporaryMetadata.delete('anyOtherTrigger');
+      log('behave as a tab opened from any other trigger (delayed)');
+      handleNewTabFromActiveTab(tab, {
+        url:                           tab.url,
+        activeTab:                     possibleOpenerTab,
+        autoAttachBehavior:            configs.autoAttachOnAnyOtherTrigger,
+        inheritContextualIdentityMode: configs.inheritContextualIdentityToTabsFromAnyOtherTriggerMode,
+        context:                       TSTAPI.kNEWTAB_CONTEXT_UNKNOWN,
+      });
+      return;
+    }
+
+    const win = TabsStore.windows.get(tab.windowId);
+    log('win.openedNewTabs ', win.openedNewTabs);
+    if (tab.$TST.parent ||
+        !possibleOpenerTab ||
+        win.openedNewTabs.has(tab.id) ||
+        tab.$TST.temporaryMetadata.has('openedWithOthers') ||
+        tab.$TST.temporaryMetadata.has('positionedBySelf')) {
+      log(' => no need to control ', {
+        parent: tab.$TST.parent,
+        possibleOpenerTab,
+        openedNewTab: win.openedNewTabs.has(tab.id),
+        openedWithOthers: tab.$TST.temporaryMetadata.has('openedWithOthers'),
+        positionedBySelf: tab.$TST.temporaryMetadata.has('positionedBySelf')
+      });
+      return;
+    }
+
+    if (tab.$TST.isNewTabCommandTab) {
+      log('behave as a tab opened by new tab command (delayed)');
+      tab.$TST.addState(Constants.kTAB_STATE_NEW_TAB_COMMAND_TAB);
+      handleNewTabFromActiveTab(tab, {
+        activeTab:                     possibleOpenerTab,
+        autoAttachBehavior:            configs.autoAttachOnNewTabCommand,
+        inheritContextualIdentityMode: configs.inheritContextualIdentityToChildTabMode,
+        context:                       TSTAPI.kNEWTAB_CONTEXT_NEWTAB_COMMAND,
+      });
+      return;
+    }
+
+    const siteMatcher  = /^\w+:\/\/([^\/]+)(?:$|\/.*$)/;
+    const openerTabSite = possibleOpenerTab.url.match(siteMatcher);
+    const newTabSite    = tab.url.match(siteMatcher);
+    if (openerTabSite &&
+        newTabSite &&
+        tab.url != possibleOpenerTab.url && // It may be opened by "Duplciate Tab" or "Open in New Container Tab" if the URL is completely same.
+        openerTabSite[1] == newTabSite[1]) {
+      log('behave as a tab opened from same site (delayed)');
+      tab.$TST.addState(Constants.kTAB_STATE_OPENED_FOR_SAME_WEBSITE);
+      handleNewTabFromActiveTab(tab, {
+        url:                           tab.url,
+        activeTab:                     possibleOpenerTab,
+        autoAttachBehavior:            configs.autoAttachSameSiteOrphan,
+        inheritContextualIdentityMode: configs.inheritContextualIdentityToSameSiteOrphanMode,
+        context:                       TSTAPI.kNEWTAB_CONTEXT_WEBSITE_SAME_TO_ACTIVE_TAB,
+      });
+      return;
+    }
+
+    log('checking special openers (delayed)', { opener: possibleOpenerTab.url, child: tab.url });
+    for (const rule of Constants.kAGGRESSIVE_OPENER_TAB_DETECTION_RULES_WITH_URL) {
+      if (rule.opener.test(possibleOpenerTab.url) &&
+          rule.child.test(tab.url)) {
+        log('behave as a tab opened from special opener (delayed)', { rule });
+        handleNewTabFromActiveTab(tab, {
+          url:                tab.url,
+          activeTab:          possibleOpenerTab,
+          autoAttachBehavior: configs.autoAttachOnOpenedWithOwner,
+          context:            TSTAPI.kNEWTAB_CONTEXT_FROM_ABOUT_ADDONS,
+        });
+        return;
+      }
+    }
+  }
+});
+
+
+Tab.onAttached.addListener(async (tab, attachInfo = {}) => {
+  if (!attachInfo.windowId)
+    return;
+
+  const parentTabOperationBehavior = TreeBehavior.getParentTabOperationBehavior(tab, {
+    context:  Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE,
+    ...attachInfo,
+  });
+  if (parentTabOperationBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+    return;
+
+  log('Tabs.onAttached ', dumpTab(tab), attachInfo);
+
+  log('descendants of attached tab: ', () => attachInfo.descendants.map(dumpTab));
+  const movedTabs = await Tree.moveTabs(attachInfo.descendants, {
+    destinationWindowId: tab.windowId,
+    insertAfter:         tab
+  });
+  log('moved descendants: ', () => movedTabs.map(dumpTab));
+  if (attachInfo.descendants.length == movedTabs.length) {
+    await Tree.applyTreeStructureToTabs(
+      [tab, ...movedTabs],
+      attachInfo.structure
+    );
+  }
+  else {
+    for (const movedTab of movedTabs) {
+      Tree.attachTabTo(movedTab, tab, {
+        broadcast: true,
+        dontMove:  true
+      });
+    }
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-removed-tabs.js b/waterfox/browser/components/sidebar/background/handle-removed-tabs.js
new file mode 100644
index 0000000000000..9cd6ad31d2437
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-removed-tabs.js
@@ -0,0 +1,292 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  wait,
+  mapAndFilterUniq,
+  countMatched,
+  configs
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Background from './background.js';
+import * as TabsGroup from './tabs-group.js';
+import * as Tree from './tree.js';
+import * as Commands from './commands.js';
+
+function log(...args) {
+  internalLogger('background/handle-removed-tabs', ...args);
+}
+
+
+Tab.onRemoving.addListener(async (tab, removeInfo = {}) => {
+  log('Tabs.onRemoving ', dumpTab(tab), removeInfo);
+  if (removeInfo.isWindowClosing)
+    return;
+
+  let closeParentBehavior;
+  let newParent;
+  const successor = tab.$TST.possibleSuccessorWithDifferentContainer;
+  if (successor) {
+    log('override closeParentBehaior with kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD for different container successor ', successor);
+    closeParentBehavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+    // When a new tab is created with a different container and this tab
+    // is removed immediately before the new tab is completely handled,
+    // TST fails to detect the new tab as the successor of this tab. Thus,
+    // we treat the new tab as the successor - the first child of this
+    // (actually not attached to this tab yet).
+    if (successor && successor != tab.$TST.firstChild)
+      newParent = successor;
+  }
+  else {
+    closeParentBehavior = TreeBehavior.getParentTabOperationBehavior(tab, {
+      context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE,
+      ...removeInfo,
+    });
+    log('detected closeParentBehaior: ', closeParentBehavior);
+  }
+
+  if (closeParentBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE &&
+      tab.$TST.subtreeCollapsed)
+    Tree.collapseExpandSubtree(tab, {
+      collapsed: false,
+      justNow:   true,
+      broadcast: false // because the tab is going to be closed, broadcasted Tree.collapseExpandSubtree can be ignored.
+    });
+
+  const postProcessParams = {
+    windowId:     tab.windowId,
+    removedTab:   tab.$TST.export(true),
+    structure:    TreeBehavior.getTreeStructureFromTabs([tab, ...tab.$TST.descendants], {
+      full:                 true,
+      keepParentOfRootTabs: true
+    }),
+    insertBefore: tab, // not firstChild, because the "tab" is disappeared from tree.
+    parent:       tab.$TST.parent,
+    newParent,
+    children:     tab.$TST.children,
+    descendants:  tab.$TST.descendants,
+    nearestFollowingRootTab: tab.$TST.nearestFollowingRootTab,
+    closeParentBehavior
+  };
+
+  if (tab.$TST.subtreeCollapsed) {
+    tryGrantCloseTab(tab, closeParentBehavior).then(async granted => {
+      if (!granted)
+        return;
+      log('Tabs.onRemoving: granted to close ', dumpTab(tab));
+      handleRemovingPostProcess(postProcessParams)
+    });
+    // First we always need to detach children from the closing parent.
+    // They will be processed again after confirmation.
+    Tree.detachAllChildren(tab, {
+      newParent,
+      behavior:         Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN,
+      dontExpand:       true,
+      dontUpdateIndent: true,
+      broadcast:        true
+    });
+  }
+  else {
+    await handleRemovingPostProcess(postProcessParams)
+  }
+
+  const win = TabsStore.windows.get(tab.windowId);
+  if (!win.internalClosingTabs.has(tab.$TST.parentId))
+    Tree.detachTab(tab, {
+      dontUpdateIndent: true,
+      dontSyncParentToOpenerTab: true,
+      broadcast:        true
+    });
+});
+async function handleRemovingPostProcess({ closeParentBehavior, windowId, parent, newParent, insertBefore, nearestFollowingRootTab, children, descendants, removedTab, structure } = {}) {
+  log('handleRemovingPostProcess ', { closeParentBehavior, windowId, parent, newParent, insertBefore, nearestFollowingRootTab, children, descendants, removedTab, structure });
+  if (closeParentBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+    await closeChildTabs(descendants, {
+      triggerTab:        removedTab,
+      originalStructure: structure
+    });
+
+  const replacedGroupTab = (closeParentBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB) ?
+    await TabsGroup.tryReplaceTabWithGroup(null, { windowId, parent, children, insertBefore, newParent }) :
+    null;
+
+  if (!replacedGroupTab) {
+    await Tree.detachAllChildren(null, {
+      windowId,
+      parent,
+      newParent,
+      children,
+      descendants,
+      nearestFollowingRootTab,
+      behavior:  closeParentBehavior,
+      broadcast: true
+    });
+  }
+}
+
+async function tryGrantCloseTab(tab, closeParentBehavior) {
+  log('tryGrantClose: ', { alreadyGranted: configs.grantedRemovingTabIds, closing: dumpTab(tab) });
+  const alreadyGranted = configs.grantedRemovingTabIds.includes(tab.id);
+  configs.grantedRemovingTabIds = configs.grantedRemovingTabIds.filter(id => id != tab.id);
+  if (!tab || alreadyGranted) {
+    log(' => no need to confirm');
+    return true;
+  }
+
+  const self = tryGrantCloseTab;
+
+  self.closingTabIds.push(tab.id);
+  if (closeParentBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE) {
+    self.closingDescendantTabIds = self.closingDescendantTabIds
+      .concat(TreeBehavior.getClosingTabsFromParent(tab).map(tab => tab.id));
+    self.closingDescendantTabIds = Array.from(new Set(self.closingDescendantTabIds));
+  }
+
+  if (self.promisedGrantedToCloseTabs) {
+    log(' => have promisedGrantedToCloseTabs');
+    return self.promisedGrantedToCloseTabs;
+  }
+
+  self.closingTabWasActive = self.closingTabWasActive || tab.active;
+
+  let shouldRestoreCount;
+  self.promisedGrantedToCloseTabs = wait(250).then(async () => {
+    log(' => confirmation with delay');
+    const closingTabIds = new Set(self.closingTabIds);
+    let allClosingTabs = new Set();
+    allClosingTabs.add(tab);
+    self.closingTabIds = Array.from(closingTabIds);
+    self.closingDescendantTabIds = mapAndFilterUniq(self.closingDescendantTabIds, id => {
+      if (closingTabIds.has(id))
+        return undefined;
+      const tab = Tab.get(id);
+      if (tab) // ignore already closed tabs
+        allClosingTabs.add(tab);
+      return id;
+    });
+    allClosingTabs = Array.from(allClosingTabs);
+    shouldRestoreCount = self.closingTabIds.length;
+    const restorableClosingTabsCount = countMatched(
+      allClosingTabs,
+      tab => tab.url != 'about:blank' &&
+             !tab.$TST.isNewTabCommandTab
+    );
+    log(' => restorableClosingTabsCount: ', restorableClosingTabsCount);
+    if (restorableClosingTabsCount > 0) {
+      log('tryGrantClose: show confirmation for ', allClosingTabs);
+      return Background.confirmToCloseTabs(allClosingTabs.slice(1).map(tab => tab.$TST.sanitized), {
+        windowId:   tab.windowId,
+        messageKey: 'warnOnCloseTabs_fromOutside_message',
+        titleKey:   'warnOnCloseTabs_fromOutside_title',
+        minConfirmCount: 0
+      });
+    }
+    return true;
+  })
+    .then(async (granted) => {
+      log(' => granted: ', granted);
+      // remove the closed tab itself because it is already closed!
+      configs.grantedRemovingTabIds = configs.grantedRemovingTabIds.filter(id => id != tab.id);
+      if (granted)
+        return true;
+      log(`tryGrantClose: not granted, restore ${shouldRestoreCount} tabs`);
+      // this is required to wait until the closing tab is stored to the "recently closed" list
+      wait(0).then(async () => {
+        const restoredTabs = await Commands.restoreTabs(shouldRestoreCount);
+        log('tryGrantClose: restored ', restoredTabs);
+      });
+      return false;
+    });
+
+  const granted = await self.promisedGrantedToCloseTabs;
+  self.closingTabIds              = [];
+  self.closingDescendantTabIds    = [];
+  self.closingTabWasActive        = false;
+  self.promisedGrantedToCloseTabs = null;
+  return granted;
+}
+tryGrantCloseTab.closingTabIds              = [];
+tryGrantCloseTab.closingDescendantTabIds    = [];
+tryGrantCloseTab.closingTabWasActive        = false;
+tryGrantCloseTab.promisedGrantedToCloseTabs = null;
+
+async function closeChildTabs(tabs, { triggerTab, originalStructure } = {}) {
+  //if (!fireTabSubtreeClosingEvent(parent, tabs))
+  //  return;
+
+  //markAsClosedSet([parent].concat(tabs));
+  // close bottom to top!
+  await TabsInternalOperation.removeTabs(tabs.slice(0).reverse(), { triggerTab, originalStructure });
+  //fireTabSubtreeClosedEvent(parent, tabs);
+}
+
+Tab.onRemoved.addListener((tab, info) => {
+  log('Tabs.onRemoved: removed ', dumpTab(tab));
+  configs.grantedRemovingTabIds = configs.grantedRemovingTabIds.filter(id => id != tab.id);
+
+  if (info.isWindowClosing)
+    return;
+
+  // The removing tab may be attached to another tab or
+  // other tabs may be attached to the removing tab.
+  // We need to detach such relations always on this timing.
+  if (info.oldChildren.length > 0) {
+    Tree.detachAllChildren(tab, {
+      children:  info.oldChildren,
+      parent:    info.oldParent,
+      behavior:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+      broadcast: true
+    });
+  }
+  if (info.oldParent) {
+    Tree.detachTab(tab, {
+      dontSyncParentToOpenerTab: true,
+      parent:    info.oldParent,
+      broadcast: true
+    });
+  }
+});
+
+browser.windows.onRemoved.addListener(windowId  => {
+  const win = TabsStore.windows.get(windowId);
+  if (!win)
+    return;
+  configs.grantedRemovingTabIds = configs.grantedRemovingTabIds.filter(id => !win.tabs.has(id));
+});
+
+
+Tab.onDetached.addListener((tab, info = {}) => {
+  log('Tabs.onDetached ', dumpTab(tab));
+  let closeParentBehavior = TreeBehavior.getParentTabOperationBehavior(tab, {
+    context: Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE,
+    ...info
+  });
+  if (closeParentBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+    closeParentBehavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+
+  const dontSyncParentToOpenerTab = info.trigger == 'tabs.onDetached';
+  Tree.detachAllChildren(tab, {
+    dontSyncParentToOpenerTab,
+    behavior:  closeParentBehavior,
+    broadcast: true
+  });
+  //reserveCloseRelatedTabs(toBeClosedTabs);
+  Tree.detachTab(tab, {
+    dontSyncParentToOpenerTab,
+    dontUpdateIndent: true,
+    broadcast:        true
+  });
+  //restoreTabAttributes(tab, backupAttributes);
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-tab-bunches.js b/waterfox/browser/components/sidebar/background/handle-tab-bunches.js
new file mode 100644
index 0000000000000..5565a985f2b27
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-tab-bunches.js
@@ -0,0 +1,549 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  configs,
+  sanitizeForHTMLText,
+  compareAsNumber,
+  isFirefoxViewTab,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as Constants from '/common/constants.js';
+import * as Dialog from '/common/dialog.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import * as TabsGroup from './tabs-group.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/handle-tab-bunches', ...args);
+}
+
+// ====================================================================
+// Detection of a bunch of tabs opened at same time.
+// Firefox's WebExtensions API doesn't provide ability to know which tabs
+// are opened together by a single trigger. Thus TST tries to detect such
+// "tab bunches" based on their opened timing.
+// ====================================================================
+
+Tab.onBeforeCreate.addListener(async (tab, info) => {
+  const win = TabsStore.windows.get(tab.windowId);
+  if (!win)
+    return;
+
+  const openerId  = tab.openerTabId;
+  const openerTab = openerId && (await browser.tabs.get(openerId).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError)));
+  if ((openerTab &&
+       (openerTab.pinned || isFirefoxViewTab(openerTab)) &&
+       openerTab.windowId == tab.windowId) ||
+      (!openerTab &&
+       !info.maybeOrphan)) {
+    if (win.preventToDetectTabBunchesUntil > Date.now()) {
+      win.preventToDetectTabBunchesUntil += configs.tabBunchesDetectionTimeout;
+    }
+    else {
+      win.openedNewTabs.set(tab.id, {
+        id:       tab.id,
+        windowId: tab.windowId,
+        indexOnCreated: tab.$indexOnCreated,
+        openerId: openerTab?.id,
+        openerIsPinned: openerTab?.pinned,
+        openerIsFirefoxView: isFirefoxViewTab(openerTab),
+        maybeFromBookmark: tab.$TST.maybeFromBookmark,
+        shouldNotGrouped: TSTAPI.isGroupingBlocked(),
+      });
+    }
+  }
+  if (win.delayedTabBunchesDetection)
+    clearTimeout(win.delayedTabBunchesDetection);
+  win.delayedTabBunchesDetection = setTimeout(
+    tryDetectTabBunches,
+    configs.tabBunchesDetectionTimeout,
+    win
+  );
+});
+
+const mPossibleTabBunchesToBeGrouped = [];
+const mPossibleTabBunchesFromBookmarks = [];
+
+async function tryDetectTabBunches(win) {
+  if (Tab.needToWaitTracked(win.id))
+    await Tab.waitUntilTrackedAll(win.id);
+  if (Tab.needToWaitMoved(win.id))
+    await Tab.waitUntilMovedAll(win.id);
+
+  let tabReferences = Array.from(win.openedNewTabs.values());
+  log('tryDetectTabBunches for ', tabReferences);
+
+  win.openedNewTabs.clear();
+
+  tabReferences = tabReferences.filter(tabReference => {
+    if (!tabReference.id)
+      return false;
+    const tab = Tab.get(tabReference.id);
+    if (!tab)
+      return false;
+    const uniqueId = tab?.$TST?.uniqueId;
+    return !uniqueId || (!uniqueId.duplicated && !uniqueId.restored);
+  });
+  if (tabReferences.length == 0) {
+    log(' => there is no possible bunches of tabs.');
+    return;
+  }
+
+  if (tabReferences.length > 1) {
+    await Promise.all(tabReferences.map(tabReference => {
+      const tab = Tab.get(tabReference.id);
+      tab.$TST.temporaryMetadata.set('openedWithOthers', true);
+      // We need to wait until all tabs are handlede completely.
+      // Otherwise `tab.$TST.needToBeGroupedSiblings` may contain unrelated tabs
+      // (tabs opened from any other parent tab) unexpectedly.
+      return tab.$TST.opened;
+    }));
+  }
+
+  if (areTabsFromOtherDeviceWithInsertAfterCurrent(tabReferences) &&
+      configs.fixupOrderOfTabsFromOtherDevice) {
+    const ids   = tabReferences.map(tabReference => tabReference.id);
+    const index = tabReferences.map(tabReference => Tab.get(tabReference.id).index).sort(compareAsNumber)[0];
+    log(' => gather tabs from other device at ', ids, index);
+    await browser.tabs.move(ids, { index });
+  }
+
+  if (configs.autoGroupNewTabsFromPinned ||
+      configs.autoGroupNewTabsFromFirefoxView ||
+      configs.autoGroupNewTabsFromOthers) {
+    mPossibleTabBunchesToBeGrouped.push(tabReferences);
+    tryGroupTabBunches();
+  }
+  if (configs.autoGroupNewTabsFromBookmarks ||
+      configs.restoreTreeForTabsFromBookmarks) {
+    mPossibleTabBunchesFromBookmarks.push(tabReferences);
+    tryHandlTabBunchesFromBookmarks();
+  }
+}
+
+async function tryGroupTabBunches() {
+  if (tryGroupTabBunches.running)
+    return;
+
+  const tabReferences = mPossibleTabBunchesToBeGrouped.shift();
+  if (!tabReferences)
+    return;
+
+  log('tryGroupTabBunches for ', tabReferences);
+  tryGroupTabBunches.running = true;
+  try {
+    const fromPinned    = [];
+    const fromOthers    = [];
+    // extract only pure new tabs
+    for (const tabReference of tabReferences) {
+      if (tabReference.shouldNotGrouped)
+        continue;
+      const tab = Tab.get(tabReference.id);
+      if (!tab)
+        continue;
+      if (tabReference.openerTabId)
+        tab.openerTabId = parseInt(tabReference.openerTabId); // restore the opener information
+      const uniqueId = tab.$TST.uniqueId;
+      if (tab.$TST.isGroupTab || uniqueId.duplicated || uniqueId.restored)
+        continue;
+      if (tabReference.openerIsPinned ||
+          tabReference.openerIsFirefoxView) {
+        // We should check the "autoGroupNewTabsFromPinned" config here,
+        // because to-be-grouped tabs should be ignored by the handler for
+        // "autoAttachSameSiteOrphan" behavior.
+        if ((tab.$TST.hasPinnedOpener &&
+             configs.autoGroupNewTabsFromPinned) ||
+            (tab.$TST.hasFirefoxViewOpener &&
+             configs.autoGroupNewTabsFromFirefoxView))
+          fromPinned.push(tab);
+      }
+      else {
+        fromOthers.push(tab);
+      }
+    }
+    log(' => ', { fromPinned, fromOthers });
+
+    if (fromPinned.length > 0 &&
+        (configs.autoGroupNewTabsFromPinned ||
+         configs.autoGroupNewTabsFromFirefoxView)) {
+      const newRootTabs = Tab.collectRootTabs(TreeItem.sort(fromPinned));
+      if (newRootTabs.length > 0) {
+        await tryGroupTabBunchesFromPinnedOpener(newRootTabs);
+      }
+    }
+
+    // We can assume that new tabs from a bookmark folder and from other
+    // sources won't be mixed.
+    const openedFromBookmarkFolder = fromOthers.length > 0 && await detectBookmarkFolderFromTabs(fromOthers, tabReferences.length);
+    log(' => tryGroupTabBunches:openedFromBookmarkFolder: ', !!openedFromBookmarkFolder);
+    const newRootTabs = Tab.collectRootTabs(TreeItem.sort(openedFromBookmarkFolder ? openedFromBookmarkFolder.tabs : fromOthers));
+    log(' newRootTabs: ', newRootTabs);
+    if (newRootTabs.length > 1 &&
+        !openedFromBookmarkFolder && // we should ignore tabs from bookmark folder: they should be handled by tryHandlTabBunchesFromBookmarks
+        configs.autoGroupNewTabsFromOthers) {
+      const granted = await confirmToAutoGroupNewTabsFromOthers(fromOthers);
+      if (granted)
+        await TabsGroup.groupTabs(newRootTabs, {
+          ...TabsGroup.temporaryStateParams(configs.groupTabTemporaryStateForNewTabsFromOthers),
+          broadcast: true
+        });
+    }
+  }
+  catch(error) {
+    log('Error on tryGroupTabBunches: ', String(error), error.stack);
+  }
+  finally {
+    tryGroupTabBunches.running = false;
+    if (mPossibleTabBunchesToBeGrouped.length > 0)
+      tryGroupTabBunches();
+  }
+}
+
+async function confirmToAutoGroupNewTabsFromOthers(tabs) {
+  if (tabs.length <= 1 ||
+      !configs.warnOnAutoGroupNewTabs)
+    return true;
+
+  const windowId = tabs[0].windowId;
+  const win = await browser.windows.get(windowId);
+
+  const listing = configs.warnOnAutoGroupNewTabsWithListing ?
+    Dialog.tabsToHTMLList(tabs, {
+      maxRows:   configs.warnOnAutoGroupNewTabsWithListingMaxRows,
+      maxHeight: Math.round(win.height * 0.8),
+      maxWidth:  Math.round(win.width * 0.75)
+    }) :
+    '';
+  const result = await Dialog.show(win, {
+    content: `
+      <div>${sanitizeForHTMLText(browser.i18n.getMessage('warnOnAutoGroupNewTabs_message', [tabs.length]))}</div>${listing}
+    `.trim(),
+    buttons: [
+      browser.i18n.getMessage('warnOnAutoGroupNewTabs_close'),
+      browser.i18n.getMessage('warnOnAutoGroupNewTabs_cancel')
+    ],
+    checkMessage: browser.i18n.getMessage('warnOnAutoGroupNewTabs_warnAgain'),
+    checked: true,
+    modal: true, // for popup
+    type:  'common-dialog', // for popup
+    url:   ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'), // for popup
+    title: browser.i18n.getMessage('warnOnAutoGroupNewTabs_title'), // for popup
+    onShownInPopup(container) {
+      setTimeout(() => { // because window.requestAnimationFrame is decelerate for an invisible document.
+        // this need to be done on the next tick, to use the height of the box for calculation of dialog size
+        const style = container.querySelector('ul').style;
+        style.height = '0px'; // this makes the box shrinkable
+        style.maxHeight = 'none';
+        style.minHeight = '0px';
+      }, 0);
+    }
+  });
+
+  switch (result.buttonIndex) {
+    case 0:
+      if (!result.checked)
+        configs.warnOnAutoGroupNewTabs = false;
+      return true;
+    case 1:
+      if (!result.checked) {
+        configs.warnOnAutoGroupNewTabs = false;
+        configs.autoGroupNewTabsFromOthers = false;
+      }
+    default:
+      return false;
+  }
+}
+
+async function tryGroupTabBunchesFromPinnedOpener(rootTabs) {
+  log(`tryGroupTabBunchesFromPinnedOpener: ${rootTabs.length} root tabs are opened from pinned tabs`);
+
+  // First, collect pinned opener tabs.
+  let pinnedOpeners = [];
+  const childrenOfPinnedTabs = {};
+  for (const tab of rootTabs) {
+    const opener = tab.$TST.openerTab;
+    if (!pinnedOpeners.includes(opener))
+      pinnedOpeners.push(opener);
+  }
+  log('pinnedOpeners ', () => pinnedOpeners.map(dumpTab));
+
+  // Second, collect tabs opened from pinned openers including existing tabs
+  // (which were left ungrouped in previous process).
+  const openerOf = {};
+  const allRootTabs = await Tab.getRootTabs(rootTabs[0].windowId)
+  for (const tab of allRootTabs) {
+    if (tab.$TST.getAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER))
+      continue;
+    if (rootTabs.includes(tab)) { // newly opened tab
+      const opener = tab.$TST.openerTab;
+      if (!opener)
+        continue;
+      openerOf[tab.id] = opener;
+      const tabs = childrenOfPinnedTabs[opener.id] || [];
+      childrenOfPinnedTabs[opener.id] = tabs.concat([tab]);
+      continue;
+    }
+    const opener = Tab.getByUniqueId(tab.$TST.getAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID));
+    if (!opener ||
+        !(opener.pinned || isFirefoxViewTab(opener)) ||
+        opener.windowId != tab.windowId)
+      continue;
+    // existing and not yet grouped tab
+    if (!pinnedOpeners.includes(opener))
+      pinnedOpeners.push(opener);
+    openerOf[tab.id] = opener;
+    const tabs = childrenOfPinnedTabs[opener.id] || [];
+    childrenOfPinnedTabs[opener.id] = tabs.concat([tab]);
+  }
+
+  // Ignore pinned openeres which has no child tab to be grouped.
+  pinnedOpeners = pinnedOpeners.filter(opener => {
+    return childrenOfPinnedTabs[opener.id].length > 1 || Tab.getGroupTabForOpener(opener);
+  });
+  log(' => ', () => pinnedOpeners.map(dumpTab));
+
+  // Move newly opened tabs to expected position before grouping!
+  // Note that we should refer "insertNewChildAt" instead of "insertNewTabFromPinnedTabAt" / "insertNewTabFromFirefoxViewAt"
+  // because these children are going to be controlled in a sub tree.
+  for (const tab of rootTabs.slice(0).sort((a, b) => a.id - b.id)/* process them in the order they were opened */) {
+    const opener   = openerOf[tab.id];
+    const siblings = tab.$TST.needToBeGroupedSiblings;
+    if (!pinnedOpeners.includes(opener) ||
+        Tab.getGroupTabForOpener(opener) ||
+        siblings.length == 0 ||
+        tab.$TST.temporaryMetadata.has('alreadyMovedAsOpenedFromPinnedOpener'))
+      continue;
+    let refTabs = {};
+    try {
+      refTabs = Tree.getReferenceTabsForNewChild(tab, null, {
+        lastRelatedTab: opener.$TST.previousLastRelatedTab,
+        parent:         siblings[0],
+        children:       siblings,
+        descendants:    siblings.map(sibling => [sibling, ...sibling.$TST.descendants]).flat()
+      });
+    }
+    catch(_error) {
+      // insertChildAt == "no control" case
+    }
+    if (refTabs.insertAfter) {
+      await Tree.moveTabSubtreeAfter(
+        tab,
+        refTabs.insertAfter,
+        { broadcast: true }
+      );
+      log(`newly opened child ${tab.id} has been moved after ${refTabs.insertAfter?.id}`);
+    }
+    else if (refTabs.insertBefore) {
+      await Tree.moveTabSubtreeBefore(
+        tab,
+        refTabs.insertBefore,
+        { broadcast: true }
+      );
+      log(`newly opened child ${tab.id} has been moved before ${refTabs.insertBefore?.id}`);
+    }
+    else {
+      continue;
+    }
+    tab.$TST.temporaryMetadata.set('alreadyMovedAsOpenedFromPinnedOpener', true);
+  }
+
+  // Finally, try to group opened tabs.
+  const newGroupTabs = new Map();
+  for (const opener of pinnedOpeners) {
+    const children = childrenOfPinnedTabs[opener.id].sort((a, b) => a.index - b.index);
+    let parent = Tab.getGroupTabForOpener(opener);
+    if (parent) {
+      for (const child of children) {
+        TabsStore.removeToBeGroupedTab(child);
+      }
+      continue;
+    }
+    log(`trying to group children of ${dumpTab(opener)}: `, () => children.map(dumpTab));
+    const uri = TabsGroup.makeGroupTabURI({
+      title:       browser.i18n.getMessage('groupTab_fromPinnedTab_label', opener.title),
+      openerTabId: opener.$TST.uniqueId.id,
+      ...TabsGroup.temporaryStateParams(isFirefoxViewTab(opener) ? configs.groupTabTemporaryStateForChildrenOfFirefoxView : configs.groupTabTemporaryStateForChildrenOfPinned)
+    });
+    parent = await TabsOpen.openURIInTab(uri, {
+      windowId:     opener.windowId,
+      insertBefore: children[0],
+      cookieStoreId: opener.cookieStoreId,
+      inBackground: true
+    });
+    log('opened group tab: ', dumpTab(parent));
+    newGroupTabs.set(opener, true);
+    for (const child of children) {
+      // Prevent the tab to be grouped again after it is ungrouped manually.
+      child.$TST.setAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER, true);
+      TabsStore.removeToBeGroupedTab(child);
+      await Tree.attachTabTo(child, parent, {
+        forceExpand: true, // this is required to avoid the group tab itself is active from active tab in collapsed tree
+        dontMove:    true,
+        broadcast:   true
+      });
+    }
+    if (opener.active)
+      parent.$TST.addState(Constants.kTAB_STATE_BUNDLED_ACTIVE);
+  }
+  return true;
+}
+
+async function tryHandlTabBunchesFromBookmarks() {
+  if (tryHandlTabBunchesFromBookmarks.running)
+    return;
+
+  const tabReferences = mPossibleTabBunchesFromBookmarks.shift();
+  if (!tabReferences)
+    return;
+
+  log('tryHandlTabBunchesFromBookmarks for ', tabReferences);
+  tryHandlTabBunchesFromBookmarks.running = true;
+  try {
+    const tabs = [];
+    for (const tabReference of tabReferences) {
+      const tab = Tab.get(tabReference.id);
+      if (!tab)
+        continue;
+      if (tabReference.openerTabId)
+        tab.openerTabId = parseInt(tabReference.openerTabId); // restore the opener information
+      const uniqueId = tab.$TST.uniqueId;
+      if (uniqueId.duplicated || uniqueId.restored)
+        continue;
+      tabs.push(tab);
+    }
+    log(' => ', { tabs });
+
+    // We can assume that new tabs from a bookmark folder and from other
+    // sources won't be mixed.
+    const openedFromBookmarkFolder = tabs.length > 0 && await detectBookmarkFolderFromTabs(tabs, tabReferences.length);
+    log(' => tryHandlTabBunchesFromBookmarks:openedFromBookmarkFolder: ', openedFromBookmarkFolder);
+    if (openedFromBookmarkFolder) {
+      if (configs.restoreTreeForTabsFromBookmarks) {
+        log(' ==> trying to restore tree structure from bookmark information');
+        const structure = await Bookmark.getTreeStructureFromBookmarkFolder(openedFromBookmarkFolder.folder);
+        log(' ==> structure:', structure);
+        if (structure.length == openedFromBookmarkFolder.tabs.length) {
+          log(' ===> apply');
+          await Tree.applyTreeStructureToTabs(openedFromBookmarkFolder.tabs, structure);
+        }
+      }
+
+      const newRootTabs = Tab.collectRootTabs(TreeItem.sort(openedFromBookmarkFolder.tabs));
+      if (newRootTabs.length > 1 &&
+          configs.autoGroupNewTabsFromBookmarks &&
+          tabReferences.every(tabReference => !tabReference.shouldNotGrouped)) {
+        log(' => tryHandlTabBunchesFromBookmarks:group');
+        await TabsGroup.groupTabs(openedFromBookmarkFolder.tabs, {
+          ...TabsGroup.temporaryStateParams(configs.groupTabTemporaryStateForNewTabsFromBookmarks),
+          broadcast: true
+        });
+      }
+    }
+  }
+  catch(error) {
+    log('Error on tryHandlTabBunchesFromBookmarks: ', String(error), error.stack);
+  }
+  finally {
+    tryHandlTabBunchesFromBookmarks.running = false;
+    if (mPossibleTabBunchesFromBookmarks.length > 0)
+      tryHandlTabBunchesFromBookmarks();
+  }
+}
+
+async function detectBookmarkFolderFromTabs(tabs, allNewTabsCount = tabs.length) {
+  log('detectBookmarkFolderFromTabs: ', tabs, allNewTabsCount);
+  return new Promise((resolve, _reject) => {
+    const maybeFromBookmarks = [];
+    let restCount = tabs.length;
+    for (const tab of tabs) {
+      tab.$TST.promisedPossibleOpenerBookmarks.then(async bookmarks => {
+        log(` bookmarks from tab ${tab.id}: `, bookmarks);
+        restCount--;
+        if (bookmarks.length > 0)
+          maybeFromBookmarks.push(tab);
+        const folder = await tryDetectMostTabsContainedBookmarkFolder(maybeFromBookmarks, allNewTabsCount);
+        if (folder) {
+          log('detectBookmarkFolderFromTabs: found folder => ', { folder, tabs });
+          resolve({
+            folder,
+            tabs: maybeFromBookmarks,
+          });
+        }
+        else if (restCount == 0) {
+          resolve(null);
+        }
+      });
+    }
+  });
+}
+
+async function tryDetectMostTabsContainedBookmarkFolder(bookmarkedTabs, allNewTabsCount = bookmarkedTabs.length) {
+  log('tryDetectMostTabsContainedBookmarkFolder ', { bookmarkedTabs, allNewTabsCount });
+  const parentIds = bookmarkedTabs.map(tab => tab.$TST.possibleOpenerBookmarks.map(bookmark => bookmark.parentId)).flat();
+  const counts    = [];
+  const countById = {};
+  for (const id of parentIds) {
+    if (!(id in countById))
+      counts.push(countById[id] = { id, count: 0 });
+    countById[id].count++;
+  }
+  log(' counts: ', counts);
+  if (counts.length == 0)
+    return null;
+
+  const greatestCountParent = counts.sort((a, b) => b.count - a.count)[0];
+  const minCount = allNewTabsCount * configs.tabsFromSameFolderMinThresholdPercentage / 100;
+  log(' => ', { greatestCountParent, minCount });
+  if (greatestCountParent.count <= minCount)
+    return null;
+
+  const items = await browser.bookmarks.get(greatestCountParent.id);
+  return Array.isArray(items) ? items[0] : items;
+}
+
+
+// Detect tabs sent from other device with `browser.tabs.insertAfterCurrent`=true based on their index
+// (Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1596787 )
+// See also: https://github.com/piroor/treestyletab/issues/2419
+function areTabsFromOtherDeviceWithInsertAfterCurrent(tabReferences) {
+  if (tabReferences.length == 0)
+    return false;
+
+  const activeTab = Tab.getActiveTab(tabReferences[0].windowId);
+  if (!activeTab)
+    return false;
+
+  const activeIndex        = activeTab.index;
+  const followingTabsCount = Tab.getTabs(activeTab.windowId).filter(tab => tab.index > activeIndex).length;
+
+  const createdCount    = tabReferences.length;
+  const expectedIndices = [activeIndex + 1];
+  const actualIndices   = tabReferences.map(tabReference => tabReference.indexOnCreated);
+
+  const overTabsCount = Math.max(0, createdCount - followingTabsCount);
+  const shouldCountDown = Math.min(createdCount - 1, createdCount - Math.floor(overTabsCount / 2));
+  const shouldCountUp = createdCount - shouldCountDown - 1;
+  for (let i = 0; i < shouldCountUp; i++) {
+    expectedIndices.push(activeIndex + 2 + i + (createdCount - overTabsCount));
+  }
+  for (let i = shouldCountDown - 1; i > -1; i--) {
+    expectedIndices.push(activeIndex + 1 + i);
+  }
+  const received = actualIndices.join(',') == expectedIndices.join(',');
+  log('areTabsFromOtherDeviceWithInsertAfterCurrent:', received, { overTabsCount, shouldCountUp, shouldCountDown, size: expectedIndices.length, actualIndices, expectedIndices });
+  return received;
+}
diff --git a/waterfox/browser/components/sidebar/background/handle-tab-focus.js b/waterfox/browser/components/sidebar/background/handle-tab-focus.js
new file mode 100644
index 0000000000000..0351e52c7efaf
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-tab-focus.js
@@ -0,0 +1,471 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  wait,
+  configs,
+  isMacOS,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as Background from './background.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/handle-tab-focus', ...args);
+}
+
+
+const PHASE_LOADING                = 0;
+const PHASE_BACKGROUND_INITIALIZED = 1;
+const PHASE_BACKGROUND_BUILT       = 2;
+const PHASE_BACKGROUND_READY       = 3;
+let mInitializationPhase = PHASE_LOADING;
+
+Background.onInit.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_INITIALIZED;
+});
+Background.onBuilt.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_BUILT;
+});
+Background.onReady.addListener(() => {
+  mInitializationPhase = PHASE_BACKGROUND_READY;
+});
+
+
+let mTabSwitchedByShortcut       = false;
+let mMaybeTabSwitchingByShortcut = false;
+
+const mLastTabsCountInWindow = new Map();
+
+Window.onInitialized.addListener(win => {
+  browser.tabs.query({
+    windowId: win.id,
+    active:   true
+  })
+    .then(activeTabs => {
+      // There may be no active tab on a startup...
+      if (activeTabs.length > 0 &&
+          !win.lastActiveTab)
+        win.lastActiveTab = activeTabs[0].id;
+    });
+});
+
+browser.windows.onRemoved.addListener(windowId => {
+  mLastTabsCountInWindow.delete(windowId);
+});
+
+
+Tab.onActivating.addListener(async (tab, info = {}) => { // return false if the activation should be canceled
+  log('Tabs.onActivating ', { tab: dumpTab(tab), info, mMaybeTabSwitchingByShortcut });
+
+  if (mMaybeTabSwitchingByShortcut) {
+    const lastCount = mLastTabsCountInWindow.get(tab.windowId);
+    const count = Tab.getAllTabs(tab.windowId).length;
+    if (lastCount != count) {
+      log('tabs are created or removed: cancel tab switching');
+      mMaybeTabSwitchingByShortcut = false;
+    }
+    mLastTabsCountInWindow.set(tab.windowId, count);
+  }
+
+  if (tab.$TST.temporaryMetadata.has('shouldReloadOnSelect')) {
+    browser.tabs.reload(tab.id)
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    tab.$TST.temporaryMetadata.delete('shouldReloadOnSelect');
+  }
+  const win = TabsStore.windows.get(tab.windowId);
+  log('  lastActiveTab: ', win.lastActiveTab); // it may be blank on a startup
+  const lastActiveTab = Tab.get(win.lastActiveTab || info.previousTabId);
+  cancelDelayedExpand(lastActiveTab);
+  const shouldSkipCollapsed = (
+    !info.byInternalOperation &&
+    mMaybeTabSwitchingByShortcut &&
+    configs.skipCollapsedTabsForTabSwitchingShortcuts
+  );
+  mTabSwitchedByShortcut = mMaybeTabSwitchingByShortcut;
+  const focusDirection = !lastActiveTab ?
+    0 :
+    (!lastActiveTab.$TST.nearestVisiblePrecedingTab &&
+     !tab.$TST.nearestVisibleFollowingTab) ?
+      -1 :
+      (!lastActiveTab.$TST.nearestVisibleFollowingTab &&
+       !tab.$TST.nearestVisiblePrecedingTab) ?
+        1 :
+        (lastActiveTab.index > tab.index) ?
+          -1 :
+          1;
+  const cache = {};
+  if (tab.$TST.collapsed) {
+    if (!tab.$TST.parent) {
+      // This is invalid case, generally never should happen,
+      // but actually happen on some environment:
+      // https://github.com/piroor/treestyletab/issues/1717
+      // So, always expand orphan collapsed tab as a failsafe.
+      Tree.collapseExpandTab(tab, {
+        collapsed: false,
+        broadcast: true
+      });
+      await handleNewActiveTab(tab, info);
+    }
+    else if (!shouldSkipCollapsed) {
+      log('=> reaction for focus given from outside of TST');
+      let allowed = false;
+      if (configs.unfocusableCollapsedTab) {
+        log('  => apply unfocusableCollapsedTab');
+        allowed = await TSTAPI.tryOperationAllowed(
+          TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_COLLAPSED_TAB,
+          { tab,
+            focusDirection },
+          { tabProperties: ['tab'], cache }
+        );
+        TSTAPI.clearCache(cache);
+        if (allowed) {
+          const toBeExpandedAncestors = [tab].concat(tab.$TST.ancestors) ;
+          for (const ancestor of toBeExpandedAncestors) {
+            Tree.collapseExpandSubtree(ancestor, {
+              collapsed: false,
+              broadcast: true
+            });
+          }
+        }
+        else {
+          log('  => canceled by someone.');
+        }
+      }
+      info.allowed = allowed;
+      await handleNewActiveTab(tab, info);
+    }
+    if (shouldSkipCollapsed) {
+      log('=> reaction for focusing collapsed descendant while Ctrl-Tab/Ctrl-Shift-Tab');
+      let successor = tab.$TST.nearestVisibleAncestorOrSelf;
+      if (!successor) // this seems invalid case...
+        return false;
+      log('successor = ', successor.id);
+      if (shouldSkipCollapsed &&
+          (win.lastActiveTab == successor.id ||
+           successor.$TST.descendants.some(tab => tab.id == win.lastActiveTab)) &&
+          focusDirection > 0) {
+        log('=> redirect successor (focus moved from the successor itself or its descendants)');
+        successor = successor.$TST.nearestVisibleFollowingTab;
+        if (successor &&
+            successor.discarded &&
+            configs.avoidDiscardedTabToBeActivatedIfPossible)
+          successor = successor.$TST.nearestLoadedTabInTree ||
+                        successor.$TST.nearestLoadedTab ||
+                        successor;
+        if (!successor)
+          successor = Tab.getFirstVisibleTab(tab.windowId);
+        log('=> ', successor.id);
+      }
+      else if (!mTabSwitchedByShortcut && // intentional focus to a discarded tabs by Ctrl-Tab/Ctrl-Shift-Tab is always allowed!
+               successor.discarded &&
+               configs.avoidDiscardedTabToBeActivatedIfPossible) {
+        log('=> redirect successor (successor is discarded)');
+        successor = successor.$TST.nearestLoadedTabInTree ||
+                      successor.$TST.nearestLoadedTab ||
+                      successor;
+        log('=> ', successor.id);
+      }
+      const allowed = await TSTAPI.tryOperationAllowed(
+        TSTAPI.kNOTIFY_TRY_REDIRECT_FOCUS_FROM_COLLAPSED_TAB,
+        { tab,
+          focusDirection },
+        { tabProperties: ['tab'], cache }
+      );
+      TSTAPI.clearCache(cache);
+      if (allowed) {
+        win.lastActiveTab = successor.id;
+        if (mMaybeTabSwitchingByShortcut)
+          setupDelayedExpand(successor);
+        TabsInternalOperation.activateTab(successor, { silently: true });
+        log('Tabs.onActivating: discarded? ', dumpTab(tab), tab?.discarded);
+        if (tab.discarded)
+          tab.$TST.temporaryMetadata.set('discardURLAfterCompletelyLoaded', tab.url);
+        return false;
+      }
+      else {
+        log('  => canceled by someone.');
+      }
+    }
+  }
+  else if (info.byActiveTabRemove &&
+           (!configs.autoCollapseExpandSubtreeOnSelect ||
+            configs.autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove)) {
+    log('=> reaction for removing current tab');
+    win.lastActiveTab = tab.id;
+    tryHighlightBundledTab(tab, {
+      ...info,
+      shouldSkipCollapsed
+    });
+    return true;
+  }
+  else if (tab.$TST.hasChild &&
+           tab.$TST.subtreeCollapsed &&
+           !shouldSkipCollapsed) {
+    log('=> reaction for newly active parent tab');
+    await handleNewActiveTab(tab, info);
+  }
+  tab.$TST.temporaryMetadata.delete('discardOnCompletelyLoaded');
+  win.lastActiveTab = tab.id;
+
+  if (mMaybeTabSwitchingByShortcut)
+    setupDelayedExpand(tab);
+  else
+    tryHighlightBundledTab(tab, {
+      ...info,
+      shouldSkipCollapsed
+    });
+
+  return true;
+});
+
+async function handleNewActiveTab(tab, { allowed, silently } = {}) {
+  log('handleNewActiveTab: ', dumpTab(tab), { allowed, silently });
+  const shouldCollapseExpandNow = configs.autoCollapseExpandSubtreeOnSelect;
+  const canCollapseTree         = shouldCollapseExpandNow;
+  const canExpandTree           = shouldCollapseExpandNow && !silently;
+  if (canExpandTree &&
+      allowed !== false) {
+    const cache = {};
+    const allowed = await TSTAPI.tryOperationAllowed(
+      tab.active ?
+        TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_PARENT :
+        TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_BUNDLED_PARENT,
+      { tab },
+      { tabProperties: ['tab'], cache }
+    );
+    if (!allowed)
+      return;
+    if (canCollapseTree &&
+        configs.autoExpandIntelligently)
+      await Tree.collapseExpandTreesIntelligentlyFor(tab, {
+        broadcast: true
+      });
+    else
+      Tree.collapseExpandSubtree(tab, {
+        collapsed: false,
+        broadcast: true
+      });
+  }
+}
+
+async function tryHighlightBundledTab(tab, { shouldSkipCollapsed, allowed, silently } = {}) {
+  const bundledTab = tab.$TST.bundledTab;
+  const oldBundledTabs = TabsStore.bundledActiveTabsInWindow.get(tab.windowId);
+  log('tryHighlightBundledTab ', {
+    tab: tab.id,
+    bundledTab: bundledTab?.id,
+    oldBundledTabs,
+    shouldSkipCollapsed,
+    allowed,
+    silently,
+  });
+  for (const tab of oldBundledTabs.values()) {
+    if (tab == bundledTab)
+      continue;
+    tab.$TST.removeState(Constants.kTAB_STATE_BUNDLED_ACTIVE);
+  }
+
+  if (!bundledTab)
+    return;
+
+  bundledTab.$TST.addState(Constants.kTAB_STATE_BUNDLED_ACTIVE);
+
+  await wait(100);
+  if (!tab.active || // ignore tab already inactivated while waiting
+      tab.$TST.hasOtherHighlighted || // ignore manual highlighting
+      bundledTab.pinned ||
+      !configs.syncActiveStateToBundledTabs)
+    return;
+
+  if (bundledTab.$TST.hasChild &&
+      bundledTab.$TST.subtreeCollapsed &&
+      !shouldSkipCollapsed)
+    await handleNewActiveTab(bundledTab, { allowed, silently });
+}
+
+Tab.onUpdated.addListener((tab, changeInfo = {}) => {
+  if ('url' in changeInfo) {
+    if (tab.$TST.temporaryMetadata.has('discardURLAfterCompletelyLoaded') &&
+        tab.$TST.temporaryMetadata.get('discardURLAfterCompletelyLoaded') != changeInfo.url)
+      tab.$TST.temporaryMetadata.delete('discardURLAfterCompletelyLoaded');
+  }
+});
+
+Tab.onStateChanged.addListener(tab => {
+  if (!tab ||
+      tab.status != 'complete')
+    return;
+
+  if (typeof browser.tabs.discard == 'function') {
+    if (tab.url == tab.$TST.temporaryMetadata.get('discardURLAfterCompletelyLoaded') &&
+        configs.autoDiscardTabForUnexpectedFocus) {
+      log('Try to discard accidentally restored tab (on restored) ', dumpTab(tab));
+      wait(configs.autoDiscardTabForUnexpectedFocusDelay).then(() => {
+        if (!TabsStore.ensureLivingItem(tab) ||
+            tab.active)
+          return;
+        if (tab.status == 'complete')
+          browser.tabs.discard(tab.id)
+            .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        else
+          tab.$TST.temporaryMetadata.set('discardOnCompletelyLoaded', true);
+      });
+    }
+    else if (tab.$TST.temporaryMetadata.has('discardOnCompletelyLoaded') && !tab.active) {
+      log('Discard accidentally restored tab (on complete) ', dumpTab(tab));
+      browser.tabs.discard(tab.id)
+        .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    }
+  }
+  tab.$TST.temporaryMetadata.delete('discardURLAfterCompletelyLoaded');
+  tab.$TST.temporaryMetadata.delete('discardOnCompletelyLoaded');
+});
+
+async function setupDelayedExpand(tab) {
+  if (!tab)
+    return;
+  cancelDelayedExpand(tab);
+  TabsStore.removeToBeExpandedTab(tab);
+  const cache = {};
+  const [ctrlTabHandlingEnabled, allowedToExpandViaAPI] = await Promise.all([
+    Permissions.isGranted(Permissions.ALL_URLS),
+    TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_LONG_PRESS_CTRL_KEY,
+      { tab },
+      { tabProperties: ['tab'], cache }
+    ),
+  ]);
+  if (!configs.autoExpandOnTabSwitchingShortcuts ||
+      !tab.$TST.hasChild ||
+      !tab.$TST.subtreeCollapsed ||
+      !ctrlTabHandlingEnabled ||
+      !allowedToExpandViaAPI)
+    return;
+  TabsStore.addToBeExpandedTab(tab);
+  tab.$TST.temporaryMetadata.set('delayedExpand', setTimeout(async () => {
+    if (!tab.$TST.temporaryMetadata.has('delayedExpand')) { // already canceled
+      log('delayed expand is already canceled ', tab.id);
+      return;
+    }
+    log('delayed expand by long-press of ctrl key on ', tab.id);
+    TabsStore.removeToBeExpandedTab(tab);
+    await Tree.collapseExpandTreesIntelligentlyFor(tab, {
+      broadcast: true
+    });
+  }, configs.autoExpandOnTabSwitchingShortcutsDelay));
+}
+
+function cancelDelayedExpand(tab) {
+  if (!tab ||
+      !tab.$TST.temporaryMetadata.has('delayedExpand'))
+    return;
+  clearTimeout(tab.$TST.temporaryMetadata.get('delayedExpand'));
+  tab.$TST.temporaryMetadata.delete('delayedExpand');
+  TabsStore.removeToBeExpandedTab(tab);
+}
+
+function cancelAllDelayedExpand(windowId) {
+  for (const tab of TabsStore.toBeExpandedTabsInWindow.get(windowId)) {
+    cancelDelayedExpand(tab);
+  }
+}
+
+Tab.onCollapsedStateChanged.addListener((tab, info = {}) => {
+  tab.$TST.toggleState(Constants.kTAB_STATE_COLLAPSED_DONE, info.collapsed, { broadcast: false });
+});
+
+
+Background.onReady.addListener(() => {
+  for (const tab of Tab.getAllTabs(null, { iterator: true })) {
+    tab.$TST.removeState(Constants.kTAB_STATE_BUNDLED_ACTIVE);
+  }
+  for (const tab of Tab.getActiveTabs({ iterator: true })) {
+    tryHighlightBundledTab(tab);
+  }
+});
+
+browser.windows.onFocusChanged.addListener(() => {
+  mMaybeTabSwitchingByShortcut = false;
+});
+
+browser.runtime.onMessage.addListener(onMessage);
+
+function onMessage(message, sender) {
+  if (mInitializationPhase < PHASE_BACKGROUND_BUILT ||
+      !message ||
+      typeof message.type != 'string')
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case Constants.kNOTIFY_TAB_MOUSEDOWN:
+      mMaybeTabSwitchingByShortcut =
+        mTabSwitchedByShortcut = false;
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_MAY_START_TAB_SWITCH: {
+      if (message.modifier != (configs.accelKey || (isMacOS() ? 'meta' : 'control')))
+        return;
+      log('kCOMMAND_NOTIFY_MAY_START_TAB_SWITCH ', message.modifier);
+      mMaybeTabSwitchingByShortcut = true;
+      if (sender.tab?.active) {
+        const win = TabsStore.windows.get(sender.tab.windowId);
+        win.lastActiveTab = sender.tab.id;
+      }
+      if (sender.tab)
+        mLastTabsCountInWindow.set(sender.tab.windowId, Tab.getAllTabs(sender.tab.windowId).length);
+    }; break;
+    case Constants.kCOMMAND_NOTIFY_MAY_END_TAB_SWITCH:
+      if (message.modifier != (configs.accelKey || (isMacOS() ? 'meta' : 'control')))
+        return;
+      log('kCOMMAND_NOTIFY_MAY_END_TAB_SWITCH ', message.modifier);
+      return (async () => {
+        if (mTabSwitchedByShortcut &&
+            configs.skipCollapsedTabsForTabSwitchingShortcuts &&
+            sender.tab) {
+          await Tab.waitUntilTracked(sender.tab.id);
+          let tab = Tab.get(sender.tab.id);
+          if (!tab) {
+            let tabs = await browser.tabs.query({ currentWindow: true, active: true }).catch(ApiTabs.createErrorHandler());
+            if (tabs.length == 0)
+              tabs = await browser.tabs.query({ currentWindow: true }).catch(ApiTabs.createErrorHandler());
+            await Tab.waitUntilTracked(tabs[0].id);
+            tab = Tab.get(tabs[0].id);
+          }
+          cancelAllDelayedExpand(tab.windowId);
+          const cache = {};
+          if (configs.autoCollapseExpandSubtreeOnSelect &&
+              tab &&
+              TabsStore.windows.get(tab.windowId).lastActiveTab == tab.id &&
+              (await TSTAPI.tryOperationAllowed(
+                TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_END_TAB_SWITCH,
+                { tab },
+                { tabProperties: ['tab'], cache }
+              ))) {
+            Tree.collapseExpandSubtree(tab, {
+              collapsed: false,
+              broadcast: true
+            });
+          }
+        }
+        mMaybeTabSwitchingByShortcut =
+          mTabSwitchedByShortcut = false;
+      })();
+  }
+}
diff --git a/waterfox/browser/components/sidebar/background/handle-tab-multiselect.js b/waterfox/browser/components/sidebar/background/handle-tab-multiselect.js
new file mode 100644
index 0000000000000..3ebb7921e77df
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-tab-multiselect.js
@@ -0,0 +1,38 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+function log(...args) {
+  internalLogger('background/handle-tab-multiselect', ...args);
+}
+
+Tab.onUpdated.addListener((tab, info, options = {}) => {
+  if (!('highlighted' in info) ||
+      !tab.$TST.subtreeCollapsed ||
+      tab.$TST.collapsed ||
+      !tab.$TST.multiselected ||
+      !options.inheritHighlighted)
+    return;
+
+  const collapsedDescendants = tab.$TST.descendants;
+  log('inherit highlighted state from root visible tab: ', {
+    highlighted: info.highlighted,
+    collapsedDescendants
+  });
+  for (const descendant of collapsedDescendants) {
+    browser.tabs.update(descendant.id, {
+      highlighted: info.highlighted,
+      active:      descendant.active
+    }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/handle-tree-changes.js b/waterfox/browser/components/sidebar/background/handle-tree-changes.js
new file mode 100644
index 0000000000000..c4266c14f23b3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/handle-tree-changes.js
@@ -0,0 +1,140 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import * as Background from './background.js';
+import * as BackgroundCache from './background-cache.js';
+import * as Tree from './tree.js';
+import * as TreeStructure from './tree-structure.js';
+
+function log(...args) {
+  internalLogger('background/handle-tree-changes', ...args);
+}
+
+let mInitialized = false;
+
+function reserveDetachHiddenTab(tab) {
+  reserveDetachHiddenTab.tabs.add(tab);
+  if (reserveDetachHiddenTab.reserved)
+    clearTimeout(reserveDetachHiddenTab.reserved);
+  reserveDetachHiddenTab.reserved = setTimeout(async () => {
+    delete reserveDetachHiddenTab.reserved;
+    const tabs = new Set(TreeItem.sort(Array.from(reserveDetachHiddenTab.tabs)));
+    reserveDetachHiddenTab.tabs.clear();
+    log('try to detach hidden tabs: ', tabs);
+    for (const tab of tabs) {
+      if (!TabsStore.ensureLivingItem(tab))
+        continue;
+      for (const descendant of tab.$TST.descendants) {
+        if (descendant.hidden)
+          continue;
+        const nearestVisibleAncestor = descendant.$TST.ancestors.find(ancestor => !ancestor.hidden && !tabs.has(ancestor));
+        if (nearestVisibleAncestor &&
+            nearestVisibleAncestor == descendant.$TST.parent)
+          continue;
+        for (const ancestor of descendant.$TST.ancestors) {
+          if (!ancestor.hidden &&
+              !ancestor.$TST.collapsed)
+            break;
+          if (!ancestor.$TST.subtreeCollapsed)
+            continue;
+          await Tree.collapseExpandSubtree(ancestor, {
+            collapsed: false,
+            broadcast: true
+          });
+        }
+        if (nearestVisibleAncestor) {
+          log(` => reattach descendant ${descendant.id} to ${nearestVisibleAncestor.id}`);
+          await Tree.attachTabTo(descendant, nearestVisibleAncestor, {
+            dontMove:  true,
+            broadcast: true
+          });
+        }
+        else {
+          log(` => detach descendant ${descendant.id}`);
+          await Tree.detachTab(descendant, {
+            broadcast: true
+          });
+        }
+      }
+      if (tab.$TST.hasParent &&
+          !tab.$TST.parent.hidden) {
+        log(` => detach hidden tab ${tab.id}`);
+        await Tree.detachTab(tab, {
+          broadcast: true
+        });
+      }
+    }
+  }, 100);
+}
+reserveDetachHiddenTab.tabs = new Set();
+
+Tab.onHidden.addListener(tab => {
+  if (configs.fixupTreeOnTabVisibilityChanged)
+    reserveDetachHiddenTab(tab);
+});
+
+function reserveAttachShownTab(tab) {
+  tab.$TST.addState(Constants.kTAB_STATE_SHOWING);
+  reserveAttachShownTab.tabs.add(tab);
+  if (reserveAttachShownTab.reserved)
+    clearTimeout(reserveAttachShownTab.reserved);
+  reserveAttachShownTab.reserved = setTimeout(async () => {
+    delete reserveAttachShownTab.reserved;
+    const tabs = new Set(TreeItem.sort(Array.from(reserveAttachShownTab.tabs)));
+    reserveAttachShownTab.tabs.clear();
+    log('try to attach shown tabs: ', tabs);
+    for (const tab of tabs) {
+      if (!TabsStore.ensureLivingItem(tab) ||
+          tab.$TST.hasParent) {
+        tab.$TST.removeState(Constants.kTAB_STATE_SHOWING);
+        continue;
+      }
+      const referenceTabs = TreeBehavior.calculateReferenceItemsFromInsertionPosition(tab, {
+        context:      Constants.kINSERTION_CONTEXT_SHOWN,
+        insertAfter:  tab.$TST.nearestVisiblePrecedingTab,
+        // Instead of nearestFollowingForeignerTab, to avoid placing the tab
+        // after hidden tabs (too far from the target)
+        insertBefore: tab.$TST.unsafeNearestFollowingForeignerTab
+      });
+      if (referenceTabs.parent) {
+        log(` => attach shown tab ${tab.id} to ${referenceTabs.parent.id}`);
+        await Tree.attachTabTo(tab, referenceTabs.parent, {
+          insertBefore: referenceTabs.insertBefore,
+          insertAfter:  referenceTabs.insertAfter,
+          broadcast:    true
+        });
+      }
+      tab.$TST.removeState(Constants.kTAB_STATE_SHOWING);
+    }
+  }, 100);
+}
+reserveAttachShownTab.tabs = new Set();
+
+Tab.onShown.addListener(tab => {
+  if (configs.fixupTreeOnTabVisibilityChanged)
+    reserveAttachShownTab(tab);
+});
+
+Background.onReady.addListener(() => {
+  mInitialized = true;
+});
+
+Tree.onSubtreeCollapsedStateChanged.addListener((tab, _info) => {
+  if (mInitialized)
+    TreeStructure.reserveToSaveTreeStructure(tab.windowId);
+  BackgroundCache.markWindowCacheDirtyFromTab(tab, Constants.kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY);
+});
diff --git a/waterfox/browser/components/sidebar/background/index-ws.js b/waterfox/browser/components/sidebar/background/index-ws.js
new file mode 100644
index 0000000000000..88de1e28b6a09
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/index-ws.js
@@ -0,0 +1,36 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import './index.js';
+
+import {
+  configs,
+} from '/common/common.js';
+import '/common/sync-provider.js';
+
+import './auto-sticky-tabs.js';
+import './handle-autoplay-blocking.js';
+import './handle-chrome-menu-commands.js';
+import './prefs.js';
+import './sharing-service.js';
+import * as TabsOpen from './tabs-open.js';
+
+browser.waterfoxBridge.initUI();
+
+TabsOpen.onForbiddenURLRequested.addListener(url => {
+  browser.waterfoxBridge.reserveToLoadForbiddenURL(url);
+});
+
+browser.waterfoxBridge.onSidebarShown.addListener(windowId => {
+  configs.sidebarVirtuallyClosedWindows = configs.sidebarVirtuallyClosedWindows.filter(id => id != windowId);
+});
+
+browser.waterfoxBridge.onSidebarHidden.addListener(windowId => {
+  if (!configs.sidebarVirtuallyClosedWindows.includes(windowId))
+    configs.sidebarVirtuallyClosedWindows = [...configs.sidebarVirtuallyClosedWindows, windowId];
+});
+
diff --git a/waterfox/browser/components/sidebar/background/index.js b/waterfox/browser/components/sidebar/background/index.js
new file mode 100644
index 0000000000000..ff99f4538e6e4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/index.js
@@ -0,0 +1,48 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log,
+  configs
+} from '/common/common.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab } from '/common/TreeItem.js';
+
+import * as Background from './background.js';
+import './handle-misc.js';
+import './handle-moved-tabs.js';
+import './handle-new-tabs.js';
+import './handle-removed-tabs.js';
+import './handle-tab-bunches.js';
+import './handle-tab-focus.js';
+import './handle-tab-multiselect.js';
+import './handle-tree-changes.js';
+import './sync-background.js';
+
+log.context = 'BG';
+
+MetricsData.add('index: Loaded');
+
+window.addEventListener('DOMContentLoaded', Background.init, { once: true });
+
+window.dumpMetricsData = () => {
+  return MetricsData.toString();
+};
+window.dumpLogs = () => {
+  return log.logs.join('\n');
+};
+
+// for old debugging method
+window.log = log;
+window.gMetricsData = MetricsData;
+window.Tab = Tab;
+window.TabsStore = TabsStore;
+window.SidebarConnection = SidebarConnection;
+window.configs = configs;
diff --git a/waterfox/browser/components/sidebar/background/migration.js b/waterfox/browser/components/sidebar/background/migration.js
new file mode 100644
index 0000000000000..677ce6d4a5601
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/migration.js
@@ -0,0 +1,505 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  saveUserStyleRules,
+  notify,
+  wait,
+  isLinux,
+  isMacOS,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+
+// eslint-disable-next-line no-unused-vars
+function log(...args) {
+  internalLogger('background/migration', ...args);
+}
+
+const kCONFIGS_VERSION = 33;
+const kFEATURES_VERSION = 9;
+
+export function migrateConfigs() {
+  switch (configs.configsVersion) {
+    case 0:
+    case 1:
+      if (configs.startDragTimeout !== null)
+        configs.longPressDuration = configs.startDragTimeout;
+      if (configs.emulateDefaultContextMenu !== null)
+        configs.emulateDefaultContextMenu = configs.emulateDefaultContextMenu;
+
+    case 2:
+      if (configs.simulateSelectOwnerOnClose !== null &&
+          !configs.simulateSelectOwnerOnClose)
+        configs.successorTabControlLevel = Constants.kSUCCESSOR_TAB_CONTROL_NEVER;
+
+    case 3:
+      if (!(configs.tabDragBehavior & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK))
+        configs.tabDragBehavior |= Constants.kDRAG_BEHAVIOR_TEAR_OFF;
+      if (!(configs.tabDragBehaviorShift & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK))
+        configs.tabDragBehaviorShift |= Constants.kDRAG_BEHAVIOR_TEAR_OFF;
+
+    case 4:
+      if (configs.fakeContextMenu !== null)
+        configs.emulateDefaultContextMenu = configs.fakeContextMenu;
+      if (configs.context_closeTabOptions_closeTree !== null)
+        configs.context_topLevel_closeTree        = configs.context_closeTabOptions_closeTree;
+      if (configs.context_closeTabOptions_closeDescendants !== null)
+        configs.context_topLevel_closeDescendants = configs.context_closeTabOptions_closeDescendants;
+      if (configs.context_closeTabOptions_closeOthers !== null)
+        configs.context_topLevel_closeOthers      = configs.context_closeTabOptions_closeOthers;
+
+    case 5:
+      if (configs.scrollbarMode !== null) {
+        switch (configs.scrollbarMode < 0 ? (isMacOS() ? 3 : 1) : configs.scrollbarMode) {
+          case 0: // default, refular width
+            configs.userStyleRules += `
+
+/* regular width scrollbar */
+#tabbar { scrollbar-width: auto; }`;
+            break;
+          case 1: // narrow width
+            break;
+          case 2: // hide
+            configs.userStyleRules += `
+
+/* hide scrollbar */
+#tabbar { scrollbar-width: none; }
+
+/* cancel spaces for macOS overlay scrollbar */
+:root.platform-mac #tabbar:dir(rtl).overflow .tab:not(.pinned) {
+  padding-inline-start: 0;
+}
+:root.platform-mac #tabbar:dir(ltr).overflow .tab:not(.pinned) {
+  padding-inline-end: 0;
+}`;
+            break;
+          case 3: // overlay (macOS)
+            break;
+        }
+      }
+      if (configs.sidebarScrollbarPosition !== null) {
+        switch (configs.sidebarScrollbarPosition) {
+          default:
+          case 0: // auto
+          case 1: // left
+            break;
+            break;
+          case 2: // right
+            configs.userStyleRules += `
+
+/* put scrollbar rightside */
+:root.left #tabbar { direction: ltr; }`;
+            break;
+        }
+      }
+
+    case 6:
+      if (configs.promoteFirstChildForClosedRoot != null &&
+          configs.promoteFirstChildForClosedRoot &&
+          configs.closeParentBehavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN)
+        configs.closeParentBehavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY;
+      if (configs.parentTabBehaviorForChanges !== null) {
+        switch (configs.parentTabBehaviorForChanges) {
+          case Constants.kPARENT_TAB_BEHAVIOR_ALWAYS:
+            configs.parentTabOperationBehaviorMode = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CONSISTENT;
+            break;
+          default:
+          case Constants.kPARENT_TAB_BEHAVIOR_ONLY_WHEN_VISIBLE:
+            configs.parentTabOperationBehaviorMode = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL;
+            break;
+          case Constants.kPARENT_TAB_BEHAVIOR_ONLY_ON_SIDEBAR:
+            configs.parentTabOperationBehaviorMode = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM;
+            configs.closeParentBehavior_outsideSidebar_expanded = configs.closeParentBehavior_noSidebar_expanded = configs.  closeParentBehavior;
+            break;
+        }
+      }
+
+    case 7:
+      if (configs.collapseExpandSubtreeByDblClick !== null &&
+          configs.collapseExpandSubtreeByDblClick)
+        configs.treeDoubleClickBehavior = Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_COLLAPSED;
+
+    case 8:
+      if (configs.autoExpandOnCollapsedChildActive !== null)
+        configs.unfocusableCollapsedTab = configs.autoExpandOnCollapsedChildActive;
+
+    case 9:
+      if (configs.simulateCloseTabByDblclick !== null &&
+          configs.simulateCloseTabByDblclick)
+        configs.treeDoubleClickBehavior = Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_CLOSE;
+
+    case 10:
+      if (configs.style == 'plain-dark' ||
+          configs.style == 'metal')
+        configs.style = configs.$default.style;
+
+    case 11:
+      if (configs.userStyleRules) {
+        configs.userStyleRules0 = configs.userStyleRules;
+        configs.userStyleRules = '';
+      }
+
+    case 12:
+      try {
+        saveUserStyleRules(Array.from(new Uint8Array(8), (_, index) => {
+          const key = `userStyleRules${index}`;
+          if (key in configs) {
+            const chunk = configs[key];
+            configs[key] = '';
+            return chunk || '';
+          }
+          else {
+            return '';
+          }
+        }).join(''));
+      }
+      catch(error) {
+        console.error(error);
+      }
+
+    case 13:
+      if (configs.style == 'mixed' ||
+          configs.style == 'vertigo')
+        configs.style = 'photon';
+
+    case 14:
+      if (configs.inheritContextualIdentityToNewChildTab !== null)
+        configs.inheritContextualIdentityToChildTabMode = configs.inheritContextualIdentityToNewChildTab ? Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT : Constants.kCONTEXTUAL_IDENTITY_DEFAULT;
+      if (configs.inheritContextualIdentityToSameSiteOrphan !== null)
+        configs.inheritContextualIdentityToSameSiteOrphanMode = configs.inheritContextualIdentityToSameSiteOrphan ? Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE : Constants.kCONTEXTUAL_IDENTITY_DEFAULT;
+      if (configs.inheritContextualIdentityToTabsFromExternal !== null)
+        configs.inheritContextualIdentityToTabsFromExternalMode = configs.inheritContextualIdentityToTabsFromExternal ? Constants.kCONTEXTUAL_IDENTITY_FROM_PARENT : Constants.kCONTEXTUAL_IDENTITY_DEFAULT;
+
+    case 15:
+      if (configs.moveDroppedTabToNewWindowForUnhandledDragEvent !== null &&
+          !configs.moveDroppedTabToNewWindowForUnhandledDragEvent) {
+        if (configs.tabDragBehavior & Constants.kDRAG_BEHAVIOR_TEAR_OFF)
+          configs.tabDragBehavior = configs.tabDragBehavior ^ Constants.kDRAG_BEHAVIOR_TEAR_OFF;
+        else if (configs.tabDragBehavior & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK)
+          configs.tabDragBehavior = configs.tabDragBehavior ^ Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK;
+
+        if (configs.tabDragBehaviorShift & Constants.kDRAG_BEHAVIOR_TEAR_OFF)
+          configs.tabDragBehaviorShift = configs.tabDragBehaviorShift ^ Constants.kDRAG_BEHAVIOR_TEAR_OFF;
+        else if (configs.tabDragBehaviorShift & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK)
+          configs.tabDragBehaviorShift = configs.tabDragBehaviorShift ^ Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK;
+      }
+
+    case 16:
+      configs.maximumDelayForBug1561879 = Math.max(configs.$default.maximumDelayForBug1561879, configs.maximumDelayForBug1561879);
+
+    case 17:
+      configs.tabDragBehavior |= Constants.kDRAG_BEHAVIOR_MOVE;
+      configs.tabDragBehaviorShift |= Constants.kDRAG_BEHAVIOR_MOVE;
+
+    case 18:
+      if (configs.connectionTimeoutDelay == 5000)
+        configs.connectionTimeoutDelay = configs.$default.connectionTimeoutDelay;
+
+    case 19:
+      if (configs.suppressGapFromShownOrHiddenToolbar !== null) {
+        configs.suppressGapFromShownOrHiddenToolbarOnNewTab =
+          configs.suppressGapFromShownOrHiddenToolbarOnFullScreen = configs.suppressGapFromShownOrHiddenToolbar;
+      }
+
+    case 20:
+      if (configs.treatTreeAsExpandedOnClosedWithNoSidebar !== null) {
+        configs.treatTreeAsExpandedOnClosed_noSidebar = configs.treatTreeAsExpandedOnClosedWithNoSidebar;
+      }
+
+    case 21:
+      if (configs.style == 'plain')
+        configs.style = 'photon';
+
+    case 22:
+    case 23:
+      if (configs.closeParentBehaviorMode !== null) {
+        configs.parentTabOperationBehaviorMode = configs.closeParentBehaviorMode;
+      }
+      if (configs.closeParentBehavior !== null) {
+        configs.closeParentBehavior_insideSidebar_expanded =
+          configs.closeParentBehavior;
+      }
+      if (configs.closeParentBehavior_outsideSidebar !== null) {
+        configs.closeParentBehavior_outsideSidebar_expanded =
+          configs.moveParentBehavior_outsideSidebar_expanded =
+          configs.closeParentBehavior_outsideSidebar;
+      }
+      if (configs.closeParentBehavior_noSidebar !== null) {
+        configs.closeParentBehavior_noSidebar_expanded =
+          configs.closeParentBehavior_noSidebar_expanded =
+          configs.closeParentBehavior_noSidebar;
+      }
+      if (configs.treatTreeAsExpandedOnClosed_outsideSidebar === true) {
+        configs.closeParentBehavior_outsideSidebar_collapsed =
+          configs.moveParentBehavior_outsideSidebar_collapsed =
+          configs.moveParentBehavior_outsideSidebar_expanded;
+      }
+      if (configs.treatTreeAsExpandedOnClosed_noSidebar === false) {
+        configs.closeParentBehavior_noSidebar_collapsed =
+          configs.moveParentBehavior_noSidebar_collapsed =
+          Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE;
+      }
+      if (configs.treatTreeAsExpandedOnClosed_outsideSidebar === true ||
+          configs.treatTreeAsExpandedOnClosed_noSidebar === false) {
+        configs.parentTabOperationBehaviorMode = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM;
+      }
+
+    case 24:
+      if (configs.autoGroupNewTabsTimeout !== null)
+        configs.tabBunchesDetectionTimeout = configs.autoGroupNewTabsTimeout;
+      if (configs.autoGroupNewTabsDelayOnNewWindow !== null)
+        configs.tabBunchesDetectionDelayOnNewWindow = configs.autoGroupNewTabsDelayOnNewWindow;
+
+    case 25:
+      if (configs.autoHiddenScrollbarPlaceholderSize !== null)
+        configs.shiftTabsForScrollbarDistance = configs.autoHiddenScrollbarPlaceholderSize;
+
+    case 26:
+      if (!configs.guessNewOrphanTabAsOpenedByNewTabCommandUrl.includes('about:privatebrowsing'))
+        configs.guessNewOrphanTabAsOpenedByNewTabCommandUrl = `${configs.guessNewOrphanTabAsOpenedByNewTabCommandUrl.trim().replace(/\|$/, '')}|about:privatebrowsing`;
+
+    case 27:
+      if (configs.openAllBookmarksWithGroupAlways !== null)
+        configs.suppressGroupTabForStructuredTabsFromBookmarks = !configs.openAllBookmarksWithGroupAlways;
+
+    case 28:
+      if (configs.heartbeatInterval == 1000)
+        configs.heartbeatInterval = configs.$default.heartbeatInterval;
+
+    case 29:
+      const autoAttachKeys = [
+        'autoAttachOnOpenedWithOwner',
+        'autoAttachOnNewTabCommand',
+        'autoAttachOnContextNewTabCommand',
+        'autoAttachOnNewTabButtonMiddleClick',
+        'autoAttachOnNewTabButtonAccelClick',
+        'autoAttachOnDuplicated',
+        'autoAttachSameSiteOrphan',
+        'autoAttachOnOpenedFromExternal',
+        'autoAttachOnAnyOtherTrigger',
+      ];
+      if (configs.insertNewChildAt != configs.$default.insertNewChildAt &&
+          (configs.insertNewChildAt == Constants.kINSERT_TOP ||
+           configs.insertNewChildAt == Constants.kINSERT_END)) {
+        for (const key of autoAttachKeys) {
+          if (configs[key] != configs.$default[key] &&
+              configs[key] != Constants.kNEWTAB_OPEN_AS_CHILD)
+            continue;
+          if (configs.insertNewChildAt == Constants.kINSERT_TOP)
+            configs[key] = Constants.kNEWTAB_OPEN_AS_CHILD_TOP;
+          else
+            configs[key] = Constants.kNEWTAB_OPEN_AS_CHILD_END;
+        }
+      }
+      else {
+        for (const key of autoAttachKeys) {
+          if (configs[key] == Constants.kNEWTAB_OPEN_AS_CHILD)
+            configs[key] = Constants.kNEWTAB_OPEN_AS_CHILD_TOP;
+        }
+      }
+
+    case 30:
+      browser.windows.getAll().then(windows => {
+        for (const win of windows) {
+          browser.sessions.removeWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_SIDEBAR);
+          browser.sessions.removeWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY);
+          browser.sessions.removeWindowValue(win.id, Constants.kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY);
+        }
+      });
+
+    case 31:
+      if (configs.tabPreviewTooltipInSidebar !== null)
+        configs.tabPreviewTooltipRenderIn = configs.tabPreviewTooltipInSidebar ?
+          Constants.kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE :
+          Constants.kIN_CONTENT_PANEL_RENDER_IN_CONTENT;
+
+    case 32:
+      if (configs.tabPreviewTooltipOffsetTop !== null)
+        configs.inContentUIOffsetTop = configs.tabPreviewTooltipOffsetTop;
+  }
+  configs.configsVersion = kCONFIGS_VERSION;
+}
+
+let mShouldShowInitialStartupPage = false;
+
+export function tryNotifyNewFeatures() {
+  /*
+  let featuresVersionOffset = 0;
+  const browserInfo = await browser.runtime.getBrowserInfo().catch(ApiTabs.createErrorHandler());
+  // "search" permission becomes available!
+  if (parseInt(browserInfo.version.split('.')[0]) >= 63)
+    featuresVersionOffset++;
+  // "menus.overrideContext" permission becomes available!
+  if (parseInt(browserInfo.version.split('.')[0]) >= 64)
+    featuresVersionOffset++;
+  */
+
+  const featuresVersion = kFEATURES_VERSION /*+ featuresVersionOffset*/;
+  const isInitialInstall = configs.notifiedFeaturesVersion == 0;
+
+  if (configs.notifiedFeaturesVersion >= featuresVersion)
+    return;
+  configs.notifiedFeaturesVersion = featuresVersion;
+
+  if (isInitialInstall &&
+      !configs.syncOtherDevicesDetected &&
+      Object.keys(configs.syncDevices).length > 1) {
+    configs.syncAvailableNotified = true;
+    configs.syncOtherDevicesDetected = true;
+  }
+
+  const typeSuffix = isInitialInstall ? 'installed' : 'updated';
+  const platformSuffix = isLinux() ? '_linux' : '';
+  const url = isInitialInstall ? Constants.kSHORTHAND_URIS.startup : browser.i18n.getMessage('message_startup_history_uri');
+  notify({
+    url,
+    title:   browser.i18n.getMessage(`startup_notification_title_${typeSuffix}`),
+    message: browser.i18n.getMessage(`startup_notification_message_${typeSuffix}${platformSuffix}`),
+    timeout: 90 * 1000
+  });
+
+  if (isInitialInstall) {
+    mShouldShowInitialStartupPage = true;
+    browser.browserAction.setBadgeText({
+      text: '!',
+    });
+  }
+}
+
+export function isInitialStartup() {
+  return !!mShouldShowInitialStartupPage;
+}
+
+export function openInitialStartupPage() {
+  mShouldShowInitialStartupPage = false;
+  browser.browserAction.setBadgeText({
+    text: null,
+  });
+  browser.tabs.create({
+    url: Constants.kSHORTHAND_URIS.startup,
+    active: true,
+  });
+}
+
+
+// Auto-migration of bookmarked internal URLs
+//
+// Internal URLs like "moz-extension://(UUID)/..." are runtime environment
+// dependent and unavailable when such bookmarks are loaded in different
+// runtime environment, for example they are synchronized from other devices.
+// Thus we should migrate such internal URLs to universal shorthand URIs like
+// "ext+ws:(name)".
+
+export async function migrateBookmarkUrls() {
+  const granted = await Permissions.isGranted(Permissions.BOOKMARKS);
+  if (!granted)
+    return;
+
+  startBookmarksUrlAutoMigration();
+
+  const urls = new Set(configs.migratedBookmarkUrls);
+  const migrations = [];
+  const updates = [];
+  for (const key in Constants.kSHORTHAND_URIS) {
+    const url = Constants.kSHORTHAND_URIS[key].split('?')[0];
+    if (urls.has(url))
+      continue;
+
+    const shorthand = `ext+ws:${key.toLowerCase()}`;
+    migrations.push(browser.bookmarks.search({ query: url })
+      .then(bookmarks => {
+        for (const bookmark of bookmarks) {
+          updates.push(browser.bookmarks.update(bookmark.id, {
+            url: bookmark.url.replace(url, shorthand)
+          }));
+        }
+      }));
+    urls.add(url);
+  }
+  if (migrations.length > 0)
+    await Promise.all(migrations);
+  if (updates.length > 0)
+    await Promise.all(updates);
+  if (urls.size > configs.migratedBookmarkUrls.length)
+    configs.migratedBookmarkUrls = Array.from(urls);
+}
+
+async function migrateBookmarkUrl(bookmark) {
+  for (const key in Constants.kSHORTHAND_URIS) {
+    const url = Constants.kSHORTHAND_URIS[key].split('?')[0];
+    if (!bookmark.url.startsWith(url))
+      continue;
+
+    const shorthand = `ext+ws:${key.toLowerCase()}`;
+    return browser.bookmarks.update(bookmark.id, {
+      url: bookmark.url.replace(url, shorthand)
+    });
+  }
+}
+
+let mObservingBookmarks = false;
+let mBookmarksListenersRegistered = false;
+
+function onBookmarkCreated(id, bookmark) {
+  if (!mObservingBookmarks)
+    return;
+
+  if (bookmark.url)
+    migrateBookmarkUrl(bookmark);
+}
+
+async function onBookmarkChanged(id, changeInfo) {
+  if (!mObservingBookmarks)
+    return;
+
+  if (changeInfo.url &&
+      changeInfo.url.startsWith(browser.runtime.getURL(''))) {
+    const bookmark = await browser.bookmarks.get(id);
+    if (Array.isArray(bookmark))
+      bookmark.forEach(migrateBookmarkUrl);
+    else
+      migrateBookmarkUrl(bookmark);
+  }
+}
+
+if (browser.bookmarks &&
+    browser.bookmarks.onCreated) {
+  browser.bookmarks.onCreated.addListener(onBookmarkCreated);
+  browser.bookmarks.onChanged.addListener(onBookmarkChanged);
+  mBookmarksListenersRegistered = true;
+}
+
+async function startBookmarksUrlAutoMigration() {
+  if (mObservingBookmarks)
+    return;
+
+  mObservingBookmarks = true;
+
+  if (mBookmarksListenersRegistered ||
+      !browser.bookmarks ||
+      !browser.bookmarks.onCreated)
+    return;
+
+  browser.bookmarks.onCreated.addListener(onBookmarkCreated);
+  browser.bookmarks.onChanged.addListener(onBookmarkChanged);
+  mBookmarksListenersRegistered = true;
+}
+
+
+configs.$loaded.then(() => {
+  configs.$addObserver(async key => {
+    // This may be triggered not only "reset all", but while importing of configs also.
+    // We should try initial migration after all configs are successfully imported.
+    await wait(100);
+    if (key == 'configsVersion' &&
+        configs.configsVersion == 0)
+      migrateConfigs();
+  });
+});
diff --git a/waterfox/browser/components/sidebar/background/native-tab-groups.js b/waterfox/browser/components/sidebar/background/native-tab-groups.js
new file mode 100644
index 0000000000000..3ec208ab7c9bd
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/native-tab-groups.js
@@ -0,0 +1,439 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  wait,
+  configs,
+  shouldApplyAnimation,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/native-tab-groups', ...args);
+}
+
+export const internallyMovingNativeTabGroups = new Map();
+
+export async function addTabsToGroup(tabs, groupIdOrProperties) {
+  const initialGroupId = typeof groupIdOrProperties == 'number' ? groupIdOrProperties : null;
+  const groupId = await addTabsToGroupInternal(tabs, groupIdOrProperties);
+  const created = groupId != initialGroupId;
+  return { groupId, created };
+}
+async function addTabsToGroupInternal(tabs, groupIdOrProperties) {
+  let groupId = typeof groupIdOrProperties == 'number' ? groupIdOrProperties : null;
+  const tabsToGrouped = tabs.filter(tab => tab.groupId != groupId);
+  if (tabsToGrouped.length == 0) {
+    return groupId;
+  }
+
+  log('addTabsToGroupInternal ', tabsToGrouped, groupId, groupIdOrProperties);
+
+  const pinnedTabs = tabsToGrouped.filter(tab => tab.pinned);
+  if (pinnedTabs.length > 0) {
+    await Promise.all(
+      pinnedTabs.map(
+        tab => browser.tabs.update(tab.id, { pinned: false })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError))
+      )
+    );
+  }
+
+  const windowId = tabsToGrouped[0].windowId;
+  const structure = TreeBehavior.getTreeStructureFromTabs(tabsToGrouped);
+
+  await Tree.detachTabsFromTree(tabsToGrouped, {
+    fromParent: true,
+    partial: true,
+  });
+
+  const { promisedGrouped, finish } = waitUntilGrouped(tabsToGrouped, {
+    groupId,
+    windowId,
+  });
+  log('addTabsToGroupInternal: group tabs!');
+  await browser.tabs.group({
+    groupId,
+    tabIds: tabsToGrouped.map(tab => tab.id),
+    ...(groupId ? {} : {
+      createProperties: {
+        windowId, // We must specify the window ID explicitly, otherwise tabs moved across windows may be reverted and grouped in the old window!
+      },
+    })
+  });
+  const group = await promisedGrouped;
+  groupId = group.id;
+  log('addTabsToGroupInternal: => ', group);
+
+  for (const tab of tabsToGrouped) {
+    TabsStore.addNativelyGroupedTab(tab, group.windowId);
+  }
+
+  if (groupIdOrProperties &&
+      typeof groupIdOrProperties == 'object') {
+    log('addTabsToGroupInternal: applying group properties');
+    const updateProperties = {};
+    if ('title' in groupIdOrProperties) {
+      updateProperties.title = groupIdOrProperties.title;
+    }
+    if ('color' in groupIdOrProperties) {
+      updateProperties.color = groupIdOrProperties.color;
+    }
+    if ('collapsed' in groupIdOrProperties) {
+      updateProperties.collapsed = groupIdOrProperties.collapsed;
+    }
+    await browser.tabGroups.update(groupId, updateProperties);
+  }
+
+  finish();
+
+  await rejectGroupFromTree(group);
+
+  log('addTabsToGroupInternal: applying tree structure');
+  await Tree.applyTreeStructureToTabs(tabsToGrouped, structure, {
+    broadcast: true
+  });
+
+  return groupId;
+}
+
+export async function rejectGroupFromTree(group) {
+  if (!group) {
+    return;
+  }
+  group = TabGroup.get(group.id);
+  if (!group?.$TST) {
+    log('rejectGroupFromTree: failed to reject untracked group');
+    return;
+  }
+
+  const firstMember = group.$TST.firstMember;
+  const lastMember  = group.$TST.lastMember;
+  const prevTab = firstMember?.$TST.previousTab;
+  const nextTab = lastMember?.$TST.nextTab;
+  const rootTab = prevTab?.$TST.rootTab;
+  if (!prevTab ||
+      !nextTab ||
+      prevTab.groupId != nextTab.groupId ||
+      prevTab.groupId != -1 ||
+      rootTab != nextTab.$TST.rootTab) {
+    log('rejectGroupFromTree: no need to reject from tree');
+    return;
+  }
+
+  log('rejectGroupFromTree ', group.id);
+  await Tree.detachTabsFromTree(group.$TST.members, {
+    fromParent: true,
+    partial: true,
+  });
+
+  // The group is in a middle of a tree. We need to move the new group away from the tree.
+  const lastDescendant = rootTab.$TST.lastDescendant;
+  if (firstMember.index - rootTab.index <= lastDescendant.index - lastMember.index) { // move above the tree
+    log('rejectGroupFromTree: move ', group.id, ' before ', rootTab.id);
+    await moveGroupBefore(group, rootTab);
+  }
+  else { // move below the tree
+    log('rejectGroupFromTree: move ', group.id, ' after ', lastDescendant.id);
+    await moveGroupAfter(group, lastDescendant);
+  }
+}
+
+function waitUntilGrouped(tabs, { groupId, windowId } = {}) {
+  const toBeGroupedIds = tabs.map(tab => tab.id);
+  const win = TabsStore.windows.get(windowId || tabs[0].windowId);
+
+  for (const tab of tabs) {
+    win.internallyMovingTabsForUpdatedNativeTabGroups.add(tab.id);
+    win.internalMovingTabs.set(tab.id, -1);
+  }
+
+  let onUpdated = null;
+  const { promisedMoved, finish: finishMoved } = waitUntilMoved(tabs, win.id)
+  const promisedGrouped = new Promise((resolve, _reject) => {
+    if (!groupId) {
+      const onGroupCreated = group => {
+        groupId = group.id;
+        browser.tabGroups.onCreated.removeListener(onGroupCreated);
+      };
+      browser.tabGroups.onCreated.addListener(onGroupCreated);
+    }
+    const toBeGroupedIdsSet = new Set(toBeGroupedIds);
+    onUpdated = (tabId, changeInfo, _tab) => {
+      if (changeInfo.groupId == groupId) {
+        toBeGroupedIdsSet.delete(tabId);
+        win.internallyMovingTabsForUpdatedNativeTabGroups.delete(tabId);
+      }
+      if (toBeGroupedIdsSet.size == 0) {
+        resolve(changeInfo.groupId);
+      }
+    };
+    browser.tabs.onUpdated.addListener(onUpdated, { properties: ['groupId'] });
+  });
+
+  const finish = () => {
+    if (finish.done) {
+      return;
+    }
+    browser.tabs.onUpdated.removeListener(onUpdated);
+    for (const tab of tabs) {
+      win.internalMovingTabs.delete(tab.id);
+    }
+    finish.done = true;
+  };
+
+  return {
+    promisedGrouped: Promise.all([
+      promisedGrouped,
+      Promise.race([
+        promisedMoved,
+        wait(configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove),
+      ]),
+    ]).then(([groupId]) => {
+      finish();
+      finishMoved();
+      return TabGroup.get(groupId);
+    }),
+    finish,
+  };
+}
+
+export async function removeTabsFromGroup(tabs) {
+  const tabsToBeUngrouped = tabs.filter(tab => tab.groupId != -1);
+  if (tabsToBeUngrouped.length == 0) {
+    return;
+  }
+  const win = TabsStore.windows.get(tabs[0].windowId);
+  for (const tab of tabs) {
+    win.internallyMovingTabsForUpdatedNativeTabGroups.add(tab.id);
+    win.internalMovingTabs.set(tab.id, -1);
+  }
+  const toBeUngroupedIds = tabsToBeUngrouped.map(tab => tab.id);
+  let onUpdated = null;
+  await new Promise((resolve, _reject) => {
+    const toBeUngroupedIdsSet = new Set(toBeUngroupedIds);
+    onUpdated = (tabId, changeInfo, _tab) => {
+      if (changeInfo.groupId == -1) {
+        toBeUngroupedIdsSet.delete(tabId);
+        win.internallyMovingTabsForUpdatedNativeTabGroups.delete(tabId);
+      }
+      if (toBeUngroupedIdsSet.size == 0) {
+        resolve();
+      }
+    };
+    browser.tabs.onUpdated.addListener(onUpdated, { properties: ['groupId'] });
+    browser.tabs.ungroup(toBeUngroupedIds);
+  });
+  for (const tab of tabsToBeUngrouped) {
+    win.internalMovingTabs.delete(tab.id);
+    TabsStore.removeNativelyGroupedTab(tab, win.id);
+  }
+  browser.tabs.onUpdated.removeListener(onUpdated);
+}
+
+export async function matchTabsGrouped(tabs, groupIdOrCreateParams) {
+  if (groupIdOrCreateParams == -1) {
+    await removeTabsFromGroup(tabs);
+  }
+  else {
+    await addTabsToGroup(tabs, groupIdOrCreateParams);
+  }
+}
+
+export async function moveGroupToNewWindow({ groupId, windowId, duplicate, left, top }) {
+  log('moveGroupToNewWindow: ', groupId, windowId);
+  const group     = TabGroup.get(groupId);
+  const members   = group.$TST.members;
+  const movedTabs = await Tree.openNewWindowFromTabs(members, { duplicate, left, top });
+  await addTabsToGroupInternal(movedTabs, {
+    title: group.title,
+    color: group.color,
+  });
+}
+
+export async function moveGroupBefore(group, insertBefore) {
+  log('moveGroupBefore: ', group, insertBefore);
+  const beforeCount = internallyMovingNativeTabGroups.get(group.id) || 0;
+  internallyMovingNativeTabGroups.set(group.id, beforeCount + 1);
+
+  const { promisedMoved, finish } = waitUntilMoved(group, insertBefore.windowId);
+
+  if (insertBefore.type == TreeItem.TYPE_GROUP) {
+    insertBefore = insertBefore.$TST.firstMember;
+  }
+
+  const members = group.$TST.members;
+  const firstMember = group.$TST.firstMember;
+  const delta = insertBefore.windowId == group.windowId && insertBefore.index > firstMember.index ? members.length : 0;
+  const index = insertBefore.index - delta;
+  log('moveGroupBefore: move to ', index, { delta, insertBeforeIndex: insertBefore.index });
+  await browser.tabGroups.move(group.id, {
+    index,
+    windowId: insertBefore.windowId,
+  });
+
+  await Promise.race([
+    promisedMoved,
+    wait(configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove).then(() => {
+      if (finish.done) {
+        return;
+      }
+    }),
+  ]);
+  finish();
+
+  const afterCount = internallyMovingNativeTabGroups.get(group.id) || 0;
+  if (afterCount <= 1) {
+    internallyMovingNativeTabGroups.delete(group.id);
+  }
+  else {
+    internallyMovingNativeTabGroups.set(group.id, afterCount - 1);
+  }
+  log('moveGroupBefore: finish');
+}
+
+export async function moveGroupAfter(group, insertAfter) {
+  log('moveGroupAfter: ', group, insertAfter);
+  const beforeCount = internallyMovingNativeTabGroups.get(group.id) || 0;
+  internallyMovingNativeTabGroups.set(group.id, beforeCount + 1);
+
+  const { promisedMoved, finish } = waitUntilMoved(group, insertAfter.windowId);
+
+  if (insertAfter.type == TreeItem.TYPE_GROUP) {
+    if (insertAfter.collapsed) {
+      insertAfter = insertAfter.$TST.lastMember;
+    }
+    else {
+      return moveGroupBefore(group, insertAfter.$TST.firstMember);
+    }
+  }
+
+  const members = group.$TST.members;
+  const firstMember = group.$TST.firstMember;
+  const delta = insertAfter.windowId == group.windowId && insertAfter.index > firstMember.index ? members.length : 0;
+  const index = insertAfter.index + 1 - delta;
+  log('moveGroupAfter: move to ', index, { delta, insertAfterIndex: insertAfter.index });
+  await browser.tabGroups.move(group.id, {
+    index,
+    windowId: insertAfter.windowId,
+  });
+
+  await Promise.race([
+    promisedMoved,
+    wait(configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove).then(() => {
+      if (finish.done) {
+        return;
+      }
+    }),
+  ]);
+  finish();
+
+  const afterCount = internallyMovingNativeTabGroups.get(group.id) || 0;
+  if (afterCount <= 1) {
+    internallyMovingNativeTabGroups.delete(group.id);
+  }
+  else {
+    internallyMovingNativeTabGroups.set(group.id, afterCount - 1);
+  }
+  log('moveGroupAfter: finish');
+}
+
+export function waitUntilMoved(groupOrMembers, destinationWindowId) {
+  const members = Array.isArray(groupOrMembers) ?
+    groupOrMembers :
+    groupOrMembers.$TST.members;
+  const win = TabsStore.windows.get(destinationWindowId || members[0].windowId);
+  const toBeMovedTabs = new Set();
+  for (const tab of members) {
+    toBeMovedTabs.add(tab.id);
+    win.internalMovingTabs.set(tab.id, -1);
+  }
+  let onTabMoved;
+  const promisedMoved = new Promise((resolve, _reject) => {
+    onTabMoved = (tabId, _moveInfo) => {
+      if (toBeMovedTabs.has(tabId)) {
+        toBeMovedTabs.delete(tabId);
+      }
+      if (toBeMovedTabs.size == 0) {
+        log('waitUntilMoved: all members have been moved');
+        resolve();
+      }
+    };
+    browser.tabs.onMoved.addListener(onTabMoved);
+  });
+  const finish = () => {
+    if (finish.done) {
+      return;
+    }
+    browser.tabs.onMoved.removeListener(onTabMoved);
+    for (const tab of members) {
+      win.internalMovingTabs.delete(tab.id);
+    }
+    finish.done = true;
+  };
+  return {
+    promisedMoved: promisedMoved.then(finish),
+    finish,
+  };
+}
+
+
+function reserveToMaintainTreeForGroup(groupId, options = {}) {
+  let timer = reserveToMaintainTreeForGroup.delayed.get(groupId);
+  if (timer)
+    clearTimeout(timer);
+  if (options.justNow || !shouldApplyAnimation()) {
+    const group = TabGroup.get(groupId);
+    rejectGroupFromTree(group);
+  }
+  timer = setTimeout(() => {
+    reserveToMaintainTreeForGroup.delayed.delete(groupId);
+    const group = TabGroup.get(groupId);
+    rejectGroupFromTree(group);
+  }, configs.nativeTabGroupModificationDetectionTimeoutAfterTabMove);
+  reserveToMaintainTreeForGroup.delayed.set(groupId, timer);
+}
+reserveToMaintainTreeForGroup.delayed = new Map();
+
+export async function startToMaintainTree() {
+  // fixup mismatched tree structure and tab groups constructed while TST is disabled
+  const groups = await browser.tabGroups.query({});
+  for (const group of groups) {
+    await rejectGroupFromTree(TabGroup.get(group.id));
+  }
+
+  // after all we start tracking of dynamic changes of tab groups
+
+  browser.tabGroups.onMoved.addListener(group => {
+    group = TabGroup.get(group.id);
+    if (!group) {
+      return;
+    }
+    log('detected tab group move: ', group);
+    const internalMoveCount = internallyMovingNativeTabGroups.get(group.id);
+    if (internalMoveCount) {
+      log(' => ignore internal move ', internalMoveCount);
+      return;
+    }
+    reserveToMaintainTreeForGroup(group.id);
+  });
+
+  Tab.onNativeGroupModified.addListener(tab => {
+    const win = TabsStore.windows.get(tab.windowId);
+    if (win.internallyMovingTabsForUpdatedNativeTabGroups.has(tab.id)) {
+      return;
+    }
+    reserveToMaintainTreeForGroup(tab.groupId);
+  });
+}
diff --git a/waterfox/browser/components/sidebar/background/prefs.js b/waterfox/browser/components/sidebar/background/prefs.js
new file mode 100644
index 0000000000000..7ae0b866800aa
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/prefs.js
@@ -0,0 +1,100 @@
+/* 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/. */
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  configs,
+  obsoleteConfigs,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+
+export const onChanged = new EventListenerManager();
+
+if (Constants.IS_BACKGROUND) {
+  for (const [name, value] of Object.entries(configs.$default)) {
+    if (obsoleteConfigs.has(name))
+      continue;
+    switch (typeof value) {
+      case 'boolean':
+        browser.prefs.setDefaultBoolValue(name, value);
+        break;
+
+      case 'string':
+        browser.prefs.setDefaultStringValue(name, value);
+        break;
+
+      default:
+        browser.prefs.setDefaultStringValue(name, JSON.stringify(value));
+        break;
+    }
+
+    getPref(name).then(value => {
+      if (JSON.stringify(configs[name]) == JSON.stringify(value))
+        return;
+      configs[name] = value;
+    });
+  }
+}
+
+async function getPref(name) {
+  const defaultValue = configs.$default[name];
+  switch (typeof defaultValue) {
+    case 'boolean':
+      return browser.prefs.getBoolValue(name, defaultValue);
+
+    case 'string':
+      return browser.prefs.getStringValue(name, defaultValue);
+
+    default:
+      return browser.prefs.getStringValue(name, JSON.stringify(defaultValue)).then(value => JSON.parse(value));
+  }
+}
+
+const mNamesSyncToChrome = new Set();
+const mNamesSyncFromChrome = new Set();
+
+browser.prefs.onChanged.addListener(name => {
+  if (mNamesSyncToChrome.has(name) ||
+      mNamesSyncFromChrome.has(name))
+    return;
+
+  mNamesSyncFromChrome.add(name);
+  getPref(name)
+    .then(value => {
+      configs[name] = value;
+      window.requestAnimationFrame(() => {
+        mNamesSyncFromChrome.delete(name);
+      });
+    });
+});
+
+configs.$addObserver(async name => {
+  if (mNamesSyncToChrome.has(name) ||
+      mNamesSyncFromChrome.has(name))
+    return;
+
+  mNamesSyncToChrome.add(name);
+
+  const value = configs[name];
+  const defaultValue = configs.$default[name];
+  switch (typeof defaultValue) {
+    case 'boolean':
+      await browser.prefs.setBoolValue(name, value);
+      break;
+
+    case 'string':
+      await browser.prefs.setStringValue(name, value);
+      break;
+
+    default:
+      await browser.prefs.setStringValue(name, JSON.stringify(value));
+      break;
+  }
+
+  window.requestAnimationFrame(() => {
+    mNamesSyncToChrome.delete(name);
+  });
+});
diff --git a/waterfox/browser/components/sidebar/background/sharing-service.js b/waterfox/browser/components/sidebar/background/sharing-service.js
new file mode 100644
index 0000000000000..441f214194c34
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/sharing-service.js
@@ -0,0 +1,22 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as TabContextMenu from './tab-context-menu.js';
+
+TabContextMenu.registerSharingService({
+  async listServices(tab) {
+    return browser.waterfoxBridge.listSharingServices(tab.id);
+  },
+
+  share(tab, shareName = null) {
+    return browser.waterfoxBridge.share(tab.id, shareName);
+  },
+
+  openPreferences() {
+    return browser.waterfoxBridge.openSharingPreferences();
+  },
+});
diff --git a/waterfox/browser/components/sidebar/background/successor-tab.js b/waterfox/browser/components/sidebar/background/successor-tab.js
new file mode 100644
index 0000000000000..ae1e7f1434562
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/successor-tab.js
@@ -0,0 +1,467 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  configs,
+  wait,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/successor-tab', ...args);
+}
+
+const mTabsToBeUpdated = new Set();
+const mInProgressUpdates = new Set();
+
+const mPromisedUpdatedSuccessorTabId = new Map();
+
+browser.tabs.onUpdated.addListener((tabId, updateInfo, _tab) => {
+  if (!('successorTabId' in updateInfo) ||
+      !mPromisedUpdatedSuccessorTabId.has(tabId))
+    return;
+  const promisedUpdate = mPromisedUpdatedSuccessorTabId.get(tabId);
+  mPromisedUpdatedSuccessorTabId.delete(tabId);
+  promisedUpdate.resolver(updateInfo.successorTabId);
+}, {
+  // we cannot watch only the property...
+  // properties: ['successorTabId'],
+});
+
+TabsInternalOperation.onBeforeTabsRemove.addListener(async tabs => {
+  let activeTab = null;
+  const tabIds = tabs.map(tab => {
+    if (tab.active)
+      activeTab = tab;
+    return tab.id;
+  });
+  if (activeTab)
+    await updateInternal(activeTab.id, tabIds);
+});
+
+function setSuccessor(tabId, successorTabId = -1) {
+  const tab          = Tab.get(tabId);
+  const successorTab = Tab.get(successorTabId);
+  if (configs.successorTabControlLevel == Constants.kSUCCESSOR_TAB_CONTROL_NEVER ||
+      !tab ||
+      !successorTab ||
+      tab.windowId != successorTab.windowId)
+    return;
+
+  const promisedUpdate = {};
+  promisedUpdate.promisedSuccessorTabId = new Promise((resolve, _reject) => {
+    promisedUpdate.resolver = resolve;
+    setTimeout(() => {
+      if (!mPromisedUpdatedSuccessorTabId.has(tabId))
+        return;
+      mPromisedUpdatedSuccessorTabId.delete(tabId);
+      resolve(null);
+    }, 2000);
+  });
+  mPromisedUpdatedSuccessorTabId.set(tabId, promisedUpdate);
+
+  const initialSuccessorTabId = tab.successorTabId;
+  browser.tabs.update(tabId, {
+    successorTabId
+  }).then(async () => {
+    // tabs.onUpdated listener won't be called sometimes, so this is a failsafe.
+    while (true) {
+      const promisedUpdate = mPromisedUpdatedSuccessorTabId.get(tabId);
+      if (!promisedUpdate)
+        break;
+
+      const tab = await browser.tabs.get(tabId);
+      if (tab.successorTabId == initialSuccessorTabId &&
+          tab.successorTabId != successorTabId) {
+        await wait(200);
+        continue;
+      }
+
+      mPromisedUpdatedSuccessorTabId.delete(tabId);
+      promisedUpdate.resolver(tab.successorTabId);
+    }
+  }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError, error => {
+    // ignore error for already closed tab
+    if (!error ||
+        !error.message ||
+        (error.message.indexOf('Invalid successorTabId') != 0 &&
+         // This error may happen at the time just after a tab is detached from its original window.
+         error.message.indexOf('Successor tab must be in the same window as the tab being updated') != 0))
+      throw error;
+  }));
+}
+
+function clearSuccessor(tabId) {
+  setSuccessor(tabId, -1);
+}
+
+
+function update(tabId) {
+  mTabsToBeUpdated.add(tabId);
+  if (mInProgressUpdates.size == 0) {
+    const waitingUpdate = new Promise((resolve, _reject) => {
+      const timer = setInterval(() => {
+        if (mInProgressUpdates.size > 1)
+          return;
+        clearInterval(timer);
+        resolve();
+      }, 100);
+    });
+    waitingUpdate.catch(_error => {}).then(() => mInProgressUpdates.delete(waitingUpdate));
+    mInProgressUpdates.add(waitingUpdate);
+  }
+  setTimeout(() => {
+    const ids = Array.from(mTabsToBeUpdated);
+    mTabsToBeUpdated.clear();
+    for (const id of ids) {
+      if (!id)
+        continue;
+      try {
+        const promisedUpdate = updateInternal(id);
+        const promisedUpdateWithTimeout = new Promise((resolve, reject) => {
+          promisedUpdate.then(resolve).catch(reject);
+          setTimeout(resolve, 1000);
+        });
+        mInProgressUpdates.add(promisedUpdateWithTimeout);
+        promisedUpdateWithTimeout.catch(_error => {}).then(() => mInProgressUpdates.delete(promisedUpdateWithTimeout));
+      }
+      catch(_error) {
+      }
+    }
+  }, 0);
+}
+async function updateInternal(tabId, excludeTabIds = []) {
+  // tabs.onActivated can be notified before the tab is completely tracked...
+  await Tab.waitUntilTracked(tabId);
+  const tab = Tab.get(tabId);
+  if (!tab)
+    return;
+
+  const promisedUpdate = mPromisedUpdatedSuccessorTabId.get(tabId);
+  await Promise.all([
+    tab.$TST.opened,
+    promisedUpdate?.promisedSuccessorTabId,
+  ]);
+
+  const renewedTab = await browser.tabs.get(tabId).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  if (!renewedTab ||
+      !TabsStore.ensureLivingItem(tab))
+    return;
+  log('updateInternal: ', dumpTab(tab), {
+    tabSuccessorTabId: tab.successorTabId,
+    renewedSuccessorTabId: renewedTab.successorTabId,
+    lastSuccessorTabIdByOwner: tab.$TST.temporaryMetadata.get('lastSuccessorTabIdByOwner'),
+    lastSuccessorTabId: tab.$TST.temporaryMetadata.get('lastSuccessorTabId'),
+  });
+  if (tab.$TST.temporaryMetadata.has('lastSuccessorTabIdByOwner')) {
+    log('respect last successor by owner');
+    const successor = Tab.get(renewedTab.successorTabId);
+    if (successor) {
+      log(`  ${dumpTab(tab)} is already prepared for "selectOwnerOnClose" behavior (successor=${renewedTab.successorTabId})`);
+      return;
+    }
+    log(`  clear successor of ${dumpTab(tab)}`);
+    tab.$TST.temporaryMetadata.delete('lastSuccessorTabIdByOwner');
+    tab.$TST.temporaryMetadata.delete('lastSuccessorTabId');
+    clearSuccessor(tab.id);
+  }
+  const lastSuccessorTab = tab.$TST.temporaryMetadata.has('lastSuccessorTabId') && Tab.get(tab.$TST.temporaryMetadata.get('lastSuccessorTabId'));
+  if (!lastSuccessorTab) {
+    log(`  ${dumpTab(tab)}'s successor is missing: it was already closed.`);
+  }
+  else {
+    log(`  ${dumpTab(tab)} is under control: `, {
+      successorTabId: renewedTab.successorTabId,
+      lastSuccessorTabId: tab.$TST.temporaryMetadata.get('lastSuccessorTabId'),
+    });
+    if (renewedTab.successorTabId != -1 &&
+        renewedTab.successorTabId != tab.$TST.temporaryMetadata.get('lastSuccessorTabId')) {
+      log(`  ${dumpTab(tab)}'s successor is modified by someone! Now it is out of control.`);
+      tab.$TST.temporaryMetadata.delete('lastSuccessorTabId');
+      return;
+    }
+  }
+  tab.$TST.temporaryMetadata.delete('lastSuccessorTabId');
+  if (configs.successorTabControlLevel == Constants.kSUCCESSOR_TAB_CONTROL_NEVER)
+    return;
+  let successor = null;
+  if (renewedTab.active) {
+    log('it is active, so reset successor');
+    const excludeTabIdsSet = new Set(excludeTabIds);
+    const findSuccessor = (...candidates) => {
+      for (const candidate of candidates) {
+        if (!excludeTabIdsSet.has(candidate?.id) &&
+            candidate)
+          return candidate;
+      }
+      return null;
+    };
+    if (configs.successorTabControlLevel == Constants.kSUCCESSOR_TAB_CONTROL_IN_TREE) {
+      const closeParentBehavior = TreeBehavior.getParentTabOperationBehavior(tab, {
+        context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE,
+        parent: tab.$TST.parent,
+        windowId: tab.windowId,
+      });
+      const collapsedChildSuccessorAllowed = (
+        closeParentBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE &&
+        closeParentBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB
+      );
+      const firstChild = collapsedChildSuccessorAllowed ? tab.$TST.firstChild : tab.$TST.firstVisibleChild;
+      const nextVisibleSibling = tab.$TST.nextVisibleSiblingTab;
+      const nearestVisiblePreceding = tab.$TST.nearestVisiblePrecedingTab;
+      successor = findSuccessor(
+        firstChild,
+        nextVisibleSibling,
+        nearestVisiblePreceding
+      );
+      log(`  possible successor: ${dumpTab(tab)}: `, successor, {
+        closeParentBehavior,
+        collapsedChildSuccessorAllowed,
+        parent: tab.$TST.parentId,
+        firstChild: firstChild?.id,
+        nextVisibleSibling: nextVisibleSibling?.id,
+        nearestVisiblePreceding: nearestVisiblePreceding?.id,
+      });
+      if (successor &&
+          successor.discarded &&
+          configs.avoidDiscardedTabToBeActivatedIfPossible) {
+        log(`  ${dumpTab(successor)} is discarded.`);
+        successor = findSuccessor(
+          tab.$TST.nearestLoadedSiblingTab,
+          tab.$TST.nearestLoadedTabInTree,
+          tab.$TST.nearestLoadedTab,
+          successor
+        );
+        log(`  => redirected successor is: ${dumpTab(successor)}`);
+      }
+    }
+    else {
+      successor = findSuccessor(
+        tab.$TST.nearestVisibleFollowingTab,
+        tab.$TST.nearestVisiblePrecedingTab
+      );
+      log(`  possible successor: ${dumpTab(tab)}`);
+      if (successor &&
+          successor.discarded &&
+          configs.avoidDiscardedTabToBeActivatedIfPossible) {
+        log(`  ${dumpTab(successor)} is discarded.`);
+        successor = findSuccessor(
+          tab.$TST.nearestLoadedTab,
+          successor
+        );
+        log(`  => redirected successor is: ${dumpTab(successor)}`);
+      }
+    }
+  }
+  if (successor) {
+    log(`  ${dumpTab(tab)} is under control: successor = ${successor.id}`);
+    setSuccessor(renewedTab.id, successor.id);
+    tab.$TST.temporaryMetadata.set('lastSuccessorTabId', successor.id);
+  }
+  else {
+    log(`  ${dumpTab(tab)} is out of control.`, {
+      active: renewedTab.active,
+    });
+    clearSuccessor(renewedTab.id);
+  }
+}
+
+async function tryClearOwnerSuccessor(tab) {
+  if (!tab ||
+      !tab.$TST.temporaryMetadata.get('lastSuccessorTabIdByOwner'))
+    return;
+  tab.$TST.temporaryMetadata.delete('lastSuccessorTabIdByOwner');
+  const renewedTab = await browser.tabs.get(tab.id).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  if (!renewedTab ||
+      renewedTab.successorTabId != tab.$TST.temporaryMetadata.get('lastSuccessorTabId'))
+    return;
+  log(`${dumpTab(tab)} is unprepared for "selectOwnerOnClose" behavior`);
+  tab.$TST.temporaryMetadata.delete('lastSuccessorTabId');
+  clearSuccessor(tab.id);
+}
+
+Tab.onActivated.addListener(async (newActiveTab, info = {}) => {
+  update(newActiveTab.id);
+  if (info.previousTabId) {
+    const oldActiveTab = Tab.get(info.previousTabId);
+    if (oldActiveTab) {
+      await tryClearOwnerSuccessor(oldActiveTab);
+      const lastRelatedTab = oldActiveTab.$TST.lastRelatedTab;
+      const newRelatedTabsCount = oldActiveTab.$TST.newRelatedTabsCount;
+      if (lastRelatedTab) {
+        log(`clear lastRelatedTabs for the window ${info.windowId} by tabs.onActivated on ${newActiveTab.id}`);
+        TabsStore.windows.get(info.windowId).clearLastRelatedTabs();
+        if (lastRelatedTab.id != newActiveTab.id) {
+          log(`non last-related-tab is activated: cancel "back to owner" behavior for ${lastRelatedTab.id}`);
+          await tryClearOwnerSuccessor(lastRelatedTab);
+        }
+      }
+      if (newRelatedTabsCount > 1) {
+        log(`multiple related tabs were opened: cancel "back to owner" behavior for ${newActiveTab.id}`);
+        await tryClearOwnerSuccessor(newActiveTab);
+      }
+    }
+    update(info.previousTabId);
+  }
+});
+
+Tab.onCreating.addListener((tab, info = {}) => {
+  if (!info.activeTab)
+    return;
+
+  const shouldControlSuccesor = (
+    configs.successorTabControlLevel != Constants.kSUCCESSOR_TAB_CONTROL_NEVER &&
+    configs.simulateSelectOwnerOnClose
+  );
+
+  log(`Tab.onCreating: should control succesor of ${tab.id}: `, shouldControlSuccesor);
+  if (shouldControlSuccesor) {
+    // don't use await here, to prevent that other onCreating handlers are treated async.
+    tryClearOwnerSuccessor(info.activeTab).then(() => {
+      const ownerTabId = tab.openerTabId || tab.active ? info.activeTab.id : null
+      if (!ownerTabId)
+        return;
+
+      log(`${dumpTab(tab)} is prepared for "selectOwnerOnClose" behavior (successor=${ownerTabId})`);
+      setSuccessor(tab.id, ownerTabId);
+      tab.$TST.temporaryMetadata.set('lastSuccessorTabId', ownerTabId);
+      tab.$TST.temporaryMetadata.set('lastSuccessorTabIdByOwner', true);
+
+      if (!tab.openerTabId)
+        return;
+
+      const opener = Tab.get(tab.openerTabId);
+      const lastRelatedTab = opener?.$TST.lastRelatedTab;
+      log(`opener ${dumpTab(opener)}'s lastRelatedTab: ${dumpTab(lastRelatedTab)})`);
+      if (lastRelatedTab) {
+        log(' => clear successor');
+        tryClearOwnerSuccessor(lastRelatedTab);
+      }
+      opener.$TST.lastRelatedTab = tab;
+    });
+  }
+  else {
+    const opener = Tab.get(tab.openerTabId);
+    if (opener)
+      opener.$TST.lastRelatedTab = tab;
+  }
+});
+
+function updateActiveTab(windowId) {
+  const activeTab = Tab.getActiveTab(windowId);
+  if (activeTab)
+    update(activeTab.id);
+}
+
+Tab.onCreated.addListener((tab, _info = {}) => {
+  updateActiveTab(tab.windowId);
+});
+
+Tab.onRemoving.addListener((tab, removeInfo = {}) => {
+  if (removeInfo.isWindowClosing)
+    return;
+
+  const lastRelatedTab = tab.$TST.lastRelatedTab;
+  if (lastRelatedTab &&
+      !lastRelatedTab.active)
+    tryClearOwnerSuccessor(lastRelatedTab);
+});
+
+Tab.onRemoved.addListener((tab, info = {}) => {
+  updateActiveTab(info.windowId);
+
+  const win = TabsStore.windows.get(info.windowId);
+  if (!win)
+    return;
+  log(`clear lastRelatedTabs for ${info.windowId} by tabs.onRemoved`);
+  win.clearLastRelatedTabs();
+});
+
+Tab.onMoved.addListener((tab, info = {}) => {
+  updateActiveTab(tab.windowId);
+
+  if (!info.byInternalOperation) {
+    log(`clear lastRelatedTabs for ${tab.windowId} by tabs.onMoved`);
+    TabsStore.windows.get(info.windowId).clearLastRelatedTabs();
+  }
+});
+
+Tab.onAttached.addListener((_tab, info = {}) => {
+  updateActiveTab(info.newWindowId);
+});
+
+Tab.onDetached.addListener((_tab, info = {}) => {
+  updateActiveTab(info.oldWindowId);
+
+  const win = TabsStore.windows.get(info.oldWindowId);
+  if (win) {
+    log(`clear lastRelatedTabs for ${info.windowId} by tabs.onDetached`);
+    win.clearLastRelatedTabs();
+  }
+});
+
+Tab.onUpdated.addListener((tab, changeInfo = {}) => {
+  if (!('discarded' in changeInfo))
+    return;
+  updateActiveTab(tab.windowId);
+});
+
+Tab.onShown.addListener(tab => {
+  updateActiveTab(tab.windowId);
+});
+
+Tab.onHidden.addListener(tab => {
+  updateActiveTab(tab.windowId);
+});
+
+Tree.onAttached.addListener((child, { parent } = {}) => {
+  updateActiveTab(child.windowId);
+
+  const lastRelatedTabId = parent.$TST.lastRelatedTabId;
+  if (lastRelatedTabId &&
+      child.$TST.previousSiblingTab &&
+      lastRelatedTabId == child.$TST.previousSiblingTab.id)
+    parent.$TST.lastRelatedTab = child;
+});
+
+Tree.onDetached.addListener((child, _info = {}) => {
+  updateActiveTab(child.windowId);
+});
+
+Tree.onSubtreeCollapsedStateChanging.addListener((tab, _info = {}) => {
+  updateActiveTab(tab.windowId);
+});
+
+SidebarConnection.onConnected.addListener((windowId, _openCount) => {
+  updateActiveTab(windowId);
+});
+
+SidebarConnection.onDisconnected.addListener((windowId, _openCount) => {
+  updateActiveTab(windowId);
+});
+
+// for automated test
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!message || !message.type)
+    return;
+
+  switch (message.type) {
+    case Constants.kCOMMAND_WAIT_UNTIL_SUCCESSORS_UPDATED:
+      return Promise.all([...mInProgressUpdates]);
+  }
+});
diff --git a/waterfox/browser/components/sidebar/background/sync-background.js b/waterfox/browser/components/sidebar/background/sync-background.js
new file mode 100644
index 0000000000000..0477b9b349548
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/sync-background.js
@@ -0,0 +1,83 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+  notify,
+  wait,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as Sync from '/common/sync.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as Tree from './tree.js';
+
+Sync.onMessage.addListener(async message => {
+  const data = message.data;
+  if (data.type != Constants.kSYNC_DATA_TYPE_TABS ||
+      !Array.isArray(data.tabs))
+    return;
+
+  const multiple = data.tabs.length > 1 ? '_multiple' : '';
+  notify({
+    title: browser.i18n.getMessage(
+      `receiveTabs_notification_title${multiple}`,
+      [Sync.getDeviceName(message.from)]
+    ),
+    message: browser.i18n.getMessage(
+      `receiveTabs_notification_message${multiple}`,
+      data.tabs.length > 1 ?
+        [data.tabs[0].url, data.tabs.length, data.tabs.length - 1] :
+        [data.tabs[0].url]
+    ),
+    timeout: configs.syncReceivedTabsNotificationTimeout
+  });
+
+  const windowId = TabsStore.getCurrentWindowId() || (await browser.windows.getCurrent()).id;
+  const win = TabsStore.windows.get(windowId);
+  const initialIndex = win.tabs.size;
+  win.toBeOpenedOrphanTabs += data.tabs.length;
+  let index = 0;
+  const tabs = [];
+  for (const tab of data.tabs) {
+    const createParams = {
+      windowId,
+      url:    tab.url,
+      index:  initialIndex + index,
+      active: index == 0
+    };
+    if (tab.cookieStoreId &&
+        tab.cookieStoreId != 'firefox-default' &&
+        ContextualIdentities.get(tab.cookieStoreId))
+      createParams.cookieStoreId = tab.cookieStoreId;
+    let openedTab;
+    try {
+      openedTab = await browser.tabs.create(createParams);
+    }
+    catch(error) {
+      console.log(error);
+    }
+    if (!openedTab)
+      openedTab = await browser.tabs.create({
+        ...createParams,
+        url: `about:blank?${tab.url}`
+      });
+    tabs.push(openedTab);
+    index++;
+  }
+
+  if (!Array.isArray(data.structure))
+    return;
+
+  await wait(100); // wait for all tabs are tracked
+  await Tree.applyTreeStructureToTabs(tabs.map(tab => Tab.get(tab.id)), data.structure, {
+    broadcast: true
+  });
+});
diff --git a/waterfox/browser/components/sidebar/background/tab-context-menu.js b/waterfox/browser/components/sidebar/background/tab-context-menu.js
new file mode 100644
index 0000000000000..cf8802667bb21
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tab-context-menu.js
@@ -0,0 +1,1860 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  mapAndFilter,
+  configs,
+  sanitizeForHTMLText
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as Sync from '/common/sync.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import * as Commands from './commands.js';
+import * as NativeTabGroups from './native-tab-groups.js';
+import * as TabsOpen from './tabs-open.js';
+
+function log(...args) {
+  internalLogger('background/tab-context-menu', ...args);
+}
+
+export const onTSTItemClick = new EventListenerManager();
+export const onTSTTabContextMenuShown = new EventListenerManager();
+export const onTSTTabContextMenuHidden = new EventListenerManager();
+export const onTopLevelItemAdded = new EventListenerManager();
+
+const EXTERNAL_TOP_LEVEL_ITEM_MATCHER = /^external-top-level-item:([^:]+):(.+)$/;
+function getExternalTopLevelItemId(ownerId, itemId) {
+  return `external-top-level-item:${ownerId}:${itemId}`;
+}
+
+const SAFE_MENU_PROPERTIES = [
+  'checked',
+  'enabled',
+  'icons',
+  'parentId',
+  'title',
+  'type',
+  'visible'
+];
+
+const mItemsById = {
+  'context_newTab': {
+    title:    browser.i18n.getMessage('tabContextMenu_newTab_label'),
+    titleTab: browser.i18n.getMessage('tabContextMenu_newTabNext_label'),
+  },
+  'context_newGroup': {
+    title:              browser.i18n.getMessage('tabContextMenu_newGroup_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_newGroup_label_multiselected')
+  },
+  'context_addToGroup': {
+    title:              browser.i18n.getMessage('tabContextMenu_addToGroup_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_addToGroup_label_multiselected')
+  },
+  'context_addToGroup_newGroup': {
+    parentId: 'context_addToGroup',
+    title:    browser.i18n.getMessage('tabContextMenu_addToGroup_newGroup_label'),
+  },
+  'context_addToGroup_separator:afterNewGroup': {
+    parentId: 'context_addToGroup',
+    type:     'separator',
+  },
+  'context_removeFromGroup': {
+    title:              browser.i18n.getMessage('tabContextMenu_removeFromGroup_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_removeFromGroup_label_multiselected')
+  },
+  'context_separator:afterNewTab': {
+    type: 'separator'
+  },
+  'context_reloadTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_reload_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_reload_label_multiselected')
+  },
+  'context_topLevel_reloadTree': {
+    title:              browser.i18n.getMessage('context_reloadTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_reloadTree_label_multiselected')
+  },
+  'context_topLevel_reloadDescendants': {
+    title:              browser.i18n.getMessage('context_reloadDescendants_label'),
+    titleMultiselected: browser.i18n.getMessage('context_reloadDescendants_label_multiselected')
+  },
+  // This item won't be handled by the onClicked handler, so you may need to handle it with something experiments API.
+  'context_unblockAutoplay': {
+    title:              browser.i18n.getMessage('tabContextMenu_unblockAutoplay_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_unblockAutoplay_label_multiselected')
+  },
+  // This item won't be handled by the onClicked handler, so you may need to handle it with something experiments API.
+  'context_topLevel_unblockAutoplayTree': {
+    title:                browser.i18n.getMessage('context_unblockAutoplayTree_label'),
+    titleMultiselected:   browser.i18n.getMessage('context_unblockAutoplayTree_label_multiselected'),
+  },
+  // This item won't be handled by the onClicked handler, so you may need to handle it with something experiments API.
+  'context_topLevel_unblockAutoplayDescendants': {
+    title:                browser.i18n.getMessage('context_unblockAutoplayDescendants_label'),
+    titleMultiselected:   browser.i18n.getMessage('context_unblockAutoplayDescendants_label_multiselected'),
+  },
+  'context_toggleMuteTab': {
+    titleMute:                browser.i18n.getMessage('tabContextMenu_mute_label'),
+    titleUnmute:              browser.i18n.getMessage('tabContextMenu_unmute_label'),
+    titleMultiselectedMute:   browser.i18n.getMessage('tabContextMenu_mute_label_multiselected'),
+    titleMultiselectedUnmute: browser.i18n.getMessage('tabContextMenu_unmute_label_multiselected')
+  },
+  'context_topLevel_toggleMuteTree': {
+    titleMuteTree:                browser.i18n.getMessage('context_toggleMuteTree_label_mute'),
+    titleMultiselectedMuteTree:   browser.i18n.getMessage('context_toggleMuteTree_label_multiselected_mute'),
+    titleUnmuteTree:              browser.i18n.getMessage('context_toggleMuteTree_label_unmute'),
+    titleMultiselectedUnmuteTree: browser.i18n.getMessage('context_toggleMuteTree_label_multiselected_unmute')
+  },
+  'context_topLevel_toggleMuteDescendants': {
+    titleMuteDescendant:                browser.i18n.getMessage('context_toggleMuteDescendants_label_mute'),
+    titleMultiselectedMuteDescendant:   browser.i18n.getMessage('context_toggleMuteDescendants_label_multiselected_mute'),
+    titleUnmuteDescendant:              browser.i18n.getMessage('context_toggleMuteDescendants_label_unmute'),
+    titleMultiselectedUnmuteDescendant: browser.i18n.getMessage('context_toggleMuteDescendants_label_multiselected_unmute')
+  },
+  'context_pinTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_pin_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_pin_label_multiselected')
+  },
+  'context_unpinTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_unpin_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_unpin_label_multiselected')
+  },
+  'context_topLevel_toggleSticky': {
+    titleStick:                browser.i18n.getMessage('context_toggleSticky_label_stick'),
+    titleMultiselectedStick:   browser.i18n.getMessage('context_toggleSticky_label_multiselected_stick'),
+    titleUnstick:              browser.i18n.getMessage('context_toggleSticky_label_unstick'),
+    titleMultiselectedUnstick: browser.i18n.getMessage('context_toggleSticky_label_multiselected_unstick')
+  },
+  'context_unloadTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_unload_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_unload_label_multiselected'),
+  },
+  'context_duplicateTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_duplicate_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_duplicate_label_multiselected')
+  },
+  'context_separator:afterDuplicate': {
+    type: 'separator'
+  },
+  'context_bookmarkTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_bookmark_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_bookmark_label_multiselected')
+  },
+  'context_topLevel_bookmarkTree': {
+    title:              browser.i18n.getMessage('context_bookmarkTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_bookmarkTree_label_multiselected')
+  },
+  'context_moveTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_moveTab_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_moveTab_label_multiselected')
+  },
+  'context_moveTabToStart': {
+    parentId: 'context_moveTab',
+    title:    browser.i18n.getMessage('tabContextMenu_moveTabToStart_label')
+  },
+  'context_moveTabToEnd': {
+    parentId: 'context_moveTab',
+    title:    browser.i18n.getMessage('tabContextMenu_moveTabToEnd_label')
+  },
+  'context_openTabInWindow': {
+    parentId: 'context_moveTab',
+    title:    browser.i18n.getMessage('tabContextMenu_tearOff_label')
+  },
+  'context_shareTabURL': {
+    title: browser.i18n.getMessage('tabContextMenu_shareTabURL_label'),
+  },
+  'context_sendTabsToDevice': {
+    title:              browser.i18n.getMessage('tabContextMenu_sendTabsToDevice_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_sendTabsToDevice_label_multiselected')
+  },
+  'context_topLevel_sendTreeToDevice': {
+    title:              browser.i18n.getMessage('context_sendTreeToDevice_label'),
+    titleMultiselected: browser.i18n.getMessage('context_sendTreeToDevice_label_multiselected')
+  },
+  'context_reopenInContainer': {
+    title: browser.i18n.getMessage('tabContextMenu_reopenInContainer_label')
+  },
+  'context_selectAllTabs': {
+    title: browser.i18n.getMessage('tabContextMenu_selectAllTabs_label')
+  },
+  'context_separator:afterSelectAllTabs': {
+    type: 'separator'
+  },
+  'context_topLevel_collapseTree': {
+    title:              browser.i18n.getMessage('context_collapseTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_collapseTree_label_multiselected')
+  },
+  'context_topLevel_collapseTreeRecursively': {
+    title:              browser.i18n.getMessage('context_collapseTreeRecursively_label'),
+    titleMultiselected: browser.i18n.getMessage('context_collapseTreeRecursively_label_multiselected')
+  },
+  'context_topLevel_collapseAll': {
+    title: browser.i18n.getMessage('context_collapseAll_label')
+  },
+  'context_topLevel_expandTree': {
+    title:              browser.i18n.getMessage('context_expandTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_expandTree_label_multiselected')
+  },
+  'context_topLevel_expandTreeRecursively': {
+    title:              browser.i18n.getMessage('context_expandTreeRecursively_label'),
+    titleMultiselected: browser.i18n.getMessage('context_expandTreeRecursively_label_multiselected')
+  },
+  'context_topLevel_expandAll': {
+    title: browser.i18n.getMessage('context_expandAll_label')
+  },
+  'context_separator:afterCollapseExpand': {
+    type: 'separator'
+  },
+  'context_closeTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_close_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_close_label_multiselected')
+  },
+  'context_closeDuplicatedTabs': {
+    title: browser.i18n.getMessage('tabContextMenu_closeDuplicatedTabs_label')
+  },
+  'context_closeMultipleTabs': {
+    title: browser.i18n.getMessage('tabContextMenu_closeMultipleTabs_label')
+  },
+  'context_closeTabsToTheStart': {
+    parentId: 'context_closeMultipleTabs',
+    title: browser.i18n.getMessage('tabContextMenu_closeTabsToTop_label')
+  },
+  'context_closeTabsToTheEnd': {
+    parentId: 'context_closeMultipleTabs',
+    title: browser.i18n.getMessage('tabContextMenu_closeTabsToBottom_label')
+  },
+  'context_closeOtherTabs': {
+    parentId: 'context_closeMultipleTabs',
+    title: browser.i18n.getMessage('tabContextMenu_closeOther_label')
+  },
+  'context_topLevel_closeTree': {
+    title:              browser.i18n.getMessage('context_closeTree_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeTree_label_multiselected')
+  },
+  'context_topLevel_closeDescendants': {
+    title:              browser.i18n.getMessage('context_closeDescendants_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeDescendants_label_multiselected')
+  },
+  'context_topLevel_closeOthers': {
+    title:              browser.i18n.getMessage('context_closeOthers_label'),
+    titleMultiselected: browser.i18n.getMessage('context_closeOthers_label_multiselected')
+  },
+  'context_undoCloseTab': {
+    title: browser.i18n.getMessage('tabContextMenu_undoClose_label'),
+    titleRegular: browser.i18n.getMessage('tabContextMenu_undoClose_label'),
+    titleMultipleTabsRestorable: browser.i18n.getMessage('tabContextMenu_undoClose_label_multiple')
+  },
+  'context_separator:afterClose': {
+    type: 'separator'
+  },
+
+  'noContextTab:context_reloadTab': {
+    title:              browser.i18n.getMessage('tabContextMenu_reloadSelected_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_reloadSelected_label_multiselected'),
+  },
+  'noContextTab:context_bookmarkSelected': {
+    title:              browser.i18n.getMessage('tabContextMenu_bookmarkSelected_label'),
+    titleMultiselected: browser.i18n.getMessage('tabContextMenu_bookmarkSelected_label_multiselected'),
+  },
+  'noContextTab:context_selectAllTabs': {
+    title: browser.i18n.getMessage('tabContextMenu_selectAllTabs_label')
+  },
+  'noContextTab:context_undoCloseTab': {
+    title: browser.i18n.getMessage('tabContextMenu_undoClose_label')
+  },
+
+  'lastSeparatorBeforeExtraItems': {
+    type:     'separator',
+    fakeMenu: true
+  }
+};
+
+const mExtraItems = new Map();
+
+const SIDEBAR_URL_PATTERN = [`${Constants.kSHORTHAND_URIS.tabbar}*`];
+
+let mInitialized = false;
+
+browser.runtime.onMessage.addListener(onMessage);
+browser.menus.onShown.addListener(onShown);
+browser.menus.onHidden.addListener(onHidden);
+browser.menus.onClicked.addListener(onClick);
+TSTAPI.onMessageExternal.addListener(onMessageExternal);
+
+function getItemPlacementSignature(item) {
+  if (item.placementSignature)
+    return item.placementSignature;
+  return item.placementSignature = JSON.stringify({
+    parentId: item.parentId
+  });
+}
+export async function init() {
+  mInitialized = true;
+
+  window.addEventListener('unload', () => {
+    browser.runtime.onMessage.removeListener(onMessage);
+    TSTAPI.onMessageExternal.removeListener(onMessageExternal);
+  }, { once: true });
+
+  const itemIds = Object.keys(mItemsById);
+  for (const id of itemIds) {
+    const item = mItemsById[id];
+    item.id          = id;
+    item.lastTitle   = item.title;
+    item.lastVisible = false;
+    item.lastEnabled = true;
+    if (item.type == 'separator') {
+      let beforeSeparator = true;
+      item.precedingItems = [];
+      item.followingItems = [];
+      for (const id of itemIds) {
+        const possibleSibling = mItemsById[id];
+        if (getItemPlacementSignature(item) != getItemPlacementSignature(possibleSibling)) {
+          if (beforeSeparator)
+            continue;
+          else
+            break;
+        }
+        if (id == item.id) {
+          beforeSeparator = false;
+          continue;
+        }
+        if (beforeSeparator) {
+          if (possibleSibling.type == 'separator') {
+            item.previousSeparator = possibleSibling;
+            item.precedingItems = [];
+          }
+          else {
+            item.precedingItems.push(id);
+          }
+        }
+        else {
+          if (possibleSibling.type == 'separator')
+            break;
+          else
+            item.followingItems.push(id);
+        }
+      }
+    }
+    const info = {
+      id,
+      title:    item.title,
+      type:     item.type || 'normal',
+      contexts: ['tab'],
+      viewTypes: ['sidebar', 'tab', 'popup'],
+      visible:  false, // hide all by default
+      documentUrlPatterns: SIDEBAR_URL_PATTERN
+    };
+    if (item.parentId)
+      info.parentId = item.parentId;
+    if (!item.fakeMenu)
+      browser.menus.create(info);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: info
+    }, browser.runtime);
+  }
+  onTSTItemClick.addListener(onClick);
+
+  await ContextualIdentities.init();
+  updateContextualIdentities();
+  ContextualIdentities.onUpdated.addListener(() => {
+    updateContextualIdentities();
+  });
+}
+
+
+// Workaround for https://github.com/piroor/treestyletab/issues/3423
+// Firefox does not provide any API to access to the sharing service of the platform.
+// We need to provide it as experiments API or something way.
+// This module is designed to work with a service which has features:
+//   * async listServices(tab)
+//     - Returns an array of sharing services on macOS.
+//     - Retruned array should have 0 or more items like:
+//       { name:  "service name",
+//         title: "title for a menu item",
+//         image: "icon image (maybe data: URI)" }
+//   * share(tab, shareName = null)
+//     - Returns nothing.
+//     - Shares the specified tab with the specified service.
+//       The second argument is optional because it is required only on macOS.
+//   * openPreferences()
+//     - Returns nothing.
+//     - Opens preferences of sharing services on macOS.
+
+let mSharingService = null;
+
+export function registerSharingService(service) {
+  mSharingService = service;
+}
+
+
+let mMultipleTabsRestorable = false;
+Tab.onChangeMultipleTabsRestorability.addListener(multipleTabsRestorable => {
+  mMultipleTabsRestorable = multipleTabsRestorable;
+});
+
+const mNativeTabGroupItems = new Set();
+function updateNativeTabGroups(contextTab) {
+  if (!contextTab ||
+      !configs.tabGroupsEnabled) {
+    return;
+  }
+
+  for (const item of mNativeTabGroupItems) {
+    const id = item.id;
+    if (id in mItemsById)
+      delete mItemsById[id];
+    browser.menus.remove(id).catch(ApiTabs.createErrorSuppressor());
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_REMOVE,
+      params: id
+    }, browser.runtime);
+  }
+  mNativeTabGroupItems.clear();
+
+  updateItem('context_addToGroup_newGroup', {
+    visible: true,
+  });
+  updateItem('context_addToGroup_separator:afterNewGroup', {
+    visible: true,
+  });
+
+  const defaultTitle = browser.i18n.getMessage('tabContextMenu_addToGroup_unnamed_label');
+  const darkSuffix = window.matchMedia('(prefers-color-scheme: dark)').matches ? '-invert' : '';
+  const groups = getEffectiveTabGroups(contextTab.windowId);
+  for (const group of groups) {
+    if (contextTab.groupId == group.id) {
+      continue;
+    }
+    const id = `context_addToGroup:group:${group.id}`;
+    const item = {
+      id,
+      parentId:  'context_addToGroup',
+      title:     group.title || defaultTitle,
+      icons:     { 16: `/resources/icons/tab-group-chicklet.svg#${group.color}${darkSuffix}` },
+      contexts:  ['tab'],
+      viewTypes: ['sidebar', 'tab', 'popup'],
+      documentUrlPatterns: SIDEBAR_URL_PATTERN,
+    };
+    browser.menus.create(item);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: item
+    }, browser.runtime);
+    mNativeTabGroupItems.add(item);
+    mItemsById[item.id] = item;
+    item.lastVisible = true;
+    item.lastEnabled = true;
+  }
+}
+
+function getEffectiveTabGroups(windowId) {
+  return TreeItem.sort(
+    [...TabsStore.windows.get(windowId).tabGroups.values()]
+      .filter(group => !!group.$TST.firstMember)
+  );
+}
+
+const mContextualIdentityItems = new Set();
+function updateContextualIdentities() {
+  for (const item of mContextualIdentityItems) {
+    const id = item.id;
+    if (id in mItemsById)
+      delete mItemsById[id];
+    browser.menus.remove(id).catch(ApiTabs.createErrorSuppressor());
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_REMOVE,
+      params: id
+    }, browser.runtime);
+  }
+  mContextualIdentityItems.clear();
+
+  const defaultItem = {
+    parentId:  'context_reopenInContainer',
+    id:        'context_reopenInContainer:firefox-default',
+    title:     browser.i18n.getMessage('tabContextMenu_reopenInContainer_noContainer_label'),
+    contexts:  ['tab'],
+    viewTypes: ['sidebar', 'tab', 'popup'],
+    documentUrlPatterns: SIDEBAR_URL_PATTERN
+  };
+  browser.menus.create(defaultItem);
+  onMessageExternal({
+    type: TSTAPI.kCONTEXT_MENU_CREATE,
+    params: defaultItem
+  }, browser.runtime);
+  mContextualIdentityItems.add(defaultItem);
+
+  const defaultSeparator = {
+    parentId:  'context_reopenInContainer',
+    id:        'context_reopenInContainer_separator',
+    type:      'separator',
+    contexts:  ['tab'],
+    viewTypes: ['sidebar', 'tab', 'popup'],
+    documentUrlPatterns: SIDEBAR_URL_PATTERN
+  };
+  browser.menus.create(defaultSeparator);
+  onMessageExternal({
+    type: TSTAPI.kCONTEXT_MENU_CREATE,
+    params: defaultSeparator
+  }, browser.runtime);
+  mContextualIdentityItems.add(defaultSeparator);
+
+  ContextualIdentities.forEach(identity => {
+    const id = `context_reopenInContainer:${identity.cookieStoreId}`;
+    const item = {
+      parentId: 'context_reopenInContainer',
+      id:       id,
+      title:    identity.name.replace(/^([a-z0-9])/i, '&$1'),
+      contexts: ['tab'],
+      viewTypes: ['sidebar', 'tab', 'popup'],
+      documentUrlPatterns: SIDEBAR_URL_PATTERN
+    };
+    if (identity.iconUrl)
+      item.icons = { 16: identity.iconUrl };
+    browser.menus.create(item);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: item
+    }, browser.runtime);
+    mContextualIdentityItems.add(item);
+    mItemsById[item.id] = item;
+    item.lastVisible = true;
+    item.lastEnabled = true;
+  });
+}
+
+const mLastDevicesSignature = new Map();
+const mSendToDeviceItems    = new Map();
+export async function updateSendToDeviceItems(parentId, { manage } = {}) {
+  const devices = await Sync.getOtherDevices();
+  const signature = JSON.stringify(devices.map(device => ({ id: device.id, name: device.name })));
+  if (signature == mLastDevicesSignature.get(parentId))
+    return false;
+
+  mLastDevicesSignature.set(parentId, signature);
+
+  const items = mSendToDeviceItems.get(parentId) || new Set();
+  for (const item of items) {
+    const id = item.id;
+    browser.menus.remove(id).catch(ApiTabs.createErrorSuppressor());
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_REMOVE,
+      params: id
+    }, browser.runtime);
+  }
+  items.clear();
+
+  const baseParams = {
+    parentId,
+    contexts:            ['tab'],
+    viewTypes:           ['sidebar', 'tab', 'popup'],
+    documentUrlPatterns: SIDEBAR_URL_PATTERN
+  };
+
+  if (devices.length > 0) {
+    for (const device of devices) {
+      const item = {
+        ...baseParams,
+        type:  'normal',
+        id:    `${parentId}:device:${device.id}`,
+        title: device.name
+      };
+      if (device.icon)
+        item.icons = {
+          '16': `/resources/icons/${sanitizeForHTMLText(device.icon)}.svg`
+        };
+      browser.menus.create(item);
+      onMessageExternal({
+        type: TSTAPI.kCONTEXT_MENU_CREATE,
+        params: item
+      }, browser.runtime);
+      items.add(item);
+    }
+
+    const separator = {
+      ...baseParams,
+      type: 'separator',
+      id:   `${parentId}:separator`
+    };
+    browser.menus.create(separator);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: separator
+    }, browser.runtime);
+    items.add(separator);
+
+    const sendToAllItem = {
+      ...baseParams,
+      type:  'normal',
+      id:    `${parentId}:all`,
+      title: browser.i18n.getMessage('tabContextMenu_sendTabsToAllDevices_label')
+    };
+    browser.menus.create(sendToAllItem);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: sendToAllItem
+    }, browser.runtime);
+    items.add(sendToAllItem);
+  }
+
+  if (manage) {
+    const manageItem = {
+      ...baseParams,
+      type:  'normal',
+      id:    `${parentId}:manage`,
+      title: browser.i18n.getMessage('tabContextMenu_manageSyncDevices_label')
+    };
+    browser.menus.create(manageItem);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: manageItem
+    }, browser.runtime);
+    items.add(manageItem);
+  }
+
+  mSendToDeviceItems.set(parentId, items);
+  return true;
+}
+
+const mLastSharingServicesSignature = new Map();
+const mShareItems                   = new Map();
+async function updateSharingServiceItems(parentId, contextTab) {
+  if (!mSharingService ||
+      !contextTab)
+    return false;
+
+  const services = await mSharingService.listServices(contextTab);
+  const signature = JSON.stringify(services);
+  if (signature == mLastSharingServicesSignature.get(parentId))
+    return false;
+
+  mLastSharingServicesSignature.set(parentId, signature);
+
+  const items = mShareItems.get(parentId) || new Set();
+  for (const item of items) {
+    const id = item.id;
+    browser.menus.remove(id).catch(ApiTabs.createErrorSuppressor());
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_REMOVE,
+      params: id
+    }, browser.runtime);
+  }
+  items.clear();
+
+  const baseParams = {
+    parentId,
+    contexts:            ['tab'],
+    viewTypes:           ['sidebar', 'tab', 'popup'],
+    documentUrlPatterns: SIDEBAR_URL_PATTERN
+  };
+
+  if (services.length > 0) {
+    for (const service of services) {
+      const item = {
+        ...baseParams,
+        type:  'normal',
+        id:    `${parentId}:service:${service.name}`,
+        title: service.title,
+      };
+      if (service.image)
+        item.icons = {
+          '16': service.image,
+        };
+      browser.menus.create(item);
+      onMessageExternal({
+        type: TSTAPI.kCONTEXT_MENU_CREATE,
+        params: item,
+      }, browser.runtime);
+      items.add(item);
+    }
+
+    const separator = {
+      ...baseParams,
+      type: 'separator',
+      id:   `${parentId}:separator`,
+    };
+    browser.menus.create(separator);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: separator,
+    }, browser.runtime);
+    items.add(separator);
+
+    const moreItem = {
+      ...baseParams,
+      type:  'normal',
+      id:    `${parentId}:more`,
+      title: browser.i18n.getMessage('tabContextMenu_shareTabURL_more_label'),
+      icons: {
+        '16': '/resources/icons/more-horiz-16.svg',
+      },
+    };
+    browser.menus.create(moreItem);
+    onMessageExternal({
+      type: TSTAPI.kCONTEXT_MENU_CREATE,
+      params: moreItem,
+    }, browser.runtime);
+    items.add(moreItem);
+  }
+
+  mShareItems.set(parentId, items);
+  return true;
+}
+
+
+function updateItem(id, state = {}) {
+  let modified = false;
+  const item = mItemsById[id];
+  if (!item) {
+    return false;
+  }
+  const updateInfo = {
+    visible: 'visible' in state ? !!state.visible : true,
+    enabled: 'enabled' in state ? !!state.enabled : true
+  };
+  if ('checked' in state)
+    updateInfo.checked = state.checked;
+  const title = String(
+    (state.tab && state.titleTab) ||
+    state.title ||
+    (state.multiselected && item.titleMultiselected) ||
+    item.title
+  ).replace(/%S/g, state.count || 0);
+  if (title) {
+    updateInfo.title = title;
+    modified = title != item.lastTitle;
+    item.lastTitle = updateInfo.title;
+  }
+  if (!modified)
+    modified = updateInfo.visible != item.lastVisible ||
+                 updateInfo.enabled != item.lastEnabled;
+  item.lastVisible = updateInfo.visible;
+  item.lastEnabled = updateInfo.enabled;
+  if (!item.fakeMenu) {
+    browser.menus.update(id, updateInfo).catch(ApiTabs.createErrorSuppressor());
+  }
+  onMessageExternal({
+    type: TSTAPI.kCONTEXT_MENU_UPDATE,
+    params: [id, updateInfo]
+  }, browser.runtime);
+  return modified;
+}
+
+function updateSeparator(id, options = {}) {
+  const item = mItemsById[id];
+  const visible = (
+    (options.hasVisiblePreceding ||
+     hasVisiblePrecedingItem(item)) &&
+    (options.hasVisibleFollowing ||
+     item.followingItems.some(id => mItemsById[id].type != 'separator' && mItemsById[id].lastVisible))
+  );
+  return updateItem(id, { visible });
+}
+function hasVisiblePrecedingItem(separator) {
+  return (
+    separator.precedingItems.some(id => mItemsById[id].type != 'separator' && mItemsById[id].lastVisible) ||
+    (separator.previousSeparator &&
+     !separator.previousSeparator.lastVisible &&
+     hasVisiblePrecedingItem(separator.previousSeparator))
+  );
+}
+
+let mOverriddenContext = null;
+let mLastContextTabId = null;
+
+async function onShown(info, contextTab) {
+  if (!mInitialized)
+    return;
+
+  const contextTabId = contextTab?.id;
+  mLastContextTabId = contextTabId;
+  try {
+    contextTab = Tab.get(contextTabId);
+
+    const windowId              = contextTab ? contextTab.windowId : (await browser.windows.getLastFocused({}).catch(ApiTabs.createErrorHandler())).id;
+    if (mLastContextTabId != contextTabId)
+      return; // Skip further operations if the menu was already reopened on a different context tab.
+    const previousTab           = contextTab?.$TST.previousTab;
+    const previousSiblingTab    = contextTab?.$TST.previousSiblingTab;
+    const nextTab               = contextTab?.$TST.nextTab;
+    const nextSiblingTab        = contextTab?.$TST.nextSiblingTab;
+    const hasDuplicatedTabs     = Tab.hasDuplicatedTabs(windowId);
+    const hasMultipleTabs       = Tab.hasMultipleTabs(windowId);
+    const hasMultipleNormalTabs = Tab.hasMultipleTabs(windowId, { normal: true });
+    const multiselected         = contextTab?.$TST.multiselected;
+    const contextTabs           = multiselected ?
+      Tab.getSelectedTabs(windowId) :
+      contextTab ?
+        [contextTab] :
+        [];
+    const hasChild              = contextTab && contextTabs.some(tab => tab.$TST.hasChild);
+    const { hasUnmutedTab, hasUnmutedDescendant } = Commands.getUnmutedState(contextTabs);
+    const { hasAutoplayBlockedTab, hasAutoplayBlockedDescendant } = Commands.getAutoplayBlockedState(contextTabs);
+    const hasChoosableNativeTabGroup = contextTab && getEffectiveTabGroups(windowId).filter(group => group.id != contextTab.groupId).length > 0;
+
+    if (mOverriddenContext)
+      return onOverriddenMenuShown(info, contextTab, windowId);
+
+    let modifiedItemsCount = cleanupOverriddenMenu();
+
+    // ESLint reports "short circuit" error for following codes.
+    //   https://eslint.org/docs/rules/no-unused-expressions#allowshortcircuit
+    // To allow those usages, I disable the rule temporarily.
+    /* eslint-disable no-unused-expressions */
+
+    const emulate = configs.emulateDefaultContextMenu;
+
+    updateItem('context_newTab', {
+      visible: emulate,
+      tab: !!contextTab,
+    }) && modifiedItemsCount++;
+
+    updateItem('context_newGroup', {
+      visible: emulate && configs.tabGroupsEnabled && !!contextTab && !hasChoosableNativeTabGroup,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_addToGroup', {
+      visible: emulate && configs.tabGroupsEnabled && !!contextTab && hasChoosableNativeTabGroup,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_removeFromGroup', {
+      visible: emulate && configs.tabGroupsEnabled && !!contextTab && contextTab.groupId != -1,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_separator:afterNewTab', {
+      visible: emulate,
+    }) && modifiedItemsCount++;
+
+    updateItem('context_reloadTab', {
+      visible: emulate && !!contextTab,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_reloadTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_reloadTree,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_reloadDescendants', {
+      visible: emulate && !!contextTab && configs.context_topLevel_reloadDescendants,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_unblockAutoplay', {
+      visible: emulate && contextTab?.$TST.autoplayBlocked,
+      multiselected,
+      title: contextTab && Commands.getMenuItemTitle(mItemsById.context_unblockAutoplay, {
+        multiselected,
+      }),
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_unblockAutoplayTree', {
+      visible: emulate && hasChild && hasAutoplayBlockedTab && configs.context_topLevel_unblockAutoplayTree,
+      multiselected,
+      title: contextTab && Commands.getMenuItemTitle(mItemsById.context_topLevel_unblockAutoplayTree, {
+        multiselected,
+      }),
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_unblockAutoplayDescendants', {
+      visible: emulate && hasChild && hasAutoplayBlockedDescendant && configs.context_topLevel_unblockAutoplayDescendants,
+      multiselected,
+      title: contextTab && Commands.getMenuItemTitle(mItemsById.context_topLevel_unblockAutoplayDescendants, {
+        multiselected,
+      }),
+    }) && modifiedItemsCount++;
+    updateItem('context_toggleMuteTab', {
+      visible: emulate && !!contextTab,
+      multiselected,
+      title: contextTab && Commands.getMenuItemTitle(mItemsById.context_toggleMuteTab, {
+        multiselected,
+        unmuted: (!contextTab.mutedInfo || !contextTab.mutedInfo.muted),
+      }),
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_toggleMuteTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_toggleMuteTree,
+      enabled: hasChild,
+      multiselected,
+      title: Commands.getMenuItemTitle(mItemsById.context_topLevel_toggleMuteTree, { multiselected, hasUnmutedTab, hasUnmutedDescendant }),
+      hasUnmutedTab,
+      hasUnmutedDescendant,
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_toggleMuteDescendants', {
+      visible: emulate && !!contextTab && configs.context_topLevel_toggleMuteDescendants,
+      enabled: hasChild,
+      multiselected,
+      title: Commands.getMenuItemTitle(mItemsById.context_topLevel_toggleMuteDescendants, { multiselected, hasUnmutedTab, hasUnmutedDescendant }),
+      hasUnmutedTab,
+      hasUnmutedDescendant,
+    }) && modifiedItemsCount++;
+    updateItem('context_pinTab', {
+      visible: emulate && !!contextTab && !contextTab.pinned,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_unpinTab', {
+      visible: emulate && !!contextTab?.pinned,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_toggleSticky', {
+      visible: emulate && !!contextTab,
+      enabled: contextTab && !contextTab.pinned,
+      multiselected,
+      title: contextTab && Commands.getMenuItemTitle(mItemsById.context_topLevel_toggleSticky, {
+        multiselected,
+        sticky: contextTab?.$TST.sticky,
+      }),
+    }) && modifiedItemsCount++;
+    const unloadableCount = Commands.filterUnloadableTabs(contextTabs).length;
+    updateItem('context_unloadTab', {
+      visible: emulate && unloadableCount > 0,
+      multiselected: unloadableCount > 1,
+      count: unloadableCount,
+    }) && modifiedItemsCount++;
+    updateItem('context_duplicateTab', {
+      visible: emulate && !!contextTab,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_bookmarkTab', {
+      visible: emulate && !!contextTab,
+      multiselected: multiselected || !contextTab
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_bookmarkTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_bookmarkTree,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_moveTab', {
+      visible: emulate && !!contextTab,
+      enabled: contextTab && hasMultipleTabs,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_moveTabToStart', {
+      enabled: emulate && !!contextTab && hasMultipleTabs && (previousSiblingTab || previousTab) && ((previousSiblingTab || previousTab).pinned == contextTab.pinned),
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_moveTabToEnd', {
+      enabled: emulate && !!contextTab && hasMultipleTabs && (nextSiblingTab || nextTab) && ((nextSiblingTab || nextTab).pinned == contextTab.pinned),
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_openTabInWindow', {
+      enabled: emulate && !!contextTab && hasMultipleTabs,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    // Not implemented yet as a built-in. See also: https://github.com/piroor/treestyletab/issues/3423
+    updateItem('context_shareTabURL', {
+      visible: emulate && !!contextTab && mSharingService && Sync.isSendableTab(contextTab),
+    }) && modifiedItemsCount++;
+
+    updateItem('context_sendTabsToDevice', {
+      visible: emulate && !!contextTab && contextTabs.filter(Sync.isSendableTab).length > 0,
+      multiselected,
+      count: contextTabs.length
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_sendTreeToDevice', {
+      visible: emulate && !!contextTab && contextTabs.filter(Sync.isSendableTab).length > 0 && configs.context_topLevel_sendTreeToDevice && hasChild,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    let showContextualIdentities = false;
+    if (contextTab && !contextTab.incognito) {
+      for (const item of mContextualIdentityItems.values()) {
+        const id = item.id;
+        let visible;
+        if (!emulate)
+          visible = false;
+        else if (id == 'context_reopenInContainer_separator')
+          visible = !!contextTab && contextTab.cookieStoreId != 'firefox-default';
+        else
+          visible = !!contextTab && id != `context_reopenInContainer:${contextTab.cookieStoreId}`;
+        updateItem(id, { visible }) && modifiedItemsCount++;
+        if (visible)
+          showContextualIdentities = true;
+      }
+    }
+    updateItem('context_reopenInContainer', {
+      visible: emulate && !!contextTab && showContextualIdentities && !contextTab.incognito,
+      enabled: contextTabs.every(tab => TabsOpen.isOpenable(tab.url)),
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_selectAllTabs', {
+      visible: emulate && !!contextTab,
+      enabled: contextTab && Tab.getSelectedTabs(windowId).length != Tab.getVisibleTabs(windowId).length,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_topLevel_collapseTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_collapseTree,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_collapseTreeRecursively', {
+      visible: emulate && !!contextTab && configs.context_topLevel_collapseTreeRecursively,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_collapseAll', {
+      visible: emulate && !multiselected && !!contextTab && configs.context_topLevel_collapseAll
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_expandTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_expandTree,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_expandTreeRecursively', {
+      visible: emulate && !!contextTab && configs.context_topLevel_expandTreeRecursively,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_expandAll', {
+      visible: emulate && !multiselected && !!contextTab && configs.context_topLevel_expandAll
+    }) && modifiedItemsCount++;
+
+    updateItem('context_closeTab', {
+      visible: emulate && !!contextTab,
+      multiselected,
+      count: contextTabs.length
+    }) && modifiedItemsCount++;
+
+    updateItem('context_closeDuplicatedTabs', {
+      visible: emulate && !!contextTab,
+      enabled: hasDuplicatedTabs && !multiselected,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_closeMultipleTabs', {
+      visible: emulate && !!contextTab,
+      enabled: hasMultipleNormalTabs,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_closeTabsToTheStart', {
+      visible: emulate && !!contextTab,
+      enabled: nextTab,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_closeTabsToTheEnd', {
+      visible: emulate && !!contextTab,
+      enabled: nextTab,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_closeOtherTabs', {
+      visible: emulate && !!contextTab,
+      enabled: hasMultipleNormalTabs,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('context_topLevel_closeTree', {
+      visible: emulate && !!contextTab && configs.context_topLevel_closeTree,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_closeDescendants', {
+      visible: emulate && !!contextTab && configs.context_topLevel_closeDescendants,
+      enabled: hasChild,
+      multiselected
+    }) && modifiedItemsCount++;
+    updateItem('context_topLevel_closeOthers', {
+      visible: emulate && !!contextTab && configs.context_topLevel_closeOthers,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    const undoCloseTabLabel = mItemsById.context_undoCloseTab[configs.undoMultipleTabsClose && mMultipleTabsRestorable ? 'titleMultipleTabsRestorable' : 'titleRegular'];
+    updateItem('context_undoCloseTab', {
+      title:   undoCloseTabLabel,
+      visible: emulate && !!contextTab,
+      multiselected
+    }) && modifiedItemsCount++;
+
+    updateItem('noContextTab:context_reloadTab', {
+      visible: emulate && !contextTab
+    }) && modifiedItemsCount++;
+    updateItem('noContextTab:context_bookmarkSelected', {
+      visible: emulate && !contextTab
+    }) && modifiedItemsCount++;
+    updateItem('noContextTab:context_selectAllTabs', {
+      visible: emulate && !contextTab,
+      enabled: !contextTab && Tab.getSelectedTabs(windowId).length != Tab.getVisibleTabs(windowId).length
+    }) && modifiedItemsCount++;
+    updateItem('noContextTab:context_undoCloseTab', {
+      title:   undoCloseTabLabel,
+      visible: emulate && !contextTab
+    }) && modifiedItemsCount++;
+
+    updateSeparator('context_separator:afterDuplicate') && modifiedItemsCount++;
+    updateSeparator('context_separator:afterSelectAllTabs') && modifiedItemsCount++;
+    updateSeparator('context_separator:afterCollapseExpand') && modifiedItemsCount++;
+    updateSeparator('context_separator:afterClose') && modifiedItemsCount++;
+
+    const flattenExtraItems = Array.from(mExtraItems.values()).flat();
+
+    updateSeparator('lastSeparatorBeforeExtraItems', {
+      hasVisibleFollowing: contextTab && flattenExtraItems.some(item => !item.parentId && item.visible !== false)
+    }) && modifiedItemsCount++;
+
+    // these items should be updated at the last to reduce flicking of showing context menu
+    await Promise.all([
+      updateNativeTabGroups(contextTab),
+      updateSendToDeviceItems('context_sendTabsToDevice', { manage: true }),
+      mItemsById.context_topLevel_sendTreeToDevice.lastVisible && updateSendToDeviceItems('context_topLevel_sendTreeToDevice'),
+      modifiedItemsCount > 0 && browser.menus.refresh().catch(ApiTabs.createErrorSuppressor()).then(_ => false),
+      updateSharingServiceItems('context_shareTabURL', contextTab),
+    ]).then(results => {
+      modifiedItemsCount = 0;
+      for (const modified of results) {
+        if (modified)
+          modifiedItemsCount++;
+      }
+    });
+    if (mLastContextTabId != contextTabId)
+      return; // Skip further operations if the menu was already reopened on a different context tab.
+
+    /* eslint-enable no-unused-expressions */
+
+    if (modifiedItemsCount > 0)
+      browser.menus.refresh().catch(ApiTabs.createErrorSuppressor());
+  }
+  catch(error) {
+    console.error(error);
+  }
+}
+
+let mLastOverriddenContextOwner = null;
+
+function onOverriddenMenuShown(info, contextTab, windowId) {
+  if (!mLastOverriddenContextOwner) {
+    for (const itemId of Object.keys(mItemsById)) {
+      if (!mItemsById[itemId].lastVisible)
+        continue;
+      mItemsById[itemId].lastVisible = false;
+      browser.menus.update(itemId, { visible: false });
+    }
+    mLastOverriddenContextOwner = mOverriddenContext.owner;
+  }
+
+  for (const item of (mExtraItems.get(mLastOverriddenContextOwner) || [])) {
+    if (item.$topLevel &&
+        item.lastVisible) {
+      browser.menus.update(
+        getExternalTopLevelItemId(mOverriddenContext.owner, item.id),
+        { visible: true }
+      );
+    }
+  }
+
+  const cache = {};
+  const message = {
+    type: TSTAPI.kCONTEXT_MENU_SHOWN,
+    info: {
+      bookmarkId:    info.bookmarkId || null,
+      button:        info.button,
+      checked:       info.checked,
+      contexts:      contextTab ? ['tab'] : info.bookmarkId ? ['bookmark'] : [],
+      editable:      false,
+      frameId:       null,
+      frameUrl:      null,
+      linkText:      null,
+      linkUrl:       null,
+      mediaType:     null,
+      menuIds:       [],
+      menuItemId:    null,
+      modifiers:     [],
+      pageUrl:       null,
+      parentMenuItemId: null,
+      selectionText: null,
+      srcUrl:        null,
+      targetElementId: null,
+      viewType:      'sidebar',
+      wasChecked:    false
+    },
+    tab: contextTab,
+    windowId
+  }
+  TSTAPI.broadcastMessage(message, {
+    targets: [mOverriddenContext.owner],
+    tabProperties: ['tab'],
+    isContextTab: true,
+    cache,
+  });
+  TSTAPI.broadcastMessage({
+    ...message,
+    type: TSTAPI.kFAKE_CONTEXT_MENU_SHOWN
+  }, {
+    targets: [mOverriddenContext.owner],
+    tabProperties: ['tab']
+  });
+
+  reserveRefresh();
+}
+
+function cleanupOverriddenMenu() {
+  if (!mLastOverriddenContextOwner)
+    return 0;
+
+  let modifiedItemsCount = 0;
+
+  const owner = mLastOverriddenContextOwner;
+  mLastOverriddenContextOwner = null;
+
+  for (const itemId of Object.keys(mItemsById)) {
+    if (!mItemsById[itemId].lastVisible)
+      continue;
+    mItemsById[itemId].lastVisible = true;
+    browser.menus.update(itemId, { visible: true });
+    modifiedItemsCount++;
+  }
+
+  for (const item of (mExtraItems.get(owner) || [])) {
+    if (item.$topLevel &&
+        item.lastVisible) {
+      browser.menus.update(
+        getExternalTopLevelItemId(owner, item.id),
+        { visible: false }
+      );
+      modifiedItemsCount++;
+    }
+  }
+
+  return modifiedItemsCount;
+}
+
+function onHidden() {
+  if (!mInitialized)
+    return;
+
+  const owner = mOverriddenContext?.owner;
+  const windowId = mOverriddenContext?.windowId;
+  if (mLastOverriddenContextOwner &&
+      owner == mLastOverriddenContextOwner) {
+    mOverriddenContext = null;
+    TSTAPI.broadcastMessage({
+      type: TSTAPI.kCONTEXT_MENU_HIDDEN,
+      windowId
+    }, {
+      targets: [owner]
+    });
+    TSTAPI.broadcastMessage({
+      type: TSTAPI.kFAKE_CONTEXT_MENU_HIDDEN,
+      windowId
+    }, {
+      targets: [owner]
+    });
+  }
+}
+
+async function onClick(info, contextTab) {
+  if (!mInitialized)
+    return;
+
+  contextTab = Tab.get(contextTab?.id);
+  const win       = await browser.windows.getLastFocused({ populate: true }).catch(ApiTabs.createErrorHandler());
+  const windowId  = contextTab?.windowId || win.id;
+  const activeTab = TabsStore.activeTabInWindow.get(windowId);
+
+  let multiselectedTabs = Tab.getSelectedTabs(windowId);
+  const isMultiselected = contextTab ? contextTab.$TST.multiselected : multiselectedTabs.length > 1;
+  if (!isMultiselected)
+    multiselectedTabs = null;
+
+  switch (info.menuItemId.replace(/^noContextTab:/, '')) {
+    case 'context_newTab': {
+      const behavior = info.button == 1 ?
+        configs.autoAttachOnNewTabButtonMiddleClick :
+        (info.modifiers && (info.modifiers.includes('Ctrl') || info.modifiers.includes('Command'))) ?
+          configs.autoAttachOnNewTabButtonAccelClick :
+          contextTab ?
+            configs.autoAttachOnContextNewTabCommand :
+            configs.autoAttachOnNewTabCommand;
+      Commands.openNewTabAs({
+        baseTab: contextTab || activeTab,
+        as:      behavior,
+      });
+    }; break;
+
+    case 'context_newGroup':
+    case 'context_addToGroup_newGroup':
+      NativeTabGroups.addTabsToGroup(multiselectedTabs || [contextTab]).then(({ groupId, created }) => {
+        if (!created) {
+          return;
+        }
+        SidebarConnection.sendMessage({
+          type: Constants.kCOMMAND_SHOW_NATIVE_TAB_GROUP_MENU_PANEL,
+          windowId,
+          groupId,
+        });
+      });
+      break;
+
+    case 'context_removeFromGroup':
+      NativeTabGroups.removeTabsFromGroup(multiselectedTabs || [contextTab]);
+      break;
+
+    case 'context_reloadTab':
+      if (multiselectedTabs) {
+        for (const tab of multiselectedTabs) {
+          browser.tabs.reload(tab.id)
+            .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+      else {
+        const tab = contextTab || activeTab;
+        browser.tabs.reload(tab.id)
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+      }
+      break;
+    case 'context_toggleMuteTab': {
+      const tab = contextTab || activeTab;
+      const unmuted = !tab.mutedInfo || !tab.mutedInfo.muted;
+      if (multiselectedTabs) {
+        for (const tab of multiselectedTabs) {
+          browser.tabs.update(tab.id, { muted: unmuted })
+            .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+      else {
+        browser.tabs.update(contextTab.id, { muted: unmuted })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+      }
+    }; break;
+    case 'context_pinTab':
+      if (multiselectedTabs) {
+        for (const tab of multiselectedTabs) {
+          browser.tabs.update(tab.id, { pinned: true })
+            .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+      else {
+        browser.tabs.update(contextTab.id, { pinned: true })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+      }
+      break;
+    case 'context_unpinTab':
+      if (multiselectedTabs) {
+        for (const tab of multiselectedTabs) {
+          browser.tabs.update(tab.id, { pinned: false })
+            .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        }
+      }
+      else {
+        browser.tabs.update(contextTab.id, { pinned: false })
+          .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+      }
+      break;
+    case 'context_toggleSticky':
+      Commands.toggleSticky(multiselectedTabs, !(contextTab || activeTab).$TST.sticky);
+      break;
+    case 'context_unloadTab':
+      Commands.unloadTabs(multiselectedTabs || [contextTab]);
+      break;
+    case 'context_duplicateTab':
+      Commands.duplicateTab(contextTab, {
+        destinationWindowId: windowId
+      });
+      break;
+    case 'context_moveTabToStart':
+      Commands.moveTabToStart(contextTab);
+      break;
+    case 'context_moveTabToEnd':
+      Commands.moveTabToEnd(contextTab);
+      break;
+    case 'context_openTabInWindow':
+      Commands.openTabInWindow(contextTab, { withTree: true });
+      break;
+    case 'context_shareTabURL':
+      if (mSharingService)
+        mSharingService.share(contextTab);
+      break;
+    case 'context_shareTabURL:more':
+      if (mSharingService)
+        mSharingService.openPreferences();
+      break;
+    case 'context_sendTabsToDevice:all':
+      Sync.sendTabsToAllDevices(multiselectedTabs || [contextTab]);
+      break;
+    case 'context_sendTabsToDevice:manage':
+      Sync.manageDevices(windowId);
+      break;
+    case 'context_topLevel_sendTreeToDevice:all':
+      Sync.sendTabsToAllDevices(multiselectedTabs || [contextTab], { recursively: true });
+      break;
+    case 'context_selectAllTabs': {
+      const tabs = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+      TabsInternalOperation.highlightTabs(
+        [activeTab].concat(mapAndFilter(tabs, tab => !tab.active ? tab : undefined))
+      ).catch(ApiTabs.createErrorSuppressor());
+    }; break;
+    case 'context_bookmarkTab':
+      Commands.bookmarkTab(contextTab);
+      break;
+    case 'context_bookmarkSelected':
+      Commands.bookmarkTab(contextTab || activeTab);
+      break;
+    case 'context_closeDuplicatedTabs': {
+      const tabs = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+      tabs.sort((a, b) => b.lastAccessed - a.lastAccessed);
+      const tabKeys = new Set();
+      const closeTabs = [];
+      for (const tab of tabs) {
+        const key = `${tab.cookieStoreId}\n${tab.url}`;
+        if (tabKeys.has(key)) {
+          closeTabs.push(Tab.get(tab.id));
+          continue;
+        }
+        tabKeys.add(key);
+      }
+      const canceled = (await browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+        tabs: closeTabs.map(tab => tab.$TST.sanitized),
+        windowId,
+      }).catch(ApiTabs.createErrorHandler())) === false;
+      if (canceled)
+        break;
+      TabsInternalOperation.removeTabs(closeTabs);
+    } break;
+    case 'context_closeTabsToTheStart': {
+      const tabs = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+      const closeTabs = [];
+      const keptTabIds = new Set(
+        multiselectedTabs ?
+          multiselectedTabs.map(tab => tab.id) :
+          [contextTab.id]
+      );
+      for (const tab of tabs) {
+        if (keptTabIds.has(tab.id))
+          break;
+        if (!tab.pinned && !tab.hidden)
+          closeTabs.push(Tab.get(tab.id));
+      }
+      const canceled = (await browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+        tabs: closeTabs.map(tab => tab.$TST.sanitized),
+        windowId
+      }).catch(ApiTabs.createErrorHandler())) === false;
+      if (canceled)
+        break;
+      TabsInternalOperation.removeTabs(closeTabs);
+    }; break;
+    case 'context_closeTabsToTheEnd': {
+      const tabs = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+      tabs.reverse();
+      const closeTabs = [];
+      const keptTabIds = new Set(
+        (multiselectedTabs ?
+          multiselectedTabs :
+          [contextTab]
+        ).reduce((tabIds, tab, _index) => {
+          if (tab.$TST.subtreeCollapsed)
+            tabIds.push(tab.id, ...tab.$TST.descendants.map(tab => tab.id))
+          else
+            tabIds.push(tab.id);
+          return tabIds;
+        }, [])
+      );
+      for (const tab of tabs) {
+        if (keptTabIds.has(tab.id))
+          break;
+        if (!tab.pinned && !tab.hidden)
+          closeTabs.push(Tab.get(tab.id));
+      }
+      closeTabs.reverse();
+      const canceled = (await browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+        tabs: closeTabs.map(tab => tab.$TST.sanitized),
+        windowId
+      }).catch(ApiTabs.createErrorHandler())) === false;
+      if (canceled)
+        break;
+      TabsInternalOperation.removeTabs(closeTabs);
+    }; break;
+    case 'context_closeOtherTabs': {
+      const tabs  = await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler());
+      const keptTabIds = new Set(
+        (multiselectedTabs ?
+          multiselectedTabs :
+          [contextTab]
+        ).reduce((tabIds, tab, _index) => {
+          if (tab.$TST.subtreeCollapsed)
+            tabIds.push(tab.id, ...tab.$TST.descendants.map(tab => tab.id))
+          else
+            tabIds.push(tab.id);
+          return tabIds;
+        }, [])
+      );
+      const closeTabs = mapAndFilter(tabs,
+                                     tab => !tab.pinned && !tab.hidden && !keptTabIds.has(tab.id) && Tab.get(tab.id) || undefined);
+      const canceled = (await browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+        tabs: closeTabs.map(tab => tab.$TST.sanitized),
+        windowId
+      }).catch(ApiTabs.createErrorHandler())) === false;
+      if (canceled)
+        break;
+      TabsInternalOperation.removeTabs(closeTabs);
+    }; break;
+    case 'context_undoCloseTab': {
+      const sessions = await browser.sessions.getRecentlyClosed({ maxResults: 1 }).catch(ApiTabs.createErrorHandler());
+      if (sessions.length && sessions[0].tab)
+        browser.sessions.restore(sessions[0].tab.sessionId).catch(ApiTabs.createErrorSuppressor());
+    }; break;
+    case 'context_closeTab': {
+      const closeTabs = (multiselectedTabs || TreeBehavior.getClosingTabsFromParent(contextTab, {
+        byInternalOperation: true
+      })).reverse(); // close down to top, to keep tree structure of Tree Style Tab
+      const canceled = (await browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_TABS_CLOSING,
+        tabs: closeTabs.map(tab => tab.$TST.sanitized),
+        windowId
+      }).catch(ApiTabs.createErrorHandler())) === false;
+      if (canceled)
+        return;
+      TabsInternalOperation.removeTabs(closeTabs);
+    }; break;
+
+    default: {
+      const nativeTabGroupMatch = info.menuItemId.match(/^context_addToGroup:group:(.+)$/);
+      if (contextTab &&
+          nativeTabGroupMatch)
+        NativeTabGroups.addTabsToGroup(multiselectedTabs || [contextTab], parseInt(nativeTabGroupMatch[1]));
+
+      const contextualIdentityMatch = info.menuItemId.match(/^context_reopenInContainer:(.+)$/);
+      if (contextTab &&
+          contextualIdentityMatch)
+        Commands.reopenInContainer(contextTab, contextualIdentityMatch[1]);
+
+      const shareTabsMatch = info.menuItemId.match(/^context_shareTabURL:service:(.+)$/);
+      if (mSharingService &&
+          contextTab &&
+          shareTabsMatch)
+        mSharingService.share(contextTab, shareTabsMatch[1]);
+
+      const sendTabsToDeviceMatch = info.menuItemId.match(/^context_sendTabsToDevice:device:(.+)$/);
+      if (contextTab &&
+          sendTabsToDeviceMatch)
+        Sync.sendTabsToDevice(
+          multiselectedTabs || [contextTab],
+          { to: sendTabsToDeviceMatch[1] }
+        );
+      const sendTreeToDeviceMatch = info.menuItemId.match(/^context_topLevel_sendTreeToDevice:device:(.+)$/);
+      if (contextTab &&
+          sendTreeToDeviceMatch)
+        Sync.sendTabsToDevice(
+          multiselectedTabs || [contextTab],
+          { to: sendTreeToDeviceMatch[1],
+            recursively: true }
+        );
+
+      if (EXTERNAL_TOP_LEVEL_ITEM_MATCHER.test(info.menuItemId)) {
+        const owner      = RegExp.$1;
+        const menuItemId = RegExp.$2;
+        const message = {
+          type: TSTAPI.kCONTEXT_MENU_CLICK,
+          info: {
+            bookmarkId:    info.bookmarkId || null,
+            button:        info.button,
+            checked:       info.checked,
+            editable:      false,
+            frameId:       null,
+            frameUrl:      null,
+            linkText:      null,
+            linkUrl:       null,
+            mediaType:     null,
+            menuItemId,
+            modifiers:     [],
+            pageUrl:       null,
+            parentMenuItemId: null,
+            selectionText: null,
+            srcUrl:        null,
+            targetElementId: null,
+            viewType:      'sidebar',
+            wasChecked:    info.wasChecked
+          },
+          tab: contextTab,
+        };
+        if (owner == browser.runtime.id) {
+          browser.runtime.sendMessage(message).catch(ApiTabs.createErrorSuppressor());
+        }
+        else {
+          const cache = {};
+          TSTAPI.sendMessage(
+            owner,
+            message,
+            { tabProperties: ['tab'], cache, isContextTab: true }
+          ).catch(ApiTabs.createErrorSuppressor());
+          TSTAPI.sendMessage(
+            owner,
+            {
+              ...message,
+              type: TSTAPI.kFAKE_CONTEXT_MENU_CLICK
+            },
+            { tabProperties: ['tab'], cache, isContextTab: true }
+          ).catch(ApiTabs.createErrorSuppressor());
+        }
+      }
+    }; break;
+  }
+}
+
+
+function getItemsFor(addonId) {
+  if (mExtraItems.has(addonId)) {
+    return mExtraItems.get(addonId);
+  }
+  const items = [];
+  mExtraItems.set(addonId, items);
+  return items;
+}
+
+function exportExtraItems() {
+  const exported = {};
+  for (const [id, items] of mExtraItems.entries()) {
+    exported[id] = items;
+  }
+  return exported;
+}
+
+async function notifyUpdated() {
+  await browser.runtime.sendMessage({
+    type:  Constants.kCOMMAND_NOTIFY_CONTEXT_MENU_UPDATED,
+    items: exportExtraItems()
+  }).catch(ApiTabs.createErrorSuppressor());
+}
+
+let mReservedNotifyUpdate;
+let mNotifyUpdatedHandlers = [];
+
+function reserveNotifyUpdated() {
+  return new Promise((resolve, _aReject) => {
+    mNotifyUpdatedHandlers.push(resolve);
+    if (mReservedNotifyUpdate)
+      clearTimeout(mReservedNotifyUpdate);
+    mReservedNotifyUpdate = setTimeout(async () => {
+      mReservedNotifyUpdate = undefined;
+      await notifyUpdated();
+      const handlers = mNotifyUpdatedHandlers;
+      mNotifyUpdatedHandlers = [];
+      for (const handler of handlers) {
+        handler();
+      }
+    }, 10);
+  });
+}
+
+function reserveRefresh() {
+  if (reserveRefresh.reserved)
+    clearTimeout(reserveRefresh.reserved);
+  reserveRefresh.reserved = setTimeout(() => {
+    reserveRefresh.reserved = null;;
+    browser.menus.refresh();
+  }, 0);
+}
+
+function onMessage(message, _sender) {
+  if (!mInitialized)
+    return;
+
+  log('tab-context-menu: internally called:', message);
+  switch (message.type) {
+    case Constants.kCOMMAND_GET_CONTEXT_MENU_ITEMS:
+      return Promise.resolve(exportExtraItems());
+
+    case TSTAPI.kCONTEXT_MENU_CLICK:
+      onTSTItemClick.dispatch(message.info, message.tab);
+      return;
+
+    case TSTAPI.kCONTEXT_MENU_SHOWN:
+      onShown(message.info, message.tab);
+      onTSTTabContextMenuShown.dispatch(message.info, message.tab);
+      return;
+
+    case TSTAPI.kCONTEXT_MENU_HIDDEN:
+      onTSTTabContextMenuHidden.dispatch();
+      return;
+
+    case Constants.kCOMMAND_NOTIFY_CONTEXT_ITEM_CHECKED_STATUS_CHANGED:
+      for (const itemData of mExtraItems.get(message.ownerId)) {
+        if (!itemData.id != message.id)
+          continue;
+        itemData.checked = message.checked;
+        break;
+      }
+      return;
+
+    case Constants.kCOMMAND_NOTIFY_CONTEXT_OVERRIDDEN:
+      mOverriddenContext = message.context || null;
+      if (mOverriddenContext) {
+        mOverriddenContext.owner = message.owner;
+        mOverriddenContext.windowId = message.windowId;
+      }
+      break;
+
+    // For optimization we update the context menu before the menu is actually opened if possible, to reduce visual flickings.
+    // But this optimization does not work as expected on environments which shows the context menu with mousedown, like macOS.
+    case TSTAPI.kNOTIFY_TAB_MOUSEDOWN:
+      if (message.button == 2) {
+        onShown(
+          message,
+          message.tab,
+        );
+        onTSTTabContextMenuShown.dispatch(message, message.tab);
+      }
+      break;
+  }
+}
+
+export function onMessageExternal(message, sender) {
+  if (!mInitialized)
+    return;
+
+  switch (message.type) {
+    case TSTAPI.kCONTEXT_MENU_CREATE:
+    case TSTAPI.kFAKE_CONTEXT_MENU_CREATE: {
+      log('TSTAPI.kCONTEXT_MENU_CREATE:', message, { id: sender.id, url: sender.url });
+      const items  = getItemsFor(sender.id);
+      let params = message.params;
+      if (Array.isArray(params))
+        params = params[0];
+      const parent = params.parentId && items.filter(item => item.id == params.parentId)[0];
+      if (params.parentId && !parent)
+        break;
+      let shouldAdd = true;
+      if (params.id) {
+        for (let i = 0, maxi = items.length; i < maxi; i++) {
+          const item = items[i];
+          if (item.id != params.id)
+            continue;
+          items.splice(i, 1, params);
+          shouldAdd = false;
+          break;
+        }
+      }
+      if (shouldAdd) {
+        items.push(params);
+        if (parent?.id) {
+          parent.children = parent.children || [];
+          parent.children.push(params.id);
+        }
+      }
+      mExtraItems.set(sender.id, items);
+      params.$topLevel = (
+        Array.isArray(params.viewTypes) &&
+        params.viewTypes.includes('sidebar')
+      );
+      if (sender.id != browser.runtime.id &&
+          params.$topLevel) {
+        params.lastVisible = params.visible !== false;
+        const visible = !!(
+          params.lastVisible &&
+          mOverriddenContext &&
+          mLastOverriddenContextOwner == sender.id
+        );
+        const createParams = {
+          id:        getExternalTopLevelItemId(sender.id, params.id),
+          type:      params.type || 'normal',
+          visible,
+          viewTypes: ['sidebar', 'tab', 'popup'],
+          contexts:  (params.contexts || []).filter(context => context == 'tab' || context == 'bookmark'),
+          documentUrlPatterns: SIDEBAR_URL_PATTERN
+        };
+        if (params.parentId)
+          createParams.parentId = getExternalTopLevelItemId(sender.id, params.parentId);
+        for (const property of SAFE_MENU_PROPERTIES) {
+          if (property in params)
+            createParams[property] = params[property];
+        }
+        browser.menus.create(createParams);
+        reserveRefresh();
+        onTopLevelItemAdded.dispatch();
+      }
+      return reserveNotifyUpdated();
+    }; break;
+
+    case TSTAPI.kCONTEXT_MENU_UPDATE:
+    case TSTAPI.kFAKE_CONTEXT_MENU_UPDATE: {
+      log('TSTAPI.kCONTEXT_MENU_UPDATE:', message, { id: sender.id, url: sender.url });
+      const items = getItemsFor(sender.id);
+      for (let i = 0, maxi = items.length; i < maxi; i++) {
+        const item = items[i];
+        if (item.id != message.params[0])
+          continue;
+        const params = message.params[1];
+        const updateProperties = {};
+        for (const property of SAFE_MENU_PROPERTIES) {
+          if (property in params)
+            updateProperties[property] = params[property];
+        }
+        if (sender.id != browser.runtime.id &&
+            item.$topLevel) {
+          if ('visible' in updateProperties)
+            item.lastVisible = updateProperties.visible;
+          if (!mOverriddenContext ||
+              mLastOverriddenContextOwner != sender.id)
+            delete updateProperties.visible;
+        }
+        items.splice(i, 1, {
+          ...item,
+          ...updateProperties
+        });
+        if (sender.id != browser.runtime.id &&
+            item.$topLevel &&
+            Object.keys(updateProperties).length > 0) {
+          browser.menus.update(
+            getExternalTopLevelItemId(sender.id, item.id),
+            updateProperties
+          );
+          reserveRefresh()
+        }
+        break;
+      }
+      mExtraItems.set(sender.id, items);
+      return reserveNotifyUpdated();
+    }; break;
+
+    case TSTAPI.kCONTEXT_MENU_REMOVE:
+    case TSTAPI.kFAKE_CONTEXT_MENU_REMOVE: {
+      log('TSTAPI.kCONTEXT_MENU_REMOVE:', message, { id: sender.id, url: sender.url });
+      let items = getItemsFor(sender.id);
+      let id    = message.params;
+      if (Array.isArray(id))
+        id = id[0];
+      const item   = items.filter(item => item.id == id)[0];
+      if (!item)
+        break;
+      const parent = item.parentId && items.filter(item => item.id == item.parentId)[0];
+      items = items.filter(item => item.id != id);
+      mExtraItems.set(sender.id, items);
+      if (parent?.children)
+        parent.children = parent.children.filter(childId => childId != id);
+      if (item.children) {
+        for (const childId of item.children) {
+          onMessageExternal({ type: message.type, params: childId }, sender);
+        }
+      }
+      if (sender.id != browser.runtime.id &&
+          item.$topLevel) {
+        browser.menus.remove(getExternalTopLevelItemId(sender.id, item.id));
+        reserveRefresh();
+      }
+      return reserveNotifyUpdated();
+    }; break;
+
+    case TSTAPI.kCONTEXT_MENU_REMOVE_ALL:
+    case TSTAPI.kFAKE_CONTEXT_MENU_REMOVE_ALL:
+    case TSTAPI.kUNREGISTER_SELF: {
+      delete mExtraItems.delete(sender.id);
+      return reserveNotifyUpdated();
+    }; break;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/background/tabs-group.js b/waterfox/browser/components/sidebar/background/tabs-group.js
new file mode 100644
index 0000000000000..1ae6f338dbdc5
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tabs-group.js
@@ -0,0 +1,662 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  wait,
+  countMatched,
+  dumpTab
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as TabsMove from './tabs-move.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/tabs-group', ...args);
+}
+
+export function makeGroupTabURI({ title, temporary, temporaryAggressive, openerTabId, aliasTabId, replacedParentCount } = {}) {
+  const url = new URL(Constants.kGROUP_TAB_URI);
+
+  if (title)
+    url.searchParams.set('title', title);
+
+  if (temporaryAggressive)
+    url.searchParams.set('temporaryAggressive', 'true');
+  else if (temporary)
+    url.searchParams.set('temporary', 'true');
+
+  if (openerTabId)
+    url.searchParams.set('openerTabId', openerTabId);
+
+  if (aliasTabId)
+    url.searchParams.set('aliasTabId', aliasTabId);
+
+  if (replacedParentCount)
+    url.searchParams.set('replacedParentCount', replacedParentCount);
+
+  return url.href;
+}
+
+export function temporaryStateParams(state) {
+  switch (state) {
+    case Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE:
+      return {
+        temporary:           true,
+        temporaryAggressive: false,
+      };
+    case Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE:
+      return {
+        temporary:           false,
+        temporaryAggressive: true,
+      };
+    default:
+      break;
+  }
+  return {
+    temporary:           false,
+    temporaryAggressive: false,
+  };
+}
+
+export async function groupTabs(tabs, { broadcast, parent, withDescendants, ...groupTabOptions } = {}) {
+  const rootTabs = Tab.collectRootTabs(tabs);
+  if (rootTabs.length <= 0)
+    return null;
+
+  log('groupTabs: ', () => tabs.map(dumpTab), { broadcast, parent, withDescendants });
+
+  const uri = makeGroupTabURI({
+    title:     browser.i18n.getMessage('groupTab_label', rootTabs[0].title),
+    temporary: true,
+    ...groupTabOptions
+  });
+  const groupTab = await TabsOpen.openURIInTab(uri, {
+    windowId:     rootTabs[0].windowId,
+    parent:       parent || rootTabs[0].$TST.parent,
+    insertBefore: rootTabs[0],
+    inBackground: true
+  });
+
+  if (!withDescendants) {
+    const structure = TreeBehavior.getTreeStructureFromTabs(tabs);
+
+    await Tree.detachTabsFromTree(tabs, {
+      broadcast: !!broadcast,
+    });
+
+    log('structure: ', structure);
+    await Tree.applyTreeStructureToTabs(tabs, structure, {
+      broadcast: !!broadcast,
+    });
+  }
+
+  await TabsMove.moveTabsAfter(tabs.slice(1), tabs[0], {
+    broadcast: !!broadcast
+  });
+  for (const tab of rootTabs) {
+    await Tree.attachTabTo(tab, groupTab, {
+      forceExpand: true, // this is required to avoid the group tab itself is active from active tab in collapsed tree
+      dontMove:  true,
+      broadcast: !!broadcast,
+    });
+  }
+  return groupTab;
+}
+
+function reserveToCleanupNeedlessGroupTab(tabOrTabs) {
+  const tabs = Array.isArray(tabOrTabs) ? tabOrTabs : [tabOrTabs] ;
+  for (const tab of tabs) {
+    if (!TabsStore.ensureLivingItem(tab))
+      continue;
+    if (tab.$TST.temporaryMetadata.has('reservedCleanupNeedlessGroupTab'))
+      clearTimeout(tab.$TST.temporaryMetadata.get('reservedCleanupNeedlessGroupTab'));
+    tab.$TST.temporaryMetadata.set('reservedCleanupNeedlessGroupTab', setTimeout(() => {
+      if (!tab.$TST)
+        return;
+      tab.$TST.temporaryMetadata.delete('reservedCleanupNeedlessGroupTab');
+      cleanupNeedlssGroupTab(tab);
+    }, 100));
+  }
+}
+
+function cleanupNeedlssGroupTab(tabs) {
+  if (!Array.isArray(tabs))
+    tabs = [tabs];
+  log('trying to clanup needless temporary group tabs from ', () => tabs.map(dumpTab));
+  const tabsToBeRemoved = [];
+  for (const tab of tabs) {
+    if (tab.$TST.temporaryMetadata.has('movingAcrossWindows'))
+      continue;
+
+    if (tab.$TST.isTemporaryGroupTab) {
+      if (tab.$TST.childIds.length > 1)
+        break;
+      const lastChild = tab.$TST.firstChild;
+      if (lastChild &&
+          !lastChild.$TST.isTemporaryGroupTab &&
+          !lastChild.$TST.isTemporaryAggressiveGroupTab)
+        break;
+    }
+    else if (tab.$TST.isTemporaryAggressiveGroupTab) {
+      if (tab.$TST.childIds.length > 1)
+        break;
+    }
+    else {
+      break;
+    }
+    tabsToBeRemoved.push(tab);
+  }
+  log('=> to be removed: ', () => tabsToBeRemoved.map(dumpTab));
+  TabsInternalOperation.removeTabs(tabsToBeRemoved, { keepDescendants: true });
+}
+
+export async function tryReplaceTabWithGroup(tab, { windowId, parent, children, insertBefore, newParent } = {}) {
+  if (tab) {
+    windowId     = tab.windowId;
+    parent       = tab.$TST.parent;
+    children     = tab.$TST.children;
+    insertBefore = insertBefore || tab.$TST.unsafeNextTab;
+  }
+
+  if (children.length <= 1 ||
+      countMatched(children,
+                   tab => !tab.$TST.states.has(Constants.kTAB_STATE_TO_BE_REMOVED)) <= 1)
+    return null;
+
+  log('trying to replace the closing tab with a new group tab');
+
+  const firstChild = children[0];
+  const uri = makeGroupTabURI({
+    title:     browser.i18n.getMessage('groupTab_label', firstChild.title),
+    ...temporaryStateParams(configs.groupTabTemporaryStateForOrphanedTabs),
+    replacedParentCount: (tab?.$TST?.replacedParentGroupTabCount || 0) + 1,
+  });
+  const win = TabsStore.windows.get(windowId);
+  win.toBeOpenedTabsWithPositions++;
+  const groupTab = await TabsOpen.openURIInTab(uri, {
+    windowId,
+    insertBefore,
+    inBackground: true
+  });
+  log('group tab: ', dumpTab(groupTab));
+  if (!groupTab) // the window is closed!
+    return;
+  if (newParent || parent)
+    await Tree.attachTabTo(groupTab, newParent || parent, {
+      dontMove:  true,
+      broadcast: true
+    });
+  for (const child of children) {
+    await Tree.attachTabTo(child, groupTab, {
+      dontMove:  true,
+      broadcast: true
+    });
+  }
+
+  // This can be triggered on closing of multiple tabs,
+  // so we should cleanup it on such cases for safety.
+  // https://github.com/piroor/treestyletab/issues/2317
+  wait(1000).then(() => reserveToCleanupNeedlessGroupTab(groupTab));
+
+  return groupTab;
+}
+
+
+// ====================================================================
+// init/update group tabs
+// ====================================================================
+
+/*
+  To prevent the tab is closed by Firefox, we need to inject scripts dynamically.
+  See also: https://github.com/piroor/treestyletab/issues/1670#issuecomment-350964087
+*/
+async function tryInitGroupTab(tab) {
+  if (!tab.$TST.isGroupTab &&
+      !tab.$TST.hasGroupTabURL)
+    return;
+  log('tryInitGroupTab ', tab);
+  const v3Options = {
+    target: { tabId: tab.id },
+  };
+  const v2Options = {
+    runAt:           'document_start',
+    matchAboutBlank: true
+  };
+  try {
+    const getPageState = function getPageState() {
+      return [window.prepared, document.documentElement.matches('.initialized')];
+    };
+    const [prepared, initialized, reloaded] = (browser.scripting ?
+      browser.scripting.executeScript({ // Manifest V3
+        ...v3Options,
+        func: getPageState,
+      }).then(results => results && results[0] && results[0].result || []) :
+      browser.tabs.executeScript(tab.id, {
+        ...v2Options,
+        code: `(${getPageState.toString()})()`,
+      }).then(results => results && results[0] || [])
+    ).catch(error => {
+      if (ApiTabs.isMissingHostPermissionError(error) &&
+          tab.$TST.hasGroupTabURL) {
+        log('  tryInitGroupTab: failed to run script for restored/discarded tab, reload the tab for safety ', tab.id);
+        browser.tabs.reload(tab.id);
+        return [[false, false, true]];
+      }
+      return ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError)(error);
+    });
+    log('  tryInitGroupTab: groupt tab state ', tab.id, { prepared, initialized, reloaded });
+    if (reloaded) {
+      log('  => reloaded ', tab.id);
+      return;
+    }
+    if (prepared && initialized) {
+      log('  => already initialized ', tab.id);
+      return;
+    }
+  }
+  catch(error) {
+    log('  tryInitGroupTab: error while checking initialized: ', tab.id, error);
+  }
+  try {
+    const getTitleExistence = function getState() {
+      return !!document.querySelector('#title');
+    };
+    const titleElementExists = (browser.scripting ?
+      browser.scripting.executeScript({ // Manifest V3
+        ...v3Options,
+        func: getTitleExistence,
+      }).then(results => results && results[0] && results[0].result) :
+      browser.tabs.executeScript(tab.id, {
+        ...v2Options,
+        code: `(${getTitleExistence.toString()})()`,
+      }).then(results => results && results[0])
+    ).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError, ApiTabs.handleMissingHostPermissionError));
+    if (!titleElementExists && tab.status == 'complete') { // we need to load resources/group-tab.html at first.
+      log('  => title element exists, load again ', tab.id);
+      return browser.tabs.update(tab.id, { url: tab.url }).catch(ApiTabs.createErrorSuppressor());
+    }
+  }
+  catch(error) {
+    log('  tryInitGroupTab error while checking title element: ', tab.id, error);
+  }
+
+  (browser.scripting ?
+    browser.scripting.executeScript({ // Manifest V3
+      ...v3Options,
+      files: [
+        '/extlib/l10n-classic.js', // ES module does not supported as a content script...
+        '/resources/group-tab.js',
+      ],
+    }) :
+    Promise.all([
+      browser.tabs.executeScript(tab.id, {
+        ...v2Options,
+        //file:  '/common/l10n.js'
+        file: '/extlib/l10n-classic.js', // ES module does not supported as a content script...
+      }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError, ApiTabs.handleMissingHostPermissionError)),
+      browser.tabs.executeScript(tab.id, {
+        ...v2Options,
+        file: '/resources/group-tab.js',
+      }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError, ApiTabs.handleMissingHostPermissionError)),
+    ])
+  ).then(() => {
+    log('tryInitGroupTab completely initialized: ', tab.id);
+  });
+
+  if (tab.$TST.states.has(Constants.kTAB_STATE_UNREAD)) {
+    tab.$TST.removeState(Constants.kTAB_STATE_UNREAD, { permanently: true });
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_UPDATED,
+      windowId: tab.windowId,
+      tabId:    tab.id,
+      removedStates: [Constants.kTAB_STATE_UNREAD]
+    });
+  }
+}
+
+function reserveToUpdateRelatedGroupTabs(tab, changedInfo) {
+  const tabMetadata = tab.$TST.temporaryMetadata;
+  const updatingTabs = tabMetadata.get('reserveToUpdateRelatedGroupTabsUpdatingTabs') || new Set();
+  if (!tabMetadata.has('reserveToUpdateRelatedGroupTabsUpdatingTabs'))
+    tabMetadata.set('reserveToUpdateRelatedGroupTabsUpdatingTabs', updatingTabs);
+
+  const ancestorGroupTabs = [
+    tab,
+    tab.$TST.bundledTab,
+    ...tab.$TST.ancestors,
+    ...tab.$TST.ancestors.map(tab => tab.$TST.bundledTab),
+  ].filter(tab => tab?.$TST.isGroupTab);
+  for (const updatingTab of ancestorGroupTabs) {
+    const updatingMetadata = updatingTab.$TST.temporaryMetadata;
+    const reservedChangedInfo = updatingMetadata.get('reservedUpdateRelatedGroupTabChangedInfo') || new Set();
+    for (const info of changedInfo) {
+      reservedChangedInfo.add(info);
+    }
+    if (updatingTabs.has(updatingTab.id))
+      continue;
+    updatingTabs.add(updatingTab.id);
+    const triggeredUpdates = updatingMetadata.get('reservedUpdateRelatedGroupTabTriggeredUpdates') || new Set();
+    triggeredUpdates.add(updatingTabs);
+    updatingMetadata.set('reservedUpdateRelatedGroupTabTriggeredUpdates', triggeredUpdates);
+    if (updatingMetadata.has('reservedUpdateRelatedGroupTab'))
+      clearTimeout(updatingMetadata.get('reservedUpdateRelatedGroupTab'));
+    updatingMetadata.set('reservedUpdateRelatedGroupTabChangedInfo', reservedChangedInfo);
+    updatingMetadata.set('reservedUpdateRelatedGroupTab', setTimeout(() => {
+      updatingMetadata.delete('reservedUpdateRelatedGroupTab');
+      if (updatingTab.$TST) {
+        try {
+          if (reservedChangedInfo.size > 0)
+            updateRelatedGroupTab(updatingTab, [...reservedChangedInfo]);
+        }
+        catch(_error) {
+        }
+        updatingMetadata.delete('reservedUpdateRelatedGroupTabChangedInfo');
+      }
+      setTimeout(() => {
+        const triggerUpdates = updatingMetadata.get('reservedUpdateRelatedGroupTabTriggeredUpdates')
+        updatingMetadata.delete('reservedUpdateRelatedGroupTabTriggeredUpdates');
+        if (!triggerUpdates)
+          return;
+        for (const updatingTabs of triggerUpdates) {
+          updatingTabs.delete(updatingTab.id);
+        }
+      }, 100)
+    }, 100));
+  }
+}
+
+async function updateRelatedGroupTab(groupTab, changedInfo = []) {
+  if (!TabsStore.ensureLivingItem(groupTab))
+    return;
+
+  await tryInitGroupTab(groupTab);
+  if (changedInfo.includes('tree')) {
+    try {
+      await browser.tabs.sendMessage(groupTab.id, {
+        type: 'ws:update-tree',
+      }).catch(error => {
+        if (ApiTabs.isMissingHostPermissionError(error))
+          throw error;
+        return ApiTabs.createErrorSuppressor(ApiTabs.handleMissingTabError, ApiTabs.handleUnloadedError)(error);
+      });
+    }
+    catch(error) {
+      if (ApiTabs.isMissingHostPermissionError(error)) {
+        log('  updateRelatedGroupTab: failed to run script for restored/discarded tab, reload the tab for safety ', groupTab.id);
+        browser.tabs.reload(groupTab.id);
+        return;
+      }
+    }
+  }
+
+  const firstChild = groupTab.$TST.firstChild;
+  if (!firstChild) // the tab can be closed while waiting...
+    return;
+
+  if (changedInfo.includes('title')) {
+    let newTitle;
+    if (Constants.kGROUP_TAB_DEFAULT_TITLE_MATCHER.test(groupTab.title)) {
+      newTitle = browser.i18n.getMessage('groupTab_label', firstChild.title);
+    }
+    else if (Constants.kGROUP_TAB_FROM_PINNED_DEFAULT_TITLE_MATCHER.test(groupTab.title)) {
+      const opener = groupTab.$TST.openerTab;
+      if (opener) {
+        if (opener &&
+            opener.favIconUrl) {
+          SidebarConnection.sendMessage({
+            type:       Constants.kCOMMAND_NOTIFY_TAB_FAVICON_UPDATED,
+            windowId:   groupTab.windowId,
+            tabId:      groupTab.id,
+            favIconUrl: opener.favIconUrl
+          });
+        }
+        newTitle = browser.i18n.getMessage('groupTab_fromPinnedTab_label', opener.title);
+      }
+    }
+
+    if (newTitle && groupTab.title != newTitle) {
+      browser.tabs.sendMessage(groupTab.id, {
+        type:  'ws:update-title',
+        title: newTitle,
+      }).catch(ApiTabs.createErrorHandler(
+        ApiTabs.handleMissingTabError,
+        ApiTabs.handleMissingHostPermissionError,
+        _error => {
+          // failed to update the title by group tab itself, so we try to update it from outside
+          groupTab.title = newTitle;
+          TabsUpdate.updateTab(groupTab, { title: newTitle });
+        }
+      ));
+    }
+  }
+}
+
+Tab.onRemoved.addListener((tab, _closeInfo = {}) => {
+  const ancestors = tab.$TST.ancestors;
+  wait(0).then(() => {
+    reserveToCleanupNeedlessGroupTab(ancestors);
+  });
+});
+
+Tab.onUpdated.addListener((tab, changeInfo) => {
+  if ('url' in changeInfo ||
+      'previousUrl' in changeInfo ||
+      'state' in changeInfo) {
+    const status = changeInfo.status || tab?.status;
+    const url = changeInfo.url ? changeInfo.url :
+      status == 'complete' && tab ? tab.url : '';
+    if (tab &&
+        status == 'complete') {
+      if (url.indexOf(Constants.kGROUP_TAB_URI) == 0) {
+        tab.$TST.addState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+      }
+      else if (!Constants.kSHORTHAND_ABOUT_URI.test(url)) {
+        tab.$TST.getPermanentStates().then(async (states) => {
+          if (url.indexOf(Constants.kGROUP_TAB_URI) == 0)
+            return;
+          // Detect group tab from different session - which can have different UUID for the URL.
+          const PREFIX_REMOVER = /^moz-extension:\/\/[^\/]+/;
+          const pathPart = url.replace(PREFIX_REMOVER, '');
+          if (states.includes(Constants.kTAB_STATE_GROUP_TAB) &&
+              pathPart.split('?')[0] == Constants.kGROUP_TAB_URI.replace(PREFIX_REMOVER, '')) {
+            const parameters = pathPart.replace(/^[^\?]+\?/, '');
+            const oldUrl = tab.url;
+            await wait(100); // for safety
+            if (tab.url != oldUrl)
+              return;
+            browser.tabs.update(tab.id, {
+              url: `${Constants.kGROUP_TAB_URI}?${parameters}`
+            }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+            tab.$TST.addState(Constants.kTAB_STATE_GROUP_TAB);
+          }
+          else {
+            tab.$TST.removeState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+          }
+        });
+      }
+    }
+    // restored tab can be replaced with blank tab. we need to restore it manually.
+    else if (changeInfo.url == 'about:blank' &&
+             changeInfo.previousUrl &&
+             changeInfo.previousUrl.indexOf(Constants.kGROUP_TAB_URI) == 0) {
+      const oldUrl = tab.url;
+      wait(100).then(() => { // redirect with delay to avoid infinite loop of recursive redirections.
+        if (tab.url != oldUrl)
+          return;
+        browser.tabs.update(tab.id, {
+          url: changeInfo.previousUrl
+        }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+        tab.$TST.addState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+      });
+    }
+
+    if (changeInfo.status ||
+        changeInfo.url ||
+        url.indexOf(Constants.kGROUP_TAB_URI) == 0)
+      tryInitGroupTab(tab);
+  }
+
+  if ('title' in changeInfo) {
+    const group = Tab.getGroupTabForOpener(tab);
+    if (group)
+      reserveToUpdateRelatedGroupTabs(group, ['title', 'tree']);
+  }
+});
+
+Tab.onGroupTabDetected.addListener(tab => {
+  tryInitGroupTab(tab);
+});
+
+Tab.onLabelUpdated.addListener(tab => {
+  reserveToUpdateRelatedGroupTabs(tab, ['title', 'tree']);
+});
+
+Tab.onActivating.addListener((tab, _info = {}) => {
+  tryInitGroupTab(tab);
+});
+
+// returns a boolean: need to reload or not.
+export async function clearTemporaryState(tab) {
+  if (!tab.$TST.isTemporaryGroupTab &&
+      !tab.$TST.isTemporaryAggressiveGroupTab)
+    return;
+
+  const url = new URL(tab.url);
+  url.searchParams.delete('temporary');
+  url.searchParams.delete('temporaryAggressive');
+  await Promise.all([
+    browser.tabs.sendMessage(tab.id, {
+      type: 'ws:clear-temporary-state',
+    }).catch(ApiTabs.createErrorHandler()),
+    browser.tabs.executeScript(tab.id, { // failsafe
+      runAt: 'document_start',
+      code:  `history.replaceState({}, document.title, ${JSON.stringify(url.href)});`,
+    }).catch(ApiTabs.createErrorHandler()),
+  ]);
+  tab.url = url.href;
+}
+
+Tab.onPinned.addListener(async tab => {
+  log('handlePinnedParentTab ', tab);
+
+  await Tree.collapseExpandSubtree(tab, {
+    collapsed: false,
+    broadcast: true
+  });
+
+  log('  childIdsBeforeMoved: ', tab.$TST.temporaryMetadata.get('childIdsBeforeMoved'));
+  log('  parentIdBeforeMoved: ', tab.$TST.temporaryMetadata.get('parentIdBeforeMoved'));
+
+  const children = (
+    tab.$TST.temporaryMetadata.has('childIdsBeforeMoved') ?
+      tab.$TST.temporaryMetadata.get('childIdsBeforeMoved').map(id => Tab.get(id)) :
+      tab.$TST.children
+  ).filter(tab => TabsStore.ensureLivingItem(tab));
+  const parent = TabsStore.ensureLivingItem(
+    tab.$TST.temporaryMetadata.has('parentIdBeforeMoved') ?
+      Tab.get(tab.$TST.temporaryMetadata.get('parentIdBeforeMoved')) :
+      tab.$TST.parent
+  );
+
+  let openedGroupTab;
+  const shouldGroupChildren = configs.autoGroupNewTabsFromPinned || tab.$TST.isGroupTab;
+  if (shouldGroupChildren) {
+    log(' => trying to group left tabs with a group: ', children);
+    openedGroupTab = await groupTabs(children, {
+      // If the tab is a group tab, the opened tab should be treated as an alias of the pinned group tab.
+      // Otherwise it should be treated just as a temporary group tab to group children.
+      title:       tab.$TST.isGroupTab ? tab.title : browser.i18n.getMessage('groupTab_fromPinnedTab_label', tab.title),
+      temporary:   !tab.$TST.isGroupTab,
+      openerTabId: tab.$TST.uniqueId.id,
+      parent,
+      withDescendants: true,
+    });
+    log(' openedGroupTab: ', openedGroupTab);
+    // Tree structure of left tabs can be modified by someone like tryFixupTreeForInsertedTab@handle-moved-tabs.js.
+    // On such cases we need to restore the original tree structure.
+    const modifiedChildren = children.filter(child => children.includes(child.$TST.parent));
+    log(' modifiedChildren: ', modifiedChildren);
+    if (modifiedChildren.length > 0) {
+      for (const child of modifiedChildren) {
+        await Tree.detachTab(child, {
+          broadcast: true,
+        });
+        await Tree.attachTabTo(child, openedGroupTab, {
+          dontMove:  true,
+          broadcast: true,
+        });
+      }
+    }
+  }
+  else {
+    log(' => no need to group left tabs, just detaching');
+    await Tree.detachAllChildren(tab, {
+      behavior: TreeBehavior.getParentTabOperationBehavior(tab, {
+        context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE,
+        preventEntireTreeBehavior: true,
+      }),
+      broadcast: true
+    });
+  }
+  await Tree.detachTab(tab, {
+    broadcast: true
+  });
+
+  // Such a group tab will be closed automatically when all children are detached.
+  // To prevent the auto close behavior, the tab type need to be turned to permanent.
+  await clearTemporaryState(tab);
+
+  if (tab.$TST.isGroupTab && openedGroupTab) {
+    const url = new URL(tab.url);
+    url.searchParams.set('aliasTabId', openedGroupTab.$TST.uniqueId.id);
+    await Promise.all([
+      browser.tabs.sendMessage(tab.id, {
+        type: 'ws:replace-state-url',
+        url: url.href,
+      }).catch(ApiTabs.createErrorHandler()),
+      browser.tabs.executeScript(tab.id, { // failsafe
+        runAt: 'document_start',
+        code:  `history.replaceState({}, document.title, ${JSON.stringify(url.href)});`,
+      }).catch(ApiTabs.createErrorHandler()),
+    ]);
+    await browser.tabs.sendMessage(tab.id, {
+      type: 'ws:update-tree',
+      url: url.href,
+    }).catch(ApiTabs.createErrorHandler());
+    tab.url = url.href;
+  }
+});
+
+Tree.onAttached.addListener((tab, _info = {}) => {
+  reserveToUpdateRelatedGroupTabs(tab, ['tree']);
+});
+
+Tree.onDetached.addListener((_tab, detachInfo) => {
+  if (!detachInfo.oldParentTab)
+    return;
+  if (detachInfo.oldParentTab.$TST.isGroupTab)
+    reserveToCleanupNeedlessGroupTab(detachInfo.oldParentTab);
+  reserveToUpdateRelatedGroupTabs(detachInfo.oldParentTab, ['tree']);
+});
+
+/*
+Tree.onSubtreeCollapsedStateChanging.addListener((tab, _info) => {
+  reserveToUpdateRelatedGroupTabs(tab);
+});
+*/
diff --git a/waterfox/browser/components/sidebar/background/tabs-move.js b/waterfox/browser/components/sidebar/background/tabs-move.js
new file mode 100644
index 0000000000000..fb5cded2a63f0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tabs-move.js
@@ -0,0 +1,465 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import {
+  log as internalLogger,
+  wait,
+  toLines,
+  configs
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import { SequenceMatcher } from '/extlib/diff.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+function log(...args) {
+  internalLogger('background/tabs-move', ...args);
+}
+function logApiTabs(...args) {
+  internalLogger('common/api-tabs', ...args);
+}
+
+
+// ========================================================
+// primitive methods for internal use
+
+export async function moveTabsBefore(tabs, referenceTab, options = {}) {
+  log('moveTabsBefore: ', tabs, referenceTab, options);
+  if (!tabs.length ||
+      !TabsStore.ensureLivingItem(referenceTab))
+    return [];
+
+  if (referenceTab.$TST.isAllPlacedBeforeSelf(tabs)) {
+    log('moveTabsBefore:no need to move');
+    return [];
+  }
+  return moveTabsInternallyBefore(tabs, referenceTab, options);
+}
+export async function moveTabBefore(tab, referenceTab, options = {}) {
+  return moveTabsBefore([tab], referenceTab, options).then(moved => moved.length > 0);
+}
+
+async function moveTabsInternallyBefore(tabs, referenceTab, options = {}) {
+  if (!tabs.length ||
+      !TabsStore.ensureLivingItem(referenceTab))
+    return [];
+
+  const win = TabsStore.windows.get(tabs[0].windowId);
+
+  log('moveTabsInternallyBefore: ', tabs, `${referenceTab.id}(index=${referenceTab.index})`, options);
+  if (referenceTab.type == TreeItem.TYPE_GROUP) {
+    referenceTab = referenceTab.$TST?.firstMember;
+    if (!TabsStore.ensureLivingItem(referenceTab)) {
+      log('missing reference tab');
+      return [];
+    }
+    log(`  => reference tab: ${referenceTab.id}(index=${referenceTab.index})`);
+  }
+
+  const precedingReferenceTab = referenceTab.$TST.previousTab;
+  if (referenceTab.pinned) {
+    // unpinned tab cannot be moved before any pinned tab
+    tabs = tabs.filter(tab => tab.pinned);
+  }
+  else if (precedingReferenceTab &&
+           !precedingReferenceTab.pinned) {
+    // pinned tab cannot be moved after any unpinned tab
+    tabs = tabs.filter(tab => !tab.pinned);
+  }
+  if (!tabs.length)
+    return [];
+
+  const movedTabs = [];
+  try {
+    /*
+      Tab elements are moved by tabs.onMoved automatically, but
+      the operation is asynchronous. To help synchronous operations
+      following to this operation, we need to move tabs immediately.
+    */
+    const tabGroups = new Set();
+    for (const tab of tabs) {
+      const oldPreviousTab = tab.$TST.unsafePreviousTab;
+      const oldNextTab     = tab.$TST.unsafeNextTab;
+      if (oldNextTab?.id == referenceTab.id) // no move case
+        continue;
+      const fromIndex = tab.index;
+      if (referenceTab.index > tab.index)
+        tab.index = referenceTab.index - 1;
+      else
+        tab.index = referenceTab.index;
+      tabGroups.add(tab.$TST.nativeTabGroup);
+      if (SidebarConnection.isInitialized()) { // only on the background page
+        win.internalMovingTabs.set(tab.id, tab.index);
+        win.alreadyMovedTabs.set(tab.id, tab.index);
+      }
+      tab.reindexedBy = `moveTabsInternallyBefore (${tab.index})`;
+      Tab.track(tab);
+      movedTabs.push(tab);
+      Tab.onTabInternallyMoved.dispatch(tab, {
+        nextTab: referenceTab,
+        oldPreviousTab,
+        oldNextTab,
+        broadcasted: !!options.broadcasted
+      });
+      SidebarConnection.sendMessage({
+        type:        Constants.kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED,
+        windowId:    tab.windowId,
+        tabId:       tab.id,
+        fromIndex,
+        toIndex:     tab.index,
+        nextTabId:   referenceTab?.id,
+        broadcasted: !!options.broadcasted
+      });
+      if (options.doNotOptimize) {
+        win.internalMovingTabs.set(tab.id, tab.index);
+        win.alreadyMovedTabs.set(tab.id, tab.index);
+        await browser.tabs.move(tab.id, { index: tab.index });
+        win.internalMovingTabs.delete(tab.id);
+        win.alreadyMovedTabs.delete(tab.id);
+      }
+    }
+    for (const group of tabGroups) {
+      group?.$TST.reindex();
+    }
+    if (movedTabs.length == 0) {
+      log(' => actually nothing moved');
+    }
+    else {
+      log(
+        'Tab nodes rearranged by moveTabsInternallyBefore:\n',
+        (!configs.debug ? '' :
+          () => toLines(Array.from(win.getOrderedTabs()),
+                        tab => ` - ${tab.index}: ${tab.id}${tabs.includes(tab) ? '[MOVED]' : ''}`))
+      );
+    }
+    if (SidebarConnection.isInitialized()) { // only on the background page
+      if (options.delayedMove) { // Wait until opening animation is finished.
+        await wait(configs.newTabAnimationDuration);
+      }
+      if (!options.doNotOptimize) {
+        syncToNativeTabs(tabs);
+      }
+    }
+  }
+  catch(e) {
+    ApiTabs.handleMissingTabError(e);
+    log('moveTabsInternallyBefore failed: ', String(e));
+  }
+  return movedTabs;
+}
+export async function moveTabInternallyBefore(tab, referenceTab, options = {}) {
+  return moveTabsInternallyBefore([tab], referenceTab, options);
+}
+
+export async function moveTabsAfter(tabs, referenceTab, options = {}) {
+  log('moveTabsAfter: ', tabs, referenceTab, options);
+  if (!tabs.length ||
+      !TabsStore.ensureLivingItem(referenceTab))
+    return [];
+
+  if (referenceTab.$TST.isAllPlacedAfterSelf(tabs)) {
+    log('moveTabsAfter:no need to move');
+    return [];
+  }
+  return moveTabsInternallyAfter(tabs, referenceTab, options);
+}
+export async function moveTabAfter(tab, referenceTab, options = {}) {
+  return moveTabsAfter([tab], referenceTab, options).then(moved => moved.length > 0);
+}
+
+async function moveTabsInternallyAfter(tabs, referenceTab, options = {}) {
+  if (!tabs.length ||
+      !TabsStore.ensureLivingItem(referenceTab))
+    return [];
+
+  const win = TabsStore.windows.get(tabs[0].windowId);
+
+  log('moveTabsInternallyAfter: ', tabs, `${referenceTab.id}(index=${referenceTab.index})`, options);
+  if (referenceTab.type == TreeItem.TYPE_GROUP) {
+    if (!referenceTab.collapsed) {
+      log('  => move before the first member tab of the reference group');
+      return moveTabsInternallyBefore(tabs, referenceTab.$TST?.firstMember, options = {});
+    }
+    referenceTab = referenceTab.$TST?.lastMember;
+    if (!TabsStore.ensureLivingItem(referenceTab)) {
+      log('missing reference tab');
+      return [];
+    }
+    log(`  => reference tab: ${referenceTab.id}(index=${referenceTab.index})`);
+  }
+
+  const followingReferenceTab = referenceTab.$TST.nextTab;
+  if (followingReferenceTab &&
+      followingReferenceTab.pinned) {
+    // unpinned tab cannot be moved before any pinned tab
+    tabs = tabs.filter(tab => tab.pinned);
+  }
+  else if (!referenceTab.pinned) {
+    // pinned tab cannot be moved after any unpinned tab
+    tabs = tabs.filter(tab => !tab.pinned);
+  }
+  if (!tabs.length)
+    return [];
+
+  const movedTabs = [];
+  try {
+    /*
+      Tab elements are moved by tabs.onMoved automatically, but
+      the operation is asynchronous. To help synchronous operations
+      following to this operation, we need to move tabs immediately.
+    */
+    let nextTab = referenceTab.$TST.unsafeNextTab;
+    while (nextTab && tabs.find(tab => tab.id == nextTab.id)) {
+      nextTab = nextTab.$TST.unsafeNextTab;
+    }
+    const tabGroups = new Set();
+    for (const tab of tabs) {
+      const oldPreviousTab = tab.$TST.unsafePreviousTab;
+      const oldNextTab     = tab.$TST.unsafeNextTab;
+      if ((!oldNextTab && !nextTab) ||
+          (oldNextTab && nextTab && oldNextTab.id == nextTab.id)) // no move case
+        continue;
+      const fromIndex = tab.index;
+      if (nextTab) {
+        if (nextTab.index > tab.index)
+          tab.index = nextTab.index - 1;
+        else
+          tab.index = nextTab.index;
+      }
+      else {
+        tab.index = win.tabs.size - 1
+      }
+      tabGroups.add(tab.$TST.nativeTabGroup);
+      if (SidebarConnection.isInitialized()) { // only on the background page
+        win.internalMovingTabs.set(tab.id, tab.index);
+        win.alreadyMovedTabs.set(tab.id, tab.index);
+      }
+      tab.reindexedBy = `moveTabsInternallyAfter (${tab.index})`;
+      Tab.track(tab);
+      movedTabs.push(tab);
+      Tab.onTabInternallyMoved.dispatch(tab, {
+        nextTab,
+        oldPreviousTab,
+        oldNextTab,
+        broadcasted: !!options.broadcasted
+      });
+      SidebarConnection.sendMessage({
+        type:        Constants.kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED,
+        windowId:    tab.windowId,
+        tabId:       tab.id,
+        fromIndex,
+        toIndex:     tab.index,
+        nextTabId:   nextTab?.id,
+        broadcasted: !!options.broadcasted
+      });
+      if (options.doNotOptimize) {
+        win.internalMovingTabs.set(tab.id, tab.index);
+        win.alreadyMovedTabs.set(tab.id, tab.index);
+        await browser.tabs.move(tab.id, { index: tab.index });
+        win.internalMovingTabs.delete(tab.id);
+        win.alreadyMovedTabs.delete(tab.id);
+      }
+    }
+    for (const group of tabGroups) {
+      group?.$TST.reindex();
+    }
+    if (movedTabs.length == 0) {
+      log(' => actually nothing moved');
+    }
+    else {
+      log(
+        'Tab nodes rearranged by moveTabsInternallyAfter:\n',
+        (!configs.debug ? '' :
+          () => toLines(Array.from(win.getOrderedTabs()),
+                        tab => ` - ${tab.index}: ${tab.id}${tabs.includes(tab) ? '[MOVED]' : ''}`))
+      );
+    }
+    if (SidebarConnection.isInitialized()) { // only on the background page
+      if (options.delayedMove) { // Wait until opening animation is finished.
+        await wait(configs.newTabAnimationDuration);
+      }
+      if (!options.doNotOptimize) {
+        syncToNativeTabs(tabs);
+      }
+    }
+  }
+  catch(e) {
+    ApiTabs.handleMissingTabError(e);
+    log('moveTabsInternallyAfter failed: ', String(e));
+  }
+  return movedTabs;
+}
+export async function moveTabInternallyAfter(tab, referenceTab, options = {}) {
+  return moveTabsInternallyAfter([tab], referenceTab, options);
+}
+
+
+// ========================================================
+// Synchronize order of tab elements to browser's tabs
+
+const mPreviousSync     = new Map();
+const mDelayedSync      = new Map();
+const mDelayedSyncTimer = new Map();
+
+export async function waitUntilSynchronized(windowId) {
+  const previous = mPreviousSync.get(windowId);
+  if (previous)
+    return previous.then(() => waitUntilSynchronized(windowId));
+  return Promise.resolve(mDelayedSync.get(windowId)).then(() => {
+    const previous = mPreviousSync.get(windowId);
+    if (previous)
+      return waitUntilSynchronized(windowId);
+  });
+}
+
+function syncToNativeTabs(tabs) {
+  const windowId = tabs[0].windowId;
+  //log(`syncToNativeTabs(${windowId})`);
+  if (mDelayedSyncTimer.has(windowId))
+    clearTimeout(mDelayedSyncTimer.get(windowId));
+  const delayedSync = new Promise((resolve, _reject) => {
+    mDelayedSyncTimer.set(windowId, setTimeout(() => {
+      mDelayedSync.delete(windowId);
+      let previousSync = mPreviousSync.get(windowId);
+      if (previousSync)
+        previousSync = previousSync.then(() => syncToNativeTabsInternal(windowId));
+      else
+        previousSync = syncToNativeTabsInternal(windowId);
+      previousSync = previousSync.then(resolve);
+      mPreviousSync.set(windowId, previousSync);
+    }, 250));
+  }).then(() => {
+    mPreviousSync.delete(windowId);
+  });
+  mDelayedSync.set(windowId, delayedSync);
+  return delayedSync;
+}
+async function syncToNativeTabsInternal(windowId) {
+  mDelayedSyncTimer.delete(windowId);
+
+  if (Tab.needToWaitTracked(windowId))
+    await Tab.waitUntilTrackedAll(windowId);
+  if (Tab.needToWaitMoved(windowId))
+    await Tab.waitUntilMovedAll(windowId);
+
+  const win = TabsStore.windows.get(windowId);
+  if (!win) // already destroyed
+    return;
+
+  // Tabs may be removed while waiting.
+  const internalOrder   = TabsStore.windows.get(windowId).order;
+  const nativeTabsOrder = (await browser.tabs.query({ windowId }).catch(ApiTabs.createErrorHandler())).map(tab => tab.id);
+  log(`syncToNativeTabs(${windowId}): rearrange `, { internalOrder:internalOrder.join(','), nativeTabsOrder:nativeTabsOrder.join(',') });
+
+  log(`syncToNativeTabs(${windowId}): step1, internalOrder => nativeTabsOrder`);
+  let tabIdsForUpdatedIndices = Array.from(nativeTabsOrder);
+
+  const moveOperations = (new SequenceMatcher(nativeTabsOrder, internalOrder)).operations();
+  const movedTabs = new Set();
+  for (const operation of moveOperations) {
+    const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+    log(`syncToNativeTabs(${windowId}): operation `, { tag, fromStart, fromEnd, toStart, toEnd });
+    switch (tag) {
+      case 'equal':
+      case 'delete':
+        break;
+
+      case 'insert':
+      case 'replace':
+        let moveTabIds = internalOrder.slice(toStart, toEnd);
+        const referenceId = nativeTabsOrder[fromStart] || null;
+        let toIndex = -1;
+        let fromIndices = moveTabIds.map(id => tabIdsForUpdatedIndices.indexOf(id));
+        if (referenceId) {
+          toIndex = tabIdsForUpdatedIndices.indexOf(referenceId);
+        }
+        if (toIndex < 0)
+          toIndex = internalOrder.length;
+        // ignore already removed tabs!
+        moveTabIds = moveTabIds.filter((id, index) => fromIndices[index] > -1);
+        if (moveTabIds.length == 0)
+          continue;
+        fromIndices = fromIndices.filter(index => index > -1);
+        const fromIndex = fromIndices[0];
+        if (fromIndex < toIndex)
+          toIndex--;
+        log(`syncToNativeTabs(${windowId}): step1, move ${moveTabIds.join(',')} before ${referenceId} / from = ${fromIndex}, to = ${toIndex}`);
+        for (const movedId of moveTabIds) {
+          win.internalMovingTabs.set(movedId, -1);
+          win.alreadyMovedTabs.set(movedId, -1);
+          movedTabs.add(movedId);
+        }
+        logApiTabs(`tabs-move:syncToNativeTabs(${windowId}): step1, browser.tabs.move() `, moveTabIds, {
+          windowId,
+          index: toIndex
+        });
+        let reallyMovedTabIds = new Set();
+        try {
+          const reallyMovedTabs = await browser.tabs.move(moveTabIds, {
+            windowId,
+            index: toIndex
+          }).catch(ApiTabs.createErrorHandler(e => {
+            log(`syncToNativeTabs(${windowId}): step1, failed to move: `, String(e), e.stack);
+            throw e;
+          }));
+          reallyMovedTabIds = new Set(reallyMovedTabs.map(tab => tab.id));
+        }
+        catch(error) {
+          console.error(error);
+        }
+        for (const id of moveTabIds) {
+          if (reallyMovedTabIds.has(id))
+            continue;
+          log(`syncToNativeTabs(${windowId}): failed to move tab ${id}: maybe unplacable position (regular tabs in pinned tabs/pinned tabs in regular tabs), or any other reason`);
+          win.internalMovingTabs.delete(id);
+          win.alreadyMovedTabs.delete(id);
+        }
+        tabIdsForUpdatedIndices = tabIdsForUpdatedIndices.filter(id => !moveTabIds.includes(id));
+        tabIdsForUpdatedIndices.splice(toIndex, 0, ...moveTabIds);
+        break;
+    }
+  }
+  log(`syncToNativeTabs(${windowId}): step1, rearrange completed.`);
+
+  if (movedTabs.size > 0) {
+    // tabs.onMoved produced by this operation can break the order of tabs
+    // in the sidebar, so we need to synchronize complete order of tabs after
+    // all.
+    SidebarConnection.sendMessage({
+      type: Constants.kCOMMAND_SYNC_TABS_ORDER,
+      windowId
+    });
+
+    // Multiple times asynchronous tab move is unstable, so we retry again
+    // for safety until all tabs are completely synchronized.
+    syncToNativeTabs([{ windowId }]);
+  }
+}
diff --git a/waterfox/browser/components/sidebar/background/tabs-open.js b/waterfox/browser/components/sidebar/background/tabs-open.js
new file mode 100644
index 0000000000000..f1daf16d519ae
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tabs-open.js
@@ -0,0 +1,342 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2024
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  configs,
+  tryRevokeObjectURL,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as TabsMove from './tabs-move.js';
+import * as Tree from './tree.js';
+
+export const onForbiddenURLRequested = new EventListenerManager();
+
+function log(...args) {
+  internalLogger('background/tabs-open', ...args);
+}
+
+const SEARCH_PREFIX_MATCHER = /^(ext\+ws:search:|about:ws-search\?)/;
+
+export async function loadURI(uri, options = {}) {
+  if (!options.windowId && !options.tab)
+    throw new Error('missing loading target window or tab');
+  try {
+    let tabId;
+    if (options.tab) {
+      tabId = options.tab.id;
+    }
+    else {
+      let tabs = await browser.tabs.query({
+        windowId: options.windowId,
+        active:   true
+      }).catch(ApiTabs.createErrorHandler());
+      if (tabs.length == 0)
+        tabs = await browser.tabs.query({
+          windowId: options.windowId,
+        }).catch(ApiTabs.createErrorHandler());
+      tabId = tabs[0].id;
+    }
+    let searchQuery = null;
+    if (SEARCH_PREFIX_MATCHER.test(uri)) {
+      const query = uri.replace(SEARCH_PREFIX_MATCHER, '');
+      if (browser.search &&
+          typeof browser.search.search == 'function')
+        searchQuery = query;
+      else
+        uri = configs.defaultSearchEngine.replace(/%s/gi, query);
+    }
+    if (searchQuery) {
+      await browser.search.search({
+        query: searchQuery,
+        tabId
+      }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    }
+    else {
+      await browser.tabs.update(tabId, {
+        url: sanitizeURL(uri),
+      }).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    }
+  }
+  catch(e) {
+    ApiTabs.handleMissingTabError(e);
+  }
+}
+
+export async function openNewTab(options = {}) {
+  const win = TabsStore.windows.get(options.windowId);
+  win.toBeOpenedNewTabCommandTab++;
+  return openURIInTab(options.url || options.uri || null, options);
+}
+
+export async function openURIInTab(uri, options = {}) {
+  const tabs = await openURIsInTabs([uri], options);
+  return tabs[0];
+}
+
+const FORBIDDEN_URL_MATCHER = /^(about|chrome|resource|file):/;
+const ALLOWED_URL_MATCHER = /^about:blank(\?|$)/;
+
+export async function openURIsInTabs(uris, { windowId, insertBefore, insertAfter, cookieStoreId, isOrphan, active, inBackground, discarded, opener, parent, fixPositions } = {}) {
+  log('openURIsInTabs: ', { uris, windowId, insertBefore, insertAfter, cookieStoreId, isOrphan, active, inBackground, discarded, opener, parent, fixPositions });
+  if (!windowId)
+    throw new Error('missing loading target window\n' + new Error().stack);
+
+  const tabs = [];
+  // Don't return the result of Tab.doAndGetNewTabs because their order can
+  // be inverted due to browser.tabs.insertAfterCurrent=true
+  const actuallyOpenedTabIds = new Set(await Tab.doAndGetNewTabs(async () => {
+    await Tab.waitUntilTrackedAll(windowId);
+    await TabsMove.waitUntilSynchronized(windowId);
+    const startIndex = Tab.calculateNewTabIndex({ insertAfter, insertBefore });
+    log('startIndex: ', startIndex);
+    const win = TabsStore.windows.get(windowId);
+    if (insertBefore ||
+        insertAfter ||
+        uris.some(uri => uri && typeof uri == 'object' && 'index' in uri))
+      win.toBeOpenedTabsWithPositions += uris.length;
+    if (cookieStoreId)
+      win.toBeOpenedTabsWithCookieStoreId += uris.length;
+    if (isOrphan)
+      win.toBeOpenedOrphanTabs += uris.length;
+    return Promise.all(uris.map(async (uri, index) => {
+      const params = {
+        windowId,
+        active: index == 0 && (active || (inBackground === false)),
+      };
+      if (uri && typeof uri == 'object') { // tabs.create() compatible
+        if ('active' in uri)
+          params.active = uri.active;
+        if ('cookieStoreId' in uri)
+          params.cookieStoreId = uri.cookieStoreId;
+        if ('discarded' in uri)
+          params.discarded = uri.discarded;
+        if ('index' in uri)
+          params.index = uri.index;
+        if ('openerTabId' in uri)
+          params.openerTabId = uri.openerTabId;
+        if ('openInReaderMode' in uri)
+          params.openInReaderMode = uri.openInReaderMode;
+        if ('pinned' in uri)
+          params.pinned = uri.pinned;
+        if ('selected' in uri)
+          params.active = uri.selected;
+        if ('title' in uri)
+          params.title = uri.title;
+        uri = uri.uri || uri.url;
+      }
+      let searchQuery = null;
+      if (uri) {
+        if (SEARCH_PREFIX_MATCHER.test(uri)) {
+          const query = uri.replace(SEARCH_PREFIX_MATCHER, '');
+          if (browser.search &&
+              typeof browser.search.search == 'function')
+            searchQuery = query;
+          else
+            params.url = configs.defaultSearchEngine.replace(/%s/gi, query);
+        }
+        else {
+          params.url = uri;
+        }
+      }
+      if (discarded &&
+          !params.active &&
+          !('discarded' in params))
+        params.discarded = true;
+      if (params.url == 'about:newtab')
+        delete params.url
+      if (params.url)
+        params.url = sanitizeURL(params.url);
+      if (!('url' in params /* about:newtab case */) ||
+          /^about:/.test(params.url))
+        params.discarded = false; // discarded tab cannot be opened with any about: URL
+      if (!params.discarded) // title cannot be set for non-discarded tabs
+        params.title = null;
+      if (opener && !params.openerTabId)
+        params.openerTabId = opener.id;
+      if (startIndex > -1 && !('index' in params))
+        params.index = startIndex + index;
+      if (cookieStoreId && !params.cookieStoreId)
+        params.cookieStoreId = cookieStoreId;
+        // Tabs opened with different container can take time to be tracked,
+        // then TabsStore.waitUntilTabsAreCreated() may be resolved before it is
+        // tracked like as "the tab is already closed". So we wait until the
+        // tab is correctly tracked.
+      const promisedNewTabTracked = new Promise((resolve, reject) => {
+        const listener = (tab) => {
+          Tab.onCreating.removeListener(listener);
+          browser.tabs.get(tab.id)
+            .then(resolve)
+            .catch(ApiTabs.createErrorSuppressor(reject));
+        };
+        Tab.onCreating.addListener(listener);
+      });
+      const createdTab = await browser.tabs.create(params).catch(ApiTabs.createErrorHandler());
+      await Promise.all([
+        promisedNewTabTracked, // TabsStore.waitUntilTabsAreCreated(createdTab.id),
+        searchQuery && browser.search.search({
+          query: searchQuery,
+          tabId: createdTab.id
+        }).catch(ApiTabs.createErrorHandler())
+      ]);
+      const tab = Tab.get(createdTab.id);
+      log('created tab: ', tab);
+      if (!tab)
+        throw new Error('tab is already closed');
+      if (!opener &&
+          parent &&
+          !isOrphan)
+        await Tree.attachTabTo(tab, parent, {
+          insertBefore: insertBefore,
+          insertAfter:  insertAfter,
+          forceExpand:  params.active,
+          broadcast:    true
+        });
+      else if (insertBefore)
+        await TabsMove.moveTabInternallyBefore(tab, insertBefore, {
+          broadcast: true
+        });
+      else if (insertAfter)
+        await TabsMove.moveTabInternallyAfter(tab, insertAfter, {
+          broadcast: true
+        });
+      log('tab is opened.');
+      await tab.$TST.opened;
+      tabs.push(tab);
+      tryRevokeObjectURL(tab.url);
+      return tab;
+    }));
+  }, windowId));
+  const openedTabs = tabs.filter(tab => actuallyOpenedTabIds.has(tab));
+
+  if (fixPositions &&
+      openedTabs.every((tab, index) => (index == 0) || (openedTabs[index-1].index - tab.index) == 1)) {
+    // tabs are opened with reversed order due to browser.tabs.insertAfterCurrent=true
+    let lastTab;
+    for (const tab of openedTabs.slice(0).reverse()) {
+      if (lastTab)
+        TabsMove.moveTabInternallyBefore(tab, lastTab);
+      lastTab = tab;
+    }
+    await TabsMove.waitUntilSynchronized(windowId);
+  }
+  return openedTabs;
+}
+
+function sanitizeURL(url) {
+  if (ALLOWED_URL_MATCHER.test(url))
+    return url;
+
+  // tabs.create() doesn't accept about:reader URLs so we fallback them to regular URLs.
+  if (/^about:reader\?/.test(url))
+    return (new URL(url)).searchParams.get('url') || 'about:blank';
+
+  if (FORBIDDEN_URL_MATCHER.test(url)) {
+    onForbiddenURLRequested.dispatch(url);
+    return `about:blank?forbidden-url=${url}`;
+  }
+
+  return url;
+}
+
+export function isOpenable(url) {
+  return !url || url == sanitizeURL(url);
+}
+
+
+function onMessage(message, openerTab) {
+  switch (message.type) {
+    case Constants.kCOMMAND_LOAD_URI:
+      loadURI(message.uri, {
+        tab: Tab.get(message.tabId)
+      });
+      break;
+
+    case Constants.kCOMMAND_OPEN_TAB:
+      if (!message.parentId && openerTab)
+        message.parentId = openerTab.id;
+      if (!message.windowId && openerTab)
+        message.windowId = openerTab.windowId;
+      Tab.waitUntilTracked([
+        message.parentId,
+        message.insertBeforeId,
+        message.insertAfterId
+      ]).then(() => {
+        openURIsInTabs(message.uris || [message.uri], {
+          windowId:     message.windowId,
+          parent:       Tab.get(message.parentId),
+          insertBefore: Tab.get(message.insertBeforeId),
+          insertAfter:  Tab.get(message.insertAfterId),
+          active:       !!message.active,
+          discarded:    message.discarded,
+        });
+      });
+      break;
+
+    case Constants.kCOMMAND_NEW_TABS:
+      Tab.waitUntilTracked([
+        message.openerId,
+        message.parentId,
+        message.insertBeforeId,
+        message.insertAfterId
+      ]).then(() => {
+        log('new tabs requested: ', message);
+        openURIsInTabs(message.uris, {
+          windowId:     message.windowId,
+          opener:       Tab.get(message.openerId),
+          parent:       Tab.get(message.parentId),
+          insertBefore: Tab.get(message.insertBeforeId),
+          insertAfter:  Tab.get(message.insertAfterId),
+          active:       message.active,
+          discarded:    message.discarded,
+        });
+      });
+      break;
+  }
+}
+
+SidebarConnection.onMessage.addListener((windowId, message) => {
+  onMessage(message);
+});
+
+browser.runtime.onMessage.addListener((message, sender) => {
+  if (!message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  onMessage(message, sender.tab);
+});
diff --git a/waterfox/browser/components/sidebar/background/tree-structure.js b/waterfox/browser/components/sidebar/background/tree-structure.js
new file mode 100644
index 0000000000000..f9f7d8fc413f8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tree-structure.js
@@ -0,0 +1,691 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  toLines,
+  configs,
+  wait,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as UserOperationBlocker from '/common/user-operation-blocker.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab } from '/common/TreeItem.js';
+
+import * as Commands from './commands.js';
+import * as TabsMove from './tabs-move.js';
+import * as TabsOpen from './tabs-open.js';
+import * as Tree from './tree.js';
+
+function log(...args) {
+  internalLogger('background/tree-structure', ...args);
+}
+
+export const onTabAttachedFromRestoredInfo = new EventListenerManager();
+
+let mRecentlyClosedTabs = [];
+let mRecentlyClosedTabsTreeStructure = [];
+
+export function startTracking() {
+  Tab.onCreated.addListener((tab, _info) => { reserveToSaveTreeStructure(tab.windowId); });
+  Tab.onRemoved.addListener((tab, info) => {
+    if (!info.isWindowClosing)
+      reserveToSaveTreeStructure(tab.windowId);
+  });
+  Tab.onMoved.addListener((tab, _info) => { reserveToSaveTreeStructure(tab.windowId); });
+  Tab.onUpdated.addListener((tab, info) => {
+    if ('openerTabId' in info)
+      reserveToSaveTreeStructure(tab.windowId);
+  });
+  Tree.onAttached.addListener((tab, _info) => { reserveToSaveTreeStructure(tab.windowId); });
+  Tree.onDetached.addListener((tab, _info) => { reserveToSaveTreeStructure(tab.windowId); });
+  Tree.onSubtreeCollapsedStateChanging.addListener(tab => { reserveToSaveTreeStructure(tab.windowId); });
+}
+
+export function reserveToSaveTreeStructure(windowId) {
+  const win = TabsStore.windows.get(windowId);
+  if (!win)
+    return;
+
+  if (win.waitingToSaveTreeStructure)
+    clearTimeout(win.waitingToSaveTreeStructure);
+  win.waitingToSaveTreeStructure = setTimeout(() => {
+    saveTreeStructure(windowId);
+  }, 150);
+}
+async function saveTreeStructure(windowId) {
+  const win = TabsStore.windows.get(windowId);
+  if (!win)
+    return;
+
+  const structure = TreeBehavior.getTreeStructureFromTabs(Tab.getAllTabs(windowId));
+  browser.sessions.setWindowValue(
+    windowId,
+    Constants.kWINDOW_STATE_TREE_STRUCTURE,
+    structure
+  ).catch(ApiTabs.createErrorSuppressor());
+}
+
+export async function loadTreeStructure(windows, restoredFromCacheResults) {
+  log('loadTreeStructure');
+  MetricsData.add('loadTreeStructure: start');
+  return MetricsData.addAsync('loadTreeStructure: restoration for windows', Promise.all(windows.map(async win => {
+    if (restoredFromCacheResults &&
+        restoredFromCacheResults.get(win.id)) {
+      log(`skip tree structure restoration for window ${win.id} (restored from cache)`);
+      return;
+    }
+    const tabs = Tab.getAllTabs(win.id);
+    let windowStateCompletelyApplied = false;
+    try {
+      const structure = await browser.sessions.getWindowValue(win.id, Constants.kWINDOW_STATE_TREE_STRUCTURE).catch(ApiTabs.createErrorHandler());
+      let uniqueIds = tabs.map(tab => tab.$TST.uniqueId || '?');
+      MetricsData.add('loadTreeStructure: read stored data');
+      if (structure &&
+          structure.length > 0 &&
+          structure.length <= tabs.length) {
+        uniqueIds = uniqueIds.map(id => id.id);
+        let tabsOffset;
+        if (structure[0].id) {
+          const structureSignature = toLines(structure, item => item.id);
+          tabsOffset = uniqueIds.join('\n').indexOf(structureSignature);
+          windowStateCompletelyApplied = tabsOffset > -1;
+        }
+        else {
+          tabsOffset = 0;
+          windowStateCompletelyApplied = structure.length == tabs.length;
+        }
+        if (tabsOffset > -1) {
+          const structureRestoreTabs = tabs.slice(tabsOffset);
+          await Tree.applyTreeStructureToTabs(structureRestoreTabs, structure);
+          for (const tab of structureRestoreTabs) {
+            tab.$TST.temporaryMetadata.set('treeStructureAlreadyRestoredFromSessionData', true);
+          }
+          MetricsData.add('loadTreeStructure: Tree.applyTreeStructureToTabs');
+        }
+        else {
+          MetricsData.add('loadTreeStructure: mismatched signature');
+        }
+      }
+      else {
+        MetricsData.add('loadTreeStructure: no valid structure information');
+      }
+    }
+    catch(error) {
+      console.log(`TreeStructure.loadTreeStructure: Fatal error, ${error}`, error.stack);
+      MetricsData.add('loadTreeStructure: failed to apply tree structure');
+    }
+    if (!windowStateCompletelyApplied) {
+      log(`Tree information for the window ${win.id} is not same to actual state. Fallback to restoration from tab relations.`);
+      MetricsData.add('loadTreeStructure: fallback to reserveToAttachTabFromRestoredInfo');
+      const unattachedTabs = new Set(tabs);
+      for (const tab of tabs) {
+        reserveToAttachTabFromRestoredInfo(tab, {
+          keepCurrentTree: true,
+          canCollapse:     true
+        }).then(attached => {
+          if (attached ||
+              tab.$TST.parent ||
+              tab.$TST.hasChild)
+            unattachedTabs.delete(tab);
+        });
+      }
+      await reserveToAttachTabFromRestoredInfo.promisedDone;
+      MetricsData.add('loadTreeStructure: attachTabFromRestoredInfo finish');
+
+      // unknown tabs may appear inside tree, so we need to fixup tree based on their position.
+      for (const tab of unattachedTabs) {
+        const action = Tree.detectTabActionFromNewPosition(tab, {
+          fromIndex: tabs.length - 1,
+          toIndex:   tab.index,
+          isTabCreating: true,
+        });
+        switch (action.action) {
+          default:
+            break;
+
+          case 'attach':
+          case 'detach':
+            log('loadTreeStructure: apply action for unattached tab: ', tab, action);
+            await action.applyIfNeeded();
+            break;
+        }
+      }
+      MetricsData.add('loadTreeStructure: finish to fixup tree structure');
+    }
+    Tab.dumpAll();
+  })));
+}
+
+async function reserveToAttachTabFromRestoredInfo(tab, options = {}) {
+  if (reserveToAttachTabFromRestoredInfo.waiting)
+    clearTimeout(reserveToAttachTabFromRestoredInfo.waiting);
+  reserveToAttachTabFromRestoredInfo.tasks.push({ tab, options: options });
+  if (!reserveToAttachTabFromRestoredInfo.promisedDone) {
+    reserveToAttachTabFromRestoredInfo.promisedDone = new Promise((resolve, _reject) => {
+      reserveToAttachTabFromRestoredInfo.onDone = resolve;
+    });
+  }
+  reserveToAttachTabFromRestoredInfo.waiting = setTimeout(async () => {
+    reserveToAttachTabFromRestoredInfo.waiting = null;
+    const tasks = reserveToAttachTabFromRestoredInfo.tasks.slice(0);
+    reserveToAttachTabFromRestoredInfo.tasks = [];
+    const uniqueIds = tasks.map(task => task.tab.$TST.uniqueId);
+    const bulk = tasks.length > 1;
+    const attachedResults = await Promise.all(uniqueIds.map((uniqueId, index) => {
+      const task = tasks[index];
+      return attachTabFromRestoredInfo(task.tab, {
+        ...task.options,
+        uniqueId,
+        bulk
+      }).catch(error => {
+        console.log(`TreeStructure.reserveToAttachTabFromRestoredInfo: Fatal error on processing task ${index}, ${error}`, error.stack);
+        return false;
+      });
+    }));
+    if (typeof reserveToAttachTabFromRestoredInfo.onDone == 'function')
+      reserveToAttachTabFromRestoredInfo.onDone(attachedResults.every(attached => !!attached));
+    delete reserveToAttachTabFromRestoredInfo.onDone;
+    delete reserveToAttachTabFromRestoredInfo.promisedDone;
+    Tab.dumpAll();
+  }, 100);
+  return reserveToAttachTabFromRestoredInfo.promisedDone;
+}
+reserveToAttachTabFromRestoredInfo.waiting = null;
+reserveToAttachTabFromRestoredInfo.tasks   = [];
+reserveToAttachTabFromRestoredInfo.promisedDone = null;
+
+
+async function attachTabFromRestoredInfo(tab, options = {}) {
+  log('attachTabFromRestoredInfo ', tab, options);
+  if (tab.$TST.temporaryMetadata.has('treeStructureAlreadyRestoredFromSessionData')) {
+    log(' => already restored ', tab.id);
+    return;
+  }
+
+  let uniqueId, insertBefore, insertAfter, insertAfterLegacy, ancestors, children, states, collapsed /* for backward compatibility */;
+  // eslint-disable-next-line prefer-const
+  [uniqueId, insertBefore, insertAfter, insertAfterLegacy, ancestors, children, states, collapsed] = await Promise.all([
+    options.uniqueId || tab.$TST.uniqueId || tab.$TST.promisedUniqueId,
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_INSERT_BEFORE).catch(ApiTabs.createErrorHandler()),
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_INSERT_AFTER).catch(ApiTabs.createErrorHandler()),
+    // This legacy should be removed after legacy data are cleared enough, maybe after Firefox 128 is released.
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_INSERT_AFTER_LEGACY).catch(ApiTabs.createErrorHandler()),
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_ANCESTORS).catch(ApiTabs.createErrorHandler()),
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_CHILDREN).catch(ApiTabs.createErrorHandler()),
+    tab.$TST.getPermanentStates(),
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_SUBTREE_COLLAPSED).catch(ApiTabs.createErrorHandler()) // for backward compatibility
+  ]);
+  ancestors = ancestors || [];
+  children  = children  || [];
+  log(`persistent references for ${dumpTab(tab)} (${uniqueId.id}): `, {
+    insertBefore, insertAfter,
+    insertAfterLegacy,
+    ancestors: ancestors.join(', '),
+    children:  children.join(', '),
+    states,
+    collapsed
+  });
+  if (collapsed && !states.includes(Constants.kTAB_STATE_SUBTREE_COLLAPSED)) {
+    // migration
+    states.push(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+    browser.sessions.removeTabValue(tab.id, Constants.kPERSISTENT_SUBTREE_COLLAPSED).catch(ApiTabs.createErrorSuppressor());
+  }
+  insertBefore = Tab.getByUniqueId(insertBefore);
+  insertAfter  = Tab.getByUniqueId(insertAfter || insertAfterLegacy);
+  ancestors    = ancestors.map(Tab.getByUniqueId);
+  children     = children.map(Tab.getByUniqueId);
+  log(' => references: ', tab.id, () => ({
+    insertBefore: dumpTab(insertBefore),
+    insertAfter:  dumpTab(insertAfter),
+    ancestors:    ancestors.map(dumpTab).join(', '),
+    children:     children.map(dumpTab).join(', ')
+  }));
+  if (configs.fixupTreeOnTabVisibilityChanged) {
+    ancestors = ancestors.filter(ancestor => ancestor && (ancestor.hidden == tab.hidden));
+    children = children.filter(child => child && (child.hidden == tab.hidden));
+    log(' ==> references: ', tab.id, () => ({
+      ancestors: ancestors.map(dumpTab).join(', '),
+      children:  children.map(dumpTab).join(', ')
+    }));
+  }
+
+  // clear wrong positioning information
+  if (tab.pinned ||
+      insertBefore?.pinned)
+    insertBefore = null;
+  const nextOfInsertAfter = insertAfter?.$TST.nextTab;
+  if (nextOfInsertAfter &&
+      nextOfInsertAfter.pinned)
+    insertAfter = null;
+
+  let attached = false;
+  const active = tab.active;
+  const promises = [];
+  for (const ancestor of ancestors) {
+    if (!ancestor)
+      continue;
+    log(' attach to old ancestor: ', tab.id, { child: tab, parent: ancestor });
+    const promisedDone = Tree.attachTabTo(tab, ancestor, {
+      insertBefore,
+      insertAfter,
+      dontExpand:  !active,
+      forceExpand: active,
+      broadcast:   true
+    });
+    if (options.bulk)
+      promises.push(promisedDone);
+    else
+      await promisedDone;
+    attached = true;
+    break;
+  }
+  if (!attached) {
+    const opener = tab.$TST.openerTab;
+    if (opener &&
+        configs.syncParentTabAndOpenerTab) {
+      log(' attach to opener: ', tab.id, { child: tab, parent: opener });
+      const promisedDone = Tree.attachTabTo(tab, opener, {
+        dontExpand:  !active,
+        forceExpand: active,
+        broadcast:   true,
+        insertAt:    Constants.kINSERT_NEAREST
+      });
+      if (options.bulk)
+        promises.push(promisedDone);
+      else
+        await promisedDone;
+    }
+    else if (!options.bulk &&
+             (tab.$TST.nearestCompletelyOpenedNormalFollowingTab ||
+              tab.$TST.nearestCompletelyOpenedNormalPrecedingTab)) {
+      log(' attach from position: ', tab.id);
+      onTabAttachedFromRestoredInfo.dispatch(tab, {
+        toIndex:   tab.index,
+        fromIndex: Tab.getLastTab(tab.windowId).index
+      });
+    }
+  }
+  if (!options.keepCurrentTree &&
+      // the restored tab is a roo tab
+      ancestors.length == 0 &&
+      // but attached to any parent based on its restored position
+      tab.$TST.parent &&
+      // when not in-middle position of existing tree (safely detachable position)
+      !tab.$TST.nextSiblingTab) {
+    Tree.detachTab(tab, {
+      broadcast: true
+    });
+  }
+  if (options.children && !options.bulk) {
+    let firstInTree = tab.$TST.firstChild || tab;
+    let lastInTree  = tab.$TST.lastDescendant || tab;
+    for (const child of children) {
+      if (!child)
+        continue;
+      await Tree.attachTabTo(child, tab, {
+        dontExpand:  !child.active,
+        forceExpand: active,
+        insertAt:    Constants.kINSERT_NEAREST,
+        dontMove:    child.index >= firstInTree.index && child.index <= lastInTree.index + 1,
+        broadcast:   true
+      });
+      if (child.index < firstInTree.index)
+        firstInTree = child;
+      else if (child.index > lastInTree.index)
+        lastInTree = child;
+    }
+  }
+
+  const subtreeCollapsed = states.includes(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+  log('restore subtree collapsed state: ', tab.id, { current: tab.$TST.subtreeCollapsed, expected: subtreeCollapsed, ...options });
+  if ((options.canCollapse || options.bulk) &&
+      tab.$TST.subtreeCollapsed != subtreeCollapsed) {
+    const promisedDone = Tree.collapseExpandSubtree(tab, {
+      broadcast: true,
+      collapsed: subtreeCollapsed,
+      justNow:   true
+    });
+    promises.push(promisedDone);
+  }
+
+  const updateCollapsedState = () => {
+    const shouldBeCollapsed = tab.$TST.ancestors.some(ancestor => ancestor.$TST.collapsed || ancestor.$TST.subtreeCollapsed);
+    log('update collapsed state: ', tab.id, { current: tab.$TST.collapsed, expected: shouldBeCollapsed });
+    if ((options.canCollapse || options.bulk) &&
+        tab.$TST.collapsed != shouldBeCollapsed) {
+      Tree.collapseExpandTabAndSubtree(tab, {
+        broadcast: true,
+        collapsed: !tab.$TST.collapsed,
+        justNow:   true
+      });
+    }
+  };
+
+  tab.$TST.temporaryMetadata.set('treeStructureAlreadyRestoredFromSessionData', true);
+
+  if (options.bulk)
+    await Promise.all(promises).then(updateCollapsedState);
+  else
+    updateCollapsedState();
+
+  return attached;
+}
+
+const mRestoringTabs = new Map();
+const mMaxRestoringTabs = new Map();
+const mRestoredTabIds = new Set();
+const mProcessingTabRestorations = [];
+
+Tab.onRestored.addListener(tab => {
+  log('onTabRestored ', dumpTab(tab));
+  mProcessingTabRestorations.push(async () => {
+    try {
+      const count = mRestoringTabs.get(tab.windowId) || 0;
+      if (count == 0) {
+        setTimeout(() => {
+          const count = mRestoringTabs.get(tab.windowId) || 0;
+          if (count > 0) {
+            UserOperationBlocker.blockIn(tab.windowId, { throbber: true });
+            UserOperationBlocker.setProgress(0, tab.windowId);
+          }
+        }, configs.delayToBlockUserOperationForTabsRestoration);
+      }
+      mRestoringTabs.set(tab.windowId, count + 1);
+      const maxCount = mMaxRestoringTabs.get(tab.windowId) || 0;
+      mMaxRestoringTabs.set(tab.windowId, Math.max(count, maxCount));
+
+      const uniqueId = await tab.$TST.promisedUniqueId;
+      mRestoredTabIds.add(uniqueId.id);
+
+      if (count == 0) {
+        // Force restore recycled active tab.
+        // See also: https://github.com/piroor/treestyletab/issues/2191#issuecomment-489271889
+        const activeTab = Tab.getActiveTab(tab.windowId);
+        const [uniqueId, restoredUniqueId] = await Promise.all([
+          activeTab.$TST.promisedUniqueId,
+          browser.sessions.getTabValue(activeTab.id, Constants.kPERSISTENT_ID).catch(ApiTabs.createErrorHandler())
+        ]);
+        if (restoredUniqueId?.id != uniqueId.id) {
+          activeTab.$TST.updateUniqueId({ id: restoredUniqueId.id });
+          reserveToAttachTabFromRestoredInfo(activeTab, {
+            children: true
+          });
+        }
+      }
+
+      reserveToAttachTabFromRestoredInfo(tab, {
+        children: true
+      });
+
+      reserveToAttachTabFromRestoredInfo.promisedDone.then(() => {
+        Tree.fixupSubtreeCollapsedState(tab, {
+          justNow:   true,
+          broadcast: true
+        });
+        SidebarConnection.sendMessage({
+          type:     Constants.kCOMMAND_NOTIFY_TAB_RESTORED,
+          tabId:    tab.id,
+          windowId: tab.windowId
+        });
+
+        let count = mRestoringTabs.get(tab.windowId) || 0;
+        count--;
+        if (count == 0) {
+          mRestoringTabs.delete(tab.windowId);
+          mMaxRestoringTabs.delete(tab.windowId);
+          setTimeout(() => { // because window.requestAnimationFrame is decelerate for an invisible document.
+            // unblock in the next event loop, after other asynchronous operations are finished
+            UserOperationBlocker.unblockIn(tab.windowId, { throbber: true });
+          }, 0);
+
+          const countToBeRestored = mRecentlyClosedTabs.filter(tab => !mRestoredTabIds.has(tab.uniqueId));
+          log('countToBeRestored: ', countToBeRestored);
+          if (countToBeRestored > 0)
+            tryRestoreClosedSetFor(tab, countToBeRestored);
+          mRestoredTabIds.clear();
+        }
+        else {
+          mRestoringTabs.set(tab.windowId, count);
+          const maxCount = mMaxRestoringTabs.get(tab.windowId);
+          UserOperationBlocker.setProgress(Math.round(maxCount - count / maxCount * 100), tab.windowId);
+        }
+      });
+    }
+    catch(_e) {
+    }
+    mProcessingTabRestorations.shift();
+    if (mProcessingTabRestorations.length > 0)
+      mProcessingTabRestorations[0]();
+  });
+  if (mProcessingTabRestorations.length == 1)
+    mProcessingTabRestorations[0]();
+});
+
+
+// Implementation for the "Undo Close Tab*s*" feature
+// https://github.com/piroor/treestyletab/issues/2627
+
+const mPendingRecentlyClosedTabsInfo = {
+  tabs:      [],
+  structure: []
+};
+
+Tab.onRemoved.addListener((_tab, _info) => {
+  const currentlyRestorable = mRecentlyClosedTabs.length > 1;
+
+  mRecentlyClosedTabs = [];
+  mRecentlyClosedTabsTreeStructure = [];
+
+  const newlyRestorable = mRecentlyClosedTabs.length > 1;
+  if (currentlyRestorable != newlyRestorable)
+    Tab.onChangeMultipleTabsRestorability.dispatch(newlyRestorable);
+});
+
+Tab.onMultipleTabsRemoving.addListener((tabs, { triggerTab, originalStructure } = {}) => {
+  if (triggerTab)
+    tabs = [triggerTab, ...tabs];
+  mPendingRecentlyClosedTabsInfo.tabs = tabs.map(tab => ({
+    originalId:    tab.id,
+    uniqueId:      tab.$TST.uniqueId.id,
+    windowId:      tab.windowId,
+    title:         tab.title,
+    url:           tab.url,
+    cookieStoreId: tab.cookieStoreId
+  }));
+  mPendingRecentlyClosedTabsInfo.structure = originalStructure || TreeBehavior.getTreeStructureFromTabs(tabs, {
+    full:                 true,
+    keepParentOfRootTabs: true
+  });
+  log('mPendingRecentlyClosedTabsInfo.tabs = ', mPendingRecentlyClosedTabsInfo.tabs);
+  log('mPendingRecentlyClosedTabsInfo.structure = ', mPendingRecentlyClosedTabsInfo.structure);
+});
+
+Tab.onMultipleTabsRemoved.addListener((tabs, { triggerTab } = {}) => {
+  log('multiple tabs are removed');
+  const currentlyRestorable = mRecentlyClosedTabs.length > 1;
+
+  if (triggerTab)
+    tabs = [triggerTab, ...tabs];
+  const tabIds = new Set(tabs.map(tab => tab.id));
+  mRecentlyClosedTabs = mPendingRecentlyClosedTabsInfo.tabs.filter(info => tabIds.has(info.originalId));
+  mRecentlyClosedTabsTreeStructure = mPendingRecentlyClosedTabsInfo.structure.filter(structure => tabIds.has(structure.originalId));
+  log('  structure: ', mRecentlyClosedTabsTreeStructure);
+
+  const newlyRestorable = mRecentlyClosedTabs.length > 1;
+  if (currentlyRestorable != newlyRestorable)
+    Tab.onChangeMultipleTabsRestorability.dispatch(newlyRestorable);
+
+  mPendingRecentlyClosedTabsInfo.tabs = [];
+  mPendingRecentlyClosedTabsInfo.structure = [];
+});
+
+let mToBeActivatedRestoredTabId = null;
+
+function onRestoredTabActivated(activeInfo) {
+  if (mToBeActivatedRestoredTabId &&
+      activeInfo.id != mToBeActivatedRestoredTabId) {
+    TabsInternalOperation.activateTab(mToBeActivatedRestoredTabId);
+  }
+  mToBeActivatedRestoredTabId = null;
+}
+
+browser.tabs.onActivated.addListener(onRestoredTabActivated);
+
+async function tryRestoreClosedSetFor(tab, countToBeRestored) {
+  const lastRecentlyClosedTabs = mRecentlyClosedTabs;
+  const lastRecentlyClosedTabsTreeStructure = mRecentlyClosedTabsTreeStructure;
+  mRecentlyClosedTabs = [];
+  mRecentlyClosedTabsTreeStructure = [];
+  if (lastRecentlyClosedTabs.length > 1)
+    Tab.onChangeMultipleTabsRestorability.dispatch(false);
+
+  if (!configs.undoMultipleTabsClose)
+    return;
+
+  const alreadRestoredIndex = lastRecentlyClosedTabs.findIndex(info => info.uniqueId == tab.$TST.uniqueId.id && info.windowId == tab.windowId);
+  log('tryRestoreClosedSetFor ', tab, lastRecentlyClosedTabs, lastRecentlyClosedTabsTreeStructure);
+  if (alreadRestoredIndex < 0) {
+    log(' => not a member of restorable tab set.');
+    return;
+  }
+
+  const toBeRestoredTabsCount = Math.min(
+    typeof countToBeRestored == 'number' ? countToBeRestored : Number.MAX_SAFE_INTEGER,
+    lastRecentlyClosedTabs.filter(tabInfo => tabInfo.uniqueId != tab.$TST.uniqueId.id).length
+  );
+  if (toBeRestoredTabsCount == 0) {
+    log(' => no more tab to be restored.');
+    return;
+  }
+
+  const sessions = (await browser.sessions.getRecentlyClosed({
+    maxResults: browser.sessions.MAX_SESSION_RESULTS
+  }).catch(ApiTabs.createErrorHandler())).filter(session => session.tab);
+
+  const canRestoreWithSession = toBeRestoredTabsCount <= sessions.length;
+
+  let restoredTabs;
+  if (canRestoreWithSession) {
+    log(`tryRestoreClosedSetFor: restore ${toBeRestoredTabsCount} tabs with the sessions API`);
+    const unsortedRestoredTabs = await Commands.restoreTabs(toBeRestoredTabsCount);
+    unsortedRestoredTabs.push(tab);
+    // tabs can be restored in different order, then we need to rearrange them manually
+    const tabsByUniqueId = new Map();
+    for (const tab of unsortedRestoredTabs) {
+      tabsByUniqueId.set(tab.$TST.uniqueId.id, tab);
+    }
+    restoredTabs = await Promise.all(lastRecentlyClosedTabsTreeStructure.map(tabInfo => {
+      const restoredTab = tabsByUniqueId.get(tabInfo.id);
+      if (restoredTab)
+        return restoredTab;
+      log('tryRestoreClosedSetFor: recreate tab for ', tabInfo);
+      return TabsOpen.openURIInTab({
+        title:         tabInfo.title,
+        url:           tabInfo.url,
+        cookieStoreId: tabInfo.cookieStoreId
+      }, {
+        windowId:      tab.windowId,
+        isOrphan:      true,
+        inBackground:  true,
+        discarded:     true,
+        fixPositions:  true
+      });
+    }));
+    let lastTab;
+    for (const tab of restoredTabs) {
+      if (lastTab && tab.$TST.previousTab != lastTab)
+        await TabsMove.moveTabAfter(
+          tab,
+          lastTab,
+          { broadcast: true }
+        );
+      lastTab = tab;
+    }
+  }
+  else {
+    log('tryRestoreClosedSetFor: recreate tabs');
+    const tabOpenOptions = {
+      windowId:     lastRecentlyClosedTabs[0].windowId,
+      isOrphan:     true,
+      inBackground: true,
+      discarded:    true,
+      fixPositions: true
+    };
+    const beforeTabs = await TabsOpen.openURIsInTabs(
+      lastRecentlyClosedTabs.slice(0, alreadRestoredIndex).map(info => ({
+        title:         info.title,
+        url:           info.url,
+        cookieStoreId: info.cookieStoreId
+      })),
+      tabOpenOptions
+    );
+    const afterTabs = await TabsOpen.openURIsInTabs(
+      lastRecentlyClosedTabs.slice(alreadRestoredIndex + 1).map(info => ({
+        title:         info.title,
+        url:           info.url,
+        cookieStoreId: info.cookieStoreId
+      })),
+      tabOpenOptions
+    );
+    // We need to move tabs after they are opened instead of
+    // specifying the "index" option for TabsOpen.openURIsInTabs(),
+    // because the given restored tab can be moved while this
+    // operation.
+    if (beforeTabs.length > 0)
+      await TabsMove.moveTabsBefore(
+        beforeTabs,
+        tab,
+        { broadcast: true }
+      );
+    if (afterTabs.length > 0)
+      await TabsMove.moveTabsAfter(
+        afterTabs,
+        tab,
+        { broadcast: true }
+      );
+    restoredTabs = [...beforeTabs, tab, ...afterTabs];
+    await TabsInternalOperation.activateTab(restoredTabs[0]);
+  }
+
+  const rootTabs = restoredTabs.filter((tab, index) => lastRecentlyClosedTabsTreeStructure[index].parent == TreeBehavior.STRUCTURE_KEEP_PARENT || lastRecentlyClosedTabsTreeStructure[index].parent == TreeBehavior.STRUCTURE_NO_PARENT);
+  log(`tryRestoreClosedSetFor: rootTabs, restoredTabs = `, rootTabs, restoredTabs);
+  for (const rootTab of rootTabs) {
+    const referenceTabs = TreeBehavior.calculateReferenceItemsFromInsertionPosition(rootTab, {
+      context:      Constants.kINSERTION_CONTEXT_MOVED,
+      insertAfter:  rootTab.$TST.previousTab,
+      insertBefore: restoredTabs[restoredTabs.length - 1].$TST.nextTab
+    });
+    log(`tryRestoreClosedSetFor: referenceTabs for ${rootTab.id} => `, referenceTabs);
+    if (referenceTabs.parent)
+      await Tree.attachTabTo(rootTab, referenceTabs.parent, {
+        dontExpand:  true,
+        insertAfter: referenceTabs.insertAfter,
+        dontMove:    true,
+        broadcast:   true
+      });
+  }
+
+  await Tree.applyTreeStructureToTabs(
+    restoredTabs,
+    lastRecentlyClosedTabsTreeStructure
+  );
+
+  // Firefox itself activates the initially restored tab with delay,
+  // so we need to activate the first tab of the restored tabs again.
+  mToBeActivatedRestoredTabId = restoredTabs[0].id;
+  wait(100).then(() => onRestoredTabActivated({ id: -1 })); // failsafe
+}
diff --git a/waterfox/browser/components/sidebar/background/tree.js b/waterfox/browser/components/sidebar/background/tree.js
new file mode 100644
index 0000000000000..43c59af9d7749
--- /dev/null
+++ b/waterfox/browser/components/sidebar/background/tree.js
@@ -0,0 +1,2251 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  wait,
+  dumpTab,
+  mapAndFilter,
+  configs,
+  shouldApplyAnimation,
+  getWindowParamsFromSource,
+  isFirefoxViewTab,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarConnection from '/common/sidebar-connection.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+import * as UserOperationBlocker from '/common/user-operation-blocker.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab, TreeItem } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as TabsMove from './tabs-move.js';
+
+function log(...args) {
+  internalLogger('background/tree', ...args);
+}
+function logCollapseExpand(...args) {
+  internalLogger('sidebar/collapse-expand', ...args);
+}
+
+
+export const onAttached     = new EventListenerManager();
+export const onDetached     = new EventListenerManager();
+export const onSubtreeCollapsedStateChanging = new EventListenerManager();
+export const onSubtreeCollapsedStateChanged  = new EventListenerManager();
+
+
+const mUnattachableTabIds = new Set();
+
+export function markTabIdAsUnattachable(id) {
+  mUnattachableTabIds.add(id);
+}
+
+export function clearUnattachableTabId(id) {
+  mUnattachableTabIds.delete(id);
+}
+
+function isTabIdUnattachable(id) {
+  return mUnattachableTabIds.has(id);
+}
+
+
+// return moved (or not)
+export async function attachTabTo(child, parent, options = {}) {
+  parent = TabsStore.ensureLivingItem(parent);
+  child = TabsStore.ensureLivingItem(child);
+  if (!parent || !child) {
+    log('missing information: ', { parent, child });
+    return false;
+  }
+
+  if (isFirefoxViewTab(parent)) {
+    log('Firefox View tab could not be a parent of other tabs');
+    return false;
+  }
+
+  log('attachTabTo: ', {
+    child:            child.id,
+    parent:           parent.id,
+    children:         parent.$TST.getAttribute(Constants.kCHILDREN),
+    insertAt:         options.insertAt,
+    insertBefore:     options.insertBefore?.id,
+    insertAfter:      options.insertAfter?.id,
+    lastRelatedTab:   options.lastRelatedTab?.id,
+    dontMove:         options.dontMove,
+    dontUpdateIndent: options.dontUpdateIndent,
+    forceExpand:      options.forceExpand,
+    dontExpand:       options.dontExpand,
+    delayedMove:      options.delayedMove,
+    dontSyncParentToOpenerTab: options.dontSyncParentToOpenerTab,
+    broadcast:        options.broadcast,
+    broadcasted:      options.broadcasted,
+    stack:            `${configs.debug && new Error().stack}\n${options.stack || ''}`
+  });
+
+  if (isTabIdUnattachable(child.id)) {
+    log('=> do not attach an unattachable tab to another (maybe already removed)');
+    return false;
+  }
+  if (isTabIdUnattachable(parent.id)) {
+    log('=> do not attach to an unattachable tab (maybe already removed)');
+    return false;
+  }
+
+  if (parent.pinned || child.pinned) {
+    log('=> pinned tabs cannot be attached');
+    return false;
+  }
+  if (parent.windowId != child.windowId) {
+    log('=> could not attach tab to a parent in different window');
+    return false;
+  }
+  const ancestors = [parent].concat(parent.$TST.ancestors);
+  if (ancestors.includes(child)) {
+    log('=> canceled for recursive request');
+    return false;
+  }
+
+  if (options.dontMove) {
+    log('=> do not move');
+    options.insertBefore = child.$TST.nextTab;
+    if (!options.insertBefore)
+      options.insertAfter = child.$TST.previousTab;
+  }
+
+  if (!options.insertBefore && !options.insertAfter) {
+    const refTabs = getReferenceTabsForNewChild(child, parent, options);
+    options.insertBefore = refTabs.insertBefore;
+    options.insertAfter  = refTabs.insertAfter;
+    log('=> calculate reference tabs ', refTabs);
+  }
+  options.insertAfter = options.insertAfter || parent;
+  log(`reference tabs for ${child.id}: `, {
+    insertBefore: options.insertBefore,
+    insertAfter:  options.insertAfter
+  });
+
+  if (!options.synchronously)
+    await Tab.waitUntilTrackedAll(child.windowId);
+
+  parent = TabsStore.ensureLivingItem(parent);
+  child = TabsStore.ensureLivingItem(child);
+  if (!parent || !child) {
+    log('attachTabTo: parent or child is closed before attaching.');
+    return false;
+  }
+  if (isTabIdUnattachable(child.id) || isTabIdUnattachable(parent.id)) {
+    log('attachTabTo: parent or child is marked as unattachable (maybe already removed)');
+    return false;
+  }
+
+  parent.$TST.invalidateCache();
+  child.$TST.invalidateCache();
+
+  const newIndex = Tab.calculateNewTabIndex({
+    insertBefore: options.insertBefore,
+    insertAfter:  options.insertAfter,
+    ignoreTabs:   [child]
+  });
+  const moved = newIndex != child.index;
+  log(`newIndex for ${child.id}: `, newIndex);
+
+  const newlyAttached = (
+    !parent.$TST.childIds.includes(child.id) ||
+    child.$TST.parentId != parent.id
+  );
+  if (!newlyAttached)
+    log('=> already attached');
+
+  if (newlyAttached) {
+    detachTab(child, {
+      ...options,
+      // Don't broadcast this detach operation, because this "attachTabTo" can be
+      // broadcasted. If we broadcast this detach operation, the tab is detached
+      // twice in the sidebar!
+      broadcast: false
+    });
+
+    log('attachTabTo: setting child information to ', parent.id);
+    // we need to set its children via the "children" setter, to invalidate cached information.
+    parent.$TST.children = parent.$TST.childIds.concat([child.id]);
+
+    // We don't need to update its parent information, because the parent's
+    // "children" setter updates the child itself automatically.
+
+    const parentLevel = parseInt(parent.$TST.getAttribute(Constants.kLEVEL) || 0);
+    if (!options.dontUpdateIndent)
+      updateTabsIndent(child, parentLevel + 1, { justNow: options.synchronously });
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_CHILDREN_CHANGED,
+      windowId: parent.windowId,
+      tabId:    parent.id,
+      childIds: parent.$TST.childIds,
+      addedChildIds:   [child.id],
+      removedChildIds: [],
+      newlyAttached
+    });
+    if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TREE_ATTACHED)) {
+      const cache = {};
+      TSTAPI.broadcastMessage({
+        type: TSTAPI.kNOTIFY_TREE_ATTACHED,
+        tab:  child,
+        parent,
+      }, { tabProperties: ['tab', 'parent'], cache }).catch(_error => {});
+      TSTAPI.clearCache(cache);
+    }
+  }
+
+  if (child.openerTabId != parent.id &&
+      !options.dontSyncParentToOpenerTab &&
+      configs.syncParentTabAndOpenerTab) {
+    log(`openerTabId of ${child.id} is changed by TST!: ${child.openerTabId} (original) => ${parent.id} (changed by TST)`, new Error().stack);
+    child.openerTabId = parent.id;
+    child.$TST.updatingOpenerTabIds.push(parent.id);
+    browser.tabs.update(child.id, { openerTabId: parent.id })
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+    wait(200).then(() => {
+      const index = child.$TST.updatingOpenerTabIds.findIndex(id => id == parent.id);
+      child.$TST.updatingOpenerTabIds.splice(index, 1);
+    });
+  }
+
+  if (newlyAttached)
+    await collapseExpandForAttachedTab(child, parent, options);
+
+  if (!options.dontMove) {
+    let nextTab = options.insertBefore;
+    let prevTab = options.insertAfter;
+    if (!nextTab && !prevTab) {
+      nextTab = Tab.getTabAt(child.windowId, newIndex);
+      if (!nextTab)
+        prevTab = Tab.getTabAt(child.windowId, newIndex - 1);
+    }
+    log('move newly attached child: ', dumpTab(child), {
+      next: dumpTab(nextTab),
+      prev: dumpTab(prevTab)
+    });
+    if (!nextTab ||
+        // We should not use a descendant of the "child" tab as the reference tab
+        // when we are going to attach the "child" and its descendants to the new
+        // parent.
+        // See also: https://github.com/piroor/treestyletab/issues/2892#issuecomment-862424942
+        nextTab.$TST.parent == child) {
+      await moveTabSubtreeAfter(child, prevTab, {
+        ...options,
+        broadcast: true
+      });
+    }
+    else {
+      await moveTabSubtreeBefore(child, nextTab, {
+        ...options,
+        broadcast: true
+      });
+    }
+  }
+
+  child.$TST.opened.then(() => {
+    if (!TabsStore.ensureLivingItem(child) || // not removed while waiting
+        child.$TST.parent != parent) // not detached while waiting
+      return;
+
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_TAB_ATTACHED_COMPLETELY,
+      windowId: child.windowId,
+      childId:  child.id,
+      parentId: parent.id,
+      newlyAttached
+    });
+  });
+
+  onAttached.dispatch(child, {
+    ...options,
+    parent,
+    insertBefore: options.insertBefore,
+    insertAfter:  options.insertAfter,
+    newIndex, newlyAttached
+  });
+
+  return !options.dontMove && moved;
+}
+
+async function collapseExpandForAttachedTab(tab, parent, options = {}) {
+  // Because the tab is possibly closing for "reopen" operation,
+  // we need to apply "forceExpand" immediately. Otherwise, when
+  // the tab is closed with "subtree collapsed" state, descendant
+  // tabs are also closed even if "forceExpand" is "true".
+  log('collapseExpandForAttachedTab: newly attached tab ', { tab, parent, options });
+  if (parent.$TST.subtreeCollapsed &&
+      !options.forceExpand) {
+    log('  the tree is collapsed, but keep collapsed by forceExpand option');
+    collapseExpandTabAndSubtree(tab, {
+      collapsed: true,
+      justNow:   true,
+      broadcast: true
+    });
+  }
+
+  const isNewTreeCreatedManually = !options.justNow && parent.$TST.childIds.length == 1;
+  let parentTreeCollasped = parent.$TST.subtreeCollapsed;
+  let parentCollasped     = parent.$TST.collapsed;
+
+  const cache = {};
+  const allowed = (options.forceExpand || !options.dontExpand) && await TSTAPI.tryOperationAllowed(
+    TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_ATTACHED_CHILD,
+    { tab: parent,
+      child: tab },
+    { tabProperties: ['tab', 'child'], cache }
+  );
+  TSTAPI.clearCache(cache);
+  if (!TabsStore.ensureLivingItem(tab)) {
+    log('  not living tab, do nothing');
+    return;
+  }
+
+  if (options.forceExpand && allowed) {
+    log(`  expand tab ${tab.id} by forceExpand option`);
+    if (parentTreeCollasped)
+      collapseExpandSubtree(parent, {
+        ...options,
+        collapsed: false,
+        broadcast: true
+      });
+    else
+      collapseExpandTabAndSubtree(tab, {
+        ...options,
+        collapsed: false,
+        broadcast: true
+      });
+    parentTreeCollasped = false;
+  }
+  else {
+    log('  not forceExpanded');
+  }
+
+  if (!options.dontExpand) {
+    if (allowed) {
+      if (configs.autoCollapseExpandSubtreeOnAttach &&
+          (isNewTreeCreatedManually ||
+           parent.$TST.isAutoExpandable)) {
+        log('  collapse others by collapseExpandTreesIntelligentlyFor');
+        await collapseExpandTreesIntelligentlyFor(parent, {
+          broadcast: true
+        });
+      }
+      if (configs.autoCollapseExpandSubtreeOnSelect ||
+          isNewTreeCreatedManually ||
+          parent.$TST.isAutoExpandable ||
+          options.forceExpand) {
+        log('  expand ancestor tabs');
+        parentTreeCollasped = false;
+        parentCollasped     = false;
+        await Promise.all([parent].concat(parent.$TST.ancestors).map(async ancestor => {
+          if (!ancestor.$TST.subtreeCollapsed)
+            return;
+          const allowed = await TSTAPI.tryOperationAllowed(
+            TSTAPI.kNOTIFY_TRY_EXPAND_TREE_FROM_ATTACHED_CHILD,
+            { tab: ancestor,
+              child: tab },
+            { tabProperties: ['tab', 'child'], cache }
+          );
+          TSTAPI.clearCache(cache);
+          if (!allowed) {
+            parentTreeCollasped = true;
+            parentCollasped     = true;
+            return;
+          }
+          if (!TabsStore.ensureLivingItem(tab))
+            return;
+          collapseExpandSubtree(ancestor, {
+            ...options,
+            collapsed:    false,
+            broadcast:    true
+          });
+          parentTreeCollasped = false;
+        }));
+        if (!TabsStore.ensureLivingItem(tab))
+          return;
+      }
+      if (!parent.$TST.subtreeCollapsed &&
+          tab.$TST.collapsed) {
+        log('  moved from collapsed tree to expanded tree');
+        collapseExpandTabAndSubtree(tab, {
+          ...options,
+          collapsed: false,
+          broadcast: true,
+        });
+      }
+    }
+    else {
+      log('  not allowed to expand');
+    }
+  }
+  else if (parent.$TST.isAutoExpandable ||
+           parent.$TST.collapsed) {
+    log('  collapse auto expanded tree');
+    collapseExpandTabAndSubtree(tab, {
+      ...options,
+      collapsed:    true,
+      broadcast:    true
+    });
+  }
+  else {
+    log('  nothing to do');
+  }
+  if (parentTreeCollasped || parentCollasped) {
+    log('  collapse tab because the parent is collapsed');
+    collapseExpandTabAndSubtree(tab, {
+      ...options,
+      collapsed: true,
+      forceExpand: false,
+      broadcast: true
+    });
+  }
+}
+
+export function getReferenceTabsForNewChild(child, parent, { insertAt, ignoreTabs, lastRelatedTab, children, descendants } = {}) {
+  log('getReferenceTabsForNewChild ', { child, parent, insertAt, ignoreTabs, lastRelatedTab, children, descendants });
+  if (typeof insertAt !== 'number')
+    insertAt = configs.insertNewChildAt;
+  log('  insertAt = ', insertAt);
+  if (parent && !descendants)
+    descendants = parent.$TST.descendants;
+  if (ignoreTabs)
+    descendants = descendants.filter(tab => !ignoreTabs.includes(tab));
+  log('  descendants = ', descendants);
+  let insertBefore, insertAfter;
+  if (descendants.length > 0) {
+    const firstChild     = descendants[0];
+    const lastDescendant = descendants[descendants.length - 1];
+    switch (insertAt) {
+      case Constants.kINSERT_END:
+      default:
+        insertAfter = lastDescendant;
+        log(`  insert ${child?.id} after lastDescendant ${insertAfter?.id} (insertAt=kINSERT_END)`);
+        break;
+      case Constants.kINSERT_TOP:
+        insertBefore = firstChild;
+        log(`  insert ${child?.id} before firstChild ${insertBefore?.id} (insertAt=kINSERT_TOP)`);
+        break;
+      case Constants.kINSERT_NEAREST: {
+        const allTabs = Tab.getOtherTabs((child || parent).windowId, ignoreTabs);
+        const index = child ? allTabs.indexOf(child) : -1;
+        log('  insertAt=kINSERT_NEAREST ', { allTabs, index });
+        if (index < allTabs.indexOf(firstChild)) {
+          insertBefore = firstChild;
+          insertAfter  = parent;
+          log(`  insert ${child?.id} between parent ${insertAfter?.id} and firstChild ${insertBefore?.id} (insertAt=kINSERT_NEAREST)`);
+        }
+        else if (index > allTabs.indexOf(lastDescendant)) {
+          insertAfter  = lastDescendant;
+          log(`  insert ${child?.id} after lastDescendant ${insertAfter?.id} (insertAt=kINSERT_NEAREST)`);
+        }
+        else { // inside the tree
+          if (parent && !children)
+            children = parent.$TST.children;
+          if (ignoreTabs)
+            children = children.filter(tab => !ignoreTabs.includes(tab));
+          for (const child of children) {
+            if (index > allTabs.indexOf(child))
+              continue;
+            insertBefore = child;
+            log(`  insert ${child?.id} before nearest following child ${insertBefore?.id} (insertAt=kINSERT_NEAREST)`);
+            break;
+          }
+          if (!insertBefore) {
+            insertAfter = lastDescendant;
+            log(`  insert ${child?.id} after lastDescendant ${insertAfter?.id} (insertAt=kINSERT_NEAREST)`);
+          }
+        }
+      }; break;
+      case Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB: {
+        // Simulates Firefox's default behavior with `browser.tabs.insertRelatedAfterCurrent`=`true`.
+        // The result will become same to kINSERT_NO_CONTROL case,
+        // but this is necessary for environments with disabled the preference.
+        if ((lastRelatedTab === undefined) && parent)
+          lastRelatedTab = child && parent.$TST.lastRelatedTabId == child.id ? parent.$TST.previousLastRelatedTab : parent.$TST.lastRelatedTab; // it could be updated already...
+        if (lastRelatedTab) {
+          insertAfter  = lastRelatedTab.$TST.lastDescendant || lastRelatedTab;
+          log(`  insert ${child?.id} after lastRelatedTab ${lastRelatedTab.id} (insertAt=kINSERT_NEXT_TO_LAST_RELATED_TAB)`);
+        }
+        else {
+          insertBefore = firstChild;
+          log(`  insert ${child?.id} before firstChild (insertAt=kINSERT_NEXT_TO_LAST_RELATED_TAB)`);
+        }
+      }; break;
+      case Constants.kINSERT_NO_CONTROL:
+        break;
+    }
+  }
+  else {
+    insertAfter = parent;
+    log(`  insert ${child?.id} after parent`);
+  }
+  if (insertBefore == child) {
+    // Return unsafe tab, to avoid placing the child after hidden tabs
+    // (too far from the place it should be.)
+    insertBefore = insertBefore?.$TST.unsafeNextTab;
+    log(`  => insert ${child?.id} before next tab ${insertBefore?.id} of the child tab itelf`);
+  }
+  if (insertAfter == child) {
+    insertAfter = insertAfter?.$TST.previousTab;
+    log(`  => insert ${child?.id} after previous tab ${insertAfter?.id} of the child tab itelf`);
+  }
+  // disallow to place tab in invalid position
+  if (insertBefore) {
+    if (parent && insertBefore.index <= parent.index) {
+      insertBefore = null;
+      log(`  => do not put ${child?.id} before a tab preceding to the parent`);
+    }
+    //TODO: we need to reject more cases...
+  }
+  if (insertAfter) {
+    const allTabsInTree = [...descendants];
+    if (parent)
+      allTabsInTree.unshift(parent);
+    const lastMember    = allTabsInTree[allTabsInTree.length - 1];
+    if (lastMember != insertAfter &&
+        insertAfter.index >= lastMember.index) {
+      insertAfter = lastMember;
+      log(`  => do not put ${child?.id} after the last tab ${insertAfter?.id} in the tree`);
+    }
+    //TODO: we need to reject more cases...
+  }
+  return { insertBefore, insertAfter };
+}
+
+export function getReferenceTabsForNewNextSibling(base, options = {}) {
+  log('getReferenceTabsForNewNextSibling ', base);
+  let insertBefore = base.$TST.nextSiblingTab;
+  if (insertBefore?.pinned &&
+      !options.pinned) {
+    insertBefore = Tab.getFirstNormalTab(base.windowId);
+  }
+  let insertAfter  = base.$TST.lastDescendant || base;
+  if (insertAfter &&
+      !insertAfter.pinned &&
+      options.pinned) {
+    insertAfter = Tab.getLastPinnedTab(base.windowId);
+  }
+  return { insertBefore, insertAfter };
+}
+
+export function detachTab(child, options = {}) {
+  log('detachTab: ', child.id, options,
+      { stack: `${configs.debug && new Error().stack}\n${options.stack || ''}` });
+  // the "parent" option is used for removing child.
+  const parent = TabsStore.ensureLivingItem(options.parent) || child.$TST.parent;
+
+  if (parent) {
+    // we need to set children and parent via setters, to invalidate cached information.
+    parent.$TST.children = parent.$TST.childIds.filter(id => id != child.id);
+    parent.$TST.invalidateCache();
+    log('detachTab: children information is updated ', parent.id, parent.$TST.childIds);
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_NOTIFY_CHILDREN_CHANGED,
+      windowId: parent.windowId,
+      tabId:    parent.id,
+      childIds: parent.$TST.childIds,
+      addedChildIds:   [],
+      removedChildIds: [child.id],
+      detached: true
+    });
+    if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TREE_DETACHED)) {
+      const cache = {};
+      TSTAPI.broadcastMessage({
+        type:      TSTAPI.kNOTIFY_TREE_DETACHED,
+        tab:       child,
+        oldParent: parent,
+      }, { tabProperties: ['tab', 'oldParent'], cache }).catch(_error => {});
+      TSTAPI.clearCache(cache);
+    }
+    // We don't need to clear its parent information, because the old parent's
+    // "children" setter removes the parent ifself from the detached child
+    // automatically.
+  }
+  else {
+    log(` => parent(${child.$TST.parentId}) is already removed, or orphan tab`);
+    // This can happen when the parent tab was detached via the native tab bar
+    // or Firefox's built-in command to detach tab from window.
+  }
+
+  if (!options.toBeRemoved && !options.toBeDetached)
+    updateTabsIndent(child);
+
+  if (child.openerTabId &&
+      !options.dontSyncParentToOpenerTab &&
+      configs.syncParentTabAndOpenerTab) {
+    log(`openerTabId of ${child.id} is cleared by TST!: ${child.openerTabId} (original)`, configs.debug && new Error().stack);
+    child.openerTabId = child.id;
+    browser.tabs.update(child.id, { openerTabId: child.id }) // set self id instead of null, because it requires any valid tab id...
+      .catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  }
+  child.$TST.invalidateCache();
+
+  onDetached.dispatch(child, {
+    oldParentTab: parent,
+    toBeRemoved:  !!options.toBeRemoved,
+    toBeDetached: !!options.toBeDetached
+  });
+}
+
+export function getWholeTree(rootTabs) {
+  if (!Array.isArray(rootTabs))
+    rootTabs = [rootTabs];
+  const wholeTree = [...rootTabs];
+  for (const rootTab of rootTabs) {
+    wholeTree.push(...rootTab.$TST.descendants);
+  }
+  return TreeItem.sort([...new Set(wholeTree)]);
+}
+
+export async function detachTabsFromTree(tabs, options = {}) {
+  if (!Array.isArray(tabs))
+    tabs = [tabs];
+  tabs = Array.from(tabs).reverse();
+  // you should specify this option if you already call "Tree.getWholeTree()" for the tabs.
+  const partial = 'partial' in options ?
+    options.partial :
+    getWholeTree(tabs).length != tabs.length;
+  const promisedAttach = [];
+  const tabsSet = new Set(tabs);
+  for (const tab of tabs) {
+    let behavior = partial ?
+      TreeBehavior.getParentTabOperationBehavior(tab, {
+        context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE,
+      }) :
+      Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+    if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+      behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+    promisedAttach.push(detachAllChildren(tab, {
+      ...options,
+      behavior,
+      ignoreTabs: tabs,
+    }));
+    if (options.fromParent &&
+        !tabsSet.has(tab.$TST.parent)) {
+      promisedAttach.push(detachTab(tab, options));
+    }
+  }
+  if (promisedAttach.length > 0)
+    await Promise.all(promisedAttach);
+}
+
+export async function detachAllChildren(
+  tab = null,
+  { windowId, children, descendants, parent, nearestFollowingRootTab, newParent, ignoreTabs, behavior, dontExpand, dontSyncParentToOpenerTab,
+    ...options } = {}
+) {
+  if (tab) {
+    windowId    = tab.$TST.windowId;
+    parent      = tab.$TST.parent;
+    children    = tab.$TST.children;
+    descendants = tab.$TST.descendants;
+  }
+  log('detachAllChildren: ',
+      tab?.id,
+      { children, parent, nearestFollowingRootTab, newParent, behavior, dontExpand, dontSyncParentToOpenerTab },
+      options);
+  // the "children" option is used for removing tab.
+  children = children ? children.map(TabsStore.ensureLivingItem) : tab.$TST.children;
+
+  const ignoreTabsSet = new Set(ignoreTabs || []);
+
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD &&
+      newParent &&
+      !children.includes(newParent))
+    children.unshift(newParent);
+
+  if (!children.length)
+    return;
+  log(' => children to be detached: ', () => children.map(dumpTab));
+
+  if (behavior === undefined)
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_SIMPLY_DETACH_ALL_CHILDREN;
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+
+  options.dontUpdateInsertionPositionInfo = true;
+
+  // the "parent" option is used for removing tab.
+  parent = TabsStore.ensureLivingItem(parent) || tab?.$TST.parent;
+  while (ignoreTabsSet.has(parent)) {
+    parent = parent.$TST.parent;
+  }
+  if (tab?.$TST.isGroupTab &&
+      Tab.getRemovingTabs(tab.windowId).length == children.length) {
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN;
+    options.dontUpdateIndent = false;
+  }
+
+  let previousTab = null;
+  let nextTab = null;
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN &&
+      !configs.moveTabsToBottomWhenDetachedFromClosedParent) {
+    nextTab = nearestFollowingRootTab !== undefined ?
+      nearestFollowingRootTab :
+      tab?.$TST.nearestFollowingRootTab;
+    previousTab = nextTab ?
+      nextTab.$TST.previousTab :
+      Tab.getLastTab(windowId || tab.windowId);
+    const descendantsSet = new Set(descendants || tab.$TST.descendants);
+    while (previousTab && (!tab || descendantsSet.has(previousTab))) {
+      previousTab = previousTab.$TST.previousTab;
+    }
+  }
+
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB) {
+    // open new group tab and replace the detaching tab with it.
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN;
+  }
+
+  if (!dontExpand &&
+      ((tab && !tab.$TST.collapsed) ||
+       (behavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE &&
+        behavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB))) {
+    if (tab) {
+      await collapseExpandSubtree(tab, {
+        ...options,
+        collapsed: false
+      });
+    }
+    else {
+      for (const child of children) {
+        await collapseExpandTabAndSubtree(child, {
+          ...options,
+          collapsed:   false,
+          forceExpand: behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN,
+        });
+      }
+    }
+  }
+
+  let count = 0;
+  for (const child of children) {
+    if (!child)
+      continue;
+    const promises = [];
+    if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN) {
+      promises.push(detachTab(child, { ...options, dontSyncParentToOpenerTab }));
+
+      // reference tabs can be closed while waiting...
+      if (nextTab?.$TST.removing)
+        nextTab = null;
+      if (previousTab?.$TST.removing)
+        previousTab = null;
+
+      if (nextTab) {
+        promises.push(moveTabSubtreeBefore(child, nextTab, options));
+      }
+      else {
+        promises.push(moveTabSubtreeAfter(child, previousTab, options));
+        previousTab = child.$TST.lastDescendant || child;
+      }
+    }
+    else if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD) {
+      promises.push(detachTab(child, { ...options, dontSyncParentToOpenerTab }));
+      if (count == 0) {
+        if (parent) {
+          promises.push(attachTabTo(child, parent, {
+            ...options,
+            dontSyncParentToOpenerTab,
+            dontExpand: true,
+            dontMove:   true
+          }));
+        }
+        promises.push(collapseExpandSubtree(child, {
+          ...options,
+          collapsed: false
+        }));
+        //deleteTabValue(child, Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+      }
+      else {
+        promises.push(attachTabTo(child, children[0], {
+          ...options,
+          dontSyncParentToOpenerTab,
+          dontExpand: true,
+          dontMove:   true
+        }));
+      }
+    }
+    else if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN &&
+             parent) {
+      promises.push(attachTabTo(child, parent, {
+        ...options,
+        dontSyncParentToOpenerTab,
+        dontExpand: true,
+        dontMove:   true
+      }));
+    }
+    else { // behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_SIMPLY_DETACH_ALL_CHILDREN
+      promises.push(detachTab(child, { ...options, dontSyncParentToOpenerTab }));
+    }
+    count++;
+    await Promise.all(promises);
+  }
+}
+
+// returns moved (or not)
+export async function behaveAutoAttachedTab(
+  tab,
+  { baseTab, behavior, broadcast, dontMove } = {}
+) {
+  if (!configs.autoAttach)
+    return false;
+
+  baseTab = baseTab || Tab.getActiveTab(TabsStore.getCurrentWindowId() || tab.windowId);
+  log('behaveAutoAttachedTab ', tab.id, baseTab.id, { baseTab, behavior });
+
+  if (baseTab?.$TST.ancestors.includes(tab)) {
+    log(' => ignore possibly restored ancestor tab to avoid cyclic references');
+    return false;
+  }
+
+  if (baseTab.pinned) {
+    if (!tab.pinned)
+      return false;
+    behavior = Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING;
+    log(' => override behavior for pinned tabs');
+  }
+  switch (behavior) {
+    default:
+      return false;
+
+    case Constants.kNEWTAB_OPEN_AS_ORPHAN:
+      log(' => kNEWTAB_OPEN_AS_ORPHAN');
+      detachTab(tab, {
+        broadcast
+      });
+      if (tab.$TST.nextTab)
+        return TabsMove.moveTabAfter(tab, Tab.getLastTab(tab.windowId), {
+          delayedMove: true
+        });
+      return false;
+
+    case Constants.kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB:
+      log(' => kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB');
+      const lastRelatedTab = baseTab.$TST.lastRelatedTab;
+      if (lastRelatedTab) {
+        log(` place after last related tab ${dumpTab(lastRelatedTab)}`);
+        await TabsMove.moveTabAfter(tab, lastRelatedTab.$TST.lastDescendant || lastRelatedTab, {
+          delayedMove: true,
+          broadcast:   true
+        });
+        return attachTabTo(tab, baseTab, {
+          insertAfter: lastRelatedTab,
+          lastRelatedTab,
+          forceExpand: true,
+          delayedMove: true,
+          broadcast
+        });
+      }
+      log(` no lastRelatedTab: fallback to kNEWTAB_OPEN_AS_CHILD`);
+    case Constants.kNEWTAB_OPEN_AS_CHILD:
+      log(' => kNEWTAB_OPEN_AS_CHILD');
+      return attachTabTo(tab, baseTab, {
+        dontMove:    dontMove || configs.insertNewChildAt == Constants.kINSERT_NO_CONTROL,
+        forceExpand: true,
+        delayedMove: true,
+        broadcast
+      });
+
+    case Constants.kNEWTAB_OPEN_AS_CHILD_TOP:
+      log(' => kNEWTAB_OPEN_AS_CHILD_TOP');
+      return attachTabTo(tab, baseTab, {
+        dontMove,
+        forceExpand: true,
+        delayedMove: true,
+        insertAt:    Constants.kINSERT_TOP,
+        broadcast
+      });
+
+    case Constants.kNEWTAB_OPEN_AS_CHILD_END:
+      log(' => kNEWTAB_OPEN_AS_CHILD_END');
+      return attachTabTo(tab, baseTab, {
+        dontMove,
+        forceExpand: true,
+        delayedMove: true,
+        insertAt:    Constants.kINSERT_END,
+        broadcast
+      });
+
+    case Constants.kNEWTAB_OPEN_AS_SIBLING: {
+      log(' => kNEWTAB_OPEN_AS_SIBLING');
+      const parent = baseTab.$TST.parent;
+      if (parent) {
+        await attachTabTo(tab, parent, {
+          delayedMove: true,
+          broadcast
+        });
+        return true;
+      }
+      else {
+        detachTab(tab, {
+          broadcast
+        });
+        return TabsMove.moveTabAfter(tab, Tab.getLastTab(tab.windowId), {
+          delayedMove: true
+        });
+      }
+    };
+
+    case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING:
+    case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER: {
+      log(' => kNEWTAB_OPEN_AS_NEXT_SIBLING(_WITH_INHERITED_CONTAINER)');
+      let nextSibling = baseTab.$TST.nextSiblingTab;
+      if (nextSibling == tab)
+        nextSibling = null;
+      const parent = baseTab.$TST.parent;
+      if (parent) {
+        return attachTabTo(tab, parent, {
+          insertBefore: nextSibling,
+          insertAfter:  baseTab.$TST.lastDescendant || baseTab,
+          delayedMove:  true,
+          broadcast
+        });
+      }
+      else {
+        detachTab(tab, {
+          broadcast
+        });
+        if (nextSibling)
+          return TabsMove.moveTabBefore(tab, nextSibling, {
+            delayedMove: true,
+            broadcast
+          });
+        else
+          return TabsMove.moveTabAfter(tab, baseTab.$TST.lastDescendant, {
+            delayedMove: true,
+            broadcast
+          });
+      }
+    };
+  }
+}
+
+export async function behaveAutoAttachedTabs(tabs, options = {}) {
+  switch (options.behavior) {
+    default:
+      return false;
+
+    case Constants.kNEWTAB_OPEN_AS_ORPHAN:
+      if (options.baseTabs && !options.baseTab)
+        options.baseTab = options.baseTabs[options.baseTabs.length - 1];
+      for (const tab of tabs) {
+        await behaveAutoAttachedTab(tab, options);
+      }
+      return false;
+
+    case Constants.kNEWTAB_OPEN_AS_CHILD:
+    case Constants.kNEWTAB_OPEN_AS_CHILD_TOP:
+    case Constants.kNEWTAB_OPEN_AS_CHILD_END: {
+      if (options.baseTabs && !options.baseTab)
+        options.baseTab = options.baseTabs[0];
+      let moved = false;
+      for (const tab of tabs) {
+        moved = (await behaveAutoAttachedTab(tab, options)) || moved;
+      }
+      return moved;
+    };
+
+    case Constants.kNEWTAB_OPEN_AS_SIBLING:
+    case Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING: {
+      if (options.baseTabs && !options.baseTab)
+        options.baseTab = options.baseTabs[options.baseTabs.length - 1];
+      let moved = false;
+      for (const tab of tabs.reverse()) {
+        moved = (await behaveAutoAttachedTab(tab, options)) || moved;
+      }
+      return moved;
+    };
+  }
+}
+
+function updateTabsIndent(tabs, level = undefined, options = {}) {
+  if (!tabs)
+    return;
+
+  if (!Array.isArray(tabs))
+    tabs = [tabs];
+
+  if (!tabs.length)
+    return;
+
+  if (level === undefined)
+    level = tabs[0].$TST.ancestors.length;
+
+  for (let i = 0, maxi = tabs.length; i < maxi; i++) {
+    const item = tabs[i];
+    if (!item || item.pinned)
+      continue;
+
+    updateTabIndent(item, level, options);
+  }
+}
+
+// this is called multiple times on a session restoration, so this should be throttled for better performance
+function updateTabIndent(tab, level = undefined, options = {}) {
+  let timer = updateTabIndent.delayed.get(tab.id);
+  if (timer)
+    clearTimeout(timer);
+  if (options.justNow || !shouldApplyAnimation()) {
+    return updateTabIndentNow(tab, level, options);
+  }
+  timer = setTimeout(() => {
+    updateTabIndent.delayed.delete(tab.id);
+    updateTabIndentNow(tab, level);
+  }, 100);
+  updateTabIndent.delayed.set(tab.id, timer);
+}
+updateTabIndent.delayed = new Map();
+
+function updateTabIndentNow(tab, level = undefined, options = {}) {
+  if (!TabsStore.ensureLivingItem(tab))
+    return;
+  tab.$TST.setAttribute(Constants.kLEVEL, level);
+  updateTabsIndent(tab.$TST.children, level + 1, options);
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_TAB_LEVEL_CHANGED,
+    windowId: tab.windowId,
+    tabId:    tab.id,
+    level
+  });
+}
+
+
+// collapse/expand tabs
+
+// returns an array of tab ids which are changed their visibility
+export async function collapseExpandSubtree(tab, params = {}) {
+  params.collapsed = !!params.collapsed;
+  if (!tab || !TabsStore.ensureLivingItem(tab))
+    return [];
+  if (!TabsStore.ensureLivingItem(tab)) // it was removed while waiting
+    return [];
+  params.stack = `${configs.debug && new Error().stack}\n${params.stack || ''}`;
+  logCollapseExpand('collapseExpandSubtree: ', dumpTab(tab), tab.$TST.subtreeCollapsed, params);
+  const visibilityChangedTabIds = await collapseExpandSubtreeInternal(tab, params);
+  onSubtreeCollapsedStateChanged.dispatch(tab, { collapsed: !!params.collapsed });
+  if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TREE_COLLAPSED_STATE_CHANGED)) {
+    TSTAPI.broadcastMessage({
+      type:      TSTAPI.kNOTIFY_TREE_COLLAPSED_STATE_CHANGED,
+      tab,
+      collapsed: !!params.collapsed
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+  }
+  return visibilityChangedTabIds;
+}
+async function collapseExpandSubtreeInternal(tab, params = {}) {
+  if (!params.force &&
+      tab.$TST.subtreeCollapsed == params.collapsed)
+    return [];
+
+  SidebarConnection.sendMessage({
+    type:      Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGING,
+    windowId:  tab.windowId,
+    tabId:     tab.id,
+    collapsed: !!params.collapsed,
+  });
+
+  if (params.collapsed) {
+    tab.$TST.addState(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+    tab.$TST.removeState(Constants.kTAB_STATE_SUBTREE_EXPANDED_MANUALLY);
+  }
+  else {
+    tab.$TST.removeState(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+  }
+  //setTabValue(tab, Constants.kTAB_STATE_SUBTREE_COLLAPSED, params.collapsed);
+
+  const isInViewport = await browser.runtime.sendMessage({
+    type:     Constants.kCOMMAND_ASK_TAB_IS_IN_VIEWPORT,
+    windowId: tab.windowId,
+    tabId:    tab.id,
+    allowPartial: true,
+  }).catch(_error => false);
+  const anchor = isInViewport ? tab : null;
+
+  const childTabs = tab.$TST.children;
+  const lastExpandedTabIndex = childTabs.length - 1;
+  const allVisibilityChangedTabIds = [];
+  for (let i = 0, maxi = childTabs.length; i < maxi; i++) {
+    const childTab = childTabs[i];
+    if (i == lastExpandedTabIndex &&
+        !params.collapsed) {
+      allVisibilityChangedTabIds.push(...(await collapseExpandTabAndSubtree(childTab, {
+        collapsed: params.collapsed,
+        justNow:   params.justNow,
+        anchor,
+        last:      true,
+        broadcast: false
+      })));
+    }
+    else {
+      allVisibilityChangedTabIds.push(...(await collapseExpandTabAndSubtree(childTab, {
+        collapsed: params.collapsed,
+        justNow:   params.justNow,
+        broadcast: false
+      })));
+    }
+  }
+  const visibilityChangedTabIds = [...new Set(allVisibilityChangedTabIds)];
+
+  onSubtreeCollapsedStateChanging.dispatch(tab, { collapsed: params.collapsed });
+  SidebarConnection.sendMessage({
+    type:      Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED,
+    windowId:  tab.windowId,
+    tabId:     tab.id,
+    collapsed: !!params.collapsed,
+    justNow:   params.justNow,
+    anchorId:  anchor?.id,
+    visibilityChangedTabIds,
+    last:      true
+  });
+
+  return visibilityChangedTabIds;
+}
+
+// returns an array of tab ids which are changed their visibility
+export function manualCollapseExpandSubtree(tab, params = {}) {
+  params.manualOperation = true;
+  const visibilityChangedTabIds = collapseExpandSubtree(tab, params);
+  if (!params.collapsed) {
+    tab.$TST.addState(Constants.kTAB_STATE_SUBTREE_EXPANDED_MANUALLY);
+    //setTabValue(tab, Constants.kTAB_STATE_SUBTREE_EXPANDED_MANUALLY, true);
+  }
+  return visibilityChangedTabIds;
+}
+
+// returns an array of tab ids which are changed their visibility
+export async function collapseExpandTabAndSubtree(tab, params = {}) {
+  log('collapseExpandTabAndSubtree ', tab, params);
+  const visibilityChangedTabIds = [];
+
+  if (!tab) {
+    log('  no target');
+    return visibilityChangedTabIds;
+  }
+
+  // allow to expand root collapsed tab
+  if (!tab.$TST.collapsed &&
+      !tab.$TST.parent) {
+    log('  no parent');
+    return visibilityChangedTabIds;
+  }
+
+  if (collapseExpandTab(tab, params))
+    visibilityChangedTabIds.push(tab.id);
+
+  if (params.collapsed &&
+      tab.active &&
+      configs.unfocusableCollapsedTab) {
+    logCollapseExpand('current tree is going to be collapsed');
+    const allowed = await TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TRY_MOVE_FOCUS_FROM_COLLAPSING_TREE,
+      { tab },
+      { tabProperties: ['tab'] }
+    );
+    if (allowed) {
+      let newSelection = tab.$TST.nearestVisibleAncestorOrSelf;
+      if (configs.avoidDiscardedTabToBeActivatedIfPossible && newSelection.discarded)
+        newSelection = newSelection.$TST.nearestLoadedTabInTree ||
+                         newSelection.$TST.nearestLoadedTab ||
+                         newSelection;
+      logCollapseExpand('=> switch to ', newSelection.id);
+      TabsInternalOperation.activateTab(newSelection, { silently: true });
+    }
+  }
+
+  if (!tab.$TST.subtreeCollapsed) {
+    const children = tab.$TST.children;
+    const allVisibilityChangedTabs = await Promise.all(children.map((child, index) => {
+      const last = params.last &&
+                     (index == children.length - 1);
+      return collapseExpandTabAndSubtree(child, {
+        ...params,
+        collapsed: params.collapsed,
+        justNow:   params.justNow,
+        anchor:    last && params.anchor,
+        last:      last,
+        broadcast: params.broadcast
+      });
+    }));
+    visibilityChangedTabIds.push(...allVisibilityChangedTabs.flat());
+  }
+
+  return [...new Set(visibilityChangedTabIds)];
+}
+
+// returns true if the tab's visibility is changed
+export async function collapseExpandTab(tab, params = {}) {
+  if (tab.pinned && params.collapsed) {
+    log('CAUTION: a pinned tab is going to be collapsed, but canceled.',
+        dumpTab(tab), { stack: configs.debug && new Error().stack });
+    params.collapsed = false;
+  }
+
+  // When an asynchronous "expand" operation is processed after a
+  // synchronous "collapse" operation, it can produce an expanded
+  // child tab under "subtree-collapsed" parent. So this is a failsafe.
+  if (!params.forceExpand &&
+      !params.collapsed &&
+      tab.$TST.ancestors.some(ancestor => ancestor.$TST.subtreeCollapsed)) {
+    log('collapseExpandTab: canceled to avoid expansion under collapsed tree ',
+        tab.$TST.ancestors.find(ancestor => ancestor.$TST.subtreeCollapsed));
+    return false;
+  }
+
+  const visibilityChanged = tab.$TST.collapsed != params.collapsed;
+
+  const stack = `${configs.debug && new Error().stack}\n${params.stack || ''}`;
+  logCollapseExpand(`collapseExpandTab ${tab.id} `, params, { stack })
+  const last = params.last &&
+                 (!tab.$TST.hasChild || tab.$TST.subtreeCollapsed);
+  const byAncestor = tab.$TST.ancestors.some(ancestor => ancestor.$TST.subtreeCollapsed) == params.collapsed;
+  const collapseExpandInfo = {
+    ...params,
+    anchor: last && params.anchor,
+    last
+  };
+
+  if (params.collapsed) {
+    tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED);
+    TabsStore.removeVisibleTab(tab);
+    TabsStore.removeExpandedTab(tab);
+  }
+  else {
+    tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED);
+    TabsStore.addVisibleTab(tab);
+    TabsStore.addExpandedTab(tab);
+  }
+
+  Tab.onCollapsedStateChanged.dispatch(tab, collapseExpandInfo);
+
+  // the message is called multiple times on a session restoration, so it should be throttled for better performance
+  let timer = collapseExpandTab.delayedNotify.get(tab.id);
+  if (timer)
+    clearTimeout(timer);
+  timer = setTimeout(() => {
+    collapseExpandTab.delayedNotify.delete(tab.id);
+    if (!TabsStore.ensureLivingItem(tab))
+      return;
+    SidebarConnection.sendMessage({
+      type:      Constants.kCOMMAND_NOTIFY_TAB_COLLAPSED_STATE_CHANGED,
+      windowId:  tab.windowId,
+      tabId:     tab.id,
+      anchorId:  collapseExpandInfo.anchor?.id,
+      justNow:   params.justNow,
+      collapsed: params.collapsed,
+      last,
+      stack,
+      byAncestor
+    });
+  }, shouldApplyAnimation() ? 100 : 0);
+  collapseExpandTab.delayedNotify.set(tab.id, timer);
+
+  return visibilityChanged;
+}
+collapseExpandTab.delayedNotify = new Map();
+
+export async function collapseExpandTreesIntelligentlyFor(tab, options = {}) {
+  if (!tab)
+    return;
+
+  logCollapseExpand('collapseExpandTreesIntelligentlyFor ', tab);
+  const win = TabsStore.windows.get(tab.windowId);
+  if (win.doingIntelligentlyCollapseExpandCount > 0) {
+    logCollapseExpand('=> done by others');
+    return;
+  }
+  win.doingIntelligentlyCollapseExpandCount++;
+
+  try {
+    const expandedAncestors = [tab.id]
+      .concat(tab.$TST.ancestors.map(ancestor => ancestor.id))
+      .concat(tab.$TST.descendants.map(descendant => descendant.id));
+    const collapseTabs = Tab.getSubtreeCollapsedTabs(tab.windowId, {
+      '!id': expandedAncestors
+    });
+    logCollapseExpand(`${collapseTabs.length} tabs can be collapsed, ancestors: `, expandedAncestors);
+    const allowedToCollapse = new Set();
+    await Promise.all(collapseTabs.map(async tab => {
+      const allowed = await TSTAPI.tryOperationAllowed(
+        TSTAPI.kNOTIFY_TRY_COLLAPSE_TREE_FROM_OTHER_EXPANSION,
+        { tab },
+        { tabProperties: ['tab'] }
+      );
+      if (allowed)
+        allowedToCollapse.add(tab);
+    }));
+    for (const collapseTab of collapseTabs) {
+      if (!allowedToCollapse.has(collapseTab))
+        continue;
+      let dontCollapse = false;
+      const parentTab = collapseTab.$TST.parent;
+      if (parentTab) {
+        dontCollapse = true;
+        if (!parentTab.$TST.subtreeCollapsed) {
+          for (const ancestor of collapseTab.$TST.ancestors) {
+            if (!expandedAncestors.includes(ancestor.id))
+              continue;
+            dontCollapse = false;
+            break;
+          }
+        }
+      }
+      logCollapseExpand(`${collapseTab.id}: dontCollapse = ${dontCollapse}`);
+
+      const manuallyExpanded = collapseTab.$TST.states.has(Constants.kTAB_STATE_SUBTREE_EXPANDED_MANUALLY);
+      if (!dontCollapse &&
+          !manuallyExpanded &&
+          collapseTab.$TST.descendants.every(tab => !tab.$TST.canBecomeSticky))
+        collapseExpandSubtree(collapseTab, {
+          ...options,
+          collapsed: true
+        });
+    }
+
+    collapseExpandSubtree(tab, {
+      ...options,
+      collapsed: false
+    });
+  }
+  catch(error) {
+    log(`failed to collapse/expand tree under ${tab.id}: ${String(error)}`, error);
+  }
+  win.doingIntelligentlyCollapseExpandCount--;
+}
+
+export async function fixupSubtreeCollapsedState(tab, options = {}) {
+  let fixed = false;
+  if (!tab.$TST.hasChild)
+    return fixed;
+  const firstChild = tab.$TST.firstChild;
+  const childrenCollapsed = firstChild.$TST.collapsed;
+  const collapsedStateMismatched = tab.$TST.subtreeCollapsed != childrenCollapsed;
+  const nextIsFirstChild = tab.$TST.nextTab == firstChild;
+  log('fixupSubtreeCollapsedState ', {
+    tab: tab.id,
+    childrenCollapsed,
+    collapsedStateMismatched,
+    nextIsFirstChild
+  });
+  if (collapsedStateMismatched) {
+    log(' => set collapsed state');
+    await collapseExpandSubtree(tab, {
+      ...options,
+      collapsed: childrenCollapsed
+    });
+    fixed = true;
+  }
+  if (!nextIsFirstChild) {
+    log(' => move child tabs');
+    await followDescendantsToMovedRoot(tab, options);
+    fixed = true;
+  }
+  return fixed;
+}
+
+
+// operate tabs based on tree information
+
+export async function moveTabSubtreeBefore(tab, nextTab, options = {}) {
+  if (!tab)
+    return;
+  if (nextTab?.$TST.isAllPlacedBeforeSelf([tab].concat(tab.$TST.descendants))) {
+    log('moveTabSubtreeBefore:no need to move');
+    return;
+  }
+
+  log('moveTabSubtreeBefore: ', tab.id, nextTab?.id);
+  const win = TabsStore.windows.get(tab.windowId);
+  win.subTreeMovingCount++;
+  try {
+    await TabsMove.moveTabInternallyBefore(tab, nextTab, options);
+    if (!TabsStore.ensureLivingItem(tab)) // it is removed while waiting
+      throw new Error('the tab was removed before moving of descendants');
+    await followDescendantsToMovedRoot(tab, options);
+  }
+  catch(error) {
+    log(`failed to move subtree: ${String(error)}`, error);
+  }
+  await wait(0);
+  win.subTreeMovingCount--;
+}
+
+export async function moveTabSubtreeAfter(tab, previousTab, options = {}) {
+  if (!tab)
+    return;
+
+  log('moveTabSubtreeAfter: ', tab.id, previousTab?.id);
+  if (previousTab?.$TST.isAllPlacedAfterSelf([tab].concat(tab.$TST.descendants))) {
+    log(' => no need to move');
+    return;
+  }
+
+  const win = TabsStore.windows.get(tab.windowId);
+  win.subTreeMovingCount++;
+  try {
+    await TabsMove.moveTabInternallyAfter(tab, previousTab, options);
+    if (!TabsStore.ensureLivingItem(tab)) // it is removed while waiting
+      throw new Error('the tab was removed before moving of descendants');
+    await followDescendantsToMovedRoot(tab, options);
+  }
+  catch(error) {
+    log(`failed to move subtree: ${String(error)}`, error);
+  }
+  await wait(0);
+  win.subTreeMovingCount--;
+}
+
+async function followDescendantsToMovedRoot(tab, options = {}) {
+  if (!tab.$TST.hasChild)
+    return;
+
+  log('followDescendantsToMovedRoot: ', tab);
+  const win = TabsStore.windows.get(tab.windowId);
+  win.subTreeChildrenMovingCount++;
+  win.subTreeMovingCount++;
+  try {
+    await TabsMove.moveTabsAfter(tab.$TST.descendants, tab, options);
+  }
+  catch(error) {
+    log(`failed to move descendants of ${tab.id}: ${String(error)}`, error);
+  }
+  win.subTreeChildrenMovingCount--;
+  win.subTreeMovingCount--;
+}
+
+// before https://bugzilla.mozilla.org/show_bug.cgi?id=1394376 is fixed (Firefox 67 or older)
+let mSlowDuplication = false;
+browser.runtime.getBrowserInfo().then(browserInfo => {
+  if (parseInt(browserInfo.version.split('.')[0]) < 68)
+    mSlowDuplication = true;
+});
+
+export async function moveTabs(tabs, { duplicate, ...options } = {}) {
+  tabs = tabs.filter(TabsStore.ensureLivingItem);
+  if (tabs.length == 0)
+    return [];
+
+  log('moveTabs: ', () => ({ tabs: tabs.map(dumpTab), duplicate, options }));
+
+  const windowId = parseInt(tabs[0].windowId || TabsStore.getCurrentWindowId());
+
+  let newWindow = options.destinationPromisedNewWindow;
+
+  let destinationWindowId = options.destinationWindowId;
+  if (!destinationWindowId && !newWindow) {
+    destinationWindowId = TabsStore.getCurrentWindowId() || windowId;
+  }
+
+  const isAcrossWindows = windowId != destinationWindowId || !!newWindow;
+  log('moveTabs: isAcrossWindows = ', isAcrossWindows, `${windowId} => ${destinationWindowId}`);
+
+  options.insertAfter = options.insertAfter || Tab.getLastTab(destinationWindowId);
+
+  let movedTabs = tabs;
+  const structure = TreeBehavior.getTreeStructureFromTabs(tabs);
+  log('original tree structure: ', structure);
+
+  let hasActive = false;
+  for (const tab of movedTabs) {
+    if (tab.active)
+      hasActive = true;
+    if (isAcrossWindows &&
+        !duplicate)
+      tab.$TST.temporaryMetadata.set('movingAcrossWindows', true);
+  }
+
+  if (!duplicate)
+    await detachTabsFromTree(tabs, options);
+
+  if (isAcrossWindows || duplicate) {
+    if (mSlowDuplication)
+      UserOperationBlocker.blockIn(windowId, { throbber: true });
+    try {
+      let win;
+      const prepareWindow = () => {
+        win = Window.init(destinationWindowId);
+        if (isAcrossWindows) {
+          win.toBeOpenedTabsWithPositions += tabs.length;
+          win.toBeOpenedOrphanTabs += tabs.length;
+          for (const tab of tabs) {
+            win.toBeAttachedTabs.add(tab.id);
+          }
+        }
+      };
+      if (newWindow) {
+        newWindow = newWindow.then(win => {
+          log('moveTabs: destination window is ready, ', win);
+          destinationWindowId = win.id;
+          prepareWindow();
+          return win;
+        });
+      }
+      else {
+        prepareWindow();
+      }
+
+      let movedTabIds = tabs.map(tab => tab.id);
+      await Promise.all([
+        newWindow,
+        (async () => {
+          const sourceWindow = TabsStore.windows.get(tabs[0].windowId);
+          if (duplicate) {
+            sourceWindow.toBeOpenedTabsWithPositions += tabs.length;
+            sourceWindow.toBeOpenedOrphanTabs += tabs.length;
+            sourceWindow.duplicatingTabsCount += tabs.length;
+          }
+          if (isAcrossWindows) {
+            for (const tab of tabs) {
+              sourceWindow.toBeDetachedTabs.add(tab.id);
+            }
+          }
+
+          log('preparing tabs');
+          if (duplicate) {
+            const startTime = Date.now();
+            // This promise will be resolved with very large delay.
+            // (See also https://bugzilla.mozilla.org/show_bug.cgi?id=1394376 )
+            const promisedDuplicatedTabs = Promise.all(movedTabIds.map(async (id, _index) => {
+              try {
+                return await browser.tabs.duplicate(id).catch(ApiTabs.createErrorHandler());
+              }
+              catch(e) {
+                ApiTabs.handleMissingTabError(e);
+                return null;
+              }
+            })).then(tabs => {
+              log(`ids from API responses are resolved in ${Date.now() - startTime}msec: `, () => tabs.map(dumpTab));
+              return tabs;
+            });
+            movedTabs = await promisedDuplicatedTabs;
+            if (mSlowDuplication)
+              UserOperationBlocker.setProgress(50, windowId);
+            movedTabs = movedTabs.map(tab => Tab.get(tab.id));
+            movedTabIds = movedTabs.map(tab => tab.id);
+          }
+          else {
+            const movedTabIdsSet = new Set(movedTabIds);
+            for (const tab of movedTabs) {
+              tab.$TST.temporaryMetadata.set('movingAcrossWindows', true);
+              if (tab.$TST.parentId &&
+                  !movedTabIdsSet.has(tab.$TST.parentId))
+                detachTab(tab, {
+                  broadcast:    true,
+                  toBeDetached: true
+                });
+            }
+          }
+        })()
+      ]);
+      log('moveTabs: all windows and tabs are ready, ', movedTabIds, destinationWindowId);
+      let toIndex = (tabs.some(tab => tab.pinned) ? Tab.getPinnedTabs(destinationWindowId) : Tab.getAllTabs(destinationWindowId)).length;
+      log('toIndex = ', toIndex);
+      if (options.insertBefore?.windowId == destinationWindowId) {
+        try {
+          toIndex = Tab.get(options.insertBefore.id).index;
+        }
+        catch(e) {
+          ApiTabs.handleMissingTabError(e);
+          log('options.insertBefore is unavailable');
+        }
+      }
+      else if (options.insertAfter?.windowId == destinationWindowId) {
+        try {
+          toIndex = Tab.get(options.insertAfter.id).index + 1;
+        }
+        catch(e) {
+          ApiTabs.handleMissingTabError(e);
+          log('options.insertAfter is unavailable');
+        }
+      }
+      if (!isAcrossWindows &&
+          movedTabs[0].index < toIndex)
+        toIndex--;
+      log(' => ', toIndex);
+      if (isAcrossWindows) {
+        let temporaryFocusHolderTab = null;
+        if (hasActive) {
+          // Blur to-be-moved tab, otherwise tabs.move() will activate them for each
+          // while the moving process and all dicarded tabs are unexpectedly restored.
+          const nextActiveTab = await TabsInternalOperation.blurTab(movedTabs, {
+            silently: true,
+          });
+          if (!nextActiveTab) {
+            // There is no focusible left tab, so we move focus to a tmeporary tab.
+            // It will be removed automatically after tabs are moved.
+            temporaryFocusHolderTab = await browser.tabs.create({
+              url:    'about:blank',
+              active: true,
+              windowId
+            });
+          }
+        }
+        movedTabs = await browser.tabs.move(movedTabIds, {
+          windowId: destinationWindowId,
+          index:    toIndex
+        });
+        if (temporaryFocusHolderTab) {
+          const leftTabsInSourceWindow = await browser.tabs.query({ windowId });
+          if (leftTabsInSourceWindow.length == 1)
+            browser.windows.remove(windowId);
+          else
+            browser.tabs.remove(temporaryFocusHolderTab.id);
+        }
+        movedTabs   = movedTabs.map(tab => Tab.get(tab.id));
+        movedTabIds = movedTabs.map(tab => tab.id);
+        for (const tab of movedTabs) {
+          tab.$TST.temporaryMetadata.delete('movingAcrossWindows');
+          tab.windowId = destinationWindowId;
+        }
+        log('moved across windows: ', movedTabIds);
+      }
+
+      log('applying tree structure', structure);
+      // wait until tabs.onCreated are processed (for safety)
+      let newTabs;
+      const startTime = Date.now();
+      const maxDelay = configs.maximumAcceptableDelayForTabDuplication;
+      while (Date.now() - startTime < maxDelay) {
+        newTabs = mapAndFilter(movedTabs,
+                               tab => Tab.get(tab.id) || undefined);
+        if (mSlowDuplication)
+          UserOperationBlocker.setProgress(Math.round(newTabs.length / tabs.length * 50) + 50, windowId);
+        if (newTabs.length < tabs.length) {
+          log('retrying: ', movedTabIds, newTabs.length, tabs.length);
+          await wait(100);
+          continue;
+        }
+        await Promise.all(newTabs.map(tab => tab.$TST.opened));
+        await applyTreeStructureToTabs(newTabs, structure, {
+          broadcast: true
+        });
+        if (duplicate) {
+          for (const tab of newTabs) {
+            tab.$TST.removeState(Constants.kTAB_STATE_DUPLICATING, { broadcast: true });
+            TabsStore.removeDuplicatingTab(tab);
+          }
+        }
+        break;
+      }
+
+      if (!newTabs) {
+        log('failed to move tabs (timeout)');
+        newTabs = [];
+      }
+      movedTabs = newTabs;
+    }
+    catch(e) {
+      if (configs.debug)
+        console.log('failed to move/duplicate tabs ', e, new Error().stack);
+      throw e;
+    }
+    finally {
+      if (mSlowDuplication)
+        UserOperationBlocker.unblockIn(windowId, { throbber: true });
+    }
+  }
+
+
+  movedTabs = mapAndFilter(movedTabs, tab => Tab.get(tab.id) || undefined);
+  if (options.insertBefore) {
+    await TabsMove.moveTabsBefore(
+      movedTabs,
+      options.insertBefore,
+      options
+    );
+  }
+  else if (options.insertAfter) {
+    await TabsMove.moveTabsAfter(
+      movedTabs,
+      options.insertAfter,
+      options
+    );
+  }
+  else {
+    log('no move: just duplicate or import');
+  }
+  // Tabs can be removed while waiting, so we need to
+  // refresh the array of tabs.
+  movedTabs = mapAndFilter(movedTabs, tab => Tab.get(tab.id) || undefined);
+
+  if (isAcrossWindows) {
+    for (const tab of movedTabs) {
+      if (tab.$TST.parent ||
+          parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || 0) == 0)
+        continue;
+      updateTabIndent(tab, 0);
+    }
+  }
+
+  return movedTabs;
+}
+
+export async function openNewWindowFromTabs(tabs, options = {}) {
+  if (tabs.length == 0)
+    return [];
+
+  log('openNewWindowFromTabs: ', tabs, options);
+  const sourceWindow = await browser.windows.get(tabs[0].windowId);
+  const sourceParams = getWindowParamsFromSource(sourceWindow, options);
+  const windowParams = {
+    //active: true,  // not supported in Firefox...
+    url:       'about:blank',
+    ...sourceParams,
+  };
+  // positions are not provided for a maximized or fullscren window!
+  if (typeof sourceParams.left == 'number')
+    sourceParams.left += 20;
+  if (typeof sourceParams.top == 'number')
+    sourceParams.top += 20;
+  let newWindow;
+  const promsiedNewWindow = browser.windows.create(windowParams)
+    .then(createdWindow => {
+      newWindow = createdWindow;
+      log('openNewWindowFromTabs: new window is ready, ', newWindow, windowParams);
+      UserOperationBlocker.blockIn(newWindow.id);
+      return newWindow;
+    })
+    .catch(ApiTabs.createErrorHandler());
+  tabs = tabs.filter(TabsStore.ensureLivingItem);
+  const movedTabs = await moveTabs(tabs, {
+    ...options,
+    destinationPromisedNewWindow: promsiedNewWindow
+  });
+
+  log('closing needless tabs');
+  browser.windows.get(newWindow.id, { populate: true })
+    .then(win => {
+      const movedTabIds = new Set(movedTabs.map(tab => tab.id));
+      log('moved tabs: ', movedTabIds);
+      const removeTabs = mapAndFilter(win.tabs, tab =>
+        !movedTabIds.has(tab.id) && Tab.get(tab.id) || undefined
+      );
+      log('removing tabs: ', removeTabs);
+      TabsInternalOperation.removeTabs(removeTabs);
+      UserOperationBlocker.unblockIn(newWindow.id);
+    })
+    .catch(ApiTabs.createErrorSuppressor());
+
+  return movedTabs;
+}
+
+
+/* "treeStructure" is an array of integers, meaning:
+  [A]     => TreeBehavior.STRUCTURE_NO_PARENT (parent is not in this tree)
+    [B]   => 0 (parent is 1st item in this tree)
+    [C]   => 0 (parent is 1st item in this tree)
+      [D] => 2 (parent is 2nd in this tree)
+  [E]     => TreeBehavior.STRUCTURE_NO_PARENT (parent is not in this tree, and this creates another tree)
+    [F]   => 0 (parent is 1st item in this another tree)
+  See also getTreeStructureFromTabs() in tree-behavior.js
+*/
+export async function applyTreeStructureToTabs(tabs, treeStructure, options = {}) {
+  if (!tabs || !treeStructure)
+    return;
+
+  MetricsData.add('applyTreeStructureToTabs: start');
+
+  log('applyTreeStructureToTabs: ', () => ({ tabs: tabs.map(dumpTab), treeStructure, options }));
+  tabs = tabs.slice(0, treeStructure.length);
+  treeStructure = treeStructure.slice(0, tabs.length);
+
+  let expandStates = tabs.map(tab => !!tab);
+  expandStates = expandStates.slice(0, tabs.length);
+  while (expandStates.length < tabs.length)
+    expandStates.push(TreeBehavior.STRUCTURE_NO_PARENT);
+
+  MetricsData.add('applyTreeStructureToTabs: preparation');
+
+  let parent = null;
+  let tabsInTree = [];
+  const promises   = [];
+  for (let i = 0, maxi = tabs.length; i < maxi; i++) {
+    const tab = tabs[i];
+    /*
+    if (tab.$TST.collapsed)
+      collapseExpandTabAndSubtree(tab, {
+        ...options,
+        collapsed: false,
+        justNow: true
+      });
+    */
+    const structureInfo = treeStructure[i];
+    let parentIndexInTree = TreeBehavior.STRUCTURE_NO_PARENT;
+    if (typeof structureInfo == 'number') { // legacy format
+      parentIndexInTree = structureInfo;
+    }
+    else {
+      parentIndexInTree = structureInfo.parent;
+      expandStates[i]   = !structureInfo.collapsed;
+    }
+    log(`  applyTreeStructureToTabs: parent for ${tab.id} => ${parentIndexInTree}`);
+    if (parentIndexInTree == TreeBehavior.STRUCTURE_NO_PARENT ||
+        parentIndexInTree == TreeBehavior.STRUCTURE_KEEP_PARENT) {
+      // there is no parent, so this is a new parent!
+      parent = null;
+      tabsInTree = [tab];
+    }
+    else {
+      tabsInTree.push(tab);
+      parent = parentIndexInTree < tabsInTree.length ? tabsInTree[parentIndexInTree] : null;
+    }
+    log('   => parent = ', parent);
+    if (parentIndexInTree != TreeBehavior.STRUCTURE_KEEP_PARENT)
+      detachTab(tab, { justNow: true });
+    if (parent && tab != parent) {
+      parent.$TST.removeState(Constants.kTAB_STATE_SUBTREE_COLLAPSED); // prevent focus changing by "current tab attached to collapsed tree"
+      promises.push(attachTabTo(tab, parent, {
+        ...options,
+        dontExpand: true,
+        dontMove:   true,
+        justNow:    true
+      }));
+    }
+  }
+  if (promises.length > 0)
+    await Promise.all(promises);
+  MetricsData.add('applyTreeStructureToTabs: attach/detach');
+
+  log('expandStates: ', expandStates);
+  for (let i = tabs.length - 1; i > -1; i--) {
+    const tab = tabs[i];
+    const expanded = expandStates[i];
+    collapseExpandSubtree(tab, {
+      ...options,
+      collapsed: expanded === undefined ? !tab.$TST.hasChild : !expanded ,
+      justNow:   true,
+      force:     true
+    });
+  }
+  MetricsData.add('applyTreeStructureToTabs: collapse/expand');
+}
+
+
+
+//===================================================================
+// Fixup tree structure for unexpectedly inserted tabs
+//===================================================================
+
+class TabActionForNewPosition {
+  constructor(action, { tab, parent, insertBefore, insertAfter, isTabCreating, isMovingByShortcut, mustToApply } = {}) {
+    this.action        = action || null;
+    this.tab           = tab;
+    this.parent        = parent;
+    this.insertBefore  = insertBefore;
+    this.insertAfter   = insertAfter;
+    this.isTabCreating = isTabCreating;
+    this.isMovingByShortcut = isMovingByShortcut;
+    this.mustToApply   = mustToApply;
+  }
+
+  async applyIfNeeded() {
+    if (!this.mustToApply)
+      return;
+    return this.apply();
+  }
+
+  async apply() {
+    log('TabActionForNewPosition: applying ', this);
+    switch (this.action) {
+      case 'invalid':
+        throw new Error('invalid action: this must not happen!');
+
+      case 'attach': {
+        const attached = attachTabTo(this.tab, Tab.get(this.parent), {
+          insertBefore: Tab.get(this.insertBefore),
+          insertAfter:  Tab.get(this.insertAfter),
+          forceExpand:  this.isTabCreating || this.isMovingByShortcut,
+          broadcast:    true,
+          synchronously: this.isTabCreating,
+        });
+        if (!this.isTabCreating)
+          await attached;
+        followDescendantsToMovedRoot(this.tab);
+      }; break;
+
+      case 'detach':
+        detachTab(this.tab, { broadcast: true });
+        followDescendantsToMovedRoot(this.tab);
+        if (!this.insertBefore && !this.insertAfter)
+          break;
+
+      case 'move':
+        if (this.insertBefore) {
+          moveTabSubtreeBefore(
+            this.tab,
+            Tab.get(this.insertBefore),
+            { broadcast: true }
+          );
+          return;
+        }
+        else if (this.insertAfter) {
+          moveTabSubtreeAfter(
+            this.tab,
+            Tab.get(this.insertAfter),
+            { broadcast: true }
+          );
+          return;
+        }
+
+      default:
+        followDescendantsToMovedRoot(this.tab);
+        break;
+    }
+  }
+}
+
+export function detectTabActionFromNewPosition(tab, moveInfo = {}) {
+  const isTabCreating = !!moveInfo?.isTabCreating;
+  const isMovingByShortcut = !!moveInfo?.isMovingByShortcut;
+
+  if (tab.pinned)
+    return new TabActionForNewPosition(tab.$TST.parentId ? 'detach' : 'move', {
+      tab,
+      isTabCreating,
+      isMovingByShortcut,
+    });
+
+  log('detectTabActionFromNewPosition: ', dumpTab(tab), moveInfo);
+  const tree   = moveInfo.treeForActionDetection || snapshotForActionDetection(tab);
+  const target = tree.target;
+  log('  calculate new position: ', tab, tree);
+
+  const toIndex   = moveInfo.toIndex;
+  const fromIndex = moveInfo.fromIndex;
+  if (toIndex == fromIndex) { // no move?
+    log('=> no move');
+    return new TabActionForNewPosition();
+  }
+
+  const prevTab = tree.tabsById[target.previous];
+  const nextTab = tree.tabsById[target.next];
+
+  // When multiple tabs are moved at once by outside of TST (e.g. moving of multiselected tabs)
+  // this method may be called multiple times asynchronously before previous operation finishes.
+  // Thus we need to refer the calculated "parent" if it is given.
+  const futurePrevParent = Tab.get(Tab.get(prevTab?.id)?.$TST?.temporaryMetadata.get('goingToBeAttachedTo'));
+  const futureNextParent = Tab.get(Tab.get(nextTab?.id)?.$TST?.temporaryMetadata.get('goingToBeAttachedTo'));
+
+  const prevParent = prevTab && tree.tabsById[prevTab.parent] ||
+    snapshotTab(Tab.get(prevTab?.parent)) || // Given treeForActionDetection may not contain the parent tab, so failsafe
+    snapshotTab(futurePrevParent);
+  const nextParent = nextTab && tree.tabsById[nextTab.parent] ||
+    snapshotTab(Tab.get(nextTab?.parent)) || // Given treeForActionDetection may not contain the parent tab, so failsafe
+    snapshotTab(futureNextParent);
+  if (prevParent)
+    tree.tabsById[prevParent.id] = prevParent;
+  if (nextParent)
+    tree.tabsById[nextParent.id] = nextParent;
+
+  // Given treeForActionDetection may not contain the parent tab, so we fixup the information.
+  if (prevTab &&
+      !prevTab.parent &&
+      prevParent) {
+    prevTab.parent = prevParent.id;
+    prevTab.level  = prevParent.level + 1;
+  }
+  if (nextTab &&
+      !nextTab.parent &&
+      nextParent) {
+    nextTab.parent = nextParent.id;
+    nextTab.level  = nextParent.level + 1;
+  }
+  log('prevTab: ', dumpTab(prevTab), `parent: ${prevTab?.parent}`);
+  log('nextTab: ', dumpTab(nextTab), `parent: ${nextTab?.parent}`);
+
+  const prevLevel  = prevTab ? prevTab.level : -1 ;
+  const nextLevel  = nextTab ? nextTab.level : -1 ;
+  log('prevLevel: '+prevLevel);
+  log('nextLevel: '+nextLevel);
+
+  const oldParent = tree.tabsById[target.parent] || snapshotTab(Tab.get(target.parent));
+  if (oldParent)
+    tree.tabsById[oldParent.id] = oldParent;
+  let newParent = null;
+  let mustToApply = false;
+
+  if (!oldParent &&
+      (!nextTab ||
+       !nextParent)) {
+    if (!nextTab)
+      log('=> A root level tab, placed at the end of tabs. We should keep it in the root level.');
+    else
+      log(' => A root level tab, placed before another root level tab. We should keep it in the root level.');
+    return new TabActionForNewPosition('move', {
+      tab,
+      isTabCreating,
+      isMovingByShortcut,
+      insertAfter: prevTab?.id,
+      mustToApply,
+    });
+  }
+
+  if (target.mayBeReplacedWithContainer) {
+    log('=> replaced by Firefox Multi-Acount Containers or Temporary Containers');
+    newParent = prevLevel < nextLevel ? prevTab : prevParent;
+    mustToApply = true;
+  }
+  else if (oldParent &&
+           prevTab &&
+           oldParent?.id == prevTab?.id) {
+    log('=> no need to fix case');
+    newParent = oldParent;
+  }
+  else if (!prevTab) {
+    log('=> moved to topmost position');
+    newParent = null;
+    mustToApply = !!oldParent;
+  }
+  else if (!nextTab) {
+    log('=> moved to last position');
+    let ancestor = oldParent;
+    while (ancestor) {
+      if (ancestor.id == prevParent?.id) {
+        log(' => moving in related tree: keep it attached in existing tree');
+        newParent = prevParent;
+        break;
+      }
+      ancestor = tree.tabsById[ancestor.parent];
+    }
+    if (!newParent) {
+      log(' => moving from other tree: keep it orphaned');
+    }
+    mustToApply = !!oldParent && newParent?.id != oldParent.id;
+  }
+  else if (prevParent?.id == nextParent?.id) {
+    log('=> moved into existing tree');
+    newParent = prevParent;
+    mustToApply = !oldParent || newParent?.id != oldParent.id;
+  }
+  else if (prevLevel > nextLevel  &&
+           nextTab?.parent != tab.id) {
+    log('=> moved to end of existing tree');
+    if (!target.active &&
+        target.children.length == 0 &&
+        (Date.now() - target.trackedAt) < 500) {
+      log('=> maybe newly opened tab');
+      newParent = prevParent;
+    }
+    else {
+      log('=> maybe drag and drop (or opened with active state and position)');
+      const realDelta = Math.abs(toIndex - fromIndex);
+      newParent = realDelta < 2 ? prevParent : (oldParent || nextParent) ;
+    }
+    while (newParent?.collapsed) {
+      log('=> the tree is collapsed, up to parent tree')
+      newParent = tree.tabsById[newParent.parent];
+    }
+    mustToApply = !!oldParent && newParent?.id != oldParent.id;
+  }
+  else if (prevLevel < nextLevel &&
+           nextTab?.parent == prevTab?.id) {
+    log('=> moved to first child position of existing tree');
+    newParent = prevTab || oldParent || nextParent;
+    mustToApply = !!oldParent && newParent?.id != oldParent.id;
+  }
+
+  log('calculated parent: ', {
+    old: oldParent?.id,
+    new: newParent?.id
+  });
+
+  if (newParent) {
+    let ancestor = newParent;
+    while (ancestor) {
+      if (ancestor.id == target.id) {
+        if (moveInfo.toIndex - moveInfo.fromIndex == 1) {
+          log('=> maybe move-down by keyboard shortcut or something.');
+          let nearestForeigner = tab.$TST.nearestFollowingForeignerTab;
+          if (nearestForeigner &&
+              nearestForeigner == tab)
+            nearestForeigner = nearestForeigner.$TST.nextTab;
+          log('nearest foreigner tab: ', nearestForeigner?.id);
+          if (nearestForeigner) {
+            if (nearestForeigner.$TST.hasChild)
+              return new TabActionForNewPosition('attach', {
+                tab,
+                isTabCreating,
+                isMovingByShortcut,
+                parent:      nearestForeigner.id,
+                insertAfter: nearestForeigner.id,
+                mustToApply,
+              });
+            return new TabActionForNewPosition(tab.$TST.parent ? 'detach' : 'move', {
+              tab,
+              isTabCreating,
+              isMovingByShortcut,
+              insertAfter: nearestForeigner.id,
+              mustToApply,
+            });
+          }
+        }
+        log('=> invalid move: a parent is moved inside its own tree!');
+        return new TabActionForNewPosition('invalid');
+      }
+      ancestor = tree.tabsById[ancestor.parent];
+    }
+  }
+
+  if (newParent != oldParent) {
+    if (newParent) {
+      return new TabActionForNewPosition('attach', {
+        tab,
+        isTabCreating,
+        isMovingByShortcut,
+        parent:       newParent.id,
+        insertBefore: nextTab?.id,
+        insertAfter:  prevTab?.id,
+        mustToApply,
+      });
+    }
+    else {
+      return new TabActionForNewPosition('detach', {
+        tab,
+        isTabCreating,
+        isMovingByShortcut,
+        mustToApply,
+      });
+    }
+  }
+  return new TabActionForNewPosition('move', {
+    tab,
+    isTabCreating,
+    isMovingByShortcut,
+    mustToApply,
+  });
+}
+
+
+//===================================================================
+// Take snapshot
+//===================================================================
+
+export function snapshotForActionDetection(targetTab) {
+  const prevTab = targetTab.$TST.nearestCompletelyOpenedNormalPrecedingTab;
+  const nextTab = targetTab.$TST.nearestCompletelyOpenedNormalFollowingTab;
+  const tabs = Array.from(new Set([
+    ...(prevTab?.$TST?.ancestors || []),
+    prevTab,
+    targetTab,
+    nextTab,
+    targetTab.$TST.parent,
+  ]))
+    .filter(TabsStore.ensureLivingItem)
+    .sort((a, b) => a.index - b.index);
+  return snapshotTree(targetTab, tabs);
+}
+
+function snapshotTree(targetTab, tabs) {
+  const allTabs = tabs || Tab.getTabs(targetTab.windowId);
+
+  const snapshotById = {};
+  function snapshotChild(tab) {
+    if (!TabsStore.ensureLivingItem(tab) || tab.pinned)
+      return null;
+    return snapshotById[tab.id] = snapshotTab(tab);
+  }
+  const snapshotArray = allTabs.map(tab => snapshotChild(tab));
+  for (const tab of allTabs) {
+    const item = snapshotById[tab.id];
+    if (!item)
+      continue;
+    item.parent   = tab.$TST.parent?.id;
+    item.next     = tab.$TST.nearestCompletelyOpenedNormalFollowingTab?.id;
+    item.previous = tab.$TST.nearestCompletelyOpenedNormalPrecedingTab?.id;
+  }
+  const activeTab = Tab.getActiveTab(targetTab.windowId);
+  return {
+    target:   snapshotById[targetTab.id],
+    active:   activeTab && snapshotById[activeTab.id],
+    tabs:     snapshotArray,
+    tabsById: snapshotById,
+  };
+}
+
+function snapshotTab(tab) {
+  if (!tab)
+    return null;
+  return {
+    id:            tab.id,
+    url:           tab.url,
+    cookieStoreId: tab.cookieStoreId,
+    active:        tab.active,
+    children:      tab.$TST.children.map(child => child.id),
+    collapsed:     tab.$TST.subtreeCollapsed,
+    pinned:        tab.pinned,
+    level:         tab.$TST.level, // parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || 0), // we need to use the number of real ancestors instead of a cached "level", because it will be updated with delay
+    trackedAt:     tab.$TST.trackedAt,
+    mayBeReplacedWithContainer: tab.$TST.mayBeReplacedWithContainer,
+  };
+}
+
+
+SidebarConnection.onMessage.addListener(async (windowId, message) => {
+  switch (message.type) {
+    case Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      const params = {
+        collapsed: message.collapsed,
+        justNow:   message.justNow,
+        broadcast: true,
+        stack:     message.stack
+      };
+      if (message.manualOperation)
+        manualCollapseExpandSubtree(tab, params);
+      else
+        collapseExpandSubtree(tab, params);
+    }; break;
+
+    case Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE_INTELLIGENTLY_FOR: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (tab)
+        await collapseExpandTreesIntelligentlyFor(tab);
+    }; break;
+
+    case Constants.kCOMMAND_NEW_WINDOW_FROM_TABS: {
+      log('new window requested: ', message);
+      await Tab.waitUntilTracked(message.tabIds);
+      const tabs = message.tabIds.map(id => TabsStore.tabs.get(id));
+      openNewWindowFromTabs(tabs, message);
+    }; break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/common/MetricsData.js b/waterfox/browser/components/sidebar/common/MetricsData.js
new file mode 100644
index 0000000000000..8dc0288e399f9
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/MetricsData.js
@@ -0,0 +1,60 @@
+/*
+# 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/.
+*/
+
+export default class MetricsData {
+  constructor(name) {
+    this.mItems = [];
+    this.mName = name || '';
+
+    const now = Date.now();
+    this.mInitialTime = now;
+    this.mLastTime    = now;
+    this.mDeltaBetweenLastItem = 0;
+  }
+
+  add(label) {
+    const now = Date.now();
+    this.mItems.push({
+      label: label,
+      delta: now - this.mLastTime
+    });
+    this.mDeltaBetweenLastItem = now - this.mInitialTime;
+    this.mLastTime = now;
+  }
+
+  addAsync(label, asyncTask) {
+    const start = Date.now();
+    if (typeof asyncTask == 'function')
+      asyncTask = asyncTask();
+    return asyncTask.then(result => {
+      this.mItems.push({
+        label: `(async) ${label}`,
+        delta: Date.now() - start,
+        async: true
+      });
+      return result;
+    });
+  }
+
+  toString() {
+    const logs = this.mItems.map(item => `${item.delta || 0}: ${item.label}`);
+    return `${this.mName ? this.mName + ': ' : ''}total ${this.mDeltaBetweenLastItem} msec\n${logs.join('\n')}`;
+  }
+
+  static add(label) {
+    return MetricsData.$static.add(label);
+  }
+
+  static addAsync(label, asyncTask) {
+    return MetricsData.$static.addAsync(label, asyncTask);
+  }
+
+  static toString() {
+    return MetricsData.$static.toString();
+  }
+}
+
+MetricsData.$static = new MetricsData();
diff --git a/waterfox/browser/components/sidebar/common/TreeItem.js b/waterfox/browser/components/sidebar/common/TreeItem.js
new file mode 100644
index 0000000000000..aafafb023b674
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/TreeItem.js
@@ -0,0 +1,3933 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+import TabFavIconHelper from '/extlib/TabFavIconHelper.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  mapAndFilter,
+  mapAndFilterUniq,
+  toLines,
+  sanitizeForHTMLText,
+  sanitizeForRegExpSource,
+  isNewTabCommandTab,
+  isFirefoxViewTab,
+  configs,
+  doProgressively,
+} from './common.js';
+
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from './constants.js';
+import * as ContextualIdentities from './contextual-identities.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as TabsStore from './tabs-store.js';
+import * as UniqueId from './unique-id.js';
+
+import Window from './Window.js';
+
+function log(...args) {
+  internalLogger('common/TreeItem', ...args);
+}
+
+function successorTabLog(...args) {
+  internalLogger('background/successor-tab', ...args);
+}
+
+
+// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions
+// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/tabs/Tab
+export const kPERMISSION_ACTIVE_TAB = 'activeTab';
+export const kPERMISSION_TABS       = 'tabs';
+export const kPERMISSION_COOKIES    = 'cookies';
+export const kPERMISSION_INCOGNITO  = 'incognito'; // only for internal use
+export const kPERMISSIONS_ALL = new Set([
+  kPERMISSION_TABS,
+  kPERMISSION_COOKIES,
+  kPERMISSION_INCOGNITO
+]);
+
+
+const mOpenedResolvers            = new Map();
+
+const mIncompletelyTrackedTabs = new Map();
+const mMovingTabs              = new Map();
+const mPromisedTrackedTabs     = new Map();
+
+
+browser.windows.onRemoved.addListener(windowId => {
+  mIncompletelyTrackedTabs.delete(windowId);
+  mMovingTabs.delete(windowId);
+});
+
+export class TreeItem {
+  static TYPE_TAB   = 'tab';
+  static TYPE_GROUP = 'group';
+  static TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER = 'group-collapsed-members-counter';
+
+  static onElementBound = new EventListenerManager();
+
+  // The list of properties which should be ignored when synchronization from the
+  // background to sidebars.
+  static UNSYNCHRONIZABLE_PROPERTIES = new Set([
+    'id',
+    // Ignore "index" on synchronization, because it maybe wrong for the sidebar.
+    // Index of tabs are managed and fixed by other sections like handling of
+    // "kCOMMAND_NOTIFY_TAB_CREATING", Window.prototype.trackTab, and others.
+    // See also: https://github.com/piroor/treestyletab/issues/2119
+    'index',
+    'reindexedBy'
+  ]);
+
+  // key = addon ID
+  // value = Set of states
+  static autoStickyStates = new Map();
+  static allAutoStickyStates = new Set();
+
+  constructor(raw) {
+    raw.$TST = this;
+    this.raw = raw;
+    this.id  = raw.id;
+
+    raw.type = this.type || 'unknown';
+
+    this.trackedAt = Date.now();
+    this.opened = Promise.resolve(true);
+
+    // We should not change the shape of the object, so temporary data should be held in this map.
+    this.temporaryMetadata = new Map();
+
+    this.highPriorityTooltipTexts = new Map();
+    this.lowPriorityTooltipTexts  = new Map();
+
+    this.$exportedForAPI = null;
+    this.$exportedForAPIWithPermissions = new Map();
+
+    this.element = null;
+    this.classList = null;
+    this.promisedElement = new Promise((resolve, _reject) => {
+      this._promisedElementResolver = resolve;
+    });
+
+    this.states = new Set();
+    this.clear();
+
+    this.uniqueId = {
+      id:            null,
+      originalId:    null,
+      originalTabId: null
+    };
+    this.promisedUniqueId = Promise.resolve(null);
+  }
+
+  destroy() {
+    if (this.element &&
+        this.element.parentNode)
+      this.element.parentNode.removeChild(this.element);
+    this.unbindElement();
+    // this.raw.$TST = null; // raw.$TST is used by destruction processes.
+    this.raw = null;
+    this.promisedUniqueId = null;
+    this.uniqueId = null;
+    this.destroyed = true;
+  }
+
+  clear() {
+    this.states.clear();
+    this.attributes = {};
+  }
+
+  bindElement(element) {
+    element.$TST   = this;
+    element.apiRaw = this.raw;
+    this.element = element;
+    this.classList = element.classList;
+    // wait until initialization processes are completed
+    (Constants.IS_BACKGROUND ?
+      setTimeout : // because window.requestAnimationFrame is decelerate for an invisible document.
+      window.requestAnimationFrame)(() => {
+      this._promisedElementResolver(element);
+      if (!element) { // reset for the next binding
+        this.promisedElement = new Promise((resolve, _reject) => {
+          this._promisedElementResolver = resolve;
+        });
+      }
+      if (!this.raw) // unbound while waiting!
+        return;
+      TreeItem.onElementBound.dispatch(this.raw);
+    }, 0);
+  }
+
+  unbindElement() {
+    if (this.element) {
+      for (const state of this.states) {
+        this.element.classList.remove(state);
+        if (state == Constants.kTAB_STATE_HIGHLIGHTED)
+          this.element.removeAttribute('aria-selected');
+      }
+      for (const name of Object.keys(this.attributes)) {
+        this.element.removeAttribute(name);
+      }
+      this.element.$TST = null;
+      this.element.apiRaw = null;
+    }
+    this.element = null;
+    this.classList = null;
+  }
+
+  startMoving() {
+    return Promise.resolve();
+  }
+
+  updateUniqueId(_options = {}) {
+    return Promise.resolve(null);
+  }
+
+  get type() {
+    return null;
+  }
+
+  get renderingId() {
+    return `${this.type}:${this.id}`;
+  }
+
+  get title() {
+    return this.raw.title;
+  }
+
+  //===================================================================
+  // status of tree item
+  //===================================================================
+
+  get collapsed() {
+    return this.states.has(Constants.kTAB_STATE_COLLAPSED);
+  }
+
+  get collapsedCompletely() {
+    return this.states.has(Constants.kTAB_STATE_COLLAPSED_DONE);
+  }
+
+  get subtreeCollapsed() {
+    return this.states.has(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+  }
+
+  get isSubtreeCollapsable() {
+    return this.hasChild &&
+           !this.collapsed &&
+           !this.subtreeCollapsed;
+  }
+
+  get isAutoExpandable() {
+    return this.hasChild && this.subtreeCollapsed;
+  }
+
+  get duplicating() {
+    return this.states.has(Constants.kTAB_STATE_DUPLICATING);
+  }
+
+  get removing() {
+    return this.states.has(Constants.kTAB_STATE_REMOVING);
+  }
+
+  get sticky() {
+    return this.states.has(Constants.kTAB_STATE_STICKY);
+  }
+
+  get stuck() {
+    return this.element?.parentNode?.classList.contains('sticky-tabs-container');
+  }
+
+  get canBecomeSticky() {
+    if (this.collapsed ||
+        this.states.has(Constants.kTAB_STATE_EXPANDING) ||
+        this.states.has(Constants.kTAB_STATE_COLLAPSING))
+      return false;
+
+    if (this.sticky)
+      return true;
+
+    if ((new Set([...this.states, ...TreeItem.allAutoStickyStates])).size < this.states.size + TreeItem.allAutoStickyStates.size) {
+      return true;
+    }
+
+    return false;
+  }
+
+  get promisedPossibleOpenerBookmarks() {
+    return Promise.resolve(null);
+  }
+
+  get defaultTooltipText() {
+    return this.raw.title;
+  }
+
+  get tooltipTextWithDescendants() {
+    const tooltip = [`* ${this.defaultTooltipText}`];
+    for (const child of this.children) {
+      if (!child)
+        continue;
+      tooltip.push(child.$TST.tooltipTextWithDescendants.replace(/^/gm, '  '));
+    }
+    return tooltip.join('\n');
+  }
+
+  get tooltipHtml() {
+    return `<span class="title-line"
+                 ><span class="title"
+                       >${sanitizeForHTMLText(this.raw.title)}</span></span>`;
+  }
+
+  get tooltipHtmlWithDescendants() {
+    return `<ul>${this.generateTooltipHtmlWithDescendants()}</ul>`;
+  }
+  generateTooltipHtmlWithDescendants() {
+    let tooltip = `<li>${this.tooltipHtml}`;
+    const children = [];
+    for (const child of this.children) {
+      if (!child)
+        continue;
+      children.push(child.$TST.generateTooltipHtmlWithDescendants());
+    }
+    if (children.length > 0)
+      tooltip += `<ul>${children.join('')}</ul>`;
+    return `${tooltip}</li>`;
+  }
+
+  registerTooltipText(ownerId, text, isHighPriority = false) {
+    if (isHighPriority) {
+      this.highPriorityTooltipTexts.set(ownerId, text);
+      this.lowPriorityTooltipTexts.delete(ownerId);
+    }
+    else {
+      this.highPriorityTooltipTexts.delete(ownerId);
+      this.lowPriorityTooltipTexts.set(ownerId, text);
+    }
+  }
+
+  unregisterTooltipText(ownerId) {
+    this.highPriorityTooltipTexts.delete(ownerId);
+    this.lowPriorityTooltipTexts.delete(ownerId);
+  }
+
+  get highPriorityTooltipText() {
+    if (this.highPriorityTooltipTexts.size == 0)
+      return null;
+    return [...this.highPriorityTooltipTexts.values()][this.highPriorityTooltipTexts.size - 1];
+  }
+
+  get lowPriorityTooltipText() {
+    if (this.lowPriorityTooltipTexts.size == 0)
+      return null;
+    return [...this.lowPriorityTooltipTexts.values()][this.lowPriorityTooltipTexts.size - 1];
+  }
+
+  //===================================================================
+  // neighbor tabs
+  //===================================================================
+
+  get nextTab() { return null; }
+  get previousTab() { return null; }
+  get unsafeNextTab() { return null; }
+  get unsafePreviousTab() { return null; }
+  get nearestCompletelyOpenedNormalFollowingTab() { return null; }
+  get nearestCompletelyOpenedNormalPrecedingTab() { return null; }
+  get nearestVisibleFollowingTab() { return null; }
+  get unsafeNearestExpandedFollowingTab() { return null; }
+  get nearestVisiblePrecedingTab() { return null; }
+  get unsafeNearestExpandedPrecedingTab() { return null; }
+  get nearestLoadedTab() { return null; }
+  get nearestLoadedTabInTree() { return null; }
+  get nearestLoadedSiblingTab() { return null; }
+  get nearestSameTypeRenderedTab() { return null; }
+
+  //===================================================================
+  // tree relations
+  //===================================================================
+
+  get parent() { return null; }
+  get hasParent() { return false; }
+
+  get ancestorIds() { return []; }
+  get ancestors() { return []; }
+
+  get level() { return 0; }
+
+  get rootTab() { return null; }
+
+  get topmostSubtreeCollapsedAncestor() { return null; }
+
+  get nearestVisibleAncestorOrSelf() { return null; }
+
+  get nearestFollowingRootTab() { return null; }
+
+  get nearestFollowingForeignerTab() {
+    const base = this.lastDescendant || this.raw;
+    return base?.$TST.nextTab;
+  }
+
+  get unsafeNearestFollowingForeignerTab() {
+    const base = this.lastDescendant || this.raw;
+    return base?.$TST.unsafeNextTab;
+  }
+
+  get children() { return []; }
+
+  get firstChild() {
+    const children = this.children;
+    return children.length > 0 ? children[0] : null ;
+  }
+
+  get firstVisibleChild() {
+    const firstChild = this.firstChild;
+    return firstChild && !firstChild.$TST.collapsed && !firstChild.hidden && firstChild;
+  }
+
+  get lastChild() {
+    const children = this.children;
+    return children.length > 0 ? children[children.length - 1] : null ;
+  }
+
+  get hasChild() { return false; }
+
+  get descendants() { return []; }
+
+  get lastDescendant() {
+    const descendants = this.descendants;
+    return descendants.length ? descendants[descendants.length-1] : null ;
+  }
+
+  get nextSiblingTab() { return null; }
+
+  get nextVisibleSiblingTab() {
+    const nextSibling = this.nextSiblingTab;
+    return nextSibling && !nextSibling.$TST.collapsed && !nextSibling.hidden && nextSibling;
+  }
+
+  get previousSiblingTab() { return null; }
+
+  get needToBeGroupedSiblings() { return []; }
+
+  //===================================================================
+  // other relations
+  //===================================================================
+
+  findSuccessor(_options = {}) {
+    return null;
+  }
+
+  // if all items are aldeardy placed at there, we don't need to move them.
+  isAllPlacedBeforeSelf(items) {
+    if (!this.raw ||
+        items.length == 0)
+      return true;
+    let nextItem = this.raw;
+    if (items[items.length - 1] == nextItem)
+      nextItem = nextItem.$TST.unsafeNextTab;
+    if (!nextItem && !items[items.length - 1].$TST.unsafeNextTab)
+      return true;
+
+    items = Array.from(items);
+    let previousItem = items.shift();
+    for (const item of items) {
+      if (item.$TST.unsafePreviousTab != previousItem)
+        return false;
+      previousItem = item;
+    }
+    return !nextItem ||
+           !previousItem ||
+           previousItem.$TST.unsafeNextTab == nextItem;
+  }
+
+  isAllPlacedAfterSelf(items) {
+    if (!this.raw ||
+        items.length == 0)
+      return true;
+    let previousItem = this.raw;
+    if (items[0] == previousItem)
+      previousItem = previousItem.$TST.unsafePreviousTab;
+    if (!previousItem && !items[0].$TST.unsafePreviousTab)
+      return true;
+
+    items = Array.from(items).reverse();
+    let nextItem = items.shift();
+    for (const item of items) {
+      if (item.$TST.unsafeNextTab != nextItem)
+        return false;
+      nextItem = item;
+    }
+    return !previousItem ||
+           !nextItem ||
+           nextItem.$TST.unsafePreviousTab == previousItem;
+  }
+
+  detach() {}
+
+  //===================================================================
+  // State
+  //===================================================================
+
+  async toggleState(state, condition, { permanently, toTab, broadcast } = {}) {
+    if (condition)
+      return this.addState(state, { permanently, toTab, broadcast });
+    else
+      return this.removeState(state, { permanently, toTab, broadcast });
+  }
+
+  async addState(state) {
+    state = state && String(state) || undefined;
+    if (!this.raw || !state)
+      return;
+
+    if (this.classList) {
+      this.classList.add(state);
+    }
+    if (this.states) {
+      this.states.add(state);
+    }
+  }
+
+  async removeState(state) {
+    state = state && String(state) || undefined;
+    if (!this.raw || !state)
+      return;
+
+    if (this.classList) {
+      this.classList.remove(state);
+    }
+    if (this.states) {
+      this.states.delete(state);
+    }
+  }
+
+  async getPermanentStates() {
+    return Promise.resolve([]);
+  }
+
+  inheritSoundStateFromChildren() {}
+
+  inheritSharingStateFromChildren() {}
+
+  onNativeGroupModified() {}
+
+  setAttribute(attribute, value) {
+    if (this.element)
+      this.element.setAttribute(attribute, value);
+    this.attributes[attribute] = value;
+  }
+
+  getAttribute(attribute) {
+    return this.attributes[attribute];
+  }
+
+  removeAttribute(attribute) {
+    if (this.element)
+      this.element.removeAttribute(attribute);
+    delete this.attributes[attribute];
+  }
+
+  resolveOpened() {}
+  rejectOpened() {}
+
+  memorizeNeighbors(hint) {
+    if (!this.raw) // already closed tab
+      return;
+    log(`memorizeNeighbors ${this.raw.id} as ${hint}`);
+    this.lastPreviousTabId = this.unsafePreviousTab?.id;
+    this.lastNextTabId = this.unsafeNextTab?.id;
+  }
+
+  // https://github.com/piroor/treestyletab/issues/2309#issuecomment-518583824
+  get movedInBulk() {
+    const previousTab = this.unsafePreviousTab;
+    if (this.lastPreviousTabId &&
+        this.lastPreviousTabId != previousTab?.id) {
+      log(`not bulkMoved lastPreviousTabId=${this.lastNextTabId}, previousTab=${previousTab?.id}`);
+      return false;
+    }
+
+    const nextTab = this.unsafeNextTab;
+    if (this.lastNextTabId &&
+        this.lastNextTabId != nextTab?.id) {
+      log(`not bulkMoved lastNextTabId=${this.lastNextTabId}, nextTab=${nextTab?.id}`);
+      return false;
+    }
+
+    return true;
+  }
+
+  get sanitized() {
+    if (!this.raw)
+      return {};
+
+    const sanitized = {
+      ...this.raw,
+      '$possibleInitialUrl': null,
+      '$TST': null,
+      '$exportedForAPI': null,
+      '$exportedForAPIWithPermissions': null,
+    };
+    delete sanitized.$TST;
+    return sanitized;
+  }
+
+  export(full) {
+    const exported = {
+      id:         this.id,
+      uniqueId:   this.uniqueId,
+      states:     Array.from(this.states),
+      attributes: this.attributes,
+      parentId:   this.parentId,
+      childIds:   this.childIds,
+      collapsed:  this.collapsed,
+      subtreeCollapsed: this.subtreeCollapsed
+    };
+    if (full)
+      return {
+        ...this.sanitized,
+        $TST: exported
+      };
+    return exported;
+  }
+
+  apply(exported) {
+    this.raw.title = exported.title;
+  }
+
+  // This function is complex a little, but we should not make a custom class for this purpose,
+  // bacause instances of the class will be very short-life and increases RAM usage on
+  // massive tabs case.
+  async exportForAPI({ addonId, light, isContextTab, interval, permissions, cache, cacheKey } = {}) {
+    const permissionsKey = [...permissions].sort().join(',');
+    if (!light &&
+        configs.cacheAPITreeItems &&
+        this.$exportedForAPIWithPermissions.has(permissionsKey))
+      return this.$exportedForAPIWithPermissions.get(permissionsKey);
+
+    let exportedTreeItem = configs.cacheAPITreeItems && light ? this.$exportedForAPI : null;
+    if (!exportedTreeItem) {
+      const children = await doProgressively(
+        this.raw.$TST.children,
+        child => child.$TST.exportForAPI({ addonId, light, isContextTab, interval, permissions, cache, cacheKey }),
+        interval
+      );
+
+      const tabStates = this.raw.$TST.states;
+      exportedTreeItem = {
+        id:             this.raw.id,
+        windowId:       this.raw.windowId,
+        type:           this.type,
+        states:         tabStates && tabStates.size > 0 &&Constants.kTAB_SAFE_STATES_ARRAY.filter(state => tabStates.has(state)) || [],
+        indent:         parseInt(this.raw.$TST.getAttribute(Constants.kLEVEL) || 0),
+        children,
+        ancestorTabIds: this.raw.$TST.ancestorIds || [],
+        bundledTabId:   this.raw.$TST.bundledTabId,
+      };
+      if (this.stuck)
+        exportedTreeItem.states.push(Constants.kTAB_STATE_STUCK);
+      if (configs.cacheAPITreeItems && light)
+        this.$exportedForAPI = exportedTreeItem;
+    }
+
+    if (light)
+      return exportedTreeItem;
+
+    const fullExportedTreeItem = { ...exportedTreeItem };
+
+    await this.exportFullTreeItemProperties(fullExportedTreeItem, { isContextTab, interval, permissions, cache });
+
+    if (configs.cacheAPITreeItems)
+      this.$exportedForAPIWithPermissions.set(permissionsKey, fullExportedTreeItem)
+    return fullExportedTreeItem;
+  }
+
+  exportFullTreeItemProperties() {}
+
+  invalidateCache() {
+    this.$exportedForAPI = null;
+    this.$exportedForAPIWithPermissions.clear();
+  }
+
+  applyStatesToElement() {
+    if (!this.element)
+      return;
+
+    this.applyAttributesToElement();
+
+    for (const state of this.states) {
+      this.element.classList.add(state);
+    }
+
+    for (const [name, value] of Object.entries(this.attributes)) {
+      this.element.setAttribute(name, value);
+    }
+  }
+
+  applyAttributesToElement() {
+    if (!this.element)
+      return;
+
+    this.element.applyAttributes();
+  }
+
+  /* element utilities */
+
+  invalidateElement(targets) {
+    if (this.element?.invalidate)
+      this.element.invalidate(targets);
+  }
+
+  updateElement(targets) {
+    if (this.element?.update)
+      this.element.update(targets);
+  }
+
+
+  //===================================================================
+  // class methods
+  //===================================================================
+
+  static registerAutoStickyState(providerId, statesToAdd) {
+    if (!statesToAdd) {
+      statesToAdd = providerId;
+      providerId = browser.runtime.id;
+    }
+    const states = TreeItem.autoStickyStates.get(providerId) || new Set();
+    if (!Array.isArray(statesToAdd))
+      statesToAdd = [statesToAdd];
+    for (const state of statesToAdd) {
+      states.add(state)
+    }
+    if (states.size == 0)
+      return;
+
+    TreeItem.autoStickyStates.set(providerId, states);
+    for (const state of states) {
+      TreeItem.allAutoStickyStates.add(state);
+    }
+
+    TreeItem.updateCanBecomeStickyTabsIndex(TabsStore.getCurrentWindowId());
+
+    if (Constants.IS_BACKGROUND) {
+      SidebarConnection.sendMessage({
+        type: Constants.kCOMMAND_BROADCAST_TAB_AUTO_STICKY_STATE,
+        providerId,
+        add:  [...statesToAdd],
+      });
+    }
+  }
+
+  static unregisterAutoStickyState(providerId, statesToRemove) {
+    if (!statesToRemove) {
+      statesToRemove = providerId;
+      providerId = browser.runtime.id;
+    }
+    const states = TreeItem.autoStickyStates.get(providerId);
+    if (!states)
+      return;
+    if (!Array.isArray(statesToRemove))
+      statesToRemove = [statesToRemove];
+    for (const state of statesToRemove) {
+      states.delete(state)
+    }
+    if (states.size > 0)
+      TreeItem.autoStickyStates.set(providerId, states);
+    else
+      TreeItem.autoStickyStates.delete(providerId);
+
+    TreeItem.allAutoStickyStates = new Set([
+      ...TreeItem.autoStickyStates.values(),
+    ].flat());
+
+    TreeItem.updateCanBecomeStickyTabsIndex(TabsStore.getCurrentWindowId());
+
+    if (Constants.IS_BACKGROUND) {
+      SidebarConnection.sendMessage({
+        type:   Constants.kCOMMAND_BROADCAST_TAB_AUTO_STICKY_STATE,
+        providerId,
+        remove: [...statesToRemove],
+      });
+    }
+  }
+
+  static async updateCanBecomeStickyTabsIndex(windowId) {
+    const tabs = await (windowId ? browser.tabs.query({ windowId }) : browser.tabs.query({}));
+    for (const tab of tabs) {
+      const item = TreeItem.get(tab);
+      if (!item) {
+        continue;
+      }
+      if (item.$TST.canBecomeSticky)
+        TabsStore.addCanBecomeStickyTab(item);
+      else
+        TabsStore.removeCanBecomeStickyTab(item);
+    }
+  }
+
+  static uniqTabsAndDescendantsSet(tabs) {
+    if (!Array.isArray(tabs))
+      tabs = [tabs];
+    return Array.from(new Set(tabs.map(tab => [tab].concat(tab.$TST.descendants)).flat())).sort(TreeItem.compare);
+  }
+
+  static compare(a, b) {
+    const delta = a.index - b.index;
+    if (delta == 0) {
+      return (a.type == TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER) ? 1 :
+        (a.type == TreeItem.TYPE_GROUP || !!a.color) ? -1 :
+          1;
+    }
+    return delta;
+  }
+
+  static sort(tabs) {
+    return tabs.length == 0 ? tabs : tabs.sort(TreeItem.compare);
+  }
+}
+
+
+export class TabGroupCollapsedMembersCounter extends TreeItem {
+  constructor(raw) {
+    super(raw);
+
+    raw.type = TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER;
+
+    this.reindex();
+  }
+
+  destroy() {
+    super.destroy();
+
+    this.raw.group = null;
+  }
+
+  get type() {
+    return TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER;
+  }
+
+  reindex(maybeLastMember) {
+    const lastMember = this.raw.group.$TST.lastMember || maybeLastMember;
+    if (lastMember) {
+      this.raw.index = lastMember.index;
+    }
+  }
+
+  get group() {
+    return this.raw.group;
+  }
+
+  get nativeTabGroup() {
+    return this.raw.group;
+  }
+
+  update() {
+    this.raw.color = this.raw.group.color;
+    this.raw.windowId = this.raw.group.windowId;
+    this.reindex();
+  }
+
+  get title() {
+    const collapsedItemsCount = Math.max(0, this.raw.group.$TST.members.length - 1);
+    return `+${collapsedItemsCount}`;
+  }
+
+  get sanitized() {
+    if (!this.raw)
+      return {};
+
+    const sanitized = {
+      ...super.sanitized,
+      group: this.raw.group.$TST.sanitized,
+    };
+    return sanitized;
+  }
+
+  export(full) {
+    const exported = super.export(full);
+    exported.group = this.raw.group.$TST.export(full);
+    if (full)
+      return {
+        ...this.sanitized,
+        $TST: exported
+      };
+    return exported;
+  }
+}
+
+
+export class TabGroup extends TreeItem {
+  constructor(raw) {
+    super(raw);
+
+    TabsStore.tabGroups.set(raw.id, raw);
+    TabsStore.windows.get(raw.windowId)?.tabGroups.set(raw.id, raw);
+
+    this.reindex();
+  }
+
+  destroy() {
+    const win = TabsStore.windows.get(this.raw.windowId);
+    if (win) {
+      win.tabGroups.delete(this.id);
+    }
+
+    TabsStore.tabGroups.delete(this.id);
+
+    if (this._collapsedMembersCounterItem) {
+      this._collapsedMembersCounterItem.destroy();
+      this._collapsedMembersCounterItem = null;
+    }
+
+    super.destroy();
+  }
+
+  get type() {
+    return TreeItem.TYPE_GROUP;
+  }
+
+  get group() {
+    return this.raw;
+  }
+
+  get nearestVisibleAncestorOrSelf() {
+    return this.raw;
+  }
+
+  get members() {
+    return TabGroup.getMembers(this.raw.id);
+  }
+
+  get firstMember() {
+    return TabGroup.getFirstMember(this.raw.id);
+  }
+
+  get lastMember() {
+    return TabGroup.getLastMember(this.raw.id);
+  }
+
+  get children() {
+    return this.members.filter(tab => !tab.$TST.parentId);
+  }
+
+  get hasChild() {
+    return !!this.firstMember;
+  }
+
+  get descendants() {
+    return this.members;
+  }
+
+  reindex(maybeFirstMember) {
+    const firstMember = TabGroup.getFirstMember(this.raw.id) || maybeFirstMember;
+    if (firstMember) {
+      this.raw.index = firstMember.index;
+    }
+  }
+
+  apply(exported) {
+    super.apply(exported);
+    this.raw.color = exported.color;
+    this.raw.collapsed = exported.collapsed;
+  }
+
+  get createParams() {
+    return {
+      title:     this.raw.title,
+      color:     this.raw.color,
+      collapsed: this.raw.collapsed,
+      windowId:  this.raw.windowId,
+    };
+  }
+
+  get collapsedMembersCounterItem() {
+    if (this._collapsedMembersCounterItem) {
+      return this._collapsedMembersCounterItem;
+    }
+    this._collapsedMembersCounterItem = {
+      id:        this.raw.id,
+      windowId:  this.raw.windowId,
+      color:     this.raw.color,
+      type:      TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER,
+      group:     this.raw,
+    };
+    new TabGroupCollapsedMembersCounter(this._collapsedMembersCounterItem);
+    return this._collapsedMembersCounterItem;
+  }
+
+
+  //===================================================================
+  // class methods
+  //===================================================================
+
+  static get(groupId) {
+    return TabsStore.tabGroups.get(groupId);
+  }
+
+  static init(group) {
+    if (group.$TST instanceof TabGroup) {
+      return group;
+    }
+    if ('index' in group) {
+      group.index = -1;
+    }
+    if ('incognito' in group) {
+      group.incognito = false;
+    }
+    group.$TST = new TabGroup(group);
+    return group;
+  }
+
+  static getMembers(groupId, options = {}) {
+    const windowId = TabGroup.get(groupId)?.windowId || TabsStore.getCurrentWindowId();
+    return TabsStore.queryAll({
+      windowId,
+      tabs:   TabsStore.getTabsMap(TabsStore.nativelyGroupedTabsInWindow, windowId),
+      living: true,
+      groupId,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getFirstMember(groupId, options = {}) {
+    const windowId = TabGroup.get(groupId)?.windowId || TabsStore.getCurrentWindowId();
+    return TabsStore.query({
+      windowId,
+      tabs:   TabsStore.getTabsMap(TabsStore.nativelyGroupedTabsInWindow, windowId),
+      living: true,
+      groupId,
+      ...options,
+      ordered: true,
+      first: true,
+    });
+  }
+
+  static getLastMember(groupId, options = {}) {
+    const windowId = TabGroup.get(groupId)?.windowId || TabsStore.getCurrentWindowId();
+    return TabsStore.query({
+      windowId,
+      tabs:   TabsStore.getTabsMap(TabsStore.nativelyGroupedTabsInWindow, windowId),
+      living: true,
+      groupId,
+      ...options,
+      ordered: true,
+      last: true,
+    });
+  }
+
+  // https://searchfox.org/mozilla-central/rev/578d9c83f046d8c361ac6b98b297c27990d468fd/browser/components/tabbrowser/content/tabgroup-menu.js#25
+  static COLORS = [
+    'blue',
+    'purple',
+    'cyan',
+    'orange',
+    'yellow',
+    'pink',
+    'green',
+    'gray',
+    'red',
+  ];
+
+  static getNextUnusedColor(windowId = null) {
+    if (!windowId) {
+      windowId = TabsStore.getCurrentWindowId();
+    }
+    const unusedColors = new Set(TabGroup.COLORS);
+    for (const group of TabsStore.windows.get(windowId).tabGroups.values()) {
+      unusedColors.delete(group.color);
+    }
+    if (unusedColors.size > 0) {
+      return [...unusedColors][0];
+    }
+    // all colors are used
+    const index = Math.floor(Math.random() * TabGroup.COLORS.length);
+    return TabGroup.COLORS[index];
+  }
+}
+
+
+export class Tab extends TreeItem {
+  //===================================================================
+  // tab tracking events
+  //===================================================================
+
+  static onTracked      = new EventListenerManager();
+  static onDestroyed    = new EventListenerManager();
+  static onInitialized  = new EventListenerManager();
+
+  //===================================================================
+  // general tab events
+  //===================================================================
+
+  static onGroupTabDetected = new EventListenerManager();
+  static onLabelUpdated     = new EventListenerManager();
+  static onStateChanged     = new EventListenerManager();
+  static onPinned           = new EventListenerManager();
+  static onUnpinned         = new EventListenerManager();
+  static onHidden           = new EventListenerManager();
+  static onShown            = new EventListenerManager();
+  static onTabInternallyMoved     = new EventListenerManager();
+  static onCollapsedStateChanged  = new EventListenerManager();
+  static onMutedStateChanged      = new EventListenerManager();
+  static onAutoplayBlockedStateChanged = new EventListenerManager();
+  static onSharingStateChanged    = new EventListenerManager();
+
+  static onBeforeCreate     = new EventListenerManager();
+  static onCreating         = new EventListenerManager();
+  static onCreated          = new EventListenerManager();
+  static onRemoving         = new EventListenerManager();
+  static onRemoved          = new EventListenerManager();
+  static onMoving           = new EventListenerManager();
+  static onMoved            = new EventListenerManager();
+  static onActivating       = new EventListenerManager();
+  static onActivated        = new EventListenerManager();
+  static onUnactivated      = new EventListenerManager();
+  static onUpdated          = new EventListenerManager();
+  static onRestored         = new EventListenerManager();
+  static onWindowRestoring  = new EventListenerManager();
+  static onAttached         = new EventListenerManager();
+  static onDetached         = new EventListenerManager();
+
+  static onMultipleTabsRemoving = new EventListenerManager();
+  static onMultipleTabsRemoved  = new EventListenerManager();
+  static onChangeMultipleTabsRestorability = new EventListenerManager();
+  static onStateChanged  = new EventListenerManager();
+  static onNativeGroupModified = new EventListenerManager();
+
+
+  constructor(raw) {
+    const alreadyTracked = Tab.get(raw.id);
+    if (alreadyTracked)
+      return alreadyTracked.$TST;
+
+    log(`tab ${dumpTab(raw)} is newly tracked: `, raw);
+
+    super(raw);
+
+    this.promisedUniqueId = new Promise((resolve, _reject) => {
+      this.onUniqueIdGenerated = resolve;
+    });
+
+    this.index = raw.index;
+
+    this.updatingOpenerTabIds = []; // this must be an array, because same opener tab id can appear multiple times.
+
+    this.newRelatedTabsCount = 0;
+
+    this.lastSoundStateCounts = {
+      soundPlaying: 0,
+      muted:        0,
+      autoPlayBlocked: 0,
+    };
+    this.soundPlayingChildrenIds = new Set();
+    this.maybeSoundPlayingChildrenIds = new Set();
+    this.mutedChildrenIds = new Set();
+    this.maybeMutedChildrenIds = new Set();
+    this.autoplayBlockedChildrenIds = new Set();
+    this.maybeAutoplayBlockedChildrenIds = new Set();
+
+    this.lastSharingStateCounts = {
+      camera:     0,
+      microphone: 0,
+      screen:     0,
+    };
+    this.sharingCameraChildrenIds = new Set();
+    this.maybeSharingCameraChildrenIds = new Set();
+    this.sharingMicrophoneChildrenIds = new Set();
+    this.maybeSharingMicrophoneChildrenIds = new Set();
+    this.sharingScreenChildrenIds = new Set();
+    this.maybeSharingScreenChildrenIds = new Set();
+
+    this.opened = new Promise((resolve, reject) => {
+      const resolvers = mOpenedResolvers.get(raw.id) || new Set();
+      resolvers.add({ resolve, reject });
+      mOpenedResolvers.set(raw.id, resolvers);
+    });
+
+    TabsStore.tabs.set(raw.id, raw);
+
+    const win = TabsStore.windows.get(raw.windowId) || new Window(raw.windowId);
+    win.trackTab(raw);
+
+    // Don't update indexes here, instead Window.prototype.trackTab()
+    // updates indexes because indexes are bound to windows.
+    // TabsStore.updateIndexesForTab(raw);
+
+    if (raw.active) {
+      TabsStore.activeTabInWindow.set(raw.windowId, raw);
+      TabsStore.activeTabsInWindow.get(raw.windowId).add(raw);
+    }
+    else {
+      TabsStore.activeTabsInWindow.get(raw.windowId).delete(raw);
+    }
+    setTimeout(() => {
+      if (!TabsStore.ensureLivingItem(raw)) {
+        return;
+      }
+      if (raw.active)  {
+        Tab.onActivated.dispatch(raw);
+      }
+      else {
+        Tab.onUnactivated.dispatch(raw);
+      }
+    }, 0);
+
+    const incompletelyTrackedTabsPerWindow = mIncompletelyTrackedTabs.get(raw.windowId) || new Set();
+    incompletelyTrackedTabsPerWindow.add(raw);
+    mIncompletelyTrackedTabs.set(raw.windowId, incompletelyTrackedTabsPerWindow);
+    this.promisedUniqueId.then(() => {
+      incompletelyTrackedTabsPerWindow.delete(raw);
+      Tab.onTracked.dispatch(raw);
+    });
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this.delayedInheritSoundStateFromChildren = null;
+  }
+
+  destroy() {
+    mPromisedTrackedTabs.delete(`${this.id}:true`);
+    mPromisedTrackedTabs.delete(`${this.id}:false`);
+
+    Tab.onDestroyed.dispatch(this.raw);
+    this.detach();
+
+    if (this.temporaryMetadata.has('reservedCleanupNeedlessGroupTab')) {
+      clearTimeout(this.temporaryMetadata.get('reservedCleanupNeedlessGroupTab'));
+      this.temporaryMetadata.delete('reservedCleanupNeedlessGroupTab');
+    }
+
+    TabsStore.tabs.delete(this.id);
+    if (this.uniqueId)
+      TabsStore.tabsByUniqueId.delete(this.uniqueId.id);
+
+    TabsStore.removeTabFromIndexes(this.raw);
+
+    super.destroy();
+  }
+
+  clear() {
+    super.clear();
+
+    this.parentId = null;
+    this.childIds = [];
+    this.cachedAncestorIds   = null;
+    this.cachedDescendantIds = null;
+  }
+
+  startMoving() {
+    let onTabMoved;
+    const promisedMoved = new Promise((resolve, _reject) => {
+      onTabMoved = resolve;
+    });
+    const movingTabs = mMovingTabs.get(this.raw.windowId) || new Set();
+    movingTabs.add(promisedMoved);
+    mMovingTabs.set(this.raw.windowId, movingTabs);
+    promisedMoved.then(() => {
+      movingTabs.delete(promisedMoved);
+    });
+    return onTabMoved;
+  }
+
+  updateUniqueId(options = {}) {
+    if (!this.raw) {
+      const error = new Error('FATAL ERROR: updateUniqueId() is unavailable for an invalid tab');
+      console.log(error);
+      throw error;
+    }
+    if (options.id) {
+      if (this.uniqueId.id)
+        TabsStore.tabsByUniqueId.delete(this.uniqueId.id);
+      this.uniqueId.id = options.id;
+      TabsStore.tabsByUniqueId.set(options.id, this.raw);
+      this.setAttribute(Constants.kPERSISTENT_ID, options.id);
+      return Promise.resolve(this.uniqueId);
+    }
+    return UniqueId.request(this.raw, options).then(uniqueId => {
+      if (uniqueId && TabsStore.ensureLivingItem(this.raw)) { // possibly removed from document while waiting
+        this.uniqueId = uniqueId;
+        TabsStore.tabsByUniqueId.set(uniqueId.id, this.raw);
+        this.setAttribute(Constants.kPERSISTENT_ID, uniqueId.id);
+      }
+      return uniqueId || {};
+    }).catch(error => {
+      console.log(`FATAL ERROR: Failed to get unique id for a tab ${this.id}: `, error);
+      return {};
+    });
+  }
+
+  get type() {
+    return TreeItem.TYPE_TAB;
+  }
+
+  get tab() {
+    return this.raw;
+  }
+
+  get nativeTabGroup() {
+    if (this.raw.groupId == -1) {
+      return null;
+    }
+    return TabGroup.get(this.raw.groupId);
+  }
+
+  //===================================================================
+  // status of tab
+  //===================================================================
+
+  get soundPlaying() {
+    return !!(this.raw?.audible && !this.raw?.mutedInfo.muted);
+  }
+  get maybeSoundPlaying() {
+    return (this.soundPlaying ||
+            (this.states.has(Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER) &&
+             this.hasChild));
+  }
+
+  get muted() {
+    return !!(this.raw?.mutedInfo?.muted);
+  }
+  get maybeMuted() {
+    return (this.muted ||
+            (this.states.has(Constants.kTAB_STATE_HAS_MUTED_MEMBER) &&
+             this.hasChild));
+  }
+
+  get autoplayBlocked() {
+    return this.states.has(Constants.kTAB_STATE_AUTOPLAY_BLOCKED);
+  }
+  get maybeAutoplayBlocked() {
+    return (this.autoplayBlocked ||
+            (this.states.has(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER) &&
+             this.hasChild));
+  }
+
+  get sharingCamera() {
+    return !!(this.raw?.sharingState?.camera);
+  }
+  get maybeSharingCamera() {
+    return (this.sharingCamera ||
+            (this.states.has(Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER) &&
+             this.hasChild));
+  }
+
+  get sharingMicrophone() {
+    return !!(this.raw?.sharingState?.microphone);
+  }
+  get maybeSharingMicrophone() {
+    return (this.sharingMicrophone ||
+            (this.states.has(Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER) &&
+             this.hasChild));
+  }
+
+  get sharingScreen() {
+    return !!(this.raw?.sharingState?.screen);
+  }
+  get maybeSharingScreen() {
+    return (this.sharingScreen ||
+            (this.states.has(Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER) &&
+             this.hasChild));
+  }
+
+  get precedesPinnedTab() {
+    const following = this.nearestVisibleFollowingTab;
+    return following?.pinned;
+  }
+
+  get followsUnpinnedTab() {
+    const preceding = this.nearestVisiblePrecedingTab;
+    return preceding && !preceding.pinned;
+  }
+
+  get isNewTabCommandTab() {
+    if (!this.raw ||
+        !configs.guessNewOrphanTabAsOpenedByNewTabCommand)
+      return false;
+
+    if (this.raw.$isNewTabCommandTab)
+      return true;
+
+    // Firefox sets "New Tab" title to a new tab command tab, even if
+    // "Blank Page" is chosen as the new tab page. So we can detect the case
+    // safely here.
+    // (confirmed on Firefox 124)
+    if (isNewTabCommandTab(this.raw))
+      return true;
+
+    // Firefox always opens a blank tab as the placeholder, when trying to
+    // open a bookmark in a new tab. So, we cannot determine the tab is
+    // "really opened as a new blank tab" or "just as a placeholder for an
+    // Open in New Tab operation", when the user choose the "Blank Page"
+    // as the new tab page and the new tab page is opened without the title
+    // "New Tab" due to any reason.
+    // But, when "Blank Page" is chosen as the new tab page, Firefox loads
+    // "about:blank" into a newly opened blank tab. As the result both current
+    // URL and the previous URL become "about:blank". This is an important
+    // difference between "a new blank tab" and "a blank tab opened for an
+    // Open in New Tab command".
+    // (confirmed on Firefox 124)
+    if (this.raw.url == 'about:blank' &&
+        this.raw.previousUrl != 'about:blank')
+      return false;
+
+    return false;
+  }
+
+  get isGroupTab() {
+    return this.states.has(Constants.kTAB_STATE_GROUP_TAB) ||
+           this.hasGroupTabURL;
+  }
+
+  get hasGroupTabURL() {
+    return !!(this.raw?.url?.indexOf(Constants.kGROUP_TAB_URI) == 0);
+  }
+
+  get isTemporaryGroupTab() {
+    if (!this.raw || !this.isGroupTab)
+      return false;
+    return (new URL(this.raw.url)).searchParams.get('temporary') == 'true';
+  }
+
+  get isTemporaryAggressiveGroupTab() {
+    if (!this.raw || !this.isGroupTab)
+      return false;
+    return (new URL(this.raw.url)).searchParams.get('temporaryAggressive') == 'true';
+  }
+
+  get replacedParentGroupTabCount() {
+    if (!this.raw || !this.isGroupTab)
+      return 0;
+    const count = parseInt((new URL(this.raw.url)).searchParams.get('replacedParentCount'));
+    return isNaN(count) ? 0 : count;
+  }
+
+  // Firefox Multi-Account Containers
+  // https://addons.mozilla.org/firefox/addon/multi-account-containers/
+  // Temporary Containers
+  // https://addons.mozilla.org/firefox/addon/temporary-containers/
+  get mayBeReplacedWithContainer() {
+    return !!(
+      this.$possiblePredecessorPreviousTab ||
+      this.$possiblePredecessorNextTab
+    );
+  }
+  get $possiblePredecessorPreviousTab() {
+    const prevTab = this.unsafePreviousTab;
+    return (
+      prevTab &&
+      this.raw &&
+      this.raw.cookieStoreId != prevTab.cookieStoreId &&
+      this.raw.url == prevTab.url
+    ) ? prevTab : null;
+  }
+  get $possiblePredecessorNextTab() {
+    const nextTab = this.unsafeNextTab;
+    return (
+      nextTab &&
+      this.raw &&
+      this.raw.cookieStoreId != nextTab.cookieStoreId &&
+      this.raw.url == nextTab.url
+    ) ? nextTab : null;
+  }
+  get possibleSuccessorWithDifferentContainer() {
+    const firstChild = this.firstChild;
+    const nextTab = this.nextTab;
+    const prevTab = this.previousTab;
+    return (
+      (firstChild &&
+       firstChild.$TST.$possiblePredecessorPreviousTab == this.raw &&
+       firstChild) ||
+      (nextTab &&
+       !nextTab.$TST.temporaryMetadata.has('openedCompletely') &&
+       nextTab.$TST.$possiblePredecessorPreviousTab == this.raw &&
+       nextTab) ||
+      (prevTab &&
+       !prevTab.$TST.temporaryMetadata.has('openedCompletely') &&
+       prevTab.$TST.$possiblePredecessorNextTab == this.raw &&
+       prevTab)
+    );
+  }
+
+  get selected() {
+    return this.states.has(Constants.kTAB_STATE_SELECTED) ||
+             (this.hasOtherHighlighted && !!(this.raw?.highlighted));
+  }
+
+  get multiselected() {
+    return this.raw &&
+             this.selected &&
+             (this.hasOtherHighlighted ||
+              TabsStore.selectedTabsInWindow.get(this.raw.windowId).size > 1);
+  }
+
+  get hasOtherHighlighted() {
+    const highlightedTabs = this.raw && TabsStore.highlightedTabsInWindow.get(this.raw.windowId);
+    return !!(highlightedTabs && highlightedTabs.size > 1);
+  }
+
+  get canBecomeSticky() {
+    if (this.raw?.pinned) {
+      return false;
+    }
+    return super.canBecomeSticky;
+  }
+
+  get promisedPossibleOpenerBookmarks() {
+    if ('possibleOpenerBookmarks' in this)
+      return Promise.resolve(this.possibleOpenerBookmarks);
+    return new Promise(async (resolve, _reject) => {
+      if (!browser.bookmarks || !this.raw)
+        return resolve(this.possibleOpenerBookmarks = []);
+      // A new tab from bookmark is opened with a title: its URL without the scheme part.
+      const url = this.raw.$possibleInitialUrl;
+      try {
+        const possibleBookmarks = await Promise.all([
+          this._safeSearchBookmstksWithUrl(`http://${url}`),
+          this._safeSearchBookmstksWithUrl(`http://www.${url}`),
+          this._safeSearchBookmstksWithUrl(`https://${url}`),
+          this._safeSearchBookmstksWithUrl(`https://www.${url}`),
+          this._safeSearchBookmstksWithUrl(`ftp://${url}`),
+          this._safeSearchBookmstksWithUrl(`moz-extension://${url}`),
+          this._safeSearchBookmstksWithUrl(url), // about:* and so on
+        ]);
+        log(`promisedPossibleOpenerBookmarks for tab ${this.id} (${url}): `, possibleBookmarks);
+        resolve(this.possibleOpenerBookmarks = possibleBookmarks.flat());
+      }
+      catch(error) {
+        log(`promisedPossibleOpenerBookmarks for the tab {this.id} (${url}): `, error);
+        // If it is detected as "not a valid URL", then
+        // it cannot be a tab opened from a bookmark.
+        resolve(this.possibleOpenerBookmarks = []);
+      }
+    });
+  }
+  async _safeSearchBookmstksWithUrl(url) {
+    try {
+      return await browser.bookmarks.search({ url });
+    }
+    catch(error) {
+      log(`_searchBookmstksWithUrl failed: tab ${this.id} (${url}): `, error);
+      try {
+        // bookmarks.search() does not accept "moz-extension:" URL
+        // via a queyr with "url" on Firefox 105 and later - it raises an error as
+        // "Uncaught Error: Type error for parameter query (Value must either:
+        // be a string value, or .url must match the format "url") for bookmarks.search."
+        // Thus we use a query with "query" to avoid the error.
+        // See also: https://github.com/piroor/treestyletab/issues/3203
+        //           https://bugzilla.mozilla.org/show_bug.cgi?id=1791313
+        const bookmarks = await browser.bookmarks.search({ query: url }).catch(_error => []);
+        return bookmarks.filter(bookmark => bookmark.url == url);
+      }
+      catch(_error) {
+        return [];
+      }
+    }
+  }
+
+  get cookieStoreName() {
+    const identity = this.raw?.cookieStoreId && ContextualIdentities.get(this.raw.cookieStoreId);
+    return identity ? identity.name : null;
+  }
+
+  get defaultTooltipText() {
+    return this.cookieStoreName ? `${this.raw.title} - ${this.cookieStoreName}` : super.defaultTooltipText;
+  }
+
+  get tooltipHtml() {
+    return this.cookieStoreName ?
+      `<span class="title-line"
+            ><span class="title"
+                  >${sanitizeForHTMLText(this.raw.title)}</span
+            ><span class="cookieStoreName"
+                  >${sanitizeForHTMLText(this.cookieStoreName)}</span></span>` :
+      super.tooltipHtml;
+  }
+
+  registerTooltipText(ownerId, text, isHighPriority = false) {
+    super.registerTooltipText(ownerId, text, isHighPriority);
+    if (Constants.IS_BACKGROUND)
+      Tab.broadcastTooltipText(this.raw);
+  }
+
+  unregisterTooltipText(ownerId) {
+    super.unregisterTooltipText(ownerId);
+    if (Constants.IS_BACKGROUND)
+      Tab.broadcastTooltipText(this.raw);
+  }
+
+  get collapsedByParent() {
+    return this._shouldBeCollapsedByParent();
+  }
+  get promisedCollapsedByParent() {
+    if (this.raw.groupId == -1) {
+      return this.collapsedByParent;
+    }
+    return browser.tabGroups.get(this.raw.groupId).then(group => {
+      return this._shouldBeCollapsedByParent(group)
+    });
+  }
+  _shouldBeCollapsedByParent(group) {
+    if (this.raw.groupId == -1) {
+      return !!this.topmostSubtreeCollapsedAncestor;
+    }
+    if (this.raw.active) {
+      // simulate "visible active tab in collapsed tab group" behavior of Firefox itself
+      return false;
+    }
+    if (this.topmostSubtreeCollapsedAncestor) {
+      return true;
+    }
+    return (group || this.nativeTabGroup)?.collapsed;
+  }
+
+  //===================================================================
+  // neighbor tabs
+  //===================================================================
+
+  get nextTab() {
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.controllableTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      controllable: true,
+      index:    (index => index > this.raw.index)
+    });
+  }
+
+  get previousTab() {
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.controllableTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      controllable: true,
+      index:    (index => index < this.raw.index),
+      last:     true
+    });
+  }
+
+  get unsafeNextTab() {
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      fromId:   this.id,
+      index:    (index => index > this.raw.index)
+    });
+  }
+
+  get unsafePreviousTab() {
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      fromId:   this.id,
+      index:    (index => index < this.raw.index),
+      last:     true
+    });
+  }
+
+  get nearestCompletelyOpenedNormalFollowingTab() { // including hidden tabs!
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.unpinnedTabsInWindow.get(this.raw.windowId),
+      states:   [Constants.kTAB_STATE_CREATING, false],
+      fromId:   this.id,
+      living:   true,
+      index:    (index => index > this.raw.index)
+    });
+  }
+
+  get nearestCompletelyOpenedNormalPrecedingTab() { // including hidden tabs!
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.unpinnedTabsInWindow.get(this.raw.windowId),
+      states:   [Constants.kTAB_STATE_CREATING, false],
+      fromId:   this.id,
+      living:   true,
+      index:    (index => index < this.raw.index),
+      last:     true
+    });
+  }
+
+  get nearestVisibleFollowingTab() { // visible, not-collapsed
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.visibleTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      visible:  true,
+      index:    (index => index > this.raw.index)
+    });
+  }
+
+  get unsafeNearestExpandedFollowingTab() { // not-collapsed, possibly hidden
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.expandedTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      index:    (index => index > this.raw.index)
+    });
+  }
+
+  get nearestVisiblePrecedingTab() { // visible, not-collapsed
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.visibleTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      visible:  true,
+      index:    (index => index < this.raw.index),
+      last:     true
+    });
+  }
+
+  get unsafeNearestExpandedPrecedingTab() { // not-collapsed, possibly hidden
+    return this.raw && TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.expandedTabsInWindow.get(this.raw.windowId),
+      fromId:   this.id,
+      index:    (index => index < this.raw.index),
+      last:     true
+    });
+  }
+
+  get nearestLoadedTab() {
+    const tabs = this.raw && TabsStore.visibleTabsInWindow.get(this.raw.windowId);
+    return this.raw && (
+      // nearest following tab
+      TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs,
+        discarded: false,
+        fromId:    this.id,
+        visible:   true,
+        index:     (index => index > this.raw.index)
+      }) ||
+      // nearest preceding tab
+      TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs,
+        discarded: false,
+        fromId:    this.id,
+        visible:   true,
+        index:     (index => index < this.raw.index),
+        last:      true
+      })
+    );
+  }
+
+  get nearestLoadedTabInTree() {
+    if (!this.raw)
+      return null;
+    let tab = this.raw;
+    const tabs = TabsStore.visibleTabsInWindow.get(tab.windowId);
+    let lastLastDescendant;
+    while (tab) {
+      const parent = tab.$TST.parent;
+      if (!parent)
+        return null;
+      const lastDescendant = parent.$TST.lastDescendant;
+      const loadedTab = (
+        // nearest following tab
+        TabsStore.query({
+          windowId:     tab.windowId,
+          tabs,
+          descendantOf: parent.id,
+          discarded:    false,
+          '!id':        this.id,
+          fromId:       (lastLastDescendant || this.raw).id,
+          toId:         lastDescendant.id,
+          visible:      true,
+          index:        (index => index > this.raw.index)
+        }) ||
+        // nearest preceding tab
+        TabsStore.query({
+          windowId:     tab.windowId,
+          tabs,
+          descendantOf: parent.id,
+          discarded:    false,
+          '!id':        this.id,
+          fromId:       tab.id,
+          toId:         parent.$TST.firstChild.id,
+          visible:      true,
+          index:        (index => index < tab.index),
+          last:         true
+        })
+      );
+      if (loadedTab)
+        return loadedTab;
+      if (!parent.discarded)
+        return parent;
+      lastLastDescendant = lastDescendant;
+      tab = tab.$TST.parent;
+    }
+    return null;
+  }
+
+  get nearestLoadedSiblingTab() {
+    const parent = this.parent;
+    if (!parent || !this.raw)
+      return null;
+    const tabs = TabsStore.visibleTabsInWindow.get(this.raw.windowId);
+    return (
+      // nearest following tab
+      TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs,
+        childOf:   parent.id,
+        discarded: false,
+        fromId:    this.id,
+        toId:      parent.$TST.lastChild.id,
+        visible:   true,
+        index:     (index => index > this.raw.index)
+      }) ||
+      // nearest preceding tab
+      TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs,
+        childOf:   parent.id,
+        discarded: false,
+        fromId:    this.id,
+        toId:      parent.$TST.firstChild.id,
+        visible:   true,
+        index:     (index => index < this.raw.index),
+        last:      true
+      })
+    );
+  }
+
+  get nearestSameTypeRenderedTab() {
+    let tab = this.raw;
+    const pinned = tab.pinned;
+    while (tab.$TST.unsafeNextTab) {
+      tab = tab.$TST.unsafeNextTab;
+      if (tab.pinned != pinned)
+        return null;
+      if (tab.$TST.element &&
+          tab.$TST.element.parentNode)
+        return tab;
+    }
+    return null;
+  }
+
+  //===================================================================
+  // tree relations
+  //===================================================================
+
+  set parent(tab) {
+    const newParentId = tab && (typeof tab == 'number' ? tab : tab.id);
+    if (!this.raw ||
+        newParentId == this.parentId)
+      return tab;
+
+    const oldParent = this.parent;
+    this.parentId = newParentId;
+    this.invalidateCachedAncestors();
+    const parent = this.parent;
+    if (parent) {
+      this.setAttribute(Constants.kPARENT, parent.id);
+      parent.$TST.invalidateCachedDescendants();
+
+      if (this.states.has(Constants.kTAB_STATE_SOUND_PLAYING))
+        parent.$TST.soundPlayingChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER))
+        parent.$TST.maybeSoundPlayingChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_MUTED))
+        parent.$TST.mutedChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_MUTED_MEMBER))
+        parent.$TST.maybeMutedChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_AUTOPLAY_BLOCKED))
+        parent.$TST.autoplayBlockedChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER))
+        parent.$TST.maybeAutoplayBlockedChildrenIds.add(this.id);
+      parent.$TST.inheritSoundStateFromChildren();
+
+      if (this.states.has(Constants.kTAB_STATE_SHARING_CAMERA))
+        parent.$TST.sharingCameraChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER))
+        parent.$TST.maybeSharingCameraChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_SHARING_MICROPHONE))
+        parent.$TST.sharingMicrophoneChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER))
+        parent.$TST.maybeSharingMicrophoneChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_SHARING_SCREEN))
+        parent.$TST.sharingScreenChildrenIds.add(this.id);
+      if (this.states.has(Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER))
+        parent.$TST.maybeSharingScreenChildrenIds.add(this.id);
+      parent.$TST.inheritSharingStateFromChildren();
+
+      TabsStore.removeRootTab(this.raw);
+    }
+    else {
+      this.removeAttribute(Constants.kPARENT);
+      TabsStore.addRootTab(this.raw);
+    }
+    if (oldParent && oldParent.id != this.parentId) {
+      oldParent.$TST.soundPlayingChildrenIds.delete(this.id);
+      oldParent.$TST.maybeSoundPlayingChildrenIds.delete(this.id);
+      oldParent.$TST.mutedChildrenIds.delete(this.id);
+      oldParent.$TST.maybeMutedChildrenIds.delete(this.id);
+      oldParent.$TST.autoplayBlockedChildrenIds.delete(this.id);
+      oldParent.$TST.maybeAutoplayBlockedChildrenIds.delete(this.id);
+      oldParent.$TST.inheritSoundStateFromChildren();
+
+      oldParent.$TST.sharingCameraChildrenIds.delete(this.id);
+      oldParent.$TST.maybeSharingCameraChildrenIds.delete(this.id);
+      oldParent.$TST.sharingMicrophoneChildrenIds.delete(this.id);
+      oldParent.$TST.maybeSharingScreenChildrenIds.delete(this.id);
+      oldParent.$TST.maybeSharingMicrophoneChildrenIds.delete(this.id);
+      oldParent.$TST.maybeSharingScreenChildrenIds.delete(this.id);
+      oldParent.$TST.inheritSharingStateFromChildren();
+
+      oldParent.$TST.children = oldParent.$TST.childIds.filter(id => id != this.id);
+    }
+    return tab;
+  }
+  get parent() {
+    return this.raw && this.parentId && TabsStore.ensureLivingItem(Tab.get(this.parentId));
+  }
+
+  get hasParent() {
+    return !!this.parentId;
+  }
+
+  get ancestorIds() {
+    if (!this.cachedAncestorIds)
+      this.updateAncestors();
+    return this.cachedAncestorIds;
+  }
+
+  get ancestors() {
+    return mapAndFilter(this.ancestorIds,
+                        id => TabsStore.ensureLivingItem(Tab.get(id)) || undefined);
+  }
+
+  updateAncestors() {
+    const ancestors = [];
+    this.cachedAncestorIds = [];
+    if (!this.raw)
+      return ancestors;
+    let descendant = this.raw;
+    while (true) {
+      const parent = Tab.get(descendant.$TST.parentId);
+      if (!parent)
+        break;
+      ancestors.push(parent);
+      this.cachedAncestorIds.push(parent.id);
+      descendant = parent;
+    }
+    return ancestors;
+  }
+
+  get level() {
+    return this.ancestorIds.length;
+  }
+
+  invalidateCachedAncestors() {
+    this.cachedAncestorIds = null;
+    for (const child of this.children) {
+      child.$TST.invalidateCachedAncestors();
+    }
+    this.invalidateCache();
+  }
+
+  get rootTab() {
+    const ancestors = this.ancestors;
+    return ancestors.length > 0 ? ancestors[ancestors.length-1] : this.raw ;
+  }
+
+  get topmostSubtreeCollapsedAncestor() {
+    for (const ancestor of [...this.ancestors].reverse()) {
+      if (ancestor.$TST.subtreeCollapsed)
+        return ancestor;
+    }
+    return null;
+  }
+
+  get nearestVisibleAncestorOrSelf() {
+    for (const ancestor of this.ancestors) {
+      if (!ancestor.$TST.collapsed)
+        return ancestor;
+    }
+    if (!this.collapsed)
+      return this.raw;
+    return null;
+  }
+
+  get nearestFollowingRootTab() {
+    return TabsStore.query({
+      windowId:  this.raw.windowId,
+      tabs:      TabsStore.rootTabsInWindow.get(this.raw.windowId),
+      fromId:    this.id,
+      living:    true,
+      index:     (index => index > this.raw.index),
+      hasParent: false,
+      first:     true
+    });
+  }
+
+  set children(tabs) {
+    if (!this.raw)
+      return tabs;
+
+    const ancestorIds = this.ancestorIds;
+    const newChildIds = mapAndFilter(tabs, tab => {
+      const id = typeof tab == 'number' ? tab : tab?.id;
+      if (!ancestorIds.includes(id))
+        return TabsStore.ensureLivingItem(Tab.get(id)) ? id : undefined;
+      console.log('FATAL ERROR: Cyclic tree structure has detected and prevented. ', {
+        ancestorsOfSelf: this.ancestors,
+        tabs,
+        tab,
+        stack: new Error().stack
+      });
+      return undefined;
+    });
+    if (newChildIds.join('|') == this.childIds.join('|'))
+      return tabs;
+
+    const oldChildren = this.children;
+    this.childIds = newChildIds;
+    this.sortAndInvalidateChildren();
+    if (this.childIds.length > 0) {
+      this.setAttribute(Constants.kCHILDREN, `|${this.childIds.join('|')}|`);
+      if (this.isSubtreeCollapsable)
+        TabsStore.addSubtreeCollapsableTab(this.raw);
+    }
+    else {
+      this.removeAttribute(Constants.kCHILDREN);
+      TabsStore.removeSubtreeCollapsableTab(this.raw);
+    }
+    for (const child of Array.from(new Set(this.children.concat(oldChildren)))) {
+      if (this.childIds.includes(child.id))
+        child.$TST.parent = this.id;
+      else
+        child.$TST.parent = null;
+    }
+    return tabs;
+  }
+  get children() {
+    return mapAndFilter(this.childIds,
+                        id => TabsStore.ensureLivingItem(Tab.get(id)) || undefined);
+  }
+
+  sortAndInvalidateChildren() {
+    // Tab.get(tabId) calls into TabsStore.tabs.get(tabId), which is just a
+    // Map. This is acceptable to repeat in order to avoid two array copies,
+    // especially on larger tab sets.
+    this.childIds.sort((a, b) => TreeItem.compare(Tab.get(a), Tab.get(b)));
+    this.invalidateCachedDescendants();
+  }
+
+  get hasChild() {
+    return this.childIds.length > 0;
+  }
+
+  get descendants() {
+    if (!this.cachedDescendantIds)
+      return this.updateDescendants();
+    return mapAndFilter(this.cachedDescendantIds,
+                        id => TabsStore.ensureLivingItem(Tab.get(id)) || undefined);
+  }
+
+  updateDescendants() {
+    let descendants = [];
+    this.cachedDescendantIds = [];
+    for (const child of this.children) {
+      descendants.push(child);
+      descendants = descendants.concat(child.$TST.descendants);
+      this.cachedDescendantIds.push(child.id);
+      this.cachedDescendantIds = this.cachedDescendantIds.concat(child.$TST.cachedDescendantIds);
+    }
+    return descendants;
+  }
+
+  invalidateCachedDescendants() {
+    this.cachedDescendantIds = null;
+    const parent = this.parent;
+    if (parent)
+      parent.$TST.invalidateCachedDescendants();
+    this.invalidateCache();
+  }
+
+  get nextSiblingTab() {
+    if (!this.raw)
+      return null;
+    const parent = this.parent;
+    if (parent) {
+      const siblingIds = parent.$TST.childIds;
+      const index = siblingIds.indexOf(this.id);
+      const siblingId = index < siblingIds.length - 1 ? siblingIds[index + 1] : null ;
+      if (!siblingId)
+        return null;
+      return Tab.get(siblingId);
+    }
+    else {
+      const nextSibling = TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs:      TabsStore.rootTabsInWindow.get(this.raw.windowId),
+        fromId:    this.id,
+        living:    true,
+        index:     (index => index > this.raw.index),
+        hasParent: false,
+        first:     true
+      });
+      // We should treat only pinned tab as the next sibling tab of a pinned
+      // tab. For example, if the last pinned tab is closed, Firefox moves
+      // focus to the first normal tab. But the previous pinned tab looks
+      // natural on TST because pinned tabs are visually grouped.
+      if (nextSibling &&
+          nextSibling.pinned != this.raw.pinned)
+        return null;
+      return nextSibling;
+    }
+  }
+
+  get previousSiblingTab() {
+    if (!this.raw)
+      return null;
+    const parent = this.parent;
+    if (parent) {
+      const siblingIds = parent.$TST.childIds;
+      const index = siblingIds.indexOf(this.id);
+      const siblingId = index > 0 ? siblingIds[index - 1] : null ;
+      if (!siblingId)
+        return null;
+      return Tab.get(siblingId);
+    }
+    else {
+      return TabsStore.query({
+        windowId:  this.raw.windowId,
+        tabs:      TabsStore.rootTabsInWindow.get(this.raw.windowId),
+        fromId:    this.id,
+        living:    true,
+        index:     (index => index < this.raw.index),
+        hasParent: false,
+        last:      true
+      });
+    }
+  }
+
+  get needToBeGroupedSiblings() {
+    if (!this.raw)
+      return [];
+    const openerTabUniqueId = this.getAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID);
+    if (!openerTabUniqueId)
+      return [];
+    return TabsStore.queryAll({
+      windowId:   this.raw.windowId,
+      tabs:       TabsStore.toBeGroupedTabsInWindow.get(this.raw.windowId),
+      normal:     true,
+      '!id':      this.id,
+      attributes: [
+        Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID, openerTabUniqueId,
+        Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER, ''
+      ],
+      ordered:    true
+    });
+  }
+
+  get precedingCanBecomeStickyTabs() {
+    return TabsStore.queryAll({
+      windowId:   this.raw.windowId,
+      tabs:       TabsStore.canBecomeStickyTabsInWindow.get(this.raw.windowId),
+      normal:     true,
+      '!id':      this.id,
+      ordered:    true,
+      fromId:     this.id,
+      reversed:   true,
+    });
+  }
+
+  get followingCanBecomeStickyTabs() {
+    return TabsStore.queryAll({
+      windowId:   this.raw.windowId,
+      tabs:       TabsStore.canBecomeStickyTabsInWindow.get(this.raw.windowId),
+      normal:     true,
+      '!id':      this.id,
+      ordered:    true,
+      fromId:     this.id,
+    });
+  }
+
+  //===================================================================
+  // other relations
+  //===================================================================
+
+  get openerTab() {
+    if (this.raw?.openerTabId == this.id)
+      return null;
+
+    if (!this.raw?.openerTabId)
+      return Tab.getOpenerFromGroupTab(this.raw);
+
+    return TabsStore.query({
+      windowId: this.raw.windowId,
+      tabs:     TabsStore.livingTabsInWindow.get(this.raw.windowId),
+      id:       this.raw.openerTabId,
+      living:   true
+    });
+  }
+
+  get hasPinnedOpener() {
+    return this.openerTab?.pinned;
+  }
+
+  get hasFirefoxViewOpener() {
+    return isFirefoxViewTab(this.openerTab);
+  }
+
+  get bundledTab() {
+    if (!this.raw)
+      return null;
+    const substance = Tab.getSubstanceFromAliasGroupTab(this.raw);
+    if (substance)
+      return substance;
+    if (this.raw.pinned)
+      return Tab.getGroupTabForOpener(this.raw);
+    if (this.isGroupTab)
+      return Tab.getOpenerFromGroupTab(this.raw);
+    return null;
+  }
+
+  get bundledTabId() {
+    const tab = this.bundledTab;
+    return tab ? tab.id : -1;
+  }
+
+  findSuccessor(options = {}) {
+    if (!this.raw)
+      return null;
+    if (typeof options != 'object')
+      options = {};
+    const ignoredTabs = (options.ignoredTabs || []).slice(0);
+    let foundTab = this.raw;
+    do {
+      ignoredTabs.push(foundTab);
+      foundTab = foundTab.$TST.nextTab;
+    } while (foundTab && ignoredTabs.includes(foundTab));
+    if (!foundTab) {
+      foundTab = this.raw;
+      do {
+        ignoredTabs.push(foundTab);
+        foundTab = foundTab.$TST.nearestVisiblePrecedingTab;
+      } while (foundTab && ignoredTabs.includes(foundTab));
+    }
+    return foundTab;
+  }
+
+  get lastRelatedTab() {
+    return Tab.get(this.lastRelatedTabId) || null;
+  }
+  set lastRelatedTab(relatedTab) {
+    if (!this.raw)
+      return relatedTab;
+    const previousLastRelatedTabId = this.lastRelatedTabId;
+    const win = TabsStore.windows.get(this.raw.windowId);
+    if (relatedTab) {
+      win.lastRelatedTabs.set(this.id, relatedTab.id);
+      this.newRelatedTabsCount++;
+      successorTabLog(`set lastRelatedTab for ${this.id}: ${previousLastRelatedTabId} => ${relatedTab.id} (${this.newRelatedTabsCount})`);
+    }
+    else {
+      win.lastRelatedTabs.delete(this.id);
+      this.newRelatedTabsCount = 0;
+      successorTabLog(`clear lastRelatedTab for ${this.id} (${previousLastRelatedTabId})`);
+    }
+    win.previousLastRelatedTabs.set(this.id, previousLastRelatedTabId);
+    return relatedTab;
+  }
+
+  get lastRelatedTabId() {
+    if (!this.raw)
+      return 0;
+    const win = TabsStore.windows.get(this.raw.windowId);
+    return win.lastRelatedTabs.get(this.id) || 0;
+  }
+
+  get previousLastRelatedTab() {
+    if (!this.raw)
+      return null;
+    const win = TabsStore.windows.get(this.raw.windowId);
+    return Tab.get(win.previousLastRelatedTabs.get(this.id)) || null;
+  }
+
+  detach() {
+    this.parent   = null;
+    this.children = [];
+  }
+
+
+  //===================================================================
+  // State
+  //===================================================================
+
+  async addState(state, { permanently, toTab, broadcast } = {}) {
+    state = state && String(state) || undefined;
+    if (!this.raw || !state)
+      return;
+
+    const modified = this.states && !this.states.has(state);
+
+    super.addState(state);
+
+    switch (state) {
+      case Constants.kTAB_STATE_HIGHLIGHTED:
+        TabsStore.addHighlightedTab(this.raw);
+        if (this.element)
+          this.element.setAttribute('aria-selected', 'true');
+        if (toTab)
+          this.raw.highlighted = true;
+        break;
+
+      case Constants.kTAB_STATE_SELECTED:
+        TabsStore.addSelectedTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_COLLAPSED:
+      case Constants.kTAB_STATE_SUBTREE_COLLAPSED:
+        if (this.isSubtreeCollapsable)
+          TabsStore.addSubtreeCollapsableTab(this.raw);
+        else
+          TabsStore.removeSubtreeCollapsableTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_HIDDEN:
+        TabsStore.removeVisibleTab(this.raw);
+        TabsStore.removeControllableTab(this.raw);
+        if (toTab)
+          this.raw.hidden = true;
+        break;
+
+      case Constants.kTAB_STATE_PINNED:
+        TabsStore.addPinnedTab(this.raw);
+        TabsStore.removeUnpinnedTab(this.raw);
+        if (toTab)
+          this.raw.pinned = true;
+        break;
+
+      case Constants.kTAB_STATE_BUNDLED_ACTIVE:
+        TabsStore.addBundledActiveTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_SOUND_PLAYING: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.soundPlayingChildrenIds.add(this.id);
+      } break;
+      case Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSoundPlayingChildrenIds.add(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_AUDIBLE:
+        if (toTab)
+          this.raw.audible = true;
+        break;
+
+      case Constants.kTAB_STATE_MUTED: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.mutedChildrenIds.add(this.id);
+        if (toTab)
+          this.raw.mutedInfo.muted = true;
+      } break;
+      case Constants.kTAB_STATE_HAS_MUTED_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeMutedChildrenIds.add(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_AUTOPLAY_BLOCKED: {
+        const parent = this.parent;
+        if (parent) {
+          parent.$TST.autoplayBlockedChildrenIds.add(this.id);
+          parent.$TST.inheritSoundStateFromChildren();
+        }
+      } break;
+      case Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER: {
+        const parent = this.parent;
+        if (parent) {
+          parent.$TST.maybeAutoplayBlockedChildrenIds.add(this.id);
+          parent.$TST.inheritSoundStateFromChildren();
+        }
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_CAMERA: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingCameraChildrenIds.add(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.camera = true;
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingCameraChildrenIds.add(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_MICROPHONE: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingMicrophoneChildrenIds.add(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.microphone = true;
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingMicrophoneChildrenIds.add(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_SCREEN: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingScreenChildrenIds.add(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.screen = 'Something';
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingScreenChildrenIds.add(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_GROUP_TAB:
+        TabsStore.addGroupTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_PRIVATE_BROWSING:
+        if (toTab)
+          this.raw.incognito = true;
+        break;
+
+      case Constants.kTAB_STATE_ATTENTION:
+        if (toTab)
+          this.raw.attention = true;
+        break;
+
+      case Constants.kTAB_STATE_DISCARDED:
+        if (toTab)
+          this.raw.discarded = true;
+        break;
+
+      case 'loading':
+        TabsStore.addLoadingTab(this.raw);
+        if (toTab)
+          this.raw.status = state;
+        break;
+
+      case 'complete':
+        TabsStore.removeLoadingTab(this.raw);
+        if (toTab)
+          this.raw.status = state;
+        break;
+    }
+
+    if (TreeItem.allAutoStickyStates.has(state)) {
+      if (this.canBecomeSticky)
+        TabsStore.addCanBecomeStickyTab(this.raw);
+      else
+        TabsStore.removeCanBecomeStickyTab(this.raw);
+    }
+
+    if (this.raw &&
+        modified &&
+        state != Constants.kTAB_STATE_ACTIVE &&
+        Constants.IS_BACKGROUND &&
+        broadcast !== false)
+      Tab.broadcastState(this.raw, {
+        add: [state],
+      });
+    if (permanently) {
+      const states = await this.getPermanentStates();
+      if (!states.includes(state)) {
+        states.push(state);
+        await browser.sessions.setTabValue(this.id, Constants.kPERSISTENT_STATES, states).catch(ApiTabs.createErrorSuppressor());
+      }
+    }
+    if (modified) {
+      this.invalidateCache();
+      if (this.raw)
+        Tab.onStateChanged.dispatch(this.raw, state, true);
+    }
+  }
+
+  async removeState(state, { permanently, toTab, broadcast } = {}) {
+    state = state && String(state) || undefined;
+    if (!this.raw || !state)
+      return;
+
+    const modified = this.states?.has(state);
+
+    super.removeState(state);
+
+    switch (state) {
+      case Constants.kTAB_STATE_HIGHLIGHTED:
+        TabsStore.removeHighlightedTab(this.raw);
+        if (this.element)
+          this.element.setAttribute('aria-selected', 'false');
+        if (toTab)
+          this.raw.highlighted = false;
+        break;
+
+      case Constants.kTAB_STATE_SELECTED:
+        TabsStore.removeSelectedTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_COLLAPSED:
+      case Constants.kTAB_STATE_SUBTREE_COLLAPSED:
+        if (this.isSubtreeCollapsable)
+          TabsStore.addSubtreeCollapsableTab(this.raw);
+        else
+          TabsStore.removeSubtreeCollapsableTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_HIDDEN:
+        if (!this.collapsed)
+          TabsStore.addVisibleTab(this.raw);
+        TabsStore.addControllableTab(this.raw);
+        if (toTab)
+          this.raw.hidden = false;
+        break;
+
+      case Constants.kTAB_STATE_PINNED:
+        TabsStore.removePinnedTab(this.raw);
+        TabsStore.addUnpinnedTab(this.raw);
+        if (toTab)
+          this.raw.pinned = false;
+        break;
+
+      case Constants.kTAB_STATE_BUNDLED_ACTIVE:
+        TabsStore.removeBundledActiveTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_SOUND_PLAYING: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.soundPlayingChildrenIds.delete(this.id);
+      } break;
+      case Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSoundPlayingChildrenIds.delete(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_AUDIBLE:
+        if (toTab)
+          this.raw.audible = false;
+        break;
+
+      case Constants.kTAB_STATE_MUTED: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.mutedChildrenIds.delete(this.id);
+        if (toTab)
+          this.raw.mutedInfo.muted = false;
+      } break;
+      case Constants.kTAB_STATE_HAS_MUTED_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeMutedChildrenIds.delete(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_AUTOPLAY_BLOCKED: {
+        const parent = this.parent;
+        if (parent) {
+          parent.$TST.autoplayBlockedChildrenIds.delete(this.id);
+          parent.$TST.inheritSoundStateFromChildren();
+        }
+      } break;
+      case Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER: {
+        const parent = this.parent;
+        if (parent) {
+          parent.$TST.maybeAutoplayBlockedChildrenIds.delete(this.id);
+          parent.$TST.inheritSoundStateFromChildren();
+        }
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_CAMERA: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingCameraChildrenIds.delete(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.camera = false;
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingCameraChildrenIds.delete(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_MICROPHONE: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingMicrophoneChildrenIds.delete(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.microphone = false;
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingMicrophoneChildrenIds.delete(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_SHARING_SCREEN: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.sharingScreenChildrenIds.delete(this.id);
+        if (toTab && this.raw.sharingState)
+          this.raw.sharingState.screen = undefined;
+      } break;
+      case Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER: {
+        const parent = this.parent;
+        if (parent)
+          parent.$TST.maybeSharingScreenChildrenIds.delete(this.id);
+      } break;
+
+      case Constants.kTAB_STATE_GROUP_TAB:
+        TabsStore.removeGroupTab(this.raw);
+        break;
+
+      case Constants.kTAB_STATE_PRIVATE_BROWSING:
+        if (toTab)
+          this.raw.incognito = false;
+        break;
+
+      case Constants.kTAB_STATE_ATTENTION:
+        if (toTab)
+          this.raw.attention = false;
+        break;
+
+      case Constants.kTAB_STATE_DISCARDED:
+        if (toTab)
+          this.raw.discarded = false;
+        break;
+    }
+
+    if (TreeItem.allAutoStickyStates.has(state)) {
+      if (this.canBecomeSticky)
+        TabsStore.addCanBecomeStickyTab(this.raw);
+      else
+        TabsStore.removeCanBecomeStickyTab(this.raw);
+    }
+
+    if (modified &&
+        state != Constants.kTAB_STATE_ACTIVE &&
+        Constants.IS_BACKGROUND &&
+        broadcast !== false)
+      Tab.broadcastState(this.raw, {
+        remove: [state],
+      });
+    if (permanently) {
+      const states = await this.getPermanentStates();
+      const index = states.indexOf(state);
+      if (index > -1) {
+        states.splice(index, 1);
+        await browser.sessions.setTabValue(this.id, Constants.kPERSISTENT_STATES, states).catch(ApiTabs.createErrorSuppressor());
+      }
+    }
+    if (modified) {
+      this.invalidateCache();
+      Tab.onStateChanged.dispatch(this.raw, state, false);
+    }
+  }
+
+  async getPermanentStates() {
+    const states = this.raw && await browser.sessions.getTabValue(this.id, Constants.kPERSISTENT_STATES).catch(ApiTabs.handleMissingTabError);
+    // We need to cleanup invalid values stored accidentally.
+    // See also: https://github.com/piroor/treestyletab/issues/2882
+    return states && mapAndFilterUniq(states, state => state && String(state) || undefined) || [];
+  }
+
+  inheritSoundStateFromChildren() {
+    if (!this.raw)
+      return;
+
+    // this is called too many times on a session restoration, so this should be throttled for better performance
+    if (this.delayedInheritSoundStateFromChildren)
+      clearTimeout(this.delayedInheritSoundStateFromChildren);
+
+    this.delayedInheritSoundStateFromChildren = setTimeout(() => {
+      this.delayedInheritSoundStateFromChildren = null;
+      if (!TabsStore.ensureLivingItem(this.raw))
+        return;
+
+      const parent = this.parent;
+      let modifiedCount = 0;
+
+      const soundPlayingCount = this.soundPlayingChildrenIds.size + this.maybeSoundPlayingChildrenIds.size;
+      if (soundPlayingCount != this.lastSoundStateCounts.soundPlaying) {
+        this.lastSoundStateCounts.soundPlaying = soundPlayingCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER, soundPlayingCount > 0);
+        if (parent) {
+          if (soundPlayingCount > 0)
+            parent.$TST.maybeSoundPlayingChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeSoundPlayingChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      const mutedCount = this.mutedChildrenIds.size + this.maybeMutedChildrenIds.size;
+      if (mutedCount != this.lastSoundStateCounts.muted) {
+        this.lastSoundStateCounts.muted = mutedCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_MUTED_MEMBER, mutedCount > 0);
+        if (parent) {
+          if (mutedCount > 0)
+            parent.$TST.maybeMutedChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeMutedChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      const autoplayBlockedCount = this.autoplayBlockedChildrenIds.size + this.maybeAutoplayBlockedChildrenIds.size;
+      if (autoplayBlockedCount != this.lastSoundStateCounts.autoplayBlocked) {
+        this.lastSoundStateCounts.autoplayBlocked = autoplayBlockedCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER, autoplayBlockedCount > 0);
+        if (parent) {
+          if (autoplayBlockedCount > 0)
+            parent.$TST.maybeAutoplayBlockedChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeAutoplayBlockedChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      if (modifiedCount == 0)
+        return;
+
+      if (parent)
+        parent.$TST.inheritSoundStateFromChildren();
+
+      SidebarConnection.sendMessage({
+        type:                  Constants.kCOMMAND_NOTIFY_TAB_SOUND_STATE_UPDATED,
+        windowId:              this.raw.windowId,
+        tabId:                 this.id,
+        hasSoundPlayingMember: this.states.has(Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER),
+        hasMutedMember:        this.states.has(Constants.kTAB_STATE_HAS_MUTED_MEMBER),
+        hasAutoplayBlockedMember: this.states.has(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER),
+      });
+    }, 100);
+  }
+
+  inheritSharingStateFromChildren() {
+    if (!this.raw)
+      return;
+
+    // this is called too many times on a session restoration, so this should be throttled for better performance
+    if (this.delayedInheritSharingStateFromChildren)
+      clearTimeout(this.delayedInheritSharingStateFromChildren);
+
+    this.delayedInheritSharingStateFromChildren = setTimeout(() => {
+      this.delayedInheritSharingStateFromChildren = null;
+      if (!TabsStore.ensureLivingItem(this.raw))
+        return;
+
+      const parent = this.parent;
+      let modifiedCount = 0;
+
+      const sharingCameraCount = this.sharingCameraChildrenIds.size + this.maybeSharingCameraChildrenIds.size;
+      if (sharingCameraCount != this.lastSharingStateCounts.sharingCamera) {
+        this.lastSharingStateCounts.sharingCamera = sharingCameraCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER, sharingCameraCount > 0);
+        if (parent) {
+          if (sharingCameraCount > 0)
+            parent.$TST.maybeSharingCameraChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeSharingCameraChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      const sharingMicrophoneCount = this.sharingMicrophoneChildrenIds.size + this.maybeSharingMicrophoneChildrenIds.size;
+      if (sharingMicrophoneCount != this.lastSharingStateCounts.sharingMicrophone) {
+        this.lastSharingStateCounts.sharingMicrophone = sharingMicrophoneCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER, sharingMicrophoneCount > 0);
+        if (parent) {
+          if (sharingMicrophoneCount > 0)
+            parent.$TST.maybeSharingMicrophoneChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeSharingMicrophoneChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      const sharingScreenCount = this.sharingScreenChildrenIds.size + this.maybeSharingScreenChildrenIds.size;
+      if (sharingScreenCount != this.lastSharingStateCounts.sharingScreen) {
+        this.lastSharingStateCounts.sharingScreen = sharingScreenCount;
+        this.toggleState(Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER, sharingScreenCount > 0);
+        if (parent) {
+          if (sharingScreenCount > 0)
+            parent.$TST.maybeSharingScreenChildrenIds.add(this.id);
+          else
+            parent.$TST.maybeSharingScreenChildrenIds.delete(this.id);
+        }
+        modifiedCount++;
+      }
+
+      if (modifiedCount == 0)
+        return;
+
+      if (parent)
+        parent.$TST.inheritSharingStateFromChildren();
+
+      SidebarConnection.sendMessage({
+        type:     Constants.kCOMMAND_NOTIFY_TAB_SHARING_STATE_UPDATED,
+        windowId: this.raw.windowId,
+        tabId:    this.id,
+        hasSharingCameraMember:     this.states.has(Constants.kTAB_STATE_HAS_SHARING_CAMERA_MEMBER),
+        hasSharingMicrophoneMember: this.states.has(Constants.kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER),
+        hasSharingScreenMember:     this.states.has(Constants.kTAB_STATE_HAS_SHARING_SCREEN_MEMBER),
+      });
+    }, 100);
+  }
+
+
+  onNativeGroupModified(oldGroupId) {
+    if (this.raw.groupId == -1) {
+      TabsStore.removeNativelyGroupedTab(this.raw);
+    }
+    else {
+      TabsStore.addNativelyGroupedTab(this.raw);
+    }
+
+    this.setAttribute(Constants.kGROUP_ID, this.raw.groupId);
+
+    const group = this.nativeTabGroup;
+    if (group) {
+      group.incognito = this.tab.incognito;
+      group.$TST.reindex(this.raw);
+    }
+
+    if (oldGroupId && oldGroupId != -1) {
+      TabGroup.get(oldGroupId)?.$TST.reindex();
+    }
+
+    Tab.onNativeGroupModified.dispatch(this.raw);
+  }
+
+
+  setAttribute(attribute, value) {
+    super.setAttribute(attribute, value);
+    this.invalidateCache();
+  }
+
+  removeAttribute(attribute) {
+    super.removeAttribute(attribute);
+    this.invalidateCache();
+  }
+
+
+  resolveOpened() {
+    if (!mOpenedResolvers.has(this.id))
+      return;
+    for (const resolver of mOpenedResolvers.get(this.id)) {
+      resolver.resolve();
+    }
+    mOpenedResolvers.delete(this.id);
+  }
+  rejectOpened() {
+    if (!mOpenedResolvers.has(this.id))
+      return;
+    for (const resolver of mOpenedResolvers.get(this.id)) {
+      resolver.reject();
+    }
+    mOpenedResolvers.delete(this.id);
+  }
+
+  apply(exported) { // not optimized and unsafe yet!
+    if (!this.raw)
+      return;
+
+    TabsStore.removeTabFromIndexes(this.raw);
+
+    for (const key of Object.keys(exported)) {
+      if (key == '$TST')
+        continue;
+      if (key in this.raw)
+        this.raw[key] = exported[key];
+    }
+
+    this.uniqueId = exported.$TST.uniqueId;
+    this.promisedUniqueId = Promise.resolve(this.uniqueId);
+
+    this.states     = new Set(exported.$TST.states);
+    this.attributes = exported.$TST.attributes;
+
+    this.parent   = exported.$TST.parentId;
+    this.children = exported.$TST.childIds || [];
+
+    TabsStore.updateIndexesForTab(this.raw);
+  }
+
+  async exportFullTreeItemProperties(fullExportedTreeItem, { isContextTab, permissions, cache } = {}) {
+    const favIconUrl = await (
+      (!permissions ||
+       (!permissions.has(kPERMISSION_TABS) &&
+        (!permissions.has(kPERMISSION_ACTIVE_TAB) ||
+         !this.raw?.active))) ?
+        null :
+        (this.raw?.id in cache.effectiveFavIconUrls) ?
+          cache.effectiveFavIconUrls[this.raw?.id] :
+          this.raw?.favIconUrl?.startsWith('data:') ?
+            this.raw?.favIconUrl :
+            TabFavIconHelper.getLastEffectiveFavIconURL(this.raw).catch(ApiTabs.handleMissingTabError)
+    );
+
+    if (!(this.raw.id in cache.effectiveFavIconUrls))
+      cache.effectiveFavIconUrls[this.raw.id] = favIconUrl;
+
+    const allowedProperties = new Set([
+      // basic tabs.Tab properties
+      'active',
+      'attention',
+      'audible',
+      'autoDiscardable',
+      'discarded',
+      'height',
+      'hidden',
+      'highlighted',
+      //'id',
+      'incognito',
+      'index',
+      'isArticle',
+      'isInReaderMode',
+      'lastAccessed',
+      'mutedInfo',
+      'openerTabId',
+      'pinned',
+      'selected',
+      'sessionId',
+      'sharingState',
+      'status',
+      'successorId',
+      'width',
+      //'windowId',
+    ]);
+
+    if (permissions.has(kPERMISSION_TABS) ||
+        (permissions.has(kPERMISSION_ACTIVE_TAB) &&
+         (this.raw.active ||
+          isContextTab))) {
+      // specially allowed with "tabs" or "activeTab" permission
+      allowedProperties.add('favIconUrl');
+      allowedProperties.add('title');
+      allowedProperties.add('url');
+      fullExportedTreeItem.effectiveFavIconUrl = favIconUrl;
+    }
+    if (permissions.has(kPERMISSION_COOKIES)) {
+      allowedProperties.add('cookieStoreId');
+      fullExportedTreeItem.cookieStoreName = this.raw.$TST.cookieStoreName;
+    }
+
+    for (const property of allowedProperties) {
+      if (property in this.raw)
+        fullExportedTreeItem[property] = this.raw[property];
+    }
+  }
+
+
+  applyStatesToElement() {
+    if (!this.element)
+      return;
+
+    super.applyStatesToElement();
+
+    if (this.states.has(Constants.kTAB_STATE_HIGHLIGHTED)) {
+      this.element.setAttribute('aria-selected', 'true');
+    }
+  }
+
+  set favIconUrl(url) {
+    if (this.element && 'favIconUrl' in this.element)
+      this.element.favIconUrl = url;
+    this.invalidateCache();
+  }
+
+
+  //===================================================================
+  // class methods
+  //===================================================================
+
+  static track(tab) {
+    const trackedTab = Tab.get(tab.id);
+    if (!trackedTab ||
+        !(tab.$TST instanceof Tab)) {
+      new Tab(tab);
+    }
+    else {
+      if (trackedTab)
+        tab = trackedTab;
+      const win = TabsStore.windows.get(tab.windowId);
+      win.trackTab(tab);
+    }
+    return trackedTab || tab;
+  }
+
+  static untrack(tabId) {
+    const tab = Tab.get(tabId);
+    if (!tab) // already untracked
+      return;
+    const win = TabsStore.windows.get(tab.windowId);
+    if (win)
+      win.untrackTab(tabId);
+  }
+
+  static isTracked(tabId) {
+    return TabsStore.tabs.has(tabId);
+  }
+
+  static get(tabId) {
+    if (!tabId) {
+      return null;
+    }
+    if (tabId && typeof tabId.color !== 'undefined') { // for backward compatibility
+      return TabGroup.get(tabId.id);
+    }
+    return TabsStore.tabs.get(typeof tabId == 'number' ? tabId : tabId?.id);
+  }
+
+  static getByUniqueId(id) {
+    if (!id)
+      return null;
+    return TabsStore.ensureLivingItem(TabsStore.tabsByUniqueId.get(id));
+  }
+
+  static needToWaitTracked(windowId) {
+    if (windowId) {
+      const tabs = mIncompletelyTrackedTabs.get(windowId);
+      return tabs && tabs.size > 0;
+    }
+    for (const tabs of mIncompletelyTrackedTabs.values()) {
+      if (tabs && tabs.size > 0)
+        return true;
+    }
+    return false;
+  }
+
+  static async waitUntilTrackedAll(windowId, options = {}) {
+    const tabSets = windowId ?
+      [mIncompletelyTrackedTabs.get(windowId)] :
+      [...mIncompletelyTrackedTabs.values()];
+    return Promise.all(tabSets.map(tabs => {
+      if (!tabs)
+        return;
+      let tabIds = Array.from(tabs, tab => tab.id);
+      if (options.exceptionTabId)
+        tabIds = tabIds.filter(id => id != options.exceptionTabId);
+      return Tab.waitUntilTracked(tabIds, options);
+    }));
+  }
+
+  static async waitUntilTracked(tabId, options = {}) {
+    if (!tabId)
+      return null;
+
+    if (Array.isArray(tabId))
+      return Promise.all(tabId.map(id => Tab.waitUntilTracked(id, options)));
+
+    const windowId = TabsStore.getCurrentWindowId();
+    if (windowId) {
+      const tabs = TabsStore.removedTabsInWindow.get(windowId);
+      if (tabs?.has(tabId))
+        return null; // already removed tab
+    }
+
+    const key = `${tabId}:${!!options.element}`;
+    if (mPromisedTrackedTabs.has(key))
+      return mPromisedTrackedTabs.get(key);
+
+    const promisedTracked = waitUntilTracked(tabId, options);
+    mPromisedTrackedTabs.set(key, promisedTracked);
+    return promisedTracked.then(tab => {
+      // Don't claer the last promise, because it is required to process following "waitUntilTracked" callbacks sequentically.
+      //if (mPromisedTrackedTabs.get(key) == promisedTracked)
+      //  mPromisedTrackedTabs.delete(key);
+      return tab;
+    }).catch(_error => {
+      //if (mPromisedTrackedTabs.get(key) == promisedTracked)
+      //  mPromisedTrackedTabs.delete(key);
+      return null;
+    });
+  }
+
+  static needToWaitMoved(windowId) {
+    if (windowId) {
+      const tabs = mMovingTabs.get(windowId);
+      return tabs && tabs.size > 0;
+    }
+    for (const tabs of mMovingTabs.values()) {
+      if (tabs && tabs.size > 0)
+        return true;
+    }
+    return false;
+  }
+
+  static async waitUntilMovedAll(windowId) {
+    const tabSets = [];
+    if (windowId) {
+      tabSets.push(mMovingTabs.get(windowId));
+    }
+    else {
+      for (const tabs of mMovingTabs.values()) {
+        tabSets.push(tabs);
+      }
+    }
+    return Promise.all(tabSets.map(tabs => tabs && Promise.all(tabs)));
+  }
+
+  static init(tab, options = {}) {
+    log('initalize tab ', tab);
+    if (!tab) {
+      const error = new Error('Fatal error: invalid tab is given to Tab.init()');
+      console.log(error, error.stack);
+      throw error;
+    }
+    const trackedTab = Tab.get(tab.id);
+    if (trackedTab)
+      tab = trackedTab;
+    tab.$TST = trackedTab?.$TST || new Tab(tab);
+    tab.$TST.updateUniqueId().then(tab.$TST.onUniqueIdGenerated);
+
+    if (tab.active)
+      tab.$TST.addState(Constants.kTAB_STATE_ACTIVE);
+
+    // When a new "child" tab was opened and the "parent" tab was closed
+    // immediately by someone outside of TST, both new "child" and the
+    // "parent" were closed by TST because all new tabs had
+    // "subtree-collapsed" state initially and such an action was detected
+    // as "closing of a collapsed tree".
+    // The initial state was introduced in old versions, but I forgot why
+    // it was required. "When new child tab is attached, collapse other
+    // tree" behavior works as expected even if the initial state is not
+    // there. Thus I remove the initial state for now, to avoid the
+    // annoying problem.
+    // See also: https://github.com/piroor/treestyletab/issues/2162
+    // tab.$TST.addState(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+
+    Tab.onInitialized.dispatch(tab, options);
+
+    if (options.existing) {
+      tab.$TST.addState(Constants.kTAB_STATE_ANIMATION_READY);
+      tab.$TST.opened = Promise.resolve(true).then(() => {
+        tab.$TST.resolveOpened();
+      });
+      tab.$TST.temporaryMetadata.delete('opening');
+      tab.$TST.temporaryMetadata.set('openedCompletely', true);
+    }
+    else {
+      tab.$TST.temporaryMetadata.set('opening', true);
+      tab.$TST.temporaryMetadata.delete('openedCompletely');
+      tab.$TST.opened = new Promise((resolve, reject) => {
+        tab.$TST.opening = false;
+        const resolvers = mOpenedResolvers.get(tab.id) || new Set();
+        resolvers.add({ resolve, reject });
+        mOpenedResolvers.set(tab.id, resolvers);
+      }).then(() => {
+        tab.$TST.temporaryMetadata.set('openedCompletely', true);
+      });
+    }
+
+    return tab;
+  }
+
+  static import(tab) {
+    const existingTab = Tab.get(tab.id);
+    if (!existingTab) {
+      return Tab.init(tab);
+    }
+    existingTab.$TST.apply(tab);
+    return existingTab;
+  }
+
+  //===================================================================
+  // get single tab
+  //===================================================================
+
+  // Note that this function can return null if it is the first tab of
+  // a new window opened by the "move tab to new window" command.
+  static getActiveTab(windowId) {
+    return TabsStore.ensureLivingItem(TabsStore.activeTabInWindow.get(windowId));
+  }
+
+  static getFirstTab(windowId) {
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.livingTabsInWindow.get(windowId),
+      living:  true,
+      ordered: true
+    });
+  }
+
+  static getLastTab(windowId) {
+    return TabsStore.query({
+      windowId,
+      tabs:   TabsStore.livingTabsInWindow.get(windowId),
+      living: true,
+      last:   true
+    });
+  }
+
+  static getFirstVisibleTab(windowId) { // visible, not-collapsed, not-hidden
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.visibleTabsInWindow.get(windowId),
+      visible: true,
+      ordered: true
+    });
+  }
+
+  static getLastVisibleTab(windowId) { // visible, not-collapsed, not-hidden
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.visibleTabsInWindow.get(windowId),
+      visible: true,
+      last:    true,
+    });
+  }
+
+  static getLastOpenedTab(windowId) {
+    const tabs = Tab.getTabs(windowId);
+    return tabs.length > 0 ?
+      tabs.sort((a, b) => b.id - a.id)[0] :
+      null ;
+  }
+
+  static getLastPinnedTab(windowId) { // visible, pinned
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.pinnedTabsInWindow.get(windowId),
+      living:  true,
+      ordered: true,
+      last:    true
+    });
+  }
+
+  static getFirstUnpinnedTab(windowId) { // not-pinned
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.unpinnedTabsInWindow.get(windowId),
+      ordered: true
+    });
+  }
+
+  static getLastUnpinnedTab(windowId) { // not-pinned
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.unpinnedTabsInWindow.get(windowId),
+      ordered: true,
+      last:    true
+    });
+  }
+
+  static getFirstNormalTab(windowId) { // visible, not-collapsed, not-pinned
+    return TabsStore.query({
+      windowId,
+      tabs:    TabsStore.unpinnedTabsInWindow.get(windowId),
+      normal:  true,
+      ordered: true
+    });
+  }
+
+  static getGroupTabForOpener(opener) {
+    if (!opener)
+      return null;
+    TabsStore.assertValidTab(opener);
+    const groupTab = TabsStore.query({
+      windowId:   opener.windowId,
+      tabs:       TabsStore.groupTabsInWindow.get(opener.windowId),
+      living:     true,
+      attributes: [
+        Constants.kCURRENT_URI,
+        new RegExp(`openerTabId=${opener.$TST.uniqueId.id}($|[#&])`)
+      ]
+    });
+    if (!groupTab ||
+        groupTab == opener ||
+        groupTab.pinned == opener.pinned)
+      return null;
+    return groupTab;
+  }
+
+  static getOpenerFromGroupTab(groupTab) {
+    if (!groupTab.$TST.isGroupTab)
+      return null;
+    TabsStore.assertValidTab(groupTab);
+    const openerTabId = (new URL(groupTab.url)).searchParams.get('openerTabId');
+    const openerTab = Tab.getByUniqueId(openerTabId);
+    if (!openerTab ||
+        openerTab == groupTab ||
+        openerTab.pinned == groupTab.pinned)
+      return null;
+    return openerTab;
+  }
+
+  static getSubstanceFromAliasGroupTab(groupTab) {
+    if (!groupTab.$TST.isGroupTab)
+      return null;
+    TabsStore.assertValidTab(groupTab);
+    const aliasTabId = (new URL(groupTab.url)).searchParams.get('aliasTabId');
+    const aliasTab = Tab.getByUniqueId(aliasTabId);
+    if (!aliasTab ||
+        aliasTab == groupTab ||
+        aliasTab.pinned == groupTab.pinned)
+      return null;
+    return aliasTab;
+  }
+
+  //===================================================================
+  // grap tabs
+  //===================================================================
+
+  static getActiveTabs() {
+    return Array.from(TabsStore.activeTabInWindow.values(), TabsStore.ensureLivingItem);
+  }
+
+  static getAllTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:     TabsStore.getTabsMap(TabsStore.livingTabsInWindow, windowId),
+      living:   true,
+      ordered:  true,
+      ...options
+    });
+  }
+
+  static getTabAt(windowId, index) {
+    const tabs    = TabsStore.livingTabsInWindow.get(windowId);
+    const allTabs = TabsStore.windows.get(windowId).tabs;
+    return TabsStore.query({
+      windowId,
+      tabs,
+      living:       true,
+      fromIndex:    Math.max(0, index - (allTabs.size - tabs.size)),
+      logicalIndex: index,
+      first:        true
+    });
+  }
+
+  static getTabs(windowId = null, options = {}) { // only visible, including collapsed and pinned
+    return TabsStore.queryAll({
+      windowId,
+      tabs:         TabsStore.getTabsMap(TabsStore.controllableTabsInWindow, windowId),
+      controllable: true,
+      ordered:      true,
+      ...options
+    });
+  }
+
+  static getTabsBetween(begin, end) {
+    if (!begin || !TabsStore.ensureLivingItem(begin) ||
+        !end || !TabsStore.ensureLivingItem(end))
+      throw new Error('getTabsBetween requires valid two tabs');
+    if (begin.windowId != end.windowId)
+      throw new Error('getTabsBetween requires two tabs in same window');
+
+    if (begin == end)
+      return [];
+    if (begin.index > end.index)
+      [begin, end] = [end, begin];
+    return TabsStore.queryAll({
+      windowId: begin.windowId,
+      tabs:     TabsStore.getTabsMap(TabsStore.controllableTabsInWindow, begin.windowId),
+      id:       (id => id != begin.id && id != end.id),
+      fromId:   begin.id,
+      toId:     end.id
+    });
+  }
+
+  static getNormalTabs(windowId = null, options = {}) { // only visible, including collapsed, not pinned
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.unpinnedTabsInWindow, windowId),
+      normal:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getVisibleTabs(windowId = null, options = {}) { // visible, not-collapsed, not-hidden
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.visibleTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getHiddenTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.livingTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      hidden:  true,
+      ...options
+    });
+  }
+
+  static getPinnedTabs(windowId = null, options = {}) { // visible, pinned
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.pinnedTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getUnpinnedTabs(windowId = null, options = {}) { // visible, not pinned
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.unpinnedTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getRootTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:         TabsStore.getTabsMap(TabsStore.rootTabsInWindow, windowId),
+      controllable: true,
+      ordered:      true,
+      ...options
+    });
+  }
+
+  static getLastRootTab(windowId, options = {}) {
+    const tabs = Tab.getRootTabs(windowId, options);
+    return tabs[tabs.length - 1];
+  }
+
+  static collectRootTabs(tabs) {
+    const tabsSet = new Set(tabs);
+    return tabs.filter(tab => {
+      if (!TabsStore.ensureLivingItem(tab))
+        return false;
+      const parent = tab.$TST.parent;
+      return !parent || !tabsSet.has(parent);
+    });
+  }
+
+  static getSubtreeCollapsedTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:     TabsStore.getTabsMap(TabsStore.subtreeCollapsableTabsInWindow, windowId),
+      living:   true,
+      hidden:   false,
+      ordered:  true,
+      ...options
+    });
+  }
+
+  static getGroupTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.groupTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getLoadingTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.loadingTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getDraggingTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.draggingTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getRemovingTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.removingTabsInWindow, windowId),
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getDuplicatingTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.duplicatingTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getHighlightedTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.highlightedTabsInWindow, windowId),
+      living:  true,
+      ordered: true,
+      ...options
+    });
+  }
+
+  static getSelectedTabs(windowId = null, options = {}) {
+    const tabs = TabsStore.getTabsMap(TabsStore.selectedTabsInWindow, windowId);
+    const selectedTabs = TabsStore.queryAll({
+      windowId,
+      tabs,
+      living:  true,
+      ordered: true,
+      ...options
+    });
+    const highlightedTabs = TabsStore.getTabsMap(TabsStore.highlightedTabsInWindow, windowId);
+    if (!highlightedTabs ||
+        highlightedTabs.size < 2)
+      return selectedTabs;
+
+    if (options.iterator)
+      return (function* () {
+        const alreadyReturnedTabs = new Set();
+        for (const tab of selectedTabs) {
+          yield tab;
+          alreadyReturnedTabs.add(tab);
+        }
+        for (const tab of highlightedTabs.values()) {
+          if (!alreadyReturnedTabs.has(tab))
+            yield tab;
+        }
+      })();
+    else
+      return TreeItem.sort(Array.from(new Set([...selectedTabs, ...Array.from(highlightedTabs.values())])));
+  }
+
+  static getNeedToBeSynchronizedTabs(windowId = null, options = {}) {
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.unsynchronizedTabsInWindow, windowId),
+      visible: true,
+      ...options
+    });
+  }
+
+  static hasNeedToBeSynchronizedTab(windowId) {
+    return !!TabsStore.query({
+      windowId,
+      tabs:     TabsStore.getTabsMap(TabsStore.unsynchronizedTabsInWindow, windowId),
+      visible:  true
+    });
+  }
+
+  static hasLoadingTab(windowId) {
+    return !!TabsStore.query({
+      windowId,
+      tabs:     TabsStore.getTabsMap(TabsStore.loadingTabsInWindow, windowId),
+      visible:  true
+    });
+  }
+
+  static hasDuplicatedTabs(windowId, options = {}) {
+    const tabs = TabsStore.queryAll({
+      windowId,
+      tabs:   TabsStore.getTabsMap(TabsStore.livingTabsInWindow, windowId),
+      living: true,
+      ...options,
+      iterator: true
+    });
+    const tabKeys = new Set();
+    for (const tab of tabs) {
+      const key = `${tab.cookieStoreId}\n${tab.url}`;
+      if (tabKeys.has(key))
+        return true;
+      tabKeys.add(key);
+    }
+    return false;
+  }
+
+  static hasMultipleTabs(windowId, options = {}) {
+    const tabs = TabsStore.queryAll({
+      windowId,
+      tabs:   TabsStore.getTabsMap(TabsStore.livingTabsInWindow, windowId),
+      living: true,
+      ...options,
+      iterator: true
+    });
+    let count = 0;
+    // eslint-disable-next-line no-unused-vars
+    for (const tab of tabs) {
+      count++;
+      if (count > 1)
+        return true;
+    }
+    return false;
+  }
+
+  // "Recycled tab" is an existing but reused tab for session restoration.
+  static getRecycledTabs(windowId = null, options = {}) {
+    const userNewTabUrls = configs.guessNewOrphanTabAsOpenedByNewTabCommandUrl.split('|').map(part => sanitizeForRegExpSource(part.trim())).join('|');
+    return TabsStore.queryAll({
+      windowId,
+      tabs:       TabsStore.getTabsMap(TabsStore.livingTabsInWindow, windowId),
+      living:     true,
+      states:     [Constants.kTAB_STATE_RESTORED, false],
+      attributes: [Constants.kCURRENT_URI, new RegExp(`^(|${userNewTabUrls}|about:newtab|about:blank|about:privatebrowsing)$`)],
+      ...options
+    });
+  }
+
+  //===================================================================
+  // utilities
+  //===================================================================
+
+  static bufferedTooltipTextChanges = new Map();
+  static broadcastTooltipText(tabs) {
+    if (!Constants.IS_BACKGROUND ||
+        !Tab.broadcastTooltipText.enabled)
+      return;
+
+    if (!Array.isArray(tabs))
+      tabs = [tabs];
+
+    if (tabs.length == 0)
+      return;
+
+    for (const tab of tabs) {
+      Tab.bufferedTooltipTextChanges.set(tab.id, {
+        windowId: tab.windowId,
+        tabId:    tab.id,
+        high:     tab.$TST.highPriorityTooltipText,
+        low:      tab.$TST.lowPriorityTooltipText,
+      });
+    }
+
+    const triedAt = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+    Tab.broadcastTooltipText.triedAt = triedAt;
+    (Constants.IS_BACKGROUND ?
+      setTimeout : // because window.requestAnimationFrame is decelerate for an invisible document.
+      window.requestAnimationFrame)(() => {
+      if (Tab.broadcastTooltipText.triedAt != triedAt)
+        return;
+
+      // Let's flush buffered changes!
+      const messageForWindows = new Map();
+      for (const change of Tab.bufferedTooltipTextChanges.values()) {
+        const message = messageForWindows.get(change.windowId) || {
+          type:     Constants.kCOMMAND_BROADCAST_TAB_TOOLTIP_TEXT,
+          windowId: change.windowId,
+          tabIds:   [],
+          changes:  [],
+        };
+        message.tabIds.push(change.tabId);
+        message.changes.push(change);
+      }
+      for (const message of messageForWindows) {
+        SidebarConnection.sendMessage(message);
+      }
+      Tab.bufferedTooltipTextChanges.clear();
+    }, 0);
+  }
+
+  static bufferedStatesChanges = new Map();
+  static broadcastState(tabs, { add, remove } = {}) {
+    if (!Constants.IS_BACKGROUND ||
+        !Tab.broadcastState.enabled)
+      return;
+
+    if (!Array.isArray(tabs))
+      tabs = [tabs];
+
+    if (tabs.length == 0)
+      return;
+
+    for (const tab of tabs) {
+      const message = Tab.bufferedStatesChanges.get(tab.id) || {
+        windowId: tab.windowId,
+        tabId:    tab.id,
+        add:      new Set(),
+        remove:   new Set(),
+      };
+      if (add)
+        for (const state of add) {
+          message.add.add(state);
+          message.remove.delete(state);
+        }
+      if (remove)
+        for (const state of remove) {
+          message.add.delete(state);
+          message.remove.add(state);
+        }
+
+      Tab.bufferedStatesChanges.set(tab.id, message);
+    }
+
+    const triedAt = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+    Tab.broadcastState.triedAt = triedAt;
+    (Constants.IS_BACKGROUND ?
+      setTimeout : // because window.requestAnimationFrame is decelerate for an invisible document.
+      window.requestAnimationFrame)(() => {
+      if (Tab.broadcastState.triedAt != triedAt)
+        return;
+
+      // Let's flush buffered changes!
+
+      // Unify buffered changes only if same type changes are consecutive.
+      // Otherwise the order of changes would be mixed and things may become broken.
+      const unifiedMessages = [];
+      let lastKey;
+      let unifiedMessage = null;
+      for (const message of Tab.bufferedStatesChanges.values()) {
+        const key = `${message.windowId}/add:${[...message.add]}/remove:${[...message.remove]}`;
+        if (key != lastKey) {
+          if (unifiedMessage)
+            unifiedMessages.push(unifiedMessage);
+          unifiedMessage = null;
+        }
+        lastKey = key;
+        unifiedMessage = unifiedMessage || {
+          type:     Constants.kCOMMAND_BROADCAST_TAB_STATE,
+          windowId: message.windowId,
+          tabIds:   new Set(),
+          add:      message.add,
+          remove:   message.remove,
+        };
+        unifiedMessage.tabIds.add(message.tabId);
+      }
+      if (unifiedMessage)
+        unifiedMessages.push(unifiedMessage);
+      Tab.bufferedStatesChanges.clear();
+
+      // SidebarConnection.sendMessage() has its own bulk-send mechanism,
+      // so we don't need to bundle them like an array.
+      for (const message of unifiedMessages) {
+        SidebarConnection.sendMessage({
+          type:     Constants.kCOMMAND_BROADCAST_TAB_STATE,
+          windowId: message.windowId,
+          tabIds:   [...message.tabIds],
+          add:      [...message.add],
+          remove:   [...message.remove],
+        });
+      }
+    }, 0);
+  }
+
+  static getOtherTabs(windowId, ignoreTabs, options = {}) {
+    const query = {
+      windowId: windowId,
+      tabs:     TabsStore.livingTabsInWindow.get(windowId),
+      ordered:  true
+    };
+    if (Array.isArray(ignoreTabs) &&
+        ignoreTabs.length > 0)
+      query['!id'] = ignoreTabs.map(tab => tab.id);
+    return TabsStore.queryAll({ ...query, ...options });
+  };
+
+  static getIndex(tab, { ignoreTabs } = {}) {
+    if (!TabsStore.ensureLivingItem(tab))
+      return -1;
+    TabsStore.assertValidTab(tab);
+    return Tab.getOtherTabs(tab.windowId, ignoreTabs).indexOf(tab);
+  }
+
+  static calculateNewTabIndex({ insertAfter, insertBefore, ignoreTabs } = {}) {
+    // We need to calculate new index based on "insertAfter" at first, to avoid
+    // placing of the new tab after hidden tabs (too far from the location it
+    // should be.)
+    if (insertAfter)
+      return Tab.getIndex(insertAfter, { ignoreTabs }) + 1;
+    if (insertBefore)
+      return Tab.getIndex(insertBefore, { ignoreTabs });
+    return -1;
+  }
+
+  static async doAndGetNewTabs(asyncTask, windowId) {
+    const tabsQueryOptions = {
+      windowType: 'normal'
+    };
+    if (windowId) {
+      tabsQueryOptions.windowId = windowId;
+    }
+    const beforeTabs = await browser.tabs.query(tabsQueryOptions).catch(ApiTabs.createErrorHandler());
+    const beforeIds  = mapAndFilterUniq(beforeTabs, tab => tab.id, { set: true });
+    await asyncTask();
+    const afterTabs = await browser.tabs.query(tabsQueryOptions).catch(ApiTabs.createErrorHandler());
+    const addedTabs = mapAndFilter(afterTabs,
+                                   tab => !beforeIds.has(tab.id) && Tab.get(tab.id) || undefined);
+    return addedTabs;
+  }
+
+  static dumpAll(windowId) {
+    if (!configs.debug)
+      return;
+    let output = 'dumpAllTabs';
+    for (const tab of Tab.getAllTabs(windowId, {iterator: true })) {
+      output += '\n' + toLines([...tab.$TST.ancestors.reverse(), tab],
+                               tab => `${tab.id}${tab.pinned ? ' [pinned]' : ''}`,
+                               ' => ');
+    }
+    log(output);
+  }
+}
+
+
+const mWaitingTasks = new Map();
+
+function destroyWaitingTabTask(task) {
+  const tasks = mWaitingTasks.get(task.tabId);
+  if (tasks)
+    tasks.delete(task);
+
+  if (task.timeout)
+    clearTimeout(task.timeout);
+
+  const resolve     = task.resolve;
+  const stack       = task.stack;
+
+  task.tabId       = undefined;
+  task.resolve     = undefined;
+  task.timeout     = undefined;
+  task.stack       = undefined;
+
+  return { resolve, stack };
+}
+
+function onWaitingTabTracked(tab) {
+  if (!tab)
+    return;
+
+  const tasks = mWaitingTasks.get(tab.id);
+  if (!tasks)
+    return;
+
+  mWaitingTasks.delete(tab.id);
+
+  for (const task of tasks) {
+    tasks.delete(task);
+    const { resolve } = destroyWaitingTabTask(task);
+    if (!resolve)
+      continue;
+    resolve(tab);
+  }
+}
+TreeItem.onElementBound.addListener(onWaitingTabTracked);
+Tab.onTracked.addListener(onWaitingTabTracked);
+
+function onWaitingTabDestroyed(tab) {
+  if (!tab)
+    return;
+
+  const tasks = mWaitingTasks.get(tab.id);
+  if (!tasks)
+    return;
+
+  mWaitingTasks.delete(tab.id);
+
+  const scope = TabsStore.getCurrentWindowId() || 'bg';
+  for (const task of tasks) {
+    tasks.delete(task);
+    const { resolve, stack } = destroyWaitingTabTask(task);
+    if (!resolve)
+      continue;
+
+    log(`Tab.waitUntilTracked: ${tab.id} is destroyed while waiting (in ${scope})\n${stack}`);
+    resolve(null);
+  }
+}
+Tab.onDestroyed.addListener(onWaitingTabDestroyed);
+
+function onWaitingTabRemoved(removedTabId, _removeInfo) {
+  const tasks = mWaitingTasks.get(removedTabId);
+  if (!tasks)
+    return;
+
+  mWaitingTasks.delete(removedTabId);
+
+  const scope = TabsStore.getCurrentWindowId() || 'bg';
+  for (const task of tasks) {
+    tasks.delete(task);
+    const { resolve, stack } = destroyWaitingTabTask(task);
+    if (!resolve)
+      continue;
+
+    log(`Tab.waitUntilTracked: ${removedTabId} is removed while waiting (in ${scope})\n${stack}`);
+    resolve(null);
+  }
+}
+browser.tabs.onRemoved.addListener(onWaitingTabRemoved);
+
+async function waitUntilTracked(tabId, options = {}) {
+  if (!tabId) {
+    return null;
+  }
+  const stack = configs.debug && new Error().stack;
+  const tab = Tab.get(tabId);
+  if (tab) {
+    onWaitingTabTracked(tab);
+    if (options.element)
+      return tab.$TST.promisedElement;
+    return tab;
+  }
+  const tasks = mWaitingTasks.get(tabId) || new Set();
+  const task = {
+    tabId,
+    stack,
+  };
+  tasks.add(task);
+  mWaitingTasks.set(tabId, tasks);
+  return new Promise((resolve, _reject) => {
+    task.resolve = resolve;
+    task.timeout = setTimeout(() => {
+      const { resolve } = destroyWaitingTabTask(task);
+      if (resolve) {
+        log(`Tab.waitUntilTracked for ${tabId} is timed out (in ${TabsStore.getCurrentWindowId() || 'bg'})\b${stack}`);
+        resolve(null);
+      }
+    }, configs.maximumDelayUntilTabIsTracked); // Tabs.moveTabs() between windows may take much time
+    browser.tabs.get(tabId).catch(_error => null).then(tab => {
+      if (tab) {
+        if (Tab.get(tabId))
+          onWaitingTabTracked(tab);
+        return;
+      }
+      const { resolve } = destroyWaitingTabTask(task);
+      if (resolve) {
+        log('waitUntilTracked was called for unexisting tab');
+        resolve(null);
+      }
+    });
+  }).then(() => destroyWaitingTabTask(task));
+}
+
+Tab.broadcastTooltipText.enabled = false;
+Tab.broadcastState.enabled = false;
+
+// utility
+TreeItem.get = item => {
+  if (!item) {
+    return null;
+  }
+  switch (item?.type) {
+    case TreeItem.TYPE_TAB:
+      return Tab.get(item.id);
+
+    case TreeItem.TYPE_GROUP:
+      return TabGroup.get(item.id);
+
+    case TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER:
+      return TabGroup.get(item.id).$TST.collapsedMembersCounterItem;
+
+    default:
+      return TabGroup.get(item) || Tab.get(item);
+  }
+};
diff --git a/waterfox/browser/components/sidebar/common/Window.js b/waterfox/browser/components/sidebar/common/Window.js
new file mode 100644
index 0000000000000..a77d4a248b83b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/Window.js
@@ -0,0 +1,303 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  configs
+} from './common.js';
+
+import * as TabsStore from './tabs-store.js';
+
+function log(...args) {
+  internalLogger('common/Window', ...args);
+}
+
+export default class Window {
+  constructor(windowId, tabGroups) {
+    const alreadyTracked = TabsStore.windows.get(windowId);
+    if (alreadyTracked)
+      return alreadyTracked;
+
+    log(`window ${windowId} is newly tracked`);
+
+    this.id    = windowId;
+    this.tabs  = new Map();
+    this.tabGroups = new Map();
+    if (tabGroups) {
+      this.initTabGroups(tabGroups);
+    }
+    this.order = [];
+
+    this.containerElement = null;
+    this.containerClassList = null;
+    this.pinnedContainerElement = null;
+
+    this.internalMovingTabs  = new Map();
+    this.alreadyMovedTabs    = new Map();
+    this.internalClosingTabs = new Set();
+    this.keepDescendantsTabs = new Set();
+    this.highlightingTabs    = new Set();
+    this.tabsToBeHighlightedAlone = new Set();
+    this.internallyMovingTabsForUpdatedNativeTabGroups = new Set();
+
+    this.subTreeMovingCount =
+      this.subTreeChildrenMovingCount =
+      this.doingIntelligentlyCollapseExpandCount =
+      this.duplicatingTabsCount = 0;
+
+    this.internallyFocusingTabs = new Set();
+    this.internallyFocusingByMouseTabs = new Set();
+    this.internallyFocusingSilentlyTabs = new Set();
+
+    this.preventToDetectTabBunchesUntil = Date.now() + configs.tabBunchesDetectionDelayOnNewWindow;
+
+    this.openingTabs   = new Set();
+
+    this.openedNewTabs = new Map();
+
+    this.bypassTabControlCount       = 0;
+    this.toBeOpenedNewTabCommandTab  = 0;
+    this.toBeOpenedTabsWithPositions = 0;
+    this.toBeOpenedTabsWithCookieStoreId = 0;
+    this.toBeOpenedOrphanTabs        = 0;
+
+    this.toBeAttachedTabs = new Set();
+    this.toBeDetachedTabs = new Set();
+
+    this.lastRelatedTabs = new Map();
+    this.previousLastRelatedTabs = new Map();
+
+    TabsStore.windows.set(windowId, this);
+    TabsStore.prepareIndexesForWindow(windowId);
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this.delayedDestroy = null;
+  }
+  initTabGroups(tabGroups) {
+    log(`initializing tabGroups of window ${this.id}: `, tabGroups);
+    this.tabGroups = new Map((tabGroups || []).map(group => [group.id, group]));
+  }
+
+  destroy() {
+    for (const tab of this.tabs.values()) {
+      if (tab.$TST)
+        tab.$TST.destroy();
+    }
+    this.tabs.clear();
+    this.tabGroups.clear();
+    TabsStore.windows.delete(this.id);
+    TabsStore.unprepareIndexesForWindow(this.id);
+
+    if (this.containerElement) {
+      const element = this.containerElement;
+      if (element.parentNode && !element.hasChildNodes())
+        element.parentNode.removeChild(element);
+    }
+    if (this.pinnedContainerElement) {
+      const element = this.element;
+      if (element.parentNode && !element.hasChildNodes())
+        element.parentNode.removeChild(element);
+    }
+    this.unbindElements();
+
+    this.tabs = null;
+    this.tabGroups = null;
+    this.order = null;
+    this.id = null;
+  }
+
+  clear() {
+    this.tabs.clear();
+    this.order = [];
+    TabsStore.unprepareIndexesForWindow(this.id);
+    TabsStore.prepareIndexesForWindow(this.id);
+    this.clearLastRelatedTabs();
+  }
+
+  clearLastRelatedTabs() {
+    for (const openerId of this.lastRelatedTabs.keys()) {
+      const opener = this.tabs.get(openerId);
+      if (!opener)
+        continue;
+      opener.$TST.newRelatedTabsCount = 0;
+    }
+    this.lastRelatedTabs.clear();
+    this.previousLastRelatedTabs.clear();
+  }
+
+  bindContainerElement(element) {
+    this.containerElement = element;
+    this.containerClassList = element.classList;
+  }
+
+  bindPinnedContainerElement(element) {
+    this.pinnedContainerElement = element;
+    this.pinnedContainerClassList = element.classList;
+  }
+
+  unbindElements() {
+    this.containerElement = null;
+    this.containerClassList = null;
+    this.pinnedContainerElement = null;
+    this.pinnedContainerClassList = null;
+  }
+
+  getOrderedTabs(startId, endId, tabs) {
+    const orderedIds = this.sliceOrder(startId, endId);
+    tabs = tabs || this.tabs;
+    return (function*() {
+      for (const id of orderedIds) {
+        const tab = tabs.get(id);
+        if (tab)
+          yield tab;
+      }
+    }).call(this);
+  }
+
+  getReversedOrderedTabs(startId, endId, tabs) {
+    const orderedIds = this.sliceOrder(startId, endId, this.order.slice(0).reverse());
+    tabs = tabs || this.tabs;
+    return (function*() {
+      for (const id of orderedIds) {
+        const tab = tabs.get(id);
+        if (tab)
+          yield tab;
+      }
+    }).call(this);
+  }
+
+  sliceOrder(startId, endId, orderedIds) {
+    if (!orderedIds)
+      orderedIds = this.order;
+    if (startId) {
+      if (!this.tabs.has(startId))
+        return [];
+      orderedIds = orderedIds.slice(orderedIds.indexOf(startId));
+    }
+    if (endId) {
+      if (!this.tabs.has(endId))
+        return [];
+      orderedIds = orderedIds.slice(0, orderedIds.indexOf(endId) + 1);
+    }
+    return orderedIds;
+  }
+
+  trackTab(tab) {
+    const alreadyTracked = TabsStore.tabs.get(tab.id);
+    if (alreadyTracked)
+      tab = alreadyTracked;
+
+    if (this.delayedDestroy) {
+      clearTimeout(this.delayedDestroy);
+      this.delayedDestroy = null;
+    }
+
+    const order = this.order;
+    if (this.tabs.has(tab.id)) { // already tracked: update
+      const prevState = tab.reindexedBy;
+      const index = order.indexOf(tab.id);
+      order.splice(index, 1);
+      order.splice(tab.index, 0, tab.id);
+      for (let i = Math.min(index, tab.index), maxi = Math.min(Math.max(index, tab.index) + 1, order.length); i < maxi; i++) {
+        const tab = this.tabs.get(order[i]);
+        if (!tab)
+          throw new Error(`Unknown tab: ${i}/${order[i]} (${order.join(', ')})`);
+        tab.index = i;
+        tab.reindexedBy = `Window.property.trackTab/update (${tab.index})`;
+        tab.$TST.invalidateCache();
+      }
+      const parent = tab.$TST.parent;
+      if (parent) {
+        parent.$TST.sortAndInvalidateChildren();
+        parent.$TST.invalidateCachedAncestors();
+      }
+      log(`tab ${dumpTab(tab)} is re-tracked under the window ${this.id}: `, prevState, index, '=>', tab.reindexedBy, order.join(', '));
+    }
+    else { // not tracked yet: add
+      this.tabs.set(tab.id, tab);
+      order.splice(tab.index, 0, tab.id);
+      for (let i = tab.index + 1, maxi = order.length; i < maxi; i++) {
+        const tab = this.tabs.get(order[i]);
+        if (!tab)
+          throw new Error(`Unknown tab: ${i}/${order[i]} (${order.join(', ')})`);
+        tab.index = i;
+        tab.reindexedBy = `Window.property.trackTab/new (${tab.index})`;
+        tab.$TST.invalidateCache();
+      }
+      log(`tab ${dumpTab(tab)} is newly tracked under the window ${this.id}: `, order);
+    }
+    TabsStore.updateIndexesForTab(tab);
+    tab.$TST.invalidateCache();
+    return tab;
+  }
+
+  detachTab(tabId) {
+    const tab = TabsStore.tabs.get(tabId);
+    if (!tab)
+      return;
+
+    TabsStore.removeTabFromIndexes(tab);
+
+    tab.$TST.detach();
+    this.tabs.delete(tabId);
+    const order = this.order;
+    const index = order.indexOf(tab.id);
+    if (index < 0) // the tab is not tracked yet!
+      return;
+    order.splice(index, 1);
+    if (this.tabs.size == 0) {
+      if (!TabsStore.getCurrentWindowId()) { // only in the background page - the sidebar has no need to destroy itself manually.
+        // the last tab can be removed with browser.tabs.closeWindowWithLastTab=false,
+        // so we should not destroy the window immediately.
+        if (this.delayedDestroy)
+          clearTimeout(this.delayedDestroy);
+        this.delayedDestroy = setTimeout(() => {
+          if (this.tabs &&
+            this.tabs.size == 0)
+            this.destroy();
+        }, (configs.collapseDuration, 1000) * 5);
+      }
+    }
+    else {
+      for (let i = index, maxi = order.length; i < maxi; i++) {
+        this.tabs.get(order[i]).index = i;
+      }
+    }
+    return tab;
+  }
+
+  untrackTab(tabId) {
+    const tab = this.detachTab(tabId);
+    if (tab)
+      tab.$TST.destroy();
+  }
+
+  export(full) {
+    const tabs = [];
+    for (const tab of this.getOrderedTabs()) {
+      tabs.push(tab.$TST.export(full));
+    }
+    return {
+      tabs,
+      tabGroups: [...this.tabGroups.values()].map(group => group.$TST.sanitized),
+    };
+  }
+}
+
+Window.onInitialized = new EventListenerManager();
+
+Window.init = (windowId, tabGroups) => {
+  const win = TabsStore.windows.get(windowId) || new Window(windowId, tabGroups);
+  if (tabGroups && tabGroups.size != win.tabGroups.size) {
+    win.initTabGroups(tabGroups);
+  }
+  Window.onInitialized.dispatch(win);
+  return win;
+}
diff --git a/waterfox/browser/components/sidebar/common/api-tabs.js b/waterfox/browser/components/sidebar/common/api-tabs.js
new file mode 100644
index 0000000000000..ea19a513b8a84
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/api-tabs.js
@@ -0,0 +1,137 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs
+} from './common.js';
+
+function log(...args) {
+  internalLogger('common/api-tabs', ...args);
+}
+
+export async function getIndexes(...queriedTabIds) {
+  log('getIndexes ', queriedTabIds);
+  if (queriedTabIds.length == 0)
+    return [];
+
+  const indexes = await Promise.all(queriedTabIds.map((tabId) => {
+    return browser.tabs.get(tabId)
+      .catch(e => {
+        handleMissingTabError(e);
+        return null;
+      });
+  }));
+  return indexes.map(tab => tab ? tab.index : -1);
+}
+
+export function isMissingTabError(error) {
+  return (
+    error &&
+    error.message &&
+    error.message.includes('Invalid tab ID:')
+  );
+}
+export function handleMissingTabError(error) {
+  if (!isMissingTabError(error))
+    throw error;
+  // otherwise, this error is caused from a tab already closed.
+  // we just ignore it.
+  //console.log('Invalid Tab ID error on: ' + error.stack);
+}
+
+export function isUnloadedError(error) {
+  return (
+    error &&
+    error.message &&
+    error.message.includes('can\'t access dead object')
+  );
+}
+export function handleUnloadedError(error) {
+  if (!isUnloadedError(error))
+    throw error;
+}
+
+export function isMissingHostPermissionError(error) {
+  return (
+    error &&
+    error.message &&
+    error.message.includes('Missing host permission for the tab')
+  );
+}
+export function handleMissingHostPermissionError(error) {
+  if (!isMissingHostPermissionError(error))
+    throw error;
+}
+
+export function createErrorHandler(...handlers) {
+  const stack = configs.debug && new Error().stack;
+  return (error) => {
+    try {
+      if (handlers.length > 0) {
+        let unhandledCount = 0;
+        handlers.forEach(handler => {
+          try {
+            handler(error);
+          }
+          catch(_error) {
+            unhandledCount++;
+          }
+        });
+        if (unhandledCount == handlers.length) // not handled
+          throw error;
+      }
+      else {
+        throw error;
+      }
+    }
+    catch(newError){
+      if (!configs.debug)
+        throw newError;
+      if (error == newError)
+        console.log('Unhandled Error: ', error, stack);
+      else
+        console.log('Unhandled Error: ', error, newError, stack);
+    }
+  };
+}
+
+export function createErrorSuppressor(...handlers) {
+  const stack = configs.debug && new Error().stack;
+  return (error) => {
+    try {
+      if (handlers.length > 0) {
+        let unhandledCount = 0;
+        handlers.forEach(handler => {
+          try {
+            handler(error);
+          }
+          catch(_error) {
+            unhandledCount++;
+          }
+        });
+        if (unhandledCount == handlers.length) // not handled
+          throw error;
+      }
+      else {
+        throw error;
+      }
+    }
+    catch(newError){
+      if (error &&
+          error.message &&
+          error.message.indexOf('Could not establish connection. Receiving end does not exist.') == 0)
+        return;
+      if (!configs.debug)
+        return;
+      if (error == newError)
+        console.log('Unhandled Error: ', error, stack);
+      else
+        console.log('Unhandled Error: ', error, newError, stack);
+    }
+  };
+}
diff --git a/waterfox/browser/components/sidebar/common/bookmark.js b/waterfox/browser/components/sidebar/common/bookmark.js
new file mode 100644
index 0000000000000..71aa1e90828c1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/bookmark.js
@@ -0,0 +1,1376 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as PlaceHolderParser from '/extlib/placeholder-parser.js';
+import RichConfirm from '/extlib/RichConfirm.js';
+
+import {
+  log as internalLogger,
+  configs,
+  notify,
+  wait,
+  sha1sum,
+  sanitizeForHTMLText,
+  isLinux,
+  isRTL,
+} from './common.js';
+import * as ApiTabs from './api-tabs.js';
+import * as TreeBehavior from './tree-behavior.js';
+import * as Constants from './constants.js';
+import * as ContextualIdentities from './contextual-identities.js';
+import * as Dialog from './dialog.js';
+import * as Permissions from './permissions.js';
+import * as UserOperationBlocker from './user-operation-blocker.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/bookmarks', ...args);
+}
+
+let mCreatingCount = 0;
+
+export async function getItemById(id) {
+  if (!id)
+    return null;
+  try {
+    const items = await browser.bookmarks.get(id).catch(ApiTabs.createErrorHandler());
+    if (items.length > 0)
+      return items[0];
+  }
+  catch(_error) {
+  }
+  return null;
+}
+
+if (Constants.IS_BACKGROUND) {
+  // Dialog loaded in a popup cannot call privileged APIs, so the background script proxies such operations.
+  browser.runtime.onMessage.addListener((message, sender) => {
+    if (!message ||
+        typeof message != 'object')
+      return;
+
+    switch (message.type) {
+      case 'ws:get-bookmark-item-by-id':
+        return getItemById(message.id);
+
+      case 'ws:get-bookmark-child-items':
+        return browser.bookmarks.getChildren(message.id || 'root________').catch(ApiTabs.createErrorHandler());
+
+      case 'ws:get-bookmark-ancestor-ids':
+        return (async () => {
+          const ancestorIds = [];
+          let item;
+          let lastId = message.id;
+          do {
+            item = await getItemById(lastId);
+            if (!item)
+              break;
+            ancestorIds.push(lastId = item.parentId);
+          } while (lastId != 'root________');
+          return ancestorIds;
+        })();
+
+      case 'ws:create-new-bookmark-folder':
+        return (async () => {
+          const folder = await browser.bookmarks.create({
+            type: 'folder',
+            title: browser.i18n.getMessage('bookmarkDialog_newFolder_defaultTitle'),
+            parentId: message.parentId,
+            ...(typeof message.index == 'number' ? { index: message.index } : {}),
+          }).catch(ApiTabs.createErrorHandler());
+          return folder;
+        })();
+
+      case 'ws:update-bookmark-folder':
+        return browser.bookmarks.update(message.id, {
+          title: message.title,
+        }).catch(ApiTabs.createErrorHandler());
+
+      case 'ws:resize-bookmark-dialog-by':
+        return (async () => {
+          const win = await browser.windows.get(sender.tab.windowId);
+          return browser.windows.update(win.id, {
+            width: win.width + (message.width || 0),
+            height: win.height + (message.height || 0),
+          });
+        })();
+    }
+  });
+}
+
+// The base URL of style declarations embedded into a popup become an unprivileged URL,
+// and it is different from the URL of this file and the base URL of this addon.
+// Thus we need to load images with their complete URL.
+export const FOLDER_CHOOSER_STYLE = `
+  .parentIdChooserMiniContainer,
+  .parentIdChooserFullContainer {
+    --icon-size: 16px;
+  }
+
+  .parentIdChooserMiniContainer {
+    display: flex;
+    flex-direction: row;
+  }
+  .parentIdChooserMini {
+    display: flex;
+    flex-grow: 1;
+    margin-inline-end: 0.2em;
+    max-width: calc(100% - 2em /* width of the showAllFolders button */ - 0.2em);
+  }
+
+  .showAllFolders {
+    display: flex;
+    flex-grow: 0;
+    width: 2em;
+  }
+
+  .showAllFolders::before {
+    -moz-context-properties: fill;
+    background: currentColor;
+    content: "";
+    display: inline-block;
+    fill: currentColor;
+    height: var(--icon-size);
+    line-height: 1;
+    mask: url("${browser.runtime.getURL('/sidebar/styles/icons/ArrowheadDown.svg')}") no-repeat center / 60%;
+    max-height: var(--icon-size);
+    max-width: var(--icon-size);
+    transform-origin: 50% 50%;
+    width: var(--icon-size);
+  }
+  .showAllFolders.expanded::before {
+    transform: rotatez(180deg);
+  }
+
+  .parentIdChooserFullContainer {
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 1;
+  }
+  .parentIdChooserFullContainer:not(.expanded) {
+    display: none;
+  }
+
+  .parentIdChooserFullContainer ul {
+    list-style: none;
+    margin-block: 0;
+    margin-inline: 0;
+    padding-block: 0;
+    padding-inline: 0;
+  }
+
+  .parentIdChooserFullContainer ul.parentIdChooserFull {
+    max-height: 0;
+    overflow: visible;
+  }
+
+  .parentIdChooserFullContainer li:not(.expanded) > ul {
+    display: none;
+  }
+
+  .parentIdChooserFullTreeContainer {
+    border: 1px solid;
+    margin-block: 0.5em;
+    margin-inline: 0;
+    min-height: 10em;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow-y: auto;
+  }
+
+  .parentIdChooserFull li {
+    list-style: none;
+    margin-block: 0;
+    margin-inline: 0;
+    padding-block: 0;
+    padding-inline: 0;
+  }
+
+  .parentIdChooserFull li > label {
+    padding-block: 0.25em;
+    padding-inline: 0.25em;
+    white-space: nowrap;
+    display: flex;
+    user-select: none;
+  }
+  .parentIdChooserFull li > label:hover {
+    background: rgba(0, 0, 0, 0.15);
+  }
+
+  .parentIdChooserFull .twisty {
+    height: 1em;
+    width: 1em;
+  }
+  .parentIdChooserFull li.noChild .twisty {
+    visibility: hidden;
+  }
+  .parentIdChooserFull li > label > .twisty {
+    order: 1;
+  }
+  .parentIdChooserFull li > label > .twisty::before {
+    -moz-context-properties: fill;
+    background: currentColor;
+    content: "";
+    display: inline-block;
+    height: 1em;
+    line-height: 1;
+    mask: url("${browser.runtime.getURL('/sidebar/styles/icons/ArrowheadDown.svg')}") no-repeat center / 60%;
+    max-height: 1em;
+    max-width: 1em;
+    transform-origin: 50% 50%;
+    transform: rotatez(-90deg);
+    width: 1em;;
+  }
+  .rtl .parentIdChooserFull li > label > .twisty::before {
+    transform: rotatez(90deg);
+  }
+  .parentIdChooserFull li.expanded > label > .twisty::before {
+    transform: rotatez(0deg);
+  }
+
+  .parentIdChooserFull li.focused > label {
+    color: highlightText;
+    background: highlight;
+    outline: 1px dotted;
+  }
+  .parentIdChooserFull li.chosen > label > .twisty::before {
+    background: highlightText;
+  }
+
+  .parentIdChooserFull li > label::before {
+    -moz-context-properties: fill;
+    background: currentColor;
+    content: "";
+    display: inline-block;
+    height: var(--icon-size);
+    line-height: 1;
+    mask: url("${browser.runtime.getURL('/resources/icons/folder-16.svg')}") no-repeat center / 60%;
+    max-height: var(--icon-size);
+    max-width: var(--icon-size);
+    order: 2;
+    width: var(--icon-size);
+  }
+
+  .parentIdChooserFull li > label > * {
+    order: 3;
+  }
+
+  .parentIdChooserFull li > label > .label-text {
+    overflow: hidden;
+    text-overflow: ellipsis
+  }
+
+  li.editing > label > .label-text {
+    display: none;
+  }
+
+  li.editing > label > input[type="text"] {
+    display: flex;
+    flex-grow: 1;
+  }
+`;
+
+const DIALOG_STYLE = `
+  .itemContainer {
+    align-items: stretch;
+    display: flex;
+    flex-direction: column;
+    margin-block: 0.2em;
+    margin-inline: 0;
+    text-align: start;
+  }
+  .itemContainer.last {
+    flex-grow: 1;
+    flex-shrink: 1;
+  }
+
+  .itemContainer > label {
+    display: flex;
+    margin-block-end: 0.2em;
+    white-space: nowrap;
+  }
+
+  .itemContainer > input[type="text"] {
+    display: flex;
+  }
+  .itemContainer.dialog > input[type="text"] {
+    min-width: 30em;
+  }
+
+  ${FOLDER_CHOOSER_STYLE}
+`;
+
+export async function bookmarkTab(tab, { parentId, showDialog } = {}) {
+  try {
+    if (!(await Permissions.isGranted(Permissions.BOOKMARKS)))
+      throw new Error('not permitted');
+  }
+  catch(_e) {
+    notify({
+      title:   browser.i18n.getMessage('bookmark_notification_notPermitted_title'),
+      message: browser.i18n.getMessage(`bookmark_notification_notPermitted_message${isLinux() ? '_linux' : ''}`),
+      url:     `moz-extension://${location.host}/options/options.html#bookmarksPermissionSection`
+    });
+    return null;
+  }
+  const parent = (
+    (await getItemById(parentId || configs.defaultBookmarkParentId)) ||
+    (await getItemById(configs.$default.defaultBookmarkParentId))
+  );
+
+  let title    = tab.title;
+  let url      = tab.url;
+  if (!parentId)
+    parentId = parent?.id;
+  if (showDialog) {
+    const windowId = tab.windowId;
+    const inline = location.pathname.startsWith('/sidebar/');
+    const inlineClass = inline ? 'inline' : 'dialog';
+    const BASE_ID = `dialog-${Date.now()}-${parseInt(Math.random() * 65000)}:`;
+    const dialogParams = {
+      content: `
+        <style type="text/css">${DIALOG_STYLE}</style>
+        <div class="itemContainer ${inlineClass}"
+            ><label for="${BASE_ID}title"
+                    accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title_accessKey')))}
+                   ><span accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title_accessKey')))}
+                         >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title'))}</span></label
+            ><input id="${BASE_ID}title"
+                    type="text"
+                    name="title"
+                    value=${JSON.stringify(sanitizeForHTMLText(title))}></div
+       ><div class="itemContainer ${inlineClass}"
+            ><label for="${BASE_ID}url"
+                    accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_url_accessKey')))}
+                   ><span accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_url_accessKey')))}
+                         >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_url'))}</span></label
+            ><input id="${BASE_ID}url"
+                    type="text"
+                    name="url"
+                    value=${JSON.stringify(sanitizeForHTMLText(url))}></div
+       ><div class="itemContainer last ${inlineClass}"
+            ><div class="itemContainer"
+                 ><label for="${BASE_ID}parentId"
+                         accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId_accessKey')))}
+                        ><span accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId_accessKey')))}
+                              >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId'))}</span></label
+                 ><span class="parentIdChooserMiniContainer"
+                       ><select id="${BASE_ID}parentId"
+                                name="parentId"
+                                class="parentIdChooserMini"></select
+                       ><button class="showAllFolders"
+                                data-no-accept-by-enter="true"
+                                title=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_showAllFolders_tooltip')))}></button
+                       ></span></div
+            ><div class="itemContainer parentIdChooserFullContainer"
+                 ><div class="parentIdChooserFullTreeContainer"
+                       tabindex="0"
+                       data-no-accept-by-enter="true"
+                      ><ul class="parentIdChooserFull"></ul></div
+                 ><span><button class="newFolder"
+                                accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_newFolder_accessKey')))}
+                                data-no-accept-by-enter="true"
+                               >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_newFolder'))}</button
+                               ></span></div
+       ></div>
+      `.trim(),
+      async onShown(container, { initFolderChooser, parentId, inline, isRTL }) {
+        if (container.classList.contains('simulation'))
+          return;
+        container.classList.add('bookmark-dialog');
+        const [defaultItem, rootItems] = await Promise.all([
+          browser.runtime.sendMessage({ type: 'ws:get-bookmark-item-by-id', id: parentId }),
+          browser.runtime.sendMessage({ type: 'ws:get-bookmark-child-items' })
+        ]);
+        initFolderChooser({
+          defaultItem,
+          rootItems,
+          container,
+          inline,
+          isRTL,
+        });
+        container.querySelector('[name="title"]').select();
+      },
+      inject: {
+        initFolderChooser,
+        parentId,
+        inline,
+        isRTL: isRTL(),
+      },
+      buttons: [
+        browser.i18n.getMessage('bookmarkDialog_accept'),
+        browser.i18n.getMessage('bookmarkDialog_cancel')
+      ]
+    };
+    let result;
+    if (inline) {
+      try {
+        UserOperationBlocker.blockIn(windowId, { throbber: false });
+        result = await RichConfirm.show(dialogParams);
+      }
+      catch(_error) {
+        result = { buttonIndex: -1 };
+      }
+      finally {
+        UserOperationBlocker.unblockIn(windowId, { throbber: false });
+      }
+    }
+    else {
+      result = await Dialog.show(await browser.windows.get(windowId), {
+        ...dialogParams,
+        modal: true,
+        type:  'dialog',
+        url:   ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'),
+        title: browser.i18n.getMessage('bookmarkDialog_dialogTitle_single')
+      });
+    }
+    if (result.buttonIndex != 0)
+      return null;
+    title    = result.values[`${BASE_ID}title`];
+    url      = result.values[`${BASE_ID}url`];
+    parentId = result.values[`${BASE_ID}parentId`];
+  }
+
+  mCreatingCount++;
+  const item = await browser.bookmarks.create({
+    parentId, title, url
+  }).catch(ApiTabs.createErrorHandler());
+  wait(150).then(() => {
+    mCreatingCount--;
+  });
+  return item;
+}
+
+export async function bookmarkTabs(tabs, { parentId, index, showDialog, title } = {}) {
+  try {
+    if (!(await Permissions.isGranted(Permissions.BOOKMARKS)))
+      throw new Error('not permitted');
+  }
+  catch(_e) {
+    notify({
+      title:   browser.i18n.getMessage('bookmark_notification_notPermitted_title'),
+      message: browser.i18n.getMessage('bookmark_notification_notPermitted_message'),
+      url:     `moz-extension://${location.host}/options/options.html#bookmarksPermissionSection`
+    });
+    return null;
+  }
+  const now = new Date();
+  const year = String(now.getFullYear());
+  if (!title)
+    title = PlaceHolderParser.process(configs.bookmarkTreeFolderName, (name, _rawArgs, ...args) => {
+      switch (name.toLowerCase()) {
+        case 'any':
+          for (const arg of args) {
+            if (!!arg)
+              return arg;
+          }
+          return '';
+
+        case 'title':
+          return tabs[0].title;
+
+        case 'group':
+          return tabs[0].isGroupTab ? tabs[0].title : '';
+
+        case 'url':
+          return tabs[0].url;
+
+        case 'short_year':
+        case 'shortyear':
+          return year.slice(-2);
+
+        case 'full_year':
+        case 'fullyear':
+        case 'year':
+          return year;
+
+        case 'month':
+          return String(now.getMonth() + 1).padStart(2, '0');
+
+        case 'date':
+          return String(now.getDate()).padStart(2, '0');
+
+        case 'hour':
+        case 'hours':
+          return String(now.getHours()).padStart(2, '0');
+
+        case 'min':
+        case 'minute':
+        case 'minutes':
+          return String(now.getMinutes()).padStart(2, '0');
+
+        case 'sec':
+        case 'second':
+        case 'seconds':
+          return String(now.getSeconds()).padStart(2, '0');
+
+        case 'msec':
+        case 'millisecond':
+        case 'milliseconds':
+          return String(now.getSeconds()).padStart(3, '0');
+      }
+    });
+  const folderParams = {
+    type: 'folder',
+    title
+  };
+  let parent;
+  if (parentId) {
+    parent = await getItemById(parentId);
+    if (index !== undefined)
+      folderParams.index = index;
+  }
+  else {
+    parent = await getItemById(configs.defaultBookmarkParentId);
+  }
+  if (!parent)
+    parent = await getItemById(configs.$default.defaultBookmarkParentId);
+  if (parent)
+    folderParams.parentId = parent.id;
+
+  if (showDialog) {
+    const windowId = tabs[0].windowId;
+    const inline = location.pathname.startsWith('/sidebar/');
+    const inlineClass = inline ? 'inline' : 'dialog';
+    const BASE_ID = `dialog-${Date.now()}-${parseInt(Math.random() * 65000)}:`;
+    const dialogParams = {
+      content: `
+        <style type="text/css">${DIALOG_STYLE}</style>
+        <div class="itemContainer ${inlineClass}"
+            ><label for="${BASE_ID}title"
+                    accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title_accessKey')))}
+                   ><span accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title_accessKey')))}
+                         >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_title'))}</span></label
+            ><input id="${BASE_ID}title"
+                    type="text"
+                    name="title"
+                    value=${JSON.stringify(sanitizeForHTMLText(title))}></div
+       ><div class="itemContainer last ${inlineClass}"
+            ><div class="itemContainer"
+                 ><label for="${BASE_ID}parentId"
+                         accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId_accessKey')))}
+                        ><span accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId_accessKey')))}
+                              >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_parentId'))}</span></label
+                 ><span class="parentIdChooserMiniContainer"
+                       ><select id="${BASE_ID}parentId"
+                                name="parentId"
+                                class="parentIdChooserMini"></select
+                       ><button class="showAllFolders"
+                                data-no-accept-by-enter="true"
+                                title=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_showAllFolders_tooltip')))}></button
+                       ></span></div
+            ><div class="itemContainer parentIdChooserFullContainer"
+                 ><div class="parentIdChooserFullTreeContainer"
+                       tabindex="0"
+                       data-no-accept-by-enter="true"
+                      ><ul class="parentIdChooserFull"></ul></div
+                 ><span><button class="newFolder"
+                                accesskey=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_newFolder_accessKey')))}
+                                data-no-accept-by-enter="true"
+                               >${sanitizeForHTMLText(browser.i18n.getMessage('bookmarkDialog_newFolder'))}</button
+                               ></span></div
+       ></div>
+      `.trim(),
+      async onShown(container, { initFolderChooser, parentId, inline, isRTL }) {
+        if (container.classList.contains('simulation'))
+          return;
+        container.classList.add('bookmark-dialog');
+        const [defaultItem, rootItems] = await Promise.all([
+          browser.runtime.sendMessage({ type: 'ws:get-bookmark-item-by-id', id: parentId }),
+          browser.runtime.sendMessage({ type: 'ws:get-bookmark-child-items' })
+        ]);
+        initFolderChooser({
+          defaultItem,
+          rootItems,
+          container,
+          inline,
+          isRTL,
+        });
+        container.querySelector('[name="title"]').select();
+      },
+      inject: {
+        initFolderChooser,
+        parentId: folderParams.parentId,
+        inline,
+        isRTL: isRTL(),
+      },
+      buttons: [
+        browser.i18n.getMessage('bookmarkDialog_accept'),
+        browser.i18n.getMessage('bookmarkDialog_cancel')
+      ]
+    };
+    let result;
+    if (inline) {
+      try {
+        UserOperationBlocker.blockIn(windowId, { throbber: false });
+        result = await RichConfirm.show(dialogParams);
+      }
+      catch(_error) {
+        result = { buttonIndex: -1 };
+      }
+      finally {
+        UserOperationBlocker.unblockIn(windowId, { throbber: false });
+      }
+    }
+    else {
+      result = await Dialog.show(await browser.windows.get(windowId), {
+        ...dialogParams,
+        modal: true,
+        type:  'dialog',
+        url:   ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'),
+        title: browser.i18n.getMessage('bookmarkDialog_dialogTitle_multiple')
+      });
+    }
+    if (result.buttonIndex != 0)
+      return null;
+    folderParams.title    = result.values[`${BASE_ID}title`];
+    folderParams.parentId = result.values[`${BASE_ID}parentId`];
+  }
+
+  const toBeCreatedCount = tabs.length + 1;
+  mCreatingCount += toBeCreatedCount;
+
+  const titles = getTitlesWithTreeStructure(tabs);
+  const folder = await browser.bookmarks.create(folderParams).catch(ApiTabs.createErrorHandler());
+  for (let i = 0, maxi = tabs.length; i < maxi; i++) {
+    await browser.bookmarks.create({
+      parentId: folder.id,
+      index:    i,
+      title:    titles[i],
+      url:      tabs[i].url
+    }).catch(ApiTabs.createErrorSuppressor());
+  }
+
+  wait(150).then(() => {
+    mCreatingCount -= toBeCreatedCount;
+  });
+
+  return folder;
+}
+
+function getTitlesWithTreeStructure(tabs) {
+  const minLevel = Math.min(...tabs.map(tab => parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || '0')));
+  const titles = [];
+  for (let i = 0, maxi = tabs.length; i < maxi; i++) {
+    const tab = tabs[i];
+    const title = tab.title;
+    const level = parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || '0') - minLevel;
+    let prefix = '';
+    for (let j = 0; j < level; j++) {
+      prefix += '>';
+    }
+    if (prefix)
+      titles.push(`${prefix} ${title}`);
+    else
+      titles.push(title.replace(/^>+ /, '')); // if the page title has marker-like prefix, we need to remove it.
+  }
+  return titles;
+}
+
+// This large method have to contain everything required to simulate the folder
+// chooser of the bookmark creation dialog.
+// Bookmark creation dialog is loaded into a popup window and we use this large
+// method to inject the behavior of the folder chooser.
+export async function initFolderChooser({ rootItems, defaultItem, defaultValue, container, inline, isRTL } = {}) {
+  const miniList = container.querySelector('select.parentIdChooserMini');
+  const fullList = container.querySelector('ul.parentIdChooserFull');
+  const fullListFocusibleContainer = container.querySelector('.parentIdChooserFullTreeContainer');
+  const fullContainer = container.querySelector('.parentIdChooserFullContainer');
+  const expandeFullListButton = container.querySelector('.showAllFolders');
+  const newFolderButton = container.querySelector('.newFolder');
+
+  const BASE_ID = `folderChooser-${Date.now()}-${parseInt(Math.random() * 65000)}:`;
+
+  const ensureItemVisible = item => {
+    const itemRect = item.querySelector('label').getBoundingClientRect();
+    const containerRect = fullListFocusibleContainer.getBoundingClientRect();
+    if (itemRect.top < containerRect.top) {
+      fullListFocusibleContainer.scrollBy(0, itemRect.top - containerRect.top - (itemRect.height / 2));
+    }
+    else if (itemRect.bottom > containerRect.bottom) {
+      fullListFocusibleContainer.scrollBy(0, itemRect.bottom - containerRect.bottom + (itemRect.height / 2));
+    }
+  };
+
+  const cancelEvent = event => {
+    event.stopImmediatePropagation();
+    event.preventDefault();
+  };
+
+  //==========================================================================
+  // Initialize mini chooser
+  //==========================================================================
+  for (const rootItem of rootItems) {
+    const item = miniList.appendChild(document.createElement('option'));
+    item.textContent = rootItem.title;
+    item.value = rootItem.id;
+  }
+
+  miniList.appendChild(document.createElement('hr'));
+  const expanderOption = miniList.appendChild(document.createElement('option'));
+  expanderOption.textContent = browser.i18n.getMessage('bookmarkDialog_showAllFolders_label');
+  expanderOption.setAttribute('value', `${BASE_ID}expandChooser`);
+
+  miniList.appendChild(document.createElement('hr'));
+  const lastChosenOption = miniList.appendChild(document.createElement('option'));
+
+  let lastChosenItem = defaultItem ||
+    defaultValue && await getItemById(defaultValue) ||
+    null;
+  const getLastChosenItem = () => {
+    return lastChosenItem || miniList.firstChild.$item || null;
+  };
+
+  const updateLastChosenOption = () => {
+    if (lastChosenItem) {
+      lastChosenOption.value       = lastChosenItem.id;
+      lastChosenOption.textContent = lastChosenItem.title;
+      lastChosenOption.style.display = '';
+    }
+    else {
+      lastChosenOption.style.display = 'none';
+    }
+    miniList.value = getLastChosenItem().id;
+  };
+  updateLastChosenOption();
+
+  let expanded = false;
+  let fullChooserHeight = 0;
+  const toggleFullChooser = async () => {
+    expanded = !expanded;
+    fullContainer.classList.toggle('expanded', expanded);
+    expandeFullListButton.classList.toggle('expanded', expanded);
+    if (!inline) {
+      const fullContainerStyle = window.getComputedStyle(fullContainer, null);
+      fullChooserHeight = Math.max(
+        fullChooserHeight,
+        Math.ceil(fullContainer.offsetHeight
+          + parseFloat(fullContainerStyle.getPropertyValue('margin-block-start'))
+          + parseFloat(fullContainerStyle.getPropertyValue('margin-block-end'))),
+        150
+      );
+      await browser.runtime.sendMessage({
+        type: 'ws:resize-bookmark-dialog-by',
+        width: 0,
+        height: expanded ? fullChooserHeight : -fullChooserHeight,
+      });
+    }
+    if (lastChosenItem) {
+      const item = fullList.querySelector(`li[data-id="${lastChosenItem.id}"]`);
+      if (item)
+        ensureItemVisible(item);
+    }
+  };
+
+  //==========================================================================
+  // Initialize expander
+  //==========================================================================
+  const getElementTarget = event => {
+    return event.target.nodeType == Node.ELEMENT_NODE ?
+      event.target :
+      event.target.parentNode;;
+  };
+
+  //==========================================================================
+  // Initialize full chooser
+  //==========================================================================
+  fullList.level = 0;
+
+  const exitAllEditings = () => {
+    for (const item of fullList.querySelectorAll('li.editing')) {
+      item.$exitTitleEdit();
+    }
+  };
+
+  const getTargetItem = event => {
+    const elementTarget = getElementTarget(event);
+    return elementTarget?.closest('li');
+  };
+
+  const focusToItem = item => {
+    if (!item)
+      return;
+
+    exitAllEditings();
+
+    for (const oldFocused of fullListFocusibleContainer.querySelectorAll('.focused')) {
+      if (oldFocused == item)
+        continue;
+      oldFocused.classList.remove('focused');
+    }
+    item.classList.add('focused');
+    lastChosenItem = item.$item;
+
+    ensureItemVisible(item);
+    updateLastChosenOption();
+  };
+
+  const toggleItemExpanded = item => {
+    if (!item)
+      return;
+
+    item.classList.toggle('expanded');
+    if (item.classList.contains('expanded'))
+      item.$completeFolderItem();
+
+    focusToItem(item);
+  };
+
+  const expandOrDigIn = (event, focusedItem) => {
+    if (!focusedItem.classList.contains('expanded')) {
+      focusedItem.classList.add('expanded');
+      focusedItem.$completeFolderItem();
+    }
+    else {
+      const firstChild = focusedItem.querySelector('li');
+      if (firstChild)
+        focusToItem(firstChild);
+    }
+  };
+  const collapseOrDigOut = (event, focusedItem) => {
+    if (focusedItem.classList.contains('expanded')) {
+      focusedItem.classList.remove('expanded');
+    }
+    else {
+      const nearestAncestor = focusedItem.parentNode.closest('li');
+      if (nearestAncestor)
+        focusToItem(nearestAncestor);
+    }
+  };
+
+  const createNewSubFolder = async () => {
+    const folder = await browser.runtime.sendMessage({
+      type:     'ws:create-new-bookmark-folder',
+      parentId: getLastChosenItem().id,
+    });
+    const parentItem = fullList.querySelector(`li[data-id="${folder.parentId}"]`);
+    if (!parentItem)
+      return;
+    parentItem.$invalidate();
+    parentItem.classList.add('expanded');
+    await parentItem.$completeFolderItem();
+    const folderItem = parentItem.querySelector(`li[data-id="${folder.id}"]`);
+    if (!folderItem)
+      return;
+
+    focusToItem(folderItem);
+    folderItem.$enterTitleEdit();
+  };
+
+  const generateFolderItem = (folder, level) => {
+    const item = document.createElement('li');
+    item.$item = folder;
+    item.setAttribute('data-id', folder.id);
+    const title = folder.title || browser.i18n.getMessage('bookmarkFolderChooser_blank');
+    const label = item.appendChild(document.createElement('label'));
+    label.setAttribute('style', `padding-inline-start: calc(1.25em * ${level} + 0.25em);`);
+    label.setAttribute('title', title);
+    const twisty = label.appendChild(document.createElement('span'));
+    twisty.setAttribute('class', 'twisty');
+    const text = label.appendChild(document.createElement('div'));
+    text.setAttribute('class', 'label-text');
+    text.textContent = title;
+    return item;
+  };
+
+  const buildItems = async (items, container) => {
+    const createdItems = [];
+    for (const item of items) {
+      if (item.type == 'bookmark' &&
+          /^place:parent=([^&]+)$/.test(item.url)) { // alias for special folders
+        const realItem = await browser.runtime.sendMessage({
+          type: 'ws:get-bookmark-item-by-id',
+          id:   RegExp.$1
+        });
+        item.id    = realItem.id;
+        item.type  = realItem.type;
+        item.title = realItem.title;
+      }
+      if (item.type != 'folder')
+        continue;
+
+      if (container.querySelector(`li[data-id="${item.id}"]`))
+        continue;
+
+      const folderItem = generateFolderItem(item, container.level);
+      container.insertBefore(folderItem, 'index' in item ? container.childNodes[item.index] : null);
+      createdItems.push(folderItem);
+      folderItem.$completeFolderItem = async () => {
+        if (!item.$fetched) {
+          item.$fetched = true;
+          item.children = (await browser.runtime.sendMessage({
+            type: 'ws:get-bookmark-child-items',
+            id:   item.id
+          })).filter(item => item?.type == 'folder');
+        }
+        folderItem.classList.toggle('noChild', !item.children || item.children.length == 0);
+        if (item.children &&
+            item.children.length > 0) {
+          let subFolderContainer = folderItem.querySelector('ul');;
+          if (!subFolderContainer) {
+            subFolderContainer = folderItem.appendChild(document.createElement('ul'));
+            subFolderContainer.level = container.level + 1;
+          }
+          await buildItems(item.children, subFolderContainer);
+        }
+        return folderItem;
+      };
+      folderItem.$invalidate = () => {
+        item.$fetched = false;
+      };
+      let titleField;
+      folderItem.$enterTitleEdit = async () => {
+        exitAllEditings();
+        if (!titleField) {
+          const label = folderItem.querySelector('label');
+          folderItem.classList.add('editing');
+          titleField = label.appendChild(document.createElement('input'));
+          titleField.setAttribute('type', 'text');
+          label.appendChild(titleField);
+          titleField.value = item.title || browser.i18n.getMessage('bookmarkFolderChooser_blank');
+        }
+        titleField.focus();
+        titleField.select();
+      };
+      folderItem.$exitTitleEdit = async () => {
+        if (!titleField)
+          return;
+        browser.runtime.sendMessage({
+          type:  'ws:update-bookmark-folder',
+          id:    item.id,
+          title: titleField.value,
+        });
+        item.title =
+           folderItem.querySelector('.label-text').textContent = titleField.value;
+        folderItem.querySelector('label').setAttribute('title', titleField.value);
+        if (lastChosenItem?.id == item.id)
+          lastChosenItem.title = item.title;
+        titleField.parentNode.removeChild(titleField);
+        titleField = null;
+        folderItem.classList.remove('editing');
+        updateLastChosenOption();
+      };
+    }
+    return createdItems;
+  };
+
+  const topLevelItems = await buildItems(rootItems, fullList);
+
+  // Expand deeply nested tree until the chosen folder
+  let itemToBeFocused = topLevelItems.length > 0 && topLevelItems[0];
+  if (lastChosenItem) {
+    const ancestorIds = await browser.runtime.sendMessage({
+      type: 'ws:get-bookmark-ancestor-ids',
+      id:   lastChosenItem.id,
+    });
+    for (const id of [...ancestorIds.reverse(), lastChosenItem.id]) {
+      if (id == 'root________')
+        continue;
+
+      const item = fullList.querySelector(`li[data-id="${id}"]`);
+      if (!item)
+        break;
+
+      itemToBeFocused = item;
+      item.classList.add('expanded');
+      await item.$completeFolderItem();
+    }
+  }
+  if (itemToBeFocused)
+    itemToBeFocused.classList.add('focused');
+
+
+  //==========================================================================
+  // UI events handling
+  //==========================================================================
+  container.addEventListener('focus', event => {
+    if (!getElementTarget(event)?.closest('input[type="text"], .parentIdChooserFullTreeContainer'))
+      exitAllEditings();
+  }, { capture: true });
+  container.addEventListener('blur', event => {
+    if (getElementTarget(event)?.closest('input[type="text"]')) {
+      const editingItem = fullList.querySelector('li.editing');
+      if (editingItem)
+        editingItem.$exitTitleEdit();
+    }
+  }, { capture: true });
+
+  miniList.addEventListener('change', () => {
+    if (miniList.value == `${BASE_ID}expandChooser`) {
+      if (!fullContainer.classList.contains('expanded'))
+        toggleFullChooser();
+      miniList.value = getLastChosenItem().id;
+      return;
+    }
+
+    const fullListItem = fullList.querySelector(`li[data-id="${miniList.value}"]`);
+    if (fullListItem)
+      focusToItem(fullListItem);
+  });
+
+  expandeFullListButton.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    toggleFullChooser();
+  });
+  expandeFullListButton.addEventListener('keydown', event => {
+    const elementTarget = getElementTarget(event);
+    if (elementTarget != expandeFullListButton)
+      return;
+
+    switch (event.key) {
+      case 'Enter':
+        cancelEvent(event);
+      case 'Space':
+        toggleFullChooser();
+        break;
+
+      default:
+        break;
+    }
+  }, { capture: true });
+
+  fullListFocusibleContainer.addEventListener('dblclick', event => {
+    if (event.button != 0)
+      return;
+    if (getElementTarget(event)?.closest('.twisty'))
+      return;
+    const item = getTargetItem(event);
+    if (item)
+      item.$enterTitleEdit();
+  });
+  fullListFocusibleContainer.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    const target = getElementTarget(event);
+    if (target?.closest('.twisty')) {
+      toggleItemExpanded(getTargetItem(event));
+    }
+    else if (!target?.closest('input[type="text"]')) {
+      focusToItem(getTargetItem(event));
+    }
+  });
+  fullListFocusibleContainer.addEventListener('keydown', event => {
+    if (getElementTarget(event)?.closest('input[type="text"]') &&
+        event.key != 'Enter')
+      return;
+
+    const focusibleItems = [...fullList.querySelectorAll('li:not(li:not(.expanded) li)')];
+    const focusedItem = fullList.querySelector('li.focused');
+    const index = focusedItem ? focusibleItems.indexOf(focusedItem) : -1;
+    switch (event.key) {
+      case 'Enter':
+        cancelEvent(event);
+        if (focusedItem?.matches('.editing'))
+          focusedItem.$exitTitleEdit();
+        toggleItemExpanded(focusedItem);
+        break;
+
+      case 'ArrowUp': {
+        cancelEvent(event);
+        const toBeFocused = focusibleItems[(index == 0 ? focusibleItems.length : index) - 1];
+        focusToItem(toBeFocused);
+      }; break;
+
+      case 'ArrowDown': {
+        cancelEvent(event);
+        const toBeFocused = focusibleItems[index == focusibleItems.length - 1 ? 0 : index + 1];
+        focusToItem(toBeFocused);
+      }; break;
+
+      case 'ArrowRight':
+        cancelEvent(event);
+        if (isRTL)
+          collapseOrDigOut(event, focusedItem);
+        else
+          expandOrDigIn(event, focusedItem);
+        break;
+
+      case 'ArrowLeft':
+        cancelEvent(event);
+        if (isRTL)
+          expandOrDigIn(event, focusedItem);
+        else
+          collapseOrDigOut(event, focusedItem);
+        break;
+
+      case 'PageUp': {
+        cancelEvent(event);
+        const toBeFocusedIndex = Math.min(focusibleItems.length - 1, Math.max(0, index - Math.floor(fullListFocusibleContainer.offsetHeight / focusedItem.offsetHeight) + 1));
+        const toBeFocused = focusibleItems[toBeFocusedIndex];
+        focusToItem(toBeFocused);
+      }; break;
+
+      case 'PageDown': {
+        cancelEvent(event);
+        const toBeFocusedIndex = Math.min(focusibleItems.length - 1, Math.max(0, index + Math.floor(fullListFocusibleContainer.offsetHeight / focusedItem.offsetHeight) - 1));
+        const toBeFocused = focusibleItems[toBeFocusedIndex];
+        focusToItem(toBeFocused);
+      }; break;
+
+      case 'Home':
+        cancelEvent(event);
+        focusToItem(focusibleItems[0]);
+        break;
+
+      case 'End':
+        cancelEvent(event);
+        focusToItem(focusibleItems[focusibleItems.length - 1]);
+        break;
+    }
+  }, { capture: true });
+
+  newFolderButton.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    createNewSubFolder();
+  });
+  newFolderButton.addEventListener('keydown', event => {
+    const elementTarget = getElementTarget(event);
+    if (elementTarget != newFolderButton)
+      return;
+
+    switch (event.key) {
+      case 'Enter':
+        cancelEvent(event);
+      case 'Space':
+        createNewSubFolder();
+        break;
+
+      default:
+        break;
+    }
+  }, { capture: true });
+}
+
+let mCreatedBookmarks = [];
+let mIsTracking = false;
+
+async function onBookmarksCreated(id, bookmark) {
+  if (!mIsTracking)
+    return;
+
+  log('onBookmarksCreated ', { id, bookmark });
+
+  if (mCreatingCount > 0)
+    return;
+
+  mCreatedBookmarks.push(bookmark);
+  reserveToGroupCreatedBookmarks();
+}
+
+function reserveToGroupCreatedBookmarks() {
+  if (reserveToGroupCreatedBookmarks.reserved)
+    clearTimeout(reserveToGroupCreatedBookmarks.reserved);
+  reserveToGroupCreatedBookmarks.reserved = setTimeout(() => {
+    reserveToGroupCreatedBookmarks.reserved = null;
+    tryGroupCreatedBookmarks();
+  }, 250);
+}
+reserveToGroupCreatedBookmarks.reserved = null;
+reserveToGroupCreatedBookmarks.retryCount = 0;
+
+async function tryGroupCreatedBookmarks() {
+  log('tryGroupCreatedBookmarks ', mCreatedBookmarks);
+
+  if (!configs.autoCreateFolderForBookmarksFromTree) {
+    log(' => autoCreateFolderForBookmarksFromTree is false');
+    return;
+  }
+
+  const lastDraggedTabs = configs.lastDraggedTabs;
+  if (lastDraggedTabs &&
+      lastDraggedTabs.tabIds.length > mCreatedBookmarks.length) {
+    if (reserveToGroupCreatedBookmarks.retryCount++ < 10) {
+      return reserveToGroupCreatedBookmarks();
+    }
+    else {
+      reserveToGroupCreatedBookmarks.retryCount = 0;
+      mCreatedBookmarks = [];
+      configs.lastDraggedTabs = null;
+      log(' => timeout');
+      return;
+    }
+  }
+  reserveToGroupCreatedBookmarks.retryCount = 0;
+
+  const bookmarks = mCreatedBookmarks;
+  mCreatedBookmarks = [];
+  if (lastDraggedTabs) {
+    // accept only bookmarks from dragged tabs
+    const digest = await sha1sum(bookmarks.map(tab => tab.url).join('\n'));
+    configs.lastDraggedTabs = null;
+    if (digest != lastDraggedTabs.urlsDigest) {
+      log(' => digest mismatched ', { digest, last: lastDraggedTabs.urlsDigest });
+      return;
+    }
+  }
+
+  if (bookmarks.length < 2) {
+    log(' => ignore single bookmark');
+    return;
+  }
+
+  {
+    // Do nothing if multiple bookmarks are created under
+    // multiple parent folders by sync.
+    const parentIds = new Set();
+    for (const bookmark of bookmarks) {
+      parentIds.add(bookmark.parentId);
+    }
+    log('parentIds: ', parentIds);
+    if (parentIds.size > 1) {
+      log(' => ignore bookmarks created under multiple folders');
+      return;
+    }
+  }
+
+  const tabs = lastDraggedTabs ?
+    lastDraggedTabs.tabIds.map(id => Tab.get(id)) :
+    (await Promise.all(bookmarks.map(async bookmark => {
+      const tabs = await browser.tabs.query({ url: bookmark.url });
+      if (tabs.length == 0)
+        return null;
+      const tab = tabs.find(tab => tab.highlighted) || tabs[0];
+      return Tab.get(tab);
+    }))).filter(tab => !!tab);
+  log('tabs: ', tabs);
+  if (tabs.length != bookmarks.length) {
+    log(' => ignore bookmarks created from non-tab sources');
+    return;
+  }
+
+  const treeStructure = TreeBehavior.getTreeStructureFromTabs(tabs);
+  log('treeStructure: ', treeStructure);
+  const topLevelTabsCount = treeStructure.filter(item => item.parent < 0).length;
+  if (topLevelTabsCount == treeStructure.length) {
+    log(' => no need to group bookmarks from dragged flat tabs');
+    return;
+  }
+
+  let titles = getTitlesWithTreeStructure(tabs);
+  if (tabs[0].$TST.isGroupTab &&
+      titles.filter(title => !/^>/.test(title)).length == 1) {
+    log('delete needless bookmark for a group tab');
+    browser.bookmarks.remove(bookmarks[0].id);
+    tabs.shift();
+    bookmarks.shift();
+    titles = getTitlesWithTreeStructure(tabs);
+  }
+  log('titles: ', titles);
+
+  log('save tree structure to bookmarks');
+  for (let i = 0, maxi = bookmarks.length; i < maxi; i++) {
+    const title = titles[i];
+    if (title == tabs[i].title)
+      continue;
+    browser.bookmarks.update(bookmarks[i].id, { title });
+  }
+
+  log('ready to group bookmarks under a folder');
+
+  const parentId = bookmarks[0].parentId;
+  {
+    // Do nothing if all bookmarks are created under a new
+    // blank folder.
+    const allChildren = await browser.bookmarks.getChildren(parentId);
+    log('allChildren.length vs bookmarks.length: ', allChildren.length, bookmarks.length);
+    if (allChildren.length == bookmarks.length) {
+      log(' => no need to create folder for bookmarks under a new blank folder');
+      return;
+    }
+  }
+
+  log('create a folder for grouping');
+  mCreatingCount++;
+  const folder = await browser.bookmarks.create({
+    type:  'folder',
+    title: bookmarks[0].title,
+    index: bookmarks[0].index,
+    parentId
+  }).catch(ApiTabs.createErrorHandler());
+  wait(150).then(() => {
+    mCreatingCount--;
+  });
+
+  log('move into a folder');
+  let movedCount = 0;
+  for (const bookmark of bookmarks) {
+    await browser.bookmarks.move(bookmark.id, {
+      parentId: folder.id,
+      index:    movedCount++
+    });
+  }
+}
+
+if (Constants.IS_BACKGROUND &&
+    browser.bookmarks &&
+    browser.bookmarks.onCreated) { // already granted
+  browser.bookmarks.onCreated.addListener(onBookmarksCreated);
+  mIsTracking = true;
+}
+
+export async function startTracking() {
+  if (!mIsTracking ||
+      !Constants.IS_BACKGROUND)
+    return;
+
+  mIsTracking = true;
+  const granted = await Permissions.isGranted(Permissions.BOOKMARKS);
+  if (granted && !browser.bookmarks.onCreated.hasListener(onBookmarksCreated))
+    browser.bookmarks.onCreated.addListener(onBookmarksCreated);
+}
+
+
+export const BOOKMARK_TITLE_DESCENDANT_MATCHER = /^(>+) /;
+
+export async function getTreeStructureFromBookmarkFolder(folderOrId) {
+  const items = folderOrId.children || await browser.bookmarks.getChildren(folderOrId.id || folderOrId);
+  return getTreeStructureFromBookmarks(items.filter(item => item.type == 'bookmark'));
+}
+
+export function getTreeStructureFromBookmarks(items) {
+  const lastItemIndicesWithLevel = new Map();
+  let lastMaxLevel = 0;
+  return items.reduce((result, item, index) => {
+    const { cookieStoreId, url } = ContextualIdentities.getIdFromBookmark(item);
+    if (cookieStoreId) {
+      item.cookieStoreId = cookieStoreId;
+      if (url)
+        item.url = url;
+    }
+
+    let level = 0;
+    if (lastItemIndicesWithLevel.size > 0 &&
+        item.title.match(BOOKMARK_TITLE_DESCENDANT_MATCHER)) {
+      level = RegExp.$1.length;
+      if (level - lastMaxLevel > 1) {
+        level = lastMaxLevel + 1;
+      }
+      else {
+        while (lastMaxLevel > level) {
+          lastItemIndicesWithLevel.delete(lastMaxLevel--);
+        }
+      }
+      lastItemIndicesWithLevel.set(level, index);
+      lastMaxLevel = level;
+      result.push(lastItemIndicesWithLevel.get(level - 1) - lastItemIndicesWithLevel.get(0));
+      item.title = item.title.replace(BOOKMARK_TITLE_DESCENDANT_MATCHER, '')
+    }
+    else {
+      result.push(-1);
+      lastItemIndicesWithLevel.clear();
+      lastItemIndicesWithLevel.set(0, index);
+    }
+    return result;
+  }, []);
+}
+
+
diff --git a/waterfox/browser/components/sidebar/common/browser-theme.js b/waterfox/browser/components/sidebar/common/browser-theme.js
new file mode 100644
index 0000000000000..b88532a1296a8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/browser-theme.js
@@ -0,0 +1,201 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs
+} from '/common/common.js';
+import * as Color from './color.js';
+import * as Constants from './constants.js';
+
+export function generateThemeRules(theme) {
+  const rules = [];
+  const generateCustomRule = (theme, prefix = '') => {
+    for (const key of Object.keys(theme)) {
+      if (!theme[key])
+        continue;
+      const propertyKey = prefix ? `${prefix}-${key}` : key;
+      let value = theme[key];
+      switch (typeof theme[key]) {
+        case 'object':
+          generateCustomRule(value, propertyKey);
+          break;
+        case 'string':
+          if (/^[^:]+:\/\//.test(value))
+            value = `url(${JSON.stringify(value)})`;
+          rules.push(`--theme-${propertyKey}: ${value};`);
+          for (let alpha = 10; alpha < 100; alpha += 10) {
+            rules.push(`--theme-${propertyKey}-${alpha}: ${Color.overrideCSSAlpha(value, alpha / 100)};`);
+          }
+          break;
+      }
+    }
+  };
+  generateCustomRule(theme);
+  return rules.join('\n');
+}
+
+export async function generateThemeDeclarations(theme) {
+  if (!theme ||
+      !theme.colors) {
+    return `
+      :root {
+        /* https://searchfox.org/mozilla-central/rev/0c7c41109902cb8967ec3ef2c0ddb326701cfbee/browser/themes/windows/browser.css#15 */
+        /* https://searchfox.org/mozilla-central/rev/0c7c41109902cb8967ec3ef2c0ddb326701cfbee/browser/themes/linux/browser.css#20 */
+        --non-lwt-selected-tab-background-color-proton: rgba(255, 255, 255, 0.15);
+    }`;
+  }
+
+  const extraColors = [];
+  const themeFrameColor   = theme.colors.frame || theme.colors.accentcolor /* old name */;
+  const inactiveTextColor = theme.colors.tab_background_text || theme.colors.textcolor /* old name */;
+  const activeTextColor   = theme.colors.tab_text || theme.colors.bookmark_text || theme.colors.toolbar_text /* old name */ || inactiveTextColor;
+  let bgAlpha = 1;
+  let hasImage = false;
+  if (theme.images) {
+    const isRightside = configs.sidebarPosition == Constants.kTABBAR_POSITION_RIGHT;
+    const images    = [];
+    const frameImage = theme.images.theme_frame || theme.images.headerURL /* old name */;
+    if (frameImage) {
+      hasImage = true;
+      // https://searchfox.org/mozilla-central/rev/532e4b94b9e807d157ba8e55034aef05c1196dc9/browser/themes/shared/tabs.inc.css#537
+      extraColors.push('--browser-bg-hover-for-header-image: rgba(0, 0, 0, 0.1);');
+      // https://searchfox.org/mozilla-central/rev/532e4b94b9e807d157ba8e55034aef05c1196dc9/browser/base/content/browser.css#20
+      extraColors.push('--browser-bg-active-for-header-image: rgba(255, 255, 255, 0.4)');
+      // https://searchfox.org/mozilla-central/rev/532e4b94b9e807d157ba8e55034aef05c1196dc9/toolkit/themes/windows/global/global.css#138
+      if (Color.isBrightColor(inactiveTextColor)) {
+        // for bright text
+        extraColors.push('--browser-textshadow-for-header-image: 1px 1px 1.5px black');
+      }
+      else {
+        // for dark text
+        extraColors.push('--browser-textshadow-for-header-image: 0 0 1.5px white');
+      }
+      images.push({
+        url:      frameImage,
+        position: isRightside ? 'top right' : 'top left',
+        repeat:   'no-repeat',
+      });
+    }
+
+    const positions = theme.properties?.additional_backgrounds_alignment || [];
+    const repeats = theme.properties?.additional_backgrounds_tiling || [];
+    if (Array.isArray(theme.images.additional_backgrounds) &&
+        theme.images.additional_backgrounds.length > 0) {
+      const leftImageCount = positions.filter(position => position.includes('left')).length;
+      const rightImageCount = positions.filter(position => position.includes('right')).length;
+      const repeatableImageCount = repeats.filter(repeat => repeat != 'no-repeat').length;
+      for (let i = 0, maxi = theme.images.additional_backgrounds.length; i < maxi; i++) {
+        const image = theme.images.additional_backgrounds[i];
+        const position = positions.length > 0 && positions[Math.min(i, positions.length - 1)] || 'default';
+        const repeat = repeats.length > 0 && repeats[Math.min(i, repeats.length - 1)] || 'default';
+        if (repeatableImageCount > 0 &&
+            repeat.includes('no-repeat'))
+          continue;
+        if (position &&
+            position.includes('right') != isRightside &&
+            repeat == 'no-repeat' &&
+            leftImageCount > 0 &&
+            rightImageCount > 0)
+          continue;
+        images.push({
+          url: image,
+          position,
+          repeat,
+          size: repeat == 'reepat-y' ? 'auto' : 'auto 100%',
+        });
+      }
+      bgAlpha = 0.75;
+      hasImage = true;
+    }
+
+    await Promise.all(images.map(async image => {
+      if (image.size)
+        return;
+
+      const loader = new Image();
+      try {
+        const shouldRepeat = (
+          theme.properties &&
+          Array.isArray(theme.properties.additional_backgrounds_tiling) &&
+          theme.properties.additional_backgrounds_tiling.some(value => value == 'repeat' || value == 'repeat-y')
+        );
+        const shouldNoRepeat = (
+          !theme.properties ||
+          !Array.isArray(theme.properties.additional_backgrounds_tiling) ||
+          theme.properties.additional_backgrounds_tiling.some(value => value == 'no-repeat')
+        );
+        let maybeRepeatable = false;
+        if (!shouldRepeat && !shouldNoRepeat) {
+          await new Promise((resolve, reject) => {
+            loader.addEventListener('load', resolve);
+            loader.addEventListener('error', reject);
+            loader.src = image;
+          });
+          maybeRepeatable = (loader.width / Math.max(1, loader.height)) <= configs.unrepeatableBGImageAspectRatio;
+        }
+        if (shouldNoRepeat)
+          image.size = 'cover';
+        else if (shouldRepeat || maybeRepeatable)
+          image.size = 'auto';
+      }
+      catch(error) {
+        console.error(error);
+      }
+    }));
+
+    if (hasImage) {
+      extraColors.push('--browser-bg-images: ' + images.map(image => `url(${JSON.stringify(image.url)})`).join(','));
+      extraColors.push('--browser-bg-position: ' + images.map(image => image.position).join(','));
+      extraColors.push('--browser-bg-repeat: ' + images.map(image => image.repeat).join(','));
+      extraColors.push('--browser-bg-size: ' + images.map(image => image.size).join(','));
+    }
+  }
+  const themeBaseColor    = Color.overrideCSSAlpha(themeFrameColor, bgAlpha);
+  let toolbarColor = Color.mixCSSColors(themeBaseColor, 'rgba(255, 255, 255, 0.4)', bgAlpha);
+  if (theme.colors.toolbar) {
+    if (hasImage) {
+      extraColors.push(`--browser-bg-for-header-image: ${theme.colors.toolbar};`);
+      toolbarColor = theme.colors.toolbar;
+    }
+    else {
+      toolbarColor = Color.mixCSSColors(themeBaseColor, theme.colors.toolbar);
+    }
+    extraColors.push(`--browser-toolbar: ${theme.colors.toolbar}`);
+    if (Color.isParsable(theme.colors.toolbar) &&
+        Color.isParsable(theme.colors.toolbar_text)) {
+      const halfTransparentTextColor = Color.mixCSSColors(theme.colors.toolbar_text, theme.colors.toolbar_text, 0.5);
+      extraColors.push(`--browser-toolbar_text-darker: ${Color.mixCSSColors(theme.colors.toolbar, halfTransparentTextColor)}`);
+    }
+  }
+  else if (hasImage) {
+    extraColors.push('--browser-bg-for-header-image: rgba(255, 255, 255, 0.25);');
+  }
+  if (theme.colors.tab_line)
+    extraColors.push(`--browser-tab-highlighter: ${theme.colors.tab_line}`);
+  if (theme.colors.tab_loading)
+    extraColors.push(`--browser-loading-indicator: ${theme.colors.tab_loading}`);
+  if (theme.colors.tab_selected)
+    extraColors.push(`--browser-selected-tab-bg: ${theme.colors.tab_selected}`);
+  extraColors.push(generateThemeRules(theme));
+  return `
+    :root {
+      --browser-background:      ${themeFrameColor};
+      --browser-bg-base:         ${toolbarColor};
+      --browser-bg-less-lighter: ${Color.mixCSSColors(toolbarColor, 'rgba(255, 255, 255, 0.05)', bgAlpha)};
+      --browser-bg-lighter:      ${Color.mixCSSColors(toolbarColor, 'rgba(255, 255, 255, 0.1)', bgAlpha)};
+      --browser-bg-more-lighter: ${Color.mixCSSColors(toolbarColor, 'rgba(255, 255, 255, 0.25)', bgAlpha)};
+      --browser-bg-lightest:     ${Color.mixCSSColors(toolbarColor, 'rgba(255, 255, 255, 0.4)', bgAlpha)};
+      --browser-bg-less-darker:  ${Color.mixCSSColors(toolbarColor, 'rgba(0, 0, 0, 0.1)', bgAlpha)};
+      --browser-bg-darker:       ${Color.mixCSSColors(toolbarColor, 'rgba(0, 0, 0, 0.25)', bgAlpha)};
+      --browser-bg-more-darker:  ${Color.mixCSSColors(toolbarColor, 'rgba(0, 0, 0, 0.5)', bgAlpha)};
+      --browser-fg:              ${inactiveTextColor};
+      --browser-fg-active:       ${activeTextColor};
+      --browser-border:          ${Color.overrideCSSAlpha(inactiveTextColor, 0.4)};
+      ${extraColors.join(';\n')}
+    }
+  `;
+}
diff --git a/waterfox/browser/components/sidebar/common/cache-storage.js b/waterfox/browser/components/sidebar/common/cache-storage.js
new file mode 100644
index 0000000000000..7ea7bb9f8c3fd
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/cache-storage.js
@@ -0,0 +1,318 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as UniqueId from '/common/unique-id.js';
+import {
+  asyncRunWithTimeout,
+} from '/common/common.js';
+
+const DB_NAME = 'PermanentStorage';
+const DB_VERSION = 3;
+const EXPIRATION_TIME_IN_MSEC = 7 * 24 * 60 * 60 * 1000; // 7 days
+const TIMEOUT_IN_MSEC = 1000 * 5; // 5 sec
+
+export const BACKGROUND = 'backgroundCaches';
+const SIDEBAR = 'sidebarCaches'; // obsolete, but left here to delete old storage
+
+let mOpenedDB;
+
+async function openDB() {
+  if (mOpenedDB)
+    return mOpenedDB;
+  return new Promise((resolve, _reject) => {
+    const request = indexedDB.open(DB_NAME, DB_VERSION);
+
+    request.onerror = () => {
+      // This can fail if this is in a private window.
+      // See: https://github.com/piroor/treestyletab/issues/3387
+      //reject(new Error('Failed to open database'));
+      resolve(null);
+    };
+
+    request.onsuccess = () => {
+      const db = request.result;
+      mOpenedDB = db;
+      resolve(db);
+    };
+
+    request.onupgradeneeded = (event) => {
+      const db = event.target.result;
+      const objectStores = db.objectStoreNames;
+
+      const needToUpgrade = event.oldVersion < DB_VERSION;
+      if (needToUpgrade) {
+        if (objectStores.contains(BACKGROUND))
+          db.deleteObjectStore(BACKGROUND);
+        if (objectStores.contains(SIDEBAR))
+          db.deleteObjectStore(SIDEBAR);
+      }
+
+      if (needToUpgrade ||
+          !objectStores.contains(BACKGROUND)) {
+        const backgroundCachesStore = db.createObjectStore(BACKGROUND, { keyPath: 'key', unique: true });
+        backgroundCachesStore.createIndex('windowId', 'windowId', { unique: false });
+        backgroundCachesStore.createIndex('timestamp', 'timestamp');
+      }
+    };
+  });
+}
+
+export async function setValue({ windowId, key, value } = {}) {
+  const [db, windowUniqueId] = await Promise.all([
+    openDB(),
+    UniqueId.ensureWindowId(windowId),
+  ]);
+  if (!db)
+    return;
+
+  reserveToExpireOldEntries();
+
+  const store = BACKGROUND;
+
+  const cacheKey = `${windowUniqueId}-${key}`;
+  asyncRunWithTimeout({
+    task: () => new Promise((resolve, reject) => {
+      const timestamp = Date.now();
+      try {
+        const transaction = db.transaction([store], 'readwrite');
+        const cacheStore = transaction.objectStore(store);
+        const cacheRequest = cacheStore.put({
+          key:      cacheKey,
+          windowId: windowUniqueId,
+          value,
+          timestamp,
+        });
+
+        transaction.oncomplete = () => {
+          //db.close();
+          windowId = undefined;
+          key      = undefined;
+          value    = undefined;
+          resolve();
+        };
+
+        cacheRequest.onerror = event => {
+          console.error(`Failed to store cache ${cacheKey} in the store ${store}`, event);
+          reject(event);
+        };
+      }
+      catch(error) {
+        console.error(`Failed to store cache ${cacheKey} in the store ${store}`, error);
+        reject(error);
+      }
+    }),
+    timeout: TIMEOUT_IN_MSEC,
+    onTimedOut() {
+      throw new Error(`CacheStorage.setValue for ${windowId}/key timed out`);
+    },
+  });
+}
+
+export async function deleteValue({ windowId, key } = {}) {
+  const [db, windowUniqueId] = await Promise.all([
+    openDB(),
+    UniqueId.ensureWindowId(windowId),
+  ]);
+  if (!db)
+    return;
+
+  reserveToExpireOldEntries();
+
+  const store = BACKGROUND;
+
+  const cacheKey = `${windowUniqueId}-${key}`;
+  asyncRunWithTimeout({
+    task: () => new Promise((resolve, reject) => {
+      try {
+        const transaction = db.transaction([store], 'readwrite');
+        const cacheStore = transaction.objectStore(store);
+        const cacheRequest = cacheStore.delete(cacheKey);
+
+        transaction.oncomplete = () => {
+          //db.close();
+          windowId = undefined;
+          key      = undefined;
+          resolve();
+        };
+
+        cacheRequest.onerror = event => {
+          console.error(`Failed to delete cache ${cacheKey} in the store ${store}`, event);
+          reject(event);
+        };
+      }
+      catch(error) {
+        console.error(`Failed to delete cache ${cacheKey} in the store ${store}`, error);
+        reject(error);
+      }
+    }),
+    timeout: TIMEOUT_IN_MSEC,
+    onTimedOut() {
+      throw new Error(`CacheStorage.deleteValue for {windowId}/key timed out`);
+    },
+  });
+}
+
+export async function getValue({ windowId, key } = {}) {
+  return asyncRunWithTimeout({
+    task: () => getValueInternal({ windowId, key }),
+    timeout: TIMEOUT_IN_MSEC,
+    onTimedOut() {
+      throw new Error(`CacheStorage.getValue for {windowId}/${key} timed out`);
+    },
+  });
+}
+async function getValueInternal({ windowId, key } = {}) {
+  return new Promise(async (resolve, _reject) => {
+    const [db, windowUniqueId] = await Promise.all([
+      openDB(),
+      UniqueId.ensureWindowId(windowId),
+    ]);
+    if (!db) {
+      resolve(null);
+      return;
+    }
+
+    const store = BACKGROUND;
+
+    const cacheKey = `${windowUniqueId}-${key}`;
+    const timestamp = Date.now();
+    try {
+      const transaction = db.transaction([store], 'readwrite');
+      const cacheStore = transaction.objectStore(store);
+
+      const cacheRequest = cacheStore.get(cacheKey);
+
+      cacheRequest.onsuccess = () => {
+        const cache = cacheRequest.result;
+        if (!cache) {
+          resolve(null);
+          return;
+        }
+        // IndexedDB does not support partial update, so
+        // we need to put all properties not only timestamp.
+        cacheStore.put({
+          key:      cacheKey,
+          windowId: windowUniqueId,
+          value:    cache.value,
+          timestamp,
+        });
+        resolve(cache.value);
+        cache.key      = undefined;
+        cache.windowId = undefined;
+        cache.value    = undefined;
+      };
+
+      cacheRequest.onerror = event => {
+        console.error('Failed to get from cache:', event);
+        resolve(null);
+      };
+
+      transaction.oncomplete = () => {
+        //db.close();
+        windowId = undefined;
+        key      = undefined;
+      };
+    }
+    catch(error) {
+      console.error('Failed to get from cache:', error);
+      resolve(null);
+    }
+  });
+}
+
+export async function clearForWindow(windowId) {
+  return asyncRunWithTimeout({
+    task: () => clearForWindowInternal(windowId),
+    timeout: TIMEOUT_IN_MSEC,
+    onTimedOut() {
+      throw new Error(`CacheStorage.clearForWindow for ${windowId} timed out`);
+    },
+  });
+}
+async function clearForWindowInternal(windowId) {
+  reserveToExpireOldEntries();
+  return new Promise(async (resolve, reject) => {
+    const [db, windowUniqueId] = await Promise.all([
+      openDB(),
+      UniqueId.ensureWindowId(windowId),
+    ]);
+    if (!db) {
+      resolve(null);
+      return;
+    }
+
+    try {
+      const transaction = db.transaction([BACKGROUND], 'readwrite');
+      const backgroundCacheStore = transaction.objectStore(BACKGROUND);
+      const backgroundCacheIndex = backgroundCacheStore.index('windowId');
+      const backgroundCacheRequest = backgroundCacheIndex.openCursor(IDBKeyRange.only(windowUniqueId));
+      backgroundCacheRequest.onsuccess = (event) => {
+        const cursor = event.target.result;
+        if (!cursor)
+          return;
+        const key = cursor.primaryKey;
+        cursor.continue();
+        backgroundCacheStore.delete(key);
+      };
+
+      transaction.oncomplete = () => {
+        //db.close();
+        resolve();
+      };
+    }
+    catch(error) {
+      console.error('Failed to clear caches:', error);
+      reject(error);
+    }
+  });
+}
+
+async function reserveToExpireOldEntries() {
+  if (reserveToExpireOldEntries.reservedExpiration)
+    clearTimeout(reserveToExpireOldEntries.reservedExpiration);
+  reserveToExpireOldEntries.reservedExpiration = setTimeout(() => {
+    reserveToExpireOldEntries.reservedExpiration = null;
+    expireOldEntries();
+  }, 500);
+}
+
+async function expireOldEntries() {
+  return new Promise(async (resolve, reject) => {
+    const db = await openDB();
+    if (!db) {
+      resolve();
+      return;
+    }
+
+    try {
+      const transaction = db.transaction([BACKGROUND], 'readwrite');
+      const backgroundCacheStore = transaction.objectStore(BACKGROUND);
+      const backgroundCacheIndex = backgroundCacheStore.index('timestamp');
+
+      const expirationTimestamp = Date.now() - EXPIRATION_TIME_IN_MSEC;
+
+      const backgroundCacheRequest = backgroundCacheIndex.openCursor(IDBKeyRange.upperBound(expirationTimestamp));
+      backgroundCacheRequest.onsuccess = (event) => {
+        const cursor = event.target.result;
+        if (!cursor)
+          return;
+        const key = cursor.primaryKey;
+        cursor.continue();
+        backgroundCacheStore.delete(key);
+      };
+
+      transaction.oncomplete = () => {
+        //db.close();
+        resolve();
+      };
+    }
+    catch(error) {
+      console.error('Failed to expire old entries:', error);
+      reject(error);
+    }
+  });
+}
diff --git a/waterfox/browser/components/sidebar/common/color.js b/waterfox/browser/components/sidebar/common/color.js
new file mode 100644
index 0000000000000..b440fa0acb0a1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/color.js
@@ -0,0 +1,199 @@
+/*
+# 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/.
+*/
+'use strict';
+
+export function mixCSSColors(base, over, alpha = 1) {
+  base = parseCSSColor(base);
+  over = parseCSSColor(over);
+  const mixed = mixColors(base, over);
+  return `rgba(${mixed.red}, ${mixed.green}, ${mixed.blue}, ${alpha})`;
+}
+
+export function overrideCSSAlpha(color, alpha = 1) {
+  const parsed = parseCSSColor(color);
+  let base = color;
+  let baseAlpha = parsed.alpha;
+  if (baseAlpha > 0) {
+    while (baseAlpha < 1) {
+      base = mixCSSColors(base, base);
+      baseAlpha *= 2;
+    }
+  }
+  return mixCSSColors(base, base, alpha);
+}
+
+function normalizeColorElement(value) {
+  return Math.max(0, Math.min(255, value.endsWith('%') ? (parseFloat(value) / 100 * 255) : parseFloat(value)));
+}
+
+function normalizeAlpha(value) {
+  if (!value)
+    return 1;
+  return Math.max(0, Math.min(1, value.endsWith('%') ? (parseFloat(value) / 100) : parseFloat(value)));
+}
+
+function normalizeAngle(value, unit) {
+  value = parseFloat(value);
+  switch ((unit || '').toLowerCase()) {
+    case 'rad':
+      value = value * (180 / Math.PI);
+      break;
+
+    case 'grad':
+      value = value * 0.9;
+      break;
+
+    case 'turn':
+      value = value * 360;
+      break;
+
+    default: // deg
+      break;
+  }
+  value = value % 360;
+  if (value < 0)
+    value += 360;
+  return value;
+}
+
+const HEX        = '[0-9a-f]';
+const DOUBLE_HEX = `${HEX}{2}`;
+const FLOAT      = '(?:\\.?[0-9]+|[0-9]+(?:\\.[0-9]+)?)';
+const FLOAT_OR_PERCENTAGE = `${FLOAT}%?`;
+
+const HEX_RRGGBBAA_MATCHER = new RegExp(`^#?(${DOUBLE_HEX})(${DOUBLE_HEX})(${DOUBLE_HEX})(${DOUBLE_HEX})?$`, 'i');
+const HEX_RGBA_MATCHER     = new RegExp(`^#?(${HEX})(${HEX})(${HEX})(${HEX})?$`, 'i');
+const RGBA_MATCHER         = new RegExp(`^rgba?\\(\\s*(${FLOAT_OR_PERCENTAGE})\\s*,?\\s*(${FLOAT_OR_PERCENTAGE})\\s*,?\\s*(${FLOAT_OR_PERCENTAGE})(?:\\s*[,/]?\\s*(${FLOAT_OR_PERCENTAGE})\\s*)?\\)$`, 'i');
+const HSLA_MATCHER         = new RegExp(`^hsla?\\(\\s*(${FLOAT})(deg|rad|grad|turn)?\\s*,?\\s*(${FLOAT_OR_PERCENTAGE})\\s*,?\\s*(${FLOAT_OR_PERCENTAGE})(?:\\s*[,/]?\\s*(${FLOAT_OR_PERCENTAGE})\\s*)?\\)$`, 'i');
+
+export function isParsable(color) {
+  if (!color)
+    return false;
+  const stringifiedColor = String(color);
+  return HEX_RRGGBBAA_MATCHER.test(stringifiedColor) ||
+    HEX_RGBA_MATCHER.test(stringifiedColor) ||
+    RGBA_MATCHER.test(stringifiedColor) ||
+    HSLA_MATCHER.test(stringifiedColor);
+}
+
+export function parseCSSColor(color, baseColor) {
+  if (typeof color!= 'string')
+    return color;
+
+  let red, green, blue, alpha;
+
+  let parts = color.match(HEX_RRGGBBAA_MATCHER);
+  if (parts) {
+    red   = parseInt(parts[1], 16);
+    green = parseInt(parts[2], 16);
+    blue  = parseInt(parts[3], 16);
+    alpha = parts[4] ? parseInt(parts[4], 16) / 255 : 1 ;
+  }
+  if (!parts) {
+    // #RGB, #RGBA
+    parts = color.match(HEX_RGBA_MATCHER);
+    if (parts) {
+      red   = Math.min(255, Math.round(255 * (parseInt(parts[1], 16) / 16)));
+      green = Math.min(255, Math.round(255 * (parseInt(parts[2], 16) / 16)));
+      blue  = Math.min(255, Math.round(255 * (parseInt(parts[3], 16) / 16)));
+      alpha = parts[4] ? parseInt(parts[4], 16) / 16 : 1 ;
+    }
+  }
+  if (!parts) {
+    // rgb(), rgba()
+    parts = color.match(RGBA_MATCHER);
+    if (parts) {
+      red   = normalizeColorElement(parts[1]);
+      green = normalizeColorElement(parts[2]);
+      blue  = normalizeColorElement(parts[3]);
+      alpha = normalizeAlpha(parts[4]);
+    }
+  }
+  if (!parts) {
+    // hsl(), hsla()
+    parts = color.match(HSLA_MATCHER);
+    if (parts) {
+      const hue        = normalizeAngle(parts[1], parts[2]);
+      const saturation = parseFloat(parts[3]);
+      const lightness  = parseFloat(parts[4]);
+      let min, max;
+      if (lightness < 50) {
+        max = 2.55 * (lightness + (lightness * (saturation / 100)));
+        min = 2.55 * (lightness - (lightness * (saturation / 100)));
+      }
+      else {
+        max = 2.55 * (lightness + ((100 - lightness) * (saturation / 100)));
+        min = 2.55 * (lightness - ((100 - lightness) * (saturation / 100)));
+      }
+      if (hue < 60) {
+        red   = max;
+        green = (hue / 60) * (max - min) + min;
+        blue  = min;
+      }
+      else if (hue < 120) {
+        red   = ((120 - hue) / 60) * (max - min) + min;
+        green = max;
+        blue  = min;
+      }
+      else if (hue < 180) {
+        red   = min;
+        green = max;
+        blue  = ((hue - 120) / 60) * (max - min) + min;
+      }
+      else if (hue < 240) {
+        red   = min;
+        green = ((240 - hue) / 60) * (max - min) + min;
+        blue  = max;
+      }
+      else if (hue < 300) {
+        red   = ((hue - 240) / 60) * (max - min) + min;
+        green = min;
+        blue  = max;
+      }
+      else {
+        red   = max;
+        green = min;
+        blue  = ((360 - hue) / 60) * (max - min) + min;
+      }
+      alpha = normalizeAlpha(parts[5]);
+    }
+  }
+  if (!parts) {
+    switch(color.toLowerCase()) {
+      case 'transparent':
+        red   = 0;
+        green = 0;
+        blue  = 0;
+        alpha = 0;
+        break;
+
+      default:
+        return color;
+    }
+  }
+
+  const parsed = { red, green, blue, alpha };
+
+  if (alpha < 1 && baseColor)
+    return mixColors(parseCSSColor(baseColor), parsed);
+
+  return parsed;
+}
+
+function mixColors(base, over) {
+  const alpha = over.alpha;
+  const red   = Math.min(255, Math.round((base.red   * (1 - alpha)) + (over.red   * alpha)));
+  const green = Math.min(255, Math.round((base.green * (1 - alpha)) + (over.green * alpha)));
+  const blue  = Math.min(255, Math.round((base.blue  * (1 - alpha)) + (over.blue  * alpha)));
+  return { red, green, blue, alpha: 1 };
+}
+
+export function isBrightColor(color) {
+  color = parseCSSColor(color);
+  // https://searchfox.org/mozilla-central/rev/532e4b94b9e807d157ba8e55034aef05c1196dc9/browser/base/content/browser.js#8200
+  const luminance = (color.red * 0.2125) + (color.green * 0.7154) + (color.blue * 0.0721);
+  return luminance > 110;
+}
diff --git a/waterfox/browser/components/sidebar/common/common.js b/waterfox/browser/components/sidebar/common/common.js
new file mode 100644
index 0000000000000..86229801f69be
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/common.js
@@ -0,0 +1,1289 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import Configs from '/extlib/Configs.js';
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import * as Constants from './constants.js';
+
+const WATERFOX_SPECIFIC_VALUES = {
+  sidebarPosition: Constants.kTABBAR_POSITION_LEFT,
+  suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation: false,
+  suppressGapFromShownOrHiddenToolbarOnNewTab: false,
+  showTreeCommandsInTabsContextMenuGlobally: false,
+  stickyActiveTab: false,
+  stickySoundPlayingTab: false,
+  stickySharingTab: false,
+  style: 'proton',
+  exposeUnblockAutoplayFeatures: true,
+
+  // because full options page is already behind the "Advanced" options
+  showExpertOptions: true,
+
+  // don't attach tabs as children of the active tab by default if possible
+  autoAttachOnOpenedWithOwner: Constants.kNEWTAB_DO_NOTHING,
+  insertNewTabFromPinnedTabAt: Constants.kINSERT_NO_CONTROL,
+  insertNewTabFromFirefoxViewAt: Constants.kINSERT_NO_CONTROL,
+  autoGroupNewTabsFromPinned: false,
+  autoAttachOnNewTabButtonMiddleClick: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+  autoAttachSameSiteOrphan: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+
+  // suppress notification at the initial startup
+  notifiedFeaturesVersion: 99999,
+  syncAvailableNotified: true,
+
+  // by our custom module, drag and drop of the tree is natively supported.
+  showTabDragBehaviorNotification: false,
+  enableWorkaroundForBug1548949: false,
+
+  // covered by our custom module
+  enableWorkaroundForBug1875100: false,
+};
+export const WATERFOX_AUTOMATED_TEST_DEFAULT_VALUES = {
+  maxTreeLevel: -1,
+  autoAttach: true,
+  syncParentTabAndOpenerTab: true,
+  autoAttachOnOpenedWithOwner: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+  autoGroupNewTabsFromPinned: true,
+  autoAttachOnNewTabButtonMiddleClick: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+  autoAttachSameSiteOrphan: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+};
+
+export const DEVICE_SPECIFIC_CONFIG_KEYS = mapAndFilter(`
+  blockStartupOperations
+  chunkedSyncDataLocal0
+  chunkedSyncDataLocal1
+  chunkedSyncDataLocal2
+  chunkedSyncDataLocal3
+  chunkedSyncDataLocal4
+  chunkedSyncDataLocal5
+  chunkedSyncDataLocal6
+  chunkedSyncDataLocal7
+  fixDragEndCoordinates
+  lastConfirmedToCloseTabs
+  lastDragOverSidebarOwnerWindowId
+  lastDraggedTabs
+  loggingConnectionMessages
+  loggingQueries
+  migratedBookmarkUrls
+  requestingPermissions
+  requestingPermissionsNatively
+  syncAvailableNotified
+  syncDeviceInfo
+  syncDevicesLocalCache
+  syncEnabled
+  syncLastMessageTimestamp
+  syncOtherDevicesDetected
+`.trim().split('\n'), key => {
+  key = key.trim();
+  return key && key.indexOf('//') != 0 && key;
+});
+
+const localKeys = DEVICE_SPECIFIC_CONFIG_KEYS.concat(mapAndFilter(`
+  APIEnabled
+  accelKey
+  baseIndent
+  cachedExternalAddons
+  colorScheme
+  debug
+  enableLinuxBehaviors
+  enableMacOSBehaviors
+  enableWindowsBehaviors
+  faviconizedTabScale
+  grantedExternalAddonPermissions
+  grantedRemovingTabIds
+  incognitoAllowedExternalAddons
+  logFor
+  logTimestamp
+  maximumDelayForBug1561879
+  minimumIntervalToProcessDragoverEvent
+  minIndent
+  notifiedFeaturesVersion
+  optionsExpandedGroups
+  optionsExpandedSections
+  outOfScreenTabsRenderingPages
+  rtl,
+  sidebarPosition
+  sidebarVirtuallyClosedWindows
+  sidebarVirtuallyOpenedWindows
+  sidebarWidthInWindow
+  startDragTimeout
+  style
+  subMenuCloseDelay
+  subMenuOpenDelay
+  testKey
+  userStyleRulesFieldHeight
+  userStyleRulesFieldTheme
+  runTestsParameters
+`.trim().split('\n'), key => {
+  key = key.trim();
+  return key && key.indexOf('//') != 0 && key;
+}));
+
+export const obsoleteConfigs = new Set(mapAndFilter(`
+  sidebarScrollbarPosition // migrated to user stylesheet
+  scrollbarMode // migrated to user stylesheet
+  suppressGapFromShownOrHiddenToolbar // migrated to suppressGapFromShownOrHiddenToolbarOnFullScreen/NewTab
+  fakeContextMenu // migrated to emulateDefaultContextMenu
+  context_closeTabOptions_closeTree // migrated to context_topLevel_closeTree
+  context_closeTabOptions_closeDescendants // migrated to context_topLevel_closeDescendants
+  context_closeTabOptions_closeOthers // migrated to context_topLevel_closeOthers
+  collapseExpandSubtreeByDblClick // migrated to treeDoubleClickBehavior
+  autoExpandOnCollapsedChildActive // migrate to unfocusableCollapsedTab
+  inheritContextualIdentityToNewChildTab // migrated to inheritContextualIdentityToChildTabMode
+  inheritContextualIdentityToSameSiteOrphan // migrated to inheritContextualIdentityToSameSiteOrphanMode
+  inheritContextualIdentityToTabsFromExternal // migrated to inheritContextualIdentityToTabsFromExternalMode
+  promoteFirstChildForClosedRoot // migrated to Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY of closeParentBehavior
+  parentTabBehaviorForChanges // migrated to parentTabOperationBehaviorMode
+  closeParentBehaviorMode // migrated to parentTabOperationBehaviorMode
+  closeParentBehavior // migrated to closeParentBehavior_insideSidebar_expanded
+  closeParentBehavior_outsideSidebar// migrated to closeParentBehavior_outsideSidebar_expanded
+  closeParentBehavior_noSidebar // migrated to closeParentBehavior_noSidebar_expanded
+  treatTreeAsExpandedOnClosedWithNoSidebar // migrated to treatTreeAsExpandedOnClosed_noSidebar
+  treatTreeAsExpandedOnClosed_outsideSidebar // migrated to closeParentBehavior_noSidebar_expanded and closeParentBehavior_noSidebar_expanded
+  treatTreeAsExpandedOnClosed_noSidebar // migrated to closeParentBehavior_noSidebar_collapsed and moveParentBehavior_noSidebar_expanded
+  moveFocusInTreeForClosedActiveTab // migrated to "successorTabControlLevel"
+  startDragTimeout // migrated to longPressDuration
+  simulateCloseTabByDblclick // migrated to "treeDoubleClickBehavior=kTREE_DOUBLE_CLICK_BEHAVIOR_CLOSE"
+  moveDroppedTabToNewWindowForUnhandledDragEvent // see also: https://github.com/piroor/treestyletab/issues/1646 , migrated to tabDragBehavior
+  openAllBookmarksWithGroupAlways // migrated to suppressGroupTabForStructuredTabsFromBookmarks
+  // migrated to chunkedUserStyleRules0-5
+  userStyleRules0
+  userStyleRules1
+  userStyleRules2
+  userStyleRules3
+  userStyleRules4
+  userStyleRules5
+  userStyleRules6
+  userStyleRules7
+  autoGroupNewTabsTimeout // migrated to tabBunchesDetectionTimeout
+  autoGroupNewTabsDelayOnNewWindow // migrated to tabBunchesDetectionDelayOnNewWindow
+  autoHiddenScrollbarPlaceholderSize // migrated to shiftTabsForScrollbarDistance
+`.trim().split('\n'), key => {
+  key = key.replace(/\/\/.*/, '').trim();
+  if (!key)
+    return undefined;
+  return key && key.indexOf('//') != 0 && key;
+}));
+
+
+const RTL_LANGUAGES = new Set([
+  'ar',
+  'he',
+  'fa',
+  'ur',
+  'ps',
+  'sd',
+  'ckb',
+  'prs',
+  'rhg',
+]);
+
+export function isRTL() {
+  const lang = (
+    navigator.language ||
+    navigator.userLanguage ||
+    //(new Intl.DateTimeFormat()).resolvedOptions().locale ||
+    ''
+  ).split('-')[0];
+  return RTL_LANGUAGES.has(lang);
+}
+
+
+export const configs = new Configs({
+  optionsExpandedSections: ['section-appearance'],
+  optionsExpandedGroups: [],
+
+  // appearance
+  sidebarPosition: Constants.kTABBAR_POSITION_AUTO,
+  sidebarPositionRighsideNotificationShown: false,
+  sidebarPositionOptionNotificationTimeout: 20 * 1000,
+  rtl: isRTL(),
+
+  style: /^Mac/i.test(navigator.platform) ? 'sidebar' : 'proton',
+  colorScheme: /^Linux/i.test(navigator.platform) ? 'system-color' : 'photon' ,
+  iconColor: 'auto',
+  indentLine: 'auto',
+
+  shiftTabsForScrollbarDistance: '0.5em',
+  shiftTabsForScrollbarOnlyOnHover: false,
+
+  unrepeatableBGImageAspectRatio: 4,
+
+  faviconizePinnedTabs: true,
+  maxFaviconizedPinnedTabsInOneRow: 0, // auto
+  faviconizedTabScale: 1.75,
+  maxPinnedTabsRowsAreaPercentage: 50,
+  fadeOutPendingTabs: false, // simulates browser.tabs.fadeOutUnloadedTabs
+  fadeOutDiscardedTabs: true, // simulates browser.tabs.fadeOutExplicitlyUnloadedTabs
+
+  counterRole: Constants.kCOUNTER_ROLE_CONTAINED_TABS,
+
+  baseIndent: 12,
+  minIndent: Constants.kDEFAULT_MIN_INDENT,
+  maxTreeLevel: -1,
+  indentAutoShrink: true,
+  indentAutoShrinkOnlyForVisible: true,
+  labelOverflowStyle: 'fade',
+
+  showContextualIdentitiesSelector: false,
+  showNewTabActionSelector: true,
+  longPressOnNewTabButton: Constants.kCONTEXTUAL_IDENTITY_SELECTOR,
+  zoomable: false,
+
+  inContentUIOffsetTop: 0, // See also https://github.com/piroor/treestyletab/issues/3698
+  tabPreviewTooltip: false,
+  tabPreviewTooltipRenderIn: Constants.kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE,
+  tabPreviewTooltipInSidebar: null, // migrated to tabPreviewTooltipMode
+  tabPreviewTooltipDelayMsec: 500, // same as "ui.tooltip.delay_ms"
+  tabPreviewTooltipOffsetTop: null, // migrated to inContentUIOffsetTop
+  showOverflowTitleByTooltip: true,
+  showCollapsedDescendantsByTooltip: true,
+  showCollapsedDescendantsByLegacyTooltipOnSidebar: true,
+  tabGroupMenuPanelRenderIn: Constants.kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE,
+
+  showDialogInSidebar: false,
+
+  outOfScreenTabsRenderingPages: 1,
+  renderHiddenTabs: false,
+
+  suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation: true,
+  suppressGapFromShownOrHiddenToolbarOnFullScreen: false,
+  suppressGapFromShownOrHiddenToolbarOnNewTab: true,
+  suppressGapFromShownOrHiddenToolbarInterval: 50,
+  suppressGapFromShownOrHiddenToolbarTimeout: 500,
+  cancelGapSuppresserHoverDelay: 1000, // msec
+
+
+  // context menu
+  emulateDefaultContextMenu: true,
+  showTreeCommandsInTabsContextMenuGlobally: true,
+
+  context_reloadTree: true,
+  context_reloadDescendants: false,
+  context_unblockAutoplayTree: true,
+  context_unblockAutoplayDescendants: false,
+  context_toggleMuteTree: true,
+  context_toggleMuteDescendants: false,
+  context_closeTree: true,
+  context_closeDescendants: false,
+  context_closeOthers: false,
+  context_toggleSticky: false,
+  context_collapseTree: false,
+  context_collapseTreeRecursively: true,
+  context_collapseAll: true,
+  context_expandTree: false,
+  context_expandTreeRecursively: true,
+  context_expandAll: true,
+  context_bookmarkTree: true,
+  context_sendTreeToDevice: false,
+
+  context_topLevel_reloadTree: false,
+  context_topLevel_reloadDescendants: false,
+  context_topLevel_unblockAutoplayTree: false,
+  context_topLevel_unblockAutoplayDescendants: false,
+  context_topLevel_toggleMuteTree: false,
+  context_topLevel_toggleMuteDescendants: false,
+  context_topLevel_closeTree: false,
+  context_topLevel_closeDescendants: false,
+  context_topLevel_closeOthers: false,
+  context_topLevel_toggleSticky: true,
+  context_topLevel_collapseTree: false,
+  context_topLevel_collapseTreeRecursively: false,
+  context_topLevel_collapseAll: false,
+  context_topLevel_expandTree: false,
+  context_topLevel_expandTreeRecursively: false,
+  context_topLevel_expandAll: false,
+  context_topLevel_bookmarkTree: false,
+  context_topLevel_sendTreeToDevice: true,
+
+  context_collapsed: false,
+  context_pinnedTab: false,
+  context_unpinnedTab: false,
+
+  context_openAllBookmarksWithStructure: true,
+  context_openAllBookmarksWithStructureRecursively: false,
+
+  openAllBookmarksWithStructureDiscarded: true,
+  suppressGroupTabForStructuredTabsFromBookmarks: true,
+
+
+  // tree behavior
+  shouldDetectClickOnIndentSpaces: true,
+
+  autoCollapseExpandSubtreeOnAttach: true,
+  autoCollapseExpandSubtreeOnSelect: true,
+  autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove: true,
+
+  treeDoubleClickBehavior: Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_NONE,
+
+  autoExpandIntelligently: true,
+  unfocusableCollapsedTab: true,
+  autoExpandOnTabSwitchingShortcuts: true,
+  autoExpandOnTabSwitchingShortcutsDelay: 800,
+  autoExpandOnLongHover: true,
+  autoExpandOnLongHoverDelay: 500,
+  autoExpandOnLongHoverRestoreIniitalState: true,
+
+  autoCreateFolderForBookmarksFromTree: true,
+
+  accelKey: '',
+
+  skipCollapsedTabsForTabSwitchingShortcuts: false,
+
+  syncParentTabAndOpenerTab: true,
+
+  dropLinksOnTabBehavior: Constants.kDROPLINK_ASK,
+
+  tabDragBehavior:      Constants.kDRAG_BEHAVIOR_MOVE | Constants.kDRAG_BEHAVIOR_TEAR_OFF | Constants.kDRAG_BEHAVIOR_ENTIRE_TREE,
+  tabDragBehaviorShift: Constants.kDRAG_BEHAVIOR_MOVE | Constants.kDRAG_BEHAVIOR_ENTIRE_TREE | Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK,
+  showTabDragBehaviorNotification: true,
+  guessDraggedNativeTabs: true,
+  ignoreTabDropNearSidebarArea: true,
+  moveSoloTabOnDropParentToDescendant: true,
+
+  fixupTreeOnTabVisibilityChanged: false,
+  fixupOrderOfTabsFromOtherDevice: true,
+
+  scrollToExpandedTree: true,
+  syncActiveStateToBundledTabs: true,
+
+  spreadMutedStateOnlyToSoundPlayingTabs: true,
+
+
+  // tab bunches
+  tabBunchesDetectionTimeout: 100,
+  tabBunchesDetectionDelayOnNewWindow: 500,
+  autoGroupNewTabsFromBookmarks: true,
+  restoreTreeForTabsFromBookmarks: true,
+  tabsFromSameFolderMinThresholdPercentage: 50,
+  autoGroupNewTabsFromOthers: false,
+  autoGroupNewTabsFromPinned: true,
+  autoGroupNewTabsFromFirefoxView: false,
+  groupTabTemporaryStateForNewTabsFromBookmarks: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+  groupTabTemporaryStateForNewTabsFromOthers: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+  groupTabTemporaryStateForChildrenOfPinned: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+  groupTabTemporaryStateForChildrenOfFirefoxView: Constants.kGROUP_TAB_TEMPORARY_STATE_PASSIVE,
+  groupTabTemporaryStateForOrphanedTabs: Constants.kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE,
+  groupTabTemporaryStateForAPI: Constants.kGROUP_TAB_TEMPORARY_STATE_NOTHING,
+  renderTreeInGroupTabs: true,
+  warnOnAutoGroupNewTabs: true,
+  warnOnAutoGroupNewTabsWithListing: true,
+  warnOnAutoGroupNewTabsWithListingMaxRows: 5,
+  showAutoGroupOptionHint: true,
+  showAutoGroupOptionHintWithOpener: true,
+
+
+  // behavior around newly opened tabs
+  insertNewChildAt: Constants.kINSERT_END, // basically this option affects only very edge cases not controlled with "autoAttach*" options.
+  insertNewTabFromPinnedTabAt: Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB,
+  insertNewTabFromFirefoxViewAt: Constants.kINSERT_NEXT_TO_LAST_RELATED_TAB,
+  insertDroppedTabsAt: Constants.kINSERT_END,
+
+  scrollToNewTabMode: Constants.kSCROLL_TO_NEW_TAB_IF_POSSIBLE,
+  scrollLines: 3,
+
+  autoAttach: true,
+  autoAttachOnOpenedWithOwner: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+  autoAttachOnNewTabCommand: Constants.kNEWTAB_DO_NOTHING,
+  autoAttachOnContextNewTabCommand: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+  autoAttachOnNewTabButtonMiddleClick: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+  middleClickPasteURLOnNewTabButton: /^Linux/i.test(navigator.platform), // simulates "browser.tabs.searchclipboardfor.middleclick"
+  autoAttachOnNewTabButtonAccelClick: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+  autoAttachOnDuplicated: Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING,
+  autoAttachSameSiteOrphan: Constants.kNEWTAB_OPEN_AS_CHILD_END,
+  autoAttachOnOpenedFromExternal: Constants.kNEWTAB_DO_NOTHING,
+  autoAttachOnAnyOtherTrigger: Constants.kNEWTAB_DO_NOTHING,
+  guessNewOrphanTabAsOpenedByNewTabCommand: true,
+  guessNewOrphanTabAsOpenedByNewTabCommandTitle: browser.i18n.getMessage('guessNewOrphanTabAsOpenedByNewTabCommandTitle'),
+  guessNewOrphanTabAsOpenedByNewTabCommandUrl: 'about:newtab|about:privatebrowsing',
+  inheritContextualIdentityToChildTabMode: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+  inheritContextualIdentityToSameSiteOrphanMode: Constants.kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE,
+  inheritContextualIdentityToTabsFromExternalMode: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+  inheritContextualIdentityToTabsFromAnyOtherTriggerMode: Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+  inheritContextualIdentityToUnopenableURLTabs: false,
+
+
+  // behavior around closed tab
+  parentTabOperationBehaviorMode:     Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL,
+  //closeParentBehavior_insideSidebar_collapsed:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE, // permanently consistent
+  closeParentBehavior_insideSidebar_expanded:   Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  closeParentBehavior_outsideSidebar_collapsed: Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  closeParentBehavior_outsideSidebar_expanded:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  closeParentBehavior_noSidebar_collapsed:      Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  closeParentBehavior_noSidebar_expanded:       Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  //moveParentBehavior_insideSidebar_collapsed:   Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE, // permanently consistent
+  //moveParentBehavior_insideSidebar_expanded:    Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE, // permanently consistent
+  moveParentBehavior_outsideSidebar_collapsed:  Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE,
+  moveParentBehavior_outsideSidebar_expanded:   Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  moveParentBehavior_noSidebar_collapsed:       Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  moveParentBehavior_noSidebar_expanded:        Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD,
+  closeParentBehavior_replaceWithGroup_thresholdToPrevent: 1, // negative value means "never prevent"
+  moveTabsToBottomWhenDetachedFromClosedParent: false,
+  promoteAllChildrenWhenClosedParentIsLastChild: true,
+  successorTabControlLevel: Constants.kSUCCESSOR_TAB_CONTROL_IN_TREE,
+  simulateSelectOwnerOnClose: true,
+  simulateLockTabSizing: true,
+  deferScrollingToOutOfViewportSuccessor: true,
+  simulateTabsLoadInBackgroundInverted: false,
+  tabsLoadInBackgroundDiscarded: false,
+  warnOnCloseTabs: true,
+  warnOnCloseTabsNotificationTimeout: 20 * 1000,
+  warnOnCloseTabsByClosebox: true,
+  warnOnCloseTabsWithListing: true,
+  lastConfirmedToCloseTabs: 0,
+  grantedRemovingTabIds: [],
+  sidebarVirtuallyOpenedWindows: [], // for automated tests
+  sidebarVirtuallyClosedWindows: [], // for automated tests
+  sidebarWidthInWindow: {},
+
+
+  // animation
+  animation: true,
+  animationForce: false,
+  maxAllowedImmediateRefreshCount: 1,
+  smoothScrollEnabled:  true,
+  smoothScrollDuration: 150,
+  burstDuration:    375,
+  indentDuration:   200,
+  collapseDuration: 150,
+  outOfViewTabNotifyDuration: 750,
+  subMenuOpenDelay: 300,
+  subMenuCloseDelay: 300,
+
+
+  // subpanel
+  lastSelectedSubPanelProviderId: null,
+  lastSubPanelHeight: 0,
+  maxSubPanelSizeRatio: 0.66,
+
+
+  // misc.
+  showExpertOptions: false,
+  exposeUnblockAutoplayFeatures: false,
+  bookmarkTreeFolderName: browser.i18n.getMessage('bookmarkFolder_label_default', ['%TITLE%', '%YEAR%', '%MONTH%', '%DATE%']),
+  defaultBookmarkParentId: 'toolbar_____', // 'unfiled_____' for Firefox 83 and olders,
+  defaultSearchEngine: 'https://www.google.com/search?q=%s',
+  acceleratedTabOperations: true,
+  acceleratedTabCreation: false,
+  enableWorkaroundForBug1548949: true,
+  enableWorkaroundForBug1763420_reloadMaskImage: true, // workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1763420
+  maximumDelayForBug1561879: 500,
+  workaroundForBug1548949DroppedItems: null,
+  heartbeatInterval: 5000,
+  connectionTimeoutDelay: 500,
+  maximumAcceptableDelayForTabDuplication: 10 * 1000,
+  maximumDelayUntilTabIsTracked: 10 * 60 * 1000,
+  delayToBlockUserOperationForTabsRestoration: 1000,
+  intervalToUpdateProgressForBlockedUserOperation: 50,
+  delayToShowProgressForBlockedUserOperation: 1000,
+  acceptableDelayForInternalFocusMoving: 150,
+  delayForDuplicatedTabDetection: 0, // https://github.com/piroor/treestyletab/issues/2845
+  delayToRetrySyncTabsOrder: 100,
+  notificationTimeout: 10 * 1000,
+  longPressDuration: 400,
+  minimumIntervalToProcessDragoverEvent: 50,
+  delayToApplyHighlightedState: 50,
+  acceptableFlickerToIgnoreClickOnTabAndTabbar: 10,
+  autoDiscardTabForUnexpectedFocus: true,
+  autoDiscardTabForUnexpectedFocusDelay: 500,
+  avoidDiscardedTabToBeActivatedIfPossible: false,
+  provressiveHighlightingStep: Number.MAX_SAFE_INTEGER,
+  progressievHighlightingInterval: 100,
+  generatedTreeItemElementsPoolLifetimeMsec: 5 * 1000,
+  nativeTabGroupModificationDetectionTimeoutAfterTabMove: 500,
+  undoMultipleTabsClose: true,
+  allowDragNewTabButton: true,
+  newTabButtonDragGestureModifiers: 'shift',
+  migratedBookmarkUrls: [],
+  lastDragOverSidebarOwnerWindowId: null,
+  notifiedFeaturesVersion: 0,
+
+  useCachedTree: true,
+  persistCachedTree: true,
+
+  // This should be removed after https://bugzilla.mozilla.org/show_bug.cgi?id=1388193
+  // or https://bugzilla.mozilla.org/show_bug.cgi?id=1421329 become fixed.
+  // Otherwise you need to set "svg.context-properties.content.enabled"="true" via "about:config".
+  simulateSVGContextFill: true,
+
+  requestingPermissions: null,
+  requestingPermissionsNatively: null,
+  lastDraggedTabs: null,
+
+  // https://dxr.mozilla.org/mozilla-central/rev/2535bad09d720e71a982f3f70dd6925f66ab8ec7/browser/base/content/browser.css#137
+  newTabAnimationDuration: 100,
+
+  chunkedUserStyleRules0: '',
+  chunkedUserStyleRules1: '',
+  chunkedUserStyleRules2: '',
+  chunkedUserStyleRules3: '',
+  chunkedUserStyleRules4: '',
+  chunkedUserStyleRules5: '',
+  chunkedUserStyleRules6: '',
+  chunkedUserStyleRules7: '',
+  // obsolete, migrated to chunkedUserStyleRules0-5
+  userStyleRules: `
+/* Show title of unread tabs with red and italic font */
+/*
+:root.sidebar tab-item.unread .label-content {
+  color: red !important;
+  font-style: italic !important;
+}
+*/
+
+/* Add private browsing indicator per tab */
+/*
+:root.sidebar tab-item.private-browsing tab-label:before {
+  content: "๐Ÿ•ถ";
+}
+*/
+`.trim(),
+  userStyleRulesFieldHeight: '10em',
+  userStyleRulesFieldTheme: 'auto',
+
+  syncOtherDevicesDetected: false,
+  syncAvailableNotified: false,
+  syncAvailableNotificationTimeout: 20 * 1000,
+  syncDeviceInfo: null,
+  syncDevices:    {},
+  syncDevicesLocalCache: {},
+  syncDeviceExpirationDays: 14,
+  // Must be same to "services.sync.engine.tabs.filteredUrls"
+  syncUnsendableUrlPattern: '^(about:.*|resource:.*|chrome:.*|wyciwyg:.*|file:.*|blob:.*|moz-extension:.*)$',
+  syncLastMessageTimestamp: 0,
+  syncReceivedTabsNotificationTimeout: 20 * 1000,
+  syncSentTabsNotificationTimeout: 5 * 1000,
+  chunkedSyncData0: '',
+  chunkedSyncData1: '',
+  chunkedSyncData2: '',
+  chunkedSyncData3: '',
+  chunkedSyncData4: '',
+  chunkedSyncData5: '',
+  chunkedSyncData6: '',
+  chunkedSyncData7: '',
+  chunkedSyncDataLocal0: '',
+  chunkedSyncDataLocal1: '',
+  chunkedSyncDataLocal2: '',
+  chunkedSyncDataLocal3: '',
+  chunkedSyncDataLocal4: '',
+  chunkedSyncDataLocal5: '',
+  chunkedSyncDataLocal6: '',
+  chunkedSyncDataLocal7: '',
+
+
+  // Compatibility with other addons
+  knownExternalAddons: [
+    'multipletab@piro.sakura.ne.jp'
+  ],
+  cachedExternalAddons: [],
+  grantedExternalAddonPermissions: {},
+  incognitoAllowedExternalAddons: [],
+
+  // This must be same to the redirect key of Container Bookmarks.
+  // https://addons.mozilla.org/firefox/addon/container-bookmarks/
+  containerRedirectKey: 'container',
+
+
+  debug:     false,
+  blockStartupOperations: false, // to collect performance profile around the initialization process
+  runTestsParameters: '',
+  syncEnabled: true,
+  tabGroupsEnabled: true, // corresponding to browser.tabs.groups.enabled
+  APIEnabled: true,
+  cacheAPITreeItems: false,
+  logTimestamp: true,
+  loggingQueries: false,
+  logFor: { // git grep configs.logFor | grep -v common.js | cut -d "'" -f 2 | sed -e "s/^/    '/" -e "s/$/': false,/"
+    'background/api-tabs-listener': false,
+    'background/background-cache': false,
+    'background/background': false,
+    'background/browser-action-menu': false,
+    'background/commands': false,
+    'background/context-menu': false,
+    'background/handle-misc': false,
+    'background/handle-moved-tabs': false,
+    'background/handle-new-tabs': false,
+    'background/handle-removed-tabs': false,
+    'background/handle-tab-bunches': false,
+    'background/handle-tab-focus': false,
+    'background/handle-tab-multiselect': false,
+    'background/handle-tree-changes': false,
+    'background/migration': false,
+    'background/native-tab-groups': false,
+    'background/successor-tab': false,
+    'background/tab-context-menu': false,
+    'background/tabs-group': false,
+    'background/tabs-move': false,
+    'background/tabs-open': false,
+    'background/tree': false,
+    'background/tree-structure': false,
+    'common/TreeItem': false,
+    'common/Window': false,
+    'common/api-tabs': false,
+    'common/bookmark': false,
+    'common/contextual-identities': false,
+    'common/dialog': false,
+    'common/permissions': false,
+    'common/retrieve-url': false,
+    'common/sidebar-connection': false,
+    'common/sync': false,
+    'common/tabs-internal-operation': false,
+    'common/tabs-update': false,
+    'common/tree-behavior': false,
+    'common/tst-api': false,
+    'common/unique-id': false,
+    'common/user-operation-blocker': false,
+    'sidebar/background-connection': false,
+    'sidebar/collapse-expand': false,
+    'sidebar/drag-and-drop': false,
+    'sidebar/event-utils': false,
+    'sidebar/gap-canceller': false,
+    'sidebar/indent': false,
+    'sidebar/mouse-event-listener': false,
+    'sidebar/pinned-tabs': false,
+    'sidebar/scroll': false,
+    'sidebar/sidebar-items': false,
+    'sidebar/sidebar': false,
+    'sidebar/size': false,
+    'sidebar/subpanel': false,
+    'sidebar/tab-context-menu': false,
+    'sidebar/tab-group-context-menu': false,
+    'sidebar/tab-preview-tooltip': false,
+    'sidebar/tst-api-frontend': false,
+  },
+  loggingConnectionMessages: false,
+  enableLinuxBehaviors: false,
+  enableMacOSBehaviors: false,
+  enableWindowsBehaviors: false,
+
+
+  ...(Object.fromEntries(Array.from(obsoleteConfigs, key => [key, null]))),
+
+  ...WATERFOX_SPECIFIC_VALUES,
+
+  configsVersion: 0,
+
+  testKey: 0 // for tests/utils.js
+}, {
+  localKeys
+});
+
+configs.$addLocalLoadedObserver((key, value) => {
+  switch (key) {
+    case 'syncEnabled':
+      configs.sync = !!value;
+      return;
+
+    default:
+      return;
+  }
+});
+
+// cleanup old data
+browser.storage.sync.remove(localKeys);
+
+configs.$loaded.then(() => {
+  EventListenerManager.debug = configs.debug;
+  log.forceStore = false;
+  if (!configs.debug)
+    log.logs = [];
+});
+
+
+export function loadUserStyleRules() {
+  return getChunkedConfig('chunkedUserStyleRules');
+}
+
+export function saveUserStyleRules(style) {
+  return setChunkedConfig('chunkedUserStyleRules', style);
+}
+
+export function getChunkedConfig(key) {
+  const chunks = [];
+  let count = 0;
+  while (true) {
+    const slotKey = `${key}${count}`;
+    if (!(slotKey in configs))
+      break;
+    chunks.push(configs[slotKey]);
+    count++;
+  }
+  return joinChunkedStrings(chunks);
+}
+
+export function setChunkedConfig(key, value) {
+  let slotsSize = 0;
+  while (`${key}${slotsSize}` in configs.$default) {
+    slotsSize++;
+  }
+
+  const chunks = chunkString(value, Constants.kSYNC_STORAGE_SAFE_QUOTA);
+  if (chunks.length > slotsSize)
+    throw new Error('too large data');
+
+  [...chunks,
+    ...Array.from(new Uint8Array(slotsSize), _ => '')]
+    .slice(0, slotsSize)
+    .forEach((chunk, index) => {
+      const slotKey = `${key}${index}`;
+      if (slotKey in configs)
+        configs[slotKey] = chunk || '';
+    });
+}
+
+function chunkString(input, maxBytes) {
+  let binaryString = btoa(Array.from(new TextEncoder().encode(input), c => String.fromCharCode(c)).join(''));
+  const chunks = [];
+  while (binaryString.length > 0) {
+    chunks.push(binaryString.slice(0, maxBytes));
+    binaryString = binaryString.slice(maxBytes);
+  }
+  return chunks;
+}
+
+function joinChunkedStrings(chunks) {
+  try {
+    const buffer = Uint8Array.from(atob(chunks.join('')).split('').map(bytes => bytes.charCodeAt(0)));
+    return new TextDecoder().decode(buffer);
+  }
+  catch(_error) {
+    return '';
+  }
+}
+
+
+shouldApplyAnimation.onChanged = new EventListenerManager();
+shouldApplyAnimation.prefersReducedMotion = window.matchMedia('(prefers-reduced-motion: reduce)');
+shouldApplyAnimation.prefersReducedMotion.addListener(_event => {
+  shouldApplyAnimation.onChanged.dispatch(shouldApplyAnimation());
+});
+configs.$addObserver(key => {
+  switch(key) {
+    case 'animation':
+    case 'animationForce':
+      shouldApplyAnimation.onChanged.dispatch(shouldApplyAnimation());
+      break;
+
+    case 'debug':
+      EventListenerManager.debug = configs[key];
+      break;
+  }
+});
+
+// Some animation effects like smooth scrolling are still active even if it matches to "prefers-reduced-motion: reduce".
+// So this function provides ability to ignore the media query result.
+export function shouldApplyAnimation(configOnly = false) {
+  if (!configs.animation)
+    return false;
+  return configOnly || configs.animationForce || !shouldApplyAnimation.prefersReducedMotion.matches;
+}
+
+
+export function log(module, ...args)
+{
+  const isModuleLog = module in configs.$default.logFor;
+  const message    = isModuleLog ? args.shift() : module ;
+  const useConsole = configs?.debug && (!isModuleLog || configs.logFor[module]);
+  const logging    = useConsole || log.forceStore;
+  if (!logging)
+    return;
+
+  args = args.map(arg => typeof arg == 'function' ? arg() : arg);
+
+  const nest = (new Error()).stack.split('\n').length;
+  let indent = '';
+  for (let i = 0; i < nest; i++) {
+    indent += ' ';
+  }
+  if (isModuleLog)
+    module = `${module}: `
+  else
+    module = '';
+
+  const timestamp = configs.logTimestamp ? `${getTimeStamp()} ` : '';
+  const line = `tst<${log.context}>: ${timestamp}${module}${indent}${message}`;
+  if (useConsole)
+    console.log(line, ...args);
+
+  log.logs.push(`${line} ${args.reduce((output, arg, index) => {
+    output += `${index == 0 ? '' : ', '}${uneval(arg)}`;
+    return output;
+  }, '')}`);
+  log.logs = log.logs.slice(-log.max);
+}
+log.context = '?';
+log.max  = 2000;
+log.logs = [];
+log.forceStore = true;
+
+// uneval() is no more available after https://bugzilla.mozilla.org/show_bug.cgi?id=1565170
+function uneval(value) {
+  switch (typeof value) {
+    case 'undefined':
+      return 'undefined';
+
+    case 'function':
+      return value.toString();
+
+    case 'object':
+      if (!value)
+        return 'null';
+    default:
+      try {
+        return JSON.stringify(value);
+      }
+      catch(e) {
+        return `${String(value)} (couldn't be stringified due to an error: ${String(e)})`;
+      }
+  }
+}
+
+function getTimeStamp() {
+  const time = new Date();
+  const hours = `0${time.getHours()}`.slice(-2);
+  const minutes = `0${time.getMinutes()}`.slice(-2);
+  const seconds = `0${time.getSeconds()}`.slice(-2);
+  const milliseconds = `00${time.getMilliseconds()}`.slice(-3);
+  return `${hours}:${minutes}:${seconds}.${milliseconds}`;
+}
+
+configs.$logger = log;
+
+export function dumpTab(tab) {
+  if (!configs || !configs.debug)
+    return '';
+  if (!tab)
+    return '<NULL>';
+  return `#${tab.id}(${!!tab.$TST ? 'tracked' : '!tracked'})`;
+}
+
+export async function wait(task = 0, timeout = 0) {
+  if (typeof task != 'function') {
+    timeout = task;
+    task    = null;
+  }
+  return new Promise((resolve, _reject) => {
+    setTimeout(async () => {
+      if (task)
+        await task();
+      resolve();
+    }, timeout);
+  });
+}
+
+export function nextFrame() {
+  return new Promise((resolve, _reject) => {
+    window.requestAnimationFrame(resolve);
+  });
+}
+
+export async function asyncRunWithTimeout({ task, timeout, onTimedOut }) {
+  let succeeded = false;
+  return Promise.race([
+    task().then(result => {
+      succeeded = true;
+      return result;
+    }),
+    wait(timeout).then(() => {
+      if (!succeeded)
+        return onTimedOut();
+    }),
+  ]);
+}
+
+
+const mNotificationTasks = new Map();
+
+function destroyNotificationTask(task) {
+  if (!mNotificationTasks.has(task.id))
+    return;
+
+  mNotificationTasks.delete(task.id);
+
+  const resolve = task.resolve;
+  const url     = task.url;
+
+  task.id      = undefined;
+  task.url     = undefined;
+  task.resolve = undefined;
+
+  return { resolve, url };
+}
+
+function onNotificationClicked(notificationId) {
+  const task = mNotificationTasks.get(notificationId);
+  if (!task)
+    return;
+
+  const { resolve, url } = destroyNotificationTask(task);
+  if (url) {
+    browser.tabs.create({
+      url
+    });
+  }
+  resolve(true);
+}
+browser.notifications.onClicked.addListener(onNotificationClicked);
+
+function onNotificationClosed(notificationId) {
+  const task = mNotificationTasks.get(notificationId);
+  if (!task)
+    return;
+
+  const { resolve } = destroyNotificationTask(task);
+  resolve(false);
+}
+browser.notifications.onClosed.addListener(onNotificationClosed);
+
+export async function notify({ icon, title, message, timeout, url } = {}) {
+  const id = await browser.notifications.create({
+    type:    'basic',
+    iconUrl: icon || Constants.kNOTIFICATION_DEFAULT_ICON,
+    title,
+    message
+  });
+
+  const task = { id, url };
+  mNotificationTasks.set(id, task);
+
+  return new Promise(async (resolve, _reject) => {
+    task.resolve = resolve;
+
+    if (typeof timeout != 'number')
+      timeout = configs.notificationTimeout;
+    if (timeout >= 0) {
+      await wait(timeout);
+    }
+    await browser.notifications.clear(id);
+    if (task.resolve) {
+      destroyNotificationTask(task);
+      resolve(false);
+    }
+  }).then(clicked => {
+    return clicked;
+  });
+}
+
+
+export function tryRevokeObjectURL(url) {
+  if (!url.startsWith(`blob:${browser.runtime.getURL('') }`))
+    return;
+
+  try {
+    URL.revokeObjectURL(url);
+  }
+  catch(error) {
+    console.log('tryRevokeObjectURL failed: ', error);
+  }
+}
+
+
+export function compareAsNumber(a, b) {
+  return a - b;
+}
+
+
+// Helper functions for optimization
+// Originally implemented by @bb010g at
+// https://github.com/piroor/treestyletab/pull/2368/commits/9d184c4ac6c9977d2557cd17cec8c2a0f21dd527
+
+// For better performance the callback function must return "undefined"
+// when the item should not be included. "null", "false", and other false
+// values will be included to the mapped result.
+export function mapAndFilter(values, mapper) {
+  /* This function logically equals to:
+  return values.reduce((mappedValues, value) => {
+    value = mapper(value);
+    if (value !== undefined)
+      mappedValues.push(value);
+    return mappedValues;
+  }, []);
+  */
+  const maxi = ('length' in values ? values.length : values.size) >>> 0; // define as unsigned int
+  const mappedValues = new Array(maxi); // prepare with enough size at first, to avoid needless re-allocation
+  let count = 0,
+      value, // this must be defined outside of the loop, to avoid needless re-allocation
+      mappedValue; // this must be defined outside of the loop, to avoid needless re-allocation
+  for (value of values) {
+    mappedValue = mapper(value);
+    if (mappedValue !== undefined)
+      mappedValues[count++] = mappedValue;
+  }
+  mappedValues.length = count; // shrink the array at last
+  return mappedValues;
+}
+
+export function mapAndFilterUniq(values, mapper, options = {}) {
+  const mappedValues = new Set();
+  let value, // this must be defined outside of the loop, to avoid needless re-allocation
+      mappedValue; // this must be defined outside of the loop, to avoid needless re-allocation
+  for (value of values) {
+    mappedValue = mapper(value);
+    if (mappedValue !== undefined)
+      mappedValues.add(mappedValue);
+  }
+  return options.set ? mappedValues : Array.from(mappedValues);
+}
+
+export function countMatched(values, matcher) {
+  /* This function logically equals to:
+  return values.reduce((count, value) => {
+    if (matcher(value))
+      count++;
+    return count;
+  }, 0);
+  */
+  let count = 0,
+      value; // this must be defined outside of the loop, to avoid needless re-allocation
+  for (value of values) {
+    if (matcher(value))
+      count++;
+  }
+  return count;
+}
+
+export function toLines(values, mapper, separator = '\n') {
+  /* This function logically equals to:
+  return values.reduce((output, value, index) => {
+    output += `${index == 0 ? '' : '\n'}${mapper(value)}`;
+    return output;
+  }, '');
+  */
+  const maxi = values.length >>> 0; // define as unsigned int
+  let i = 0,
+      lines = '';
+  while (i < maxi) { // use "while" loop instead "for" loop, for better performance
+    lines += `${i == 0 ? '' : separator}${mapper(values[i])}`;
+    i++;
+  }
+  return lines;
+}
+
+export async function doProgressively(tabs, task, interval) {
+  interval = Math.max(0, interval);
+  let lastStartAt = Date.now();
+  const results = [];
+  for (const tab of tabs) {
+    results.push(task(tab));
+    if (interval && (Date.now() - lastStartAt >= interval)) {
+      await wait(50);
+      lastStartAt = Date.now();
+    }
+  }
+  return Promise.all(results);
+}
+
+
+let useLegacyOverflowEvents = false;
+
+export function watchOverflowStateChange({ target, moreResizeTargets, onOverflow, onUnderflow, horizontal, vertical }) {
+  if (!horizontal && !vertical)
+    return;
+
+  onOverflow  = onOverflow  || (() => {});
+  onUnderflow = onUnderflow || (() => {});
+
+  let lastOverflow = null;
+  let invoked = false;
+  const onObserved = () => {
+    if (invoked)
+      return;
+    invoked = true;
+    window.requestAnimationFrame(() => {
+      invoked = false;
+
+      const overflow = (
+        (horizontal && isOverflowHorizontally(target)) ||
+        (vertical && isOverflowVertically(target))
+      );
+      if (overflow === lastOverflow)
+        return;
+
+      lastOverflow = overflow;
+
+      if (overflow) {
+        onOverflow();
+      }
+      else {
+        onUnderflow();
+      }
+    });
+  };
+
+  let resizeObserver/*, mutationObserver*/;
+  if (!useLegacyOverflowEvents) {
+    const resizeTargets = new Set([target, ...(moreResizeTargets || [])]);
+    resizeObserver = new ResizeObserver(entries => {
+      for (const entry of entries) {
+        if (!resizeTargets.has(entry.target))
+          continue;
+        onObserved();
+      }
+    });
+    for (const resizeTarget of resizeTargets) {
+      resizeObserver.observe(resizeTarget);
+    }
+
+    /*
+    // ResizeObserver won't observe changes of scrollHeight/Width,
+    // Observing changes of the DOM tree can be workaround.
+    mutationObserver = new MutationObserver(mutations => {
+      for (let mutation of mutations) {
+        if (mutation.type != 'childList' &&
+            mutation.type != 'subtree')
+          continue;
+        onObserved();
+      }
+    });
+    mutationObserver.observe(target, {
+      childList: true,
+      subtree:   true,
+    });
+    */
+  }
+
+  const destroyObserver = () => {
+    if (!resizeObserver)
+      return;
+    resizeObserver.disconnect();
+    resizeObserver = null;
+    /*
+    mutationObserver.disconnect();
+    mutationObserver = null;
+    */
+  };
+
+  // Legacy method for Firefox 127 or older.
+  // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=1888737
+  const onOverflowEvent = event => {
+    if (!useLegacyOverflowEvents) {
+      useLegacyOverflowEvents = true;
+      destroyObserver();
+    }
+    if (event.target != target)
+      return;
+    if (event.type == 'overflow')
+      onOverflow();
+    else
+      onUnderflow();
+  };
+  target.addEventListener('overflow', onOverflowEvent);
+  target.addEventListener('underflow', onOverflowEvent);
+
+  const unwatch = () => {
+    target.removeEventListener('overflow', onOverflowEvent);
+    target.removeEventListener('underflow', onOverflowEvent);
+    destroyObserver();
+  };
+  return unwatch;
+}
+
+function isOverflowHorizontally(target) {
+  return target.scrollWidth > target.clientWidth;
+}
+
+function isOverflowVertically(target) {
+  return target.scrollHeight > target.clientHeight;
+}
+
+
+export async function sha1sum(string) {
+  const encoder = new TextEncoder();
+  const data = encoder.encode(string);
+  const hashBuffer = await crypto.subtle.digest('SHA-1', data);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  const hashHex = hashArray.map(byte => byte.toString(16).padStart(2, '0')).join('');
+  return hashHex;
+}
+
+export function sanitizeForHTMLText(text) {
+  return (text || '')
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+}
+
+export function sanitizeForRegExpSource(source) { // https://stackoverflow.com/questions/6300183/sanitize-string-of-regex-characters-before-regexp-build
+  return source.replace(/[#-.]|[[-^]|[?|{}]/g, '\\$&');
+}
+
+export function sanitizeAccesskeyMark(label) {
+  return String(label || '').replace(/\(&[a-z]\)|&([a-z])/gi, '$1');
+}
+
+export function getWindowParamsFromSource(sourceWindow, { left, top, width, height } = {}) {
+  const params = {
+    // inherit properties of the source window
+    incognito: sourceWindow.incognito,
+    state:     sourceWindow.state,
+    width:     sourceWindow.width,
+    height:    sourceWindow.height,
+    left:      sourceWindow.left,
+    top:       sourceWindow.top,
+  };
+  if (typeof left == 'number')
+    params.left = left;
+  if (typeof top == 'number')
+    params.top = top;
+  if (typeof width == 'number')
+    params.width = width;
+  if (typeof height == 'number')
+    params.height = height;
+  if (params.state == 'fullscreen' ||
+      params.state == 'maximized') {
+    delete params.left;
+    delete params.top;
+    delete params.width;
+    delete params.height;
+  }
+  return params;
+}
+
+export function isNewTabCommandTab(tab) {
+  const newTabTitles = new Set(configs.guessNewOrphanTabAsOpenedByNewTabCommandTitle.split('|'));
+  const newTabUrls   = new Set(configs.guessNewOrphanTabAsOpenedByNewTabCommandUrl.split('|'));
+  return newTabTitles.has(tab?.title) || newTabUrls.has(tab?.url);
+}
+
+export function isFirefoxViewTab(tab) {
+  return (
+    tab?.url.startsWith('about:firefoxview') &&
+    tab?.hidden
+  );
+}
+
+
+export function waitUntilStartupOperationsUnblocked() {
+  if (!configs.blockStartupOperations)
+    return;
+
+  return new Promise((resolve, _reject) => {
+    const waitUntilUblocked = key => {
+      if (key != 'blockStartupOperations' ||
+          configs[key])
+        return;
+      configs.$removeObserver(waitUntilUblocked);
+      resolve();
+    };
+    configs.$addObserver(waitUntilUblocked);
+  });
+}
+
+
+export function isLinux() {
+  return configs.enableLinuxBehaviors || /^Linux/i.test(navigator.platform);
+}
+
+export function isMacOS() {
+  return configs.enableMacOSBehaviors || /^Mac/i.test(navigator.platform);
+}
+
+export function isWindows() {
+  return configs.enableWindowsBehaviors || /^Win/i.test(navigator.platform);
+}
diff --git a/waterfox/browser/components/sidebar/common/constants.js b/waterfox/browser/components/sidebar/common/constants.js
new file mode 100644
index 0000000000000..5cbf8de56df19
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/constants.js
@@ -0,0 +1,482 @@
+/*
+# 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/.
+*/
+'use strict';
+
+export const kCOMMAND_GET_INSTANCE_ID                = 'ws:get-instance-id';
+export const kCOMMAND_RELOAD                         = 'ws:reload';
+export const kCOMMAND_PING_TO_BACKGROUND             = 'ws:ping-to-background';
+export const kCOMMAND_PING_TO_SIDEBAR                = 'ws:ping-to-sidebar';
+export const kCOMMAND_REQUEST_CONNECT_PREFIX         = 'ws:request-connect-from:';
+export const kCOMMAND_REQUEST_UNIQUE_ID              = 'ws:request-unique-id';
+export const kCOMMAND_GET_THEME_DECLARATIONS         = 'ws:get-theme-declarations';
+export const kCOMMAND_GET_CONTEXTUAL_IDENTITIES_COLOR_INFO = 'ws:get-contextual-identities-color-info';
+export const kCOMMAND_GET_CONFIG_VALUE               = 'ws:get-config-value';
+export const kCOMMAND_SET_CONFIG_VALUE               = 'ws:set-config-value';
+export const kCOMMAND_GET_USER_STYLE_RULES           = 'ws:get-user-style-rules';
+export const kCOMMAND_PULL_TABS                      = 'ws:pull-tabs';
+export const kCOMMAND_SYNC_TABS_ORDER                = 'ws:sync-tabs-order';
+export const kCOMMAND_PULL_TABS_ORDER                = 'ws:pull-tabs-order';
+export const kCOMMAND_PULL_TREE_STRUCTURE            = 'ws:pull-tree-structure';
+export const kCOMMAND_GET_RENDERED_TAB_IDS           = 'ws:get-rendered-tab-ids';
+export const kCOMMAND_ASK_TAB_IS_IN_VIEWPORT         = 'ws:ask-tab-is-in-viewport';
+export const kCOMMAND_LOAD_URI                       = 'ws:load-uri';
+export const kCOMMAND_OPEN_TAB                       = 'ws:open-tab';
+export const kCOMMAND_NEW_WINDOW_FROM_TABS           = 'ws:open-new-window-from-tabs';
+export const kCOMMAND_NEW_TABS                       = 'ws:open-new-tabs';
+export const kCOMMAND_NEW_TAB_AS                     = 'ws:open-new-tab-as';
+export const kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION = 'ws:remove-tabs-by-mouse-operation';
+export const kCOMMAND_REMOVE_TABS_INTERNALLY         = 'ws:remove-tabs-internally';
+export const kCOMMAND_UPDATE_LOADING_STATE           = 'ws:update-loading-state';
+export const kCOMMAND_CONFIRM_TO_CLOSE_TABS          = 'ws:confirm-to-close-tabs';
+export const kCOMMAND_SHOW_DIALOG                    = 'ws:show-dialog';
+export const kCOMMAND_NOTIFY_BACKGROUND_READY        = 'ws:notify-background-ready';
+export const kCOMMAND_NOTIFY_CONNECTION_READY        = 'ws:notify-connection-ready';
+export const kCOMMAND_NOTIFY_SIDEBAR_CLOSED          = 'ws:notify-sidebar-closed';
+export const kCOMMAND_NOTIFY_TAB_CREATING            = 'ws:notify-tab-creating';
+export const kCOMMAND_NOTIFY_TAB_CREATED             = 'ws:notify-tab-created';
+export const kCOMMAND_NOTIFY_TAB_UPDATED             = 'ws:notify-tab-updated';
+export const kCOMMAND_NOTIFY_TAB_MOVED               = 'ws:notify-tab-moved';
+export const kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED    = 'ws:notify-tab-internally-moved';
+export const kCOMMAND_NOTIFY_TAB_REMOVING            = 'ws:notify-tab-removing';
+export const kCOMMAND_NOTIFY_TAB_REMOVED             = 'ws:notify-tab-removed';
+export const kCOMMAND_NOTIFY_TAB_ACTIVATING          = 'ws:notify-tab-activating';
+export const kCOMMAND_NOTIFY_TAB_ACTIVATED           = 'ws:notify-tab-activated';
+export const kCOMMAND_NOTIFY_MAY_START_TAB_SWITCH    = 'ws:notify-may-start-tab-switch';
+export const kCOMMAND_NOTIFY_MAY_END_TAB_SWITCH      = 'ws:notify-may-end-tab-switch';
+export const kCOMMAND_NOTIFY_TAB_ATTACHED_TO_WINDOW   = 'ws:notify-tab-attached-to-window';
+export const kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW = 'ws:notify-tab-detached-from-window';
+export const kCOMMAND_NOTIFY_PERMISSIONS_GRANTED     = 'ws:notify-permissions-granted';
+export const kCOMMAND_NOTIFY_TAB_PINNED              = 'ws:notify-tab-pinned';
+export const kCOMMAND_NOTIFY_TAB_UNPINNED            = 'ws:notify-tab-unpinned';
+export const kCOMMAND_NOTIFY_TAB_SHOWN               = 'ws:notify-tab-shown';
+export const kCOMMAND_NOTIFY_TAB_HIDDEN              = 'ws:notify-tab-hidden';
+export const kCOMMAND_NOTIFY_TAB_RESTORING           = 'ws:notify-tab-restoring';
+export const kCOMMAND_NOTIFY_TAB_RESTORED            = 'ws:notify-tab-restored';
+export const kCOMMAND_NOTIFY_TREE_ITEM_LABEL_UPDATED       = 'ws:notify-tab-label-updated';
+export const kCOMMAND_NOTIFY_TAB_FAVICON_UPDATED     = 'ws:notify-tab-favicon-updated';
+export const kCOMMAND_NOTIFY_TAB_SOUND_STATE_UPDATED = 'ws:notify-tab-sound-state-updated';
+export const kCOMMAND_NOTIFY_TAB_SHARING_STATE_UPDATED = 'ws:notify-tab-sharing-state-updated';
+export const kCOMMAND_NOTIFY_TABS_CLOSING            = 'ws:notify-tabs-closing';
+export const kCOMMAND_NOTIFY_HIGHLIGHTED_TABS_CHANGED = 'ws:notify-highlighted-tabs-changed';
+export const kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_IN_PROGRESS = 'ws:notify-tabs-highlighting-in-progress';
+export const kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_COMPLETE    = 'ws:notify-tabs-highlighting-complete';
+export const kCOMMAND_NOTIFY_GROUP_TAB_DETECTED      = 'ws:notify-group-tab-detected';
+export const kCOMMAND_NOTIFY_CHILDREN_CHANGED        = 'ws:notify-children-changed';
+export const kCOMMAND_NOTIFY_TAB_COLLAPSED_STATE_CHANGED     = 'ws:notify-tab-collapsed-state-changed';
+export const kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGING = 'ws:notify-subtree-collapsed-state-changing';
+export const kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED = 'ws:notify-subtree-collapsed-state-changed';
+export const kCOMMAND_NOTIFY_TAB_GROUP_CREATED       = 'ws:notify-tab-group-created';
+export const kCOMMAND_NOTIFY_TAB_GROUP_UPDATED       = 'ws:notify-tab-group-updated';
+export const kCOMMAND_NOTIFY_TAB_GROUP_REMOVED       = 'ws:notify-tab-group-removed';
+export const kCOMMAND_SET_SUBTREE_COLLAPSED_STATE                   = 'ws:set-subtree-collapsed-state';
+export const kCOMMAND_SET_SUBTREE_COLLAPSED_STATE_INTELLIGENTLY_FOR = 'ws:set-subtree-collapsed-state-intelligently-for';
+export const kCOMMAND_TOGGLE_STICKY                  = 'ws:toggle-sticky';
+export const kCOMMAND_NOTIFY_TAB_LEVEL_CHANGED       = 'ws:notify-tab-level-changed';
+export const kCOMMAND_NOTIFY_TAB_ATTACHED_COMPLETELY = 'ws:notify-tab-attached-completely';
+export const kCOMMAND_BROADCAST_CURRENT_DRAG_DATA    = 'ws:broadcast-current-drag-data';
+export const kCOMMAND_SHOW_CONTAINER_SELECTOR        = 'ws:show-container-selector';
+export const kCOMMAND_SCROLL_TABBAR                  = 'ws:scroll-tabbar';
+export const kCOMMAND_TOGGLE_SUBPANEL                = 'ws:toggle-subpanel';
+export const kCOMMAND_SWITCH_SUBPANEL                = 'ws:switch-subpanel';
+export const kCOMMAND_INCREASE_SUBPANEL              = 'ws:increase-subpanel';
+export const kCOMMAND_DECREASE_SUBPANEL              = 'ws:decrease-subpanel';
+export const kCOMMAND_REQUEST_QUERY_LOGS             = 'ws:request-query-logs';
+export const kCOMMAND_RESPONSE_QUERY_LOGS            = 'ws:response-query-logs';
+export const kCOMMAND_REQUEST_CONNECTION_MESSAGE_LOGS  = 'ws:request-connection-message-logs';
+export const kCOMMAND_RESPONSE_CONNECTION_MESSAGE_LOGS = 'ws:response-connection-message-logs';
+export const kCOMMAND_NOTIFY_TEST_KEY_CHANGED        = 'ws:notify-test-key-changed';
+export const kCOMMAND_SIMULATE_SIDEBAR_MESSAGE       = 'ws:simulate-sidebar-message';
+export const kCOMMAND_GET_CONTEXT_MENU_ITEMS         = 'ws:contextMenu-get-items';
+export const kCOMMAND_NOTIFY_CONTEXT_MENU_UPDATED    = 'ws:contextMenu-updated';
+export const kCOMMAND_NOTIFY_CONTEXT_ITEM_CHECKED_STATUS_CHANGED = 'ws:contextMenu-item-checked-status-changed';
+export const kCOMMAND_NOTIFY_CONTEXT_OVERRIDDEN      = 'ws:notify-context-overridden';
+export const kCOMMAND_AUTODETECT_DUPLICATED_TAB_DETECTION_DELAY = 'ws:autodetect-duplicated-tab-detection-delay';
+export const kCOMMAND_TEST_DUPLICATED_TAB_DETECTION             = 'ws:test-duplicated-tab-detection';
+export const kCOMMAND_WAIT_UNTIL_SUCCESSORS_UPDATED = 'ws:wait-until-successors-updated';
+export const kCOMMAND_GET_SIDEBAR_POSITION          = 'ws:get-sidebar-position';
+export const kCOMMAND_GET_ABOVE_TAB                 = 'ws:get-above-tab';
+export const kCOMMAND_GET_BELOW_TAB                 = 'ws:get-below-tab';
+export const kCOMMAND_GET_LEFT_TAB                  = 'ws:get-left-tab';
+export const kCOMMAND_GET_RIGHT_TAB                 = 'ws:get-right-tab';
+export const kCOMMAND_GET_BOUNDING_CLIENT_RECT      = 'ws:get-bounding-client-rect';
+export const kCOMMAND_SHOW_NATIVE_TAB_GROUP_MENU_PANEL = 'ws:show-native-tab-group-menu-panel';
+export const kCOMMAND_UPDATE_NATIVE_TAB_GROUP       = 'ws:update-native-tab-group';
+export const kCOMMAND_INVOKE_NATIVE_TAB_GROUP_MENU_PANEL_COMMAND = 'ws:invoke-native-tab-group-menu-panel-command';
+export const kCOMMAND_NEW_WINDOW_FROM_NATIVE_TAB_GROUP = 'ws:new-window-from-native-tab-group';
+
+export const kCOMMAND_ACTIVATE_TAB            = 'ws:activate-tab';
+export const kCOMMAND_HIGHLIGHT_TABS          = 'ws:highlight-tabs';
+export const kCOMMAND_TOGGLE_MUTED_FROM_SOUND_BUTTON = 'ws:toggle-muted-from-sound-button';
+export const kCOMMAND_UNBLOCK_AUTOPLAY_FROM_SOUND_BUTTON = 'ws:unblock-autoplay-from-sound-button';
+export const kCOMMAND_PERFORM_TABS_DRAG_DROP  = 'ws:perform-tabs-drag-drop';
+export const kCOMMAND_BLOCK_USER_OPERATIONS   = 'ws:block-user-operations';
+export const kCOMMAND_UNBLOCK_USER_OPERATIONS = 'ws:unblock-user-operations';
+export const kCOMMAND_PROGRESS_USER_OPERATIONS = 'ws:progress-user-operations';
+export const kCOMMAND_BROADCAST_TAB_STATE     = 'ws:broadcast-tab-state';
+export const kCOMMAND_BROADCAST_TAB_TOOLTIP_TEXT = 'ws:broadcast-tab-tooltip-text';
+export const kCOMMAND_BROADCAST_TAB_AUTO_STICKY_STATE = 'ws:broadcast-tab-auto-sticky-state';
+
+export const kCOMMAND_BOOKMARK_TAB_WITH_DIALOG  = 'ws:bookmark-tab-with-dialog';
+export const kCOMMAND_BOOKMARK_TABS_WITH_DIALOG = 'ws:bookmark-tabs-with-dialog';
+
+export const kNOTIFY_TAB_MOUSEDOWN  = 'ws:tab-mousedown';
+export const kNOTIFY_TAB_MOUSEDOWN_EXPIRED  = 'ws:tab-mousedown-expired';
+
+export const kNOTIFY_SIDEBAR_FOCUS = 'ws:sidebar-focus';
+export const kNOTIFY_SIDEBAR_BLUR  = 'ws:sidebar-blur';
+
+export const kNOTIFY_CONFIRMATION_DIALOG_READY  = 'ws:confirmation-dialog-ready';
+
+export const kCONNECTION_HEARTBEAT = 'ws:connection-heartbeat';
+
+export const kAPI_TAB_ID       = 'data-tab-id';
+export const kAPI_WINDOW_ID    = 'data-window-id';
+export const kAPI_NATIVE_TAB_GROUP_ID = 'data-native-tab-group-id';
+
+export const kGROUP_ID      = 'data-group-id';
+export const kPARENT        = 'data-parent-id';
+export const kCHILDREN      = 'data-child-ids';
+export const kLEVEL         = 'data-level';
+export const kCLOSED_SET_ID = 'data-closed-set-id';
+export const kCURRENT_URI   = 'data-current-uri';
+export const kCURRENT_FAVICON_URI = 'data-current-favicon-uri';
+export const kCONTEXTUAL_IDENTITY_NAME = 'data-contextual-identity-name';
+export const kMAX_TREE_LEVEL = 'data-max-tree-level';
+export const kLABEL_OVERFLOW = 'data-label-overflow';
+
+export const kPERSISTENT_ID            = 'data-persistent-id';
+export const kPERSISTENT_ANCESTORS     = 'ancestors';
+export const kPERSISTENT_CHILDREN      = 'children';
+export const kPERSISTENT_INSERT_BEFORE = 'insert-before';
+export const kPERSISTENT_INSERT_AFTER  = 'insert-after';
+export const kPERSISTENT_INSERT_AFTER_LEGACY = 'isnert-after';
+export const kPERSISTENT_STATES        = 'special-tab-states';
+export const kPERSISTENT_SUBTREE_COLLAPSED = 'subtree-collapsed'; // obsolete
+export const kPERSISTENT_ORIGINAL_OPENER_TAB_ID            = 'data-original-opener-tab-id';
+export const kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER = 'data-already-grouped-for-pinned-opener';
+
+export const kFAVICON_IMAGE   = 'favicon-image';
+export const kFAVICON_BUILTIN = 'favicon-builtin';
+export const kFAVICON_DEFAULT = 'favicon-default'; // just for backward compatibility, and this should be removed from future versions
+export const kFAVICON_SHARING_STATE = 'favicon-sharing-state';
+export const kFAVICON_STICKY_STATE = 'favicon-sticky-state';
+export const kBACKGROUND      = 'background';
+export const kTHROBBER        = 'throbber';
+export const kHIGHLIGHTER     = 'highlighter';
+export const kBURSTER         = 'burster';
+export const kNEWTAB_BUTTON   = 'newtab-button';
+export const kEXTRA_ITEMS_CONTAINER        = 'extra-items-container';
+export const kCONTEXTUAL_IDENTITY_MARKER   = 'contextual-identity-marker';
+export const kCONTEXTUAL_IDENTITY_SELECTOR = 'contextual-identities-selector';
+export const kCONTEXTUAL_IDENTITY_SELECTOR_CONTEXT_MENU = 'contextual-identities-selector-context';
+export const kNEWTAB_ACTION_SELECTOR       = 'newtab-action-selector';
+export const kTABBAR_SPACER   = 'tabs-spacer';
+
+export const kTAB_STATE_ACTIVE                    = 'active';
+export const kTAB_STATE_PINNED                    = 'pinned';
+export const kTAB_STATE_LAST_ROW                  = 'last-row';
+export const kTAB_STATE_LAST_VISIBLE              = 'last-visible';
+export const kTAB_STATE_AUDIBLE                   = 'audible';
+export const kTAB_STATE_SOUND_PLAYING             = 'sound-playing';
+export const kTAB_STATE_HAS_SOUND_PLAYING_MEMBER  = 'has-sound-playing-member';
+export const kTAB_STATE_MUTED                     = 'muted';
+export const kTAB_STATE_HAS_MUTED_MEMBER          = 'has-muted-member';
+export const kTAB_STATE_AUTOPLAY_BLOCKED          = 'autoplay-blocked';
+export const kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER = 'has-autoplay-blocked-member';
+export const kTAB_STATE_PRIVATE_BROWSING          = 'private-browsing';
+export const kTAB_STATE_HIDDEN                    = 'hidden';
+export const kTAB_STATE_SHARING_CAMERA            = 'sharing-camera';
+export const kTAB_STATE_SHARING_MICROPHONE        = 'sharing-microphone';
+export const kTAB_STATE_SHARING_SCREEN            = 'sharing-screen';
+export const kTAB_STATE_HAS_SHARING_CAMERA_MEMBER     = 'has-sharing-camera-member';
+export const kTAB_STATE_HAS_SHARING_MICROPHONE_MEMBER = 'has-sharing-microphone-member';
+export const kTAB_STATE_HAS_SHARING_SCREEN_MEMBER     = 'has-sharing-screen-member';
+export const kTAB_STATE_ANIMATION_READY           = 'animation-ready';
+export const kTAB_STATE_NOT_ACTIVATED_SINCE_LOAD  = 'not-activated-since-load';
+export const kTAB_STATE_BURSTING                  = 'bursting';
+export const kTAB_STATE_CREATING                  = 'creating';
+export const kTAB_STATE_TO_BE_REMOVED             = 'to-be-removed';
+export const kTAB_STATE_REMOVING                  = 'removing';
+export const kTAB_STATE_COLLAPSED                 = 'collapsed';
+export const kTAB_STATE_COLLAPSED_DONE            = 'collapsed-completely';
+export const kTAB_STATE_COLLAPSING                = 'collapsing';
+export const kTAB_STATE_EXPANDING                 = 'expanding';
+export const kTAB_STATE_MOVING                    = 'moving';
+export const kTAB_STATE_SHOWING                   = 'showing';
+export const kTAB_STATE_SUBTREE_COLLAPSED         = 'subtree-collapsed';
+export const kTAB_STATE_SUBTREE_EXPANDED_MANUALLY = 'subtree-expanded-manually';
+export const kTAB_STATE_FAVICONIZED               = 'faviconized';
+export const kTAB_STATE_UNREAD                    = 'unread';
+export const kTAB_STATE_PENDING                   = 'pending';
+export const kTAB_STATE_HIGHLIGHTED               = 'highlighted';
+export const kTAB_STATE_BUNDLED_ACTIVE            = 'bundled-active';
+export const kTAB_STATE_SOME_DESCENDANTS_HIGHLIGHTED = 'some-descendants-highlighted';
+export const kTAB_STATE_ALL_DESCENDANTS_HIGHLIGHTED  = 'all-descendants-highlighted';
+export const kTAB_STATE_ATTENTION                 = 'attention';
+export const kTAB_STATE_DISCARDED                 = 'discarded';
+export const kTAB_STATE_SELECTED                  = 'selected';
+export const kTAB_STATE_DRAGGING                  = 'dragging';
+export const kTAB_STATE_DUPLICATING               = 'duplicating';
+export const kTAB_STATE_DUPLICATED                = 'duplicated';
+export const kTAB_STATE_RESTORED                  = 'restored';
+export const kTAB_STATE_FROM_EXTERNAL             = 'from-external';
+export const kTAB_STATE_FROM_FIREFOX_VIEW         = 'from-firefox-view';
+export const kTAB_STATE_THROBBER_UNSYNCHRONIZED   = 'throbber-unsynchronized';
+export const kTAB_STATE_GROUP_TAB                 = 'group-tab';
+export const kTAB_STATE_NEW_TAB_COMMAND_TAB       = 'newtab-command-tab';
+export const kTAB_STATE_OPENED_FOR_SAME_WEBSITE   = 'opened-for-same-website';
+export const kTAB_STATE_STICKY                    = 'sticky';
+export const kTAB_STATE_STUCK                   = 'stuck'; // virtual state
+export const kTAB_INTERNAL_STATES = new Set([ // TST specific states
+  'tab',
+  kTAB_STATE_LAST_ROW,
+  kTAB_STATE_LAST_VISIBLE,
+  kTAB_STATE_ANIMATION_READY,
+  kTAB_STATE_COLLAPSED_DONE,
+  kTAB_STATE_CREATING,
+  kTAB_STATE_DUPLICATING,
+  kTAB_STATE_COLLAPSING,
+  kTAB_STATE_EXPANDING,
+  kTAB_STATE_MOVING,
+  kTAB_STATE_TO_BE_REMOVED,
+  kTAB_STATE_REMOVING,
+  kTAB_STATE_SHOWING,
+  kTAB_STATE_THROBBER_UNSYNCHRONIZED,
+  kTAB_STATE_NEW_TAB_COMMAND_TAB,
+  kTAB_STATE_DUPLICATED,
+  kTAB_STATE_RESTORED,
+  kTAB_STATE_FROM_EXTERNAL,
+  kTAB_STATE_FROM_FIREFOX_VIEW,
+  kTAB_STATE_OPENED_FOR_SAME_WEBSITE,
+  kTAB_STATE_STICKY,
+  kTAB_STATE_STUCK,
+  kTAB_STATE_PENDING,
+]);
+export const kTAB_TEMPORARY_STATES = new Set([ // states not trigger updating of cache
+  kTAB_STATE_CREATING,
+  kTAB_STATE_BURSTING,
+  kTAB_STATE_COLLAPSING,
+  kTAB_STATE_DUPLICATING,
+  kTAB_STATE_EXPANDING,
+  kTAB_STATE_MOVING,
+  kTAB_STATE_TO_BE_REMOVED,
+  kTAB_STATE_REMOVING,
+  kTAB_STATE_SHOWING,
+  kTAB_STATE_NEW_TAB_COMMAND_TAB,
+  kTAB_STATE_DUPLICATED,
+  kTAB_STATE_RESTORED,
+  kTAB_STATE_FROM_EXTERNAL,
+  kTAB_STATE_FROM_FIREFOX_VIEW,
+  kTAB_STATE_OPENED_FOR_SAME_WEBSITE,
+  kTAB_STATE_PENDING,
+]);
+export const kTAB_SAFE_STATES = new Set([ // exportable via API
+  kTAB_STATE_COLLAPSED,
+  kTAB_STATE_SUBTREE_COLLAPSED,
+  kTAB_STATE_GROUP_TAB,
+  kTAB_STATE_CREATING,
+  kTAB_STATE_NEW_TAB_COMMAND_TAB,
+  kTAB_STATE_DUPLICATED,
+  kTAB_STATE_RESTORED,
+  kTAB_STATE_FROM_EXTERNAL,
+  kTAB_STATE_FROM_FIREFOX_VIEW,
+  kTAB_STATE_OPENED_FOR_SAME_WEBSITE,
+  kTAB_STATE_STICKY,
+  kTAB_STATE_STUCK,
+]);
+export const kTAB_SAFE_STATES_ARRAY = Array.from(kTAB_SAFE_STATES);
+
+export const kTABBAR_STATE_OVERFLOW               = 'overflow';
+export const kTABBAR_STATE_SCROLLED               = 'scrolled';
+export const kTABBAR_STATE_FULLY_SCROLLED         = 'fully-scrolled';
+export const kTABBAR_STATE_BLOCKING               = 'blocking';
+export const kTABBAR_STATE_BLOCKING_WITH_THROBBER = 'blocking-throbber';
+export const kTABBAR_STATE_BLOCKING_WITH_SHADE    = 'blocking-shade';
+export const kTABBAR_STATE_HAVE_LOADING_TAB       = 'have-loading-tab';
+export const kTABBAR_STATE_HAVE_UNSYNCHRONIZED_THROBBER = 'have-unsynchronized-throbber';
+export const kTABBAR_STATE_THROBBER_SYNCHRONIZING = 'throbber-synchronizing';
+export const kTABBAR_STATE_CONTEXTUAL_IDENTITY_SELECTABLE = 'contextual-identity-selectable';
+export const kTABBAR_STATE_NEWTAB_ACTION_SELECTABLE = 'newtab-action-selectable';
+export const kTABBAR_STATE_MULTIPLE_HIGHLIGHTED   = 'mutiple-highlighted';
+export const kTABBAR_STATE_HAS_VISUAL_GAP         = 'has-visual-gap';
+export const kTABBAR_STATE_HOVER_ON_TOP_EDGE      = 'hover-on-top-edge';
+export const kTABBAR_STATE_SCROLLBAR_AUTOHIDE     = 'scrollbar-autohide';
+export const kTABBAR_STATE_FAVICONIZE_PINNED_TABS = 'faviconize-pinned-tabs';
+export const kTABBAR_STATE_TAB_DRAGGING           = 'tab-dragging';
+export const kTABBAR_STATE_LINK_DRAGGING          = 'link-dragging';
+
+export const kWINDOW_STATE_TREE_STRUCTURE  = 'tree-structure';
+export const kWINDOW_STATE_SCROLL_POSITION = 'scroll-position';
+export const kWINDOW_STATE_SUBPANEL_PROVIDER_ID = 'subpanel-provider-id';
+export const kWINDOW_STATE_SUBPANEL_HEIGHT = 'subpanel-height';
+export const kWINDOW_STATE_SUBPANEL_EFFECTIVE_HEIGHT = 'subpanel-effective-height';
+export const kWINDOW_STATE_CACHED_TABS     = 'cached-tabs';
+export const kWINDOW_STATE_CACHED_SIDEBAR  = 'cached-sidebar-contents';
+export const kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS  = 'cached-sidebar-contents:contents';
+export const kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY = 'cached-sidebar-contents:tabs-dirty';
+export const kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY = 'cached-sidebar-contents:collapsed-dirty';
+
+export const kCACHE_KEYS = [
+  kWINDOW_STATE_CACHED_TABS,
+  kWINDOW_STATE_CACHED_SIDEBAR,
+  kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS,
+  kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY,
+  kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY,
+];
+
+export const kCOUNTER_ROLE_ALL_TABS       = 1;
+export const kCOUNTER_ROLE_CONTAINED_TABS = 2;
+
+export const kTABBAR_POSITION_AUTO  = 0;
+export const kTABBAR_POSITION_LEFT  = 1;
+export const kTABBAR_POSITION_RIGHT = 2;
+
+export const kACTION_MOVE   = 1 << 0;
+export const kACTION_ATTACH = 1 << 10;
+export const kACTION_DETACH = 1 << 11;
+
+export const kDROPLINK_ASK    = 0;
+export const kDROPLINK_LOAD   = 1 << 0;
+export const kDROPLINK_NEWTAB = 1 << 1;
+
+export const kGROUP_BOOKMARK_ASK                         = 0;
+export const kGROUP_BOOKMARK_SUBTREE                     = 1 << 0;
+export const kGROUP_BOOKMARK_SEPARATE                    = 1 << 1;
+export const kGROUP_BOOKMARK_FIXED                       = kGROUP_BOOKMARK_SUBTREE | kGROUP_BOOKMARK_SEPARATE;
+export const kGROUP_BOOKMARK_USE_DUMMY                   = 1 << 8;
+export const kGROUP_BOOKMARK_USE_DUMMY_FORCE             = 1 << 10;
+export const kGROUP_BOOKMARK_DONT_RESTORE_TREE_STRUCTURE = 1 << 9;
+export const kGROUP_BOOKMARK_EXPAND_ALL_TREE             = 1 << 11;
+export const kGROUP_BOOKMARK_CANCEL                      = -1;
+
+export const kGROUP_TAB_TEMPORARY_STATE_NOTHING = 0;
+export const kGROUP_TAB_TEMPORARY_STATE_PASSIVE = 1;
+export const kGROUP_TAB_TEMPORARY_STATE_AGGRESSIVE = 2;
+
+export const kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL   = 0;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CONSISTENT = 1;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM     = -1;
+
+export const kPARENT_TAB_OPERATION_CONTEXT_CLOSE = 1;
+export const kPARENT_TAB_OPERATION_CONTEXT_MOVE  = 2;
+
+export const kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE                = 2;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD        = 3;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN       = 0;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY      = 6;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_DETACH_ALL_CHILDREN        = 1;
+export const kPARENT_TAB_OPERATION_BEHAVIOR_SIMPLY_DETACH_ALL_CHILDREN = 4; // just for internal use
+export const kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB     = 5;
+
+// just for migration from old versions
+export const kPARENT_TAB_BEHAVIOR_ALWAYS            = 0;
+export const kPARENT_TAB_BEHAVIOR_ONLY_WHEN_VISIBLE = 1;
+export const kPARENT_TAB_BEHAVIOR_ONLY_ON_SIDEBAR   = 2;
+
+export const kINSERT_NO_CONTROL = -1;
+export const kINSERT_INHERIT    = -2;
+export const kINSERT_TOP        = 0;
+export const kINSERT_END        = 1;
+export const kINSERT_NEAREST    = 2;
+export const kINSERT_NEXT_TO_LAST_RELATED_TAB = 3;
+export const kCONTROLLED_INSERTION_POSITION = new Set([
+  kINSERT_TOP,
+  kINSERT_NEAREST,
+  kINSERT_NEXT_TO_LAST_RELATED_TAB,
+]);
+
+export const kSUCCESSOR_TAB_CONTROL_NEVER            = 0;
+export const kSUCCESSOR_TAB_CONTROL_SIMULATE_DEFAULT = 1;
+export const kSUCCESSOR_TAB_CONTROL_IN_TREE          = 2;
+
+export const kTREE_DOUBLE_CLICK_BEHAVIOR_NONE                  = 0;
+export const kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_COLLAPSED      = 1;
+export const kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_STICKY         = 4;
+export const kTREE_DOUBLE_CLICK_BEHAVIOR_CLOSE                 = 3;
+// 2 is a retired number for a removed feature
+
+export const kDRAG_BEHAVIOR_NONE           = 0;
+export const kDRAG_BEHAVIOR_ENTIRE_TREE     = 1 << 0;
+export const kDRAG_BEHAVIOR_ALLOW_BOOKMARK = 1 << 1;
+export const kDRAG_BEHAVIOR_TEAR_OFF       = 1 << 2;
+export const kDRAG_BEHAVIOR_MOVE           = 1 << 3;
+
+export const kNEWTAB_DO_NOTHING           = -1;
+export const kNEWTAB_OPEN_AS_ORPHAN       = 0;
+export const kNEWTAB_OPEN_AS_CHILD        = 1; // no control about position
+export const kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB = 5;
+export const kNEWTAB_OPEN_AS_CHILD_TOP    = 6;
+export const kNEWTAB_OPEN_AS_CHILD_END    = 7;
+export const kNEWTAB_OPEN_AS_SIBLING      = 2;
+export const kNEWTAB_OPEN_AS_NEXT_SIBLING = 3;
+export const kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER = 4;
+export const kCONTROLLED_NEWTAB_POSITION = new Set([
+  kNEWTAB_OPEN_AS_CHILD,
+  kNEWTAB_OPEN_AS_CHILD_NEXT_TO_LAST_RELATED_TAB,
+  kNEWTAB_OPEN_AS_CHILD_TOP,
+  kNEWTAB_OPEN_AS_CHILD_END,
+  kNEWTAB_OPEN_AS_SIBLING,
+  kNEWTAB_OPEN_AS_NEXT_SIBLING,
+  kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER,
+]);
+
+export const kCONTEXTUAL_IDENTITY_DEFAULT          = 0;
+export const kCONTEXTUAL_IDENTITY_FROM_PARENT      = 1;
+export const kCONTEXTUAL_IDENTITY_FROM_LAST_ACTIVE = 2;
+
+export const kSCROLL_TO_NEW_TAB_IGNORE      = 0;
+export const kSCROLL_TO_NEW_TAB_IF_POSSIBLE = 1;
+
+export const kTABBAR_UPDATE_REASON_RESIZE        = 1 << 0;
+export const kTABBAR_UPDATE_REASON_COLLAPSE      = 1 << 1;
+export const kTABBAR_UPDATE_REASON_EXPAND        = 1 << 2;
+export const kTABBAR_UPDATE_REASON_ANIMATION_END = 1 << 3;
+export const kTABBAR_UPDATE_REASON_TAB_OPEN      = 1 << 4;
+export const kTABBAR_UPDATE_REASON_TAB_CLOSE     = 1 << 5;
+export const kTABBAR_UPDATE_REASON_TAB_MOVE      = 1 << 6;
+export const kTABBAR_UPDATE_REASON_VIRTUAL_SCROLL_VIEWPORT_UPDATE = 1 << 7;
+
+export const kDEFAULT_MIN_INDENT = 3;
+
+export const kGROUP_TAB_URI = browser.runtime.getURL('resources/group-tab.html');
+export const kGROUP_TAB_DEFAULT_TITLE_MATCHER = new RegExp(`^${browser.i18n.getMessage('groupTab_label', '.+')}$`);
+export const kGROUP_TAB_FROM_PINNED_DEFAULT_TITLE_MATCHER = new RegExp(`^${browser.i18n.getMessage('groupTab_fromPinnedTab_label', '.+')}$`);
+export const kSHORTHAND_CUSTOM_URI = /^ext\+ws:([^:?#]+)(?:[:?]([^#]*))?(#.*)?$/;
+export const kSHORTHAND_ABOUT_URI = /^about:ws-([^?]+)/;
+export const kSHORTHAND_URIS = {
+  tabbar:  browser.runtime.getURL('sidebar/sidebar.html'),
+  group:   kGROUP_TAB_URI,
+  options: browser.runtime.getURL('options/options.html?independent=true'),
+  startup: browser.runtime.getURL('resources/startup.html'),
+  testRunner:    browser.runtime.getURL('tests/runner.html'),
+  'test-runner': browser.runtime.getURL('tests/runner.html')
+};
+
+export const kINSERTION_CONTEXT_MOVED = 1;
+export const kINSERTION_CONTEXT_SHOWN = 2;
+export const kINSERTION_CONTEXT_CREATED = 3;
+
+export const kIN_CONTENT_PANEL_RENDER_NOWHERE    = 0;
+export const kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR = 1 << 0;
+export const kIN_CONTENT_PANEL_RENDER_IN_CONTENT = 1 << 1;
+export const kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE = kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR | kIN_CONTENT_PANEL_RENDER_IN_CONTENT;
+
+export const kAGGRESSIVE_OPENER_TAB_DETECTION_RULES_WITH_URL = [
+  { opener: /^about:addons/,
+    child:  /^https:\/\/addons.mozilla.org\/([^\/]+\/)?[^\/]+\/search\// }
+];
+
+export const kNOTIFICATION_DEFAULT_ICON = '/resources/64x64.svg#default-bright';
+
+// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/storage/sync
+// Use 6 * 1024 instead of 8 * 1024 (max of the quota) for safety.
+// For example, 6 * 8 = 48KB is the max size of the user style rules.
+export const kSYNC_STORAGE_SAFE_QUOTA = 6 * 1024;
+
+export const kSYNC_DATA_TYPE_TABS = 'tabs';
+
+export const IS_BACKGROUND = location.href.startsWith(browser.runtime.getURL('background/background.html'));
+export const IS_SIDEBAR    = location.href.startsWith(browser.runtime.getURL('sidebar/sidebar.html'));
diff --git a/waterfox/browser/components/sidebar/common/contextual-identities.js b/waterfox/browser/components/sidebar/common/contextual-identities.js
new file mode 100644
index 0000000000000..f46b80759e754
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/contextual-identities.js
@@ -0,0 +1,218 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  configs,
+  log as internalLogger,
+  isWindows,
+} from './common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+
+// eslint-disable-next-line no-unused-vars
+function log(...args) {
+  internalLogger('common/contextual-identities', ...args);
+}
+
+const mContextualIdentities = new Map();
+let mIsObserving = false;
+
+export function get(id) {
+  return mContextualIdentities.get(id);
+}
+
+export function getIdFromName(name) {
+  for (const identity of mContextualIdentities.values()) {
+    if (identity.name.toLowerCase() == name.toLowerCase())
+      return identity.cookieStoreId;
+  }
+  return null;
+}
+
+// Respect container type stored by Container Bookmarks
+// https://addons.mozilla.org/firefox/addon/container-bookmarks/
+export function getIdFromBookmark(bookmark) {
+  const containerMatcher = new RegExp(`#${configs.containerRedirectKey}-(.+)$`);
+  const matchedContainer = bookmark.url.match(containerMatcher);
+  if (!matchedContainer)
+    return {};
+
+  const idPart = matchedContainer[matchedContainer.length-1];
+  const url    = bookmark.url.replace(containerMatcher, '');
+
+  // old method
+  const identity = mContextualIdentities.get(decodeURIComponent(idPart));
+  if (identity) {
+    return {
+      cookieStoreId: identity.cookieStoreId,
+      url,
+    };
+  }
+
+  for (const [cookieStoreId, identity] of mContextualIdentities.entries()) {
+    if (idPart != encodeURIComponent(identity.name.toLowerCase().replace(/\s/g, '-')))
+      continue;
+    return {
+      cookieStoreId,
+      url,
+    };
+  }
+
+  return {};
+}
+
+export function getColorInfo() {
+  const colors = {};
+  const customColors = [];
+  forEach(identity => {
+    if (!identity.colorCode)
+      return;
+    let colorValue = identity.colorCode;
+    if (identity.color) {
+      const customColor = `--contextual-identity-color-${identity.color}`;
+      customColors.push(`${customColor}: ${identity.colorCode};`);
+      colorValue = `var(${customColor})`;
+    }
+    colors[identity.cookieStoreId] = colorValue;
+  });
+
+  return {
+    colors,
+    colorDeclarations: customColors.length > 0 ? `:root { ${customColors.join('\n')} }` : ''
+  };
+}
+
+export function getCount() {
+  return mContextualIdentities.size;
+}
+
+export function forEach(callback) {
+  for (const identity of mContextualIdentities.values()) {
+    callback(identity);
+  }
+}
+
+if (browser.contextualIdentities) { // already granted
+  browser.contextualIdentities.onCreated.addListener(onContextualIdentityCreated);
+  browser.contextualIdentities.onRemoved.addListener(onContextualIdentityRemoved);
+  browser.contextualIdentities.onUpdated.addListener(onContextualIdentityUpdated);
+  mIsObserving = true;
+}
+
+export function startObserve() {
+  if (!browser.contextualIdentities ||
+      mIsObserving)
+    return;
+  mIsObserving = true;
+  browser.contextualIdentities.onCreated.addListener(onContextualIdentityCreated);
+  browser.contextualIdentities.onRemoved.addListener(onContextualIdentityRemoved);
+  browser.contextualIdentities.onUpdated.addListener(onContextualIdentityUpdated);
+}
+
+export function endObserve() {
+  if (!browser.contextualIdentities ||
+      !mIsObserving)
+    return;
+  browser.contextualIdentities.onCreated.removeListener(onContextualIdentityCreated);
+  browser.contextualIdentities.onRemoved.removeListener(onContextualIdentityRemoved);
+  browser.contextualIdentities.onUpdated.removeListener(onContextualIdentityUpdated);
+}
+
+export async function init() {
+  if (!browser.contextualIdentities)
+    return;
+  const identities = await browser.contextualIdentities.query({}).catch(ApiTabs.createErrorHandler());
+  for (const identity of identities) {
+    mContextualIdentities.set(identity.cookieStoreId, fixupIcon(identity));
+  }
+}
+
+function fixupIcon(identity) {
+  if (identity.icon && identity.color)
+    identity.iconUrl = `/resources/icons/contextual-identities/${identity.icon}.svg#${safeColor(identity.color)}`;
+  return identity;
+}
+
+const mDarkModeMedia = window.matchMedia('(prefers-color-scheme: dark)');
+mDarkModeMedia.addListener(async _event => {
+  await init();
+  forEach(identity => onContextualIdentityUpdated({ contextualIdentity: identity }));
+});
+
+function safeColor(color) {
+  switch (color) {
+    case 'blue':
+    case 'turquoise':
+    case 'green':
+    case 'yellow':
+    case 'orange':
+    case 'red':
+    case 'pink':
+    case 'purple':
+      return color;
+
+    case 'toolbar':
+    default:
+      return !isWindows() && mDarkModeMedia.matches ? 'toolbar-dark' : 'toolbar-light';
+  }
+}
+
+export const onUpdated = new EventListenerManager();
+
+function onContextualIdentityCreated(createdInfo) {
+  if (!mIsObserving)
+    return;
+
+  const identity = createdInfo.contextualIdentity;
+  mContextualIdentities.set(identity.cookieStoreId, fixupIcon(identity));
+  onUpdated.dispatch();
+}
+
+function onContextualIdentityRemoved(removedInfo) {
+  if (!mIsObserving)
+    return;
+
+  const identity = removedInfo.contextualIdentity;
+  delete mContextualIdentities.delete(identity.cookieStoreId);
+  onUpdated.dispatch();
+}
+
+function onContextualIdentityUpdated(updatedInfo) {
+  if (!mIsObserving)
+    return;
+
+  const identity = updatedInfo.contextualIdentity;
+  mContextualIdentities.set(identity.cookieStoreId, fixupIcon(identity));
+  onUpdated.dispatch();
+}
+
+
+export function generateMenuItems({ hasDefault } = {}) {
+  const fragment = document.createDocumentFragment();
+
+  if (hasDefault) {
+    const defaultCotnainerItem = document.createElement('li');
+    defaultCotnainerItem.dataset.value = 'firefox-default';
+    defaultCotnainerItem.textContent = browser.i18n.getMessage('tabbar_newTabWithContexualIdentity_default');
+    fragment.appendChild(defaultCotnainerItem);
+
+    const separator = document.createElement('li');
+    separator.classList.add('separator');
+    fragment.appendChild(separator);
+  }
+
+  forEach(identity => {
+    const item = document.createElement('li');
+    item.dataset.value = identity.cookieStoreId;
+    item.textContent = identity.name;
+    item.dataset.icon = identity.iconUrl;
+    fragment.appendChild(item);
+  });
+
+  return fragment;
+}
diff --git a/waterfox/browser/components/sidebar/common/css-selector-parser.js b/waterfox/browser/components/sidebar/common/css-selector-parser.js
new file mode 100644
index 0000000000000..a855d15366d5e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/css-selector-parser.js
@@ -0,0 +1,142 @@
+/*
+  Original: https://github.com/joakimbeng/split-css-selector
+  MIT License ยฉ Joakim Carlstein
+*/
+
+'use strict';
+
+export function splitSelectors(selectors) {
+  if (isAtRule(selectors))
+    return [selectors];
+
+  return split(selectors, {
+    splitter: ',',
+    appendSplitter: false,
+  });
+}
+
+export function splitSelectorParts(selector) {
+  if (isAtRule(selector))
+    return [selector];
+
+  return split(selector, {
+    splitters: [
+      ' ', '\t', '\n', // https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_combinator
+      '>', // https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator
+      '+', // https://developer.mozilla.org/en-US/docs/Web/CSS/Adjacent_sibling_combinator
+      '~', // https://developer.mozilla.org/en-US/docs/Web/CSS/General_sibling_combinator
+      // '||', // https://developer.mozilla.org/en-US/docs/Web/CSS/Column_combinator
+    ],
+    appendSplitter: true,
+  }).filter(part => part !== '');
+}
+
+function split(input, { splitter, splitters, appendSplitter }) {
+  const splittersSet = splitters && new Set(splitters);
+
+  const splitted = [];
+  let parens     = 0;
+  let angulars   = 0;
+  let soFar      = '';
+  let escaped    = false;
+  let singleQuoted = false;
+  let doubleQuoted = false;
+  for (const char of input) {
+    if (escaped) {
+      soFar += char;
+      escaped = false;
+      continue;
+    }
+    if (char === '\\' && !escaped) {
+      soFar += char;
+      escaped = true;
+      continue;
+    }
+    if (char === "'") {
+      if (singleQuoted)
+        singleQuoted = false;
+      else if (!doubleQuoted)
+        singleQuoted = true;
+    }
+    else if (char === '"') {
+      if (doubleQuoted)
+        doubleQuoted = false;
+      else if (!singleQuoted)
+        doubleQuoted = true;
+    }
+    else if (char === '(') {
+      parens++;
+    }
+    else if (char === ')') {
+      parens--;
+    }
+    else if (char === '[') {
+      angulars++;
+    }
+    else if (char === ']') {
+      angulars--;
+    }
+    else if (splitter && char === splitter) {
+      if (!parens &&
+          !angulars &&
+          !singleQuoted &&
+          !doubleQuoted) {
+        splitted.push(soFar.trim());
+        soFar = '';
+        if (appendSplitter)
+          soFar += char;
+        continue;
+      }
+    }
+    else if (splittersSet?.has(char)) {
+      if (!parens &&
+          !angulars &&
+          !singleQuoted &&
+          !doubleQuoted) {
+        splitted.push(soFar);
+        soFar = '';
+        if (appendSplitter)
+          soFar += char;
+        continue;
+      }
+    }
+    soFar += char;
+  }
+  splitted.push(soFar.trim());
+  return splitted;
+}
+
+function isAtRule(selector) {
+  return selector.startsWith('@');
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
+const PSEUDO_ELEMENTS = `
+  :after
+  ::after
+  ::backdrop
+  :before
+  ::before
+  ::cue
+  ::cue-region
+  :first-letter
+  ::first-letter
+  :first-line
+  ::first-line
+  ::file-selector-button
+  ::grammer-error
+  ::marker
+  ::part
+  ::placeholder
+  ::selection
+  ::slotted
+  ::spelling-error
+  ::target-text
+`.trim().split('\n').map(item => item.trim());
+const PSEUDO_ELEMENTS_MATCHER = new RegExp(`(${PSEUDO_ELEMENTS.join('|')})$`, 'i');
+
+export function appendPart(baseSelector, appendant) {
+  if (PSEUDO_ELEMENTS_MATCHER.test(baseSelector))
+    return baseSelector.replace(PSEUDO_ELEMENTS_MATCHER, `${appendant}$1`);
+  return `${baseSelector}${appendant}`;
+}
diff --git a/waterfox/browser/components/sidebar/common/dialog.js b/waterfox/browser/components/sidebar/common/dialog.js
new file mode 100644
index 0000000000000..f853118e14fb8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/dialog.js
@@ -0,0 +1,140 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import RichConfirm from '/extlib/RichConfirm.js';
+
+import {
+  log as internalLogger,
+  configs,
+  isMacOS,
+  sanitizeForHTMLText,
+} from '/common/common.js';
+
+import * as ApiTabs from './api-tabs.js';
+import * as Constants from './constants.js';
+import * as Permissions from './permissions.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as UserOperationBlocker from './user-operation-blocker.js';
+
+import { Tab } from './TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/dialog', ...args);
+}
+
+export async function show(ownerWindow, dialogParams) {
+  let result;
+  let unblocked = false;
+  try {
+    if (configs.showDialogInSidebar &&
+        SidebarConnection.isOpen(ownerWindow.id)/* &&
+        SidebarConnection.hasFocus(ownerWindow.id)*/) {
+      UserOperationBlocker.blockIn(ownerWindow.id, { throbber: false });
+      result = await browser.runtime.sendMessage({
+        type:     Constants.kCOMMAND_SHOW_DIALOG,
+        params:   {
+          ...dialogParams,
+          onShown: null,
+          onShownInTab: null,
+          onShownInPopup: null,
+          userOperationBlockerParams: { throbber: false },
+        },
+        windowId: ownerWindow.id
+      }).catch(ApiTabs.createErrorHandler());
+    }
+    else if (isMacOS() &&
+             ownerWindow.state == 'fullscreen') {
+      // on macOS, a popup window opened from a fullscreen browser window is always
+      // opened as a new fullscreen window, thus we need to fallback to a workaround.
+      log('showDialog: show in a temporary tab in ', ownerWindow.id);
+      UserOperationBlocker.blockIn(ownerWindow.id, { throbber: false, shade: true });
+      const tempTab = await browser.tabs.create({
+        windowId: ownerWindow.id,
+        url:      ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'),
+        active:   true
+      });
+      await Tab.waitUntilTracked(tempTab.id).then(() => {
+        Tab.get(tempTab.id).$TST.addState('hidden', { broadcast: true });
+      });
+      result = await RichConfirm.showInTab(tempTab.id, {
+        ...dialogParams,
+        onShown: [
+          container => {
+            const style = container.closest('.rich-confirm-dialog').style;
+            style.maxWidth = `${Math.floor(window.innerWidth * 0.6)}px`;
+            style.marginInlineStart = style.marginInlineEnd = 'auto';
+          },
+          dialogParams.onShownInTab || dialogParams.onShown
+        ],
+        onHidden(...params) {
+          UserOperationBlocker.unblockIn(ownerWindow.id, { throbber: false });
+          unblocked = true;
+          if (typeof dialogParams.onHidden == 'function')
+            dialogParams.onHidden(...params);
+        },
+      });
+      browser.tabs.remove(tempTab.id);
+    }
+    else {
+      log('showDialog: show in a popup window on ', ownerWindow.id);
+      UserOperationBlocker.blockIn(ownerWindow.id, { throbber: false });
+      result = await RichConfirm.showInPopup(ownerWindow.id, {
+        ...dialogParams,
+        onShown: dialogParams.onShownInPopup || dialogParams.onShown,
+        onHidden(...params) {
+          UserOperationBlocker.unblockIn(ownerWindow.id, { throbber: false });
+          unblocked = true;
+          if (typeof dialogParams.onHidden == 'function')
+            dialogParams.onHidden(...params);
+        },
+      });
+    }
+  }
+  catch(_error) {
+    result = { buttonIndex: -1 };
+  }
+  finally {
+    if (!unblocked)
+      UserOperationBlocker.unblockIn(ownerWindow.id, { throbber: false });
+  }
+  return result;
+}
+
+export function tabsToHTMLList(tabs, { maxHeight, maxWidth }) {
+  const rootLevelOffset = tabs.map(tab => parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || 0)).sort()[0];
+  return (
+    `<ul style="border: 1px inset;
+                display: flex;
+                flex-direction: column;
+                flex-grow: 1;
+                flex-shrink: 1;
+                margin-block: 0.5em;
+                margin-inline: 0;
+                min-height: 2em;
+                max-height: calc(${maxHeight}px - 12em /* title bar, message, checkbox, buttons, and margins */);
+                max-width: ${maxWidth}px;
+                overflow: auto;
+                padding-block: 0.5em;
+                padding-inline: 0.5em;">` +
+      tabs.map(tab => `<li style="align-items: center;
+                                  display: flex;
+                                  flex-direction: row;
+                                  padding-inline-start: calc((${tab.$TST.getAttribute(Constants.kLEVEL)} - ${rootLevelOffset}) * 0.25em);"
+                           title="${sanitizeForHTMLText(tab.title)}"
+                          ><img style="display: flex;
+                                       max-height: 1em;
+                                       max-width: 1em;"
+                                alt=""
+                                src="${sanitizeForHTMLText(tab.favIconUrl || browser.runtime.getURL('resources/icons/defaultFavicon.svg'))}"
+                               ><span style="margin-inline-start: 0.25em;
+                                             overflow: hidden;
+                                             text-overflow: ellipsis;
+                                             white-space: nowrap;"
+                                     >${sanitizeForHTMLText(tab.title)}</span></li>`).join('') +
+      `</ul>`
+  );
+}
diff --git a/waterfox/browser/components/sidebar/common/diff.js b/waterfox/browser/components/sidebar/common/diff.js
new file mode 100644
index 0000000000000..3e63b05e2afc0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/diff.js
@@ -0,0 +1,909 @@
+/**
+ * Mainly ported from difflib.py, the standard diff library of Python.
+ * This code is distributed under the Python Software Foundation License.
+ * Contributor(s): Sutou Kouhei <kou@clear-code.com> (porting)
+ *                 YUKI "Piro" Hiroshi <yuki@clear-code.com>
+ *                   (encoded diff, DOM Updater)
+ * ------------------------------------------------------------------------
+ * Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ * Python Software Foundation.
+ * All rights reserved.
+ *
+ * Copyright (c) 2000 BeOpen.com.
+ * All rights reserved.
+ *
+ * Copyright (c) 1995-2001 Corporation for National Research Initiatives.
+ * All rights reserved.
+ *
+ * Copyright (c) 1991-1995 Stichting Mathematisch Centrum.
+ * All rights reserved.
+ */
+
+export class SequenceMatcher {
+  constructor(from, to, junkPredicate) {
+    this.from = from;
+    this.to = to;
+    this.junkPredicate = junkPredicate;
+    this._updateToIndexes();
+  }
+
+  longestMatch(fromStart, fromEnd, toStart, toEnd) {
+    let bestInfo = this._findBestMatchPosition(fromStart, fromEnd,
+                                               toStart, toEnd);
+    const haveJunk = Object.keys(this.junks).length > 0;
+    if (haveJunk) {
+      const adjust = this._adjustBestInfoWithJunkPredicate;
+      const args = [fromStart, fromEnd, toStart, toEnd];
+
+      bestInfo = adjust.apply(this, [false, bestInfo].concat(args));
+      bestInfo = adjust.apply(this, [true, bestInfo].concat(args));
+    }
+
+    return bestInfo;
+  }
+
+  matches() {
+    if (!this._matches)
+      this._matches = this._computeMatches();
+    return this._matches;
+  }
+
+  blocks() {
+    if (!this._blocks)
+      this._blocks = this._computeBlocks();
+    return this._blocks;
+  }
+
+  operations() {
+    if (!this._operations)
+      this._operations = this._computeOperations();
+    return this._operations;
+  }
+
+  groupedOperations(contextSize) {
+    if (!contextSize)
+      contextSize = 3;
+
+    let operations = this.operations();
+    if (operations.length == 0)
+      operations = [['equal', 0, 0, 0, 0]];
+    operations = this._expandEdgeEqualOperations(operations, contextSize);
+
+    const groupWindow = contextSize * 2;
+    const groups = [];
+    let group = [];
+    for (const operation of operations) {
+      const tag = operation[0];
+      let fromStart = operation[1];
+      const fromEnd = operation[2];
+      let toStart = operation[3];
+      const toEnd = operation[4];
+
+      if (tag == 'equal' && fromEnd - fromStart > groupWindow) {
+        group.push([tag,
+          fromStart,
+          Math.min(fromEnd, fromStart + contextSize),
+          toStart,
+          Math.min(toEnd, toStart + contextSize)]);
+        groups.push(group);
+        group = [];
+        fromStart = Math.max(fromStart, fromEnd - contextSize);
+        toStart = Math.max(toStart, toEnd - contextSize);
+      }
+      group.push([tag, fromStart, fromEnd, toStart, toEnd]);
+    }
+
+    if (group.length > 0)
+      groups.push(group);
+
+    return groups;
+  }
+
+  ratio() {
+    if (!this._ratio)
+      this._ratio = this._computeRatio();
+    return this._ratio;
+  }
+
+  _updateToIndexes() {
+    this.toIndexes = {};
+    this.junks = {};
+
+    for (let i = 0, length = this.to.length; i < length; i++) {
+      const item = this.to[i];
+
+      if (!this.toIndexes[item])
+        this.toIndexes[item] = [];
+      this.toIndexes[item].push(i);
+    }
+
+    if (!this.junkPredicate)
+      return;
+
+    const toIndexesWithoutJunk = {};
+    for (const item in this.toIndexes) {
+      if (this.junkPredicate(item)) {
+        this.junks[item] = true;
+      } else {
+        toIndexesWithoutJunk[item] = this.toIndexes[item];
+      }
+    }
+    this.toIndexes = toIndexesWithoutJunk;
+  }
+
+  _findBestMatchPosition(fromStart, fromEnd, toStart, toEnd) {
+    let bestFrom = fromStart;
+    let bestTo = toStart;
+    let bestSize = 0;
+    let lastSizes = {};
+    let fromIndex;
+
+    for (fromIndex = fromStart; fromIndex <= fromEnd; fromIndex++) {
+      const sizes = {};
+
+      const toIndexes = this.toIndexes[this.from[fromIndex]] || [];
+      for (let i = 0, length = toIndexes.length; i < length; i++) {
+        const toIndex = toIndexes[i];
+
+        if (toIndex < toStart)
+          continue;
+        if (toIndex > toEnd)
+          break;
+
+        const size = sizes[toIndex] = (lastSizes[toIndex - 1] || 0) + 1;
+        if (size > bestSize) {
+          bestFrom = fromIndex - size + 1;
+          bestTo = toIndex - size + 1;
+          bestSize = size;
+        }
+      }
+      lastSizes = sizes;
+    }
+
+    return [bestFrom, bestTo, bestSize];
+  }
+
+  _adjustBestInfoWithJunkPredicate(shouldJunk, bestInfo,
+    fromStart, fromEnd,
+    toStart, toEnd) {
+    let [bestFrom, bestTo, bestSize] = bestInfo;
+
+    while (bestFrom > fromStart &&
+           bestTo > toStart &&
+           (shouldJunk ?
+             this.junks[this.to[bestTo - 1]] :
+             !this.junks[this.to[bestTo - 1]]) &&
+           this.from[bestFrom - 1] == this.to[bestTo - 1]) {
+      bestFrom -= 1;
+      bestTo -= 1;
+      bestSize += 1;
+    }
+
+    while (bestFrom + bestSize < fromEnd &&
+           bestTo + bestSize < toEnd &&
+           (shouldJunk ?
+             this.junks[this.to[bestTo + bestSize]] :
+             !this.junks[this.to[bestTo + bestSize]]) &&
+           this.from[bestFrom + bestSize] == this.to[bestTo + bestSize]) {
+      bestSize += 1;
+    }
+
+    return [bestFrom, bestTo, bestSize];
+  }
+
+  _computeMatches() {
+    const matches = [];
+    const queue = [[0, this.from.length, 0, this.to.length]];
+
+    while (queue.length > 0) {
+      const target = queue.pop();
+      const [fromStart, fromEnd, toStart, toEnd] = target;
+
+      const match = this.longestMatch(fromStart, fromEnd - 1, toStart, toEnd - 1);
+      const matchFromIndex = match[0];
+      const matchToIndex = match[1];
+      const size = match[2];
+      if (size > 0) {
+        if (fromStart < matchFromIndex && toStart < matchToIndex)
+          queue.push([fromStart, matchFromIndex, toStart, matchToIndex]);
+
+        matches.push(match);
+        if (matchFromIndex + size < fromEnd && matchToIndex + size < toEnd)
+          queue.push([matchFromIndex + size, fromEnd,
+            matchToIndex + size, toEnd]);
+      }
+    }
+
+    matches.sort((matchInfo1, matchInfo2) => {
+      const fromIndex1 = matchInfo1[0];
+      const fromIndex2 = matchInfo2[0];
+      return fromIndex1 - fromIndex2;
+    });
+    return matches;
+  }
+
+  _computeBlocks() {
+    const blocks = [];
+    let currentFromIndex = 0;
+    let currentToIndex = 0;
+    let currentSize = 0;
+
+    for (const match of this.matches()) {
+      const [fromIndex, toIndex, size] = match;
+
+      if (currentFromIndex + currentSize == fromIndex &&
+            currentToIndex + currentSize == toIndex) {
+        currentSize += size;
+      } else {
+        if (currentSize > 0)
+          blocks.push([currentFromIndex, currentToIndex, currentSize]);
+        currentFromIndex = fromIndex;
+        currentToIndex = toIndex;
+        currentSize = size;
+      }
+    }
+
+    if (currentSize > 0)
+      blocks.push([currentFromIndex, currentToIndex, currentSize]);
+
+    blocks.push([this.from.length, this.to.length, 0]);
+    return blocks;
+  }
+
+  _computeOperations() {
+    let fromIndex = 0;
+    let toIndex = 0;
+    const operations = [];
+
+    for (const block of this.blocks()) {
+      const [matchFromIndex, matchToIndex, size] = block;
+
+      const tag = this._determineTag(fromIndex, toIndex,
+                                     matchFromIndex, matchToIndex);
+      if (tag != 'equal')
+        operations.push([tag,
+          fromIndex, matchFromIndex,
+          toIndex, matchToIndex]);
+
+      fromIndex = matchFromIndex + size;
+      toIndex = matchToIndex + size;
+
+      if (size > 0)
+        operations.push(['equal',
+          matchFromIndex, fromIndex,
+          matchToIndex, toIndex]);
+    }
+
+    return operations;
+  }
+
+  _determineTag(fromIndex, toIndex,
+    matchFromIndex, matchToIndex) {
+    if (fromIndex < matchFromIndex && toIndex < matchToIndex) {
+      return 'replace';
+    } else if (fromIndex < matchFromIndex) {
+      return 'delete';
+    } else if (toIndex < matchToIndex) {
+      return 'insert';
+    } else {
+      return 'equal';
+    }
+  }
+
+  _expandEdgeEqualOperations(operations, contextSize) {
+    const expandedOperations = [];
+
+    for (let index = 0, length = operations.length; index < length; index++) {
+      const operation = operations[index];
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+
+      if (tag == 'equal' && index == 0) {
+        expandedOperations.push([tag,
+          Math.max(fromStart, fromEnd - contextSize),
+          fromEnd,
+          Math.max(toStart, toEnd - contextSize),
+          toEnd]);
+      } else if (tag == 'equal' && index == length - 1) {
+        expandedOperations.push([tag,
+          fromStart,
+          Math.min(fromEnd, fromStart + contextSize),
+          toStart,
+          Math.min(toEnd, toStart + contextSize),
+          toEnd]);
+      } else {
+        expandedOperations.push(operation);
+      }
+    }
+
+    return expandedOperations;
+  }
+
+  _computeRatio() {
+    const length = this.from.length + this.to.length;
+
+    if (length == 0)
+      return 1.0;
+
+    let matches = 0;
+    for (const block of this.blocks()) {
+      const size = block[2];
+      matches += size;
+    }
+    return 2.0 * matches / length;
+  }
+
+};
+
+
+export class ReadableDiffer {
+  constructor(from, to) {
+    this.from = from;
+    this.to = to;
+  }
+
+  diff() {
+    let lines = [];
+    const matcher = new SequenceMatcher(this.from, this.to);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      let target;
+
+      switch (tag) {
+        case 'replace':
+          target = this._diffLines(fromStart, fromEnd, toStart, toEnd);
+          lines = lines.concat(target);
+          break;
+        case 'delete':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagDeleted(target));
+          break;
+        case 'insert':
+          target = this.to.slice(toStart, toEnd);
+          lines = lines.concat(this._tagInserted(target));
+          break;
+        case 'equal':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagEqual(target));
+          break;
+        default:
+          throw 'unknown tag: ' + tag;
+          break;
+      }
+    }
+
+    return lines;
+  }
+
+  encodedDiff() {
+    let lines = [];
+    const matcher = new SequenceMatcher(this.from, this.to);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      let target;
+
+      switch (tag) {
+        case 'replace':
+          target = this._diffLines(fromStart, fromEnd, toStart, toEnd, true);
+          lines = lines.concat(target);
+          break;
+        case 'delete':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagDeleted(target, true));
+          break;
+        case 'insert':
+          target = this.to.slice(toStart, toEnd);
+          lines = lines.concat(this._tagInserted(target, true));
+          break;
+        case 'equal':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagEqual(target, true));
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+          break;
+      }
+    }
+
+    const blocks = [];
+    let lastBlock = '';
+    let lastLineType = '';
+    for (const line of lines) {
+      const lineType = line.match(/^<span class="line ([^" ]+)/)[1];
+      if (lineType != lastLineType) {
+        blocks.push(lastBlock + (lastBlock ? '</span>' : '' ));
+        lastBlock = `<span class="block ${lineType}">`;
+        lastLineType = lineType;
+      }
+      lastBlock += line;
+    }
+    if (lastBlock)
+      blocks.push(`${lastBlock}</span>`);
+
+    return blocks.join('');
+  }
+
+  _tagLine(mark, contents) {
+    return contents.map(content => `${mark} ${content}`);
+  }
+
+  _encodedTagLine(encodedClass, contents) {
+    return contents.map(content => `<span class="line ${encodedClass}">${this._escapeForEncoded(content)}</span>`);
+  }
+
+  _escapeForEncoded(string) {
+    return string
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;');
+  }
+
+  _tagDeleted(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('deleted', contents) :
+      this._tagLine('-', contents);
+  }
+
+  _tagInserted(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('inserted', contents) :
+      this._tagLine('+', contents);
+  }
+
+  _tagEqual(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('equal', contents) :
+      this._tagLine(' ', contents);
+  }
+
+  _tagDifference(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('difference', contents) :
+      this._tagLine('?', contents);
+  }
+
+  _findDiffLineInfo(fromStart, fromEnd, toStart, toEnd) {
+    let bestRatio = 0.74;
+    let fromEqualIndex, toEqualIndex;
+    let fromBestIndex, toBestIndex;
+
+    for (let toIndex = toStart; toIndex < toEnd; toIndex++) {
+      for (let fromIndex = fromStart; fromIndex < fromEnd; fromIndex++) {
+        if (this.from[fromIndex] == this.to[toIndex]) {
+          if (fromEqualIndex === undefined)
+            fromEqualIndex = fromIndex;
+          if (toEqualIndex === undefined)
+            toEqualIndex = toIndex;
+          continue;
+        }
+
+        const matcher = new SequenceMatcher(this.from[fromIndex],
+                                            this.to[toIndex],
+                                            this._isSpaceCharacter);
+        if (matcher.ratio() > bestRatio) {
+          bestRatio = matcher.ratio();
+          fromBestIndex = fromIndex;
+          toBestIndex = toIndex;
+        }
+      }
+    }
+
+    return [bestRatio,
+      fromEqualIndex, toEqualIndex,
+      fromBestIndex, toBestIndex];
+  }
+
+  _diffLines(fromStart, fromEnd, toStart, toEnd, encoded) {
+    const cutOff = 0.75;
+    const info = this._findDiffLineInfo(fromStart, fromEnd, toStart, toEnd);
+    let bestRatio = info[0];
+    const fromEqualIndex = info[1];
+    const toEqualIndex = info[2];
+    let fromBestIndex = info[3];
+    let toBestIndex = info[4];
+
+    if (bestRatio < cutOff) {
+      if (fromEqualIndex === undefined) {
+        const taggedFrom = this._tagDeleted(this.from.slice(fromStart, fromEnd), encoded);
+        const taggedTo = this._tagInserted(this.to.slice(toStart, toEnd), encoded);
+        if (toEnd - toStart < fromEnd - fromStart)
+          return taggedTo.concat(taggedFrom);
+        else
+          return taggedFrom.concat(taggedTo);
+      }
+
+      fromBestIndex = fromEqualIndex;
+      toBestIndex = toEqualIndex;
+      bestRatio = 1.0;
+    }
+
+    return [].concat(
+      this.__diffLines(fromStart, fromBestIndex,
+                       toStart, toBestIndex,
+                       encoded),
+      (encoded ?
+        this._diffLineEncoded(this.from[fromBestIndex],
+                              this.to[toBestIndex]) :
+        this._diffLine(this.from[fromBestIndex],
+                       this.to[toBestIndex])
+      ),
+      this.__diffLines(fromBestIndex + 1, fromEnd,
+                       toBestIndex + 1, toEnd,
+                       encoded)
+    );
+  }
+
+  __diffLines(fromStart, fromEnd, toStart, toEnd, encoded) {
+    if (fromStart < fromEnd) {
+      if (toStart < toEnd) {
+        return this._diffLines(fromStart, fromEnd, toStart, toEnd, encoded);
+      } else {
+        return this._tagDeleted(this.from.slice(fromStart, fromEnd), encoded);
+      }
+    } else {
+      return this._tagInserted(this.to.slice(toStart, toEnd), encoded);
+    }
+  }
+
+  _diffLineEncoded(fromLine, toLine) {
+    const fromChars = fromLine.split('');
+    const toChars = toLine.split('');
+    const matcher = new SequenceMatcher(fromLine, toLine,
+                                        this._isSpaceCharacter);
+    const phrases = [];
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      const fromPhrase = fromChars.slice(fromStart, fromEnd).join('');
+      const toPhrase = toChars.slice(toStart, toEnd).join('');
+      switch (tag) {
+        case 'replace':
+        case 'delete':
+        case 'insert':
+        case 'equal':
+          phrases.push({ tag         : tag,
+            from        : fromPhrase,
+            encodedFrom : this._escapeForEncoded(fromPhrase),
+            to          : toPhrase,
+            encodedTo   : this._escapeForEncoded(toPhrase), });
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+      }
+    }
+
+    const encodedPhrases = [];
+    let current;
+    let replaced = 0;
+    let inserted = 0;
+    let deleted = 0;
+    for (let i = 0, maxi = phrases.length; i < maxi; i++)
+    {
+      current = phrases[i];
+      switch (current.tag) {
+        case 'replace':
+          encodedPhrases.push('<span class="phrase replaced">');
+          encodedPhrases.push(this._encodedTagPhrase('deleted', current.encodedFrom));
+          encodedPhrases.push(this._encodedTagPhrase('inserted', current.encodedTo));
+          encodedPhrases.push('</span>');
+          replaced++;
+          break;
+        case 'delete':
+          encodedPhrases.push(this._encodedTagPhrase('deleted', current.encodedFrom));
+          deleted++;
+          break;
+        case 'insert':
+          encodedPhrases.push(this._encodedTagPhrase('inserted', current.encodedTo));
+          inserted++;
+          break;
+        case 'equal':
+          // \95ฯX\93_\82ฬŠิ‚ษ‹\B2\82�‚๊‚ฝ1\95\B6\8E\9A\82\BE\82\AF\82ฬ–\B3\95ฯX\95\94\95\AA\82\BE\82\AF\82อ“\C1\95สˆ\B5\82\A2
+          if (
+            current.from.length == 1 &&
+                    (i > 0 && phrases[i-1].tag != 'equal') &&
+                    (i < maxi-1 && phrases[i+1].tag != 'equal')
+          ) {
+            encodedPhrases.push('<span class="phrase equal">');
+            encodedPhrases.push(this._encodedTagPhrase('duplicated', current.encodedFrom));
+            encodedPhrases.push(this._encodedTagPhrase('duplicated', current.encodedTo));
+            encodedPhrases.push('</span>');
+          }
+          else {
+            encodedPhrases.push(current.encodedFrom);
+          }
+          break;
+      }
+    }
+
+    const extraClass = (replaced || (deleted && inserted)) ?
+      ' includes-both-modification' :
+      '' ;
+
+    return [
+      `<span class="line replaced${extraClass}">${encodedPhrases.join('')}</span>`
+    ];
+  }
+
+  _encodedTagPhrase(encodedClass, content) {
+    return `<span class="phrase ${encodedClass}">${content}</span>`;
+  }
+
+  _diffLine(fromLine, toLine) {
+    let fromTags = '';
+    let toTags = '';
+    const matcher = new SequenceMatcher(fromLine, toLine,
+                                        this._isSpaceCharacter);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+
+      const fromLength = fromEnd - fromStart;
+      const toLength = toEnd - toStart;
+      switch (tag) {
+        case 'replace':
+          fromTags += this._repeat('^', fromLength);
+          toTags += this._repeat('^', toLength);
+          break;
+        case 'delete':
+          fromTags += this._repeat('-', fromLength);
+          break;
+        case 'insert':
+          toTags += this._repeat('+', toLength);
+          break;
+        case 'equal':
+          fromTags += this._repeat(' ', fromLength);
+          toTags += this._repeat(' ', toLength);
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+          break;
+      }
+    }
+
+    return this._formatDiffPoint(fromLine, toLine, fromTags, toTags);
+  }
+
+  _formatDiffPoint(fromLine, toLine, fromTags, toTags) {
+    let common;
+    let result;
+
+    common = Math.min(this._nLeadingCharacters(fromLine, '\t'),
+                      this._nLeadingCharacters(toLine, '\t'));
+    common = Math.min(common,
+                      this._nLeadingCharacters(fromTags.slice(0, common),
+                                               ' '));
+    fromTags = fromTags.slice(common).replace(/\s*$/, '');
+    toTags = toTags.slice(common).replace(/\s*$/, '');
+
+    result = this._tagDeleted([fromLine]);
+    if (fromTags.length > 0) {
+      fromTags = this._repeat('\t', common) + fromTags;
+      result = result.concat(this._tagDifference([fromTags]));
+    }
+    result = result.concat(this._tagInserted([toLine]));
+    if (toTags.length > 0) {
+      toTags = this._repeat('\t', common) + toTags;
+      result = result.concat(this._tagDifference([toTags]));
+    }
+
+    return result;
+  }
+
+  _nLeadingCharacters(string, character) {
+    let n = 0;
+    while (string[n] == character) {
+      n++;
+    }
+    return n;
+  }
+
+  _isSpaceCharacter(character) {
+    return character == ' ' || character == '\t';
+  }
+
+  _repeat(string, n) {
+    let result = '';
+    for (; n > 0; n--) {
+      result += string;
+    }
+    return result;
+  }
+
+};
+
+
+export const Diff = {
+
+  readable(from, to, encoded) {
+    const differ = new ReadableDiffer(this._splitWithLine(from), this._splitWithLine(to));
+    return encoded ?
+      differ.encodedDiff() :
+      differ.diff(encoded).join('\n') ;
+  },
+
+  foldedReadable(from, to, encoded) {
+    const differ = new ReadableDiffer(this._splitWithLine(this._fold(from)),
+                                      this._splitWithLine(this._fold(to)));
+    return encoded ?
+      differ.encodedDiff() :
+      differ.diff(encoded).join('\n') ;
+  },
+
+  isInterested(diff) {
+    if (!diff)
+      return false;
+
+    if (diff.length == 0)
+      return false;
+
+    if (!diff.match(/^[-+]/mg))
+      return false;
+
+    if (diff.match(/^[ ?]/mg))
+      return true;
+
+    if (diff.match(/(?:.*\n){2,}/g))
+      return true;
+
+    if (this.needFold(diff))
+      return true;
+
+    return false;
+  },
+
+  needFold(diff) {
+    if (!diff)
+      return false;
+
+    if (diff.match(/^[-+].{79}/mg))
+      return true;
+
+    return false;
+  },
+
+  _splitWithLine(string) {
+    string = String(string);
+    return string.length == 0 ? [] : string.split(/\r?\n/);
+  },
+
+  _fold(string) {
+    string = String(string);
+    const foldedLines = string.split('\n').map(line => line.replace(/(.{78})/g, '$1\n'));
+    return foldedLines.join('\n');
+  }
+
+};
+
+
+export const DOMUpdater = {
+  /**
+   * method
+   * @param before {Node}   - the node to be updated, e.g. Element
+   * @param after  {Node}   - the node describing updated state,
+   *                          e.g. DocumentFragment
+   * @return count {number} - the count of appied changes
+   */
+  update(before, after, counter = { count: 0 }) {
+    if (before.nodeValue !== null ||
+        after.nodeValue !== null) {
+      if (before.nodeValue != after.nodeValue) {
+        //console.log('node value: ', after.nodeValue);
+        before.nodeValue = after.nodeValue;
+        counter.count++;
+      }
+      return counter.count;
+    }
+
+    const beforeNodes = Array.from(before.childNodes, this._getDiffableNodeString);
+    const afterNodes = Array.from(after.childNodes, this._getDiffableNodeString);
+    const nodeOerations = (new SequenceMatcher(beforeNodes, afterNodes)).operations();
+    // Update from back to front for safety!
+    for (const operation of nodeOerations.reverse()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      switch (tag) {
+        case 'equal':
+          for (let i = 0, maxi = fromEnd - fromStart; i < maxi; i++) {
+            this.update(
+              before.childNodes[fromStart + i],
+              after.childNodes[toStart + i],
+              counter
+            );
+          }
+          break;
+        case 'delete':
+          for (let i = fromEnd - 1; i >= fromStart; i--) {
+            //console.log('delete: delete node: ', i, before.childNodes[i]);
+            before.removeChild(before.childNodes[i]);
+            counter.count++;
+          }
+          break;
+        case 'insert': {
+          const reference = before.childNodes[fromStart] || null;
+          for (let i = toStart; i < toEnd; i++) {
+            if (!after.childNodes[i])
+              continue;
+            //console.console.log('insert: insert node: ', i, after.childNodes[i]);
+            before.insertBefore(after.childNodes[i].cloneNode(true), reference);
+            counter.count++;
+          }
+        }; break;
+        case 'replace': {
+          for (let i = fromEnd - 1; i >= fromStart; i--) {
+            //console.log('replace: delete node: ', i, before.childNodes[i]);
+            before.removeChild(before.childNodes[i]);
+            counter.count++;
+          }
+          const reference = before.childNodes[fromStart] || null;
+          for (let i = toStart; i < toEnd; i++) {
+            if (!after.childNodes[i])
+              continue;
+            //console.log('replace: insert node: ', i, after.childNodes[i]);
+            before.insertBefore(after.childNodes[i].cloneNode(true), reference);
+            counter.count++;
+          }
+        }; break;
+      }
+    }
+
+    if (before.nodeType == before.ELEMENT_NODE &&
+        after.nodeType == after.ELEMENT_NODE) {
+      const beforeAttrs = Array.from(before.attributes, attr => `${attr.name}:${attr.value}`).  sort();
+      const afterAttrs = Array.from(after.attributes, attr => `${attr.name}:${attr.value}`).  sort();
+      const attrOerations = (new SequenceMatcher(beforeAttrs, afterAttrs)).operations();
+      for (const operation of attrOerations) {
+        const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+        switch (tag) {
+          case 'equal':
+            break;
+          case 'delete':
+            for (let i = fromStart; i < fromEnd; i++) {
+              const name = beforeAttrs[i].split(':')[0];
+              //console.log('delete: delete attr: ', name);
+              before.removeAttribute(name);
+              counter.count++;
+            }
+            break;
+          case 'insert':
+            for (let i = toStart; i < toEnd; i++) {
+              const attr = afterAttrs[i].split(':');
+              const name = attr[0];
+              const value = attr.slice(1).join(':');
+              //console.log('insert: set attr: ', name, value);
+              before.setAttribute(name, value);
+              counter.count++;
+            }
+            break;
+          case 'replace':
+            const insertedAttrs = new Set();
+            for (let i = toStart; i < toEnd; i++) {
+              const attr = afterAttrs[i].split(':');
+              const name = attr[0];
+              const value = attr.slice(1).join(':');
+              //console.log('replace: set attr: ', name, value);
+              before.setAttribute(name, value);
+              insertedAttrs.add(name);
+              counter.count++;
+            }
+            for (let i = fromStart; i < fromEnd; i++) {
+              const name = beforeAttrs[i].split(':')[0];
+              if (insertedAttrs.has(name))
+                continue;
+              //console.log('replace: delete attr: ', name);
+              before.removeAttribute(name);
+              counter.count++;
+            }
+            break;
+        }
+      }
+    }
+    return counter.count;
+  },
+
+  _getDiffableNodeString(node) {
+    if (node.nodeType == node.ELEMENT_NODE)
+      return `element:${node.tagName}#${node.id}#${node.getAttribute('anonid')}`;
+    else
+      return `node:${node.nodeType}`;
+  }
+
+};
diff --git a/waterfox/browser/components/sidebar/common/handle-accel-key.js b/waterfox/browser/components/sidebar/common/handle-accel-key.js
new file mode 100644
index 0000000000000..ca1188530e8fa
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/handle-accel-key.js
@@ -0,0 +1,103 @@
+/*
+# 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/.
+*/
+'use strict';
+
+(function() {
+  if (window.handleAccelKeyLoaded)
+    return;
+
+  function stringifySoloModifier(event) {
+    switch (event.key) {
+      case 'Alt':
+        return (
+          !event.ctrlKey &&
+          !event.metaKey
+        ) ? 'alt' : null;
+
+      case 'Control':
+        return (
+          !event.altKey &&
+          !event.metaKey
+        ) ? 'control' : null;
+
+      case 'Meta':
+        return (
+          !event.altKey &&
+          !event.ctrlKey
+        ) ? 'meta' : null;
+
+      default:
+        return null;
+    }
+  }
+
+  function stringifyModifier(event) {
+    if (event.altKey &&
+        !event.ctrlKey &&
+        !event.metaKey)
+      return 'alt';
+
+    if (!event.altKey &&
+        event.ctrlKey &&
+        !event.metaKey)
+      return 'control';
+
+    if (!event.altKey &&
+        !event.ctrlKey &&
+        event.metaKey)
+      return 'meta';
+
+    return null;
+  }
+
+  function stringifyUnshiftedSoloModifier(event) {
+    if (event.key != 'Shift')
+      return null;
+    return stringifyModifier(event);
+  }
+
+  function stringifyMayTabSwitchModifier(event) {
+    if (!/^(Tab|Shift|PageUp|PageDown)$/.test(event.key))
+      return null;
+    return stringifyModifier(event);
+  }
+
+  function onKeyDown(event) {
+    const modifier             = stringifySoloModifier(event);
+    const mayTabSwitchModifier = stringifyMayTabSwitchModifier(event);
+    if (modifier ||
+        mayTabSwitchModifier)
+      browser.runtime.sendMessage({
+        type:     'ws:notify-may-start-tab-switch',
+        modifier: modifier || mayTabSwitchModifier
+      });
+  }
+
+  function onKeyUp(event) {
+    const modifier             = stringifySoloModifier(event);
+    const unshiftedModifier    = stringifyUnshiftedSoloModifier(event);
+    const mayTabSwitchModifier = stringifyMayTabSwitchModifier(event);
+    if (modifier ||
+        (!unshiftedModifier &&
+         !mayTabSwitchModifier))
+      browser.runtime.sendMessage({
+        type:     'ws:notify-may-end-tab-switch',
+        modifier: modifier || stringifyModifier(event)
+      });
+  }
+
+  function init() {
+    window.handleAccelKeyLoaded = true;
+    window.addEventListener('keydown', onKeyDown, { capture: true });
+    window.addEventListener('keyup', onKeyUp, { capture: true });
+    window.addEventListener('pagehide', () => {
+      window.addEventListener('keydown', onKeyDown, { capture: true });
+      window.addEventListener('keyup', onKeyUp, { capture: true });
+      window.addEventListener('pageshow', init, { once: true });
+    }, { once: true });
+  }
+  init();
+})();
diff --git a/waterfox/browser/components/sidebar/common/permissions.js b/waterfox/browser/components/sidebar/common/permissions.js
new file mode 100644
index 0000000000000..98c6a1ad49837
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/permissions.js
@@ -0,0 +1,362 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  notify,
+  configs
+} from './common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from './constants.js';
+
+function log(...args) {
+  internalLogger('common/permissions', ...args);
+}
+
+export const ALL_URLS = { origins: ['<all_urls>'] };
+export const BOOKMARKS = { permissions: ['bookmarks'] };
+export const CLIPBOARD_READ = { permissions: ['clipboardRead'] };
+export const TAB_HIDE = { permissions: ['tabHide'] };
+
+const checkboxesForPermission = new Map();
+
+export function clearRequest() {
+  configs.requestingPermissions = null;
+}
+
+
+const cachedGranted = new Map();
+
+export async function isGranted(permissions) {
+  try {
+    const granted = await browser.permissions.contains(permissions).catch(ApiTabs.createErrorHandler());
+    cachedGranted.set(JSON.stringify(permissions), granted);
+    return granted;
+  }
+  catch(error) {
+    console.error(error);
+    return Promise.reject(new Error('unsupported permission'));
+  }
+}
+
+export function isGrantedSync(permissions) {
+  return cachedGranted.get(JSON.stringify(permissions));
+}
+
+// cache last state
+for (const permissions of [ALL_URLS, BOOKMARKS, CLIPBOARD_READ, TAB_HIDE]) {
+  isGranted(permissions);
+}
+
+
+const CUSTOM_PANEL_AVAILABLE_URLS_MATCHER = new RegExp(`^((https?|data):|moz-extension://${location.host}/)`);
+
+export async function canInjectScriptToTab(tab) {
+  if (!tab ||
+      !CUSTOM_PANEL_AVAILABLE_URLS_MATCHER.test(tab.url))
+    return false;
+
+  return isGranted(ALL_URLS);
+}
+
+export function canInjectScriptToTabSync(tab) {
+  if (!tab ||
+      !CUSTOM_PANEL_AVAILABLE_URLS_MATCHER.test(tab.url))
+    return false;
+
+  return isGrantedSync(ALL_URLS);
+}
+
+
+const mRequests = new Map();
+
+function destroyRequest(request) {
+  const permissions = JSON.stringify(request.permissions);
+  const requests = mRequests.get(permissions);
+  if (requests)
+    requests.delete(request);
+
+  const onChanged = request.resolve;
+  const checkbox  = request.url;
+
+  request.permissions = undefined;
+  request.onChanged   = undefined;
+  request.checkbox    = undefined;
+
+  return { onChanged, checkbox };
+}
+
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!message ||
+      !message.type ||
+      message.type != Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED)
+    return;
+
+  const permissions = JSON.stringify(message.permissions);
+
+  isGranted(message.permissions); // to cache latest state
+
+  const requests = mRequests.get(permissions);
+  if (!requests)
+    return;
+
+  mRequests.delete(permissions);
+
+  for (const request of requests) {
+    const { onChanged, checkbox } = destroyRequest(request);
+    const checked =onChanged ?
+      onChanged(true) :
+      undefined;
+    checkbox.checked = checked !== undefined ? !!checked : true;
+  }
+});
+
+/*
+// These events are not available yet on Firefox...
+browser.permissions.onAdded.addListener(addedPermissions => {
+  const permissions = JSON.stringify(addedPermissions.permissions);
+  const requests = mRequests.get(permissions);
+  if (!requests)
+    return;
+
+  mRequests.delete(permissions);
+
+  for (const request of requests) {
+    const { checkbox } = destroyRequest(request);
+    checkbox.checked = true;
+  }
+});
+browser.permissions.onRemoved.addListener(removedPermissions => {
+  const permissions = JSON.stringify(addedPermissions.permissions);
+  const requests = mRequests.get(permissions);
+  if (!requests)
+    return;
+
+  mRequests.delete(permissions);
+
+  for (const request of requests) {
+    const { checkbox } = destroyRequest(request);
+    checkbox.checked = false;
+  }
+});
+*/
+
+export function bindToCheckbox(permissions, checkbox, options = {}) {
+  const checkboxes = checkboxesForPermission.get(permissions) || [];
+  checkboxes.push(checkbox);
+  checkboxesForPermission.set(permissions, checkboxes);
+
+  isGranted(permissions)
+    .then(granted => {
+      const checked = options.onInitialized ?
+        options.onInitialized(granted) :
+        checkbox.dataset.relatedConfigKey ?
+          configs[checkbox.dataset.relatedConfigKey] :
+          undefined;
+      checkbox.checked = checked !== undefined ? !!checked : granted;
+    })
+    .catch(_error => {
+      checkbox.setAttribute('readonly', true);
+      checkbox.setAttribute('disabled', true);
+      const label = checkbox.closest('label') || document.querySelector(`label[for=${checkbox.id}]`);
+      if (label)
+        label.setAttribute('disabled', true);
+    });
+
+  checkbox.addEventListener('change', _event => {
+    checkbox.requestPermissions()
+  });
+
+  const key = JSON.stringify(permissions);
+  const requests = mRequests.get(key) || new Set();
+  const request = {
+    permissions,
+    onChanged: options.onChanged,
+    checkbox,
+  };
+  requests.add(request);
+  mRequests.set(key, requests);
+
+  checkbox.requestPermissions = async () => {
+    log('permission requested: ', permissions);
+    const checkboxes = checkboxesForPermission.get(permissions);
+    try {
+      log('checkboxes: ', checkboxes);
+      log('checkbox.checked: ', checkbox.checked);
+      if (!checkbox.checked) {
+        if (checkbox.dataset.relatedConfigKey)
+          configs[checkbox.dataset.relatedConfigKey] = false;
+        if (options.onChanged)
+          options.onChanged(false);
+        const canRevoke = Array.from(checkboxes, checkbox => checkbox.dataset.relatedConfigKey ? configs[checkbox.dataset.relatedConfigKey] : null).filter(state => state !== null).every(state => !state);
+        log('canRevoke: ', canRevoke);
+        if (!canRevoke)
+          return;
+        log('revoking the permission');
+        await browser.permissions.remove(permissions).catch(ApiTabs.createErrorSuppressor());
+        for (const otherCheckbox of checkboxes) {
+          if (otherCheckbox != checkbox &&
+              otherCheckbox.dataset.relatedConfigKey)
+            continue;
+          otherCheckbox.checked = false;
+        }
+        return;
+      }
+
+      for (const otherCheckbox of checkboxes) {
+        if (otherCheckbox != checkbox &&
+            otherCheckbox.dataset.relatedConfigKey)
+          continue;
+        otherCheckbox.checked = false;
+      }
+
+      if (configs.requestingPermissionsNatively)
+        return;
+
+      log('requesting the permission');
+      configs.requestingPermissionsNatively = permissions;
+      let granted = await browser.permissions.request(permissions).catch(ApiTabs.createErrorHandler());
+      configs.requestingPermissionsNatively = null;
+
+      log('granted: ', granted);
+      if (granted === undefined) {
+        granted = await isGranted(permissions);
+        log('granted (retry): ', granted);
+      }
+      else if (!granted) {
+        log('not granted: cacneled');
+        return;
+      }
+
+      if (granted) {
+        if (checkbox.dataset.relatedConfigKey)
+          configs[checkbox.dataset.relatedConfigKey] = true;
+        const configValue = checkbox.dataset.relatedConfigKey ? true : null;
+        const onChangedResult = options.onChanged && options.onChanged(true);
+        const checked = configValue !== null ? configValue :
+          options.onChanged ?
+            onChangedResult :
+            undefined;
+        log('update checkboxes with checked state ', checked);
+        for (const otherCheckbox of checkboxes) {
+          if (otherCheckbox != checkbox &&
+              otherCheckbox.dataset.relatedConfigKey)
+            continue;
+          otherCheckbox.checked = checked !== undefined ? !!checked : true;
+        }
+        browser.runtime.sendMessage({
+          type: Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED,
+          permissions
+        }).catch(_error => {});
+        log('finish');
+        return;
+      }
+
+      log('fallback to the failsafe method');
+      configs.requestingPermissions = permissions;
+      browser.browserAction.setBadgeText({ text: '!' });
+      browser.browserAction.setPopup({ popup: '' });
+
+      notify({
+        title:   browser.i18n.getMessage('config_requestPermissions_fallbackToToolbarButton_title'),
+        message: browser.i18n.getMessage('config_requestPermissions_fallbackToToolbarButton_message'),
+        icon:    'resources/24x24.svg#default'
+      });
+      return;
+    }
+    catch(error) {
+      console.log(error);
+    }
+    for (const checkbox of checkboxes) {
+      checkbox.checked = false;
+    }
+  };
+}
+
+export function bindToClickable(permissions, node, { onChanged } = {}) {
+  node.addEventListener('click', _event => {
+    node.requestPermissions()
+  });
+
+  if (node.requestPermissions)
+    return;
+
+  node.requestPermissions = async () => {
+    try {
+      const checkboxes = checkboxesForPermission.get(permissions);
+      if (configs.requestingPermissionsNatively ||
+          checkboxes.every(checkbox => checkbox.checked))
+        return;
+
+      configs.requestingPermissionsNatively = permissions;
+      // We need to call this without delay to avoid "permissions.request may only be called from a user input handler" error.
+      let granted = await browser.permissions.request(permissions).catch(ApiTabs.createErrorHandler());
+      configs.requestingPermissionsNatively = null;
+
+      if (granted === undefined)
+        granted = await isGranted(permissions);
+      else if (!granted)
+        return;
+
+      if (granted) {
+        for (const checkbox of checkboxes) {
+          checkbox.checked = true;
+        }
+        if (onChanged)
+          onChanged(true);
+        browser.runtime.sendMessage({
+          type: Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED,
+          permissions
+        }).catch(_error => {});
+        return;
+      }
+
+      configs.requestingPermissions = permissions;
+      browser.browserAction.setBadgeText({ text: '!' });
+      browser.browserAction.setPopup({ popup: '' });
+
+      notify({
+        title:   browser.i18n.getMessage('config_requestPermissions_fallbackToToolbarButton_title'),
+        message: browser.i18n.getMessage('config_requestPermissions_fallbackToToolbarButton_message'),
+        icon:    'resources/24x24.svg#default'
+      });
+      return;
+    }
+    catch(error) {
+      console.log(error);
+    }
+  };
+}
+
+export function requestPostProcess() {
+  if (!configs.requestingPermissions)
+    return false;
+
+  const permissions = configs.requestingPermissions;
+  configs.requestingPermissions = null;
+  configs.requestingPermissionsNatively = permissions;
+
+  browser.browserAction.setBadgeText({ text: '' });
+  browser.permissions.request(permissions)
+    .then(granted => {
+      log('permission requested: ', permissions, granted);
+      if (granted)
+        browser.runtime.sendMessage({
+          type: Constants.kCOMMAND_NOTIFY_PERMISSIONS_GRANTED,
+          permissions
+        }).catch(_error => {});
+    })
+    .catch(ApiTabs.createErrorSuppressor())
+    .finally(() => {
+      configs.requestingPermissionsNatively = null;
+    });
+  return true;
+}
+
+configs.$loaded.then(() => {
+  configs.requestingPermissionsNatively = null;
+});
diff --git a/waterfox/browser/components/sidebar/common/retrieve-url.js b/waterfox/browser/components/sidebar/common/retrieve-url.js
new file mode 100644
index 0000000000000..a73c730f3b8af
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/retrieve-url.js
@@ -0,0 +1,197 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+} from './common.js';
+import * as Permissions from './permissions.js';
+
+function log(...args) {
+  internalLogger('common/retrieve-url', ...args);
+}
+
+export const kTYPE_PLAIN_TEXT  = 'text/plain';
+export const kTYPE_X_MOZ_URL   = 'text/x-moz-url';
+export const kTYPE_URI_LIST    = 'text/uri-list';
+export const kTYPE_MOZ_TEXT_INTERNAL = 'text/x-moz-text-internal';
+const kBOOKMARK_FOLDER  = 'x-moz-place:';
+
+const ACCEPTABLE_DATA_TYPES = [
+  kTYPE_URI_LIST,
+  kTYPE_X_MOZ_URL,
+  kTYPE_MOZ_TEXT_INTERNAL,
+  kTYPE_PLAIN_TEXT,
+];
+
+let mFileURLResolver = null;
+
+export async function registerFileURLResolver(resolver) {
+  mFileURLResolver = resolver;
+}
+
+export async function fromDragEvent(event) {
+  log('fromDragEvent ', event);
+  const dt = event.dataTransfer;
+  const urls = [];
+  if (dt.files.length > 0) {
+    for (const file of dt.files) {
+      if (typeof mFileURLResolver == 'function') {
+        urls.push(await mFileURLResolver(file));
+      }
+      else {
+        // Created object URLs need to be revoked by tryRevokeObjectURL()
+        // in common/common.js, after they are loaded.
+        urls.push(URL.createObjectURL(file));
+      }
+    }
+  }
+  else {
+    for (const type of ACCEPTABLE_DATA_TYPES) {
+      const urlData = dt.getData(type);
+      if (urlData)
+        urls.push(...fromData(urlData, type));
+      if (urls.length)
+        break;
+    }
+    for (const type of dt.types) {
+      if (!/^application\/x-ws-drag-data;(.+)$/.test(type))
+        continue;
+      const params     = RegExp.$1;
+      const providerId = /provider=([^;&]+)/.test(params) && RegExp.$1;
+      const dataId     = /id=([^;&]+)/.test(params) && RegExp.$1;
+      try {
+        const dragData = await browser.runtime.sendMessage(providerId, {
+          type: 'get-drag-data',
+          id:   dataId
+        });
+        if (!dragData || typeof dragData != 'object')
+          break;
+        for (const type of ACCEPTABLE_DATA_TYPES) {
+          const urlData = dragData[type];
+          if (urlData)
+            urls.push(...fromData(urlData, type));
+          if (urls.length)
+            break;
+        }
+      }
+      catch(_error) {
+      }
+    }
+  }
+  log(' => retrieved: ', urls);
+  return sanitizeURLs(urls);
+}
+
+let mSelectionClipboardProvider = null;
+
+/* provider should have two methods:
+    isAvailable(): returns boolean which indicates the selection clipboard is available or not.
+    getTextData(): returns a string from the selection clipboard.
+*/
+export function registerSelectionClipboardProvider(provider) {
+  mSelectionClipboardProvider = provider;
+}
+
+export async function fromClipboard({ selection } = {}) {
+  const urls = [];
+
+  if (selection && mSelectionClipboardProvider) {
+    if (await mSelectionClipboardProvider.isAvailable()) {
+      const maybeUrlString = await mSelectionClipboardProvider.getTextData();
+      if (maybeUrlString)
+        urls.push(...fromData(maybeUrlString, kTYPE_PLAIN_TEXT));
+      return sanitizeURLs(urls);
+    }
+  }
+
+  if (!(await Permissions.isGranted(Permissions.CLIPBOARD_READ)) ||
+      typeof navigator.clipboard.read != 'function')
+    return urls;
+
+  const clipboardContents = await navigator.clipboard.read();
+  log('fromClipboard ', clipboardContents);
+
+  for (const item of clipboardContents) {
+    for (const type of item.types) {
+      const maybeUrlBlob   = await item.getType(type);
+      const maybeUrlString = await maybeUrlBlob.text();
+      if (maybeUrlString)
+        urls.push(...fromData(maybeUrlString, type));
+      if (urls.length)
+        break;
+    }
+  }
+  log(' => retrieved: ', urls);
+  return sanitizeURLs(urls);
+}
+
+function sanitizeURLs(urls) {
+  const filteredUrls = urls.filter(url =>
+    url &&
+      url.length &&
+      url.indexOf(kBOOKMARK_FOLDER) == 0 ||
+      !/^\s*(javascript|data):/.test(url)
+  );
+  log('sanitizeURLs filtered: ', filteredUrls);
+
+  const fixedUrls = filteredUrls.map(fixupURIFromText);
+  log('sanitizeURLs fixed: ', fixedUrls);
+
+  return fixedUrls;
+}
+
+function fromData(data, type) {
+  log('fromData: ', type, data);
+  switch (type) {
+    case kTYPE_URI_LIST:
+      return data
+        .replace(/\r/g, '\n')
+        .replace(/\n\n+/g, '\n')
+        .split('\n')
+        .filter(line => {
+          return line.charAt(0) != '#';
+        });
+
+    case kTYPE_X_MOZ_URL:
+      return data
+        .trim()
+        .replace(/\r/g, '\n')
+        .replace(/\n\n+/g, '\n')
+        .split('\n')
+        .filter((_line, index) => {
+          return index % 2 == 0;
+        });
+
+    case kTYPE_MOZ_TEXT_INTERNAL:
+      return data
+        .replace(/\r/g, '\n')
+        .replace(/\n\n+/g, '\n')
+        .trim()
+        .split('\n');
+
+    case kTYPE_PLAIN_TEXT:
+      return data
+        .replace(/\r/g, '\n')
+        .replace(/\n\n+/g, '\n')
+        .trim()
+        .split('\n')
+        .map(line => {
+          return /^\w+:\/\/.+/.test(line) ? line : `ext+ws:search:${line}`;
+        });
+  }
+  return [];
+}
+
+function fixupURIFromText(maybeURI) {
+  if (/^(ext\+)?\w+:/.test(maybeURI))
+    return maybeURI;
+
+  if (/^([^\.\s]+\.)+[^\.\s]{2}/.test(maybeURI))
+    return `http://${maybeURI}`;
+
+  return maybeURI;
+}
diff --git a/waterfox/browser/components/sidebar/common/sidebar-connection.js b/waterfox/browser/components/sidebar/common/sidebar-connection.js
new file mode 100644
index 0000000000000..80b8adfa091ee
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/sidebar-connection.js
@@ -0,0 +1,305 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  mapAndFilterUniq,
+  configs,
+  wait,
+} from './common.js';
+import * as Constants from './constants.js';
+import * as TabsStore from './tabs-store.js';
+
+function log(...args) {
+  internalLogger('common/sidebar-connection', ...args);
+}
+
+export const onMessage = new EventListenerManager();
+export const onConnected = new EventListenerManager();
+export const onDisconnected = new EventListenerManager();
+
+const mConnections = new Map();
+const mReceivers = new Map();
+const mFocusState = new Map();
+let mIsListening = false;
+
+export function isInitialized() {
+  return mIsListening;
+}
+
+export function isSidebarOpen(windowId) {
+  if (!mIsListening ||
+      Constants.IS_SIDEBAR)
+    return false;
+
+  // for automated tests
+  if (configs.sidebarVirtuallyOpenedWindows.length > 0 &&
+      configs.sidebarVirtuallyOpenedWindows.includes(windowId))
+    return true;
+  if (configs.sidebarVirtuallyClosedWindows.length > 0 &&
+      configs.sidebarVirtuallyClosedWindows.includes(windowId))
+    return false;
+
+  if (windowId in configs.sidebarWidthInWindow &&
+      configs.sidebarWidthInWindow[windowId] == 0)
+    return false;
+
+  const connections = mConnections.get(windowId);
+  if (!connections)
+    return false;
+  for (const connection of connections) {
+    if (connection.type == 'sidebar')
+      return true;
+  }
+  return false;
+}
+
+export function isOpen(windowId) {
+  if (!mIsListening ||
+      Constants.IS_SIDEBAR)
+    return false;
+
+  // for automated tests
+  if (configs.sidebarVirtuallyOpenedWindows.length > 0 &&
+      configs.sidebarVirtuallyOpenedWindows.includes(windowId))
+    return true;
+  if (configs.sidebarVirtuallyClosedWindows.length > 0 &&
+      configs.sidebarVirtuallyClosedWindows.includes(windowId))
+    return false;
+
+  if (windowId in configs.sidebarWidthInWindow &&
+      configs.sidebarWidthInWindow[windowId] == 0)
+    return false;
+
+  const connections = mConnections.get(windowId);
+  return connections && connections.size > 0;
+}
+
+export function hasFocus(windowId) {
+  return mFocusState.has(windowId)
+}
+
+export const counts = {
+  broadcast: {}
+};
+
+export function getOpenWindowIds() {
+  return mIsListening ? Array.from(mConnections.keys()) : [];
+}
+
+export function sendMessage(message) {
+  if (!mIsListening ||
+      Constants.IS_SIDEBAR)
+    return false;
+
+  if (Array.isArray(message))
+    log('Sending ', message.length, ' messages');
+
+  if (message.windowId) {
+    if (configs.loggingConnectionMessages) {
+      counts[message.windowId] = counts[message.windowId] || {};
+      const localCounts = counts[message.windowId];
+      localCounts[message.type] = localCounts[message.type] || 0;
+      localCounts[message.type]++;
+    }
+    const connections = mConnections.get(message.windowId);
+    if (!connections || connections.size == 0)
+      return false;
+    for (const connection of connections) {
+      sendMessageToPort(connection.port, message);
+    }
+    //port.postMessage(message);
+    return true;
+  }
+
+  // broadcast
+  counts.broadcast[message.type] = counts.broadcast[message.type] || 0;
+  counts.broadcast[message.type]++;
+  for (const connections of mConnections.values()) {
+    if (!connections || connections.size == 0)
+      continue;
+    for (const connection of connections) {
+      sendMessageToPort(connection.port, message);
+    }
+    //port.postMessage(message);
+  }
+  return true;
+}
+
+const mReservedTasks = new WeakMap();
+
+// Se should not send messages immediately, instead we should throttle
+// it and bulk-send multiple messages, for better user experience.
+// Sending too much messages in one event loop may block everything
+// and makes Firefox like frozen.
+function sendMessageToPort(port, message) {
+  const task = mReservedTasks.get(port) || { messages: [] };
+  task.messages.push(message);
+  mReservedTasks.set(port, task);
+  if (!task.onFrame) {
+    task.onFrame = () => {
+      delete task.onFrame;
+      const messages = task.messages;
+      task.messages = [];
+      port.postMessage(messages);
+      if (configs.debug) {
+        const types = mapAndFilterUniq(messages,
+                                       message => message.type || undefined).join(', ');
+        log(`${messages.length} messages sent (${types}):`, messages);
+      }
+    };
+    // We should not use window.requestAnimationFrame for throttling,
+    // because it is quite lagged on some environment. Firefox may
+    // decelerate the method for an invisible document (the background
+    // page).
+    //window.requestAnimationFrame(task.onFrame);
+    setTimeout(task.onFrame, 0);
+  }
+}
+
+if (Constants.IS_BACKGROUND) {
+  const matcher = new RegExp(`^${Constants.kCOMMAND_REQUEST_CONNECT_PREFIX}([0-9]+):(.+)$`);
+  browser.runtime.onConnect.addListener(port => {
+    if (!mIsListening ||
+        !matcher.test(port.name))
+      return;
+
+    const windowId   = parseInt(RegExp.$1);
+    const type       = RegExp.$2;
+    const connection = { port, type };
+    const connections = mConnections.get(windowId) || new Set();
+    connections.add(connection);
+    mConnections.set(windowId, connections);
+    let connectionTimeoutTimer = null;
+    const updateTimeoutTimer = () => {
+      if (connectionTimeoutTimer) {
+        clearTimeout(connectionTimeoutTimer);
+        connectionTimeoutTimer = null;
+      }
+      // On slow situation (like having too many tabs - 5000 or more)
+      // we should wait more for the pong. Otherwise the vital check
+      // may produce needless reloadings even if the sidebar is still alive.
+      // See also https://github.com/piroor/treestyletab/issues/3130
+      const timeout = configs.heartbeatInterval + Math.max(configs.connectionTimeoutDelay, TabsStore.tabs.size);
+      connectionTimeoutTimer = setTimeout(async () => {
+        log(`Missing heartbeat from window ${windowId}. Maybe disconnected or resumed.`);
+        try {
+          const pong = await browser.runtime.sendMessage({
+            type: Constants.kCOMMAND_PING_TO_SIDEBAR,
+            windowId
+          });
+          if (pong) {
+            log(`Sidebar for the window ${windowId} responded. Keep connected.`);
+            return;
+          }
+        }
+        catch(_error) {
+        }
+        log(`Sidebar for the window ${windowId} did not respond. Disconnect now.`);
+        cleanup(); // eslint-disable-line no-use-before-define
+        port.disconnect();
+      }, timeout);
+    };
+    const cleanup = _diconnectedPort => {
+      if (!port.onMessage.hasListener(receiver)) // eslint-disable-line no-use-before-define
+        return;
+      if (connectionTimeoutTimer) {
+        clearTimeout(connectionTimeoutTimer);
+        connectionTimeoutTimer = null;
+      }
+      connections.delete(connection);
+      if (connections.size == 0) {
+        mConnections.delete(windowId);
+        const sidebarWidthInWindow = { ...configs.sidebarWidthInWindow };
+        delete sidebarWidthInWindow[windowId];
+        configs.sidebarWidthInWindow = sidebarWidthInWindow;
+      }
+      port.onMessage.removeListener(receiver); // eslint-disable-line no-use-before-define
+      mReceivers.delete(windowId);
+      mFocusState.delete(windowId);
+      onDisconnected.dispatch(windowId, connections.size);
+
+      // We need to notify this to some conetnt scripts, to destroy themselves.
+      /*
+      browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_NOTIFY_SIDEBAR_CLOSED,
+        windowId,
+      });
+      */
+      browser.windows.get(windowId, { populate: true }).then(async win => {
+        let count = 0;
+        for (const tab of win.tabs) {
+          count++;
+          if (count >= 20) {
+            // We should not block too long seconds on too much tabs case.
+            await wait(10);
+            count = 0;
+          }
+          try {
+            browser.tabs.sendMessage(tab.id, {
+              type: Constants.kCOMMAND_NOTIFY_SIDEBAR_CLOSED,
+            });
+          }
+          catch (_error) {
+          }
+        }
+      });
+    };
+    const receiver = message => {
+      if (Array.isArray(message))
+        return message.forEach(receiver);
+      if (message.type == Constants.kCONNECTION_HEARTBEAT)
+        updateTimeoutTimer();
+      else
+        onMessage.dispatch(windowId, message);
+    };
+    port.onMessage.addListener(receiver);
+    mReceivers.set(windowId, receiver);
+    onConnected.dispatch(windowId, connections.size);
+    port.onDisconnect.addListener(cleanup);
+  });
+
+  onMessage.addListener(async (windowId, message) => {
+    switch (message.type) {
+      case Constants.kNOTIFY_SIDEBAR_FOCUS:
+        mFocusState.set(windowId, true);
+        break;
+
+      case Constants.kNOTIFY_SIDEBAR_BLUR:
+        mFocusState.delete(windowId);
+        break;
+    }
+  });
+}
+
+export function init() {
+  if (mIsListening)
+    return;
+
+  mIsListening = true;
+}
+
+
+//===================================================================
+// Logging
+//===================================================================
+
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!mIsListening ||
+      !message ||
+      typeof message != 'object' ||
+      message.type != Constants.kCOMMAND_REQUEST_CONNECTION_MESSAGE_LOGS ||
+      !Constants.IS_BACKGROUND)
+    return;
+
+  browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_RESPONSE_CONNECTION_MESSAGE_LOGS,
+    logs: JSON.parse(JSON.stringify(counts))
+  });
+});
diff --git a/waterfox/browser/components/sidebar/common/sync-provider.js b/waterfox/browser/components/sidebar/common/sync-provider.js
new file mode 100644
index 0000000000000..3dcefa75313e1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/sync-provider.js
@@ -0,0 +1,30 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as Sync from '/common/sync.js';
+
+Sync.registerExternalProvider({
+  async getOtherDevices() {
+    return browser.waterfoxBridge.listSyncDevices();
+  },
+
+  sendTabsToDevice(tabs, deviceId) {
+    if (!Array.isArray(tabs))
+      tabs = [tabs];
+    return browser.waterfoxBridge.sendToDevice(tabs.map(tab => tab.id), deviceId);
+  },
+
+  sendTabsToAllDevices(tabs) {
+    if (!Array.isArray(tabs))
+      tabs = [tabs];
+    return browser.waterfoxBridge.sendToDevice(tabs.map(tab => tab.id));
+  },
+
+  manageDevices(windowId) {
+    return browser.waterfoxBridge.openSyncDeviceSettings(windowId)
+  },
+});
diff --git a/waterfox/browser/components/sidebar/common/sync.js b/waterfox/browser/components/sidebar/common/sync.js
new file mode 100644
index 0000000000000..a099be6e070de
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/sync.js
@@ -0,0 +1,515 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  configs,
+  notify,
+  wait,
+  getChunkedConfig,
+  setChunkedConfig,
+  isLinux,
+} from './common.js';
+import * as Constants from '/common/constants.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/sync', ...args);
+}
+
+export const onMessage = new EventListenerManager();
+export const onNewDevice = new EventListenerManager();
+export const onUpdatedDevice = new EventListenerManager();
+export const onObsoleteDevice = new EventListenerManager();
+
+const SEND_TABS_SIMULATOR_ID = 'send-tabs-to-device-simulator@piro.sakura.ne.jp';
+
+// Workaround for https://github.com/piroor/treestyletab/blob/trunk/README.md#user-content-feature-requests-send-tab-tree-to-device-does-not-work
+// and https://bugzilla.mozilla.org/show_bug.cgi?id=1417183 (resolved as WONTFIX)
+// Firefox does not provide any API to access to Sync features directly.
+// We need to provide it as experiments API or something way.
+// This module is designed to work with a service provide which has features:
+//   * async getOtherDevices()
+//     - Returns an array of sync devices.
+//     - Retruned array should have 0 or more items like:
+//       { id:   "identifier of the device",
+//         name: "name of the device",
+//         type: "type of the device (desktop, mobile, and so on)" }
+//   * sendTabsToDevice(tabs, deviceId)
+//     - Returns nothing.
+//     - Sends URLs of given tabs to the specified device.
+//     - The device is one of values returned by getOtherDevices().
+//   * sendTabsToAllDevices(tabs)
+//     - Returns nothing.
+//     - Sends URLs of given tabs to all other devices.
+//   * manageDevices(windowId)
+//     - Returns nothing.
+//     - Opens settings page for Sync devices.
+//       It will appear as a tab in the specified window.
+
+let mExternalProvider = null;
+
+export function registerExternalProvider(provider) {
+  mExternalProvider = provider;
+}
+
+export function hasExternalProvider() {
+  return !!mExternalProvider;
+}
+
+let mMyDeviceInfo = null;
+
+async function getMyDeviceInfo() {
+  if (!configs.syncDeviceInfo || !configs.syncDeviceInfo.id) {
+    const newDeviceInfo = await generateDeviceInfo();
+    if (!configs.syncDeviceInfo)
+      configs.syncDeviceInfo = newDeviceInfo;
+  }
+  return mMyDeviceInfo = configs.syncDeviceInfo;
+}
+
+async function ensureDeviceInfoInitialized() {
+  await getMyDeviceInfo();
+}
+
+export async function waitUntilDeviceInfoInitialized() {
+  while (!configs.syncDeviceInfo) {
+    await wait(100);
+  }
+  mMyDeviceInfo = configs.syncDeviceInfo;
+}
+
+let initialized = false;
+let preChanges = [];
+
+function onConfigChanged(key, value = undefined) {
+  if (!initialized) {
+    preChanges.push({ key, value: value === undefined ? configs[key] : value });
+    return;
+  }
+  switch (key) {
+    case 'syncOtherDevicesDetected':
+      if (!configs.syncAvailableNotified) {
+        configs.syncAvailableNotified = true;
+        notify({
+          title:   browser.i18n.getMessage('syncAvailable_notification_title'),
+          message: browser.i18n.getMessage(`syncAvailable_notification_message${isLinux() ? '_linux' : ''}`),
+          url:     `${Constants.kSHORTHAND_URIS.options}#syncTabsToDeviceOptions`,
+          timeout: configs.syncAvailableNotificationTimeout
+        });
+      }
+      return;
+
+    case 'syncDevices':
+      // This may happen when all configs are reset.
+      // We need to try updating devices after syncDeviceInfo is completely cleared.
+      wait(100).then(updateDevices);
+      break;
+
+    case 'syncDeviceInfo':
+      if (configs.syncDeviceInfo &&
+          mMyDeviceInfo &&
+          configs.syncDeviceInfo.id == mMyDeviceInfo.id &&
+          configs.syncDeviceInfo.timestamp == mMyDeviceInfo.timestamp)
+        return; // ignore updating triggered by myself
+      mMyDeviceInfo = null;
+      updateSelf();
+      break;
+
+    default:
+      if (key.startsWith('chunkedSyncData'))
+        reserveToReceiveMessage();
+      break;
+  }
+}
+
+browser.runtime.onMessageExternal.addListener((message, sender) => {
+  if (!initialized ||
+      !message ||
+      typeof message != 'object' ||
+      typeof message.type != 'string' ||
+      sender.id != SEND_TABS_SIMULATOR_ID)
+    return;
+
+  switch (message.type) {
+    case 'ready':
+      try {
+        browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'register-self' }).catch(_error => {});
+      }
+      catch(_error) {
+      }
+    case 'device-added':
+    case 'device-updated':
+    case 'device-removed':
+      updateSelf();
+      break;
+  }
+});
+
+export async function init() {
+  configs.$addObserver(onConfigChanged); // we need to register the listener to collect pre-sent changes
+  await configs.$loaded;
+  await ensureDeviceInfoInitialized();
+  await updateSelf();
+  initialized = true;
+
+  reserveToReceiveMessage();
+  window.setInterval(updateSelf, 1000 * 60 * 60 * 24); // update info every day!
+
+  for (const change of preChanges) {
+    onConfigChanged(change.key, change.value);
+  }
+  preChanges = [];
+
+  try {
+    browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'register-self' }).catch(_error => {});
+  }
+  catch(_error) {
+  }
+}
+
+export async function generateDeviceInfo({ name, icon } = {}) {
+  const [platformInfo, browserInfo] = await Promise.all([
+    browser.runtime.getPlatformInfo(),
+    browser.runtime.getBrowserInfo()
+  ]);
+  return {
+    id:   `device-${Date.now()}-${Math.round(Math.random() * 65000)}`,
+    name: name === undefined ?
+      browser.i18n.getMessage('syncDeviceDefaultName', [toHumanReadableOSName(platformInfo.os), browserInfo.name]) :
+      (name || null),
+    icon: icon || 'device-desktop'
+  };
+}
+
+// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/PlatformOs
+function toHumanReadableOSName(os) {
+  switch (os) {
+    case 'mac': return 'macOS';
+    case 'win': return 'Windows';
+    case 'android': return 'Android';
+    case 'cros': return 'Chrome OS';
+    case 'linux': return 'Linux';
+    case 'openbsd': return 'Open/FreeBSD';
+    default: return 'Unknown Platform';
+  }
+}
+
+configs.$addObserver(key => {
+  switch (key) {
+    case 'syncUnsendableUrlPattern':
+      isSendableTab.unsendableUrlMatcher = null;
+      break;
+
+    default:
+      break;
+  }
+});
+
+async function updateSelf() {
+  if (updateSelf.updating)
+    return;
+
+  updateSelf.updating = true;
+
+  const [devices] = await Promise.all([
+    (async () => {
+      try {
+        return await browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'list-devices' });
+      }
+      catch(_error) {
+      }
+    })(),
+    ensureDeviceInfoInitialized(),
+  ]);
+  if (devices) {
+    const myDeviceFromSimulator = devices.find(device => device.myself);
+    if (mMyDeviceInfo.simulatorId != myDeviceFromSimulator.id)
+      mMyDeviceInfo.simulatorId = myDeviceFromSimulator.id;
+  }
+
+  configs.syncDeviceInfo = mMyDeviceInfo = {
+    ...clone(configs.syncDeviceInfo),
+    timestamp: Date.now(),
+  };
+
+  await updateDevices();
+
+  setTimeout(() => {
+    updateSelf.updating = false;
+  }, 250);
+}
+
+async function updateDevices() {
+  if (updateDevices.updating)
+    return;
+  updateDevices.updating = true;
+  const [devicesFromSimulator] = await Promise.all([
+    (async () => {
+      try {
+        return await browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'list-devices' });
+      }
+      catch(_error) {
+      }
+    })(),
+    waitUntilDeviceInfoInitialized(),
+  ]);
+
+  const remote = clone(configs.syncDevices);
+  const local  = clone(configs.syncDevicesLocalCache);
+  log('devices updated: ', local, remote);
+  for (const [id, info] of Object.entries(remote)) {
+    if (id == mMyDeviceInfo.id)
+      continue;
+    local[id] = info;
+    if (id in local) {
+      log('updated device: ', info);
+      onUpdatedDevice.dispatch(info);
+    }
+    else {
+      log('new device: ', info);
+      onNewDevice.dispatch(info);
+    }
+  }
+
+  if (devicesFromSimulator) {
+    const knownDeviceIdsFromSimulator = new Set(Object.values(local).map(device => device.simulatorId).filter(id => !!id));
+    for (const deviceFromSimulator of devicesFromSimulator) {
+      if (knownDeviceIdsFromSimulator.has(deviceFromSimulator.id))
+        continue;
+      const localId = `device-from-simulator:${deviceFromSimulator.id}`;
+      local[localId] = {
+        ...deviceFromSimulator,
+        id: localId,
+      };
+    }
+  }
+
+  for (const [id, info] of Object.entries(local)) {
+    if (id in remote ||
+        id == mMyDeviceInfo.id)
+      continue;
+    log('obsolete device: ', info);
+    delete local[id];
+    onObsoleteDevice.dispatch(info);
+  }
+
+  if (configs.syncDeviceExpirationDays > 0) {
+    const expireDateInSeconds = Date.now() - (1000 * 60 * 60 * configs.syncDeviceExpirationDays);
+    for (const [id, info] of Object.entries(local)) {
+      if (info &&
+          info.timestamp < expireDateInSeconds) {
+        delete local[id];
+        log('expired device: ', info);
+        onObsoleteDevice.dispatch(info);
+      }
+    }
+  }
+
+  local[mMyDeviceInfo.id] = clone(mMyDeviceInfo);
+  log('store myself: ', mMyDeviceInfo, local[mMyDeviceInfo.id]);
+
+  if (!configs.syncOtherDevicesDetected && Object.keys(local).length > 1)
+    configs.syncOtherDevicesDetected = true;
+
+  configs.syncDevices = local;
+  configs.syncDevicesLocalCache = clone(local);
+  setTimeout(() => {
+    updateDevices.updating = false;
+  }, 250);
+}
+
+function reserveToReceiveMessage() {
+  if (reserveToReceiveMessage.reserved)
+    clearTimeout(reserveToReceiveMessage.reserved);
+  reserveToReceiveMessage.reserved = setTimeout(() => {
+    delete reserveToReceiveMessage.reserved;
+    receiveMessage();
+  }, 250);
+}
+
+async function receiveMessage() {
+  const myDeviceInfo = await getMyDeviceInfo();
+  try {
+    const messages = readMessages();
+    log('receiveMessage: queued messages => ', messages);
+    const restMessages = messages.filter(message => {
+      if (message.timestamp <= configs.syncLastMessageTimestamp)
+        return false;
+      if (message.to == myDeviceInfo.id) {
+        log('receiveMessage receive: ', message);
+        configs.syncLastMessageTimestamp = message.timestamp;
+        onMessage.dispatch(message);
+        return false;
+      }
+      return true;
+    });
+    log('receiveMessage: restMessages => ', restMessages);
+    if (restMessages.length != messages.length)
+      writeMessages(restMessages);
+  }
+  catch(error) {
+    log('receiveMessage fatal error: ', error);
+    writeMessages([]);
+  }
+}
+
+export async function sendMessage(to, data) {
+  const myDeviceInfo = await getMyDeviceInfo();
+  try {
+    const messages = readMessages();
+    messages.push({
+      timestamp: Date.now(),
+      from:      myDeviceInfo.id,
+      to,
+      data
+    });
+    log('sendMessage: queued messages => ', messages);
+    writeMessages(messages);
+  }
+  catch(error) {
+    console.log('Sync.sendMessage: failed to send message ', error);
+    writeMessages([]);
+  }
+}
+
+function readMessages() {
+  try {
+    return uniqMessages([
+      ...JSON.parse(getChunkedConfig('chunkedSyncDataLocal') || '[]'),
+      ...JSON.parse(getChunkedConfig('chunkedSyncData') || '[]')
+    ]);
+  }
+  catch(error) {
+    log('failed to read messages: ', error);
+    return [];
+  }
+}
+
+function writeMessages(messages) {
+  const stringified = JSON.stringify(messages || []);
+  setChunkedConfig('chunkedSyncDataLocal', stringified);
+  setChunkedConfig('chunkedSyncData', stringified);
+}
+
+function uniqMessages(messages) {
+  const knownMessages = new Set();
+  return messages.filter(message => {
+    const key = JSON.stringify(message);
+    if (knownMessages.has(key))
+      return false;
+    knownMessages.add(key);
+    return true;
+  });
+}
+
+function clone(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+
+export async function getOtherDevices() {
+  if (mExternalProvider)
+    return mExternalProvider.getOtherDevices();
+
+  await waitUntilDeviceInfoInitialized();
+
+  const devices = configs.syncDevices || {};
+  const result = [];
+  for (const [id, info] of Object.entries(devices)) {
+    if (id == mMyDeviceInfo.id ||
+        !info.id /* ignore invalid device info accidentally saved (see also https://github.com/piroor/treestyletab/issues/2922 ) */)
+      continue;
+    result.push(info);
+  }
+  return result.sort((a, b) => a.name > b.name);
+}
+
+export function getDeviceName(id) {
+  const devices = configs.syncDevices || {};
+  if (!(id in devices) || !devices[id])
+    return browser.i18n.getMessage('syncDeviceUnknownDevice');
+  return String(devices[id].name || '').trim() || browser.i18n.getMessage('syncDeviceMissingDeviceName');
+}
+
+// https://searchfox.org/mozilla-central/rev/d866b96d74ec2a63f09ee418f048d23f4fd379a2/browser/base/content/browser-sync.js#1176
+export function isSendableTab(tab) {
+  if (!tab.url ||
+      tab.url.length > 65535)
+    return false;
+
+  if (!isSendableTab.unsendableUrlMatcher)
+    isSendableTab.unsendableUrlMatcher = new RegExp(configs.syncUnsendableUrlPattern);
+  return !isSendableTab.unsendableUrlMatcher.test(tab.url);
+}
+
+export function sendTabsToDevice(tabs, { to, recursively } = {}) {
+  if (recursively)
+    tabs = Tab.collectRootTabs(tabs).map(tab => [tab, ...tab.$TST.descendants]).flat();
+  tabs = tabs.filter(isSendableTab);
+
+  if (mExternalProvider)
+    return mExternalProvider.sendTabsToDevice(tabs, to);
+
+  sendMessage(to, getTabsDataToSend(tabs));
+
+  const multiple = tabs.length > 1 ? '_multiple' : '';
+  notify({
+    title: browser.i18n.getMessage(
+      `sentTabs_notification_title${multiple}`,
+      [getDeviceName(to)]
+    ),
+    message: browser.i18n.getMessage(
+      `sentTabs_notification_message${multiple}`,
+      [getDeviceName(to)]
+    ),
+    timeout: configs.syncSentTabsNotificationTimeout
+  });
+}
+
+export async function sendTabsToAllDevices(tabs, { recursively } = {}) {
+  if (recursively)
+    tabs = Tab.collectRootTabs(tabs).map(tab => [tab, ...tab.$TST.descendants]).flat();
+  tabs = tabs.filter(isSendableTab);
+
+  if (mExternalProvider)
+    return mExternalProvider.sendTabsToAllDevices(tabs);
+
+  const data = getTabsDataToSend(tabs);
+  const devices = await getOtherDevices();
+  for (const device of devices) {
+    sendMessage(device.id, data);
+  }
+
+  const multiple = tabs.length > 1 ? '_multiple' : '';
+  notify({
+    title:   browser.i18n.getMessage(`sentTabsToAllDevices_notification_title${multiple}`),
+    message: browser.i18n.getMessage(`sentTabsToAllDevices_notification_message${multiple}`),
+    timeout: configs.syncSentTabsNotificationTimeout
+  });
+}
+
+function getTabsDataToSend(tabs) {
+  return {
+    type:       Constants.kSYNC_DATA_TYPE_TABS,
+    tabs:       tabs.map(tab => ({ url: tab.url, cookieStoreId: tab.cookieStoreId })),
+    structure : TreeBehavior.getTreeStructureFromTabs(tabs).map(item => item.parent)
+  };
+}
+
+export function manageDevices(windowId) {
+  if (mExternalProvider)
+    return mExternalProvider.manageDevices(windowId);
+
+  browser.tabs.create({
+    windowId,
+    url: `${Constants.kSHORTHAND_URIS.options}#syncTabsToDeviceOptions`
+  });
+}
diff --git a/waterfox/browser/components/sidebar/common/tabs-internal-operation.js b/waterfox/browser/components/sidebar/common/tabs-internal-operation.js
new file mode 100644
index 0000000000000..bf83b2a2b9d8d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/tabs-internal-operation.js
@@ -0,0 +1,396 @@
+/*
+# 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/.
+*/
+'use strict';
+
+// internal operations means operations bypassing WebExtensions' tabs APIs.
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  mapAndFilter,
+  configs,
+  wait,
+} from './common.js';
+import * as ApiTabs from './api-tabs.js';
+import * as Constants from './constants.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as TabsStore from './tabs-store.js';
+import * as TabsUpdate from './tabs-update.js';
+
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/tabs-internal-operation', ...args);
+}
+
+export const onBeforeTabsRemove = new EventListenerManager();
+
+export async function activateTab(tab, { byMouseOperation, keepMultiselection, silently } = {}) {
+  if (!Constants.IS_BACKGROUND)
+    throw new Error('Error: TabsInternalOperation.activateTab is available only on the background page, use a `kCOMMAND_ACTIVATE_TAB` message instead.');
+
+  tab = TabsStore.ensureLivingItem(tab);
+  if (!tab)
+    return;
+  log('activateTab: ', dumpTab(tab));
+  const win = TabsStore.windows.get(tab.windowId);
+  win.internallyFocusingTabs.add(tab.id);
+  if (byMouseOperation)
+    win.internallyFocusingByMouseTabs.add(tab.id);
+  if (silently)
+    win.internallyFocusingSilentlyTabs.add(tab.id);
+  let tabs = [tab];
+  if (tab.$TST.hasOtherHighlighted &&
+      keepMultiselection) {
+    const highlightedTabs = Tab.getHighlightedTabs(tab.windowId);
+    if (highlightedTabs.some(highlightedTab => highlightedTab.id == tab.id)) {
+      // switch active tab with highlighted state
+      tabs = tabs.concat(mapAndFilter(highlightedTabs,
+                                      highlightedTab => highlightedTab.id != tab.id && highlightedTab || undefined));
+    }
+  }
+  if (tabs.length == 1)
+    win.tabsToBeHighlightedAlone.add(tab.id);
+  highlightTabs(tabs);
+}
+
+export async function blurTab(bluredTabs, { windowId, silently, keepDiscarded } = {}) {
+  if (bluredTabs &&
+      !Array.isArray(bluredTabs))
+    bluredTabs = [bluredTabs];
+
+  const bluredTabIds = new Set(Array.from(bluredTabs || [], tab => tab.id || tab));
+
+  // First, try to find successor based on successorTabId from left tabs.
+  let successorTab = Tab.get(bluredTabs.find(tab => tab.active)?.successorTabId);
+  const scannedTabIds = new Set();
+  while (bluredTabIds.has(successorTab?.id) ||
+         (keepDiscarded &&
+          successorTab?.discarded)) {
+    if (scannedTabIds.has(successorTab.id))
+      break; // prevent infinite loop!
+    scannedTabIds.add(successorTab.id);
+    const nextSuccessorTab = (successorTab.successorTabId > 0 && successorTab.successorTabId != successorTab.id) ?
+      Tab.get(successorTab.successorTabId) :
+      null;
+    if (!nextSuccessorTab)
+      break;
+    successorTab = nextSuccessorTab;
+  }
+  log('blurTab/step 1: found successor = ', successorTab?.id);
+
+  // Second, try to detect successor based on their order.
+  if (!successorTab ||
+      bluredTabIds.has(successorTab.id) ||
+      (keepDiscarded &&
+       successorTab.discarded)) {
+    if (successorTab)
+      log(' => it cannot become the successor, find again');
+    let bluredTabsFound = false;
+    for (const tab of Tab.getVisibleTabs(windowId || bluredTabs[0].windowId)) {
+      if (keepDiscarded &&
+          tab.discarded) {
+        continue;
+      }
+      const blured = bluredTabIds.has(tab.id);
+      if (blured)
+        bluredTabsFound = true;
+      if (!bluredTabsFound)
+        successorTab = tab;
+      if (bluredTabsFound &&
+          !blured) {
+        successorTab = tab;
+        break;
+      }
+    }
+    log('blurTab/step 2: found successor = ', successorTab?.id);
+  }
+
+  if (successorTab)
+    await activateTab(successorTab, { silently });
+  return successorTab;
+}
+
+export function removeTab(tab) {
+  return removeTabs([tab]);
+}
+
+export async function removeTabs(tabs, { keepDescendants, byMouseOperation, originalStructure, triggerTab } = {}) {
+  if (!Constants.IS_BACKGROUND)
+    throw new Error('TabsInternalOperation.removeTabs is available only on the background page, use a `kCOMMAND_REMOVE_TABS_INTERNALLY` message instead.');
+
+  log('TabsInternalOperation.removeTabs: ', () => tabs.map(dumpTab));
+  if (tabs.length == 0)
+    return;
+
+  await onBeforeTabsRemove.dispatch(tabs);
+
+  const win = TabsStore.windows.get(tabs[0].windowId);
+  const tabIds = [];
+  let willChangeFocus = false;
+  tabs = tabs.filter(tab => {
+    if ((!win ||
+         !win.internalClosingTabs.has(tab.id)) &&
+        TabsStore.ensureLivingItem(tab)) {
+      tabIds.push(tab.id);
+      if (tab.active)
+        willChangeFocus = true;
+      return true;
+    }
+    return false;
+  });
+  log(' => ', () => tabs.map(dumpTab));
+  if (!tabs.length)
+    return;
+
+  if (win) {
+    // Flag tabs to be closed at a time. With this flag TST skips some
+    // operations on tab close (for example, opening a group tab to replace
+    // a closed parent tab to keep the tree structure).
+    for (const tab of tabs) {
+      win.internalClosingTabs.add(tab.id);
+      tab.$TST.addState(Constants.kTAB_STATE_TO_BE_REMOVED);
+      clearCache(tab);
+      if (keepDescendants)
+        win.keepDescendantsTabs.add(tab.id);
+      if (willChangeFocus && byMouseOperation) {
+        win.internallyFocusingByMouseTabs.add(tab.id);
+        setTimeout(() => { // the operation can be canceled
+          win.internallyFocusingByMouseTabs.delete(tab.id);
+        }, 250);
+      }
+    }
+  }
+
+  const sortedTabs = TreeItem.sort(Array.from(tabs));
+  Tab.onMultipleTabsRemoving.dispatch(sortedTabs, { triggerTab, originalStructure });
+
+  const promisedRemoved = browser.tabs.remove(tabIds).catch(ApiTabs.createErrorHandler(ApiTabs.handleMissingTabError));
+  if (win) {
+    promisedRemoved.then(() => {
+      // "beforeunload" listeners in tabs blocks the operation and the
+      // returned promise is resolved after all "beforeunload" listeners
+      // are processed and "browser.tabs.onRemoved()" listeners are
+      // processed for really closed tabs.
+      // In other words, there may be some "canceled tab close"s and
+      // we need to clear "to-be-closed" flags for such tabs.
+      // See also: https://github.com/piroor/treestyletab/issues/2384
+      const canceledTabs = new Set(tabs.filter(tab => tab.$TST && !tab.$TST.destroyed));
+      log(`${canceledTabs.size} tabs may be canceled to close.`);
+      if (canceledTabs.size == 0) {
+        Tab.onMultipleTabsRemoved.dispatch(sortedTabs, { triggerTab, originalStructure });
+        return;
+      }
+      log(`Clearing "to-be-removed" flag for requested ${tabs.length} tabs...`);
+      for (const tab of canceledTabs) {
+        tab.$TST.removeState(Constants.kTAB_STATE_TO_BE_REMOVED);
+        win.internalClosingTabs.delete(tab.id);
+        if (keepDescendants)
+          win.keepDescendantsTabs.delete(tab.id);
+      }
+      Tab.onMultipleTabsRemoved.dispatch(sortedTabs.filter(tab => !canceledTabs.has(tab)), { triggerTab, originalStructure });
+    });
+  }
+  return promisedRemoved;
+}
+
+export function setTabActive(tab) {
+  const oldActiveTabs = clearOldActiveStateInWindow(tab.windowId, tab);
+  tab.active = true;
+  tab.$TST.addState(Constants.kTAB_STATE_ACTIVE);
+  tab.$TST.removeState(Constants.kTAB_STATE_NOT_ACTIVATED_SINCE_LOAD);
+  tab.$TST.removeState(Constants.kTAB_STATE_UNREAD, { permanently: true });
+  tab.$TST.removeState(Constants.kTAB_STATE_PENDING, { broadcast: Constants.IS_BACKGROUND });
+  TabsStore.activeTabsInWindow.get(tab.windowId).add(tab);
+  TabsStore.activeTabInWindow.set(tab.windowId, tab);
+  Tab.onActivated.dispatch(tab);
+  return oldActiveTabs;
+}
+
+export function clearOldActiveStateInWindow(windowId, exception) {
+  const oldTabs = TabsStore.activeTabsInWindow.get(windowId);
+  for (const oldTab of oldTabs) {
+    if (oldTab.id == exception?.id)
+      continue;
+    oldTab.$TST.removeState(Constants.kTAB_STATE_ACTIVE);
+    oldTab.active = false;
+    oldTabs.delete(oldTab);
+    Tab.onUnactivated.dispatch(oldTab);
+  }
+  return Array.from(oldTabs);
+}
+
+export function clearCache(tab) {
+  if (!tab)
+    return;
+  const errorHandler = ApiTabs.createErrorSuppressor(ApiTabs.handleMissingTabError);
+  for (const key of Constants.kCACHE_KEYS) {
+    browser.sessions.removeTabValue(tab.id, key).catch(errorHandler);
+  }
+}
+
+// Note: this treats the first specified tab as active.
+export async function highlightTabs(tabs, { inheritToCollapsedDescendants } = {}) {
+  if (!Constants.IS_BACKGROUND)
+    throw new Error('TabsInternalOperation.highlightTabs is available only on the background page, use a `kCOMMAND_HIGHLIGHT_TABS` message instead.');
+
+  if (!tabs || tabs.length == 0)
+    throw new Error('TabsInternalOperation.highlightTabs requires one or more tabs.');
+
+  const highlightedTabs = Tab.getHighlightedTabs(tabs[0].windowId);
+  if (tabs.map(tab => tab.id).join('\n') == highlightedTabs.map(tab => tab.id).join('\n')) {
+    log('highlightTabs: already highlighted');
+    return;
+  }
+
+  log('setting tabs highlighted ', tabs, { inheritToCollapsedDescendants });
+
+  const startAtTimestamp = Date.now();
+  const startAt = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+  highlightTabs.lastStartedAt = startAt;
+
+  const windowId = tabs[0].windowId;
+  const win      = TabsStore.windows.get(windowId);
+
+  win.highlightingTabs.clear();
+  win.tabsMovedWhileHighlighting = false;
+  const tabIds = tabs.map(tab => {
+    win.highlightingTabs.add(tab.id);
+    return tab.id;
+  });
+  const toBeHighlightedTabIds = new Set([...win.highlightingTabs]);
+
+  TabsUpdate.updateTabsHighlighted({
+    windowId,
+    tabIds,
+    inheritToCollapsedDescendants,
+  });
+  SidebarConnection.sendMessage({
+    type:     Constants.kCOMMAND_NOTIFY_HIGHLIGHTED_TABS_CHANGED,
+    windowId,
+    tabIds,
+  });
+
+  // for better performance, we should not call browser.tabs.update() for each tab.
+  const highlightedTabIds = new Set(tabIds);
+  const activeTab = Tab.getActiveTab(windowId);
+  const indices = mapAndFilter(highlightedTabIds,
+                               id => id == activeTab.id ? undefined : Tab.get(id).index);
+  if (highlightedTabIds.has(activeTab.id))
+    indices.unshift(activeTab.index);
+
+  // highlight tabs progressively, because massinve change at once may block updating of highlighted appearance of tabs.
+  let count = 1; // 1 is for setActive()
+  while (highlightTabs.lastStartedAt == startAt) {
+    count += (configs.provressiveHighlightingStep <= 0 ? Number.MAX_SAFE_INTEGER : configs.provressiveHighlightingStep);
+    await browser.tabs.highlight({
+      windowId,
+      populate: false,
+      tabs:     indices.slice(0, count),
+    }).catch(ApiTabs.createErrorSuppressor());
+    const progress = Math.ceil(Math.min(indices.length, count) / indices.length * 100);
+    log(`highlightTabs: ${progress} %`);
+    await wait(configs.progressievHighlightingInterval);
+
+    if (win.tabsMovedWhileHighlighting) {
+      log('highlightTabs: tabs are moved while highlighting, retry');
+      await wait(250);
+      return highlightTabs(tabs, { inheritToCollapsedDescendants });
+    }
+
+    if (win.highlightingTabs.size < toBeHighlightedTabIds.size) {
+      log('highlightTabs: someone cleared multiselection while in-progress ', toBeHighlightedTabIds.size, win.highlightingTabs.size);
+      break;
+    }
+
+    const unifiedHighlightTabIds = new Set([...toBeHighlightedTabIds, ...win.highlightingTabs]);
+    if (unifiedHighlightTabIds.size != toBeHighlightedTabIds.size) {
+      log('highlightTabs: someone tried multiselection again while in-progress ', toBeHighlightedTabIds.size, win.highlightingTabs.size);
+      break;
+    }
+
+    if (count >= indices.length)
+      break;
+
+    SidebarConnection.sendMessage({
+      type: Constants.kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_IN_PROGRESS,
+      windowId,
+      progress,
+    });
+  }
+  SidebarConnection.sendMessage({
+    type: Constants.kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_COMPLETE,
+    windowId,
+  });
+  log('highlightTabs done. ', Date.now() - startAtTimestamp, ' msec');
+}
+
+
+SidebarConnection.onMessage.addListener(async (windowId, message) => {
+  switch (message.type) {
+    case Constants.kCOMMAND_ACTIVATE_TAB: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      activateTab(tab, {
+        byMouseOperation:   message.byMouseOperation,
+        keepMultiselection: message.keepMultiselection,
+        silently:           message.silently
+      });
+    }; break;
+
+    case Constants.kCOMMAND_HIGHLIGHT_TABS: {
+      await Tab.waitUntilTracked(message.tabIds);
+      highlightTabs(message.tabIds.map(id => Tab.get(id)), {
+        inheritToCollapsedDescendants: message.inheritToCollapsedDescendants,
+      });
+    }; break;
+
+    case Constants.kCOMMAND_REMOVE_TABS_INTERNALLY:
+      await Tab.waitUntilTracked(message.tabIds);
+      removeTabs(message.tabIds.map(id => Tab.get(id)), {
+        byMouseOperation: message.byMouseOperation,
+        keepDescendants:  message.keepDescendants
+      });
+      break;
+
+    case Constants.kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION:
+      await Tab.waitUntilTracked(message.tabIds);
+      removeTabs(message.tabIds.map(id => Tab.get(id)), {
+        byMouseOperation: true,
+        keepDescendants:  message.keepDescendants
+      });
+      break;
+  }
+});
+
+if (Constants.IS_BACKGROUND) {
+  browser.runtime.onMessage.addListener((message, _sender) => {
+    switch (message.type) {
+      // for operations from group-tab.html
+      case Constants.kCOMMAND_REMOVE_TABS_INTERNALLY:
+        Tab.waitUntilTracked(message.tabIds).then(() => {
+          removeTabs(message.tabIds.map(id => Tab.get(id)), {
+            byMouseOperation: message.byMouseOperation,
+            keepDescendants:  message.keepDescendants,
+          });
+        });
+        break;
+
+      // for automated tests
+      case Constants.kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION:
+        Tab.waitUntilTracked(message.tabIds).then(() => {
+          removeTabs(message.tabIds.map(id => Tab.get(id)), {
+            byMouseOperation: true
+          });
+        });
+        break;
+    }
+  });
+}
diff --git a/waterfox/browser/components/sidebar/common/tabs-store.js b/waterfox/browser/components/sidebar/common/tabs-store.js
new file mode 100644
index 0000000000000..8d86a9beca88c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/tabs-store.js
@@ -0,0 +1,798 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs
+} from './common.js';
+import * as Constants from './constants.js';
+
+// eslint-disable-next-line no-unused-vars
+function log(...args) {
+  internalLogger('common/tabs', ...args);
+}
+
+
+let mTargetWindow;
+
+export function setCurrentWindowId(targetWindow) {
+  return mTargetWindow = targetWindow;
+}
+
+export function getCurrentWindowId() {
+  return mTargetWindow;
+}
+
+
+//===================================================================
+// Tab Tracking
+//===================================================================
+
+export const windows        = new Map();
+export const tabs           = new Map();
+export const tabGroups      = new Map();
+export const tabsByUniqueId = new Map();
+
+export function clear() {
+  tabs.clear();
+  tabsByUniqueId.clear();
+}
+
+export const queryLogs = [];
+const MAX_LOGS = 100000;
+
+const MATCHING_ATTRIBUTES = `
+active
+attention
+audible
+autoDiscardable
+cookieStoreId
+discarded
+favIconUrl
+hidden
+highlighted
+id
+incognito
+index
+isArticle
+isInReaderMode
+pinned
+sessionId
+status
+successorId
+title
+url
+`.trim().split(/\s+/);
+
+export function queryAll(query) {
+  if (configs.loggingQueries) {
+    queryLogs.push(query);
+    queryLogs.splice(0, Math.max(0, queryLogs.length - MAX_LOGS));
+    if (query.tabs?.name)
+      query.indexedTabs = query.tabs.name;
+  }
+  fixupQuery(query);
+  const startAt = Date.now();
+  if (query.windowId || query.ordered) {
+    let tabs = [];
+    for (const win of windows.values()) {
+      if (query.windowId && !matched(win.id, query.windowId))
+        continue;
+      const [sourceTabs, offset] = sourceTabsForQuery(query, win);
+      tabs = tabs.concat(query.iterator ? getMatchedTabsIterator(sourceTabs, query, offset) : extractMatchedTabs(sourceTabs, query, offset));
+    }
+    query.elapsed = Date.now() - startAt;
+    if (query.iterator) {
+      return (function* () {
+        for (const tabsIterator of tabs) {
+          for (const tab of tabsIterator) {
+            yield tab;
+          }
+        }
+      })();
+    }
+    else {
+      return tabs;
+    }
+  }
+  else {
+    const sourceTabs = (query.tabs || tabs).values();
+    const matchedTabs = query.iterator ? getMatchedTabsIterator(sourceTabs, query) : extractMatchedTabs(sourceTabs, query);
+    query.elapsed = Date.now() - startAt;
+    return matchedTabs;
+  }
+}
+
+function sourceTabsForQuery(query, win) {
+  let offset = 0;
+  if (!query.ordered)
+    return [query.tabs?.values() || win.tabs.values(), offset];
+  let fromId;
+  let toId = query.toId;
+  if (typeof query.index == 'number') {
+    fromId = win.order[query.index];
+    offset = query.index;
+  }
+  if (typeof query.fromIndex == 'number') {
+    fromId = win.order[query.fromIndex];
+    offset = query.fromIndex;
+  }
+  if (typeof query.toIndex == 'number') {
+    toId = win.order[query.toIndex];
+  }
+  if (typeof fromId != 'number') {
+    fromId = query.fromId;
+    offset = win.order.indexOf(query.fromId);
+  }
+  if (query.last || query.reversed)
+    return [win.getReversedOrderedTabs(fromId, toId, query.tabs), offset];
+  return [win.getOrderedTabs(fromId, toId, query.tabs), offset];
+}
+
+function extractMatchedTabs(tabsInStore, query, offset) {
+  const matchedTabs = [];
+  let firstTime     = true;
+  let logicalIndex  = offset || 0;
+  for (const tab of tabsInStore) {
+    if (!tabs.has(tab.id) ||
+        (!query.skipMatching &&
+         !matchedWithQuery(tab, query)))
+      continue;
+
+    if (!firstTime)
+      logicalIndex++;
+    firstTime = false;
+    if ('logicalIndex' in query &&
+        !matched(logicalIndex, query.logicalIndex))
+      continue;
+
+    matchedTabs.push(tab);
+    if (query.first || query.last)
+      break;
+  }
+  return matchedTabs;
+}
+
+function* getMatchedTabsIterator(tabsInStore, query, offset) {
+  let firstTime     = true;
+  let logicalIndex  = offset || 0;
+  for (const tab of tabsInStore) {
+    if (!tabs.has(tab.id) ||
+        (!query.skipMatching &&
+         !matchedWithQuery(tab, query)))
+      continue;
+
+    if (!firstTime)
+      logicalIndex++;
+    firstTime = false;
+    if ('logicalIndex' in query &&
+        !matched(logicalIndex, query.logicalIndex))
+      continue;
+
+    yield tab;
+    if (query.first || query.last)
+      break;
+  }
+}
+
+function matchedWithQuery(tab, query) {
+  for (const attribute of MATCHING_ATTRIBUTES) {
+    if (attribute in query &&
+        !matched(tab[attribute], query[attribute]))
+      return false;
+    const invertedAttribute = `!${attribute}`;
+    if (invertedAttribute in query &&
+        matched(tab[attribute], query[invertedAttribute]))
+      return false;
+  }
+
+  if (!tab.$TST)
+    return false;
+
+  const tabStates = tab.$TST.states;
+  if ('states' in query && tabStates) {
+    const queryStates = query.states;
+    for (let i = 0, maxi = queryStates.length; i < maxi; i += 2) {
+      const state   = queryStates[i];
+      const pattern = queryStates[i+1];
+      if (!matched(tabStates.has(state), pattern))
+        return false;
+    }
+  }
+  const tabAttributes = tab.$TST.attributes;
+  if ('attributes' in query && tabAttributes) {
+    const queryAttributes = query.attributes;
+    for (let i = 0, maxi = queryAttributes.length; i < maxi; i += 2) {
+      const attribute = queryAttributes[i];
+      const pattern   = queryAttributes[i+1];
+      if (!matched(tabAttributes[attribute], pattern))
+        return false;
+    }
+  }
+
+  if (query.living &&
+      !ensureLivingItem(tab))
+    return false;
+  if (query.normal &&
+      (tab.hidden ||
+       tabStates.has(Constants.kTAB_STATE_SHOWING) ||
+       tab.pinned))
+    return false;
+  if (query.pinned &&
+      (tab.hidden ||
+       tabStates.has(Constants.kTAB_STATE_SHOWING) ||
+       !tab.pinned))
+    return false;
+  if (query.visible &&
+      ((tabStates.has(Constants.kTAB_STATE_COLLAPSED) &&
+        !tabStates.has(Constants.kTAB_STATE_EXPANDING)) ||
+       tab.hidden ||
+       tabStates.has(Constants.kTAB_STATE_SHOWING)))
+    return false;
+  if (query.hidden &&
+      !tab.hidden)
+    return false;
+  if (query.controllable &&
+      (tab.hidden ||
+       tabStates.has(Constants.kTAB_STATE_SHOWING)))
+    return false;
+  if ('hasChild' in query &&
+      query.hasChild != tab.$TST.hasChild)
+    return false;
+  if ('hasParent' in query &&
+      query.hasParent != tab.$TST.hasParent)
+    return false;
+  if ('childOf' in query &&
+      !tab.$TST.parentId != query.childOf)
+    return false;
+  if ('descendantOf' in query &&
+      !tab.$TST.ancestorIds.includes(query.descendantOf))
+    return false;
+  if (query.groupId &&
+      tab.groupId != query.groupId)
+    return false;
+
+  return true;
+}
+
+function matched(value, pattern) {
+  if (pattern instanceof RegExp &&
+      !pattern.test(String(value)))
+    return false;
+  if (pattern instanceof Set &&
+      !pattern.has(value))
+    return false;
+  if (Array.isArray(pattern) &&
+      !pattern.includes(value))
+    return false;
+  if (typeof pattern == 'function' &&
+      !pattern(value))
+    return false;
+  if (typeof pattern == 'boolean' &&
+      !!value !== pattern)
+    return false;
+  if (typeof pattern == 'string' &&
+      String(value || '') != pattern)
+    return false;
+  if (typeof pattern == 'number' &&
+      value != pattern)
+    return false;
+  return true;
+}
+
+export function query(query) {
+  if (configs.loggingQueries) {
+    queryLogs.push(query);
+    queryLogs.splice(0, Math.max(0, queryLogs.length - MAX_LOGS));
+    if (query.tabs?.name)
+      query.indexedTabs = query.tabs.name;
+  }
+  fixupQuery(query);
+  if (query.last)
+    query.ordered = true;
+  else
+    query.first = true;
+  const startAt = Date.now();
+  let tabs = [];
+  if (query.windowId || query.ordered) {
+    for (const win of windows.values()) {
+      if (query.windowId && !matched(win.id, query.windowId))
+        continue;
+      const [sourceTabs, offset] = sourceTabsForQuery(query, win);
+      tabs = tabs.concat(extractMatchedTabs(sourceTabs, query, offset));
+      if (tabs.length > 0)
+        break;
+    }
+  }
+  else {
+    tabs = extractMatchedTabs((query.tabs ||tabs).values(), query);
+  }
+  query.elapsed = Date.now() - startAt;
+  return tabs.length > 0 ? tabs[0] : null ;
+}
+
+function fixupQuery(query) {
+  if (query.fromId ||
+      query.toId ||
+      typeof query.index == 'number' ||
+      typeof query.fromIndex == 'number' ||
+      typeof query.logicalIndex == 'number')
+    query.ordered = true;
+  if ((query.normal ||
+       query.visible ||
+       query.controllable ||
+       query.pinned) &&
+       !('living' in query))
+    query.living = true;
+}
+
+
+//===================================================================
+// Indexes for optimization
+//===================================================================
+
+export const activeTabInWindow       = new Map();
+export const activeTabsInWindow      = new Map();
+export const bundledActiveTabsInWindow = new Map();
+export const livingTabsInWindow      = new Map();
+export const controllableTabsInWindow = new Map();
+export const removingTabsInWindow    = new Map();
+export const removedTabsInWindow     = new Map();
+export const visibleTabsInWindow     = new Map();
+export const expandedTabsInWindow    = new Map();
+export const selectedTabsInWindow    = new Map();
+export const highlightedTabsInWindow = new Map();
+export const pinnedTabsInWindow      = new Map();
+export const unpinnedTabsInWindow    = new Map();
+export const rootTabsInWindow        = new Map();
+export const groupTabsInWindow       = new Map();
+export const toBeExpandedTabsInWindow = new Map();
+export const subtreeCollapsableTabsInWindow = new Map();
+export const draggingTabsInWindow    = new Map();
+export const duplicatingTabsInWindow = new Map();
+export const toBeGroupedTabsInWindow = new Map();
+export const nativelyGroupedTabsInWindow = new Map();
+export const loadingTabsInWindow     = new Map();
+export const unsynchronizedTabsInWindow = new Map();
+export const virtualScrollRenderableTabsInWindow  = new Map();
+export const scrollPositionCalculationTargetTabsInWindow = new Map();
+export const canBecomeStickyTabsInWindow = new Map();
+
+function createMapWithName(name) {
+  const map = new Map();
+  map.name = name;
+  return map;
+}
+
+export function prepareIndexesForWindow(windowId) {
+  activeTabsInWindow.set(windowId, new Set());
+  bundledActiveTabsInWindow.set(windowId, createMapWithName(`bundled active tabs in window ${windowId}`));
+  livingTabsInWindow.set(windowId, createMapWithName(`living tabs in window ${windowId}`));
+  controllableTabsInWindow.set(windowId, createMapWithName(`controllable tabs in window ${windowId}`));
+  removingTabsInWindow.set(windowId, createMapWithName(`removing tabs in window ${windowId}`));
+  removedTabsInWindow.set(windowId, createMapWithName(`removed tabs in window ${windowId}`));
+  visibleTabsInWindow.set(windowId, createMapWithName(`visible tabs in window ${windowId}`));
+  expandedTabsInWindow.set(windowId, createMapWithName(`expanded tabs in window ${windowId}`));
+  selectedTabsInWindow.set(windowId, createMapWithName(`selected tabs in window ${windowId}`));
+  highlightedTabsInWindow.set(windowId, createMapWithName(`highlighted tabs in window ${windowId}`));
+  pinnedTabsInWindow.set(windowId, createMapWithName(`pinned tabs in window ${windowId}`));
+  unpinnedTabsInWindow.set(windowId, createMapWithName(`unpinned tabs in window ${windowId}`));
+  rootTabsInWindow.set(windowId, createMapWithName(`root tabs in window ${windowId}`));
+  groupTabsInWindow.set(windowId, createMapWithName(`group tabs in window ${windowId}`));
+  toBeExpandedTabsInWindow.set(windowId, createMapWithName(`to-be-expanded tabs in window ${windowId}`));
+  subtreeCollapsableTabsInWindow.set(windowId, createMapWithName(`collapsable parent tabs in window ${windowId}`));
+  draggingTabsInWindow.set(windowId, createMapWithName(`dragging tabs in window ${windowId}`));
+  duplicatingTabsInWindow.set(windowId, createMapWithName(`duplicating tabs in window ${windowId}`));
+  toBeGroupedTabsInWindow.set(windowId, createMapWithName(`to-be-grouped tabs in window ${windowId}`));
+  nativelyGroupedTabsInWindow.set(windowId, createMapWithName(`natively grouped tabs in window ${windowId}`));
+  loadingTabsInWindow.set(windowId, createMapWithName(`loading tabs in window ${windowId}`));
+  unsynchronizedTabsInWindow.set(windowId, createMapWithName(`unsynchronized tabs in window ${windowId}`));
+  virtualScrollRenderableTabsInWindow.set(windowId, createMapWithName(`virtual scroll renderable tabs in window ${windowId}`));
+  scrollPositionCalculationTargetTabsInWindow.set(windowId, createMapWithName(`scroll position calculation target tabs in window ${windowId}`));
+  canBecomeStickyTabsInWindow.set(windowId, createMapWithName(`can become sticky tabs in window ${windowId}`));
+}
+
+export function unprepareIndexesForWindow(windowId) {
+  activeTabInWindow.delete(windowId);
+  activeTabsInWindow.delete(windowId);
+  bundledActiveTabsInWindow.delete(windowId);
+  livingTabsInWindow.delete(windowId);
+  controllableTabsInWindow.delete(windowId);
+  removingTabsInWindow.delete(windowId);
+  removedTabsInWindow.delete(windowId);
+  visibleTabsInWindow.delete(windowId);
+  expandedTabsInWindow.delete(windowId);
+  selectedTabsInWindow.delete(windowId);
+  highlightedTabsInWindow.delete(windowId);
+  pinnedTabsInWindow.delete(windowId);
+  unpinnedTabsInWindow.delete(windowId);
+  rootTabsInWindow.delete(windowId);
+  groupTabsInWindow.delete(windowId);
+  toBeExpandedTabsInWindow.delete(windowId);
+  subtreeCollapsableTabsInWindow.delete(windowId);
+  toBeGroupedTabsInWindow.delete(windowId);
+  nativelyGroupedTabsInWindow.delete(windowId);
+  loadingTabsInWindow.delete(windowId);
+  unsynchronizedTabsInWindow.delete(windowId);
+  virtualScrollRenderableTabsInWindow.delete(windowId);
+  scrollPositionCalculationTargetTabsInWindow.delete(windowId);
+  canBecomeStickyTabsInWindow.delete(windowId);
+}
+
+export function getTabsMap(tabsStore, windowId = null) {
+  return windowId ?
+    tabsStore.get(windowId) :
+    new Map([...tabsStore.values()].map(tabs => [...tabs.entries()]).flat());
+}
+
+export function updateIndexesForTab(tab) {
+  addLivingTab(tab);
+
+  if (!tab.hidden)
+    addControllableTab(tab);
+  else
+    removeControllableTab(tab);
+
+  if (tab.$TST.collapsed)
+    removeExpandedTab(tab);
+  else
+    addExpandedTab(tab);
+
+  if (tab.hidden || tab.$TST.collapsed)
+    removeVisibleTab(tab);
+  else
+    addVisibleTab(tab);
+
+  if (tab.$TST.states.has(Constants.kTAB_STATE_SELECTED))
+    addSelectedTab(tab);
+  else
+    removeSelectedTab(tab);
+
+  if (tab.highlighted)
+    addHighlightedTab(tab);
+  else
+    removeHighlightedTab(tab);
+
+  if (tab.pinned) {
+    removeUnpinnedTab(tab);
+    addPinnedTab(tab);
+  }
+  else {
+    removePinnedTab(tab);
+    addUnpinnedTab(tab);
+  }
+
+  if (tab.$TST.isGroupTab)
+    addGroupTab(tab);
+  else
+    removeGroupTab(tab);
+
+  if (tab.$TST.duplicating)
+    addDuplicatingTab(tab);
+  else
+    removeDuplicatingTab(tab);
+
+  if (tab.$TST.getAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID) &&
+      !tab.$TST.getAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER))
+    addToBeGroupedTab(tab);
+  else
+    removeToBeGroupedTab(tab);
+
+  if (tab.$TST.parent)
+    removeRootTab(tab);
+  else
+    addRootTab(tab);
+
+  if (tab.$TST.hasChild &&
+      !tab.$TST.subtreeCollapsed &&
+      !tab.$TST.collapsed)
+    addSubtreeCollapsableTab(tab);
+  else
+    removeSubtreeCollapsableTab(tab);
+
+  if (tab.status == 'loading')
+    addLoadingTab(tab);
+  else
+    removeLoadingTab(tab);
+
+  if (tab.$TST.states.has(Constants.kTAB_STATE_BUNDLED_ACTIVE))
+    addBundledActiveTab(tab);
+  else
+    removeBundledActiveTab(tab);
+
+  if (tab.groupId && tab.groupId != -1)
+    addNativelyGroupedTab(tab);
+  else
+    removeNativelyGroupedTab(tab);
+
+  updateVirtualScrollRenderabilityIndexForTab(tab);
+
+  if (tab.$TST.states.has(Constants.kTAB_STATE_COLLAPSED_DONE))
+    removeScrollPositionCalculationTargetTab(tab);
+  else
+    addScrollPositionCalculationTargetTab(tab);
+
+  if (tab.$TST.canBecomeSticky)
+    addCanBecomeStickyTab(tab);
+  else
+    removeCanBecomeStickyTab(tab);
+}
+
+export function updateVirtualScrollRenderabilityIndexForTab(tab) {
+  if (tab.pinned ||
+      (tab.hidden &&
+       ((tab.url == 'about:firefoxview' &&
+         tab.cookieStoreId == 'firefox-default') ||
+        !configs.renderHiddenTabs)) ||
+      tab.$TST.states.has(Constants.kTAB_STATE_COLLAPSED_DONE) ||
+      (tabGroups.get(tab.groupId)?.$TST.states.has(Constants.kTAB_STATE_COLLAPSED_DONE) &&
+       !tab.active))
+    removeVirtualScrollRenderableTab(tab);
+  else
+    addVirtualScrollRenderableTab(tab);
+}
+
+export function removeTabFromIndexes(tab) {
+  removeBundledActiveTab(tab);
+  removeLivingTab(tab);
+  removeControllableTab(tab);
+  removeRemovingTab(tab);
+  //removeRemovedTab(tab);
+  removeVisibleTab(tab);
+  removeExpandedTab(tab);
+  removeSelectedTab(tab);
+  removeHighlightedTab(tab);
+  removePinnedTab(tab);
+  removeUnpinnedTab(tab);
+  removeRootTab(tab);
+  removeGroupTab(tab);
+  removeToBeExpandedTab(tab);
+  removeSubtreeCollapsableTab(tab);
+  removeDuplicatingTab(tab);
+  removeDraggingTab(tab);
+  removeToBeGroupedTab(tab);
+  removeNativelyGroupedTab(tab);
+  removeLoadingTab(tab);
+  removeUnsynchronizedTab(tab);
+  //removeVirtualScrollRenderableTab(tab);
+  removeScrollPositionCalculationTargetTab(tab);
+  removeCanBecomeStickyTab(tab);
+}
+
+function addTabToIndex(tab, indexes, windowId = null) {
+  if (!tab)
+    throw new Error(`TabsStore.addTabToIndex gets non-tab parameter!: ${JSON.stringify(tab)} : ${new Error().stack}`);
+  const tabs = indexes.get(windowId || tab.windowId);
+  if (tabs)
+    tabs.set(tab.id, tab);
+}
+
+function removeTabFromIndex(tab, indexes, windowId = null) {
+  if (!tab)
+    throw new Error(`TabsStore.removeTabFromIndex gets non-tab parameter!: ${JSON.stringify(tab)} : ${new Error().stack}`);
+  const tabs = indexes.get(windowId || tab.windowId);
+  if (tabs)
+    tabs.delete(tab.id);
+}
+
+export function addLivingTab(tab) {
+  addTabToIndex(tab, livingTabsInWindow);
+}
+export function removeLivingTab(tab) {
+  removeTabFromIndex(tab, livingTabsInWindow);
+}
+
+export function addControllableTab(tab) {
+  addTabToIndex(tab, controllableTabsInWindow);
+}
+export function removeControllableTab(tab) {
+  removeTabFromIndex(tab, controllableTabsInWindow);
+}
+
+export function addRemovingTab(tab) {
+  addTabToIndex(tab, removingTabsInWindow);
+  removeTabFromIndexes(tab);
+}
+export function removeRemovingTab(tab) {
+  removeTabFromIndex(tab, removingTabsInWindow);
+}
+
+export function addRemovedTab(tab) {
+  addTabToIndex(tab, removedTabsInWindow);
+  setTimeout(removeRemovedTab, 100000, {
+    id:       tab.id,
+    windowId: tab.windowId
+  });
+}
+export function removeRemovedTab(tab) {
+  removeTabFromIndex(tab, removedTabsInWindow);
+}
+
+export function addVisibleTab(tab) {
+  addTabToIndex(tab, visibleTabsInWindow);
+}
+export function removeVisibleTab(tab) {
+  removeTabFromIndex(tab, visibleTabsInWindow);
+}
+
+export function addExpandedTab(tab) {
+  addTabToIndex(tab, expandedTabsInWindow);
+}
+export function removeExpandedTab(tab) {
+  removeTabFromIndex(tab, expandedTabsInWindow);
+}
+
+export function addSelectedTab(tab) {
+  addTabToIndex(tab, selectedTabsInWindow);
+}
+export function removeSelectedTab(tab) {
+  removeTabFromIndex(tab, selectedTabsInWindow);
+}
+
+export function addHighlightedTab(tab) {
+  addTabToIndex(tab, highlightedTabsInWindow);
+}
+export function removeHighlightedTab(tab) {
+  removeTabFromIndex(tab, highlightedTabsInWindow);
+}
+
+export function addPinnedTab(tab) {
+  addTabToIndex(tab, pinnedTabsInWindow);
+}
+export function removePinnedTab(tab) {
+  removeTabFromIndex(tab, pinnedTabsInWindow);
+}
+
+export function addUnpinnedTab(tab) {
+  addTabToIndex(tab, unpinnedTabsInWindow);
+}
+export function removeUnpinnedTab(tab) {
+  removeTabFromIndex(tab, unpinnedTabsInWindow);
+}
+
+export function addRootTab(tab) {
+  addTabToIndex(tab, rootTabsInWindow);
+}
+export function removeRootTab(tab) {
+  removeTabFromIndex(tab, rootTabsInWindow);
+}
+
+export function addGroupTab(tab) {
+  addTabToIndex(tab, groupTabsInWindow);
+}
+export function removeGroupTab(tab) {
+  removeTabFromIndex(tab, groupTabsInWindow);
+}
+
+export function addToBeExpandedTab(tab) {
+  addTabToIndex(tab, toBeExpandedTabsInWindow);
+}
+export function removeToBeExpandedTab(tab) {
+  removeTabFromIndex(tab, toBeExpandedTabsInWindow);
+}
+
+export function addSubtreeCollapsableTab(tab) {
+  addTabToIndex(tab, subtreeCollapsableTabsInWindow);
+}
+export function removeSubtreeCollapsableTab(tab) {
+  removeTabFromIndex(tab, subtreeCollapsableTabsInWindow);
+}
+
+export function addDuplicatingTab(tab) {
+  addTabToIndex(tab, duplicatingTabsInWindow);
+}
+export function removeDuplicatingTab(tab) {
+  removeTabFromIndex(tab, duplicatingTabsInWindow);
+}
+
+export function addDraggingTab(tab) {
+  addTabToIndex(tab, draggingTabsInWindow);
+}
+export function removeDraggingTab(tab) {
+  removeTabFromIndex(tab, draggingTabsInWindow);
+}
+
+export function addToBeGroupedTab(tab) {
+  addTabToIndex(tab, toBeGroupedTabsInWindow);
+}
+export function removeToBeGroupedTab(tab) {
+  removeTabFromIndex(tab, toBeGroupedTabsInWindow);
+}
+
+export function addNativelyGroupedTab(tab, windowId = null) {
+  addTabToIndex(tab, nativelyGroupedTabsInWindow, windowId);
+}
+export function removeNativelyGroupedTab(tab, windowId = null) {
+  removeTabFromIndex(tab, nativelyGroupedTabsInWindow, windowId);
+}
+
+export function addLoadingTab(tab) {
+  addTabToIndex(tab, loadingTabsInWindow);
+}
+export function removeLoadingTab(tab) {
+  removeTabFromIndex(tab, loadingTabsInWindow);
+}
+
+export function addUnsynchronizedTab(tab) {
+  addTabToIndex(tab, unsynchronizedTabsInWindow);
+}
+export function removeUnsynchronizedTab(tab) {
+  removeTabFromIndex(tab, unsynchronizedTabsInWindow);
+}
+
+export function addBundledActiveTab(tab) {
+  addTabToIndex(tab, bundledActiveTabsInWindow);
+}
+export function removeBundledActiveTab(tab) {
+  removeTabFromIndex(tab, bundledActiveTabsInWindow);
+}
+
+export function addVirtualScrollRenderableTab(tab) {
+  addTabToIndex(tab, virtualScrollRenderableTabsInWindow);
+}
+export function removeVirtualScrollRenderableTab(tab) {
+  removeTabFromIndex(tab, virtualScrollRenderableTabsInWindow);
+}
+
+export function addScrollPositionCalculationTargetTab(tab) {
+  addTabToIndex(tab, scrollPositionCalculationTargetTabsInWindow);
+}
+export function removeScrollPositionCalculationTargetTab(tab) {
+  removeTabFromIndex(tab, scrollPositionCalculationTargetTabsInWindow);
+}
+
+export function addCanBecomeStickyTab(tab) {
+  addTabToIndex(tab, canBecomeStickyTabsInWindow);
+}
+export function removeCanBecomeStickyTab(tab) {
+  removeTabFromIndex(tab, canBecomeStickyTabsInWindow);
+}
+
+
+
+//===================================================================
+// Utilities
+//===================================================================
+
+export function assertValidTab(tab) {
+  if (tab?.$TST)
+    return;
+  const error = new Error('FATAL ERROR: invalid tab is given');
+  console.log(error.message, tab, error.stack);
+  throw error;
+}
+
+export function ensureLivingItem(tab) {
+  const isNativeTabGroup = tab?.type == 'group';
+  if (!tab ||
+      !tab.id ||
+      !tab.$TST ||
+      (!isNativeTabGroup && !tabs.has(tab.id)) ||
+      tab.$TST.removing ||
+      !windows.get(tab.windowId) ||
+      (isNativeTabGroup && !windows.get(tab.windowId).tabGroups.has(tab.id)))
+    return null;
+  return tab;
+}
+
+
+//===================================================================
+// Logging
+//===================================================================
+
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!message ||
+      typeof message != 'object' ||
+      message.type != Constants.kCOMMAND_REQUEST_QUERY_LOGS)
+    return;
+
+  browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_RESPONSE_QUERY_LOGS,
+    logs: JSON.parse(JSON.stringify(queryLogs)),
+    windowId: mTargetWindow || 'background'
+  });
+});
diff --git a/waterfox/browser/components/sidebar/common/tabs-update.js b/waterfox/browser/components/sidebar/common/tabs-update.js
new file mode 100644
index 0000000000000..8e8c9dd0c5026
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/tabs-update.js
@@ -0,0 +1,444 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import {
+  log as internalLogger,
+  dumpTab,
+  wait,
+  mapAndFilter
+} from './common.js';
+
+import * as Constants from './constants.js';
+import * as ContextualIdentities from './contextual-identities.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as TabsStore from './tabs-store.js';
+
+import { Tab } from './TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/tabs-update', ...args);
+}
+
+
+const mBufferedUpdates = new Map();
+
+function getBufferedUpdate(tab) {
+  const update = mBufferedUpdates.get(tab.id) || {
+    windowId: tab.windowId,
+    tabId:    tab.id,
+    attributes: {
+      updated: {},
+      added:   {},
+      removed: new Set(),
+    },
+    isGroupTab:   false,
+    updatedTitle: undefined,
+    updatedLabel: undefined,
+    favIconUrl:   undefined,
+    loadingState: undefined,
+    loadingStateReallyChanged: undefined,
+    pinned:       undefined,
+    hidden:       undefined,
+    groupId:      undefined,
+    soundStateChanged: false,
+  };
+  mBufferedUpdates.set(tab.id, update);
+  return update;
+}
+
+function flushBufferedUpdates() {
+  if (!Constants.IS_BACKGROUND) {
+    mBufferedUpdates.clear();
+    return;
+  }
+
+  const triedAt = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+  flushBufferedUpdates.triedAt = triedAt;
+  (Constants.IS_BACKGROUND ?
+    setTimeout : // because window.requestAnimationFrame is decelerate for an invisible document.
+    window.requestAnimationFrame)(() => {
+    if (flushBufferedUpdates.triedAt != triedAt)
+      return;
+    for (const update of mBufferedUpdates.values()) {
+      // no need to notify attributes broadcasted via Tab.broadcastState()
+      delete update.attributes.updated.highlighted;
+      delete update.attributes.updated.hidden;
+      delete update.attributes.updated.pinned;
+      delete update.attributes.updated.audible;
+      delete update.attributes.updated.mutedInfo;
+      delete update.attributes.updated.sharingState;
+      delete update.attributes.updated.incognito;
+      delete update.attributes.updated.attention;
+      delete update.attributes.updated.discarded;
+      if (Object.keys(update.attributes.updated).length > 0 ||
+          Object.keys(update.attributes.added).length > 0 ||
+          update.attributes.removed.size > 0 ||
+          update.soundStateChanged ||
+          update.sharingStateChanged)
+        SidebarConnection.sendMessage({
+          type:              Constants.kCOMMAND_NOTIFY_TAB_UPDATED,
+          windowId:          update.windowId,
+          tabId:             update.tabId,
+          updatedProperties: update.attributes.updated,
+          addedAttributes:   update.attributes.added,
+          removedAttributes: [...update.attributes.removed],
+          soundStateChanged: update.soundStateChanged,
+          sharingStateChanged: update.sharingStateChanged,
+        });
+
+      // SidebarConnection.sendMessage() has its own bulk-send mechanism,
+      // so we don't need to bundle them like an array.
+      if (update.isGroupTab)
+        SidebarConnection.sendMessage({
+          type:     Constants.kCOMMAND_NOTIFY_GROUP_TAB_DETECTED,
+          windowId: update.windowId,
+          tabId:    update.tabId,
+        });
+      if (update.updatedTitle !== undefined)
+        SidebarConnection.sendMessage({
+          type:     Constants.kCOMMAND_NOTIFY_TREE_ITEM_LABEL_UPDATED,
+          windowId: update.windowId,
+          tabId:    update.tabId,
+          title:    update.updatedTitle,
+          label:    update.updatedLabel,
+        });
+      if (update.favIconUrl !== undefined)
+        SidebarConnection.sendMessage({
+          type:       Constants.kCOMMAND_NOTIFY_TAB_FAVICON_UPDATED,
+          windowId:   update.windowId,
+          tabId:      update.tabId,
+          favIconUrl: update.favIconUrl,
+        });
+      if (update.loadingState !== undefined)
+        SidebarConnection.sendMessage({
+          type:     Constants.kCOMMAND_UPDATE_LOADING_STATE,
+          windowId: update.windowId,
+          tabId:    update.tabId,
+          status:   update.loadingState,
+          reallyChanged: update.loadingStateReallyChanged,
+        });
+      if (update.pinned !== undefined)
+        SidebarConnection.sendMessage({
+          type:     update.pinned ? Constants.kCOMMAND_NOTIFY_TAB_PINNED : Constants.kCOMMAND_NOTIFY_TAB_UNPINNED,
+          windowId: update.windowId,
+          tabId:    update.tabId,
+        });
+      if (update.hidden !== undefined)
+        SidebarConnection.sendMessage({
+          type:     update.hidden ? Constants.kCOMMAND_NOTIFY_TAB_HIDDEN : Constants.kCOMMAND_NOTIFY_TAB_SHOWN,
+          windowId: update.windowId,
+          tabId:    update.tabId,
+        });
+    }
+    mBufferedUpdates.clear();
+  }, 0);
+}
+
+export function updateTab(tab, newState = {}, options = {}) {
+  const update = getBufferedUpdate(tab);
+  const oldState = options.old || {};
+
+  if ('url' in newState) {
+    tab.$TST.setAttribute(Constants.kCURRENT_URI, update.attributes.added[Constants.kCURRENT_URI] = newState.url);
+    update.attributes.removed.delete(Constants.kCURRENT_URI);
+  }
+
+  if ('url' in newState &&
+      newState.url.indexOf(Constants.kGROUP_TAB_URI) == 0) {
+    tab.$TST.addState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+    update.isGroupTab = true;
+    Tab.onGroupTabDetected.dispatch(tab);
+  }
+  else if (tab.$TST.states.has(Constants.kTAB_STATE_GROUP_TAB) &&
+           !tab.$TST.hasGroupTabURL) {
+    tab.$TST.removeState(Constants.kTAB_STATE_GROUP_TAB, { permanently: true });
+    update.isGroupTab = false;
+  }
+
+  if (options.forceApply ||
+      ('title' in newState &&
+       newState.title != oldState.title)) {
+    if (options.forceApply) {
+      tab.$TST.getPermanentStates().then(states => {
+        tab.$TST.toggleState(
+          Constants.kTAB_STATE_UNREAD,
+          (states.includes(Constants.kTAB_STATE_UNREAD) &&
+           !tab.$TST.isGroupTab),
+          { permanently: true }
+        );
+      });
+    }
+    else if (tab.$TST.isGroupTab) {
+      tab.$TST.removeState(Constants.kTAB_STATE_UNREAD, { permanently: true });
+    }
+    else if (!tab.active) {
+      tab.$TST.addState(Constants.kTAB_STATE_UNREAD, { permanently: true });
+    }
+    tab.$TST.label = newState.title;
+    Tab.onLabelUpdated.dispatch(tab);
+    update.updatedTitle = tab.title;
+    update.updatedLabel = tab.$TST.label;
+  }
+
+  const openerOfGroupTab = tab.$TST.isGroupTab && Tab.getOpenerFromGroupTab(tab);
+  if (openerOfGroupTab &&
+      openerOfGroupTab.favIconUrl) {
+    update.favIconUrl = openerOfGroupTab.favIconUrl;
+  }
+  else if (options.forceApply ||
+           'favIconUrl' in newState) {
+    tab.$TST.setAttribute(Constants.kCURRENT_FAVICON_URI, update.attributes.added[Constants.kCURRENT_FAVICON_URI] = tab.favIconUrl);
+    update.attributes.removed.delete(Constants.kCURRENT_FAVICON_URI);
+    // "favIconUrl" will be "undefined" if the website has no favicon.
+    // Keys with "undefined" value will be removed from JSON-stringified result,
+    // so we need to use "null" instead of it.
+    // See also: https://github.com/piroor/treestyletab/issues/3515
+    update.favIconUrl = tab.favIconUrl || null;
+  }
+  else if (tab.$TST.isGroupTab) {
+    // "about:ws-group" can set error icon for the favicon and
+    // reloading doesn't cloear that, so we need to clear favIconUrl manually.
+    tab.favIconUrl = null;
+    delete update.attributes.added[Constants.kCURRENT_FAVICON_URI];
+    update.attributes.removed.add(Constants.kCURRENT_URI);
+    tab.$TST.removeAttribute(Constants.kCURRENT_FAVICON_URI);
+    update.favIconUrl = null;
+  }
+
+  if ('status' in newState) {
+    const reallyChanged = !tab.$TST.states.has(newState.status);
+    const removed = newState.status == 'loading' ? 'complete' : 'loading';
+    tab.$TST.removeState(removed);
+    tab.$TST.addState(newState.status);
+    if (!options.forceApply) {
+      update.loadingState = tab.status;
+      update.loadingStateReallyChanged = reallyChanged;
+    }
+  }
+
+  if ((options.forceApply ||
+       'pinned' in newState) &&
+      newState.pinned != tab.$TST.states.has(Constants.kTAB_STATE_PINNED)) {
+    if (newState.pinned) {
+      tab.$TST.addState(Constants.kTAB_STATE_PINNED);
+      tab.$TST.removeAttribute(Constants.kLEVEL); // don't indent pinned tabs!
+      delete update.attributes.added[Constants.kLEVEL];
+      update.attributes.removed.add(Constants.kLEVEL);
+      Tab.onPinned.dispatch(tab);
+      update.pinned = true;
+    }
+    else {
+      tab.$TST.removeState(Constants.kTAB_STATE_PINNED);
+      Tab.onUnpinned.dispatch(tab);
+      update.pinned = false;
+    }
+  }
+
+  if (options.forceApply ||
+      'audible' in newState)
+    tab.$TST.toggleState(Constants.kTAB_STATE_AUDIBLE, newState.audible);
+
+  let soundStateChanged = false;
+
+  if (options.forceApply ||
+      'mutedInfo' in newState) {
+    soundStateChanged = true;
+    const muted = newState.mutedInfo?.muted;
+    tab.$TST.toggleState(Constants.kTAB_STATE_MUTED, muted, newState.audible);
+    Tab.onMutedStateChanged.dispatch(tab, muted);
+  }
+
+  if (options.forceApply ||
+      soundStateChanged ||
+      'audible' in newState) {
+    soundStateChanged = true;
+    tab.$TST.toggleState(
+      Constants.kTAB_STATE_SOUND_PLAYING,
+      (tab.audible &&
+       !tab.mutedInfo.muted)
+    );
+  }
+
+  if (soundStateChanged) {
+    const parent = tab.$TST.parent;
+    if (parent)
+      parent.$TST.inheritSoundStateFromChildren();
+  }
+
+  let sharingStateChanged = false;
+  if (options.forceApply ||
+      'sharingState' in newState) {
+    sharingStateChanged = true;
+    const sharingCamera     = !!newState.sharingState?.camera;
+    const sharingMicrophone = !!newState.sharingState?.microphone;
+    const sharingScreen     = !!newState.sharingState?.screen;
+    tab.$TST.toggleState(Constants.kTAB_STATE_SHARING_CAMERA,     sharingCamera);
+    tab.$TST.toggleState(Constants.kTAB_STATE_SHARING_MICROPHONE, sharingMicrophone);
+    tab.$TST.toggleState(Constants.kTAB_STATE_SHARING_SCREEN,     sharingScreen);
+    Tab.onSharingStateChanged.dispatch(tab, {
+      camera:     sharingCamera,
+      microphone: sharingMicrophone,
+      screen:     sharingScreen,
+    });
+    const parent = tab.$TST.parent;
+    if (parent)
+      parent.$TST.inheritSharingStateFromChildren();
+  }
+
+  if (options.forceApply ||
+      'cookieStoreId' in newState) {
+    for (const state of tab.$TST.states) {
+      if (String(state).startsWith('contextual-identity-'))
+        tab.$TST.removeState(state);
+    }
+    if (newState.cookieStoreId) {
+      const state = `contextual-identity-${newState.cookieStoreId}`;
+      tab.$TST.addState(state);
+      const identity = ContextualIdentities.get(newState.cookieStoreId);
+      if (identity)
+        tab.$TST.setAttribute(Constants.kCONTEXTUAL_IDENTITY_NAME, identity.name);
+      else
+        tab.$TST.removeAttribute(Constants.kCONTEXTUAL_IDENTITY_NAME);
+    }
+    else {
+      tab.$TST.removeAttribute(Constants.kCONTEXTUAL_IDENTITY_NAME);
+    }
+  }
+
+  if (options.forceApply ||
+      'incognito' in newState)
+    tab.$TST.toggleState(Constants.kTAB_STATE_PRIVATE_BROWSING, newState.incognito);
+
+  if (options.forceApply ||
+      'hidden' in newState) {
+    if (newState.hidden) {
+      if (!tab.$TST.states.has(Constants.kTAB_STATE_HIDDEN)) {
+        tab.$TST.addState(Constants.kTAB_STATE_HIDDEN);
+        Tab.onHidden.dispatch(tab);
+        update.hidden = true;
+      }
+    }
+    else if (tab.$TST.states.has(Constants.kTAB_STATE_HIDDEN)) {
+      tab.$TST.removeState(Constants.kTAB_STATE_HIDDEN);
+      Tab.onShown.dispatch(tab);
+      update.hidden = false;
+    }
+  }
+
+  if (options.forceApply ||
+      'highlighted' in newState)
+    tab.$TST.toggleState(Constants.kTAB_STATE_HIGHLIGHTED, newState.highlighted);
+
+  if (options.forceApply ||
+      'attention' in newState)
+    tab.$TST.toggleState(Constants.kTAB_STATE_ATTENTION, newState.attention);
+
+  if (options.forceApply ||
+      'discarded' in newState) {
+    wait(0).then(() => {
+      // Don't set this class immediately, because we need to know
+      // the newly active tab *was* discarded on onTabClosed handler.
+      tab.$TST.toggleState(Constants.kTAB_STATE_DISCARDED, newState.discarded);
+    });
+  }
+
+  if (options.forceApply ||
+      'groupId' in newState) {
+    tab.$TST.onNativeGroupModified(oldState.groupId);
+    update.attributes.added[Constants.kGROUP_ID] = newState.groupId;
+  }
+
+  update.soundStateChanged = update.soundStateChanged || soundStateChanged;
+  update.sharingStateChanged = update.sharingStateChanged || sharingStateChanged;
+  update.attributes.updated = {
+    ...update.attributes.updated,
+    ...(newState?.$TST?.sanitized || newState),
+  };
+  flushBufferedUpdates();
+
+  tab.$TST.invalidateCache();
+}
+
+export async function updateTabsHighlighted(highlightInfo) {
+  if (Tab.needToWaitTracked(highlightInfo.windowId))
+    await Tab.waitUntilTrackedAll(highlightInfo.windowId);
+  const win = TabsStore.windows.get(highlightInfo.windowId);
+  if (!win)
+    return;
+
+  //const startAt = Date.now();
+
+  const tabIds = highlightInfo.tabIds; // new Set(highlightInfo.tabIds);
+  const toBeUnhighlightedTabs = Tab.getHighlightedTabs(highlightInfo.windowId, {
+    ordered: false,
+    '!id':   tabIds
+  });
+  const alreadyHighlightedTabs = TabsStore.highlightedTabsInWindow.get(highlightInfo.windowId);
+  const toBeHighlightedTabs = mapAndFilter(tabIds, id => {
+    const tab = win.tabs.get(id);
+    return tab && !alreadyHighlightedTabs.has(tab.id) && tab || undefined;
+  });
+
+  //console.log(`updateTabsHighlighted: ${Date.now() - startAt}ms`, { toBeHighlightedTabs, toBeUnhighlightedTabs});
+
+  const inheritToCollapsedDescendants = !!highlightInfo.inheritToCollapsedDescendants;
+  //log('updateTabsHighlighted ', { toBeHighlightedTabs, toBeUnhighlightedTabs});
+  for (const tab of toBeUnhighlightedTabs) {
+    TabsStore.removeHighlightedTab(tab);
+    updateTabHighlighted(tab, false, { inheritToCollapsedDescendants });
+  }
+  for (const tab of toBeHighlightedTabs) {
+    TabsStore.addHighlightedTab(tab);
+    updateTabHighlighted(tab, true, { inheritToCollapsedDescendants });
+  }
+}
+async function updateTabHighlighted(tab, highlighted, { inheritToCollapsedDescendants } = {}) {
+  log(`highlighted status of ${dumpTab(tab)}: `, { old: tab.highlighted, new: highlighted });
+  //if (tab.highlighted == highlighted)
+  //  return false;
+  tab.$TST.toggleState(Constants.kTAB_STATE_HIGHLIGHTED, highlighted);
+  tab.highlighted = highlighted;
+  const win = TabsStore.windows.get(tab.windowId);
+  const inheritHighlighted = !win.tabsToBeHighlightedAlone.has(tab.id);
+  if (!inheritHighlighted)
+    win.tabsToBeHighlightedAlone.delete(tab.id);
+  updateTab(tab, { highlighted });
+  Tab.onUpdated.dispatch(tab, { highlighted }, {
+    inheritHighlighted: inheritToCollapsedDescendants && inheritHighlighted,
+  });
+  return true;
+}
+
+
+export async function completeLoadingTabs(windowId) {
+  const completedTabs = new Set((await browser.tabs.query({ windowId, status: 'complete' })).map(tab => tab.id));
+  for (const tab of Tab.getLoadingTabs(windowId, { ordered: false, iterator: true })) {
+    if (completedTabs.has(tab.id))
+      updateTab(tab, { status: 'complete' });
+  }
+}
diff --git a/waterfox/browser/components/sidebar/common/tree-behavior.js b/waterfox/browser/components/sidebar/common/tree-behavior.js
new file mode 100644
index 0000000000000..49a9a360dae2b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/tree-behavior.js
@@ -0,0 +1,417 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs
+} from './common.js';
+import * as Constants from './constants.js';
+import * as SidebarConnection from './sidebar-connection.js';
+
+import { TreeItem } from './TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/tree-behavior', ...args);
+}
+
+export function getParentTabOperationBehavior(tab, { context, byInternalOperation, preventEntireTreeBehavior, parent, windowId } = {}) {
+  const sidebarVisible = SidebarConnection.isInitialized() ? ((windowId || tab) && SidebarConnection.isOpen(windowId || tab.windowId)) : true;
+  log('getParentTabOperationBehavior ', tab, { byInternalOperation, preventEntireTreeBehavior, parent, sidebarVisible /*, stack: configs.debug && new Error().stack */ });
+
+  // strategy: https://github.com/piroor/treestyletab/issues/2860#issuecomment-820622273
+  let behavior;
+  switch (configs.parentTabOperationBehaviorMode) {
+    case Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CONSISTENT:
+      log(' => kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CONSISTENT');
+      if (context == Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE) {
+        behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE;
+      }
+      else {
+        behavior = tab.$TST.subtreeCollapsed ?
+          Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE :
+          configs.closeParentBehavior_insideSidebar_expanded;
+      }
+      break;
+    default:
+    case Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL:
+      log(' => kPARENT_TAB_OPERATION_BEHAVIOR_MODE_PARALLEL');
+      if (context == Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE) {
+        behavior = byInternalOperation ?
+          Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE :
+          configs.moveParentBehavior_outsideSidebar_expanded;
+      }
+      else {
+        behavior = byInternalOperation ?
+          (tab.$TST.subtreeCollapsed ?
+            Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE :
+            configs.closeParentBehavior_insideSidebar_expanded) :
+          configs.closeParentBehavior_outsideSidebar_expanded;
+      }
+      break;
+    case Constants.kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM: // kPARENT_TAB_BEHAVIOR_ONLY_ON_SIDEBAR
+      log(' => kPARENT_TAB_OPERATION_BEHAVIOR_MODE_CUSTOM');
+      if (context == Constants.kPARENT_TAB_OPERATION_CONTEXT_MOVE) {
+        behavior = byInternalOperation ?
+          Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE :
+          sidebarVisible ?
+            (tab.$TST.subtreeCollapsed ?
+              configs.moveParentBehavior_outsideSidebar_collapsed :
+              configs.moveParentBehavior_outsideSidebar_expanded) :
+            (tab.$TST.subtreeCollapsed ?
+              configs.moveParentBehavior_noSidebar_collapsed :
+              configs.moveParentBehavior_noSidebar_expanded);
+      }
+      else {
+        behavior = byInternalOperation ?
+          (tab.$TST.subtreeCollapsed ?
+            Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE :
+            configs.closeParentBehavior_insideSidebar_expanded) :
+          sidebarVisible ?
+            (tab.$TST.subtreeCollapsed ?
+              configs.closeParentBehavior_outsideSidebar_collapsed :
+              configs.closeParentBehavior_outsideSidebar_expanded) :
+            (tab.$TST.subtreeCollapsed ?
+              configs.closeParentBehavior_noSidebar_collapsed :
+              configs.closeParentBehavior_noSidebar_expanded);
+      }
+      break;
+  }
+  const parentTab = parent || tab.$TST.parent;
+
+  log(' => behavior: ', behavior);
+
+  const replacedParentCount = tab?.$TST?.replacedParentGroupTabCount;
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_REPLACE_WITH_GROUP_TAB &&
+      configs.closeParentBehavior_replaceWithGroup_thresholdToPrevent >= 0 &&
+      replacedParentCount &&
+      replacedParentCount >= configs.closeParentBehavior_replaceWithGroup_thresholdToPrevent) {
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY;
+    log(' => the group tab is already replaced parent, fallback to kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY');
+  }
+
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE &&
+      preventEntireTreeBehavior) {
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY;
+    log(' => preventEntireTreeBehavior behavior, fallback to kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY');
+  }
+
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_INTELLIGENTLY) {
+    behavior = parentTab ? Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN : Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD;
+    log(' => intelligent behavior: ', behavior);
+  }
+
+  // Promote all children to upper level, if this is the last child of the parent.
+  // This is similar to "taking by representation".
+  if (behavior == Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_FIRST_CHILD &&
+      parentTab &&
+      parentTab.$TST.childIds.length == 1 &&
+      configs.promoteAllChildrenWhenClosedParentIsLastChild) {
+    behavior = Constants.kPARENT_TAB_OPERATION_BEHAVIOR_PROMOTE_ALL_CHILDREN;
+    log(' => blast child ehavior: ', behavior);
+  }
+
+  return behavior;
+}
+
+export function getClosingTabsFromParent(tab, removeInfo = {}) {
+  log('getClosingTabsFromParent: ', tab, removeInfo);
+  if (tab?.type == TreeItem.TYPE_GROUP) {
+    return tab.$TST.members;
+  }
+  const closeParentBehavior = getParentTabOperationBehavior(tab, {
+    ...removeInfo,
+    context: Constants.kPARENT_TAB_OPERATION_CONTEXT_CLOSE,
+  });
+  log('getClosingTabsFromParent: closeParentBehavior ', closeParentBehavior);
+  if (closeParentBehavior != Constants.kPARENT_TAB_OPERATION_BEHAVIOR_ENTIRE_TREE)
+    return [tab];
+  return [tab].concat(tab.$TST.descendants);
+}
+
+export function calculateReferenceItemsFromInsertionPosition(
+  item,
+  { context, insertBefore, insertAfter } = {}
+) {
+  let firstItem = (Array.isArray(item) ? item[0] : item) || item;
+  let lastItem  = (Array.isArray(item) ? item[item.length - 1] : item) || item;
+  firstItem = firstItem?.$TST?.nativeTabGroup || firstItem;
+  lastItem = lastItem?.$TST?.nativeTabGroup?.collapsed && lastItem?.$TST?.nativeTabGroup || lastItem;
+  log('calculateReferenceItemsFromInsertionPosition ', {
+    firstItem:    firstItem?.id,
+    lastItem:     lastItem?.id,
+    insertBefore: insertBefore?.id,
+    insertAfter : insertAfter?.id
+  });
+  if (insertBefore) {
+    /* strategy for moved case
+         +------------------ CASE 1 ---------------------------
+         |     <= detach from parent, and move
+         |[TARGET  ]
+         +------------------ CASE 2 ---------------------------
+         |  [      ]
+         |     <= attach to the parent of the target, and move
+         |[TARGET  ]
+         +------------------ CASE 3 ---------------------------
+         |[        ]
+         |     <= attach to the parent of the target, and move
+         |[TARGET  ]
+         +------------------ CASE 4 ---------------------------
+         |[        ]
+         |     <= attach to the parent of the target (previous item), and move
+         |  [TARGET]
+         +-----------------------------------------------------
+    */
+    /* strategy for shown case
+         +------------------ CASE 5 ---------------------------
+         |     <= detach from parent, and move
+         |[TARGET  ]
+         +------------------ CASE 6 ---------------------------
+         |  [      ]
+         |     <= if the inserted item has a parent and it is not the parent of the target, attach to the parent of the target. Otherwise keep inserted as a root.
+         |[TARGET  ]
+         +------------------ CASE 7 ---------------------------
+         |[        ]
+         |     <= attach to the parent of the target, and move
+         |[TARGET  ]
+         +------------------ CASE 8 ---------------------------
+         |[        ]
+         |     <= attach to the parent of the target (previous item), and move
+         |  [TARGET]
+         +-----------------------------------------------------
+    */
+    if (insertBefore.type == TreeItem.TYPE_GROUP) {
+      log('calculateReferenceItemsFromInsertionPosition: from insertBefore, special case for a group item');
+      return {
+        insertBefore,
+      };
+    }
+    let prevItem = insertBefore &&
+      (configs.fixupTreeOnTabVisibilityChanged ?
+        insertBefore.$TST.nearestVisiblePrecedingTab :
+        insertBefore.$TST.unsafeNearestExpandedPrecedingTab);
+    if (prevItem == lastItem) // failsafe
+      prevItem = !firstItem ? null :
+        configs.fixupTreeOnTabVisibilityChanged ?
+          firstItem?.$TST.nearestVisiblePrecedingTab :
+          firstItem?.$TST.unsafeNearestExpandedPrecedingTab;
+    if (!prevItem) {
+      log('calculateReferenceItemsFromInsertionPosition: from insertBefore, CASE 1/5');
+      // allow to move pinned item to beside of another pinned item
+      if (!firstItem ||
+          !!firstItem.pinned == !!insertBefore?.pinned) {
+        return {
+          insertBefore
+        };
+      }
+      else {
+        return {};
+      }
+    }
+    else {
+      const prevLevel   = Number(prevItem?.$TST?.getAttribute(Constants.kLEVEL) || 0);
+      const targetLevel = Number(insertBefore?.$TST?.getAttribute(Constants.kLEVEL) || 0);
+      let parent = null;
+      if (!firstItem || !firstItem.pinned) {
+        if (prevLevel < targetLevel) {
+          if (context == Constants.kINSERTION_CONTEXT_MOVED) {
+            log('calculateReferenceItemsFromInsertionPosition: from insertBefore, CASE 4, prevItem = ', prevItem);
+            parent = prevItem;
+          }
+          else {
+            log('calculateReferenceItemsFromInsertionPosition: from insertBefore, CASE 8, prevItem = ', prevItem);
+            parent = (firstItem?.$TST?.parent != prevItem) ? prevItem : null;
+          }
+        }
+        else {
+          const possibleParent = insertBefore?.$TST?.parent;
+          if (context == Constants.kINSERTION_CONTEXT_MOVED || prevLevel == targetLevel) {
+            log('calculateReferenceItemsFromInsertionPosition: from insertBefore, CASE 2/3/7');
+            parent = possibleParent;
+          }
+          else {
+            log('calculateReferenceItemsFromInsertionPosition: from insertBefore, CASE 6');
+            parent = firstItem?.$TST?.parent != possibleParent && possibleParent || firstItem?.$TST?.parent;
+          }
+        }
+      }
+      const result = {
+        parent,
+        insertAfter: prevItem,
+        insertBefore
+      };
+      log(' => ', result);
+      return result;
+    }
+  }
+  if (insertAfter) {
+    /* strategy for moved case
+         +------------------ CASE 1 ---------------------------
+         |[TARGET  ]
+         |     <= if the target has a parent, attach to it and and move
+         +------------------ CASE 2 ---------------------------
+         |  [TARGET]
+         |     <= attach to the parent of the target, and move
+         |[        ]
+         +------------------ CASE 3 ---------------------------
+         |[TARGET  ]
+         |     <= attach to the parent of the target, and move
+         |[        ]
+         +------------------ CASE 4 ---------------------------
+         |[TARGET  ]
+         |     <= attach to the target, and move
+         |  [      ]
+         +-----------------------------------------------------
+    */
+    /* strategy for shown case
+         +------------------ CASE 5 ---------------------------
+         |[TARGET  ]
+         |     <= if the inserted item has a parent, detach. Otherwise keep inserted as a root.
+         +------------------ CASE 6 ---------------------------
+         |  [TARGET]
+         |     <= if the inserted item has a parent and it is not the parent of the next item, attach to the parent of the target. Otherwise attach to the parent of the next item.
+         |[        ]
+         +------------------ CASE 7 ---------------------------
+         |[TARGET  ]
+         |     <= attach to the parent of the target, and move
+         |[        ]
+         +------------------ CASE 8 ---------------------------
+         |[TARGET  ]
+         |     <= attach to the target, and move
+         |  [      ]
+         +-----------------------------------------------------
+    */
+    // We need to refer unsafeNearestExpandedFollowingTab instead of a visible item, to avoid
+    // placing the item after hidden items (it is too far from the target).
+    let unsafeNextItem = insertAfter?.$TST?.unsafeNearestExpandedFollowingTab;
+    if (firstItem && unsafeNextItem == firstItem) // failsafe
+      unsafeNextItem = lastItem?.$TST?.unsafeNearestExpandedFollowingTab;
+    let nextItem = insertAfter &&
+      (configs.fixupTreeOnTabVisibilityChanged ?
+        insertAfter.$TST?.nearestVisibleFollowingTab :
+        unsafeNextItem);
+    if (firstItem && nextItem == firstItem) // failsafe
+      nextItem = configs.fixupTreeOnTabVisibilityChanged ?
+        lastItem?.$TST?.nearestVisibleFollowingTab :
+        unsafeNextItem;
+    if (!nextItem) {
+      let result;
+      if (context == Constants.kINSERTION_CONTEXT_MOVED) {
+        log('calculateReferenceItemsFromInsertionPosition: from insertAfter, CASE 1');
+        result = {
+          parent:       insertAfter?.$TST?.parent,
+          insertBefore: unsafeNextItem,
+          insertAfter
+        };
+      }
+      else {
+        log('calculateReferenceItemsFromInsertionPosition: from insertAfter, CASE 5');
+        result = {
+          parent:       firstItem?.$TST?.parent && insertAfter?.$TST?.parent,
+          insertBefore: unsafeNextItem,
+          insertAfter
+        };
+      }
+      log(' => ', result);
+      return result;
+    }
+    else {
+      const targetLevel = Number(insertAfter?.$TST?.getAttribute(Constants.kLEVEL) || 0);
+      const nextLevel   = Number(nextItem?.$TST?.getAttribute(Constants.kLEVEL) || 0);
+      let parent = null;
+      if (!firstItem || !firstItem.pinned) {
+        if (targetLevel < nextLevel) {
+          log('calculateReferenceItemsFromInsertionPosition: from insertAfter, CASE 4/8');
+          parent = insertAfter;
+        }
+        else  {
+          const possibleParent = insertAfter?.$TST?.parent;
+          if (context == Constants.kINSERTION_CONTEXT_MOVED || targetLevel == nextLevel) {
+            log('calculateReferenceItemsFromInsertionPosition: from insertAfter, CASE 2/3/7');
+            parent = possibleParent;
+          }
+          else {
+            log('calculateReferenceItemsFromInsertionPosition: from insertAfter, CASE 6');
+            parent = firstItem?.$TST?.parent != possibleParent && possibleParent || firstItem?.$TST.parent;
+          }
+        }
+      }
+      const result = {
+        parent,
+        insertBefore: unsafeNextItem || nextItem,
+        insertAfter
+      };
+      log(' => ', result);
+      return result;
+    }
+  }
+  throw new Error('calculateReferenceItemsFromInsertionPosition requires one of insertBefore or insertAfter parameter!');
+}
+
+
+export const STRUCTURE_NO_PARENT = -1;
+export const STRUCTURE_KEEP_PARENT = -2;
+
+export function getTreeStructureFromTabs(tabs, { full, keepParentOfRootTabs } = {}) {
+  if (!tabs || !tabs.length)
+    return [];
+
+  /* this returns...
+    [A]     => STRUCTURE_NO_PARENT (parent is not in this tree)
+      [B]   => 0 (parent is 1st item in this tree)
+      [C]   => 0 (parent is 1st item in this tree)
+        [D] => 2 (parent is 2nd in this tree)
+    [E]     => STRUCTURE_NO_PARENT (parent is not in this tree, and this creates another tree)
+      [F]   => 0 (parent is 1st item in this another tree)
+  */
+  const tabIds = tabs.map(tab => tab.id);
+  return cleanUpTreeStructureArray(
+    tabs.map((tab, index) => {
+      const parentId = tab.$TST.parentId;
+      const indexInGivenTabs = parent ? tabIds.indexOf(parentId) : STRUCTURE_NO_PARENT ;
+      return indexInGivenTabs >= index ? STRUCTURE_NO_PARENT : indexInGivenTabs ;
+    }),
+    STRUCTURE_NO_PARENT
+  ).map((parentIndex, index) => {
+    if (parentIndex == STRUCTURE_NO_PARENT &&
+        keepParentOfRootTabs)
+      parentIndex = STRUCTURE_KEEP_PARENT;
+    const tab = tabs[index];
+    const item = {
+      id:        tab.$TST.uniqueId.id,
+      parent:    parentIndex,
+      collapsed: tab.$TST.subtreeCollapsed
+    };
+    if (full) {
+      item.title  = tab.title;
+      item.url    = tab.url;
+      item.pinned = tab.pinned;
+      item.originalId = tab.id;
+    }
+    return item;
+  });
+}
+function cleanUpTreeStructureArray(treeStructure, defaultParent) {
+  let offset = 0;
+  treeStructure = treeStructure
+    .map((position, index) => {
+      return (position == index) ? STRUCTURE_NO_PARENT : position ;
+    })
+    .map((position, index) => {
+      if (position == STRUCTURE_NO_PARENT) {
+        offset = index;
+        return position;
+      }
+      return position - offset;
+    });
+
+  /* The final step, this validates all of values.
+     Smaller than STRUCTURE_NO_PARENT is invalid, so it becomes to STRUCTURE_NO_PARENT. */
+  treeStructure = treeStructure.map(index => {
+    return index < STRUCTURE_NO_PARENT ? defaultParent : index ;
+  });
+  return treeStructure;
+}
diff --git a/waterfox/browser/components/sidebar/common/tst-api.js b/waterfox/browser/components/sidebar/common/tst-api.js
new file mode 100644
index 0000000000000..2deff7b6d19ab
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/tst-api.js
@@ -0,0 +1,1502 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2024
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  wait,
+  configs,
+  isLinux,
+} from './common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from './constants.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as TabsStore from './tabs-store.js';
+
+import {
+  Tab,
+  kPERMISSION_INCOGNITO,
+  kPERMISSIONS_ALL,
+} from './TreeItem.js';
+
+function log(...args) {
+  internalLogger('common/tst-api', ...args);
+}
+
+export const onInitialized = new EventListenerManager();
+export const onRegistered   = new EventListenerManager();
+export const onUnregistered = new EventListenerManager();
+export const onMessageExternal = {
+  $listeners: new Set(),
+  addListener(listener) {
+    this.$listeners.add(listener);
+  },
+  removeListener(listener) {
+    this.$listeners.delete(listener);
+  },
+  dispatch(...args) {
+    return Array.from(this.$listeners, listener => listener(...args));
+  }
+};
+
+export const kREGISTER_SELF         = 'register-self';
+export const kUNREGISTER_SELF       = 'unregister-self';
+export const kGET_VERSION           = 'get-version';
+export const kWAIT_FOR_SHUTDOWN     = 'wait-for-shutdown';
+export const kPING                  = 'ping';
+export const kNOTIFY_READY          = 'ready';
+export const kNOTIFY_SHUTDOWN       = 'shutdown'; // defined but not notified for now.
+export const kNOTIFY_SIDEBAR_SHOW   = 'sidebar-show';
+export const kNOTIFY_SIDEBAR_HIDE   = 'sidebar-hide';
+export const kNOTIFY_TABS_RENDERED  = 'tabs-rendered';
+export const kNOTIFY_TABS_UNRENDERED = 'tabs-unrendered';
+export const kNOTIFY_TAB_STICKY_STATE_CHANGED = 'tab-sticky-state-changed';
+export const kNOTIFY_TAB_CLICKED    = 'tab-clicked'; // for backward compatibility
+export const kNOTIFY_TAB_DBLCLICKED = 'tab-dblclicked';
+export const kNOTIFY_TAB_MOUSEDOWN  = 'tab-mousedown';
+export const kNOTIFY_TAB_MOUSEUP    = 'tab-mouseup';
+export const kNOTIFY_TABBAR_CLICKED = 'tabbar-clicked'; // for backward compatibility
+export const kNOTIFY_TABBAR_MOUSEDOWN = 'tabbar-mousedown';
+export const kNOTIFY_TABBAR_MOUSEUP = 'tabbar-mouseup';
+export const kNOTIFY_EXTRA_CONTENTS_CLICKED      = 'extra-contents-clicked';
+export const kNOTIFY_EXTRA_CONTENTS_DBLCLICKED   = 'extra-contents-dblclicked';
+export const kNOTIFY_EXTRA_CONTENTS_MOUSEDOWN    = 'extra-contents-mousedown';
+export const kNOTIFY_EXTRA_CONTENTS_MOUSEUP      = 'extra-contents-mouseup';
+export const kNOTIFY_EXTRA_CONTENTS_KEYDOWN      = 'extra-contents-keydown';
+export const kNOTIFY_EXTRA_CONTENTS_KEYUP        = 'extra-contents-keyup';
+export const kNOTIFY_EXTRA_CONTENTS_INPUT        = 'extra-contents-input';
+export const kNOTIFY_EXTRA_CONTENTS_CHANGE       = 'extra-contents-change';
+export const kNOTIFY_EXTRA_CONTENTS_COMPOSITIONSTART  = 'extra-contents-compositionstart';
+export const kNOTIFY_EXTRA_CONTENTS_COMPOSITIONUPDATE = 'extra-contents-compositionupdate';
+export const kNOTIFY_EXTRA_CONTENTS_COMPOSITIONEND    = 'extra-contents-compositionend';
+export const kNOTIFY_EXTRA_CONTENTS_FOCUS        = 'extra-contents-focus';
+export const kNOTIFY_EXTRA_CONTENTS_BLUR         = 'extra-contents-blur';
+export const kNOTIFY_TABBAR_OVERFLOW  = 'tabbar-overflow';
+export const kNOTIFY_TABBAR_UNDERFLOW = 'tabbar-underflow';
+export const kNOTIFY_NEW_TAB_BUTTON_CLICKED   = 'new-tab-button-clicked';
+export const kNOTIFY_NEW_TAB_BUTTON_MOUSEDOWN = 'new-tab-button-mousedown';
+export const kNOTIFY_NEW_TAB_BUTTON_MOUSEUP   = 'new-tab-button-mouseup';
+export const kNOTIFY_TAB_MOUSEMOVE  = 'tab-mousemove';
+export const kNOTIFY_TAB_MOUSEOVER  = 'tab-mouseover';
+export const kNOTIFY_TAB_MOUSEOUT   = 'tab-mouseout';
+export const kNOTIFY_TAB_DRAGREADY  = 'tab-dragready';
+export const kNOTIFY_TAB_DRAGCANCEL = 'tab-dragcancel';
+export const kNOTIFY_TAB_DRAGSTART  = 'tab-dragstart';
+export const kNOTIFY_TAB_DRAGENTER  = 'tab-dragenter';
+export const kNOTIFY_TAB_DRAGEXIT   = 'tab-dragexit';
+export const kNOTIFY_TAB_DRAGEND    = 'tab-dragend';
+export const kNOTIFY_TREE_ATTACHED  = 'tree-attached';
+export const kNOTIFY_TREE_DETACHED  = 'tree-detached';
+export const kNOTIFY_TREE_COLLAPSED_STATE_CHANGED = 'tree-collapsed-state-changed';
+export const kNOTIFY_NATIVE_TAB_DRAGSTART = 'native-tab-dragstart';
+export const kNOTIFY_NATIVE_TAB_DRAGEND   = 'native-tab-dragend';
+export const kNOTIFY_PERMISSIONS_CHANGED = 'permissions-changed';
+export const kNOTIFY_NEW_TAB_PROCESSED = 'new-tab-processed';
+export const kSTART_CUSTOM_DRAG     = 'start-custom-drag';
+export const kNOTIFY_TRY_MOVE_FOCUS_FROM_COLLAPSING_TREE = 'try-move-focus-from-collapsing-tree';
+export const kNOTIFY_TRY_REDIRECT_FOCUS_FROM_COLLAPSED_TAB = 'try-redirect-focus-from-collaped-tab';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_PARENT = 'try-expand-tree-from-focused-parent';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_BUNDLED_PARENT = 'try-expand-tree-from-focused-bundled-parent';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_ATTACHED_CHILD = 'try-expand-tree-from-attached-child';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_FOCUSED_COLLAPSED_TAB = 'try-expand-tree-from-focused-collapsed-tab';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_LONG_PRESS_CTRL_KEY = 'try-expand-tree-from-long-press-ctrl-key';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_END_TAB_SWITCH = 'try-expand-tree-from-end-tab-switch';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_EXPAND_COMMAND = 'try-expand-tree-from-expand-command';
+export const kNOTIFY_TRY_EXPAND_TREE_FROM_EXPAND_ALL_COMMAND = 'try-expand-tree-from-expand-all-command';
+export const kNOTIFY_TRY_COLLAPSE_TREE_FROM_OTHER_EXPANSION = 'try-collapse-tree-from-other-expansion';
+export const kNOTIFY_TRY_COLLAPSE_TREE_FROM_COLLAPSE_COMMAND = 'try-collapse-tree-from-collapse-command';
+export const kNOTIFY_TRY_COLLAPSE_TREE_FROM_COLLAPSE_ALL_COMMAND = 'try-collapse-tree-from-collapse-all-command';
+export const kNOTIFY_TRY_FIXUP_TREE_ON_TAB_MOVED = 'try-fixup-tree-on-tab-moved';
+export const kNOTIFY_TRY_HANDLE_NEWTAB = 'try-handle-newtab';
+export const kNOTIFY_TRY_SCROLL_TO_ACTIVATED_TAB = 'try-scroll-to-activated-tab';
+export const kGET_TREE              = 'get-tree';
+export const kGET_LIGHT_TREE        = 'get-light-tree';
+export const kATTACH                = 'attach';
+export const kDETACH                = 'detach';
+export const kINDENT                = 'indent';
+export const kDEMOTE                = 'demote';
+export const kOUTDENT               = 'outdent';
+export const kPROMOTE               = 'promote';
+export const kMOVE_UP               = 'move-up';
+export const kMOVE_TO_START         = 'move-to-start';
+export const kMOVE_DOWN             = 'move-down';
+export const kMOVE_TO_END           = 'move-to-end';
+export const kMOVE_BEFORE           = 'move-before';
+export const kMOVE_AFTER            = 'move-after';
+export const kFOCUS                 = 'focus';
+export const kCREATE                = 'create';
+export const kDUPLICATE             = 'duplicate';
+export const kGROUP_TABS            = 'group-tabs';
+export const kOPEN_IN_NEW_WINDOW    = 'open-in-new-window';
+export const kREOPEN_IN_CONTAINER   = 'reopen-in-container';
+export const kGET_TREE_STRUCTURE    = 'get-tree-structure';
+export const kSET_TREE_STRUCTURE    = 'set-tree-structure';
+export const kSTICK_TAB             = 'stick-tab';
+export const kUNSTICK_TAB           = 'unstick-tab';
+export const kTOGGLE_STICKY_STATE   = 'toggle-sticky-state';
+export const kREGISTER_AUTO_STICKY_STATES   = 'register-auto-sticky-states';
+export const kUNREGISTER_AUTO_STICKY_STATES = 'unregister-auto-sticky-states';
+export const kCOLLAPSE_TREE         = 'collapse-tree';
+export const kEXPAND_TREE           = 'expand-tree';
+export const kTOGGLE_TREE_COLLAPSED = 'toggle-tree-collapsed';
+export const kADD_TAB_STATE         = 'add-tab-state';
+export const kREMOVE_TAB_STATE      = 'remove-tab-state';
+export const kSCROLL                = 'scroll';
+export const kSTOP_SCROLL           = 'stop-scroll';
+export const kSCROLL_LOCK           = 'scroll-lock';
+export const kSCROLL_UNLOCK         = 'scroll-unlock';
+export const kNOTIFY_SCROLLED       = 'scrolled';
+export const kBLOCK_GROUPING        = 'block-grouping';
+export const kUNBLOCK_GROUPING      = 'unblock-grouping';
+export const kSET_TOOLTIP_TEXT      = 'set-tooltip-text';
+export const kCLEAR_TOOLTIP_TEXT    = 'clear-tooltip-text';
+export const kGRANT_TO_REMOVE_TABS  = 'grant-to-remove-tabs';
+export const kOPEN_ALL_BOOKMARKS_WITH_STRUCTURE = 'open-all-bookmarks-with-structure';
+export const kSET_EXTRA_CONTENTS                  = 'set-extra-contents';
+export const kCLEAR_EXTRA_CONTENTS                = 'clear-extra-contents';
+export const kCLEAR_ALL_EXTRA_CONTENTS            = 'clear-all-extra-contents';
+export const kSET_EXTRA_TAB_CONTENTS              = 'set-extra-tab-contents'; // for backward compatibility
+export const kCLEAR_EXTRA_TAB_CONTENTS            = 'clear-extra-tab-contents'; // for backward compatibility
+export const kCLEAR_ALL_EXTRA_TAB_CONTENTS        = 'clear-all-extra-tab-contents'; // for backward compatibility
+export const kSET_EXTRA_NEW_TAB_BUTTON_CONTENTS   = 'set-extra-new-tab-button-contents'; // for backward compatibility
+export const kCLEAR_EXTRA_NEW_TAB_BUTTON_CONTENTS = 'clear-extra-new-tab-button-contents'; // for backward compatibility
+export const kSET_EXTRA_CONTENTS_PROPERTIES       = 'set-extra-contents-properties';
+export const kFOCUS_TO_EXTRA_CONTENTS             = 'focus-to-extra-contents';
+export const kGET_DRAG_DATA         = 'get-drag-data';
+
+const BULK_MESSAGING_TYPES = new Set([
+  kNOTIFY_SIDEBAR_SHOW,
+  kNOTIFY_SIDEBAR_HIDE,
+  kNOTIFY_TABS_RENDERED,
+  kNOTIFY_TABS_UNRENDERED,
+  kNOTIFY_TAB_STICKY_STATE_CHANGED,
+  kNOTIFY_EXTRA_CONTENTS_FOCUS,
+  kNOTIFY_EXTRA_CONTENTS_BLUR,
+  kNOTIFY_TABBAR_OVERFLOW,
+  kNOTIFY_TABBAR_UNDERFLOW,
+  kNOTIFY_TAB_MOUSEMOVE,
+  kNOTIFY_TAB_MOUSEOVER,
+  kNOTIFY_TAB_MOUSEOUT,
+  kNOTIFY_TAB_DRAGREADY,
+  kNOTIFY_TAB_DRAGCANCEL,
+  kNOTIFY_TAB_DRAGSTART,
+  kNOTIFY_TAB_DRAGENTER,
+  kNOTIFY_TAB_DRAGEXIT,
+  kNOTIFY_TAB_DRAGEND,
+  kNOTIFY_TREE_ATTACHED,
+  kNOTIFY_TREE_DETACHED,
+  kNOTIFY_TREE_COLLAPSED_STATE_CHANGED,
+  kNOTIFY_NATIVE_TAB_DRAGSTART,
+  kNOTIFY_NATIVE_TAB_DRAGEND,
+  kNOTIFY_PERMISSIONS_CHANGED,
+]);
+
+export const kCONTEXT_MENU_OPEN       = 'contextMenu-open';
+export const kCONTEXT_MENU_CREATE     = 'contextMenu-create';
+export const kCONTEXT_MENU_UPDATE     = 'contextMenu-update';
+export const kCONTEXT_MENU_REMOVE     = 'contextMenu-remove';
+export const kCONTEXT_MENU_REMOVE_ALL = 'contextMenu-remove-all';
+export const kCONTEXT_MENU_CLICK      = 'contextMenu-click';
+export const kCONTEXT_MENU_SHOWN      = 'contextMenu-shown';
+export const kCONTEXT_MENU_HIDDEN     = 'contextMenu-hidden';
+export const kFAKE_CONTEXT_MENU_OPEN       = 'fake-contextMenu-open';
+export const kFAKE_CONTEXT_MENU_CREATE     = 'fake-contextMenu-create';
+export const kFAKE_CONTEXT_MENU_UPDATE     = 'fake-contextMenu-update';
+export const kFAKE_CONTEXT_MENU_REMOVE     = 'fake-contextMenu-remove';
+export const kFAKE_CONTEXT_MENU_REMOVE_ALL = 'fake-contextMenu-remove-all';
+export const kFAKE_CONTEXT_MENU_CLICK      = 'fake-contextMenu-click';
+export const kFAKE_CONTEXT_MENU_SHOWN      = 'fake-contextMenu-shown';
+export const kFAKE_CONTEXT_MENU_HIDDEN     = 'fake-contextMenu-hidden';
+export const kOVERRIDE_CONTEXT        = 'override-context';
+
+export const kCOMMAND_BROADCAST_API_REGISTERED   = 'ws:broadcast-registered';
+export const kCOMMAND_BROADCAST_API_UNREGISTERED = 'ws:broadcast-unregistered';
+export const kCOMMAND_BROADCAST_API_PERMISSION_CHANGED = 'ws:permission-changed';
+export const kCOMMAND_REQUEST_INITIALIZE         = 'ws:request-initialize';
+export const kCOMMAND_REQUEST_CONTROL_STATE      = 'ws:request-control-state';
+export const kCOMMAND_GET_ADDONS                 = 'ws:get-addons';
+export const kCOMMAND_SET_API_PERMISSION         = 'ws:set-api-permisssion';
+export const kCOMMAND_NOTIFY_PERMISSION_CHANGED  = 'ws:notify-api-permisssion-changed';
+export const kCOMMAND_UNREGISTER_ADDON           = 'ws:unregister-addon';
+
+export const INTERNAL_CALL_PREFIX = 'ws:api:';
+export const INTERNAL_CALL_PREFIX_MATCHER = new RegExp(`^${INTERNAL_CALL_PREFIX}`);
+
+export const kNEWTAB_CONTEXT_NEWTAB_COMMAND             = 'newtab-command';
+export const kNEWTAB_CONTEXT_WITH_OPENER                = 'with-opener';
+export const kNEWTAB_CONTEXT_DUPLICATED                 = 'duplicated';
+export const kNEWTAB_CONTEXT_FROM_PINNED                = 'from-pinned';
+export const kNEWTAB_CONTEXT_FROM_EXTERNAL              = 'from-external';
+export const kNEWTAB_CONTEXT_WEBSITE_SAME_TO_ACTIVE_TAB = 'website-same-to-active-tab';
+export const kNEWTAB_CONTEXT_FROM_ABOUT_ADDONS          = 'from-about-addons';
+export const kNEWTAB_CONTEXT_UNKNOWN                    = 'unknown';
+
+const mAddons = new Map();
+let mScrollLockedBy    = {};
+let mGroupingBlockedBy = {};
+
+const mPendingMessagesFor = new Map();
+const mMessagesPendedAt   = new Map();
+
+// you should use this to reduce memory usage around effective favicons
+export function clearCache(cache) {
+  cache.effectiveFavIconUrls = {};
+}
+
+// This function is complex a little, but we should not make a custom class for this purpose,
+// bacause instances of the class will be very short-life and increases RAM usage on
+// massive tabs case.
+export async function exportTab(sourceTab, { addonId, light, isContextTab, interval, permissions, cache, cacheKey } = {}) {
+  const normalizedSourceTab = Tab.get(sourceTab);
+  if (!normalizedSourceTab)
+    throw new Error(`Fatal error: tried to export not a tab. ${sourceTab}`);
+  sourceTab = normalizedSourceTab;
+
+  if (!interval)
+    interval = 0;
+  if (!cache)
+    cache = {};
+
+  if (!cache.tabs)
+    cache.tabs = {};
+  if (!cache.effectiveFavIconUrls)
+    cache.effectiveFavIconUrls = {};
+
+  if (!permissions) {
+    permissions = (!addonId || addonId == browser.runtime.id) ?
+      kPERMISSIONS_ALL :
+      new Set(getGrantedPermissionsForAddon(addonId));
+    if (addonId &&
+        configs.incognitoAllowedExternalAddons.includes(addonId))
+      permissions.add(kPERMISSION_INCOGNITO);
+  }
+  if (!cacheKey)
+    cacheKey = `${sourceTab.id}:${Array.from(permissions).sort().join(',')}`;
+
+  if (!sourceTab ||
+      (sourceTab.incognito &&
+       !permissions.has(kPERMISSION_INCOGNITO)))
+    return null;
+
+  // The promise is cached here instead of the result,
+  // to avoid cache miss caused by concurrent call.
+  if (!(cacheKey in cache.tabs)) {
+    cache.tabs[cacheKey] = sourceTab.$TST.exportForAPI({ addonId, light, isContextTab, interval, permissions, cache, cacheKey });
+  }
+  return cache.tabs[cacheKey];
+}
+
+export function getAddon(id) {
+  return mAddons.get(id);
+}
+
+export function getGrantedPermissionsForAddon(id) {
+  const addon = getAddon(id);
+  return addon?.grantedPermissions || new Set();
+}
+
+function registerAddon(id, addon) {
+  log('addon is registered: ', id, addon);
+
+  // inherit properties from last effective value
+  const oldAddon = getAddon(id);
+  if (oldAddon) {
+    for (const param of [
+      'name',
+      'icons',
+      'listeningTypes',
+      'allowBulkMessaging',
+      'lightTree',
+      'style',
+      'permissions',
+    ]) {
+      if (!(param in addon) && param in oldAddon) {
+        addon[param] = oldAddon[param];
+      }
+    }
+  }
+
+  if (!addon.listeningTypes) {
+    // for backward compatibility, send all message types available on TST 2.4.16 by default.
+    addon.listeningTypes = [
+      kNOTIFY_READY,
+      kNOTIFY_SHUTDOWN,
+      kNOTIFY_TAB_CLICKED,
+      kNOTIFY_TAB_MOUSEDOWN,
+      kNOTIFY_TAB_MOUSEUP,
+      kNOTIFY_NEW_TAB_BUTTON_CLICKED,
+      kNOTIFY_NEW_TAB_BUTTON_MOUSEDOWN,
+      kNOTIFY_NEW_TAB_BUTTON_MOUSEUP,
+      kNOTIFY_TABBAR_CLICKED,
+      kNOTIFY_TABBAR_MOUSEDOWN,
+      kNOTIFY_TABBAR_MOUSEUP
+    ];
+  }
+
+  let requestedPermissions = addon.permissions || [];
+  if (!Array.isArray(requestedPermissions))
+    requestedPermissions = [requestedPermissions];
+  addon.requestedPermissions = new Set(requestedPermissions);
+  const grantedPermissions = configs.grantedExternalAddonPermissions[id] || [];
+  addon.grantedPermissions = new Set(grantedPermissions);
+
+  if (Constants.IS_BACKGROUND &&
+      !addon.bypassPermissionCheck &&
+      addon.requestedPermissions.size > 0 &&
+      addon.grantedPermissions.size != addon.requestedPermissions.size)
+    notifyPermissionRequest(addon, addon.requestedPermissions);
+
+  addon.id = id;
+  addon.lastRegistered = Date.now();
+  mAddons.set(id, addon);
+
+  onRegistered.dispatch(addon);
+}
+
+const mPermissionNotificationForAddon = new Map();
+
+async function notifyPermissionRequest(addon, requestedPermissions) {
+  log('notifyPermissionRequest ', addon, requestedPermissions);
+
+  if (mPermissionNotificationForAddon.has(addon.id))
+    return;
+
+  mPermissionNotificationForAddon.set(addon.id, -1);
+  const id = await browser.notifications.create({
+    type:    'basic',
+    iconUrl: Constants.kNOTIFICATION_DEFAULT_ICON,
+    title:   browser.i18n.getMessage('api_requestedPermissions_title'),
+    message: browser.i18n.getMessage(`api_requestedPermissions_message${isLinux() ? '_linux' : ''}`, [
+      addon.name || addon.title || addon.id,
+      Array.from(requestedPermissions, permission => {
+        if (permission == kPERMISSION_INCOGNITO)
+          return null;
+        try {
+          return browser.i18n.getMessage(`api_requestedPermissions_type_${permission}`) || permission;
+        }
+        catch(_error) {
+          return permission;
+        }
+      }).filter(permission => !!permission).join('\n')
+    ])
+  });
+  mPermissionNotificationForAddon.set(addon.id, id);
+}
+
+function setPermissions(addon, permisssions) {
+  addon.grantedPermissions = permisssions;
+  const cachedPermissions = JSON.parse(JSON.stringify(configs.grantedExternalAddonPermissions));
+  cachedPermissions[addon.id] = Array.from(addon.grantedPermissions);
+  configs.grantedExternalAddonPermissions = cachedPermissions;
+  notifyPermissionChanged(addon);
+}
+
+function notifyPermissionChanged(addon) {
+  const permissions = Array.from(addon.grantedPermissions);
+  browser.runtime.sendMessage({
+    type: kCOMMAND_BROADCAST_API_PERMISSION_CHANGED,
+    id:   addon.id,
+    permissions
+  });
+  if (addon.id == browser.runtime.id)
+    return;
+  browser.runtime.sendMessage(addon.id, {
+    type:                 kNOTIFY_PERMISSIONS_CHANGED,
+    grantedPermissions:   permissions.filter(permission => permission.startsWith('!')),
+    privateWindowAllowed: configs.incognitoAllowedExternalAddons.includes(addon.id)
+  }).catch(ApiTabs.createErrorHandler());
+}
+
+function unregisterAddon(id) {
+  const addon = getAddon(id);
+  log('addon is unregistered: ', id, addon);
+  onUnregistered.dispatch(addon);
+  mAddons.delete(id);
+  mPendingMessagesFor.delete(id);
+  mMessagesPendedAt.delete(id);
+  delete mScrollLockedBy[id];
+  delete mGroupingBlockedBy[id];
+}
+
+export function getAddons() {
+  return mAddons.entries();
+}
+
+const mConnections = new Map();
+
+function onCommonCommand(message, sender) {
+  if (!message ||
+      typeof message.type != 'string')
+    return;
+
+  const addon = getAddon(sender.id);
+
+  switch (message.type) {
+    case kSCROLL_LOCK:
+      mScrollLockedBy[sender.id] = true;
+      if (!addon)
+        registerAddon(sender.id, sender);
+      return Promise.resolve(true);
+
+    case kSCROLL_UNLOCK:
+      delete mScrollLockedBy[sender.id];
+      return Promise.resolve(true);
+
+    case kBLOCK_GROUPING:
+      mGroupingBlockedBy[sender.id] = true;
+      if (!addon)
+        registerAddon(sender.id, sender);
+      return Promise.resolve(true);
+
+    case kUNBLOCK_GROUPING:
+      delete mGroupingBlockedBy[sender.id];
+      return Promise.resolve(true);
+
+    case kSET_EXTRA_TAB_CONTENTS:
+      if (!addon)
+        registerAddon(sender.id, sender);
+      break;
+
+    case kSET_EXTRA_NEW_TAB_BUTTON_CONTENTS:
+      if (!addon)
+        registerAddon(sender.id, sender);
+      break;
+  }
+}
+
+
+// =======================================================================
+// for backend
+// =======================================================================
+
+let mInitialized = false;
+let mPromisedInitialized = null;
+
+if (Constants.IS_BACKGROUND) {
+  browser.runtime.onMessageExternal.addListener(onBackendCommand);
+  browser.runtime.onConnectExternal.addListener(port => {
+    if (!mInitialized ||
+        !configs.APIEnabled)
+      return;
+    const sender = port.sender;
+    mConnections.set(sender.id, port);
+    port.onMessage.addListener(message => {
+      const messages = message.messages || [message];
+      for (const oneMessage of messages) {
+        onMessageExternal.dispatch(oneMessage, sender);
+        SidebarConnection.sendMessage({
+          type: 'external',
+          oneMessage,
+          sender
+        });
+      }
+    });
+    port.onDisconnect.addListener(_message => {
+      mConnections.delete(sender.id);
+      onBackendCommand({
+        type: kUNREGISTER_SELF,
+        sender
+      }).catch(ApiTabs.createErrorSuppressor());
+    });
+  });
+}
+
+export async function initAsBackend() {
+  // We must listen API messages from other addons here beacause:
+  //  * Before notification messages are sent to other addons.
+  //  * After configs are loaded and TST's background page is almost completely initialized.
+  //    (to prevent troubles like breakage of `configs.cachedExternalAddons`, see also:
+  //     https://github.com/piroor/treestyletab/issues/2300#issuecomment-498947370 )
+  mInitialized = true;
+
+  let resolver;
+  mPromisedInitialized = new Promise((resolve, _reject) => {
+    resolver = resolve;
+  });
+
+  const manifest = browser.runtime.getManifest();
+  registerAddon(browser.runtime.id, {
+    id:         browser.runtime.id,
+    internalId: browser.runtime.getURL('').replace(/^moz-extension:\/\/([^\/]+)\/.*$/, '$1'),
+    icons:      manifest.icons,
+    listeningTypes: [
+      kNOTIFY_EXTRA_CONTENTS_CLICKED,
+      kNOTIFY_EXTRA_CONTENTS_DBLCLICKED,
+      kNOTIFY_EXTRA_CONTENTS_MOUSEDOWN,
+      kNOTIFY_EXTRA_CONTENTS_MOUSEUP,
+      kNOTIFY_EXTRA_CONTENTS_KEYDOWN,
+      kNOTIFY_EXTRA_CONTENTS_KEYUP,
+      kNOTIFY_EXTRA_CONTENTS_INPUT,
+      kNOTIFY_EXTRA_CONTENTS_CHANGE,
+      kNOTIFY_EXTRA_CONTENTS_COMPOSITIONSTART,
+      kNOTIFY_EXTRA_CONTENTS_COMPOSITIONUPDATE,
+      kNOTIFY_EXTRA_CONTENTS_COMPOSITIONEND,
+      kNOTIFY_EXTRA_CONTENTS_FOCUS,
+      kNOTIFY_EXTRA_CONTENTS_BLUR,
+    ],
+    bypassPermissionCheck: true,
+    allowBulkMessaging:    true,
+    lightTree:             true,
+  });
+
+  const respondedAddons = [];
+  const notifiedAddons = {};
+  const notifyAddons = configs.knownExternalAddons.concat(configs.cachedExternalAddons);
+  log('initAsBackend: notifyAddons = ', notifyAddons);
+  await Promise.all(notifyAddons.map(async id => {
+    if (id in notifiedAddons)
+      return;
+    notifiedAddons[id] = true;
+    try {
+      id = await new Promise((resolve, reject) => {
+        let responded = false;
+        browser.runtime.sendMessage(id, {
+          type: kNOTIFY_READY
+        }).then(() => {
+          responded = true;
+          resolve(id);
+        }).catch(ApiTabs.createErrorHandler(reject));
+        setTimeout(() => {
+          if (!responded)
+            reject(new Error(`TSTAPI.initAsBackend: addon ${id} does not respond.`));
+        }, 3000);
+      });
+      if (id)
+        respondedAddons.push(id);
+    }
+    catch(e) {
+      console.log(`TSTAPI.initAsBackend: failed to send "ready" message to "${id}":`, e);
+    }
+  }));
+  log('initAsBackend: respondedAddons = ', respondedAddons);
+  configs.cachedExternalAddons = respondedAddons;
+
+  onInitialized.dispatch();
+  resolver();
+}
+
+if (Constants.IS_BACKGROUND) {
+  browser.notifications.onClicked.addListener(notificationId => {
+    if (!mInitialized)
+      return;
+
+    for (const [addonId, id] of mPermissionNotificationForAddon.entries()) {
+      if (id != notificationId)
+        continue;
+      mPermissionNotificationForAddon.delete(addonId);
+      browser.tabs.create({
+        url: `moz-extension://${location.host}/options/options.html#externalAddonPermissionsGroup`
+      });
+      break;
+    }
+  });
+
+  browser.notifications.onClosed.addListener((notificationId, _byUser) => {
+    if (!mInitialized)
+      return;
+
+    for (const [addonId, id] of mPermissionNotificationForAddon.entries()) {
+      if (id != notificationId)
+        continue;
+      mPermissionNotificationForAddon.delete(addonId);
+      break;
+    }
+  });
+
+  SidebarConnection.onConnected.addListener((windowId, openCount) => {
+    SidebarConnection.sendMessage({
+      type: Constants.kCOMMAND_NOTIFY_CONNECTION_READY,
+      windowId,
+      openCount,
+    });
+  });
+
+  SidebarConnection.onDisconnected.addListener((windowId, openCount) => {
+    broadcastMessage({
+      type:   kNOTIFY_SIDEBAR_HIDE,
+      window: windowId,
+      windowId,
+      openCount
+    });
+  });
+
+  /*
+  // This mechanism doesn't work actually.
+  // See also: https://github.com/piroor/treestyletab/issues/2128#issuecomment-454650407
+
+  const mConnectionsForAddons = new Map();
+
+  browser.runtime.onConnectExternal.addListener(port => {
+    if (!mInitialized)
+      return;
+
+    const sender = port.sender;
+    log('Connected: ', sender.id);
+
+    const connections = mConnectionsForAddons.get(sender.id) || new Set();
+    connections.add(port);
+
+    const addon = getAddon(sender.id);
+    if (!addon) { // treat as register-self
+      const message = {
+        id:             sender.id,
+        internalId:     sender.url.replace(/^moz-extension:\/\/([^\/]+)\/.*$/, '$1'),
+        newlyInstalled: !configs.cachedExternalAddons.includes(sender.id)
+      };
+      registerAddon(sender.id, message);
+      browser.runtime.sendMessage({
+        type: kCOMMAND_BROADCAST_API_REGISTERED,
+        sender,
+        message
+      }).catch(ApiTabs.createErrorSuppressor());
+      if (message.newlyInstalled)
+        configs.cachedExternalAddons = configs.cachedExternalAddons.concat([sender.id]);
+    }
+
+    const onMessage = message => {
+      onBackendCommand(message, sender);
+    };
+    port.onMessage.addListener(onMessage);
+
+    const onDisconnected = _message => {
+      log('Disconnected: ', sender.id);
+      port.onMessage.removeListener(onMessage);
+      port.onDisconnect.removeListener(onDisconnected);
+
+      connections.delete(port);
+      if (connections.size > 0)
+        return;
+
+      setTimeout(() => {
+        // if it is not re-registered while 10sec, it may be uninstalled.
+        if (getAddon(sender.id))
+          return;
+        configs.cachedExternalAddons = configs.cachedExternalAddons.filter(id => id != sender.id);
+      }, 10 * 1000);
+      browser.runtime.sendMessage({
+        type: kCOMMAND_BROADCAST_API_UNREGISTERED,
+        sender
+      }).catch(ApiTabs.createErrorSuppressor());
+      unregisterAddon(sender.id);
+      mConnectionsForAddons.delete(sender.id);
+    }
+    port.onDisconnect.addListener(onDisconnected);
+  });
+  */
+
+  browser.runtime.onMessage.addListener((message, _sender) => {
+    if (!mInitialized ||
+        !message ||
+        typeof message.type != 'string')
+      return;
+
+    switch (message.type) {
+      case kCOMMAND_REQUEST_INITIALIZE:
+        return Promise.resolve({
+          addons:         exportAddons(),
+          scrollLocked:   mScrollLockedBy,
+          groupingLocked: mGroupingBlockedBy
+        });
+
+      case kCOMMAND_REQUEST_CONTROL_STATE:
+        return Promise.resolve({
+          scrollLocked:   mScrollLockedBy,
+          groupingLocked: mGroupingBlockedBy
+        });
+
+      case kCOMMAND_GET_ADDONS:
+        return mPromisedInitialized.then(() => {
+          const addons = [];
+          for (const [id, addon] of mAddons.entries()) {
+            addons.push({
+              id,
+              label:              addon.name || addon.title || addon.id,
+              permissions:        Array.from(addon.requestedPermissions),
+              permissionsGranted: Array.from(addon.requestedPermissions).join(',') == Array.from(addon.grantedPermissions).join(',')
+            });
+          }
+          return addons;
+        });
+
+      case kCOMMAND_SET_API_PERMISSION:
+        setPermissions(getAddon(message.id), new Set(message.permissions));
+        break;
+
+      case kCOMMAND_NOTIFY_PERMISSION_CHANGED:
+        notifyPermissionChanged(getAddon(message.id));
+        break;
+
+      case kCOMMAND_UNREGISTER_ADDON:
+        unregisterAddon(message.id);
+        break;
+    }
+  });
+}
+
+const mPromisedOnBeforeUnload = new Promise((resolve, _reject) => {
+  // If this promise doesn't do anything then there seems to be a timeout so it only works if TST is disabled within about 10 seconds after this promise is used as a response to a message. After that it will not throw an error for the waiting extension.
+  // If we use the following then the returned promise will be rejected when TST is disabled even for longer times:
+  window.addEventListener('beforeunload', () => resolve());
+});
+
+const mWaitingShutdownMessages = new Map();
+
+function onBackendCommand(message, sender) {
+  if (message?.messages)
+    return Promise.all(
+      message.messages.map(oneMessage => onBackendCommand(oneMessage, sender))
+    );
+
+  if (!mInitialized ||
+      !message ||
+      typeof message != 'object' ||
+      typeof message.type != 'string')
+    return;
+
+  const results = onMessageExternal.dispatch(message, sender);
+  const firstPromise = results.find(result => result instanceof Promise);
+  if (firstPromise)
+    return firstPromise;
+
+  switch (message.type) {
+    case kPING:
+      return Promise.resolve(true);
+
+    case kREGISTER_SELF:
+      return (async () => {
+        message.internalId = sender.url.replace(/^moz-extension:\/\/([^\/]+)\/.*$/, '$1');
+        message.id = sender.id;
+        message.subPanel = message.subPanel || message.subpanel || null;
+        if (message.subPanel) {
+          const url = typeof message.subPanel.url === 'string' && new URL(message.subPanel.url, new URL('/', sender.url));
+          if (!url || url.hostname !== message.internalId) {
+            console.error(`"subPanel.url" must refer to a page packed in the registering extension.`);
+            message.subPanel.url = 'about:blank?error=invalid-origin'
+          } else
+            message.subPanel.url = url.href;
+        }
+        message.newlyInstalled = !configs.cachedExternalAddons.includes(sender.id);
+        registerAddon(sender.id, message);
+        browser.runtime.sendMessage({
+          type:    kCOMMAND_BROADCAST_API_REGISTERED,
+          sender:  sender,
+          message: message
+        }).catch(ApiTabs.createErrorSuppressor());
+        if (message.newlyInstalled)
+          configs.cachedExternalAddons = configs.cachedExternalAddons.concat([sender.id]);
+        if (message.listeningTypes &&
+            message.listeningTypes.includes(kWAIT_FOR_SHUTDOWN) &&
+            !mWaitingShutdownMessages.has(sender.id)) {
+          const onShutdown = () => {
+            const storedShutdown = mWaitingShutdownMessages.get(sender.id);
+            // eslint-disable-next-line no-use-before-define
+            if (storedShutdown && storedShutdown !== promisedShutdown)
+              return; // it is obsolete
+
+            const addon          = getAddon(sender.id);
+            const lastRegistered = addon?.lastRegistered;
+            setTimeout(() => {
+              // if it is re-registered immediately, it was updated or reloaded.
+              const addon = getAddon(sender.id);
+              if (addon &&
+                  addon.lastRegistered != lastRegistered)
+                return;
+              // otherwise it is uninstalled.
+              browser.runtime.sendMessage({
+                type: kCOMMAND_BROADCAST_API_UNREGISTERED,
+                sender
+              }).catch(ApiTabs.createErrorSuppressor());
+              unregisterAddon(sender.id);
+              configs.cachedExternalAddons = configs.cachedExternalAddons.filter(id => id != sender.id);
+            }, 350);
+          };
+          const promisedShutdown = (async () => {
+            try {
+              const shouldUninit = await browser.runtime.sendMessage(sender.id, {
+                type: kWAIT_FOR_SHUTDOWN
+              });
+              if (!shouldUninit)
+                return;
+            }
+            catch (_error) {
+              // Extension was disabled.
+            }
+            finally {
+              mWaitingShutdownMessages.delete(sender.id);
+            }
+            onShutdown();
+          })();
+          mWaitingShutdownMessages.set(sender.id, promisedShutdown);
+          promisedShutdown.catch(onShutdown);
+        }
+        return {
+          grantedPermissions:   Array.from(getGrantedPermissionsForAddon(sender.id)).filter(permission => permission.startsWith('!')),
+          privateWindowAllowed: configs.incognitoAllowedExternalAddons.includes(sender.id)
+        };
+      })();
+
+    case kUNREGISTER_SELF:
+      return (async () => {
+        browser.runtime.sendMessage({
+          type: kCOMMAND_BROADCAST_API_UNREGISTERED,
+          sender
+        }).catch(ApiTabs.createErrorSuppressor());
+        unregisterAddon(sender.id);
+        configs.cachedExternalAddons = configs.cachedExternalAddons.filter(id => id != sender.id);
+        return true;
+      })();
+
+    case kWAIT_FOR_SHUTDOWN:
+      return mPromisedOnBeforeUnload;
+
+    default:
+      return onCommonCommand(message, sender);
+  }
+}
+
+function exportAddons() {
+  const exported = {};
+  for (const [id, addon] of getAddons()) {
+    exported[id] = addon;
+  }
+  return exported;
+}
+
+export function isGroupingBlocked() {
+  return Object.keys(mGroupingBlockedBy).length > 0;
+}
+
+
+// =======================================================================
+// for frontend
+// =======================================================================
+
+export async function initAsFrontend() {
+  let resolver;
+  mPromisedInitialized = new Promise((resolve, _reject) => {
+    resolver = resolve;
+  });
+  log('initAsFrontend: start');
+  let response;
+  while (true) {
+    response = await browser.runtime.sendMessage({ type: kCOMMAND_REQUEST_INITIALIZE });
+    if (response)
+      break;
+    await wait(10);
+  }
+  browser.runtime.onMessageExternal.addListener(onFrontendCommand);
+  log('initAsFrontend: response = ', response);
+  importAddons(response.addons);
+  for (const [, addon] of getAddons()) {
+    onRegistered.dispatch(addon);
+  }
+  mScrollLockedBy    = response.scrollLocked;
+  mGroupingBlockedBy = response.groupingLocked;
+
+  onInitialized.dispatch();
+  log('initAsFrontend: finish');
+  resolver();
+  mPromisedInitialized = null;
+}
+
+function onFrontendCommand(message, sender) {
+  //console.log('onFrontendCommand ', message, sender);
+  if (!configs.APIEnabled)
+    return;
+
+  if (message?.messages)
+    return Promise.all(
+      message.messages.map(oneMessage => onFrontendCommand(oneMessage, sender))
+    );
+
+  if (message &&
+      typeof message == 'object' &&
+      typeof message.type == 'string') {
+    const results = onMessageExternal.dispatch(message, sender);
+    log('onMessageExternal: ', message, ' => ', results, 'sender: ', sender);
+    const firstPromise = results.find(result => result instanceof Promise);
+    if (firstPromise)
+      return firstPromise;
+  }
+  if (configs.incognitoAllowedExternalAddons.includes(sender.id) ||
+      !document.documentElement.classList.contains('incognito'))
+    return onCommonCommand(message, sender);
+}
+
+if (Constants.IS_SIDEBAR) {
+  browser.runtime.onMessage.addListener((message, _sender) => {
+    if (!message ||
+        typeof message != 'object' ||
+        typeof message.type != 'string')
+      return;
+
+    switch (message.type) {
+      case kCOMMAND_BROADCAST_API_REGISTERED:
+        registerAddon(message.sender.id, message.message);
+        break;
+
+      case kCOMMAND_BROADCAST_API_UNREGISTERED:
+        unregisterAddon(message.sender.id);
+        break;
+
+      case kCOMMAND_BROADCAST_API_PERMISSION_CHANGED: {
+        const addon = getAddon(message.id);
+        addon.grantedPermissions = new Set(message.permissions);
+      }; break;
+    }
+  });
+}
+
+function importAddons(addons) {
+  if (!addons)
+    console.log(new Error('null import'));
+  for (const id of Object.keys(mAddons)) {
+    unregisterAddon(id);
+  }
+  for (const [id, addon] of Object.entries(addons)) {
+    registerAddon(id, addon);
+  }
+}
+
+export function isScrollLocked() {
+  return Object.keys(mScrollLockedBy).length > 0;
+}
+
+export async function notifyScrolled(params = {}) {
+  const lockers = Object.keys(mScrollLockedBy);
+  const tab     = params.tab;
+  const windowId = TabsStore.getCurrentWindowId();
+  const tabs    = Tab.getTabs(windowId);
+  const cache   = {};
+  const results = await broadcastMessage({
+    type: kNOTIFY_SCROLLED,
+    tab:  tab && tabs.find(another => another.id == tab.id),
+    tabs,
+    overflow: params.overflow,
+    window: windowId,
+    windowId,
+
+    deltaX:       params.event.deltaX,
+    deltaY:       params.event.deltaY,
+    deltaZ:       params.event.deltaZ,
+    deltaMode:    params.event.deltaMode,
+    scrollTop:    params.scrollContainer.scrollTop,
+    scrollTopMax: params.scrollContainer.scrollTopMax,
+
+    altKey:   params.event.altKey,
+    ctrlKey:  params.event.ctrlKey,
+    metaKey:  params.event.metaKey,
+    shiftKey: params.event.shiftKey,
+
+    clientX:  params.event.clientX,
+    clientY:  params.event.clientY,
+  }, {
+    targets: lockers,
+    tabProperties: ['tab', 'tabs'],
+    cache,
+  });
+  for (const result of results) {
+    if (!result || result.error || result.result === undefined)
+      delete mScrollLockedBy[result.id];
+  }
+  clearCache(cache);
+}
+
+
+// =======================================================================
+// Common utilities to send notification messages to other addons
+// =======================================================================
+
+export async function tryOperationAllowed(type, message = {}, { targets, except, tabProperties, cache } = {}) {
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+
+  if (!hasListenerForMessageType(type, { targets, except })) {
+    //log(`=> ${type}: no listener, always allowed`);
+    return true;
+  }
+  cache = cache || {};
+  const results = await broadcastMessage({ ...message, type }, {
+    targets,
+    except,
+    tabProperties,
+    cache,
+  }).catch(error => {
+    if (configs.debug)
+      console.error(error);
+    return [];
+  });
+  if (!results) {
+    log(`=> ${type}: allowed because no one responded`);
+    return true;
+  }
+  if (results.flat().some(result => result?.result)) {
+    log(`=> ${type}: canceled by some helper addon`);
+    return false;
+  }
+  log(`=> ${type}: allowed by all helper addons`);
+  return true;
+}
+
+export function hasListenerForMessageType(type, { targets, except } = {}) {
+  return getListenersForMessageType(type, { targets, except }).length > 0;
+}
+
+export function getListenersForMessageType(type, { targets, except } = {}) {
+  targets = targets instanceof Set ? targets : new Set(Array.isArray(targets) ? targets : targets ? [targets] : []);
+  except  = except instanceof Set ? except : new Set(Array.isArray(except) ? except : except ? [except] : []);
+
+  const finalTargets = new Set();
+  for (const [id, addon] of getAddons()) {
+    if (addon.listeningTypes.includes(type) &&
+        (targets.size == 0 || targets.has(id)) &&
+        !except.has(id))
+      finalTargets.add(id);
+  }
+  //log('getListenersForMessageType ', { type, targets, except, finalTargets, all: mAddons });
+  return Array.from(finalTargets, getAddon);
+}
+
+export async function sendMessage(addonId, message, { tabProperties, cache, isContextTab } = {}) {
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+
+  cache = cache || {};
+
+  const incognitoParams = { windowId: message.windowId || message.window };
+  for (const key of tabProperties) {
+    if (!message[key])
+      continue;
+    if (Array.isArray(message[key]))
+      incognitoParams.tab = message[key][0].tab;
+    else
+      incognitoParams.tab = message[key].tab;
+    break;
+  }
+  if (!isSafeAtIncognito(addonId, incognitoParams))
+    throw new Error(`Message from incognito source is not allowed for ${addonId}`);
+
+  const safeMessage = await sanitizeMessage(message, { addonId, tabProperties, cache, isContextTab });
+  const result = directSendMessage(addonId, safeMessage);
+  if (result.error)
+    throw result.error;
+  return result.result;
+}
+
+export async function broadcastMessage(message, { targets, except, tabProperties, cache, isContextTab } = {}) {
+  if (!configs.APIEnabled)
+    return [];
+
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+
+  const listenerAddons = getListenersForMessageType(message.type, { targets, except });
+  tabProperties = tabProperties || [];
+  cache         = cache || {};
+  log(`broadcastMessage: sending message for ${message.type}: `, {
+    message,
+    listenerAddons,
+    tabProperties
+  });
+
+  const promisedResults = spawnMessages(new Set(listenerAddons.map(addon => addon.id)), {
+    message,
+    tabProperties,
+    cache,
+    isContextTab,
+  });
+  return Promise.all(promisedResults).then(results => {
+    log(`broadcastMessage: got responses for ${message.type}: `, results);
+    return results;
+  }).catch(ApiTabs.createErrorHandler());
+}
+
+function* spawnMessages(targets, { message, tabProperties, cache, isContextTab }) {
+  tabProperties = tabProperties || [];
+  cache         = cache || {};
+
+  const incognitoParams = { windowId: message.windowId || message.window };
+  for (const key of tabProperties) {
+    if (!message[key])
+      continue;
+    if (Array.isArray(message[key]))
+      incognitoParams.tab = message[key][0].tab;
+    else
+      incognitoParams.tab = message[key].tab;
+    break;
+  }
+
+  const send = async (id) => {
+    if (!isSafeAtIncognito(id, incognitoParams))
+      return {
+        id,
+        result: undefined
+      };
+
+    const allowedMessage = await sanitizeMessage(message, { addonId: id, tabProperties, cache, isContextTab });
+    const addon = getAddon(id) || {};
+    if (BULK_MESSAGING_TYPES.has(message.type) &&
+        addon.allowBulkMessaging) {
+      const startAt = `${Date.now()}-${parseInt(Math.random() * 65000)}`;
+      mMessagesPendedAt.set(id, startAt);
+      const messages = mPendingMessagesFor.get(id) || [];
+      messages.push(allowedMessage);
+      mPendingMessagesFor.set(id, messages);
+      (Constants.IS_BACKGROUND ?
+        setTimeout : // because window.requestAnimationFrame is decelerate for an invisible document.
+        window.requestAnimationFrame)(() => {
+        if (mMessagesPendedAt.get(id) != startAt)
+          return;
+        const messages = mPendingMessagesFor.get(id);
+        mPendingMessagesFor.delete(id);
+        if (!messages || messages.length == 0)
+          return;
+        directSendMessage(id, messages.length == 1 ? messages[0] : { messages });
+      }, 0);
+      return {
+        id,
+        result: null,
+      };
+    }
+
+    return directSendMessage(id, allowedMessage);
+  };
+
+  for (const id of targets) {
+    yield send(id);
+  }
+}
+async function directSendMessage(id, message) {
+  try {
+    const result = await (id == browser.runtime.id ?
+      browser.runtime.sendMessage(
+        Array.isArray(message) ?
+          message.map(message => ({ ...message, type: `${INTERNAL_CALL_PREFIX}${message.type}` })) :
+          ({ ...message, type: `${INTERNAL_CALL_PREFIX}${message.type}` })
+      ) :
+      browser.runtime.sendMessage(id, message));
+    return {
+      id,
+      result,
+    };
+  }
+  catch(error) {
+    console.log(`Error on sending message to ${id}`, message, error);
+    if (error &&
+        error.message == 'Could not establish connection. Receiving end does not exist.') {
+      browser.runtime.sendMessage(id, { type: kNOTIFY_READY }).catch(_error => {
+        console.log(`Unregistering missing helper addon ${id}...`);
+        unregisterAddon(id);
+        if (Constants.IS_SIDEBAR)
+          browser.runtime.sendMessage({ type: kCOMMAND_UNREGISTER_ADDON, id });
+      });
+    }
+    return {
+      id,
+      error,
+    };
+  }
+}
+
+export function isSafeAtIncognito(addonId, { tab, windowId }) {
+  if (addonId == browser.runtime.id)
+    return true;
+  const win = windowId && TabsStore.windows.get(windowId);
+  const hasIncognitoInfo = win?.incognito || tab?.incognito;
+  return !hasIncognitoInfo || configs.incognitoAllowedExternalAddons.includes(addonId);
+}
+
+async function sanitizeMessage(message, { addonId, tabProperties, cache, isContextTab }) {
+  const addon = getAddon(addonId);
+  if (!message ||
+      !tabProperties ||
+      tabProperties.length == 0 ||
+      addon.bypassPermissionCheck)
+    return message;
+
+  cache = cache || {};
+
+  const sanitizedProperties = {};
+  const tasks = [];
+  if (tabProperties) {
+    for (const name of tabProperties) {
+      const treeItem = message[name];
+      if (!treeItem)
+        continue;
+      if (Array.isArray(treeItem))
+        tasks.push((async treeItems => {
+          const tabs = await Promise.all(treeItems.map(treeItem => exportTab(treeItem, {
+            addonId: addon.id,
+            light:   !!addon.lightTree,
+            cache,
+            isContextTab,
+          })));
+          sanitizedProperties[name] = tabs.filter(tab => !!tab);
+        })(treeItem));
+      else
+        tasks.push((async () => {
+          sanitizedProperties[name] = await exportTab(treeItem, {
+            addonId: addon.id,
+            light:   !!addon.lightTree,
+            cache,
+            isContextTab,
+          });
+        })());
+    }
+  }
+  await Promise.all(tasks);
+  return { ...message, ...sanitizedProperties };
+}
+
+
+// =======================================================================
+// Common utilities for request-response type API call
+// =======================================================================
+
+export async function getTargetTabs(message, sender) {
+  const tabQuery = message.tabs || message.tabIds || message.tab || message.tabId;
+  const windowId = message.window || message.windowId;
+
+  if (Array.isArray(tabQuery))
+    await Promise.all(tabQuery.map(oneTabQuery => {
+      if (typeof oneTabQuery == 'number')
+        return Tab.waitUntilTracked(oneTabQuery)
+      return true;
+    }));
+  else if (typeof tabQuery == 'number')
+    await Tab.waitUntilTracked(tabQuery);
+
+  if (windowId)
+    await Tab.waitUntilTrackedAll(windowId);
+
+  const queryOptions = {};
+  if (Array.isArray(queryOptions.states)) {
+    queryOptions.states = queryOptions.states || [];
+    queryOptions.states.push(...queryOptions.states.map(state => [state, true]));
+  }
+  if (Array.isArray(queryOptions.statesNot)) {
+    queryOptions.states = queryOptions.statesNot || [];
+    queryOptions.states.push(...queryOptions.statesNot.map(state => [state, false]));
+  }
+
+  if (Array.isArray(tabQuery))
+    return getTabsByQueries(tabQuery, { windowId, queryOptions, sender });
+
+  if (windowId) {
+    if (tabQuery == '*')
+      return Tab.getAllTabs(windowId, { ...queryOptions, iterator: true });
+    else if (!tabQuery)
+      return Tab.getRootTabs(windowId, { ...queryOptions, iterator: true });
+  }
+  if (tabQuery == '*') {
+    const win = await browser.windows.getLastFocused({
+      windowTypes: ['normal']
+    }).catch(ApiTabs.createErrorHandler());
+    return Tab.getAllTabs(win.id, { ...queryOptions, iterator: true });
+  }
+  if (tabQuery) {
+    let tabs = await getTabsByQueries([tabQuery], { windowId, queryOptions, sender });
+    if (queryOptions.states)
+      tabs = tabs.filter(tab => {
+        const unified = new Set([...tab.$TST.states, ...queryOptions.states]);
+        return unified.size == tab.$TST.states.size;
+      });
+    if (queryOptions.statesNot)
+      tabs = tabs.filter(tab => {
+        const unified = new Set([...tab.$TST.states, ...queryOptions.statesNot]);
+        return unified.size > tab.$TST.states.size;
+      });
+    return tabs;
+  }
+  return [];
+}
+
+export async function getTargetRenderedTabs(message, sender) {
+  // Don't touch to this "tabs" until they are finally returned.
+  // Populating it to an array while operations will finishes
+  // the iterator and returned tabs will become just blank.
+  const tabs = await getTargetTabs(message, sender);
+  if (!tabs)
+    return tabs;
+
+  const windowId = message.window ||
+    message.windowId ||
+    await browser.windows.getLastFocused({
+      windowTypes: ['normal']
+    }).catch(ApiTabs.createErrorHandler()).then(win => win?.id);
+  const renderedTabIds = await browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_GET_RENDERED_TAB_IDS,
+    windowId,
+  });
+  const renderedTabIdsSet = new Set(renderedTabIds);
+  return Array.from(tabs).filter(tab => renderedTabIdsSet.has(tab.id));
+}
+
+async function getTabsByQueries(queries, { windowId, queryOptions, sender }) {
+  const win = !windowId && await browser.windows.getLastFocused({
+    populate: true
+  }).catch(ApiTabs.createErrorHandler());
+  const activeWindow = TabsStore.windows.get(windowId || win.id) || win;
+  const tabs = await Promise.all(queries.map(query => getTabsByQuery(query, { activeWindow, queryOptions, sender }).catch(error => {
+    console.error(error);
+    return null;
+  })));
+  log('getTabsByQueries: ', queries, ' => ', tabs, 'sender: ', sender, windowId);
+
+  return tabs.flat().filter(tab => !!tab);
+}
+
+async function getTabsByQuery(query, { activeWindow, queryOptions, sender }) {
+  log('getTabsByQuery: ', { query, activeWindow, queryOptions, sender });
+  if (query && typeof query == 'object' && typeof query.id == 'number') // tabs.Tab
+    query = query.id;
+  let id = query;
+  query = String(query).toLowerCase();
+  let baseTab = Tab.getActiveTab(activeWindow.id);
+
+  // this sometimes happen when the active tab was detached from the window
+  if (!baseTab)
+    return null;
+
+  const nonActiveTabMatched = query.match(/^([^-]+)-of-(.+)$/i);
+  if (nonActiveTabMatched) {
+    query = nonActiveTabMatched[1];
+    id    = nonActiveTabMatched[2];
+    if (/^\d+$/.test(id))
+      id = parseInt(id);
+    baseTab = Tab.get(id) || Tab.getByUniqueId(id);
+    if (!baseTab)
+      return null;
+  }
+  switch (query) {
+    case 'active':
+    case 'current':
+      return baseTab;
+
+    case 'parent':
+      return baseTab.$TST.parent;
+
+    case 'root':
+      return baseTab.$TST.rootTab;
+
+    case 'next':
+      return baseTab.$TST.nextTab;
+    case 'nextcyclic':
+      return baseTab.$TST.nextTab || Tab.getFirstTab(baseTab.windowId, queryOptions || {});
+
+    case 'previous':
+    case 'prev':
+      return baseTab.$TST.previousTab;
+    case 'previouscyclic':
+    case 'prevcyclic':
+      return baseTab.$TST.previousTab || Tab.getLastTab(baseTab.windowId, queryOptions || {});
+
+    case 'nextsibling':
+      return baseTab.$TST.nextSiblingTab;
+    case 'nextsiblingcyclic': {
+      const nextSibling = baseTab.$TST.nextSiblingTab;
+      if (nextSibling)
+        return nextSibling;
+      const parent = baseTab.$TST.parent;
+      if (parent)
+        return parent.$TST.firstChild;
+      return Tab.getFirstTab(baseTab.windowId, queryOptions || {});
+    }
+
+    case 'previoussibling':
+    case 'prevsibling':
+      return baseTab.$TST.previousSiblingTab;
+    case 'previoussiblingcyclic':
+    case 'prevsiblingcyclic': {
+      const previousSiblingTab = baseTab.$TST.previousSiblingTab;
+      if (previousSiblingTab)
+        return previousSiblingTab;
+      const parent = baseTab.$TST.parent;
+      if (parent)
+        return parent.$TST.lastChild;
+      return Tab.getLastRootTab(baseTab.windowId, queryOptions || {});
+    }
+
+    case 'nextvisible':
+      return baseTab.$TST.nearestVisibleFollowingTab;
+    case 'nextvisiblecyclic':
+      return baseTab.$TST.nearestVisibleFollowingTab || Tab.getFirstVisibleTab(baseTab.windowId, queryOptions || {});
+
+    case 'previousvisible':
+    case 'prevvisible':
+      return baseTab.$TST.nearestVisiblePrecedingTab;
+    case 'previousvisiblecyclic':
+    case 'prevvisiblecyclic':
+      return baseTab.$TST.nearestVisiblePrecedingTab || Tab.getLastVisibleTab(baseTab.windowId, queryOptions || {});
+
+    case 'lastdescendant':
+      return baseTab.$TST.lastDescendant;
+
+    case 'sendertab':
+      return Tab.get(sender?.tab?.id) || null;
+
+
+    case 'highlighted':
+    case 'multiselected':
+      return Tab.getHighlightedTabs(baseTab.windowId, queryOptions || {});
+
+    case 'allvisibles':
+      return Tab.getVisibleTabs(baseTab.windowId, queryOptions || {});
+
+    case 'normalvisibles':
+      return Tab.getVisibleTabs(baseTab.windowId, { ...(queryOptions || {}), normal: true });
+
+
+    default:
+      return Tab.get(id) || Tab.getByUniqueId(id);
+  }
+}
+
+export function formatResult(results, originalMessage) {
+  if (Array.isArray(originalMessage.tabs) ||
+      originalMessage.tab == '*' ||
+      originalMessage.tabs == '*')
+    return results;
+  if (originalMessage.tab)
+    return results[0];
+  return results;
+}
+
+const TABS_ARRAY_QUERY_MATCHER = /^(\*|allvisibles|normalvisibles)$/i;
+
+export async function formatTabResult(exportedTabs, originalMessage) {
+  exportedTabs = await Promise.all(exportedTabs);
+  if (Array.isArray(originalMessage.tabs) ||
+      TABS_ARRAY_QUERY_MATCHER.test(originalMessage.tab) ||
+      TABS_ARRAY_QUERY_MATCHER.test(originalMessage.tabs))
+    return exportedTabs.filter(tab => !!tab);
+  return exportedTabs.length == 0 ?
+    null :
+    exportedTabs[0];
+}
diff --git a/waterfox/browser/components/sidebar/common/unique-id.js b/waterfox/browser/components/sidebar/common/unique-id.js
new file mode 100644
index 0000000000000..89969cbe992d9
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/unique-id.js
@@ -0,0 +1,181 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  wait,
+} from './common.js';
+import * as ApiTabs from './api-tabs.js';
+import * as Constants from './constants.js';
+import * as TabsStore from './tabs-store.js';
+
+// eslint-disable-next-line no-unused-vars
+function log(...args) {
+  internalLogger('common/unique-id', ...args);
+}
+
+//===================================================================
+// Unique Tab ID
+//===================================================================
+
+// for generated IDs
+const kID_ADJECTIVES = `
+Agile
+Breezy
+Cheerful
+Dapper
+Edgy
+Feisty
+Gutsy
+Hoary
+Intrepid
+Jaunty
+Karmic
+Lucid
+Marveric
+Natty
+Oneiric
+Precise
+Quantal
+Raring
+Saucy
+Trusty
+Utopic
+Vivid
+Warty
+Xenial
+Yakkety
+Zesty
+`.toLowerCase().trim().split(/\s+/);
+
+const kID_NOUNS = `
+Alpaca
+Badger
+Cat
+Drake
+Eft
+Fawn
+Gibbon
+Heron
+Ibis
+Jackalope
+Koala
+Lynx
+Meerkat
+Narwhal
+Ocelot
+Pangolin
+Quetzal
+Ringtail
+Salamander
+Tahr
+Unicorn
+Vervet
+Werwolf
+Xerus
+Yak
+Zapus
+`.toLowerCase().trim().split(/\s+/);
+
+let mReadyToDetectDuplicatedTab = false;
+
+export function readyToDetectDuplicatedTab() {
+  mReadyToDetectDuplicatedTab = true;
+}
+
+export async function request(tabOrId, options = {}) {
+  if (typeof options != 'object')
+    options = {};
+
+  let tab = tabOrId;
+  if (typeof tabOrId == 'number')
+    tab = TabsStore.tabs.get(tabOrId);
+
+  if (TabsStore.getCurrentWindowId()) {
+    return browser.runtime.sendMessage({
+      type:  Constants.kCOMMAND_REQUEST_UNIQUE_ID,
+      tabId: tab.id
+    }).catch(ApiTabs.createErrorHandler());
+  }
+
+  let originalId    = null;
+  let originalTabId = null;
+  let duplicated    = false;
+  if (!options.forceNew) {
+    // https://github.com/piroor/treestyletab/issues/2845
+    // This delay may break initial restoration of tabs, so we should
+    // ignore it until all restoration processes are finished.
+    if (mReadyToDetectDuplicatedTab &&
+        configs.delayForDuplicatedTabDetection > 0)
+      await wait(configs.delayForDuplicatedTabDetection);
+
+    let oldId = await browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_ID).catch(ApiTabs.createErrorHandler());
+    if (oldId && !oldId.tabId) // ignore broken information!
+      oldId = null;
+
+    if (oldId) {
+      // If the tab detected from stored tabId is different, it is duplicated tab.
+      try {
+        const tabWithOldId = TabsStore.tabs.get(oldId.tabId);
+        if (!tabWithOldId)
+          throw new Error(`Invalid tab ID: ${oldId.tabId}`);
+        originalId = (tabWithOldId.$TST.uniqueId || await tabWithOldId.$TST.promisedUniqueId).id;
+        duplicated = tab && tabWithOldId.id != tab.id && originalId == oldId.id;
+        if (duplicated)
+          originalTabId = oldId.tabId;
+        else
+          throw new Error(`Invalid tab ID: ${oldId.tabId}`);
+      }
+      catch(e) {
+        ApiTabs.handleMissingTabError(e);
+        // It fails if the tab doesn't exist.
+        // There is no live tab for the tabId, thus
+        // this seems to be a tab restored from session.
+        // We need to update the related tab id.
+        browser.sessions.setTabValue(tab.id, Constants.kPERSISTENT_ID, {
+          id:    oldId.id,
+          tabId: tab.id
+        }).catch(ApiTabs.createErrorSuppressor());
+        return {
+          id:            oldId.id,
+          originalId:    null,
+          originalTabId: oldId.tabId,
+          restored:      true
+        };
+      }
+    }
+  }
+
+  const id = `tab-${generate()}`;
+  // tabId is for detecttion of duplicated tabs
+  await browser.sessions.setTabValue(tab.id, Constants.kPERSISTENT_ID, { id, tabId: tab.id }).catch(ApiTabs.createErrorSuppressor());
+  return { id, originalId, originalTabId, duplicated };
+}
+
+function generate() {
+  const adjective   = kID_ADJECTIVES[Math.floor(Math.random() * kID_ADJECTIVES.length)];
+  const noun        = kID_NOUNS[Math.floor(Math.random() * kID_NOUNS.length)];
+  const randomValue = Math.floor(Math.random() * 1000);
+  return `${adjective}-${noun}-${Date.now()}-${randomValue}`;
+}
+
+export async function getFromTabs(tabs) {
+  return Promise.all(tabs.map(tab =>
+    browser.sessions.getTabValue(tab.id, Constants.kPERSISTENT_ID).catch(ApiTabs.createErrorHandler())
+  ));
+}
+
+export async function ensureWindowId(windowId) {
+  const storedUniqueId = await browser.sessions.getWindowValue(windowId, 'uniqueId').catch(_ => null);
+  if (storedUniqueId)
+    return storedUniqueId;
+
+  const uniqueId = `window-${generate()}`;
+  await browser.sessions.setWindowValue(windowId, 'uniqueId', uniqueId).catch(_ => null);
+  return uniqueId;
+}
diff --git a/waterfox/browser/components/sidebar/common/user-operation-blocker.js b/waterfox/browser/components/sidebar/common/user-operation-blocker.js
new file mode 100644
index 0000000000000..54ad1bc58387f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/common/user-operation-blocker.js
@@ -0,0 +1,109 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs
+} from './common.js';
+import * as Constants from './constants.js';
+import * as SidebarConnection from './sidebar-connection.js';
+import * as TabsStore from './tabs-store.js';
+
+function log(...args) {
+  internalLogger('common/user-operation-blocker', ...args);
+}
+
+let mBlockingCount = 0;
+let mBlockingThrobberCount = 0;
+const mProgressbar = document.querySelector('#blocking-screen progress');
+
+export function block({ throbber, shade } = {}) {
+  mBlockingCount++;
+  document.documentElement.classList.add(Constants.kTABBAR_STATE_BLOCKING);
+  log('block ', mBlockingCount, () => new Error().stack);
+  if (throbber) {
+    mBlockingThrobberCount++;
+    mProgressbar.delayedShow = setTimeout(() => {
+      mProgressbar.delayedShow = null;
+      mProgressbar.classList.add('shown');
+    }, configs.delayToShowProgressForBlockedUserOperation);
+    document.documentElement.classList.add(Constants.kTABBAR_STATE_BLOCKING_WITH_THROBBER);
+  }
+  else if (shade) {
+    document.documentElement.classList.add(Constants.kTABBAR_STATE_BLOCKING_WITH_SHADE);
+  }
+}
+
+export function setProgress(percentage, windowId = null) {
+  percentage = Math.max(0, Math.min(100, percentage));
+  if (mProgressbar)
+    mProgressbar.value = percentage;
+  if (windowId && !TabsStore.getCurrentWindowId())
+    SidebarConnection.sendMessage({
+      type: Constants.kCOMMAND_PROGRESS_USER_OPERATIONS,
+      windowId,
+      percentage
+    });
+}
+
+export function blockIn(windowId, { throbber, shade } = {}) {
+  const targetWindow = TabsStore.getCurrentWindowId();
+  if (targetWindow && targetWindow != windowId)
+    return;
+
+  log(`blockIn(${windowId}) `, () => new Error().stack);
+  if (!targetWindow) {
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_BLOCK_USER_OPERATIONS,
+      windowId,
+      throbber: !!throbber,
+      shade:    !!shade
+    });
+    return;
+  }
+  block({ throbber, shade });
+}
+
+export function unblock() {
+  mBlockingThrobberCount--;
+  log('unblock ', mBlockingCount, () => new Error().stack);
+  if (mBlockingThrobberCount < 0)
+    mBlockingThrobberCount = 0;
+  if (mBlockingThrobberCount == 0) {
+    setProgress(0);
+    mProgressbar.classList.remove('shown');
+    if (mProgressbar.delayedShow)
+      clearTimeout(mProgressbar.delayedShow);
+    document.documentElement.classList.remove(Constants.kTABBAR_STATE_BLOCKING_WITH_THROBBER);
+    document.documentElement.classList.remove(Constants.kTABBAR_STATE_BLOCKING_WITH_SHADE);
+  }
+
+  mBlockingCount--;
+  if (mBlockingCount < 0)
+    mBlockingCount = 0;
+  if (mBlockingCount == 0)
+    document.documentElement.classList.remove(Constants.kTABBAR_STATE_BLOCKING);
+}
+
+export function unblockIn(windowId, { throbber, shade } = {}) {
+  const targetWindow = TabsStore.getCurrentWindowId();
+  if (targetWindow && targetWindow != windowId)
+    return;
+
+  log(`unblockIn(${windowId}) `, () => new Error().stack);
+  if (!targetWindow) {
+    SidebarConnection.sendMessage({
+      type:     Constants.kCOMMAND_UNBLOCK_USER_OPERATIONS,
+      windowId,
+      throbber: !!throbber,
+      shade:    !!shade
+    });
+    return;
+  }
+  unblock({ throbber, shade });
+}
+
diff --git a/waterfox/browser/components/sidebar/experiments/prefs.js b/waterfox/browser/components/sidebar/experiments/prefs.js
new file mode 100644
index 0000000000000..d6093465b2d3d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/prefs.js
@@ -0,0 +1,165 @@
+/* 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/. */
+/* Original: https://github.com/mozilla-extensions/webcompat-addon/blob/main/src/experiment-apis/aboutConfigPrefs.js */
+'use strict';
+
+const AboutPreferencesWatcher = {
+  BASE_URL: null, // this need to be replaced with "moz-extension://..../"
+  BASE_PREF: 'browser.sidebar.', // null,
+
+  onPrefChanged(name) {
+    switch (name) {
+      case 'browser.tabs.selectOwnerOnClose':
+        Services.prefs.setBoolPref(`${this.BASE_PREF}simulateSelectOwnerOnClose`, Services.prefs.getBoolPref(name));
+        break;
+
+      case 'browser.tabs.loadInBackground':
+        Services.prefs.setBoolPref(`${this.BASE_PREF}simulateTabsLoadInBackgroundInverted`, Services.prefs.getBoolPref(name));
+        break;
+
+      case 'browser.tabs.warnOnClose':
+        Services.prefs.setBoolPref(`${this.BASE_PREF}warnOnCloseTabs`, Services.prefs.getBoolPref(name));
+        break;
+
+      case 'browser.tabs.searchclipboardfor.middleclick':
+        Services.prefs.setBoolPref(`${this.BASE_PREF}middleClickPasteURLOnNewTabButton`, Services.prefs.getBoolPref(name));
+        break;
+
+      case 'browser.tabs.insertAfterCurrent':
+      case 'browser.tabs.insertRelatedAfterCurrent': {
+        const insertAfterCurrent        = Services.prefs.getBoolPref('browser.tabs.insertAfterCurrent');
+        const insertRelatedAfterCurrent = Services.prefs.getBoolPref('browser.tabs.insertRelatedAfterCurrent');
+        const useTree = (
+          Services.prefs.getBoolPref(`${this.BASE_PREF}autoAttach`, false) &&
+          Services.prefs.getBoolPref(`${this.BASE_PREF}syncParentTabAndOpenerTab`, false)
+        );
+        Services.prefs.setStringPref(`${this.BASE_PREF}autoAttachOnOpenedWithOwner`,
+          !useTree ? -1 :
+            insertRelatedAfterCurrent ? 5 :
+              insertAfterCurrent ? 6 :
+                0);
+        Services.prefs.setStringPref(`${this.BASE_PREF}insertNewTabFromPinnedTabAt`,
+          !useTree ? -1 :
+            insertRelatedAfterCurrent ? 3 :
+              insertAfterCurrent ? 0 :
+                1);
+        Services.prefs.setStringPref(`${this.BASE_PREF}insertNewTabFromFirefoxViewAt`,
+          !useTree ? -1 :
+            insertRelatedAfterCurrent ? 3 :
+              insertAfterCurrent ? 0 :
+                1);
+      }; break;
+    }
+  },
+
+  // as an XPCOM component...
+  classDescription: 'Waterfox Chrome Window Watcher for about:preferences',
+  contractID:       '@waterfox.net/chrome-window-watche-about-preferences;1',
+  classID:          Components.ID('{c8a990cf-b9a3-4b4c-829c-a1dfc5753527}'),
+  QueryInterface:   ChromeUtils.generateQI([
+    'nsIObserver',
+    'nsISupportsWeakReference',
+  ]),
+
+  // nsIObserver
+  observe(subject, topic, data) {
+    switch (topic) {
+      case 'nsPref:changed':
+        this.onPrefChanged(data);
+        break;
+    }
+  },
+
+  createInstance(iid) {
+    return this.QueryInterface(iid);
+  },
+};
+
+this.prefs = class extends ExtensionAPI {
+  getAPI(context) {
+    const EventManager = ExtensionCommon.EventManager;
+    const extensionIDBase = context.extension.id.split('@')[0];
+
+    AboutPreferencesWatcher.BASE_URL = context.extension.baseURL;
+
+    // Synchronize simulation configs with the browser's preferences
+    for (const [source, dest] of Object.entries({
+      'browser.tabs.selectOwnerOnClose': `${AboutPreferencesWatcher.BASE_PREF}simulateSelectOwnerOnClose`,
+      'browser.tabs.loadInBackground':   `${AboutPreferencesWatcher.BASE_PREF}simulateTabsLoadInBackgroundInverted`,
+      'browser.tabs.warnOnClose':        `${AboutPreferencesWatcher.BASE_PREF}warnOnCloseTabs`,
+      'browser.tabs.searchclipboardfor.middleclick': `${AboutPreferencesWatcher.BASE_PREF}middleClickPasteURLOnNewTabButton`,
+    })) {
+      Services.prefs.setBoolPref(dest, Services.prefs.getBoolPref(source));
+    }
+    Services.prefs.addObserver('browser.tabs.', AboutPreferencesWatcher);
+    AboutPreferencesWatcher.onPrefChanged('browser.tabs.insertAfterCurrent');
+
+    return {
+      prefs: {
+        onChanged: new EventManager({
+          context,
+          name: 'prefs.onChanged',
+          register: (fire) => {
+            const observe = (_subject, _topic, data) => {
+              fire.async(data.replace(AboutPreferencesWatcher.BASE_PREF, '')).catch(() => {}); // ignore Message Manager disconnects
+            };
+            Services.prefs.addObserver(AboutPreferencesWatcher.BASE_PREF, observe);
+            return () => {
+              Services.prefs.removeObserver(AboutPreferencesWatcher.BASE_PREF, observe);
+            };
+          },
+        }).api(),
+        async getBoolValue(name, defaultValue = false) {
+          try {
+            return Services.prefs.getBoolPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+        async setBoolValue(name, value) {
+          Services.prefs.setBoolPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+        async setDefaultBoolValue(name, value) {
+          Services.prefs.getDefaultBranch(null).setBoolPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+        async getStringValue(name, defaultValue = '') {
+          try {
+            return Services.prefs.getStringPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+        async setStringValue(name, value) {
+          Services.prefs.setStringPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+        async setDefaultStringValue(name, value) {
+          Services.prefs.getDefaultBranch(null).setStringPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+        async getIntValue(name, defaultValue = 0) {
+          try {
+            return Services.prefs.getIntPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+        async setIntValue(name, value) {
+          Services.prefs.setIntPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+        async setDefaultIntValue(name, value) {
+          Services.prefs.getDefaultBranch(null).setIntPref(`${AboutPreferencesWatcher.BASE_PREF}${name}`, value);
+        },
+      },
+    };
+  }
+
+  onShutdown(isAppShutdown) {
+    if (isAppShutdown)
+      return;
+
+    Services.prefs.removeObserver('browser.tabs.', AboutPreferencesWatcher);
+  }
+};
diff --git a/waterfox/browser/components/sidebar/experiments/prefs.json b/waterfox/browser/components/sidebar/experiments/prefs.json
new file mode 100644
index 0000000000000..1184381aba9d8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/prefs.json
@@ -0,0 +1,199 @@
+[
+  {
+    "namespace": "prefs",
+    "description": "",
+    "functions": [
+      {
+        "name": "getBoolValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "boolean",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "boolean",
+          "description": ""
+        },
+        "async": true
+      },
+      {
+        "name": "setBoolValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "boolean",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      },
+      {
+        "name": "setDefaultBoolValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "boolean",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      },
+      {
+        "name": "getStringValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "string",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "string",
+          "description": ""
+        },
+        "async": true
+      },
+      {
+        "name": "setStringValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "string",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      },
+      {
+        "name": "setDefaultStringValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "string",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      },
+      {
+        "name": "getIntValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "integer",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "integer",
+          "description": ""
+        },
+        "async": true
+      },
+      {
+        "name": "setIntValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "integer",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      },
+      {
+        "name": "setDefaultIntValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "integer",
+            "name": "value",
+            "description": ""
+          }
+        ],
+        "async": true
+      }
+    ],
+    "events": [
+      {
+        "name": "onChanged",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/experiments/syncPrefs.js b/waterfox/browser/components/sidebar/experiments/syncPrefs.js
new file mode 100644
index 0000000000000..8cef46fce96c8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/syncPrefs.js
@@ -0,0 +1,41 @@
+/* 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/. */
+/* Original: https://github.com/mozilla-extensions/webcompat-addon/blob/main/src/experiment-apis/aboutConfigPrefsChild.js */
+'use strict';
+
+this.syncPrefs = class extends ExtensionAPI {
+  getAPI(context) {
+    const extensionIDBase = context.extension.id.split('@')[0];
+    const extensionPrefNameBase = `extensions.${extensionIDBase}.`;
+
+    return {
+      syncPrefs: {
+        getBoolValue(name, defaultValue = false) {
+          try {
+            return Services.prefs.getBoolPref(`${extensionPrefNameBase}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+        getStringValue(name, defaultValue = '') {
+          try {
+            return Services.prefs.getStringPref(`${extensionPrefNameBase}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+        getIntValue(name, defaultValue = 0) {
+          try {
+            return Services.prefs.getIntPref(`${extensionPrefNameBase}${name}`, defaultValue);
+          }
+          catch(_error) {
+            return defaultValue;
+          }
+        },
+      },
+    };
+  }
+};
diff --git a/waterfox/browser/components/sidebar/experiments/syncPrefs.json b/waterfox/browser/components/sidebar/experiments/syncPrefs.json
new file mode 100644
index 0000000000000..efd05f00be081
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/syncPrefs.json
@@ -0,0 +1,76 @@
+[
+  {
+    "namespace": "syncPrefs",
+    "description": "",
+    "functions": [
+      {
+        "name": "getBoolValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "boolean",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "boolean",
+          "description": ""
+        }
+      },
+      {
+        "name": "getStringValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "string",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "string",
+          "description": ""
+        }
+      },
+      {
+        "name": "getIntValue",
+        "description": "",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "description": ""
+          },
+          {
+            "type": "integer",
+            "name": "default",
+            "optional": true,
+            "description": ""
+          }
+        ],
+        "returns": {
+          "type": "integer",
+          "description": ""
+        }
+      }
+    ],
+    "events": [
+    ]
+  }
+]
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/experiments/waterfoxBridge.js b/waterfox/browser/components/sidebar/experiments/waterfoxBridge.js
new file mode 100644
index 0000000000000..3e370d7f9bf00
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/waterfoxBridge.js
@@ -0,0 +1,887 @@
+/* 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/. */
+'use strict';
+
+const HTML = 'http://www.w3.org/1999/xhtml';
+const XUL  = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';
+
+const TYPE_TREE = 'application/x-ws-tree';
+const TST_ID = 'treestyletab@piro.sakura.ne.jp';
+
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  AddonManager: 'resource://gre/modules/AddonManager.sys.mjs',
+  CustomizableUI: 'resource:///modules/CustomizableUI.sys.mjs',
+  ExtensionPermissions: 'resource://gre/modules/ExtensionPermissions.sys.mjs',
+  PageThumbs: 'resource://gre/modules/PageThumbs.sys.mjs',
+  PlacesUtils: 'resource://gre/modules/PlacesUtils.sys.mjs',
+});
+
+// Range.createContextualFragment() unexpectedly drops XUL elements.
+// Moreover, the security mechanism of the browser rejects adoptation of elements
+// created by DOMParser(). Thus we need to create elements manually...
+function element(document, NS, localName, attributes, children) {
+  if (Array.isArray(attributes)) {
+    children   = attributes;
+    attributes = {};
+  }
+  const element = document.createElementNS(NS, localName);
+  if (attributes) {
+    for (const [name, value] of Object.entries(attributes)) {
+      element.setAttribute(name, value);
+    }
+  }
+  if (children) {
+    for (const child of children) {
+      if (typeof child == 'string')
+        element.appendChild(document.createTextNode(child));
+      else
+        element.appendChild(child);
+    }
+  }
+  return element;
+}
+
+const BrowserWindowWatcher = {
+  WATCHING_URLS: [
+    'chrome://browser/content/browser.xhtml',
+  ],
+  BASE_URL: null, // this need to be replaced with "moz-extension://..../"
+  BASE_PREF: 'browser.sidebar.', // null,
+  locale:   null, // this need to be replaced with a map
+  loadingForbiddenURLs: [],
+  autoplayBlockedListeners: new Set(),
+  autoplayUnblockedListeners: new Set(),
+  visibilityChangedListeners: new Set(),
+  menuCommandListeners: new Set(),
+  sidebarShownListeners: new Set(),
+  sidebarHiddenListeners: new Set(),
+  lastTransferredFiles: new Map(),
+
+  handleWindow(win) {
+    if (!win ||
+        !win.location)
+      return false;
+
+    const document = win.document;
+    if (!document)
+      return false;
+
+    if (win.location.href.startsWith('chrome://browser/content/browser.xhtml')) {
+      const installed = this.installTabsSidebar(win);
+      if (installed) {
+        win.addEventListener('DOMAudioPlaybackBlockStarted', this, { capture: true });
+        win.addEventListener('DOMAudioPlaybackBlockStopped', this, { capture: true });
+        win.addEventListener('visibilitychange', this);
+        win.addEventListener('TreeVerticalTabsShown', this);
+        win.addEventListener('TreeVerticalTabsHidden', this);
+      }
+      return installed;
+    }
+
+    return true;
+  },
+
+  unhandleWindow(win) {
+    if (!win ||
+        !win.location)
+      return;
+
+    const document = win.document;
+    if (!document)
+      return;
+
+    if (win.location.href.startsWith('chrome://browser/content/browser.xhtml')) {
+      this.uninstallTabsSidebar(win);
+      try {
+        win.removeEventListener('DOMAudioPlaybackBlockStarted', this, { capture: true });
+        win.removeEventListener('DOMAudioPlaybackBlockStopped', this, { capture: true });
+        win.removeEventListener('visibilitychange', this);
+        win.removeEventListener('TreeVerticalTabsShown', this);
+        win.removeEventListener('TreeVerticalTabsHidden', this);
+      }
+      catch(_error) {
+      }
+    }
+  },
+
+  installTabsSidebar(win) {
+    const document = win.document;
+
+    const tabsSidebarElement = document.querySelector('#tree-vertical-tabs-box');
+    if (tabsSidebarElement?.getAttribute('initialized') == 'true')
+      return true;
+
+    if (tabsSidebarElement) {
+      tabsSidebarElement.setAttribute('initialized', 'true');
+      tabsSidebarElement.addEventListener('dragover', this, { capture: true });
+    } else {
+      console.error('WaterfoxBridge: #tree-vertical-tabs element not found. Cannot attach event listeners or load panel.');
+    }
+
+    document.addEventListener('command', this);
+    document.addEventListener('customizationchange', this, { capture: true });
+
+    this.updateToggleButton(document);
+
+    return true;
+  },
+
+  getKeyFromFile(file) {
+    if (!file)
+      return '';
+    return `${file.name}?lastModified=${file.lastModified}&size=${file.size}&type=${file.type}`;
+  },
+  getFileURL(file) {
+    if (!file)
+      return '';
+    return this.lastTransferredFiles[this.getKeyFromFile(file)];
+  },
+
+  uninstallTabsSidebar(win) {
+    const document = win.document;
+
+    document.removeEventListener('command', this);
+    document.removeEventListener('customizationchange', this, { capture: true });
+
+    const tabsSidebarElement = document.querySelector('#tree-vertical-tabs-box');
+    if (tabsSidebarElement?.getAttribute('initialized') == 'true') {
+      tabsSidebarElement.removeAttribute('initialized');
+      tabsSidebarElement.removeEventListener('dragover', this, { capture: true });
+    }
+  },
+
+  updateToggleButton(document, button) {
+    button = button || document.querySelector('#toggle-tree-vertical-tabs');
+    if (!button)
+      return;
+
+    button.removeAttribute('disabled');
+  },
+
+  *iterateTargetWindows() {
+    const browserWindows = Services.wm.getEnumerator('navigator:browser');
+    while (browserWindows.hasMoreElements()) {
+      const win = browserWindows.getNext()/*.QueryInterface(Components.interfaces.nsIDOMWindow)*/
+      yield win;
+    }
+    return;
+  },
+
+  openOptions(win, full = false) {
+    const url = full ? `${this.BASE_URL}options/options.html#!` : 'about:preferences#tabsSidebar';
+
+    const windows = Services.wm.getEnumerator('navigator:browser');
+    while (windows.hasMoreElements()) {
+      const win = windows.getNext()/*.QueryInterface(Components.interfaces.nsIDOMWindow)*/;
+      if (!win.gBrowser)
+        continue;
+      for (const tab of win.gBrowser.tabs) {
+        if (tab.linkedBrowser.currentURI.spec != url)
+          continue;
+        win.gBrowser.selectedTab = tab;
+        return;
+      }
+    }
+
+    (win || Services.wm.getMostRecentBrowserWindow())
+      .openLinkIn(url, 'tab', {
+        allowThirdPartyFixup: false,
+        triggeringPrincipal:  Services.scriptSecurityManager.getSystemPrincipal(),
+        inBackground:         false,
+      });
+  },
+
+  handleEvent(event) {
+    const win = event.target.ownerDocument?.defaultView || event.target.defaultView;
+    switch (event.type) {
+      case 'command':
+        switch (event.target.id) {
+          case 'toggle-tree-vertical-tabs':
+          case 'toggle-tree-vertical-tabs-command':
+          case 'viewmenu-toggle-tree-vertical-tabs':
+            this.updateToggleButton(event.target.ownerDocument);
+            break;
+        }
+        break;
+
+      case 'customizationchange':
+        this.updateToggleButton(event.target.ownerDocument);
+        break;
+
+      case 'DOMAudioPlaybackBlockStarted': {
+        const gBrowser = event.target.ownerDocument.defaultView.gBrowser;
+        const tab      = gBrowser.getTabForBrowser(event.target);
+        for (const listener of this.autoplayBlockedListeners) {
+          listener(tab);
+        }
+      }; break;
+
+      case 'DOMAudioPlaybackBlockStopped': {
+        const gBrowser = event.target.ownerDocument.defaultView.gBrowser;
+        const tab      = gBrowser.getTabForBrowser(event.target);
+        for (const listener of this.autoplayUnblockedListeners) {
+          listener(tab);
+        }
+      }; break;
+
+      case 'visibilitychange':
+        for (const listener of this.visibilityChangedListeners) {
+          listener(event.currentTarget);
+        }
+        break;
+
+      case 'TreeVerticalTabsShown':
+        for (const listener of this.sidebarShownListeners) {
+          listener(event.target.ownerDocument.defaultView);
+        }
+        break;
+
+      case 'TreeVerticalTabsHidden':
+        for (const listener of this.sidebarHiddenListeners) {
+          listener(event.target.ownerDocument.defaultView);
+        }
+        break;
+
+      case 'dragover': {
+        const tabsSidebarElement = event.currentTarget;
+        this.lastTransferredFiles.clear();
+        for (const file of event.dataTransfer.files) {
+          const fileInternal = Cc['@mozilla.org/file/local;1']
+            .createInstance(Components.interfaces.nsIFile);
+          fileInternal.initWithPath(file.mozFullPath);
+          const url = Services.io.getProtocolHandler('file')
+            .QueryInterface(Components.interfaces.nsIFileProtocolHandler)
+            .getURLSpecFromActualFile(fileInternal);
+          this.lastTransferredFiles[this.getKeyFromFile(file)] = url;
+        }
+      }; break;
+    }
+  },
+  tryHidePopup(event) {
+    if (event.target.closest)
+      event.target.closest('panel')?.hidePopup();
+  },
+
+  // as an XPCOM component...
+  classDescription: 'Waterfox Chrome Window Watcher for Browser Windows',
+  contractID:       '@waterfox.net/chrome-window-watche-browser-windows;1',
+  classID:          Components.ID('{8d25e5cc-1d67-4556-819e-e25bd37c79c5}'),
+  QueryInterface:   ChromeUtils.generateQI([
+    'nsIContentPolicy',
+    'nsIObserver',
+    'nsISupportsWeakReference',
+  ]),
+
+  // nsIContentPolicy
+  shouldLoad(contentLocation, loadInfo, mimeTypeGuess) {
+     const FORBIDDEN_URL_MATCHER = /^about:blank\?forbidden-url=/;
+     if (FORBIDDEN_URL_MATCHER.test(contentLocation.spec)) {
+       const url = contentLocation.spec.replace(FORBIDDEN_URL_MATCHER, '');
+       const index = this.loadingForbiddenURLs.indexOf(url);
+       if (index > -1) {
+         this.loadingForbiddenURLs.splice(index, 1);
+         const browser = loadInfo.browsingContext.embedderElement;
+         browser.loadURI(Services.io.newURI(url), {
+           triggeringPrincipal:  Services.scriptSecurityManager.getSystemPrincipal(),
+         });
+         return Components.interfaces.nsIContentPolicy.REJECT_REQUEST;
+       }
+     }
+
+    if (this.WATCHING_URLS.some(url => contentLocation.spec.startsWith(url))) {
+      const startAt = Date.now();
+      const topWin  = loadInfo.browsingContext.topChromeWindow;
+      const timer   = topWin.setInterval(() => {
+        if (Date.now() - startAt > 1000) {
+          // timeout
+          topWin.clearInterval(timer);
+          return;
+        }
+        const win = loadInfo.browsingContext.window;
+        if (!win)
+          return;
+        try {
+          if (this.handleWindow(win))
+            topWin.clearInterval(timer);
+        }
+        catch(_error) {
+        }
+      }, 250);
+    }
+    return Components.interfaces.nsIContentPolicy.ACCEPT;
+  },
+
+  shouldProcess(contentLocation, loadInfo, mimeTypeGuess) {
+    return Components.interfaces.nsIContentPolicy.ACCEPT;
+  },
+
+  // nsIObserver
+  observe(subject, topic, data) {
+    switch (topic) {
+      case 'domwindowopened':
+        subject
+          //.QueryInterface(Components.interfaces.nsIDOMWindow)
+          .addEventListener('DOMContentLoaded', () => {
+            this.handleWindow(subject);
+          }, { once: true });
+        break;
+    }
+  },
+
+  createInstance(iid) {
+    return this.QueryInterface(iid);
+  },
+
+
+  // AddonManager listener callbacks
+
+  async tryConfirmUsingTST() {
+    const ignorePrefKey = `${this.BASE_PREF}.ignoreConflictionWithTST`;
+    if (Services.prefs.getBoolPref(ignorePrefKey, false))
+      return;
+
+    const nsIPrompt = Components.interfaces.nsIPrompt;
+    const shouldAsk = { value: true };
+    const result = Services.prompt.confirmEx(
+      Services.wm.getMostRecentBrowserWindow(),
+      this.locale.get('tryConfirmUsingTST_title'),
+      this.locale.get('tryConfirmUsingTST_message'),
+      (nsIPrompt.BUTTON_TITLE_IS_STRING * nsIPrompt.BUTTON_POS_0 |
+       nsIPrompt.BUTTON_TITLE_IS_STRING * nsIPrompt.BUTTON_POS_1 |
+       nsIPrompt.BUTTON_TITLE_IS_STRING * nsIPrompt.BUTTON_POS_2),
+      this.locale.get('tryConfirmUsingTST_WS'),
+      this.locale.get('tryConfirmUsingTST_both'),
+      this.locale.get('tryConfirmUsingTST_TST'),
+      this.locale.get('tryConfirmUsingTST_ask'),
+      shouldAsk
+    );
+
+    if (result > -1 &&
+        !shouldAsk.value)
+      Services.prefs.setBoolPref(ignorePrefKey, true);
+
+    switch (result) {
+      case 0: {
+        const addon = await lazy.AddonManager.getAddonByID(TST_ID);
+        addon.disable();
+      }; return;
+
+      case 2:
+        Services.prefs.setBoolPref('browser.sidebar.enabled', false);
+        return;
+
+      default:
+        return;
+    }
+  },
+
+  // install listener callbacks
+  onNewInstall(_install) {},
+  onInstallCancelled(_install) {},
+  onInstallPostponed(_install) {},
+  onInstallFailed(_install) {},
+  onInstallEnded(install) {
+    if (install.addon.id == TST_ID)
+      this.tryConfirmUsingTST();
+  },
+  onDownloadStarted(_install) {},
+  onDownloadCancelled(_install) {},
+  onDownloadEnded(_install) {},
+  onDownloadFailed(_install) {},
+
+  // addon listener callbacks
+  onUninstalled(_addon) {},
+  onEnabled(addon) {
+    if (addon.id == TST_ID)
+      this.tryConfirmUsingTST();
+  },
+  onDisabled(_addon) {},
+};
+
+this.waterfoxBridge = class extends ExtensionAPI {
+  getAPI(context) {
+    const EventManager = ExtensionCommon.EventManager;
+
+    return {
+      waterfoxBridge: {
+        async initUI() {
+          BrowserWindowWatcher.EXTENSION_ID = context.extension.id;
+          BrowserWindowWatcher.BASE_URL = context.extension.baseURL;
+          //BrowserWindowWatcher.BASE_PREF = `extensions.${context.extension.id.split('@')[0]}.`;
+          BrowserWindowWatcher.locale   = {
+            get(key) {
+              key = key.toLowerCase();
+              if (this.selected.has(key))
+                return this.selected.get(key);
+              return this.default.get(key) || key;
+            },
+            default:  context.extension.localeData.messages.get(context.extension.localeData.defaultLocale),
+            selected: context.extension.localeData.messages.get(context.extension.localeData.selectedLocale),
+          };
+
+          //const resourceURI = Services.io.newURI('resources', null, context.extension.rootURI);
+          //const handler = Cc['@mozilla.org/network/protocol;1?name=resource'].getService(Components.interfaces.nsISubstitutingProtocolHandler);
+          //handler.setSubstitution('waterfox-bridge', resourceURI);
+
+          // watch loading of about:preferences in subframes
+          const registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+          registrar.registerFactory(
+            BrowserWindowWatcher.classID,
+            BrowserWindowWatcher.classDescription,
+            BrowserWindowWatcher.contractID,
+            BrowserWindowWatcher
+          );
+          Services.catMan.addCategoryEntry(
+            'content-policy',
+            BrowserWindowWatcher.contractID,
+            BrowserWindowWatcher.contractID,
+            false,
+            true
+          );
+
+          // handle loading of browser windows
+          Services.ww.registerNotification(BrowserWindowWatcher);
+
+          // handle already opened browser windows
+          const windows = BrowserWindowWatcher.iterateTargetWindows();
+          while (true) {
+            const win = windows.next();
+            if (win.done)
+              break;
+            BrowserWindowWatcher.handleWindow(win.value);
+          }
+
+          // grant special permissions by default
+          if (!Services.prefs.getBoolPref(`${BrowserWindowWatcher.BASE_PREF}permissionsGranted`, false)) {
+            lazy.ExtensionPermissions.add(context.extension.id, {
+              origins: ['<all_urls>'],
+              permissions: ['internal:privateBrowsingAllowed'],
+            }, true);
+            Services.prefs.setBoolPref(`${BrowserWindowWatcher.BASE_PREF}permissionsGranted`, true);
+          }
+
+          // auto detection and warning for TST
+          lazy.AddonManager.addInstallListener(BrowserWindowWatcher);
+          lazy.AddonManager.addAddonListener(BrowserWindowWatcher);
+          const installedTST = await lazy.AddonManager.getAddonByID(TST_ID);
+          if (installedTST?.isActive)
+            BrowserWindowWatcher.tryConfirmUsingTST();
+        },
+
+        async reserveToLoadForbiddenURL(url) {
+          BrowserWindowWatcher.loadingForbiddenURLs.push(url);
+        },
+
+        async getFileURL(file) {
+          return BrowserWindowWatcher.getFileURL(file);
+        },
+
+        async getTabPreview(tabId) {
+          const info = {
+            url:   null,
+            found: false,
+          };
+          const tab = context.extension.tabManager.get(tabId);
+          if (!tab)
+            return info;
+
+          const nativeTab = tab.nativeTab;
+          const window    = nativeTab.ownerDocument.defaultView;
+          try {
+            const canvas = await window.tabPreviews.get(nativeTab);
+            /*
+            // We can get a URL like "https%3A%2F%2Fwww.example.com.org%2F&revision=0000"
+            // but Firefox does not allow loading of such a special internal URL from
+            // addon's sidebar page.
+            const image     = await window.tabPreviews.get(nativeTab);
+            return image.src;
+            */
+            if (canvas) {
+              info.url   = canvas.toDataURL('image/png');
+              info.found = true;
+              return info;
+            }
+          }
+          catch (_error) { // tabPreviews.capture() raises error if the tab is discarded.
+            // console.error('waterfoxBridge: failed to take a tab preview: ', tabId, error);
+          }
+
+          // simulate default preview
+          // see also: https://searchfox.org/mozilla-esr115/rev/d0623081f317c92e0c7bc2a8b1b138687bdb23f5/browser/themes/shared/ctrlTab.css#85-94
+          const canvas = lazy.PageThumbs.createCanvas(window);
+          try {
+            // TODO: we should change the fill color to "CanvasText"...
+            const image = new window.Image();
+            await new Promise((resolve, reject) => {
+              image.addEventListener('load', resolve, { once: true });
+              image.addEventListener('error', reject, { once: true });
+              image.src = 'chrome://global/skin/icons/defaultFavicon.svg';
+            });
+            const ctx = canvas.getContext('2d');
+            ctx.fillStyle = 'Canvas';
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+            const iconSize = canvas.width * 0.2;
+            ctx.drawImage(
+              image,
+              0,
+              0,
+              image.width,
+              image.height,
+              (canvas.width - iconSize) / 2,
+              (canvas.height - iconSize) / 2,
+              iconSize,
+              iconSize
+            );
+          }
+          catch (_error) {
+          }
+          info.url = canvas.toDataURL('image/png');
+          return info;
+        },
+
+        async showPreviewPanel(tabId, top) {
+          const tab = tabId && context.extension.tabManager.get(tabId);
+          if (!tab)
+            return;
+
+          const document = tab.nativeTab.ownerDocument;
+          const tabbrowserTabs = document.getElementById('tabbrowser-tabs');
+          if (!tabbrowserTabs)
+            return;
+
+          if (!tabbrowserTabs.previewPanel) {
+            // load the tab preview component
+            const TabHoverPreviewPanel = ChromeUtils.importESModule(
+              'chrome://browser/content/tabbrowser/tab-hover-preview.mjs'
+            ).default;
+            tabbrowserTabs.previewPanel = new TabHoverPreviewPanel(
+              document.getElementById('tab-preview-panel')
+            );
+          }
+          tabbrowserTabs.previewPanel.__ws__top = top;
+          tabbrowserTabs.previewPanel.activate(tab.nativeTab);
+        },
+
+        async hidePreviewPanel(windowId) {
+          const win = windowId && context.extension.windowManager.get(windowId);
+          if (!win || !win.window)
+            return;
+
+          try {
+            // Access the document through the window object
+            const document = win.window.document;
+            const tabPreview = document.getElementById('tabbrowser-tabs')?.previewPanel;
+            if (!tabPreview)
+              return;
+            tabPreview.__ws__top = null;
+          } catch (error) {
+            console.log("Error in hidePreviewPanel:", error);
+          }
+        },
+
+        async openPreferences() {
+          BrowserWindowWatcher.openOptions();
+        },
+
+        onWindowVisibilityChanged: new EventManager({
+          context,
+          name: 'waterfoxBridge.onWindowVisibilityChanged',
+          register: (fire) => {
+            const onChanged = win => {
+              const wrappedWindow = context.extension.windowManager.getWrapper(win);
+              if (wrappedWindow)
+                fire.async(wrappedWindow.id, win.document.visibilityState).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.visibilityChangedListeners.add(onChanged);
+            return () => {
+              BrowserWindowWatcher.visibilityChangedListeners.delete(onChanged);
+            };
+          },
+        }).api(),
+
+        onMenuCommand: new EventManager({
+          context,
+          name: 'waterfoxBridge.onMenuCommand',
+          register: (fire) => {
+            const onCommand = event => {
+              fire.async({
+                itemId:   event.target.id,
+                detail:   event.detail,
+                button:   event.button,
+                altKey:   event.altKey,
+                ctrlKey:  event.ctrlKey,
+                metaKey:  event.metaKey,
+                shiftKey: event.shiftKey,
+              }).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.menuCommandListeners.add(onCommand);
+            return () => {
+              BrowserWindowWatcher.menuCommandListeners.delete(onCommand);
+            };
+          },
+        }).api(),
+
+        onSidebarShown: new EventManager({
+          context,
+          name: 'waterfoxBridge.onSidebarShown',
+          register: (fire) => {
+            const onShown = win => {
+              const wrappedWindow = context.extension.windowManager.getWrapper(win);
+              if (wrappedWindow)
+                fire.async(wrappedWindow.id).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.sidebarShownListeners.add(onShown);
+            return () => {
+              BrowserWindowWatcher.sidebarShownListeners.delete(onShown);
+            };
+          },
+        }).api(),
+
+        onSidebarHidden: new EventManager({
+          context,
+          name: 'waterfoxBridge.onSidebarHidden',
+          register: (fire) => {
+            const onHidden = win => {
+              const wrappedWindow = context.extension.windowManager.getWrapper(win);
+              if (wrappedWindow)
+                fire.async(wrappedWindow.id).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.sidebarHiddenListeners.add(onHidden);
+            return () => {
+              BrowserWindowWatcher.sidebarHiddenListeners.delete(onHidden);
+            };
+          },
+        }).api(),
+
+
+        async listSyncDevices() {
+          const devices = [];
+          const targets = Services.wm.getMostRecentBrowserWindow().gSync.getSendTabTargets();
+          for (const target of targets) {
+            devices.push({
+              id:   target.id,
+              name: target.name,
+              type: target.type,
+            });
+          }
+          return devices;
+        },
+
+        async sendToDevice(tabIds, deviceId) {
+          if (!Array.isArray(tabIds))
+            tabIds = [tabIds];
+          const gSync = Services.wm.getMostRecentBrowserWindow().gSync;
+          const tabs = tabIds.map(id => context.extension.tabManager.get(id));
+          const targets = gSync.getSendTabTargets().filter(target => !deviceId || target.id == deviceId);
+          for (const tab of tabs) {
+            gSync.sendTabToDevice(
+              tab.nativeTab.linkedBrowser.currentURI.spec,
+              targets,
+              tab.nativeTab.linkedBrowser.contentTitle
+            );
+          }
+        },
+
+        async openSyncDeviceSettings(windowId) {
+          let DOMWin = null;
+          try {
+            const win = windowId && context.extension.windowManager.get(windowId)
+            DOMWin = win?.window;
+          }
+          catch (_error) {
+          }
+          (DOMWin || Services.wm.getMostRecentBrowserWindow()).gSync.openDevicesManagementPage('sendtab');
+        },
+
+
+        async listSharingServices(tabId) {
+          const tab = tabId && context.extension.tabManager.get(tabId);
+
+          const services = [];
+          const win = Services.wm.getMostRecentBrowserWindow();
+          const sharingService = win.gBrowser.MacSharingService;
+          if (!sharingService)
+            return services;
+
+          const uri = win.gURLBar.makeURIReadable(
+            tab?.nativeTab.linkedBrowser.currentURI ||
+            Services.io.newURI('https://waterfox.net/', null, null)
+          ).displaySpec;
+          for (const service of sharingService.getSharingProviders(uri)) {
+            services.push({
+              name:  service.name,
+              title: service.menuItemTitle,
+              image: service.image,
+            });
+          }
+          return services;
+        },
+
+        async share(tabIds, shareName) {
+          if (!Array.isArray(tabIds))
+            tabIds = [tabIds];
+          const tabs = tabIds.map(id => context.extension.tabManager.get(id));
+
+          // currently we can share only one URL at a time...
+          const tab = tabs[0];
+          const win = Services.wm.getMostRecentBrowserWindow();
+          const uri = win.gURLBar.makeURIReadable(tab.nativeTab.linkedBrowser.currentURI).displaySpec;
+
+          if (AppConstants.platform == 'win') {
+            win.WindowsUIUtils.shareUrl(uri, tab.nativeTab.linkedBrowser.contentTitle);
+            return;
+          }
+
+          if (shareName) { // for macOS
+            win.gBrowser.MacSharingService.shareUrl(shareName, uri, tab.nativeTab.linkedBrowser.contentTitle);
+            return;
+          }
+        },
+
+        async openSharingPreferences() {
+          Services.wm.getMostRecentBrowserWindow().gBrowser.MacSharingService.openSharingPreferences();
+        },
+
+
+        async listAutoplayBlockedTabs(windowId) {
+          const tabs = new Set();
+          const windows = windowId ?
+            [context.extension.windowManager.get(windowId)] :
+            context.extension.windowManager.getAll();
+          for (const win of windows) {
+            if (!win.window.gBrowser)
+              continue;
+            for (const tab of win.window.document.querySelectorAll('tab[activemedia-blocked="true"]')) {
+              const wrappedTab = context.extension.tabManager.getWrapper(tab);
+              if (wrappedTab)
+                tabs.add(wrappedTab.convert());
+            }
+          }
+          return [...tabs].sort((a, b) => a.index - b.index);
+        },
+
+        async isAutoplayBlockedTab(tabId) {
+          const tab = context.extension.tabManager.get(tabId);
+          if (!tab)
+            return false;
+          return tab.nativeTab.getAttribute('activemedia-blocked') == 'true';
+        },
+
+        async unblockAutoplay(tabIds) {
+          if (!Array.isArray(tabIds))
+            tabIds = [tabIds];
+          const tabs = tabIds.map(id => context.extension.tabManager.get(id));
+          for (const tab of tabs) {
+            tab.nativeTab.linkedBrowser.resumeMedia();
+          }
+        },
+
+        onAutoplayBlocked: new EventManager({
+          context,
+          name: 'waterfoxBridge.onAutoplayBlocked',
+          register: (fire) => {
+            const onBlocked = tab => {
+              const wrappedTab = context.extension.tabManager.getWrapper(tab);
+              if (wrappedTab)
+                fire.async(wrappedTab.convert()).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.autoplayBlockedListeners.add(onBlocked);
+            return () => {
+              BrowserWindowWatcher.autoplayBlockedListeners.delete(onBlocked);
+            };
+          },
+        }).api(),
+
+        onAutoplayUnblocked: new EventManager({
+          context,
+          name: 'waterfoxBridge.onAutoplayUnblocked',
+          register: (fire) => {
+            const onUnblocked = tab => {
+              const wrappedTab = context.extension.tabManager.getWrapper(tab);
+              if (wrappedTab)
+                fire.async(wrappedTab.convert()).catch(() => {}); // ignore Message Manager disconnects
+            };
+            BrowserWindowWatcher.autoplayUnblockedListeners.add(onUnblocked);
+            return () => {
+              BrowserWindowWatcher.autoplayUnblockedListeners.delete(onUnblocked);
+            };
+          },
+        }).api(),
+
+
+        async isSelectionClipboardAvailable() {
+          try {
+            return Services.clipboard.isClipboardTypeSupported(Services.clipboard.kSelectionClipboard);
+          }
+          catch(_error) {
+            return false;
+          }
+        },
+
+        async getSelectionClipboardContents() {
+          try {
+            const transferable = Components.classes['@mozilla.org/widget/transferable;1']
+              .createInstance(Components.interfaces.nsITransferable);
+            const loadContext = Services.wm.getMostRecentBrowserWindow()
+              .docShell.QueryInterface(Components.interfaces.nsILoadContext);
+            transferable.init(loadContext);
+            transferable.addDataFlavor('text/plain');
+
+            Services.clipboard.getData(transferable, Services.clipboard.kSelectionClipboard);
+
+            const data = {};
+            transferable.getTransferData('text/plain', data);
+            if (data) {
+              data = data.value.QueryInterface(Components.interfaces.nsISupportsString);
+              return data.data;
+            }
+          }
+          catch(_error) {
+            return '';
+          }
+        },
+      },
+    };
+  }
+
+  onShutdown(isAppShutdown) {
+    if (isAppShutdown)
+      return;
+
+    lazy.AddonManager.removeInstallListener(BrowserWindowWatcher);
+    lazy.AddonManager.removeAddonListener(BrowserWindowWatcher);
+
+    if (lazy.PlacesUtils.__ws_orig__unwrapNodes) {
+      lazy.PlacesUtils.unwrapNodes = lazy.PlacesUtils.__ws_orig__unwrapNodes;
+      lazy.PlacesUtils.__ws_orig__unwrapNodes = null;
+    }
+
+    const registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+    registrar.unregisterFactory(
+      BrowserWindowWatcher.classID,
+      BrowserWindowWatcher
+    );
+    Services.catMan.deleteCategoryEntry(
+      'content-policy',
+      BrowserWindowWatcher.contractID,
+      false
+    );
+
+    Services.ww.unregisterNotification(BrowserWindowWatcher);
+
+    const windows = BrowserWindowWatcher.iterateTargetWindows();
+    while (true) {
+      const win = windows.next();
+      if (win.done)
+        break;
+      BrowserWindowWatcher.unhandleWindow(win.value);
+    }
+
+    //const handler = Cc['@mozilla.org/network/protocol;1?name=resource'].getService(Components.interfaces.nsISubstitutingProtocolHandler);
+    //handler.setSubstitution('waterfox-bridge', null);
+
+    Services.prefs.removeObserver('', BrowserWindowWatcher);
+  }
+};
diff --git a/waterfox/browser/components/sidebar/experiments/waterfoxBridge.json b/waterfox/browser/components/sidebar/experiments/waterfoxBridge.json
new file mode 100644
index 0000000000000..38cb4c8760291
--- /dev/null
+++ b/waterfox/browser/components/sidebar/experiments/waterfoxBridge.json
@@ -0,0 +1,459 @@
+[
+  {
+    "namespace": "waterfoxBridge",
+
+    "types": [
+      {
+        "id": "TabPreviewInfo",
+        "type": "object",
+        "description": "Information of a tab preview image.",
+        "properties": {
+          "url": {
+            "type": "string",
+            "description": "A URL string to a tab preview image."
+          },
+          "found": {
+            "type": "boolean",
+            "description": "Indicates availability of the preview image."
+          }
+        }
+      },
+      {
+        "id": "SyncDeviceInfo",
+        "type": "object",
+        "description": "An object indicating sync device.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier string of a sync device."
+          },
+          "name": {
+            "type": "string",
+            "description": "The visible name of a sync device."
+          },
+          "target": {
+            "type": "string",
+            "description": "The type string of a sync device."
+          }
+        }
+      },
+      {
+        "id": "ShareService",
+        "type": "object",
+        "description": "An object indicating sync device.",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of a sharing service."
+          },
+          "title": {
+            "type": "string",
+            "description": "The menu label for a sharing service."
+          },
+          "image": {
+            "type": "string",
+            "description": "The image for a sharing device."
+          }
+        }
+      }
+    ],
+
+    "functions": [
+      {
+        "name": "initUI",
+        "type": "function",
+        "description": "Initializes the custom UI for Waterfox.",
+        "async": true,
+        "parameters": []
+      },
+      {
+        "name": "reserveToLoadForbiddenURL",
+        "type": "function",
+        "description": "Reserve a URL to load by Waterfox.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "string",
+            "name": "url"
+          }
+        ]
+      },
+      {
+        "name": "getFileURL",
+        "type": "function",
+        "description": "Get file: URL from a file.",
+        "async": true,
+        "parameters": [
+          {
+            "name": "file",
+            "type": "object",
+            "description": "Information of a file.",
+            "properties": {
+              "lastModified": {
+                "type": "integer",
+                "description": "Last modified timestamp of the file."
+              },
+              "name": {
+                "type": "string",
+                "description": "Name of the file."
+              },
+              "size": {
+                "type": "integer",
+                "description": "Size of the file."
+              },
+              "type": {
+                "type": "string",
+                "description": "MIME type of the file."
+              }
+            }
+          }
+        ],
+        "returns": {
+          "type": "string",
+          "name": "url"
+        }
+      },
+      {
+        "name": "getTabPreview",
+        "type": "function",
+        "description": "Returns a tab preview image URL and its metadata.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "tabId",
+            "minimum": 0
+          }
+        ],
+        "returns": {
+          "type": "array",
+          "items": {
+            "$ref": "waterfoxBridge.TabPreviewInfo"
+          }
+        }
+      },
+      {
+        "name": "showPreviewPanel",
+        "type": "function",
+        "description": "Shows the preview panel for the tab.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "tabId",
+            "minimum": 0
+          },
+          {
+            "type": "integer",
+            "name": "top"
+          }
+        ]
+      },
+      {
+        "name": "hidePreviewPanel",
+        "type": "function",
+        "description": "Hides the preview panel for the window.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId",
+            "minimum": 0
+          }
+        ]
+      },
+      {
+        "name": "openPreferences",
+        "type": "function",
+        "description": "Opens the preferences.",
+        "async": true,
+        "parameters": []
+      },
+
+      {
+        "name": "listSyncDevices",
+        "type": "function",
+        "description": "Returns an array of sync device information.",
+        "async": true,
+        "parameters": [],
+        "returns": {
+          "type": "array",
+          "items": {
+            "$ref": "waterfoxBridge.SyncDeviceInfo"
+          }
+        }
+      },
+      {
+        "name": "sendToDevice",
+        "type": "function",
+        "description": "Sends tabs to a device or all devices.",
+        "async": true,
+        "parameters": [
+          {
+            "name": "tabIds",
+            "description": "The tab or list of tabs to send.",
+            "type": "array",
+            "choices": [
+              { "type": "integer", "minimum": 0 },
+              { "type": "array", "items": { "type": "integer", "minimum": 0 } }
+            ]
+          },
+          {
+            "name": "deviceId",
+            "type": "string",
+            "description": "The ID of a device",
+            "optional": true
+          }
+        ]
+      },
+      {
+        "name": "openSyncDeviceSettings",
+        "type": "function",
+        "description": "Opens the settings of sync devices.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId",
+            "minimum": 0,
+            "optional": true
+          }
+        ]
+      },
+
+      {
+        "name": "listSharingServices",
+        "type": "function",
+        "description": "Returns an array of share service on macOS.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "tabId",
+            "minimum": 0,
+            "optional": true
+          }
+        ],
+        "returns": {
+          "type": "array",
+          "items": {
+            "$ref": "waterfoxBridge.ShareService"
+          }
+        }
+      },
+      {
+        "name": "share",
+        "type": "function",
+        "description": "Shares tabs via browser's share feature.",
+        "async": true,
+        "parameters": [
+          {
+            "name": "tabIds",
+            "description": "The tab or list of tabs to share.",
+            "type": "array",
+            "choices": [
+              { "type": "integer", "minimum": 0 },
+              { "type": "array", "items": { "type": "integer", "minimum": 0 } }
+            ]
+          },
+          {
+            "name": "shareName",
+            "type": "string",
+            "description": "The name of a sharing method on macOS",
+            "optional": true
+          }
+        ]
+      },
+      {
+        "name": "openSharingPreferences",
+        "type": "function",
+        "description": "Opens the preferences of sharing services on macOS.",
+        "async": true,
+        "parameters": []
+      },
+
+      {
+        "name": "listAutoplayBlockedTabs",
+        "type": "function",
+        "description": "Returns an array of autoplay blocked tabs in a window.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId",
+            "minimum": 0,
+            "optional": true
+          }
+        ],
+        "returns": {
+          "type": "array",
+          "items": {
+            "$ref": "tabs.Tab"
+          }
+        }
+      },
+      {
+        "name": "isAutoplayBlockedTab",
+        "type": "function",
+        "description": "Returns the tab's autoplay blocked state.",
+        "async": true,
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId",
+            "minimum": 0
+          }
+        ],
+        "returns": {
+          "type": "boolean",
+          "name": "autoplayBlocked"
+        }
+      },
+      {
+        "name": "unblockAutoplay",
+        "type": "function",
+        "description": "Resumes blocked autoplay of tabs.",
+        "async": true,
+        "parameters": [
+          {
+            "name": "tabIds",
+            "description": "The tab or list of tabs to resume autoplay.",
+            "type": "array",
+            "choices": [
+              { "type": "integer", "minimum": 0 },
+              { "type": "array", "items": { "type": "integer", "minimum": 0 } }
+            ]
+          }
+        ]
+      },
+
+      {
+        "name": "isSelectionClipboardAvailable",
+        "type": "function",
+        "description": "Returns availability of the selection clipboard.",
+        "async": true,
+        "parameters": [
+        ],
+        "returns": {
+          "type": "boolean",
+          "name": "selectionClipboardAvailable"
+        }
+      },
+      {
+        "name": "getSelectionClipboardContents",
+        "type": "function",
+        "description": "Returns the contents of the selection clipboard as a string.",
+        "async": true,
+        "parameters": [
+        ],
+        "returns": {
+          "type": "string",
+          "name": "selectionClipboardContents"
+        }
+      }
+    ],
+
+    "events": [
+      {
+        "name": "onWindowVisibilityChanged",
+        "description": "Notified when the minimized state of a window is changed.",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId",
+            "minimum": 0
+          },
+          {
+            "type": "string",
+            "name": "visibilityState"
+          }
+        ]
+      },
+      {
+        "name": "onMenuCommand",
+        "description": "Notified when a menu command is invoked.",
+        "type": "function",
+        "parameters": [
+          {
+            "name": "eventInfo",
+            "type": "object",
+            "description": "An object indicating command event.",
+            "properties": {
+              "itemId": {
+                "type": "string",
+                "description": "The id of the event target."
+              },
+              "detail": {
+                "type": "integer",
+                "description": "Corresponding to MouseEvent.prototype.detail."
+              },
+              "button": {
+                "type": "integer",
+                "description": "Corresponding to MouseEvent.prototype.button."
+              },
+              "altKey": {
+                "type": "boolean",
+                "description": "Corresponding to MouseEvent.prototype.altKey."
+              },
+              "ctrlKey": {
+                "type": "boolean",
+                "description": "Corresponding to MouseEvent.prototype.ctrlKey."
+              },
+              "metaKey": {
+                "type": "boolean",
+                "description": "Corresponding to MouseEvent.prototype.metaKey."
+              },
+              "shiftKey": {
+                "type": "boolean",
+                "description": "Corresponding to MouseEvent.prototype.shiftKey."
+              }
+            }
+          }
+        ]
+      },
+      {
+        "name": "onSidebarShown",
+        "description": "Notified when the sidebar is shown.",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId"
+          }
+        ]
+      },
+      {
+        "name": "onSidebarHidden",
+        "description": "Notified when the sidebar is hidden.",
+        "type": "function",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "windowId"
+          }
+        ]
+      },
+      {
+        "name": "onAutoplayBlocked",
+        "description": "Notified when a tab's autoplay is blocked.",
+        "type": "function",
+        "parameters": [
+          {
+            "$ref": "tabs.Tab"
+          }
+        ]
+      },
+      {
+        "name": "onAutoplayUnblocked",
+        "description": "Notified when a tab's autoplay is unblocked.",
+        "type": "function",
+        "parameters": [
+          {
+            "$ref": "tabs.Tab"
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/extlib/Configs.js b/waterfox/browser/components/sidebar/extlib/Configs.js
new file mode 100644
index 0000000000000..754cd03eefe42
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/Configs.js
@@ -0,0 +1,630 @@
+/*
+ license: The MIT License, Copyright (c) 2016-2023 YUKI "Piro" Hiroshi
+ original:
+   http://github.com/piroor/webextensions-lib-configs
+*/
+
+'use strict';
+
+/*
+There are multiple level values:
+
+(higher priority)
+ * [default] locked managed values (given via GPO or policies.json)
+ * [default] locked default values (given to the constructor)
+ * [user] locked user values (given via API)
+   => [default] it should fallback to the default value if there is no user value
+ * [user] user values (local storage)
+ * [default] non-locked managed values (given via GPO or policies.json)
+ * [default] overridden default values (given via API)
+ * [default] built-in default values (given to the constructor)
+(lower priority)
+
+Only values different from [default] are stored and synchronized.
+*/
+
+const OBSERVABLE_AREA = new Set([
+  'internal', // TST internal
+  'local',
+  'sync',
+  'managed',
+]);
+
+// eslint-disable-next-line no-unused-vars
+class Configs {
+  constructor(
+    defaults,
+    { logging, logger, localKeys, syncKeys, sync } = { syncKeys: [], logger: null }
+  ) {
+    this._defaultValues = {
+      ...this._clone(defaults),
+      __ConfigsMigration__userValeusSameToDefaultAreCleared: false,
+    };
+    this._lockedDefaultKeys = new Set();
+
+    this._managedValues = {};
+    this._lockedManagedKeys = new Set();
+
+    this._userValues = {};
+    this._lockedUserKeys = new Set();
+
+    this._fetchedValues = {};
+
+    this.$default = {};
+    this.$all = {};
+
+    for (const key of Object.keys(this._defaultValues)) {
+      Object.defineProperty(this.$default, key, {
+        get: () => this._getDefaultValue(key),
+        set: (value) => this._setDefaultValue(key, value),
+        enumerable: true,
+      });
+      const description = {
+        get: () => this._getValue(key),
+        set: (value) => this._setValue(key, value),
+        enumerable: true,
+      };
+      Object.defineProperty(this, key, description);
+      Object.defineProperty(this.$all, key, description);
+    }
+
+    for (const [key, locked] of Object.entries(defaults)) {
+      if (!key.endsWith(':locked'))
+        continue;
+      if (locked)
+        this._lockedDefaultKeys.add(key.replace(/:locked$/, ''));
+      delete defaults[key];
+    }
+
+    this.$logging = logging || false;
+    this.$logs = [];
+    this.$logger = logger;
+    this.sync = sync === undefined ? true : !!sync;
+    this._updating = new Map();
+    this._observers = new Set();
+    this._changedObservers = new Set();
+    this._localLoadedObservers = new Set();
+    this._syncKeys = [
+      ...(localKeys ?
+        Object.keys(defaults).filter(x => !localKeys.includes(x)) :
+        (syncKeys || [])),
+      '__ConfigsMigration__userValeusSameToDefaultAreCleared',
+    ];
+    this.$loaded = this._load();
+
+    this.$preReceivedChanges = [];
+    this.$listeningChanges = false;
+    browser.storage.onChanged.addListener(this._onChanged.bind(this));
+
+    this.$preReceivedMessages = [];
+    this.$listeningMessages = false;
+    browser.runtime.onMessage.addListener(this._onMessage.bind(this));
+  }
+
+  $reset(key, { broadcast } = {}) {
+    if (!key) {
+      for (const key of Object.keys(this._defaultValues)) {
+        this.$reset(key);
+      }
+      return;
+    }
+
+    if (!this._defaultValues.hasOwnProperty(key))
+      throw new Error(`failed to reset unknown key: ${key}`);
+
+    this._setValue(key, this._getDefaultValue(key), true, { broadcast });
+  }
+
+  $cleanUp({ broadcast } = {}) {
+    for (const [key, defaultValue] of Object.entries(this.$default)) {
+      if (!this._userValues.hasOwnProperty(key))
+        continue;
+      const value = JSON.stringify(this._getNonDefaultValue(key));
+      if (value == JSON.stringify(defaultValue) ||
+          (this._managedValues.hasOwnProperty(key) &&
+           value == JSON.stringify(this._managedValues[key])))
+        this.$reset(key, { broadcast });
+    }
+  }
+
+  _getDefaultValue(key) {
+    if (this._managedValues.hasOwnProperty(key))
+      return this._managedValues[key];
+    return this._defaultValues[key];
+  }
+
+  _setDefaultValue(key, value, { broadcast } = {}) {
+    if (!key)
+      throw new Error(`missing key for default value ${value}`);
+
+    if (!this._defaultValues.hasOwnProperty(key))
+      throw new Error(`failed to set default value for unknown key: ${key}`);
+
+    const currentValue = this[key];
+    const currentDefaultValue = this._getDefaultValue(key);
+
+    this._defaultValues[key] = this._clone(value);
+    const defaultValue = this._getDefaultValue(key);
+    if (JSON.stringify(defaultValue) == JSON.stringify(this._getNonDefaultValue[key]))
+      this.$reset(key, { broadcast });
+
+    const newDefaultValue = this._getDefaultValue(key);
+    if (currentValue == currentDefaultValue &&
+        currentValue != newDefaultValue &&
+        this[key] == newDefaultValue) {
+      const observers = [...this._observers, ...this._changedObservers];
+      this.$notifyToObservers(key, value, observers, 'onChangeConfig');
+    }
+
+    if (broadcast === false)
+      return;
+
+    try {
+      browser.runtime.sendMessage({
+        type:  'Configs:updateDefaultValue',
+        key:   key,
+        value: defaultValue,
+      }).catch(_error => {});
+    }
+    catch(_error) {
+    }
+  }
+
+  _getNonDefaultValue(key) {
+    if (this._userValues.hasOwnProperty(key))
+      return this._userValues[key];
+    if (this._managedValues.hasOwnProperty(key) &&
+        !this._lockedManagedKeys.has(key))
+      return this._managedValues[key];
+    return undefined;
+  }
+
+  $addLocalLoadedObserver(observer) {
+    if (!this._localLoadedObservers.has(observer))
+      this._localLoadedObservers.add(observer);
+  }
+  $removeLocalLoadedObserver(observer) {
+    this._localLoadedObservers.delete(observer);
+  }
+
+  $addChangedObserver(observer) {
+    if (!this._changedObservers.has(observer))
+      this._changedObservers.add(observer);
+  }
+  $removeChangedObserver(observer) {
+    this._changedObservers.delete(observer);
+  }
+
+  $addObserver(observer) {
+    // for backward compatibility
+    if (typeof observer == 'function')
+      this.$addChangedObserver(observer);
+    else if (!this._observers.has(observer))
+      this._observers.add(observer);
+  }
+  $removeObserver(observer) {
+    // for backward compatibility
+    if (typeof observer == 'function')
+      this.$removeChangedObserver(observer);
+    else
+      this._observers.delete(observer);
+  }
+
+  _log(message, ...args) {
+    message = `Configs[${location.href}] ${message}`;
+    this.$logs = this.$logs.slice(-1000);
+
+    if (!this.$logging)
+      return;
+
+    if (typeof this.$logger === 'function')
+      this.$logger(message, ...args);
+    else
+      console.log(message, ...args);
+  }
+
+  _load() {
+    return this.$_promisedLoad ||
+             (this.$_promisedLoad = this._tryLoad());
+  }
+
+  async _tryLoad() {
+    this._log('load');
+    try {
+      this._log(`load: try load from storage on ${location.href}`);
+      const [localValues, managedValues, lockedKeys] = await Promise.all([
+        (async () => {
+          try {
+            const localValues = await browser.storage.local.get(null); // keys must be "null" to get only stored values
+            this._log('load: successfully loaded local storage');
+            const observers = [...this._observers, ...this._localLoadedObservers];
+            for (const [key, value] of Object.entries(localValues)) {
+              this.$notifyToObservers(key, value, observers, 'onLocalLoaded');
+            }
+            return localValues;
+          }
+          catch(e) {
+            this._log('load: failed to load local storage: ', String(e));
+          }
+          return {};
+        })(),
+        (async () => {
+          if (!browser.storage.managed) {
+            this._log('load: skip managed storage');
+            return null;
+          }
+          return new Promise(async (resolve, _reject) => {
+            const loadManagedStorage = () => {
+              let resolved = false;
+              return new Promise((resolve, reject) => {
+                browser.storage.managed.get().then(managedValues => {
+                  if (resolved)
+                    return;
+                  resolved = true;
+                  this._log('load: successfully loaded managed storage');
+                  resolve(managedValues || null);
+                }).catch(error => {
+                  if (resolved)
+                    return;
+                  resolved = true;
+                  this._log('load: failed to load managed storage: ', String(error));
+                  reject(error);
+                });
+
+                // storage.managed.get() fails on options page in Thunderbird.
+                // The problem should be fixed by Thunderbird side.
+                setTimeout(() => {
+                  if (resolved)
+                    return;
+                  resolved = true;
+                  this._log('load: failed to load managed storage: timeout');
+                  reject(new Error('timeout'));
+                }, 250);
+              });
+            };
+
+            for (let i = 0, maxi = 10; i < maxi; i++) {
+              try {
+                const result = await loadManagedStorage();
+                // On old versions Firefox and Thunderbird, a value with
+                // REG_MULTI_SZ type is always delivered as a simple string,
+                // thus we need to parse it by self.
+                for (const [key, value] of Object.entries(result)) {
+                  const defaultValue = this._defaultValues[key];
+                  if (typeof value != 'string')
+                    continue;
+
+                  const trimmed = value.trim();
+                  if (Array.isArray(defaultValue)) {
+                    result[key] = (trimmed.startsWith('[') && trimmed.endsWith(']')) ?
+                      JSON.parse(value) :
+                      trimmed.includes('\n') ?
+                        trimmed.split('\n') :
+                        trimmed.split(',');
+                  }
+                  else if (defaultValue &&
+                           typeof defaultValue == 'object' &&
+                           trimmed.startsWith('{') &&
+                           trimmed.endsWith('}')) {
+                    result[key] = JSON.parse(trimmed);
+                  }
+                }
+                resolve(result);
+                return;
+              }
+              catch(error) {
+                if (error.message != 'timeout') {
+                  console.log('managed storage is not provided');
+                  resolve(null);
+                  return;
+                }
+                console.log('failed to load managed storage ', error);
+              }
+              await new Promise(resolve => setTimeout(resolve, 250));
+            }
+            console.log('failed to load managed storage with 10 times retly');
+            resolve(null);
+          });
+        })(),
+        (async () => {
+          try {
+            const lockedKeys = await browser.runtime.sendMessage({
+              type: 'Configs:getLockedKeys'
+            });
+            this._log('load: successfully synchronized locked state');
+            return lockedKeys || [];
+          }
+          catch(e) {
+            this._log('load: failed to synchronize locked state: ', String(e));
+          }
+          return [];
+        })()
+      ]);
+      this._log(`load: loaded:`, { localValues, managedValues, lockedKeys });
+
+      lockedKeys.push(...this._lockedDefaultKeys);
+
+      if (managedValues) {
+        for (const [key, value] of Object.entries(managedValues)) {
+          if (key.endsWith(':locked'))
+            continue;
+          const locked = managedValues[`${key}:locked`] !== false;
+          this._managedValues[key] = value;
+          if (locked)
+            this._lockedManagedKeys.add(key);
+        }
+      }
+
+      this._userValues = this._clone({ ...(localValues || {}) });
+      this._log('load: values are applied');
+
+      for (const key of new Set(lockedKeys)) {
+        this._updateLocked(key, true);
+      }
+      this._log('load: locked state is applied');
+      this.$listeningChanges = true;
+      if (this.sync &&
+          (this._syncKeys ||
+           this._syncKeys.length > 0)) {
+        try {
+          browser.storage.sync.get(this._syncKeys).then(syncedValues => {
+            this._log('load: successfully loaded sync storage');
+            if (!syncedValues)
+              return;
+            for (const key of Object.keys(syncedValues)) {
+              this[key] = syncedValues[key];
+            }
+          });
+        }
+        catch(e) {
+          this._log('load: failed to read sync storage: ', String(e));
+          return null;
+        }
+      }
+      this.$listeningMessages = true;
+
+      if (!this.__ConfigsMigration__userValeusSameToDefaultAreCleared) {
+        this.$cleanUp();
+        this.__ConfigsMigration__userValeusSameToDefaultAreCleared = true;
+      }
+
+      this.$_promisedLoad = this.$_promisedLoad.then(() => {
+        if (this.$preReceivedChanges.length > 0) {
+          const changes = [...this.$preReceivedChanges];
+          this.$preReceivedChanges = [];
+          for (const change of changes) {
+            this._onChanged(change, 'internal');
+          }
+        }
+        if (this.$preReceivedMessages.length > 0) {
+          const messages = [...this.$preReceivedMessages];
+          this.$preReceivedMessages = [];
+          for (const message of messages) {
+            this._onMessage(message.message, message.sender);
+          }
+        }
+      });
+
+      return this.$all;
+    }
+    catch(e) {
+      this._log('load: fatal error: ', e, e.stack);
+      throw e;
+    }
+  }
+
+  _getValue(key) {
+    if (this._lockedManagedKeys.has(key))
+      return this._managedValues[key];
+    if (this._lockedDefaultKeys.has(key))
+      return this._defaultValues[key];
+    if (this._lockedUserKeys.has(key))
+      return this._userValues[key] || this._getDefaultValue(key);
+    if (this._userValues.hasOwnProperty(key))
+      return this._userValues[key];
+    if (this._managedValues.hasOwnProperty(key))
+      return this._managedValues[key];
+    if (this._defaultValues.hasOwnProperty(key))
+      return this._defaultValues[key];
+    throw new Error(`invalid access: unknown key ${key}`);
+  }
+
+  _setValue(key, value, force = false, { broadcast } = {}) {
+    const newValue = this._clone(value);
+
+    if (this._lockedDefaultKeys.has(key) ||
+        this._lockedManagedKeys.has(key) ||
+        this._lockedUserKeys.has(key)) {
+      this._log(`warning: ${key} is locked and not updated`);
+      return newValue;
+    }
+
+    const stringified = JSON.stringify(value);
+    if (stringified == JSON.stringify(this._userValues[key]) && !force) {
+      this._log(`skip: ${key} is not changed`);
+      return newValue;
+    }
+
+    const oldValue = this._getValue(key);
+
+    const shouldReset = stringified == JSON.stringify(this._getDefaultValue(key));
+    this._log(`set: ${key} = ${value}${shouldReset ? ' (reset to default)' : ''}`);
+    if (shouldReset)
+      delete this._userValues[key];
+    else
+      this._userValues[key] = newValue;
+
+    if (broadcast === false)
+      return newValue;
+
+    const update = {};
+    update[key] = newValue;
+    try {
+      const updatingValues = this._updating.get(key) || [];
+      updatingValues.push(newValue);
+      this._updating.set(key, updatingValues);
+      const updated = shouldReset ?
+        browser.storage.local.remove([key]).then(() => {
+          this._log('local: successfully removed ', key);
+        }) :
+        browser.storage.local.set(update).then(() => {
+          this._log('local: successfully saved ', update);
+        });
+      updated
+        .then(() => {
+          setTimeout(() => {
+            const updatingValues = this._updating.get(key);
+            if (!updatingValues ||
+                !updatingValues.includes(newValue))
+              return;
+            // failsafe: on Thunderbird updates sometimes won't be notified to the page itself.
+            const changes = {};
+            changes[key] = {
+              oldValue,
+              newValue,
+            };
+            this._onChanged(changes, 'internal');
+          }, 250);
+        });
+    }
+    catch(e) {
+      this._log('save: failed', e);
+    }
+    try {
+      if (this.sync && this._syncKeys.includes(key)) {
+        if (shouldReset)
+          browser.storage.sync.remove([key]).then(() => {
+            this._log('sync: successfully removed', update);
+          });
+        else
+          browser.storage.sync.set(update).then(() => {
+            this._log('sync: successfully synced', update);
+          });
+      }
+    }
+    catch(e) {
+      this._log('sync: failed', e);
+    }
+    return newValue;
+  }
+
+  $lock(key) {
+    this._log('locking: ' + key);
+    this._updateLocked(key, true);
+  }
+
+  $unlock(key) {
+    this._log('unlocking: ' + key);
+    this._updateLocked(key, false);
+  }
+
+  $isLocked(key) {
+    return this._lockedUserKeys.has(key);
+  }
+
+  _updateLocked(key, locked, { broadcast } = {}) {
+    if (locked)
+      this._lockedUserKeys.add(key);
+    else
+      this._lockedUserKeys.delete(key);
+
+    if (browser.runtime &&
+        broadcast !== false) {
+      try {
+        browser.runtime.sendMessage({
+          type:   'Configs:updateLocked',
+          key:    key,
+          locked: this._lockedUserKeys.has(key),
+        }).catch(_error => {});
+      }
+      catch(_error) {
+      }
+    }
+  }
+
+  _onMessage(message, sender) {
+    if (!message ||
+        typeof message.type != 'string')
+      return;
+
+    if (!this.$listeningMessages) {
+      this.$preReceivedMessages.push({ message, sender });
+      return;
+    }
+
+    this._log(`onMessage: ${message.type}`, message, sender);
+    switch (message.type) {
+      case 'Configs:getLockedKeys':
+        return Promise.resolve(Array.from(this._lockedUserKeys));
+
+      case 'Configs:updateLocked':
+        this._updateLocked(message.key, message.locked, { broadcast: false });
+        break;
+
+      case 'Configs:updateDefaultValue':
+        this._setDefaultValue(message.key, message.value, { broadcast: false });
+        break;
+    }
+  }
+
+  _onChanged(changes, areaName) {
+    if (!OBSERVABLE_AREA.has(areaName))
+      return;
+
+    if (!this.$listeningChanges) {
+      this.$preReceivedChanges.push(changes);
+      return;
+    }
+
+    this._log('_onChanged ', areaName, changes);
+    const observers = [...this._observers, ...this._changedObservers];
+    for (const [key, change] of Object.entries(changes)) {
+      // storage.local.onChanged is sometimes notified with delay, and it
+      // unexpctedly reverts stored user value after it is changed multiple
+      // times in short time range, and it may produce "ghost value" problem, like:
+      // 1. setting to "true" (updates the stored value to "true" immediately)
+      // 2. setting to "false" (updates the stored value to "false" immediately)
+      // 3. "true" is notified (updates the stored value to "true" with delay)
+      // 4. getting the value - it gots "true" instead of "false"!
+      // To avoid such problems, we need to skip applying notified new value
+      // if the notification is from a local change.
+      const updatingValues = this._updating.get(key);
+      if (updatingValues &&
+          updatingValues[0] == change.newValue) {
+        updatingValues.shift();
+      }
+      else {
+        if ('newValue' in change)
+          this._userValues[key] = this._clone(change.newValue);
+        else
+          delete this._userValues[key];
+      }
+
+      if (!updatingValues || updatingValues.length == 0)
+        this._updating.delete(key);
+      else
+        this._updating.set(key, updatingValues);
+
+      const value = this._getNonDefaultValue(key);
+
+      if (JSON.stringify(value) == JSON.stringify(this._getDefaultValue(key)))
+        return;
+
+      this.$notifyToObservers(key, value, observers, 'onChangeConfig');
+    }
+  }
+
+  $notifyToObservers(key, value, observers, observerMethod) {
+    for (const observer of observers) {
+      if (typeof observer === 'function')
+        observer(key, value);
+      else if (observer && typeof observer[observerMethod] === 'function')
+        observer[observerMethod](key, value);
+    }
+  }
+
+  _clone(value) {
+    return JSON.parse(JSON.stringify(value));
+  }
+};
+export default Configs;
diff --git a/waterfox/browser/components/sidebar/extlib/EventListenerManager.js b/waterfox/browser/components/sidebar/extlib/EventListenerManager.js
new file mode 100644
index 0000000000000..4a9f1c3306ec3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/EventListenerManager.js
@@ -0,0 +1,117 @@
+/*
+ license: The MIT License, Copyright (c) 2018 YUKI "Piro" Hiroshi
+ original:
+   https://github.com/piroor/webextensions-lib-event-listener-manager
+*/
+
+'use strict';
+
+const TIMEOUT = 2000;
+
+export default class EventListenerManager {
+  constructor() {
+    this._listeners = new Set();
+    this._stacksOnListenerAdded = new WeakMap();
+    this._sourceOfListeners = new WeakMap();
+  }
+
+  addListener(listener) {
+    const listeners = this._listeners;
+    if (!listeners.has(listener)) {
+      listeners.add(listener);
+      if (EventListenerManager.debug) {
+        const stack = new Error().stack;
+        this._stacksOnListenerAdded.set(listener, stack);
+        this._sourceOfListeners.set(listener, stack.split('\n')[1]);
+      }
+    }
+  }
+
+  removeListener(listener) {
+    this._listeners.delete(listener);
+    this._stacksOnListenerAdded.delete(listener);
+    this._sourceOfListeners.delete(listener);
+  }
+
+  removeAllListeners() {
+    this._listeners.clear();
+    this._stacksOnListenerAdded.clear();
+    this._sourceOfListeners.clear();
+  }
+
+  hasListener() {
+    return this._listeners.size > 0;
+  }
+
+  dispatch(...args) {
+    const results = this.dispatchWithDetails(...args);
+    if (results instanceof Promise)
+      return results.then(this.normalizeResults);
+    else
+      return this.normalizeResults(results);
+  }
+
+  // We hope to process results synchronously if possibly,
+  // so this method must not be "async".
+  dispatchWithDetails(...args) {
+    const results = Array(this._listeners.size);
+    let index = 0;
+
+    for (let listener of this._listeners) {
+      const startAt = EventListenerManager.debug && Date.now();
+      const timer = EventListenerManager.debug && setTimeout(() => {
+        const listenerAddedStack = this._stacksOnListenerAdded.get(listener);
+        console.log(`listener does not respond in ${TIMEOUT}ms.\n----------------------\n${listenerAddedStack || 'non debug mode or already removed listener:\n'+listener.toString()}\n----------------------\n${new Error().stack}\n----------------------\nargs:`, args);
+      }, TIMEOUT);
+
+      try {
+        const result = listener(...args);
+        if (result instanceof Promise)
+          results[index++] = result
+            .catch(e => {
+              console.log(e);
+            })
+            .then(result => {
+              if (timer)
+                clearTimeout(timer);
+              return {
+                value:    result,
+                elapsed:  EventListenerManager.debug && (Date.now() - startAt),
+                async:    true,
+                listener: EventListenerManager.debug && this._sourceOfListeners.get(listener)
+              };
+            });
+        if (timer)
+          clearTimeout(timer);
+        results[index++] = {
+          value:    result,
+          elapsed:  EventListenerManager.debug && (Date.now() - startAt),
+          async:    false,
+          listener: EventListenerManager.debug && this._sourceOfListeners.get(listener)
+        };
+      }
+      catch(e) {
+        console.log(e);
+        if (timer)
+          clearTimeout(timer);
+      }
+    }
+
+    if (results.some(result => result instanceof Promise))
+      return Promise.all(results);
+    else
+      return results;
+  }
+
+  normalizeResults(results) {
+    if (results.length == 1)
+      return results[0].value;
+    for (const result of results) {
+      if (result.value === false)
+        return false;
+    }
+    return true;
+  }
+}
+
+EventListenerManager.debug = false;
diff --git a/waterfox/browser/components/sidebar/extlib/MenuUI.js b/waterfox/browser/components/sidebar/extlib/MenuUI.js
new file mode 100644
index 0000000000000..fe04fe77b1be1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/MenuUI.js
@@ -0,0 +1,1144 @@
+/*
+ license: The MIT License, Copyright (c) 2018-2025 YUKI "Piro" Hiroshi
+ original:
+   https://github.com/piroor/webextensions-lib-menu-ui
+*/
+'use strict';
+
+{
+  class MenuUI {
+    static $wait(timeout) {
+      return new Promise((resolve, _reject) => {
+        setTimeout(resolve, timeout);
+      });
+    }
+
+    // XPath Utilities
+    static $hasClass(className) {
+      return `contains(concat(" ", normalize-space(@class), " "), " ${className} ")`;
+    };
+
+    static $evaluateXPath(expression, context, type) {
+      if (!type)
+        type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
+      try {
+        return (context.ownerDocument || context).evaluate(
+          expression,
+          (context || document),
+          null,
+          type,
+          null
+        );
+      }
+      catch(_e) {
+        return {
+          singleNodeValue: null,
+          snapshotLength:  0,
+          snapshotItem:    function() {
+            return null
+          }
+        };
+      }
+    }
+
+    static $getArrayFromXPathResult(result) {
+      const max   = result.snapshotLength;
+      const array = new Array(max);
+      if (!max)
+        return array;
+
+      for (let i = 0; i < max; i++) {
+        array[i] = result.snapshotItem(i);
+      }
+      return array;
+    }
+
+    RTL_LANGUAGES = new Set([
+      'ar',
+      'he',
+      'fa',
+      'ur',
+      'ps',
+      'sd',
+      'ckb',
+      'prs',
+      'rhg',
+    ]);
+
+    get isRTL() {
+      const lang = (
+        navigator.language ||
+        navigator.userLanguage ||
+        //(new Intl.DateTimeFormat()).resolvedOptions().locale ||
+        ''
+      ).split('-')[0];
+      return this.RTL_LANGUAGES.has(lang);
+    }
+
+    constructor(params = {}) {
+      this.$lastHoverItem   = null;
+      this.$lastFocusedItem = null;
+      this.$mouseDownFired  = false;
+
+      this.root              = params.root;
+      this.onCommand         = params.onCommand || (() => {});
+      this.onShown           = params.onShown || (() => {});
+      this.onHidden          = params.onHidden || (() => {});
+      this.animationDuration = params.animationDuration || 150;
+      this.subMenuOpenDelay  = params.subMenuOpenDelay || 300;
+      this.subMenuCloseDelay = params.subMenuCloseDelay || 300;
+      this.appearance        = params.appearance || 'menu';
+      this.incrementalSearch = params.incrementalSearch || false;
+      this.incrementalSearchTimeout = params.incrementalSearchTimeout || 1000;
+
+      this.$onBlur            = this.$onBlur.bind(this);
+      this.$onMouseOver       = this.$onMouseOver.bind(this);
+      this.$onMouseDown       = this.$onMouseDown.bind(this);
+      this.$onMouseUp         = this.$onMouseUp.bind(this);
+      this.$onClick           = this.$onClick.bind(this);
+      this.$onKeyDown         = this.$onKeyDown.bind(this);
+      this.$onKeyUp           = this.$onKeyUp.bind(this);
+      this.$onTransitionEnd   = this.$onTransitionEnd.bind(this);
+      this.$onContextMenu     = this.$onContextMenu.bind(this);
+
+      this.root.classList.toggle('rtl', this.isRTL);
+
+      if (!this.root.id)
+        this.root.id = `MenuUI-root-${this.$uniqueKey}-${parseInt(Math.random() * Math.pow(2, 16))}`;
+
+      this.root.classList.add(this.$commonClass);
+      this.root.classList.add('menu-ui');
+      this.root.classList.add(this.appearance);
+      this.root.setAttribute('role', 'menu');
+
+      this.$screen = document.createElement('div');
+      this.$screen.classList.add(this.$commonClass);
+      this.$screen.classList.add('menu-ui-blocking-screen');
+      this.root.parentNode.insertBefore(this.$screen, this.root.nextSibling);
+
+      this.$marker = document.createElement('span');
+      this.$marker.classList.add(this.$commonClass);
+      this.$marker.classList.add('menu-ui-marker');
+      this.$marker.classList.add(this.appearance);
+      this.root.parentNode.insertBefore(this.$marker, this.root.nextSibling);
+
+      this.$lastKeyInputAt = -1;
+      this.$incrementalSearchString = '';
+    }
+
+    get opened() {
+      return this.root.classList.contains('open');
+    }
+
+    $updateAccessKey(item) {
+      const ACCESS_KEY_MATCHER = /(&([^\s]))/i;
+
+      const title = item.getAttribute('title');
+      if (title)
+        item.setAttribute('title', title.replace(ACCESS_KEY_MATCHER, '$2'));
+
+      const label = MenuUI.$evaluateXPath('child::text()', item, XPathResult.STRING_TYPE).stringValue;
+      item.dataset.lowerCasedText = label.toLowerCase();
+
+      const matchedKey = label.match(ACCESS_KEY_MATCHER);
+      if (matchedKey) {
+        const textNode = MenuUI.$evaluateXPath(
+          `child::node()[contains(self::text(), "${matchedKey[1]}")]`,
+          item,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue;
+        if (textNode) {
+          const range = document.createRange();
+          const startPosition = textNode.nodeValue.indexOf(matchedKey[1]);
+          range.setStart(textNode, startPosition);
+          range.setEnd(textNode, startPosition + 2);
+          range.deleteContents();
+          const accessKeyNode = document.createElement('span');
+          accessKeyNode.classList.add('accesskey');
+          accessKeyNode.textContent = matchedKey[2];
+          range.insertNode(accessKeyNode);
+          range.detach();
+        }
+        item.dataset.accessKey = matchedKey[2].toLowerCase();
+      }
+      else if (/^([^\s])/i.test(item.textContent))
+        item.dataset.subAccessKey = RegExp.$1.toLowerCase();
+      else
+        item.dataset.accessKey = item.dataset.subAccessKey = null;
+    }
+
+    async open(options = {}) {
+      if (this.closeTimeout) {
+        clearTimeout(this.closeTimeout);
+        delete this.closeTimeout;
+        this.$onClosed();
+      }
+      this.canceller = options.canceller;
+      this.$mouseDownAfterOpen = false;
+      this.$lastFocusedItem = null;
+      this.$lastHoverItem = null;
+      this.anchor = options.anchor;
+      this.$updateItems(this.root);
+      this.root.classList.add('open');
+      this.$screen.classList.add('open');
+      this.$marker.classList.remove('top');
+      this.$marker.classList.remove('bottom');
+      if (this.anchor) {
+        this.anchor.classList.add('open');
+        this.$marker.style.transition = `opacity ${this.animationDuration}ms ease-out`;
+        this.$marker.classList.add('open');
+      }
+      this.$updatePositions(this.root, options);
+      this.onShown();
+      return new Promise(async (resolve, _reject) => {
+        await MenuUI.$wait(0);
+        if (this.$tryCancelOpen()) {
+          this.close().then(resolve);
+          return;
+        }
+        await MenuUI.$wait(this.animationDuration);
+        if (this.$tryCancelOpen()) {
+          this.close().then(resolve);
+          return;
+        }
+        this.root.parentNode.addEventListener('mouseover', this.$onMouseOver);
+        this.root.addEventListener('transitionend', this.$onTransitionEnd);
+        window.addEventListener('contextmenu', this.$onContextMenu, { capture: true });
+        window.addEventListener('mousedown', this.$onMouseDown, { capture: true });
+        window.addEventListener('mouseup', this.$onMouseUp, { capture: true });
+        window.addEventListener('click', this.$onClick, { capture: true });
+        window.addEventListener('keydown', this.$onKeyDown, { capture: true });
+        window.addEventListener('keyup', this.$onKeyUp, { capture: true });
+        window.addEventListener('blur', this.$onBlur, { capture: true });
+        resolve();
+      });
+    }
+
+    $tryCancelOpen() {
+      if (!(typeof this.canceller == 'function'))
+        return false;
+      try {
+        return this.canceller();
+      }
+      catch(_e) {
+      }
+      return false;
+    }
+
+    updateMenuItem(item) {
+      this.$updateItems(item);
+      const submenu = item.querySelector('ul');
+      if (submenu)
+        this.$updatePositions(submenu);
+    }
+
+    $updateItems(parent) {
+      parent.setAttribute('role', 'menu');
+      for (const item of parent.querySelectorAll('li:not(.separator)')) {
+        item.setAttribute('tabindex', -1);
+        item.classList.remove('open');
+
+        if (item.classList.contains('checkbox'))
+          item.setAttribute('role', 'menuitemcheckbox');
+        else if (item.classList.contains('radio'))
+          item.setAttribute('role', 'menuitemradio');
+        else if (item.classList.contains('separator'))
+          item.setAttribute('role', 'separator');
+        else
+          item.setAttribute('role', 'menuitem');
+
+        if (item.matches('.checked, .radio')) {
+          if (item.classList.contains('checked'))
+            item.setAttribute('aria-checked', 'true');
+          else
+            item.setAttribute('aria-checked', 'false');
+        }
+        else {
+          item.removeAttribute('aria-checked');
+        }
+
+        this.$updateAccessKey(item);
+        const icon = item.querySelector('span.icon') || document.createElement('span');
+        if (!icon.parentNode) {
+          icon.classList.add('icon');
+          item.insertBefore(icon, item.firstChild);
+        }
+        if (item.dataset.icon) {
+          if (item.dataset.iconColor) {
+            item.style.backgroundImage = '';
+            icon.style.backgroundColor = item.dataset.iconColor;
+            icon.style.mask            = `url(${JSON.stringify(item.dataset.icon)}) no-repeat center / 100%`;
+          }
+          else {
+            item.style.backgroundImage = `url(${JSON.stringify(item.dataset.icon)})`;
+            icon.style.backgroundColor =
+              icon.style.mask = '';
+          }
+        }
+        else {
+          item.style.backgroundImage =
+            icon.style.backgroundColor =
+            icon.style.mask = '';
+        }
+        if (item.querySelector('ul'))
+          item.classList.add('has-submenu');
+        else
+          item.classList.remove('has-submenu');
+      }
+    }
+
+    $updatePositions(parent, options = {}) {
+      const menus = [parent].concat(Array.from(parent.querySelectorAll('ul')));
+      for (const menu of menus) {
+        if (this.animationDuration)
+          menu.style.transition = `opacity ${this.animationDuration}ms ease-out`;
+        else
+          menu.style.transition = '';
+        this.$updatePosition(menu, options);
+      }
+    }
+
+    $updatePosition(menu, options = {}) {
+      let left = options.left;
+      let top  = options.top;
+      const containerRect = this.$containerRect;
+      const menuRect      = menu.getBoundingClientRect();
+
+      if (options.anchor &&
+          (left === undefined || top === undefined) &&
+          menu == this.root) {
+        const anchorRect = options.anchor.getBoundingClientRect();
+        if (containerRect.bottom - anchorRect.bottom >= menuRect.height) {
+          top = anchorRect.bottom;
+          this.$marker.classList.add('top');
+          this.$marker.classList.remove('bottom');
+          this.$marker.style.top = `calc(${top}px - 0.4em)`;
+        }
+        else if (anchorRect.top - containerRect.top >= menuRect.height) {
+          top = Math.max(0, anchorRect.top - menuRect.height);
+          this.$marker.classList.add('bottom');
+          this.$marker.classList.remove('top');
+          this.$marker.style.top = `calc(${top}px + ${menuRect.height}px - 0.6em)`;
+        }
+        else {
+          top = Math.max(0, containerRect.top - menuRect.height);
+          this.$marker.classList.remove('bottom');
+          this.$marker.classList.remove('top');
+          this.$marker.style.top = `calc(${top}px + ${menuRect.height}px - 0.6em)`;
+        }
+
+        const canPlaceAtRight = containerRect.right - anchorRect.left >= menuRect.width;
+        const canPlaceAtLeft  = anchorRect.left - containerRect.left >= menuRect.width;
+
+        if (canPlaceAtRight || canPlaceAtLeft) {
+          if (this.isRTL) {
+            if (canPlaceAtLeft) {
+              left = Math.max(0, anchorRect.right - menuRect.width);
+              this.$marker.style.left = `calc(${left}px + ${menuRect.width}px - 1.5em)`;
+            }
+            else {
+              left = anchorRect.left;
+              this.$marker.style.left = `calc(${left}px + 0.5em)`;
+            }
+          }
+          else {
+            if (canPlaceAtRight) {
+              left = anchorRect.left;
+              this.$marker.style.left = `calc(${left}px + 0.5em)`;
+            }
+            else {
+              left = Math.max(0, anchorRect.right - menuRect.width);
+              this.$marker.style.left = `calc(${left}px + ${menuRect.width}px - 1.5em)`;
+            }
+          }
+
+        }
+        else {
+          left = Math.max(0, containerRect.left - menuRect.width);
+          this.$marker.style.left = `calc(${left}px + ${menuRect.width}px - 1.5em)`;
+        }
+      }
+
+      let parentRect;
+      if (menu.parentNode.localName == 'li') {
+        parentRect = menu.parentNode.getBoundingClientRect();
+        left = this.isRTL ? parentRect.left - menuRect.width : parentRect.right;
+        top  = parentRect.top;
+      }
+
+      if (left === undefined)
+        left = Math.max(0, (containerRect.width - menuRect.width) / 2);
+      else if (this.isRTL)
+        left -= menuRect.width;
+
+      if (top === undefined)
+        top = Math.max(0, (containerRect.height - menuRect.height) / 2);
+
+      if (!options.anchor && menu == this.root) {
+        // reposition to avoid the menu is opened below the cursor
+        if (containerRect.bottom - top < menuRect.height) {
+          top = top - menuRect.height;
+        }
+        if (containerRect.right - left < menuRect.width) {
+          left = left - menuRect.width;
+        }
+      }
+
+      const minMargin = 3;
+      const overwrap  = 4;
+      const firstTryLeft = Math.max(minMargin, Math.min(left - overwrap, containerRect.width - menuRect.width - minMargin));
+      if (parentRect &&
+          firstTryLeft < parentRect.right - overwrap &&
+          containerRect.left < parentRect.left - menuRect.width + overwrap) {
+        left = parentRect.left - menuRect.width + overwrap;
+      }
+      else {
+        left = firstTryLeft;
+      }
+      menu.style.left = `${left}px`;
+
+      top  = Math.max(minMargin, Math.min(top,  containerRect.height - menuRect.height - minMargin));
+      if (menu == this.root && this.$marker.classList.contains('top'))
+        menu.style.top = `calc(${top}px + 0.5em)`;
+      else if (menu == this.root && this.$marker.classList.contains('bottom'))
+        menu.style.top = `calc(${top}px - 0.5em)`;
+      else
+        menu.style.top = `${top}px`;
+    }
+
+    async close() {
+      if (!this.opened)
+        return;
+      this.$tryCancelOpen();
+      this.root.classList.remove('open');
+      this.$screen.classList.remove('open');
+      if (this.anchor) {
+        this.anchor.classList.remove('open');
+        this.$marker.classList.remove('open');
+      }
+      this.$mouseDownAfterOpen = false;
+      this.$lastFocusedItem = null;
+      this.$lastHoverItem = null;
+      this.$mouseDownFired = false;
+      this.anchor = null;
+      this.canceller = null;
+      return new Promise((resolve, _reject) => {
+        this.closeTimeout = setTimeout(() => {
+          delete this.closeTimeout;
+          this.$onClosed();
+          resolve();
+        }, this.animationDuration);
+      });
+    }
+    $onClosed() {
+      const menus = [this.root].concat(Array.from(this.root.querySelectorAll('ul')));
+      for (const menu of menus) {
+        this.$updatePosition(menu, { left: 0, right: 0 });
+      }
+      this.root.parentNode.removeEventListener('mouseover', this.$onMouseOver);
+      this.root.removeEventListener('transitionend', this.$onTransitionEnd);
+      window.removeEventListener('contextmenu', this.$onContextMenu, { capture: true });
+      window.removeEventListener('mousedown', this.$onMouseDown, { capture: true });
+      window.removeEventListener('mouseup', this.$onMouseUp, { capture: true });
+      window.removeEventListener('click', this.$onClick, { capture: true });
+      window.removeEventListener('keydown', this.$onKeyDown, { capture: true });
+      window.removeEventListener('keyup', this.$onKeyUp, { capture: true });
+      window.removeEventListener('blur', this.$onBlur, { capture: true });
+      this.onHidden();
+    }
+
+    get $containerRect() {
+      const x      = 0;
+      const y      = 0;
+      const width  = window.innerWidth;
+      const height = window.innerHeight;
+      return {
+        x, y, width, height,
+        left:   x,
+        top:    y,
+        right:  width,
+        bottom: height
+      };
+    }
+
+    focusTo(item) {
+      this.$lastFocusedItem = this.$lastHoverItem = item;
+      this.$lastFocusedItem.focus();
+      this.$lastFocusedItem.scrollIntoView({ block: 'nearest' });
+    }
+
+    $onBlur(event) {
+      if (event.target == document)
+        this.close();
+    }
+
+    $onMouseOver(event) {
+      let item = this.$getEffectiveItem(event.target);
+      if (this.delayedOpen && this.delayedOpen.item != item) {
+        clearTimeout(this.delayedOpen.timer);
+        this.delayedOpen = null;
+      }
+      if (item && item.delayedClose) {
+        clearTimeout(item.delayedClose);
+        item.delayedClose = null;
+      }
+      if (item && item.classList.contains('separator')) {
+        this.$lastHoverItem = item;
+        item = null;
+      }
+      if (!item) {
+        if (this.$lastFocusedItem) {
+          if (this.$lastFocusedItem.parentNode != this.root) {
+            this.focusTo(this.$lastFocusedItem.parentNode.parentNode);
+          }
+          else {
+            this.$lastFocusedItem.blur();
+            this.$lastFocusedItem = null;
+          }
+        }
+        this.$setHover(null);
+        return;
+      }
+
+      this.$setHover(item);
+      this.$closeOtherSubmenus(item);
+      this.focusTo(item);
+
+      this.delayedOpen = {
+        item:  item,
+        timer: setTimeout(() => {
+          this.delayedOpen = null;
+          this.$openSubmenuFor(item);
+        }, this.subMenuOpenDelay)
+      };
+    }
+
+    $setHover(item) {
+      for (const item of this.root.querySelectorAll('li.hover')) {
+        if (item != item)
+          item.classList.remove('hover');
+      }
+      if (item)
+        item.classList.add('hover');
+    }
+
+    $openSubmenuFor(item) {
+      const items = MenuUI.$evaluateXPath(
+        `ancestor-or-self::li[${MenuUI.$hasClass('has-submenu')}][not(${MenuUI.$hasClass('disabled')})]`,
+        item
+      );
+      for (const item of MenuUI.$getArrayFromXPathResult(items)) {
+        item.classList.add('open');
+      }
+    }
+
+    $closeOtherSubmenus(item) {
+      const items = MenuUI.$evaluateXPath(
+        `preceding-sibling::li[${MenuUI.$hasClass('has-submenu')}] |
+       following-sibling::li[${MenuUI.$hasClass('has-submenu')}] |
+       preceding-sibling::li/descendant::li[${MenuUI.$hasClass('has-submenu')}] |
+       following-sibling::li/descendant::li[${MenuUI.$hasClass('has-submenu')}]`,
+        item
+      );
+      for (const item of MenuUI.$getArrayFromXPathResult(items)) {
+        item.delayedClose = setTimeout(() => {
+          item.classList.remove('open');
+        }, this.subMenuCloseDelay);
+      }
+    }
+
+    $onMouseDown(event) {
+      event.stopImmediatePropagation();
+      event.stopPropagation();
+      event.preventDefault();
+      this.$mouseDownAfterOpen = true;
+      this.$mouseDownFired = true;
+    }
+
+    $getEffectiveItem(node) {
+      const target = node.closest('li');
+      let untransparentTarget = target && target.closest('ul');
+      while (untransparentTarget) {
+        if (parseFloat(window.getComputedStyle(untransparentTarget, null).opacity) < 1)
+          return null;
+        untransparentTarget = untransparentTarget.parentNode.closest('ul');
+        if (untransparentTarget == document)
+          break;
+      }
+      return target;
+    }
+
+    $onMouseUp(event) {
+      if (!this.$mouseDownAfterOpen &&
+        event.target.closest(`#${this.root.id}`))
+        this.$onClick(event);
+    }
+
+    async $onClick(event) {
+      event.stopImmediatePropagation();
+      event.stopPropagation();
+      event.preventDefault();
+
+      const target = this.$getEffectiveItem(event.target);
+      if (!target ||
+        target.classList.contains('separator') ||
+        target.classList.contains('has-submenu') ||
+        target.classList.contains('disabled')) {
+        if (this.$mouseDownFired && // ignore "click" event triggered by a mousedown fired before the menu is opened (like long-press)
+            !event.target.closest(`#${this.root.id}`))
+          return this.close();
+        return;
+      }
+
+      this.onCommand(target, event);
+    }
+
+    $getNextFocusedItemByAccesskey(key) {
+      for (const attribute of ['access-key', 'sub-access-key']) {
+        const current = this.$lastHoverItem || this.$lastFocusedItem || this.root.firstChild;
+        const condition = `@data-${attribute}="${key.toLowerCase()}"`;
+        const item = this.$getNextItem(current, condition);
+        if (item)
+          return item;
+      }
+      return null;
+    }
+
+    $incrementalSearchNextFocusedItem(key) {
+      this.$incrementalSearchString += key.toLowerCase();
+      const current = this.$lastHoverItem || this.$lastFocusedItem || this.root.firstChild;
+      const condition = `starts-with(@data-lower-cased-text, "${this.$incrementalSearchString.replace(/"/g, '\\"')}")`;
+      if (this.$isItemMatches(current, condition))
+        return current;
+      const item = this.$getNextItem(current, condition);
+      return item;
+    }
+
+    $shouldSearchIncremental() {
+      if (!this.incrementalSearch)
+        return false;
+
+      const last = this.$lastKeyInputAt;
+      const now = this.$lastKeyInputAt = Date.now();
+      if (last < 0)
+        return true; // start
+
+      if (now - last > this.incrementalSearchTimeout)
+        this.$incrementalSearchString = '';
+
+      return true; // continue
+    }
+
+    $onKeyDown(event) {
+      switch (event.key) {
+        case 'ArrowUp':
+          event.stopPropagation();
+          event.preventDefault();
+          this.$advanceFocus(-1);
+          break;
+
+        case 'ArrowDown':
+          event.stopPropagation();
+          event.preventDefault();
+          this.$advanceFocus(1);
+          break;
+
+        case 'ArrowRight':
+          event.stopPropagation();
+          event.preventDefault();
+          if (this.isRTL)
+            this.$digOut();
+          else
+            this.$digIn();
+          break;
+
+        case 'ArrowLeft':
+          event.stopPropagation();
+          event.preventDefault();
+          if (this.isRTL)
+            this.$digIn();
+          else
+            this.$digOut();
+          break;
+
+        case 'Home':
+          event.stopPropagation();
+          event.preventDefault();
+          this.$advanceFocus(1, (
+            this.$lastHoverItem && this.$lastHoverItem.parentNode ||
+          this.$lastFocusedItem && this.$lastFocusedItem.parentNode ||
+          this.root
+          ).lastChild);
+          break;
+
+        case 'End':
+          event.stopPropagation();
+          event.preventDefault();
+          this.$advanceFocus(-1, (
+            this.$lastHoverItem && this.$lastHoverItem.parentNode ||
+          this.$lastFocusedItem && this.$lastFocusedItem.parentNode ||
+          this.root
+          ).firstChild);
+          break;
+
+        case 'Enter': {
+          event.stopPropagation();
+          event.preventDefault();
+          const targetItem = this.$lastHoverItem || this.$lastFocusedItem;
+          if (targetItem) {
+            if (targetItem.classList.contains('disabled'))
+              this.close();
+            else if (!targetItem.classList.contains('separator'))
+              this.onCommand(targetItem, event);
+          }
+        }; break;
+
+        case 'Escape': {
+          event.stopPropagation();
+          event.preventDefault();
+          const targetItem = this.$lastHoverItem || this.$lastFocusedItem;
+          if (!targetItem ||
+            targetItem.parentNode == this.root)
+            this.close();
+          else
+            this.$digOut();
+        }; break;
+
+        case 'BackSpace': {
+          if (this.$shouldSearchIncremental()) {
+            event.stopPropagation();
+            event.preventDefault();
+            this.$incrementalSearchString = this.$incrementalSearchString.slice(0, this.$incrementalSearchString.length - 1);
+            const item = this.$incrementalSearchNextFocusedItem('');
+            if (item) {
+              this.focusTo(item);
+              this.$setHover(null);
+            }
+          }
+        }; break;
+
+        default:
+          if (event.key.length == 1) {
+            if (this.$shouldSearchIncremental()) {
+              event.stopPropagation();
+              event.preventDefault();
+              const item = this.$incrementalSearchNextFocusedItem(event.key);
+              if (item) {
+                this.focusTo(item);
+                this.$setHover(null);
+              }
+              return;
+            }
+
+            const item = this.$getNextFocusedItemByAccesskey(event.key);
+            if (item) {
+              this.focusTo(item);
+              this.$setHover(null);
+              if (this.$getNextFocusedItemByAccesskey(event.key) == item &&
+                  !item.classList.contains('disabled')) {
+                if (item.querySelector('ul'))
+                  this.$digIn();
+                else
+                  this.onCommand(item, event);
+              }
+            }
+          }
+          return;
+      }
+    }
+
+    $onKeyUp(event) {
+      switch (event.key) {
+        case 'ArrowUp':
+        case 'ArrowDown':
+        case 'ArrowRight':
+        case 'ArrowLeft':
+        case 'Home':
+        case 'End':
+        case 'Enter':
+        case 'Escape':
+        case 'Bakcspace':
+          event.stopPropagation();
+          event.preventDefault();
+          return;
+
+        default:
+          if (event.key.length == 1 &&
+              (this.$shouldSearchIncremental() ||
+               this.$getNextFocusedItemByAccesskey(event.key))) {
+            event.stopPropagation();
+            event.preventDefault();
+          }
+          return;
+      }
+    }
+
+    $getPreviousItem(base, condition = '') {
+      const extrcondition = condition ? `[${condition}]` : '' ;
+      const item = (
+        MenuUI.$evaluateXPath(
+          `preceding-sibling::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}[1]`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue ||
+        MenuUI.$evaluateXPath(
+          `following-sibling::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}[last()]`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue ||
+        MenuUI.$evaluateXPath(
+          `self::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue
+      );
+      if (window.getComputedStyle(item, null).display == 'none')
+        return this.$getPreviousItem(item, condition);
+      return item;
+    }
+
+    $getNextItem(base, condition = '') {
+      const extrcondition = condition ? `[${condition}]` : '' ;
+      const item = (
+        MenuUI.$evaluateXPath(
+          `following-sibling::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}[1]`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue ||
+        MenuUI.$evaluateXPath(
+          `preceding-sibling::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}[last()]`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue ||
+        MenuUI.$evaluateXPath(
+          `self::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}`,
+          base,
+          XPathResult.FIRST_ORDERED_NODE_TYPE
+        ).singleNodeValue
+      );
+      if (item && window.getComputedStyle(item, null).display == 'none')
+        return this.$getNextItem(item, condition);
+      return item;
+    }
+
+    $isItemMatches(base, condition = '') {
+      const extrcondition = condition ? `[${condition}]` : '' ;
+      return !!MenuUI.$evaluateXPath(
+        `self::li[not(${MenuUI.$hasClass('separator')})]${extrcondition}`,
+        base,
+        XPathResult.FIRST_ORDERED_NODE_TYPE
+      ).singleNodeValue;
+    }
+
+    $advanceFocus(direction, lastFocused = null) {
+      lastFocused = lastFocused || this.$lastHoverItem || this.$lastFocusedItem;
+      if (!lastFocused) {
+        if (direction < 0)
+          this.$lastFocusedItem = lastFocused = this.root.firstChild;
+        else
+          this.$lastFocusedItem = lastFocused = this.root.lastChild;
+      }
+      this.focusTo(direction < 0 ? this.$getPreviousItem(lastFocused) : this.$getNextItem(lastFocused));
+      this.$setHover(null);
+    }
+
+    $digIn() {
+      if (!this.$lastFocusedItem) {
+        this.$advanceFocus(1, this.root.lastChild);
+        return;
+      }
+      const submenu = this.$lastFocusedItem.querySelector('ul');
+      if (!submenu || this.$lastFocusedItem.classList.contains('disabled'))
+        return;
+      this.$closeOtherSubmenus(this.$lastFocusedItem);
+      this.$openSubmenuFor(this.$lastFocusedItem);
+      this.$advanceFocus(1, submenu.lastChild);
+    }
+
+    $digOut() {
+      const targetItem = this.$lastHoverItem || this.$lastFocusedItem;
+      if (!targetItem ||
+        targetItem.parentNode == this.root)
+        return;
+      this.$closeOtherSubmenus(targetItem);
+      this.$lastFocusedItem = targetItem.parentNode.parentNode;
+      this.$closeOtherSubmenus(this.$lastFocusedItem);
+      this.$lastFocusedItem.classList.remove('open');
+      this.focusTo(targetItem.parentNode.parentNode);
+      this.$setHover(null);
+    }
+
+    $onTransitionEnd(event) {
+      const hoverItems = this.root.querySelectorAll('li:hover');
+      if (hoverItems.length == 0)
+        return;
+      const $lastHoverItem = hoverItems[hoverItems.length - 1];
+      const item = this.$getEffectiveItem($lastHoverItem);
+      if (!item)
+        return;
+      if (item.parentNode != event.target)
+        return;
+      this.$setHover(item);
+      this.focusTo(item);
+    }
+
+    $onContextMenu(event) {
+      event.stopImmediatePropagation();
+      event.stopPropagation();
+      event.preventDefault();
+    }
+
+
+    static $installStyles() {
+      this.style = document.createElement('style');
+      this.style.setAttribute('type', 'text/css');
+      const common = `.${this.$commonClass}`;
+      this.style.textContent = `
+        ${common}.menu-ui,
+        ${common}.menu-ui ul {
+          background-color: var(--menu-ui-background-color);
+          color: var(--menu-ui-text-color);
+          cursor: default;
+          margin: 0;
+          max-height: calc(100% - 6px);
+          max-width: calc(100% - 6px);
+          opacity: 0;
+          overflow: hidden; /* because scrollbars always trap mouse events even if it is invisible. See also: https://github.com/piroor/treestyletab/issues/2386 */
+          padding: 0;
+          pointer-events: none;
+          position: fixed;
+          z-index: 999999;
+        }
+        ${common}.menu-ui.rtl {
+          direction: rtl;
+        }
+
+        ${common}.menu-ui.open,
+        ${common}.menu-ui.open li.open > ul {
+          opacity: 1;
+          overflow: auto;
+          pointer-events: auto;
+        }
+
+        ${common}.menu-ui li {
+          list-style: none;
+          margin: 0;
+          padding: 0;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        ${common}.menu-ui li:not(.separator):focus,
+        ${common}.menu-ui li:not(.separator).open {
+          background-color: var(--menu-ui-background-color-active);
+          color: var(--menu-ui-text-color-active);
+        }
+
+        ${common}.menu-ui li.radio.checked::before,
+        ${common}.menu-ui li.checkbox.checked::before {
+          content: "โœ”";
+          position: absolute;
+          inset-inline-start: 0.5em;
+        }
+
+        ${common}.menu-ui li.separator {
+          height: 0.5em;
+          visibility: hidden;
+          margin: 0;
+          padding: 0;
+        }
+
+        ${common}.menu-ui li.has-submenu,
+        ${common}.menu-ui.menu li.has-submenu {
+          padding-inline-end: 1em;
+        }
+        ${common}.menu-ui li.has-submenu::after {
+          content: "โฏ";
+          inset-inline-end: 0.25em;
+          position: absolute;
+          transform: scale(0.75);
+        }
+
+        ${common}.menu-ui .accesskey {
+          text-decoration: underline;
+        }
+
+        ${common}.menu-ui-blocking-screen {
+          display: none;
+        }
+
+        ${common}.menu-ui-blocking-screen.open {
+          bottom: 0;
+          display: block;
+          left: 0;
+          position: fixed;
+          right: 0;
+          top: 0;
+          z-index: 899999;
+        }
+
+        ${common}.menu-ui.menu li:not(.separator):focus,
+        ${common}.menu-ui.menu li:not(.separator).open {
+          outline: none;
+        }
+
+        ${common}.menu-ui.panel li:not(.separator):focus ul li:not(:focus):not(.open),
+        ${common}.menu-ui.panel li:not(.separator).open ul li:not(:focus):not(.open) {
+          background-color: transparent;
+          color: var(--menu-ui-text-color);
+        }
+
+        ${common}.menu-ui-marker {
+          opacity: 0;
+          pointer-events: none;
+          position: fixed;
+        }
+
+        ${common}.menu-ui-marker.open {
+          border: 0.5em solid transparent;
+          content: "";
+          height: 0;
+          left: 0;
+          opacity: 1;
+          top: 0;
+          width: 0;
+          z-index: 999999;
+        }
+
+        ${common}.menu-ui-marker.top {
+          border-bottom: 0.5em solid var(--menu-ui-background-color);
+        }
+        ${common}.menu-ui-marker.bottom {
+          border-top: 0.5em solid var(--menu-ui-background-color);
+        }
+
+        ${common}.menu-ui li.disabled {
+          opacity: 0.5;
+        }
+
+        ${common}.menu-ui li[data-icon],
+        ${common}.menu-ui.menu li[data-icon],
+        ${common}.menu-ui.panel li[data-icon] {
+          --icon-size: 16px;
+          background-repeat: no-repeat;
+          background-size: var(--icon-size);
+          padding-inline-start: calc(var(--icon-size) + 0.7em);
+        }
+        ${common}.menu-ui:not(.rtl) li[data-icon],
+        ${common}.menu-ui:not(.rtl).menu li[data-icon],
+        ${common}.menu-ui:not(.rtl).panel li[data-icon] {
+          background-position: left center;
+        }
+        ${common}.menu-ui.rtl li[data-icon],
+        ${common}.menu-ui.rtl.menu li[data-icon],
+        ${common}.menu-ui.rtl.panel li[data-icon] {
+          background-position: right center;
+        }
+
+        ${common}.menu-ui li.checkbox,
+        ${common}.menu-ui li.radio,
+        ${common}.menu-ui.menu li.checkbox,
+        ${common}.menu-ui.panel li.checkbox,
+        ${common}.menu-ui.menu li.radio,
+        ${common}.menu-ui.panel li.radio {
+          padding-inline-start: 1.7em;
+        }
+
+        /* panel-like appearance */
+        ${common}.panel {
+          --menu-ui-background-color: -moz-dialog;
+          --menu-ui-text-color: -moz-dialogtext;
+          --menu-ui-background-color-active: Highlight;
+          --menu-ui-text-color-active: HighlightText;
+        }
+        ${common}.panel li.disabled {
+          --menu-ui-background-color-active: InactiveCaptionText;
+          --menu-ui-text-color-active: InactiveCaption;
+        }
+        ${common}.menu-ui.panel,
+        ${common}.menu-ui.panel ul {
+          box-shadow: 0.1em 0.1em 0.8em rgba(0, 0, 0, 0.65);
+          padding: 0.25em 0;
+        }
+
+        ${common}.menu-ui.panel li {
+          padding: 0.15em 1em 0.15em 0.7em;
+        }
+
+
+        /* Menu-like appearance */
+        ${common}.menu {
+          --menu-ui-background-color: Menu;
+          --menu-ui-text-color: MenuText;
+          --menu-ui-background-color-active: Highlight;
+          --menu-ui-text-color-active: HighlightText;
+        }
+        ${common}.menu li.disabled {
+          --menu-ui-background-color-active: InactiveCaptionText;
+          --menu-ui-text-color-active: InactiveCaption;
+        }
+        ${common}.menu-ui.menu,
+        ${common}.menu-ui.menu ul {
+          border: 1px outset Menu;
+          box-shadow: 0.1em 0.1em 0.5em rgba(0, 0, 0, 0.65);
+          font: -moz-pull-down-menu;
+        }
+
+        ${common}.menu-ui.menu li {
+          padding: 0.15em 0.5em 0.15em 0.7em;
+        }
+
+        ${common}.menu-ui.menu li.separator {
+          border: 1px inset Menu;
+          height: 0;
+          margin: 0 0.5em;
+          max-height: 0;
+          opacity: 0.5;
+          padding: 0;
+          visibility: visible;
+        }
+
+        ${common}.menu-ui.menu:not(.rtl) li[data-icon]:not([data-icon-color]),
+        ${common}.menu-ui.panel:not(.rtl) li[data-icon]:not([data-icon-color]) {
+          background-position: 0.5em center;
+        }
+        ${common}.menu-ui.menu.rtl li[data-icon]:not([data-icon-color]),
+        ${common}.menu-ui.panel.rtl li[data-icon]:not([data-icon-color]) {
+          background-position: calc(100% - 0.5em) center;
+        }
+
+        ${common}.menu-ui li:not([data-icon]) .icon,
+        ${common}.menu-ui li[data-icon]:not([data-icon-color]) .icon {
+          display: none;
+        }
+
+        ${common}.menu-ui li[data-icon][data-icon-color] .icon {
+          display: inline-block;
+          height: var(--icon-size);
+          inset-inline-start: 0.5em;
+          max-height: var(--icon-size);
+          max-width: var(--icon-size);
+          position: absolute;
+          width: var(--icon-size);
+        }
+      `;
+      document.head.appendChild(this.style);
+    }
+
+    static init() {
+      MenuUI.$uniqueKey   = parseInt(Math.random() * Math.pow(2, 16));
+      MenuUI.$commonClass = `menu-ui-${MenuUI.$uniqueKey}`;
+
+      MenuUI.prototype.$uniqueKey   = MenuUI.$uniqueKey;
+      MenuUI.prototype.$commonClass = MenuUI.$commonClass;
+
+      MenuUI.$installStyles();
+
+      window.MenuUI = MenuUI;
+    }
+  };
+
+  MenuUI.init();
+}
+export default MenuUI;
diff --git a/waterfox/browser/components/sidebar/extlib/Options.js b/waterfox/browser/components/sidebar/extlib/Options.js
new file mode 100644
index 0000000000000..dddd3a7b28bc6
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/Options.js
@@ -0,0 +1,420 @@
+/*
+ license: The MIT License, Copyright (c) 2016-2020 YUKI "Piro" Hiroshi
+ original:
+   http://github.com/piroor/webextensions-lib-options
+*/
+
+class Options {
+  constructor(configs, { steps, onImporting, onImported, onExporting, onExported } = {}) {
+    this.configs = configs;
+    this.steps = steps || {};
+    this.$onImporting = onImporting;
+    this.$onImported  = onImported;
+    this.$onExporting = onExporting;
+    this.$onExported  = onExported;
+    this.uiNodes = new Map();
+    this.throttleTimers = new Map();
+
+    this.onReady = this.onReady.bind(this);
+    this.onConfigChanged = this.onConfigChanged.bind(this)
+    document.addEventListener('DOMContentLoaded', this.onReady);
+  }
+
+  findUIsForKey(key) {
+    key = this._sanitizeForSelector(key);
+    if (!key)
+      return [];
+    return document.querySelectorAll(`[name="${key}"], #${key}, [data-config-key="${key}"]`);
+  }
+
+  detectUIType(node) {
+    if (!node)
+      return this.UI_MISSING;
+
+    if (node.localName == 'textarea')
+      return this.UI_TYPE_TEXT_FIELD;
+
+    if (node.localName == 'select')
+      return this.UI_TYPE_SELECTBOX;
+
+    if (node.localName != 'input')
+      return this.UI_TYPE_UNKNOWN;
+
+    switch (node.type) {
+      case 'text':
+      case 'password':
+      case 'number':
+      case 'color':
+        return this.UI_TYPE_TEXT_FIELD;
+
+      case 'checkbox':
+        return this.UI_TYPE_CHECKBOX;
+
+      case 'radio':
+        return this.UI_TYPE_RADIO;
+
+      default:
+        return this.UI_TYPE_UNKNOWN;
+    }
+  }
+
+  throttledUpdate(key, uiNode, value) {
+    if (this.throttleTimers.has(key))
+      clearTimeout(this.throttleTimers.get(key));
+    uiNode.dataset.configValueUpdating = true;
+    this.throttleTimers.set(key, setTimeout(() => {
+      this.throttleTimers.delete(key);
+      this.configs[key] = this.UIValueToConfigValue(key, value);
+      setTimeout(() => {
+        uiNode.dataset.configValueUpdating = false;
+      }, 50);
+    }, 250));
+  }
+
+  UIValueToConfigValue(key, value) {
+    switch (typeof this.configs.$default[key]) {
+      case 'string':
+        return String(value);
+
+      case 'number':
+        return Number(value);
+
+      case 'boolean':
+        if (typeof value == 'string')
+          return value != 'false';
+        else
+          return Boolean(value);
+
+      default: // object
+        if (typeof value == 'string')
+          return JSON.parse(value || 'null');
+        else
+          return value;
+    }
+  }
+
+  configValueToUIValue(value) {
+    if (typeof value == 'object') {
+      value = JSON.stringify(value);
+      if (value == 'null')
+        value = '';
+      return value;
+    }
+    else
+      return value;
+  }
+
+  applyLocked(node, key) {
+    const locked = this.configs.$isLocked(key);
+    node.disabled = locked;
+    const selector = node.id && `label[for="${this._sanitizeForSelector(node.id)}"]`;
+    const label = node.closest('label') || (node.id && node.ownerDocument.querySelector(selector)) || node;
+    if (label)
+      label.classList.toggle('locked', locked);
+  }
+
+  bindToCheckbox(key, node) {
+    node.checked = this.configValueToUIValue(this.configs[key]);
+    node.addEventListener('change', () => {
+      this.throttledUpdate(key, node, node.checked);
+    });
+    this.applyLocked(node, key);
+    this.addResetMethod(key, node);
+    const nodes = this.uiNodes.get(key) || [];
+    nodes.push(node);
+    this.uiNodes.set(key, nodes);
+  }
+  bindToRadio(key, node) {
+    const group  = node.getAttribute('name');
+    const radios = document.querySelectorAll(`input[name="${this._sanitizeForSelector(group)}"]`);
+    let activated = false;
+    for (const radio of radios) {
+      const nodes = this.uiNodes.get(key) || [];
+      if (nodes.includes(radio))
+        continue;
+      this.applyLocked(radio, key);
+      nodes.push(radio);
+      this.uiNodes.set(key, nodes);
+      radio.addEventListener('change', () => {
+        if (!activated)
+          return;
+        const stringifiedValue = this.configs[key];
+        if (stringifiedValue != radio.value)
+          this.throttledUpdate(key, radio, radio.value);
+      });
+    }
+    const selector = `input[type="radio"][value=${JSON.stringify(String(this.configs[key]))}]`;
+    const chosens = (this.uiNodes.get(key) || []).filter(node => node.matches(selector));
+    if (chosens && chosens.length > 0)
+      chosens.map(chosen => { chosen.checked = true; });
+    setTimeout(() => {
+      activated = true;
+    }, 0);
+  }
+  bindToTextField(key, node) {
+    node.value = this.configValueToUIValue(this.configs[key]);
+    node.addEventListener('input', () => {
+      this.throttledUpdate(key, node, node.value);
+    });
+    this.applyLocked(node, key);
+    this.addResetMethod(key, node);
+    const nodes = this.uiNodes.get(key) || [];
+    nodes.push(node);
+    this.uiNodes.set(key, nodes);
+  }
+  bindToSelectBox(key, node) {
+    node.value = this.configValueToUIValue(this.configs[key]);
+    node.addEventListener('change', () => {
+      this.throttledUpdate(key, node, node.value);
+    });
+    this.applyLocked(node, key);
+    this.addResetMethod(key, node);
+    const nodes = this.uiNodes.get(key) || [];
+    nodes.push(node);
+    this.uiNodes.set(key, nodes);
+  }
+  addResetMethod(key, node) {
+    node.$reset = () => {
+      this.configs.$reset(key);
+      const value = this.configs.$default[key];
+      if (this.detectUIType(node) == this.UI_TYPE_CHECKBOX)
+        node.checked = value;
+      else
+        node.value = value;
+    };
+  }
+
+  async onReady() {
+    document.removeEventListener('DOMContentLoaded', this.onReady);
+
+    if (!this.configs || !this.configs.$loaded)
+      throw new Error('you must give configs!');
+
+    this.configs.$addObserver(this.onConfigChanged);
+    await this.configs.$loaded;
+    for (const key of Object.keys(this.configs.$default)) {
+      const nodes = this.findUIsForKey(key);
+      if (!nodes.length)
+        continue;
+      for (const node of nodes) {
+        switch (this.detectUIType(node)) {
+          case this.UI_TYPE_CHECKBOX:
+            this.bindToCheckbox(key, node);
+            break;
+
+          case this.UI_TYPE_RADIO:
+            this.bindToRadio(key, node);
+            break;
+
+          case this.UI_TYPE_TEXT_FIELD:
+            this.bindToTextField(key, node);
+            break;
+
+          case this.UI_TYPE_SELECTBOX:
+            this.bindToSelectBox(key, node);
+            break;
+
+          case this.UI_MISSING:
+            continue;
+
+          default:
+            throw new Error(`unknown type UI element for ${key}`);
+        }
+      }
+    }
+  }
+
+  onConfigChanged(key) {
+    const nodes = this.uiNodes.get(key);
+    if (!nodes || !nodes.length)
+      return;
+
+    for (const node of nodes) {
+      if (node.dataset.configValueUpdating == 'true')
+        continue;
+      if (node.matches('input[type="radio"]')) {
+        node.checked = this.configs[key] == node.value;
+      }
+      else if (node.matches('input[type="checkbox"]')) {
+        node.checked = !!this.configs[key];
+      }
+      else {
+        node.value = this.configValueToUIValue(this.configs[key]);
+      }
+      this.applyLocked(node, key);
+    }
+  }
+
+  buildUIForAllConfigs(parent) {
+    parent = parent || document.body;
+    const range = document.createRange();
+    range.selectNodeContents(parent);
+    range.collapse(false);
+    const rows = [];
+    for (const key of Object.keys(this.configs.$default).sort()) {
+      const value = this.configs.$default[key];
+      const type = typeof value == 'number' ? 'number' :
+        typeof value == 'boolean' ? 'checkbox' :
+          'text' ;
+      // To accept decimal values like "1.1", we need to set "step" with decmimal values.
+      // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/number
+      const step = type != 'number' ? '' : `step="${this.sanitizeForHTMLText(key in this.steps ? this.steps[key] : String(1.75).replace(/[1-9]/g, '0').replace(/0$/, '1'))}"`;
+      const placeholder = type == 'checkbox' ? '' : `placeholder=${JSON.stringify(this.sanitizeForHTMLText(String(value)))}`;
+      rows.push(`
+        <tr ${rows.length > 0 ? 'style="border-top: 1px solid rgba(0, 0, 0, 0.2);"' : ''}>
+          <td style="width: 45%; word-break: break-all;">
+            <label for="allconfigs-field-${this.sanitizeForHTMLText(key)}">${this.sanitizeForHTMLText(key)}</label>
+          </td>
+          <td style="width: 35%;">
+            <input id="allconfigs-field-${this.sanitizeForHTMLText(key)}"
+                   type="${type}"
+                   ${type != 'checkbox' && type != 'radio' ? 'style="width: 100%;"' : ''}
+                   ${step}
+                   ${placeholder}>
+          </td>
+          <td>
+            <button id="allconfigs-reset-${this.sanitizeForHTMLText(key)}">Reset</button>
+          </td>
+        </tr>
+      `);
+    }
+    const fragment = range.createContextualFragment(`
+      <table id="allconfigs-table"
+             style="border-collapse: collapse">
+        <tbody>${rows.join('')}</tbody>
+      </table>
+      <div>
+        <button id="allconfigs-reset-all">Reset All</button>
+        <button id="allconfigs-export">Export</button>
+        <a id="allconfigs-export-file"
+           type="application/json"
+           download="configs-${browser.runtime.id}.json"
+           style="display:none"></a>
+        <button id="allconfigs-import">Import</button>
+        <input id="allconfigs-import-file"
+               type="file"
+               accept="application/json"
+               style="display:none">
+      </div>
+    `);
+    range.insertNode(fragment);
+    range.detach();
+    const table = document.getElementById('allconfigs-table');
+    for (const input of table.querySelectorAll('input')) {
+      const key = input.id.replace(/^allconfigs-field-/, '');
+      switch (this.detectUIType(input)) {
+        case this.UI_TYPE_CHECKBOX:
+          this.bindToCheckbox(key, input);
+          break;
+
+        case this.UI_TYPE_TEXT_FIELD:
+          this.bindToTextField(key, input);
+          break;
+      }
+      const button = table.querySelector(`#allconfigs-reset-${this._sanitizeForSelector(key)}`);
+      button.addEventListener('click', () => {
+        input.$reset();
+      });
+      button.addEventListener('keyup', event => {
+        if (event.key == 'Enter' || event.key == ' ')
+          input.$reset();
+      });
+    }
+    const resetAllButton = document.getElementById('allconfigs-reset-all');
+    resetAllButton.addEventListener('keydown', event => {
+      if (event.key == 'Enter' || event.key == ' ')
+        this.resetAll();
+    });
+    resetAllButton.addEventListener('click', event => {
+      if (event.button == 0)
+        this.resetAll();
+    });
+    const exportButton = document.getElementById('allconfigs-export');
+    exportButton.addEventListener('keydown', event => {
+      if (event.key == 'Enter' || event.key == ' ')
+        this.exportToFile();
+    });
+    exportButton.addEventListener('click', event => {
+      if (event.button == 0)
+        this.exportToFile();
+    });
+    const importButton = document.getElementById('allconfigs-import');
+    importButton.addEventListener('keydown', event => {
+      if (event.key == 'Enter' || event.key == ' ')
+        this.importFromFile();
+    });
+    importButton.addEventListener('click', event => {
+      if (event.button == 0)
+        this.importFromFile();
+    });
+    const fileField = document.getElementById('allconfigs-import-file');
+    fileField.addEventListener('change', async _event => {
+      const text = await fileField.files.item(0).text();
+      let values = JSON.parse(text);
+      if (typeof this.$onImporting == 'function')
+        values = await this.$onImporting(values);
+      for (const key of Object.keys(this.configs.$default)) {
+        const value = values[key] !== undefined ? values[key] : this.configs.$default[key];
+        const changed = value != this.configs[key];
+        this.configs[key] = value;
+        if (changed)
+          this.onConfigChanged(key);
+      }
+      if (typeof this.$onImported == 'function')
+        await this.$onImported();
+    });
+  }
+  sanitizeForHTMLText(text) {
+    return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  }
+
+  resetAll() {
+    this.configs.$reset();
+  }
+
+  importFromFile() {
+    document.getElementById('allconfigs-import-file').click();
+  }
+
+  async exportToFile() {
+    let values = {};
+    for (const key of Object.keys(this.configs.$default).sort()) {
+      const defaultValue = JSON.stringify(this.configs.$default[key]);
+      const currentValue = JSON.stringify(this.configs[key]);
+      if (defaultValue !== currentValue) {
+        values[key] = this.configs[key];
+      }
+    }
+    if (typeof this.$onExporting == 'function')
+      values = await this.$onExporting(values);
+    // Pretty print the exported JSON, because some major addons
+    // including Stylus and uBlock do that.
+    const exported = JSON.stringify(values, null, 2);
+    const browserInfo = browser.runtime.getBrowserInfo && await browser.runtime.getBrowserInfo();
+    switch (browserInfo && browserInfo.name) {
+      case 'Thunderbird':
+        window.open(`data:application/json,${encodeURIComponent(exported)}`);
+        break;
+
+      default:
+        const link = document.getElementById('allconfigs-export-file');
+        link.href = URL.createObjectURL(new Blob([exported], { type: 'application/json' }));
+        link.click();
+        break;
+    }
+    if (typeof this.$onExported == 'function')
+      await this.$onExported();
+  }
+
+  _sanitizeForSelector(string) {
+    return string.replace(/[:\[\]()]/g, '\\$&');
+  }
+};
+
+Options.prototype.UI_TYPE_UNKNOWN    = 0;
+Options.prototype.UI_TYPE_TEXT_FIELD = 1 << 0;
+Options.prototype.UI_TYPE_CHECKBOX   = 1 << 1;
+Options.prototype.UI_TYPE_RADIO      = 1 << 2;
+Options.prototype.UI_TYPE_SELECTBOX  = 1 << 3;
+
+export default Options;
diff --git a/waterfox/browser/components/sidebar/extlib/RichConfirm.js b/waterfox/browser/components/sidebar/extlib/RichConfirm.js
new file mode 100644
index 0000000000000..bcc2b053ef14e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/RichConfirm.js
@@ -0,0 +1,1621 @@
+/*
+ license: The MIT License, Copyright (c) 2018-2025 YUKI "Piro" Hiroshi
+ original:
+   https://github.com/piroor/webextensions-lib-rich-confirm
+*/
+'use strict';
+
+(function defineRichConfirm(uniqueKey) {
+  class RichConfirm {
+    constructor(params) {
+      this.params = params;
+      if (!this.params.buttons)
+        this.params.buttons = ['OK'];
+      this.onClick = this.onClick.bind(this);
+      this.onKeyDown = this.onKeyDown.bind(this);
+      this.onKeyUp = this.onKeyUp.bind(this);
+      this.onContextMenu = this.onContextMenu.bind(this);
+      this.onUnload = this.onUnload.bind(this);
+    }
+    get commonClass() {
+      return `rich-confirm-${this.uniqueKey}`;
+    }
+    get dialog() {
+      return this.ui.querySelector('.rich-confirm-dialog');
+    }
+    get content() {
+      return this.ui.querySelector('.rich-confirm-content');
+    }
+    get buttonsContainer() {
+      return this.ui.querySelector('.rich-confirm-buttons');
+    }
+    get checkContainer() {
+      return this.ui.querySelector('.rich-confirm-check-label');
+    }
+    get checkCheckbox() {
+      return this.ui.querySelector('.rich-confirm-check-checkbox');
+    }
+    get checkMessage() {
+      return this.ui.querySelector('.rich-confirm-check-message');
+    }
+
+    get focusTargets() {
+      return Array.from(this.ui.querySelectorAll('input:not([type="hidden"]), textarea, select, button, *[tabindex]:not([tabindex^="-"])')).filter(node => node.offsetWidth > 0);
+    }
+
+    RTL_LANGUAGES = new Set([
+      'ar',
+      'he',
+      'fa',
+      'ur',
+      'ps',
+      'sd',
+      'ckb',
+      'prs',
+      'rhg',
+    ]);
+    get isRTL() {
+      const lang = (
+        navigator.language ||
+        navigator.userLanguage ||
+        //(new Intl.DateTimeFormat()).resolvedOptions().locale ||
+        ''
+      ).split('-')[0];
+      return this.RTL_LANGUAGES.has(lang);
+    }
+
+    buildUI() {
+      if (this.ui)
+        return;
+      this.style = document.createElement('style');
+      this.style.setAttribute('type', 'text/css');
+      const common = `.${this.commonClass}`;
+      this.style.textContent = `
+        /* color scheme */
+        ${common}.rich-confirm,
+        :root${common} {
+          /* https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/themes/shared/in-content/common.inc.css */
+          --in-content-page-color: var(--grey-90);
+          --in-content-page-background: var(--grey-10);
+          --in-content-text-color: var(--in-content-page-color);
+          --in-content-deemphasized-text: var(--grey-60);
+          --in-content-selected-text: #fff;
+          --in-content-box-background: #fff;
+          --in-content-box-background-hover: var(--grey-20);
+          --in-content-box-background-active: var(--grey-30);
+          --in-content-box-border-color: var(--grey-90-a30);
+          --in-content-box-border-color-mixed: rgb(calc((249 * 0.7) + (12 * 0.3)), calc((249 * 0.7) + (12 * 0.3)), calc((250 * 0.7) + (13 * 0.3)));
+          --in-content-box-info-background: var(--grey-20);
+          --in-content-item-hover: rgba(69, 161, 255, 0.2); /* blue 40 a20 */
+          --in-content-item-hover-mixed: rgb(calc((249 * 0.8) + (69 * 0.2)), calc((249 * 0.8) + (161 * 0.2)), calc((250 * 0.8) + (255 * 0.2)));
+          --in-content-item-selected: var(--blue-50);
+          --in-content-border-highlight: var(--blue-50);
+          --in-content-border-focus: var(--blue-50);
+          --in-content-border-hover: var(--grey-90-a50);
+          --in-content-border-hover-mixed: rgb(calc((249 * 0.5) + (12 * 0.5)), calc((249 * 0.5) + (12 * 0.5)), calc((250 * 0.5) + (13 * 0.5)));
+          --in-content-border-active: var(--blue-50);
+          --in-content-border-active-shadow: var(--blue-50-a30);
+          --in-content-border-invalid: var(--red-50);
+          --in-content-border-invalid-shadow: var(--red-50-a30);
+          --in-content-border-color: var(--grey-30);
+          --in-content-border-color-mixed: #d7d7db;
+          --in-content-category-outline-focus: 1px dotted var(--blue-50);
+          --in-content-category-text-selected: var(--blue-50);
+          --in-content-category-text-selected-active: var(--blue-60);
+          --in-content-category-background-hover: rgba(12,12,13,0.1);
+          --in-content-category-background-active: rgba(12,12,13,0.15);
+          --in-content-category-background-selected-hover: rgba(12,12,13,0.15);
+          --in-content-category-background-selected-active: rgba(12,12,13,0.2);
+          --in-content-tab-color: #424f5a;
+          --in-content-link-color: var(--blue-60);
+          --in-content-link-color-hover: var(--blue-70);
+          --in-content-link-color-active: var(--blue-80);
+          --in-content-link-color-visited: var(--blue-60);
+          --in-content-button-background: var(--grey-90-a10);
+          --in-content-button-background-mixed: rgb(calc((249 * 0.9) + (12 * 0.1)), calc((249 * 0.9) + (12 * 0.1)), calc((250 * 0.9) + (13 * 0.1)));
+          --in-content-button-background-hover: var(--grey-90-a20);
+          --in-content-button-background-hover-mixed: rgb(calc((249 * 0.8) + (12 * 0.2)), calc((249 * 0.8) + (12 * 0.2)), calc((250 * 0.8) + (13 * 0.2)));
+          --in-content-button-background-active: var(--grey-90-a30);
+          --in-content-button-background-active-mixed: rgb(calc((249 * 0.7) + (12 * 0.3)), calc((249 * 0.7) + (12 * 0.3)), calc((250 * 0.7) + (13 * 0.3)));
+
+          --blue-40: #45a1ff;
+          --blue-40-a10: rgb(69, 161, 255, 0.1);
+          --blue-50: #0a84ff;
+          --blue-50-a30: rgba(10, 132, 255, 0.3);
+          --blue-60: #0060df;
+          --blue-70: #003eaa;
+          --blue-80: #002275;
+          --grey-10: #f9f9fa;
+          --grey-10-a015: rgba(249, 249, 250, 0.015);
+          --grey-10-a20: rgba(249, 249, 250, 0.2);
+          --grey-20: #ededf0;
+          --grey-30: #d7d7db;
+          --grey-40: #b1b1b3;
+          --grey-60: #4a4a4f;
+          --grey-90: #0c0c0d;
+          --grey-90-a10: rgba(12, 12, 13, 0.1);
+          --grey-90-a20: rgba(12, 12, 13, 0.2);
+          --grey-90-a30: rgba(12, 12, 13, 0.3);
+          --grey-90-a50: rgba(12, 12, 13, 0.5);
+          --grey-90-a60: rgba(12, 12, 13, 0.6);
+          --green-50: #30e60b;
+          --green-60: #12bc00;
+          --green-70: #058b00;
+          --green-80: #006504;
+          --green-90: #003706;
+          --orange-50: #ff9400;
+          --purple-70: #6200a4;
+          --red-50: #ff0039;
+          --red-50-a30: rgba(255, 0, 57, 0.3);
+          --red-60: #d70022;
+          --red-70: #a4000f;
+          --red-80: #5a0002;
+          --red-90: #3e0200;
+          --yellow-10: #ffff98;
+          --yellow-50: #ffe900;
+          --yellow-60: #d7b600;
+          --yellow-60-a30: rgba(215, 182, 0, 0.3);
+          --yellow-70: #a47f00;
+          --yellow-80: #715100;
+          --yellow-90: #3e2800;
+
+          /* https://hg.mozilla.org/mozilla-central/raw-file/tip/browser/themes/addons/dark/manifest.json */
+          --dark-frame: hsl(240, 5%, 5%);
+          --dark-icons: rgb(249, 249, 250, 0.7);
+          --dark-ntp-background: #2A2A2E;
+          --dark-ntp-text: rgb(249, 249, 250);
+          --dark-popup: #4a4a4f;
+          --dark-popup-border: #27272b;
+          --dark-popup-text: rgb(249, 249, 250);
+          --dark-sidebar: #38383D;
+          --dark-sidebar-text: rgb(249, 249, 250);
+          --dark-sidebar-border: rgba(255, 255, 255, 0.1);
+          --dark-tab-background-text: rgb(249, 249, 250);
+          --dark-tab-line: #0a84ff;
+          --dark-toolbar: hsl(240, 1%, 20%);
+          --dark-toolbar-bottom-separator: hsl(240, 5%, 5%);
+          --dark-toolbar-field: rgb(71, 71, 73);
+          --dark-toolbar-field-border: rgba(249, 249, 250, 0.2);
+          --dark-toolbar-field-separator: #5F6670;
+          --dark-toolbar-field-text: rgb(249, 249, 250);
+
+          /* https://searchfox.org/mozilla-central/rev/35873cfc312a6285f54aa5e4ec2d4ab911157522/browser/themes/shared/tabs.inc.css#24 */
+          --tab-loading-fill: #0A84FF;
+
+
+          --bg-color: var(--grey-10);
+          --text-color: var(--grey-90);
+        }
+
+        ${common}.rich-confirm.rtl {
+          direction: rtl;
+        }
+
+        ${common}.rich-confirm :link {
+          color: var(--in-content-link-color);
+        }
+        ${common}.rich-confirm :visited {
+          color: var(--in-content-link-color-visited);
+        }
+
+        ${common}.rich-confirm :link:hover,
+        ${common}.rich-confirm :visited:hover {
+          color: var(--in-content-link-color-hover);
+        }
+
+        ${common}.rich-confirm :link:active,
+        ${common}.rich-confirm :visited:active {
+          color: var(--in-content-link-color-active);
+        }
+
+        @media (prefers-color-scheme: dark) {
+          ${common}.rich-confirm,
+          :root${common} {
+            /* https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/themes/shared/in-content/common.inc.css */
+            --in-content-page-background: #2A2A2E /* rgb(42, 42, 46) */;
+            --in-content-page-color: rgb(249, 249, 250);
+            --in-content-text-color: var(--in-content-page-color);
+            --in-content-deemphasized-text: var(--grey-40);
+            --in-content-box-background: #202023;
+            --in-content-box-background-hover: /* rgba(249,249,250,0.15) */ rgb(calc((42 * 0.85) + (249 * 0.15)), calc((42 * 0.85) + (249 * 0.15)), calc((46 * 0.85) + (250 * 0.15)));
+            --in-content-box-background-active: /*rgba(249,249,250,0.2) */ rgb(calc((42 * 0.8) + (249 * 0.2)), calc((42 * 0.8) + (249 * 0.2)), calc((46 * 0.8) + (250 * 0.2)));
+            --in-content-box-background-odd: rgba(249,249,250,0.05);
+            --in-content-box-info-background: rgba(249,249,250,0.15);
+
+            --in-content-border-color: rgba(249,249,250,0.2);
+            --in-content-border-color-mixed: rgb(calc((42 * 0.8) + (249 * 0.2)), calc((42 * 0.8) + (249 * 0.2)), calc((46 * 0.8) + (250 * 0.2)));
+            --in-content-border-hover: rgba(249,249,250,0.3);
+            --in-content-border-hover-mixed: rgb(calc((42 * 0.7) + (249 * 0.3)), calc((42 * 0.7) + (249 * 0.3)), calc((46 * 0.7) + (250 * 0.3)));
+            --in-content-box-border-color: rgba(249,249,250,0.2);
+            --in-content-box-border-color-mixed: rgb(calc((42 * 0.8) + (249 * 0.2)), calc((42 * 0.8) + (249 * 0.2)), calc((46 * 0.8) + (250 * 0.2)));
+
+            --in-content-button-background: rgba(249,249,250,0.1);
+            --in-content-button-background-mixed: rgb(calc((42 * 0.9) + (249 * 0.1)), calc((42 * 0.9) + (249 * 0.1)), calc((46 * 0.9) + (250 * 0.1)));
+            --in-content-button-background-hover: rgba(249,249,250,0.15);
+            --in-content-button-background-hover-mixed: rgb(calc((42 * 0.85) + (249 * 0.15)), calc((42 * 0.85) + (249 * 0.15)), calc((46 * 0.85) + (250 * 0.15)));
+            --in-content-button-background-active: rgba(249,249,250,0.2);
+            --in-content-button-background-active-mixed: rgb(calc((42 * 0.8) + (249 * 0.2)), calc((42 * 0.8) + (249 * 0.2)), calc((46 * 0.8) + (250 * 0.2)));
+
+            --in-content-link-color: var(--blue-40);
+            --in-content-link-color-hover: var(--blue-50);
+            --in-content-link-color-active: var(--blue-60);
+
+            --bg-color: var(--in-content-page-background);
+            --text-color: var(--in-content-text-color);
+          }
+
+          ${common}.rich-confirm textarea,
+          ${common}.rich-confirm input {
+            background: var(--in-content-box-background);
+            border: thin solid var(--in-content-box-border-color-mixed);
+            color: var(--in-content-text-color);
+          }
+          ${common}.rich-confirm textarea:hover,
+          ${common}.rich-confirm input:hover {
+            border-color: var(--in-content-border-hover-mixed);
+          }
+          ${common}.rich-confirm textarea:focus,
+          ${common}.rich-confirm input:focus {
+            border-color: var(--in-content-border-focus);
+            box-shadow: 0 0 0 1px var(--in-content-border-active),
+                        0 0 0 4px var(--in-content-border-active-shadow);
+          }
+
+          ${common}.rich-confirm fieldset,
+          ${common}.rich-confirm hr {
+            border: thin solid var(--in-content-box-border-color-mixed);
+          }
+
+          ${common}.rich-confirm hr {
+            border-width: thin 0 0 0;
+          }
+
+          ${common}.rich-confirm button,
+          ${common}.rich-confirm select {
+            background: var(--in-content-button-background-mixed);
+            border: 0 none transparent;
+            color: var(--in-content-text-color);
+            margin: 4px;
+          }
+          ${common}.rich-confirm button:hover,
+          ${common}.rich-confirm select:hover {
+            background: var(--in-content-button-background-hover-mixed);
+          }
+          ${common}.rich-confirm button:focus,
+          ${common}.rich-confirm select:focus {
+            background: var(--in-content-button-background-active-mixed);
+            box-shadow: 0 0 0 1px var(--in-content-border-active),
+                        0 0 0 4px var(--in-content-border-active-shadow);
+          }
+          ${common}.rich-confirm option {
+            background: var(--bg-color);
+            color: var(--text-color);
+          }
+          ${common}.rich-confirm option:active,
+          ${common}.rich-confirm option:focus {
+            background: var(--in-content-item-selected);
+          }
+          ${common}.rich-confirm option:hover {
+            background: var(--in-content-item-hover-mixed);
+          }
+        }
+
+        ${common}.rich-confirm,
+        ${common}.rich-confirm-row {
+          align-items: center;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+        }
+        ${common}.rich-confirm:not(.simulation),
+        ${common}.rich-confirm-row:not(.simulation) {
+          align-items: stretch;
+          bottom: 0;
+          left: 0;
+          position: fixed;
+          right: 0;
+          top: 0;
+        }
+
+        ${common}.rich-confirm {
+          left:0;
+          pointer-events: none;
+          z-index: 999997;
+        }
+        ${common}.rich-confirm.popup-window,
+        :root${common}.popup-window body {
+          background: var(--bg-color);
+        }
+        ${common}.rich-confirm:not(.popup-window) {
+          background: rgba(0, 0, 0, 0.45);
+          opacity: 0;
+          transition: opacity 250ms ease-out;
+        }
+
+        ${common}.rich-confirm.show {
+          opacity: 1;
+          pointer-events: auto;
+        }
+
+        ${common}.rich-confirm-row {
+          z-index: 999998;
+        }
+
+        ${common}.rich-confirm-dialog {
+          color: var(--text-color);
+          font: message-box;
+          overflow: hidden;
+          padding: 1em;
+          z-index: 999999;
+        }
+        /* Don't apply "auto" immediately because it can produce needless scrollbar even if all contents are visible without scrolling. */
+        ${common}.rich-confirm.shown .rich-confirm-dialog {
+          overflow: auto;
+        }
+        ${common}.rich-confirm.shown .rich-confirm-dialog.popup-window:not(.simulation) {
+          display: flex;
+          flex-direction: column;
+          flex-grow: 1;
+        }
+        ${common}.rich-confirm-dialog:not(.popup-window) {
+          background: var(--bg-color);
+          box-shadow: 0.1em 0.1em 0.5em rgba(0, 0, 0, 0.65);
+          margin: 0.5em;
+          max-height: 90%;
+          max-width: 90%;
+        }
+
+        ${common}.rich-confirm-content {
+          white-space: pre-wrap;
+        }
+        ${common}.rich-confirm-content.popup-window:not(.simulation) {
+          display: flex;
+          flex-direction: column;
+          flex-grow: 1;
+          flex-shrink: 1;
+        }
+
+        ${common}.rich-confirm-buttons {
+          align-items: center;
+          display: flex;
+          flex-direction: row;
+          margin: 0.5em 0 0;
+        }
+
+        @media (min-width: 40em) {
+          ${common}.rich-confirm-buttons.type-dialog button,
+          ${common}.rich-confirm-buttons.type-common-dialog button {
+            white-space: nowrap;
+          }
+
+          ${common}.rich-confirm-buttons.type-dialog {
+            justify-content: flex-end;
+          }
+          ${common}.rich-confirm-buttons.type-dialog button + button {
+            margin-inline-start: 1em;
+          }
+
+          ${common}.rich-confirm-buttons.type-common-dialog {
+            justify-content: center;
+          }
+          ${common}.rich-confirm-buttons.type-common-dialog button + button {
+            margin-inline-start: 1em;
+          }
+
+          ${common}.rich-confirm-buttons.type-dialog.mac,
+          ${common}.rich-confirm-buttons.type-dialog.linux,
+          ${common}.rich-confirm-buttons.type-common-dialog.mac,
+          ${common}.rich-confirm-buttons.type-common-dialog.linux {
+            justify-content: flex-start;
+            flex-direction: row-reverse;
+          }
+          ${common}.rich-confirm-buttons.type-dialog.mac button + button,
+          ${common}.rich-confirm-buttons.type-dialog.linux button + button,
+          ${common}.rich-confirm-buttons.type-common-dialog.mac button + button,
+          ${common}.rich-confirm-buttons.type-common-dialog.linux button + button {
+            margin-inline-end: 1em;
+          }
+        }
+
+        /* popup type dialog always have horizontal buttons */
+        ${common}.rich-confirm-buttons.popup-window.type-dialog button,
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog button {
+          white-space: nowrap;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-dialog {
+          justify-content: flex-end;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-dialog button + button {
+          margin-inline-start: 1em;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog {
+          justify-content: center;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog button + button {
+          margin-inline-start: 1em;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-dialog.mac,
+        ${common}.rich-confirm-buttons.popup-window.type-dialog.linux,
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog.mac,
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog.linux {
+          justify-content: flex-start;
+          flex-direction: row-reverse;
+        }
+        ${common}.rich-confirm-buttons.popup-window.type-dialog.mac button + button,
+        ${common}.rich-confirm-buttons.popup-window.type-dialog.linux button + button,
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog.mac button + button,
+        ${common}.rich-confirm-buttons.popup-window.type-common-dialog.linux button + button {
+          margin-inline-end: 1em;
+        }
+
+        ${common}.rich-confirm-buttons:not(.type-dialog):not(.type-common-dialog) {
+          align-items: stretch;
+          flex-direction: column;
+        }
+        @media (max-width: 40em) {
+          ${common}.rich-confirm-buttons:not(.popup-window):not(.type-dialog).type-common-dialog {
+            align-items: stretch;
+            flex-direction: column;
+          }
+        }
+
+        ${common}.rich-confirm button {
+          -moz-appearance: button;
+          font: message-box;
+          text-align: center;
+        }
+
+        ${common}.rich-confirm-buttons:not(.type-dialog):not(.type-common-dialog) button {
+          display: block;
+          margin-bottom: 0.2em;
+          padding: 0.4em;
+          width: 100%;
+        }
+        @media (max-width: 40em) {
+          ${common}.rich-confirm-buttons:not(.popup-window):not(.type-dialog).type-common-dialog button {
+            display: block;
+            margin-bottom: 0.2em;
+            padding: 0.4em;
+            width: 100%;
+          }
+        }
+
+        ${common}.rich-confirm-check-label {
+          display: flex;
+          flex-direction: row;
+          margin-top: 0.5em;
+        }
+
+        ${common}.rich-confirm-check-label.hidden {
+          display: none;
+        }
+
+        ${common}.rich-confirm .accesskey {
+          text-decoration: underline;
+        }
+
+
+        ${common}.rich-confirm.simulation {
+          max-height: 0 !important;
+          max-width: 0 !important;
+          overflow: hidden !important;
+          visibility: hidden !important;
+        }
+        ${common}.rich-confirm-row.simulation {
+          position: static !important;
+        }
+        ${common}.rich-confirm-dialog.simulation {
+          border:  1px solid;
+        }
+      `;
+      document.head.appendChild(this.style);
+
+      const range = document.createRange();
+      range.selectNodeContents(document.body);
+      range.collapse(false);
+      const commonClass = [
+        this.commonClass,
+        this.params.popup ? 'popup-window' : '',
+        this.params.simulation ? 'simulation' : '',
+        this.params.type ? `type-${this.params.type}` : '',
+        /win/i.test(navigator.platform) ? 'windows' :
+          /mac/i.test(navigator.platform) ? 'mac' :
+            /linux/i.test(navigator.platform) ? 'linux' :
+              '',
+        this.isRTL ? 'rtl' : '',
+      ].join(' ');
+      const uniqueId = `created-at-${Date.now()}-${Math.floor(Math.random() * Math.pow(2, 24))}`;
+      const fragment = range.createContextualFragment(`
+        <div class="rich-confirm ${commonClass} ${uniqueId}">
+          <div class="rich-confirm-row ${commonClass}">
+            <div class="rich-confirm-dialog ${commonClass}" role="dialog">
+              <div class="rich-confirm-content ${commonClass}"></div>
+              <label class="rich-confirm-check-label ${commonClass}">
+                <input type="checkbox"
+                       class="rich-confirm-check-checkbox ${commonClass}">
+                <span class="rich-confirm-check-message ${commonClass}"></span>
+              </label>
+              <div class="rich-confirm-buttons ${commonClass}"></div>
+            </div>
+          </div>
+        </div>
+      `);
+      range.insertNode(fragment);
+      range.detach();
+      this.ui = document.querySelector(`.rich-confirm.${this.commonClass}.${uniqueId}`);
+    }
+
+    getNextFocusedNodeByAccesskey(key) {
+      for (const attribute of ['accesskey', 'data-access-key', 'data-sub-access-key']) {
+        const current = this.dialog.querySelector(':focus');
+        const condition = `[${attribute}="${key.toLowerCase()}"]`;
+        const nextNode = this.getNextNode(current, condition);
+        if (nextNode)
+          return nextNode;
+      }
+      return null;
+    }
+
+    getNextNode(base, condition = '') {
+      const matchedNodes = [...this.dialog.querySelectorAll(condition)];
+      const currentIndex = matchedNodes.indexOf(base);
+      const nextNode = currentIndex == -1 || currentIndex == matchedNodes.index - 1 ?
+        matchedNodes[0] : matchedNodes[currentIndex + 1];
+      if (nextNode && window.getComputedStyle(nextNode, null).display == 'none')
+        return this.getNextNode(nextNode, condition);
+      return nextNode;
+    }
+
+    updateAccessKey(element) {
+      const ACCESS_KEY_MATCHER = /(&([^\s]))/i;
+      const label = element.textContent || (/^(button|submit|reset)$/i.test(element.type) && element.value) || '';
+      const matchedKey = element.accessKey ?
+        label.match(new RegExp(`((${element.accessKey}))`, 'i')) :
+        label.match(ACCESS_KEY_MATCHER);
+      const accessKey = element.accessKey || (matchedKey && matchedKey[2]);
+      if (accessKey) {
+        element.accessKey = element.dataset.accessKey = accessKey.toLowerCase();
+        if (matchedKey &&
+            !/^(input|textarea)$/i.test(element.localName)) {
+          const textNode = this.evaluateXPath(
+            `child::node()[contains(self::text(), "${matchedKey[1]}")]`,
+            element,
+            XPathResult.FIRST_ORDERED_NODE_TYPE
+          ).singleNodeValue;
+          if (textNode) {
+            const range = document.createRange();
+            const startPosition = textNode.nodeValue.indexOf(matchedKey[1]);
+            range.setStart(textNode, startPosition);
+            range.setEnd(textNode, startPosition + matchedKey[1].length);
+            range.deleteContents();
+            const accessKeyNode = document.createElement('span');
+            accessKeyNode.classList.add('accesskey');
+            accessKeyNode.textContent = matchedKey[2];
+            range.insertNode(accessKeyNode);
+            range.detach();
+          }
+        }
+      }
+      else if (/^([^\s])/i.test(label))
+        element.dataset.subAccessKey = RegExp.$1.toLowerCase();
+      else
+        element.dataset.accessKey = element.dataset.subAccessKey = null;
+    }
+
+    evaluateXPath(expression, context, type) {
+      if (!type)
+        type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
+      try {
+        return (context.ownerDocument || context).evaluate(
+          expression,
+          (context || document),
+          null,
+          type,
+          null
+        );
+      }
+      catch(_e) {
+        return {
+          singleNodeValue: null,
+          snapshotLength:  0,
+          snapshotItem:    function() {
+            return null
+          }
+        };
+      }
+    }
+
+    async show({ onShown, onDialogOpened } = {}) {
+      this.buildUI();
+      await new Promise((resolve, _reject) => setTimeout(resolve, 0));
+
+      const range = document.createRange();
+
+      if (this.params.content) {
+        range.selectNodeContents(this.content);
+        range.collapse(false);
+        const fragment = range.createContextualFragment(this.params.content);
+        range.insertNode(fragment);
+        for (const element of this.content.querySelectorAll('[accesskey]')) {
+          this.updateAccessKey(element);
+        }
+      }
+      else if (this.params.message) {
+        this.content.textContent = this.params.message;
+      }
+
+      if (this.params.checkMessage) {
+        this.checkMessage.textContent = this.params.checkMessage;
+        this.checkCheckbox.checked = !!this.params.checked;
+        this.checkContainer.classList.remove('hidden');
+      }
+      else {
+        this.checkContainer.classList.add('hidden');
+      }
+
+      range.selectNodeContents(this.buttonsContainer);
+      range.deleteContents();
+      const buttons = document.createDocumentFragment();
+      for (const label of this.params.buttons) {
+        const button = document.createElement('button');
+        button.textContent = label;
+        button.setAttribute('title', label);
+        buttons.appendChild(button);
+        this.updateAccessKey(button);
+      }
+      range.insertNode(buttons);
+
+      this.ui.addEventListener('click', this.onClick);
+      window.addEventListener('keydown', this.onKeyDown, true);
+      window.addEventListener('keyup', this.onKeyUp, true);
+      window.addEventListener('contextmenu', this.onContextMenu, true);
+      window.addEventListener('pagehide', this.onUnload);
+      window.addEventListener('beforeunload', this.onUnload);
+
+      const targets = this.focusTargets.filter(target => target != this.checkCheckbox);
+      targets[0].focus();
+
+      range.detach();
+
+      if (typeof this.params.onShown == 'function') {
+        try {
+          await this.params.onShown(this.content, this.params.inject || {});
+        }
+        catch(error) {
+          console.error(error);
+        }
+      }
+      else if (Array.isArray(this.params.onShown)) {
+        for (const onShownPart of this.params.onShown) {
+          if (typeof onShownPart != 'function')
+            continue;
+          try {
+            await onShownPart(this.content, this.params.inject || {});
+          }
+          catch(error) {
+            console.error(error);
+          }
+        }
+      }
+
+      this.ui.querySelector('.rich-confirm-dialog').setAttribute('aria-modal', !!this.params.modal);
+      this.ui.classList.add('show');
+
+      if (typeof onShown == 'function') {
+        try {
+          await onShown(this.content, this.params.inject || {});
+        }
+        catch(error) {
+          console.error(error);
+        }
+      }
+      else if (Array.isArray(onShown)) {
+        for (const onShownPart of onShown) {
+          if (typeof onShownPart != 'function')
+            continue;
+          try {
+            await onShownPart(this.content, this.params.inject || {});
+          }
+          catch(error) {
+            console.error(error);
+          }
+        }
+      }
+
+      if (typeof onDialogOpened == 'function') {
+        try {
+          await onDialogOpened({
+            close: () => {
+              this.hide();
+            },
+          });
+        }
+        catch(error) {
+          console.error(error);
+        }
+      }
+
+      setTimeout(() => {
+        if (!this.ui ||
+            !this.ui.classList)
+          return;
+        // Apply overflow:auto after all contents are correctly rendered.
+        this.ui.classList.add('shown');
+      }, 10);
+
+      return new Promise((resolve, reject) => {
+        this._resolve = resolve;
+        this._rejecte = reject;
+      });
+    }
+
+    async hide() {
+      this.ui.classList.remove('show');
+      if (typeof this.params.onHidden == 'function') {
+        try {
+          this.params.onHidden(this.content, this.params.inject || {});
+        }
+        catch(_error) {
+        }
+      }
+      this.ui.removeEventListener('click', this.onClick);
+      window.removeEventListener('keydown', this.onKeyDown, true);
+      window.removeEventListener('keyup', this.onKeyUp, true);
+      window.removeEventListener('contextmenu', this.onContextMenu, true);
+      window.removeEventListener('pagehide', this.onUnload);
+      window.removeEventListener('beforeunload', this.onUnload);
+      delete this._resolve;
+      delete this._rejecte;
+      const ui = this.ui;
+      const style = this.style;
+      delete this.ui;
+      delete this.style;
+      return new Promise((resolve, _reject) => {
+        window.setTimeout(() => {
+          // remove elements after animation is finished
+          ui.parentNode.removeChild(ui);
+          style.parentNode.removeChild(style);
+        }, 1000);
+        resolve();
+      });
+    }
+
+    dismiss() {
+      const resolve = this._resolve;
+      const result = {
+        buttonIndex: -1,
+        checked: !!this.params.checkMessage && this.checkCheckbox.checked
+      };
+      return this.hide().then(() => resolve(result));
+    }
+
+    onClick(event) {
+      let target = event.target;
+      if (target.nodeType == Node.TEXT_NODE)
+        target = target.parentNode;
+
+      if (target.closest(`.rich-confirm-content.${this.commonClass}`) &&
+          target.closest('input, textarea, select, button'))
+        return;
+
+      if (event.button != 0) {
+        event.stopPropagation();
+        event.preventDefault();
+        return;
+      }
+
+      const button = target.closest('button');
+      if (button) {
+        event.stopPropagation();
+        event.preventDefault();
+        const buttonIndex = Array.from(this.buttonsContainer.childNodes).indexOf(button);
+        const values = {};
+        for (const field of this.content.querySelectorAll('[id], [name]')) {
+          let value = null;
+          if (field.matches('input[type="checkbox"]')) {
+            value = field.checked;
+          }
+          else if (field.matches('input[type="radio"]')) {
+            if (field.checked)
+              value = field.value;
+          }
+          else if ('value' in field.dataset) {
+            value = field.dataset.value;
+          }
+          else {
+            value = field.value;
+          }
+          values[field.id || field.name] = value;
+        }
+        const resolve = this._resolve;
+        const result = {
+          buttonIndex,
+          values,
+          checked: !!this.params.checkMessage && this.checkCheckbox.checked
+        };
+        this.hide().then(() => resolve(result));
+        return;
+      }
+
+      if (!this.params.popup &&
+          !target.closest(`.rich-confirm-dialog.${this.commonClass}`)) {
+        event.stopPropagation();
+        event.preventDefault();
+        this.dismiss();
+      }
+    }
+
+    onKeyDown(event) {
+      let target = event.target;
+      if (target.nodeType == Node.TEXT_NODE)
+        target = target.parentNode;
+      const onContent = target.closest(`.rich-confirm-content.${this.commonClass}`);
+
+      switch (event.key) {
+        case 'ArrowUp':
+        case 'PageUp':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          this.advanceFocus(-1);
+          break;
+
+        case 'ArrowLeft':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          this.advanceFocus(this.isRTL ? 1 : -1);
+          break;
+
+        case 'ArrowDown':
+        case 'PageDown':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          this.advanceFocus(1);
+          break;
+
+        case 'ArrowRight':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          this.advanceFocus(this.isRTL ? -1 : 1);
+          break;
+
+        case 'Home':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          this.focusTargets[0].focus();
+          break;
+
+        case 'End':
+          if (onContent)
+            break;
+          event.stopPropagation();
+          event.preventDefault();
+          const targets = this.focusTargets;
+          targets[targets.length-1].focus();
+          break;
+
+        case 'Tab':
+          event.stopPropagation();
+          event.preventDefault();
+          this.advanceFocus(event.shiftKey ? -1 : 1);
+          break;
+
+        case 'Escape':
+          event.stopPropagation();
+          event.preventDefault();
+          this.dismiss();
+          break;
+
+        case 'Enter':
+          if (onContent &&
+              !target.closest('textarea') &&
+              !target.closest('[data-no-accept-by-enter="true"]')) {
+            event.stopPropagation();
+            event.preventDefault();
+            this.buttonsContainer.firstChild.click();
+          }
+          break;
+
+        default: {
+          const currentFocused = this.dialog.querySelector(':focus');
+          const needAccelKey = (
+            currentFocused &&
+            (currentFocused.localName.toLowerCase() == 'textarea' ||
+             (currentFocused.localName.toLowerCase() == 'input' &&
+              /^(date|datetime|datetime-local|email|file|month|number|password|search|tel|text|time|url|week)$/i.test(currentFocused.type)))
+          );
+          if ((!needAccelKey || event.altKey) &&
+              !event.ctrlKey &&
+              !event.shiftKey &&
+              !event.metaKey &&
+              event.key.length == 1) {
+            const node = this.getNextFocusedNodeByAccesskey(event.key);
+            if (node && typeof node.focus == 'function') {
+              node.focus();
+              const nextNode = this.getNextFocusedNodeByAccesskey(event.key);
+              if ((!nextNode || nextNode == node) &&
+                  typeof node.click == 'function')
+                node.click();
+            }
+          }
+        }; return;
+      }
+    }
+
+    onKeyUp(event) {
+      switch (event.key) {
+        case 'ArrowUp':
+        case 'ArrowLeft':
+        case 'PageUp':
+        case 'ArrowDown':
+        case 'ArrowRight':
+        case 'PageDown':
+        case 'Home':
+        case 'End':
+        case 'Tab':
+        case 'Escape':
+          event.stopPropagation();
+          event.preventDefault();
+          break;
+
+        default:
+          return;
+      }
+    }
+
+    onContextMenu(event) {
+      let target = event.target;
+      if (target.nodeType == Node.TEXT_NODE)
+        target = target.parentNode;
+      const onContent = target.closest(`.rich-confirm-content.${this.commonClass}`);
+      if (!onContent || !target.closest('input, textarea')) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.stopImmediatePropagation();
+      }
+    }
+
+    onUnload() {
+      this.dismiss();
+    }
+
+    advanceFocus(direction) {
+      const focusedItem = this.ui.querySelector(':focus');
+      console.log('focusedItem ', focusedItem);
+      const targets = this.focusTargets;
+      console.log('focusTargets ', targets);
+      const index = focusedItem ? targets.indexOf(focusedItem) : -1;
+      if (direction < 0) { // backward
+        const nextFocused = index < 0 ? targets[targets.length-1] :
+          targets[index == 0 ? targets.length-1 : index-1];
+        nextFocused.focus();
+      }
+      else { // forward
+        const nextFocused = index < 0 ? targets[0] :
+          targets[index == targets.length-1 ? 0 : index+1];
+        nextFocused.focus();
+      }
+    }
+
+    static async show(params) {
+      const confirm = new this(params);
+      return confirm.show();
+    }
+
+    static async showInTab(tabId, params) {
+      if (!params) {
+        params = tabId;
+        tabId = (await browser.tabs.getCurrent()).id;
+      }
+      let onMessage;
+      const oneTimeKey = `popup-${this.uniqueKey}-${Date.now()}-${parseInt(Math.random() * Math.pow(2, 16))}`;
+      const promisedResult = new Promise((resolve, _reject) => {
+        onMessage = (message, _sender) => {
+          if (message?.oneTimeKey != oneTimeKey)
+            return;
+
+          switch (message.type) {
+            case 'rich-confirm-dialog-shown':
+              if (typeof params.onReady == 'function') {
+                try {
+                  params.onReady({
+                    width:  message.dialogWidth,
+                    height: message.dialogHeight
+                  });
+                }
+                catch(error) {
+                  console.error(error);
+                }
+              }
+              break;
+
+            case 'rich-confirm-dialog-complete':
+              resolve(message.result);
+              break;
+          }
+        };
+        browser.runtime.onMessage.addListener(onMessage);
+      });
+      try {
+        if (typeof browser.tabs.executeScript == 'function') // Manifest V2
+          await browser.tabs.executeScript(tabId, {
+            code: `
+              if (!window.RichConfirm)
+                 (${defineRichConfirm.toString()})(${this.uniqueKey});
+            `,
+            matchAboutBlank: true,
+            runAt:           'document_start'
+          });
+        else // Manifest V3
+          await browser.scripting.executeScript({
+            target: { tabId },
+            func: defineRichConfirm,
+            args: [this.uniqueKey],
+          });
+        const transferableParams = { ...params };
+        const injectTransferable = [];
+        const inject = params.inject || {};
+        delete transferableParams.inject;
+        for (const key in params.inject) {
+          const value = inject[key];
+          const transferable = (
+            value &&
+            typeof value == 'function' &&
+            typeof value.toString == 'function'
+          ) ? value.toString() : JSON.stringify(value);
+          injectTransferable.push(`${JSON.stringify(key)} : ${transferable}`);
+        }
+        const stringifyOnShown = onShown => {
+          if (Array.isArray(onShown))
+            return `[${onShown.map(stringifyOnShown).join(',')}]`;
+          return typeof onShown == 'function' ?
+            onShown.toString()
+              .replace(/^\s*(async\s+)?function/, '$1')
+              .replace(/^\s*(async\s+)?/, '$1 function ')
+              .replace(/^\s*(async\s+)?function ((?:\([^=\)]*\)|[^\(\)=]+)\s*=>\s*\{)/, '$1 $2') :
+            '() => {}';
+        };
+        const originalOnShown = stringifyOnShown(params.onShown);
+        delete transferableParams.onShown;
+
+        const run = async function run(uniqueKey, oneTimeKey, originalOnShown, transferableParams, inject) {
+          delete window.RichConfirm.result;
+          const confirm = new RichConfirm({
+            ...transferableParams,
+            inject: inject || {},
+            async onShown(content, inject) {
+              if (!Array.isArray(originalOnShown))
+                originalOnShown = [originalOnShown];
+              for (const originalOnShownPart of originalOnShown) {
+                try {
+                  if (typeof originalOnShownPart == 'function')
+                    await originalOnShownPart(content, inject);
+                }
+                catch(error) {
+                  console.error(error);
+                }
+              }
+            }
+          });
+          const result = await confirm.show({
+            onShown(content, _injected) {
+              const dialog = content.parentNode;
+              const rect   = dialog.getBoundingClientRect();
+              const style  = window.getComputedStyle(dialog, null);
+              // End padding is not included in the scrillable size,
+              // so we manually add them.
+              const inlineEndPadding  = dialog.scrollLeftMax > 0 && parseFloat(style.getPropertyValue('padding-inline-end')) || 0;
+              const bottomPadding = dialog.scrollTopMax > 0 && parseFloat(style.getPropertyValue('padding-bottom')) || 0;
+              browser.runtime.sendMessage({
+                type:         'rich-confirm-dialog-shown',
+                uniqueKey,
+                oneTimeKey,
+                dialogWidth:  rect.width + dialog.scrollLeftMax + inlineEndPadding,
+                dialogHeight: rect.height + dialog.scrollTopMax + bottomPadding
+              });
+            },
+          });
+          browser.runtime.sendMessage({
+            type:      'rich-confirm-dialog-complete',
+            uniqueKey,
+            oneTimeKey,
+            result
+          });
+        };
+        if (typeof browser.tabs.executeScript == 'function') // Manifest V2
+          browser.tabs.executeScript(tabId, {
+            code: `
+              (${run.toString()})(
+                ${this.uniqueKey},
+                ${JSON.stringify(oneTimeKey)},
+                (${originalOnShown.toString()}),
+                ${JSON.stringify(transferableParams)},
+                {${injectTransferable.join(',')}}
+              );
+            `,
+            matchAboutBlank: true,
+            runAt:           'document_start'
+          });
+        else // Manifest V3
+          browser.scripting.executeScript({
+            target: { tabId },
+            func: run,
+            args: [this.uniqueKey, oneTimeKey, originalOnShown, transferableParams, inject],
+          });
+        // Don't return the promise directly here, instead await it
+        // because the "finally" block must be processed after
+        // the promise is resolved.
+        const result = await promisedResult;
+        return result;
+      }
+      catch(error) {
+        console.error(error, error.stack);
+        return {
+          buttonIndex: -1
+        };
+      }
+      finally {
+        if (browser.runtime.onMessage.hasListener(onMessage))
+          browser.runtime.onMessage.removeListener(onMessage);
+      }
+    }
+
+    static async showInPopup(ownerWinId, params) {
+      let ownerWin;
+      if (!params) {
+        params = ownerWinId;
+        ownerWin = await browser.windows.getLastFocused({});
+      }
+      else {
+        try {
+          ownerWin = await browser.windows.get(ownerWinId).catch(_error => null);
+        }
+        catch(_error) {
+        }
+        if (!ownerWin) {
+          ownerWin = await browser.windows.getLastFocused({});
+        }
+      }
+
+      const type = this.DIALOG_READY_NOTIFICATION_TYPE;
+      const tryRepositionDialogToCenterOfOwner = this._tryRepositionDialogToCenterOfOwner;
+      browser.runtime.onMessage.addListener(function onMessage(message, sender) {
+        switch (message.type) {
+          case type:
+            browser.runtime.onMessage.removeListener(onMessage);
+            tryRepositionDialogToCenterOfOwner({
+              ...message,
+              dialogWindowId: sender.tab.windowId,
+            });
+            break;
+        }
+      });
+
+      return this._showInPopupInternal(ownerWin, {
+        ...params,
+        inject: {
+          ...(params.inject || {}),
+          __RichConfirm__reportScreenMessageType: type,
+          __RichConfirm__ownerWindowId: ownerWin.id,
+        },
+        onShown: [
+          ...(!params.onShown ? [] : Array.isArray(params.onShown) ? params.onShown : [params.onShown]),
+          (container, { __RichConfirm__reportScreenMessageType, __RichConfirm__ownerWindowId }) => {
+            setTimeout(() => {
+              // We cannot move this window by this callback function, thus I just send
+              // a request to update window position.
+              browser.runtime.sendMessage({
+                type:          __RichConfirm__reportScreenMessageType,
+                ownerWindowId: __RichConfirm__ownerWindowId,
+                availLeft:     screen.availLeft,
+                availTop:      screen.availTop,
+                availWidth:    screen.availWidth,
+                availHeight:   screen.availHeight,
+              });
+            }, 0);
+          },
+        ],
+      });
+    }
+
+    static async _tryRepositionDialogToCenterOfOwner({ dialogWindowId, ownerWindowId, availLeft, availTop, availWidth, availHeight }) {
+      const [dialogWin, ownerWin] = await Promise.all([
+        browser.windows.get(dialogWindowId),
+        browser.windows.get(ownerWindowId),
+      ]);
+      const placedOnOwner = (
+        dialogWin.left + dialogWin.width - (dialogWin.width / 2) < ownerWin.left &&
+        dialogWin.top + dialogWin.height - (dialogWin.height / 2) < ownerWin.top &&
+        dialogWin.left + (dialogWin.width / 2) < ownerWin.left + ownerWin.width &&
+        dialogWin.top + (dialogWin.height / 2) < ownerWin.top + ownerWin.height
+      );
+      const placedInsideViewArea = (
+        dialogWin.left >= availLeft &&
+        dialogWin.top >= availTop &&
+        dialogWin.left + dialogWin.width <= availLeft + availWidth &&
+        dialogWin.top + dialogWin.height <= availTop + availHeight
+      );
+      if (placedOnOwner && placedInsideViewArea)
+        return;
+
+      const top  = ownerWin.top + Math.round((ownerWin.height - dialogWin.height) / 2);
+      const left = ownerWin.left + Math.round((ownerWin.width - dialogWin.width) / 2);
+      return browser.windows.update(dialogWin.id, {
+        left: Math.min(availLeft + availWidth - dialogWin.width, Math.max(availLeft, left)),
+        top:  Math.min(availTop + availHeight - dialogWin.height, Math.max(availTop, top)),
+      });
+    }
+
+    // Workaround for a problem on an overload situation.
+    // When the system is in overload, the promise returned by browser.windows.create()
+    // won't be resolved forever (until the window is closed).
+    // So, we detect the opened window without the promise in different way
+    // based on its unique URL.
+    static async _safeCreateWindow(params) {
+      const existingWindowIds = new Set((await browser.windows.getAll()).map(win => win.id));
+      // We must not add any extra query or hash for "about:blank", because it is very special URL.
+      // Extension with <all_urls> permission can inject arbitrary script to an "about:blank" page,
+      // but injection will fail for URIs like "about:blank#..." with missing host permission.
+      // Moreover, dialog window with "about:blank" is used to avoid closed windows restoration.
+      const uniqueKeyParam = params.url == 'about:blank' ? null : `popup-id-for-${uniqueKey}=${parseInt(Math.random() * Math.pow(2, 16))}`;
+      const dialogUrl = !uniqueKeyParam ? params.url : params.url.replace(/[?#]|$/, matched => {
+        if (!matched)
+          return `#${uniqueKeyParam}`;
+        if (matched == '?')
+          return `?${uniqueKeyParam}&`;
+        return `?#{uniqueKeyParam}#`;
+      });
+      let win;
+      const promisedWin = browser.windows.create({
+        ...params,
+        url: dialogUrl,
+      }).then(resolvedWin => {
+        // The returned promise won't be resolved until the opened window become fucused.
+        console.log('RichConfirm._safeCreateWindow: promised window is resolved');
+        win = resolvedWin;
+      });
+      while (!win) {
+        await Promise.race([
+          new Promise(async (resolve, _reject) => {
+            if (win)
+              return resolve();
+            const windows = await browser.windows.getAll({ populate: true });
+            if (win)
+              return resolve();
+            for (const window of windows) {
+              if (existingWindowIds.has(window.id) ||
+                  (uniqueKeyParam ? !window.tabs[0].url.includes(uniqueKeyParam) : window.tabs[0].url != dialogUrl))
+                continue;
+
+              console.log('RichConfirm._safeCreateWindow: new window is detected');
+              win = window;
+              resolve();
+              return;
+            }
+            setTimeout(resolve, 150);
+          }),
+          promisedWin,
+        ]);
+      }
+      win.dialogUrl = dialogUrl;
+      return win;
+    }
+
+    static async _showInPopupInternal(ownerWin, params) {
+      const minWidth  = Math.max(ownerWin.width, Math.ceil(screen.availWidth / 3));
+      const minHeight = Math.max(ownerWin.height, Math.ceil(screen.availHeight / 3));
+
+      const simulation = new this({
+        ...params,
+        popup: true,
+        simulation: true
+      });
+      simulation.buildUI();
+      const simulatedContainer = simulation.ui.querySelector('.rich-confirm-row');
+      simulatedContainer.style.minWidth  = `${minWidth}px`;
+      simulatedContainer.style.minHeight = `${minHeight}px`;
+      await new Promise((resolve, _reject) => {
+        simulation.show({
+          onShown() {
+            setTimeout(() => {
+              resolve();
+            }, 0);
+          }
+        });
+      });
+      const simulatedDialog = simulation.ui.querySelector('.rich-confirm-dialog');
+      const simulatedRect   = simulatedDialog.getBoundingClientRect();
+
+      // Safe guard for scrollbar due to unexpected line breaks
+      const safetyFactor  = 1.05;
+      const simulatedSize = {
+        width:  Math.ceil(simulatedRect.width * safetyFactor),
+        height: Math.ceil(simulatedRect.height * safetyFactor)
+      };
+      simulation.hide();
+      // This dimension is not accurate because we must think about
+      // the size of the window frame, but currently I don't know how to
+      // calculate it here...
+
+      simulatedSize.top  = ownerWin.top + Math.floor((ownerWin.height - simulatedSize.height) / 2);
+      simulatedSize.left = ownerWin.left + Math.floor((ownerWin.width - simulatedSize.width) / 2);
+
+      const url     = params.url || 'about:blank';
+      const fullUrl = /^about:/.test(url) || /^\w+:\/\//.test(url) ?
+        url :
+        `moz-extension://${location.host}/${url.replace(/^\//, '')}`;
+      const win = await this._safeCreateWindow({
+        url:    fullUrl,
+        type:   'popup',
+        ...simulatedSize
+      });
+      const dialogUrl = win.dialogUrl || fullUrl;
+      // Due to a Firefox's bug we cannot open popup type window
+      // at specified position.
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1271047
+      // Thus we need to move the window immediately after it is opened.
+      if (win.left + win.width - (win.width / 2) <= ownerWin.left ||
+          win.top + win.height - (win.height / 2) <= ownerWin.top ||
+          win.left + (win.width / 2) >= ownerWin.left + ownerWin.width ||
+          win.top + (win.height / 2) >= ownerWin.top + ownerWin.height) {
+        // But, such a move will produce an annoying flash.
+        // So, I grudgingly accept the position of the dialog placed
+        // if the popup (partially or fully) covers the owner window.
+        browser.windows.update(win.id, {
+          top:  simulatedSize.top,
+          left: simulatedSize.left
+        });
+      }
+      const activeTab = win.tabs.find(tab => tab.active);
+
+      const onFocusChanged = async windowId => {
+        if (!params.modal ||
+            windowId != ownerWin.id) {
+          return;
+        }
+        console.log(`focus of the window ${ownerWin.id} which is the owner of a modal dialog ${win.id} is changed`);
+        const [updatedWin, updatedOwnerWin] = await Promise.all([
+          browser.windows.get(win.id),
+          browser.windows.get(ownerWin.id),
+        ]);
+        if (updatedOwnerWin?.state == 'minimized') {
+          console.log(' => but the owner window is minimized');
+          if (updatedWin.state != 'minimized') {
+            console.log(' => minimize the modal dialog also');
+            browser.windows.update(win.id, { state: 'minimized' });
+          }
+          return;
+        }
+        browser.windows.update(win.id, { focused: true });
+      };
+      browser.windows.onFocusChanged.addListener(onFocusChanged);
+
+      // On Thunderbird, closing of a composition window won't notify "windows.onRemoved" events, so we need to listen "tabs.onRemoved" also.
+      let onWindowClosed, onTabClosed;
+      const promisedDismissed = new Promise((resolve, _reject) => {
+        onWindowClosed = windowId => {
+          if (win.closed) {
+            return;
+          }
+          switch (windowId) {
+            case ownerWin.id:
+              browser.windows.remove(win.id);
+              break;
+            case win.id:
+              win.closed = true;
+              resolve({ buttonIndex: -1 });
+              break;
+          }
+        };
+        onTabClosed = (_tabId, removeInfo) => {
+          if (win.closed || !removeInfo.isWindowClosing) {
+            return;
+          }
+          switch (removeInfo.windowId) {
+            case ownerWin.id:
+              browser.windows.remove(win.id);
+              break;
+            case win.id:
+              win.closed = true;
+              resolve({ buttonIndex: -1 });
+              break;
+          }
+        };
+      });
+      browser.windows.onRemoved.addListener(onWindowClosed);
+      browser.tabs.onRemoved.addListener(onTabClosed);
+
+      const result = await Promise.race([
+        promisedDismissed,
+        (async () => {
+          try {
+            let onDialogOpenedCalled = false;
+            const frameSize = await new Promise((resolve, _reject) => {
+              let timeout;
+              const getFrameSize = function getFrameSize(title, uniqueKey) {
+                if (title)
+                  document.title = title;
+                const classList = document.documentElement.classList;
+                classList.add(`rich-confirm-${uniqueKey}`);
+                classList.add('popup-window');
+                return {
+                  width:  window.outerWidth - window.innerWidth,
+                  height: window.outerHeight - window.innerHeight,
+                  url:    location.href
+                };
+              };
+              const onTabUpdated = (tabId, updateInfo, _tab) => {
+                if (updateInfo.status != 'complete' ||
+                    !browser.tabs.onUpdated.hasListener(onTabUpdated))
+                  return;
+                if (timeout)
+                  clearTimeout(timeout);
+                if (typeof browser.tabs.executeScript == 'function') // Manifest V2
+                  browser.tabs.executeScript(tabId, {
+                    code: `(${getFrameSize.toString()})(
+                      ${JSON.stringify(params.title)},
+                      ${JSON.stringify(uniqueKey)}
+                    );`,
+                    matchAboutBlank: true,
+                    runAt:           'document_start'
+                  }).then(results => {
+                    if (results[0].url != dialogUrl)
+                      return;
+                    browser.tabs.onUpdated.removeListener(onTabUpdated);
+                    resolve(results[0]);
+                  });
+                else // Manifest V3
+                  browser.scripting.executeScript({
+                    target: { tabId },
+                    func:   getFrameSize,
+                    args:   [params.title, uniqueKey],
+                  }).then(injectionResults => {
+                    const result = injectionResults[0].result;
+                    if (result.url != dialogUrl)
+                      return;
+                    browser.tabs.onUpdated.removeListener(onTabUpdated);
+                    resolve(result);
+                  });
+
+                if (typeof params.onDialogOpened == 'function' &&
+                    !onDialogOpenedCalled) {
+                  onDialogOpenedCalled = true;
+                  params.onDialogOpened({
+                    close() {
+                      browser.windows.remove(win.id);
+                    },
+                  });
+                }
+              };
+              timeout = setTimeout(() => {
+                if (!browser.tabs.onUpdated.hasListener(onTabUpdated))
+                  return;
+                timeout = null;
+                if (typeof browser.tabs.executeScript == 'function') // Manifest V2
+                  browser.tabs.executeScript(activeTab.id, {
+                    code: `(${getFrameSize.toString()})(
+                      ${JSON.stringify(params.title)},
+                      ${JSON.stringify(uniqueKey)}
+                    );`,
+                    matchAboutBlank: true,
+                    runAt:           'document_start'
+                  }).then(results => {
+                    if (results[0].url != dialogUrl)
+                      return;
+                    browser.tabs.onUpdated.removeListener(onTabUpdated);
+                    resolve(results[0]);
+                  }).catch(console.error);
+                else // Manifest V3
+                  browser.scripting.executeScript({
+                    target: { tabId: activeTab.id },
+                    func:   getFrameSize,
+                    args:   [params.title, uniqueKey],
+                  }).then(injectionResults => {
+                    const result = injectionResults[0].result;
+                    if (result.url != dialogUrl)
+                      return;
+                    browser.tabs.onUpdated.removeListener(onTabUpdated);
+                    resolve(result);
+                  }).catch(console.error);
+
+                if (typeof params.onDialogOpened == 'function' &&
+                    !onDialogOpenedCalled) {
+                  onDialogOpenedCalled = true;
+                  params.onDialogOpened({
+                    close() {
+                      browser.windows.remove(win.id);
+                    },
+                  });
+                }
+              }, 500);
+              browser.tabs.onUpdated.addListener(onTabUpdated, {
+                properties: ['status'],
+                tabId:      activeTab.id
+              });
+            });
+
+            if (typeof browser.tabs.setZoom == 'function')
+              await browser.tabs.setZoom(activeTab.id, 1);
+            return this.showInTab(activeTab.id, {
+              ...params,
+              popup: true,
+              onReady(dialogSize) {
+                const actualWidth  = Math.min(
+                  Math.ceil(dialogSize.width + frameSize.width),
+                  Math.max(
+                    ownerWin.left + ownerWin.width - simulatedSize.left,
+                    minWidth
+                  )
+                );
+                const actualHeight = Math.min(
+                  Math.ceil(dialogSize.height + frameSize.height),
+                  Math.max(
+                    ownerWin.top + ownerWin.height - simulatedSize.top,
+                    minHeight
+                  )
+                );
+                // This won't be proceeded until the promise returned by windows.create() is resolved,
+                // even if it is already detected via windows.query()... so we'll see oddly sized window
+                // until it become focused.
+                browser.windows.update(win.id, {
+                  width:  actualWidth,
+                  height: actualHeight,
+                  // We should reposition the dialog at truly center of the
+                  // owner window, but it will produce an annoying slip of
+                  // the window, so I give up for now.
+                  //top:    Math.floor(ownerWin.top + ((ownerWin.height - actualHeight) / 2)),
+                  //left:   Math.floor(ownerWin.left + ((ownerWin.width - actualWidth) / 2))
+                });
+              }
+            });
+          }
+          catch(error) {
+            console.error(error);
+            return null;
+          }
+        })()
+      ]);
+
+      browser.windows.onFocusChanged.removeListener(onFocusChanged);
+      browser.windows.onRemoved.removeListener(onWindowClosed);
+      browser.tabs.onRemoved.removeListener(onTabClosed);
+
+      if (!win.closed) {
+        // A window closed with a blank page won't appear
+        // in the "Recently Closed Windows" list.
+        const reloadWithBlank = function reloadWithBlank() {
+          location.replace('about:blank');
+        };
+        (typeof browser.tabs.executeScript == 'function' ?
+          browser.tabs.executeScript(activeTab.id, { // Manifest V2
+            code: `(${reloadWithBlank.toString()})();`,
+            matchAboutBlank: true,
+            runAt:           'document_start'
+          }) :
+          browser.scripting.executeScript({ // Manifest V3
+            target: { tabId: activeTab.id },
+            func:   reloadWithBlank,
+          }))
+          .then(() => {
+            browser.windows.remove(win.id);
+          });
+      }
+
+      return result;
+    }
+  };
+  RichConfirm.uniqueKey = RichConfirm.prototype.uniqueKey = uniqueKey;
+  RichConfirm.DIALOG_READY_NOTIFICATION_TYPE = `__RichConfirm_${uniqueKey}__confirmation-dialog-ready`;
+  window.RichConfirm = RichConfirm;
+  return true; // this is required to run this script as a content script
+})(parseInt(Math.random() * Math.pow(2, 16)));
+export default RichConfirm;
diff --git a/waterfox/browser/components/sidebar/extlib/TabFavIconHelper.js b/waterfox/browser/components/sidebar/extlib/TabFavIconHelper.js
new file mode 100644
index 0000000000000..3b654063630e8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/TabFavIconHelper.js
@@ -0,0 +1,677 @@
+/*
+# 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/.
+*/
+/*
+ original:
+   http://github.com/piroor/webextensions-lib-tab-favicon-helper
+*/
+'use strict';
+
+const TabFavIconHelper = {
+  LAST_EFFECTIVE_FAVICON: 'last-effective-favIcon',
+  VALID_FAVICON_PATTERN: /^(about|app|chrome|data|file|ftp|https?|moz-extension|resource):/,
+  DRAWABLE_FAVICON_PATTERN: /^(https?|moz-extension|resource):/,
+
+  // original: chrome://browser/content/aboutlogins/icons/favicon.svg
+  FAVICON_LOCKWISE: `
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32">
+  <defs>
+    <linearGradient id="b" x1="24.684" y1="5.756" x2="6.966" y2="26.663" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ff9640"/>
+      <stop offset=".6" stop-color="#fc4055"/>
+      <stop offset="1" stop-color="#e31587"/>
+    </linearGradient>
+    <linearGradient id="c" x1="26.362" y1="4.459" x2="10.705" y2="21.897" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e" stop-opacity=".8"/>
+      <stop offset=".094" stop-color="#fff36e" stop-opacity=".699"/>
+      <stop offset=".752" stop-color="#fff36e" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="d" x1="7.175" y1="27.275" x2="23.418" y2="11.454" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#0090ed"/>
+      <stop offset=".386" stop-color="#5b6df8"/>
+      <stop offset=".629" stop-color="#9059ff"/>
+      <stop offset="1" stop-color="#b833e1"/>
+    </linearGradient>
+    <linearGradient id="a" x1="29.104" y1="15.901" x2="26.135" y2="21.045" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#722291" stop-opacity=".5"/>
+      <stop offset=".5" stop-color="#722291" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="e" x1="20.659" y1="21.192" x2="13.347" y2="28.399" xlink:href="#a"/>
+    <linearGradient id="f" x1="2.97" y1="19.36" x2="10.224" y2="21.105" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#054096" stop-opacity=".5"/>
+      <stop offset=".054" stop-color="#0f3d9c" stop-opacity=".441"/>
+      <stop offset=".261" stop-color="#2f35b1" stop-opacity=".249"/>
+      <stop offset=".466" stop-color="#462fbf" stop-opacity=".111"/>
+      <stop offset=".669" stop-color="#542bc8" stop-opacity=".028"/>
+      <stop offset=".864" stop-color="#592acb" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <path d="M15.986 31.076A5.635 5.635 0 0 1 12.3 29.76 103.855 103.855 0 0 1 2.249 19.7a5.841 5.841 0 0 1-.006-7.4A103.792 103.792 0 0 1 12.3 2.247a5.837 5.837 0 0 1 7.4-.006A104.1 104.1 0 0 1 29.751 12.3a5.842 5.842 0 0 1 .006 7.405c-.423.484-.584.661-.917 1.025l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 100.308 100.308 0 0 0-9.7-9.714 2.352 2.352 0 0 0-2.814.007 100.323 100.323 0 0 0-9.7 9.7 2.354 2.354 0 0 0 .006 2.815 100.375 100.375 0 0 0 9.7 9.708 2.352 2.352 0 0 0 2.815-.006c1.311-1.145 2.326-2.031 3.434-3.086l-3.4-3.609a2.834 2.834 0 0 1-.776-2.008 2.675 2.675 0 0 1 .834-1.9l.194-.184a2.493 2.493 0 0 0 1.124-2.333 2.81 2.81 0 0 0-5.6 0 2.559 2.559 0 0 0 1.092 2.279l.127.118a2.735 2.735 0 0 1 .324 3.7 1.846 1.846 0 0 1-.253.262l-1.578 1.326a1.75 1.75 0 0 1-2.252-2.68l.755-.634a5.758 5.758 0 0 1-1.715-4.366 6.305 6.305 0 0 1 12.6 0 5.642 5.642 0 0 1-1.854 4.528l3.84 4.082a2.071 2.071 0 0 1 .59 1.446 2.128 2.128 0 0 1-.628 1.526c-1.6 1.592-2.895 2.72-4.533 4.15a5.745 5.745 0 0 1-3.753 1.354z" fill="url(#b)"/>
+  <path d="M15.986 31.076A5.635 5.635 0 0 1 12.3 29.76 103.855 103.855 0 0 1 2.249 19.7a5.841 5.841 0 0 1-.006-7.4A103.792 103.792 0 0 1 12.3 2.247a5.837 5.837 0 0 1 7.4-.006A104.1 104.1 0 0 1 29.751 12.3a5.842 5.842 0 0 1 .006 7.405c-.423.484-.584.661-.917 1.025l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 100.308 100.308 0 0 0-9.7-9.714 2.352 2.352 0 0 0-2.814.007 100.323 100.323 0 0 0-9.7 9.7 2.354 2.354 0 0 0 .006 2.815 100.375 100.375 0 0 0 9.7 9.708 2.352 2.352 0 0 0 2.815-.006c1.311-1.145 2.326-2.031 3.434-3.086l-3.4-3.609a2.834 2.834 0 0 1-.776-2.008 2.675 2.675 0 0 1 .834-1.9l.194-.184a2.493 2.493 0 0 0 1.124-2.333 2.81 2.81 0 0 0-5.6 0 2.559 2.559 0 0 0 1.092 2.279l.127.118a2.735 2.735 0 0 1 .324 3.7 1.846 1.846 0 0 1-.253.262l-1.578 1.326a1.75 1.75 0 0 1-2.252-2.68l.755-.634a5.758 5.758 0 0 1-1.715-4.366 6.305 6.305 0 0 1 12.6 0 5.642 5.642 0 0 1-1.854 4.528l3.84 4.082a2.071 2.071 0 0 1 .59 1.446 2.128 2.128 0 0 1-.628 1.526c-1.6 1.592-2.895 2.72-4.533 4.15a5.745 5.745 0 0 1-3.753 1.354z" fill="url(#c)"/>
+  <path d="M29.58 17.75a34.267 34.267 0 0 0-2.473-3.15 2.352 2.352 0 0 1 .008 2.814c-.393.45-.546.617-.86.961l-.234.258a1.749 1.749 0 1 0 2.585 2.357l.234-.255c.231-.253.379-.415.59-.653a2.161 2.161 0 0 0 .15-2.332zm-8.734 6.275c-1.108 1.055-2.123 1.941-3.434 3.086a2.352 2.352 0 0 1-2.815.006 100.375 100.375 0 0 1-9.7-9.708 2.354 2.354 0 0 1-.006-2.815s-2.131 1.984-2.4 3.424a2.956 2.956 0 0 0 .724 2.782 103.772 103.772 0 0 0 9.085 8.96 5.635 5.635 0 0 0 3.683 1.316 5.745 5.745 0 0 0 3.753-1.351c.926-.808 1.741-1.52 2.565-2.273a1.558 1.558 0 0 0 0-1.476 11.55 11.55 0 0 0-1.455-1.951z" fill="url(#d)"/>
+  <path d="M29.43 20.079c-.211.238-.359.4-.59.653l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 34.267 34.267 0 0 1 2.473 3.153 2.161 2.161 0 0 1-.15 2.329z" fill="url(#a)"/>
+  <path d="M22.3 25.976a11.55 11.55 0 0 0-1.458-1.951c-1.108 1.055-2.123 1.941-3.434 3.086a2.352 2.352 0 0 1-2.815.006c-1.414-1.234-2.768-2.5-4.095-3.8L8.023 25.8c1.384 1.35 2.8 2.668 4.28 3.958a5.635 5.635 0 0 0 3.683 1.316 5.745 5.745 0 0 0 3.753-1.351c.926-.808 1.741-1.52 2.565-2.273a1.558 1.558 0 0 0-.004-1.474z" fill="url(#e)"/>
+  <path d="M4.892 17.409a2.354 2.354 0 0 1-.006-2.815s-2.131 1.984-2.4 3.424a2.956 2.956 0 0 0 .729 2.782c1.56 1.739 3.158 3.4 4.808 5.007l2.479-2.48c-1.935-1.891-3.802-3.844-5.61-5.918z" opacity=".9" fill="url(#f)"/>
+</svg>
+`,
+  // original: chrome://browser/content/robot.ico
+  FAVICON_ROBOT: `
+data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACGFjVEwAAAASAAAAAJNtBPIAAAAaZmNUTAAAAAAAAAAQAAAAEAAAAAAAAAAALuAD6AABhIDeugAAALhJREFUOI2Nk8sNxCAMRDlGohauXFOMpfTiAlxICqAELltHLqlgctg1InzMRhpFAc+LGWTnmoeZYamt78zXdZmaQtQMADlnU0OIAlbmJUBEcO4bRKQY2rUXIPmAGnDuG/Bx3/fvOPVaDUg+oAPUf1PArIMCSD5glMEsUGaG+kyAFWIBaCsKuA+HGCNijLgP133XgOEtaPFMy2vUolEGJoCIzBmoRUR9+7rxj16DZaW/mgtmxnJ8V3oAnApQwNS5zpcAAAAaZmNUTAAAAAEAAAAQAAAAEAAAAAAAAAAAAB4D6AIB52fclgAAACpmZEFUAAAAAjiNY2AYBVhBc3Pzf2LEcGreqcbwH1kDNjHauWAUjAJyAADymxf9WF+u8QAAABpmY1RMAAAAAwAAABAAAAAQAAAAAAAAAAAAHgPoAgEK8Q9/AAAAFmZkQVQAAAAEOI1jYBgFo2AUjAIIAAAEEAAB0xIn4wAAABpmY1RMAAAABQAAABAAAAAQAAAAAAAAAAAAHgPoAgHnO30FAAAAQGZkQVQAAAAGOI1jYBieYKcaw39ixHCC/6cwFWMTw2rz/1MM/6Vu/f///xTD/51qEIwuRjsXILuEGLFRMApgAADhNCsVfozYcAAAABpmY1RMAAAABwAAABAAAAAQAAAAAAAAAAAAHgPoAgEKra7sAAAAFmZkQVQAAAAIOI1jYBgFo2AUjAIIAAAEEAABM9s3hAAAABpmY1RMAAAACQAAABAAAAAQAAAAAAAAAAAAHgPoAgHn3p+wAAAAKmZkQVQAAAAKOI1jYBgFWEFzc/N/YsRwat6pxvAfWQM2Mdq5YBSMAnIAAPKbF/1BhPl6AAAAGmZjVEwAAAALAAAAEAAAABAAAAAAAAAAAAAeA+gCAQpITFkAAAAWZmRBVAAAAAw4jWNgGAWjYBSMAggAAAQQAAHaszpmAAAAGmZjVEwAAAANAAAAEAAAABAAAAAAAAAAAAAeA+gCAeeCPiMAAABAZmRBVAAAAA44jWNgGJ5gpxrDf2LEcIL/pzAVYxPDavP/Uwz/pW79////FMP/nWoQjC5GOxcgu4QYsVEwCmAAAOE0KxUmBL0KAAAAGmZjVEwAAAAPAAAAEAAAABAAAAAAAAAAAAAeA+gCAQoU7coAAAAWZmRBVAAAABA4jWNgGAWjYBSMAggAAAQQAAEpOBELAAAAGmZjVEwAAAARAAAAEAAAABAAAAAAAAAAAAAeA+gCAeYVWtoAAAAqZmRBVAAAABI4jWNgGAVYQXNz839ixHBq3qnG8B9ZAzYx2rlgFIwCcgAA8psX/WvpAecAAAAaZmNUTAAAABMAAAAQAAAAEAAAAAAAAAAAAB4D6AIBC4OJMwAAABZmZEFUAAAAFDiNY2AYBaNgFIwCCAAABBAAAcBQHOkAAAAaZmNUTAAAABUAAAAQAAAAEAAAAAAAAAAAAB4D6AIB5kn7SQAAAEBmZEFUAAAAFjiNY2AYnmCnGsN/YsRwgv+nMBVjE8Nq8/9TDP+lbv3///8Uw/+dahCMLkY7FyC7hBixUTAKYAAA4TQrFc+cEoQAAAAaZmNUTAAAABcAAAAQAAAAEAAAAAAAAAAAAB4D6AIBC98ooAAAABZmZEFUAAAAGDiNY2AYBaNgFIwCCAAABBAAASCZDI4AAAAaZmNUTAAAABkAAAAQAAAAEAAAAAAAAAAAAB4D6AIB5qwZ/AAAACpmZEFUAAAAGjiNY2AYBVhBc3Pzf2LEcGreqcbwH1kDNjHauWAUjAJyAADymxf9cjJWbAAAABpmY1RMAAAAGwAAABAAAAAQAAAAAAAAAAAAHgPoAgELOsoVAAAAFmZkQVQAAAAcOI1jYBgFo2AUjAIIAAAEEAAByfEBbAAAABpmY1RMAAAAHQAAABAAAAAQAAAAAAAAAAAAHgPoAgHm8LhvAAAAQGZkQVQAAAAeOI1jYBieYKcaw39ixHCC/6cwFWMTw2rz/1MM/6Vu/f///xTD/51qEIwuRjsXILuEGLFRMApgAADhNCsVlxR3/gAAABpmY1RMAAAAHwAAABAAAAAQAAAAAAAAAAAAHgPoAgELZmuGAAAAFmZkQVQAAAAgOI1jYBgFo2AUjAIIAAAEEAABHP5cFQAAABpmY1RMAAAAIQAAABAAAAAQAAAAAAAAAAAAHgPoAgHlgtAOAAAAKmZkQVQAAAAiOI1jYBgFWEFzc/N/YsRwat6pxvAfWQM2Mdq5YBSMAnIAAPKbF/0/MvDdAAAAAElFTkSuQmCC
+`.trim(),
+  // original: chrome://browser/skin/controlcenter/dashboard.svg
+  FAVICON_DASHBOARD: `
+<svg data-name="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 12H4a2 2 0 0 1-2-2V3a1 1 0 0 0-2 0v7a4 4 0 0 0 4 4h11a1 1 0 0 0 0-2z"/>
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M4 11a1 1 0 0 0 1-1V8a1 1 0 0 0-2 0v2a1 1 0 0 0 1 1zM7 11a1 1 0 0 0 1-1V4a1 1 0 0 0-2 0v6a1 1 0 0 0 1 1zM10 11a1 1 0 0 0 1-1V6a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1zM13 11a1 1 0 0 0 1-1V7a1 1 0 0 0-2 0v3a1 1 0 0 0 1 1z"/>
+</svg>
+`,
+  // original: chrome://browser/skin/developer.svg
+  FAVICON_DEVELOPER: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.555 3.2l-2.434 2.436a1.243 1.243 0 1 1-1.757-1.757L12.8 1.445A3.956 3.956 0 0 0 11 1a3.976 3.976 0 0 0-3.434 6.02l-6.273 6.273a1 1 0 1 0 1.414 1.414L8.98 8.434A3.96 3.96 0 0 0 11 9a4 4 0 0 0 4-4 3.956 3.956 0 0 0-.445-1.8z"/>
+</svg>
+`,
+  // original: chrome://browser/skin/privatebrowsing/favicon.svg
+  FAVICON_PRIVATE_BROWSING: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <circle cx="8" cy="8" r="8" fill="#8d20ae"/>
+  <circle cx="8" cy="8" r="7.5" stroke="#7b149a" stroke-width="1" fill="none"/>
+  <path d="M11.309,10.995C10.061,10.995,9.2,9.5,8,9.5s-2.135,1.5-3.309,1.5c-1.541,0-2.678-1.455-2.7-3.948C1.983,5.5,2.446,5.005,4.446,5.005S7.031,5.822,8,5.822s1.555-.817,3.555-0.817S14.017,5.5,14.006,7.047C13.987,9.54,12.85,10.995,11.309,10.995ZM5.426,6.911a1.739,1.739,0,0,0-1.716.953A2.049,2.049,0,0,0,5.3,8.544c0.788,0,1.716-.288,1.716-0.544A1.428,1.428,0,0,0,5.426,6.911Zm5.148,0A1.429,1.429,0,0,0,8.981,8c0,0.257.928,0.544,1.716,0.544a2.049,2.049,0,0,0,1.593-.681A1.739,1.739,0,0,0,10.574,6.911Z" stroke="#670c83" stroke-width="2" fill="none"/>
+  <path d="M11.309,10.995C10.061,10.995,9.2,9.5,8,9.5s-2.135,1.5-3.309,1.5c-1.541,0-2.678-1.455-2.7-3.948C1.983,5.5,2.446,5.005,4.446,5.005S7.031,5.822,8,5.822s1.555-.817,3.555-0.817S14.017,5.5,14.006,7.047C13.987,9.54,12.85,10.995,11.309,10.995ZM5.426,6.911a1.739,1.739,0,0,0-1.716.953A2.049,2.049,0,0,0,5.3,8.544c0.788,0,1.716-.288,1.716-0.544A1.428,1.428,0,0,0,5.426,6.911Zm5.148,0A1.429,1.429,0,0,0,8.981,8c0,0.257.928,0.544,1.716,0.544a2.049,2.049,0,0,0,1.593-.681A1.739,1.739,0,0,0,10.574,6.911Z" fill="#fff"/>
+</svg>
+`,
+  // original: chrome://browser/skin/settings.svg
+  FAVICON_SETTINGS: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/>
+</svg>
+`,
+  // original: chrome://browser/skin/window.svg
+  FAVICON_WINDOW: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h11a2 2 0 0 0 2-2V4a3 3 0 0 0-3-3zm1 11a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V6h12zm0-7H2V4a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1z"/>
+</svg>
+`,
+  // original: chrome://devtools/skin/images/profiler-stopwatch.svg
+  FAVICON_PROFILER: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M10.85 6.85a.5.5 0 0 0-.7-.7l-2.5 2.5.7.7 2.5-2.5zM8 10a1 1 0 1 0 0-2 1 1 0 0 0 0 2zM5 1a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1zM8 4a5 5 0 1 0 0 10A5 5 0 0 0 8 4zM1 9a7 7 0 1 1 14 0A7 7 0 0 1 1 9z"/>
+</svg>
+`,
+  // original: chrome://global/skin/icons/performance.svg
+  FAVICON_PERFORMANCE: `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M8 1a8 8 0 0 0-8 8 7.89 7.89 0 0 0 .78 3.43 1 1 0 0 0 .9.57.94.94 0 0 0 .43-.1 1 1 0 0 0 .47-1.33A6.07 6.07 0 0 1 2 9a6 6 0 0 1 12 0 5.93 5.93 0 0 1-.59 2.57 1 1 0 0 0 1.81.86A7.89 7.89 0 0 0 16 9a8 8 0 0 0-8-8z"/>
+  <path fill="context-fill" d="M11.77 7.08a.5.5 0 0 0-.69.15L8.62 11.1A2.12 2.12 0 0 0 8 11a2 2 0 0 0 0 4 2.05 2.05 0 0 0 1.12-.34 2.31 2.31 0 0 0 .54-.54 2 2 0 0 0 0-2.24 2.31 2.31 0 0 0-.2-.24l2.46-3.87a.5.5 0 0 0-.15-.69z"/>
+</svg>
+`,
+  // original: chrome://global/skin/icons/warning.svg
+  FAVICON_WARNING: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.742 12.106L9.789 2.2a2 2 0 0 0-3.578 0l-4.953 9.91A2 2 0 0 0 3.047 15h9.905a2 2 0 0 0 1.79-2.894zM7 5a1 1 0 0 1 2 0v4a1 1 0 0 1-2 0zm1 8.25A1.25 1.25 0 1 1 9.25 12 1.25 1.25 0 0 1 8 13.25z"/>
+</svg>
+`,
+  // original: chrome://mozapps/skin/extensions/extensionGeneric-16.svg
+  FAVICON_EXTENSION: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"/>
+</svg>
+`,
+  // original: globe-16.svg
+  FAVICON_GLOBE: `
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M8 0a8 8 0 1 0 8 8 8.009 8.009 0 0 0-8-8zm5.163 4.958h-1.552a7.7 7.7 0 0 0-1.051-2.376 6.03 6.03 0 0 1 2.603 2.376zM14 8a5.963 5.963 0 0 1-.335 1.958h-1.821A12.327 12.327 0 0 0 12 8a12.327 12.327 0 0 0-.156-1.958h1.821A5.963 5.963 0 0 1 14 8zm-6 6c-1.075 0-2.037-1.2-2.567-2.958h5.135C10.037 12.8 9.075 14 8 14zM5.174 9.958a11.084 11.084 0 0 1 0-3.916h5.651A11.114 11.114 0 0 1 11 8a11.114 11.114 0 0 1-.174 1.958zM2 8a5.963 5.963 0 0 1 .335-1.958h1.821a12.361 12.361 0 0 0 0 3.916H2.335A5.963 5.963 0 0 1 2 8zm6-6c1.075 0 2.037 1.2 2.567 2.958H5.433C5.963 3.2 6.925 2 8 2zm-2.56.582a7.7 7.7 0 0 0-1.051 2.376H2.837A6.03 6.03 0 0 1 5.44 2.582zm-2.6 8.46h1.549a7.7 7.7 0 0 0 1.051 2.376 6.03 6.03 0 0 1-2.603-2.376zm7.723 2.376a7.7 7.7 0 0 0 1.051-2.376h1.552a6.03 6.03 0 0 1-2.606 2.376z"/>
+</svg>
+`,
+
+  async _urlToKey(url) { // sha1 hash
+    const encoder = new TextEncoder();
+    const data = encoder.encode(url);
+
+    const hashBuffer = await crypto.subtle.digest('SHA-1', data);
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join('');
+
+    return hashHex;
+  },
+
+  DB_NAME: 'TabFavIconHelper',
+  DB_VERSION: 2,
+  STORE_FAVICONS: 'favIcons',
+  STORE_EFFECTIVE_FAVICONS: 'effectiveFavIcons',
+  STORE_UNEFFECTIVE_FAVICONS: 'uneffectiveFavIcons',
+  EXPIRATION_TIME_IN_MSEC: 7 * 24 * 60 * 60 * 1000, // 7 days
+
+  async _openDB() {
+    if (this._openedDB)
+      return this._openedDB;
+    return new Promise((resolve, _reject) => {
+      const request = indexedDB.open(this.DB_NAME, this.DB_VERSION);
+
+      request.onerror = () => {
+        // This can fail if this is in a private window.
+        // See: https://github.com/piroor/treestyletab/issues/3387
+        //reject(new Error('Failed to open database'));
+        resolve(null);
+      };
+
+      request.onsuccess = () => {
+        const db = request.result;
+        this._openedDB = db;
+        resolve(db);
+      };
+
+      request.onupgradeneeded = (event) => {
+        const db = event.target.result;
+        const objectStores = db.objectStoreNames;
+
+        const needToUpgrade = event.oldVersion < this.DB_VERSION;
+        if (needToUpgrade) {
+          if (objectStores.contains(this.STORE_FAVICONS))
+            db.deleteObjectStore(this.STORE_FAVICONS);
+          if (objectStores.contains(this.STORE_EFFECTIVE_FAVICONS))
+            db.deleteObjectStore(this.STORE_EFFECTIVE_FAVICONS);
+          if (objectStores.contains(this.STORE_UNEFFECTIVE_FAVICONS))
+            db.deleteObjectStore(this.STORE_UNEFFECTIVE_FAVICONS);
+        }
+
+        if (needToUpgrade ||
+            !objectStores.contains(this.STORE_FAVICONS)) {
+          const favIconsStore = db.createObjectStore(this.STORE_FAVICONS, { keyPath: 'key', unique: true });
+          favIconsStore.createIndex('urlKey', 'urlKey', { unique: false });
+          favIconsStore.createIndex('timestamp', 'timestamp');
+        }
+
+        if (needToUpgrade ||
+            !objectStores.contains(this.STORE_EFFECTIVE_FAVICONS)) {
+          const effectiveFavIconsStore = db.createObjectStore(this.STORE_EFFECTIVE_FAVICONS, { keyPath: 'urlKey', unique: true });
+          effectiveFavIconsStore.createIndex('timestamp', 'timestamp');
+          effectiveFavIconsStore.createIndex('favIconKey', 'favIconKey', { unique: false });
+        }
+
+        if (needToUpgrade ||
+            !objectStores.contains(this.STORE_UNEFFECTIVE_FAVICONS)) {
+          const uneffectiveFavIconsStore = db.createObjectStore(this.STORE_UNEFFECTIVE_FAVICONS, { keyPath: 'urlKey', unique: true });
+          uneffectiveFavIconsStore.createIndex('timestamp', 'timestamp');
+          uneffectiveFavIconsStore.createIndex('favIconKey', 'favIconKey', { unique: false });
+        }
+      };
+    });
+  },
+
+  async _associateFavIconUrlToTabUrl({ favIconUrl, tabUrl, store } = {}) {
+    const [db, tabUrlKey, favIconKey] = await Promise.all([
+      this._openDB(),
+      this._urlToKey(tabUrl),
+      this._urlToKey(favIconUrl),
+    ]);
+    if (!db)
+      return;
+
+    try {
+      const transaction = db.transaction([store, this.STORE_FAVICONS], 'readwrite');
+      const associationStore = transaction.objectStore(store);
+      const favIconStore = transaction.objectStore(this.STORE_FAVICONS);
+      const timestamp = Date.now();
+
+      const associationRequest = associationStore.put({ urlKey: tabUrlKey, favIconKey, timestamp });
+      const favIconRequest = favIconStore.put({ key: favIconKey, url: favIconUrl, timestamp });
+
+      transaction.oncomplete = () => {
+        //db.close();
+        this._reserveToExpireOldEntries();
+        favIconUrl = undefined;
+        tabUrl = undefined;
+        store = undefined;
+      };
+
+      associationRequest.onerror = event => {
+        console.error(`Failed to associate favIconUrl ${favIconUrl} to tabUrl ${tabUrl} in the store ${store}`, event);
+      };
+
+      favIconRequest.onerror = event => {
+        console.error(`Failed to store favIconUrl ${favIconUrl} to tabUrl ${tabUrl} in the store ${store}`, event);
+      };
+    }
+    catch(error) {
+      console.error(`Failed to associate favIconUrl ${favIconUrl} to tabUrl ${tabUrl} in the store ${store}`, error);
+    }
+  },
+
+  async _unassociateFavIconUrlFromTabUrl({ tabUrl, store } = {}) {
+    const [db, tabUrlKey] = await Promise.all([
+      this._openDB(),
+      this._urlToKey(tabUrl),
+    ]);
+    if (!db)
+      return;
+
+    try {
+      const transaction = db.transaction([store], 'readwrite');
+      const associationStore = transaction.objectStore(store);
+      const unassociationRequest = associationStore.delete(tabUrlKey);
+
+      transaction.oncomplete = () => {
+        //db.close();
+        this._reserveToExpireOldEntries();
+        tabUrl = undefined;
+        store = undefined;
+      };
+
+      unassociationRequest.onerror = event => {
+        console.error(`Failed to unassociate favIconUrl from tabUrl ${tabUrl} in the store ${store}`, event);
+      };
+    }
+    catch(error) {
+      console.error(`Failed to unassociate favIconUrl from tabUrl ${tabUrl} in the store ${store}`, error);
+    }
+  },
+
+  async _getAssociatedFavIconUrlFromTabUrl({ tabUrl, store } = {}) {
+    return new Promise(async (resolve, _reject) => {
+      const [db, tabUrlKey] = await Promise.all([
+        this._openDB(),
+        this._urlToKey(tabUrl),
+      ]);
+      if (!db) {
+        resolve(null);
+        return;
+      }
+
+      try {
+        const transaction = db.transaction([store, this.STORE_FAVICONS], 'readonly');
+        const associationStore = transaction.objectStore(store);
+        const favIconStore = transaction.objectStore(this.STORE_FAVICONS);
+
+        const associationRequest = associationStore.get(tabUrlKey);
+
+        associationRequest.onsuccess = () => {
+          const association = associationRequest.result;
+          if (!association) {
+            //console.log(`No associated favIconUrl for the tabUrl ${tabUrl} in the store ${store}`);
+            resolve(null);
+            return;
+          }
+
+          const favIconRequest = favIconStore.get(association.favIconKey);
+
+          favIconRequest.onsuccess = () => {
+            let favIcon = favIconRequest.result;
+            if (!favIcon) {
+              //console.log(`FavIcon data not found for the tabUrl ${tabUrl} in the store ${store}`);
+              resolve(null);
+              return;
+            }
+            if (favIcon.timestamp < Date.now() - this.EXPIRATION_TIME_IN_MSEC) {
+              //console.log(`FavIcon data is expired for the tabUrl ${tabUrl} in the store ${store}`);
+              this._reserveToExpireOldEntries();
+              resolve(null);
+              return;
+            }
+            resolve(favIcon.url);
+            favIcon.url = undefined;
+            favIcon = undefined;
+          };
+
+          favIconRequest.onerror = event => {
+            console.error(`Failed to get favIconUrl from tabUrl ${tabUrl}`, event);
+            resolve(null);
+          };
+        };
+
+        associationRequest.onerror = event => {
+          console.error(`Failed to get favIcon association from tabUrl ${tabUrl}`, event);
+          resolve(null);
+        };
+
+        transaction.oncomplete = () => {
+          //db.close();
+          tabUrl = undefined;
+          store = undefined;
+        };
+      }
+      catch(error) {
+        console.error('Failed to get from cache:', error);
+        resolve(null);
+      }
+    });
+  },
+
+  async _reserveToExpireOldEntries() {
+    if (this._reservedExpiration)
+      clearTimeout(this._reservedExpiration);
+    this._reservedExpiration = setTimeout(() => {
+      this._reservedExpiration = null;
+      this._expireOldEntries();
+    }, 500);
+  },
+  async _expireOldEntries() {
+    return new Promise(async (resolve, reject) => {
+      const db = await this._openDB();
+      if (!db) {
+        resolve();
+        return;
+      }
+
+      try {
+        const transaction = db.transaction([this.STORE_FAVICONS, this.STORE_EFFECTIVE_FAVICONS, this.STORE_UNEFFECTIVE_FAVICONS], 'readwrite');
+        const favIconsStore = transaction.objectStore(this.STORE_FAVICONS);
+        const effectiveFavIconsStore = transaction.objectStore(this.STORE_EFFECTIVE_FAVICONS);
+        const uneffectiveFavIconsStore = transaction.objectStore(this.STORE_UNEFFECTIVE_FAVICONS);
+
+        const favIconIndex = favIconsStore.index('timestamp');
+        const effectiveFavIconIndex = effectiveFavIconsStore.index('timestamp');
+        const uneffectiveFavIconIndex = uneffectiveFavIconsStore.index('timestamp');
+
+        const expirationTimestamp = Date.now() - this.EXPIRATION_TIME_IN_MSEC;
+
+        const favIconRequest = favIconIndex.openCursor(IDBKeyRange.upperBound(expirationTimestamp));
+        favIconRequest.onsuccess = (event) => {
+          const cursor = event.target.result;
+          if (!cursor)
+            return;
+          const key = cursor.primaryKey;
+          cursor.continue();
+          const deleteRequest = favIconsStore.delete(key);
+          deleteRequest.onerror = event => {
+            console.error(`Failed to clear favicon index`, event);
+          };
+        };
+        favIconRequest.onerror = event => {
+          console.error(`Failed to retrieve favicon index`, event);
+        };
+
+        const effectiveFavIconRequest = effectiveFavIconIndex.openCursor(IDBKeyRange.upperBound(expirationTimestamp));
+        effectiveFavIconRequest.onsuccess = (event) => {
+          const cursor = event.target.result;
+          if (!cursor)
+            return;
+          const url = cursor.primaryKey;
+          cursor.continue();
+          const deleteRequest = effectiveFavIconsStore.delete(url);
+          deleteRequest.onerror = event => {
+            console.error(`Failed to clear effective favicon index`, event);
+          };
+        };
+        effectiveFavIconRequest.onerror = event => {
+          console.error(`Failed to retrieve effective favicon index`, event);
+        };
+
+        const uneffectiveFavIconRequest = uneffectiveFavIconIndex.openCursor(IDBKeyRange.upperBound(expirationTimestamp));
+        uneffectiveFavIconRequest.onsuccess = (event) => {
+          const cursor = event.target.result;
+          if (!cursor)
+            return;
+          const url = cursor.primaryKey;
+          cursor.continue();
+          const deleteRequest = uneffectiveFavIconsStore.delete(url);
+          deleteRequest.onerror = event => {
+            console.error(`Failed to clear uneffective favicon index`, event);
+          };
+        };
+        uneffectiveFavIconRequest.onerror = event => {
+          console.error(`Failed to retrieve uneffective favicon index`, event);
+        };
+
+        transaction.oncomplete = () => {
+          //db.close();
+          resolve();
+        };
+      }
+      catch(error) {
+        console.error('Failed to expire old entries:', error);
+        reject(error);
+      }
+    });
+  },
+
+  _tasks: [],
+  _processStep: 5,
+  FAVICON_SIZE: 16,
+
+  _init() {
+    this._onTabUpdated = this._onTabUpdated.bind(this);
+    browser.tabs.onUpdated.addListener(this._onTabUpdated);
+
+    this.canvas = document.createElement('canvas');
+    this.canvas.width = this.canvas.height = this.FAVICON_SIZE;
+    this.canvas.setAttribute('style', `
+      visibility: hidden;
+      pointer-events: none;
+      position: fixed
+    `);
+    document.body.appendChild(this.canvas);
+
+    window.addEventListener('unload', () => {
+      browser.tabs.onUpdated.removeListener(this._onTabUpdated);
+    }, { once: true });
+  },
+
+  _sessionAPIAvailable: (
+    browser.sessions &&
+    browser.sessions.getTabValue &&
+    browser.sessions.setTabValue &&
+    browser.sessions.removeTabValue
+  ),
+
+  _addTask(task) {
+    this._tasks.push(task);
+    this._run();
+  },
+
+  _run() {
+    if (this._running)
+      return;
+    this._running = true;
+    const processOneTask = () => {
+      if (this._tasks.length == 0) {
+        this._running = false;
+      }
+      else {
+        const tasks = this._tasks.splice(0, this._processStep);
+        while (tasks.length > 0) {
+          tasks.shift()();
+        }
+        window.requestAnimationFrame(processOneTask);
+      }
+    };
+    processOneTask();
+  },
+
+  // public
+  loadToImage(params = {}) {
+    this._addTask(() => {
+      this._getEffectiveFavIconURL(params.tab, params.url)
+        .then(url => {
+          params.image.src = url;
+          params.image.classList.remove('error');
+          url = undefined;
+        },
+              _error => {
+                params.image.src = '';
+                params.image.classList.add('error');
+              });
+    });
+  },
+
+  // public
+  maybeImageTab(_tab) { // for backward compatibility
+    return false;
+  },
+
+  _getSafeFaviconUrl(url) {
+    switch (url) {
+      case 'chrome://browser/content/aboutlogins/icons/favicon.svg':
+        return this._getSVGDataURI(this.FAVICON_LOCKWISE);
+      case 'chrome://browser/content/robot.ico':
+        return this.FAVICON_ROBOT;
+      case 'chrome://browser/skin/controlcenter/dashboard.svg':
+        return this._getSVGDataURI(this.FAVICON_DASHBOARD);
+      case 'chrome://browser/skin/developer.svg':
+        return this._getSVGDataURI(this.FAVICON_DEVELOPER);
+      case 'chrome://browser/skin/privatebrowsing/favicon.svg':
+        return this._getSVGDataURI(this.FAVICON_PRIVATE_BROWSING);
+      case 'chrome://browser/skin/settings.svg':
+        return this._getSVGDataURI(this.FAVICON_SETTINGS);
+      case 'chrome://browser/skin/window.svg':
+        return this._getSVGDataURI(this.FAVICON_WINDOW);
+      case 'chrome://devtools/skin/images/profiler-stopwatch.svg':
+        return this._getSVGDataURI(this.FAVICON_PROFILER);
+      case 'chrome://global/skin/icons/performance.svg':
+        return this._getSVGDataURI(this.FAVICON_PERFORMANCE);
+      case 'chrome://global/skin/icons/warning.svg':
+        return this._getSVGDataURI(this.FAVICON_WARNING);
+      case 'chrome://mozapps/skin/extensions/extensionGeneric-16.svg':
+        return this._getSVGDataURI(this.FAVICON_EXTENSION);
+      default:
+        if (/^chrome:\/\//.test(url) &&
+            !/^chrome:\/\/branding\//.test(url))
+          return this._getSVGDataURI(this.FAVICON_GLOBE);
+        break;
+    }
+    return url;
+  },
+  _getSVGDataURI(svg) {
+    return `data:image/svg+xml,${encodeURIComponent(svg.trim())}`;
+  },
+
+  // public
+  async getLastEffectiveFavIconURL(tab) {
+    if (tab.favIconUrl?.startsWith('data:'))
+      return tab.favIconUrl;
+
+    const uneffectiveFavIconUrl = await this._getAssociatedFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_UNEFFECTIVE_FAVICONS });
+    if (uneffectiveFavIconUrl)
+      return null;
+
+    const favIconUrl = await this._getAssociatedFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_EFFECTIVE_FAVICONS });
+    if (favIconUrl)
+      return favIconUrl;
+
+    if (!this._sessionAPIAvailable)
+      return null;
+
+    const lastData = await browser.sessions.getTabValue(tab.id, this.LAST_EFFECTIVE_FAVICON);
+    return lastData && lastData.url == tab.url && lastData.favIconUrl;
+  },
+
+  async _getEffectiveFavIconURL(tab, favIconUrl = null) {
+    if (tab.favIconUrl?.startsWith('data:')) {
+      browser.sessions.removeTabValue(tab.id, this.LAST_EFFECTIVE_FAVICON);
+      this._unassociateFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_UNEFFECTIVE_FAVICONS });
+      return tab.favIconUrl;
+    }
+
+    return new Promise(async (resolve, reject) => {
+      favIconUrl = this._getSafeFaviconUrl(favIconUrl || tab.favIconUrl);
+      let storedFavIconUrl;
+      if (!favIconUrl && tab.discarded) {
+        // discarded tab doesn't have favIconUrl, so we should use cached data.
+        storedFavIconUrl = favIconUrl = await this.getLastEffectiveFavIconURL(tab);
+      }
+
+      let loader, onLoad, onError;
+      const clear = (() => {
+        if (loader) {
+          loader.removeEventListener('load', onLoad, { once: true });
+          loader.removeEventListener('error', onError, { once: true });
+        }
+        loader = onLoad = onError = favIconUrl = storedFavIconUrl = undefined;
+      });
+
+      onLoad = async foundFavIconUrl => {
+        let dataURL = null;
+        if (this.DRAWABLE_FAVICON_PATTERN.test(favIconUrl)) {
+          const context = this.canvas.getContext('2d');
+          context.clearRect(0, 0, this.FAVICON_SIZE, this.FAVICON_SIZE);
+          context.drawImage(loader, 0, 0, this.FAVICON_SIZE, this.FAVICON_SIZE);
+          try {
+            dataURL = this.canvas.toDataURL('image/png');
+          }
+          catch(_error) {
+            // it can fail due to security reasons
+          }
+        }
+        const oldFavIconUrl = foundFavIconUrl || await this._getAssociatedFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_EFFECTIVE_FAVICONS });
+        if (!oldFavIconUrl ||
+            oldFavIconUrl != favIconUrl) {
+          if (this._sessionAPIAvailable)
+            browser.sessions.setTabValue(tab.id, this.LAST_EFFECTIVE_FAVICON, {
+              url: tab.url,
+              favIconUrl,
+            });
+        }
+        this._associateFavIconUrlToTabUrl({ tabUrl: tab.url, favIconUrl, store: this.STORE_EFFECTIVE_FAVICONS });
+        this._unassociateFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_UNEFFECTIVE_FAVICONS });
+        resolve(dataURL || favIconUrl);
+        clear();
+      };
+      onError = async error => {
+        this._unassociateFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_EFFECTIVE_FAVICONS });
+        this._associateFavIconUrlToTabUrl({ tabUrl: tab.url, favIconUrl, store: this.STORE_UNEFFECTIVE_FAVICONS });
+        if (this._sessionAPIAvailable)
+          browser.sessions.removeTabValue(tab.id, this.LAST_EFFECTIVE_FAVICON);
+        clear();
+        reject(error || new Error('No effective icon'));
+      };
+      storedFavIconUrl = storedFavIconUrl || await this._getAssociatedFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_EFFECTIVE_FAVICONS });
+      if (storedFavIconUrl)
+        return onLoad(storedFavIconUrl);
+      if (!favIconUrl ||
+          !this.VALID_FAVICON_PATTERN.test(favIconUrl)) {
+        onError();
+        return;
+      }
+      loader = new Image();
+      if (/^https?:/.test(favIconUrl))
+        loader.crossOrigin = 'anonymous';
+      loader.addEventListener('load', () => onLoad(), { once: true });
+      loader.addEventListener('error', onError, { once: true });
+      try {
+        loader.src = favIconUrl;
+      }
+      catch(error) {
+        this._unassociateFavIconUrlFromTabUrl({ tabUrl: tab.url, store: this.STORE_EFFECTIVE_FAVICONS });
+        this._associateFavIconUrlToTabUrl({ tabUrl: tab.url, favIconUrl, store: this.STORE_UNEFFECTIVE_FAVICONS });
+        onError(error);
+      }
+    });
+  },
+
+  _onTabUpdated(tabId, changeInfo, _tab) {
+    if (!this._hasFavIconInfo(changeInfo))
+      return;
+    let timer = this._updatingTabs.get(tabId);
+    if (timer)
+      clearTimeout(timer);
+    // Updating of last effective favicon must be done after the loading
+    // of the tab itself is correctly done, to avoid cookie problems on
+    // some websites.
+    // See also: https://github.com/piroor/treestyletab/issues/2064
+    timer = setTimeout(async () => {
+      this._updatingTabs.delete(tabId);
+      const tab = await browser.tabs.get(tabId);
+      if (!tab ||
+          (changeInfo.favIconUrl &&
+           tab.favIconUrl != changeInfo.favIconUrl) ||
+          (changeInfo.url &&
+           tab.url != changeInfo.url) ||
+          !this._hasFavIconInfo(tab))
+        return; // expired
+
+      await this._getEffectiveFavIconURL(
+        tab,
+        changeInfo.favIconUrl
+      ).catch(_error => {});
+    }, 5000);
+    this._updatingTabs.set(tabId, timer);
+  },
+  _hasFavIconInfo(tabOrChangeInfo) {
+    return 'favIconUrl' in tabOrChangeInfo;
+  },
+  _updatingTabs: new Map(),
+};
+TabFavIconHelper._init(); // eslint-disable-line no-underscore-dangle
+export default TabFavIconHelper;
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.css b/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.css
new file mode 100644
index 0000000000000..1fbb4645f5869
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.css
@@ -0,0 +1,1245 @@
+/* codemirror-colorpicker version 1.9.80 */
+/* codemirror colorview */
+.codemirror-colorview {
+  border: 1px solid #cecece;
+  position: relative;
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin: 0px 2px;
+  width: 10px;
+  height: 10px;
+  cursor: pointer;
+  vertical-align: middle;
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat; }
+  .codemirror-colorview .codemirror-colorview-background {
+    content: "";
+    position: absolute;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    top: 0px; }
+  .codemirror-colorview:hover {
+    border-color: #494949; }
+
+/* codemirror-colorpicker */
+.codemirror-colorpicker {
+  position: relative;
+  width: 224px;
+  z-index: 1000;
+  display: inline-block;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  background-color: #fff;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0px 10px 2px rgba(0, 0, 0, 0.12);
+          box-shadow: 0 0px 10px 2px rgba(0, 0, 0, 0.12);
+  /* theme */ }
+  .codemirror-colorpicker > .arrow {
+    position: absolute;
+    top: -10px;
+    left: 7px;
+    width: 0;
+    height: 0;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    display: none;
+    border-bottom: 10px solid rgba(0, 0, 0, 0.2);
+    pointer-events: none; }
+    .codemirror-colorpicker > .arrow:after {
+      position: absolute;
+      content: "";
+      top: 1px;
+      left: -9px;
+      width: 0;
+      height: 0;
+      border-left: 9px solid transparent;
+      border-right: 9px solid transparent;
+      border-bottom: 9px solid white; }
+  .codemirror-colorpicker .colorpicker-body .arrow-button {
+    position: relative;
+    width: 10px;
+    height: 12px;
+    padding: 0px;
+    background-color: transparent; }
+    .codemirror-colorpicker .colorpicker-body .arrow-button:before {
+      content: "";
+      display: inline-block;
+      position: absolute;
+      left: 0px;
+      right: 0px;
+      top: 0px;
+      height: 50%;
+      width: 0;
+      height: 0;
+      border-left: 3px solid transparent;
+      border-right: 3px solid transparent;
+      border-bottom: 3px solid black;
+      pointer-events: none;
+      margin: 2px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box; }
+    .codemirror-colorpicker .colorpicker-body .arrow-button:after {
+      content: "";
+      display: inline-block;
+      position: absolute;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      top: 50%;
+      width: 0;
+      height: 0;
+      border-left: 3px solid transparent;
+      border-right: 3px solid transparent;
+      border-top: 3px solid black;
+      pointer-events: none;
+      margin: 2px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box; }
+  .codemirror-colorpicker .colorpicker-body .color {
+    position: relative;
+    height: 120px;
+    overflow: hidden;
+    cursor: pointer; }
+    .codemirror-colorpicker .colorpicker-body .color > .saturation {
+      position: relative;
+      width: 100%;
+      height: 100%; }
+      .codemirror-colorpicker .colorpicker-body .color > .saturation > .value {
+        position: relative;
+        width: 100%;
+        height: 100%; }
+        .codemirror-colorpicker .colorpicker-body .color > .saturation > .value > .drag-pointer {
+          position: absolute;
+          width: 10px;
+          height: 10px;
+          border-radius: 50%;
+          -webkit-transform: translateX(-50%) translateY(-50%);
+                  transform: translateX(-50%) translateY(-50%); }
+    .codemirror-colorpicker .colorpicker-body .color > .saturation {
+      background-color: rgba(204, 154, 129, 0);
+      background-image: -webkit-gradient(linear, left top, right top, from(#FFF), to(rgba(204, 154, 129, 0)));
+      background-image: linear-gradient(to right, #FFF, rgba(204, 154, 129, 0));
+      background-repeat: repeat-x; }
+      .codemirror-colorpicker .colorpicker-body .color > .saturation > .value {
+        background-image: -webkit-gradient(linear, left bottom, left top, from(#000000), to(rgba(204, 154, 129, 0)));
+        background-image: linear-gradient(to top, #000000, rgba(204, 154, 129, 0)); }
+        .codemirror-colorpicker .colorpicker-body .color > .saturation > .value > .drag-pointer {
+          border: 1px solid #fff;
+          -webkit-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.05);
+                  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.05); }
+  .codemirror-colorpicker .colorpicker-body .control {
+    position: relative;
+    padding: 10px 0px 10px 0px;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none; }
+    .codemirror-colorpicker .colorpicker-body .control.has-eyedropper {
+      padding-left: 30px; }
+      .codemirror-colorpicker .colorpicker-body .control.has-eyedropper .el-cp-color-control__left {
+        position: absolute;
+        left: 12px;
+        top: 20px;
+        width: 30px;
+        height: 30px;
+        border-radius: 50%;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box; }
+      .codemirror-colorpicker .colorpicker-body .control.has-eyedropper > .color, .codemirror-colorpicker .colorpicker-body .control.has-eyedropper > .empty {
+        left: 45px; }
+    .codemirror-colorpicker .colorpicker-body .control > .color, .codemirror-colorpicker .colorpicker-body .control > .empty {
+      position: absolute;
+      left: 12px;
+      top: 14px;
+      width: 30px;
+      height: 30px;
+      border-radius: 50%;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box; }
+    .codemirror-colorpicker .colorpicker-body .control > .color {
+      border: 1px solid rgba(0, 0, 0, 0.1); }
+    .codemirror-colorpicker .colorpicker-body .control > .hue {
+      position: relative;
+      padding: 6px 16px;
+      margin: 0px 0px 0px 42px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      cursor: pointer; }
+      .codemirror-colorpicker .colorpicker-body .control > .hue > .hue-container {
+        position: relative;
+        width: 100%;
+        height: 10px;
+        border-radius: 3px; }
+    .codemirror-colorpicker .colorpicker-body .control > .opacity {
+      position: relative;
+      padding: 3px 16px;
+      margin: 0px 0px 0px 42px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      cursor: pointer; }
+      .codemirror-colorpicker .colorpicker-body .control > .opacity > .opacity-container {
+        position: relative;
+        width: 100%;
+        height: 10px;
+        border-radius: 3px; }
+    .codemirror-colorpicker .colorpicker-body .control .drag-bar, .codemirror-colorpicker .colorpicker-body .control .drag-bar2 {
+      position: absolute;
+      cursor: pointer;
+      top: 50%;
+      left: 0px;
+      -webkit-transform: translateX(-50%) translateY(-50%);
+              transform: translateX(-50%) translateY(-50%);
+      width: 12px;
+      height: 12px;
+      border-radius: 50%; }
+    .codemirror-colorpicker .colorpicker-body .control > .hue > .hue-container {
+      background: -webkit-gradient(linear, left top, right top, from(#ff0000), color-stop(17%, #ffff00), color-stop(33%, #00ff00), color-stop(50%, #00ffff), color-stop(67%, #0000ff), color-stop(83%, #ff00ff), to(#ff0000));
+      background: linear-gradient(to right, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); }
+    .codemirror-colorpicker .colorpicker-body .control > .opacity > .opacity-container {
+      background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat; }
+      .codemirror-colorpicker .colorpicker-body .control > .opacity > .opacity-container > .color-bar {
+        position: absolute;
+        display: block;
+        content: "";
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        top: 0px; }
+    .codemirror-colorpicker .colorpicker-body .control > .empty {
+      background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat; }
+    .codemirror-colorpicker .colorpicker-body .control .drag-bar,
+    .codemirror-colorpicker .colorpicker-body .control .drag-bar2 {
+      border: 1px solid rgba(0, 0, 0, 0.05);
+      -webkit-box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.2);
+              box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.2);
+      background-color: #fefefe; }
+  .codemirror-colorpicker .colorpicker-body .information {
+    /*border-top: 1px solid #e8e8e8;*/
+    position: relative;
+    -webkit-box-sizing: padding-box;
+            box-sizing: padding-box; }
+    .codemirror-colorpicker .colorpicker-body .information > input {
+      position: absolute;
+      font-size: 10px;
+      height: 20px;
+      bottom: 20px;
+      padding: 0 0 0 2px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      -webkit-user-select: text;
+         -moz-user-select: text;
+          -ms-user-select: text;
+              user-select: text; }
+      .codemirror-colorpicker .colorpicker-body .information > input[type=number] {
+        -webkit-appearance: none;
+           -moz-appearance: none;
+                appearance: none; }
+      .codemirror-colorpicker .colorpicker-body .information > input[type=number]::-webkit-inner-spin-button, .codemirror-colorpicker .colorpicker-body .information > input[type=number]::-webkit-outer-spin-button {
+        -webkit-appearance: none;
+                appearance: none;
+        margin: 0; }
+    .codemirror-colorpicker .colorpicker-body .information.hex > .information-item.hex {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex; }
+    .codemirror-colorpicker .colorpicker-body .information.rgb > .information-item.rgb {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex; }
+    .codemirror-colorpicker .colorpicker-body .information.hsl > .information-item.hsl {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex; }
+    .codemirror-colorpicker .colorpicker-body .information > .information-item {
+      display: none;
+      position: relative;
+      padding: 0px 5px;
+      padding-left: 9px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      margin-right: 40px; }
+      .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field {
+        display: block;
+        -webkit-box-flex: 1;
+            -ms-flex: 1;
+                flex: 1;
+        padding: 3px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        position: relative; }
+        .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field > .title {
+          text-align: center;
+          font-size: 12px;
+          color: #a9a9a9;
+          padding-top: 2px;
+          cursor: pointer;
+          -webkit-user-select: none;
+             -moz-user-select: none;
+              -ms-user-select: none;
+                  user-select: none; }
+        .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field input {
+          text-align: center;
+          width: 100%;
+          padding: 3px;
+          height: 21px;
+          font-size: 11px;
+          color: #333;
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box;
+          -webkit-user-select: text;
+             -moz-user-select: text;
+              -ms-user-select: text;
+                  user-select: text;
+          border: 1px solid #cbcbcb;
+          border-radius: 2px; }
+          .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field input[type=number] {
+            -webkit-appearance: none;
+               -moz-appearance: none;
+                    appearance: none; }
+          .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field input[type=number]::-webkit-inner-spin-button, .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field input[type=number]::-webkit-outer-spin-button {
+            -webkit-appearance: none;
+                    appearance: none;
+            margin: 0; }
+        .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field.hsl-l input[type=number], .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field.hsl-s input[type=number] {
+          padding-left: 1px;
+          padding-right: 10px; }
+        .codemirror-colorpicker .colorpicker-body .information > .information-item > .input-field .postfix {
+          display: inline-block;
+          position: absolute;
+          right: 3px;
+          top: 2px;
+          height: 21px;
+          line-height: 2;
+          padding: 2px;
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box;
+          text-align: center;
+          font-size: 11px; }
+    .codemirror-colorpicker .colorpicker-body .information > .information-change {
+      position: absolute;
+      display: block;
+      width: 40px;
+      top: 0px;
+      right: 0px;
+      bottom: 0px;
+      text-align: center;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      padding-top: 5px; }
+      .codemirror-colorpicker .colorpicker-body .information > .information-change > .format-change-button {
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        background: transparent;
+        border: 0px;
+        cursor: pointer;
+        outline: none; }
+    .codemirror-colorpicker .colorpicker-body .information > .title {
+      color: #a3a3a3; }
+    .codemirror-colorpicker .colorpicker-body .information > .input {
+      color: #333; }
+  .codemirror-colorpicker .colorpicker-body .colorsets {
+    border-top: 1px solid #e2e2e2; }
+    .codemirror-colorpicker .colorpicker-body .colorsets > .menu {
+      float: right;
+      padding: 10px 5px;
+      padding-right: 15px; }
+      .codemirror-colorpicker .colorpicker-body .colorsets > .menu button {
+        border: 0px;
+        font-size: 14px;
+        font-weight: 300;
+        font-family: serif, sans-serif;
+        outline: none;
+        cursor: pointer; }
+    .codemirror-colorpicker .colorpicker-body .colorsets > .color-list {
+      margin-right: 30px;
+      display: block;
+      padding: 12px 0px 0px 12px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      line-height: 0; }
+      .codemirror-colorpicker .colorpicker-body .colorsets > .color-list .color-item {
+        width: 13px;
+        height: 13px;
+        border-radius: 2px;
+        display: inline-block;
+        margin-right: 12px;
+        margin-bottom: 12px;
+        position: relative;
+        background-size: contain;
+        overflow: hidden;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        cursor: pointer;
+        vertical-align: middle; }
+        .codemirror-colorpicker .colorpicker-body .colorsets > .color-list .color-item:hover {
+          -webkit-transform: scale(1.2);
+                  transform: scale(1.2); }
+        .codemirror-colorpicker .colorpicker-body .colorsets > .color-list .color-item .empty {
+          position: absolute;
+          left: 0px;
+          top: 0px;
+          background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat;
+          width: 100%;
+          height: 100%;
+          padding: 0px;
+          margin: 0px;
+          pointer-events: none; }
+        .codemirror-colorpicker .colorpicker-body .colorsets > .color-list .color-item .color-view {
+          position: absolute;
+          left: 0px;
+          top: 0px;
+          width: 100%;
+          height: 100%;
+          padding: 0px;
+          margin: 0px;
+          pointer-events: none;
+          border: 1px solid rgba(0, 0, 0, 0.1);
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box; }
+      .codemirror-colorpicker .colorpicker-body .colorsets > .color-list .add-color-item {
+        width: 13px;
+        height: 13px;
+        display: inline-block;
+        margin-right: 12px;
+        margin-bottom: 12px;
+        cursor: pointer;
+        line-height: 1;
+        text-align: center;
+        font-size: 16px;
+        font-weight: 400;
+        font-family: serif,sans-serif;
+        color: #8e8e8e;
+        vertical-align: middle; }
+  .codemirror-colorpicker .colorpicker-body .color-chooser {
+    position: absolute;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    top: 0px;
+    opacity: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    -webkit-transition: opacity 0.05s ease-out;
+    transition: opacity 0.05s ease-out;
+    pointer-events: none; }
+    .codemirror-colorpicker .colorpicker-body .color-chooser.open {
+      opacity: 1;
+      pointer-events: all; }
+    .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container {
+      position: absolute;
+      top: 120px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      background-color: white; }
+      .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-item-header {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        height: 34px;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        padding: 3px 0px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
+        .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-item-header .title {
+          -webkit-box-flex: 2;
+              -ms-flex: 2;
+                  flex: 2;
+          font-weight: bold;
+          font-size: 15px;
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box;
+          margin-right: 30px;
+          vertical-align: middle;
+          margin: 0px;
+          padding: 5px;
+          padding-left: 14px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          color: #000;
+          text-align: left; }
+        .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-item-header .items {
+          -webkit-box-flex: 1;
+              -ms-flex: 1;
+                  flex: 1;
+          text-align: right;
+          padding-right: 10px;
+          display: block;
+          height: 100%;
+          line-height: 2;
+          cursor: pointer; }
+      .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list {
+        position: absolute;
+        top: 34px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        overflow: auto; }
+        .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item {
+          cursor: pointer;
+          display: -webkit-box;
+          display: -ms-flexbox;
+          display: flex;
+          padding: 3px 0px;
+          border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
+          .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item:hover {
+            background-color: rgba(0, 0, 0, 0.05); }
+          .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item .title {
+            -webkit-box-flex: 2;
+                -ms-flex: 2;
+                    flex: 2;
+            font-size: 14px;
+            -webkit-box-sizing: border-box;
+                    box-sizing: border-box;
+            margin-right: 30px;
+            vertical-align: middle;
+            pointer-events: none;
+            margin: 0px;
+            padding: 5px;
+            padding-left: 14px;
+            font-weight: normal;
+            font-size: 13px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            color: #000;
+            text-align: left; }
+          .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item .items {
+            -webkit-box-flex: 3;
+                -ms-flex: 3;
+                    flex: 3;
+            display: block;
+            height: 100%;
+            line-height: 1.6;
+            cursor: pointer;
+            pointer-events: none; }
+            .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item .items .color-item {
+              width: 13px;
+              height: 13px;
+              border-radius: 3px;
+              display: inline-block;
+              margin-right: 10px;
+              background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat;
+              background-size: contain;
+              border: 1px solid #dddddd;
+              overflow: hidden;
+              -webkit-box-sizing: border-box;
+                      box-sizing: border-box;
+              cursor: pointer;
+              vertical-align: middle; }
+              .codemirror-colorpicker .colorpicker-body .color-chooser .color-chooser-container .colorsets-list .colorsets-item .items .color-item .color-view {
+                width: 100%;
+                height: 100%;
+                padding: 0px;
+                margin: 0px;
+                pointer-events: none; }
+  .codemirror-colorpicker.sketch {
+    border-radius: 5px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .color {
+      margin: 10px 10px 2px 10px;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      height: 150px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .control {
+      padding: 0px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control.has-eyedropper {
+        padding-left: 30px; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .control.has-eyedropper .el-cp-color-control__left {
+          top: 4px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control > .color, .codemirror-colorpicker.sketch > .colorpicker-body > .control > .empty {
+        position: absolute;
+        right: 10px;
+        left: auto;
+        top: 1px;
+        width: 26px;
+        height: 26px;
+        border-radius: 2px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control > .color {
+        -webkit-box-shadow: inset 0px 0px 1px 0px rgba(0, 0, 0, 0.5);
+                box-shadow: inset 0px 0px 1px 0px rgba(0, 0, 0, 0.5); }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control > .hue {
+        position: relative;
+        padding: 2px 2px 2px 10px;
+        margin: 0px 38px 0px 0px; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .control > .hue > .hue-container {
+          border-radius: 0px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control > .opacity {
+        position: relative;
+        padding: 2px 2px 2px 10px;
+        margin: 0px 38px 0px 0px; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .control > .opacity > .opacity-container {
+          border-radius: 0px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar, .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar2 {
+        border-radius: 0px;
+        top: 50%;
+        left: 0px;
+        width: 2px;
+        height: 50%;
+        -webkit-transform: translateX(-50%) translateY(-50%);
+                transform: translateX(-50%) translateY(-50%);
+        border-radius: 1px;
+        bottom: 1px !important; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar.first, .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar2.first {
+          left: 0px;
+          -webkit-transform: translateX(50%) translateY(-50%) !important;
+                  transform: translateX(50%) translateY(-50%) !important; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar.last, .codemirror-colorpicker.sketch > .colorpicker-body > .control .drag-bar2.last {
+          -webkit-transform: translateX(-150%) translateY(-50%) !important;
+                  transform: translateX(-150%) translateY(-50%) !important; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-change {
+      display: none; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.rgb .information-item.rgb {
+      display: inherit; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.rgb .information-item.hsl {
+      display: none !important; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.hex .information-item.hex {
+      display: inherit; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.hex .information-item.hsl {
+      display: none !important; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.hsl .information-item.rgb {
+      display: none !important; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information.hsl .information-item.hsl {
+      display: inherit; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item {
+      display: -webkit-inline-box !important;
+      display: -ms-inline-flexbox !important;
+      display: inline-flex !important;
+      margin-right: 0px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item > .input-field {
+        padding-left: 0px; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item > .input-field:last-child {
+          padding-right: 0px; }
+        .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item > .input-field > .title {
+          color: black;
+          font-size: 11px;
+          cursor: pointer; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item > .input-field:last-child:not(:first-child) {
+        padding-right: 0px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item.hex {
+      width: 74px;
+      padding-right: 0px;
+      padding-left: 5px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item.rgb {
+      width: 140px;
+      padding-left: 0px;
+      padding-right: 0px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .information .information-item.hsl {
+      display: none;
+      width: 140px;
+      padding-left: 0px;
+      padding-right: 0px; }
+    .codemirror-colorpicker.sketch > .colorpicker-body > .colorsets > .color-list {
+      margin-right: 0px;
+      padding-right: 12px; }
+      .codemirror-colorpicker.sketch > .colorpicker-body > .colorsets > .color-list .color-item {
+        width: 16px;
+        height: 16px;
+        border-radius: 3px;
+        margin-right: 9px;
+        margin-bottom: 10px; }
+  .codemirror-colorpicker.palette {
+    border-radius: 3px;
+    -webkit-box-shadow: none;
+            box-shadow: none; }
+    .codemirror-colorpicker.palette > .colorpicker-body > .color {
+      display: none; }
+    .codemirror-colorpicker.palette > .colorpicker-body > .control {
+      display: none; }
+    .codemirror-colorpicker.palette > .colorpicker-body > .information {
+      display: none; }
+    .codemirror-colorpicker.palette > .colorpicker-body > .colorsets {
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      border-top: 0px; }
+      .codemirror-colorpicker.palette > .colorpicker-body > .colorsets > .color-list .color-item {
+        width: 15px;
+        height: 15px;
+        margin-right: 10px;
+        margin-bottom: 10px; }
+    .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser {
+      display: none;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box; }
+      .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser.open {
+        display: block;
+        top: -1px;
+        left: -1px;
+        right: -1px;
+        bottom: auto;
+        border-radius: 3px;
+        border: 1px solid #d8d8d8;
+        -webkit-box-shadow: 0 0px 10px 2px rgba(0, 0, 0, 0.12);
+                box-shadow: 0 0px 10px 2px rgba(0, 0, 0, 0.12); }
+        .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser.open .color-chooser-container {
+          position: relative;
+          top: auto;
+          left: auto;
+          right: auto;
+          bottom: auto;
+          background-color: white;
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box;
+          border-radius: 2px; }
+          .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser.open .color-chooser-container .colorsets-item-header {
+            position: relative;
+            left: auto;
+            top: auto;
+            right: auto;
+            bottom: auto;
+            border-top-left-radius: 3px;
+            border-top-right-radius: 3px; }
+          .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser.open .color-chooser-container .colorsets-list {
+            position: relative;
+            top: auto;
+            left: auto;
+            right: auto;
+            bottom: auto;
+            overflow: auto; }
+            .codemirror-colorpicker.palette > .colorpicker-body > .color-chooser.open .color-chooser-container .colorsets-list .colorsets-item:last-child {
+              border-bottom-left-radius: 3px;
+              border-bottom-right-radius: 3px; }
+  .codemirror-colorpicker.macos .colorpicker-body .wheel {
+    width: 224px;
+    height: 224px;
+    position: relative;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box; }
+    .codemirror-colorpicker.macos .colorpicker-body .wheel .wheel-canvas {
+      width: 214px;
+      height: 214px;
+      border-radius: 50%;
+      position: absolute;
+      left: 5px;
+      top: 5px; }
+    .codemirror-colorpicker.macos .colorpicker-body .wheel .drag-pointer {
+      display: inline-block;
+      position: absolute;
+      width: 10px;
+      height: 10px;
+      left: 50%;
+      top: 50%;
+      border: 1px solid white;
+      border-radius: 50%;
+      -webkit-transform: translateX(-50%) translateY(-50%);
+              transform: translateX(-50%) translateY(-50%);
+      z-index: 2; }
+  .codemirror-colorpicker.macos .control {
+    padding-top: 0px; }
+    .codemirror-colorpicker.macos .control > .color, .codemirror-colorpicker.macos .control > .empty {
+      top: 4px; }
+    .codemirror-colorpicker.macos .control.has-eyedropper {
+      padding-left: 30px; }
+      .codemirror-colorpicker.macos .control.has-eyedropper .el-cp-color-control__left {
+        top: 9px; }
+  .codemirror-colorpicker.macos .value {
+    position: relative;
+    padding: 6px 16px;
+    margin: 0px 0px 0px 42px;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+    cursor: pointer; }
+    .codemirror-colorpicker.macos .value > .value-container {
+      position: relative;
+      width: 100%;
+      height: 10px;
+      border-radius: 3px;
+      background-image: -webkit-gradient(linear, left top, right top, from(#000000), to(rgba(255, 255, 255, 0)));
+      background-image: linear-gradient(to right, #000000 0%, rgba(255, 255, 255, 0) 100%);
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box; }
+      .codemirror-colorpicker.macos .value > .value-container .drag-bar {
+        position: absolute;
+        cursor: pointer;
+        top: 50%;
+        left: 0px;
+        -webkit-transform: translateX(-50%) translateY(-50%);
+                transform: translateX(-50%) translateY(-50%);
+        width: 12px;
+        height: 12px;
+        border-radius: 50%; }
+  .codemirror-colorpicker.mini {
+    width: 180px;
+    display: inline-block; }
+    .codemirror-colorpicker.mini .control {
+      padding: 0px; }
+      .codemirror-colorpicker.mini .control .hue, .codemirror-colorpicker.mini .control .opacity {
+        margin: 0px;
+        padding: 0px; }
+      .codemirror-colorpicker.mini .control .hue > .hue-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 20px; }
+      .codemirror-colorpicker.mini .control .opacity > .opacity-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 20px; }
+      .codemirror-colorpicker.mini .control .drag-bar, .codemirror-colorpicker.mini .control .drag-bar2 {
+        border: 0px;
+        background-color: transparent;
+        height: 100%;
+        width: 5px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        -webkit-box-shadow: none;
+                box-shadow: none; }
+        .codemirror-colorpicker.mini .control .drag-bar.last:before, .codemirror-colorpicker.mini .control .drag-bar.lastafter, .codemirror-colorpicker.mini .control .drag-bar2.last:before, .codemirror-colorpicker.mini .control .drag-bar2.lastafter {
+          left: 1px; }
+        .codemirror-colorpicker.mini .control .drag-bar.first:before, .codemirror-colorpicker.mini .control .drag-bar.first:after, .codemirror-colorpicker.mini .control .drag-bar2.first:before, .codemirror-colorpicker.mini .control .drag-bar2.first:after {
+          left: 3px; }
+        .codemirror-colorpicker.mini .control .drag-bar:before, .codemirror-colorpicker.mini .control .drag-bar2:before {
+          content: "";
+          position: absolute;
+          left: 2px;
+          top: 0px;
+          width: 0;
+          height: 0;
+          -webkit-transform: translateX(-50%);
+                  transform: translateX(-50%);
+          border-left: 4px solid transparent;
+          border-right: 4px solid transparent;
+          border-top: 4px solid black; }
+        .codemirror-colorpicker.mini .control .drag-bar:after, .codemirror-colorpicker.mini .control .drag-bar2:after {
+          content: "";
+          position: absolute;
+          left: 2px;
+          bottom: 0px;
+          width: 0;
+          height: 0;
+          -webkit-transform: translateX(-50%);
+                  transform: translateX(-50%);
+          border-left: 4px solid transparent;
+          border-right: 4px solid transparent;
+          border-bottom: 4px solid black; }
+  .codemirror-colorpicker.mini-vertical {
+    width: 180px;
+    display: inline-block; }
+    .codemirror-colorpicker.mini-vertical .color {
+      display: inline-block;
+      width: 140px;
+      height: 160px;
+      vertical-align: middle; }
+    .codemirror-colorpicker.mini-vertical .control {
+      height: 160px;
+      padding: 0px;
+      vertical-align: middle;
+      display: inline-block; }
+      .codemirror-colorpicker.mini-vertical .control .hue, .codemirror-colorpicker.mini-vertical .control .opacity {
+        margin: 0px;
+        padding: 0px;
+        width: 20px;
+        display: inline-block;
+        vertical-align: middle;
+        height: 100%;
+        position: relative; }
+      .codemirror-colorpicker.mini-vertical .control .hue > .hue-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 100%;
+        background: -webkit-gradient(linear, left bottom, left top, from(#ff0000), color-stop(17%, #ffff00), color-stop(33%, #00ff00), color-stop(50%, #00ffff), color-stop(67%, #0000ff), color-stop(83%, #ff00ff), to(#ff0000));
+        background: linear-gradient(to top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); }
+      .codemirror-colorpicker.mini-vertical .control .opacity > .opacity-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 100%;
+        width: 20px; }
+      .codemirror-colorpicker.mini-vertical .control .drag-bar, .codemirror-colorpicker.mini-vertical .control .drag-bar2 {
+        border: 0px;
+        background-color: transparent;
+        height: 2px;
+        width: 100%;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        -webkit-box-shadow: none;
+                box-shadow: none;
+        -webkit-transform: none;
+                transform: none; }
+        .codemirror-colorpicker.mini-vertical .control .drag-bar.last:before, .codemirror-colorpicker.mini-vertical .control .drag-bar.last:after, .codemirror-colorpicker.mini-vertical .control .drag-bar2.last:before, .codemirror-colorpicker.mini-vertical .control .drag-bar2.last:after {
+          top: 2px; }
+        .codemirror-colorpicker.mini-vertical .control .drag-bar.first:before, .codemirror-colorpicker.mini-vertical .control .drag-bar.first:after, .codemirror-colorpicker.mini-vertical .control .drag-bar2.first:before, .codemirror-colorpicker.mini-vertical .control .drag-bar2.first:after {
+          top: -1px; }
+        .codemirror-colorpicker.mini-vertical .control .drag-bar:before, .codemirror-colorpicker.mini-vertical .control .drag-bar2:before {
+          content: "";
+          position: absolute;
+          left: 0px;
+          top: 2px;
+          width: 0;
+          height: 0;
+          -webkit-transform: translateY(-50%);
+                  transform: translateY(-50%);
+          border-top: 4px solid transparent;
+          border-bottom: 4px solid transparent;
+          border-left: 4px solid black; }
+        .codemirror-colorpicker.mini-vertical .control .drag-bar:after, .codemirror-colorpicker.mini-vertical .control .drag-bar2:after {
+          content: "";
+          position: absolute;
+          top: 2px;
+          right: 0px;
+          width: 0;
+          height: 0;
+          -webkit-transform: translateY(-50%);
+                  transform: translateY(-50%);
+          border-top: 4px solid transparent;
+          border-bottom: 4px solid transparent;
+          border-right: 4px solid black; }
+  .codemirror-colorpicker.ring .colorpicker-body > .color {
+    position: absolute;
+    width: 120px;
+    height: 120px;
+    left: 52px;
+    top: 52px; }
+  .codemirror-colorpicker.ring .colorpicker-body .wheel {
+    width: 224px;
+    height: 224px;
+    position: relative;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box; }
+    .codemirror-colorpicker.ring .colorpicker-body .wheel .wheel-canvas {
+      width: 214px;
+      height: 214px;
+      border-radius: 50%;
+      position: absolute;
+      left: 5px;
+      top: 5px; }
+    .codemirror-colorpicker.ring .colorpicker-body .wheel .drag-pointer {
+      display: inline-block;
+      position: absolute;
+      width: 10px;
+      height: 10px;
+      left: 50%;
+      top: 50%;
+      border: 1px solid white;
+      border-radius: 50%;
+      -webkit-transform: translateX(-50%) translateY(-50%);
+              transform: translateX(-50%) translateY(-50%);
+      z-index: 2; }
+  .codemirror-colorpicker.ring .control {
+    padding-top: 0px; }
+    .codemirror-colorpicker.ring .control .value {
+      display: none; }
+    .codemirror-colorpicker.ring .control > .color, .codemirror-colorpicker.ring .control > .empty {
+      top: -17px;
+      width: 30px;
+      height: 30px;
+      border-radius: 2px; }
+    .codemirror-colorpicker.ring .control.has-eyedropper {
+      padding-left: 30px;
+      padding-top: 10px; }
+      .codemirror-colorpicker.ring .control.has-eyedropper > .color, .codemirror-colorpicker.ring .control.has-eyedropper > .empty {
+        top: -2px; }
+      .codemirror-colorpicker.ring .control.has-eyedropper .el-cp-color-control__left {
+        top: 4px; }
+  .codemirror-colorpicker.xd {
+    display: inline-block;
+    padding-top: 12px;
+    width: 245px; }
+    .codemirror-colorpicker.xd .color {
+      display: inline-block;
+      margin-left: 12px;
+      margin-bottom: 12px;
+      width: 170px;
+      height: 170px;
+      vertical-align: middle;
+      border-radius: 3px;
+      overflow: hidden;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      border: 1px solid #cecece; }
+      .codemirror-colorpicker.xd .color > .saturation > .value > .drag-pointer {
+        border: 2px solid white;
+        width: 7px;
+        height: 7px;
+        -webkit-box-shadow: 0 0 1px 0px black, inset 0 0 1px 0px black;
+                box-shadow: 0 0 1px 0px black, inset 0 0 1px 0px black; }
+    .codemirror-colorpicker.xd .control {
+      height: 170px;
+      padding: 0px;
+      vertical-align: middle;
+      display: inline-block;
+      margin-right: 12px;
+      margin-bottom: 12px; }
+      .codemirror-colorpicker.xd .control .hue, .codemirror-colorpicker.xd .control .opacity {
+        margin: 0px;
+        padding: 0px;
+        width: 13px;
+        display: inline-block;
+        vertical-align: middle;
+        height: 100%;
+        position: relative;
+        overflow: hidden;
+        border-radius: 3px;
+        margin-left: 8px; }
+      .codemirror-colorpicker.xd .control .hue > .hue-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 100%;
+        background: -webkit-gradient(linear, left bottom, left top, from(#ff0000), color-stop(17%, #ffff00), color-stop(33%, #00ff00), color-stop(50%, #00ffff), color-stop(67%, #0000ff), color-stop(83%, #ff00ff), to(#ff0000));
+        background: linear-gradient(to top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); }
+      .codemirror-colorpicker.xd .control .opacity > .opacity-container {
+        border-radius: 0px;
+        overflow: hidden;
+        height: 100%; }
+      .codemirror-colorpicker.xd .control .drag-bar, .codemirror-colorpicker.xd .control .drag-bar2 {
+        border: 0px;
+        background-color: transparent;
+        border: 2px solid white;
+        -webkit-box-shadow: 0 0 1px 0px black, inset 0 0 1px 0px black;
+                box-shadow: 0 0 1px 0px black, inset 0 0 1px 0px black;
+        width: 10px;
+        height: 10px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        -webkit-transform: none;
+                transform: none;
+        overflow: hidden;
+        left: 50%;
+        -webkit-transform: translateX(-50%) translateY(-50%);
+                transform: translateX(-50%) translateY(-50%); }
+    .codemirror-colorpicker.xd .information {
+      margin-top: 5px; }
+  .codemirror-colorpicker.vscode {
+    width: 336px;
+    display: inline-block;
+    background-color: #333;
+    border: 1px solid #ececec;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+    border-radius: 0px; }
+    .codemirror-colorpicker.vscode .colorpicker-body {
+      border-radius: 0px;
+      display: inline-block; }
+      .codemirror-colorpicker.vscode .colorpicker-body .color-view {
+        height: 34px; }
+        .codemirror-colorpicker.vscode .colorpicker-body .color-view.has-eyedropper {
+          display: -webkit-box;
+          display: -ms-flexbox;
+          display: flex; }
+          .codemirror-colorpicker.vscode .colorpicker-body .color-view.has-eyedropper .color-view-container {
+            width: 254px;
+            display: inline-block; }
+          .codemirror-colorpicker.vscode .colorpicker-body .color-view.has-eyedropper .el-cp-color-control__left {
+            float: right;
+            width: 80px;
+            text-align: center;
+            padding: 6px 0px; }
+            .codemirror-colorpicker.vscode .colorpicker-body .color-view.has-eyedropper .el-cp-color-control__left button {
+              display: inline-block; }
+              .codemirror-colorpicker.vscode .colorpicker-body .color-view.has-eyedropper .el-cp-color-control__left button svg path {
+                fill: white; }
+        .codemirror-colorpicker.vscode .colorpicker-body .color-view .color-view-container {
+          line-height: 34px;
+          font-size: 14px;
+          text-align: center;
+          width: 100%;
+          height: 100%;
+          cursor: pointer;
+          -webkit-user-select: none;
+             -moz-user-select: none;
+              -ms-user-select: none;
+                  user-select: none;
+          text-shadow: 0 0 3px #535353;
+          background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAJElEQVQYV2NctWrVfwYkEBYWxojMZ6SDAmT7QGx0K1EcRBsFAADeG/3M/HteAAAAAElFTkSuQmCC") repeat; }
+          .codemirror-colorpicker.vscode .colorpicker-body .color-view .color-view-container .preview {
+            display: block;
+            height: 100%; }
+      .codemirror-colorpicker.vscode .colorpicker-body .color-tool {
+        padding: 8px; }
+    .codemirror-colorpicker.vscode .color {
+      display: inline-block;
+      width: 240px;
+      height: 160px;
+      vertical-align: middle; }
+    .codemirror-colorpicker.vscode .control {
+      height: 160px;
+      vertical-align: middle;
+      display: inline-block;
+      padding: 0px 0px 0px 4px; }
+      .codemirror-colorpicker.vscode .control .hue, .codemirror-colorpicker.vscode .control .opacity {
+        margin: 0px;
+        padding: 0px;
+        width: 30px;
+        display: inline-block;
+        vertical-align: middle;
+        height: 100%;
+        position: relative; }
+      .codemirror-colorpicker.vscode .control .hue {
+        padding-left: 5px;
+        width: 35px; }
+      .codemirror-colorpicker.vscode .control .hue > .hue-container {
+        border-radius: 0px;
+        height: 100%;
+        background: -webkit-gradient(linear, left bottom, left top, from(#ff0000), color-stop(17%, #ffff00), color-stop(33%, #00ff00), color-stop(50%, #00ffff), color-stop(67%, #0000ff), color-stop(83%, #ff00ff), to(#ff0000));
+        background: linear-gradient(to top, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%); }
+      .codemirror-colorpicker.vscode .control .opacity > .opacity-container {
+        border-radius: 0px;
+        height: 100%;
+        width: 30px; }
+      .codemirror-colorpicker.vscode .control .drag-bar, .codemirror-colorpicker.vscode .control .drag-bar2 {
+        background-color: transparent;
+        height: 5px;
+        width: 33px;
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+        -webkit-box-shadow: none;
+                box-shadow: none;
+        -webkit-transform: translateY(-50%) translateX(-2px);
+                transform: translateY(-50%) translateX(-2px);
+        border: 1px solid white;
+        border-radius: 0px;
+        -webkit-box-shadow: 0 0 2px 0 black, inset 0 0 0 0 black;
+                box-shadow: 0 0 2px 0 black, inset 0 0 0 0 black; }
+  .codemirror-colorpicker.box {
+    width: 420px;
+    border-radius: 10px; }
+    .codemirror-colorpicker.box .colorpicker-body {
+      display: grid;
+      padding: 10px 20px 10px 10px;
+      grid-template-columns: 200px 1fr;
+      -webkit-column-gap: 10px;
+         -moz-column-gap: 10px;
+              column-gap: 10px;
+      grid-template-rows: auto; }
+      .codemirror-colorpicker.box .colorpicker-body > .color {
+        height: 100%;
+        border-radius: 8px;
+        overflow: hidden; }
+    .codemirror-colorpicker.box .control {
+      padding: 0px !important; }
+      .codemirror-colorpicker.box .control > * {
+        vertical-align: middle; }
+      .codemirror-colorpicker.box .control .color-info {
+        position: relative;
+        height: 30px;
+        width: 30px;
+        display: inline-block; }
+        .codemirror-colorpicker.box .control .color-info > .color, .codemirror-colorpicker.box .control .color-info > .empty {
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          border-radius: 50%;
+          -webkit-box-sizing: border-box;
+                  box-sizing: border-box; }
+        .codemirror-colorpicker.box .control .color-info > .color {
+          border: 1px solid rgba(0, 0, 0, 0.1); }
+      .codemirror-colorpicker.box .control > .color, .codemirror-colorpicker.box .control > .empty {
+        top: 4px; }
+      .codemirror-colorpicker.box .control.has-eyedropper {
+        padding-left: 30px; }
+        .codemirror-colorpicker.box .control.has-eyedropper .el-cp-color-control__left {
+          display: inline-block;
+          width: 30px;
+          height: 30px;
+          position: relative;
+          top: auto;
+          left: auto; }
+      .codemirror-colorpicker.box .control .hue, .codemirror-colorpicker.box .control .opacity {
+        padding-left: 0px !important;
+        margin-left: 0px !important;
+        padding-right: 0px !important; }
+    .codemirror-colorpicker.box .value {
+      position: relative;
+      -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+      cursor: pointer; }
+      .codemirror-colorpicker.box .value > .value-container {
+        position: relative;
+        width: 100%;
+        height: 10px;
+        border-radius: 3px;
+        background-image: -webkit-gradient(linear, left top, right top, from(#000000), to(rgba(255, 255, 255, 0)));
+        background-image: linear-gradient(to right, #000000 0%, rgba(255, 255, 255, 0) 100%);
+        -webkit-box-sizing: border-box;
+                box-sizing: border-box; }
+        .codemirror-colorpicker.box .value > .value-container .drag-bar {
+          position: absolute;
+          cursor: pointer;
+          top: 50%;
+          left: 0px;
+          -webkit-transform: translateX(-50%) translateY(-50%);
+                  transform: translateX(-50%) translateY(-50%);
+          width: 12px;
+          height: 12px;
+          border-radius: 50%; }
+    .codemirror-colorpicker.box .information {
+      margin-top: 6px; }
+      .codemirror-colorpicker.box .information .information-change {
+        display: none; }
+      .codemirror-colorpicker.box .information > .information-item {
+        margin: 0px !important;
+        padding: 0px !important; }
+    .codemirror-colorpicker.box .colorsets {
+      border: 0px;
+      position: relative; }
+      .codemirror-colorpicker.box .colorsets .color-list {
+        padding: 0px !important;
+        margin-right: 0px !important; }
+        .codemirror-colorpicker.box .colorsets .color-list .current-color-sets .color-item {
+          width: 20px;
+          height: 20px;
+          margin-right: 4px !important;
+          margin-bottom: 4px !important; }
+      .codemirror-colorpicker.box .colorsets .menu {
+        float: none;
+        position: absolute;
+        right: -20px;
+        top: -15px; }
+    .codemirror-colorpicker.box .color-chooser .color-chooser-container {
+      top: 0px;
+      left: 200px; }
+
+.colorsets-contextmenu {
+  position: fixed;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-radius: 6px;
+  background-color: #ececec;
+  border: 1px solid #cccccc;
+  display: none;
+  list-style: none;
+  font-size: 13px;
+  padding-left: 0px;
+  padding-right: 0px; }
+  .colorsets-contextmenu.show {
+    display: inline-block; }
+  .colorsets-contextmenu .menu-item {
+    padding: 2px 20px;
+    cursor: default; }
+    .colorsets-contextmenu .menu-item:hover {
+      background-color: #5ea3fb;
+      color: white; }
+  .colorsets-contextmenu.small .menu-item.small-hide {
+    display: none; }
+
+.el-cp-color-eyedropper button {
+  display: block;
+  width: 30px;
+  height: 30px;
+  padding: 0;
+  margin: -4px;
+  font-size: 0;
+  border: none;
+  border-radius: var(--size-radius);
+  cursor: pointer;
+  outline: none;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  background: none;
+  -webkit-transition: opacity var(--speed-focus) ease-out, -webkit-box-shadow var(--speed-focus) ease-out;
+  transition: opacity var(--speed-focus) ease-out, -webkit-box-shadow var(--speed-focus) ease-out;
+  transition: box-shadow var(--speed-focus) ease-out, opacity var(--speed-focus) ease-out;
+  transition: box-shadow var(--speed-focus) ease-out, opacity var(--speed-focus) ease-out, -webkit-box-shadow var(--speed-focus) ease-out; }
+  .el-cp-color-eyedropper button:focus-visible {
+    -webkit-box-shadow: 0 0 0 2px var(--color-key);
+            box-shadow: 0 0 0 2px var(--color-key); }
+  .el-cp-color-eyedropper button:active {
+    opacity: .5; }
+
+.el-cp-color-eyedropper svg {
+  display: block;
+  margin: 0 auto;
+  color: var(--color-fill); }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.js b/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.js
new file mode 100644
index 0000000000000..1065430aaf65b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-colorpicker.js
@@ -0,0 +1,10122 @@
+/* codemirror-colorpicker version 1.9.80 */
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global['codemirror-colorpicker'] = factory());
+}(this || self, (function () { 'use strict';
+
+/**
+ * @method format
+ *
+ * convert color to format string
+ *
+ *     // hex
+ *     color.format({ r : 255, g : 255, b : 255, a: 1 }, 'hex')  // #FFFFFFFF
+ *
+ *     // rgb
+ *     color.format({ r : 255, g : 255, b : 255 }, 'rgb') // rgba(255, 255, 255, 0.5);
+ *
+ *     // rgba
+ *     color.format({ r : 255, g : 255, b : 255, a : 0.5 }, 'rgb') // rgba(255, 255, 255, 0.5);
+ *
+ * @param {Object} obj  obj has r, g, b and a attributes
+ * @param {"hex"/"rgb"} type  format string type
+ * @returns {*}
+ */
+function format(obj, type) {
+    var defaultColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rgba(0, 0, 0, 0)';
+
+
+    if (Array.isArray(obj)) {
+        obj = { r: obj[0], g: obj[1], b: obj[2], a: obj[3] };
+    }
+
+    if (type == 'hex') {
+        return hex(obj);
+    } else if (type == 'rgb') {
+        return rgb(obj, defaultColor);
+    } else if (type == 'hsl') {
+        return hsl(obj);
+    }
+
+    return obj;
+}
+
+function hex(obj) {
+    if (Array.isArray(obj)) {
+        obj = { r: obj[0], g: obj[1], b: obj[2], a: obj[3] };
+    }
+
+    var r = obj.r.toString(16);
+    if (obj.r < 16) r = "0" + r;
+
+    var g = obj.g.toString(16);
+    if (obj.g < 16) g = "0" + g;
+
+    var b = obj.b.toString(16);
+    if (obj.b < 16) b = "0" + b;
+
+    var alphaValue = '';
+    if (obj.a < 1) {
+        var alpha = Math.floor(obj.a * 255);
+        var alphaValue = alpha.toString(16);
+        if (alpha < 16) alphaValue = "0" + alphaValue;
+    }
+
+    return '#' + r + g + b + alphaValue;
+}
+
+function rgb(obj) {
+    var defaultColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'rgba(0, 0, 0, 0)';
+
+    if (Array.isArray(obj)) {
+        obj = { r: obj[0], g: obj[1], b: obj[2], a: obj[3] };
+    }
+
+    if (typeof obj == 'undefined') {
+        return undefined;
+    }
+
+    if (obj.a == 1 || typeof obj.a == 'undefined') {
+        if (isNaN(obj.r)) {
+            return defaultColor;
+        }
+        return 'rgb(' + obj.r + ',' + obj.g + ',' + obj.b + ')';
+    } else {
+        return 'rgba(' + obj.r + ',' + obj.g + ',' + obj.b + ',' + obj.a + ')';
+    }
+}
+
+function hsl(obj) {
+    if (Array.isArray(obj)) {
+        obj = { r: obj[0], g: obj[1], b: obj[2], a: obj[3] };
+    }
+
+    if (obj.a == 1 || typeof obj.a == 'undefined') {
+        return 'hsl(' + obj.h + ',' + obj.s + '%,' + obj.l + '%)';
+    } else {
+        return 'hsla(' + obj.h + ',' + obj.s + '%,' + obj.l + '%,' + obj.a + ')';
+    }
+}
+
+var formatter = {
+    format: format,
+    rgb: rgb,
+    hsl: hsl,
+    hex: hex
+};
+
+function round(n, k) {
+    k = typeof k == 'undefined' ? 1 : k;
+    return Math.round(n * k) / k;
+}
+
+function degreeToRadian(angle) {
+    return angle * Math.PI / 180;
+}
+
+/**
+ * 
+ * convert radian to degree 
+ * 
+ * @param {*} radian 
+ * @returns {Number} 0..360
+ */
+function radianToDegree(radian) {
+    var angle = radian * 180 / Math.PI;
+
+    if (angle < 0) {
+        // ๊ฐ๋„๊ฐ€ 0๋ณด๋‹ค ์ž‘์œผ๋ฉด 360 ์—์„œ ๋ฐ˜์ „์‹œํ‚จ๋‹ค. 
+        angle = 360 + angle;
+    }
+
+    return angle;
+}
+
+function getXInCircle(angle, radius) {
+    var centerX = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+
+    return centerX + radius * Math.cos(degreeToRadian(angle));
+}
+
+function getYInCircle(angle, radius) {
+    var centerY = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+
+    return centerY + radius * Math.sin(degreeToRadian(angle));
+}
+
+function getXYInCircle(angle, radius) {
+    var centerX = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var centerY = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+
+    return {
+        x: getXInCircle(angle, radius, centerX),
+        y: getYInCircle(angle, radius, centerY)
+    };
+}
+
+function caculateAngle(rx, ry) {
+    return radianToDegree(Math.atan2(ry, rx));
+}
+
+var math = {
+    round: round,
+    radianToDegree: radianToDegree,
+    degreeToRadian: degreeToRadian,
+    getXInCircle: getXInCircle,
+    getYInCircle: getYInCircle,
+    caculateAngle: caculateAngle
+};
+
+var color_names = { aliceblue: "rgb(240, 248, 255)", antiquewhite: "rgb(250, 235, 215)", aqua: "rgb(0, 255, 255)", aquamarine: "rgb(127, 255, 212)", azure: "rgb(240, 255, 255)", beige: "rgb(245, 245, 220)", bisque: "rgb(255, 228, 196)", black: "rgb(0, 0, 0)", blanchedalmond: "rgb(255, 235, 205)", blue: "rgb(0, 0, 255)", blueviolet: "rgb(138, 43, 226)", brown: "rgb(165, 42, 42)", burlywood: "rgb(222, 184, 135)", cadetblue: "rgb(95, 158, 160)", chartreuse: "rgb(127, 255, 0)", chocolate: "rgb(210, 105, 30)", coral: "rgb(255, 127, 80)", cornflowerblue: "rgb(100, 149, 237)", cornsilk: "rgb(255, 248, 220)", crimson: "rgb(237, 20, 61)", cyan: "rgb(0, 255, 255)", darkblue: "rgb(0, 0, 139)", darkcyan: "rgb(0, 139, 139)", darkgoldenrod: "rgb(184, 134, 11)", darkgray: "rgb(169, 169, 169)", darkgrey: "rgb(169, 169, 169)", darkgreen: "rgb(0, 100, 0)", darkkhaki: "rgb(189, 183, 107)", darkmagenta: "rgb(139, 0, 139)", darkolivegreen: "rgb(85, 107, 47)", darkorange: "rgb(255, 140, 0)", darkorchid: "rgb(153, 50, 204)", darkred: "rgb(139, 0, 0)", darksalmon: "rgb(233, 150, 122)", darkseagreen: "rgb(143, 188, 143)", darkslateblue: "rgb(72, 61, 139)", darkslategray: "rgb(47, 79, 79)", darkslategrey: "rgb(47, 79, 79)", darkturquoise: "rgb(0, 206, 209)", darkviolet: "rgb(148, 0, 211)", deeppink: "rgb(255, 20, 147)", deepskyblue: "rgb(0, 191, 255)", dimgray: "rgb(105, 105, 105)", dimgrey: "rgb(105, 105, 105)", dodgerblue: "rgb(30, 144, 255)", firebrick: "rgb(178, 34, 34)", floralwhite: "rgb(255, 250, 240)", forestgreen: "rgb(34, 139, 34)", fuchsia: "rgb(255, 0, 255)", gainsboro: "rgb(220, 220, 220)", ghostwhite: "rgb(248, 248, 255)", gold: "rgb(255, 215, 0)", goldenrod: "rgb(218, 165, 32)", gray: "rgb(128, 128, 128)", grey: "rgb(128, 128, 128)", green: "rgb(0, 128, 0)", greenyellow: "rgb(173, 255, 47)", honeydew: "rgb(240, 255, 240)", hotpink: "rgb(255, 105, 180)", indianred: "rgb(205, 92, 92)", indigo: "rgb(75, 0, 130)", ivory: "rgb(255, 255, 240)", khaki: "rgb(240, 230, 140)", lavender: "rgb(230, 230, 250)", lavenderblush: "rgb(255, 240, 245)", lawngreen: "rgb(124, 252, 0)", lemonchiffon: "rgb(255, 250, 205)", lightblue: "rgb(173, 216, 230)", lightcoral: "rgb(240, 128, 128)", lightcyan: "rgb(224, 255, 255)", lightgoldenrodyellow: "rgb(250, 250, 210)", lightgreen: "rgb(144, 238, 144)", lightgray: "rgb(211, 211, 211)", lightgrey: "rgb(211, 211, 211)", lightpink: "rgb(255, 182, 193)", lightsalmon: "rgb(255, 160, 122)", lightseagreen: "rgb(32, 178, 170)", lightskyblue: "rgb(135, 206, 250)", lightslategray: "rgb(119, 136, 153)", lightslategrey: "rgb(119, 136, 153)", lightsteelblue: "rgb(176, 196, 222)", lightyellow: "rgb(255, 255, 224)", lime: "rgb(0, 255, 0)", limegreen: "rgb(50, 205, 50)", linen: "rgb(250, 240, 230)", magenta: "rgb(255, 0, 255)", maroon: "rgb(128, 0, 0)", mediumaquamarine: "rgb(102, 205, 170)", mediumblue: "rgb(0, 0, 205)", mediumorchid: "rgb(186, 85, 211)", mediumpurple: "rgb(147, 112, 219)", mediumseagreen: "rgb(60, 179, 113)", mediumslateblue: "rgb(123, 104, 238)", mediumspringgreen: "rgb(0, 250, 154)", mediumturquoise: "rgb(72, 209, 204)", mediumvioletred: "rgb(199, 21, 133)", midnightblue: "rgb(25, 25, 112)", mintcream: "rgb(245, 255, 250)", mistyrose: "rgb(255, 228, 225)", moccasin: "rgb(255, 228, 181)", navajowhite: "rgb(255, 222, 173)", navy: "rgb(0, 0, 128)", oldlace: "rgb(253, 245, 230)", olive: "rgb(128, 128, 0)", olivedrab: "rgb(107, 142, 35)", orange: "rgb(255, 165, 0)", orangered: "rgb(255, 69, 0)", orchid: "rgb(218, 112, 214)", palegoldenrod: "rgb(238, 232, 170)", palegreen: "rgb(152, 251, 152)", paleturquoise: "rgb(175, 238, 238)", palevioletred: "rgb(219, 112, 147)", papayawhip: "rgb(255, 239, 213)", peachpuff: "rgb(255, 218, 185)", peru: "rgb(205, 133, 63)", pink: "rgb(255, 192, 203)", plum: "rgb(221, 160, 221)", powderblue: "rgb(176, 224, 230)", purple: "rgb(128, 0, 128)", rebeccapurple: "rgb(102, 51, 153)", red: "rgb(255, 0, 0)", rosybrown: "rgb(188, 143, 143)", royalblue: "rgb(65, 105, 225)", saddlebrown: "rgb(139, 69, 19)", salmon: "rgb(250, 128, 114)", sandybrown: "rgb(244, 164, 96)", seagreen: "rgb(46, 139, 87)", seashell: "rgb(255, 245, 238)", sienna: "rgb(160, 82, 45)", silver: "rgb(192, 192, 192)", skyblue: "rgb(135, 206, 235)", slateblue: "rgb(106, 90, 205)", slategray: "rgb(112, 128, 144)", slategrey: "rgb(112, 128, 144)", snow: "rgb(255, 250, 250)", springgreen: "rgb(0, 255, 127)", steelblue: "rgb(70, 130, 180)", tan: "rgb(210, 180, 140)", teal: "rgb(0, 128, 128)", thistle: "rgb(216, 191, 216)", tomato: "rgb(255, 99, 71)", turquoise: "rgb(64, 224, 208)", violet: "rgb(238, 130, 238)", wheat: "rgb(245, 222, 179)", white: "rgb(255, 255, 255)", whitesmoke: "rgb(245, 245, 245)", yellow: "rgb(255, 255, 0)", yellowgreen: "rgb(154, 205, 50)", transparent: "rgba(0, 0, 0, 0)" };
+
+function isColorName(name) {
+    return !!color_names[name];
+}
+
+function getColorByName(name) {
+    return color_names[name];
+}
+
+var ColorNames = {
+    isColorName: isColorName,
+    getColorByName: getColorByName
+};
+
+function HUEtoRGB(p, q, t) {
+    if (t < 0) t += 1;
+    if (t > 1) t -= 1;
+    if (t < 1 / 6) return p + (q - p) * 6 * t;
+    if (t < 1 / 2) return q;
+    if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+    return p;
+}
+
+function HSLtoHSV(h, s, l) {
+
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            h = _arguments$.h,
+            s = _arguments$.s,
+            l = _arguments$.l;
+    }
+    var rgb = HSLtoRGB(h, s, l);
+
+    return RGBtoHSV(rgb.r, rgb.g, rgb.b);
+}
+
+function HSLtoRGB(h, s, l) {
+
+    if (arguments.length == 1) {
+        var _arguments$2 = arguments[0],
+            h = _arguments$2.h,
+            s = _arguments$2.s,
+            l = _arguments$2.l;
+    }
+
+    var r, g, b;
+
+    h /= 360;
+    s /= 100;
+    l /= 100;
+
+    if (s == 0) {
+        r = g = b = l; // achromatic
+    } else {
+        var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+        var p = 2 * l - q;
+        r = HUEtoRGB(p, q, h + 1 / 3);
+        g = HUEtoRGB(p, q, h);
+        b = HUEtoRGB(p, q, h - 1 / 3);
+    }
+
+    return { r: round(r * 255), g: round(g * 255), b: round(b * 255) };
+}
+
+var fromHSL = {
+    HUEtoRGB: HUEtoRGB,
+    HSLtoHSV: HSLtoHSV,
+    HSLtoRGB: HSLtoRGB
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+
+
+
+
+var defineProperty = function (obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+};
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var get = function get(object, property, receiver) {
+  if (object === null) object = Function.prototype;
+  var desc = Object.getOwnPropertyDescriptor(object, property);
+
+  if (desc === undefined) {
+    var parent = Object.getPrototypeOf(object);
+
+    if (parent === null) {
+      return undefined;
+    } else {
+      return get(parent, property, receiver);
+    }
+  } else if ("value" in desc) {
+    return desc.value;
+  } else {
+    var getter = desc.get;
+
+    if (getter === undefined) {
+      return undefined;
+    }
+
+    return getter.call(receiver);
+  }
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+
+
+
+
+
+
+
+
+
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+
+
+
+
+var slicedToArray = function () {
+  function sliceIterator(arr, i) {
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _e = undefined;
+
+    try {
+      for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+        _arr.push(_s.value);
+
+        if (i && _arr.length === i) break;
+      }
+    } catch (err) {
+      _d = true;
+      _e = err;
+    } finally {
+      try {
+        if (!_n && _i["return"]) _i["return"]();
+      } finally {
+        if (_d) throw _e;
+      }
+    }
+
+    return _arr;
+  }
+
+  return function (arr, i) {
+    if (Array.isArray(arr)) {
+      return arr;
+    } else if (Symbol.iterator in Object(arr)) {
+      return sliceIterator(arr, i);
+    } else {
+      throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    }
+  };
+}();
+
+
+
+
+
+
+
+
+
+
+
+var toArray = function (arr) {
+  return Array.isArray(arr) ? arr : Array.from(arr);
+};
+
+var toConsumableArray = function (arr) {
+  if (Array.isArray(arr)) {
+    for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+    return arr2;
+  } else {
+    return Array.from(arr);
+  }
+};
+
+var color_regexp = /(#(?:[\da-f]{8})|#(?:[\da-f]{3}){1,2}|rgb\((?:\s*\d{1,3},\s*){2}\d{1,3}\s*\)|rgba\((?:\s*\d{1,3},\s*){3}\d*\.?\d+\s*\)|hsl\(\s*\d{1,3}(?:,\s*\d{1,3}%){2}\s*\)|hsla\(\s*\d{1,3}(?:,\s*\d{1,3}%){2},\s*\d*\.?\d+\s*\)|([\w_\-]+))/gi;
+var color_split = ',';
+
+function matches(str) {
+    var matches = str.match(color_regexp);
+    var result = [];
+
+    if (!matches) {
+        return result;
+    }
+
+    for (var i = 0, len = matches.length; i < len; i++) {
+
+        if (matches[i].indexOf('#') > -1 || matches[i].indexOf('rgb') > -1 || matches[i].indexOf('hsl') > -1) {
+            result.push({ color: matches[i] });
+        } else {
+            var nameColor = ColorNames.getColorByName(matches[i]);
+
+            if (nameColor) {
+                result.push({ color: matches[i], nameColor: nameColor });
+            }
+        }
+    }
+
+    var pos = { next: 0 };
+    result.forEach(function (item) {
+        var startIndex = str.indexOf(item.color, pos.next);
+
+        item.startIndex = startIndex;
+        item.endIndex = startIndex + item.color.length;
+
+        pos.next = item.endIndex;
+    });
+
+    return result;
+}
+
+function convertMatches(str) {
+    var m = matches(str);
+
+    m.forEach(function (it, index) {
+        str = str.replace(it.color, '@' + index);
+    });
+
+    return { str: str, matches: m };
+}
+
+function convertMatchesArray(str) {
+    var splitStr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+
+    var ret = convertMatches(str);
+    return ret.str.split(splitStr).map(function (it, index) {
+        it = trim(it);
+
+        if (ret.matches[index]) {
+            it = it.replace('@' + index, ret.matches[index].color);
+        }
+
+        return it;
+    });
+}
+
+function reverseMatches(str, matches) {
+    matches.forEach(function (it, index) {
+        str = str.replace('@' + index, it.color);
+    });
+
+    return str;
+}
+
+function trim(str) {
+    return str.replace(/^\s+|\s+$/g, '');
+}
+
+/**
+ * @method rgb
+ *
+ * parse string to rgb color
+ *
+ * 		color.parse("#FF0000") === { r : 255, g : 0, b : 0 }
+ *
+ * 		color.parse("rgb(255, 0, 0)") == { r : 255, g : 0, b :0 }
+ * 		color.parse(0xff0000) == { r : 255, g : 0, b : 0 }
+ * 		color.parse(0xff000000) == { r : 255, g : 0, b : 0, a: 0 }
+ *
+ * @param {String} str color string
+ * @returns {Object}  rgb object
+ */
+function parse(str) {
+    if (typeof str == 'string') {
+
+        if (ColorNames.isColorName(str)) {
+            str = ColorNames.getColorByName(str);
+        }
+
+        if (str.indexOf("rgb(") > -1) {
+            var arr = str.replace("rgb(", "").replace(")", "").split(",");
+
+            for (var i = 0, len = arr.length; i < len; i++) {
+                arr[i] = parseInt(trim(arr[i]), 10);
+            }
+
+            var obj = { type: 'rgb', r: arr[0], g: arr[1], b: arr[2], a: 1 };
+
+            obj = Object.assign(obj, RGBtoHSL(obj));
+
+            return obj;
+        } else if (str.indexOf("rgba(") > -1) {
+            var arr = str.replace("rgba(", "").replace(")", "").split(",");
+
+            for (var i = 0, len = arr.length; i < len; i++) {
+
+                if (len - 1 == i) {
+                    arr[i] = parseFloat(trim(arr[i]));
+                } else {
+                    arr[i] = parseInt(trim(arr[i]), 10);
+                }
+            }
+
+            var obj = { type: 'rgb', r: arr[0], g: arr[1], b: arr[2], a: arr[3] };
+
+            obj = Object.assign(obj, RGBtoHSL(obj));
+
+            return obj;
+        } else if (str.indexOf("hsl(") > -1) {
+            var arr = str.replace("hsl(", "").replace(")", "").split(",");
+
+            for (var i = 0, len = arr.length; i < len; i++) {
+                arr[i] = parseFloat(trim(arr[i]));
+            }
+
+            var obj = { type: 'hsl', h: arr[0], s: arr[1], l: arr[2], a: 1 };
+
+            obj = Object.assign(obj, HSLtoRGB(obj));
+
+            return obj;
+        } else if (str.indexOf("hsla(") > -1) {
+            var arr = str.replace("hsla(", "").replace(")", "").split(",");
+
+            for (var i = 0, len = arr.length; i < len; i++) {
+
+                if (len - 1 == i) {
+                    arr[i] = parseFloat(trim(arr[i]));
+                } else {
+                    arr[i] = parseInt(trim(arr[i]), 10);
+                }
+            }
+
+            var obj = { type: 'hsl', h: arr[0], s: arr[1], l: arr[2], a: arr[3] };
+
+            obj = Object.assign(obj, HSLtoRGB(obj));
+
+            return obj;
+        } else if (str.indexOf("#") == 0) {
+
+            str = str.replace("#", "");
+
+            var arr = [];
+            var a = 1;
+            if (str.length == 3) {
+                for (var i = 0, len = str.length; i < len; i++) {
+                    var char = str.substr(i, 1);
+                    arr.push(parseInt(char + char, 16));
+                }
+            } else if (str.length === 8) {
+                for (var i = 0, len = str.length; i < len; i += 2) {
+                    arr.push(parseInt(str.substr(i, 2), 16));
+                }
+
+                a = arr.pop() / 255;
+            } else {
+                for (var i = 0, len = str.length; i < len; i += 2) {
+                    arr.push(parseInt(str.substr(i, 2), 16));
+                }
+            }
+
+            var obj = { type: 'hex', r: arr[0], g: arr[1], b: arr[2], a: a };
+
+            obj = Object.assign(obj, RGBtoHSL(obj));
+
+            return obj;
+        }
+    } else if (typeof str == 'number') {
+        if (0x000000 <= str && str <= 0xffffff) {
+            var r = (str & 0xff0000) >> 16;
+            var g = (str & 0x00ff00) >> 8;
+            var b = (str & 0x0000ff) >> 0;
+
+            var obj = { type: 'hex', r: r, g: g, b: b, a: 1 };
+            obj = Object.assign(obj, RGBtoHSL(obj));
+            return obj;
+        } else if (0x00000000 <= str && str <= 0xffffffff) {
+            var _r = (str & 0xff000000) >> 24;
+            var _g = (str & 0x00ff0000) >> 16;
+            var _b = (str & 0x0000ff00) >> 8;
+            var _a = (str & 0x000000ff) / 255;
+
+            var obj = { type: 'hex', r: _r, g: _g, b: _b, a: _a };
+            obj = Object.assign(obj, RGBtoHSL(obj));
+
+            return obj;
+        }
+    }
+
+    return str;
+}
+
+function parseGradient(colors) {
+    if (typeof colors == 'string') {
+        colors = convertMatchesArray(colors);
+    }
+
+    colors = colors.map(function (it) {
+        if (typeof it == 'string') {
+            var ret = convertMatches(it);
+            var arr = trim(ret.str).split(' ');
+
+            if (arr[1]) {
+                if (arr[1].includes('%')) {
+                    arr[1] = parseFloat(arr[1].replace(/%/, '')) / 100;
+                } else {
+                    arr[1] = parseFloat(arr[1]);
+                }
+            } else {
+                arr[1] = '*';
+            }
+
+            arr[0] = reverseMatches(arr[0], ret.matches);
+
+            return arr;
+        } else if (Array.isArray(it)) {
+
+            if (!it[1]) {
+                it[1] = '*';
+            } else if (typeof it[1] == 'string') {
+                if (it[1].includes('%')) {
+                    it[1] = parseFloat(it[1].replace(/%/, '')) / 100;
+                } else {
+                    it[1] = +it[1];
+                }
+            }
+
+            return [].concat(toConsumableArray(it));
+        }
+    });
+
+    var count = colors.filter(function (it) {
+        return it[1] === '*';
+    }).length;
+
+    if (count > 0) {
+        var sum = colors.filter(function (it) {
+            return it[1] != '*' && it[1] != 1;
+        }).map(function (it) {
+            return it[1];
+        }).reduce(function (total, cur) {
+            return total + cur;
+        }, 0);
+
+        var dist = (1 - sum) / count;
+        colors.forEach(function (it, index) {
+            if (it[1] == '*' && index > 0) {
+                if (colors.length - 1 == index) {
+                    // it[1] = 1 
+                } else {
+                    it[1] = dist;
+                }
+            }
+        });
+    }
+
+    return colors;
+}
+
+var parser = {
+    matches: matches,
+    convertMatches: convertMatches,
+    convertMatchesArray: convertMatchesArray,
+    reverseMatches: reverseMatches,
+    parse: parse,
+    parseGradient: parseGradient,
+    trim: trim,
+    color_regexp: color_regexp,
+    color_split: color_split
+};
+
+/**
+ * @method RGBtoHSV
+ *
+ * convert rgb to hsv
+ *
+ * 		color.RGBtoHSV(0, 0, 255) === { h : 240, s : 1, v : 1 } === '#FFFF00'
+ *
+ * @param {Number} R  red color value
+ * @param {Number} G  green color value
+ * @param {Number} B  blue color value
+ * @return {Object}  hsv color code
+ */
+function RGBtoHSV(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            r = _arguments$.r,
+            g = _arguments$.g,
+            b = _arguments$.b;
+    }
+
+    var R1 = r / 255;
+    var G1 = g / 255;
+    var B1 = b / 255;
+
+    var MaxC = Math.max(R1, G1, B1);
+    var MinC = Math.min(R1, G1, B1);
+
+    var DeltaC = MaxC - MinC;
+
+    var H = 0;
+
+    if (DeltaC == 0) {
+        H = 0;
+    } else if (MaxC == R1) {
+        H = 60 * ((G1 - B1) / DeltaC % 6);
+    } else if (MaxC == G1) {
+        H = 60 * ((B1 - R1) / DeltaC + 2);
+    } else if (MaxC == B1) {
+        H = 60 * ((R1 - G1) / DeltaC + 4);
+    }
+
+    if (H < 0) {
+        H = 360 + H;
+    }
+
+    var S = 0;
+
+    if (MaxC == 0) S = 0;else S = DeltaC / MaxC;
+
+    var V = MaxC;
+
+    return { h: H, s: S, v: V };
+}
+
+function RGBtoCMYK(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$2 = arguments[0],
+            r = _arguments$2.r,
+            g = _arguments$2.g,
+            b = _arguments$2.b;
+    }
+
+    var R1 = r / 255;
+    var G1 = g / 255;
+    var B1 = b / 255;
+
+    var K = 1 - Math.max(R1, G1, B1);
+    var C = (1 - R1 - K) / (1 - K);
+    var M = (1 - G1 - K) / (1 - K);
+    var Y = (1 - B1 - K) / (1 - K);
+
+    return { c: C, m: M, y: Y, k: K };
+}
+
+function RGBtoHSL(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$3 = arguments[0],
+            r = _arguments$3.r,
+            g = _arguments$3.g,
+            b = _arguments$3.b;
+    }
+
+    r /= 255, g /= 255, b /= 255;
+    var max = Math.max(r, g, b),
+        min = Math.min(r, g, b);
+    var h,
+        s,
+        l = (max + min) / 2;
+
+    if (max == min) {
+        h = s = 0; // achromatic
+    } else {
+        var d = max - min;
+        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+        switch (max) {
+            case r:
+                h = (g - b) / d + (g < b ? 6 : 0);break;
+            case g:
+                h = (b - r) / d + 2;break;
+            case b:
+                h = (r - g) / d + 4;break;
+        }
+        h /= 6;
+    }
+
+    return { h: round(h * 360), s: round(s * 100), l: round(l * 100) };
+}
+
+function c(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$4 = arguments[0],
+            r = _arguments$4.r,
+            g = _arguments$4.g,
+            b = _arguments$4.b;
+    }
+    return gray((r + g + b) / 3 > 90 ? 0 : 255);
+}
+
+function gray(gray) {
+    return { r: gray, g: gray, b: gray };
+}
+
+function RGBtoSimpleGray(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$5 = arguments[0],
+            r = _arguments$5.r,
+            g = _arguments$5.g,
+            b = _arguments$5.b;
+    }
+    return gray(Math.ceil((r + g + b) / 3));
+}
+
+function RGBtoGray(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$6 = arguments[0],
+            r = _arguments$6.r,
+            g = _arguments$6.g,
+            b = _arguments$6.b;
+    }
+    return gray(RGBtoYCrCb(r, g, b).y);
+}
+
+function brightness(r, g, b) {
+    return Math.ceil(r * 0.2126 + g * 0.7152 + b * 0.0722);
+}
+
+
+
+
+
+
+
+function RGBtoYCrCb(r, g, b) {
+
+    if (arguments.length == 1) {
+        var _arguments$7 = arguments[0],
+            r = _arguments$7.r,
+            g = _arguments$7.g,
+            b = _arguments$7.b;
+    }
+    var Y = brightness(r, g, b);
+    var Cb = 0.564 * (b - Y);
+    var Cr = 0.713 * (r - Y);
+
+    return { y: Y, cr: Cr, cb: Cb };
+}
+
+function PivotRGB(n) {
+    var point = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.04045;
+
+    return (n > point ? Math.pow((n + 0.055) / 1.055, 2.4) : n / 12.92) * 100;
+}
+
+function RGBtoXYZ(r, g, b) {
+    //sR, sG and sB (Standard RGB) input range = 0 รท 255
+    //X, Y and Z output refer to a D65/2ยฐ standard illuminant.
+    if (arguments.length == 1) {
+        var _arguments$8 = arguments[0],
+            r = _arguments$8.r,
+            g = _arguments$8.g,
+            b = _arguments$8.b;
+    }
+
+    var R = r / 255;
+    var G = g / 255;
+    var B = b / 255;
+
+    R = PivotRGB(R);
+    G = PivotRGB(G);
+    B = PivotRGB(B);
+
+    var x = R * 0.4124 + G * 0.3576 + B * 0.1805;
+    var y = R * 0.2126 + G * 0.7152 + B * 0.0722;
+    var z = R * 0.0193 + G * 0.1192 + B * 0.9505;
+
+    return { x: x, y: y, z: z };
+}
+
+function RGBtoLAB(r, g, b) {
+    if (arguments.length == 1) {
+        var _arguments$9 = arguments[0],
+            r = _arguments$9.r,
+            g = _arguments$9.g,
+            b = _arguments$9.b;
+    }
+    return XYZtoLAB(RGBtoXYZ(r, g, b));
+}
+
+var fromRGB = {
+    RGBtoCMYK: RGBtoCMYK,
+    RGBtoGray: RGBtoGray,
+    RGBtoHSL: RGBtoHSL,
+    RGBtoHSV: RGBtoHSV,
+    RGBtoLAB: RGBtoLAB,
+    RGBtoSimpleGray: RGBtoSimpleGray,
+    RGBtoXYZ: RGBtoXYZ,
+    RGBtoYCrCb: RGBtoYCrCb,
+    c: c,
+    brightness: brightness,
+    gray: gray
+};
+
+function CMYKtoRGB(c, m, y, k) {
+
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            c = _arguments$.c,
+            m = _arguments$.m,
+            y = _arguments$.y,
+            k = _arguments$.k;
+    }
+
+    var R = 255 * (1 - c) * (1 - k);
+    var G = 255 * (1 - m) * (1 - k);
+    var B = 255 * (1 - y) * (1 - k);
+
+    return { r: R, g: G, b: B };
+}
+
+var fromCMYK = {
+    CMYKtoRGB: CMYKtoRGB
+};
+
+function ReverseXyz(n) {
+    return Math.pow(n, 3) > 0.008856 ? Math.pow(n, 3) : (n - 16 / 116) / 7.787;
+}
+
+function ReverseRGB(n) {
+    return n > 0.0031308 ? 1.055 * Math.pow(n, 1 / 2.4) - 0.055 : 12.92 * n;
+}
+
+function XYZtoRGB(x, y, z) {
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            x = _arguments$.x,
+            y = _arguments$.y,
+            z = _arguments$.z;
+    }
+    //X, Y and Z input refer to a D65/2ยฐ standard illuminant.
+    //sR, sG and sB (standard RGB) output range = 0 รท 255
+
+    var X = x / 100.0;
+    var Y = y / 100.0;
+    var Z = z / 100.0;
+
+    var R = X * 3.2406 + Y * -1.5372 + Z * -0.4986;
+    var G = X * -0.9689 + Y * 1.8758 + Z * 0.0415;
+    var B = X * 0.0557 + Y * -0.2040 + Z * 1.0570;
+
+    R = ReverseRGB(R);
+    G = ReverseRGB(G);
+    B = ReverseRGB(B);
+
+    var r = round(R * 255);
+    var g = round(G * 255);
+    var b = round(B * 255);
+
+    return { r: r, g: g, b: b };
+}
+
+function LABtoXYZ(l, a, b) {
+    if (arguments.length == 1) {
+        var _arguments$2 = arguments[0],
+            l = _arguments$2.l,
+            a = _arguments$2.a,
+            b = _arguments$2.b;
+    }
+    //Reference-X, Y and Z refer to specific illuminants and observers.
+    //Common reference values are available below in this same page.
+
+    var Y = (l + 16) / 116;
+    var X = a / 500 + Y;
+    var Z = Y - b / 200;
+
+    Y = ReverseXyz(Y);
+    X = ReverseXyz(X);
+    Z = ReverseXyz(Z);
+
+    var x = X * 95.047;
+    var y = Y * 100.000;
+    var z = Z * 108.883;
+
+    return { x: x, y: y, z: z };
+}
+
+
+
+
+
+function LABtoRGB(l, a, b) {
+    if (arguments.length == 1) {
+        var _arguments$4 = arguments[0],
+            l = _arguments$4.l,
+            a = _arguments$4.a,
+            b = _arguments$4.b;
+    }
+    return XYZtoRGB(LABtoXYZ(l, a, b));
+}
+
+var fromLAB = {
+    XYZtoRGB: XYZtoRGB,
+    LABtoRGB: LABtoRGB,
+    LABtoXYZ: LABtoXYZ
+};
+
+/**
+ * @method HSVtoRGB
+ *
+ * convert hsv to rgb
+ *
+ * 		color.HSVtoRGB(0,0,1) === #FFFFF === { r : 255, g : 0, b : 0 }
+ *
+ * @param {Number} H  hue color number  (min : 0, max : 360)
+ * @param {Number} S  Saturation number  (min : 0, max : 1)
+ * @param {Number} V  Value number 		(min : 0, max : 1 )
+ * @returns {Object}
+ */
+function HSVtoRGB(h, s, v) {
+
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            h = _arguments$.h,
+            s = _arguments$.s,
+            v = _arguments$.v;
+    }
+
+    var H = h;
+    var S = s;
+    var V = v;
+
+    if (H >= 360) {
+        H = 0;
+    }
+
+    var C = S * V;
+    var X = C * (1 - Math.abs(H / 60 % 2 - 1));
+    var m = V - C;
+
+    var temp = [];
+
+    if (0 <= H && H < 60) {
+        temp = [C, X, 0];
+    } else if (60 <= H && H < 120) {
+        temp = [X, C, 0];
+    } else if (120 <= H && H < 180) {
+        temp = [0, C, X];
+    } else if (180 <= H && H < 240) {
+        temp = [0, X, C];
+    } else if (240 <= H && H < 300) {
+        temp = [X, 0, C];
+    } else if (300 <= H && H < 360) {
+        temp = [C, 0, X];
+    }
+
+    return {
+        r: round((temp[0] + m) * 255),
+        g: round((temp[1] + m) * 255),
+        b: round((temp[2] + m) * 255)
+    };
+}
+
+function HSVtoHSL(h, s, v) {
+
+    if (arguments.length == 1) {
+        var _arguments$2 = arguments[0],
+            h = _arguments$2.h,
+            s = _arguments$2.s,
+            v = _arguments$2.v;
+    }
+
+    var rgb = HSVtoRGB(h, s, v);
+
+    return RGBtoHSL(rgb.r, rgb.g, rgb.b);
+}
+
+var fromHSV = {
+    HSVtoHSL: HSVtoHSL,
+    HSVtoRGB: HSVtoRGB
+};
+
+function YCrCbtoRGB(y, cr, cb, bit) {
+
+    if (arguments.length == 1) {
+        var _arguments$ = arguments[0],
+            y = _arguments$.y,
+            cr = _arguments$.cr,
+            cb = _arguments$.cb,
+            bit = _arguments$.bit;
+
+        bit = bit || 0;
+    }
+    var R = y + 1.402 * (cr - bit);
+    var G = y - 0.344 * (cb - bit) - 0.714 * (cr - bit);
+    var B = y + 1.772 * (cb - bit);
+
+    return { r: Math.ceil(R), g: Math.ceil(G), b: Math.ceil(B) };
+}
+
+var fromYCrCb = {
+    YCrCbtoRGB: YCrCbtoRGB
+};
+
+/**
+ * @deprecated 
+ * 
+ * instead of this,  use blend function 
+ *  
+ * @param {*} startColor 
+ * @param {*} endColor 
+ * @param {*} t 
+ */
+function interpolateRGB(startColor, endColor) {
+    var t = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.5;
+    var exportFormat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'hex';
+
+    var obj = {
+        r: round(startColor.r + (endColor.r - startColor.r) * t),
+        g: round(startColor.g + (endColor.g - startColor.g) * t),
+        b: round(startColor.b + (endColor.b - startColor.b) * t),
+        a: round(startColor.a + (endColor.a - startColor.a) * t, 100)
+    };
+
+    return format(obj, obj.a < 1 ? 'rgb' : exportFormat);
+}
+
+function scale(scale) {
+    var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+
+    if (!scale) return [];
+
+    if (typeof scale === 'string') {
+        scale = convertMatchesArray(scale);
+    }
+
+    scale = scale || [];
+    var len = scale.length;
+
+    var colors = [];
+    for (var i = 0; i < len - 1; i++) {
+        for (var index = 0; index < count; index++) {
+            colors.push(blend(scale[i], scale[i + 1], index / count));
+        }
+    }
+    return colors;
+}
+
+function blend(startColor, endColor) {
+    var ratio = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.5;
+    var format$$1 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'hex';
+
+    var s = parse(startColor);
+    var e = parse(endColor);
+
+    return interpolateRGB(s, e, ratio, format$$1);
+}
+
+function mix(startcolor, endColor) {
+    var ratio = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.5;
+    var format$$1 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'hex';
+
+    return blend(startcolor, endColor, ratio, format$$1);
+}
+
+/**
+ * 
+ * @param {Color|String} c 
+ */
+function contrast(c$$1) {
+    c$$1 = parse(c$$1);
+    return (Math.round(c$$1.r * 299) + Math.round(c$$1.g * 587) + Math.round(c$$1.b * 114)) / 1000;
+}
+
+function contrastColor(c$$1) {
+    return contrast(c$$1) >= 128 ? 'black' : 'white';
+}
+
+function gradient(colors) {
+    var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+
+    colors = parseGradient(colors);
+
+    var newColors = [];
+    var maxCount = count - (colors.length - 1);
+    var allCount = maxCount;
+
+    for (var i = 1, len = colors.length; i < len; i++) {
+
+        var startColor = colors[i - 1][0];
+        var endColor = colors[i][0];
+
+        // if it is second color
+        var rate = i == 1 ? colors[i][1] : colors[i][1] - colors[i - 1][1];
+
+        // if it is last color 
+        var colorCount = i == colors.length - 1 ? allCount : Math.floor(rate * maxCount);
+
+        newColors = newColors.concat(scale([startColor, endColor], colorCount), [endColor]);
+
+        allCount -= colorCount;
+    }
+    return newColors;
+}
+
+function scaleHSV(color) {
+    var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h';
+    var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 9;
+    var exportFormat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'rgb';
+    var min = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+    var max = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+    var dist = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 100;
+
+    var colorObj = parse(color);
+    var hsv = RGBtoHSV(colorObj);
+    var unit = (max - min) * dist / count;
+
+    var results = [];
+    for (var i = 1; i <= count; i++) {
+        hsv[target] = Math.abs((dist - unit * i) / dist);
+        results.push(format(HSVtoRGB(hsv), exportFormat));
+    }
+
+    return results;
+}
+
+function scaleH(color) {
+    var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 9;
+    var exportFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rgb';
+    var min = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var max = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 360;
+
+    return scaleHSV(color, 'h', count, exportFormat, min, max, 1);
+}
+
+function scaleS(color) {
+    var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 9;
+    var exportFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rgb';
+    var min = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var max = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+
+    return scaleHSV(color, 's', count, exportFormat, min, max, 100);
+}
+
+function scaleV(color) {
+    var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 9;
+    var exportFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'rgb';
+    var min = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var max = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+
+    return scaleHSV(color, 'v', count, exportFormat, min, max, 100);
+}
+
+/* predefined scale colors */
+scale.parula = function (count) {
+    return scale(['#352a87', '#0f5cdd', '#00b5a6', '#ffc337', '#fdff00'], count);
+};
+
+scale.jet = function (count) {
+    return scale(['#00008f', '#0020ff', '#00ffff', '#51ff77', '#fdff00', '#ff0000', '#800000'], count);
+};
+
+scale.hsv = function (count) {
+    return scale(['#ff0000', '#ffff00', '#00ff00', '#00ffff', '#0000ff', '#ff00ff', '#ff0000'], count);
+};
+
+scale.hot = function (count) {
+    return scale(['#0b0000', '#ff0000', '#ffff00', '#ffffff'], count);
+};
+scale.pink = function (count) {
+    return scale(['#1e0000', '#bd7b7b', '#e7e5b2', '#ffffff'], count);
+};
+
+scale.bone = function (count) {
+    return scale(['#000000', '#4a4a68', '#a6c6c6', '#ffffff'], count);
+};
+
+scale.copper = function (count) {
+    return scale(['#000000', '#3d2618', '#9d623e', '#ffa167', '#ffc77f'], count);
+};
+
+var mixin = {
+    interpolateRGB: interpolateRGB,
+    blend: blend,
+    mix: mix,
+    scale: scale,
+    contrast: contrast,
+    contrastColor: contrastColor,
+    gradient: gradient,
+    scaleHSV: scaleHSV,
+    scaleH: scaleH,
+    scaleS: scaleS,
+    scaleV: scaleV
+};
+
+function array_equals(v1, v2) {
+    if (v1.length !== v2.length) return false;
+    for (var i = 0, len = v1.length; i < len; ++i) {
+        if (v1[i] !== v2[i]) return false;
+    }
+    return true;
+}
+
+function euclidean(v1, v2) {
+    var total = 0;
+
+    for (var i = 0, len = v1.length; i < len; i++) {
+        total += Math.pow(v2[i] - v1[i], 2);
+    }
+
+    return Math.sqrt(total);
+}
+
+function manhattan(v1, v2) {
+    var total = 0;
+
+    for (var i = 0, len = v1.length; i < len; i++) {
+        total += Math.abs(v2[i] - v1[i]);
+    }
+
+    return total;
+}
+
+function max(v1, v2) {
+    var max = 0;
+    for (var i = 0, len = v1.length; i < len; i++) {
+        max = Math.max(max, Math.abs(v2[i] - v1[i]));
+    }
+
+    return max;
+}
+
+var distances = {
+    euclidean: euclidean,
+    manhattan: manhattan,
+    max: max
+};
+
+var create_random_number = {
+    linear: function linear(num, count) {
+        var centeroids = [];
+        var start = Math.round(Math.random() * num);
+        var dist = Math.floor(num / count);
+
+        do {
+
+            centeroids.push(start);
+
+            start = (start + dist) % num;
+        } while (centeroids.length < count);
+
+        return centeroids;
+    },
+
+    shuffle: function shuffle(num, count) {
+        var centeroids = [];
+
+        while (centeroids.length < count) {
+
+            var index = Math.round(Math.random() * num);
+
+            if (centeroids.indexOf(index) == -1) {
+                centeroids.push(index);
+            }
+        }
+
+        return centeroids;
+    }
+
+};
+
+function randomCentroids(points, k) {
+    var method = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'linear';
+
+
+    var centeroids = create_random_number[method](points.length, k);
+
+    return centeroids.map(function (i) {
+        return points[i];
+    });
+
+    // var centeroids = points.slice(0);
+
+    // centeroids.sort(function () {
+    //     return (Math.round(Math.random()) - 0.5);
+    // })
+
+    // return centeroids.slice(0, k); 
+}
+
+function closestCenteroid(point, centeroids, distance) {
+    var min = Infinity,
+        kIndex = 0;
+
+    centeroids.forEach(function (center, i) {
+        var dist = distance(point, center);
+
+        if (dist < min) {
+            min = dist;
+            kIndex = i;
+        }
+    });
+
+    return kIndex;
+}
+
+function getCenteroid(assigned) {
+
+    if (!assigned.length) return [];
+
+    // initialize centeroid list 
+    var centeroid = new Array(assigned[0].length);
+    for (var i = 0, len = centeroid.length; i < len; i++) {
+        centeroid[i] = 0;
+    }
+
+    for (var index = 0, len = assigned.length; index < len; index++) {
+        var it = assigned[index];
+
+        var last = index + 1;
+
+        for (var j = 0, jLen = it.length; j < jLen; j++) {
+            centeroid[j] += (it[j] - centeroid[j]) / last;
+        }
+    }
+
+    centeroid = centeroid.map(function (it) {
+        return Math.floor(it);
+    });
+
+    return centeroid;
+}
+
+function unique_array(arrays) {
+    return arrays;
+    var set = {};
+    var count = arrays.length;
+    var it = null;
+    while (count--) {
+        it = arrays[count];
+        set[JSON.stringify(it)] = it;
+    }
+
+    return Object.values(set);
+}
+
+function splitK(k, points, centeroids, distance) {
+    var assignment = new Array(k);
+
+    for (var i = 0; i < k; i++) {
+        assignment[i] = [];
+    }
+
+    for (var idx = 0, pointLength = points.length; idx < pointLength; idx++) {
+        var point = points[idx];
+        var index = closestCenteroid(point, centeroids, distance);
+        assignment[index].push(point);
+    }
+
+    return assignment;
+}
+
+function setNewCenteroid(k, points, assignment, centeroids, movement, randomFunction) {
+
+    for (var i = 0; i < k; i++) {
+        var assigned = assignment[i];
+
+        var centeroid = centeroids[i];
+        var newCenteroid = new Array(centeroid.length);
+
+        if (assigned.length > 0) {
+            newCenteroid = getCenteroid(assigned);
+        } else {
+            var idx = Math.floor(randomFunction() * points.length);
+            newCenteroid = points[idx];
+        }
+
+        if (array_equals(newCenteroid, centeroid)) {
+            movement = false;
+        } else {
+            movement = true;
+        }
+
+        centeroids[i] = newCenteroid;
+    }
+
+    return movement;
+}
+
+function kmeans(points, k, distanceFunction) {
+    var period = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 10;
+    var initialRandom = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'linear';
+
+    points = unique_array(points);
+
+    k = k || Math.max(2, Math.ceil(Math.sqrt(points.length / 2)));
+
+    var distance = distanceFunction || 'euclidean';
+    if (typeof distance == 'string') {
+        distance = distances[distance];
+    }
+
+    var rng_seed = 0;
+    var random = function random() {
+        rng_seed = (rng_seed * 9301 + 49297) % 233280;
+        return rng_seed / 233280;
+    };
+
+    var centeroids = randomCentroids(points, k, initialRandom);
+
+    var movement = true;
+    var iterations = 0;
+    while (movement) {
+        var assignment = splitK(k, points, centeroids, distance);
+
+        movement = setNewCenteroid(k, points, assignment, centeroids, false, random);
+
+        iterations++;
+
+        if (iterations % period == 0) {
+            break;
+        }
+    }
+
+    return centeroids;
+}
+
+function each(len, callback) {
+    for (var i = 0; i < len; i += 4) {
+        callback(i);
+    }
+}
+
+function pack(bitmap, callback) {
+
+    each(bitmap.pixels.length, function (i) {
+        callback(bitmap.pixels, i);
+    });
+}
+
+var Canvas = {
+    create: function create(width, height) {
+        var canvas = document.createElement('canvas');
+        canvas.width = width || 0;
+        canvas.height = height || 0;
+
+        return canvas;
+    },
+    drawPixels: function drawPixels(bitmap) {
+        var canvas = this.create(bitmap.width, bitmap.height);
+
+        var context = canvas.getContext('2d');
+        var imagedata = context.getImageData(0, 0, canvas.width, canvas.height);
+
+        imagedata.data.set(bitmap.pixels);
+
+        context.putImageData(imagedata, 0, 0);
+
+        return canvas;
+    },
+    createHistogram: function createHistogram(width, height, histogram, callback) {
+        var opt = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : { black: true, red: false, green: false, blue: false };
+
+        var canvas = this.create(width, height);
+        var context = canvas.getContext('2d');
+        context.clearRect(0, 0, width, height);
+        context.fillStyle = "white";
+        context.fillRect(0, 0, width, height);
+        context.globalAlpha = 0.7;
+
+        var omit = { black: false };
+        if (opt.black) {
+            omit.black = false;
+        } else {
+            omit.black = true;
+        }
+        if (opt.red) {
+            omit.red = false;
+        } else {
+            omit.red = true;
+        }
+        if (opt.green) {
+            omit.green = false;
+        } else {
+            omit.green = true;
+        }
+        if (opt.blue) {
+            omit.blue = false;
+        } else {
+            omit.blue = true;
+        }
+
+        Object.keys(histogram).forEach(function (color) {
+
+            if (!omit[color]) {
+
+                var array = histogram[color];
+                var ymax = Math.max.apply(Math, array);
+                var unitWith = width / array.length;
+
+                context.fillStyle = color;
+                array.forEach(function (it, index) {
+                    var currentHeight = height * (it / ymax);
+                    var x = index * unitWith;
+
+                    context.fillRect(x, height - currentHeight, unitWith, currentHeight);
+                });
+            }
+        });
+
+        if (typeof callback == 'function') callback(canvas);
+    },
+    getHistogram: function getHistogram(bitmap) {
+        var black = new Array(256);
+        var red = new Array(256);
+        var green = new Array(256);
+        var blue = new Array(256);
+        for (var i = 0; i < 256; i++) {
+            black[i] = 0;
+            red[i] = 0;
+            green[i] = 0;
+            blue[i] = 0;
+        }
+
+        pack(bitmap, function (pixels, i) {
+            // gray scale 
+            var grayIndex = Math.round(Color$1.brightness(pixels[i], pixels[i + 1], pixels[i + 2]));
+            black[grayIndex]++;
+
+            red[pixels[i]]++;
+            green[pixels[i + 1]]++;
+            blue[pixels[i + 2]]++;
+        });
+
+        return { black: black, red: red, green: green, blue: blue };
+    },
+    getBitmap: function getBitmap(bitmap, area) {
+        var canvas = this.drawPixels(bitmap);
+
+        var context = canvas.getContext('2d');
+        var pixels = context.getImageData(area.x || 0, area.y || 0, area.width || canvas.width, area.height || canvas.height).data;
+
+        return { pixels: pixels, width: area.width, height: area.height };
+    },
+    putBitmap: function putBitmap(bitmap, subBitmap, area) {
+
+        var canvas = this.drawPixels(bitmap);
+        var subCanvas = this.drawPixels(subBitmap);
+
+        var context = canvas.getContext('2d');
+        context.drawImage(subCanvas, area.x, area.y);
+
+        bitmap.pixels = context.getImageData(0, 0, bitmap.width, bitmap.height).data;
+
+        return bitmap;
+    }
+};
+
+var ImageLoader = function () {
+    function ImageLoader(url) {
+        var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        classCallCheck(this, ImageLoader);
+
+        this.isLoaded = false;
+        this.imageUrl = url;
+        this.opt = opt;
+        this.initialize();
+    }
+
+    createClass(ImageLoader, [{
+        key: 'initialize',
+        value: function initialize() {
+            this.canvas = this.createCanvas();
+            this.context = this.canvas.getContext('2d');
+        }
+    }, {
+        key: 'createCanvas',
+        value: function createCanvas() {
+            return document.createElement('canvas');
+        }
+    }, {
+        key: 'load',
+        value: function load(callback) {
+            this.loadImage(callback);
+        }
+    }, {
+        key: 'loadImage',
+        value: function loadImage(callback) {
+            var _this = this;
+
+            var ctx = this.context;
+            this.newImage = new Image();
+            var img = this.newImage;
+            img.onload = function () {
+                var ratio = img.height / img.width;
+
+                if (_this.opt.canvasWidth && _this.opt.canvasHeight) {
+                    _this.canvas.width = _this.opt.canvasWidth;
+                    _this.canvas.height = _this.opt.canvasHeight;
+                } else {
+                    _this.canvas.width = _this.opt.maxWidth ? _this.opt.maxWidth : img.width;
+                    _this.canvas.height = _this.canvas.width * ratio;
+                }
+
+                ctx.drawImage(img, 0, 0, img.width, img.height, 0, 0, _this.canvas.width, _this.canvas.height);
+                _this.isLoaded = true;
+                callback && callback();
+            };
+
+            this.getImageUrl(function (url) {
+                img.src = url;
+            });
+        }
+    }, {
+        key: 'load',
+        value: function load(callback) {
+            var _this2 = this;
+
+            this.newImage = new Image();
+            var img = this.newImage;
+            img.onload = function () {
+                _this2.isLoaded = true;
+                callback && callback();
+            };
+
+            this.getImageUrl(function (url) {
+                img.src = url;
+            });
+        }
+    }, {
+        key: 'getImageUrl',
+        value: function getImageUrl(callback) {
+            if (typeof this.imageUrl == 'string') {
+                return callback(this.imageUrl);
+            } else if (this.imageUrl instanceof Blob) {
+                var reader = new FileReader();
+
+                reader.onload = function (ev) {
+                    callback(ev.target.result);
+                };
+
+                reader.readAsDataURL(this.imageUrl);
+            }
+        }
+    }, {
+        key: 'getRGBA',
+        value: function getRGBA(r, g, b, a) {
+            return [r, g, b, a];
+        }
+    }, {
+        key: 'toArray',
+        value: function toArray$$1(filter, callback) {
+            var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+            var imagedata = this.context.getImageData(0, 0, this.canvas.width, this.canvas.height);
+            var width = imagedata.width;
+            var height = imagedata.height;
+
+            var pixels = new Uint8ClampedArray(imagedata.data);
+
+            var bitmap = { pixels: pixels, width: width, height: height };
+
+            if (!filter) {
+                filter = function () {
+                    return function (bitmap, done) {
+                        done(bitmap);
+                    };
+                }();
+            }
+
+            filter(bitmap, function (newBitmap) {
+                var tmpCanvas = Canvas.drawPixels(newBitmap);
+
+                if (opt.returnTo == 'canvas') {
+                    callback(tmpCanvas);
+                } else {
+                    callback(tmpCanvas.toDataURL(opt.outputFormat || 'image/png'));
+                }
+            }, opt);
+        }
+    }, {
+        key: 'toHistogram',
+        value: function toHistogram(opt) {
+            var imagedata = this.context.getImageData(0, 0, this.canvas.width, this.canvas.height);
+            var width = imagedata.width;
+            var height = imagedata.height;
+
+            var pixels = new Uint8ClampedArray(imagedata.data);
+
+            var bitmap = { pixels: pixels, width: width, height: height };
+
+            return Canvas.getHistogram(bitmap);
+        }
+    }, {
+        key: 'toRGB',
+        value: function toRGB() {
+            var imagedata = this.context.getImageData(0, 0, this.canvas.width, this.canvas.height);
+
+            var rgba = imagedata.data;
+            var results = [];
+            for (var i = 0, len = rgba.length; i < len; i += 4) {
+                results[results.length] = [rgba[i + 0], rgba[i + 1], rgba[i + 2], rgba[i + 3]];
+            }
+
+            return results;
+        }
+    }]);
+    return ImageLoader;
+}();
+
+var CONSTANT = {
+    identity: function identity() {
+        return [1, 0, 0, 0, 1, 0, 0, 0, 1];
+    },
+    stretching: function stretching(k) {
+        return [k, 0, 0, 0, 1, 0, 0, 0, 1];
+    },
+    squeezing: function squeezing(k) {
+        return [k, 0, 0, 0, 1 / k, 0, 0, 0, 1];
+    },
+    scale: function scale() {
+        var sx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+        var sy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+
+        sx = sx || sx === 0 ? sx : 1;
+        sy = sy || sy === 0 ? sy : 1;
+        return [sx, 0, 0, 0, sy, 0, 0, 0, 1];
+    },
+    scaleX: function scaleX(sx) {
+        return this.scale(sx);
+    },
+    scaleY: function scaleY(sy) {
+        return this.scale(1, sy);
+    },
+    translate: function translate(tx, ty) {
+        return [1, 0, tx, 0, 1, ty, 0, 0, 1];
+    },
+    rotate: function rotate(angle) {
+        var r = this.radian(angle);
+        return [Math.cos(r), -Math.sin(r), 0, Math.sin(r), Math.cos(r), 0, 0, 0, 1];
+    },
+    rotate90: function rotate90() {
+        return [0, -1, 0, 1, 0, 0, 0, 0, 1];
+    },
+    rotate180: function rotate180() {
+        return [-1, 0, 0, 0, -1, 0, 0, 0, 1];
+    },
+    rotate270: function rotate270() {
+        return [0, 1, 0, -1, 0, 0, 0, 0, 1];
+    },
+    radian: function radian(degree) {
+        return degree * Math.PI / 180;
+    },
+    skew: function skew(degreeX, degreeY) {
+        var radianX = this.radian(degreeX);
+        var radianY = this.radian(degreeY);
+        return [1, Math.tan(radianX), 0, Math.tan(radianY), 1, 0, 0, 0, 1];
+    },
+    skewX: function skewX(degreeX) {
+        var radianX = this.radian(degreeX);
+
+        return [1, Math.tan(radianX), 0, 0, 1, 0, 0, 0, 1];
+    },
+    skewY: function skewY(degreeY) {
+        var radianY = this.radian(degreeY);
+
+        return [1, 0, 0, Math.tan(radianY), 1, 0, 0, 0, 1];
+    },
+    shear1: function shear1(angle) {
+        return [1, -Math.tan(this.radian(angle) / 2), 0, 0, 1, 0, 0, 0, 1];
+    },
+    shear2: function shear2(angle) {
+        return [1, 0, 0, Math.sin(this.radian(angle)), 1, 0, 0, 0, 1];
+    }
+};
+
+var Matrix = {
+    CONSTANT: CONSTANT,
+
+    radian: function radian(angle) {
+        return CONSTANT.radian(angle);
+    },
+    multiply: function multiply(A, C) {
+        // console.log(JSON.stringify(A), JSON.stringify(C))
+        return [A[0] * C[0] + A[1] * C[1] + A[2] * C[2], A[3] * C[0] + A[4] * C[1] + A[5] * C[2], A[6] * C[0] + A[7] * C[1] + A[8] * C[2]];
+    },
+    identity: function identity(B) {
+        return this.multiply(CONSTANT.identity(), B);
+    },
+    translate: function translate(x, y, B) {
+        return this.multiply(CONSTANT.translate(x, y), B);
+    },
+    rotate: function rotate(angle, B) {
+        return this.multiply(CONSTANT.rotate(angle), B);
+    },
+    shear1: function shear1(angle, B) {
+        return this.multiply(CONSTANT.shear1(angle), B);
+    },
+    shear2: function shear2(angle, B) {
+        return this.multiply(CONSTANT.shear2(angle), B);
+    },
+    rotateShear: function rotateShear(angle, B) {
+
+        var arr = B;
+
+        arr = this.shear1(angle, arr);
+        arr = this.shear2(angle, arr);
+        arr = this.shear1(angle, arr);
+
+        return arr;
+    }
+};
+
+function crop() {
+    var startX = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var startY = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var width = arguments[2];
+    var height = arguments[3];
+
+
+    var newBitmap = createBitmap(width * height * 4, width, height);
+
+    return function (bitmap, done) {
+        for (var y = startY, realY = 0; y < height; y++, realY++) {
+            for (var x = startX, realX = 0; x < width; x++, realX++) {
+                newBitmap.pixels[realY * width * realX] = bitmap.pixels[y * width * x];
+            }
+        }
+
+        done(newBitmap);
+    };
+}
+
+// Image manupulate 
+function resize(dstWidth, dstHeight) {
+    return function (bitmap, done) {
+        var c = Canvas.drawPixels(bitmap);
+        var context = c.getContext('2d');
+
+        c.width = dstWidth;
+        c.height = dstHeight;
+
+        done({
+            pixels: new Uint8ClampedArray(context.getImageData(0, 0, dstWidth, dstHeight).data),
+            width: dstWidth,
+            height: dstHeight
+        });
+    };
+}
+
+function flipV() {
+    return function (bitmap, done) {
+        var width = bitmap.width;
+        var height = bitmap.height;
+        var isCenter = height % 2 == 1 ? 1 : 0;
+
+        var halfHeight = isCenter ? Math.floor(height / 2) : height / 2;
+
+        for (var y = 0; y < halfHeight; y++) {
+            for (var x = 0; x < width; x++) {
+
+                var startIndex = y * width + x << 2;
+                var endIndex = (height - 1 - y) * width + x << 2;
+                swapColor(bitmap.pixels, startIndex, endIndex);
+            }
+        }
+
+        done(bitmap);
+    };
+}
+
+function flipH() {
+    return function (bitmap, done) {
+        var width = bitmap.width;
+        var height = bitmap.height;
+        var isCenter = width % 2 == 1 ? 1 : 0;
+
+        var halfWidth = isCenter ? Math.floor(width / 2) : width / 2;
+
+        for (var y = 0; y < height; y++) {
+            for (var x = 0; x < halfWidth; x++) {
+
+                var startIndex = y * width + x << 2;
+                var endIndex = y * width + (width - 1 - x) << 2;
+                swapColor(bitmap.pixels, startIndex, endIndex);
+            }
+        }
+
+        done(bitmap);
+    };
+}
+
+function rotateDegree(angle) {
+    var cx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'center';
+    var cy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'center';
+
+    // const r = F.radian(angle)
+
+    return function (bitmap, done) {
+        var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+        var newBitmap = createBitmap(bitmap.pixels.length, bitmap.width, bitmap.height);
+        var width = bitmap.width;
+        var height = bitmap.height;
+
+        if (cx == 'center') {
+            cx = Math.floor(width / 2);
+        }
+
+        if (cy == 'center') {
+            cy = Math.floor(height / 2);
+        }
+
+        var translateMatrix = Matrix.CONSTANT.translate(-cx, -cy);
+        var translateMatrix2 = Matrix.CONSTANT.translate(cx, cy);
+        var shear1Matrix = Matrix.CONSTANT.shear1(angle);
+        var shear2Matrix = Matrix.CONSTANT.shear2(angle);
+
+        packXY(function (pixels, i, x, y) {
+            // console.log(x, y, i)
+            var arr = Matrix.multiply(translateMatrix, [x, y, 1]);
+
+            arr = Matrix.multiply(shear1Matrix, arr).map(Math.round);
+            arr = Matrix.multiply(shear2Matrix, arr).map(Math.round);
+            arr = Matrix.multiply(shear1Matrix, arr).map(Math.round);
+            arr = Matrix.multiply(translateMatrix2, arr);
+
+            var _arr = arr,
+                _arr2 = slicedToArray(_arr, 2),
+                x1 = _arr2[0],
+                y1 = _arr2[1];
+
+            if (x1 < 0) return;
+            if (y1 < 0) return;
+            if (x1 > width - 1) return;
+            if (y1 > height - 1) return;
+
+            var endIndex = y1 * width + x1 << 2; //  bit 2 shift is  * 4  
+
+            fillPixelColor(pixels, endIndex, bitmap.pixels, i);
+        })(newBitmap, function () {
+            done(newBitmap);
+        }, opt);
+    };
+}
+
+function rotate() {
+    var degree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+    degree = parseParamNumber(degree);
+    degree = degree % 360;
+    return function (bitmap, done) {
+        var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+
+        if (degree == 0) return bitmap;
+
+        if (degree == 90 || degree == 270) {
+            var newBitmap = createBitmap(bitmap.pixels.length, bitmap.height, bitmap.width);
+        } else if (degree == 180) {
+            var newBitmap = createBitmap(bitmap.pixels.length, bitmap.width, bitmap.height);
+        } else {
+            return rotateDegree(degree)(bitmap, done, opt);
+        }
+        packXY(function (pixels, i, x, y) {
+
+            if (degree == 90) {
+                var endIndex = x * newBitmap.width + (newBitmap.width - 1 - y) << 2; //  << 2 is equals to (multiply)* 4 
+            } else if (degree == 270) {
+                var endIndex = (newBitmap.height - 1 - x) * newBitmap.width + y << 2;
+            } else if (degree == 180) {
+                var endIndex = (newBitmap.height - 1 - y) * newBitmap.width + (newBitmap.width - 1 - x) << 2;
+            }
+
+            fillPixelColor(newBitmap.pixels, endIndex, bitmap.pixels, i);
+        })(bitmap, function () {
+            done(newBitmap);
+        }, opt);
+    };
+}
+
+function histogram$1() {
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'gray';
+    var points = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
+    var $realPoints = [];
+
+    for (var i = 0; i < points.length - 1; i++) {
+        var sp = points[i];
+        var ep = points[i + 1];
+
+        var distX = ep[0] - sp[0];
+        var distY = ep[1] - sp[1];
+
+        var rate = distY / distX;
+
+        for (var realIndex = 0, start = sp[0]; realIndex < distX; realIndex++, start++) {
+            $realPoints[start] = sp[1] + realIndex * rate;
+        }
+    }
+
+    $realPoints[255] = 255;
+
+    if (type === 'red') {
+        return pixel(function () {
+            $r = $realPoints[$r];
+        }, {}, { $realPoints: $realPoints });
+    } else if (type === 'green') {
+        return pixel(function () {
+            $g = $realPoints[$g];
+        }, {}, { $realPoints: $realPoints });
+    } else if (type === 'blue') {
+        return pixel(function () {
+            $b = $realPoints[$b];
+        }, {}, { $realPoints: $realPoints });
+    } else {
+        return pixel(function () {
+
+            var l = Color.RGBtoYCrCb($r, $g, $b);
+            var c = Color.YCrCbtoRGB(clamp($realPoints[clamp(l.y)]), l.cr, l.cb, 0);
+            $r = c.r;
+            $g = c.g;
+            $b = c.b;
+        }, {}, { $realPoints: $realPoints });
+    }
+}
+
+var image$1 = {
+    crop: crop,
+    resize: resize,
+    flipH: flipH,
+    flipV: flipV,
+    rotate: rotate,
+    rotateDegree: rotateDegree,
+    histogram: histogram$1,
+    'rotate-degree': rotateDegree
+};
+
+function bitonal(darkColor, lightColor) {
+    var threshold = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100;
+
+    var $darkColor = Color$1.parse(darkColor);
+    var $lightColor = Color$1.parse(lightColor);
+    var $threshold = threshold;
+
+    return pixel('\n        const thresholdColor = ( $r + $g + $b ) <= $threshold ? $darkColor : $lightColor\n\n        $r = thresholdColor.r\n        $g = thresholdColor.g \n        $b = thresholdColor.b \n    ', {
+        $threshold: $threshold
+    }, {
+        $darkColor: $darkColor,
+        $lightColor: $lightColor
+    });
+}
+
+/*
+ * @param {Number} amount  -100..100  ,  value < 0  is darken, value > 0 is brighten 
+ */
+function brightness$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    amount = parseParamNumber(amount);
+    var $C = Math.floor(255 * (amount / 100));
+
+    return pixel('\n        $r += $C \n        $g += $C \n        $b += $C \n    ', { $C: $C });
+}
+
+function brownie() {
+
+    var $matrix = [0.5997023498159715, 0.34553243048391263, -0.2708298674538042, 0, -0.037703249837783157, 0.8609577587992641, 0.15059552388459913, 0, 0.24113635128153335, -0.07441037908422492, 0.44972182064877153, 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+/**
+ * 
+ * @param {Number} amount from 0 to 100 
+ */
+function clip() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+    amount = parseParamNumber(amount);
+    var $C = Math.abs(amount) * 2.55;
+
+    return pixel('\n\n        $r = ($r > 255 - $C) ? 255 : 0\n        $g = ($g > 255 - $C) ? 255 : 0\n        $b = ($b > 255 - $C) ? 255 : 0\n\n    ', { $C: $C });
+}
+
+/**
+ * 
+ * @param {*} amount   min = -128, max = 128 
+ */
+function contrast$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+    amount = parseParamNumber(amount);
+    var $C = Math.max((128 + amount) / 128, 0);
+
+    return pixel('\n        $r *= $C\n        $g *= $C\n        $b *= $C\n    ', { $C: $C });
+}
+
+function gamma() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var $C = parseParamNumber(amount);
+    return pixel('\n        $r = Math.pow($r / 255, $C) * 255\n        $g = Math.pow($g / 255, $C) * 255\n        $b = Math.pow($b / 255, $C) * 255\n    ', { $C: $C });
+}
+
+/**
+ * F.gradient('red', 'blue', 'yellow', 'white', 10)
+ * F.gradient('red, blue, yellow, white, 10')
+ */
+function gradient$1() {
+    // ์ „์ฒด ๋งค๊ฐœ๋ณ€์ˆ˜ ๊ธฐ์ค€์œผ๋กœ ํŒŒ์‹ฑ 
+    // ์ƒ‰์ด ์•„๋‹Œ ๊ฒƒ ๊ธฐ์ค€์œผ๋กœ scale ๋ณ€์ˆ˜๋กœ ์ธ์‹ 
+
+    var params = [].concat(Array.prototype.slice.call(arguments));
+
+    if (params.length === 1 && typeof params[0] === 'string') {
+        params = Color$1.convertMatchesArray(params[0]);
+    }
+
+    params = params.map(function (arg) {
+        var res = Color$1.matches(arg);
+
+        if (!res.length) {
+            return { type: 'scale', value: arg };
+        }
+
+        return { type: 'param', value: arg };
+    });
+
+    var $scale = params.filter(function (it) {
+        return it.type == 'scale';
+    })[0];
+    $scale = $scale ? +$scale.value : 256;
+
+    params = params.filter(function (it) {
+        return it.type == 'param';
+    }).map(function (it) {
+        return it.value;
+    }).join(',');
+
+    var $colors = Color$1.gradient(params, $scale).map(function (c) {
+        var _Color$parse = Color$1.parse(c),
+            r = _Color$parse.r,
+            g = _Color$parse.g,
+            b = _Color$parse.b,
+            a = _Color$parse.a;
+
+        return { r: r, g: g, b: b, a: a };
+    });
+
+    return pixel('\n        const colorIndex = clamp(Math.ceil($r * 0.2126 + $g * 0.7152 + $b * 0.0722))\n        const newColorIndex = clamp(Math.floor(colorIndex * ($scale / 256)))\n        const color = $colors[newColorIndex]\n\n        $r = color.r \n        $g = color.g \n        $b = color.b \n        $a = clamp(Math.floor(color.a * 256))\n    ', {}, { $colors: $colors, $scale: $scale });
+}
+
+function grayscale(amount) {
+    amount = parseParamNumber(amount);
+    var C = amount / 100;
+
+    if (C > 1) C = 1;
+
+    var $matrix = [0.2126 + 0.7874 * (1 - C), 0.7152 - 0.7152 * (1 - C), 0.0722 - 0.0722 * (1 - C), 0, 0.2126 - 0.2126 * (1 - C), 0.7152 + 0.2848 * (1 - C), 0.0722 - 0.0722 * (1 - C), 0, 0.2126 - 0.2126 * (1 - C), 0.7152 - 0.7152 * (1 - C), 0.0722 + 0.9278 * (1 - C), 0, 0, 0, 0, 1];
+
+    return pixel( /*javascript*/'\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a\n    ', {
+        $matrix: $matrix
+    });
+}
+
+/*
+ * @param {Number} amount   0..360  
+ */
+function hue() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 360;
+
+    var $C = parseParamNumber(amount);
+    return pixel('\n        var hsv = Color.RGBtoHSV($r, $g, $b);\n\n        // 0 ~ 360 \n        var h = hsv.h;\n        h += Math.abs($C)\n        h = h % 360\n        hsv.h = h\n\n        var rgb = Color.HSVtoRGB(hsv);\n\n        $r = rgb.r\n        $g = rgb.g\n        $b = rgb.b\n    ', {
+        $C: $C
+    });
+}
+
+function invert() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    var $C = amount / 100;
+
+    return pixel('\n        $r = (255 - $r) * $C\n        $g = (255 - $g) * $C\n        $b = (255 - $b) * $C\n    ', {
+        $C: $C
+    });
+}
+
+function kodachrome() {
+
+    var $matrix = [1.1285582396593525, -0.3967382283601348, -0.03992559172921793, 0, -0.16404339962244616, 1.0835251566291304, -0.05498805115633132, 0, -0.16786010706155763, -0.5603416277695248, 1.6014850761964943, 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+function matrix() {
+    var $a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var $b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var $c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var $d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var $e = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+    var $f = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+    var $g = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 0;
+    var $h = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 0;
+    var $i = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 0;
+    var $j = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 0;
+    var $k = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : 0;
+    var $l = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : 0;
+    var $m = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : 0;
+    var $n = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : 0;
+    var $o = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : 0;
+    var $p = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : 0;
+
+
+    var $matrix = [$a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m, $n, $o, $p];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+/**
+ * 
+ * @param {Number} amount 1..100
+ */
+function noise() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var $C = parseParamNumber(amount);
+    return pixel('\n        const C = Math.abs($C) * 5\n        const min = -C\n        const max = C \n        const noiseValue = Math.round(min + (Math.random() * (max - min)))\n\n        $r += noiseValue\n        $g += noiseValue\n        $b += noiseValue\n    ', {
+        $C: $C
+    });
+}
+
+function opacity() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    var $C = amount / 100;
+
+    return pixel('\n        $a *= $C \n    ', { $C: $C });
+}
+
+function polaroid() {
+
+    var $matrix = [1.438, -0.062, -0.062, 0, -0.122, 1.378, -0.122, 0, -0.016, -0.016, 1.483, 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+/*
+ * @param {Number} amount  -100..100 
+ */
+function saturation() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    var C = amount / 100;
+    var L = 1 - Math.abs(C);
+
+    var $matrix = [L, 0, 0, 0, 0, L, 0, 0, 0, 0, L, 0, 0, 0, 0, L];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+/*
+ * @param {Number} amount  0..1 
+ */
+function sepia() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = parseParamNumber(amount);
+    if (C > 1) C = 1;
+
+    var $matrix = [0.393 + 0.607 * (1 - C), 0.769 - 0.769 * (1 - C), 0.189 - 0.189 * (1 - C), 0, 0.349 - 0.349 * (1 - C), 0.686 + 0.314 * (1 - C), 0.168 - 0.168 * (1 - C), 0, 0.272 - 0.272 * (1 - C), 0.534 - 0.534 * (1 - C), 0.131 + 0.869 * (1 - C), 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+function shade() {
+    var redValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+    var greenValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+    var blueValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+
+    var $redValue = parseParamNumber(redValue);
+    var $greenValue = parseParamNumber(greenValue);
+    var $blueValue = parseParamNumber(blueValue);
+
+    return pixel('\n        $r *= $redValue\n        $g *= $greenValue\n        $b *= $blueValue\n    ', {
+        $redValue: $redValue,
+        $greenValue: $greenValue,
+        $blueValue: $blueValue
+    });
+}
+
+function shift() {
+
+    var $matrix = [1.438, -0.062, -0.062, 0, -0.122, 1.378, -0.122, 0, -0.016, -0.016, 1.483, 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+/**
+ * change the relative darkness of (a part of an image) by overexposure to light.
+ * @param {*} r 
+ * @param {*} g 
+ * @param {*} b 
+ */
+function solarize(redValue, greenValue, blueValue) {
+    var $redValue = parseParamNumber(redValue);
+    var $greenValue = parseParamNumber(greenValue);
+    var $blueValue = parseParamNumber(blueValue);
+    return pixel('\n        $r = ($r < $redValue) ? 255 - $r: $r\n        $g = ($g < $greenValue) ? 255 - $g: $g\n        $b = ($b < $blueValue) ? 255 - $b: $b\n    ', {
+        $redValue: $redValue, $greenValue: $greenValue, $blueValue: $blueValue
+    });
+}
+
+function technicolor() {
+
+    var $matrix = [1.9125277891456083, -0.8545344976951645, -0.09155508482755585, 0, -0.3087833385928097, 1.7658908555458428, -0.10601743074722245, 0, -0.231103377548616, -0.7501899197440212, 1.847597816108189, 0, 0, 0, 0, 1];
+
+    return pixel('\n        $r = $matrix[0] * $r + $matrix[1] * $g + $matrix[2] * $b + $matrix[3] * $a\n        $g = $matrix[4] * $r + $matrix[5] * $g + $matrix[6] * $b + $matrix[7] * $a\n        $b = $matrix[8] * $r + $matrix[9] * $g + $matrix[10] * $b + $matrix[11] * $a\n        $a = $matrix[12] * $r + $matrix[13] * $g + $matrix[14] * $b + $matrix[15] * $a        \n    ', {
+        $matrix: $matrix
+    });
+}
+
+function thresholdColor() {
+    var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 200;
+    var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
+    var hasColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
+    var $scale = parseParamNumber(scale);
+    amount = parseParamNumber(amount);
+    var $C = amount / 100;
+    var $hasColor = hasColor;
+
+    return pixel('\n        // refer to Color.brightness \n        const v = ($C * Math.ceil($r * 0.2126 + $g * 0.7152 + $b * 0.0722) ) >= $scale ? 255 : 0;\n\n        if ($hasColor) {\n\n            if (v == 0) {\n                $r = 0 \n                $g = 0 \n                $b = 0\n            }\n            \n        } else {\n            const value = Math.round(v)\n            $r = value \n            $g = value \n            $b = value \n        }\n        \n    ', {
+        $C: $C, $scale: $scale, $hasColor: $hasColor
+    });
+}
+
+/*
+ * @param {Number} amount  0..100 
+ */
+function threshold() {
+  var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 200;
+  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
+
+  return thresholdColor(scale, amount, false);
+}
+
+function tint () {
+    var redTint = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+    var greenTint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+    var blueTint = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+
+    var $redTint = parseParamNumber(redTint);
+    var $greenTint = parseParamNumber(greenTint);
+    var $blueTint = parseParamNumber(blueTint);
+    return pixel("\n\n        $r += (255 - $r) * $redTint\n        $g += (255 - $g) * $greenTint\n        $b += (255 - $b) * $blueTint\n\n    ", {
+        $redTint: $redTint,
+        $greenTint: $greenTint,
+        $blueTint: $blueTint
+    });
+}
+
+var pixel$1 = {
+    bitonal: bitonal,
+    brightness: brightness$1,
+    brownie: brownie,
+    clip: clip,
+    contrast: contrast$1,
+    gamma: gamma,
+    gradient: gradient$1,
+    grayscale: grayscale,
+    hue: hue,
+    invert: invert,
+    kodachrome: kodachrome,
+    matrix: matrix,
+    noise: noise,
+    opacity: opacity,
+    polaroid: polaroid,
+    saturation: saturation,
+    sepia: sepia,
+    shade: shade,
+    shift: shift,
+    solarize: solarize,
+    technicolor: technicolor,
+    threshold: threshold,
+    'threshold-color': thresholdColor,
+    tint: tint
+};
+
+function blur () {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3;
+    amount = parseParamNumber(amount);
+
+    return convolution(createBlurMatrix(amount));
+}
+
+/*
+ * carve, mold, or stamp a design on (a surface) so that it stands out in relief.
+ * 
+ * @param {Number} amount   0.0 .. 4.0 
+ */
+function emboss() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 4;
+
+    amount = parseParamNumber(amount);
+    return convolution([amount * -2.0, -amount, 0.0, -amount, 1.0, amount, 0.0, amount, amount * 2.0]);
+}
+
+function gaussianBlur() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    var C = amount / 100;
+
+    return convolution(weight([1, 2, 1, 2, 4, 2, 1, 2, 1], 1 / 16 * C));
+}
+
+function gaussianBlur5x() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    var C = amount / 100;
+    return convolution(weight([1, 4, 6, 4, 1, 4, 16, 24, 16, 4, 6, 24, 36, 24, 6, 4, 16, 24, 16, 4, 1, 4, 6, 4, 1], 1 / 256 * C));
+}
+
+function grayscale2() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([0.3, 0.3, 0.3, 0, 0, 0.59, 0.59, 0.59, 0, 0, 0.11, 0.11, 0.11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], amount / 100));
+}
+
+function identity() {
+    return convolution([0, 0, 0, 0, 1, 0, 0, 0, 0]);
+}
+
+function kirschHorizontal() {
+    var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    count = parseParamNumber(count);
+    return convolution([5, 5, 5, -3, 0, -3, -3, -3, -3]);
+}
+
+function kirschVertical() {
+    var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    count = parseParamNumber(count);
+    return convolution([5, -3, -3, 5, 0, -3, 5, -3, -3]);
+}
+
+function laplacian() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([-1, -1, -1, -1, 8, -1, -1, -1, -1], amount / 100));
+}
+
+function laplacian5x() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], amount / 100));
+}
+
+function motionBlur() {
+    return convolution(weight([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1], 1 / 9));
+}
+
+function motionBlur2() {
+    return convolution(weight([1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1], 1 / 9));
+}
+
+function motionBlur3() {
+    return convolution(weight([1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1], 1 / 9));
+}
+
+function negative() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([-1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1], amount / 100));
+}
+
+function sepia2() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([0.393, 0.349, 0.272, 0, 0, 0.769, 0.686, 0.534, 0, 0, 0.189, 0.168, 0.131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], amount / 100));
+}
+
+function sharpen() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([0, -1, 0, -1, 5, -1, 0, -1, 0], amount / 100));
+}
+
+function sobelHorizontal() {
+    return convolution([-1, -2, -1, 0, 0, 0, 1, 2, 1]);
+}
+
+function sobelVertical() {
+    return convolution([-1, 0, 1, -2, 0, 2, -1, 0, 1]);
+}
+
+/*
+
+StackBlur - a fast almost Gaussian Blur For Canvas
+
+Version: 	0.5
+Author:		Mario Klingemann
+Contact: 	mario@quasimondo.com
+Website:	http://www.quasimondo.com/StackBlurForCanvas
+Twitter:	@quasimondo
+
+In case you find this class useful - especially in commercial projects -
+I am not totally unhappy for a small donation to my PayPal account
+mario@quasimondo.de
+
+Or support me on flattr: 
+https://flattr.com/thing/72791/StackBlur-a-fast-almost-Gaussian-Blur-Effect-for-CanvasJavascript
+
+Copyright (c) 2010 Mario Klingemann
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+var mul_table = [512, 512, 456, 512, 328, 456, 335, 512, 405, 328, 271, 456, 388, 335, 292, 512, 454, 405, 364, 328, 298, 271, 496, 456, 420, 388, 360, 335, 312, 292, 273, 512, 482, 454, 428, 405, 383, 364, 345, 328, 312, 298, 284, 271, 259, 496, 475, 456, 437, 420, 404, 388, 374, 360, 347, 335, 323, 312, 302, 292, 282, 273, 265, 512, 497, 482, 468, 454, 441, 428, 417, 405, 394, 383, 373, 364, 354, 345, 337, 328, 320, 312, 305, 298, 291, 284, 278, 271, 265, 259, 507, 496, 485, 475, 465, 456, 446, 437, 428, 420, 412, 404, 396, 388, 381, 374, 367, 360, 354, 347, 341, 335, 329, 323, 318, 312, 307, 302, 297, 292, 287, 282, 278, 273, 269, 265, 261, 512, 505, 497, 489, 482, 475, 468, 461, 454, 447, 441, 435, 428, 422, 417, 411, 405, 399, 394, 389, 383, 378, 373, 368, 364, 359, 354, 350, 345, 341, 337, 332, 328, 324, 320, 316, 312, 309, 305, 301, 298, 294, 291, 287, 284, 281, 278, 274, 271, 268, 265, 262, 259, 257, 507, 501, 496, 491, 485, 480, 475, 470, 465, 460, 456, 451, 446, 442, 437, 433, 428, 424, 420, 416, 412, 408, 404, 400, 396, 392, 388, 385, 381, 377, 374, 370, 367, 363, 360, 357, 354, 350, 347, 344, 341, 338, 335, 332, 329, 326, 323, 320, 318, 315, 312, 310, 307, 304, 302, 299, 297, 294, 292, 289, 287, 285, 282, 280, 278, 275, 273, 271, 269, 267, 265, 263, 261, 259];
+
+var shg_table = [9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24];
+
+function BlurStack() {
+    this.r = 0;
+    this.g = 0;
+    this.b = 0;
+    this.a = 0;
+    this.next = null;
+}
+
+function stackBlurImage(bitmap, radius, blurAlphaChannel) {
+
+    if (blurAlphaChannel) return stackBlurCanvasRGBA(bitmap, 0, 0, radius);else return stackBlurCanvasRGB(bitmap, 0, 0, radius);
+}
+
+function stackBlurCanvasRGBA(bitmap, top_x, top_y, radius) {
+    if (isNaN(radius) || radius < 1) return bitmap;
+    radius |= 0;
+
+    var pixels = bitmap.pixels,
+        width = bitmap.width,
+        height = bitmap.height;
+
+    var x, y, i, p, yp, yi, yw, r_sum, g_sum, b_sum, a_sum, r_out_sum, g_out_sum, b_out_sum, a_out_sum, r_in_sum, g_in_sum, b_in_sum, a_in_sum, pr, pg, pb, pa, rbs;
+
+    var div = radius + radius + 1;
+    var widthMinus1 = width - 1;
+    var heightMinus1 = height - 1;
+    var radiusPlus1 = radius + 1;
+    var sumFactor = radiusPlus1 * (radiusPlus1 + 1) / 2;
+
+    var stackStart = new BlurStack();
+    var stack = stackStart;
+    for (i = 1; i < div; i++) {
+        stack = stack.next = new BlurStack();
+        if (i == radiusPlus1) var stackEnd = stack;
+    }
+    stack.next = stackStart;
+    var stackIn = null;
+    var stackOut = null;
+
+    yw = yi = 0;
+
+    var mul_sum = mul_table[radius];
+    var shg_sum = shg_table[radius];
+
+    for (y = 0; y < height; y++) {
+        r_in_sum = g_in_sum = b_in_sum = a_in_sum = r_sum = g_sum = b_sum = a_sum = 0;
+
+        r_out_sum = radiusPlus1 * (pr = pixels[yi]);
+        g_out_sum = radiusPlus1 * (pg = pixels[yi + 1]);
+        b_out_sum = radiusPlus1 * (pb = pixels[yi + 2]);
+        a_out_sum = radiusPlus1 * (pa = pixels[yi + 3]);
+
+        r_sum += sumFactor * pr;
+        g_sum += sumFactor * pg;
+        b_sum += sumFactor * pb;
+        a_sum += sumFactor * pa;
+
+        stack = stackStart;
+
+        for (i = 0; i < radiusPlus1; i++) {
+            stack.r = pr;
+            stack.g = pg;
+            stack.b = pb;
+            stack.a = pa;
+            stack = stack.next;
+        }
+
+        for (i = 1; i < radiusPlus1; i++) {
+            p = yi + ((widthMinus1 < i ? widthMinus1 : i) << 2);
+            r_sum += (stack.r = pr = pixels[p]) * (rbs = radiusPlus1 - i);
+            g_sum += (stack.g = pg = pixels[p + 1]) * rbs;
+            b_sum += (stack.b = pb = pixels[p + 2]) * rbs;
+            a_sum += (stack.a = pa = pixels[p + 3]) * rbs;
+
+            r_in_sum += pr;
+            g_in_sum += pg;
+            b_in_sum += pb;
+            a_in_sum += pa;
+
+            stack = stack.next;
+        }
+
+        stackIn = stackStart;
+        stackOut = stackEnd;
+        for (x = 0; x < width; x++) {
+            pixels[yi + 3] = pa = a_sum * mul_sum >> shg_sum;
+            if (pa != 0) {
+                pa = 255 / pa;
+                pixels[yi] = (r_sum * mul_sum >> shg_sum) * pa;
+                pixels[yi + 1] = (g_sum * mul_sum >> shg_sum) * pa;
+                pixels[yi + 2] = (b_sum * mul_sum >> shg_sum) * pa;
+            } else {
+                pixels[yi] = pixels[yi + 1] = pixels[yi + 2] = 0;
+            }
+
+            r_sum -= r_out_sum;
+            g_sum -= g_out_sum;
+            b_sum -= b_out_sum;
+            a_sum -= a_out_sum;
+
+            r_out_sum -= stackIn.r;
+            g_out_sum -= stackIn.g;
+            b_out_sum -= stackIn.b;
+            a_out_sum -= stackIn.a;
+
+            p = yw + ((p = x + radius + 1) < widthMinus1 ? p : widthMinus1) << 2;
+
+            r_in_sum += stackIn.r = pixels[p];
+            g_in_sum += stackIn.g = pixels[p + 1];
+            b_in_sum += stackIn.b = pixels[p + 2];
+            a_in_sum += stackIn.a = pixels[p + 3];
+
+            r_sum += r_in_sum;
+            g_sum += g_in_sum;
+            b_sum += b_in_sum;
+            a_sum += a_in_sum;
+
+            stackIn = stackIn.next;
+
+            r_out_sum += pr = stackOut.r;
+            g_out_sum += pg = stackOut.g;
+            b_out_sum += pb = stackOut.b;
+            a_out_sum += pa = stackOut.a;
+
+            r_in_sum -= pr;
+            g_in_sum -= pg;
+            b_in_sum -= pb;
+            a_in_sum -= pa;
+
+            stackOut = stackOut.next;
+
+            yi += 4;
+        }
+        yw += width;
+    }
+
+    for (x = 0; x < width; x++) {
+        g_in_sum = b_in_sum = a_in_sum = r_in_sum = g_sum = b_sum = a_sum = r_sum = 0;
+
+        yi = x << 2;
+        r_out_sum = radiusPlus1 * (pr = pixels[yi]);
+        g_out_sum = radiusPlus1 * (pg = pixels[yi + 1]);
+        b_out_sum = radiusPlus1 * (pb = pixels[yi + 2]);
+        a_out_sum = radiusPlus1 * (pa = pixels[yi + 3]);
+
+        r_sum += sumFactor * pr;
+        g_sum += sumFactor * pg;
+        b_sum += sumFactor * pb;
+        a_sum += sumFactor * pa;
+
+        stack = stackStart;
+
+        for (i = 0; i < radiusPlus1; i++) {
+            stack.r = pr;
+            stack.g = pg;
+            stack.b = pb;
+            stack.a = pa;
+            stack = stack.next;
+        }
+
+        yp = width;
+
+        for (i = 1; i <= radius; i++) {
+            yi = yp + x << 2;
+
+            r_sum += (stack.r = pr = pixels[yi]) * (rbs = radiusPlus1 - i);
+            g_sum += (stack.g = pg = pixels[yi + 1]) * rbs;
+            b_sum += (stack.b = pb = pixels[yi + 2]) * rbs;
+            a_sum += (stack.a = pa = pixels[yi + 3]) * rbs;
+
+            r_in_sum += pr;
+            g_in_sum += pg;
+            b_in_sum += pb;
+            a_in_sum += pa;
+
+            stack = stack.next;
+
+            if (i < heightMinus1) {
+                yp += width;
+            }
+        }
+
+        yi = x;
+        stackIn = stackStart;
+        stackOut = stackEnd;
+        for (y = 0; y < height; y++) {
+            p = yi << 2;
+            pixels[p + 3] = pa = a_sum * mul_sum >> shg_sum;
+            if (pa > 0) {
+                pa = 255 / pa;
+                pixels[p] = (r_sum * mul_sum >> shg_sum) * pa;
+                pixels[p + 1] = (g_sum * mul_sum >> shg_sum) * pa;
+                pixels[p + 2] = (b_sum * mul_sum >> shg_sum) * pa;
+            } else {
+                pixels[p] = pixels[p + 1] = pixels[p + 2] = 0;
+            }
+
+            r_sum -= r_out_sum;
+            g_sum -= g_out_sum;
+            b_sum -= b_out_sum;
+            a_sum -= a_out_sum;
+
+            r_out_sum -= stackIn.r;
+            g_out_sum -= stackIn.g;
+            b_out_sum -= stackIn.b;
+            a_out_sum -= stackIn.a;
+
+            p = x + ((p = y + radiusPlus1) < heightMinus1 ? p : heightMinus1) * width << 2;
+
+            r_sum += r_in_sum += stackIn.r = pixels[p];
+            g_sum += g_in_sum += stackIn.g = pixels[p + 1];
+            b_sum += b_in_sum += stackIn.b = pixels[p + 2];
+            a_sum += a_in_sum += stackIn.a = pixels[p + 3];
+
+            stackIn = stackIn.next;
+
+            r_out_sum += pr = stackOut.r;
+            g_out_sum += pg = stackOut.g;
+            b_out_sum += pb = stackOut.b;
+            a_out_sum += pa = stackOut.a;
+
+            r_in_sum -= pr;
+            g_in_sum -= pg;
+            b_in_sum -= pb;
+            a_in_sum -= pa;
+
+            stackOut = stackOut.next;
+
+            yi += width;
+        }
+    }
+
+    return bitmap;
+}
+
+function stackBlurCanvasRGBA(bitmap, top_x, top_y, radius) {
+    if (isNaN(radius) || radius < 1) return bitmap;
+    radius |= 0;
+
+    var pixels = bitmap.pixels,
+        width = bitmap.width,
+        height = bitmap.height;
+
+    var x, y, i, p, yp, yi, yw, r_sum, g_sum, b_sum, r_out_sum, g_out_sum, b_out_sum, r_in_sum, g_in_sum, b_in_sum, pr, pg, pb, rbs;
+
+    var div = radius + radius + 1;
+    var widthMinus1 = width - 1;
+    var heightMinus1 = height - 1;
+    var radiusPlus1 = radius + 1;
+    var sumFactor = radiusPlus1 * (radiusPlus1 + 1) / 2;
+
+    var stackStart = new BlurStack();
+    var stack = stackStart;
+    for (i = 1; i < div; i++) {
+        stack = stack.next = new BlurStack();
+        if (i == radiusPlus1) var stackEnd = stack;
+    }
+    stack.next = stackStart;
+    var stackIn = null;
+    var stackOut = null;
+
+    yw = yi = 0;
+
+    var mul_sum = mul_table[radius];
+    var shg_sum = shg_table[radius];
+
+    for (y = 0; y < height; y++) {
+        r_in_sum = g_in_sum = b_in_sum = r_sum = g_sum = b_sum = 0;
+
+        r_out_sum = radiusPlus1 * (pr = pixels[yi]);
+        g_out_sum = radiusPlus1 * (pg = pixels[yi + 1]);
+        b_out_sum = radiusPlus1 * (pb = pixels[yi + 2]);
+
+        r_sum += sumFactor * pr;
+        g_sum += sumFactor * pg;
+        b_sum += sumFactor * pb;
+
+        stack = stackStart;
+
+        for (i = 0; i < radiusPlus1; i++) {
+            stack.r = pr;
+            stack.g = pg;
+            stack.b = pb;
+            stack = stack.next;
+        }
+
+        for (i = 1; i < radiusPlus1; i++) {
+            p = yi + ((widthMinus1 < i ? widthMinus1 : i) << 2);
+            r_sum += (stack.r = pr = pixels[p]) * (rbs = radiusPlus1 - i);
+            g_sum += (stack.g = pg = pixels[p + 1]) * rbs;
+            b_sum += (stack.b = pb = pixels[p + 2]) * rbs;
+
+            r_in_sum += pr;
+            g_in_sum += pg;
+            b_in_sum += pb;
+
+            stack = stack.next;
+        }
+
+        stackIn = stackStart;
+        stackOut = stackEnd;
+        for (x = 0; x < width; x++) {
+            pixels[yi] = r_sum * mul_sum >> shg_sum;
+            pixels[yi + 1] = g_sum * mul_sum >> shg_sum;
+            pixels[yi + 2] = b_sum * mul_sum >> shg_sum;
+
+            r_sum -= r_out_sum;
+            g_sum -= g_out_sum;
+            b_sum -= b_out_sum;
+
+            r_out_sum -= stackIn.r;
+            g_out_sum -= stackIn.g;
+            b_out_sum -= stackIn.b;
+
+            p = yw + ((p = x + radius + 1) < widthMinus1 ? p : widthMinus1) << 2;
+
+            r_in_sum += stackIn.r = pixels[p];
+            g_in_sum += stackIn.g = pixels[p + 1];
+            b_in_sum += stackIn.b = pixels[p + 2];
+
+            r_sum += r_in_sum;
+            g_sum += g_in_sum;
+            b_sum += b_in_sum;
+
+            stackIn = stackIn.next;
+
+            r_out_sum += pr = stackOut.r;
+            g_out_sum += pg = stackOut.g;
+            b_out_sum += pb = stackOut.b;
+
+            r_in_sum -= pr;
+            g_in_sum -= pg;
+            b_in_sum -= pb;
+
+            stackOut = stackOut.next;
+
+            yi += 4;
+        }
+        yw += width;
+    }
+
+    for (x = 0; x < width; x++) {
+        g_in_sum = b_in_sum = r_in_sum = g_sum = b_sum = r_sum = 0;
+
+        yi = x << 2;
+        r_out_sum = radiusPlus1 * (pr = pixels[yi]);
+        g_out_sum = radiusPlus1 * (pg = pixels[yi + 1]);
+        b_out_sum = radiusPlus1 * (pb = pixels[yi + 2]);
+
+        r_sum += sumFactor * pr;
+        g_sum += sumFactor * pg;
+        b_sum += sumFactor * pb;
+
+        stack = stackStart;
+
+        for (i = 0; i < radiusPlus1; i++) {
+            stack.r = pr;
+            stack.g = pg;
+            stack.b = pb;
+            stack = stack.next;
+        }
+
+        yp = width;
+
+        for (i = 1; i <= radius; i++) {
+            yi = yp + x << 2;
+
+            r_sum += (stack.r = pr = pixels[yi]) * (rbs = radiusPlus1 - i);
+            g_sum += (stack.g = pg = pixels[yi + 1]) * rbs;
+            b_sum += (stack.b = pb = pixels[yi + 2]) * rbs;
+
+            r_in_sum += pr;
+            g_in_sum += pg;
+            b_in_sum += pb;
+
+            stack = stack.next;
+
+            if (i < heightMinus1) {
+                yp += width;
+            }
+        }
+
+        yi = x;
+        stackIn = stackStart;
+        stackOut = stackEnd;
+        for (y = 0; y < height; y++) {
+            p = yi << 2;
+            pixels[p] = r_sum * mul_sum >> shg_sum;
+            pixels[p + 1] = g_sum * mul_sum >> shg_sum;
+            pixels[p + 2] = b_sum * mul_sum >> shg_sum;
+
+            r_sum -= r_out_sum;
+            g_sum -= g_out_sum;
+            b_sum -= b_out_sum;
+
+            r_out_sum -= stackIn.r;
+            g_out_sum -= stackIn.g;
+            b_out_sum -= stackIn.b;
+
+            p = x + ((p = y + radiusPlus1) < heightMinus1 ? p : heightMinus1) * width << 2;
+
+            r_sum += r_in_sum += stackIn.r = pixels[p];
+            g_sum += g_in_sum += stackIn.g = pixels[p + 1];
+            b_sum += b_in_sum += stackIn.b = pixels[p + 2];
+
+            stackIn = stackIn.next;
+
+            r_out_sum += pr = stackOut.r;
+            g_out_sum += pg = stackOut.g;
+            b_out_sum += pb = stackOut.b;
+
+            r_in_sum -= pr;
+            g_in_sum -= pg;
+            b_in_sum -= pb;
+
+            stackOut = stackOut.next;
+
+            yi += width;
+        }
+    }
+
+    return bitmap;
+}
+
+function stackBlur () {
+    var radius = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10;
+    var hasAlphaChannel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+    radius = parseParamNumber(radius);
+
+    return function (bitmap, done) {
+        var newBitmap = stackBlurImage(bitmap, radius, hasAlphaChannel);
+
+        done(newBitmap);
+    };
+}
+
+function transparency() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 100;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0.3, 0, 0, 0, 0, 0, 1], amount / 100));
+}
+
+function unsharpMasking() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 256;
+
+    amount = parseParamNumber(amount);
+    return convolution(weight([1, 4, 6, 4, 1, 4, 16, 24, 16, 4, 6, 24, -476, 24, 6, 4, 16, 24, 16, 4, 1, 4, 6, 4, 1], -1 / amount));
+}
+
+var matrix$1 = {
+     blur: blur,
+     emboss: emboss,
+     gaussianBlur: gaussianBlur,
+     'gaussian-blur': gaussianBlur,
+     gaussianBlur5x: gaussianBlur5x,
+     'gaussian-blur-5x': gaussianBlur5x,
+     grayscale2: grayscale2,
+     normal: identity,
+     kirschHorizontal: kirschHorizontal,
+     'kirsch-horizontal': kirschHorizontal,
+     kirschVertical: kirschVertical,
+     'kirsch-vertical': kirschVertical,
+     laplacian: laplacian,
+     laplacian5x: laplacian5x,
+     'laplacian-5x': laplacian5x,
+     motionBlur: motionBlur,
+     'motion-blur': motionBlur,
+     motionBlur2: motionBlur2,
+     'motion-blur-2': motionBlur2,
+     motionBlur3: motionBlur3,
+     'motion-blur-3': motionBlur3,
+     negative: negative,
+     sepia2: sepia2,
+     sharpen: sharpen,
+     sobelHorizontal: sobelHorizontal,
+     'sobel-horizontal': sobelHorizontal,
+     sobelVertical: sobelVertical,
+     'sobel-vertical': sobelVertical,
+     stackBlur: stackBlur,
+     'stack-blur': stackBlur,
+     transparency: transparency,
+     unsharpMasking: unsharpMasking,
+     'unsharp-masking': unsharpMasking
+};
+
+function kirsch() {
+    return filter$1('kirsch-horizontal kirsch-vertical');
+}
+
+function sobel() {
+    return filter$1('sobel-horizontal sobel-vertical');
+}
+
+function vintage() {
+    return filter$1('brightness(15) saturation(-20) gamma(1.8)');
+}
+
+var multi$2 = {
+    kirsch: kirsch,
+    sobel: sobel,
+    vintage: vintage
+};
+
+var FilterList = _extends({}, image$1, pixel$1, matrix$1, multi$2);
+
+var _functions;
+
+var makeId = 0;
+
+var functions$1 = (_functions = {
+    partial: partial,
+    multi: multi$1,
+    merge: merge$1,
+    weight: weight,
+    repeat: repeat,
+    colorMatrix: colorMatrix,
+    each: each$1,
+    eachXY: eachXY,
+    createRandomCount: createRandomCount,
+    createRandRange: createRandRange,
+    createBitmap: createBitmap,
+    createBlurMatrix: createBlurMatrix,
+    pack: pack$1,
+    packXY: packXY,
+    pixel: pixel,
+    getBitmap: getBitmap,
+    putBitmap: putBitmap,
+    radian: radian,
+    convolution: convolution,
+    parseParamNumber: parseParamNumber,
+    filter: filter$1,
+    clamp: clamp$1,
+    fillColor: fillColor,
+    fillPixelColor: fillPixelColor
+}, defineProperty(_functions, 'multi', multi$1), defineProperty(_functions, 'merge', merge$1), defineProperty(_functions, 'matches', matches$1), defineProperty(_functions, 'parseFilter', parseFilter), defineProperty(_functions, 'partial', partial), _functions);
+
+var LocalFilter = functions$1;
+
+function weight(arr) {
+    var num = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+
+    return arr.map(function (i) {
+        return i * num;
+    });
+}
+
+function repeat(value, num) {
+    var arr = new Array(num);
+    for (var i = 0; i < num; i++) {
+        arr[i] = value;
+    }
+    return arr;
+}
+
+function colorMatrix(pixels, i, matrix) {
+    var r = pixels[i],
+        g = pixels[i + 1],
+        b = pixels[i + 2],
+        a = pixels[i + 3];
+
+    fillColor(pixels, i, matrix[0] * r + matrix[1] * g + matrix[2] * b + matrix[3] * a, matrix[4] * r + matrix[5] * g + matrix[6] * b + matrix[7] * a, matrix[8] * r + matrix[9] * g + matrix[10] * b + matrix[11] * a, matrix[12] * r + matrix[13] * g + matrix[14] * b + matrix[15] * a);
+}
+
+function makeFilter$1(filter) {
+
+    if (typeof filter == 'function') {
+        return filter;
+    }
+
+    if (typeof filter == 'string') {
+        filter = [filter];
+    }
+
+    filter = filter.slice(0);
+    var filterName = filter.shift();
+
+    if (typeof filterName == 'function') {
+        return filterName;
+    }
+
+    var params = filter;
+
+    var filterFunction = FilterList[filterName] || LocalFilter[filterName];
+
+    if (!filterFunction) {
+        throw new Error(filterName + ' is not filter. please check filter name.');
+    }
+    return filterFunction.apply(filterFunction, params);
+}
+
+function forLoop(max) {
+    var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var step = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+    var callback = arguments[3];
+    var done = arguments[4];
+    var functionDumpCount = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 10000;
+    var frameTimer = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'full';
+    var loopCount = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 50;
+
+    var runIndex = index;
+    var timer = function timer(callback) {
+        setTimeout(callback, 0);
+    };
+
+    if (frameTimer == 'requestAnimationFrame') {
+        timer = requestAnimationFrame;
+        functionDumpCount = 1000;
+    }
+
+    if (frameTimer == 'full') {
+        /* only for loop  */
+        timer = null;
+        functionDumpCount = max;
+    }
+
+    function makeFunction() {
+        var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 50;
+
+        var arr = [].concat(toConsumableArray(Array(count)));
+
+        var functionStrings = arr.map(function (countIndex) {
+            return 'cri = ri + i * s; if (cri >= mx) return {currentRunIndex: cri, i: null}; c(cri); i++;';
+        }).join('\n');
+
+        var smallLoopFunction = new Function('ri', 'i', 's', 'mx', 'c', '\n            let cri = ri;\n            \n            ' + functionStrings + '\n            \n            return {currentRunIndex: cri, i: i} \n        ');
+
+        return smallLoopFunction;
+    }
+
+    function runCallback() {
+
+        var smallLoopFunction = makeFunction(loopCount); // loop is call  20 callbacks at once 
+
+        var currentRunIndex = runIndex;
+        var ret = {};
+        var i = 0;
+        while (i < functionDumpCount) {
+            ret = smallLoopFunction(runIndex, i, step, max, callback);
+
+            if (ret.i == null) {
+                currentRunIndex = ret.currentRunIndex;
+                break;
+            }
+
+            i = ret.i;
+            currentRunIndex = ret.currentRunIndex;
+        }
+
+        nextCallback(currentRunIndex);
+    }
+
+    function nextCallback(currentRunIndex) {
+        if (currentRunIndex) {
+            runIndex = currentRunIndex;
+        } else {
+            runIndex += step;
+        }
+
+        if (runIndex >= max) {
+            done();
+            return;
+        }
+
+        if (timer) timer(runCallback);else runCallback();
+    }
+
+    runCallback();
+}
+
+function each$1(len, callback, done) {
+    var opt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+
+    forLoop(len, 0, 4, function (i) {
+        callback(i, i >> 2 /* xyIndex */);
+    }, function () {
+        done();
+    }, opt.functionDumpCount, opt.frameTimer, opt.loopCount);
+}
+
+function eachXY(len, width, callback, done) {
+    var opt = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
+
+    forLoop(len, 0, 4, function (i) {
+        var xyIndex = i >> 2;
+        callback(i, xyIndex % width, Math.floor(xyIndex / width));
+    }, function () {
+        done();
+    }, opt.functionDumpCount, opt.frameTimer, opt.loopCount);
+}
+
+function createRandRange(min, max, count) {
+    var result = [];
+
+    for (var i = 1; i <= count; i++) {
+        var num = Math.random() * (max - min) + min;
+        var sign = Math.floor(Math.random() * 10) % 2 == 0 ? -1 : 1;
+        result.push(sign * num);
+    }
+
+    result.sort();
+
+    var centerIndex = Math.floor(count >> 1);
+    var a = result[centerIndex];
+    result[centerIndex] = result[0];
+    result[0] = a;
+
+    return result;
+}
+
+function createRandomCount() {
+    return [3 * 3, 4 * 4, 5 * 5, 6 * 6, 7 * 7, 8 * 8, 9 * 9, 10 * 10].sort(function (a, b) {
+        return 0.5 - Math.random();
+    })[0];
+}
+
+function createBitmap(length, width, height) {
+    return { pixels: new Uint8ClampedArray(length), width: width, height: height };
+}
+
+function putPixel(dstBitmap, srcBitmap, startX, startY) {
+
+    var len = srcBitmap.pixels.length / 4;
+    var dstX = 0,
+        dstY = 0,
+        x = 0,
+        y = 0,
+        srcIndex = 0,
+        dstIndex = 0;
+    for (var i = 0; i < len; i++) {
+        x = i % srcBitmap.width, y = Math.floor(i / srcBitmap.width);
+
+        dstX = startX + x;
+        dstY = startY + y;
+
+        if (dstX > dstBitmap.width) continue;
+        if (dstY > dstBitmap.height) continue;
+
+        srcIndex = y * srcBitmap.width + x << 2;
+        dstIndex = dstY * dstBitmap.width + dstX << 2;
+
+        dstBitmap.pixels[dstIndex] = srcBitmap.pixels[srcIndex];
+        dstBitmap.pixels[dstIndex + 1] = srcBitmap.pixels[srcIndex + 1];
+        dstBitmap.pixels[dstIndex + 2] = srcBitmap.pixels[srcIndex + 2];
+        dstBitmap.pixels[dstIndex + 3] = srcBitmap.pixels[srcIndex + 3];
+    }
+}
+
+function getPixel(srcBitmap, dstBitmap, startX, startY) {
+    var len = dstBitmap.pixels.length >> 2;
+    var srcX = 0,
+        srcY = 0,
+        x = 0,
+        y = 0,
+        srcIndex = 0,
+        dstIndex = 0;
+    for (var i = 0; i < len; i++) {
+        var x = i % dstBitmap.width,
+            y = Math.floor(i / dstBitmap.width);
+
+        srcX = startX + x;
+        srcY = startY + y;
+
+        if (srcX > srcBitmap.width) continue;
+        if (srcY > srcBitmap.height) continue;
+
+        srcIndex = srcY * srcBitmap.width + srcX << 2;
+        dstIndex = y * dstBitmap.width + x << 2;
+
+        dstBitmap.pixels[dstIndex] = srcBitmap.pixels[srcIndex];
+        dstBitmap.pixels[dstIndex + 1] = srcBitmap.pixels[srcIndex + 1];
+        dstBitmap.pixels[dstIndex + 2] = srcBitmap.pixels[srcIndex + 2];
+        dstBitmap.pixels[dstIndex + 3] = srcBitmap.pixels[srcIndex + 3];
+    }
+}
+
+function cloneBitmap(bitmap) {
+    var padding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+
+
+    var width = bitmap.width + padding;
+    var height = bitmap.height + padding;
+
+    var newBitmap = { pixels: new Uint8ClampedArray(width * height * 4), width: width, height: height };
+
+    return newBitmap;
+}
+
+function getBitmap(bitmap, area) {
+    return Canvas.getBitmap(bitmap, area);
+}
+
+function putBitmap(bitmap, subBitmap, area) {
+    return Canvas.putBitmap(bitmap, subBitmap, area);
+}
+
+function parseParamNumber(param) {
+    if (typeof param === 'string') {
+        param = param.replace(/deg/, '');
+        param = param.replace(/px/, '');
+    }
+    return +param;
+}
+
+var filter_regexp = /(([\w_\-]+)(\(([^\)]*)\))?)+/gi;
+function pack$1(callback) {
+    return function (bitmap, done) {
+        each$1(bitmap.pixels.length, function (i, xyIndex) {
+            callback(bitmap.pixels, i, xyIndex, bitmap.pixels[i], bitmap.pixels[i + 1], bitmap.pixels[i + 2], bitmap.pixels[i + 3]);
+        }, function () {
+            done(bitmap);
+        });
+    };
+}
+
+function makePrebuildUserFilterList(arr) {
+
+    var codeString = arr.map(function (it) {
+        return ' \n            ' + it.userFunction.$preContext + '\n\n            ' + it.userFunction.$preCallbackString + '\n\n            $r = clamp($r); $g = clamp($g); $b = clamp($b); $a = clamp($a);\n        ';
+    }).join('\n\n');
+
+    var rootContextObject = { clamp: clamp$1, Color: Color$1 };
+    arr.forEach(function (it) {
+        Object.assign(rootContextObject, it.userFunction.rootContextObject);
+    });
+
+    var rootContextDefine = 'const ' + Object.keys(rootContextObject).map(function (key) {
+        return ' ' + key + ' = $rc.' + key + ' ';
+    }).join(',');
+
+    var FunctionCode = ' \n    let $r = $p[$pi], $g = $p[$pi+1], $b = $p[$pi+2], $a = $p[$pi+3];\n    \n    ' + rootContextDefine + '\n\n    ' + codeString + '\n    \n    $p[$pi] = $r; $p[$pi+1] = $g; $p[$pi+2] = $b; $p[$pi+3] = $a;\n    ';
+
+    var userFunction = new Function('$p', '$pi', '$rc', FunctionCode);
+
+    return function ($pixels, $pixelIndex) {
+        userFunction($pixels, $pixelIndex, rootContextObject);
+    };
+}
+
+function makeUserFilterFunctionList(arr) {
+    var rootContextObject = {};
+    var list = arr.map(function (it) {
+        var newKeys = [];
+
+        Object.keys(it.context).forEach(function (key, i) {
+            newKeys[key] = 'n$' + makeId++ + key + '$';
+        });
+
+        Object.keys(it.rootContext).forEach(function (key, i) {
+            newKeys[key] = 'r$' + makeId++ + key + '$';
+
+            rootContextObject[newKeys[key]] = it.rootContext[key];
+        });
+
+        var preContext = Object.keys(it.context).filter(function (key) {
+            if (typeof it.context[key] === 'number' || typeof it.context[key] === 'string') {
+                return false;
+            } else if (Array.isArray(it.context[key])) {
+                if (typeof it.context[key][0] == 'number' || typeof it.context[key][0] == 'string') {
+                    return false;
+                }
+            }
+
+            return true;
+        }).map(function (key, i) {
+            return [newKeys[key], JSON.stringify(it.context[key])].join(' = ');
+        });
+
+        var preCallbackString = it.callback;
+
+        if (typeof it.callback === 'function') {
+            preCallbackString = it.callback.toString().split("{");
+
+            preCallbackString.shift();
+            preCallbackString = preCallbackString.join("{");
+            preCallbackString = preCallbackString.split("}");
+            preCallbackString.pop();
+            preCallbackString = preCallbackString.join("}");
+        }
+
+        Object.keys(newKeys).forEach(function (key) {
+            var newKey = newKeys[key];
+
+            if (typeof it.context[key] === 'number' || typeof it.context[key] === 'string') {
+                preCallbackString = preCallbackString.replace(new RegExp("\\" + key, "g"), it.context[key]);
+            } else if (Array.isArray(it.context[key])) {
+                if (typeof it.context[key][0] == 'number' || typeof it.context[key][0] == 'string') {
+                    it.context[key].forEach(function (item, index) {
+                        preCallbackString = preCallbackString.replace(new RegExp("\\" + key + '\\[' + index + '\\]', "g"), item);
+                    });
+                } else {
+                    preCallbackString = preCallbackString.replace(new RegExp("\\" + key, "g"), newKey);
+                }
+            } else {
+                preCallbackString = preCallbackString.replace(new RegExp("\\" + key, "g"), newKey);
+            }
+        });
+
+        return { preCallbackString: preCallbackString, preContext: preContext };
+    });
+
+    var preContext = list.map(function (it, i) {
+        return it.preContext.length ? 'const ' + it.preContext + ';' : "";
+    }).join('\n\n');
+
+    var preCallbackString = list.map(function (it) {
+        return it.preCallbackString;
+    }).join('\n\n');
+
+    var FunctionCode = ' \n    let $r = $pixels[$pixelIndex], $g = $pixels[$pixelIndex+1], $b = $pixels[$pixelIndex+2], $a = $pixels[$pixelIndex+3];\n\n    ' + preContext + '\n\n    ' + preCallbackString + '\n    \n    $pixels[$pixelIndex] = $r\n    $pixels[$pixelIndex+1] = $g \n    $pixels[$pixelIndex+2] = $b   \n    $pixels[$pixelIndex+3] = $a   \n    ';
+
+    var userFunction = new Function('$pixels', '$pixelIndex', '$clamp', '$Color', FunctionCode);
+
+    userFunction.$preCallbackString = preCallbackString;
+    userFunction.$preContext = preContext;
+    userFunction.rootContextObject = rootContextObject;
+
+    return userFunction;
+}
+
+function makeUserFilterFunction(callback) {
+    var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var rootContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+    return makeUserFilterFunctionList([{ callback: callback, context: context, rootContext: rootContext }]);
+}
+
+function pixel(callback) {
+    var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var rootContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+    var userFunction = makeUserFilterFunction(callback, context, rootContext);
+
+    var returnCallback = function returnCallback(bitmap, done) {};
+
+    returnCallback.userFunction = userFunction;
+
+    return returnCallback;
+}
+
+var ColorListIndex = [0, 1, 2, 3];
+
+function swapColor(pixels, startIndex, endIndex) {
+
+    ColorListIndex.forEach(function (i) {
+        var temp = pixels[startIndex + i];
+        pixels[startIndex + i] = pixels[endIndex + i];
+        pixels[endIndex + i] = temp;
+    });
+}
+
+function packXY(callback) {
+    return function (bitmap, done) {
+        var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+        eachXY(bitmap.pixels.length, bitmap.width, function (i, x, y) {
+            callback(bitmap.pixels, i, x, y);
+        }, function () {
+            done(bitmap);
+        }, opt);
+    };
+}
+
+function radian(degree) {
+    return Matrix.CONSTANT.radian(degree);
+}
+
+function createBlurMatrix() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3;
+
+    var count = Math.pow(amount, 2);
+    var value = 1 / count;
+    return repeat(value, count);
+}
+
+function fillColor(pixels, i, r, g, b, a) {
+    if (arguments.length == 3) {
+        var _arguments$ = arguments[2],
+            r = _arguments$.r,
+            g = _arguments$.g,
+            b = _arguments$.b,
+            a = _arguments$.a;
+    }
+
+    if (typeof r == 'number') {
+        pixels[i] = r;
+    }
+    if (typeof g == 'number') {
+        pixels[i + 1] = g;
+    }
+    if (typeof b == 'number') {
+        pixels[i + 2] = b;
+    }
+    if (typeof a == 'number') {
+        pixels[i + 3] = a;
+    }
+}
+
+function fillPixelColor(targetPixels, targetIndex, sourcePixels, sourceIndex) {
+    fillColor(targetPixels, targetIndex, sourcePixels[sourceIndex], sourcePixels[sourceIndex + 1], sourcePixels[sourceIndex + 2], sourcePixels[sourceIndex + 3]);
+}
+
+
+
+function createWeightTable(weights) {
+    var min = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var max = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 255;
+
+    var weightTable = [];
+
+    weightTable = weights.map(function (w, i) {
+        return [];
+    });
+
+    weights.forEach(function (w, i) {
+
+        if (w != 0) {
+            var data = weightTable[i];
+
+            for (var i = min; i <= max; i++) {
+                data[i] = w * i;
+            }
+        }
+    });
+
+    return weightTable;
+}
+
+function createSubPixelWeightFunction(weights, weightTable, width, height, opaque) {
+
+    var side = Math.round(Math.sqrt(weights.length));
+    var halfSide = Math.floor(side / 2);
+    var alphaFac = opaque ? 1 : 0;
+
+    var FunctionCode = 'let r = 0, g = 0, b = 0, a = 0, scy = 0, scx =0, si = 0; ';
+    var R = [];
+    var G = [];
+    var B = [];
+    var A = [];
+    weights.forEach(function (wt, index) {
+        var cy = Math.floor(index / side);
+        var cx = index % side;
+        var distY = cy - halfSide;
+        var distX = cx - halfSide;
+
+        if (wt == 0) {
+            return;
+        }
+
+        R.push('$t[' + index + '][$sp[(($sy + (' + distY + ')) * ' + width + ' + ($sx + (' + distX + '))) * 4]]');
+        G.push('$t[' + index + '][$sp[(($sy + (' + distY + ')) * ' + width + ' + ($sx + (' + distX + '))) * 4 + 1]]');
+        B.push('$t[' + index + '][$sp[(($sy + (' + distY + ')) * ' + width + ' + ($sx + (' + distX + '))) * 4 + 2]]');
+        A.push('$t[' + index + '][$sp[(($sy + (' + distY + ')) * ' + width + ' + ($sx + (' + distX + '))) * 4 + 3]]');
+    });
+
+    FunctionCode += 'r = ' + R.join(' + ') + '; g = ' + G.join(' + ') + '; b = ' + B.join(' + ') + '; a = ' + A.join(' + ') + ';';
+    FunctionCode += '$dp[$di] = r; $dp[$di+1] = g;$dp[$di+2] = b;$dp[$di+3] = a + (' + alphaFac + ')*(255-a); ';
+
+    // console.log(FunctionCode)
+
+    var subPixelFunction = new Function('$dp', '$sp', '$di', '$sx', '$sy', '$t', FunctionCode);
+
+    return function ($dp, $sp, $di, $sx, $sy) {
+        subPixelFunction($dp, $sp, $di, $sx, $sy, weightTable);
+    };
+}
+
+function convolution(weights) {
+    var opaque = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+    var weightTable = createWeightTable(weights);
+    return function (bitmap, done) {
+        var side = Math.round(Math.sqrt(weights.length));
+        var padding = side * 2;
+
+        // ์›๋ณธ ํฌ๊ธฐ๋ฅผ ๋Š˜๋ฆผ 
+        var sourceBitmap = cloneBitmap(bitmap, padding);
+
+        // ์›๋ณธ ๋ฐ์ดํƒ€ ๋ณต์‚ฌ 
+        putPixel(sourceBitmap, bitmap, side, side);
+
+        // ์ตœ์ข… ์•„์›ƒํ’‹ 
+        var newBitmap = createBitmap(sourceBitmap.pixels.length, sourceBitmap.width, sourceBitmap.height);
+
+        // ๋งˆ์ง€๋ง‰ ์›๋ณธ ์•„์›ƒํ’‹ 
+        var returnBitmap = createBitmap(bitmap.pixels.length, bitmap.width, bitmap.height);
+
+        var subPixelWeightFunction = createSubPixelWeightFunction(weights, weightTable, sourceBitmap.width, sourceBitmap.height, opaque);
+
+        var len = bitmap.pixels.length / 4;
+        for (var i = 0; i < len; i++) {
+            var xyIndex = i,
+                x = xyIndex % bitmap.width + side,
+                y = Math.floor(xyIndex / bitmap.width) + side;
+
+            subPixelWeightFunction(newBitmap.pixels, sourceBitmap.pixels, (y * sourceBitmap.width + x) * 4, x, y);
+        }
+
+        getPixel(newBitmap, returnBitmap, side, side);
+        done(returnBitmap);
+    };
+}
+
+function matches$1(str) {
+    var ret = Color$1.convertMatches(str);
+    var matches = ret.str.match(filter_regexp);
+    var result = [];
+
+    if (!matches) {
+        return result;
+    }
+
+    result = matches.map(function (it) {
+        return { filter: it, origin: Color$1.reverseMatches(it, ret.matches) };
+    });
+
+    var pos = { next: 0 };
+    result = result.map(function (item) {
+
+        var startIndex = str.indexOf(item.origin, pos.next);
+
+        item.startIndex = startIndex;
+        item.endIndex = startIndex + item.origin.length;
+
+        item.arr = parseFilter(item.origin);
+
+        pos.next = item.endIndex;
+
+        return item;
+    }).filter(function (it) {
+        if (!it.arr.length) return false;
+        return true;
+    });
+
+    return result;
+}
+
+/**
+ * Filter Parser 
+ * 
+ * F.parseFilter('blur(30)') == ['blue', '30']
+ * F.parseFilter('gradient(white, black, 3)') == ['gradient', 'white', 'black', '3']
+ * 
+ * @param {String} filterString 
+ */
+function parseFilter(filterString) {
+
+    var ret = Color$1.convertMatches(filterString);
+    var matches = ret.str.match(filter_regexp);
+
+    if (!matches[0]) {
+        return [];
+    }
+
+    var arr = matches[0].split('(');
+
+    var filterName = arr.shift();
+    var filterParams = [];
+
+    if (arr.length) {
+        filterParams = arr.shift().split(')')[0].split(',').map(function (f) {
+            return Color$1.reverseMatches(f, ret.matches);
+        });
+    }
+
+    var result = [filterName].concat(toConsumableArray(filterParams)).map(Color$1.trim);
+
+    return result;
+}
+
+function clamp$1(num) {
+    return Math.min(255, num);
+}
+
+function filter$1(str) {
+    return merge$1(matches$1(str).map(function (it) {
+        return it.arr;
+    }));
+}
+
+function makeGroupedFilter$1() {
+    var filters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+    var groupedFilter = [];
+    var group = [];
+    for (var i = 0, len = filters.length; i < len; i++) {
+        var f = filters[i];
+
+        if (f.userFunction) {
+            group.push(f);
+        } else {
+            if (group.length) {
+                groupedFilter.push([].concat(toConsumableArray(group)));
+            }
+            groupedFilter.push(f);
+            group = [];
+        }
+    }
+
+    if (group.length) {
+        groupedFilter.push([].concat(toConsumableArray(group)));
+    }
+
+    groupedFilter.forEach(function (filter, index) {
+        if (Array.isArray(filter)) {
+            groupedFilter[index] = function () {
+                var userFunction = makePrebuildUserFilterList(filter);
+                // console.log(userFunction)
+                return function (bitmap, done) {
+
+                    for (var i = 0, len = bitmap.pixels.length; i < len; i += 4) {
+                        userFunction(bitmap.pixels, i);
+                    }
+
+                    done(bitmap);
+                    // forLoop(bitmap.pixels.length, 0, 4, function (i) {
+                    //     userFunction(bitmap.pixels, i)
+                    // }, function () {
+                    //     done(bitmap)
+                    // })
+                };
+            }();
+        }
+    });
+
+    return groupedFilter;
+}
+
+/** 
+ * 
+ * multiply filters
+ * 
+ * ImageFilter.multi('blur', 'grayscale', 'sharpen', ['blur', 3], function (bitmap) {  return bitmap });
+ * 
+ */
+function multi$1() {
+    for (var _len = arguments.length, filters = Array(_len), _key = 0; _key < _len; _key++) {
+        filters[_key] = arguments[_key];
+    }
+
+    filters = filters.map(function (filter) {
+        return makeFilter$1(filter);
+    }).filter(function (f) {
+        return f;
+    });
+
+    filters = makeGroupedFilter$1(filters);
+
+    var max = filters.length;
+
+    return function (bitmap, done) {
+        var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+
+        var currentBitmap = bitmap;
+        var index = 0;
+
+        function runFilter() {
+            filters[index].call(null, currentBitmap, function (nextBitmap) {
+                currentBitmap = nextBitmap;
+
+                nextFilter();
+            }, opt);
+        }
+
+        function nextFilter() {
+            index++;
+
+            if (index >= max) {
+                done(currentBitmap);
+                return;
+            }
+
+            runFilter();
+        }
+
+        runFilter();
+    };
+}
+
+function merge$1(filters) {
+    return multi$1.apply(undefined, toConsumableArray(filters));
+}
+
+/**
+ * apply filter into special area
+ * 
+ * F.partial({x,y,width,height}, filter, filter, filter )
+ * F.partial({x,y,width,height}, 'filter' )
+ * 
+ * @param {{x, y, width, height}} area 
+ * @param {*} filters   
+ */
+function partial(area) {
+    var allFilter = null;
+
+    for (var _len2 = arguments.length, filters = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        filters[_key2 - 1] = arguments[_key2];
+    }
+
+    if (filters.length == 1 && typeof filters[0] === 'string') {
+        allFilter = filter$1(filters[0]);
+    } else {
+        allFilter = merge$1(filters);
+    }
+
+    return function (bitmap, done) {
+        var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+        allFilter(getBitmap(bitmap, area), function (newBitmap) {
+            done(putBitmap(bitmap, newBitmap, area));
+        }, opt);
+    };
+}
+
+function parseParamNumber$1(param) {
+    if (typeof param === 'string') {
+        param = param.replace(/deg/, '');
+        param = param.replace(/px/, '');
+    }
+    return +param;
+}
+
+function weight$1(arr) {
+    var num = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+
+    return arr.map(function (i) {
+        return i * num;
+    });
+}
+
+var SHADER_INDEX = 0;
+
+function convolutionString(count) {
+
+    var width = Math.sqrt(count);
+    var half = Math.floor(width / 2);
+
+    return [].concat(toConsumableArray(Array(count))).map(function (it, index) {
+        var y = Math.floor(index / width) - half;
+        var x = index % width - half;
+
+        return 'texture(u_image, v_texCoord + onePixel * vec2(' + x + ', ' + y + ')) * u_kernel' + count + '[' + index + ']';
+    }).join(' + \n');
+}
+
+function multi$3(str) {
+    return [].concat(Array.prototype.slice.call(arguments));
+}
+
+function convolution$1(arr) {
+
+    return {
+        type: 'convolution',
+        length: arr.length,
+        content: arr
+    };
+}
+
+function makeShader(str, index) {
+    return '\n        if (u_filterIndex == ' + index + '.0) {\n            ' + str + '\n        }\n    ';
+}
+
+function shader(str, options) {
+    return {
+        type: 'shader',
+        index: SHADER_INDEX,
+        options: options,
+        content: makeShader(str, SHADER_INDEX++)
+    };
+}
+
+function makeVertexShaderSource() {
+    return '#version 300 es \n\n        in vec2 a_position;\n        in vec2 a_texCoord; \n\n        uniform vec2 u_resolution;\n        uniform float u_flipY;\n\n        out vec2 v_texCoord; \n\n        void main() {\n            vec2 zeroToOne = a_position / u_resolution;\n\n            vec2 zeroToTwo = zeroToOne * 2.0;\n\n            vec2 clipSpace = zeroToTwo - 1.0;\n\n            gl_Position = vec4(clipSpace * vec2(1, u_flipY), 0, 1);\n\n            v_texCoord = a_texCoord;\n\n        }\n    ';
+}
+
+function makeConvolution(count) {
+
+    return '\n    \n    if (u_kernelSelect == ' + count + '.0) {\n        vec4 colorSum = ' + convolutionString(count) + '; \n\n        outColor = vec4((colorSum / u_kernel' + count + 'Weight).rgb, 1);\n        \n    }\n    ';
+}
+
+function makeFragmentShaderSource(filterShaderList) {
+
+    var filterContent = filterShaderList.filter(function (f) {
+        return f.type == 'shader';
+    }).map(function (f) {
+        return f.content;
+    }).join('\n\n');
+
+    var weightTable = { '9': true };
+
+    filterShaderList.filter(function (f) {
+        return f.type == 'convolution';
+    }).forEach(function (f) {
+        weightTable[f.length] = true;
+    });
+
+    var convolutionString = Object.keys(weightTable).map(function (len) {
+        return makeConvolution(+len);
+    }).join('\n');
+
+    return '#version 300 es\n\n    precision highp int;\n    precision mediump float;\n    \n    uniform sampler2D u_image;\n\n    // 3 is 3x3 matrix kernel \n    uniform float u_kernelSelect;\n    uniform float u_filterIndex;\n\n    uniform float u_kernel9[9];\n    uniform float u_kernel9Weight;\n    uniform float u_kernel25[25];\n    uniform float u_kernel25Weight;\n    uniform float u_kernel49[49];\n    uniform float u_kernel49Weight;\n    uniform float u_kernel81[81];\n    uniform float u_kernel81Weight;    \n\n    in vec2 v_texCoord;\n    \n    out vec4 outColor;\n\n    float random (vec2 st) {\n        return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n    } \n\n    // \n    vec3 rgb2hsv(vec3 c)\n    {\n        vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);\n        vec4 p = c.g < c.b ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);\n        vec4 q = c.r < p.x ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);\n\n        float d = q.x - min(q.w, q.y);\n        float e = 1.0e-10;\n        return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);\n    }\n\n    vec3 hsv2rgb(vec3 c)\n    {\n        vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);\n        vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);\n        return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);\n    }\n    \n    void main() {\n        vec4 pixelColor = texture(u_image, v_texCoord);\n        vec2 onePixel = vec2(1) / vec2(textureSize(u_image, 0));                \n\n        ' + filterContent + '\n\n        ' + convolutionString + '\n\n    }';
+}
+
+function colorToVec4(color) {
+    color = [color.r / 255, color.g / 255, color.b / 255, color.a || 0].map(toFloatString);
+    return 'vec4(' + color + ')';
+}
+
+function toFloatString(number) {
+    if (number == Math.floor(number)) {
+        return number + '.0';
+    }
+
+    return number;
+}
+
+function blur$1 () {
+    return convolution$1([1, 1, 1, 1, 1, 1, 1, 1, 1]);
+}
+
+function normal () {
+    return convolution$1([0, 0, 0, 0, 1, 0, 0, 0, 0]);
+}
+
+/*
+ * carve, mold, or stamp a design on (a surface) so that it stands out in relief.
+ * 
+ * @param {Number} amount   0.0 .. 4.0 
+ */
+function emboss$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 4;
+
+    amount = parseParamNumber$1(amount);
+    return convolution$1([amount * -2.0, -amount, 0.0, -amount, 1.0, amount, 0.0, amount, amount * 2.0]);
+}
+
+/**
+ * 
+ * @param {Number} amount 0..1
+ */
+function gaussianBlur$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = parseParamNumber$1(amount) * (1 / 16);
+
+    return convolution$1(weight$1([1, 2, 1, 2, 4, 2, 1, 2, 1], C));
+}
+
+function gaussianBlur5x$1() {
+    return convolution$1([1, 4, 6, 4, 1, 4, 16, 24, 16, 4, 6, 24, 36, 24, 6, 4, 16, 24, 16, 4, 1, 4, 6, 4, 1]);
+}
+
+function grayscale2$1() {
+    return convolution$1([0.3, 0.3, 0.3, 0, 0, 0.59, 0.59, 0.59, 0, 0, 0.11, 0.11, 0.11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+}
+
+function kirschHorizontal$1() {
+    return convolution$1([5, 5, 5, -3, 0, -3, -3, -3, -3]);
+}
+
+function kirschVertical$1() {
+    return convolution$1([5, -3, -3, 5, 0, -3, 5, -3, -3]);
+}
+
+function laplacian$1() {
+    return convolution$1([-1, -1, -1, -1, 8, -1, -1, -1, -1]);
+}
+
+function laplacian5x$1() {
+    return convolution$1([-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]);
+}
+
+function motionBlur$1() {
+    return convolution$1([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+}
+
+function motionBlur2$1() {
+    return convolution$1([1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1]);
+}
+
+function motionBlur3$1() {
+    return convolution$1([1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1]);
+}
+
+function negative$1() {
+    return convolution$1([-1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1]);
+}
+
+function sepia2$1() {
+    return convolution$1([0.393, 0.349, 0.272, 0, 0, 0.769, 0.686, 0.534, 0, 0, 0.189, 0.168, 0.131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+}
+
+function sharpen$1() {
+    return convolution$1([0, -1, 0, -1, 5, -1, 0, -1, 0]);
+}
+
+function sobelHorizontal$1() {
+    return convolution$1([-1, -2, -1, 0, 0, 0, 1, 2, 1]);
+}
+
+function sobelVertical$1() {
+    return convolution$1([-1, 0, 1, -2, 0, 2, -1, 0, 1]);
+}
+
+function transparency$1() {
+    return convolution$1([1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0.3, 0, 0, 0, 0, 0, 1]);
+}
+
+function unsharpMasking$1() {
+    return convolution$1(weight$1([1, 4, 6, 4, 1, 4, 16, 24, 16, 4, 6, 24, -476, 24, 6, 4, 16, 24, 16, 4, 1, 4, 6, 4, 1], -1 / 256));
+}
+
+var matrix$2 = {
+     blur: blur$1,
+     normal: normal,
+     emboss: emboss$1,
+     gaussianBlur: gaussianBlur$1,
+     'gaussian-blur': gaussianBlur$1,
+     gaussianBlur5x: gaussianBlur5x$1,
+     'gaussian-blur-5x': gaussianBlur5x$1,
+     grayscale2: grayscale2$1,
+     kirschHorizontal: kirschHorizontal$1,
+     'kirsch-horizontal': kirschHorizontal$1,
+     kirschVertical: kirschVertical$1,
+     'kirsch-vertical': kirschVertical$1,
+     laplacian: laplacian$1,
+     laplacian5x: laplacian5x$1,
+     'laplacian-5x': laplacian5x$1,
+     motionBlur: motionBlur$1,
+     'motion-blur': motionBlur$1,
+     motionBlur2: motionBlur2$1,
+     'motion-blur-2': motionBlur2$1,
+     motionBlur3: motionBlur3$1,
+     'motion-blur-3': motionBlur3$1,
+     negative: negative$1,
+     sepia2: sepia2$1,
+     sharpen: sharpen$1,
+     sobelHorizontal: sobelHorizontal$1,
+     'sobel-horizontal': sobelHorizontal$1,
+     sobelVertical: sobelVertical$1,
+     'sobel-vertical': sobelVertical$1,
+     transparency: transparency$1,
+     unsharpMasking: unsharpMasking$1,
+     'unsharp-masking': unsharpMasking$1
+};
+
+function bitonal$1(darkColor, lightColor) {
+    var threshold = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.5;
+
+    var checkVlue = toFloatString(threshold);
+    var darkColorString = colorToVec4(Color$1.parse(darkColor));
+    var lightColorString = colorToVec4(Color$1.parse(lightColor));
+
+    return shader('\n        if ((pixelColor.r + pixelColor.g + pixelColor.b) > ' + checkVlue + ') {\n            outColor = vec4(' + lightColorString + '.rgb, pixelColor.a);\n        } else {\n            outColor = vec4(' + darkColorString + '.rgb, pixelColor.a);\n        }\n    ');
+}
+
+/*
+ * @param {Number} amount  -1..1  ,  value < 0  is darken, value > 0 is brighten 
+ */
+function brightness$2() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = pixelColor + (' + C + ');\n    ');
+}
+
+function matrix$3() {
+    var $a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var $b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var $c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var $d = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var $e = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+    var $f = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+    var $g = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 0;
+    var $h = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 0;
+    var $i = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 0;
+    var $j = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 0;
+    var $k = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : 0;
+    var $l = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : 0;
+    var $m = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : 0;
+    var $n = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : 0;
+    var $o = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : 0;
+    var $p = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : 0;
+
+
+    var matrix = [$a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m, $n, $o, $p].map(toFloatString);
+
+    return shader('\n\n        outColor = vec4(\n            ' + matrix[0] + ' * pixelColor.r + ' + matrix[1] + ' * pixelColor.g + ' + matrix[2] + ' * pixelColor.b + ' + matrix[3] + ' * pixelColor.a,\n            ' + matrix[4] + ' * pixelColor.r + ' + matrix[5] + ' * pixelColor.g + ' + matrix[6] + ' * pixelColor.b + ' + matrix[7] + ' * pixelColor.a,\n            ' + matrix[8] + ' * pixelColor.r + ' + matrix[9] + ' * pixelColor.g + ' + matrix[10] + ' * pixelColor.b + ' + matrix[11] + ' * pixelColor.a,\n            ' + matrix[12] + ' * pixelColor.r + ' + matrix[13] + ' * pixelColor.g + ' + matrix[14] + ' * pixelColor.b + ' + matrix[15] + ' * pixelColor.a\n        ); \n    ');
+}
+
+function brownie$1() {
+
+    return matrix$3(0.5997023498159715, 0.34553243048391263, -0.2708298674538042, 0, -0.037703249837783157, 0.8609577587992641, 0.15059552388459913, 0, 0.24113635128153335, -0.07441037908422492, 0.44972182064877153, 0, 0, 0, 0, 1);
+}
+
+/*
+ * @param {Number} amount 0..1
+ */
+function clip$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = vec4(\n            (pixelColor.r > 1.0 - ' + C + ') ? 1.0 : 0.0,\n            (pixelColor.g > 1.0 - ' + C + ') ? 1.0 : 0.0,\n            (pixelColor.b > 1.0 - ' + C + ') ? 1.0 : 0.0,\n            pixelColor.a \n        );\n    ');
+}
+
+function chaos() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        vec2 st = pixelColor.st;\n        st *= ' + C + ';\n        \n        vec2 ipos = floor(st);  // get the integer coords\n\n        vec3 color = vec3(random( ipos ));\n\n        outColor = vec4(color, pixelColor.a);\n    ');
+}
+
+/*
+ * @param {Number} amount  0..1
+ */
+function contrast$2() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = pixelColor * ' + C + ';\n    ');
+}
+
+/*
+ * @param {Number} amount  -1..1  ,  value < 0  is darken, value > 0 is brighten 
+ */
+function gamma$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = vec4(pow(pixelColor.r, ' + C + '), pow(pixelColor.g, ' + C + '), pow(pixelColor.b, ' + C + '), pixelColor.a );\n    ');
+}
+
+/**
+ * F.gradient('red', 'blue', 'yellow', 'white', 10)
+ * F.gradient('red, blue, yellow, white, 10')
+ */
+function gradient$2() {
+    // ์ „์ฒด ๋งค๊ฐœ๋ณ€์ˆ˜ ๊ธฐ์ค€์œผ๋กœ ํŒŒ์‹ฑ 
+    // ์ƒ‰์ด ์•„๋‹Œ ๊ฒƒ ๊ธฐ์ค€์œผ๋กœ scale ๋ณ€์ˆ˜๋กœ ์ธ์‹ 
+
+    var params = [].concat(Array.prototype.slice.call(arguments));
+
+    if (params.length === 1 && typeof params[0] === 'string') {
+        params = Color$1.convertMatchesArray(params[0]);
+    }
+
+    params = params.map(function (arg) {
+        return arg;
+    }).join(', ');
+
+    var colors = Color$1.parseGradient(params);
+
+    colors[0][1] = 0;
+    colors[colors.length - 1][1] = 1;
+
+    colors = colors.map(function (c) {
+        var _Color$parse = Color$1.parse(c[0]),
+            r = _Color$parse.r,
+            g = _Color$parse.g,
+            b = _Color$parse.b,
+            a = _Color$parse.a;
+
+        return [{ r: r, g: g, b: b, a: a }, c[1]];
+    });
+
+    var temp = [];
+
+    for (var i = 0, len = colors.length; i < len - 1; i++) {
+        var start = colors[i];
+        var end = colors[i + 1];
+
+        var startColor = colorToVec4(start[0]);
+        var endColor = colorToVec4(end[0]);
+
+        var startRate = toFloatString(start[1]);
+        var endRate = toFloatString(end[1]);
+
+        temp.push('\n            if (' + startRate + ' <= rate && rate < ' + endRate + ') {\n                outColor = mix(' + startColor + ', ' + endColor + ', (rate - ' + startRate + ')/(' + endRate + ' - ' + startRate + '));\n            }\n        ');
+    }
+
+    return shader('\n        float rate = (pixelColor.r * 0.2126 + pixelColor.g * 0.7152 + pixelColor.b * 0.0722); \n\n        ' + temp.join('\n') + '        \n    ');
+}
+
+/**
+ * 
+ * @param {Number} amount 0..1
+ */
+function grayscale$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = parseParamNumber$1(amount);
+
+    if (C > 1) C = 1;
+
+    return matrix$3(0.2126 + 0.7874 * (1 - C), 0.7152 - 0.7152 * (1 - C), 0.0722 - 0.0722 * (1 - C), 0, 0.2126 - 0.2126 * (1 - C), 0.7152 + 0.2848 * (1 - C), 0.0722 - 0.0722 * (1 - C), 0, 0.2126 - 0.2126 * (1 - C), 0.7152 - 0.7152 * (1 - C), 0.0722 + 0.9278 * (1 - C), 0, 0, 0, 0, 1);
+}
+
+//http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl
+/*
+ * @param {Number} amount  0..1  ,  (real value 0..360)
+ */
+function hue$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        vec3 hsv = rgb2hsv(pixelColor.rgb);\n        hsv.x += ' + C + ';\n        outColor = vec4(hsv2rgb(hsv).rgb, pixelColor.a);\n    ');
+}
+
+function invert$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = vec4(\n            (1.0 - pixelColor.r) * ' + C + ',\n            (1.0 - pixelColor.g) * ' + C + ',\n            (1.0 - pixelColor.b) * ' + C + ',\n            pixelColor.a\n        );\n    ');
+}
+
+function kodachrome$1() {
+
+    return matrix$3(1.1285582396593525, -0.3967382283601348, -0.03992559172921793, 0, -0.16404339962244616, 1.0835251566291304, -0.05498805115633132, 0, -0.16786010706155763, -0.5603416277695248, 1.6014850761964943, 0, 0, 0, 0, 1);
+}
+
+/**
+ * 
+ * @param {Number} amount 0..1
+ */
+function noise$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+
+    var C = Math.abs(parseParamNumber$1(amount));
+    var min = toFloatString(-C);
+    var max = toFloatString(C);
+    return shader('\n        float rnd = ' + min + ' + random( pixelColor.st ) * (' + max + ' - ' + min + ');\n\n        outColor = vec4(pixelColor.rgb + rnd, 1.0);\n    ');
+}
+
+/**
+ * 
+ * @param {Number} amount 0..1
+ */
+function opacity$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = toFloatString(parseParamNumber$1(amount));
+
+    return shader('\n        outColor = vec4(pixelColor.rgb, pixelColor.a * ' + C + ');\n    ');
+}
+
+function polaroid$1() {
+
+    return matrix$3(1.438, -0.062, -0.062, 0, -0.122, 1.378, -0.122, 0, -0.016, -0.016, 1.483, 0, 0, 0, 0, 1);
+}
+
+/*
+ * @param {Number} amount  0..1 
+ */
+function saturation$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+    var L = 1 - Math.abs(parseParamNumber$1(amount));
+
+    return matrix$3(L, 0, 0, 0, 0, L, 0, 0, 0, 0, L, 0, 0, 0, 0, L);
+}
+
+/*
+ * @param {Number} amount  0..100 
+ */
+function sepia$1() {
+    var amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    var C = parseParamNumber$1(amount);
+    if (C > 1) C = 1;
+
+    return matrix$3(0.393 + 0.607 * (1 - C), 0.769 - 0.769 * (1 - C), 0.189 - 0.189 * (1 - C), 0, 0.349 - 0.349 * (1 - C), 0.686 + 0.314 * (1 - C), 0.168 - 0.168 * (1 - C), 0, 0.272 - 0.272 * (1 - C), 0.534 - 0.534 * (1 - C), 0.131 + 0.869 * (1 - C), 0, 0, 0, 0, 1);
+}
+
+function shade$1() {
+    var redValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+    var greenValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+    var blueValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+
+    var r = toFloatString(parseParamNumber$1(redValue) / 255);
+    var g = toFloatString(parseParamNumber$1(greenValue) / 255);
+    var b = toFloatString(parseParamNumber$1(blueValue) / 255);
+
+    return shader('\n        outColor = vec4(\n            pixelColor.r * ' + r + ',\n            pixelColor.g * ' + g + ',\n            pixelColor.b * ' + b + ',\n            pixelColor.a\n        );\n    ');
+}
+
+function shift$1() {
+
+    return matrix$3(1.438, -0.062, -0.062, 0, -0.122, 1.378, -0.122, 0, -0.016, -0.016, 1.483, 0, 0, 0, 0, 1);
+}
+
+function solarize$1(redValue, greenValue, blueValue) {
+    var r = toFloatString(parseParamNumber$1(redValue));
+    var g = toFloatString(parseParamNumber$1(greenValue));
+    var b = toFloatString(parseParamNumber$1(blueValue));
+
+    return shader('\n        outColor = vec4(\n            (pixelColor.r < ' + r + ') ? 1.0 - pixelColor.r: pixelColor.r,\n            (pixelColor.g < ' + g + ') ? 1.0 - pixelColor.g: pixelColor.g,\n            (pixelColor.b < ' + b + ') ? 1.0 - pixelColor.b: pixelColor.b,\n            pixelColor.a\n        );\n    ');
+}
+
+function technicolor$1() {
+
+    return matrix$3(1.9125277891456083, -0.8545344976951645, -0.09155508482755585, 0, -0.3087833385928097, 1.7658908555458428, -0.10601743074722245, 0, -0.231103377548616, -0.7501899197440212, 1.847597816108189, 0, 0, 0, 0, 1);
+}
+
+function thresholdColor$1() {
+    var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
+    scale = toFloatString(parseParamNumber$1(scale));
+
+    return shader('\n        float c = ( (pixelColor.r * 0.2126 + pixelColor.g * 0.7152 + pixelColor.b * 0.0722) ) >= ' + scale + ' ? 1.0 : 0.0;\n\n        outColor = vec4(c, c, c, pixelColor.a);\n    ');
+}
+
+/*
+ * @param {Number} amount  0..100 
+ */
+function threshold$1() {
+  var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 200;
+  var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
+
+  return thresholdColor$1(scale, amount, false);
+}
+
+/**
+ * 
+ * @param {*} redTint  0..1
+ * @param {*} greenTint 0..1
+ * @param {*} blueTint 0..1
+ */
+function tint$1 () {
+    var redTint = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    var greenTint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var blueTint = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+
+    var r = parseParamNumber$1(redTint);
+    var g = parseParamNumber$1(greenTint);
+    var b = parseParamNumber$1(blueTint);
+
+    return shader('\n        outColor = vec4(\n            pixelColor.r += (1 - pixelColor.r) * ' + r + ',\n            pixelColor.g += (1 - pixelColor.g) * ' + g + ',\n            pixelColor.b += (1 - pixelColor.b) * ' + b + ',\n            pixelColor.a\n        );\n    ');
+}
+
+var pixel$2 = {
+    bitonal: bitonal$1,
+    brightness: brightness$2,
+    brownie: brownie$1,
+    clip: clip$1,
+    chaos: chaos,
+    contrast: contrast$2,
+    gamma: gamma$1,
+    gradient: gradient$2,
+    grayscale: grayscale$1,
+    hue: hue$1,
+    invert: invert$1,
+    kodachrome: kodachrome$1,
+    matrix: matrix$3,
+    noise: noise$1,
+    opacity: opacity$1,
+    polaroid: polaroid$1,
+    saturation: saturation$1,
+    sepia: sepia$1,
+    shade: shade$1,
+    shift: shift$1,
+    solarize: solarize$1,
+    technicolor: technicolor$1,
+    threshold: threshold$1,
+    'threshold-color': thresholdColor$1,
+    tint: tint$1
+};
+
+function kirsch$1() {
+    return multi$3('kirsch-horizontal kirsch-vertical');
+}
+
+function sobel$1() {
+    return multi$3('sobel-horizontal sobel-vertical');
+}
+
+function vintage$1() {
+    return multi$3('brightness(0.15) saturation(-0.2) gamma(1.8)');
+}
+
+var multi$4 = {
+    kirsch: kirsch$1,
+    sobel: sobel$1,
+    vintage: vintage$1
+};
+
+var GLFilter = _extends({}, matrix$2, pixel$2, multi$4);
+
+var TEXTURE_INDEX = 0;
+
+var GLCanvas = function () {
+    function GLCanvas() {
+        var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+            width: '400px',
+            height: '300px'
+        };
+        classCallCheck(this, GLCanvas);
+
+        this.img = opt.img;
+        this.width = parseFloat(this.img.width || opt.width || '400px');
+        this.height = parseFloat(this.img.height || opt.height || '300px');
+        this.init();
+    }
+
+    createClass(GLCanvas, [{
+        key: 'resize',
+        value: function resize() {
+            this.canvas.width = this.width;
+            this.canvas.height = this.height;
+            this.canvas.style.width = this.width + 'px';
+            this.canvas.style.height = this.height + 'px';
+
+            this.viewport();
+        }
+
+        /* Canvas ๋น„์šฐ๊ธฐ, ๋น„์šธ ๋•Œ ์ƒ‰ ์ง€์ •ํ•˜๊ธฐ  */
+
+    }, {
+        key: 'clear',
+        value: function clear() {
+            var r = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+            var g = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+            var b = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+            var a = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+
+            var gl = this.gl;
+
+            gl.clearColor(r, g, b, a);
+            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+        }
+
+        /* viewport ์„ค์ •, ๊ธฐ๋ณธ์ ์œผ๋กœ canvas ์˜ ํฌ๊ธฐ๋กœ ๊ณ ์ •  */
+
+    }, {
+        key: 'viewport',
+        value: function viewport(x, y, width, height) {
+            var gl = this.gl;
+
+            gl.viewport(x || 0, y || 0, width || gl.canvas.width, height || gl.canvas.height);
+        }
+
+        // canvas ์ดˆ๊ธฐํ™” 
+        // gl context ๊ตฌํ•˜๊ธฐ 
+
+    }, {
+        key: 'initCanvas',
+        value: function initCanvas(vertexSource, fragmentSource) {
+            this.canvas = document.createElement('canvas');
+
+            this.gl = this.canvas.getContext('webgl2');
+
+            if (!this.gl) {
+                throw new Error("you need webgl2 support");
+            }
+
+            // program ์ƒ์„ฑ 
+            this.program = this.createProgram(vertexSource, fragmentSource);
+
+            // this.clear()
+            this.resize();
+
+            // buffer ์„ค์ • 
+            this.initBuffer();
+        }
+    }, {
+        key: 'draw',
+        value: function draw() {
+            var primitiveType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'TRIANGLES';
+            var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+            var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 6;
+
+            var gl = this.gl;
+
+            gl.drawArrays(gl[primitiveType], offset, count);
+        }
+    }, {
+        key: 'triangles',
+        value: function triangles() {
+            var offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+            var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 6;
+
+            this.draw('TRIANGLES', offset, count);
+        }
+    }, {
+        key: 'uniform2f',
+        value: function uniform2f() {
+            var _gl;
+
+            for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+                args[_key] = arguments[_key];
+            }
+
+            var key = args.shift();
+
+            (_gl = this.gl).uniform2f.apply(_gl, [this.locations[key]].concat(args));
+        }
+    }, {
+        key: 'uniform1f',
+        value: function uniform1f() {
+            var _gl2;
+
+            for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                args[_key2] = arguments[_key2];
+            }
+
+            var key = args.shift();
+
+            (_gl2 = this.gl).uniform1f.apply(_gl2, [this.locations[key]].concat(args));
+        }
+    }, {
+        key: 'uniform1fv',
+        value: function uniform1fv() {
+            var _gl3;
+
+            for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                args[_key3] = arguments[_key3];
+            }
+
+            var key = args.shift();
+
+            (_gl3 = this.gl).uniform1fv.apply(_gl3, [this.locations[key]].concat(args));
+        }
+    }, {
+        key: 'uniform1i',
+        value: function uniform1i() {
+            var _gl4;
+
+            for (var _len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                args[_key4] = arguments[_key4];
+            }
+
+            var key = args.shift();
+
+            (_gl4 = this.gl).uniform1i.apply(_gl4, [this.locations[key]].concat(args));
+        }
+    }, {
+        key: 'useProgram',
+        value: function useProgram() {
+            var gl = this.gl;
+
+            gl.useProgram(this.program);
+        }
+    }, {
+        key: 'bindBuffer',
+        value: function bindBuffer(key, data) {
+            var drawType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'STATIC_DRAW';
+
+            var gl = this.gl;
+
+            if (!this.buffers[key]) {
+                this.buffers[key] = gl.createBuffer();
+            }
+
+            gl.bindBuffer(gl.ARRAY_BUFFER, this.buffers[key]);
+
+            if (data) {
+                gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(data), gl[drawType]);
+            }
+        }
+    }, {
+        key: 'enable',
+        value: function enable(key) {
+            var gl = this.gl;
+
+            // array attribute ๋ฅผ ํ™œ์„ฑํ™” ์‹œํ‚ด 
+            gl.enableVertexAttribArray(this.locations[key]);
+        }
+    }, {
+        key: 'location',
+        value: function location(key) {
+            var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "attribute";
+
+            if (type === 'attribute') {
+                this.locations[key] = this.gl.getAttribLocation(this.program, key);
+            } else if (type === 'uniform') {
+                this.locations[key] = this.gl.getUniformLocation(this.program, key);
+            }
+        }
+    }, {
+        key: 'a',
+        value: function a(key) {
+            return this.location(key);
+        }
+    }, {
+        key: 'u',
+        value: function u(key) {
+            return this.location(key, "uniform");
+        }
+    }, {
+        key: 'pointer',
+        value: function pointer(key) {
+            var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'FLOAT';
+            var size = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
+            var normalize = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+            var stride = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+            var offset = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+
+            var gl = this.gl;
+
+            gl.vertexAttribPointer(this.locations[key], size, gl[type], normalize, stride, offset);
+        }
+    }, {
+        key: 'bufferData',
+        value: function bufferData() {
+            var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+            var gl = this.gl;
+            gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(data), gl.STATIC_DRAW);
+        }
+    }, {
+        key: 'isPowerOf2',
+        value: function isPowerOf2(value) {
+            return (value & value - 1) == 0;
+        }
+    }, {
+        key: 'bindTexture',
+        value: function bindTexture(key) {
+            var img = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+            var mipLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+            var internalFormat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'RGBA';
+            var srcFormat = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'RGBA';
+            var srcType = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'UNSIGNED_BYTE';
+
+            var gl = this.gl;
+
+            if (arguments.length == 1) {
+                gl.bindTexture(gl.TEXTURE_2D, this.textures[key]);
+                return;
+            }
+
+            if (!this.textures[key]) {
+                this.textures[key] = gl.createTexture();
+            }
+
+            this.textureIndex[key] = TEXTURE_INDEX++;
+            // this.activeTexture(key)
+            gl.bindTexture(gl.TEXTURE_2D, this.textures[key]);
+
+            this.setTextureParameter();
+
+            gl.texImage2D(gl.TEXTURE_2D, mipLevel, gl[internalFormat], gl[srcFormat], gl[srcType], img.newImage || img);
+        }
+    }, {
+        key: 'bindColorTexture',
+        value: function bindColorTexture(key, data) {
+            var width = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 256;
+            var height = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+            var mipLevel = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+            var internalFormat = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'RGBA';
+            var srcFormat = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'RGBA';
+            var srcType = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 'UNSIGNED_BYTE';
+
+            var gl = this.gl;
+
+            if (!this.textures[key]) {
+                this.textures[key] = gl.createTexture();
+            }
+
+            this.textureIndex[key] = TEXTURE_INDEX++;
+            gl.bindTexture(gl.TEXTURE_2D, this.textures[key]);
+
+            this.setTextureParameter();
+
+            gl.texImage2D(gl.TEXTURE_2D, mipLevel, gl[internalFormat], width, height, 0, gl[srcFormat], gl[srcType], new Uint8Array(data));
+        }
+    }, {
+        key: 'bindEmptyTexture',
+        value: function bindEmptyTexture(key, width, height) {
+            var mipLevel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+            var internalFormat = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'RGBA';
+            var srcFormat = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'RGBA';
+            var srcType = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'UNSIGNED_BYTE';
+
+            var gl = this.gl;
+
+            if (!this.textures[key]) {
+                this.textures[key] = gl.createTexture();
+            }
+
+            this.textureIndex[key] = TEXTURE_INDEX++;
+            gl.bindTexture(gl.TEXTURE_2D, this.textures[key]);
+
+            this.setTextureParameter();
+
+            var border = 0;
+            var data = null;
+
+            gl.texImage2D(gl.TEXTURE_2D, mipLevel, gl[internalFormat], width, height, border, gl[srcFormat], gl[srcType], data);
+        }
+    }, {
+        key: 'setTextureParameter',
+        value: function setTextureParameter() {
+            var gl = this.gl;
+
+            gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+            gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+            gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+            gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+        }
+    }, {
+        key: 'bindFrameBufferWithTexture',
+        value: function bindFrameBufferWithTexture(key, textureKey, width, height) {
+            this.bindEmptyTexture(textureKey, width, height);
+            this.bindFrameBuffer(key, textureKey);
+        }
+    }, {
+        key: 'enumToString',
+        value: function enumToString(value) {
+            var gl = this.gl;
+
+            if (value === 0) {
+                return "NONE";
+            }
+            for (var key in gl) {
+                if (gl[key] === value) {
+                    return key;
+                }
+            }
+            return "0x" + value.toString(16);
+        }
+    }, {
+        key: 'bindFrameBuffer',
+        value: function bindFrameBuffer(key) {
+            var textureKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
+            var gl = this.gl;
+
+            if (arguments.length === 1) {
+                gl.bindFramebuffer(gl.FRAMEBUFFER, key == null ? null : this.framebuffers[key]);
+                return;
+            }
+
+            if (!this.framebuffers[key]) {
+                // ํ”„๋ ˆ์ž„๋ฒ„ํผ ์ƒ์„ฑํ•˜๊ธฐ 
+                this.framebuffers[key] = gl.createFramebuffer();
+            }
+
+            gl.bindFramebuffer(gl.FRAMEBUFFER, this.framebuffers[key]);
+
+            // framebuffer ์— texture2d ์—ฐ๊ฒฐ 
+            var mipLevel = 0;
+            var attachmentPoint = gl.COLOR_ATTACHMENT0; // framebuffer ๋ฅผ attachmentPoint ์— ์—ฐ๊ฒฐํ•œ๋‹ค. 
+            // framebuffer ๋Š” ๋ฐ์ดํƒ€๋ฅผ ๊ฐ€์ง€๊ณ  ์žˆ์ง€ ์•Š๊ณ  ์—ฐ๊ฒฐ ๊ณ ๋ฆฌ๋งŒ ๊ฐ€์ง€๊ณ  ์žˆ๋‹ค. 
+            gl.framebufferTexture2D(gl.FRAMEBUFFER, attachmentPoint, gl.TEXTURE_2D, this.textures[textureKey], mipLevel);
+
+            // framebuffer ์ƒํƒœ ์ฒดํฌ ํ•˜๊ธฐ 
+            // framebuffer ๋ฅผ ๋” ์ด์ƒ ํ• ๋‹น ๋ชปํ•  ์ˆ˜๋„ ์žˆ์Œ. 
+            var status = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+
+            // console.log(this.enumToString(attachmentPoint), this.enumToString(status), key, this.textures[textureKey]);
+
+            if (status !== gl.FRAMEBUFFER_COMPLETE) {
+                return;
+            }
+        }
+    }, {
+        key: 'bindVA',
+        value: function bindVA() {
+            var gl = this.gl;
+
+            if (!this.vao) {
+                this.vao = gl.createVertexArray();
+            }
+
+            gl.bindVertexArray(this.vao);
+        }
+    }, {
+        key: 'bindAttr',
+        value: function bindAttr(key, data) {
+            var drawType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'STATIC_DRAW';
+            var size = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 2;
+
+            // ๋ฒ„ํผ๋ฅผ ๋งŒ๋“ค๊ณ  ๋ฐ์ดํƒ€๋ฅผ ์—ฐ๊ฒฐํ•œ๋‹ค. 
+            this.bindBuffer(key, data, drawType);
+
+            //array ๋ณ€์ˆ˜๋ฅผ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ๋„๋ก ํ™œ์„ฑํ™” ์‹œํ‚จ๋‹ค. 
+            this.enable(key);
+
+            // ํฌ์ธํ„ฐ๋ฅผ ์ง€์ •ํ•œ๋‹ค. 
+            // array ๋ณ€์ˆ˜๊ฐ€ ์–ด๋–ป๊ฒŒ iteration ๋ ์ง€ ์ง€์ •ํ•œ๋‹ค. size ๋Š” ํ•œ๋ฒˆ์— ์—ฐ์‚ฐ๋  ์š”์†Œ ๊ฐœ์ˆ˜ 
+            // size ๊ฐ€ 2 ๋ผ๊ณ  ํ–ˆ์„ ๋•Œ 2๊ฐœ์”ฉ ํ•˜๋‚˜์˜ iteration ์— ๋“ค์–ด๊ฐ„๋‹ค. 
+            // ์ฆ‰, (x, y) ๊ฐ€ ํ•œ๋ฒˆ์— ๋“ค์–ด๊ฐ 
+            this.pointer(key, 'FLOAT', size);
+        }
+
+        /* 
+            shader ์—์„œ ์‚ฌ์šฉํ•˜๋Š” Attribute, Uniform ๋ณ€์ˆ˜ ์„ค์ • 
+            ๋ณ€์ˆ˜ ์„ค์ •์„ ๊ฐ„์†Œํ™” ํ•  ํ•„์š”๋„ ์žˆ์„ ๋“ฏ ํ•˜๋‹ค. 
+        */
+
+    }, {
+        key: 'initBuffer',
+        value: function initBuffer() {
+            var _canvas = this.canvas,
+                width = _canvas.width,
+                height = _canvas.height;
+
+            // console.log(width, height)
+
+            // ์„ ์–ธ๋œ ๋ณ€์ˆ˜ location ์ง€์ • ํ•˜๊ธฐ 
+            // location ์„ ์ง€์ •ํ•ด์•ผ GLSL ์—์„œ ํ•ด๋‹น ๋ณ€์ˆ˜์™€ ์—ฐ๊ฒฐํ•  ์ˆ˜ ์žˆ๋‹ค. ์–ธ์ œ? 
+
+            this.a("a_position");
+            this.a("a_texCoord");
+            this.u("u_resolution");
+            this.u("u_image");
+            this.u("u_flipY");
+
+            this.u("u_kernelSelect");
+            this.u("u_filterIndex");
+
+            this.u("u_kernel9[0]");
+            this.u("u_kernel9Weight");
+            this.u("u_kernel25[0]");
+            this.u("u_kernel25Weight");
+            this.u("u_kernel49[0]");
+            this.u("u_kernel49Weight");
+            this.u("u_kernel81[0]");
+            this.u("u_kernel81Weight");
+
+            this.bindVA();
+
+            // ๋‹จ์ˆœ ๋ณ€์ˆ˜๋ฅผ ์ดˆ๊ธฐํ™” ํ•˜๊ณ  
+            this.bindAttr("a_position", [0, 0, width, 0, 0, height, 0, height, width, 0, width, height], 'STATIC_DRAW', 2 /* components for iteration */);
+
+            // ๋ณ€์ˆ˜์— ๋ฐ์ดํƒ€๋ฅผ ์—ฐ๊ฒฐํ• ๋‹ค. 
+            this.bindAttr("a_texCoord", [0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0], 'STATIC_DRAW', 2 /* components for iteration */);
+
+            // texture ๋Š” img ๋กœ ํ•  ์ˆ˜๋„ ์žˆ๊ณ  
+            this.bindTexture("u_image", this.img);
+
+            // ๋น„์–ด์žˆ๋Š” texture ๋„ ๋งŒ๋“ค ์ˆ˜ ์žˆ๋‹ค. 
+            // ๊ฐ์ฒด๋กœ ์ œ์–ดํ• ๊นŒ? 
+            // texture ๋ฅผ framebuffer ๋กœ ๋ฐ”๋กœ ๋Œ€์‘์‹œํ‚จ๋‹ค. 
+            // ์ดํ›„ framebuffer ๊ฐ€ ๋ณ€๊ฒฝ๋˜๋ฉด img_texture ๊ฐ€ ๋ฐ”๋€๋‹ค. 
+            this.bindFrameBufferWithTexture("frame_buffer_0", "img_texture_0", width, height);
+            this.bindFrameBufferWithTexture("frame_buffer_1", "img_texture_1", width, height);
+        }
+    }, {
+        key: 'activeTexture',
+        value: function activeTexture() {
+            var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+            var gl = this.gl;
+
+            gl.activeTexture(gl.TEXTURE0 + index);
+        }
+    }, {
+        key: 'drawFilter',
+        value: function drawFilter() {
+            var _this = this;
+
+            var gl = this.gl;
+
+            this.resize();
+            this.clear();
+
+            this.useProgram();
+
+            this.bindVA();
+
+            this.activeTexture(0);
+            this.bindTexture('u_image');
+
+            this.uniform1i("u_image", 0);
+            this.uniform1f("u_flipY", 1);
+
+            var _gl$canvas = gl.canvas,
+                width = _gl$canvas.width,
+                height = _gl$canvas.height;
+
+
+            this.eachFilter(function (f, index) {
+
+                _this.bindFrameBuffer('frame_buffer_' + index % 2);
+                _this.uniform2f("u_resolution", width, height);
+                _this.viewport(0, 0, width, height);
+
+                _this.effectFilter(f);
+
+                // ๋‹ค์Œ ๋“œ๋กœ์ž‰์„ ์œ„ํ•ด ๋ฐฉ๊ธˆ ๋ Œ๋”๋ง ํ•œ ํ…์Šค์ฒ˜๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
+                _this.bindTexture('img_texture_' + index % 2);
+            });
+
+            this.uniform1f("u_flipY", -1);
+            this.bindFrameBuffer(null);
+            this.uniform2f("u_resolution", width, height);
+            this.viewport(0, 0, width, height);
+
+            // clear ๊ฐ€ ์žˆ๋Š” ์ด์œ ๋Š”? 
+            this.clear();
+
+            this.effectFilter("normal");
+        }
+    }, {
+        key: 'effectFilter',
+        value: function effectFilter(filterFunction) {
+
+            if (typeof filterFunction == 'string') {
+                filterFunction = (GLFilter[filterFunction] || GLFilter.normal).call(GLFilter);
+            }
+
+            if (filterFunction.type == 'convolution') {
+                this.uniform1f("u_kernelSelect", filterFunction.length);
+                this.uniform1f("u_filterIndex", -1.0);
+                this.uniform1fv('u_kernel' + filterFunction.length + '[0]', filterFunction.content);
+                this.uniform1f('u_kernel' + filterFunction.length + 'Weight', this.computeKernelWeight(filterFunction.content));
+            } else {
+
+                this.uniform1f("u_kernelSelect", -1.0);
+                this.uniform1f("u_filterIndex", filterFunction.index);
+            }
+
+            this.triangles(0 /* ์‹œ์ž‘ ์ง€์  */, 6 /* ์ขŒํ‘œ(vertex, ๊ผญ์ง€์ ) ๊ฐœ์ˆ˜ */); // ์ด 6๊ฐœ๋ฅผ ๋„๋Š”๋ฐ , triangles ๋‹ˆ๊น 3๊ฐœ์”ฉ ๋ฌถ์–ด์„œ 2๋ฒˆ ๋ˆ๋‹ค. 
+        }
+    }, {
+        key: 'computeKernelWeight',
+        value: function computeKernelWeight(kernel) {
+            var weight = kernel.reduce(function (prev, curr) {
+                return prev + curr;
+            });
+            return weight <= 0 ? 1 : weight;
+        }
+    }, {
+        key: 'createProgram',
+        value: function createProgram(vertexSource, fragmentSource) {
+
+            var gl = this.gl;
+
+            var program = gl.createProgram();
+
+            this.vertexShader = this.createVertexShader(vertexSource);
+            this.fragmentShader = this.createFragmentShader(fragmentSource);
+
+            // console.log(fragmentSource)      
+
+
+            gl.attachShader(program, this.vertexShader);
+            gl.attachShader(program, this.fragmentShader);
+
+            gl.linkProgram(program);
+
+            var success = gl.getProgramParameter(program, gl.LINK_STATUS);
+            if (success) {
+
+                return program;
+            }
+
+            console.error(gl.getProgramInfoLog(program));
+            gl.deleteProgram(program);
+        }
+    }, {
+        key: 'createShader',
+        value: function createShader(type, source) {
+            var gl = this.gl;
+
+            var shader$$1 = gl.createShader(type);
+            gl.shaderSource(shader$$1, source);
+            gl.compileShader(shader$$1);
+
+            var success = gl.getShaderParameter(shader$$1, gl.COMPILE_STATUS);
+
+            if (success) {
+                return shader$$1;
+            }
+
+            console.error(gl.getShaderInfoLog(shader$$1));
+            gl.deleteShader(shader$$1);
+        }
+    }, {
+        key: 'createVertexShader',
+        value: function createVertexShader(vertexSource) {
+            var gl = this.gl;
+
+            return this.createShader(gl.VERTEX_SHADER, vertexSource);
+        }
+    }, {
+        key: 'createFragmentShader',
+        value: function createFragmentShader(fragmentSource) {
+            var gl = this.gl;
+
+            return this.createShader(gl.FRAGMENT_SHADER, fragmentSource);
+        }
+    }, {
+        key: 'eachFilter',
+        value: function eachFilter(callback) {
+            this.filterList.forEach(callback);
+        }
+    }, {
+        key: 'init',
+        value: function init() {
+            this.locations = {};
+            this.buffers = {};
+            this.framebuffers = {};
+            this.textures = {};
+            this.textureIndex = {};
+            this.hasTexParameter = {};
+        }
+    }, {
+        key: 'destroy',
+        value: function destroy() {
+            var gl = this.gl;
+
+            this.init();
+
+            gl.deleteProgram(this.program);
+        }
+    }, {
+        key: 'filter',
+        value: function filter(filterList, doneCallback) {
+
+            this.filterList = filterList;
+
+            this.initCanvas(makeVertexShaderSource(), makeFragmentShaderSource(this.filterList));
+
+            this.drawFilter();
+
+            if (typeof doneCallback == 'function') {
+
+                doneCallback(this);
+            }
+        }
+    }]);
+    return GLCanvas;
+}();
+
+var GL$1 = {
+    GLCanvas: GLCanvas
+};
+
+var functions = {
+    filter: filter
+};
+
+
+
+
+
+
+function makeFilterFunction(filterObj) {
+    var filterName = filterObj.arr[0];
+    var f = GLFilter[filterName];
+
+    var arr = filterObj.arr;
+    arr.shift();
+
+    var result = f.apply(this, arr);
+
+    return result;
+}
+
+/**
+ * ๊ฒน์ณ์ ธ ์žˆ๋Š” Filter ํ•จ์ˆ˜๋ฅผ 1์ฐจ์›์œผ๋กœ ๋‚˜์—ดํ•œ๋‹ค. 
+ * ex)  ['sobel'] => ['sobel-horizontal', 'sobel-vertial'] 
+ * 
+ * @param {String|Array} filterString 
+ */
+function flatFilter(filterString) {
+
+    var filter_list = [];
+
+    if (typeof filterString == 'string') {
+        filter_list = matches$1(filterString);
+    } else if (Array.isArray(filterString)) {
+        filter_list = filterString;
+    }
+
+    var allFilter = [];
+
+    filter_list.forEach(function (filterObj) {
+        var filterName = filterObj.arr[0];
+
+        if (GLFilter[filterName]) {
+            var f = makeFilterFunction(filterObj);
+
+            if (f.type == 'convolution' || f.type == 'shader') {
+                allFilter.push(f);
+            } else {
+                f.forEach(function (subFilter) {
+                    allFilter = allFilter.concat(flatFilter(subFilter));
+                });
+            }
+        }
+    });
+
+    // console.log(filter_list, allFilter)
+
+    return allFilter;
+}
+
+function filter(img, filterString, callback, opt) {
+
+    var canvas = new GL$1.GLCanvas({
+        width: opt.width || img.width,
+        height: opt.height || img.height,
+        img: img
+    });
+
+    canvas.filter(flatFilter(filterString), function done() {
+        if (typeof callback == 'function') {
+            callback(canvas);
+        }
+    });
+}
+
+var GL = _extends({}, GL$1, functions);
+
+function palette(colors) {
+    var k = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 6;
+    var exportFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'hex';
+
+
+    if (colors.length > k) {
+        colors = kmeans(colors, k);
+    }
+
+    return colors.map(function (c) {
+        return format(c, exportFormat);
+    });
+}
+
+function ImageToRGB(url) {
+    var callbackOrOption = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var callback = arguments[2];
+
+
+    if (!callback) {
+        var img = new ImageLoader(url);
+        img.loadImage(function () {
+            if (typeof callbackOrOption == 'function') {
+                callbackOrOption(img.toRGB());
+            }
+        });
+    } else if (callback) {
+        var img = new ImageLoader(url, callbackOrOption);
+        img.loadImage(function () {
+            if (typeof callback == 'function') {
+                callback(img.toRGB());
+            }
+        });
+    }
+}
+
+function ImageToCanvas(url, filter, callback) {
+    var opt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : { frameTimer: 'full' };
+
+    ImageToURL(url, filter, callback, Object.assign({
+        returnTo: 'canvas'
+    }, opt));
+}
+
+function ImageToURL(url, filter, callback) {
+    var opt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : { frameTimer: 'full' };
+
+    var img = new ImageLoader(url);
+    img.loadImage(function () {
+        img.toArray(filter, function (datauri) {
+            if (typeof callback == 'function') {
+                callback(datauri);
+            }
+        }, opt);
+    });
+}
+
+function GLToCanvas(url, filter, callback) {
+    var opt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+    var img = new ImageLoader(url);
+    img.load(function () {
+        GL.filter(img.newImage, filter, function done(datauri) {
+            if (typeof callback == 'function') {
+                callback(datauri);
+            }
+        }, opt);
+    });
+}
+
+function histogram(url, callback) {
+    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+    var img = new ImageLoader(url);
+    img.loadImage(function () {
+        if (typeof callback == 'function') {
+            callback(img.toHistogram(opt));
+        }
+    });
+}
+
+function histogramToPoints(points) {
+    var tension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.2;
+
+
+    var controlPoints = [];
+    for (var i = 0; i < points.length; i++) {
+        var p = points[i];
+        if (i == 0) {
+            controlPoints[i] = [];
+            continue;
+        }
+
+        if (i == points.length - 1) {
+            controlPoints[i] = [];
+            continue;
+        }
+
+        var prevPoint = points[i - 1];
+        var nextPoint = points[i + 1];
+
+        // ๊ธฐ์šธ๊ธฐ 
+        var M = (nextPoint[1] - prevPoint[1]) / (nextPoint[0] - prevPoint[0]);
+
+        var newControlPoint = [prevPoint[0] + (nextPoint[0] - prevPoint[0]) * tension, prevPoint[1] + (nextPoint[1] - prevPoint[1]) * tension];
+
+        var controlPoint = [[].concat(toConsumableArray(prevPoint)), /* start */
+        [].concat(newControlPoint) /* end */
+        ];
+
+        var P = Math.sqrt(Math.pow(p[0] - prevPoint[0], 2) + Math.pow(p[1] - prevPoint[1], 2));
+        var N = Math.sqrt(Math.pow(nextPoint[0] - p[0], 2) + Math.pow(nextPoint[1] - p[1], 2));
+
+        var rate = P / N;
+
+        var dx = controlPoint[0][0] + (controlPoint[1][0] - controlPoint[0][0]) * rate;
+        var dy = controlPoint[0][1] + (controlPoint[1][1] - controlPoint[0][1]) * rate;
+
+        controlPoint[0][0] += p[0] - dx;
+        controlPoint[0][1] += p[1] - dy;
+        controlPoint[1][0] += p[0] - dx;
+        controlPoint[1][1] += p[1] - dy;
+
+        controlPoints[i] = controlPoint;
+    }
+
+    return controlPoints;
+}
+
+function ImageToHistogram(url, callback) {
+    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : { width: 200, height: 100 };
+
+
+    var img = new ImageLoader(url);
+    img.loadImage(function () {
+        Canvas.createHistogram(opt.width || 200, opt.height || 100, img.toHistogram(opt), function (canvas) {
+            if (typeof callback == 'function') callback(canvas.toDataURL('image/png'));
+        }, opt);
+    });
+}
+
+var image = {
+    palette: palette,
+    ImageToCanvas: ImageToCanvas,
+    ImageToHistogram: ImageToHistogram,
+    ImageToRGB: ImageToRGB,
+    ImageToURL: ImageToURL,
+    GLToCanvas: GLToCanvas,
+    histogram: histogram,
+    histogramToPoints: histogramToPoints
+};
+
+var Color$1 = _extends({}, formatter, math, mixin, parser, fromYCrCb, fromRGB, fromCMYK, fromHSV, fromHSL, fromLAB, image);
+
+var hue_color = [{ rgb: '#ff0000', start: .0 }, { rgb: '#ffff00', start: .17 }, { rgb: '#00ff00', start: .33 }, { rgb: '#00ffff', start: .50 }, { rgb: '#0000ff', start: .67 }, { rgb: '#ff00ff', start: .83 }, { rgb: '#ff0000', start: 1 }];
+
+function checkHueColor(p) {
+    var startColor, endColor;
+
+    for (var i = 0; i < hue_color.length; i++) {
+        if (hue_color[i].start >= p) {
+            startColor = hue_color[i - 1];
+            endColor = hue_color[i];
+            break;
+        }
+    }
+
+    if (startColor && endColor) {
+        return Color$1.interpolateRGB(startColor, endColor, (p - startColor.start) / (endColor.start - startColor.start));
+    }
+
+    return hue_color[0].rgb;
+}
+
+function initHueColors() {
+    for (var i = 0, len = hue_color.length; i < len; i++) {
+        var hue = hue_color[i];
+
+        var obj = Color$1.parse(hue.rgb);
+
+        hue.r = obj.r;
+        hue.g = obj.g;
+        hue.b = obj.b;
+    }
+}
+
+initHueColors();
+
+var HueColor = {
+    colors: hue_color,
+    checkHueColor: checkHueColor
+};
+
+// TODO: worker run 
+var ImageFilter = _extends({}, FilterList, functions$1);
+
+var Util = {
+    Color: Color$1,
+    HueColor: HueColor,
+    ColorNames: ColorNames,
+    ImageFilter: ImageFilter,
+    GL: GL,
+    Canvas: Canvas,
+    ImageLoader: ImageLoader
+};
+
+var color = Color$1.color;
+
+var counter = 0;
+var cached = [];
+
+var Dom = function () {
+    function Dom(tag, className, attr) {
+        classCallCheck(this, Dom);
+
+
+        if (typeof tag != 'string') {
+            this.el = tag;
+        } else {
+
+            var el = document.createElement(tag);
+            this.uniqId = counter++;
+
+            if (className) {
+                el.className = className;
+            }
+
+            attr = attr || {};
+
+            for (var k in attr) {
+                el.setAttribute(k, attr[k]);
+            }
+
+            this.el = el;
+        }
+    }
+
+    createClass(Dom, [{
+        key: 'attr',
+        value: function attr(key, value) {
+            if (arguments.length == 1) {
+                return this.el.getAttribute(key);
+            }
+
+            this.el.setAttribute(key, value);
+
+            return this;
+        }
+    }, {
+        key: 'closest',
+        value: function closest(cls) {
+
+            var temp = this;
+            var checkCls = false;
+
+            while (!(checkCls = temp.hasClass(cls))) {
+                if (temp.el.parentNode) {
+                    temp = new Dom(temp.el.parentNode);
+                } else {
+                    return null;
+                }
+            }
+
+            if (checkCls) {
+                return temp;
+            }
+
+            return null;
+        }
+    }, {
+        key: 'checked',
+        value: function checked() {
+            return this.el.checked;
+        }
+    }, {
+        key: 'removeClass',
+        value: function removeClass(cls) {
+            this.el.className = (' ' + this.el.className + ' ').replace(' ' + cls + ' ', ' ').trim();
+
+            return this;
+        }
+    }, {
+        key: 'hasClass',
+        value: function hasClass(cls) {
+            if (!this.el.className) {
+                return false;
+            } else {
+                var newClass = ' ' + this.el.className + ' ';
+                return newClass.indexOf(' ' + cls + ' ') > -1;
+            }
+        }
+    }, {
+        key: 'addClass',
+        value: function addClass(cls) {
+            if (!this.hasClass(cls)) {
+                this.el.className = this.el.className + ' ' + cls;
+            }
+
+            return this;
+        }
+    }, {
+        key: 'toggleClass',
+        value: function toggleClass(cls) {
+            if (this.hasClass(cls)) {
+                this.removeClass(cls);
+            } else {
+                this.addClass(cls);
+            }
+        }
+    }, {
+        key: 'html',
+        value: function html(_html) {
+            try {
+                if (typeof _html == 'string') {
+                    this.el.innerHTML = _html;
+                } else {
+                    this.empty().append(_html);
+                }
+            } catch (e) {
+                console.log(_html);
+            }
+
+            return this;
+        }
+    }, {
+        key: 'find',
+        value: function find(selector) {
+            return this.el.querySelector(selector);
+        }
+    }, {
+        key: '$',
+        value: function $(selector) {
+            return new Dom(this.find(selector));
+        }
+    }, {
+        key: 'findAll',
+        value: function findAll(selector) {
+            return this.el.querySelectorAll(selector);
+        }
+    }, {
+        key: '$$',
+        value: function $$(selector) {
+            return [].concat(toConsumableArray(this.findAll(selector))).map(function (el) {
+                return new Dom(el);
+            });
+        }
+    }, {
+        key: 'empty',
+        value: function empty() {
+            return this.html('');
+        }
+    }, {
+        key: 'append',
+        value: function append(el) {
+
+            if (typeof el == 'string') {
+                this.el.appendChild(document.createTextNode(el));
+            } else {
+                this.el.appendChild(el.el || el);
+            }
+
+            return this;
+        }
+    }, {
+        key: 'appendTo',
+        value: function appendTo(target) {
+            var t = target.el ? target.el : target;
+
+            t.appendChild(this.el);
+
+            return this;
+        }
+    }, {
+        key: 'remove',
+        value: function remove() {
+            if (this.el.parentNode) {
+                this.el.parentNode.removeChild(this.el);
+            }
+
+            return this;
+        }
+    }, {
+        key: 'text',
+        value: function text() {
+            return this.el.textContent;
+        }
+    }, {
+        key: 'css',
+        value: function css(key, value) {
+            var _this = this;
+
+            if (arguments.length == 2) {
+                this.el.style[key] = value;
+            } else if (arguments.length == 1) {
+
+                if (typeof key == 'string') {
+                    return getComputedStyle(this.el)[key];
+                } else {
+                    var keys = key || {};
+                    Object.keys(keys).forEach(function (k) {
+                        _this.el.style[k] = keys[k];
+                    });
+                }
+            }
+
+            return this;
+        }
+    }, {
+        key: 'cssFloat',
+        value: function cssFloat(key) {
+            return parseFloat(this.css(key));
+        }
+    }, {
+        key: 'cssInt',
+        value: function cssInt(key) {
+            return parseInt(this.css(key));
+        }
+    }, {
+        key: 'offset',
+        value: function offset() {
+            var rect = this.el.getBoundingClientRect();
+
+            return {
+                top: rect.top + Dom.getScrollTop(),
+                left: rect.left + Dom.getScrollLeft()
+            };
+        }
+    }, {
+        key: 'rect',
+        value: function rect() {
+            return this.el.getBoundingClientRect();
+        }
+    }, {
+        key: 'position',
+        value: function position() {
+
+            if (this.el.style.top) {
+                return {
+                    top: parseFloat(this.css('top')),
+                    left: parseFloat(this.css('left'))
+                };
+            } else {
+                return this.el.getBoundingClientRect();
+            }
+        }
+    }, {
+        key: 'size',
+        value: function size() {
+            return [this.width(), this.height()];
+        }
+    }, {
+        key: 'width',
+        value: function width() {
+            return this.el.offsetWidth || this.el.getBoundingClientRect().width;
+        }
+    }, {
+        key: 'contentWidth',
+        value: function contentWidth() {
+            return this.width() - this.cssFloat('padding-left') - this.cssFloat('padding-right');
+        }
+    }, {
+        key: 'height',
+        value: function height() {
+            return this.el.offsetHeight || this.el.getBoundingClientRect().height;
+        }
+    }, {
+        key: 'contentHeight',
+        value: function contentHeight() {
+            return this.height() - this.cssFloat('padding-top') - this.cssFloat('padding-bottom');
+        }
+    }, {
+        key: 'dataKey',
+        value: function dataKey(key) {
+            return this.uniqId + '.' + key;
+        }
+    }, {
+        key: 'data',
+        value: function data(key, value) {
+            if (arguments.length == 2) {
+                cached[this.dataKey(key)] = value;
+            } else if (arguments.length == 1) {
+                return cached[this.dataKey(key)];
+            } else {
+                var keys = Object.keys(cached);
+
+                var uniqId = this.uniqId + ".";
+                return keys.filter(function (key) {
+                    if (key.indexOf(uniqId) == 0) {
+                        return true;
+                    }
+
+                    return false;
+                }).map(function (value) {
+                    return cached[value];
+                });
+            }
+
+            return this;
+        }
+    }, {
+        key: 'val',
+        value: function val(value) {
+            if (arguments.length == 0) {
+                return this.el.value;
+            } else if (arguments.length == 1) {
+                this.el.value = value;
+            }
+
+            return this;
+        }
+    }, {
+        key: 'int',
+        value: function int() {
+            return parseInt(this.val(), 10);
+        }
+    }, {
+        key: 'float',
+        value: function float() {
+            return parseFloat(this.val());
+        }
+    }, {
+        key: 'show',
+        value: function show() {
+            return this.css('display', 'block');
+        }
+    }, {
+        key: 'hide',
+        value: function hide() {
+            return this.css('display', 'none');
+        }
+    }, {
+        key: 'toggle',
+        value: function toggle() {
+            if (this.css('display') == 'none') {
+                return this.show();
+            } else {
+                return this.hide();
+            }
+        }
+    }, {
+        key: 'scrollTop',
+        value: function scrollTop() {
+            if (this.el === document.body) {
+                return Dom.getScrollTop();
+            }
+
+            return this.el.scrollTop;
+        }
+    }, {
+        key: 'scrollLeft',
+        value: function scrollLeft() {
+            if (this.el === document.body) {
+                return Dom.getScrollLeft();
+            }
+
+            return this.el.scrollLeft;
+        }
+    }, {
+        key: 'on',
+        value: function on(eventName, callback, opt1, opt2) {
+            this.el.addEventListener(eventName, callback, opt1, opt2);
+
+            return this;
+        }
+    }, {
+        key: 'off',
+        value: function off(eventName, callback) {
+            this.el.removeEventListener(eventName, callback);
+
+            return this;
+        }
+    }, {
+        key: 'getElement',
+        value: function getElement() {
+            return this.el;
+        }
+    }, {
+        key: 'createChild',
+        value: function createChild(tag) {
+            var className = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+            var attrs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+            var css = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+            var $element = new Dom(tag, className, attrs);
+            $element.css(css);
+
+            this.append($element);
+
+            return $element;
+        }
+    }, {
+        key: 'firstChild',
+        value: function firstChild() {
+            return new Dom(this.el.firstElementChild);
+        }
+    }, {
+        key: 'replace',
+        value: function replace(oldElement, newElement) {
+            this.el.replaceChild(newElement, oldElement);
+
+            return this;
+        }
+    }], [{
+        key: 'getScrollTop',
+        value: function getScrollTop() {
+            return Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop);
+        }
+    }, {
+        key: 'getScrollLeft',
+        value: function getScrollLeft() {
+            return Math.max(window.pageXOffset, document.documentElement.scrollLeft, document.body.scrollLeft);
+        }
+    }]);
+    return Dom;
+}();
+
+var BaseModule = function () {
+    function BaseModule($store) {
+        classCallCheck(this, BaseModule);
+
+        this.$store = $store;
+        this.initialize();
+    }
+
+    createClass(BaseModule, [{
+        key: 'initialize',
+        value: function initialize() {
+            var _this = this;
+
+            this.filterProps().forEach(function (key) {
+                _this.$store.action(key, _this);
+            });
+        }
+    }, {
+        key: 'filterProps',
+        value: function filterProps() {
+            var pattern = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
+
+            return Object.getOwnPropertyNames(this.__proto__).filter(function (key) {
+                return key.startsWith(pattern);
+            });
+        }
+    }]);
+    return BaseModule;
+}();
+
+var ColorSetsList = function (_BaseModule) {
+    inherits(ColorSetsList, _BaseModule);
+
+    function ColorSetsList() {
+        classCallCheck(this, ColorSetsList);
+        return possibleConstructorReturn(this, (ColorSetsList.__proto__ || Object.getPrototypeOf(ColorSetsList)).apply(this, arguments));
+    }
+
+    createClass(ColorSetsList, [{
+        key: 'initialize',
+        value: function initialize() {
+            get(ColorSetsList.prototype.__proto__ || Object.getPrototypeOf(ColorSetsList.prototype), 'initialize', this).call(this);
+
+            // set property
+            this.$store.colorSetsList = [{ name: "Material",
+                colors: ['#F44336', '#E91E63', '#9C27B0', '#673AB7', '#3F51B5', '#2196F3', '#03A9F4', '#00BCD4', '#009688', '#4CAF50', '#8BC34A', '#CDDC39', '#FFEB3B', '#FFC107', '#FF9800', '#FF5722', '#795548', '#9E9E9E', '#607D8B']
+            }, { name: "Custom", "edit": true, "colors": [] }, { name: "Color Scale", "scale": ['red', 'yellow', 'black'], count: 5 }];
+            this.$store.currentColorSets = {};
+        }
+    }, {
+        key: '/list',
+        value: function list($store) {
+            return Array.isArray($store.userList) && $store.userList.length ? $store.userList : $store.colorSetsList;
+        }
+    }, {
+        key: '/setUserPalette',
+        value: function setUserPalette($store, list) {
+            $store.userList = list;
+
+            $store.dispatch('/resetUserPalette');
+            $store.dispatch('/setCurrentColorSets');
+        }
+    }, {
+        key: '/resetUserPalette',
+        value: function resetUserPalette($store) {
+            if ($store.userList && $store.userList.length) {
+                $store.userList = $store.userList.map(function (element, index) {
+
+                    if (typeof element.colors == 'function') {
+                        var makeCallback = element.colors;
+
+                        element.colors = makeCallback($store);
+                        element._colors = makeCallback;
+                    }
+
+                    return Object.assign({
+                        name: 'color-' + index,
+                        colors: []
+                    }, element);
+                });
+
+                $store.emit('changeUserList');
+            }
+        }
+    }, {
+        key: '/setCurrentColorSets',
+        value: function setCurrentColorSets($store, nameOrIndex) {
+
+            var _list = $store.dispatch('/list');
+
+            if (typeof nameOrIndex == 'undefined') {
+                $store.currentColorSets = _list[0];
+            } else if (typeof nameOrIndex == 'number') {
+                $store.currentColorSets = _list[nameOrIndex];
+            } else {
+                $store.currentColorSets = _list.filter(function (obj) {
+                    return obj.name == nameOrIndex;
+                })[0];
+            }
+
+            $store.emit('changeCurrentColorSets');
+        }
+    }, {
+        key: '/getCurrentColorSets',
+        value: function getCurrentColorSets($store) {
+            return $store.currentColorSets;
+        }
+    }, {
+        key: '/addCurrentColor',
+        value: function addCurrentColor($store, color) {
+            if (Array.isArray($store.currentColorSets.colors)) {
+                $store.currentColorSets.colors.push(color);
+                $store.emit('changeCurrentColorSets');
+            }
+        }
+    }, {
+        key: '/setCurrentColorAll',
+        value: function setCurrentColorAll($store) {
+            var colors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
+            $store.currentColorSets.colors = colors;
+            $store.emit('changeCurrentColorSets');
+        }
+    }, {
+        key: '/removeCurrentColor',
+        value: function removeCurrentColor($store, index) {
+            if ($store.currentColorSets.colors[index]) {
+                $store.currentColorSets.colors.splice(index, 1);
+                $store.emit('changeCurrentColorSets');
+            }
+        }
+    }, {
+        key: '/removeCurrentColorToTheRight',
+        value: function removeCurrentColorToTheRight($store, index) {
+            if ($store.currentColorSets.colors[index]) {
+                $store.currentColorSets.colors.splice(index, Number.MAX_VALUE);
+                $store.emit('changeCurrentColorSets');
+            }
+        }
+    }, {
+        key: '/clearPalette',
+        value: function clearPalette($store) {
+            if ($store.currentColorSets.colors) {
+                $store.currentColorSets.colors = [];
+                $store.emit('changeCurrentColorSets');
+            }
+        }
+    }, {
+        key: '/getCurrentColors',
+        value: function getCurrentColors($store) {
+            return $store.dispatch('/getColors', $store.currentColorSets);
+        }
+    }, {
+        key: '/getColors',
+        value: function getColors($store, element) {
+            if (element.scale) {
+                return Color$1.scale(element.scale, element.count);
+            }
+
+            return element.colors || [];
+        }
+    }, {
+        key: '/getColorSetsList',
+        value: function getColorSetsList($store) {
+            return $store.dispatch('/list').map(function (element) {
+                return {
+                    name: element.name,
+                    edit: element.edit,
+                    colors: $store.dispatch('/getColors', element)
+                };
+            });
+        }
+    }]);
+    return ColorSetsList;
+}(BaseModule);
+
+var Event = {
+    addEvent: function addEvent(dom, eventName, callback, options) {
+        if (dom) {
+            dom.addEventListener(eventName, callback, options);
+        }
+    },
+    removeEvent: function removeEvent(dom, eventName, callback) {
+        if (dom) {
+            dom.removeEventListener(eventName, callback);
+        }
+    },
+    pos: function pos(e) {
+        if (e.touches && e.touches[0]) {
+            return e.touches[0];
+        }
+
+        return e;
+    },
+    posXY: function posXY(e) {
+        var pos = this.pos(e);
+        return {
+            x: pos.pageX,
+            y: pos.pageY
+        };
+    }
+};
+
+var DELEGATE_SPLIT = '.';
+
+var State = function () {
+  function State(masterObj) {
+    var settingObj = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    classCallCheck(this, State);
+
+
+    this.masterObj = masterObj;
+    this.settingObj = settingObj;
+  }
+
+  createClass(State, [{
+    key: 'set',
+    value: function set$$1(key, value) {
+      var defaultValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+
+      this.settingObj[key] = value || defaultValue;
+    }
+  }, {
+    key: 'init',
+    value: function init(key) {
+
+      if (!this.has(key)) {
+
+        var arr = key.split(DELEGATE_SPLIT);
+
+        var obj = this.masterObj.refs[arr[0]] || this.masterObj[arr[0]] || this.masterObj;
+        var method = arr.pop();
+
+        if (obj[method]) {
+          for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+            args[_key - 1] = arguments[_key];
+          }
+
+          var value = obj[method].apply(obj, args);
+
+          this.set(key, value);
+        }
+      }
+    }
+  }, {
+    key: 'get',
+    value: function get$$1(key) {
+      var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+
+      this.init(key, defaultValue);
+
+      return this.settingObj[key] || defaultValue;
+    }
+  }, {
+    key: 'has',
+    value: function has(key) {
+      return !!this.settingObj[key];
+    }
+  }]);
+  return State;
+}();
+
+var CHECK_EVENT_PATTERN = /^(click|mouse(down|up|move|enter|leave)|touch(start|move|end)|key(down|up|press)|contextmenu|change|input)/ig;
+var CHECK_LOAD_PATTERN = /^load (.*)/ig;
+var EVENT_SAPARATOR = ' ';
+var META_KEYS = ['Control', 'Shift', 'Alt', 'Meta'];
+
+var EventMachin = function () {
+  function EventMachin() {
+    classCallCheck(this, EventMachin);
+
+    this.state = new State(this);
+    this.refs = {};
+
+    this.childComponents = this.components();
+  }
+
+  /**
+   * ์ž์‹์œผ๋กœ ์‚ฌ์šฉํ•  ์ปดํฌ๋„ŒํŠธ๋ฅผ ์ƒ์„ฑํ•ด์ค€๋‹ค. 
+   * ์ƒ์„ฑ ์‹œ์ ์— $store ๊ฐ์ฒด๊ฐ€ ์ž๋™์œผ๋กœ ๊ณต์œ ๋œ๋‹ค. 
+   * ๋ชจ๋“  ๋ฐ์ดํƒ€๋Š” $store ๊ธฐ์ค€์œผ๋กœ ์ž‘์„ฑํ•œ๋‹ค. 
+   */
+
+
+  createClass(EventMachin, [{
+    key: 'newChildComponents',
+    value: function newChildComponents() {
+      var _this = this;
+
+      var childKeys = Object.keys(this.childComponents);
+      childKeys.forEach(function (key) {
+        var Component = _this.childComponents[key];
+
+        _this[key] = new Component(_this);
+      });
+    }
+
+    /**
+     * ๋ถ€๋ชจ๊ฐ€ ์ •์˜ํ•œ template ๊ณผ  ๊ทธ ์•ˆ์—์„œ ๋™์ž‘ํ•˜๋Š” ์ž์‹ ์ปดํฌ๋„ŒํŠธ๋“ค์„ ๋‹ค ํ•ฉ์ณ์„œ 
+     * ์ตœ์ข… element ๋ฅผ ๋งŒ๋“ค์–ด์ค€๋‹ค. 
+     * 
+     * ๊ทธ๋ฆฌ๊ณ  ์ž๋™์œผ๋กœ load ๋˜์–ด์งˆ๊ฒŒ ์žˆ์œผ๋ฉด ๋กœ๋“œ ํ•ด์ค€๋‹ค. 
+     */
+
+  }, {
+    key: 'render',
+    value: function render() {
+      // 1. ๋‚˜์˜ template ์„ ๋งŒ๋“ค์–ด๋‚ด๊ณ   
+      this.$el = this.parseTemplate(this.template());
+      this.refs.$el = this.$el;
+
+      // ๊ฐœ๋ณ„ ๊ฐ์ฒด ์…‹ํŒ…ํ•˜๊ณ  
+      this.parseTarget();
+
+      // ๋ฐ์ดํƒ€ ๋กœ๋“œ ํ•˜๊ณ  
+      this.load();
+
+      this.afterRender();
+    }
+  }, {
+    key: 'afterRender',
+    value: function afterRender() {}
+
+    /**
+     * ์ž์‹ ์ปดํฌ๋„ŒํŠธ๋กœ ์‚ฌ์šฉ๋  ๊ฐ์ฒด ์ •์˜ 
+     */
+
+  }, {
+    key: 'components',
+    value: function components() {
+      return {};
+    }
+
+    /**
+     * Class ๊ธฐ๋ฐ˜์œผ๋กœ $el ์„ ์ƒ์„ฑํ•˜๊ธฐ ์œ„ํ•ด์„œ 
+     * ์„ ์–ธํ˜•์œผ๋กœ html ํ…œํ”Œ๋ฆฟ์„ ์ •์˜ํ•œ๋‹ค. 
+     * 
+     * @param {*} html 
+     */
+
+  }, {
+    key: 'parseTemplate',
+    value: function parseTemplate(html) {
+      var _this2 = this;
+
+      var $el = new Dom("div").html(html).firstChild();
+
+      // ref element ์ •๋ฆฌ 
+      var refs = $el.findAll('[ref]');
+
+      [].concat(toConsumableArray(refs)).forEach(function (node) {
+        var name = node.getAttribute('ref');
+        _this2.refs[name] = new Dom(node);
+      });
+
+      return $el;
+    }
+
+    /**
+     * target ์œผ๋กœ ์ง€์ •๋œ ์ž์‹ ์ปดํฌ๋„ŒํŠธ๋ฅผ ๋Œ€์ฒดํ•ด์ค€๋‹ค.
+     */
+
+  }, {
+    key: 'parseTarget',
+    value: function parseTarget() {
+      var _this3 = this;
+
+      var $el = this.$el;
+      var targets = $el.findAll('[target]');
+
+      [].concat(toConsumableArray(targets)).forEach(function (node) {
+        var targetComponentName = node.getAttribute('target');
+        var refName = node.getAttribute('ref') || targetComponentName;
+
+        var Component = _this3.childComponents[targetComponentName];
+        var instance = new Component(_this3);
+        _this3[refName] = instance;
+        _this3.refs[refName] = instance.$el;
+
+        if (instance) {
+          instance.render();
+          var $parent = new Dom(node.parentNode);
+          $parent.replace(node, instance.$el.el);
+        }
+      });
+    }
+
+    // load function์ด ์ •์˜๋œ ๊ฐ์ฒด๋Š” load ๋ฅผ ์‹คํ–‰ํ•ด์ค€๋‹ค. 
+
+  }, {
+    key: 'load',
+    value: function load() {
+      var _this4 = this;
+
+      this.filterProps(CHECK_LOAD_PATTERN).forEach(function (callbackName) {
+        var elName = callbackName.split('load ')[1];
+
+        if (_this4.refs[elName]) {
+          _this4.refs[elName].html(_this4.parseTemplate(_this4[callbackName].call(_this4)));
+        }
+      });
+    }
+
+    // ๊ธฐ๋ณธ ํ…œํ”Œ๋ฆฟ ์ง€์ • 
+
+  }, {
+    key: 'template',
+    value: function template() {
+      return '<div></div>';
+    }
+  }, {
+    key: 'initialize',
+    value: function initialize() {}
+
+    /**
+     * ์ด๋ฒคํŠธ๋ฅผ ์ดˆ๊ธฐํ™”ํ•œ๋‹ค. 
+     */
+
+  }, {
+    key: 'initializeEvent',
+    value: function initializeEvent() {
+      var _this5 = this;
+
+      this.initializeEventMachin();
+
+      // ์ž์‹ ์ด๋ฒคํŠธ๋„ ๊ฐ™์ด ์ดˆ๊ธฐํ™” ํ•œ๋‹ค. 
+      // ๊ทธ๋ž˜์„œ ์ด ๋ฉ”์†Œ๋“œ๋Š” ๋ถ€๋ชจ์—์„œ ํ•œ๋ฒˆ๋งŒ ๋ถˆ๋ ค๋„ ๋œ๋‹ค. 
+      Object.keys(this.childComponents).forEach(function (key) {
+        if (_this5[key]) _this5[key].initializeEvent();
+      });
+    }
+
+    /**
+     * ์ž์›์„ ํ•ด์ œํ•œ๋‹ค. 
+     * ์ด๊ฒƒ๋„ ์—ญ์‹œ ์ž์‹ ์ปดํฌ๋„ŒํŠธ๊นŒ์ง€ ์ œ์–ดํ•˜๊ธฐ ๋•Œ๋ฌธ์— ๊ฐ€์žฅ ์ตœ์ƒ์œ„ ๋ถ€๋ชจ์—์„œ ํ•œ๋ฒˆ๋งŒ ํ˜ธ์ถœ๋˜๋„ ๋œ๋‹ค. 
+     */
+
+  }, {
+    key: 'destroy',
+    value: function destroy() {
+      var _this6 = this;
+
+      this.destroyEventMachin();
+      // this.refs = {} 
+
+      Object.keys(this.childComponents).forEach(function (key) {
+        if (_this6[key]) _this6[key].destroy();
+      });
+    }
+  }, {
+    key: 'destroyEventMachin',
+    value: function destroyEventMachin() {
+      this.removeEventAll();
+    }
+  }, {
+    key: 'initializeEventMachin',
+    value: function initializeEventMachin() {
+      this.filterProps(CHECK_EVENT_PATTERN).forEach(this.parseEvent.bind(this));
+    }
+
+    /**
+     * property ์ˆ˜์ง‘ํ•˜๊ธฐ 
+     * ์ƒ์œ„ ํด๋ž˜์Šค์˜ ๋ชจ๋“  property ๋ฅผ ์ˆ˜์ง‘ํ•ด์„œ ๋ฆฌํ„ดํ•œ๋‹ค. 
+     */
+
+  }, {
+    key: 'collectProps',
+    value: function collectProps() {
+
+      if (!this.collapsedProps) {
+        var p = this.__proto__;
+        var results = [];
+        do {
+          results.push.apply(results, toConsumableArray(Object.getOwnPropertyNames(p)));
+          p = p.__proto__;
+        } while (p);
+
+        this.collapsedProps = results;
+      }
+
+      return this.collapsedProps;
+    }
+  }, {
+    key: 'filterProps',
+    value: function filterProps(pattern) {
+      return this.collectProps().filter(function (key) {
+        return key.match(pattern);
+      });
+    }
+  }, {
+    key: 'parseEvent',
+    value: function parseEvent(key) {
+      var arr = key.split(EVENT_SAPARATOR);
+
+      this.bindingEvent(arr, this[key].bind(this));
+    }
+  }, {
+    key: 'getDefaultDomElement',
+    value: function getDefaultDomElement(dom) {
+      var el = void 0;
+
+      if (dom) {
+        el = this.refs[dom] || this[dom] || window[dom];
+      } else {
+        el = this.el || this.$el || this.$root;
+      }
+
+      if (el instanceof Dom) {
+        return el.getElement();
+      }
+
+      return el;
+    }
+  }, {
+    key: 'getDefaultEventObject',
+    value: function getDefaultEventObject(eventName) {
+      var _this7 = this;
+
+      var arr = eventName.split('.');
+      var realEventName = arr.shift();
+
+      var isControl = arr.includes('Control');
+      var isShift = arr.includes('Shift');
+      var isAlt = arr.includes('Alt');
+      var isMeta = arr.includes('Meta');
+
+      arr = arr.filter(function (code) {
+        return META_KEYS.includes(code) === false;
+      });
+
+      var checkMethodList = arr.filter(function (code) {
+        return !!_this7[code];
+      });
+
+      arr = arr.filter(function (code) {
+        return checkMethodList.includes(code) === false;
+      }).map(function (code) {
+        return code.toLowerCase();
+      });
+
+      return {
+        eventName: realEventName,
+        isControl: isControl,
+        isShift: isShift,
+        isAlt: isAlt,
+        isMeta: isMeta,
+        codes: arr,
+        checkMethodList: checkMethodList
+      };
+    }
+  }, {
+    key: 'bindingEvent',
+    value: function bindingEvent(_ref, callback) {
+      var _ref2 = toArray(_ref),
+          eventName = _ref2[0],
+          dom = _ref2[1],
+          delegate = _ref2.slice(2);
+
+      dom = this.getDefaultDomElement(dom);
+      var eventObject = this.getDefaultEventObject(eventName);
+
+      eventObject.dom = dom;
+      eventObject.delegate = delegate.join(EVENT_SAPARATOR);
+
+      this.addEvent(eventObject, callback);
+    }
+  }, {
+    key: 'matchPath',
+    value: function matchPath(el, selector) {
+      if (el) {
+        if (el.matches(selector)) {
+          return el;
+        }
+        return this.matchPath(el.parentElement, selector);
+      }
+      return null;
+    }
+  }, {
+    key: 'getBindings',
+    value: function getBindings() {
+
+      if (!this._bindings) {
+        this.initBindings();
+      }
+
+      return this._bindings;
+    }
+  }, {
+    key: 'addBinding',
+    value: function addBinding(obj) {
+      this.getBindings().push(obj);
+    }
+  }, {
+    key: 'initBindings',
+    value: function initBindings() {
+      this._bindings = [];
+    }
+  }, {
+    key: 'checkEventType',
+    value: function checkEventType(e, eventObject) {
+      var _this8 = this;
+
+      var onlyControl = eventObject.isControl ? e.ctrlKey : true;
+      var onlyShift = eventObject.isShift ? e.shiftKey : true;
+      var onlyAlt = eventObject.isAlt ? e.altKey : true;
+      var onlyMeta = eventObject.isMeta ? e.metaKey : true;
+
+      var hasKeyCode = true;
+      if (eventObject.codes.length) {
+        hasKeyCode = eventObject.codes.includes(e.code.toLowerCase()) || eventObject.codes.includes(e.key.toLowerCase());
+      }
+
+      var isAllCheck = true;
+      if (eventObject.checkMethodList.length) {
+        // ์ฒดํฌ ๋ฉ”์†Œ๋“œ๋“ค์€ ๋ชจ๋“  ๋ฉ”์†Œ๋“œ๋ฅผ ๋‹ค ์ ์šฉํ•ด์•ผํ•œ๋‹ค. 
+        isAllCheck = eventObject.checkMethodList.every(function (method) {
+          return _this8[method].call(_this8, e);
+        });
+      }
+
+      return onlyControl && onlyAlt && onlyShift && onlyMeta && hasKeyCode && isAllCheck;
+    }
+  }, {
+    key: 'makeCallback',
+    value: function makeCallback(eventObject, callback) {
+      var _this9 = this;
+
+      if (eventObject.delegate) {
+        return function (e) {
+          e.xy = Event.posXY(e);
+          if (_this9.checkEventType(e, eventObject)) {
+            var delegateTarget = _this9.matchPath(e.target || e.srcElement, eventObject.delegate);
+
+            if (delegateTarget) {
+              // delegate target ์ด ์žˆ๋Š” ๊ฒฝ์šฐ๋งŒ callback ์‹คํ–‰ 
+              e.delegateTarget = delegateTarget;
+              e.$delegateTarget = new Dom(delegateTarget);
+              return callback(e);
+            }
+          }
+        };
+      } else {
+        return function (e) {
+          e.xy = Event.posXY(e);
+          if (_this9.checkEventType(e, eventObject)) {
+            return callback(e);
+          }
+        };
+      }
+    }
+  }, {
+    key: 'addEvent',
+    value: function addEvent(eventObject, callback) {
+      eventObject.callback = this.makeCallback(eventObject, callback);
+      this.addBinding(eventObject);
+
+      var options = true;
+      if (eventObject.eventName === 'touchstart') {
+        options = { passive: true };
+      }
+
+      Event.addEvent(eventObject.dom, eventObject.eventName, eventObject.callback, options);
+    }
+  }, {
+    key: 'removeEventAll',
+    value: function removeEventAll() {
+      var _this10 = this;
+
+      this.getBindings().forEach(function (obj) {
+        _this10.removeEvent(obj);
+      });
+      this.initBindings();
+    }
+  }, {
+    key: 'removeEvent',
+    value: function removeEvent(_ref3) {
+      var eventName = _ref3.eventName,
+          dom = _ref3.dom,
+          callback = _ref3.callback;
+
+      Event.removeEvent(dom, eventName, callback);
+    }
+  }]);
+  return EventMachin;
+}();
+
+var CHECK_STORE_EVENT_PATTERN = /^@/;
+
+var UIElement = function (_EventMachin) {
+    inherits(UIElement, _EventMachin);
+
+    function UIElement(opt) {
+        classCallCheck(this, UIElement);
+
+        var _this = possibleConstructorReturn(this, (UIElement.__proto__ || Object.getPrototypeOf(UIElement)).call(this, opt));
+
+        _this.opt = opt || {};
+
+        if (opt && opt.$store) {
+            _this.$store = opt.$store;
+        }
+
+        _this.initialize();
+
+        _this.initializeStoreEvent();
+        return _this;
+    }
+
+    /**
+     * initialize store event 
+     * 
+     * you can define '@xxx' method(event) in UIElement 
+     * 
+     * 
+     */
+
+
+    createClass(UIElement, [{
+        key: 'initializeStoreEvent',
+        value: function initializeStoreEvent() {
+            var _this2 = this;
+
+            this.storeEvents = {};
+            this.filterProps(CHECK_STORE_EVENT_PATTERN).forEach(function (key) {
+                var arr = key.split('@');
+                arr.shift();
+                var event = arr.join('@');
+
+                _this2.storeEvents[event] = _this2[key].bind(_this2);
+                _this2.$store.on(event, _this2.storeEvents[event]);
+            });
+        }
+    }, {
+        key: 'destoryStoreEvent',
+        value: function destoryStoreEvent() {
+            var _this3 = this;
+
+            Object.keys(this.storeEvents).forEach(function (event) {
+                _this3.$store.off(event, _this3.storeEvents[event]);
+            });
+        }
+    }]);
+    return UIElement;
+}(EventMachin);
+
+function isUndefined(v) {
+    return typeof v == 'undefined' || v == null;
+}
+
+var ColorManager = function (_BaseModule) {
+    inherits(ColorManager, _BaseModule);
+
+    function ColorManager() {
+        classCallCheck(this, ColorManager);
+        return possibleConstructorReturn(this, (ColorManager.__proto__ || Object.getPrototypeOf(ColorManager)).apply(this, arguments));
+    }
+
+    createClass(ColorManager, [{
+        key: 'initialize',
+        value: function initialize() {
+            get(ColorManager.prototype.__proto__ || Object.getPrototypeOf(ColorManager.prototype), 'initialize', this).call(this);
+
+            this.$store.rgb = {};
+            this.$store.hsl = {};
+            this.$store.hsv = {};
+            this.$store.alpha = 1;
+            this.$store.format = 'hex';
+
+            // this.$store.dispatch('/changeColor');
+        }
+    }, {
+        key: '/changeFormat',
+        value: function changeFormat($store, format) {
+            $store.format = format;
+
+            $store.emit('changeFormat');
+        }
+    }, {
+        key: '/initColor',
+        value: function initColor($store, colorObj, source) {
+            $store.dispatch('/changeColor', colorObj, source, true);
+            $store.emit('initColor');
+        }
+    }, {
+        key: '/changeColor',
+        value: function changeColor($store, colorObj, source, isNotEmit) {
+
+            colorObj = colorObj || '#FF0000';
+
+            if (typeof colorObj == 'string') {
+                colorObj = Color$1.parse(colorObj);
+            }
+
+            colorObj.source = colorObj.source || source;
+
+            $store.alpha = isUndefined(colorObj.a) ? $store.alpha : colorObj.a;
+            $store.format = colorObj.type != 'hsv' ? colorObj.type || $store.format : $store.format;
+
+            if (colorObj.type == 'hsl') {
+                $store.hsl = Object.assign($store.hsl, colorObj);
+                $store.rgb = Color$1.HSLtoRGB($store.hsl);
+                $store.hsv = Color$1.HSLtoHSV(colorObj);
+            } else if (colorObj.type == 'hex') {
+                $store.rgb = Object.assign($store.rgb, colorObj);
+                $store.hsl = Color$1.RGBtoHSL($store.rgb);
+                $store.hsv = Color$1.RGBtoHSV(colorObj);
+            } else if (colorObj.type == 'rgb') {
+                $store.rgb = Object.assign($store.rgb, colorObj);
+                $store.hsl = Color$1.RGBtoHSL($store.rgb);
+                $store.hsv = Color$1.RGBtoHSV(colorObj);
+            } else if (colorObj.type == 'hsv') {
+                $store.hsv = Object.assign($store.hsv, colorObj);
+                $store.rgb = Color$1.HSVtoRGB($store.hsv);
+                $store.hsl = Color$1.HSVtoHSL($store.hsv);
+            }
+
+            if (!isNotEmit) {
+                $store.emit('changeColor', colorObj.source);
+            }
+        }
+    }, {
+        key: '/getHueColor',
+        value: function getHueColor($store) {
+            return HueColor.checkHueColor($store.hsv.h / 360);
+        }
+    }, {
+        key: '/toString',
+        value: function toString($store, type) {
+            type = type || $store.format;
+            var colorObj = $store[type] || $store.rgb;
+            return Color$1.format(_extends({}, colorObj, {
+                a: $store.alpha
+            }), type);
+        }
+    }, {
+        key: '/toColor',
+        value: function toColor($store, type) {
+            type = type || $store.format;
+
+            if (type == 'rgb') {
+                return $store.dispatch('/toRGB');
+            } else if (type == 'hsl') {
+                return $store.dispatch('/toHSL');
+            } else if (type == 'hex') {
+                return $store.dispatch('/toHEX');
+            }
+
+            return $store.dispatch('/toString', type);
+        }
+    }, {
+        key: '/toRGB',
+        value: function toRGB($store) {
+            return $store.dispatch('/toString', 'rgb');
+        }
+    }, {
+        key: '/toHSL',
+        value: function toHSL($store) {
+            return $store.dispatch('/toString', 'hsl');
+        }
+    }, {
+        key: '/toHEX',
+        value: function toHEX($store) {
+            return $store.dispatch('/toString', 'hex').toUpperCase();
+        }
+    }]);
+    return ColorManager;
+}(BaseModule);
+
+var BaseStore = function () {
+    function BaseStore(opt) {
+        classCallCheck(this, BaseStore);
+
+        this.callbacks = [];
+        this.actions = [];
+        this.modules = opt.modules || [];
+
+        this.initialize();
+    }
+
+    createClass(BaseStore, [{
+        key: 'initialize',
+        value: function initialize() {
+            this.initializeModule();
+        }
+    }, {
+        key: 'initializeModule',
+        value: function initializeModule() {
+            var _this = this;
+
+            this.modules.forEach(function (Module) {
+                var instance = new Module(_this);
+            });
+        }
+    }, {
+        key: 'action',
+        value: function action(_action, context) {
+            this.actions[_action] = { context: context, callback: context[_action] };
+        }
+    }, {
+        key: 'dispatch',
+        value: function dispatch(action) {
+            var args = [].concat(Array.prototype.slice.call(arguments));
+            var action = args.shift();
+
+            var m = this.actions[action];
+
+            if (m) {
+                return m.callback.apply(m.context, [this].concat(toConsumableArray(args)));
+            }
+        }
+    }, {
+        key: 'module',
+        value: function module(ModuleObject) {
+            // this.action()
+        }
+    }, {
+        key: 'on',
+        value: function on(event, callback) {
+            this.callbacks.push({ event: event, callback: callback });
+        }
+    }, {
+        key: 'off',
+        value: function off(event, callback) {
+
+            if (arguments.length == 0) {
+                this.callbacks = [];
+            } else if (arguments.length == 1) {
+                this.callbacks = this.callbacks.filter(function (f) {
+                    return f.event != event;
+                });
+            } else if (arguments.length == 2) {
+                this.callbacks = this.callbacks.filter(function (f) {
+                    return f.event != event && f.callback != callback;
+                });
+            }
+        }
+    }, {
+        key: 'emit',
+        value: function emit() {
+            var args = [].concat(Array.prototype.slice.call(arguments));
+            var event = args.shift();
+
+            this.callbacks.filter(function (f) {
+                return f.event == event;
+            }).forEach(function (f) {
+                if (f && typeof f.callback == 'function') {
+                    f.callback.apply(f, toConsumableArray(args));
+                }
+            });
+        }
+    }]);
+    return BaseStore;
+}();
+
+var BaseColorPicker = function (_UIElement) {
+    inherits(BaseColorPicker, _UIElement);
+
+    function BaseColorPicker(opt) {
+        classCallCheck(this, BaseColorPicker);
+
+        var _this = possibleConstructorReturn(this, (BaseColorPicker.__proto__ || Object.getPrototypeOf(BaseColorPicker)).call(this, opt));
+
+        _this.isColorPickerShow = false;
+        _this.isShortCut = false;
+        _this.hideDelay = +(typeof _this.opt.hideDeplay == 'undefined' ? 2000 : _this.opt.hideDelay);
+        _this.timerCloseColorPicker;
+        _this.autoHide = _this.opt.autoHide || true;
+        _this.outputFormat = _this.opt.outputFormat;
+        _this.$checkColorPickerClass = _this.checkColorPickerClass.bind(_this);
+
+        return _this;
+    }
+
+    createClass(BaseColorPicker, [{
+        key: 'initialize',
+        value: function initialize() {
+            var _this2 = this;
+
+            this.$body = null;
+            this.$root = null;
+
+            this.$store = new BaseStore({
+                modules: [ColorManager, ColorSetsList]
+            });
+
+            this.callbackChange = function () {
+                _this2.callbackColorValue();
+            };
+
+            this.callbackLastUpdate = function () {
+                _this2.callbackLastUpdateColorValue();
+            };
+
+            this.colorpickerShowCallback = function () {};
+            this.colorpickerHideCallback = function () {};
+            this.colorpickerLastUpdateCallback = function () {};
+
+            this.$body = new Dom(this.getContainer());
+            this.$root = new Dom('div', 'codemirror-colorpicker');
+
+            //  append colorpicker to container (ex : body)
+            if (this.opt.position == 'inline') {
+                this.$body.append(this.$root);
+            }
+
+            if (this.opt.type) {
+                // to change css style
+                this.$root.addClass(this.opt.type);
+            }
+
+            if (this.opt.hideInformation) {
+                this.$root.addClass('hide-information');
+            }
+
+            if (this.opt.hideColorsets) {
+                this.$root.addClass('hide-colorsets');
+            }
+
+            this.$arrow = new Dom('div', 'arrow');
+
+            this.$root.append(this.$arrow);
+
+            this.$store.dispatch('/setUserPalette', this.opt.colorSets);
+
+            this.render();
+
+            this.$root.append(this.$el);
+
+            this.initColorWithoutChangeEvent(this.opt.color);
+
+            // ์ด๋ฒคํŠธ ์—ฐ๊ฒฐ 
+            this.initializeEvent();
+        }
+    }, {
+        key: 'initColorWithoutChangeEvent',
+        value: function initColorWithoutChangeEvent(color) {
+            this.$store.dispatch('/initColor', color);
+        }
+
+        /** 
+         * public method 
+         * 
+         */
+
+        /**
+         * 
+         * show colorpicker with position  
+         * 
+         * @param {{left, top, hideDelay, isShortCut}} opt 
+         * @param {String|Object} color  
+         * @param {Function} showCallback  it is called when colorpicker is shown
+         * @param {Function} hideCallback  it is called once when colorpicker is hidden
+         */
+
+    }, {
+        key: 'show',
+        value: function show(opt, color, showCallback, hideCallback, lastUpdateCallback) {
+
+            // ๋งค๋ฒˆ ์ด๋ฒคํŠธ๋ฅผ ์ง€์šฐ๊ณ  ๋‹ค์‹œ ์ƒ์„ฑํ•  ํ•„์š”๊ฐ€ ์—†์–ด์„œ ์ดˆ๊ธฐํ™” ์ฝ”๋“œ๋Š” ์ง€์›€. 
+            // this.destroy();
+            // this.initializeEvent();
+            // define colorpicker callback
+            this.colorpickerShowCallback = showCallback;
+            this.colorpickerHideCallback = hideCallback;
+            this.colorpickerLastUpdateCallback = lastUpdateCallback;
+            this.$root.css(this.getInitalizePosition()).show();
+
+            this.isColorPickerShow = true;
+            this.isShortCut = opt.isShortCut || false;
+            this.outputFormat = opt.outputFormat;
+
+            // define hide delay
+            this.hideDelay = +(typeof opt.hideDelay == 'undefined' ? 2000 : opt.hideDelay);
+            if (this.hideDelay > 0) {
+                this.setHideDelay(this.hideDelay);
+            }
+
+            this.$root.appendTo(this.$body);
+            this.definePosition(opt);
+            this.initColorWithoutChangeEvent(color);
+        }
+
+        /**
+         * 
+         * initialize color for colorpicker
+         * 
+         * @param {String|Object} newColor 
+         * @param {String} format  hex, rgb, hsl
+         */
+
+    }, {
+        key: 'initColor',
+        value: function initColor(newColor, format) {
+            this.$store.dispatch('/changeColor', newColor, format);
+        }
+
+        /**
+         * hide colorpicker 
+         * 
+         */
+
+    }, {
+        key: 'hide',
+        value: function hide() {
+            if (this.isColorPickerShow) {
+                // this.destroy();
+                this.$root.hide();
+                this.$root.remove(); // not empty 
+                this.isColorPickerShow = false;
+
+                this.callbackHideColorValue();
+            }
+        }
+
+        /**
+         * set to colors in current sets that you see 
+         * @param {Array} colors 
+         */
+
+    }, {
+        key: 'setColorsInPalette',
+        value: function setColorsInPalette() {
+            var colors = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+            this.$store.dispatch('/setCurrentColorAll', colors);
+        }
+
+        /**
+         * refresh all color palette 
+         * 
+         * @param {*} list 
+         */
+
+    }, {
+        key: 'setUserPalette',
+        value: function setUserPalette() {
+            var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+            this.$store.dispatch('/setUserPalette', list);
+        }
+
+        /**
+         * private method 
+         */
+
+    }, {
+        key: 'getOption',
+        value: function getOption(key) {
+            return this.opt[key];
+        }
+    }, {
+        key: 'setOption',
+        value: function setOption(key, value) {
+            this.opt[key] = value;
+        }
+    }, {
+        key: 'isType',
+        value: function isType(key) {
+            return this.getOption('type') == key;
+        }
+    }, {
+        key: 'isPaletteType',
+        value: function isPaletteType() {
+            return this.isType('palette');
+        }
+    }, {
+        key: 'isSketchType',
+        value: function isSketchType() {
+            return this.isType('sketch');
+        }
+    }, {
+        key: 'getContainer',
+        value: function getContainer() {
+            return this.opt.container || document.body;
+        }
+    }, {
+        key: 'getColor',
+        value: function getColor(type) {
+            return this.$store.dispatch('/toColor', type);
+        }
+    }, {
+        key: 'definePositionForArrow',
+        value: function definePositionForArrow(opt, elementScreenLeft, elementScreenTop) {
+            // console.log(arguments)
+        }
+    }, {
+        key: 'definePosition',
+        value: function definePosition(opt) {
+
+            var width = this.$root.width();
+            var height = this.$root.height();
+
+            // set left position for color picker
+            var elementScreenLeft = opt.left - this.$body.scrollLeft();
+            if (width + elementScreenLeft > window.innerWidth) {
+                elementScreenLeft -= width + elementScreenLeft - window.innerWidth;
+            }
+            if (elementScreenLeft < 0) {
+                elementScreenLeft = 0;
+            }
+
+            // set top position for color picker
+            var elementScreenTop = opt.top - this.$body.scrollTop();
+            if (height + elementScreenTop > window.innerHeight) {
+                elementScreenTop -= height + elementScreenTop - window.innerHeight;
+            }
+            if (elementScreenTop < 0) {
+                elementScreenTop = 0;
+            }
+
+            // set position
+            this.$root.css({
+                left: elementScreenLeft + 'px',
+                top: elementScreenTop + 'px'
+            });
+
+            // this.definePositionForArrow(opt, elementScreenLeft, elementScreenTop);
+        }
+    }, {
+        key: 'getInitalizePosition',
+        value: function getInitalizePosition() {
+            if (this.opt.position == 'inline') {
+                return {
+                    position: 'relative',
+                    left: 'auto',
+                    top: 'auto',
+                    display: 'inline-block'
+                };
+            } else {
+                return {
+                    position: 'fixed', // color picker has fixed position
+                    left: '-10000px',
+                    top: '-10000px'
+                };
+            }
+        }
+    }, {
+        key: 'isAbsolute',
+        value: function isAbsolute() {
+            return this.opt.position !== 'inline';
+        }
+
+        // Event Bindings 
+
+    }, {
+        key: 'mouseup.isAbsolute document',
+        value: function mouseupIsAbsoluteDocument(e) {
+
+            this.__isMouseDown = false;
+            // when color picker clicked in outside
+            if (this.checkInHtml(e.target)) {
+                //this.setHideDelay(hideDelay);
+            } else if (this.checkColorPickerClass(e.target) == false) {
+                this.hide();
+            } else {
+                if (!this.__isMouseIn) {
+                    clearTimeout(this.timerCloseColorPicker);
+                    this.timerCloseColorPicker = setTimeout(this.hide.bind(this), this.delayTime || this.hideDelay);
+                }
+            }
+        }
+    }, {
+        key: 'keyup.isAbsolute.escape $root',
+        value: function keyupIsAbsoluteEscape$root(e) {
+            this.hide();
+        }
+    }, {
+        key: 'mouseover.isAbsolute $root',
+        value: function mouseoverIsAbsolute$root(e) {
+            clearTimeout(this.timerCloseColorPicker);
+            // this.__isMouseDown = true; 
+        }
+    }, {
+        key: 'mousemove.isAbsolute $root',
+        value: function mousemoveIsAbsolute$root(e) {
+            clearTimeout(this.timerCloseColorPicker);
+        }
+    }, {
+        key: 'mouseenter.isAbsolute $root',
+        value: function mouseenterIsAbsolute$root(e) {
+            clearTimeout(this.timerCloseColorPicker);
+            this.__isMouseIn = true;
+        }
+    }, {
+        key: 'mouseleave.isAbsolute $root',
+        value: function mouseleaveIsAbsolute$root(e) {
+            this.__isMouseIn = false;
+            if (!this.__isMouseDown) {
+                clearTimeout(this.timerCloseColorPicker);
+                this.timerCloseColorPicker = setTimeout(this.hide.bind(this), this.delayTime || this.hideDelay);
+            }
+        }
+    }, {
+        key: 'mousedown.isAbsolute $root',
+        value: function mousedownIsAbsolute$root(e) {
+            this.__isMouseDown = true;
+        }
+    }, {
+        key: 'setHideDelay',
+        value: function setHideDelay(delayTime) {
+            this.delayTime = delayTime || 0;
+        }
+    }, {
+        key: 'runHideDelay',
+        value: function runHideDelay() {
+
+            if (this.isColorPickerShow) {
+                this.setHideDelay();
+                // const hideCallback = this.setHideDelay(delayTime);
+
+                // this.timerCloseColorPicker = setTimeout(hideCallback, delayTime);
+            }
+        }
+    }, {
+        key: 'callbackColorValue',
+        value: function callbackColorValue(color) {
+            color = color || this.getCurrentColor();
+
+            if (typeof this.opt.onChange == 'function') {
+                this.opt.onChange.call(this, color);
+            }
+
+            if (typeof this.colorpickerShowCallback == 'function') {
+                this.colorpickerShowCallback(color);
+            }
+        }
+    }, {
+        key: 'callbackLastUpdateColorValue',
+        value: function callbackLastUpdateColorValue(color) {
+            color = color || this.getCurrentColor();
+
+            if (typeof this.opt.onLastUpdate == 'function') {
+                this.opt.onLastUpdate.call(this, color);
+            }
+
+            if (typeof this.colorpickerLastUpdateCallback == 'function') {
+                this.colorpickerLastUpdateCallback(color);
+            }
+        }
+    }, {
+        key: 'callbackHideColorValue',
+        value: function callbackHideColorValue(color) {
+            color = color || this.getCurrentColor();
+            if (typeof this.opt.onHide == 'function') {
+                this.opt.onHide.call(this, color);
+            }
+
+            if (typeof this.colorpickerHideCallback == 'function') {
+                this.colorpickerHideCallback(color);
+            }
+        }
+    }, {
+        key: 'getCurrentColor',
+        value: function getCurrentColor() {
+            return this.$store.dispatch('/toColor', this.outputFormat);
+        }
+    }, {
+        key: 'checkColorPickerClass',
+        value: function checkColorPickerClass(el) {
+            var hasColorView = new Dom(el).closest('codemirror-colorview');
+            var hasColorPicker = new Dom(el).closest('codemirror-colorpicker');
+            var hasCodeMirror = new Dom(el).closest('CodeMirror');
+            var IsInHtml = el.nodeName == 'HTML';
+
+            return !!(hasColorPicker || hasColorView || hasCodeMirror);
+        }
+    }, {
+        key: 'checkInHtml',
+        value: function checkInHtml(el) {
+            var IsInHtml = el.nodeName == 'HTML';
+
+            return IsInHtml;
+        }
+    }, {
+        key: 'initializeStoreEvent',
+        value: function initializeStoreEvent() {
+            get(BaseColorPicker.prototype.__proto__ || Object.getPrototypeOf(BaseColorPicker.prototype), 'initializeStoreEvent', this).call(this);
+
+            this.$store.on('changeColor', this.callbackChange);
+            this.$store.on('lastUpdateColor', this.callbackLastUpdate);
+            this.$store.on('changeFormat', this.callbackChange);
+        }
+    }, {
+        key: 'destroy',
+        value: function destroy() {
+            get(BaseColorPicker.prototype.__proto__ || Object.getPrototypeOf(BaseColorPicker.prototype), 'destroy', this).call(this);
+
+            this.$store.off('changeColor', this.callbackChange);
+            this.$store.off('lastUpdateColor', this.callbackLastUpdate);
+            this.$store.off('changeFormat', this.callbackChange);
+
+            this.callbackChange = undefined;
+            this.callbackLastUpdate = undefined;
+
+            // remove color picker callback
+            this.colorpickerShowCallback = undefined;
+            this.colorpickerHideCallback = undefined;
+        }
+    }]);
+    return BaseColorPicker;
+}(UIElement);
+
+var BaseBox = function (_UIElement) {
+    inherits(BaseBox, _UIElement);
+
+    function BaseBox(opt) {
+        classCallCheck(this, BaseBox);
+
+        var _this = possibleConstructorReturn(this, (BaseBox.__proto__ || Object.getPrototypeOf(BaseBox)).call(this, opt));
+
+        _this.source = 'base-box';
+        return _this;
+    }
+
+    createClass(BaseBox, [{
+        key: 'refresh',
+        value: function refresh() {}
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {}
+
+        /** push change event  */
+
+    }, {
+        key: 'changeColor',
+        value: function changeColor(opt) {
+            this.$store.dispatch('/changeColor', Object.assign({
+                source: this.source
+            }, opt || {}));
+        }
+
+        // Event Bindings 
+
+    }, {
+        key: 'mouseup document',
+        value: function mouseupDocument(e) {
+            this.onDragEnd(e);
+        }
+    }, {
+        key: 'mousemove document',
+        value: function mousemoveDocument(e) {
+            this.onDragMove(e);
+        }
+    }, {
+        key: 'mousedown $bar',
+        value: function mousedown$bar(e) {
+            e.preventDefault();
+            this.isDown = true;
+        }
+    }, {
+        key: 'mousedown $container',
+        value: function mousedown$container(e) {
+            this.isDown = true;
+            this.onDragStart(e);
+        }
+    }, {
+        key: 'touchend document',
+        value: function touchendDocument(e) {
+            this.onDragEnd(e);
+        }
+    }, {
+        key: 'touchmove document',
+        value: function touchmoveDocument(e) {
+            this.onDragMove(e);
+        }
+    }, {
+        key: 'touchstart $bar',
+        value: function touchstart$bar(e) {
+            e.preventDefault();
+            this.isDown = true;
+        }
+    }, {
+        key: 'touchstart $container',
+        value: function touchstart$container(e) {
+            this.onDragStart(e);
+        }
+    }, {
+        key: 'onDragStart',
+        value: function onDragStart(e) {
+            this.isDown = true;
+            this.refreshColorUI(e);
+        }
+    }, {
+        key: 'onDragMove',
+        value: function onDragMove(e) {
+            if (this.isDown) {
+                this.refreshColorUI(e);
+            }
+        }
+
+        /* called when mouse is ended move  */
+
+    }, {
+        key: 'onDragEnd',
+        value: function onDragEnd(e) {
+            if (this.isDown) {
+                this.$store.emit('lastUpdateColor');
+                this.isDown = false;
+            }
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (this.source != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return BaseBox;
+}(UIElement);
+
+var BaseSlider = function (_BaseBox) {
+    inherits(BaseSlider, _BaseBox);
+
+    function BaseSlider(opt) {
+        classCallCheck(this, BaseSlider);
+
+        var _this = possibleConstructorReturn(this, (BaseSlider.__proto__ || Object.getPrototypeOf(BaseSlider)).call(this, opt));
+
+        _this.minValue = 0; // min domain value 
+        _this.maxValue = 1; // max domain value 
+        _this.source = 'base-slider';
+        return _this;
+    }
+
+    /* slider container's min and max position */
+
+
+    createClass(BaseSlider, [{
+        key: 'getMinMaxPosition',
+        value: function getMinMaxPosition() {
+            var min = this.getMinPosition();
+            var width = this.getMaxDist();
+            var max = min + width;
+
+            return { min: min, max: max, width: width };
+        }
+
+        /** get current position on page  */
+
+    }, {
+        key: 'getCurrent',
+        value: function getCurrent(value) {
+            return min + this.getMaxDist() * value;
+        }
+
+        /** get min position on slider container  */
+
+    }, {
+        key: 'getMinPosition',
+        value: function getMinPosition() {
+            return this.refs.$container.offset().left;
+        }
+    }, {
+        key: 'getMaxDist',
+        value: function getMaxDist() {
+            return this.state.get('$container.width');
+        }
+
+        /** get dist for position value */
+
+    }, {
+        key: 'getDist',
+        value: function getDist(current) {
+            var _getMinMaxPosition = this.getMinMaxPosition(),
+                min = _getMinMaxPosition.min,
+                max = _getMinMaxPosition.max;
+
+            var dist;
+            if (current < min) {
+                dist = 0;
+            } else if (current > max) {
+                dist = 100;
+            } else {
+                dist = (current - min) / (max - min) * 100;
+            }
+
+            return dist;
+        }
+
+        /** get caculated dist for domain value   */
+
+    }, {
+        key: 'getCaculatedDist',
+        value: function getCaculatedDist(e) {
+            var current = e ? this.getMousePosition(e) : this.getCurrent(this.getDefaultValue() / this.maxValue);
+            var dist = this.getDist(current);
+
+            return dist;
+        }
+
+        /** get default value used in slider container */
+
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return 0;
+        }
+
+        /** set mosue position */
+
+    }, {
+        key: 'setMousePosition',
+        value: function setMousePosition(x) {
+            this.refs.$bar.css({ left: x + 'px' });
+        }
+
+        /** set mouse position in page */
+
+    }, {
+        key: 'getMousePosition',
+        value: function getMousePosition(e) {
+            return Event.pos(e).pageX;
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+
+        /** set drag bar position  */
+
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI(v) {
+
+            v = v || this.getDefaultValue();
+
+            if (v <= this.minValue) {
+                this.refs.$bar.addClass('first').removeClass('last');
+            } else if (v >= this.maxValue) {
+                this.refs.$bar.addClass('last').removeClass('first');
+            } else {
+                this.refs.$bar.removeClass('last').removeClass('first');
+            }
+
+            this.setMousePosition(this.getMaxDist() * ((v || 0) / this.maxValue));
+        }
+    }]);
+    return BaseSlider;
+}(BaseBox);
+
+var Value = function (_BaseSlider) {
+    inherits(Value, _BaseSlider);
+
+    function Value(opt) {
+        classCallCheck(this, Value);
+
+        var _this = possibleConstructorReturn(this, (Value.__proto__ || Object.getPrototypeOf(Value)).call(this, opt));
+
+        _this.minValue = 0;
+        _this.maxValue = 1;
+        _this.source = 'value-control';
+        return _this;
+    }
+
+    createClass(Value, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class="value">\n                <div ref="$container" class="value-container">\n                    <div ref="$bar" class="drag-bar"></div>\n                </div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            this.refs.$container.css("background-color", this.$store.dispatch('/toRGB'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            get(Value.prototype.__proto__ || Object.getPrototypeOf(Value.prototype), 'refresh', this).call(this);
+            this.setBackgroundColor();
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.hsv.v;
+        }
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {
+            var dist = this.getCaculatedDist(e);
+
+            this.setColorUI(dist / 100 * this.maxValue);
+
+            this.changeColor({
+                type: 'hsv',
+                v: dist / 100 * this.maxValue
+            });
+        }
+    }]);
+    return Value;
+}(BaseSlider);
+
+var Opacity = function (_BaseSlider) {
+    inherits(Opacity, _BaseSlider);
+
+    function Opacity(opt) {
+        classCallCheck(this, Opacity);
+
+        var _this = possibleConstructorReturn(this, (Opacity.__proto__ || Object.getPrototypeOf(Opacity)).call(this, opt));
+
+        _this.minValue = 0;
+        _this.maxValue = 1;
+        _this.source = 'opacity-control';
+        return _this;
+    }
+
+    createClass(Opacity, [{
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="opacity">\n            <div ref="$container" class="opacity-container">\n                <div ref="$colorbar" class="color-bar"></div>\n                <div ref="$bar" class="drag-bar"></div>\n            </div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            get(Opacity.prototype.__proto__ || Object.getPrototypeOf(Opacity.prototype), 'refresh', this).call(this);
+            this.setOpacityColorBar();
+        }
+    }, {
+        key: 'setOpacityColorBar',
+        value: function setOpacityColorBar() {
+            var rgb = Object.assign({}, this.$store.rgb);
+
+            rgb.a = 0;
+            var start = Color$1.format(rgb, 'rgb');
+
+            rgb.a = 1;
+            var end = Color$1.format(rgb, 'rgb');
+
+            this.setOpacityColorBarBackground(start, end);
+        }
+    }, {
+        key: 'setOpacityColorBarBackground',
+        value: function setOpacityColorBarBackground(start, end) {
+            this.refs.$colorbar.css('background', 'linear-gradient(to right, ' + start + ', ' + end + ')');
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.alpha;
+        }
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {
+            var dist = this.getCaculatedDist(e);
+
+            this.setColorUI(dist / 100 * this.maxValue);
+
+            this.changeColor({
+                a: Math.floor(dist) / 100 * this.maxValue
+            });
+        }
+    }]);
+    return Opacity;
+}(BaseSlider);
+
+function isSupported(api, apiParent) {
+    return api in apiParent;
+}
+
+var enableEyeDropper = isSupported('EyeDropper', window);
+
+var Eyedropper = function (_UIElement) {
+  inherits(Eyedropper, _UIElement);
+
+  function Eyedropper() {
+    classCallCheck(this, Eyedropper);
+    return possibleConstructorReturn(this, (Eyedropper.__proto__ || Object.getPrototypeOf(Eyedropper)).apply(this, arguments));
+  }
+
+  createClass(Eyedropper, [{
+    key: 'template',
+    value: function template() {
+      return (/*html*/'\n      <nav class="el-cp-color-eyedropper">\n        <button type="button" ref="$button" title="Eyedropper">\n          <svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">\n            <path d="M7.797 18.344c-.019.001-.074-.009-.24-.065-.277-.094-.745-.25-1.137.141l-1.542 1.543a.595.595 0 0 1-.84-.84L5.58 17.58c.391-.39.235-.859.141-1.14-.045-.134-.06-.195-.072-.206-.002-.003-.005-.003-.007-.001l1.06-1.06.703.705a.432.432 0 1 0 .611-.611l-.703-.705.557-.557.703.703a.434.434 0 0 0 .611 0 .434.434 0 0 0 0-.61l-.703-.703.571-.572.703.704a.435.435 0 0 0 .612 0 .434.434 0 0 0 0-.61l-.705-.706L14 7.875l2.126 2.127-8.33 8.342zM19.29 9.37l-.654-.655 1.669-1.668a2.372 2.372 0 0 0-3.353-3.354l-1.669 1.669-.655-.654a1.341 1.341 0 0 0-1.898 1.897l.658.658-8.358 8.359c-.373.373-.214.841-.13 1.094.061.18.069.24.069.253l-1.543 1.542a1.458 1.458 0 1 0 2.062 2.061l1.536-1.54c.019-.003.08.006.259.066.252.085.72.243 1.093-.13l8.359-8.358.658.658a1.341 1.341 0 1 0 1.897-1.898z" fill="currentColor"/>\n          </svg>\n        </button>\n      </nav>\n    '
+      );
+    }
+  }, {
+    key: 'click $button',
+    value: function click$button() {
+      var _this2 = this;
+
+      if (enableEyeDropper) {
+        var eyeDropper = new EyeDropper();
+        eyeDropper.open().then(function (result) {
+          _this2.$store.dispatch('/changeColor', result.sRGBHex);
+          _this2.$store.emit('lastUpdateColor');
+        });
+      }
+    }
+  }]);
+  return Eyedropper;
+}(UIElement);
+
+var source = 'macos-control';
+
+var ColorControl = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Value: Value, Opacity: Opacity, Eyedropper: Eyedropper };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+
+            var hasEyeDropper = enableEyeDropper ? 'has-eyedropper' : '';
+            var $eyedropper = !!enableEyeDropper ? '\n        <div class="el-cp-color-control__left">\n          <div target="Eyedropper"></div>\n        </div>\n      ' : '';
+
+            return '\n        <div class="control ' + hasEyeDropper + '">\n            <div target="Value" ></div>\n            <div target="Opacity" ></div>\n            <div ref="$controlPattern" class="empty"></div>\n            <div ref="$controlColor" class="color"></div>\n            ' + $eyedropper + '                       \n        </div>\n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            this.refs.$controlColor.css("background-color", this.$store.dispatch('/toRGB'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+            this.setBackgroundColor();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Value.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var ColorWheel = function (_UIElement) {
+    inherits(ColorWheel, _UIElement);
+
+    function ColorWheel(opt) {
+        classCallCheck(this, ColorWheel);
+
+        var _this = possibleConstructorReturn(this, (ColorWheel.__proto__ || Object.getPrototypeOf(ColorWheel)).call(this, opt));
+
+        _this.width = 214;
+        _this.height = 214;
+        _this.thinkness = 0;
+        _this.half_thinkness = 0;
+        _this.source = 'colorwheel';
+        return _this;
+    }
+
+    createClass(ColorWheel, [{
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="wheel">\n            <canvas class="wheel-canvas" ref="$colorwheel" ></canvas>\n            <div class="wheel-canvas" ref="$valuewheel" ></div>\n            <div class="drag-pointer" ref="$drag_pointer"></div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh(isEvent) {
+            this.setColorUI(isEvent);
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI(isEvent) {
+            this.renderCanvas();
+            this.renderValue();
+            this.setHueColor(null, isEvent);
+        }
+    }, {
+        key: 'renderValue',
+        value: function renderValue() {
+            var value = 1 - this.$store.hsv.v;
+            this.refs.$valuewheel.css({
+                'background-color': 'rgba(0, 0, 0, ' + value + ')'
+            });
+        }
+    }, {
+        key: 'renderWheel',
+        value: function renderWheel(width, height) {
+
+            if (this.width && !width) width = this.width;
+            if (this.height && !height) height = this.height;
+
+            var $canvas = new Dom('canvas');
+            var context = $canvas.el.getContext('2d');
+            $canvas.el.width = width;
+            $canvas.el.height = height;
+            $canvas.css({ width: width + 'px', height: height + 'px' });
+
+            var img = context.getImageData(0, 0, width, height);
+            var pixels = img.data;
+            var half_width = Math.floor(width / 2);
+            var half_height = Math.floor(height / 2);
+
+            var radius = width > height ? half_height : half_width;
+            var cx = half_width;
+            var cy = half_height;
+
+            for (var y = 0; y < height; y++) {
+                for (var x = 0; x < width; x++) {
+                    var rx = x - cx + 1,
+                        ry = y - cy + 1,
+                        d = rx * rx + ry * ry,
+                        hue = caculateAngle(rx, ry);
+
+                    var rgb = Color$1.HSVtoRGB(hue, // 0~360 hue 
+                    Math.min(Math.sqrt(d) / radius, 1), // 0..1 Saturation 
+                    1 //  0..1 Value
+                    );
+
+                    var index = (y * width + x) * 4;
+                    pixels[index] = rgb.r;
+                    pixels[index + 1] = rgb.g;
+                    pixels[index + 2] = rgb.b;
+                    pixels[index + 3] = 255;
+                }
+            }
+
+            context.putImageData(img, 0, 0);
+
+            if (this.thinkness > 0) {
+                context.globalCompositeOperation = "destination-out"; // destination-out ์€ ๊ทธ๋ฆฌ๋Š” ์˜์—ญ์ด ์ง€์›Œ์ง„๋‹ค. 
+                context.fillStyle = 'black';
+                context.beginPath();
+                context.arc(cx, cy, radius - this.thinkness, 0, Math.PI * 2);
+                context.closePath();
+                context.fill();
+            }
+
+            return $canvas;
+        }
+    }, {
+        key: 'renderCanvas',
+        value: function renderCanvas() {
+
+            // only once rendering 
+            if (this.$store.createdWheelCanvas) return;
+
+            var $canvas = this.refs.$colorwheel;
+            // console.log($canvas);
+            var context = $canvas.el.getContext('2d');
+
+            var _$canvas$size = $canvas.size(),
+                _$canvas$size2 = slicedToArray(_$canvas$size, 2),
+                width = _$canvas$size2[0],
+                height = _$canvas$size2[1];
+
+            if (this.width && !width) width = this.width;
+            if (this.height && !height) height = this.height;
+
+            $canvas.el.width = width;
+            $canvas.el.height = height;
+            $canvas.css({ width: width + 'px', height: height + 'px' });
+
+            var $wheelCanvas = this.renderWheel(width, height);
+
+            context.drawImage($wheelCanvas.el, 0, 0);
+
+            this.$store.createdWheelCanvas = true;
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.hsv.h;
+        }
+    }, {
+        key: 'getDefaultSaturation',
+        value: function getDefaultSaturation() {
+            return this.$store.hsv.s;
+        }
+    }, {
+        key: 'getCurrentXY',
+        value: function getCurrentXY(e, angle, radius, centerX, centerY) {
+            return e ? Event.posXY(e) : getXYInCircle(angle, radius, centerX, centerY);
+        }
+    }, {
+        key: 'getRectangle',
+        value: function getRectangle() {
+            var width = this.state.get('$el.width');
+            var height = this.state.get('$el.height');
+            var radius = this.state.get('$colorwheel.width') / 2;
+
+            var minX = this.refs.$el.offset().left;
+            var centerX = minX + width / 2;
+
+            var minY = this.refs.$el.offset().top;
+            var centerY = minY + height / 2;
+
+            return { minX: minX, minY: minY, width: width, height: height, radius: radius, centerX: centerX, centerY: centerY };
+        }
+    }, {
+        key: 'setHueColor',
+        value: function setHueColor(e, isEvent) {
+
+            if (!this.state.get('$el.width')) return;
+
+            var _getRectangle = this.getRectangle(),
+                minX = _getRectangle.minX,
+                minY = _getRectangle.minY,
+                radius = _getRectangle.radius,
+                centerX = _getRectangle.centerX,
+                centerY = _getRectangle.centerY;
+
+            var _getCurrentXY = this.getCurrentXY(e, this.getDefaultValue(), this.getDefaultSaturation() * radius, centerX, centerY),
+                x = _getCurrentXY.x,
+                y = _getCurrentXY.y;
+
+            var rx = x - centerX,
+                ry = y - centerY,
+                d = rx * rx + ry * ry,
+                hue = caculateAngle(rx, ry);
+
+            if (d > radius * radius) {
+                var _getCurrentXY2 = this.getCurrentXY(null, hue, radius, centerX, centerY),
+                    x = _getCurrentXY2.x,
+                    y = _getCurrentXY2.y;
+            }
+
+            // saturation ์„ 
+            var saturation = Math.min(Math.sqrt(d) / radius, 1);
+
+            // set drag pointer position 
+            this.refs.$drag_pointer.css({
+                left: x - minX + 'px',
+                top: y - minY + 'px'
+            });
+
+            if (!isEvent) {
+                this.changeColor({
+                    type: 'hsv',
+                    h: hue,
+                    s: saturation
+                });
+            }
+        }
+    }, {
+        key: 'changeColor',
+        value: function changeColor(opt) {
+            this.$store.dispatch('/changeColor', Object.assign({
+                source: this.source
+            }, opt || {}));
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (this.source != sourceType) {
+                this.refresh(true);
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh(true);
+        }
+
+        // Event Bindings 
+
+    }, {
+        key: 'mouseup document',
+        value: function mouseupDocument(e) {
+            if (this.isDown) {
+                this.isDown = false;
+                this.$store.emit('lastUpdateColor');
+            }
+        }
+    }, {
+        key: 'mousemove document',
+        value: function mousemoveDocument(e) {
+            if (this.isDown) {
+                this.setHueColor(e);
+            }
+        }
+    }, {
+        key: 'mousedown $drag_pointer',
+        value: function mousedown$drag_pointer(e) {
+            e.preventDefault();
+            this.isDown = true;
+        }
+    }, {
+        key: 'mousedown $el',
+        value: function mousedown$el(e) {
+            this.isDown = true;
+            this.setHueColor(e);
+        }
+    }, {
+        key: 'touchend document',
+        value: function touchendDocument(e) {
+            if (this.isDown) {
+                this.isDown = false;
+                this.$store.emit('lastUpdateColor');
+            }
+        }
+    }, {
+        key: 'touchmove document',
+        value: function touchmoveDocument(e) {
+            if (this.isDown) {
+                this.setHueColor(e);
+            }
+        }
+    }, {
+        key: 'touchstart $drag_pointer',
+        value: function touchstart$drag_pointer(e) {
+            e.preventDefault();
+            this.isDown = true;
+        }
+    }, {
+        key: 'touchstart $el',
+        value: function touchstart$el(e) {
+            e.preventDefault();
+            this.isDown = true;
+            this.setHueColor(e);
+        }
+    }]);
+    return ColorWheel;
+}(UIElement);
+
+var source$2 = 'chromedevtool-information';
+
+var ColorInformation = function (_UIElement) {
+    inherits(ColorInformation, _UIElement);
+
+    function ColorInformation() {
+        classCallCheck(this, ColorInformation);
+        return possibleConstructorReturn(this, (ColorInformation.__proto__ || Object.getPrototypeOf(ColorInformation)).apply(this, arguments));
+    }
+
+    createClass(ColorInformation, [{
+        key: 'template',
+        value: function template() {
+            return (/*html*/'\n        <div class="information hex">\n            <div ref="$informationChange" class="information-change">\n                <button ref="$formatChangeButton" type="button" class="format-change-button arrow-button"></button>\n            </div>\n            <div class="information-item hex">\n                <div class="input-field hex">\n                    <input ref="$hexCode" class="input" type="text" />\n                    <div class="title">HEX</div>\n                </div>\n            </div>\n            <div class="information-item rgb">\n                <div class="input-field rgb-r">\n                    <input ref="$rgb_r" class="input" type="number" step="1" min="0" max="255" />\n                    <div class="title">R</div>\n                </div>\n                <div class="input-field rgb-g">\n                    <input ref="$rgb_g" class="input" type="number" step="1" min="0" max="255" />\n                    <div class="title">G</div>\n                </div>\n                <div class="input-field rgb-b">\n                    <input ref="$rgb_b" class="input" type="number" step="1" min="0" max="255" />\n                    <div class="title">B</div>\n                </div>          \n                <div class="input-field rgb-a">\n                    <input ref="$rgb_a" class="input" type="number" step="0.01" min="0" max="1" />\n                    <div class="title">A</div>\n                </div>                                                            \n            </div>\n            <div class="information-item hsl">\n                <div class="input-field hsl-h">\n                    <input ref="$hsl_h" class="input" type="number" step="1" min="0" max="360" />\n                    <div class="title">H</div>\n                </div>\n                <div class="input-field hsl-s">\n                    <input ref="$hsl_s" class="input" type="number" step="1" min="0" max="100" />\n                    <div class="postfix">%</div>\n                    <div class="title">S</div>\n                </div>\n                <div class="input-field hsl-l">\n                    <input ref="$hsl_l" class="input" type="number" step="1" min="0" max="100" />\n                    <div class="postfix">%</div>                        \n                    <div class="title">L</div>\n                </div>\n                <div class="input-field hsl-a">\n                    <input ref="$hsl_a" class="input" type="number" step="0.01" min="0" max="1" />\n                    <div class="title">A</div>\n                </div>\n            </div>\n        </div>\n        '
+            );
+        }
+    }, {
+        key: 'setCurrentFormat',
+        value: function setCurrentFormat(format) {
+            this.format = format;
+
+            this.initFormat();
+        }
+    }, {
+        key: 'initFormat',
+        value: function initFormat() {
+            var _this2 = this;
+
+            var current_format = this.format || 'hex';
+
+            ['hex', 'rgb', 'hsl'].filter(function (it) {
+                return it !== current_format;
+            }).forEach(function (formatString) {
+                _this2.$el.removeClass(formatString);
+            });
+
+            this.$el.addClass(current_format);
+        }
+    }, {
+        key: 'nextFormat',
+        value: function nextFormat() {
+            var current_format = this.$store.format || 'hex';
+
+            var next_format = 'hex';
+            if (current_format == 'hex') {
+                next_format = 'rgb';
+            } else if (current_format == 'rgb') {
+                next_format = 'hsl';
+            } else if (current_format == 'hsl') {
+                next_format = 'hex';
+            }
+
+            this.format = next_format;
+            this.$store.dispatch('/changeFormat', next_format);
+            this.$store.emit('lastUpdateColor');
+            this.initFormat();
+        }
+    }, {
+        key: 'goToFormat',
+        value: function goToFormat(to_format) {
+            this.format = to_format;
+            this.$store.dispatch('/changeFormat', this.format);
+            this.$store.emit('lastUpdateColor');
+            this.initFormat();
+        }
+    }, {
+        key: 'getFormat',
+        value: function getFormat() {
+            return this.format || 'hex';
+        }
+    }, {
+        key: 'checkNumberKey',
+        value: function checkNumberKey(e) {
+            var code = e.which,
+                isExcept = false;
+
+            if (code == 37 || code == 39 || code == 8 || code == 46 || code == 9) isExcept = true;
+
+            if (!isExcept && (code < 48 || code > 57)) return false;
+
+            return true;
+        }
+    }, {
+        key: 'checkNotNumberKey',
+        value: function checkNotNumberKey(e) {
+            return !this.checkNumberKey(e);
+        }
+    }, {
+        key: 'changeRgbColor',
+        value: function changeRgbColor() {
+            this.$store.dispatch('/changeColor', {
+                type: 'rgb',
+                r: this.refs.$rgb_r.int(),
+                g: this.refs.$rgb_g.int(),
+                b: this.refs.$rgb_b.int(),
+                a: this.refs.$rgb_a.float(),
+                source: source$2
+            });
+            this.$store.emit('lastUpdateColor');
+        }
+    }, {
+        key: 'changeHslColor',
+        value: function changeHslColor() {
+            this.$store.dispatch('/changeColor', {
+                type: 'hsl',
+                h: this.refs.$hsl_h.int(),
+                s: this.refs.$hsl_s.int(),
+                l: this.refs.$hsl_l.int(),
+                a: this.refs.$hsl_a.float(),
+                source: source$2
+            });
+            this.$store.emit('lastUpdateColor');
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$2 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }, {
+        key: 'input $rgb_r',
+        value: function input$rgb_r(e) {
+            this.changeRgbColor();
+        }
+    }, {
+        key: 'input $rgb_g',
+        value: function input$rgb_g(e) {
+            this.changeRgbColor();
+        }
+    }, {
+        key: 'input $rgb_b',
+        value: function input$rgb_b(e) {
+            this.changeRgbColor();
+        }
+    }, {
+        key: 'input $rgb_a',
+        value: function input$rgb_a(e) {
+            this.changeRgbColor();
+        }
+    }, {
+        key: 'input $hsl_h',
+        value: function input$hsl_h(e) {
+            this.changeHslColor();
+        }
+    }, {
+        key: 'input $hsl_s',
+        value: function input$hsl_s(e) {
+            this.changeHslColor();
+        }
+    }, {
+        key: 'input $hsl_l',
+        value: function input$hsl_l(e) {
+            this.changeHslColor();
+        }
+    }, {
+        key: 'input $hsl_a',
+        value: function input$hsl_a(e) {
+            this.changeHslColor();
+        }
+    }, {
+        key: 'keyup $hexCode',
+        value: function keyup$hexCode(e) {
+            var code = this.refs.$hexCode.val();
+
+            if (code.charAt(0) == '#' && (code.length == 7 || code.length === 9)) {
+                this.$store.dispatch('/changeColor', code, source$2);
+                this.$store.emit('lastUpdateColor');
+            }
+        }
+    }, {
+        key: 'click $formatChangeButton',
+        value: function click$formatChangeButton(e) {
+            this.nextFormat();
+        }
+    }, {
+        key: 'click $el .information-item.hex .input-field .title',
+        value: function click$elInformationItemHexInputFieldTitle(e) {
+            this.goToFormat('rgb');
+        }
+    }, {
+        key: 'click $el .information-item.rgb .input-field .title',
+        value: function click$elInformationItemRgbInputFieldTitle(e) {
+            this.goToFormat('hsl');
+        }
+    }, {
+        key: 'click $el .information-item.hsl .input-field .title',
+        value: function click$elInformationItemHslInputFieldTitle(e) {
+            this.goToFormat('hex');
+        }
+    }, {
+        key: 'setRGBInput',
+        value: function setRGBInput() {
+            this.refs.$rgb_r.val(this.$store.rgb.r);
+            this.refs.$rgb_g.val(this.$store.rgb.g);
+            this.refs.$rgb_b.val(this.$store.rgb.b);
+            this.refs.$rgb_a.val(this.$store.alpha);
+        }
+    }, {
+        key: 'setHSLInput',
+        value: function setHSLInput() {
+            this.refs.$hsl_h.val(this.$store.hsl.h);
+            this.refs.$hsl_s.val(this.$store.hsl.s);
+            this.refs.$hsl_l.val(this.$store.hsl.l);
+            this.refs.$hsl_a.val(this.$store.alpha);
+        }
+    }, {
+        key: 'setHexInput',
+        value: function setHexInput() {
+            this.refs.$hexCode.val(this.$store.dispatch('/toHEX'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setCurrentFormat(this.$store.format);
+            this.setRGBInput();
+            this.setHSLInput();
+            this.setHexInput();
+        }
+    }]);
+    return ColorInformation;
+}(UIElement);
+
+var DATA_COLORSETS_INDEX = 'data-colorsets-index';
+
+var ColorSetsChooser = function (_UIElement) {
+    inherits(ColorSetsChooser, _UIElement);
+
+    function ColorSetsChooser() {
+        classCallCheck(this, ColorSetsChooser);
+        return possibleConstructorReturn(this, (ColorSetsChooser.__proto__ || Object.getPrototypeOf(ColorSetsChooser)).apply(this, arguments));
+    }
+
+    createClass(ColorSetsChooser, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class="color-chooser">\n                <div class="color-chooser-container">\n                    <div class="colorsets-item colorsets-item-header">\n                        <h1 class="title">Color Palettes</h1>\n                        <span ref="$toggleButton" class="items">&times;</span>\n                    </div>\n                    <div ref="$colorsetsList" class="colorsets-list"></div>\n                </div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.load();
+        }
+    }, {
+        key: '@changeCurrentColorSets',
+        value: function changeCurrentColorSets() {
+            this.refresh();
+        }
+    }, {
+        key: '@toggleColorChooser',
+        value: function toggleColorChooser() {
+            this.toggle();
+        }
+
+        // loadable 
+
+    }, {
+        key: 'load $colorsetsList',
+        value: function load$colorsetsList() {
+            // colorsets 
+            var colorSets = this.$store.dispatch('/getColorSetsList');
+
+            return '\n            <div>\n                ' + colorSets.map(function (element, index) {
+                return '\n                        <div class="colorsets-item" data-colorsets-index="' + index + '" >\n                            <h1 class="title">' + element.name + '</h1>\n                            <div class="items">\n                                <div>\n                                    ' + element.colors.filter(function (color, i) {
+                    return i < 5;
+                }).map(function (color) {
+                    color = color || 'rgba(255, 255, 255, 1)';
+                    return '<div class="color-item" title="' + color + '">\n                                                <div class="color-view" style="background-color: ' + color + '"></div>\n                                            </div>';
+                }).join('') + '\n                                </div>\n                            </div>\n                        </div>';
+            }).join('') + '\n            </div>\n        ';
+        }
+    }, {
+        key: 'show',
+        value: function show() {
+            this.$el.addClass('open');
+        }
+    }, {
+        key: 'hide',
+        value: function hide() {
+            this.$el.removeClass('open');
+        }
+    }, {
+        key: 'toggle',
+        value: function toggle() {
+            this.$el.toggleClass('open');
+        }
+    }, {
+        key: 'click $toggleButton',
+        value: function click$toggleButton(e) {
+            this.toggle();
+        }
+    }, {
+        key: 'click $colorsetsList .colorsets-item',
+        value: function click$colorsetsListColorsetsItem(e) {
+            var $item = e.$delegateTarget;
+
+            if ($item) {
+
+                var index = parseInt($item.attr(DATA_COLORSETS_INDEX));
+
+                this.$store.dispatch('/setCurrentColorSets', index);
+
+                this.hide();
+            }
+        }
+    }, {
+        key: 'destroy',
+        value: function destroy() {
+            get(ColorSetsChooser.prototype.__proto__ || Object.getPrototypeOf(ColorSetsChooser.prototype), 'destroy', this).call(this);
+
+            this.hide();
+        }
+    }]);
+    return ColorSetsChooser;
+}(UIElement);
+
+var CurrentColorSets = function (_UIElement) {
+    inherits(CurrentColorSets, _UIElement);
+
+    function CurrentColorSets() {
+        classCallCheck(this, CurrentColorSets);
+        return possibleConstructorReturn(this, (CurrentColorSets.__proto__ || Object.getPrototypeOf(CurrentColorSets)).apply(this, arguments));
+    }
+
+    createClass(CurrentColorSets, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class="colorsets">\n                <div class="menu" title="Open Color Palettes">\n                    <button ref="$colorSetsChooseButton" type="button" class="color-sets-choose-btn arrow-button"></button>\n                </div>\n                <div ref="$colorSetsColorList" class="color-list"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'load $colorSetsColorList',
+        value: function load$colorSetsColorList() {
+            var currentColorSets = this.$store.dispatch('/getCurrentColorSets');
+            var colors = this.$store.dispatch('/getCurrentColors');
+
+            return '\n            <div class="current-color-sets">\n            ' + colors.map(function (color, i) {
+                return '<div class="color-item" title="' + color + '" data-index="' + i + '" data-color="' + color + '">\n                    <div class="empty"></div>\n                    <div class="color-view" style="background-color: ' + color + '"></div>\n                </div>';
+            }).join('') + '   \n            ' + (currentColorSets.edit ? '<div class="add-color-item">+</div>' : '') + '         \n            </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.load();
+        }
+    }, {
+        key: 'addColor',
+        value: function addColor(color) {
+            this.$store.dispatch('/addCurrentColor', color);
+        }
+    }, {
+        key: '@changeCurrentColorSets',
+        value: function changeCurrentColorSets() {
+            this.refresh();
+        }
+    }, {
+        key: 'click $colorSetsChooseButton',
+        value: function click$colorSetsChooseButton(e) {
+            this.$store.emit('toggleColorChooser');
+        }
+    }, {
+        key: 'contextmenu $colorSetsColorList',
+        value: function contextmenu$colorSetsColorList(e) {
+            e.preventDefault();
+            var currentColorSets = this.$store.dispatch('/getCurrentColorSets');
+
+            if (!currentColorSets.edit) {
+                return;
+            }
+
+            var $target = new Dom(e.target);
+
+            var $item = $target.closest('color-item');
+
+            if ($item) {
+                var index = parseInt($item.attr('data-index'));
+
+                this.$store.emit('showContextMenu', e, index);
+            } else {
+                this.$store.emit('showContextMenu', e);
+            }
+        }
+    }, {
+        key: 'click $colorSetsColorList .add-color-item',
+        value: function click$colorSetsColorListAddColorItem(e) {
+            this.addColor(this.$store.dispatch('/toColor'));
+        }
+    }, {
+        key: 'click $colorSetsColorList .color-item',
+        value: function click$colorSetsColorListColorItem(e) {
+            this.$store.dispatch('/changeColor', e.$delegateTarget.attr('data-color'));
+            this.$store.emit('lastUpdateColor');
+        }
+    }]);
+    return CurrentColorSets;
+}(UIElement);
+
+var CurrentColorSetsContextMenu = function (_UIElement) {
+    inherits(CurrentColorSetsContextMenu, _UIElement);
+
+    function CurrentColorSetsContextMenu() {
+        classCallCheck(this, CurrentColorSetsContextMenu);
+        return possibleConstructorReturn(this, (CurrentColorSetsContextMenu.__proto__ || Object.getPrototypeOf(CurrentColorSetsContextMenu)).apply(this, arguments));
+    }
+
+    createClass(CurrentColorSetsContextMenu, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <ul class="colorsets-contextmenu">\n                <li class="menu-item small-hide" data-type="remove-color">Remove color</li>\n                <li class="menu-item small-hide" data-type="remove-all-to-the-right">Remove all to the right</li>\n                <li class="menu-item" data-type="clear-palette">Clear palette</li>\n            </ul>\n        ';
+        }
+    }, {
+        key: 'show',
+        value: function show(e, index) {
+            var $event = Event.pos(e);
+
+            this.$el.css({
+                top: $event.clientY - 10 + 'px',
+                left: $event.clientX + 'px'
+            });
+            this.$el.addClass('show');
+            this.selectedColorIndex = index;
+
+            if (typeof this.selectedColorIndex == 'undefined') {
+                this.$el.addClass('small');
+            } else {
+                this.$el.removeClass('small');
+            }
+        }
+    }, {
+        key: 'hide',
+        value: function hide() {
+            this.$el.removeClass('show');
+        }
+    }, {
+        key: 'runCommand',
+        value: function runCommand(command) {
+            switch (command) {
+                case 'remove-color':
+                    this.$store.dispatch('/removeCurrentColor', this.selectedColorIndex);
+                    break;
+                case 'remove-all-to-the-right':
+                    this.$store.dispatch('/removeCurrentColorToTheRight', this.selectedColorIndex);
+                    break;
+                case 'clear-palette':
+                    this.$store.dispatch('/clearPalette');
+                    break;
+            }
+        }
+    }, {
+        key: '@showContextMenu',
+        value: function showContextMenu(e, index) {
+            this.show(e, index);
+        }
+    }, {
+        key: 'click $el .menu-item',
+        value: function click$elMenuItem(e) {
+            e.preventDefault();
+
+            this.runCommand(e.$delegateTarget.attr('data-type'));
+            this.hide();
+        }
+    }]);
+    return CurrentColorSetsContextMenu;
+}(UIElement);
+
+var MacOSColorPicker = function (_BaseColorPicker) {
+    inherits(MacOSColorPicker, _BaseColorPicker);
+
+    function MacOSColorPicker() {
+        classCallCheck(this, MacOSColorPicker);
+        return possibleConstructorReturn(this, (MacOSColorPicker.__proto__ || Object.getPrototypeOf(MacOSColorPicker)).apply(this, arguments));
+    }
+
+    createClass(MacOSColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="colorwheel"></div>\n                <div target="control"></div>\n                <div target="information"></div>\n                <div target="currentColorSets"></div>\n                <div target="colorSetsChooser"></div>\n                <div target="contextMenu"></div>                \n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                colorwheel: ColorWheel,
+                control: ColorControl,
+                information: ColorInformation,
+                currentColorSets: CurrentColorSets,
+                colorSetsChooser: ColorSetsChooser,
+                contextMenu: CurrentColorSetsContextMenu
+            };
+        }
+    }]);
+    return MacOSColorPicker;
+}(BaseColorPicker);
+
+var Hue = function (_BaseSlider) {
+    inherits(Hue, _BaseSlider);
+
+    function Hue(opt) {
+        classCallCheck(this, Hue);
+
+        var _this = possibleConstructorReturn(this, (Hue.__proto__ || Object.getPrototypeOf(Hue)).call(this, opt));
+
+        _this.minValue = 0;
+        _this.maxValue = 360;
+        _this.source = 'hue-control';
+        return _this;
+    }
+
+    createClass(Hue, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class="hue">\n                <div ref="$container" class="hue-container">\n                    <div ref="$bar" class="drag-bar"></div>\n                </div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.hsv.h;
+        }
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {
+
+            var dist = this.getCaculatedDist(e);
+
+            this.setColorUI(dist / 100 * this.maxValue);
+
+            this.changeColor({
+                h: dist / 100 * this.maxValue,
+                type: 'hsv'
+            });
+        }
+    }]);
+    return Hue;
+}(BaseSlider);
+
+var source$3 = 'chromedevtool-control';
+
+var ColorControl$2 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: Hue, Opacity: Opacity, Eyedropper: Eyedropper };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+
+            var hasEyeDropper = enableEyeDropper ? 'has-eyedropper' : '';
+            var $eyedropper = !!enableEyeDropper ? '\n        <div class="el-cp-color-control__left">\n          <div target="Eyedropper"></div>\n        </div>\n      ' : '';
+
+            return '\n        <div class="control ' + hasEyeDropper + '">\n            <div target="Hue" ></div>\n            <div target="Opacity" ></div>\n            <div ref="$controlPattern" class="empty"></div>\n            <div ref="$controlColor" class="color"></div>\n            ' + $eyedropper + '            \n        </div>\n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            this.refs.$controlColor.css("background-color", this.$store.dispatch('/toRGB'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+            this.setBackgroundColor();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$3 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var source$4 = 'chromedevtool-palette';
+
+var ColorPalette = function (_UIElement) {
+    inherits(ColorPalette, _UIElement);
+
+    function ColorPalette() {
+        classCallCheck(this, ColorPalette);
+        return possibleConstructorReturn(this, (ColorPalette.__proto__ || Object.getPrototypeOf(ColorPalette)).apply(this, arguments));
+    }
+
+    createClass(ColorPalette, [{
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="color">\n            <div ref="$saturation" class="saturation">\n                <div ref="$value" class="value">\n                    <div ref="$drag_pointer" class="drag-pointer"></div>\n                </div>\n            </div>        \n        </div>        \n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor(color) {
+            this.$el.css("background-color", color);
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+    }, {
+        key: 'caculateSV',
+        value: function caculateSV() {
+            var pos = this.drag_pointer_pos || { x: 0, y: 0 };
+
+            var width = this.state.get('$el.width');
+            var height = this.state.get('$el.height');
+
+            var s = pos.x / width;
+            var v = (height - pos.y) / height;
+
+            this.$store.dispatch('/changeColor', {
+                type: 'hsv',
+                s: s,
+                v: v,
+                source: source$4
+            });
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            var x = this.state.get('$el.width') * this.$store.hsv.s,
+                y = this.state.get('$el.height') * (1 - this.$store.hsv.v);
+
+            this.refs.$drag_pointer.css({
+                left: x + "px",
+                top: y + "px"
+            });
+
+            this.drag_pointer_pos = { x: x, y: y };
+
+            this.setBackgroundColor(this.$store.dispatch('/getHueColor'));
+        }
+    }, {
+        key: 'setMainColor',
+        value: function setMainColor(e) {
+            // e.preventDefault();
+            var pos = this.$el.offset(); // position for screen
+            var w = this.state.get('$el.contentWidth');
+            var h = this.state.get('$el.contentHeight');
+
+            var x = Event.pos(e).pageX - pos.left;
+            var y = Event.pos(e).pageY - pos.top;
+
+            if (x < 0) x = 0;else if (x > w) x = w;
+
+            if (y < 0) y = 0;else if (y > h) y = h;
+
+            this.refs.$drag_pointer.css({
+                left: x + 'px',
+                top: y + 'px'
+            });
+
+            this.drag_pointer_pos = { x: x, y: y };
+
+            this.caculateSV();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$4 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }, {
+        key: 'mouseup document',
+        value: function mouseupDocument(e) {
+            if (this.isDown) {
+                this.isDown = false;
+                this.$store.emit('lastUpdateColor');
+            }
+        }
+    }, {
+        key: 'mousemove document',
+        value: function mousemoveDocument(e) {
+            if (this.isDown) {
+                this.setMainColor(e);
+            }
+        }
+    }, {
+        key: 'mousedown',
+        value: function mousedown(e) {
+            this.isDown = true;
+            this.setMainColor(e);
+        }
+    }, {
+        key: 'touchend document',
+        value: function touchendDocument(e) {
+            if (this.isDown) {
+                this.isDown = false;
+                this.$store.emit('lastUpdateColor');
+            }
+        }
+    }, {
+        key: 'touchmove document',
+        value: function touchmoveDocument(e) {
+            if (this.isDown) {
+                this.setMainColor(e);
+            }
+        }
+    }, {
+        key: 'touchstart',
+        value: function touchstart(e) {
+            e.preventDefault();
+            this.isDown = true;
+            this.setMainColor(e);
+        }
+    }]);
+    return ColorPalette;
+}(UIElement);
+
+var ChromeDevToolColorPicker = function (_BaseColorPicker) {
+    inherits(ChromeDevToolColorPicker, _BaseColorPicker);
+
+    function ChromeDevToolColorPicker() {
+        classCallCheck(this, ChromeDevToolColorPicker);
+        return possibleConstructorReturn(this, (ChromeDevToolColorPicker.__proto__ || Object.getPrototypeOf(ChromeDevToolColorPicker)).apply(this, arguments));
+    }
+
+    createClass(ChromeDevToolColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="palette"></div> \n                <div target="control"></div>\n                <div target="information"></div>\n                <div target="currentColorSets"></div>\n                <div target="colorSetsChooser"></div>\n                <div target="contextMenu"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$2,
+                information: ColorInformation,
+                currentColorSets: CurrentColorSets,
+                colorSetsChooser: ColorSetsChooser,
+                contextMenu: CurrentColorSetsContextMenu
+            };
+        }
+    }]);
+    return ChromeDevToolColorPicker;
+}(BaseColorPicker);
+
+var source$5 = 'mini-control';
+
+var ColorControl$4 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: Hue, Opacity: Opacity };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="control">\n            <div target="Hue" ></div>\n            <div target="Opacity" ></div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$5 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var MiniColorPicker = function (_BaseColorPicker) {
+    inherits(MiniColorPicker, _BaseColorPicker);
+
+    function MiniColorPicker() {
+        classCallCheck(this, MiniColorPicker);
+        return possibleConstructorReturn(this, (MiniColorPicker.__proto__ || Object.getPrototypeOf(MiniColorPicker)).apply(this, arguments));
+    }
+
+    createClass(MiniColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="palette"></div>\n                <div target="control"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$4
+            };
+        }
+    }]);
+    return MiniColorPicker;
+}(BaseColorPicker);
+
+var VerticalSlider = function (_BaseSlider) {
+    inherits(VerticalSlider, _BaseSlider);
+
+    function VerticalSlider(opt) {
+        classCallCheck(this, VerticalSlider);
+
+        var _this = possibleConstructorReturn(this, (VerticalSlider.__proto__ || Object.getPrototypeOf(VerticalSlider)).call(this, opt));
+
+        _this.source = 'vertical-slider';
+        return _this;
+    }
+
+    /** get max height for vertical slider */
+
+
+    createClass(VerticalSlider, [{
+        key: 'getMaxDist',
+        value: function getMaxDist() {
+            return this.state.get('$container.height');
+        }
+
+        /** set mouse pointer for vertical slider */
+
+    }, {
+        key: 'setMousePosition',
+        value: function setMousePosition(y) {
+            this.refs.$bar.css({ top: y + 'px' });
+        }
+
+        /** get mouse position by pageY for vertical slider */
+
+    }, {
+        key: 'getMousePosition',
+        value: function getMousePosition(e) {
+            return Event.pos(e).pageY;
+        }
+
+        /** get min position for vertial slider */
+
+    }, {
+        key: 'getMinPosition',
+        value: function getMinPosition() {
+            return this.refs.$container.offset().top;
+        }
+
+        /** get caculated dist for domain value   */
+
+    }, {
+        key: 'getCaculatedDist',
+        value: function getCaculatedDist(e) {
+            var current = e ? this.getMousePosition(e) : this.getCurrent(this.getDefaultValue() / this.maxValue);
+            var dist = 100 - this.getDist(current);
+
+            return dist;
+        }
+
+        /** set drag bar position  */
+
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI(v) {
+
+            v = v || this.getDefaultValue();
+
+            if (v <= this.minValue) {
+                this.refs.$bar.addClass('first').removeClass('last');
+            } else if (v >= this.maxValue) {
+                this.refs.$bar.addClass('last').removeClass('first');
+            } else {
+                this.refs.$bar.removeClass('last').removeClass('first');
+            }
+
+            var per = 1 - (v || 0) / this.maxValue;
+
+            this.setMousePosition(this.getMaxDist() * per);
+        }
+    }]);
+    return VerticalSlider;
+}(BaseSlider);
+
+var VerticalHue = function (_VerticalSlider) {
+    inherits(VerticalHue, _VerticalSlider);
+
+    function VerticalHue(opt) {
+        classCallCheck(this, VerticalHue);
+
+        var _this = possibleConstructorReturn(this, (VerticalHue.__proto__ || Object.getPrototypeOf(VerticalHue)).call(this, opt));
+
+        _this.minValue = 0;
+        _this.maxValue = 360;
+        _this.source = 'vertical-hue-control';
+        return _this;
+    }
+
+    createClass(VerticalHue, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class="hue">\n                <div ref="$container" class="hue-container">\n                    <div ref="$bar" class="drag-bar"></div>\n                </div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.hsv.h;
+        }
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {
+
+            var dist = this.getCaculatedDist(e);
+
+            this.setColorUI(dist / 100 * this.maxValue);
+
+            this.changeColor({
+                h: dist / 100 * this.maxValue,
+                type: 'hsv'
+            });
+        }
+    }]);
+    return VerticalHue;
+}(VerticalSlider);
+
+var Opacity$2 = function (_VerticalSlider) {
+    inherits(Opacity, _VerticalSlider);
+
+    function Opacity(opt) {
+        classCallCheck(this, Opacity);
+
+        var _this = possibleConstructorReturn(this, (Opacity.__proto__ || Object.getPrototypeOf(Opacity)).call(this, opt));
+
+        _this.source = 'vertical-opacity-control';
+        return _this;
+    }
+
+    createClass(Opacity, [{
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="opacity">\n            <div ref="$container" class="opacity-container">\n                <div ref="$colorbar" class="color-bar"></div>\n                <div ref="$bar" class="drag-bar2"></div>\n            </div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            get(Opacity.prototype.__proto__ || Object.getPrototypeOf(Opacity.prototype), 'refresh', this).call(this);
+            this.setOpacityColorBar();
+        }
+    }, {
+        key: 'setOpacityColorBar',
+        value: function setOpacityColorBar() {
+            var rgb = Object.assign({}, this.$store.rgb);
+
+            rgb.a = 0;
+            var start = Color$1.format(rgb, 'rgb');
+
+            rgb.a = 1;
+            var end = Color$1.format(rgb, 'rgb');
+
+            this.refs.$colorbar.css('background', 'linear-gradient(to top, ' + start + ', ' + end + ')');
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.alpha;
+        }
+    }, {
+        key: 'refreshColorUI',
+        value: function refreshColorUI(e) {
+            var dist = this.getCaculatedDist(e);
+
+            this.setColorUI(dist / 100 * this.maxValue);
+
+            this.changeColor({
+                a: Math.floor(dist) / 100 * this.maxValue
+            });
+        }
+    }]);
+    return Opacity;
+}(VerticalSlider);
+
+var source$6 = 'mini-control';
+
+var ColorControl$6 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: VerticalHue, Opacity: Opacity$2 };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+            return '<div class="control"><div target="Hue" ></div><div target="Opacity" ></div></div>';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$6 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var MiniColorPicker$2 = function (_BaseColorPicker) {
+    inherits(MiniColorPicker, _BaseColorPicker);
+
+    function MiniColorPicker() {
+        classCallCheck(this, MiniColorPicker);
+        return possibleConstructorReturn(this, (MiniColorPicker.__proto__ || Object.getPrototypeOf(MiniColorPicker)).apply(this, arguments));
+    }
+
+    createClass(MiniColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="palette"></div><div target="control"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$6
+            };
+        }
+    }]);
+    return MiniColorPicker;
+}(BaseColorPicker);
+
+var source$7 = 'macos-control';
+
+var ColorControl$8 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Value: Value, Opacity: Opacity, Eyedropper: Eyedropper };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+
+            var hasEyeDropper = enableEyeDropper ? 'has-eyedropper' : '';
+            var $eyedropper = !!enableEyeDropper ? '\n        <div class="el-cp-color-control__left">\n          <div target="Eyedropper"></div>\n        </div>\n      ' : '';
+
+            return '\n        <div class="control ' + hasEyeDropper + '">\n            <div target="Value" ></div>\n            <div target="Opacity" ></div>\n            <div ref="$controlPattern" class="empty"></div>\n            <div ref="$controlColor" class="color"></div>\n            ' + $eyedropper + '                                \n        </div>\n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            this.refs.$controlColor.css("background-color", this.$store.dispatch('/toRGB'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+            this.setBackgroundColor();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Value.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$7 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var ColorRing = function (_ColorWheel) {
+    inherits(ColorRing, _ColorWheel);
+
+    function ColorRing(opt) {
+        classCallCheck(this, ColorRing);
+
+        var _this = possibleConstructorReturn(this, (ColorRing.__proto__ || Object.getPrototypeOf(ColorRing)).call(this, opt));
+
+        _this.width = 214;
+        _this.height = 214;
+        _this.thinkness = 16;
+        _this.half_thinkness = _this.thinkness / 2;
+        _this.source = 'colorring';
+        return _this;
+    }
+
+    createClass(ColorRing, [{
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="wheel" data-type="ring">\n            <canvas class="wheel-canvas" ref="$colorwheel" ></canvas>\n            <div class="drag-pointer" ref="$drag_pointer"></div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI(isEvent) {
+            this.renderCanvas();
+            this.setHueColor(null, isEvent);
+        }
+    }, {
+        key: 'getDefaultValue',
+        value: function getDefaultValue() {
+            return this.$store.hsv.h;
+        }
+    }, {
+        key: 'setHueColor',
+        value: function setHueColor(e, isEvent) {
+
+            if (!this.state.get('$el.width')) return;
+
+            var _getRectangle = this.getRectangle(),
+                minX = _getRectangle.minX,
+                minY = _getRectangle.minY,
+                radius = _getRectangle.radius,
+                centerX = _getRectangle.centerX,
+                centerY = _getRectangle.centerY;
+
+            var _getCurrentXY = this.getCurrentXY(e, this.getDefaultValue(), radius, centerX, centerY),
+                x = _getCurrentXY.x,
+                y = _getCurrentXY.y;
+
+            var rx = x - centerX,
+                ry = y - centerY,
+                hue = caculateAngle(rx, ry);
+
+            {
+                var _getCurrentXY2 = this.getCurrentXY(null, hue, radius - this.half_thinkness, centerX, centerY),
+                    x = _getCurrentXY2.x,
+                    y = _getCurrentXY2.y;
+            }
+
+            // set drag pointer position 
+            this.refs.$drag_pointer.css({
+                left: x - minX + 'px',
+                top: y - minY + 'px'
+            });
+
+            if (!isEvent) {
+                this.changeColor({
+                    type: 'hsv',
+                    h: hue
+                });
+            }
+        }
+    }]);
+    return ColorRing;
+}(ColorWheel);
+
+// import ColorWheel from '../ui/ColorWheel'
+var RingColorPicker = function (_BaseColorPicker) {
+    inherits(RingColorPicker, _BaseColorPicker);
+
+    function RingColorPicker() {
+        classCallCheck(this, RingColorPicker);
+        return possibleConstructorReturn(this, (RingColorPicker.__proto__ || Object.getPrototypeOf(RingColorPicker)).apply(this, arguments));
+    }
+
+    createClass(RingColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="colorring"></div>\n                <div target="palette"></div> \n                <div target="control"></div>\n                <div target="information"></div>\n                <div target="currentColorSets"></div>\n                <div target="colorSetsChooser"></div>\n                <div target="contextMenu"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                colorring: ColorRing,
+                palette: ColorPalette,
+                control: ColorControl$8,
+                information: ColorInformation,
+                currentColorSets: CurrentColorSets,
+                colorSetsChooser: ColorSetsChooser,
+                contextMenu: CurrentColorSetsContextMenu
+            };
+        }
+    }]);
+    return RingColorPicker;
+}(BaseColorPicker);
+
+var ColorControl$10 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: VerticalHue, Opacity: Opacity$2 };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+            return '\n        <div class="control">\n            <div target="Hue" ></div>\n            <div target="Opacity" ></div>\n        </div>\n        ';
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor() {
+            this.refresh();
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var XDColorPicker = function (_BaseColorPicker) {
+    inherits(XDColorPicker, _BaseColorPicker);
+
+    function XDColorPicker() {
+        classCallCheck(this, XDColorPicker);
+        return possibleConstructorReturn(this, (XDColorPicker.__proto__ || Object.getPrototypeOf(XDColorPicker)).apply(this, arguments));
+    }
+
+    createClass(XDColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return '\n            <div class=\'colorpicker-body\'>\n                <div target="palette"></div> \n                <div target="control"></div>\n                <div target="information"></div>\n                <div target="currentColorSets"></div>\n                <div target="colorSetsChooser"></div>\n                <div target="contextMenu"></div>\n            </div>\n        ';
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$10,
+                information: ColorInformation,
+                currentColorSets: CurrentColorSets,
+                colorSetsChooser: ColorSetsChooser,
+                contextMenu: CurrentColorSetsContextMenu
+            };
+        }
+    }]);
+    return XDColorPicker;
+}(BaseColorPicker);
+
+var source$8 = 'mini-control';
+
+var ColorControl$12 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: VerticalHue, Opacity: Opacity$2 };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+            return (/*html*/'\n            <div class="control">\n                <div target="Opacity" ></div>            \n                <div target="Hue" ></div>\n            </div>\n        '
+            );
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$8 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var VSCodePicker = function (_BaseColorPicker) {
+    inherits(VSCodePicker, _BaseColorPicker);
+
+    function VSCodePicker() {
+        classCallCheck(this, VSCodePicker);
+        return possibleConstructorReturn(this, (VSCodePicker.__proto__ || Object.getPrototypeOf(VSCodePicker)).apply(this, arguments));
+    }
+
+    createClass(VSCodePicker, [{
+        key: 'template',
+        value: function template() {
+
+            var hasEyeDropper = enableEyeDropper ? 'has-eyedropper' : '';
+            var $eyedropper = !!enableEyeDropper ? '\n        <div class="el-cp-color-control__left">\n          <div target="Eyedropper"></div>\n        </div>\n      ' : '';
+
+            return (/*html*/'\n            <div class=\'colorpicker-body\'>\n                <div class=\'color-view ' + hasEyeDropper + '\' >\n                    <div class=\'color-view-container\'  >\n                        <div class="preview" ref="$colorview"></div>\n                    </div>\n                    ' + $eyedropper + '            \n                </div>\n                <div class=\'color-tool\'>\n                    <div target="palette"></div>\n                    <div target="control"></div>\n                </div>\n            </div>\n        '
+            );
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$12,
+                Eyedropper: Eyedropper
+            };
+        }
+    }, {
+        key: 'initColorWithoutChangeEvent',
+        value: function initColorWithoutChangeEvent(color) {
+            this.$store.dispatch('/initColor', color);
+            this.refresh();
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            var color = this.$store.dispatch('/toColor');
+            var rgb = this.$store.rgb;
+            var bValue = Color$1.brightness(rgb.r, rgb.g, rgb.b);
+
+            this.refs.$colorview.css({
+                "background-color": color,
+                'color': bValue > 127 ? 'black' : 'white'
+            });
+            this.refs.$colorview.html(color);
+        }
+    }, {
+        key: 'click $colorview',
+        value: function click$colorview(e) {
+            this.nextFormat();
+        }
+    }, {
+        key: 'nextFormat',
+        value: function nextFormat() {
+            var current_format = this.$store.format || 'hex';
+
+            var next_format = 'hex';
+            if (current_format == 'hex') {
+                next_format = 'rgb';
+            } else if (current_format == 'rgb') {
+                next_format = 'hsl';
+            } else if (current_format == 'hsl') {
+                next_format = 'hex';
+            }
+
+            this.$store.dispatch('/changeFormat', next_format);
+            this.$store.emit('lastUpdateColor');
+            this.refresh();
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setBackgroundColor();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor() {
+            this.refresh();
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return VSCodePicker;
+}(BaseColorPicker);
+
+var source$9 = 'chromedevtool-control';
+
+var ColorControl$14 = function (_UIElement) {
+    inherits(ColorControl, _UIElement);
+
+    function ColorControl() {
+        classCallCheck(this, ColorControl);
+        return possibleConstructorReturn(this, (ColorControl.__proto__ || Object.getPrototypeOf(ColorControl)).apply(this, arguments));
+    }
+
+    createClass(ColorControl, [{
+        key: 'components',
+        value: function components() {
+            return { Hue: Hue, Opacity: Opacity, Eyedropper: Eyedropper };
+        }
+    }, {
+        key: 'template',
+        value: function template() {
+
+            var hasEyeDropper = enableEyeDropper ? 'has-eyedropper' : '';
+            var $eyedropper = !!enableEyeDropper ? '\n        <div class="el-cp-color-control__left">\n          <div target="Eyedropper"></div>\n        </div>\n      ' : '';
+
+            return '\n        <div class="control ' + hasEyeDropper + '">\n            <div>\n                ' + $eyedropper + '                                \n                <div class="color-info">\n                    <div ref="$controlPattern" class="empty"></div>\n                    <div ref="$controlColor" class="color"></div>        \n                </div>\n            </div>\n            <div target="Hue" ></div>\n            <div target="Opacity" ></div>\n\n        </div>\n        ';
+        }
+    }, {
+        key: 'setBackgroundColor',
+        value: function setBackgroundColor() {
+            this.refs.$controlColor.css("background-color", this.$store.dispatch('/toRGB'));
+        }
+    }, {
+        key: 'refresh',
+        value: function refresh() {
+            this.setColorUI();
+            this.setBackgroundColor();
+        }
+    }, {
+        key: 'setColorUI',
+        value: function setColorUI() {
+            this.Hue.setColorUI();
+            this.Opacity.setColorUI();
+        }
+    }, {
+        key: '@changeColor',
+        value: function changeColor(sourceType) {
+            if (source$9 != sourceType) {
+                this.refresh();
+            }
+        }
+    }, {
+        key: '@initColor',
+        value: function initColor() {
+            this.refresh();
+        }
+    }]);
+    return ColorControl;
+}(UIElement);
+
+var BoxColorPicker = function (_BaseColorPicker) {
+    inherits(BoxColorPicker, _BaseColorPicker);
+
+    function BoxColorPicker() {
+        classCallCheck(this, BoxColorPicker);
+        return possibleConstructorReturn(this, (BoxColorPicker.__proto__ || Object.getPrototypeOf(BoxColorPicker)).apply(this, arguments));
+    }
+
+    createClass(BoxColorPicker, [{
+        key: 'template',
+        value: function template() {
+            return (/*html*/'\n            <div class=\'colorpicker-body\'>\n                <div target="palette"></div> \n                <div>\n                    <div target="control"></div>\n                    <div target="information"></div>\n                    <div target="currentColorSets"></div>\n                    <div target="colorSetsChooser"></div>\n                    <div target="contextMenu"></div>\n                </div>\n            </div>\n        '
+            );
+        }
+    }, {
+        key: 'components',
+        value: function components() {
+            return {
+                palette: ColorPalette,
+                control: ColorControl$14,
+                information: ColorInformation,
+                currentColorSets: CurrentColorSets,
+                colorSetsChooser: ColorSetsChooser,
+                contextMenu: CurrentColorSetsContextMenu
+            };
+        }
+    }]);
+    return BoxColorPicker;
+}(BaseColorPicker);
+
+var ColorPicker = {
+    create: function create(opts) {
+        switch (opts.type) {
+            case 'box':
+                return new BoxColorPicker(opts);
+            case 'macos':
+                return new MacOSColorPicker(opts);
+            case 'xd':
+                return new XDColorPicker(opts);
+            case 'ring':
+                return new RingColorPicker(opts);
+            case 'mini':
+                return new MiniColorPicker(opts);
+            case 'vscode':
+                return new VSCodePicker(opts);
+            case 'mini-vertical':
+                return new MiniColorPicker$2(opts);
+            case 'sketch':
+            case 'palette':
+            default:
+                return new ChromeDevToolColorPicker(opts);
+        }
+    },
+
+    ColorPicker: ChromeDevToolColorPicker,
+    ChromeDevToolColorPicker: ChromeDevToolColorPicker,
+    MacOSColorPicker: MacOSColorPicker,
+    RingColorPicker: RingColorPicker,
+    MiniColorPicker: MiniColorPicker,
+    VSCodePicker: VSCodePicker,
+    MiniVerticalColorPicker: MiniColorPicker$2
+};
+
+var colorpicker_class = 'codemirror-colorview';
+var colorpicker_background_class = 'codemirror-colorview-background';
+// Excluded tokens do not show color views..
+var excluded_token = ['comment', 'builtin', 'qualifier', 'tag', 'property', 'property error', 'variable', 'variable-2'];
+
+function onChange(cm, evt) {
+    if (evt.origin == 'setValue') {
+        // if content is changed by setValue method, it initialize markers
+        // cm.state.colorpicker.close_color_picker();
+        cm.state.colorpicker.init_color_update();
+        cm.state.colorpicker.style_color_update();
+    } else {
+        cm.state.colorpicker.style_color_update(cm.getCursor().line);
+    }
+}
+
+function onUpdate(cm, evt) {
+    if (!cm.state.colorpicker.isUpdate) {
+        cm.state.colorpicker.isUpdate = true;
+        cm.state.colorpicker.close_color_picker();
+        cm.state.colorpicker.init_color_update();
+        cm.state.colorpicker.style_color_update();
+    }
+}
+
+function onRefresh(cm, evt) {
+    onChange(cm, { origin: 'setValue' });
+}
+
+function onKeyup(cm, evt) {
+    cm.state.colorpicker.keyup(evt);
+}
+
+function onMousedown(cm, evt) {
+    if (cm.state.colorpicker.is_edit_mode()) {
+        cm.state.colorpicker.check_mousedown(evt);
+    }
+}
+
+function onPaste(cm, evt) {
+    onChange(cm, { origin: 'setValue' });
+}
+
+function onScroll(cm) {
+    cm.state.colorpicker.close_color_picker();
+}
+
+function onBlur(cm) {
+    cm.state.colorpicker.hide_delay_color_picker(cm.state.colorpicker.opt.hideDelay || 1000);
+}
+
+function debounce(callback, delay) {
+
+    var t = undefined;
+
+    return function (cm, e) {
+        if (t) {
+            clearTimeout(t);
+        }
+
+        t = setTimeout(function () {
+            callback(cm, e);
+        }, delay || 300);
+    };
+}
+
+function has_class(el, cls) {
+    if (!el || !el.className) {
+        return false;
+    } else {
+        var newClass = ' ' + el.className + ' ';
+        return newClass.indexOf(' ' + cls + ' ') > -1;
+    }
+}
+
+var ColorView = function () {
+    function ColorView(cm, opt) {
+        classCallCheck(this, ColorView);
+
+        if (typeof opt == 'boolean') {
+            opt = { mode: 'edit' };
+        } else {
+            opt = Object.assign({ mode: 'edit' }, opt || {});
+        }
+
+        this.opt = opt;
+        this.cm = cm;
+        this.markers = {};
+
+        // set excluded token 
+        this.excluded_token = this.opt.excluded_token || excluded_token;
+
+        if (this.opt.colorpicker) {
+            this.colorpicker = this.opt.colorpicker(this.opt);
+        } else {
+            this.colorpicker = ColorPicker.create(this.opt);
+        }
+
+        this.init_event();
+    }
+
+    createClass(ColorView, [{
+        key: 'init_event',
+        value: function init_event() {
+
+            this.cm.on('mousedown', onMousedown);
+            this.cm.on('keyup', onKeyup);
+            this.cm.on('change', onChange);
+            this.cm.on('update', onUpdate);
+            this.cm.on('refresh', onRefresh);
+            this.cm.on('blur', onBlur);
+
+            // create paste callback
+            this.onPasteCallback = function (cm, callback) {
+                return function (evt) {
+                    callback.call(this, cm, evt);
+                };
+            }(this.cm, onPaste);
+
+            this.onScrollEvent = debounce(onScroll, 50);
+
+            this.cm.getWrapperElement().addEventListener('paste', this.onPasteCallback);
+
+            if (this.is_edit_mode()) {
+                this.cm.on('scroll', this.onScrollEvent);
+            }
+        }
+    }, {
+        key: 'is_edit_mode',
+        value: function is_edit_mode() {
+            return this.opt.mode == 'edit';
+        }
+    }, {
+        key: 'is_view_mode',
+        value: function is_view_mode() {
+            return this.opt.mode == 'view';
+        }
+    }, {
+        key: 'destroy',
+        value: function destroy() {
+            this.cm.off('mousedown', onMousedown);
+            this.cm.off('keyup', onKeyup);
+            this.cm.off('change', onChange);
+            this.cm.off('blur', onBlur);
+
+            this.cm.getWrapperElement().removeEventListener('paste', this.onPasteCallback);
+
+            if (this.is_edit_mode()) {
+                this.cm.off('scroll', this.onScrollEvent);
+            }
+        }
+    }, {
+        key: 'hasClass',
+        value: function hasClass(el, className) {
+            if (!el.className) {
+                return false;
+            } else {
+                var newClass = ' ' + el.className + ' ';
+                return newClass.indexOf(' ' + className + ' ') > -1;
+            }
+        }
+    }, {
+        key: 'check_mousedown',
+        value: function check_mousedown(evt) {
+            if (this.hasClass(evt.target, colorpicker_background_class)) {
+                this.open_color_picker(evt.target.parentNode);
+            } else {
+                this.close_color_picker();
+            }
+        }
+    }, {
+        key: 'popup_color_picker',
+        value: function popup_color_picker(defalutColor) {
+            var cursor = this.cm.getCursor();
+            var self = this;
+            var colorMarker = {
+                lineNo: cursor.line,
+                ch: cursor.ch,
+                color: defalutColor || '#FFFFFF',
+                isShortCut: true
+            };
+
+            Object.keys(this.markers).forEach(function (key) {
+                var searchKey = "#" + key;
+                if (searchKey.indexOf("#" + colorMarker.lineNo + ":") > -1) {
+                    var marker = self.markers[key];
+
+                    if (marker.ch <= colorMarker.ch && colorMarker.ch <= marker.ch + marker.color.length) {
+                        // when cursor has marker
+                        colorMarker.ch = marker.ch;
+                        colorMarker.color = marker.color;
+                        colorMarker.nameColor = marker.nameColor;
+                    }
+                }
+            });
+
+            this.open_color_picker(colorMarker);
+        }
+    }, {
+        key: 'open_color_picker',
+        value: function open_color_picker(el) {
+            var _this = this;
+
+            var lineNo = el.lineNo;
+            var ch = el.ch;
+            var nameColor = el.nameColor;
+            var color = el.color;
+
+            if (this.colorpicker) {
+                var prevColor = color;
+                var pos = this.cm.charCoords({ line: lineNo, ch: ch });
+                this.colorpicker.show({
+                    left: pos.left,
+                    top: pos.bottom,
+                    isShortCut: el.isShortCut || false,
+                    hideDelay: this.opt.hideDelay || 2000
+                }, nameColor || color, function (newColor) {
+                    _this.cm.replaceRange(newColor, { line: lineNo, ch: ch }, { line: lineNo, ch: ch + prevColor.length }, '*colorpicker');
+                    _this.cm.focus();
+                    prevColor = newColor;
+                });
+            }
+        }
+    }, {
+        key: 'close_color_picker',
+        value: function close_color_picker() {
+            if (this.colorpicker) {
+                this.colorpicker.hide();
+            }
+        }
+    }, {
+        key: 'hide_delay_color_picker',
+        value: function hide_delay_color_picker() {
+            if (this.colorpicker) {
+                this.colorpicker.runHideDelay();
+            }
+        }
+    }, {
+        key: 'key',
+        value: function key(lineNo, ch) {
+            return [lineNo, ch].join(":");
+        }
+    }, {
+        key: 'keyup',
+        value: function keyup(evt) {
+
+            if (this.colorpicker) {
+                if (evt.key == 'Escape') {
+                    this.colorpicker.hide();
+                } else if (this.colorpicker.isShortCut == false) {
+                    this.colorpicker.hide();
+                }
+            }
+        }
+    }, {
+        key: 'init_color_update',
+        value: function init_color_update() {
+            this.markers = {}; // initialize marker list
+        }
+    }, {
+        key: 'style_color_update',
+        value: function style_color_update(lineHandle) {
+            if (lineHandle) {
+                this.match(lineHandle);
+            } else {
+                var max = this.cm.lineCount();
+
+                for (var lineNo = 0; lineNo < max; lineNo++) {
+                    this.match(lineNo);
+                }
+            }
+        }
+    }, {
+        key: 'empty_marker',
+        value: function empty_marker(lineNo, lineHandle) {
+            var list = lineHandle.markedSpans || [];
+
+            for (var i = 0, len = list.length; i < len; i++) {
+                var key = this.key(lineNo, list[i].from);
+
+                if (key && has_class(list[i].marker.replacedWith, colorpicker_class)) {
+                    delete this.markers[key];
+                    list[i].marker.clear();
+                }
+            }
+        }
+    }, {
+        key: 'match_result',
+        value: function match_result(lineHandle) {
+            return Color$1.matches(lineHandle.text);
+        }
+    }, {
+        key: 'submatch',
+        value: function submatch(lineNo, lineHandle) {
+            var _this2 = this;
+
+            this.empty_marker(lineNo, lineHandle);
+
+            var result = this.match_result(lineHandle);
+            var obj = { next: 0 };
+
+            result.forEach(function (item) {
+                _this2.render(obj, lineNo, lineHandle, item.color, item.nameColor);
+            });
+        }
+    }, {
+        key: 'match',
+        value: function match(lineNo) {
+            var lineHandle = this.cm.getLineHandle(lineNo);
+            var self = this;
+            this.cm.operation(function () {
+                self.submatch(lineNo, lineHandle);
+            });
+        }
+    }, {
+        key: 'make_element',
+        value: function make_element() {
+            var el = document.createElement('div');
+
+            el.className = colorpicker_class;
+
+            if (this.is_edit_mode()) {
+                el.title = "open color picker";
+            } else {
+                el.title = "";
+            }
+
+            el.back_element = this.make_background_element();
+            el.appendChild(el.back_element);
+
+            return el;
+        }
+    }, {
+        key: 'make_background_element',
+        value: function make_background_element() {
+            var el = document.createElement('div');
+
+            el.className = colorpicker_background_class;
+
+            return el;
+        }
+    }, {
+        key: 'set_state',
+        value: function set_state(lineNo, start, color, nameColor) {
+            var marker = this.create_marker(lineNo, start);
+
+            marker.lineNo = lineNo;
+            marker.ch = start;
+            marker.color = color;
+            marker.nameColor = nameColor;
+
+            return marker;
+        }
+    }, {
+        key: 'create_marker',
+        value: function create_marker(lineNo, start) {
+
+            if (!this.has_marker(lineNo, start)) {
+                this.init_marker(lineNo, start);
+            }
+
+            return this.get_marker(lineNo, start);
+        }
+    }, {
+        key: 'init_marker',
+        value: function init_marker(lineNo, start) {
+            this.markers[this.key(lineNo, start)] = this.make_element();
+        }
+    }, {
+        key: 'has_marker',
+        value: function has_marker(lineNo, start) {
+            return !!this.get_marker(lineNo, start);
+        }
+    }, {
+        key: 'get_marker',
+        value: function get_marker(lineNo, start) {
+            var key = this.key(lineNo, start);
+            return this.markers[key];
+        }
+    }, {
+        key: 'update_element',
+        value: function update_element(el, color) {
+            el.back_element.style.backgroundColor = color;
+        }
+    }, {
+        key: 'set_mark',
+        value: function set_mark(line, ch, el) {
+            this.cm.setBookmark({ line: line, ch: ch }, { widget: el, handleMouseEvents: true });
+        }
+    }, {
+        key: 'is_excluded_token',
+        value: function is_excluded_token(line, ch) {
+            var token = this.cm.getTokenAt({ line: line, ch: ch }, true);
+            var type = token.type;
+            var state = token.state.state;
+
+            if (type == null && state == 'block') return true;
+            if (type == null && state == 'top') return true;
+            // if (type == null && state == 'prop')  return true;
+
+            return this.excluded_token.includes(type); // true is that it has a excluded token 
+        }
+    }, {
+        key: 'render',
+        value: function render(cursor, lineNo, lineHandle, color, nameColor) {
+            var start = lineHandle.text.indexOf(color, cursor.next);
+
+            if (this.is_excluded_token(lineNo, start + 1) === true) {
+                // excluded token do not show.
+                cursor.next = start + color.length;
+                return;
+            }
+
+            cursor.next = start + color.length;
+
+            if (this.has_marker(lineNo, start)) {
+                this.update_element(this.create_marker(lineNo, start), nameColor || color);
+                this.set_state(lineNo, start, color, nameColor);
+                return;
+            }
+
+            var el = this.create_marker(lineNo, start);
+
+            this.update_element(el, nameColor || color);
+
+            this.set_state(lineNo, start, color, nameColor || color);
+            this.set_mark(lineNo, start, el);
+        }
+    }]);
+    return ColorView;
+}();
+
+try {
+    var CodeMirror = require('codemirror');
+} catch (e) {}
+
+var CHECK_CODEMIRROR_OBJECT = function CHECK_CODEMIRROR_OBJECT() {
+    return CodeMirror || window.CodeMirror;
+};
+function LOAD_CODEMIRROR_COLORPICKER() {
+    var CODEMIRROR_OBJECT = CHECK_CODEMIRROR_OBJECT();
+
+    if (CODEMIRROR_OBJECT) {
+        CODEMIRROR_OBJECT.defineOption("colorpicker", false, function (cm, val, old) {
+            if (old && old != CODEMIRROR_OBJECT.Init) {
+
+                if (cm.state.colorpicker) {
+                    cm.state.colorpicker.destroy();
+                    cm.state.colorpicker = null;
+                }
+                // remove event listener
+            }
+
+            if (val) {
+                cm.state.colorpicker = new ColorView(cm, val);
+            }
+        });
+    }
+}
+
+LOAD_CODEMIRROR_COLORPICKER();
+
+var CodeMirrorExtension = {
+    load: LOAD_CODEMIRROR_COLORPICKER
+};
+
+var index = _extends({}, Util, ColorPicker, CodeMirrorExtension);
+
+return index;
+
+})));
+window["codemirror-picker"] = self["codemirror-picker"];
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-mode-css.js b/waterfox/browser/components/sidebar/extlib/codemirror-mode-css.js
new file mode 100644
index 0000000000000..f8fc101ca1ee4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-mode-css.js
@@ -0,0 +1,863 @@
+/* CodeMirror version 5.65.19 */
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("css", function(config, parserConfig) {
+  var inline = parserConfig.inline
+  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+
+  var indentUnit = config.indentUnit,
+      tokenHooks = parserConfig.tokenHooks,
+      documentTypes = parserConfig.documentTypes || {},
+      mediaTypes = parserConfig.mediaTypes || {},
+      mediaFeatures = parserConfig.mediaFeatures || {},
+      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
+      propertyKeywords = parserConfig.propertyKeywords || {},
+      nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
+      fontProperties = parserConfig.fontProperties || {},
+      counterDescriptors = parserConfig.counterDescriptors || {},
+      colorKeywords = parserConfig.colorKeywords || {},
+      valueKeywords = parserConfig.valueKeywords || {},
+      allowNested = parserConfig.allowNested,
+      lineComment = parserConfig.lineComment,
+      supportsAtComponent = parserConfig.supportsAtComponent === true,
+      highlightNonStandardPropertyKeywords = config.highlightNonStandardPropertyKeywords !== false;
+
+  var type, override;
+  function ret(style, tp) { type = tp; return style; }
+
+  // Tokenizers
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (tokenHooks[ch]) {
+      var result = tokenHooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == "@") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("def", stream.current());
+    } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) {
+      return ret(null, "compare");
+    } else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (ch == "#") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("atom", "hash");
+    } else if (ch == "!") {
+      stream.match(/^\s*\w*/);
+      return ret("keyword", "important");
+    } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
+      stream.eatWhile(/[\w.%]/);
+      return ret("number", "unit");
+    } else if (ch === "-") {
+      if (/[\d.]/.test(stream.peek())) {
+        stream.eatWhile(/[\w.%]/);
+        return ret("number", "unit");
+      } else if (stream.match(/^-[\w\\\-]*/)) {
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ret("variable-2", "variable-definition");
+        return ret("variable-2", "variable");
+      } else if (stream.match(/^\w+-/)) {
+        return ret("meta", "meta");
+      }
+    } else if (/[,+>*\/]/.test(ch)) {
+      return ret(null, "select-op");
+    } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
+      return ret("qualifier", "qualifier");
+    } else if (/[:;{}\[\]\(\)]/.test(ch)) {
+      return ret(null, ch);
+    } else if (stream.match(/^[\w-.]+(?=\()/)) {
+      if (/^(url(-prefix)?|domain|regexp)$/i.test(stream.current())) {
+        state.tokenize = tokenParenthesized;
+      }
+      return ret("variable callee", "variable");
+    } else if (/[\w\\\-]/.test(ch)) {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("property", "word");
+    } else {
+      return ret(null, null);
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          if (quote == ")") stream.backUp(1);
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+      return ret("string", "string");
+    };
+  }
+
+  function tokenParenthesized(stream, state) {
+    stream.next(); // Must be '('
+    if (!stream.match(/^\s*[\"\')]/, false))
+      state.tokenize = tokenString(")");
+    else
+      state.tokenize = null;
+    return ret(null, "(");
+  }
+
+  // Context management
+
+  function Context(type, indent, prev) {
+    this.type = type;
+    this.indent = indent;
+    this.prev = prev;
+  }
+
+  function pushContext(state, stream, type, indent) {
+    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
+    return type;
+  }
+
+  function popContext(state) {
+    if (state.context.prev)
+      state.context = state.context.prev;
+    return state.context.type;
+  }
+
+  function pass(type, stream, state) {
+    return states[state.context.type](type, stream, state);
+  }
+  function popAndPass(type, stream, state, n) {
+    for (var i = n || 1; i > 0; i--)
+      state.context = state.context.prev;
+    return pass(type, stream, state);
+  }
+
+  // Parser
+
+  function wordAsValue(stream) {
+    var word = stream.current().toLowerCase();
+    if (valueKeywords.hasOwnProperty(word))
+      override = "atom";
+    else if (colorKeywords.hasOwnProperty(word))
+      override = "keyword";
+    else
+      override = "variable";
+  }
+
+  var states = {};
+
+  states.top = function(type, stream, state) {
+    if (type == "{") {
+      return pushContext(state, stream, "block");
+    } else if (type == "}" && state.context.prev) {
+      return popContext(state);
+    } else if (supportsAtComponent && /@component/i.test(type)) {
+      return pushContext(state, stream, "atComponentBlock");
+    } else if (/^@(-moz-)?document$/i.test(type)) {
+      return pushContext(state, stream, "documentTypes");
+    } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) {
+      return pushContext(state, stream, "atBlock");
+    } else if (/^@(font-face|counter-style)/i.test(type)) {
+      state.stateArg = type;
+      return "restricted_atBlock_before";
+    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) {
+      return "keyframes";
+    } else if (type && type.charAt(0) == "@") {
+      return pushContext(state, stream, "at");
+    } else if (type == "hash") {
+      override = "builtin";
+    } else if (type == "word") {
+      override = "tag";
+    } else if (type == "variable-definition") {
+      return "maybeprop";
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    } else if (type == ":") {
+      return "pseudo";
+    } else if (allowNested && type == "(") {
+      return pushContext(state, stream, "parens");
+    }
+    return state.context.type;
+  };
+
+  states.block = function(type, stream, state) {
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (propertyKeywords.hasOwnProperty(word)) {
+        override = "property";
+        return "maybeprop";
+      } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
+        override = highlightNonStandardPropertyKeywords ? "string-2" : "property";
+        return "maybeprop";
+      } else if (allowNested) {
+        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
+        return "block";
+      } else {
+        override += " error";
+        return "maybeprop";
+      }
+    } else if (type == "meta") {
+      return "block";
+    } else if (!allowNested && (type == "hash" || type == "qualifier")) {
+      override = "error";
+      return "block";
+    } else {
+      return states.top(type, stream, state);
+    }
+  };
+
+  states.maybeprop = function(type, stream, state) {
+    if (type == ":") return pushContext(state, stream, "prop");
+    return pass(type, stream, state);
+  };
+
+  states.prop = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" && allowNested) return pushContext(state, stream, "propBlock");
+    if (type == "}" || type == "{") return popAndPass(type, stream, state);
+    if (type == "(") return pushContext(state, stream, "parens");
+
+    if (type == "hash" && !/^#([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(stream.current())) {
+      override += " error";
+    } else if (type == "word") {
+      wordAsValue(stream);
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    }
+    return "prop";
+  };
+
+  states.propBlock = function(type, _stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "word") { override = "property"; return "maybeprop"; }
+    return state.context.type;
+  };
+
+  states.parens = function(type, stream, state) {
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == ")") return popContext(state);
+    if (type == "(") return pushContext(state, stream, "parens");
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+    if (type == "word") wordAsValue(stream);
+    return "parens";
+  };
+
+  states.pseudo = function(type, stream, state) {
+    if (type == "meta") return "pseudo";
+
+    if (type == "word") {
+      override = "variable-3";
+      return state.context.type;
+    }
+    return pass(type, stream, state);
+  };
+
+  states.documentTypes = function(type, stream, state) {
+    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
+      override = "tag";
+      return state.context.type;
+    } else {
+      return states.atBlock(type, stream, state);
+    }
+  };
+
+  states.atBlock = function(type, stream, state) {
+    if (type == "(") return pushContext(state, stream, "atBlock_parens");
+    if (type == "}" || type == ";") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
+
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (word == "only" || word == "not" || word == "and" || word == "or")
+        override = "keyword";
+      else if (mediaTypes.hasOwnProperty(word))
+        override = "attribute";
+      else if (mediaFeatures.hasOwnProperty(word))
+        override = "property";
+      else if (mediaValueKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else if (propertyKeywords.hasOwnProperty(word))
+        override = "property";
+      else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+        override = highlightNonStandardPropertyKeywords ? "string-2" : "property";
+      else if (valueKeywords.hasOwnProperty(word))
+        override = "atom";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else
+        override = "error";
+    }
+    return state.context.type;
+  };
+
+  states.atComponentBlock = function(type, stream, state) {
+    if (type == "}")
+      return popAndPass(type, stream, state);
+    if (type == "{")
+      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
+    if (type == "word")
+      override = "error";
+    return state.context.type;
+  };
+
+  states.atBlock_parens = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
+    return states.atBlock(type, stream, state);
+  };
+
+  states.restricted_atBlock_before = function(type, stream, state) {
+    if (type == "{")
+      return pushContext(state, stream, "restricted_atBlock");
+    if (type == "word" && state.stateArg == "@counter-style") {
+      override = "variable";
+      return "restricted_atBlock_before";
+    }
+    return pass(type, stream, state);
+  };
+
+  states.restricted_atBlock = function(type, stream, state) {
+    if (type == "}") {
+      state.stateArg = null;
+      return popContext(state);
+    }
+    if (type == "word") {
+      if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+          (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
+        override = "error";
+      else
+        override = "property";
+      return "maybeprop";
+    }
+    return "restricted_atBlock";
+  };
+
+  states.keyframes = function(type, stream, state) {
+    if (type == "word") { override = "variable"; return "keyframes"; }
+    if (type == "{") return pushContext(state, stream, "top");
+    return pass(type, stream, state);
+  };
+
+  states.at = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == "word") override = "tag";
+    else if (type == "hash") override = "builtin";
+    return "at";
+  };
+
+  states.interpolation = function(type, stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "{" || type == ";") return popAndPass(type, stream, state);
+    if (type == "word") override = "variable";
+    else if (type != "variable" && type != "(" && type != ")") override = "error";
+    return "interpolation";
+  };
+
+  return {
+    startState: function(base) {
+      return {tokenize: null,
+              state: inline ? "block" : "top",
+              stateArg: null,
+              context: new Context(inline ? "block" : "top", base || 0, null)};
+    },
+
+    token: function(stream, state) {
+      if (!state.tokenize && stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style && typeof style == "object") {
+        type = style[1];
+        style = style[0];
+      }
+      override = style;
+      if (type != "comment")
+        state.state = states[state.state](type, stream, state);
+      return override;
+    },
+
+    indent: function(state, textAfter) {
+      var cx = state.context, ch = textAfter && textAfter.charAt(0);
+      var indent = cx.indent;
+      if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
+      if (cx.prev) {
+        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
+                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
+          // Resume indentation from parent context.
+          cx = cx.prev;
+          indent = cx.indent;
+        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
+          // Dedent relative to current context.
+          indent = Math.max(0, cx.indent - indentUnit);
+        }
+      }
+      return indent;
+    },
+
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
+    lineComment: lineComment,
+    fold: "brace"
+  };
+});
+
+  function keySet(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i].toLowerCase()] = true;
+    }
+    return keys;
+  }
+
+  var documentTypes_ = [
+    "domain", "regexp", "url", "url-prefix"
+  ], documentTypes = keySet(documentTypes_);
+
+  var mediaTypes_ = [
+    "all", "aural", "braille", "handheld", "print", "projection", "screen",
+    "tty", "tv", "embossed"
+  ], mediaTypes = keySet(mediaTypes_);
+
+  var mediaFeatures_ = [
+    "width", "min-width", "max-width", "height", "min-height", "max-height",
+    "device-width", "min-device-width", "max-device-width", "device-height",
+    "min-device-height", "max-device-height", "aspect-ratio",
+    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
+    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
+    "max-color", "color-index", "min-color-index", "max-color-index",
+    "monochrome", "min-monochrome", "max-monochrome", "resolution",
+    "min-resolution", "max-resolution", "scan", "grid", "orientation",
+    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+    "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme",
+    "dynamic-range", "video-dynamic-range"
+  ], mediaFeatures = keySet(mediaFeatures_);
+
+  var mediaValueKeywords_ = [
+    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+    "interlace", "progressive",
+    "dark", "light",
+    "standard", "high"
+  ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
+  var propertyKeywords_ = [
+    "align-content", "align-items", "align-self", "alignment-adjust",
+    "alignment-baseline", "all", "anchor-point", "animation", "animation-delay",
+    "animation-direction", "animation-duration", "animation-fill-mode",
+    "animation-iteration-count", "animation-name", "animation-play-state",
+    "animation-timing-function", "appearance", "azimuth", "backdrop-filter",
+    "backface-visibility", "background", "background-attachment",
+    "background-blend-mode", "background-clip", "background-color",
+    "background-image", "background-origin", "background-position",
+    "background-position-x", "background-position-y", "background-repeat",
+    "background-size", "baseline-shift", "binding", "bleed", "block-size",
+    "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target",
+    "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
+    "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
+    "border-collapse", "border-color", "border-image", "border-image-outset",
+    "border-image-repeat", "border-image-slice", "border-image-source",
+    "border-image-width", "border-left", "border-left-color", "border-left-style",
+    "border-left-width", "border-radius", "border-right", "border-right-color",
+    "border-right-style", "border-right-width", "border-spacing", "border-style",
+    "border-top", "border-top-color", "border-top-left-radius",
+    "border-top-right-radius", "border-top-style", "border-top-width",
+    "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing",
+    "break-after", "break-before", "break-inside", "caption-side", "caret-color",
+    "clear", "clip", "color", "color-profile", "column-count", "column-fill",
+    "column-gap", "column-rule", "column-rule-color", "column-rule-style",
+    "column-rule-width", "column-span", "column-width", "columns", "contain",
+    "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after",
+    "cue-before", "cursor", "direction", "display", "dominant-baseline",
+    "drop-initial-after-adjust", "drop-initial-after-align",
+    "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",
+    "drop-initial-value", "elevation", "empty-cells", "fit", "fit-content", "fit-position",
+    "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow",
+    "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into",
+    "font", "font-family", "font-feature-settings", "font-kerning",
+    "font-language-override", "font-optical-sizing", "font-size",
+    "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
+    "font-variant", "font-variant-alternates", "font-variant-caps",
+    "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
+    "font-variant-position", "font-variation-settings", "font-weight", "gap",
+    "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows",
+    "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start",
+    "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "grid-row-start",
+    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens", "icon",
+    "image-orientation", "image-rendering", "image-resolution", "inline-box-align",
+    "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline",
+    "inset-inline-end", "inset-inline-start", "isolation", "justify-content",
+    "justify-items", "justify-self", "left", "letter-spacing", "line-break",
+    "line-height", "line-height-step", "line-stacking", "line-stacking-ruby",
+    "line-stacking-shift", "line-stacking-strategy", "list-style",
+    "list-style-image", "list-style-position", "list-style-type", "margin",
+    "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
+    "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
+    "marquee-style", "mask-clip", "mask-composite", "mask-image", "mask-mode",
+    "mask-origin", "mask-position", "mask-repeat", "mask-size","mask-type",
+    "max-block-size", "max-height", "max-inline-size",
+    "max-width", "min-block-size", "min-height", "min-inline-size", "min-width",
+    "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right",
+    "nav-up", "object-fit", "object-position", "offset", "offset-anchor",
+    "offset-distance", "offset-path", "offset-position", "offset-rotate",
+    "opacity", "order", "orphans", "outline", "outline-color", "outline-offset",
+    "outline-style", "outline-width", "overflow", "overflow-style",
+    "overflow-wrap", "overflow-x", "overflow-y", "padding", "padding-bottom",
+    "padding-left", "padding-right", "padding-top", "page", "page-break-after",
+    "page-break-before", "page-break-inside", "page-policy", "pause",
+    "pause-after", "pause-before", "perspective", "perspective-origin", "pitch",
+    "pitch-range", "place-content", "place-items", "place-self", "play-during",
+    "position", "presentation-level", "punctuation-trim", "quotes",
+    "region-break-after", "region-break-before", "region-break-inside",
+    "region-fragment", "rendering-intent", "resize", "rest", "rest-after",
+    "rest-before", "richness", "right", "rotate", "rotation", "rotation-point",
+    "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span",
+    "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block",
+    "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom",
+    "scroll-margin-inline", "scroll-margin-inline-end",
+    "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right",
+    "scroll-margin-top", "scroll-padding", "scroll-padding-block",
+    "scroll-padding-block-end", "scroll-padding-block-start",
+    "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end",
+    "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right",
+    "scroll-padding-top", "scroll-snap-align", "scroll-snap-type",
+    "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside",
+    "size", "speak", "speak-as", "speak-header", "speak-numeral",
+    "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size",
+    "table-layout", "target", "target-name", "target-new", "target-position",
+    "text-align", "text-align-last", "text-combine-upright", "text-decoration",
+    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
+    "text-decoration-skip-ink", "text-decoration-style", "text-emphasis",
+    "text-emphasis-color", "text-emphasis-position", "text-emphasis-style",
+    "text-height", "text-indent", "text-justify", "text-orientation",
+    "text-outline", "text-overflow", "text-rendering", "text-shadow",
+    "text-size-adjust", "text-space-collapse", "text-transform",
+    "text-underline-position", "text-wrap", "top", "touch-action", "transform", "transform-origin",
+    "transform-style", "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "translate",
+    "unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance",
+    "voice-duration", "voice-family", "voice-pitch", "voice-range", "voice-rate",
+    "voice-stress", "voice-volume", "volume", "white-space", "widows", "width",
+    "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index",
+    // SVG-specific
+    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
+    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
+    "color-interpolation", "color-interpolation-filters",
+    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
+    "marker", "marker-end", "marker-mid", "marker-start", "paint-order", "shape-rendering", "stroke",
+    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
+    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
+    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
+    "glyph-orientation-vertical", "text-anchor", "writing-mode",
+  ], propertyKeywords = keySet(propertyKeywords_);
+
+  var nonStandardPropertyKeywords_ = [
+    "accent-color", "aspect-ratio", "border-block", "border-block-color", "border-block-end",
+    "border-block-end-color", "border-block-end-style", "border-block-end-width",
+    "border-block-start", "border-block-start-color", "border-block-start-style",
+    "border-block-start-width", "border-block-style", "border-block-width",
+    "border-inline", "border-inline-color", "border-inline-end",
+    "border-inline-end-color", "border-inline-end-style",
+    "border-inline-end-width", "border-inline-start", "border-inline-start-color",
+    "border-inline-start-style", "border-inline-start-width",
+    "border-inline-style", "border-inline-width", "content-visibility", "margin-block",
+    "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",
+    "margin-inline-start", "overflow-anchor", "overscroll-behavior", "padding-block", "padding-block-end",
+    "padding-block-start", "padding-inline", "padding-inline-end",
+    "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color",
+    "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
+    "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
+    "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom"
+  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
+
+  var fontProperties_ = [
+    "font-display", "font-family", "src", "unicode-range", "font-variant",
+     "font-feature-settings", "font-stretch", "font-weight", "font-style"
+  ], fontProperties = keySet(fontProperties_);
+
+  var counterDescriptors_ = [
+    "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
+    "speak-as", "suffix", "symbols", "system"
+  ], counterDescriptors = keySet(counterDescriptors_);
+
+  var colorKeywords_ = [
+    "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
+    "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
+    "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
+    "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
+    "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen",
+    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
+    "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet",
+    "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick",
+    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
+    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
+    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
+    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
+    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink",
+    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey",
+    "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
+    "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
+    "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
+    "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
+    "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
+    "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
+    "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
+    "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
+    "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
+    "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan",
+    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
+    "whitesmoke", "yellow", "yellowgreen"
+  ], colorKeywords = keySet(colorKeywords_);
+
+  var valueKeywords_ = [
+    "above", "absolute", "activeborder", "additive", "activecaption", "afar",
+    "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
+    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
+    "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
+    "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "bengali", "blink", "block", "block-axis", "blur", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break", "break-all", "break-word", "brightness", "bullets", "button",
+    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
+    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
+    "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
+    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "conic-gradient", "contain", "content", "contents",
+    "content-box", "context-menu", "continuous", "contrast", "copy", "counter", "counters", "cover", "crop",
+    "cross", "crosshair", "cubic-bezier", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
+    "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
+    "disc", "discard", "disclosure-closed", "disclosure-open", "document",
+    "dot-dash", "dot-dot-dash",
+    "dotted", "double", "down", "drop-shadow", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
+    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
+    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
+    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
+    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
+    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
+    "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
+    "forwards", "from", "geometricPrecision", "georgian", "grayscale", "graytext", "grid", "groove",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
+    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "hue-rotate", "icon", "ignore",
+    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
+    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
+    "inline-block", "inline-flex", "inline-grid", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
+    "katakana", "katakana-iroha", "keep-all", "khmer",
+    "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
+    "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
+    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
+    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d",
+    "media-play-button", "media-slider", "media-sliderthumb",
+    "media-volume-slider", "media-volume-sliderthumb", "medium",
+    "menu", "menulist", "menulist-button",
+    "menutext", "message-box", "middle", "min-intrinsic",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize",
+    "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
+    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
+    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
+    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
+    "painted", "page", "paused", "persian", "perspective", "pinch-zoom", "plus-darker", "plus-lighter",
+    "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
+    "progress", "push-button", "radial-gradient", "radio", "read-only",
+    "read-write", "read-write-plaintext-only", "rectangle", "region",
+    "relative", "repeat", "repeating-linear-gradient", "repeating-radial-gradient",
+    "repeating-conic-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+    "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
+    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "saturate", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
+    "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
+    "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
+    "semi-condensed", "semi-expanded", "separate", "sepia", "serif", "show", "sidama",
+    "simp-chinese-formal", "simp-chinese-informal", "single",
+    "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
+    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "stroke-box", "sub",
+    "subpixel-antialiased", "svg_masks", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
+    "table-caption", "table-cell", "table-column", "table-column-group",
+    "table-footer-group", "table-header-group", "table-row", "table-row-group",
+    "tamil",
+    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
+    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
+    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
+    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
+    "trad-chinese-formal", "trad-chinese-informal", "transform",
+    "translate", "translate3d", "translateX", "translateY", "translateZ",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unidirectional-pan", "unset", "up",
+    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
+    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
+    "var", "vertical", "vertical-text", "view-box", "visible", "visibleFill", "visiblePainted",
+    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
+    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
+    "xx-large", "xx-small"
+  ], valueKeywords = keySet(valueKeywords_);
+
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+    .concat(valueKeywords_);
+  CodeMirror.registerHelper("hintWords", "css", allWords);
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ["comment", "comment"];
+  }
+
+  CodeMirror.defineMIME("text/css", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css"
+  });
+
+  CodeMirror.defineMIME("text/x-scss", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    lineComment: "//",
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      ":": function(stream) {
+        if (stream.match(/^\s*\{/, false))
+          return [null, null]
+        return false;
+      },
+      "$": function(stream) {
+        stream.match(/^[\w-]+/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "#": function(stream) {
+        if (!stream.eat("{")) return false;
+        return [null, "interpolation"];
+      }
+    },
+    name: "css",
+    helperType: "scss"
+  });
+
+  CodeMirror.defineMIME("text/x-less", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    lineComment: "//",
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      "@": function(stream) {
+        if (stream.eat("{")) return [null, "interpolation"];
+        if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false;
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "&": function() {
+        return ["atom", "atom"];
+      }
+    },
+    name: "css",
+    helperType: "less"
+  });
+
+  CodeMirror.defineMIME("text/x-gss", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    supportsAtComponent: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css",
+    helperType: "gss"
+  });
+
+});
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-day.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-day.css
new file mode 100644
index 0000000000000..71326553062db
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-day.css
@@ -0,0 +1,41 @@
+/*
+
+    Name:       3024 day
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
+.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
+
+.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
+.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
+
+.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
+.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
+.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
+
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
+
+.cm-s-3024-day span.cm-comment { color: #cdab53; }
+.cm-s-3024-day span.cm-atom { color: #a16a94; }
+.cm-s-3024-day span.cm-number { color: #a16a94; }
+
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
+.cm-s-3024-day span.cm-keyword { color: #db2d20; }
+.cm-s-3024-day span.cm-string { color: #fded02; }
+
+.cm-s-3024-day span.cm-variable { color: #01a252; }
+.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-day span.cm-def { color: #e8bbd0; }
+.cm-s-3024-day span.cm-bracket { color: #3a3432; }
+.cm-s-3024-day span.cm-tag { color: #db2d20; }
+.cm-s-3024-day span.cm-link { color: #a16a94; }
+.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
+
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-night.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-night.css
new file mode 100644
index 0000000000000..adc5900ad10d0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/3024-night.css
@@ -0,0 +1,39 @@
+/*
+
+    Name:       3024 night
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
+.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
+.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
+.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
+.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
+
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
+
+.cm-s-3024-night span.cm-comment { color: #cdab53; }
+.cm-s-3024-night span.cm-atom { color: #a16a94; }
+.cm-s-3024-night span.cm-number { color: #a16a94; }
+
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
+.cm-s-3024-night span.cm-keyword { color: #db2d20; }
+.cm-s-3024-night span.cm-string { color: #fded02; }
+
+.cm-s-3024-night span.cm-variable { color: #01a252; }
+.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-night span.cm-def { color: #e8bbd0; }
+.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
+.cm-s-3024-night span.cm-tag { color: #db2d20; }
+.cm-s-3024-night span.cm-link { color: #a16a94; }
+.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
+
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/abbott.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/abbott.css
new file mode 100644
index 0000000000000..3e516a67f948a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/abbott.css
@@ -0,0 +1,268 @@
+/*
+ * abbott.css
+ * A warm, dark theme for prose and code, with pastels and pretty greens.
+ *
+ * Ported from abbott.vim (https://github.com/bcat/abbott.vim) version 2.1.
+ * Original design and CodeMirror port by Jonathan Rascher.
+ *
+ * This theme shares the following color palette with the Vim color scheme.
+ *
+ * Brown shades:
+ *   bistre: #231c14
+ *   chocolate: #3c3022
+ *   cocoa: #745d42
+ *   vanilla_cream: #fef3b4
+ *
+ * Red shades:
+ *   crimson: #d80450
+ *   cinnabar: #f63f05
+ *
+ * Green shades:
+ *   dark_olive: #273900
+ *   forest_green: #24a507
+ *   chartreuse: #a0ea00
+ *   pastel_chartreuse: #d8ff84
+ *
+ * Yellow shades:
+ *   marigold: #fbb32f
+ *   lemon_meringue: #fbec5d
+ *
+ * Blue shades:
+ *   cornflower_blue: #3f91f1
+ *   periwinkle_blue: #8ccdf0
+ *
+ * Magenta shades:
+ *   french_pink: #ec6c99
+ *   lavender: #e6a2f3
+ *
+ * Cyan shades:
+ *   zomp: #39a78d
+ *   seafoam_green: #00ff7f
+ */
+
+/* Style the UI: */
+
+/* Equivalent to Vim's Normal group. */
+.cm-s-abbott.CodeMirror {
+  background: #231c14 /* bistre */;
+  color: #d8ff84 /* pastel_chartreuse */;
+}
+
+/* Roughly equivalent to Vim's LineNr group. */
+.cm-s-abbott .CodeMirror-gutters {
+  background: #231c14 /* bistre */;
+  border: none;
+}
+.cm-s-abbott .CodeMirror-linenumber { color: #fbec5d /* lemon_meringue */; }
+
+.cm-s-abbott .CodeMirror-guttermarker { color: #f63f05 /* cinnabar */; }
+
+/* Roughly equivalent to Vim's FoldColumn group. */
+.cm-s-abbott .CodeMirror-guttermarker-subtle { color: #fbb32f /* marigold */; }
+
+/*
+ * Roughly equivalent to Vim's CursorColumn group. (We use a brighter color
+ * since Vim's cursorcolumn option highlights a whole column, whereas
+ * CodeMirror's rule just highlights a thin line.)
+ */
+.cm-s-abbott .CodeMirror-ruler { border-color: #745d42 /* cocoa */; }
+
+/* Equivalent to Vim's Cursor group in insert mode. */
+.cm-s-abbott .CodeMirror-cursor { border-color: #a0ea00 /* chartreuse */; }
+
+/* Equivalent to Vim's Cursor group in normal mode. */
+.cm-s-abbott.cm-fat-cursor .CodeMirror-cursor,
+.cm-s-abbott .cm-animate-fat-cursor {
+  /*
+   * CodeMirror doesn't allow changing the foreground color of the character
+   * under the cursor, so we can't use a reverse video effect for the cursor.
+   * Instead, make it semitransparent.
+   */
+  background: rgba(160, 234, 0, 0.5) /* chartreuse */;
+}
+.cm-s-abbott.cm-fat-cursor .CodeMirror-cursors {
+  /*
+   * Boost the z-index so the fat cursor shows up on top of text and
+   * matchingbracket/matchingtag highlights.
+   */
+  z-index: 3;
+}
+
+/* Equivalent to Vim's Cursor group in replace mode. */
+.cm-s-abbott .CodeMirror-overwrite .CodeMirror-cursor {
+  border-bottom: 1px solid #a0ea00 /* chartreuse */;
+  border-left: none;
+  width: auto;
+}
+
+/* Roughly equivalent to Vim's CursorIM group. */
+.cm-s-abbott .CodeMirror-secondarycursor {
+  border-color: #00ff7f /* seafoam_green */;
+}
+
+/* Roughly equivalent to Vim's Visual group. */
+.cm-s-abbott .CodeMirror-selected,
+.cm-s-abbott.CodeMirror-focused .CodeMirror-selected {
+  background: #273900 /* dark_olive */;
+}
+.cm-s-abbott .CodeMirror-line::selection,
+.cm-s-abbott .CodeMirror-line > span::selection,
+.cm-s-abbott .CodeMirror-line > span > span::selection {
+  background: #273900 /* dark_olive */;
+}
+.cm-s-abbott .CodeMirror-line::-moz-selection,
+.cm-s-abbott .CodeMirror-line > span::-moz-selection,
+.cm-s-abbott .CodeMirror-line > span > span::-moz-selection {
+  background: #273900 /* dark_olive */;
+}
+
+/* Roughly equivalent to Vim's SpecialKey group. */
+.cm-s-abbott .cm-tab { color: #00ff7f /* seafoam_green */; }
+
+/* Equivalent to Vim's Search group. */
+.cm-s-abbott .cm-searching {
+  background: #fef3b4 /* vanilla_cream */ !important;
+  color: #231c14 /* bistre */ !important;
+}
+
+/* Style syntax highlighting modes: */
+
+/* Equivalent to Vim's Comment group. */
+.cm-s-abbott span.cm-comment {
+  color: #fbb32f /* marigold */;
+  font-style: italic;
+}
+
+/* Equivalent to Vim's String group. */
+.cm-s-abbott span.cm-string,
+.cm-s-abbott span.cm-string-2 {
+  color: #e6a2f3 /* lavender */;
+}
+
+/* Equivalent to Vim's Constant group. */
+.cm-s-abbott span.cm-number,
+.cm-s-abbott span.cm-string.cm-url { color: #f63f05 /* cinnabar */; }
+
+/* Roughly equivalent to Vim's SpecialKey group. */
+.cm-s-abbott span.cm-invalidchar { color: #00ff7f /* seafoam_green */; }
+
+/* Equivalent to Vim's Special group. */
+.cm-s-abbott span.cm-atom { color: #fef3b4 /* vanilla_cream */; }
+
+/* Equivalent to Vim's Delimiter group. */
+.cm-s-abbott span.cm-bracket,
+.cm-s-abbott span.cm-punctuation {
+  color: #fef3b4 /* vanilla_cream */;
+}
+
+/* Equivalent Vim's Operator group. */
+.cm-s-abbott span.cm-operator { font-weight: bold; }
+
+/* Roughly equivalent to Vim's Identifier group. */
+.cm-s-abbott span.cm-def,
+.cm-s-abbott span.cm-variable,
+.cm-s-abbott span.cm-variable-2,
+.cm-s-abbott span.cm-variable-3 {
+  color: #8ccdf0 /* periwinkle_blue */;
+}
+
+/* Roughly equivalent to Vim's Function group. */
+.cm-s-abbott span.cm-builtin,
+.cm-s-abbott span.cm-property,
+.cm-s-abbott span.cm-qualifier {
+  color: #3f91f1 /* cornflower_blue */;
+}
+
+/* Equivalent to Vim's Type group. */
+.cm-s-abbott span.cm-type { color: #24a507 /* forest_green */; }
+
+/* Equivalent to Vim's Keyword group. */
+.cm-s-abbott span.cm-keyword {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's PreProc group. */
+.cm-s-abbott span.cm-meta { color: #ec6c99 /* french_pink */; }
+
+/* Equivalent to Vim's htmlTagName group (linked to Statement). */
+.cm-s-abbott span.cm-tag {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's htmlArg group (linked to Type). */
+.cm-s-abbott span.cm-attribute { color: #24a507 /* forest_green */; }
+
+/* Equivalent to Vim's htmlH1, markdownH1, etc. groups (linked to Title). */
+.cm-s-abbott span.cm-header {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's markdownRule group (linked to PreProc). */
+.cm-s-abbott span.cm-hr { color: #ec6c99 /* french_pink */; }
+
+/* Roughly equivalent to Vim's Underlined group. */
+.cm-s-abbott span.cm-link { color: #e6a2f3 /* lavender */; }
+
+/* Equivalent to Vim's diffRemoved group. */
+.cm-s-abbott span.cm-negative {
+  background: #d80450 /* crimson */;
+  color: #231c14 /* bistre */;
+}
+
+/* Equivalent to Vim's diffAdded group. */
+.cm-s-abbott span.cm-positive {
+  background: #a0ea00 /* chartreuse */;
+  color: #231c14 /* bistre */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's Error group. */
+.cm-s-abbott span.cm-error {
+  background: #d80450 /* crimson */;
+  color: #231c14 /* bistre */;
+}
+
+/* Style addons: */
+
+/* Equivalent to Vim's MatchParen group. */
+.cm-s-abbott span.CodeMirror-matchingbracket {
+  background: #745d42 /* cocoa */ !important;
+  color: #231c14 /* bistre */ !important;
+  font-weight: bold;
+}
+
+/*
+ * Roughly equivalent to Vim's Error group. (Vim doesn't seem to have a direct
+ * equivalent in its own matchparen plugin, but many syntax highlighting plugins
+ * mark mismatched brackets as Error.)
+ */
+.cm-s-abbott span.CodeMirror-nonmatchingbracket {
+  background: #d80450 /* crimson */ !important;
+  color: #231c14 /* bistre */ !important;
+}
+
+.cm-s-abbott .CodeMirror-matchingtag,
+.cm-s-abbott .cm-matchhighlight {
+  outline: 1px solid #39a78d /* zomp */;
+}
+
+/* Equivalent to Vim's CursorLine group. */
+.cm-s-abbott .CodeMirror-activeline-background,
+.cm-s-abbott .CodeMirror-activeline-gutter {
+  background: #3c3022 /* chocolate */;
+}
+
+/* Equivalent to Vim's CursorLineNr group. */
+.cm-s-abbott .CodeMirror-activeline-gutter .CodeMirror-linenumber {
+  color: #d8ff84 /* pastel_chartreuse */;
+  font-weight: bold;
+}
+
+/* Roughly equivalent to Vim's Folded group. */
+.cm-s-abbott .CodeMirror-foldmarker {
+  color: #f63f05 /* cinnabar */;
+  text-shadow: none;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/abcdef.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/abcdef.css
new file mode 100644
index 0000000000000..cf93530946b49
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/abcdef.css
@@ -0,0 +1,32 @@
+.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
+.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
+.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
+.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
+.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
+.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
+.cm-s-abcdef span.cm-atom { color: #77F; }
+.cm-s-abcdef span.cm-number { color: violet; }
+.cm-s-abcdef span.cm-def { color: #fffabc; }
+.cm-s-abcdef span.cm-variable { color: #abcdef; }
+.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
+.cm-s-abcdef span.cm-property { color: #fedcba; }
+.cm-s-abcdef span.cm-operator { color: #ff0; }
+.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
+.cm-s-abcdef span.cm-string { color: #2b4; }
+.cm-s-abcdef span.cm-meta { color: #C9F; }
+.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
+.cm-s-abcdef span.cm-builtin { color: #30aabc; }
+.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
+.cm-s-abcdef span.cm-tag { color: #FFDD44; }
+.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
+.cm-s-abcdef span.cm-error { color: #FF0000; }
+.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
+.cm-s-abcdef span.cm-link { color: blueviolet; }
+
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance-mobile.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance-mobile.css
new file mode 100644
index 0000000000000..88d332e1a79c7
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance-mobile.css
@@ -0,0 +1,5 @@
+.cm-s-ambiance.CodeMirror {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance.css
new file mode 100644
index 0000000000000..782fca43f5275
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ambiance.css
@@ -0,0 +1,74 @@
+/* ambiance theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-ambiance .cm-header { color: blue; }
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
+.cm-s-ambiance .cm-keyword { color: #cda869; }
+.cm-s-ambiance .cm-atom { color: #CF7EA9; }
+.cm-s-ambiance .cm-number { color: #78CF8A; }
+.cm-s-ambiance .cm-def { color: #aac6e3; }
+.cm-s-ambiance .cm-variable { color: #ffb795; }
+.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
+.cm-s-ambiance .cm-property { color: #eed1b3; }
+.cm-s-ambiance .cm-operator { color: #fa8d6a; }
+.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
+.cm-s-ambiance .cm-string { color: #8f9d6a; }
+.cm-s-ambiance .cm-string-2 { color: #9d937c; }
+.cm-s-ambiance .cm-meta { color: #D2A8A1; }
+.cm-s-ambiance .cm-qualifier { color: yellow; }
+.cm-s-ambiance .cm-builtin { color: #9999cc; }
+.cm-s-ambiance .cm-bracket { color: #24C2C7; }
+.cm-s-ambiance .cm-tag { color: #fee4ff; }
+.cm-s-ambiance .cm-attribute { color: #9B859D; }
+.cm-s-ambiance .cm-hr { color: pink; }
+.cm-s-ambiance .cm-link { color: #F4C20B; }
+.cm-s-ambiance .cm-special { color: #FF9D00; }
+.cm-s-ambiance .cm-error { color: #AF2018; }
+
+.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
+.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
+
+.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+/* Editor styling */
+
+.cm-s-ambiance.CodeMirror {
+  line-height: 1.40em;
+  color: #E6E1DC;
+  background-color: #202020;
+  -webkit-box-shadow: inset 0 0 10px black;
+  -moz-box-shadow: inset 0 0 10px black;
+  box-shadow: inset 0 0 10px black;
+}
+
+.cm-s-ambiance .CodeMirror-gutters {
+  background: #3D3D3D;
+  border-right: 1px solid #4D4D4D;
+  box-shadow: 0 10px 20px black;
+}
+
+.cm-s-ambiance .CodeMirror-linenumber {
+  text-shadow: 0px 1px 1px #4d4d4d;
+  color: #111;
+  padding: 0 5px;
+}
+
+.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
+.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
+
+.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
+
+.cm-s-ambiance .CodeMirror-activeline-background {
+  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
+}
+
+.cm-s-ambiance.CodeMirror,
+.cm-s-ambiance .CodeMirror-gutters {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-dark.css
new file mode 100644
index 0000000000000..13656b94bbf8a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-dark.css
@@ -0,0 +1,44 @@
+/* Based on https://github.com/dempfi/ayu */
+
+.cm-s-ayu-dark.CodeMirror { background: #0a0e14; color: #b3b1ad; }
+.cm-s-ayu-dark div.CodeMirror-selected { background: #273747; }
+.cm-s-ayu-dark .CodeMirror-line::selection, .cm-s-ayu-dark .CodeMirror-line > span::selection, .cm-s-ayu-dark .CodeMirror-line > span > span::selection { background: rgba(39, 55, 71, 99); }
+.cm-s-ayu-dark .CodeMirror-line::-moz-selection, .cm-s-ayu-dark .CodeMirror-line > span::-moz-selection, .cm-s-ayu-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 55, 71, 99); }
+.cm-s-ayu-dark .CodeMirror-gutters { background: #0a0e14; border-right: 0px; }
+.cm-s-ayu-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-ayu-dark .CodeMirror-guttermarker-subtle { color: #3d424d; }
+.cm-s-ayu-dark .CodeMirror-linenumber { color: #3d424d; }
+.cm-s-ayu-dark .CodeMirror-cursor { border-left: 1px solid #e6b450; }
+.cm-s-ayu-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
+
+.cm-s-ayu-dark span.cm-comment { color: #626a73; }
+.cm-s-ayu-dark span.cm-atom { color: #ae81ff; }
+.cm-s-ayu-dark span.cm-number { color: #e6b450; }
+
+.cm-s-ayu-dark span.cm-comment.cm-attribute { color: #ffb454; }
+.cm-s-ayu-dark span.cm-comment.cm-def { color: rgba(57, 186, 230, 80); }
+.cm-s-ayu-dark span.cm-comment.cm-tag { color: #39bae6; }
+.cm-s-ayu-dark span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-ayu-dark span.cm-property, .cm-s-ayu-dark span.cm-attribute { color: #ffb454; }  
+.cm-s-ayu-dark span.cm-keyword { color: #ff8f40; } 
+.cm-s-ayu-dark span.cm-builtin { color: #e6b450; }
+.cm-s-ayu-dark span.cm-string { color: #c2d94c; }
+
+.cm-s-ayu-dark span.cm-variable { color: #b3b1ad; }
+.cm-s-ayu-dark span.cm-variable-2 { color: #f07178; }
+.cm-s-ayu-dark span.cm-variable-3 { color: #39bae6; }
+.cm-s-ayu-dark span.cm-type { color: #ff8f40; }
+.cm-s-ayu-dark span.cm-def { color: #ffee99; }
+.cm-s-ayu-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-ayu-dark span.cm-tag { color: rgba(57, 186, 230, 80); }
+.cm-s-ayu-dark span.cm-header { color: #c2d94c; }
+.cm-s-ayu-dark span.cm-link { color: #39bae6; }
+.cm-s-ayu-dark span.cm-error { color: #ff3333; } 
+
+.cm-s-ayu-dark .CodeMirror-activeline-background { background: #01060e; }
+.cm-s-ayu-dark .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-mirage.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-mirage.css
new file mode 100644
index 0000000000000..19403cefb57cb
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ayu-mirage.css
@@ -0,0 +1,45 @@
+/* Based on https://github.com/dempfi/ayu */
+
+.cm-s-ayu-mirage.CodeMirror { background: #1f2430; color: #cbccc6; }
+.cm-s-ayu-mirage div.CodeMirror-selected { background: #34455a; }
+.cm-s-ayu-mirage .CodeMirror-line::selection, .cm-s-ayu-mirage .CodeMirror-line > span::selection, .cm-s-ayu-mirage .CodeMirror-line > span > span::selection { background: #34455a; }
+.cm-s-ayu-mirage .CodeMirror-line::-moz-selection, .cm-s-ayu-mirage .CodeMirror-line > span::-moz-selection, .cm-s-ayu-mirage .CodeMirror-line > span > span::-moz-selection { background: rgba(25, 30, 42, 99); }
+.cm-s-ayu-mirage .CodeMirror-gutters { background: #1f2430; border-right: 0px; }
+.cm-s-ayu-mirage .CodeMirror-guttermarker { color: white; }
+.cm-s-ayu-mirage .CodeMirror-guttermarker-subtle { color:  rgba(112, 122, 140, 66); }
+.cm-s-ayu-mirage .CodeMirror-linenumber { color: rgba(61, 66, 77, 99); }
+.cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66;  }
+.cm-s-ayu-mirage.cm-fat-cursor .CodeMirror-cursor {background-color: #a2a8a175 !important;}
+.cm-s-ayu-mirage .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
+
+.cm-s-ayu-mirage span.cm-comment { color: #5c6773; font-style:italic; }
+.cm-s-ayu-mirage span.cm-atom { color: #ae81ff; }
+.cm-s-ayu-mirage span.cm-number { color: #ffcc66; }
+
+.cm-s-ayu-mirage span.cm-comment.cm-attribute { color: #ffd580; }
+.cm-s-ayu-mirage span.cm-comment.cm-def { color: #d4bfff; }
+.cm-s-ayu-mirage span.cm-comment.cm-tag { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-ayu-mirage span.cm-property { color: #f29e74; }
+.cm-s-ayu-mirage span.cm-attribute { color: #ffd580; }  
+.cm-s-ayu-mirage span.cm-keyword { color: #ffa759; } 
+.cm-s-ayu-mirage span.cm-builtin { color: #ffcc66; }
+.cm-s-ayu-mirage span.cm-string { color: #bae67e; }
+
+.cm-s-ayu-mirage span.cm-variable { color: #cbccc6; }
+.cm-s-ayu-mirage span.cm-variable-2 { color: #f28779; }
+.cm-s-ayu-mirage span.cm-variable-3 { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-type { color: #ffa759; }
+.cm-s-ayu-mirage span.cm-def { color: #ffd580; }
+.cm-s-ayu-mirage span.cm-bracket { color: rgba(92, 207, 230, 80); }
+.cm-s-ayu-mirage span.cm-tag { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-header { color: #bae67e; }
+.cm-s-ayu-mirage span.cm-link { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-error { color: #ff3333; } 
+
+.cm-s-ayu-mirage .CodeMirror-activeline-background { background: #191e2a; }
+.cm-s-ayu-mirage .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-dark.css
new file mode 100644
index 0000000000000..b3c31aba20b97
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-dark.css
@@ -0,0 +1,40 @@
+/*
+
+    Name:       Base16 Default Dark
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
+.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
+.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
+.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
+.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+.cm-s-base16-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
+
+.cm-s-base16-dark span.cm-comment { color: #8f5536; }
+.cm-s-base16-dark span.cm-atom { color: #aa759f; }
+.cm-s-base16-dark span.cm-number { color: #aa759f; }
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
+.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
+.cm-s-base16-dark span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-dark span.cm-variable { color: #90a959; }
+.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-dark span.cm-def { color: #d28445; }
+.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
+.cm-s-base16-dark span.cm-tag { color: #ac4142; }
+.cm-s-base16-dark span.cm-link { color: #aa759f; }
+.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
+
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-light.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-light.css
new file mode 100644
index 0000000000000..1d5f582f6a987
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/base16-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Light
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
+.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
+.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
+
+.cm-s-base16-light span.cm-comment { color: #8f5536; }
+.cm-s-base16-light span.cm-atom { color: #aa759f; }
+.cm-s-base16-light span.cm-number { color: #aa759f; }
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
+.cm-s-base16-light span.cm-keyword { color: #ac4142; }
+.cm-s-base16-light span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-light span.cm-variable { color: #90a959; }
+.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-light span.cm-def { color: #d28445; }
+.cm-s-base16-light span.cm-bracket { color: #202020; }
+.cm-s-base16-light span.cm-tag { color: #ac4142; }
+.cm-s-base16-light span.cm-link { color: #aa759f; }
+.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
+
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-matchingbracket { color: #f5f5f5 !important; background-color: #6A9FB5 !important}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/bespin.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/bespin.css
new file mode 100644
index 0000000000000..3fd3d93a5aba2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/bespin.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Bespin
+    Author:     Mozilla / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
+.cm-s-bespin div.CodeMirror-selected {background: #59554f !important;}
+.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
+.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
+.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
+
+.cm-s-bespin span.cm-comment {color: #937121;}
+.cm-s-bespin span.cm-atom {color: #9b859d;}
+.cm-s-bespin span.cm-number {color: #9b859d;}
+
+.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
+.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
+.cm-s-bespin span.cm-string {color: #f9ee98;}
+
+.cm-s-bespin span.cm-variable {color: #54be0d;}
+.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
+.cm-s-bespin span.cm-def {color: #cf7d34;}
+.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
+.cm-s-bespin span.cm-bracket {color: #9d9b97;}
+.cm-s-bespin span.cm-tag {color: #cf6a4c;}
+.cm-s-bespin span.cm-link {color: #9b859d;}
+
+.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/blackboard.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/blackboard.css
new file mode 100644
index 0000000000000..b6eaedb18014c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/blackboard.css
@@ -0,0 +1,32 @@
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/cobalt.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/cobalt.css
new file mode 100644
index 0000000000000..bbbda3b54382a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/cobalt.css
@@ -0,0 +1,25 @@
+.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
+.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
+.cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/colorforth.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/colorforth.css
new file mode 100644
index 0000000000000..19095e41d98cc
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/colorforth.css
@@ -0,0 +1,33 @@
+.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
+.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
+.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-colorforth span.cm-comment     { color: #ededed; }
+.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
+.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
+.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
+.cm-s-colorforth span.cm-variable    { color: #73ff00; }
+.cm-s-colorforth span.cm-string      { color: #007bff; }
+.cm-s-colorforth span.cm-number      { color: #00c4ff; }
+.cm-s-colorforth span.cm-atom        { color: #606060; }
+
+.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
+.cm-s-colorforth span.cm-property    {}
+.cm-s-colorforth span.cm-operator    {}
+
+.cm-s-colorforth span.cm-meta        { color: yellow; }
+.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
+.cm-s-colorforth span.cm-bracket     { color: #cc7; }
+.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
+.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
+.cm-s-colorforth span.cm-error       { color: #f00; }
+
+.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
+
+.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
+
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/darcula.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/darcula.css
new file mode 100644
index 0000000000000..2ec81a3557443
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/darcula.css
@@ -0,0 +1,53 @@
+/**
+    Name: IntelliJ IDEA darcula theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-darcula  { font-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif;}
+.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
+
+.cm-s-darcula span.cm-meta { color: #BBB529; }
+.cm-s-darcula span.cm-number { color: #6897BB; }
+.cm-s-darcula span.cm-keyword { color: #CC7832; line-height: 1em; font-weight: bold; }
+.cm-s-darcula span.cm-def { color: #A9B7C6; font-style: italic; }
+.cm-s-darcula span.cm-variable { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-2 { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-3 { color: #9876AA; }
+.cm-s-darcula span.cm-type { color: #AABBCC; font-weight: bold; }
+.cm-s-darcula span.cm-property { color: #FFC66D; }
+.cm-s-darcula span.cm-operator { color: #A9B7C6; }
+.cm-s-darcula span.cm-string { color: #6A8759; }
+.cm-s-darcula span.cm-string-2 { color: #6A8759; }
+.cm-s-darcula span.cm-comment { color: #61A151; font-style: italic; }
+.cm-s-darcula span.cm-link { color: #CC7832; }
+.cm-s-darcula span.cm-atom { color: #CC7832; }
+.cm-s-darcula span.cm-error { color: #BC3F3C; }
+.cm-s-darcula span.cm-tag { color: #629755; font-weight: bold; font-style: italic; text-decoration: underline; }
+.cm-s-darcula span.cm-attribute { color: #6897bb; }
+.cm-s-darcula span.cm-qualifier { color: #6A8759; }
+.cm-s-darcula span.cm-bracket { color: #A9B7C6; }
+.cm-s-darcula span.cm-builtin { color: #FF9E59; }
+.cm-s-darcula span.cm-special { color: #FF9E59; }
+.cm-s-darcula span.cm-matchhighlight { color: #FFFFFF; background-color: rgba(50, 89, 48, .7); font-weight: normal;}
+.cm-s-darcula span.cm-searching { color: #FFFFFF; background-color: rgba(61, 115, 59, .7); font-weight: normal;}
+
+.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #A9B7C6; }
+.cm-s-darcula .CodeMirror-activeline-background { background: #323232; }
+.cm-s-darcula .CodeMirror-gutters { background: #313335; border-right: 1px solid #313335; }
+.cm-s-darcula .CodeMirror-guttermarker { color: #FFEE80; }
+.cm-s-darcula .CodeMirror-guttermarker-subtle { color: #D0D0D0; }
+.cm-s-darcula .CodeMirrir-linenumber { color: #606366; }
+.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3B514D; color: #FFEF28 !important; font-weight: bold; }
+
+.cm-s-darcula div.CodeMirror-selected { background: #214283; }
+
+.CodeMirror-hints.darcula {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  color: #9C9E9E;
+  background-color: #3B3E3F !important;
+}
+
+.CodeMirror-hints.darcula .CodeMirror-hint-active {
+  background-color: #494D4E !important;
+  color: #9C9E9E !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/dracula.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/dracula.css
new file mode 100644
index 0000000000000..253133efe7929
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/dracula.css
@@ -0,0 +1,40 @@
+/*
+
+    Name:       dracula
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
+
+*/
+
+
+.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
+  background-color: #282a36 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-dracula .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula span.cm-comment { color: #6272a4; }
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
+.cm-s-dracula span.cm-number { color: #bd93f9; }
+.cm-s-dracula span.cm-variable { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-2 { color: white; }
+.cm-s-dracula span.cm-def { color: #50fa7b; }
+.cm-s-dracula span.cm-operator { color: #ff79c6; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-atom { color: #bd93f9; }
+.cm-s-dracula span.cm-meta { color: #f8f8f2; }
+.cm-s-dracula span.cm-tag { color: #ff79c6; }
+.cm-s-dracula span.cm-attribute { color: #50fa7b; }
+.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
+.cm-s-dracula span.cm-property { color: #66d9ef; }
+.cm-s-dracula span.cm-builtin { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
+
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-dark.css
new file mode 100644
index 0000000000000..5373178e8d717
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-dark.css
@@ -0,0 +1,35 @@
+/*
+Name:   DuoTone-Dark
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-dark.CodeMirror { background: #2a2734; color: #6c6783; }
+.cm-s-duotone-dark div.CodeMirror-selected { background: #545167!important; }
+.cm-s-duotone-dark .CodeMirror-gutters { background: #2a2734; border-right: 0px; }
+.cm-s-duotone-dark .CodeMirror-linenumber { color: #545167; }
+
+/* begin cursor */
+.cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
+.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
+.cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
+/* end cursor */
+
+.cm-s-duotone-dark span.cm-atom, .cm-s-duotone-dark span.cm-number, .cm-s-duotone-dark span.cm-keyword, .cm-s-duotone-dark span.cm-variable, .cm-s-duotone-dark span.cm-attribute, .cm-s-duotone-dark span.cm-quote, .cm-s-duotone-dark span.cm-hr, .cm-s-duotone-dark span.cm-link { color: #ffcc99; }
+
+.cm-s-duotone-dark span.cm-property { color: #9a86fd; }
+.cm-s-duotone-dark span.cm-punctuation, .cm-s-duotone-dark span.cm-unit, .cm-s-duotone-dark span.cm-negative { color: #e09142; }
+.cm-s-duotone-dark span.cm-string { color: #ffb870; }
+.cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
+.cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
+
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
+.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #a7a5b2; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-dark span.cm-header { font-weight: normal; }
+.cm-s-duotone-dark .CodeMirror-matchingbracket { text-decoration: underline; color: #eeebff !important; } 
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-light.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-light.css
new file mode 100644
index 0000000000000..a0a0b8336e8a6
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/duotone-light.css
@@ -0,0 +1,36 @@
+/*
+Name:   DuoTone-Light
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-light.CodeMirror { background: #faf8f5; color: #b29762; }
+.cm-s-duotone-light div.CodeMirror-selected { background: #e3dcce !important; }
+.cm-s-duotone-light .CodeMirror-gutters { background: #faf8f5; border-right: 0px; }
+.cm-s-duotone-light .CodeMirror-linenumber { color: #cdc4b1; }
+
+/* begin cursor */
+.cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
+.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
+.cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
+/* end cursor */
+
+.cm-s-duotone-light span.cm-atom, .cm-s-duotone-light span.cm-number, .cm-s-duotone-light span.cm-keyword, .cm-s-duotone-light span.cm-variable, .cm-s-duotone-light span.cm-attribute, .cm-s-duotone-light span.cm-quote, .cm-s-duotone-light-light span.cm-hr, .cm-s-duotone-light-light span.cm-link { color: #063289; }
+
+.cm-s-duotone-light span.cm-property { color: #b29762; }
+.cm-s-duotone-light span.cm-punctuation, .cm-s-duotone-light span.cm-unit, .cm-s-duotone-light span.cm-negative { color: #063289; }
+.cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
+.cm-s-duotone-light span.cm-positive { color: #896724; }
+
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
+.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #6f6e6a; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+/* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */
+.cm-s-duotone-light span.cm-error, .cm-s-duotone-light span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-light span.cm-header { font-weight: normal; }
+.cm-s-duotone-light .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
+
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/eclipse.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/eclipse.css
new file mode 100644
index 0000000000000..800d603f6d4fc
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/eclipse.css
@@ -0,0 +1,23 @@
+.cm-s-eclipse span.cm-meta { color: #FF1717; }
+.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom { color: #219; }
+.cm-s-eclipse span.cm-number { color: #164; }
+.cm-s-eclipse span.cm-def { color: #00f; }
+.cm-s-eclipse span.cm-variable { color: black; }
+.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
+.cm-s-eclipse span.cm-property { color: black; }
+.cm-s-eclipse span.cm-operator { color: black; }
+.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
+.cm-s-eclipse span.cm-string { color: #2A00FF; }
+.cm-s-eclipse span.cm-string-2 { color: #f50; }
+.cm-s-eclipse span.cm-qualifier { color: #555; }
+.cm-s-eclipse span.cm-builtin { color: #30a; }
+.cm-s-eclipse span.cm-bracket { color: #cc7; }
+.cm-s-eclipse span.cm-tag { color: #170; }
+.cm-s-eclipse span.cm-attribute { color: #00c; }
+.cm-s-eclipse span.cm-link { color: #219; }
+.cm-s-eclipse span.cm-error { color: #f00; }
+
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/elegant.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/elegant.css
new file mode 100644
index 0000000000000..45b3ea655e803
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/elegant.css
@@ -0,0 +1,13 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
+.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-variable { color: black; }
+.cm-s-elegant span.cm-variable-2 { color: #b11; }
+.cm-s-elegant span.cm-qualifier { color: #555; }
+.cm-s-elegant span.cm-keyword { color: #730; }
+.cm-s-elegant span.cm-builtin { color: #30a; }
+.cm-s-elegant span.cm-link { color: #762; }
+.cm-s-elegant span.cm-error { background-color: #fdd; }
+
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/erlang-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/erlang-dark.css
new file mode 100644
index 0000000000000..8c8a4171a6079
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/erlang-dark.css
@@ -0,0 +1,34 @@
+.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
+.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
+.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
+.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
+.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
+.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
+.cm-s-erlang-dark span.cm-comment    { color: #77f; }
+.cm-s-erlang-dark span.cm-def        { color: #e7a; }
+.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
+.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
+.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
+.cm-s-erlang-dark span.cm-operator   { color: #d55; }
+.cm-s-erlang-dark span.cm-property   { color: #ccc; }
+.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
+.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
+.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
+.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
+.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
+.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
+
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/gruvbox-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/gruvbox-dark.css
new file mode 100644
index 0000000000000..d712dda08df2d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/gruvbox-dark.css
@@ -0,0 +1,39 @@
+/*
+
+    Name:       gruvbox-dark
+    Author:     kRkk (https://github.com/krkk)
+
+    Original gruvbox color scheme by Pavel Pertsev (https://github.com/morhetz/gruvbox)
+
+*/
+
+.cm-s-gruvbox-dark.CodeMirror, .cm-s-gruvbox-dark .CodeMirror-gutters { background-color: #282828; color: #bdae93; }
+.cm-s-gruvbox-dark .CodeMirror-gutters {background: #282828; border-right: 0px;}
+.cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
+.cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
+.cm-s-gruvbox-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
+.cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
+.cm-s-gruvbox-dark span.cm-meta { color: #83a598; }
+
+.cm-s-gruvbox-dark span.cm-comment { color: #928374; }
+.cm-s-gruvbox-dark span.cm-number, span.cm-atom { color: #d3869b; }
+.cm-s-gruvbox-dark span.cm-keyword { color: #f84934; }
+
+.cm-s-gruvbox-dark span.cm-variable { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-2 { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-3, .cm-s-gruvbox-dark span.cm-type { color: #fabd2f; }
+.cm-s-gruvbox-dark span.cm-operator { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-callee { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-def { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-property { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-string { color: #b8bb26; }
+.cm-s-gruvbox-dark span.cm-string-2 { color: #8ec07c; }
+.cm-s-gruvbox-dark span.cm-qualifier { color: #8ec07c; }
+.cm-s-gruvbox-dark span.cm-attribute { color: #8ec07c; }
+
+.cm-s-gruvbox-dark .CodeMirror-activeline-background { background: #3c3836; }
+.cm-s-gruvbox-dark .CodeMirror-matchingbracket { background: #928374; color:#282828 !important; }
+
+.cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
+.cm-s-gruvbox-dark span.cm-tag { color: #fe8019; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/hopscotch.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/hopscotch.css
new file mode 100644
index 0000000000000..7d05431bdcd7e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/hopscotch.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Hopscotch
+    Author:     Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
+.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
+.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
+.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
+.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
+
+.cm-s-hopscotch span.cm-comment {color: #b33508;}
+.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
+.cm-s-hopscotch span.cm-number {color: #c85e7c;}
+
+.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
+.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
+.cm-s-hopscotch span.cm-string {color: #fdcc59;}
+
+.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
+.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
+.cm-s-hopscotch span.cm-def {color: #fd8b19;}
+.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
+.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
+.cm-s-hopscotch span.cm-tag {color: #dd464c;}
+.cm-s-hopscotch span.cm-link {color: #c85e7c;}
+
+.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/icecoder.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/icecoder.css
new file mode 100644
index 0000000000000..5440fbe27c85c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/icecoder.css
@@ -0,0 +1,43 @@
+/*
+ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
+*/
+
+.cm-s-icecoder { color: #666; background: #1d1d1b; }
+
+.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
+.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
+.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
+
+.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
+
+.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
+.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
+
+.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
+.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
+
+.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
+
+.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
+.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
+.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
+
+.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
+
+.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
+.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
+.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
+.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
+
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
+.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
+.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/idea.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/idea.css
new file mode 100644
index 0000000000000..eab36717ad2a5
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/idea.css
@@ -0,0 +1,42 @@
+/**
+    Name:       IDEA default theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-idea span.cm-meta { color: #808000; }
+.cm-s-idea span.cm-number { color: #0000FF; }
+.cm-s-idea span.cm-keyword { line-height: 1em; font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-atom { font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-def { color: #000000; }
+.cm-s-idea span.cm-variable { color: black; }
+.cm-s-idea span.cm-variable-2 { color: black; }
+.cm-s-idea span.cm-variable-3, .cm-s-idea span.cm-type { color: black; }
+.cm-s-idea span.cm-property { color: black; }
+.cm-s-idea span.cm-operator { color: black; }
+.cm-s-idea span.cm-comment { color: #808080; }
+.cm-s-idea span.cm-string { color: #008000; }
+.cm-s-idea span.cm-string-2 { color: #008000; }
+.cm-s-idea span.cm-qualifier { color: #555; }
+.cm-s-idea span.cm-error { color: #FF0000; }
+.cm-s-idea span.cm-attribute { color: #0000FF; }
+.cm-s-idea span.cm-tag { color: #000080; }
+.cm-s-idea span.cm-link { color: #0000FF; }
+.cm-s-idea .CodeMirror-activeline-background { background: #FFFAE3; }
+
+.cm-s-idea span.cm-builtin { color: #30a; }
+.cm-s-idea span.cm-bracket { color: #cc7; }
+.cm-s-idea  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+
+
+.cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
+
+.CodeMirror-hints.idea {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  color: #616569;
+  background-color: #ebf3fd !important;
+}
+
+.CodeMirror-hints.idea .CodeMirror-hint-active {
+  background-color: #a2b8c9 !important;
+  color: #5c6065 !important;
+}
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/isotope.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/isotope.css
new file mode 100644
index 0000000000000..d0d6263cf4e48
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/isotope.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Isotope
+    Author:     David Desandro / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
+.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
+.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
+.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
+
+.cm-s-isotope span.cm-comment {color: #3300ff;}
+.cm-s-isotope span.cm-atom {color: #cc00ff;}
+.cm-s-isotope span.cm-number {color: #cc00ff;}
+
+.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
+.cm-s-isotope span.cm-keyword {color: #ff0000;}
+.cm-s-isotope span.cm-string {color: #ff0099;}
+
+.cm-s-isotope span.cm-variable {color: #33ff00;}
+.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
+.cm-s-isotope span.cm-def {color: #ff9900;}
+.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
+.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
+.cm-s-isotope span.cm-tag {color: #ff0000;}
+.cm-s-isotope span.cm-link {color: #cc00ff;}
+
+.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/juejin.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/juejin.css
new file mode 100644
index 0000000000000..38cf7fe37336d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/juejin.css
@@ -0,0 +1,30 @@
+.cm-s-juejin.CodeMirror {
+  background: #f8f9fa;
+}
+.cm-s-juejin .cm-header,
+.cm-s-juejin .cm-def {
+  color: #1ba2f0;
+}
+.cm-s-juejin .cm-comment {
+  color: #009e9d;
+}
+.cm-s-juejin .cm-quote,
+.cm-s-juejin .cm-link,
+.cm-s-juejin .cm-strong,
+.cm-s-juejin .cm-attribute {
+  color: #fd7741;
+}
+.cm-s-juejin .cm-url,
+.cm-s-juejin .cm-keyword,
+.cm-s-juejin .cm-builtin {
+  color: #bb51b8;
+}
+.cm-s-juejin .cm-hr {
+  color: #909090;
+}
+.cm-s-juejin .cm-tag {
+  color: #107000;
+}
+.cm-s-juejin .cm-variable-2 {
+  color: #0050a0;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/lesser-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/lesser-dark.css
new file mode 100644
index 0000000000000..f96bf430c2af7
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/lesser-dark.css
@@ -0,0 +1,47 @@
+/*
+http://lesscss.org/ dark theme
+Ported to CodeMirror by Peter Kroon
+*/
+.cm-s-lesser-dark {
+  line-height: 1.3em;
+}
+.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
+.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
+.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
+
+.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
+
+.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
+.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
+.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
+
+.cm-s-lesser-dark span.cm-header { color: #a0a; }
+.cm-s-lesser-dark span.cm-quote { color: #090; }
+.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
+.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
+.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
+.cm-s-lesser-dark span.cm-def { color: white; }
+.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
+.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
+.cm-s-lesser-dark span.cm-property { color: #92A75C; }
+.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
+.cm-s-lesser-dark span.cm-comment { color: #666; }
+.cm-s-lesser-dark span.cm-string { color: #BCD279; }
+.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
+.cm-s-lesser-dark span.cm-meta { color: #738C73; }
+.cm-s-lesser-dark span.cm-qualifier { color: #555; }
+.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
+.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
+.cm-s-lesser-dark span.cm-tag { color: #669199; }
+.cm-s-lesser-dark span.cm-attribute { color: #81a4d5; }
+.cm-s-lesser-dark span.cm-hr { color: #999; }
+.cm-s-lesser-dark span.cm-link { color: #7070E6; }
+.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
+
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/liquibyte.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/liquibyte.css
new file mode 100644
index 0000000000000..393825e0296a3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/liquibyte.css
@@ -0,0 +1,95 @@
+.cm-s-liquibyte.CodeMirror {
+	background-color: #000;
+	color: #fff;
+	line-height: 1.2em;
+	font-size: 1em;
+}
+.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
+	text-decoration: underline;
+	text-decoration-color: #0f0;
+	text-decoration-style: wavy;
+}
+.cm-s-liquibyte .cm-trailingspace {
+	text-decoration: line-through;
+	text-decoration-color: #f00;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .cm-tab {
+	text-decoration: line-through;
+	text-decoration-color: #404040;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
+.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
+.cm-s-liquibyte .CodeMirror-guttermarker {  }
+.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
+.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
+.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
+
+.cm-s-liquibyte span.cm-comment     { color: #008000; }
+.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-string      { color: #ff8000; }
+.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
+
+.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
+.cm-s-liquibyte span.cm-operator    { color: #fff; }
+
+.cm-s-liquibyte span.cm-meta        { color: #0f0; }
+.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
+.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
+.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
+.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-error       { color: #f00; }
+
+.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
+
+.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
+
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
+
+/* Default styles for common addons */
+.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
+.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
+/* Scrollbars */
+/* Simple */
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
+	background-color: rgba(80, 80, 80, .7);
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	background-color: rgba(80, 80, 80, .3);
+	border: 1px solid #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	border-top: 1px solid #404040;
+	border-bottom: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
+	border-left: 1px solid #404040;
+	border-right: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
+	background-color: #262626;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
+	background-color: #262626;
+	border-top: 1px solid #404040;
+}
+/* Overlay */
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+	background-color: #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
+	border: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
+	border: 1px solid #404040;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/lucario.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/lucario.css
new file mode 100644
index 0000000000000..17a1551032f9f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/lucario.css
@@ -0,0 +1,37 @@
+/*
+  Name:       lucario
+  Author:     Raphael Amorim
+
+  Original Lucario color scheme (https://github.com/raphamorim/lucario)
+*/
+
+.cm-s-lucario.CodeMirror, .cm-s-lucario .CodeMirror-gutters {
+  background-color: #2b3e50 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-lucario .CodeMirror-gutters { color: #2b3e50; }
+.cm-s-lucario .CodeMirror-cursor { border-left: solid thin #E6C845; }
+.cm-s-lucario .CodeMirror-linenumber { color: #f8f8f2; }
+.cm-s-lucario .CodeMirror-selected { background: #243443; }
+.cm-s-lucario .CodeMirror-line::selection, .cm-s-lucario .CodeMirror-line > span::selection, .cm-s-lucario .CodeMirror-line > span > span::selection { background: #243443; }
+.cm-s-lucario .CodeMirror-line::-moz-selection, .cm-s-lucario .CodeMirror-line > span::-moz-selection, .cm-s-lucario .CodeMirror-line > span > span::-moz-selection { background: #243443; }
+.cm-s-lucario span.cm-comment { color: #5c98cd; }
+.cm-s-lucario span.cm-string, .cm-s-lucario span.cm-string-2 { color: #E6DB74; }
+.cm-s-lucario span.cm-number { color: #ca94ff; }
+.cm-s-lucario span.cm-variable { color: #f8f8f2; }
+.cm-s-lucario span.cm-variable-2 { color: #f8f8f2; }
+.cm-s-lucario span.cm-def { color: #72C05D; }
+.cm-s-lucario span.cm-operator { color: #66D9EF; }
+.cm-s-lucario span.cm-keyword { color: #ff6541; }
+.cm-s-lucario span.cm-atom { color: #bd93f9; }
+.cm-s-lucario span.cm-meta { color: #f8f8f2; }
+.cm-s-lucario span.cm-tag { color: #ff6541; }
+.cm-s-lucario span.cm-attribute { color: #66D9EF; }
+.cm-s-lucario span.cm-qualifier { color: #72C05D; }
+.cm-s-lucario span.cm-property { color: #f8f8f2; }
+.cm-s-lucario span.cm-builtin { color: #72C05D; }
+.cm-s-lucario span.cm-variable-3, .cm-s-lucario span.cm-type { color: #ffb86c; }
+
+.cm-s-lucario .CodeMirror-activeline-background { background: #243443; }
+.cm-s-lucario .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-darker.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-darker.css
new file mode 100644
index 0000000000000..45b64efb252eb
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-darker.css
@@ -0,0 +1,135 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-darker.CodeMirror {
+  background-color: #212121;
+  color: #EEFFFF;
+}
+
+.cm-s-material-darker .CodeMirror-gutters {
+  background: #212121;
+  color: #545454;
+  border: none;
+}
+
+.cm-s-material-darker .CodeMirror-guttermarker,
+.cm-s-material-darker .CodeMirror-guttermarker-subtle,
+.cm-s-material-darker .CodeMirror-linenumber {
+  color: #545454;
+}
+
+.cm-s-material-darker .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-material-darker div.CodeMirror-selected {
+  background: rgba(97, 97, 97, 0.2);
+}
+
+.cm-s-material-darker.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(97, 97, 97, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-line::selection,
+.cm-s-material-darker .CodeMirror-line>span::selection,
+.cm-s-material-darker .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-line::-moz-selection,
+.cm-s-material-darker .CodeMirror-line>span::-moz-selection,
+.cm-s-material-darker .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-darker .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-darker .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-darker .cm-variable-3,
+.cm-s-material-darker .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-darker .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-darker .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-darker .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-darker .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-darker .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-comment {
+  color: #545454;
+}
+
+.cm-s-material-darker .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-darker .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-darker .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-darker .cm-variable-3,
+.cm-s-material-darker .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-darker .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-darker .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-ocean.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-ocean.css
new file mode 100644
index 0000000000000..404178de22e58
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-ocean.css
@@ -0,0 +1,141 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-ocean.CodeMirror {
+  background-color: #0F111A;
+  color: #8F93A2;
+}
+
+.cm-s-material-ocean .CodeMirror-gutters {
+  background: #0F111A;
+  color: #464B5D;
+  border: none;
+}
+
+.cm-s-material-ocean .CodeMirror-guttermarker,
+.cm-s-material-ocean .CodeMirror-guttermarker-subtle,
+.cm-s-material-ocean .CodeMirror-linenumber {
+  color: #464B5D;
+}
+
+.cm-s-material-ocean .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+.cm-s-material-ocean.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #a2a8a175 !important;
+}
+.cm-s-material-ocean .cm-animate-fat-cursor {
+  background-color: #a2a8a175 !important;
+}
+
+.cm-s-material-ocean div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-ocean.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-line::selection,
+.cm-s-material-ocean .CodeMirror-line>span::selection,
+.cm-s-material-ocean .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-line::-moz-selection,
+.cm-s-material-ocean .CodeMirror-line>span::-moz-selection,
+.cm-s-material-ocean .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-ocean .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-ocean .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-ocean .cm-variable-3,
+.cm-s-material-ocean .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-ocean .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-ocean .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-ocean .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-ocean .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-ocean .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-comment {
+  color: #464B5D;
+}
+
+.cm-s-material-ocean .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-ocean .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-ocean .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-ocean .cm-variable-3,
+.cm-s-material-ocean .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-ocean .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-ocean .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-palenight.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-palenight.css
new file mode 100644
index 0000000000000..6712c43a0ef5a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material-palenight.css
@@ -0,0 +1,141 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-palenight.CodeMirror {
+  background-color: #292D3E;
+  color: #A6ACCD;
+}
+
+.cm-s-material-palenight .CodeMirror-gutters {
+  background: #292D3E;
+  color: #676E95;
+  border: none;
+}
+
+.cm-s-material-palenight .CodeMirror-guttermarker,
+.cm-s-material-palenight .CodeMirror-guttermarker-subtle,
+.cm-s-material-palenight .CodeMirror-linenumber {
+  color: #676E95;
+}
+
+.cm-s-material-palenight .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+.cm-s-material-palenight.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #607c8b80 !important;
+}
+.cm-s-material-palenight .cm-animate-fat-cursor {
+  background-color: #607c8b80 !important;
+}
+
+.cm-s-material-palenight div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-palenight.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-line::selection,
+.cm-s-material-palenight .CodeMirror-line>span::selection,
+.cm-s-material-palenight .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-line::-moz-selection,
+.cm-s-material-palenight .CodeMirror-line>span::-moz-selection,
+.cm-s-material-palenight .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-palenight .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-palenight .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-palenight .cm-variable-3,
+.cm-s-material-palenight .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-palenight .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-palenight .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-palenight .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-palenight .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-palenight .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-comment {
+  color: #676E95;
+}
+
+.cm-s-material-palenight .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-palenight .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-palenight .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-palenight .cm-variable-3,
+.cm-s-material-palenight .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-palenight .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-palenight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/material.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material.css
new file mode 100644
index 0000000000000..a7848499a739a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/material.css
@@ -0,0 +1,141 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material.CodeMirror {
+  background-color: #263238;
+  color: #EEFFFF;
+}
+
+.cm-s-material .CodeMirror-gutters {
+  background: #263238;
+  color: #546E7A;
+  border: none;
+}
+
+.cm-s-material .CodeMirror-guttermarker,
+.cm-s-material .CodeMirror-guttermarker-subtle,
+.cm-s-material .CodeMirror-linenumber {
+  color: #546E7A;
+}
+
+.cm-s-material .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+.cm-s-material.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #5d6d5c80 !important;
+}
+.cm-s-material .cm-animate-fat-cursor {
+  background-color: #5d6d5c80 !important;
+}
+
+.cm-s-material div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-line::selection,
+.cm-s-material .CodeMirror-line>span::selection,
+.cm-s-material .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-line::-moz-selection,
+.cm-s-material .CodeMirror-line>span::-moz-selection,
+.cm-s-material .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material .cm-variable-3,
+.cm-s-material .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material .cm-comment {
+  color: #546E7A;
+}
+
+.cm-s-material .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material .cm-variable-3,
+.cm-s-material .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/mbo.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/mbo.css
new file mode 100644
index 0000000000000..e164fcf42ae5c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/mbo.css
@@ -0,0 +1,37 @@
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
+
+.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
+.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
+.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
+.cm-s-mbo .CodeMirror-guttermarker { color: white; }
+.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
+.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
+
+.cm-s-mbo span.cm-comment { color: #95958a; }
+.cm-s-mbo span.cm-atom { color: #00a8c6; }
+.cm-s-mbo span.cm-number { color: #00a8c6; }
+
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
+.cm-s-mbo span.cm-keyword { color: #ffb928; }
+.cm-s-mbo span.cm-string { color: #ffcf6c; }
+.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
+
+.cm-s-mbo span.cm-variable { color: #ffffec; }
+.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
+.cm-s-mbo span.cm-def { color: #ffffec; }
+.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
+.cm-s-mbo span.cm-tag { color: #9ddfe9; }
+.cm-s-mbo span.cm-link { color: #f54b07; }
+.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
+.cm-s-mbo span.cm-qualifier { color: #ffffec; }
+
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/mdn-like.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/mdn-like.css
new file mode 100644
index 0000000000000..622ed3efb74f1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/mdn-like.css
@@ -0,0 +1,46 @@
+/*
+  MDN-LIKE Theme - Mozilla
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+  GitHub: @peterkroon
+
+  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+
+*/
+.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
+.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
+
+.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+
+.cm-s-mdn-like .cm-keyword { color: #6262FF; }
+.cm-s-mdn-like .cm-atom { color: #F90; }
+.cm-s-mdn-like .cm-number { color:  #ca7841; }
+.cm-s-mdn-like .cm-def { color: #8DA6CE; }
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
+
+.cm-s-mdn-like .cm-variable { color: #07a; }
+.cm-s-mdn-like .cm-property { color: #905; }
+.cm-s-mdn-like .cm-qualifier { color: #690; }
+
+.cm-s-mdn-like .cm-operator { color: #cda869; }
+.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
+.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
+.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
+.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
+.cm-s-mdn-like .cm-tag { color: #997643; }
+.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-mdn-like .cm-header { color: #FF6400; }
+.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
+.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
+
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
+
+.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/midnight.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/midnight.css
new file mode 100644
index 0000000000000..fc26474a4a7c3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/midnight.css
@@ -0,0 +1,39 @@
+/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
+
+/*<!--activeline-->*/
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
+
+.cm-s-midnight.CodeMirror {
+    background: #0F192A;
+    color: #D1EDFF;
+}
+
+.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
+.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
+.cm-s-midnight .CodeMirror-guttermarker { color: white; }
+.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
+.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
+
+.cm-s-midnight span.cm-comment { color: #428BDD; }
+.cm-s-midnight span.cm-atom { color: #AE81FF; }
+.cm-s-midnight span.cm-number { color: #D1EDFF; }
+
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
+.cm-s-midnight span.cm-keyword { color: #E83737; }
+.cm-s-midnight span.cm-string { color: #1DC116; }
+
+.cm-s-midnight span.cm-variable { color: #FFAA3E; }
+.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
+.cm-s-midnight span.cm-def { color: #4DD; }
+.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
+.cm-s-midnight span.cm-tag { color: #449; }
+.cm-s-midnight span.cm-link { color: #AE81FF; }
+.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
+
+.cm-s-midnight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/monokai.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/monokai.css
new file mode 100644
index 0000000000000..cd4cd5572092d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/monokai.css
@@ -0,0 +1,41 @@
+/* Based on Sublime Text's Monokai theme */
+
+.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
+.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
+.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
+.cm-s-monokai .CodeMirror-guttermarker { color: white; }
+.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-monokai span.cm-comment { color: #75715e; }
+.cm-s-monokai span.cm-atom { color: #ae81ff; }
+.cm-s-monokai span.cm-number { color: #ae81ff; }
+
+.cm-s-monokai span.cm-comment.cm-attribute { color: #97b757; }
+.cm-s-monokai span.cm-comment.cm-def { color: #bc9262; }
+.cm-s-monokai span.cm-comment.cm-tag { color: #bc6283; }
+.cm-s-monokai span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
+.cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-builtin { color: #66d9ef; }
+.cm-s-monokai span.cm-string { color: #e6db74; }
+
+.cm-s-monokai span.cm-variable { color: #f8f8f2; }
+.cm-s-monokai span.cm-variable-2 { color: #9effff; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
+.cm-s-monokai span.cm-def { color: #fd971f; }
+.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
+.cm-s-monokai span.cm-tag { color: #f92672; }
+.cm-s-monokai span.cm-header { color: #ae81ff; }
+.cm-s-monokai span.cm-link { color: #ae81ff; }
+.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
+
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
+.cm-s-monokai .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/moxer.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/moxer.css
new file mode 100644
index 0000000000000..b3ca35e38544a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/moxer.css
@@ -0,0 +1,143 @@
+/*
+  Name:       Moxer Theme
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://github.com/moxer-theme/moxer-code
+*/
+
+.cm-s-moxer.CodeMirror {
+  background-color: #090A0F;
+  color: #8E95B4;
+  line-height: 1.8;
+}
+
+.cm-s-moxer .CodeMirror-gutters {
+  background: #090A0F;
+  color: #35394B;
+  border: none;
+}
+
+.cm-s-moxer .CodeMirror-guttermarker,
+.cm-s-moxer .CodeMirror-guttermarker-subtle,
+.cm-s-moxer .CodeMirror-linenumber {
+  color: #35394B;
+}
+
+
+.cm-s-moxer .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-moxer div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-moxer.CodeMirror-focused div.CodeMirror-selected {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-line::selection,
+.cm-s-moxer .CodeMirror-line>span::selection,
+.cm-s-moxer .CodeMirror-line>span>span::selection {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-line::-moz-selection,
+.cm-s-moxer .CodeMirror-line>span::-moz-selection,
+.cm-s-moxer .CodeMirror-line>span>span::-moz-selection {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-activeline-background,
+.cm-s-moxer .CodeMirror-activeline-gutter .CodeMirror-linenumber {
+  background: rgba(33, 36, 49, 0.5);
+}
+
+.cm-s-moxer .cm-keyword {
+  color: #D46C6C;
+}
+
+.cm-s-moxer .cm-operator {
+  color: #D46C6C;
+}
+
+.cm-s-moxer .cm-variable-2 {
+  color: #81C5DA;
+}
+
+
+.cm-s-moxer .cm-variable-3,
+.cm-s-moxer .cm-type {
+  color: #f07178;
+}
+
+.cm-s-moxer .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-moxer .cm-atom {
+  color: #A99BE2;
+}
+
+.cm-s-moxer .cm-number {
+  color: #7CA4C0;
+}
+
+.cm-s-moxer .cm-def {
+  color: #F5DFA5;
+}
+
+.cm-s-moxer .CodeMirror-line .cm-def ~ .cm-def {
+  color: #81C5DA;
+}
+
+.cm-s-moxer .cm-string {
+  color: #B2E4AE;
+}
+
+.cm-s-moxer .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-moxer .cm-comment {
+  color: #3F445A;
+}
+
+.cm-s-moxer .cm-variable {
+  color: #8E95B4;
+}
+
+.cm-s-moxer .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-moxer .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-moxer .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-moxer .cm-property {
+  color: #81C5DA;
+}
+
+.cm-s-moxer .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-moxer .cm-variable-3,
+.cm-s-moxer .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-moxer .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-moxer .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/neat.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/neat.css
new file mode 100644
index 0000000000000..4267b1a37dc87
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/neat.css
@@ -0,0 +1,12 @@
+.cm-s-neat span.cm-comment { color: #a86; }
+.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
+.cm-s-neat span.cm-string { color: #a22; }
+.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-variable { color: black; }
+.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
+.cm-s-neat span.cm-meta { color: #555; }
+.cm-s-neat span.cm-link { color: #3a3; }
+
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/neo.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/neo.css
new file mode 100644
index 0000000000000..b28d5c65fab77
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/neo.css
@@ -0,0 +1,43 @@
+/* neo theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-neo.CodeMirror {
+  background-color:#ffffff;
+  color:#2e383c;
+  line-height:1.4375;
+}
+.cm-s-neo .cm-comment { color:#75787b; }
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
+.cm-s-neo .cm-string { color:#b35e14; }
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
+
+
+/* Editor styling */
+
+.cm-s-neo pre {
+  padding:0;
+}
+
+.cm-s-neo .CodeMirror-gutters {
+  border:none;
+  border-right:10px solid transparent;
+  background-color:transparent;
+}
+
+.cm-s-neo .CodeMirror-linenumber {
+  padding:0;
+  color:#e0e2e5;
+}
+
+.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
+.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
+
+.cm-s-neo .CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: rgba(155,157,162,0.37);
+  z-index: 1;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/night.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/night.css
new file mode 100644
index 0000000000000..f631bf42c748d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/night.css
@@ -0,0 +1,27 @@
+/* Loosely based on the Midnight Textmate theme */
+
+.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-night div.CodeMirror-selected { background: #447; }
+.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-guttermarker { color: white; }
+.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
+.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-night span.cm-comment { color: #8900d1; }
+.cm-s-night span.cm-atom { color: #845dc4; }
+.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
+.cm-s-night span.cm-keyword { color: #599eff; }
+.cm-s-night span.cm-string { color: #37f14a; }
+.cm-s-night span.cm-meta { color: #7678e2; }
+.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
+.cm-s-night span.cm-bracket { color: #8da6ce; }
+.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
+.cm-s-night span.cm-link { color: #845dc4; }
+.cm-s-night span.cm-error { color: #9d1e15; }
+
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
+.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/nord.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/nord.css
new file mode 100644
index 0000000000000..41a8ad7782361
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/nord.css
@@ -0,0 +1,42 @@
+/* Based on arcticicestudio's Nord theme */
+/* https://github.com/arcticicestudio/nord */
+
+.cm-s-nord.CodeMirror { background: #2e3440; color: #d8dee9; }
+.cm-s-nord div.CodeMirror-selected { background: #434c5e; }
+.cm-s-nord .CodeMirror-line::selection, .cm-s-nord .CodeMirror-line > span::selection, .cm-s-nord .CodeMirror-line > span > span::selection { background: #3b4252; }
+.cm-s-nord .CodeMirror-line::-moz-selection, .cm-s-nord .CodeMirror-line > span::-moz-selection, .cm-s-nord .CodeMirror-line > span > span::-moz-selection { background: #3b4252; }
+.cm-s-nord .CodeMirror-gutters { background: #2e3440; border-right: 0px; }
+.cm-s-nord .CodeMirror-guttermarker { color: #4c566a; }
+.cm-s-nord .CodeMirror-guttermarker-subtle { color: #4c566a; }
+.cm-s-nord .CodeMirror-linenumber { color: #4c566a; }
+.cm-s-nord .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-nord span.cm-comment { color: #4c566a; }
+.cm-s-nord span.cm-atom { color: #b48ead; }
+.cm-s-nord span.cm-number { color: #b48ead; }
+
+.cm-s-nord span.cm-comment.cm-attribute { color: #97b757; }
+.cm-s-nord span.cm-comment.cm-def { color: #bc9262; }
+.cm-s-nord span.cm-comment.cm-tag { color: #bc6283; }
+.cm-s-nord span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-nord span.cm-property, .cm-s-nord span.cm-attribute { color: #8FBCBB; }
+.cm-s-nord span.cm-keyword { color: #81A1C1; }
+.cm-s-nord span.cm-builtin { color: #81A1C1; }
+.cm-s-nord span.cm-string { color: #A3BE8C; }
+
+.cm-s-nord span.cm-variable { color: #d8dee9; }
+.cm-s-nord span.cm-variable-2 { color: #d8dee9; }
+.cm-s-nord span.cm-variable-3, .cm-s-nord span.cm-type { color: #d8dee9; }
+.cm-s-nord span.cm-def { color: #8FBCBB; }
+.cm-s-nord span.cm-bracket { color: #81A1C1; }
+.cm-s-nord span.cm-tag { color: #bf616a; }
+.cm-s-nord span.cm-header { color: #b48ead; }
+.cm-s-nord span.cm-link { color: #b48ead; }
+.cm-s-nord span.cm-error { background: #bf616a; color: #f8f8f0; }
+
+.cm-s-nord .CodeMirror-activeline-background { background: #3b4252; }
+.cm-s-nord .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/oceanic-next.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/oceanic-next.css
new file mode 100644
index 0000000000000..f3d0d08acb778
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/oceanic-next.css
@@ -0,0 +1,46 @@
+/*
+
+    Name:       oceanic-next
+    Author:     Filype Pereira (https://github.com/fpereira1)
+
+    Original oceanic-next color scheme by Dmitri Voronianski (https://github.com/voronianski/oceanic-next-color-scheme)
+
+*/
+
+.cm-s-oceanic-next.CodeMirror { background: #304148; color: #f8f8f2; }
+.cm-s-oceanic-next div.CodeMirror-selected { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::selection, .cm-s-oceanic-next .CodeMirror-line > span::selection, .cm-s-oceanic-next .CodeMirror-line > span > span::selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span > span::-moz-selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-gutters { background: #304148; border-right: 10px; }
+.cm-s-oceanic-next .CodeMirror-guttermarker { color: white; }
+.cm-s-oceanic-next .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-oceanic-next.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
+
+.cm-s-oceanic-next span.cm-comment { color: #65737E; }
+.cm-s-oceanic-next span.cm-atom { color: #C594C5; }
+.cm-s-oceanic-next span.cm-number { color: #F99157; }
+
+.cm-s-oceanic-next span.cm-property { color: #99C794; }
+.cm-s-oceanic-next span.cm-attribute,
+.cm-s-oceanic-next span.cm-keyword { color: #C594C5; }
+.cm-s-oceanic-next span.cm-builtin { color: #66d9ef; }
+.cm-s-oceanic-next span.cm-string { color: #99C794; }
+
+.cm-s-oceanic-next span.cm-variable,
+.cm-s-oceanic-next span.cm-variable-2,
+.cm-s-oceanic-next span.cm-variable-3 { color: #f8f8f2; }
+.cm-s-oceanic-next span.cm-def { color: #6699CC; }
+.cm-s-oceanic-next span.cm-bracket { color: #5FB3B3; }
+.cm-s-oceanic-next span.cm-tag { color: #C594C5; }
+.cm-s-oceanic-next span.cm-header { color: #C594C5; }
+.cm-s-oceanic-next span.cm-link { color: #C594C5; }
+.cm-s-oceanic-next span.cm-error { background: #C594C5; color: #f8f8f0; }
+
+.cm-s-oceanic-next .CodeMirror-activeline-background { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/panda-syntax.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/panda-syntax.css
new file mode 100644
index 0000000000000..de14e911244b9
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/panda-syntax.css
@@ -0,0 +1,85 @@
+/*
+	Name:       Panda Syntax
+	Author:     Siamak Mokhtari (http://github.com/siamak/)
+	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
+*/
+.cm-s-panda-syntax {
+	background: #292A2B;
+	color: #E6E6E6;
+	line-height: 1.5;
+	font-family: 'Operator Mono', 'Source Code Pro', Menlo, Monaco, Consolas, Courier New, monospace;
+}
+.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
+.cm-s-panda-syntax .CodeMirror-activeline-background {
+	background: rgba(99, 123, 156, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-selected {
+	background: #FFF;
+}
+.cm-s-panda-syntax .cm-comment {
+	font-style: italic;
+	color: #676B79;
+}
+.cm-s-panda-syntax .cm-operator {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-string {
+	color: #19F9D8;
+}
+.cm-s-panda-syntax .cm-string-2 {
+    color: #FFB86C;
+}
+
+.cm-s-panda-syntax .cm-tag {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-meta {
+	color: #b084eb;
+}
+
+.cm-s-panda-syntax .cm-number {
+	color: #FFB86C;
+}
+.cm-s-panda-syntax .cm-atom {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-keyword {
+	color: #FF75B5;
+}
+.cm-s-panda-syntax .cm-variable {
+	color: #ffb86c;
+}
+.cm-s-panda-syntax .cm-variable-2 {
+	color: #ff9ac1;
+}
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
+	color: #ff9ac1;
+}
+
+.cm-s-panda-syntax .cm-def {
+	color: #e6e6e6;
+}
+.cm-s-panda-syntax .cm-property {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-unit {
+    color: #ffb86c;
+}
+
+.cm-s-panda-syntax .cm-attribute {
+    color: #ffb86c;
+}
+
+.cm-s-panda-syntax .CodeMirror-matchingbracket {
+    border-bottom: 1px dotted #19F9D8;
+    padding-bottom: 2px;
+    color: #e6e6e6;
+}
+.cm-s-panda-syntax .CodeMirror-gutters {
+    background: #292a2b;
+    border-right-color: rgba(255, 255, 255, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-linenumber {
+    color: #e6e6e6;
+    opacity: 0.6;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-dark.css
new file mode 100644
index 0000000000000..aa9d207e6d7c4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-dark.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraรญso (Dark)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
+.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
+.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
+
+.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
+.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
+.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
+.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
+
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-light.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-light.css
new file mode 100644
index 0000000000000..ae0c755f89848
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/paraiso-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraรญso (Light)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
+.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
+.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
+.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
+
+.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-light span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-light span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-light span.cm-variable { color: #48b685; }
+.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-light span.cm-def { color: #f99b15; }
+.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
+.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-light span.cm-link { color: #815ba4; }
+.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
+
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/pastel-on-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/pastel-on-dark.css
new file mode 100644
index 0000000000000..60435dd15e635
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/pastel-on-dark.css
@@ -0,0 +1,52 @@
+/**
+ * Pastel On Dark theme ported from ACE editor
+ * @license MIT
+ * @copyright AtomicPages LLC 2014
+ * @author Dennis Thompson, AtomicPages LLC
+ * @version 1.1
+ * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
+ */
+
+.cm-s-pastel-on-dark.CodeMirror {
+	background: #2c2827;
+	color: #8F938F;
+	line-height: 1.5;
+}
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
+
+.cm-s-pastel-on-dark .CodeMirror-gutters {
+	background: #34302f;
+	border-right: 0px;
+	padding: 0 3px;
+}
+.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
+.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
+.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
+.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
+.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
+.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
+.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
+.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-error {
+	background: #757aD8;
+	color: #f8f8f0;
+}
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
+.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
+	border: 1px solid rgba(255,255,255,0.25);
+	color: #8F938F !important;
+	margin: -1px -1px 0 -1px;
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/railscasts.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/railscasts.css
new file mode 100644
index 0000000000000..aeff0449d56f3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/railscasts.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Railscasts
+    Author:     Ryan Bates (http://railscasts.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
+.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
+.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
+.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
+.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+
+.cm-s-railscasts span.cm-comment {color: #bc9458;}
+.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
+.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+
+.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
+.cm-s-railscasts span.cm-keyword {color: #da4939;}
+.cm-s-railscasts span.cm-string {color: #ffc66d;}
+
+.cm-s-railscasts span.cm-variable {color: #a5c261;}
+.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
+.cm-s-railscasts span.cm-def {color: #cc7833;}
+.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
+.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
+.cm-s-railscasts span.cm-tag {color: #da4939;}
+.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+
+.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/rubyblue.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/rubyblue.css
new file mode 100644
index 0000000000000..1f181b06ec271
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/rubyblue.css
@@ -0,0 +1,25 @@
+.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
+.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
+.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
+.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
+.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
+.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
+.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
+.cm-s-rubyblue span.cm-keyword { color: #F0F; }
+.cm-s-rubyblue span.cm-string { color: #F08047; }
+.cm-s-rubyblue span.cm-meta { color: #F0F; }
+.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
+.cm-s-rubyblue span.cm-bracket { color: #F0F; }
+.cm-s-rubyblue span.cm-link { color: #F4C20B; }
+.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
+.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
+
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/seti.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/seti.css
new file mode 100644
index 0000000000000..814f76f7dece8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/seti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       seti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
+
+*/
+
+
+.cm-s-seti.CodeMirror {
+  background-color: #151718 !important;
+  color: #CFD2D1 !important;
+  border: none;
+}
+.cm-s-seti .CodeMirror-gutters {
+  color: #404b53;
+  background-color: #0E1112;
+  border: none;
+}
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti span.cm-comment { color: #41535b; }
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
+.cm-s-seti span.cm-number { color: #cd3f45; }
+.cm-s-seti span.cm-variable { color: #55b5db; }
+.cm-s-seti span.cm-variable-2 { color: #a074c4; }
+.cm-s-seti span.cm-def { color: #55b5db; }
+.cm-s-seti span.cm-keyword { color: #ff79c6; }
+.cm-s-seti span.cm-operator { color: #9fca56; }
+.cm-s-seti span.cm-keyword { color: #e6cd69; }
+.cm-s-seti span.cm-atom { color: #cd3f45; }
+.cm-s-seti span.cm-meta { color: #55b5db; }
+.cm-s-seti span.cm-tag { color: #55b5db; }
+.cm-s-seti span.cm-attribute { color: #9fca56; }
+.cm-s-seti span.cm-qualifier { color: #9fca56; }
+.cm-s-seti span.cm-property { color: #a074c4; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
+.cm-s-seti span.cm-builtin { color: #9fca56; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/shadowfox.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/shadowfox.css
new file mode 100644
index 0000000000000..32d59b139ac24
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/shadowfox.css
@@ -0,0 +1,52 @@
+/*
+
+    Name:       shadowfox
+    Author:     overdodactyl (http://github.com/overdodactyl)
+
+    Original shadowfox color scheme by Firefox
+
+*/
+
+.cm-s-shadowfox.CodeMirror { background: #2a2a2e; color: #b1b1b3; }
+.cm-s-shadowfox div.CodeMirror-selected { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::selection, .cm-s-shadowfox .CodeMirror-line > span::selection, .cm-s-shadowfox .CodeMirror-line > span > span::selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span > span::-moz-selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-gutters { background: #0c0c0d ; border-right: 1px solid #0c0c0d; }
+.cm-s-shadowfox .CodeMirror-guttermarker { color: #555; }
+.cm-s-shadowfox .CodeMirror-linenumber { color: #939393; }
+.cm-s-shadowfox .CodeMirror-cursor { border-left: 1px solid #fff; }
+
+.cm-s-shadowfox span.cm-comment { color: #939393; }
+.cm-s-shadowfox span.cm-atom { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-quote { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-builtin { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-attribute { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-keyword { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-error { color: #FF7DE9; }
+
+.cm-s-shadowfox span.cm-number { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string-2 { color: #6B89FF; }
+
+.cm-s-shadowfox span.cm-meta { color: #939393; }
+.cm-s-shadowfox span.cm-hr { color: #939393; }
+
+.cm-s-shadowfox span.cm-header { color: #75BFFF; }
+.cm-s-shadowfox span.cm-qualifier { color: #75BFFF; }
+.cm-s-shadowfox span.cm-variable-2 { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-property { color: #86DE74; }
+
+.cm-s-shadowfox span.cm-def { color: #75BFFF; }
+.cm-s-shadowfox span.cm-bracket { color: #75BFFF; }
+.cm-s-shadowfox span.cm-tag { color: #75BFFF; }
+.cm-s-shadowfox span.cm-link:visited { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-variable { color: #B98EFF; }
+.cm-s-shadowfox span.cm-variable-3 { color: #d7d7db; }
+.cm-s-shadowfox span.cm-link { color: #737373; }
+.cm-s-shadowfox span.cm-operator { color: #b1b1b3; }
+.cm-s-shadowfox span.cm-special { color: #d7d7db; }
+
+.cm-s-shadowfox .CodeMirror-activeline-background { background: rgba(185, 215, 253, .15) }
+.cm-s-shadowfox .CodeMirror-matchingbracket { outline: solid 1px rgba(255, 255, 255, .25); color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/solarized.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/solarized.css
new file mode 100644
index 0000000000000..e978fec9b0a18
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/solarized.css
@@ -0,0 +1,165 @@
+/*
+Solarized theme for code-mirror
+http://ethanschoonover.com/solarized
+*/
+
+/*
+Solarized color palette
+http://ethanschoonover.com/solarized/img/solarized-palette.png
+*/
+
+.solarized.base03 { color: #002b36; }
+.solarized.base02 { color: #073642; }
+.solarized.base01 { color: #586e75; }
+.solarized.base00 { color: #657b83; }
+.solarized.base0 { color: #839496; }
+.solarized.base1 { color: #93a1a1; }
+.solarized.base2 { color: #eee8d5; }
+.solarized.base3  { color: #fdf6e3; }
+.solarized.solar-yellow  { color: #b58900; }
+.solarized.solar-orange  { color: #cb4b16; }
+.solarized.solar-red { color: #dc322f; }
+.solarized.solar-magenta { color: #d33682; }
+.solarized.solar-violet  { color: #6c71c4; }
+.solarized.solar-blue { color: #268bd2; }
+.solarized.solar-cyan { color: #2aa198; }
+.solarized.solar-green { color: #859900; }
+
+/* Color scheme for code-mirror */
+
+.cm-s-solarized {
+  line-height: 1.45em;
+  color-profile: sRGB;
+  rendering-intent: auto;
+}
+.cm-s-solarized.cm-s-dark {
+  color: #839496;
+  background-color: #002b36;
+}
+.cm-s-solarized.cm-s-light {
+  background-color: #fdf6e3;
+  color: #657b83;
+}
+
+.cm-s-solarized .CodeMirror-widget {
+  text-shadow: none;
+}
+
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
+
+.cm-s-solarized .cm-keyword { color: #cb4b16; }
+.cm-s-solarized .cm-atom { color: #d33682; }
+.cm-s-solarized .cm-number { color: #d33682; }
+.cm-s-solarized .cm-def { color: #2aa198; }
+
+.cm-s-solarized .cm-variable { color: #839496; }
+.cm-s-solarized .cm-variable-2 { color: #b58900; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
+
+.cm-s-solarized .cm-property { color: #2aa198; }
+.cm-s-solarized .cm-operator { color: #6c71c4; }
+
+.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
+
+.cm-s-solarized .cm-string { color: #859900; }
+.cm-s-solarized .cm-string-2 { color: #b58900; }
+
+.cm-s-solarized .cm-meta { color: #859900; }
+.cm-s-solarized .cm-qualifier { color: #b58900; }
+.cm-s-solarized .cm-builtin { color: #d33682; }
+.cm-s-solarized .cm-bracket { color: #cb4b16; }
+.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
+.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
+.cm-s-solarized .cm-tag { color: #93a1a1; }
+.cm-s-solarized .cm-attribute { color: #2aa198; }
+.cm-s-solarized .cm-hr {
+  color: transparent;
+  border-top: 1px solid #586e75;
+  display: block;
+}
+.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
+.cm-s-solarized .cm-special { color: #6c71c4; }
+.cm-s-solarized .cm-em {
+  color: #999;
+  text-decoration: underline;
+  text-decoration-style: dotted;
+}
+.cm-s-solarized .cm-error,
+.cm-s-solarized .cm-invalidchar {
+  color: #586e75;
+  border-bottom: 1px dotted #dc322f;
+}
+
+.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
+
+.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-light .CodeMirror-line > span::-moz-selection, .cm-s-light .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
+
+/* Editor styling */
+
+
+
+/* Little shadow on the view-port of the buffer view */
+.cm-s-solarized.CodeMirror {
+  -moz-box-shadow: inset 7px 0 12px -6px #000;
+  -webkit-box-shadow: inset 7px 0 12px -6px #000;
+  box-shadow: inset 7px 0 12px -6px #000;
+}
+
+/* Remove gutter border */
+.cm-s-solarized .CodeMirror-gutters {
+  border-right: 0;
+}
+
+/* Gutter colors and line number styling based of color scheme (dark / light) */
+
+/* Dark */
+.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
+  background-color: #073642;
+}
+
+.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
+  color: #586e75;
+}
+
+/* Light */
+.cm-s-solarized.cm-s-light .CodeMirror-gutters {
+  background-color: #eee8d5;
+}
+
+.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
+  color: #839496;
+}
+
+/* Common */
+.cm-s-solarized .CodeMirror-linenumber {
+  padding: 0 5px;
+}
+.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
+.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
+.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
+
+.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
+  color: #586e75;
+}
+
+/* Cursor */
+.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
+
+/* Fat cursor */
+.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
+.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
+.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
+.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
+
+/* Active line */
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
+  background: rgba(255, 255, 255, 0.06);
+}
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.06);
+}
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ssms.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ssms.css
new file mode 100644
index 0000000000000..9494c14c20f0a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ssms.css
@@ -0,0 +1,16 @@
+.cm-s-ssms span.cm-keyword { color: blue; }
+.cm-s-ssms span.cm-comment { color: darkgreen; }
+.cm-s-ssms span.cm-string { color: red; }
+.cm-s-ssms span.cm-def { color: black; }
+.cm-s-ssms span.cm-variable { color: black; }
+.cm-s-ssms span.cm-variable-2 { color: black; }
+.cm-s-ssms span.cm-atom { color: darkgray; }
+.cm-s-ssms .CodeMirror-linenumber { color: teal; }
+.cm-s-ssms .CodeMirror-activeline-background { background: #ffffff; }
+.cm-s-ssms span.cm-string-2 { color: #FF00FF; }
+.cm-s-ssms span.cm-operator, 
+.cm-s-ssms span.cm-bracket, 
+.cm-s-ssms span.cm-punctuation { color: darkgray; }
+.cm-s-ssms .CodeMirror-gutters { border-right: 3px solid #ffee62; background-color: #ffffff; }
+.cm-s-ssms div.CodeMirror-selected { background: #ADD6FF; }
+
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/the-matrix.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/the-matrix.css
new file mode 100644
index 0000000000000..c4c93c11eafdb
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/the-matrix.css
@@ -0,0 +1,30 @@
+.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
+.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
+.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
+.cm-s-the-matrix span.cm-atom { color: #3FF; }
+.cm-s-the-matrix span.cm-number { color: #FFB94F; }
+.cm-s-the-matrix span.cm-def { color: #99C; }
+.cm-s-the-matrix span.cm-variable { color: #F6C; }
+.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
+.cm-s-the-matrix span.cm-property { color: #62FFA0; }
+.cm-s-the-matrix span.cm-operator { color: #999; }
+.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
+.cm-s-the-matrix span.cm-string { color: #39C; }
+.cm-s-the-matrix span.cm-meta { color: #C9F; }
+.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
+.cm-s-the-matrix span.cm-builtin { color: #30a; }
+.cm-s-the-matrix span.cm-bracket { color: #cc7; }
+.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
+.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
+.cm-s-the-matrix span.cm-error { color: #FF0000; }
+
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-bright.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-bright.css
new file mode 100644
index 0000000000000..b6dd4a92787a4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-bright.css
@@ -0,0 +1,35 @@
+/*
+
+    Name:       Tomorrow Night - Bright
+    Author:     Chris Kempson
+
+    Port done by Gerard Braad <me@gbraad.nl>
+
+*/
+
+.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
+.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
+
+.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
+.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
+.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
+.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
+.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-eighties.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-eighties.css
new file mode 100644
index 0000000000000..2a9debc327131
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/tomorrow-night-eighties.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Tomorrow Night - Eighties
+    Author:     Chris Kempson
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
+
+.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
+.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
+.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/ttcn.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ttcn.css
new file mode 100644
index 0000000000000..0b14ac35d64f4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/ttcn.css
@@ -0,0 +1,64 @@
+.cm-s-ttcn .cm-quote { color: #090; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-link { text-decoration: underline; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
+
+.cm-s-ttcn .cm-atom { color: #219; }
+.cm-s-ttcn .cm-attribute { color: #00c; }
+.cm-s-ttcn .cm-bracket { color: #997; }
+.cm-s-ttcn .cm-comment { color: #333333; }
+.cm-s-ttcn .cm-def { color: #00f; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-error { color: #f00; }
+.cm-s-ttcn .cm-hr { color: #999; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-keyword { font-weight:bold; }
+.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
+.cm-s-ttcn .cm-meta { color: #555; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-qualifier { color: #555; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-string { color: #006400; }
+.cm-s-ttcn .cm-string-2 { color: #f50; }
+.cm-s-ttcn .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-tag { color: #170; }
+.cm-s-ttcn .cm-variable { color: #8B2252; }
+.cm-s-ttcn .cm-variable-2 { color: #05a; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
+
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+
+/* ASN */
+.cm-s-ttcn .cm-accessTypes,
+.cm-s-ttcn .cm-compareTypes { color: #27408B; }
+.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
+.cm-s-ttcn .cm-modifier { color:#D2691E; }
+.cm-s-ttcn .cm-status { color:#8B4545; }
+.cm-s-ttcn .cm-storage { color:#A020F0; }
+.cm-s-ttcn .cm-tags { color:#006400; }
+
+/* CFG */
+.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
+.cm-s-ttcn .cm-fileNCtrlMaskOptions,
+.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
+
+/* TTCN */
+.cm-s-ttcn .cm-booleanConsts,
+.cm-s-ttcn .cm-otherConsts,
+.cm-s-ttcn .cm-verdictConsts { color: #006400; }
+.cm-s-ttcn .cm-configOps,
+.cm-s-ttcn .cm-functionOps,
+.cm-s-ttcn .cm-portOps,
+.cm-s-ttcn .cm-sutOps,
+.cm-s-ttcn .cm-timerOps,
+.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
+.cm-s-ttcn .cm-preprocessor,
+.cm-s-ttcn .cm-templateMatch,
+.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
+.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
+.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/twilight.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/twilight.css
new file mode 100644
index 0000000000000..b2b1b2aa93e02
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/twilight.css
@@ -0,0 +1,32 @@
+.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
+.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
+.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
+
+.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-guttermarker { color: white; }
+.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
+.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
+.cm-s-twilight .cm-atom { color: #FC0; }
+.cm-s-twilight .cm-number { color:  #ca7841; } /**/
+.cm-s-twilight .cm-def { color: #8DA6CE; }
+.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
+.cm-s-twilight .cm-operator { color: #cda869; } /**/
+.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
+.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
+.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
+.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
+.cm-s-twilight .cm-tag { color: #997643; } /**/
+.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-twilight .cm-header { color: #FF6400; }
+.cm-s-twilight .cm-hr { color: #AEAEAE; }
+.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/vibrant-ink.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/vibrant-ink.css
new file mode 100644
index 0000000000000..6358ad3655a44
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/vibrant-ink.css
@@ -0,0 +1,34 @@
+/* Taken from the popular Visual Studio Vibrant Ink Schema */
+
+.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
+.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
+.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
+
+.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
+.cm-s-vibrant-ink .cm-atom { color: #FC0; }
+.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
+.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
+.cm-s-vibrant-ink .cm-operator { color: #888; }
+.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
+.cm-s-vibrant-ink .cm-string-2 { color: red; }
+.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
+.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-header { color: #FF6400; }
+.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
+.cm-s-vibrant-ink .cm-link { color: #5656F3; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-dark.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-dark.css
new file mode 100644
index 0000000000000..7da1a0f7053a1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-dark.css
@@ -0,0 +1,53 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort <mike@brevoort.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
+.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
+.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-dark span.cm-number { color: #164; }
+.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
+.cm-s-xq-dark span.cm-variable { color: #FFF; }
+.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
+.cm-s-xq-dark span.cm-property {}
+.cm-s-xq-dark span.cm-operator {}
+.cm-s-xq-dark span.cm-comment { color: gray; }
+.cm-s-xq-dark span.cm-string { color: #9FEE00; }
+.cm-s-xq-dark span.cm-meta { color: yellow; }
+.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
+.cm-s-xq-dark span.cm-builtin { color: #30a; }
+.cm-s-xq-dark span.cm-bracket { color: #cc7; }
+.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
+.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
+.cm-s-xq-dark span.cm-error { color: #f00; }
+
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-light.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-light.css
new file mode 100644
index 0000000000000..7b182ea99756b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/xq-light.css
@@ -0,0 +1,43 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort <mike@brevoort.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
+.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-light span.cm-number { color: #164; }
+.cm-s-xq-light span.cm-def { text-decoration:underline; }
+.cm-s-xq-light span.cm-variable { color: black; }
+.cm-s-xq-light span.cm-variable-2 { color:black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
+.cm-s-xq-light span.cm-property {}
+.cm-s-xq-light span.cm-operator {}
+.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
+.cm-s-xq-light span.cm-string { color: red; }
+.cm-s-xq-light span.cm-meta { color: yellow; }
+.cm-s-xq-light span.cm-qualifier { color: grey; }
+.cm-s-xq-light span.cm-builtin { color: #7EA656; }
+.cm-s-xq-light span.cm-bracket { color: #cc7; }
+.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
+.cm-s-xq-light span.cm-attribute { color: #7F007F; }
+.cm-s-xq-light span.cm-error { color: #f00; }
+
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/yeti.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/yeti.css
new file mode 100644
index 0000000000000..d085f72497156
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/yeti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       yeti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
+
+*/
+
+
+.cm-s-yeti.CodeMirror {
+  background-color: #ECEAE8 !important;
+  color: #d1c9c0 !important;
+  border: none;
+}
+
+.cm-s-yeti .CodeMirror-gutters {
+  color: #adaba6;
+  background-color: #E5E1DB;
+  border: none;
+}
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
+.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
+.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
+.cm-s-yeti span.cm-comment { color: #d4c8be; }
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
+.cm-s-yeti span.cm-number { color: #a074c4; }
+.cm-s-yeti span.cm-variable { color: #55b5db; }
+.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
+.cm-s-yeti span.cm-def { color: #55b5db; }
+.cm-s-yeti span.cm-operator { color: #9fb96e; }
+.cm-s-yeti span.cm-keyword { color: #9fb96e; }
+.cm-s-yeti span.cm-atom { color: #a074c4; }
+.cm-s-yeti span.cm-meta { color: #96c0d8; }
+.cm-s-yeti span.cm-tag { color: #96c0d8; }
+.cm-s-yeti span.cm-attribute { color: #9fb96e; }
+.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
+.cm-s-yeti span.cm-property { color: #a074c4; }
+.cm-s-yeti span.cm-builtin { color: #a074c4; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/yonce.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/yonce.css
new file mode 100644
index 0000000000000..975f0788a2b54
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/yonce.css
@@ -0,0 +1,59 @@
+/*
+
+    Name:       yoncรฉ
+    Author:     Thomas MacLean (http://github.com/thomasmaclean)
+
+    Original yoncรฉ color scheme by Mina Markham (https://github.com/minamarkham)
+
+*/
+
+.cm-s-yonce.CodeMirror { background: #1C1C1C; color: #d4d4d4; } /**/
+.cm-s-yonce div.CodeMirror-selected { background: rgba(252, 69, 133, 0.478); } /**/
+.cm-s-yonce .CodeMirror-selectedtext,
+.cm-s-yonce .CodeMirror-selected,
+.cm-s-yonce .CodeMirror-line::selection,
+.cm-s-yonce .CodeMirror-line > span::selection,
+.cm-s-yonce .CodeMirror-line > span > span::selection,
+.cm-s-yonce .CodeMirror-line::-moz-selection,
+.cm-s-yonce .CodeMirror-line > span::-moz-selection,
+.cm-s-yonce .CodeMirror-line > span > span::-moz-selection { background: rgba(252, 67, 132, 0.47); }
+
+.cm-s-yonce.CodeMirror pre { padding-left: 0px; }
+.cm-s-yonce .CodeMirror-gutters {background: #1C1C1C; border-right: 0px;}
+.cm-s-yonce .CodeMirror-linenumber {color: #777777;  padding-right: 10px; }
+.cm-s-yonce .CodeMirror-activeline .CodeMirror-linenumber.CodeMirror-gutter-elt { background: #1C1C1C; color: #fc4384; }
+.cm-s-yonce .CodeMirror-linenumber { color: #777; }
+.cm-s-yonce .CodeMirror-cursor { border-left: 2px solid #FC4384; }
+.cm-s-yonce .cm-searching { background: rgba(243, 155, 53, .3) !important; outline: 1px solid #F39B35; }
+.cm-s-yonce .cm-searching.CodeMirror-selectedtext { background: rgba(243, 155, 53, .7) !important; color: white; }
+
+.cm-s-yonce .cm-keyword { color: #00A7AA; } /**/
+.cm-s-yonce .cm-atom { color: #F39B35; }
+.cm-s-yonce .cm-number, .cm-s-yonce span.cm-type { color:  #A06FCA; } /**/
+.cm-s-yonce .cm-def { color: #98E342; }
+.cm-s-yonce .cm-property,
+.cm-s-yonce span.cm-variable { color: #D4D4D4; font-style: italic; }
+.cm-s-yonce span.cm-variable-2 { color: #da7dae; font-style: italic; }
+.cm-s-yonce span.cm-variable-3 { color: #A06FCA; }
+.cm-s-yonce .cm-type.cm-def { color: #FC4384; font-style: normal; text-decoration: underline; }
+.cm-s-yonce .cm-property.cm-def { color: #FC4384; font-style: normal; }
+.cm-s-yonce .cm-callee { color: #FC4384; font-style: normal; }
+.cm-s-yonce .cm-operator { color: #FC4384; } /**/
+.cm-s-yonce .cm-qualifier,
+.cm-s-yonce .cm-tag { color: #FC4384; }
+.cm-s-yonce .cm-tag.cm-bracket { color: #D4D4D4; }
+.cm-s-yonce .cm-attribute { color: #A06FCA; }
+.cm-s-yonce .cm-comment { color:#696d70; font-style:italic; font-weight:normal; } /**/
+.cm-s-yonce .cm-comment.cm-tag { color: #FC4384 }
+.cm-s-yonce .cm-comment.cm-attribute { color: #D4D4D4; }
+.cm-s-yonce .cm-string { color:#E6DB74; } /**/
+.cm-s-yonce .cm-string-2 { color:#F39B35; } /*?*/
+.cm-s-yonce .cm-meta { color: #D4D4D4; background: inherit; }
+.cm-s-yonce .cm-builtin { color: #FC4384; } /*?*/
+.cm-s-yonce .cm-header { color: #da7dae; }
+.cm-s-yonce .cm-hr { color: #98E342; }
+.cm-s-yonce .cm-link { color:#696d70; font-style:italic; text-decoration:none; } /**/
+.cm-s-yonce .cm-error { border-bottom: 1px solid #C42412; }
+
+.cm-s-yonce .CodeMirror-activeline-background { background: #272727; }
+.cm-s-yonce .CodeMirror-matchingbracket { outline:1px solid grey; color:#D4D4D4 !important; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror-theme/zenburn.css b/waterfox/browser/components/sidebar/extlib/codemirror-theme/zenburn.css
new file mode 100644
index 0000000000000..4eb4247c9285b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror-theme/zenburn.css
@@ -0,0 +1,37 @@
+/**
+ * "
+ *  Using Zenburn color palette from the Emacs Zenburn Theme
+ *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
+ *
+ *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
+ * "
+ * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
+ */
+
+.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
+.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-zenburn.CodeMirror { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
+.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
+.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
+.cm-s-zenburn span.cm-atom { color: #bfebbf; }
+.cm-s-zenburn span.cm-def { color: #dcdccc; }
+.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
+.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
+.cm-s-zenburn span.cm-string { color: #cc9393; }
+.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
+.cm-s-zenburn span.cm-number { color: #dcdccc; }
+.cm-s-zenburn span.cm-tag { color: #93e0e3; }
+.cm-s-zenburn span.cm-property { color: #dfaf8f; }
+.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
+.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
+.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
+.cm-s-zenburn span.cm-header { color: #f0efd0; }
+.cm-s-zenburn span.cm-operator { color: #f0efd0; }
+.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
+.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror.css b/waterfox/browser/components/sidebar/extlib/codemirror.css
new file mode 100644
index 0000000000000..dbe6664ee2a8a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror.css
@@ -0,0 +1,345 @@
+/* CodeMirror version 5.65.19 */
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+  color: black;
+  direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  white-space: nowrap;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+  border-left: 1px solid black;
+  border-right: none;
+  width: 0;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.cm-fat-cursor .CodeMirror-cursor {
+  width: auto;
+  border: 0 !important;
+  background: #7e7;
+}
+.cm-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+.cm-fat-cursor .CodeMirror-line::selection,
+.cm-fat-cursor .CodeMirror-line > span::selection, 
+.cm-fat-cursor .CodeMirror-line > span > span::selection { background: transparent; }
+.cm-fat-cursor .CodeMirror-line::-moz-selection,
+.cm-fat-cursor .CodeMirror-line > span::-moz-selection,
+.cm-fat-cursor .CodeMirror-line > span > span::-moz-selection { background: transparent; }
+.cm-fat-cursor { caret-color: transparent; }
+@-moz-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@-webkit-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-rulers {
+  position: absolute;
+  left: 0; right: 0; top: -50px; bottom: 0;
+  overflow: hidden;
+}
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  top: 0; bottom: 0;
+  position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  position: relative;
+  overflow: hidden;
+  background: white;
+}
+
+.CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
+  /* 50px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -50px; margin-right: -50px;
+  padding-bottom: 50px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+  z-index: 0;
+}
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 50px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+  outline: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  min-height: 100%;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  display: inline-block;
+  vertical-align: top;
+  margin-bottom: -50px;
+}
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+
+.CodeMirror-lines {
+  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: contextual;
+  font-variant-ligatures: contextual;
+}
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-rtl pre { direction: rtl; }
+
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
+}
+
+.CodeMirror-cursor {
+  position: absolute;
+  pointer-events: none;
+}
+.CodeMirror-measure pre { position: static; }
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
+}
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+  background-color: #ffa;
+  background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
diff --git a/waterfox/browser/components/sidebar/extlib/codemirror.js b/waterfox/browser/components/sidebar/extlib/codemirror.js
new file mode 100644
index 0000000000000..6a5535eb30471
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/codemirror.js
@@ -0,0 +1,9886 @@
+/* CodeMirror version 5.65.19 */
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+// This is CodeMirror (https://codemirror.net/5), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
+
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = global || self, global.CodeMirror = factory());
+}(this, (function () { 'use strict';
+
+  // Kludges for bugs and behavior differences that can't be feature
+  // detected are enabled based on userAgent etc sniffing.
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
+
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
+  var edge = /Edge\/(\d+)/.exec(userAgent);
+  var ie = ie_upto10 || ie_11up || edge;
+  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]);
+  var webkit = !edge && /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = !edge && /Chrome\/(\d+)/.exec(userAgent);
+  var chrome_version = chrome && +chrome[1];
+  var presto = /Opera\//.test(userAgent);
+  var safari = /Apple Computer/.test(navigator.vendor);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
+
+  var ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2);
+  var android = /Android/.test(userAgent);
+  // This is woefully incomplete. Suggestions for alternative methods welcome.
+  var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var chromeOS = /\bCrOS\b/.test(userAgent);
+  var windows = /win/i.test(platform);
+
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
+  if (presto_version) { presto_version = Number(presto_version[1]); }
+  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
+  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
+  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
+  var captureRightClick = gecko || (ie && ie_version >= 9);
+
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
+
+  var rmClass = function(node, cls) {
+    var current = node.className;
+    var match = classTest(cls).exec(current);
+    if (match) {
+      var after = current.slice(match.index + match[0].length);
+      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    }
+  };
+
+  function removeChildren(e) {
+    for (var count = e.childNodes.length; count > 0; --count)
+      { e.removeChild(e.firstChild); }
+    return e
+  }
+
+  function removeChildrenAndAdd(parent, e) {
+    return removeChildren(parent).appendChild(e)
+  }
+
+  function elt(tag, content, className, style) {
+    var e = document.createElement(tag);
+    if (className) { e.className = className; }
+    if (style) { e.style.cssText = style; }
+    if (typeof content == "string") { e.appendChild(document.createTextNode(content)); }
+    else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]); } }
+    return e
+  }
+  // wrapper for elt, which removes the elt from the accessibility tree
+  function eltP(tag, content, className, style) {
+    var e = elt(tag, content, className, style);
+    e.setAttribute("role", "presentation");
+    return e
+  }
+
+  var range;
+  if (document.createRange) { range = function(node, start, end, endNode) {
+    var r = document.createRange();
+    r.setEnd(endNode || node, end);
+    r.setStart(node, start);
+    return r
+  }; }
+  else { range = function(node, start, end) {
+    var r = document.body.createTextRange();
+    try { r.moveToElementText(node.parentNode); }
+    catch(e) { return r }
+    r.collapse(true);
+    r.moveEnd("character", end);
+    r.moveStart("character", start);
+    return r
+  }; }
+
+  function contains(parent, child) {
+    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+      { child = child.parentNode; }
+    if (parent.contains)
+      { return parent.contains(child) }
+    do {
+      if (child.nodeType == 11) { child = child.host; }
+      if (child == parent) { return true }
+    } while (child = child.parentNode)
+  }
+
+  function activeElt(rootNode) {
+    // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
+    // IE < 10 will throw when accessed while the page is loading or in an iframe.
+    // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+    var doc = rootNode.ownerDocument || rootNode;
+    var activeElement;
+    try {
+      activeElement = rootNode.activeElement;
+    } catch(e) {
+      activeElement = doc.body || null;
+    }
+    while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+      { activeElement = activeElement.shadowRoot.activeElement; }
+    return activeElement
+  }
+
+  function addClass(node, cls) {
+    var current = node.className;
+    if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls; }
+  }
+  function joinClasses(a, b) {
+    var as = a.split(" ");
+    for (var i = 0; i < as.length; i++)
+      { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i]; } }
+    return b
+  }
+
+  var selectInput = function(node) { node.select(); };
+  if (ios) // Mobile Safari apparently has a bug where select() is broken.
+    { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; }
+  else if (ie) // Suppress mysterious IE10 errors
+    { selectInput = function(node) { try { node.select(); } catch(_e) {} }; }
+
+  function doc(cm) { return cm.display.wrapper.ownerDocument }
+
+  function root(cm) {
+    return rootNode(cm.display.wrapper)
+  }
+
+  function rootNode(element) {
+    // Detect modern browsers (2017+).
+    return element.getRootNode ? element.getRootNode() : element.ownerDocument
+  }
+
+  function win(cm) { return doc(cm).defaultView }
+
+  function bind(f) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    return function(){return f.apply(null, args)}
+  }
+
+  function copyObj(obj, target, overwrite) {
+    if (!target) { target = {}; }
+    for (var prop in obj)
+      { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+        { target[prop] = obj[prop]; } }
+    return target
+  }
+
+  // Counts the column offset in a string, taking tabs into account.
+  // Used mostly to find indentation.
+  function countColumn(string, end, tabSize, startIndex, startValue) {
+    if (end == null) {
+      end = string.search(/[^\s\u00a0]/);
+      if (end == -1) { end = string.length; }
+    }
+    for (var i = startIndex || 0, n = startValue || 0;;) {
+      var nextTab = string.indexOf("\t", i);
+      if (nextTab < 0 || nextTab >= end)
+        { return n + (end - i) }
+      n += nextTab - i;
+      n += tabSize - (n % tabSize);
+      i = nextTab + 1;
+    }
+  }
+
+  var Delayed = function() {
+    this.id = null;
+    this.f = null;
+    this.time = 0;
+    this.handler = bind(this.onTimeout, this);
+  };
+  Delayed.prototype.onTimeout = function (self) {
+    self.id = 0;
+    if (self.time <= +new Date) {
+      self.f();
+    } else {
+      setTimeout(self.handler, self.time - +new Date);
+    }
+  };
+  Delayed.prototype.set = function (ms, f) {
+    this.f = f;
+    var time = +new Date + ms;
+    if (!this.id || time < this.time) {
+      clearTimeout(this.id);
+      this.id = setTimeout(this.handler, ms);
+      this.time = time;
+    }
+  };
+
+  function indexOf(array, elt) {
+    for (var i = 0; i < array.length; ++i)
+      { if (array[i] == elt) { return i } }
+    return -1
+  }
+
+  // Number of pixels added to scroller and sizer to hide scrollbar
+  var scrollerGap = 50;
+
+  // Returned or thrown by various protocols to signal 'I'm not
+  // handling this'.
+  var Pass = {toString: function(){return "CodeMirror.Pass"}};
+
+  // Reused option objects for setSelection & friends
+  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
+
+  // The inverse of countColumn -- find the offset that corresponds to
+  // a particular column.
+  function findColumn(string, goal, tabSize) {
+    for (var pos = 0, col = 0;;) {
+      var nextTab = string.indexOf("\t", pos);
+      if (nextTab == -1) { nextTab = string.length; }
+      var skipped = nextTab - pos;
+      if (nextTab == string.length || col + skipped >= goal)
+        { return pos + Math.min(skipped, goal - col) }
+      col += nextTab - pos;
+      col += tabSize - (col % tabSize);
+      pos = nextTab + 1;
+      if (col >= goal) { return pos }
+    }
+  }
+
+  var spaceStrs = [""];
+  function spaceStr(n) {
+    while (spaceStrs.length <= n)
+      { spaceStrs.push(lst(spaceStrs) + " "); }
+    return spaceStrs[n]
+  }
+
+  function lst(arr) { return arr[arr.length-1] }
+
+  function map(array, f) {
+    var out = [];
+    for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i); }
+    return out
+  }
+
+  function insertSorted(array, value, score) {
+    var pos = 0, priority = score(value);
+    while (pos < array.length && score(array[pos]) <= priority) { pos++; }
+    array.splice(pos, 0, value);
+  }
+
+  function nothing() {}
+
+  function createObj(base, props) {
+    var inst;
+    if (Object.create) {
+      inst = Object.create(base);
+    } else {
+      nothing.prototype = base;
+      inst = new nothing();
+    }
+    if (props) { copyObj(props, inst); }
+    return inst
+  }
+
+  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  function isWordCharBasic(ch) {
+    return /\w/.test(ch) || ch > "\x80" &&
+      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
+  }
+  function isWordChar(ch, helper) {
+    if (!helper) { return isWordCharBasic(ch) }
+    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true }
+    return helper.test(ch)
+  }
+
+  function isEmpty(obj) {
+    for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } }
+    return true
+  }
+
+  // Extending unicode characters. A series of a non-extending char +
+  // any number of extending chars is treated as a single unit as far
+  // as editing and measuring is concerned. This is not fully correct,
+  // since some scripts/fonts/browsers also treat other configurations
+  // of code points as a group.
+  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
+
+  // Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range.
+  function skipExtendingChars(str, pos, dir) {
+    while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { pos += dir; }
+    return pos
+  }
+
+  // Returns the value from the range [`from`; `to`] that satisfies
+  // `pred` and is closest to `from`. Assumes that at least `to`
+  // satisfies `pred`. Supports `from` being greater than `to`.
+  function findFirst(pred, from, to) {
+    // At any point we are certain `to` satisfies `pred`, don't know
+    // whether `from` does.
+    var dir = from > to ? -1 : 1;
+    for (;;) {
+      if (from == to) { return from }
+      var midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF);
+      if (mid == from) { return pred(mid) ? from : to }
+      if (pred(mid)) { to = mid; }
+      else { from = mid + dir; }
+    }
+  }
+
+  // BIDI HELPERS
+
+  function iterateBidiSections(order, from, to, f) {
+    if (!order) { return f(from, to, "ltr", 0) }
+    var found = false;
+    for (var i = 0; i < order.length; ++i) {
+      var part = order[i];
+      if (part.from < to && part.to > from || from == to && part.to == from) {
+        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i);
+        found = true;
+      }
+    }
+    if (!found) { f(from, to, "ltr"); }
+  }
+
+  var bidiOther = null;
+  function getBidiPartAt(order, ch, sticky) {
+    var found;
+    bidiOther = null;
+    for (var i = 0; i < order.length; ++i) {
+      var cur = order[i];
+      if (cur.from < ch && cur.to > ch) { return i }
+      if (cur.to == ch) {
+        if (cur.from != cur.to && sticky == "before") { found = i; }
+        else { bidiOther = i; }
+      }
+      if (cur.from == ch) {
+        if (cur.from != cur.to && sticky != "before") { found = i; }
+        else { bidiOther = i; }
+      }
+    }
+    return found != null ? found : bidiOther
+  }
+
+  // Bidirectional ordering algorithm
+  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
+  // that this (partially) implements.
+
+  // One-char codes used for character types:
+  // L (L):   Left-to-Right
+  // R (R):   Right-to-Left
+  // r (AL):  Right-to-Left Arabic
+  // 1 (EN):  European Number
+  // + (ES):  European Number Separator
+  // % (ET):  European Number Terminator
+  // n (AN):  Arabic Number
+  // , (CS):  Common Number Separator
+  // m (NSM): Non-Spacing Mark
+  // b (BN):  Boundary Neutral
+  // s (B):   Paragraph Separator
+  // t (S):   Segment Separator
+  // w (WS):  Whitespace
+  // N (ON):  Other Neutrals
+
+  // Returns null if characters are ordered as they appear
+  // (left-to-right), or an array of sections ({from, to, level}
+  // objects) in the order in which they occur visually.
+  var bidiOrdering = (function() {
+    // Character types for codepoints 0 to 0xff
+    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
+    // Character types for codepoints 0x600 to 0x6f9
+    var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";
+    function charType(code) {
+      if (code <= 0xf7) { return lowTypes.charAt(code) }
+      else if (0x590 <= code && code <= 0x5f4) { return "R" }
+      else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }
+      else if (0x6ee <= code && code <= 0x8ac) { return "r" }
+      else if (0x2000 <= code && code <= 0x200b) { return "w" }
+      else if (code == 0x200c) { return "b" }
+      else { return "L" }
+    }
+
+    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
+
+    function BidiSpan(level, from, to) {
+      this.level = level;
+      this.from = from; this.to = to;
+    }
+
+    return function(str, direction) {
+      var outerType = direction == "ltr" ? "L" : "R";
+
+      if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false }
+      var len = str.length, types = [];
+      for (var i = 0; i < len; ++i)
+        { types.push(charType(str.charCodeAt(i))); }
+
+      // W1. Examine each non-spacing mark (NSM) in the level run, and
+      // change the type of the NSM to the type of the previous
+      // character. If the NSM is at the start of the level run, it will
+      // get the type of sor.
+      for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {
+        var type = types[i$1];
+        if (type == "m") { types[i$1] = prev; }
+        else { prev = type; }
+      }
+
+      // W2. Search backwards from each instance of a European number
+      // until the first strong type (R, L, AL, or sor) is found. If an
+      // AL is found, change the type of the European number to Arabic
+      // number.
+      // W3. Change all ALs to R.
+      for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {
+        var type$1 = types[i$2];
+        if (type$1 == "1" && cur == "r") { types[i$2] = "n"; }
+        else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } }
+      }
+
+      // W4. A single European separator between two European numbers
+      // changes to a European number. A single common separator between
+      // two numbers of the same type changes to that type.
+      for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {
+        var type$2 = types[i$3];
+        if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; }
+        else if (type$2 == "," && prev$1 == types[i$3+1] &&
+                 (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; }
+        prev$1 = type$2;
+      }
+
+      // W5. A sequence of European terminators adjacent to European
+      // numbers changes to all European numbers.
+      // W6. Otherwise, separators and terminators change to Other
+      // Neutral.
+      for (var i$4 = 0; i$4 < len; ++i$4) {
+        var type$3 = types[i$4];
+        if (type$3 == ",") { types[i$4] = "N"; }
+        else if (type$3 == "%") {
+          var end = (void 0);
+          for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}
+          var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
+          for (var j = i$4; j < end; ++j) { types[j] = replace; }
+          i$4 = end - 1;
+        }
+      }
+
+      // W7. Search backwards from each instance of a European number
+      // until the first strong type (R, L, or sor) is found. If an L is
+      // found, then change the type of the European number to L.
+      for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {
+        var type$4 = types[i$5];
+        if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; }
+        else if (isStrong.test(type$4)) { cur$1 = type$4; }
+      }
+
+      // N1. A sequence of neutrals takes the direction of the
+      // surrounding strong text if the text on both sides has the same
+      // direction. European and Arabic numbers act as if they were R in
+      // terms of their influence on neutrals. Start-of-level-run (sor)
+      // and end-of-level-run (eor) are used at level run boundaries.
+      // N2. Any remaining neutrals take the embedding direction.
+      for (var i$6 = 0; i$6 < len; ++i$6) {
+        if (isNeutral.test(types[i$6])) {
+          var end$1 = (void 0);
+          for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}
+          var before = (i$6 ? types[i$6-1] : outerType) == "L";
+          var after = (end$1 < len ? types[end$1] : outerType) == "L";
+          var replace$1 = before == after ? (before ? "L" : "R") : outerType;
+          for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; }
+          i$6 = end$1 - 1;
+        }
+      }
+
+      // Here we depart from the documented algorithm, in order to avoid
+      // building up an actual levels array. Since there are only three
+      // levels (0, 1, 2) in an implementation that doesn't take
+      // explicit embedding into account, we can build up the order on
+      // the fly, without following the level-based algorithm.
+      var order = [], m;
+      for (var i$7 = 0; i$7 < len;) {
+        if (countsAsLeft.test(types[i$7])) {
+          var start = i$7;
+          for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}
+          order.push(new BidiSpan(0, start, i$7));
+        } else {
+          var pos = i$7, at = order.length, isRTL = direction == "rtl" ? 1 : 0;
+          for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}
+          for (var j$2 = pos; j$2 < i$7;) {
+            if (countsAsNum.test(types[j$2])) {
+              if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); at += isRTL; }
+              var nstart = j$2;
+              for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}
+              order.splice(at, 0, new BidiSpan(2, nstart, j$2));
+              at += isRTL;
+              pos = j$2;
+            } else { ++j$2; }
+          }
+          if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); }
+        }
+      }
+      if (direction == "ltr") {
+        if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+          order[0].from = m[0].length;
+          order.unshift(new BidiSpan(0, 0, m[0].length));
+        }
+        if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+          lst(order).to -= m[0].length;
+          order.push(new BidiSpan(0, len - m[0].length, len));
+        }
+      }
+
+      return direction == "rtl" ? order.reverse() : order
+    }
+  })();
+
+  // Get the bidi ordering for the given line (and cache it). Returns
+  // false for lines that are fully left-to-right, and an array of
+  // BidiSpan objects otherwise.
+  function getOrder(line, direction) {
+    var order = line.order;
+    if (order == null) { order = line.order = bidiOrdering(line.text, direction); }
+    return order
+  }
+
+  // EVENT HANDLING
+
+  // Lightweight event framework. on/off also work on DOM nodes,
+  // registering native DOM handlers.
+
+  var noHandlers = [];
+
+  var on = function(emitter, type, f) {
+    if (emitter.addEventListener) {
+      emitter.addEventListener(type, f, false);
+    } else if (emitter.attachEvent) {
+      emitter.attachEvent("on" + type, f);
+    } else {
+      var map = emitter._handlers || (emitter._handlers = {});
+      map[type] = (map[type] || noHandlers).concat(f);
+    }
+  };
+
+  function getHandlers(emitter, type) {
+    return emitter._handlers && emitter._handlers[type] || noHandlers
+  }
+
+  function off(emitter, type, f) {
+    if (emitter.removeEventListener) {
+      emitter.removeEventListener(type, f, false);
+    } else if (emitter.detachEvent) {
+      emitter.detachEvent("on" + type, f);
+    } else {
+      var map = emitter._handlers, arr = map && map[type];
+      if (arr) {
+        var index = indexOf(arr, f);
+        if (index > -1)
+          { map[type] = arr.slice(0, index).concat(arr.slice(index + 1)); }
+      }
+    }
+  }
+
+  function signal(emitter, type /*, values...*/) {
+    var handlers = getHandlers(emitter, type);
+    if (!handlers.length) { return }
+    var args = Array.prototype.slice.call(arguments, 2);
+    for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); }
+  }
+
+  // The DOM events that CodeMirror handles can be overridden by
+  // registering a (non-DOM) handler on the editor for the event name,
+  // and preventDefault-ing the event in that handler.
+  function signalDOMEvent(cm, e, override) {
+    if (typeof e == "string")
+      { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; }
+    signal(cm, override || e.type, cm, e);
+    return e_defaultPrevented(e) || e.codemirrorIgnore
+  }
+
+  function signalCursorActivity(cm) {
+    var arr = cm._handlers && cm._handlers.cursorActivity;
+    if (!arr) { return }
+    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+    for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)
+      { set.push(arr[i]); } }
+  }
+
+  function hasHandler(emitter, type) {
+    return getHandlers(emitter, type).length > 0
+  }
+
+  // Add on and off methods to a constructor's prototype, to make
+  // registering events on such objects more convenient.
+  function eventMixin(ctor) {
+    ctor.prototype.on = function(type, f) {on(this, type, f);};
+    ctor.prototype.off = function(type, f) {off(this, type, f);};
+  }
+
+  // Due to the fact that we still support jurassic IE versions, some
+  // compatibility wrappers are needed.
+
+  function e_preventDefault(e) {
+    if (e.preventDefault) { e.preventDefault(); }
+    else { e.returnValue = false; }
+  }
+  function e_stopPropagation(e) {
+    if (e.stopPropagation) { e.stopPropagation(); }
+    else { e.cancelBubble = true; }
+  }
+  function e_defaultPrevented(e) {
+    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
+  }
+  function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
+
+  function e_target(e) {return e.target || e.srcElement}
+  function e_button(e) {
+    var b = e.which;
+    if (b == null) {
+      if (e.button & 1) { b = 1; }
+      else if (e.button & 2) { b = 3; }
+      else if (e.button & 4) { b = 2; }
+    }
+    if (mac && e.ctrlKey && b == 1) { b = 3; }
+    return b
+  }
+
+  // Detect drag-and-drop
+  var dragAndDrop = function() {
+    // There is *some* kind of drag-and-drop support in IE6-8, but I
+    // couldn't get it to work yet.
+    if (ie && ie_version < 9) { return false }
+    var div = elt('div');
+    return "draggable" in div || "dragDrop" in div
+  }();
+
+  var zwspSupported;
+  function zeroWidthElement(measure) {
+    if (zwspSupported == null) {
+      var test = elt("span", "\u200b");
+      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
+      if (measure.firstChild.offsetHeight != 0)
+        { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); }
+    }
+    var node = zwspSupported ? elt("span", "\u200b") :
+      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    node.setAttribute("cm-text", "");
+    return node
+  }
+
+  // Feature-detect IE's crummy client rect reporting for bidi text
+  var badBidiRects;
+  function hasBadBidiRects(measure) {
+    if (badBidiRects != null) { return badBidiRects }
+    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
+    var r0 = range(txt, 0, 1).getBoundingClientRect();
+    var r1 = range(txt, 1, 2).getBoundingClientRect();
+    removeChildren(measure);
+    if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)
+    return badBidiRects = (r1.right - r0.right < 3)
+  }
+
+  // See if "".split is the broken IE version, if so, provide an
+  // alternative way to split lines.
+  var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {
+    var pos = 0, result = [], l = string.length;
+    while (pos <= l) {
+      var nl = string.indexOf("\n", pos);
+      if (nl == -1) { nl = string.length; }
+      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
+      var rt = line.indexOf("\r");
+      if (rt != -1) {
+        result.push(line.slice(0, rt));
+        pos += rt + 1;
+      } else {
+        result.push(line);
+        pos = nl + 1;
+      }
+    }
+    return result
+  } : function (string) { return string.split(/\r\n?|\n/); };
+
+  var hasSelection = window.getSelection ? function (te) {
+    try { return te.selectionStart != te.selectionEnd }
+    catch(e) { return false }
+  } : function (te) {
+    var range;
+    try {range = te.ownerDocument.selection.createRange();}
+    catch(e) {}
+    if (!range || range.parentElement() != te) { return false }
+    return range.compareEndPoints("StartToEnd", range) != 0
+  };
+
+  var hasCopyEvent = (function () {
+    var e = elt("div");
+    if ("oncopy" in e) { return true }
+    e.setAttribute("oncopy", "return;");
+    return typeof e.oncopy == "function"
+  })();
+
+  var badZoomedRects = null;
+  function hasBadZoomedRects(measure) {
+    if (badZoomedRects != null) { return badZoomedRects }
+    var node = removeChildrenAndAdd(measure, elt("span", "x"));
+    var normal = node.getBoundingClientRect();
+    var fromRange = range(node, 0, 1).getBoundingClientRect();
+    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
+  }
+
+  // Known modes, by name and by MIME
+  var modes = {}, mimeModes = {};
+
+  // Extra arguments are stored as the mode's dependencies, which is
+  // used by (legacy) mechanisms like loadmode.js to automatically
+  // load a mode. (Preferred mechanism is the require/define calls.)
+  function defineMode(name, mode) {
+    if (arguments.length > 2)
+      { mode.dependencies = Array.prototype.slice.call(arguments, 2); }
+    modes[name] = mode;
+  }
+
+  function defineMIME(mime, spec) {
+    mimeModes[mime] = spec;
+  }
+
+  // Given a MIME type, a {name, ...options} config object, or a name
+  // string, return a mode config object.
+  function resolveMode(spec) {
+    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+      spec = mimeModes[spec];
+    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+      var found = mimeModes[spec.name];
+      if (typeof found == "string") { found = {name: found}; }
+      spec = createObj(found, spec);
+      spec.name = found.name;
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
+      return resolveMode("application/xml")
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
+      return resolveMode("application/json")
+    }
+    if (typeof spec == "string") { return {name: spec} }
+    else { return spec || {name: "null"} }
+  }
+
+  // Given a mode spec (anything that resolveMode accepts), find and
+  // initialize an actual mode object.
+  function getMode(options, spec) {
+    spec = resolveMode(spec);
+    var mfactory = modes[spec.name];
+    if (!mfactory) { return getMode(options, "text/plain") }
+    var modeObj = mfactory(options, spec);
+    if (modeExtensions.hasOwnProperty(spec.name)) {
+      var exts = modeExtensions[spec.name];
+      for (var prop in exts) {
+        if (!exts.hasOwnProperty(prop)) { continue }
+        if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; }
+        modeObj[prop] = exts[prop];
+      }
+    }
+    modeObj.name = spec.name;
+    if (spec.helperType) { modeObj.helperType = spec.helperType; }
+    if (spec.modeProps) { for (var prop$1 in spec.modeProps)
+      { modeObj[prop$1] = spec.modeProps[prop$1]; } }
+
+    return modeObj
+  }
+
+  // This can be used to attach properties to mode objects from
+  // outside the actual mode definition.
+  var modeExtensions = {};
+  function extendMode(mode, properties) {
+    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+    copyObj(properties, exts);
+  }
+
+  function copyState(mode, state) {
+    if (state === true) { return state }
+    if (mode.copyState) { return mode.copyState(state) }
+    var nstate = {};
+    for (var n in state) {
+      var val = state[n];
+      if (val instanceof Array) { val = val.concat([]); }
+      nstate[n] = val;
+    }
+    return nstate
+  }
+
+  // Given a mode and a state (for that mode), find the inner mode and
+  // state at the position that the state refers to.
+  function innerMode(mode, state) {
+    var info;
+    while (mode.innerMode) {
+      info = mode.innerMode(state);
+      if (!info || info.mode == mode) { break }
+      state = info.state;
+      mode = info.mode;
+    }
+    return info || {mode: mode, state: state}
+  }
+
+  function startState(mode, a1, a2) {
+    return mode.startState ? mode.startState(a1, a2) : true
+  }
+
+  // STRING STREAM
+
+  // Fed to the mode parsers, provides helper functions to make
+  // parsers more succinct.
+
+  var StringStream = function(string, tabSize, lineOracle) {
+    this.pos = this.start = 0;
+    this.string = string;
+    this.tabSize = tabSize || 8;
+    this.lastColumnPos = this.lastColumnValue = 0;
+    this.lineStart = 0;
+    this.lineOracle = lineOracle;
+  };
+
+  StringStream.prototype.eol = function () {return this.pos >= this.string.length};
+  StringStream.prototype.sol = function () {return this.pos == this.lineStart};
+  StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined};
+  StringStream.prototype.next = function () {
+    if (this.pos < this.string.length)
+      { return this.string.charAt(this.pos++) }
+  };
+  StringStream.prototype.eat = function (match) {
+    var ch = this.string.charAt(this.pos);
+    var ok;
+    if (typeof match == "string") { ok = ch == match; }
+    else { ok = ch && (match.test ? match.test(ch) : match(ch)); }
+    if (ok) {++this.pos; return ch}
+  };
+  StringStream.prototype.eatWhile = function (match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start
+  };
+  StringStream.prototype.eatSpace = function () {
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this.pos; }
+    return this.pos > start
+  };
+  StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;};
+  StringStream.prototype.skipTo = function (ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true}
+  };
+  StringStream.prototype.backUp = function (n) {this.pos -= n;};
+  StringStream.prototype.column = function () {
+    if (this.lastColumnPos < this.start) {
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+      this.lastColumnPos = this.start;
+    }
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+  };
+  StringStream.prototype.indentation = function () {
+    return countColumn(this.string, null, this.tabSize) -
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+  };
+  StringStream.prototype.match = function (pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; };
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
+        if (consume !== false) { this.pos += pattern.length; }
+        return true
+      }
+    } else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) { return null }
+      if (match && consume !== false) { this.pos += match[0].length; }
+      return match
+    }
+  };
+  StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)};
+  StringStream.prototype.hideFirstChars = function (n, inner) {
+    this.lineStart += n;
+    try { return inner() }
+    finally { this.lineStart -= n; }
+  };
+  StringStream.prototype.lookAhead = function (n) {
+    var oracle = this.lineOracle;
+    return oracle && oracle.lookAhead(n)
+  };
+  StringStream.prototype.baseToken = function () {
+    var oracle = this.lineOracle;
+    return oracle && oracle.baseToken(this.pos)
+  };
+
+  // Find the line object corresponding to the given line number.
+  function getLine(doc, n) {
+    n -= doc.first;
+    if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }
+    var chunk = doc;
+    while (!chunk.lines) {
+      for (var i = 0;; ++i) {
+        var child = chunk.children[i], sz = child.chunkSize();
+        if (n < sz) { chunk = child; break }
+        n -= sz;
+      }
+    }
+    return chunk.lines[n]
+  }
+
+  // Get the part of a document between two positions, as an array of
+  // strings.
+  function getBetween(doc, start, end) {
+    var out = [], n = start.line;
+    doc.iter(start.line, end.line + 1, function (line) {
+      var text = line.text;
+      if (n == end.line) { text = text.slice(0, end.ch); }
+      if (n == start.line) { text = text.slice(start.ch); }
+      out.push(text);
+      ++n;
+    });
+    return out
+  }
+  // Get the lines between from and to, as array of strings.
+  function getLines(doc, from, to) {
+    var out = [];
+    doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value
+    return out
+  }
+
+  // Update the height of a line, propagating the height change
+  // upwards to parent nodes.
+  function updateLineHeight(line, height) {
+    var diff = height - line.height;
+    if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } }
+  }
+
+  // Given a line object, find its line number by walking up through
+  // its parent links.
+  function lineNo(line) {
+    if (line.parent == null) { return null }
+    var cur = line.parent, no = indexOf(cur.lines, line);
+    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+      for (var i = 0;; ++i) {
+        if (chunk.children[i] == cur) { break }
+        no += chunk.children[i].chunkSize();
+      }
+    }
+    return no + cur.first
+  }
+
+  // Find the line at the given vertical position, using the height
+  // information in the document tree.
+  function lineAtHeight(chunk, h) {
+    var n = chunk.first;
+    outer: do {
+      for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {
+        var child = chunk.children[i$1], ch = child.height;
+        if (h < ch) { chunk = child; continue outer }
+        h -= ch;
+        n += child.chunkSize();
+      }
+      return n
+    } while (!chunk.lines)
+    var i = 0;
+    for (; i < chunk.lines.length; ++i) {
+      var line = chunk.lines[i], lh = line.height;
+      if (h < lh) { break }
+      h -= lh;
+    }
+    return n + i
+  }
+
+  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
+
+  function lineNumberFor(options, i) {
+    return String(options.lineNumberFormatter(i + options.firstLineNumber))
+  }
+
+  // A Pos instance represents a position within the text.
+  function Pos(line, ch, sticky) {
+    if ( sticky === void 0 ) sticky = null;
+
+    if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) }
+    this.line = line;
+    this.ch = ch;
+    this.sticky = sticky;
+  }
+
+  // Compare two positions, return 0 if they are the same, a negative
+  // number when a is less, and a positive number otherwise.
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
+
+  function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }
+
+  function copyPos(x) {return Pos(x.line, x.ch)}
+  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
+  function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
+
+  // Most of the external API clips given positions to make sure they
+  // actually exist within the document.
+  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
+  function clipPos(doc, pos) {
+    if (pos.line < doc.first) { return Pos(doc.first, 0) }
+    var last = doc.first + doc.size - 1;
+    if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }
+    return clipToLen(pos, getLine(doc, pos.line).text.length)
+  }
+  function clipToLen(pos, linelen) {
+    var ch = pos.ch;
+    if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }
+    else if (ch < 0) { return Pos(pos.line, 0) }
+    else { return pos }
+  }
+  function clipPosArray(doc, array) {
+    var out = [];
+    for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); }
+    return out
+  }
+
+  var SavedContext = function(state, lookAhead) {
+    this.state = state;
+    this.lookAhead = lookAhead;
+  };
+
+  var Context = function(doc, state, line, lookAhead) {
+    this.state = state;
+    this.doc = doc;
+    this.line = line;
+    this.maxLookAhead = lookAhead || 0;
+    this.baseTokens = null;
+    this.baseTokenPos = 1;
+  };
+
+  Context.prototype.lookAhead = function (n) {
+    var line = this.doc.getLine(this.line + n);
+    if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }
+    return line
+  };
+
+  Context.prototype.baseToken = function (n) {
+    if (!this.baseTokens) { return null }
+    while (this.baseTokens[this.baseTokenPos] <= n)
+      { this.baseTokenPos += 2; }
+    var type = this.baseTokens[this.baseTokenPos + 1];
+    return {type: type && type.replace(/( |^)overlay .*/, ""),
+            size: this.baseTokens[this.baseTokenPos] - n}
+  };
+
+  Context.prototype.nextLine = function () {
+    this.line++;
+    if (this.maxLookAhead > 0) { this.maxLookAhead--; }
+  };
+
+  Context.fromSaved = function (doc, saved, line) {
+    if (saved instanceof SavedContext)
+      { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }
+    else
+      { return new Context(doc, copyState(doc.mode, saved), line) }
+  };
+
+  Context.prototype.save = function (copy) {
+    var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;
+    return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+  };
+
+
+  // Compute a style array (an array starting with a mode generation
+  // -- for invalidation -- followed by pairs of end positions and
+  // style strings), which is used to highlight the tokens on the
+  // line.
+  function highlightLine(cm, line, context, forceToEnd) {
+    // A styles array always starts with a number identifying the
+    // mode/overlays that it is based on (for easy invalidation).
+    var st = [cm.state.modeGen], lineClasses = {};
+    // Compute the base array of styles
+    runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },
+            lineClasses, forceToEnd);
+    var state = context.state;
+
+    // Run overlays, adjust style array.
+    var loop = function ( o ) {
+      context.baseTokens = st;
+      var overlay = cm.state.overlays[o], i = 1, at = 0;
+      context.state = true;
+      runMode(cm, line.text, overlay.mode, context, function (end, style) {
+        var start = i;
+        // Ensure there's a token end at the current position, and that i points at it
+        while (at < end) {
+          var i_end = st[i];
+          if (i_end > end)
+            { st.splice(i, 1, end, st[i+1], i_end); }
+          i += 2;
+          at = Math.min(end, i_end);
+        }
+        if (!style) { return }
+        if (overlay.opaque) {
+          st.splice(start, i - start, end, "overlay " + style);
+          i = start + 2;
+        } else {
+          for (; start < i; start += 2) {
+            var cur = st[start+1];
+            st[start+1] = (cur ? cur + " " : "") + "overlay " + style;
+          }
+        }
+      }, lineClasses);
+      context.state = state;
+      context.baseTokens = null;
+      context.baseTokenPos = 1;
+    };
+
+    for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
+
+    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
+  }
+
+  function getLineStyles(cm, line, updateFrontier) {
+    if (!line.styles || line.styles[0] != cm.state.modeGen) {
+      var context = getContextBefore(cm, lineNo(line));
+      var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);
+      var result = highlightLine(cm, line, context);
+      if (resetState) { context.state = resetState; }
+      line.stateAfter = context.save(!resetState);
+      line.styles = result.styles;
+      if (result.classes) { line.styleClasses = result.classes; }
+      else if (line.styleClasses) { line.styleClasses = null; }
+      if (updateFrontier === cm.doc.highlightFrontier)
+        { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }
+    }
+    return line.styles
+  }
+
+  function getContextBefore(cm, n, precise) {
+    var doc = cm.doc, display = cm.display;
+    if (!doc.mode.startState) { return new Context(doc, true, n) }
+    var start = findStartLine(cm, n, precise);
+    var saved = start > doc.first && getLine(doc, start - 1).stateAfter;
+    var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);
+
+    doc.iter(start, n, function (line) {
+      processLine(cm, line.text, context);
+      var pos = context.line;
+      line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;
+      context.nextLine();
+    });
+    if (precise) { doc.modeFrontier = context.line; }
+    return context
+  }
+
+  // Lightweight form of highlight -- proceed over this line and
+  // update state, but don't save a style array. Used for lines that
+  // aren't currently visible.
+  function processLine(cm, text, context, startAt) {
+    var mode = cm.doc.mode;
+    var stream = new StringStream(text, cm.options.tabSize, context);
+    stream.start = stream.pos = startAt || 0;
+    if (text == "") { callBlankLine(mode, context.state); }
+    while (!stream.eol()) {
+      readToken(mode, stream, context.state);
+      stream.start = stream.pos;
+    }
+  }
+
+  function callBlankLine(mode, state) {
+    if (mode.blankLine) { return mode.blankLine(state) }
+    if (!mode.innerMode) { return }
+    var inner = innerMode(mode, state);
+    if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }
+  }
+
+  function readToken(mode, stream, state, inner) {
+    for (var i = 0; i < 10; i++) {
+      if (inner) { inner[0] = innerMode(mode, state).mode; }
+      var style = mode.token(stream, state);
+      if (stream.pos > stream.start) { return style }
+    }
+    throw new Error("Mode " + mode.name + " failed to advance stream.")
+  }
+
+  var Token = function(stream, type, state) {
+    this.start = stream.start; this.end = stream.pos;
+    this.string = stream.current();
+    this.type = type || null;
+    this.state = state;
+  };
+
+  // Utility for getTokenAt and getLineTokens
+  function takeToken(cm, pos, precise, asArray) {
+    var doc = cm.doc, mode = doc.mode, style;
+    pos = clipPos(doc, pos);
+    var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);
+    var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;
+    if (asArray) { tokens = []; }
+    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+      stream.start = stream.pos;
+      style = readToken(mode, stream, context.state);
+      if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }
+    }
+    return asArray ? tokens : new Token(stream, style, context.state)
+  }
+
+  function extractLineClasses(type, output) {
+    if (type) { for (;;) {
+      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
+      if (!lineClass) { break }
+      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
+      var prop = lineClass[1] ? "bgClass" : "textClass";
+      if (output[prop] == null)
+        { output[prop] = lineClass[2]; }
+      else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
+        { output[prop] += " " + lineClass[2]; }
+    } }
+    return type
+  }
+
+  // Run the given mode's parser over a line, calling f for each token.
+  function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
+    var flattenSpans = mode.flattenSpans;
+    if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }
+    var curStart = 0, curStyle = null;
+    var stream = new StringStream(text, cm.options.tabSize, context), style;
+    var inner = cm.options.addModeClass && [null];
+    if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }
+    while (!stream.eol()) {
+      if (stream.pos > cm.options.maxHighlightLength) {
+        flattenSpans = false;
+        if (forceToEnd) { processLine(cm, text, context, stream.pos); }
+        stream.pos = text.length;
+        style = null;
+      } else {
+        style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);
+      }
+      if (inner) {
+        var mName = inner[0].name;
+        if (mName) { style = "m-" + (style ? mName + " " + style : mName); }
+      }
+      if (!flattenSpans || curStyle != style) {
+        while (curStart < stream.start) {
+          curStart = Math.min(stream.start, curStart + 5000);
+          f(curStart, curStyle);
+        }
+        curStyle = style;
+      }
+      stream.start = stream.pos;
+    }
+    while (curStart < stream.pos) {
+      // Webkit seems to refuse to render text nodes longer than 57444
+      // characters, and returns inaccurate measurements in nodes
+      // starting around 5000 chars.
+      var pos = Math.min(stream.pos, curStart + 5000);
+      f(pos, curStyle);
+      curStart = pos;
+    }
+  }
+
+  // Finds the line to start with when starting a parse. Tries to
+  // find a line with a stateAfter, so that it can start with a
+  // valid state. If that fails, it returns the line with the
+  // smallest indentation, which tends to need the least context to
+  // parse correctly.
+  function findStartLine(cm, n, precise) {
+    var minindent, minline, doc = cm.doc;
+    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+    for (var search = n; search > lim; --search) {
+      if (search <= doc.first) { return doc.first }
+      var line = getLine(doc, search - 1), after = line.stateAfter;
+      if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
+        { return search }
+      var indented = countColumn(line.text, null, cm.options.tabSize);
+      if (minline == null || minindent > indented) {
+        minline = search - 1;
+        minindent = indented;
+      }
+    }
+    return minline
+  }
+
+  function retreatFrontier(doc, n) {
+    doc.modeFrontier = Math.min(doc.modeFrontier, n);
+    if (doc.highlightFrontier < n - 10) { return }
+    var start = doc.first;
+    for (var line = n - 1; line > start; line--) {
+      var saved = getLine(doc, line).stateAfter;
+      // change is on 3
+      // state on line 1 looked ahead 2 -- so saw 3
+      // test 1 + 2 < 3 should cover this
+      if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+        start = line + 1;
+        break
+      }
+    }
+    doc.highlightFrontier = Math.min(doc.highlightFrontier, start);
+  }
+
+  // Optimize some code when these features are not used.
+  var sawReadOnlySpans = false, sawCollapsedSpans = false;
+
+  function seeReadOnlySpans() {
+    sawReadOnlySpans = true;
+  }
+
+  function seeCollapsedSpans() {
+    sawCollapsedSpans = true;
+  }
+
+  // TEXTMARKER SPANS
+
+  function MarkedSpan(marker, from, to) {
+    this.marker = marker;
+    this.from = from; this.to = to;
+  }
+
+  // Search an array of spans for a span matching the given marker.
+  function getMarkedSpanFor(spans, marker) {
+    if (spans) { for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.marker == marker) { return span }
+    } }
+  }
+
+  // Remove a span from an array, returning undefined if no spans are
+  // left (we don't store arrays for lines without spans).
+  function removeMarkedSpan(spans, span) {
+    var r;
+    for (var i = 0; i < spans.length; ++i)
+      { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }
+    return r
+  }
+
+  // Add a span to a line.
+  function addMarkedSpan(line, span, op) {
+    var inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet));
+    if (inThisOp && line.markedSpans && inThisOp.has(line.markedSpans)) {
+      line.markedSpans.push(span);
+    } else {
+      line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
+      if (inThisOp) { inThisOp.add(line.markedSpans); }
+    }
+    span.marker.attachLine(line);
+  }
+
+  // Used for the algorithm that adjusts markers for a change in the
+  // document. These functions cut an array of spans at a given
+  // character position, returning an array of remaining chunks (or
+  // undefined if nothing remains).
+  function markedSpansBefore(old, startCh, isInsert) {
+    var nw;
+    if (old) { for (var i = 0; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
+        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
+        ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
+      }
+    } }
+    return nw
+  }
+  function markedSpansAfter(old, endCh, isInsert) {
+    var nw;
+    if (old) { for (var i = 0; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
+        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
+        ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                              span.to == null ? null : span.to - endCh));
+      }
+    } }
+    return nw
+  }
+
+  // Given a change object, compute the new set of marker spans that
+  // cover the line in which the change took place. Removes spans
+  // entirely within the change, reconnects spans belonging to the
+  // same marker that appear on both sides of the change, and cuts off
+  // spans partially within the change. Returns an array of span
+  // arrays with one element for each line in (after) the change.
+  function stretchSpansOverChange(doc, change) {
+    if (change.full) { return null }
+    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
+    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
+    if (!oldFirst && !oldLast) { return null }
+
+    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
+    // Get the spans that 'stick out' on both sides
+    var first = markedSpansBefore(oldFirst, startCh, isInsert);
+    var last = markedSpansAfter(oldLast, endCh, isInsert);
+
+    // Next, merge those two ends
+    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
+    if (first) {
+      // Fix up .to properties of first
+      for (var i = 0; i < first.length; ++i) {
+        var span = first[i];
+        if (span.to == null) {
+          var found = getMarkedSpanFor(last, span.marker);
+          if (!found) { span.to = startCh; }
+          else if (sameLine) { span.to = found.to == null ? null : found.to + offset; }
+        }
+      }
+    }
+    if (last) {
+      // Fix up .from in last (or move them into first in case of sameLine)
+      for (var i$1 = 0; i$1 < last.length; ++i$1) {
+        var span$1 = last[i$1];
+        if (span$1.to != null) { span$1.to += offset; }
+        if (span$1.from == null) {
+          var found$1 = getMarkedSpanFor(first, span$1.marker);
+          if (!found$1) {
+            span$1.from = offset;
+            if (sameLine) { (first || (first = [])).push(span$1); }
+          }
+        } else {
+          span$1.from += offset;
+          if (sameLine) { (first || (first = [])).push(span$1); }
+        }
+      }
+    }
+    // Make sure we didn't create any zero-length spans
+    if (first) { first = clearEmptySpans(first); }
+    if (last && last != first) { last = clearEmptySpans(last); }
+
+    var newMarkers = [first];
+    if (!sameLine) {
+      // Fill gap with whole-line-spans
+      var gap = change.text.length - 2, gapMarkers;
+      if (gap > 0 && first)
+        { for (var i$2 = 0; i$2 < first.length; ++i$2)
+          { if (first[i$2].to == null)
+            { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } }
+      for (var i$3 = 0; i$3 < gap; ++i$3)
+        { newMarkers.push(gapMarkers); }
+      newMarkers.push(last);
+    }
+    return newMarkers
+  }
+
+  // Remove spans that are empty and don't have a clearWhenEmpty
+  // option of false.
+  function clearEmptySpans(spans) {
+    for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
+        { spans.splice(i--, 1); }
+    }
+    if (!spans.length) { return null }
+    return spans
+  }
+
+  // Used to 'clip' out readOnly ranges when making a change.
+  function removeReadOnlyRanges(doc, from, to) {
+    var markers = null;
+    doc.iter(from.line, to.line + 1, function (line) {
+      if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+        var mark = line.markedSpans[i].marker;
+        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
+          { (markers || (markers = [])).push(mark); }
+      } }
+    });
+    if (!markers) { return null }
+    var parts = [{from: from, to: to}];
+    for (var i = 0; i < markers.length; ++i) {
+      var mk = markers[i], m = mk.find(0);
+      for (var j = 0; j < parts.length; ++j) {
+        var p = parts[j];
+        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }
+        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
+          { newParts.push({from: p.from, to: m.from}); }
+        if (dto > 0 || !mk.inclusiveRight && !dto)
+          { newParts.push({from: m.to, to: p.to}); }
+        parts.splice.apply(parts, newParts);
+        j += newParts.length - 3;
+      }
+    }
+    return parts
+  }
+
+  // Connect or disconnect spans from a line.
+  function detachMarkedSpans(line) {
+    var spans = line.markedSpans;
+    if (!spans) { return }
+    for (var i = 0; i < spans.length; ++i)
+      { spans[i].marker.detachLine(line); }
+    line.markedSpans = null;
+  }
+  function attachMarkedSpans(line, spans) {
+    if (!spans) { return }
+    for (var i = 0; i < spans.length; ++i)
+      { spans[i].marker.attachLine(line); }
+    line.markedSpans = spans;
+  }
+
+  // Helpers used when computing which overlapping collapsed span
+  // counts as the larger one.
+  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
+  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
+
+  // Returns a number indicating which of two overlapping collapsed
+  // spans is larger (and thus includes the other). Falls back to
+  // comparing ids when the spans cover exactly the same range.
+  function compareCollapsedMarkers(a, b) {
+    var lenDiff = a.lines.length - b.lines.length;
+    if (lenDiff != 0) { return lenDiff }
+    var aPos = a.find(), bPos = b.find();
+    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
+    if (fromCmp) { return -fromCmp }
+    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
+    if (toCmp) { return toCmp }
+    return b.id - a.id
+  }
+
+  // Find out whether a line ends or starts in a collapsed span. If
+  // so, return the marker for that span.
+  function collapsedSpanAtSide(line, start) {
+    var sps = sawCollapsedSpans && line.markedSpans, found;
+    if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+      sp = sps[i];
+      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
+        { found = sp.marker; }
+    } }
+    return found
+  }
+  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
+  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
+
+  function collapsedSpanAround(line, ch) {
+    var sps = sawCollapsedSpans && line.markedSpans, found;
+    if (sps) { for (var i = 0; i < sps.length; ++i) {
+      var sp = sps[i];
+      if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }
+    } }
+    return found
+  }
+
+  // Test whether there exists a collapsed span that partially
+  // overlaps (covers the start or end, but not both) of a new span.
+  // Such overlap is not allowed.
+  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
+    var line = getLine(doc, lineNo);
+    var sps = sawCollapsedSpans && line.markedSpans;
+    if (sps) { for (var i = 0; i < sps.length; ++i) {
+      var sp = sps[i];
+      if (!sp.marker.collapsed) { continue }
+      var found = sp.marker.find(0);
+      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
+      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
+      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }
+      if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
+          fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
+        { return true }
+    } }
+  }
+
+  // A visual line is a line as drawn on the screen. Folding, for
+  // example, can cause multiple logical lines to appear on the same
+  // visual line. This finds the start of the visual line that the
+  // given line is part of (usually that is the line itself).
+  function visualLine(line) {
+    var merged;
+    while (merged = collapsedSpanAtStart(line))
+      { line = merged.find(-1, true).line; }
+    return line
+  }
+
+  function visualLineEnd(line) {
+    var merged;
+    while (merged = collapsedSpanAtEnd(line))
+      { line = merged.find(1, true).line; }
+    return line
+  }
+
+  // Returns an array of logical lines that continue the visual line
+  // started by the argument, or undefined if there are no such lines.
+  function visualLineContinued(line) {
+    var merged, lines;
+    while (merged = collapsedSpanAtEnd(line)) {
+      line = merged.find(1, true).line
+      ;(lines || (lines = [])).push(line);
+    }
+    return lines
+  }
+
+  // Get the line number of the start of the visual line that the
+  // given line number is part of.
+  function visualLineNo(doc, lineN) {
+    var line = getLine(doc, lineN), vis = visualLine(line);
+    if (line == vis) { return lineN }
+    return lineNo(vis)
+  }
+
+  // Get the line number of the start of the next visual line after
+  // the given line.
+  function visualLineEndNo(doc, lineN) {
+    if (lineN > doc.lastLine()) { return lineN }
+    var line = getLine(doc, lineN), merged;
+    if (!lineIsHidden(doc, line)) { return lineN }
+    while (merged = collapsedSpanAtEnd(line))
+      { line = merged.find(1, true).line; }
+    return lineNo(line) + 1
+  }
+
+  // Compute whether a line is hidden. Lines count as hidden when they
+  // are part of a visual line that starts with another line, or when
+  // they are entirely covered by collapsed, non-widget span.
+  function lineIsHidden(doc, line) {
+    var sps = sawCollapsedSpans && line.markedSpans;
+    if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+      sp = sps[i];
+      if (!sp.marker.collapsed) { continue }
+      if (sp.from == null) { return true }
+      if (sp.marker.widgetNode) { continue }
+      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
+        { return true }
+    } }
+  }
+  function lineIsHiddenInner(doc, line, span) {
+    if (span.to == null) {
+      var end = span.marker.find(1, true);
+      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
+    }
+    if (span.marker.inclusiveRight && span.to == line.text.length)
+      { return true }
+    for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {
+      sp = line.markedSpans[i];
+      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
+          (sp.to == null || sp.to != span.from) &&
+          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
+          lineIsHiddenInner(doc, line, sp)) { return true }
+    }
+  }
+
+  // Find the height above the given line.
+  function heightAtLine(lineObj) {
+    lineObj = visualLine(lineObj);
+
+    var h = 0, chunk = lineObj.parent;
+    for (var i = 0; i < chunk.lines.length; ++i) {
+      var line = chunk.lines[i];
+      if (line == lineObj) { break }
+      else { h += line.height; }
+    }
+    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
+      for (var i$1 = 0; i$1 < p.children.length; ++i$1) {
+        var cur = p.children[i$1];
+        if (cur == chunk) { break }
+        else { h += cur.height; }
+      }
+    }
+    return h
+  }
+
+  // Compute the character length of a line, taking into account
+  // collapsed ranges (see markText) that might hide parts, and join
+  // other lines onto it.
+  function lineLength(line) {
+    if (line.height == 0) { return 0 }
+    var len = line.text.length, merged, cur = line;
+    while (merged = collapsedSpanAtStart(cur)) {
+      var found = merged.find(0, true);
+      cur = found.from.line;
+      len += found.from.ch - found.to.ch;
+    }
+    cur = line;
+    while (merged = collapsedSpanAtEnd(cur)) {
+      var found$1 = merged.find(0, true);
+      len -= cur.text.length - found$1.from.ch;
+      cur = found$1.to.line;
+      len += cur.text.length - found$1.to.ch;
+    }
+    return len
+  }
+
+  // Find the longest line in the document.
+  function findMaxLine(cm) {
+    var d = cm.display, doc = cm.doc;
+    d.maxLine = getLine(doc, doc.first);
+    d.maxLineLength = lineLength(d.maxLine);
+    d.maxLineChanged = true;
+    doc.iter(function (line) {
+      var len = lineLength(line);
+      if (len > d.maxLineLength) {
+        d.maxLineLength = len;
+        d.maxLine = line;
+      }
+    });
+  }
+
+  // LINE DATA STRUCTURE
+
+  // Line objects. These hold state related to a line, including
+  // highlighting info (the styles array).
+  var Line = function(text, markedSpans, estimateHeight) {
+    this.text = text;
+    attachMarkedSpans(this, markedSpans);
+    this.height = estimateHeight ? estimateHeight(this) : 1;
+  };
+
+  Line.prototype.lineNo = function () { return lineNo(this) };
+  eventMixin(Line);
+
+  // Change the content (text, markers) of a line. Automatically
+  // invalidates cached information and tries to re-estimate the
+  // line's height.
+  function updateLine(line, text, markedSpans, estimateHeight) {
+    line.text = text;
+    if (line.stateAfter) { line.stateAfter = null; }
+    if (line.styles) { line.styles = null; }
+    if (line.order != null) { line.order = null; }
+    detachMarkedSpans(line);
+    attachMarkedSpans(line, markedSpans);
+    var estHeight = estimateHeight ? estimateHeight(line) : 1;
+    if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+  }
+
+  // Detach a line from the document tree and its markers.
+  function cleanUpLine(line) {
+    line.parent = null;
+    detachMarkedSpans(line);
+  }
+
+  // Convert a style as returned by a mode (either null, or a string
+  // containing one or more styles) to a CSS style. This is cached,
+  // and also looks for line-wide styles.
+  var styleToClassCache = {}, styleToClassCacheWithMode = {};
+  function interpretTokenStyle(style, options) {
+    if (!style || /^\s*$/.test(style)) { return null }
+    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+    return cache[style] ||
+      (cache[style] = style.replace(/\S+/g, "cm-$&"))
+  }
+
+  // Render the DOM representation of the text of a line. Also builds
+  // up a 'line map', which points at the DOM nodes that represent
+  // specific stretches of text, and is used by the measuring code.
+  // The returned object contains the DOM node, this map, and
+  // information about line-wide styles that were set by the mode.
+  function buildLineContent(cm, lineView) {
+    // The padding-right forces the element to have a 'border', which
+    // is needed on Webkit to be able to get line-level bounding
+    // rectangles for it (in measureChar).
+    var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null);
+    var builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
+                   col: 0, pos: 0, cm: cm,
+                   trailingSpace: false,
+                   splitSpaces: cm.getOption("lineWrapping")};
+    lineView.measure = {};
+
+    // Iterate over the logical lines that make up this visual line.
+    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+      var line = i ? lineView.rest[i - 1] : lineView.line, order = (void 0);
+      builder.pos = 0;
+      builder.addToken = buildToken;
+      // Optionally wire in some hacks into the token-rendering
+      // algorithm, to deal with browser quirks.
+      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
+        { builder.addToken = buildTokenBadBidi(builder.addToken, order); }
+      builder.map = [];
+      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
+      if (line.styleClasses) {
+        if (line.styleClasses.bgClass)
+          { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); }
+        if (line.styleClasses.textClass)
+          { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); }
+      }
+
+      // Ensure at least a single node is present, for measuring.
+      if (builder.map.length == 0)
+        { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); }
+
+      // Store the map and a cache object for the current logical line
+      if (i == 0) {
+        lineView.measure.map = builder.map;
+        lineView.measure.cache = {};
+      } else {
+  (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
+        ;(lineView.measure.caches || (lineView.measure.caches = [])).push({});
+      }
+    }
+
+    // See issue #2901
+    if (webkit) {
+      var last = builder.content.lastChild;
+      if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
+        { builder.content.className = "cm-tab-wrap-hack"; }
+    }
+
+    signal(cm, "renderLine", cm, lineView.line, builder.pre);
+    if (builder.pre.className)
+      { builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); }
+
+    return builder
+  }
+
+  function defaultSpecialCharPlaceholder(ch) {
+    var token = elt("span", "\u2022", "cm-invalidchar");
+    token.title = "\\u" + ch.charCodeAt(0).toString(16);
+    token.setAttribute("aria-label", token.title);
+    return token
+  }
+
+  // Build up the DOM representation for a single token, and add it to
+  // the line map. Takes care to render special characters separately.
+  function buildToken(builder, text, style, startStyle, endStyle, css, attributes) {
+    if (!text) { return }
+    var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text;
+    var special = builder.cm.state.specialChars, mustWrap = false;
+    var content;
+    if (!special.test(text)) {
+      builder.col += text.length;
+      content = document.createTextNode(displayText);
+      builder.map.push(builder.pos, builder.pos + text.length, content);
+      if (ie && ie_version < 9) { mustWrap = true; }
+      builder.pos += text.length;
+    } else {
+      content = document.createDocumentFragment();
+      var pos = 0;
+      while (true) {
+        special.lastIndex = pos;
+        var m = special.exec(text);
+        var skipped = m ? m.index - pos : text.length - pos;
+        if (skipped) {
+          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+          if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])); }
+          else { content.appendChild(txt); }
+          builder.map.push(builder.pos, builder.pos + skipped, txt);
+          builder.col += skipped;
+          builder.pos += skipped;
+        }
+        if (!m) { break }
+        pos += skipped + 1;
+        var txt$1 = (void 0);
+        if (m[0] == "\t") {
+          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
+          txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+          txt$1.setAttribute("role", "presentation");
+          txt$1.setAttribute("cm-text", "\t");
+          builder.col += tabWidth;
+        } else if (m[0] == "\r" || m[0] == "\n") {
+          txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+          txt$1.setAttribute("cm-text", m[0]);
+          builder.col += 1;
+        } else {
+          txt$1 = builder.cm.options.specialCharPlaceholder(m[0]);
+          txt$1.setAttribute("cm-text", m[0]);
+          if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])); }
+          else { content.appendChild(txt$1); }
+          builder.col += 1;
+        }
+        builder.map.push(builder.pos, builder.pos + 1, txt$1);
+        builder.pos++;
+      }
+    }
+    builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32;
+    if (style || startStyle || endStyle || mustWrap || css || attributes) {
+      var fullStyle = style || "";
+      if (startStyle) { fullStyle += startStyle; }
+      if (endStyle) { fullStyle += endStyle; }
+      var token = elt("span", [content], fullStyle, css);
+      if (attributes) {
+        for (var attr in attributes) { if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class")
+          { token.setAttribute(attr, attributes[attr]); } }
+      }
+      return builder.content.appendChild(token)
+    }
+    builder.content.appendChild(content);
+  }
+
+  // Change some spaces to NBSP to prevent the browser from collapsing
+  // trailing spaces at the end of a line when rendering text (issue #1362).
+  function splitSpaces(text, trailingBefore) {
+    if (text.length > 1 && !/  /.test(text)) { return text }
+    var spaceBefore = trailingBefore, result = "";
+    for (var i = 0; i < text.length; i++) {
+      var ch = text.charAt(i);
+      if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
+        { ch = "\u00a0"; }
+      result += ch;
+      spaceBefore = ch == " ";
+    }
+    return result
+  }
+
+  // Work around nonsense dimensions being reported for stretches of
+  // right-to-left text.
+  function buildTokenBadBidi(inner, order) {
+    return function (builder, text, style, startStyle, endStyle, css, attributes) {
+      style = style ? style + " cm-force-border" : "cm-force-border";
+      var start = builder.pos, end = start + text.length;
+      for (;;) {
+        // Find the part that overlaps with the start of this text
+        var part = (void 0);
+        for (var i = 0; i < order.length; i++) {
+          part = order[i];
+          if (part.to > start && part.from <= start) { break }
+        }
+        if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, css, attributes) }
+        inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes);
+        startStyle = null;
+        text = text.slice(part.to - start);
+        start = part.to;
+      }
+    }
+  }
+
+  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+    var widget = !ignoreWidget && marker.widgetNode;
+    if (widget) { builder.map.push(builder.pos, builder.pos + size, widget); }
+    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+      if (!widget)
+        { widget = builder.content.appendChild(document.createElement("span")); }
+      widget.setAttribute("cm-marker", marker.id);
+    }
+    if (widget) {
+      builder.cm.display.input.setUneditable(widget);
+      builder.content.appendChild(widget);
+    }
+    builder.pos += size;
+    builder.trailingSpace = false;
+  }
+
+  // Outputs a number of spans to make up a line, taking highlighting
+  // and marked text into account.
+  function insertLineContent(line, builder, styles) {
+    var spans = line.markedSpans, allText = line.text, at = 0;
+    if (!spans) {
+      for (var i$1 = 1; i$1 < styles.length; i$1+=2)
+        { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)); }
+      return
+    }
+
+    var len = allText.length, pos = 0, i = 1, text = "", style, css;
+    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed, attributes;
+    for (;;) {
+      if (nextChange == pos) { // Update current marker set
+        spanStyle = spanEndStyle = spanStartStyle = css = "";
+        attributes = null;
+        collapsed = null; nextChange = Infinity;
+        var foundBookmarks = [], endStyles = (void 0);
+        for (var j = 0; j < spans.length; ++j) {
+          var sp = spans[j], m = sp.marker;
+          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+            foundBookmarks.push(m);
+          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+              nextChange = sp.to;
+              spanEndStyle = "";
+            }
+            if (m.className) { spanStyle += " " + m.className; }
+            if (m.css) { css = (css ? css + ";" : "") + m.css; }
+            if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
+            if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
+            // support for the old title property
+            // https://github.com/codemirror/CodeMirror/pull/5673
+            if (m.title) { (attributes || (attributes = {})).title = m.title; }
+            if (m.attributes) {
+              for (var attr in m.attributes)
+                { (attributes || (attributes = {}))[attr] = m.attributes[attr]; }
+            }
+            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
+              { collapsed = sp; }
+          } else if (sp.from > pos && nextChange > sp.from) {
+            nextChange = sp.from;
+          }
+        }
+        if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2)
+          { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1]; } } }
+
+        if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2)
+          { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); } }
+        if (collapsed && (collapsed.from || 0) == pos) {
+          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
+                             collapsed.marker, collapsed.from == null);
+          if (collapsed.to == null) { return }
+          if (collapsed.to == pos) { collapsed = false; }
+        }
+      }
+      if (pos >= len) { break }
+
+      var upto = Math.min(len, nextChange);
+      while (true) {
+        if (text) {
+          var end = pos + text.length;
+          if (!collapsed) {
+            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
+            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
+                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes);
+          }
+          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
+          pos = end;
+          spanStartStyle = "";
+        }
+        text = allText.slice(at, at = styles[i++]);
+        style = interpretTokenStyle(styles[i++], builder.cm.options);
+      }
+    }
+  }
+
+
+  // These objects are used to represent the visible (currently drawn)
+  // part of the document. A LineView may correspond to multiple
+  // logical lines, if those are connected by collapsed ranges.
+  function LineView(doc, line, lineN) {
+    // The starting line
+    this.line = line;
+    // Continuing lines, if any
+    this.rest = visualLineContinued(line);
+    // Number of logical lines in this visual line
+    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+    this.node = this.text = null;
+    this.hidden = lineIsHidden(doc, line);
+  }
+
+  // Create a range of LineView objects for the given lines.
+  function buildViewArray(cm, from, to) {
+    var array = [], nextPos;
+    for (var pos = from; pos < to; pos = nextPos) {
+      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+      nextPos = pos + view.size;
+      array.push(view);
+    }
+    return array
+  }
+
+  var operationGroup = null;
+
+  function pushOperation(op) {
+    if (operationGroup) {
+      operationGroup.ops.push(op);
+    } else {
+      op.ownsGroup = operationGroup = {
+        ops: [op],
+        delayedCallbacks: []
+      };
+    }
+  }
+
+  function fireCallbacksForOps(group) {
+    // Calls delayed callbacks and cursorActivity handlers until no
+    // new ones appear
+    var callbacks = group.delayedCallbacks, i = 0;
+    do {
+      for (; i < callbacks.length; i++)
+        { callbacks[i].call(null); }
+      for (var j = 0; j < group.ops.length; j++) {
+        var op = group.ops[j];
+        if (op.cursorActivityHandlers)
+          { while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+            { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); } }
+      }
+    } while (i < callbacks.length)
+  }
+
+  function finishOperation(op, endCb) {
+    var group = op.ownsGroup;
+    if (!group) { return }
+
+    try { fireCallbacksForOps(group); }
+    finally {
+      operationGroup = null;
+      endCb(group);
+    }
+  }
+
+  var orphanDelayedCallbacks = null;
+
+  // Often, we want to signal events at a point where we are in the
+  // middle of some work, but don't want the handler to start calling
+  // other methods on the editor, which might be in an inconsistent
+  // state or simply not expect any other events to happen.
+  // signalLater looks whether there are any handlers, and schedules
+  // them to be executed when the last operation ends, or, if no
+  // operation is active, when a timeout fires.
+  function signalLater(emitter, type /*, values...*/) {
+    var arr = getHandlers(emitter, type);
+    if (!arr.length) { return }
+    var args = Array.prototype.slice.call(arguments, 2), list;
+    if (operationGroup) {
+      list = operationGroup.delayedCallbacks;
+    } else if (orphanDelayedCallbacks) {
+      list = orphanDelayedCallbacks;
+    } else {
+      list = orphanDelayedCallbacks = [];
+      setTimeout(fireOrphanDelayed, 0);
+    }
+    var loop = function ( i ) {
+      list.push(function () { return arr[i].apply(null, args); });
+    };
+
+    for (var i = 0; i < arr.length; ++i)
+      loop( i );
+  }
+
+  function fireOrphanDelayed() {
+    var delayed = orphanDelayedCallbacks;
+    orphanDelayedCallbacks = null;
+    for (var i = 0; i < delayed.length; ++i) { delayed[i](); }
+  }
+
+  // When an aspect of a line changes, a string is added to
+  // lineView.changes. This updates the relevant part of the line's
+  // DOM structure.
+  function updateLineForChanges(cm, lineView, lineN, dims) {
+    for (var j = 0; j < lineView.changes.length; j++) {
+      var type = lineView.changes[j];
+      if (type == "text") { updateLineText(cm, lineView); }
+      else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims); }
+      else if (type == "class") { updateLineClasses(cm, lineView); }
+      else if (type == "widget") { updateLineWidgets(cm, lineView, dims); }
+    }
+    lineView.changes = null;
+  }
+
+  // Lines with gutter elements, widgets or a background class need to
+  // be wrapped, and have the extra elements added to the wrapper div
+  function ensureLineWrapped(lineView) {
+    if (lineView.node == lineView.text) {
+      lineView.node = elt("div", null, null, "position: relative");
+      if (lineView.text.parentNode)
+        { lineView.text.parentNode.replaceChild(lineView.node, lineView.text); }
+      lineView.node.appendChild(lineView.text);
+      if (ie && ie_version < 8) { lineView.node.style.zIndex = 2; }
+    }
+    return lineView.node
+  }
+
+  function updateLineBackground(cm, lineView) {
+    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
+    if (cls) { cls += " CodeMirror-linebackground"; }
+    if (lineView.background) {
+      if (cls) { lineView.background.className = cls; }
+      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+    } else if (cls) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+      cm.display.input.setUneditable(lineView.background);
+    }
+  }
+
+  // Wrapper around buildLineContent which will reuse the structure
+  // in display.externalMeasured when possible.
+  function getLineContent(cm, lineView) {
+    var ext = cm.display.externalMeasured;
+    if (ext && ext.line == lineView.line) {
+      cm.display.externalMeasured = null;
+      lineView.measure = ext.measure;
+      return ext.built
+    }
+    return buildLineContent(cm, lineView)
+  }
+
+  // Redraw the line's text. Interacts with the background and text
+  // classes because the mode may output tokens that influence these
+  // classes.
+  function updateLineText(cm, lineView) {
+    var cls = lineView.text.className;
+    var built = getLineContent(cm, lineView);
+    if (lineView.text == lineView.node) { lineView.node = built.pre; }
+    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
+    lineView.text = built.pre;
+    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
+      lineView.bgClass = built.bgClass;
+      lineView.textClass = built.textClass;
+      updateLineClasses(cm, lineView);
+    } else if (cls) {
+      lineView.text.className = cls;
+    }
+  }
+
+  function updateLineClasses(cm, lineView) {
+    updateLineBackground(cm, lineView);
+    if (lineView.line.wrapClass)
+      { ensureLineWrapped(lineView).className = lineView.line.wrapClass; }
+    else if (lineView.node != lineView.text)
+      { lineView.node.className = ""; }
+    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
+    lineView.text.className = textClass || "";
+  }
+
+  function updateLineGutter(cm, lineView, lineN, dims) {
+    if (lineView.gutter) {
+      lineView.node.removeChild(lineView.gutter);
+      lineView.gutter = null;
+    }
+    if (lineView.gutterBackground) {
+      lineView.node.removeChild(lineView.gutterBackground);
+      lineView.gutterBackground = null;
+    }
+    if (lineView.line.gutterClass) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                      ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px"));
+      cm.display.input.setUneditable(lineView.gutterBackground);
+      wrap.insertBefore(lineView.gutterBackground, lineView.text);
+    }
+    var markers = lineView.line.gutterMarkers;
+    if (cm.options.lineNumbers || markers) {
+      var wrap$1 = ensureLineWrapped(lineView);
+      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"));
+      gutterWrap.setAttribute("aria-hidden", "true");
+      cm.display.input.setUneditable(gutterWrap);
+      wrap$1.insertBefore(gutterWrap, lineView.text);
+      if (lineView.line.gutterClass)
+        { gutterWrap.className += " " + lineView.line.gutterClass; }
+      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
+        { lineView.lineNumber = gutterWrap.appendChild(
+          elt("div", lineNumberFor(cm.options, lineN),
+              "CodeMirror-linenumber CodeMirror-gutter-elt",
+              ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))); }
+      if (markers) { for (var k = 0; k < cm.display.gutterSpecs.length; ++k) {
+        var id = cm.display.gutterSpecs[k].className, found = markers.hasOwnProperty(id) && markers[id];
+        if (found)
+          { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
+                                     ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))); }
+      } }
+    }
+  }
+
+  function updateLineWidgets(cm, lineView, dims) {
+    if (lineView.alignable) { lineView.alignable = null; }
+    var isWidget = classTest("CodeMirror-linewidget");
+    for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {
+      next = node.nextSibling;
+      if (isWidget.test(node.className)) { lineView.node.removeChild(node); }
+    }
+    insertLineWidgets(cm, lineView, dims);
+  }
+
+  // Build a line's DOM representation from scratch
+  function buildLineElement(cm, lineView, lineN, dims) {
+    var built = getLineContent(cm, lineView);
+    lineView.text = lineView.node = built.pre;
+    if (built.bgClass) { lineView.bgClass = built.bgClass; }
+    if (built.textClass) { lineView.textClass = built.textClass; }
+
+    updateLineClasses(cm, lineView);
+    updateLineGutter(cm, lineView, lineN, dims);
+    insertLineWidgets(cm, lineView, dims);
+    return lineView.node
+  }
+
+  // A lineView may contain multiple logical lines (when merged by
+  // collapsed spans). The widgets for all of them need to be drawn.
+  function insertLineWidgets(cm, lineView, dims) {
+    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
+    if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+      { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); } }
+  }
+
+  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
+    if (!line.widgets) { return }
+    var wrap = ensureLineWrapped(lineView);
+    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""));
+      if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); }
+      positionLineWidget(widget, node, lineView, dims);
+      cm.display.input.setUneditable(node);
+      if (allowAbove && widget.above)
+        { wrap.insertBefore(node, lineView.gutter || lineView.text); }
+      else
+        { wrap.appendChild(node); }
+      signalLater(widget, "redraw");
+    }
+  }
+
+  function positionLineWidget(widget, node, lineView, dims) {
+    if (widget.noHScroll) {
+  (lineView.alignable || (lineView.alignable = [])).push(node);
+      var width = dims.wrapperWidth;
+      node.style.left = dims.fixedPos + "px";
+      if (!widget.coverGutter) {
+        width -= dims.gutterTotalWidth;
+        node.style.paddingLeft = dims.gutterTotalWidth + "px";
+      }
+      node.style.width = width + "px";
+    }
+    if (widget.coverGutter) {
+      node.style.zIndex = 5;
+      node.style.position = "relative";
+      if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px"; }
+    }
+  }
+
+  function widgetHeight(widget) {
+    if (widget.height != null) { return widget.height }
+    var cm = widget.doc.cm;
+    if (!cm) { return 0 }
+    if (!contains(document.body, widget.node)) {
+      var parentStyle = "position: relative;";
+      if (widget.coverGutter)
+        { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; }
+      if (widget.noHScroll)
+        { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; }
+      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+    }
+    return widget.height = widget.node.parentNode.offsetHeight
+  }
+
+  // Return true when the given mouse event happened in a widget
+  function eventInWidget(display, e) {
+    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
+      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+          (n.parentNode == display.sizer && n != display.mover))
+        { return true }
+    }
+  }
+
+  // POSITION MEASUREMENT
+
+  function paddingTop(display) {return display.lineSpace.offsetTop}
+  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
+  function paddingH(display) {
+    if (display.cachedPaddingH) { return display.cachedPaddingH }
+    var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"));
+    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
+    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
+    if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }
+    return data
+  }
+
+  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
+  function displayWidth(cm) {
+    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
+  }
+  function displayHeight(cm) {
+    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
+  }
+
+  // Ensure the lineView.wrapping.heights array is populated. This is
+  // an array of bottom offsets for the lines that make up a drawn
+  // line. When lineWrapping is on, there might be more than one
+  // height.
+  function ensureLineHeights(cm, lineView, rect) {
+    var wrapping = cm.options.lineWrapping;
+    var curWidth = wrapping && displayWidth(cm);
+    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
+      var heights = lineView.measure.heights = [];
+      if (wrapping) {
+        lineView.measure.width = curWidth;
+        var rects = lineView.text.firstChild.getClientRects();
+        for (var i = 0; i < rects.length - 1; i++) {
+          var cur = rects[i], next = rects[i + 1];
+          if (Math.abs(cur.bottom - next.bottom) > 2)
+            { heights.push((cur.bottom + next.top) / 2 - rect.top); }
+        }
+      }
+      heights.push(rect.bottom - rect.top);
+    }
+  }
+
+  // Find a line map (mapping character offsets to text nodes) and a
+  // measurement cache for the given line number. (A line view might
+  // contain multiple lines when collapsed ranges are present.)
+  function mapFromLineView(lineView, line, lineN) {
+    if (lineView.line == line)
+      { return {map: lineView.measure.map, cache: lineView.measure.cache} }
+    if (lineView.rest) {
+      for (var i = 0; i < lineView.rest.length; i++)
+        { if (lineView.rest[i] == line)
+          { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }
+      for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)
+        { if (lineNo(lineView.rest[i$1]) > lineN)
+          { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }
+    }
+  }
+
+  // Render a line into the hidden node display.externalMeasured. Used
+  // when measurement is needed for a line that's not in the viewport.
+  function updateExternalMeasurement(cm, line) {
+    line = visualLine(line);
+    var lineN = lineNo(line);
+    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
+    view.lineN = lineN;
+    var built = view.built = buildLineContent(cm, view);
+    view.text = built.pre;
+    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
+    return view
+  }
+
+  // Get a {top, bottom, left, right} box (in line-local coordinates)
+  // for a given character.
+  function measureChar(cm, line, ch, bias) {
+    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
+  }
+
+  // Find a line view that corresponds to the given line number.
+  function findViewForLine(cm, lineN) {
+    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
+      { return cm.display.view[findViewIndex(cm, lineN)] }
+    var ext = cm.display.externalMeasured;
+    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+      { return ext }
+  }
+
+  // Measurement can be split in two steps, the set-up work that
+  // applies to the whole line, and the measurement of the actual
+  // character. Functions like coordsChar, that need to do a lot of
+  // measurements in a row, can thus ensure that the set-up work is
+  // only done once.
+  function prepareMeasureForLine(cm, line) {
+    var lineN = lineNo(line);
+    var view = findViewForLine(cm, lineN);
+    if (view && !view.text) {
+      view = null;
+    } else if (view && view.changes) {
+      updateLineForChanges(cm, view, lineN, getDimensions(cm));
+      cm.curOp.forceUpdate = true;
+    }
+    if (!view)
+      { view = updateExternalMeasurement(cm, line); }
+
+    var info = mapFromLineView(view, line, lineN);
+    return {
+      line: line, view: view, rect: null,
+      map: info.map, cache: info.cache, before: info.before,
+      hasHeights: false
+    }
+  }
+
+  // Given a prepared measurement object, measures the position of an
+  // actual character (or fetches it from the cache).
+  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+    if (prepared.before) { ch = -1; }
+    var key = ch + (bias || ""), found;
+    if (prepared.cache.hasOwnProperty(key)) {
+      found = prepared.cache[key];
+    } else {
+      if (!prepared.rect)
+        { prepared.rect = prepared.view.text.getBoundingClientRect(); }
+      if (!prepared.hasHeights) {
+        ensureLineHeights(cm, prepared.view, prepared.rect);
+        prepared.hasHeights = true;
+      }
+      found = measureCharInner(cm, prepared, ch, bias);
+      if (!found.bogus) { prepared.cache[key] = found; }
+    }
+    return {left: found.left, right: found.right,
+            top: varHeight ? found.rtop : found.top,
+            bottom: varHeight ? found.rbottom : found.bottom}
+  }
+
+  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+
+  function nodeAndOffsetInLineMap(map, ch, bias) {
+    var node, start, end, collapse, mStart, mEnd;
+    // First, search the line map for the text node corresponding to,
+    // or closest to, the target character.
+    for (var i = 0; i < map.length; i += 3) {
+      mStart = map[i];
+      mEnd = map[i + 1];
+      if (ch < mStart) {
+        start = 0; end = 1;
+        collapse = "left";
+      } else if (ch < mEnd) {
+        start = ch - mStart;
+        end = start + 1;
+      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
+        end = mEnd - mStart;
+        start = end - 1;
+        if (ch >= mEnd) { collapse = "right"; }
+      }
+      if (start != null) {
+        node = map[i + 2];
+        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
+          { collapse = bias; }
+        if (bias == "left" && start == 0)
+          { while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
+            node = map[(i -= 3) + 2];
+            collapse = "left";
+          } }
+        if (bias == "right" && start == mEnd - mStart)
+          { while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
+            node = map[(i += 3) + 2];
+            collapse = "right";
+          } }
+        break
+      }
+    }
+    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
+  }
+
+  function getUsefulRect(rects, bias) {
+    var rect = nullRect;
+    if (bias == "left") { for (var i = 0; i < rects.length; i++) {
+      if ((rect = rects[i]).left != rect.right) { break }
+    } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) {
+      if ((rect = rects[i$1]).left != rect.right) { break }
+    } }
+    return rect
+  }
+
+  function measureCharInner(cm, prepared, ch, bias) {
+    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+
+    var rect;
+    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
+      for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start; }
+        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end; }
+        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
+          { rect = node.parentNode.getBoundingClientRect(); }
+        else
+          { rect = getUsefulRect(range(node, start, end).getClientRects(), bias); }
+        if (rect.left || rect.right || start == 0) { break }
+        end = start;
+        start = start - 1;
+        collapse = "right";
+      }
+      if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect); }
+    } else { // If it is a widget, simply get the box for the whole widget.
+      if (start > 0) { collapse = bias = "right"; }
+      var rects;
+      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
+        { rect = rects[bias == "right" ? rects.length - 1 : 0]; }
+      else
+        { rect = node.getBoundingClientRect(); }
+    }
+    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
+      var rSpan = node.parentNode.getClientRects()[0];
+      if (rSpan)
+        { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; }
+      else
+        { rect = nullRect; }
+    }
+
+    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+    var mid = (rtop + rbot) / 2;
+    var heights = prepared.view.measure.heights;
+    var i = 0;
+    for (; i < heights.length - 1; i++)
+      { if (mid < heights[i]) { break } }
+    var top = i ? heights[i - 1] : 0, bot = heights[i];
+    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
+                  top: top, bottom: bot};
+    if (!rect.left && !rect.right) { result.bogus = true; }
+    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
+    return result
+  }
+
+  // Work around problem with bounding client rects on ranges being
+  // returned incorrectly when zoomed on IE10 and below.
+  function maybeUpdateRectForZooming(measure, rect) {
+    if (!window.screen || screen.logicalXDPI == null ||
+        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+      { return rect }
+    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+    return {left: rect.left * scaleX, right: rect.right * scaleX,
+            top: rect.top * scaleY, bottom: rect.bottom * scaleY}
+  }
+
+  function clearLineMeasurementCacheFor(lineView) {
+    if (lineView.measure) {
+      lineView.measure.cache = {};
+      lineView.measure.heights = null;
+      if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+        { lineView.measure.caches[i] = {}; } }
+    }
+  }
+
+  function clearLineMeasurementCache(cm) {
+    cm.display.externalMeasure = null;
+    removeChildren(cm.display.lineMeasure);
+    for (var i = 0; i < cm.display.view.length; i++)
+      { clearLineMeasurementCacheFor(cm.display.view[i]); }
+  }
+
+  function clearCaches(cm) {
+    clearLineMeasurementCache(cm);
+    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
+    if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true; }
+    cm.display.lineNumChars = null;
+  }
+
+  function pageScrollX(doc) {
+    // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
+    // which causes page_Offset and bounding client rects to use
+    // different reference viewports and invalidate our calculations.
+    if (chrome && android) { return -(doc.body.getBoundingClientRect().left - parseInt(getComputedStyle(doc.body).marginLeft)) }
+    return doc.defaultView.pageXOffset || (doc.documentElement || doc.body).scrollLeft
+  }
+  function pageScrollY(doc) {
+    if (chrome && android) { return -(doc.body.getBoundingClientRect().top - parseInt(getComputedStyle(doc.body).marginTop)) }
+    return doc.defaultView.pageYOffset || (doc.documentElement || doc.body).scrollTop
+  }
+
+  function widgetTopHeight(lineObj) {
+    var ref = visualLine(lineObj);
+    var widgets = ref.widgets;
+    var height = 0;
+    if (widgets) { for (var i = 0; i < widgets.length; ++i) { if (widgets[i].above)
+      { height += widgetHeight(widgets[i]); } } }
+    return height
+  }
+
+  // Converts a {top, bottom, left, right} box from line-local
+  // coordinates into another coordinate system. Context may be one of
+  // "line", "div" (display.lineDiv), "local"./null (editor), "window",
+  // or "page".
+  function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
+    if (!includeWidgets) {
+      var height = widgetTopHeight(lineObj);
+      rect.top += height; rect.bottom += height;
+    }
+    if (context == "line") { return rect }
+    if (!context) { context = "local"; }
+    var yOff = heightAtLine(lineObj);
+    if (context == "local") { yOff += paddingTop(cm.display); }
+    else { yOff -= cm.display.viewOffset; }
+    if (context == "page" || context == "window") {
+      var lOff = cm.display.lineSpace.getBoundingClientRect();
+      yOff += lOff.top + (context == "window" ? 0 : pageScrollY(doc(cm)));
+      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX(doc(cm)));
+      rect.left += xOff; rect.right += xOff;
+    }
+    rect.top += yOff; rect.bottom += yOff;
+    return rect
+  }
+
+  // Coverts a box from "div" coords to another coordinate system.
+  // Context may be "window", "page", "div", or "local"./null.
+  function fromCoordSystem(cm, coords, context) {
+    if (context == "div") { return coords }
+    var left = coords.left, top = coords.top;
+    // First move into "page" coordinate system
+    if (context == "page") {
+      left -= pageScrollX(doc(cm));
+      top -= pageScrollY(doc(cm));
+    } else if (context == "local" || !context) {
+      var localBox = cm.display.sizer.getBoundingClientRect();
+      left += localBox.left;
+      top += localBox.top;
+    }
+
+    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
+    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
+  }
+
+  function charCoords(cm, pos, context, lineObj, bias) {
+    if (!lineObj) { lineObj = getLine(cm.doc, pos.line); }
+    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
+  }
+
+  // Returns a box for a given cursor position, which may have an
+  // 'other' property containing the position of the secondary cursor
+  // on a bidi boundary.
+  // A cursor Pos(line, char, "before") is on the same visual line as `char - 1`
+  // and after `char - 1` in writing order of `char - 1`
+  // A cursor Pos(line, char, "after") is on the same visual line as `char`
+  // and before `char` in writing order of `char`
+  // Examples (upper-case letters are RTL, lower-case are LTR):
+  //     Pos(0, 1, ...)
+  //     before   after
+  // ab     a|b     a|b
+  // aB     a|B     aB|
+  // Ab     |Ab     A|b
+  // AB     B|A     B|A
+  // Every position after the last character on a line is considered to stick
+  // to the last character on the line.
+  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
+    lineObj = lineObj || getLine(cm.doc, pos.line);
+    if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+    function get(ch, right) {
+      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
+      if (right) { m.left = m.right; } else { m.right = m.left; }
+      return intoCoordSystem(cm, lineObj, m, context)
+    }
+    var order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky;
+    if (ch >= lineObj.text.length) {
+      ch = lineObj.text.length;
+      sticky = "before";
+    } else if (ch <= 0) {
+      ch = 0;
+      sticky = "after";
+    }
+    if (!order) { return get(sticky == "before" ? ch - 1 : ch, sticky == "before") }
+
+    function getBidi(ch, partPos, invert) {
+      var part = order[partPos], right = part.level == 1;
+      return get(invert ? ch - 1 : ch, right != invert)
+    }
+    var partPos = getBidiPartAt(order, ch, sticky);
+    var other = bidiOther;
+    var val = getBidi(ch, partPos, sticky == "before");
+    if (other != null) { val.other = getBidi(ch, other, sticky != "before"); }
+    return val
+  }
+
+  // Used to cheaply estimate the coordinates for a position. Used for
+  // intermediate scroll updates.
+  function estimateCoords(cm, pos) {
+    var left = 0;
+    pos = clipPos(cm.doc, pos);
+    if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch; }
+    var lineObj = getLine(cm.doc, pos.line);
+    var top = heightAtLine(lineObj) + paddingTop(cm.display);
+    return {left: left, right: left, top: top, bottom: top + lineObj.height}
+  }
+
+  // Positions returned by coordsChar contain some extra information.
+  // xRel is the relative x position of the input coordinates compared
+  // to the found position (so xRel > 0 means the coordinates are to
+  // the right of the character position, for example). When outside
+  // is true, that means the coordinates lie outside the line's
+  // vertical range.
+  function PosWithInfo(line, ch, sticky, outside, xRel) {
+    var pos = Pos(line, ch, sticky);
+    pos.xRel = xRel;
+    if (outside) { pos.outside = outside; }
+    return pos
+  }
+
+  // Compute the character position closest to the given coordinates.
+  // Input must be lineSpace-local ("div" coordinate system).
+  function coordsChar(cm, x, y) {
+    var doc = cm.doc;
+    y += cm.display.viewOffset;
+    if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) }
+    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+    if (lineN > last)
+      { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) }
+    if (x < 0) { x = 0; }
+
+    var lineObj = getLine(doc, lineN);
+    for (;;) {
+      var found = coordsCharInner(cm, lineObj, lineN, x, y);
+      var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0));
+      if (!collapsed) { return found }
+      var rangeEnd = collapsed.find(1);
+      if (rangeEnd.line == lineN) { return rangeEnd }
+      lineObj = getLine(doc, lineN = rangeEnd.line);
+    }
+  }
+
+  function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
+    y -= widgetTopHeight(lineObj);
+    var end = lineObj.text.length;
+    var begin = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; }, end, 0);
+    end = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch).top > y; }, begin, end);
+    return {begin: begin, end: end}
+  }
+
+  function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+    if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+    var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top;
+    return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
+  }
+
+  // Returns true if the given side of a box is after the given
+  // coordinates, in top-to-bottom, left-to-right order.
+  function boxIsAfter(box, x, y, left) {
+    return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x
+  }
+
+  function coordsCharInner(cm, lineObj, lineNo, x, y) {
+    // Move y into line-local coordinate space
+    y -= heightAtLine(lineObj);
+    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
+    // When directly calling `measureCharPrepared`, we have to adjust
+    // for the widgets at this line.
+    var widgetHeight = widgetTopHeight(lineObj);
+    var begin = 0, end = lineObj.text.length, ltr = true;
+
+    var order = getOrder(lineObj, cm.doc.direction);
+    // If the line isn't plain left-to-right text, first figure out
+    // which bidi section the coordinates fall into.
+    if (order) {
+      var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)
+                   (cm, lineObj, lineNo, preparedMeasure, order, x, y);
+      ltr = part.level != 1;
+      // The awkward -1 offsets are needed because findFirst (called
+      // on these below) will treat its first bound as inclusive,
+      // second as exclusive, but we want to actually address the
+      // characters in the part's range
+      begin = ltr ? part.from : part.to - 1;
+      end = ltr ? part.to : part.from - 1;
+    }
+
+    // A binary search to find the first character whose bounding box
+    // starts after the coordinates. If we run across any whose box wrap
+    // the coordinates, store that.
+    var chAround = null, boxAround = null;
+    var ch = findFirst(function (ch) {
+      var box = measureCharPrepared(cm, preparedMeasure, ch);
+      box.top += widgetHeight; box.bottom += widgetHeight;
+      if (!boxIsAfter(box, x, y, false)) { return false }
+      if (box.top <= y && box.left <= x) {
+        chAround = ch;
+        boxAround = box;
+      }
+      return true
+    }, begin, end);
+
+    var baseX, sticky, outside = false;
+    // If a box around the coordinates was found, use that
+    if (boxAround) {
+      // Distinguish coordinates nearer to the left or right side of the box
+      var atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr;
+      ch = chAround + (atStart ? 0 : 1);
+      sticky = atStart ? "after" : "before";
+      baseX = atLeft ? boxAround.left : boxAround.right;
+    } else {
+      // (Adjust for extended bound, if necessary.)
+      if (!ltr && (ch == end || ch == begin)) { ch++; }
+      // To determine which side to associate with, get the box to the
+      // left of the character and compare it's vertical position to the
+      // coordinates
+      sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :
+        (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y) == ltr ?
+        "after" : "before";
+      // Now get accurate coordinates for this place, in order to get a
+      // base X position
+      var coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure);
+      baseX = coords.left;
+      outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0;
+    }
+
+    ch = skipExtendingChars(lineObj.text, ch, 1);
+    return PosWithInfo(lineNo, ch, sticky, outside, x - baseX)
+  }
+
+  function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) {
+    // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+    // situation, we can take this ordering to correspond to the visual
+    // ordering. This finds the first part whose end is after the given
+    // coordinates.
+    var index = findFirst(function (i) {
+      var part = order[i], ltr = part.level != 1;
+      return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"),
+                                     "line", lineObj, preparedMeasure), x, y, true)
+    }, 0, order.length - 1);
+    var part = order[index];
+    // If this isn't the first part, the part's start is also after
+    // the coordinates, and the coordinates aren't on the same line as
+    // that start, move one part back.
+    if (index > 0) {
+      var ltr = part.level != 1;
+      var start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"),
+                               "line", lineObj, preparedMeasure);
+      if (boxIsAfter(start, x, y, true) && start.top > y)
+        { part = order[index - 1]; }
+    }
+    return part
+  }
+
+  function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) {
+    // In a wrapped line, rtl text on wrapping boundaries can do things
+    // that don't correspond to the ordering in our `order` array at
+    // all, so a binary search doesn't work, and we want to return a
+    // part that only spans one line so that the binary search in
+    // coordsCharInner is safe. As such, we first find the extent of the
+    // wrapped line, and then do a flat search in which we discard any
+    // spans that aren't on the line.
+    var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y);
+    var begin = ref.begin;
+    var end = ref.end;
+    if (/\s/.test(lineObj.text.charAt(end - 1))) { end--; }
+    var part = null, closestDist = null;
+    for (var i = 0; i < order.length; i++) {
+      var p = order[i];
+      if (p.from >= end || p.to <= begin) { continue }
+      var ltr = p.level != 1;
+      var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right;
+      // Weigh against spans ending before this, so that they are only
+      // picked if nothing ends after
+      var dist = endX < x ? x - endX + 1e9 : endX - x;
+      if (!part || closestDist > dist) {
+        part = p;
+        closestDist = dist;
+      }
+    }
+    if (!part) { part = order[order.length - 1]; }
+    // Clip the part to the wrapped line.
+    if (part.from < begin) { part = {from: begin, to: part.to, level: part.level}; }
+    if (part.to > end) { part = {from: part.from, to: end, level: part.level}; }
+    return part
+  }
+
+  var measureText;
+  // Compute the default text height.
+  function textHeight(display) {
+    if (display.cachedTextHeight != null) { return display.cachedTextHeight }
+    if (measureText == null) {
+      measureText = elt("pre", null, "CodeMirror-line-like");
+      // Measure a bunch of lines, for browsers that compute
+      // fractional heights.
+      for (var i = 0; i < 49; ++i) {
+        measureText.appendChild(document.createTextNode("x"));
+        measureText.appendChild(elt("br"));
+      }
+      measureText.appendChild(document.createTextNode("x"));
+    }
+    removeChildrenAndAdd(display.measure, measureText);
+    var height = measureText.offsetHeight / 50;
+    if (height > 3) { display.cachedTextHeight = height; }
+    removeChildren(display.measure);
+    return height || 1
+  }
+
+  // Compute the default character width.
+  function charWidth(display) {
+    if (display.cachedCharWidth != null) { return display.cachedCharWidth }
+    var anchor = elt("span", "xxxxxxxxxx");
+    var pre = elt("pre", [anchor], "CodeMirror-line-like");
+    removeChildrenAndAdd(display.measure, pre);
+    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
+    if (width > 2) { display.cachedCharWidth = width; }
+    return width || 10
+  }
+
+  // Do a bulk-read of the DOM positions and sizes needed to draw the
+  // view, so that we don't interleave reading and writing to the DOM.
+  function getDimensions(cm) {
+    var d = cm.display, left = {}, width = {};
+    var gutterLeft = d.gutters.clientLeft;
+    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
+      var id = cm.display.gutterSpecs[i].className;
+      left[id] = n.offsetLeft + n.clientLeft + gutterLeft;
+      width[id] = n.clientWidth;
+    }
+    return {fixedPos: compensateForHScroll(d),
+            gutterTotalWidth: d.gutters.offsetWidth,
+            gutterLeft: left,
+            gutterWidth: width,
+            wrapperWidth: d.wrapper.clientWidth}
+  }
+
+  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
+  // but using getBoundingClientRect to get a sub-pixel-accurate
+  // result.
+  function compensateForHScroll(display) {
+    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
+  }
+
+  // Returns a function that estimates the height of a line, to use as
+  // first approximation until the line becomes visible (and is thus
+  // properly measurable).
+  function estimateHeight(cm) {
+    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
+    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
+    return function (line) {
+      if (lineIsHidden(cm.doc, line)) { return 0 }
+
+      var widgetsHeight = 0;
+      if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) {
+        if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height; }
+      } }
+
+      if (wrapping)
+        { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th }
+      else
+        { return widgetsHeight + th }
+    }
+  }
+
+  function estimateLineHeights(cm) {
+    var doc = cm.doc, est = estimateHeight(cm);
+    doc.iter(function (line) {
+      var estHeight = est(line);
+      if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+    });
+  }
+
+  // Given a mouse event, find the corresponding position. If liberal
+  // is false, it checks whether a gutter or scrollbar was clicked,
+  // and returns null if it was. forRect is used by rectangular
+  // selections, and tries to estimate a character position even for
+  // coordinates beyond the right of the text.
+  function posFromMouse(cm, e, liberal, forRect) {
+    var display = cm.display;
+    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null }
+
+    var x, y, space = display.lineSpace.getBoundingClientRect();
+    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
+    try { x = e.clientX - space.left; y = e.clientY - space.top; }
+    catch (e$1) { return null }
+    var coords = coordsChar(cm, x, y), line;
+    if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
+      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
+    }
+    return coords
+  }
+
+  // Find the view element corresponding to a given line. Return null
+  // when the line isn't visible.
+  function findViewIndex(cm, n) {
+    if (n >= cm.display.viewTo) { return null }
+    n -= cm.display.viewFrom;
+    if (n < 0) { return null }
+    var view = cm.display.view;
+    for (var i = 0; i < view.length; i++) {
+      n -= view[i].size;
+      if (n < 0) { return i }
+    }
+  }
+
+  // Updates the display.view data structure for a given change to the
+  // document. From and to are in pre-change coordinates. Lendiff is
+  // the amount of lines added or subtracted by the change. This is
+  // used for changes that span multiple lines, or change the way
+  // lines are divided into visual lines. regLineChange (below)
+  // registers single-line changes.
+  function regChange(cm, from, to, lendiff) {
+    if (from == null) { from = cm.doc.first; }
+    if (to == null) { to = cm.doc.first + cm.doc.size; }
+    if (!lendiff) { lendiff = 0; }
+
+    var display = cm.display;
+    if (lendiff && to < display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers > from))
+      { display.updateLineNumbers = from; }
+
+    cm.curOp.viewChanged = true;
+
+    if (from >= display.viewTo) { // Change after
+      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
+        { resetView(cm); }
+    } else if (to <= display.viewFrom) { // Change before
+      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
+        resetView(cm);
+      } else {
+        display.viewFrom += lendiff;
+        display.viewTo += lendiff;
+      }
+    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
+      resetView(cm);
+    } else if (from <= display.viewFrom) { // Top overlap
+      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cut) {
+        display.view = display.view.slice(cut.index);
+        display.viewFrom = cut.lineN;
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
+    } else if (to >= display.viewTo) { // Bottom overlap
+      var cut$1 = viewCuttingPoint(cm, from, from, -1);
+      if (cut$1) {
+        display.view = display.view.slice(0, cut$1.index);
+        display.viewTo = cut$1.lineN;
+      } else {
+        resetView(cm);
+      }
+    } else { // Gap in the middle
+      var cutTop = viewCuttingPoint(cm, from, from, -1);
+      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cutTop && cutBot) {
+        display.view = display.view.slice(0, cutTop.index)
+          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
+          .concat(display.view.slice(cutBot.index));
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
+    }
+
+    var ext = display.externalMeasured;
+    if (ext) {
+      if (to < ext.lineN)
+        { ext.lineN += lendiff; }
+      else if (from < ext.lineN + ext.size)
+        { display.externalMeasured = null; }
+    }
+  }
+
+  // Register a change to a single line. Type must be one of "text",
+  // "gutter", "class", "widget"
+  function regLineChange(cm, line, type) {
+    cm.curOp.viewChanged = true;
+    var display = cm.display, ext = cm.display.externalMeasured;
+    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
+      { display.externalMeasured = null; }
+
+    if (line < display.viewFrom || line >= display.viewTo) { return }
+    var lineView = display.view[findViewIndex(cm, line)];
+    if (lineView.node == null) { return }
+    var arr = lineView.changes || (lineView.changes = []);
+    if (indexOf(arr, type) == -1) { arr.push(type); }
+  }
+
+  // Clear the view.
+  function resetView(cm) {
+    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
+    cm.display.view = [];
+    cm.display.viewOffset = 0;
+  }
+
+  function viewCuttingPoint(cm, oldN, newN, dir) {
+    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
+      { return {index: index, lineN: newN} }
+    var n = cm.display.viewFrom;
+    for (var i = 0; i < index; i++)
+      { n += view[i].size; }
+    if (n != oldN) {
+      if (dir > 0) {
+        if (index == view.length - 1) { return null }
+        diff = (n + view[index].size) - oldN;
+        index++;
+      } else {
+        diff = n - oldN;
+      }
+      oldN += diff; newN += diff;
+    }
+    while (visualLineNo(cm.doc, newN) != newN) {
+      if (index == (dir < 0 ? 0 : view.length - 1)) { return null }
+      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
+      index += dir;
+    }
+    return {index: index, lineN: newN}
+  }
+
+  // Force the view to cover a given range, adding empty view element
+  // or clipping off existing ones as needed.
+  function adjustView(cm, from, to) {
+    var display = cm.display, view = display.view;
+    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
+      display.view = buildViewArray(cm, from, to);
+      display.viewFrom = from;
+    } else {
+      if (display.viewFrom > from)
+        { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); }
+      else if (display.viewFrom < from)
+        { display.view = display.view.slice(findViewIndex(cm, from)); }
+      display.viewFrom = from;
+      if (display.viewTo < to)
+        { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); }
+      else if (display.viewTo > to)
+        { display.view = display.view.slice(0, findViewIndex(cm, to)); }
+    }
+    display.viewTo = to;
+  }
+
+  // Count the number of lines in the view whose DOM representation is
+  // out of date (or nonexistent).
+  function countDirtyView(cm) {
+    var view = cm.display.view, dirty = 0;
+    for (var i = 0; i < view.length; i++) {
+      var lineView = view[i];
+      if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; }
+    }
+    return dirty
+  }
+
+  function updateSelection(cm) {
+    cm.display.input.showSelection(cm.display.input.prepareSelection());
+  }
+
+  function prepareSelection(cm, primary) {
+    if ( primary === void 0 ) primary = true;
+
+    var doc = cm.doc, result = {};
+    var curFragment = result.cursors = document.createDocumentFragment();
+    var selFragment = result.selection = document.createDocumentFragment();
+
+    var customCursor = cm.options.$customCursor;
+    if (customCursor) { primary = true; }
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      if (!primary && i == doc.sel.primIndex) { continue }
+      var range = doc.sel.ranges[i];
+      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) { continue }
+      var collapsed = range.empty();
+      if (customCursor) {
+        var head = customCursor(cm, range);
+        if (head) { drawSelectionCursor(cm, head, curFragment); }
+      } else if (collapsed || cm.options.showCursorWhenSelecting) {
+        drawSelectionCursor(cm, range.head, curFragment);
+      }
+      if (!collapsed)
+        { drawSelectionRange(cm, range, selFragment); }
+    }
+    return result
+  }
+
+  // Draws a cursor for the given range
+  function drawSelectionCursor(cm, head, output) {
+    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+
+    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+    cursor.style.left = pos.left + "px";
+    cursor.style.top = pos.top + "px";
+    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
+
+    if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {
+      var charPos = charCoords(cm, head, "div", null, null);
+      var width = charPos.right - charPos.left;
+      cursor.style.width = (width > 0 ? width : cm.defaultCharWidth()) + "px";
+    }
+
+    if (pos.other) {
+      // Secondary cursor, shown when on a 'jump' in bi-directional text
+      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+      otherCursor.style.display = "";
+      otherCursor.style.left = pos.other.left + "px";
+      otherCursor.style.top = pos.other.top + "px";
+      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+    }
+  }
+
+  function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }
+
+  // Draws the given range as a highlighted selection
+  function drawSelectionRange(cm, range, output) {
+    var display = cm.display, doc = cm.doc;
+    var fragment = document.createDocumentFragment();
+    var padding = paddingH(cm.display), leftSide = padding.left;
+    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
+    var docLTR = doc.direction == "ltr";
+
+    function add(left, top, width, bottom) {
+      if (top < 0) { top = 0; }
+      top = Math.round(top);
+      bottom = Math.round(bottom);
+      fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n                             top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n                             height: " + (bottom - top) + "px")));
+    }
+
+    function drawForLine(line, fromArg, toArg) {
+      var lineObj = getLine(doc, line);
+      var lineLen = lineObj.text.length;
+      var start, end;
+      function coords(ch, bias) {
+        return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
+      }
+
+      function wrapX(pos, dir, side) {
+        var extent = wrappedLineExtentChar(cm, lineObj, null, pos);
+        var prop = (dir == "ltr") == (side == "after") ? "left" : "right";
+        var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1);
+        return coords(ch, prop)[prop]
+      }
+
+      var order = getOrder(lineObj, doc.direction);
+      iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i) {
+        var ltr = dir == "ltr";
+        var fromPos = coords(from, ltr ? "left" : "right");
+        var toPos = coords(to - 1, ltr ? "right" : "left");
+
+        var openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen;
+        var first = i == 0, last = !order || i == order.length - 1;
+        if (toPos.top - fromPos.top <= 3) { // Single line
+          var openLeft = (docLTR ? openStart : openEnd) && first;
+          var openRight = (docLTR ? openEnd : openStart) && last;
+          var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left;
+          var right = openRight ? rightSide : (ltr ? toPos : fromPos).right;
+          add(left, fromPos.top, right - left, fromPos.bottom);
+        } else { // Multiple lines
+          var topLeft, topRight, botLeft, botRight;
+          if (ltr) {
+            topLeft = docLTR && openStart && first ? leftSide : fromPos.left;
+            topRight = docLTR ? rightSide : wrapX(from, dir, "before");
+            botLeft = docLTR ? leftSide : wrapX(to, dir, "after");
+            botRight = docLTR && openEnd && last ? rightSide : toPos.right;
+          } else {
+            topLeft = !docLTR ? leftSide : wrapX(from, dir, "before");
+            topRight = !docLTR && openStart && first ? rightSide : fromPos.right;
+            botLeft = !docLTR && openEnd && last ? leftSide : toPos.left;
+            botRight = !docLTR ? rightSide : wrapX(to, dir, "after");
+          }
+          add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom);
+          if (fromPos.bottom < toPos.top) { add(leftSide, fromPos.bottom, null, toPos.top); }
+          add(botLeft, toPos.top, botRight - botLeft, toPos.bottom);
+        }
+
+        if (!start || cmpCoords(fromPos, start) < 0) { start = fromPos; }
+        if (cmpCoords(toPos, start) < 0) { start = toPos; }
+        if (!end || cmpCoords(fromPos, end) < 0) { end = fromPos; }
+        if (cmpCoords(toPos, end) < 0) { end = toPos; }
+      });
+      return {start: start, end: end}
+    }
+
+    var sFrom = range.from(), sTo = range.to();
+    if (sFrom.line == sTo.line) {
+      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
+    } else {
+      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
+      var singleVLine = visualLine(fromLine) == visualLine(toLine);
+      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
+      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
+      if (singleVLine) {
+        if (leftEnd.top < rightStart.top - 2) {
+          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
+          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
+        } else {
+          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+        }
+      }
+      if (leftEnd.bottom < rightStart.top)
+        { add(leftSide, leftEnd.bottom, null, rightStart.top); }
+    }
+
+    output.appendChild(fragment);
+  }
+
+  // Cursor-blinking
+  function restartBlink(cm) {
+    if (!cm.state.focused) { return }
+    var display = cm.display;
+    clearInterval(display.blinker);
+    var on = true;
+    display.cursorDiv.style.visibility = "";
+    if (cm.options.cursorBlinkRate > 0)
+      { display.blinker = setInterval(function () {
+        if (!cm.hasFocus()) { onBlur(cm); }
+        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
+      }, cm.options.cursorBlinkRate); }
+    else if (cm.options.cursorBlinkRate < 0)
+      { display.cursorDiv.style.visibility = "hidden"; }
+  }
+
+  function ensureFocus(cm) {
+    if (!cm.hasFocus()) {
+      cm.display.input.focus();
+      if (!cm.state.focused) { onFocus(cm); }
+    }
+  }
+
+  function delayBlurEvent(cm) {
+    cm.state.delayingBlurEvent = true;
+    setTimeout(function () { if (cm.state.delayingBlurEvent) {
+      cm.state.delayingBlurEvent = false;
+      if (cm.state.focused) { onBlur(cm); }
+    } }, 100);
+  }
+
+  function onFocus(cm, e) {
+    if (cm.state.delayingBlurEvent && !cm.state.draggingText) { cm.state.delayingBlurEvent = false; }
+
+    if (cm.options.readOnly == "nocursor") { return }
+    if (!cm.state.focused) {
+      signal(cm, "focus", cm, e);
+      cm.state.focused = true;
+      addClass(cm.display.wrapper, "CodeMirror-focused");
+      // This test prevents this from firing when a context
+      // menu is closed (since the input reset would kill the
+      // select-all detection hack)
+      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
+        cm.display.input.reset();
+        if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20); } // Issue #1730
+      }
+      cm.display.input.receivedFocus();
+    }
+    restartBlink(cm);
+  }
+  function onBlur(cm, e) {
+    if (cm.state.delayingBlurEvent) { return }
+
+    if (cm.state.focused) {
+      signal(cm, "blur", cm, e);
+      cm.state.focused = false;
+      rmClass(cm.display.wrapper, "CodeMirror-focused");
+    }
+    clearInterval(cm.display.blinker);
+    setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false; } }, 150);
+  }
+
+  // Read the actual heights of the rendered lines, and update their
+  // stored heights to match.
+  function updateHeightsInViewport(cm) {
+    var display = cm.display;
+    var prevBottom = display.lineDiv.offsetTop;
+    var viewTop = Math.max(0, display.scroller.getBoundingClientRect().top);
+    var oldHeight = display.lineDiv.getBoundingClientRect().top;
+    var mustScroll = 0;
+    for (var i = 0; i < display.view.length; i++) {
+      var cur = display.view[i], wrapping = cm.options.lineWrapping;
+      var height = (void 0), width = 0;
+      if (cur.hidden) { continue }
+      oldHeight += cur.line.height;
+      if (ie && ie_version < 8) {
+        var bot = cur.node.offsetTop + cur.node.offsetHeight;
+        height = bot - prevBottom;
+        prevBottom = bot;
+      } else {
+        var box = cur.node.getBoundingClientRect();
+        height = box.bottom - box.top;
+        // Check that lines don't extend past the right of the current
+        // editor width
+        if (!wrapping && cur.text.firstChild)
+          { width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; }
+      }
+      var diff = cur.line.height - height;
+      if (diff > .005 || diff < -.005) {
+        if (oldHeight < viewTop) { mustScroll -= diff; }
+        updateLineHeight(cur.line, height);
+        updateWidgetHeight(cur.line);
+        if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
+          { updateWidgetHeight(cur.rest[j]); } }
+      }
+      if (width > cm.display.sizerWidth) {
+        var chWidth = Math.ceil(width / charWidth(cm.display));
+        if (chWidth > cm.display.maxLineLength) {
+          cm.display.maxLineLength = chWidth;
+          cm.display.maxLine = cur.line;
+          cm.display.maxLineChanged = true;
+        }
+      }
+    }
+    if (Math.abs(mustScroll) > 2) { display.scroller.scrollTop += mustScroll; }
+  }
+
+  // Read and store the height of line widgets associated with the
+  // given line.
+  function updateWidgetHeight(line) {
+    if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i) {
+      var w = line.widgets[i], parent = w.node.parentNode;
+      if (parent) { w.height = parent.offsetHeight; }
+    } }
+  }
+
+  // Compute the lines that are visible in a given viewport (defaults
+  // the current scroll position). viewport may contain top,
+  // height, and ensure (see op.scrollToPos) properties.
+  function visibleLines(display, doc, viewport) {
+    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
+    top = Math.floor(top - paddingTop(display));
+    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
+
+    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
+    // forces those lines into the viewport (if possible).
+    if (viewport && viewport.ensure) {
+      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+      if (ensureFrom < from) {
+        from = ensureFrom;
+        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+        to = ensureTo;
+      }
+    }
+    return {from: from, to: Math.max(to, from + 1)}
+  }
+
+  // SCROLLING THINGS INTO VIEW
+
+  // If an editor sits on the top or bottom of the window, partially
+  // scrolled out of view, this ensures that the cursor is visible.
+  function maybeScrollWindow(cm, rect) {
+    if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
+
+    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
+    var doc = display.wrapper.ownerDocument;
+    if (rect.top + box.top < 0) { doScroll = true; }
+    else if (rect.bottom + box.top > (doc.defaultView.innerHeight || doc.documentElement.clientHeight)) { doScroll = false; }
+    if (doScroll != null && !phantom) {
+      var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n                         top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n                         height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n                         left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));
+      cm.display.lineSpace.appendChild(scrollNode);
+      scrollNode.scrollIntoView(doScroll);
+      cm.display.lineSpace.removeChild(scrollNode);
+    }
+  }
+
+  // Scroll a given position into view (immediately), verifying that
+  // it actually became visible (as line heights are accurately
+  // measured, the position of something may 'drift' during drawing).
+  function scrollPosIntoView(cm, pos, end, margin) {
+    if (margin == null) { margin = 0; }
+    var rect;
+    if (!cm.options.lineWrapping && pos == end) {
+      // Set pos and end to the cursor positions around the character pos sticks to
+      // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+      // If pos == Pos(_, 0, "before"), pos and end are unchanged
+      end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos;
+      pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;
+    }
+    for (var limit = 0; limit < 5; limit++) {
+      var changed = false;
+      var coords = cursorCoords(cm, pos);
+      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+      rect = {left: Math.min(coords.left, endCoords.left),
+              top: Math.min(coords.top, endCoords.top) - margin,
+              right: Math.max(coords.left, endCoords.left),
+              bottom: Math.max(coords.bottom, endCoords.bottom) + margin};
+      var scrollPos = calculateScrollPos(cm, rect);
+      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+      if (scrollPos.scrollTop != null) {
+        updateScrollTop(cm, scrollPos.scrollTop);
+        if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; }
+      }
+      if (scrollPos.scrollLeft != null) {
+        setScrollLeft(cm, scrollPos.scrollLeft);
+        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; }
+      }
+      if (!changed) { break }
+    }
+    return rect
+  }
+
+  // Scroll a given set of coordinates into view (immediately).
+  function scrollIntoView(cm, rect) {
+    var scrollPos = calculateScrollPos(cm, rect);
+    if (scrollPos.scrollTop != null) { updateScrollTop(cm, scrollPos.scrollTop); }
+    if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); }
+  }
+
+  // Calculate a new scroll position needed to scroll the given
+  // rectangle into view. Returns an object with scrollTop and
+  // scrollLeft properties. When these are undefined, the
+  // vertical/horizontal position does not need to be adjusted.
+  function calculateScrollPos(cm, rect) {
+    var display = cm.display, snapMargin = textHeight(cm.display);
+    if (rect.top < 0) { rect.top = 0; }
+    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+    var screen = displayHeight(cm), result = {};
+    if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; }
+    var docBottom = cm.doc.height + paddingVert(display);
+    var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin;
+    if (rect.top < screentop) {
+      result.scrollTop = atTop ? 0 : rect.top;
+    } else if (rect.bottom > screentop + screen) {
+      var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen);
+      if (newTop != screentop) { result.scrollTop = newTop; }
+    }
+
+    var gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth;
+    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace;
+    var screenw = displayWidth(cm) - display.gutters.offsetWidth;
+    var tooWide = rect.right - rect.left > screenw;
+    if (tooWide) { rect.right = rect.left + screenw; }
+    if (rect.left < 10)
+      { result.scrollLeft = 0; }
+    else if (rect.left < screenleft)
+      { result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10)); }
+    else if (rect.right > screenw + screenleft - 3)
+      { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }
+    return result
+  }
+
+  // Store a relative adjustment to the scroll position in the current
+  // operation (to be applied when the operation finishes).
+  function addToScrollTop(cm, top) {
+    if (top == null) { return }
+    resolveScrollToPos(cm);
+    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+  }
+
+  // Make sure that at the end of the operation the current cursor is
+  // shown.
+  function ensureCursorVisible(cm) {
+    resolveScrollToPos(cm);
+    var cur = cm.getCursor();
+    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin};
+  }
+
+  function scrollToCoords(cm, x, y) {
+    if (x != null || y != null) { resolveScrollToPos(cm); }
+    if (x != null) { cm.curOp.scrollLeft = x; }
+    if (y != null) { cm.curOp.scrollTop = y; }
+  }
+
+  function scrollToRange(cm, range) {
+    resolveScrollToPos(cm);
+    cm.curOp.scrollToPos = range;
+  }
+
+  // When an operation has its scrollToPos property set, and another
+  // scroll action is applied before the end of the operation, this
+  // 'simulates' scrolling that position into view in a cheap way, so
+  // that the effect of intermediate scroll commands is not ignored.
+  function resolveScrollToPos(cm) {
+    var range = cm.curOp.scrollToPos;
+    if (range) {
+      cm.curOp.scrollToPos = null;
+      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
+      scrollToCoordsRange(cm, from, to, range.margin);
+    }
+  }
+
+  function scrollToCoordsRange(cm, from, to, margin) {
+    var sPos = calculateScrollPos(cm, {
+      left: Math.min(from.left, to.left),
+      top: Math.min(from.top, to.top) - margin,
+      right: Math.max(from.right, to.right),
+      bottom: Math.max(from.bottom, to.bottom) + margin
+    });
+    scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop);
+  }
+
+  // Sync the scrollable area and scrollbars, ensure the viewport
+  // covers the visible area.
+  function updateScrollTop(cm, val) {
+    if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
+    if (!gecko) { updateDisplaySimple(cm, {top: val}); }
+    setScrollTop(cm, val, true);
+    if (gecko) { updateDisplaySimple(cm); }
+    startWorker(cm, 100);
+  }
+
+  function setScrollTop(cm, val, forceScroll) {
+    val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val));
+    if (cm.display.scroller.scrollTop == val && !forceScroll) { return }
+    cm.doc.scrollTop = val;
+    cm.display.scrollbars.setScrollTop(val);
+    if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; }
+  }
+
+  // Sync scroller and scrollbar, ensure the gutter elements are
+  // aligned.
+  function setScrollLeft(cm, val, isScroller, forceScroll) {
+    val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth));
+    if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }
+    cm.doc.scrollLeft = val;
+    alignHorizontally(cm);
+    if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; }
+    cm.display.scrollbars.setScrollLeft(val);
+  }
+
+  // SCROLLBARS
+
+  // Prepare DOM reads needed to update the scrollbars. Done in one
+  // shot to minimize update/measure roundtrips.
+  function measureForScrollbars(cm) {
+    var d = cm.display, gutterW = d.gutters.offsetWidth;
+    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
+    return {
+      clientHeight: d.scroller.clientHeight,
+      viewHeight: d.wrapper.clientHeight,
+      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+      viewWidth: d.wrapper.clientWidth,
+      barLeft: cm.options.fixedGutter ? gutterW : 0,
+      docHeight: docH,
+      scrollHeight: docH + scrollGap(cm) + d.barHeight,
+      nativeBarWidth: d.nativeBarWidth,
+      gutterWidth: gutterW
+    }
+  }
+
+  var NativeScrollbars = function(place, scroll, cm) {
+    this.cm = cm;
+    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+    vert.tabIndex = horiz.tabIndex = -1;
+    place(vert); place(horiz);
+
+    on(vert, "scroll", function () {
+      if (vert.clientHeight) { scroll(vert.scrollTop, "vertical"); }
+    });
+    on(horiz, "scroll", function () {
+      if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal"); }
+    });
+
+    this.checkedZeroWidth = false;
+    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+    if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; }
+  };
+
+  NativeScrollbars.prototype.update = function (measure) {
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    var sWidth = measure.nativeBarWidth;
+
+    if (needsV) {
+      this.vert.style.display = "block";
+      this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+      // A bug in IE8 can cause this value to be negative, so guard it.
+      this.vert.firstChild.style.height =
+        Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+    } else {
+      this.vert.scrollTop = 0;
+      this.vert.style.display = "";
+      this.vert.firstChild.style.height = "0";
+    }
+
+    if (needsH) {
+      this.horiz.style.display = "block";
+      this.horiz.style.right = needsV ? sWidth + "px" : "0";
+      this.horiz.style.left = measure.barLeft + "px";
+      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+      this.horiz.firstChild.style.width =
+        Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+    } else {
+      this.horiz.style.display = "";
+      this.horiz.firstChild.style.width = "0";
+    }
+
+    if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+      if (sWidth == 0) { this.zeroWidthHack(); }
+      this.checkedZeroWidth = true;
+    }
+
+    return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
+  };
+
+  NativeScrollbars.prototype.setScrollLeft = function (pos) {
+    if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos; }
+    if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); }
+  };
+
+  NativeScrollbars.prototype.setScrollTop = function (pos) {
+    if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos; }
+    if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); }
+  };
+
+  NativeScrollbars.prototype.zeroWidthHack = function () {
+    var w = mac && !mac_geMountainLion ? "12px" : "18px";
+    this.horiz.style.height = this.vert.style.width = w;
+    this.horiz.style.visibility = this.vert.style.visibility = "hidden";
+    this.disableHoriz = new Delayed;
+    this.disableVert = new Delayed;
+  };
+
+  NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) {
+    bar.style.visibility = "";
+    function maybeDisable() {
+      // To find out whether the scrollbar is still visible, we
+      // check whether the element under the pixel in the bottom
+      // right corner of the scrollbar box is the scrollbar box
+      // itself (when the bar is still visible) or its filler child
+      // (when the bar is hidden). If it is still visible, we keep
+      // it enabled, if it's hidden, we disable pointer events.
+      var box = bar.getBoundingClientRect();
+      var elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
+          : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1);
+      if (elt != bar) { bar.style.visibility = "hidden"; }
+      else { delay.set(1000, maybeDisable); }
+    }
+    delay.set(1000, maybeDisable);
+  };
+
+  NativeScrollbars.prototype.clear = function () {
+    var parent = this.horiz.parentNode;
+    parent.removeChild(this.horiz);
+    parent.removeChild(this.vert);
+  };
+
+  var NullScrollbars = function () {};
+
+  NullScrollbars.prototype.update = function () { return {bottom: 0, right: 0} };
+  NullScrollbars.prototype.setScrollLeft = function () {};
+  NullScrollbars.prototype.setScrollTop = function () {};
+  NullScrollbars.prototype.clear = function () {};
+
+  function updateScrollbars(cm, measure) {
+    if (!measure) { measure = measureForScrollbars(cm); }
+    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+    updateScrollbarsInner(cm, measure);
+    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+        { updateHeightsInViewport(cm); }
+      updateScrollbarsInner(cm, measureForScrollbars(cm));
+      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+    }
+  }
+
+  // Re-synchronize the fake scrollbars with the actual size of the
+  // content.
+  function updateScrollbarsInner(cm, measure) {
+    var d = cm.display;
+    var sizes = d.scrollbars.update(measure);
+
+    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent";
+
+    if (sizes.right && sizes.bottom) {
+      d.scrollbarFiller.style.display = "block";
+      d.scrollbarFiller.style.height = sizes.bottom + "px";
+      d.scrollbarFiller.style.width = sizes.right + "px";
+    } else { d.scrollbarFiller.style.display = ""; }
+    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+      d.gutterFiller.style.display = "block";
+      d.gutterFiller.style.height = sizes.bottom + "px";
+      d.gutterFiller.style.width = measure.gutterWidth + "px";
+    } else { d.gutterFiller.style.display = ""; }
+  }
+
+  var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+  function initScrollbars(cm) {
+    if (cm.display.scrollbars) {
+      cm.display.scrollbars.clear();
+      if (cm.display.scrollbars.addClass)
+        { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+    }
+
+    cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
+      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+      // Prevent clicks in the scrollbars from killing focus
+      on(node, "mousedown", function () {
+        if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); }
+      });
+      node.setAttribute("cm-not-content", "true");
+    }, function (pos, axis) {
+      if (axis == "horizontal") { setScrollLeft(cm, pos); }
+      else { updateScrollTop(cm, pos); }
+    }, cm);
+    if (cm.display.scrollbars.addClass)
+      { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+  }
+
+  // Operations are used to wrap a series of changes to the editor
+  // state in such a way that each change won't have to update the
+  // cursor and display (which would be awkward, slow, and
+  // error-prone). Instead, display updates are batched and then all
+  // combined and executed at once.
+
+  var nextOpId = 0;
+  // Start a new operation.
+  function startOperation(cm) {
+    cm.curOp = {
+      cm: cm,
+      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+      startHeight: cm.doc.height, // Used to detect need to update scrollbar
+      forceUpdate: false,      // Used to force a redraw
+      updateInput: 0,       // Whether to reset the input textarea
+      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
+      changeObjs: null,        // Accumulated changes, for firing change events
+      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
+      selectionChanged: false, // Whether the selection needs to be redrawn
+      updateMaxLine: false,    // Set when the widest line needs to be determined anew
+      scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
+      scrollToPos: null,       // Used to scroll to a specific position
+      focus: false,
+      id: ++nextOpId,          // Unique ID
+      markArrays: null         // Used by addMarkedSpan
+    };
+    pushOperation(cm.curOp);
+  }
+
+  // Finish an operation, updating the display and signalling delayed events
+  function endOperation(cm) {
+    var op = cm.curOp;
+    if (op) { finishOperation(op, function (group) {
+      for (var i = 0; i < group.ops.length; i++)
+        { group.ops[i].cm.curOp = null; }
+      endOperations(group);
+    }); }
+  }
+
+  // The DOM updates done when an operation finishes are batched so
+  // that the minimum number of relayouts are required.
+  function endOperations(group) {
+    var ops = group.ops;
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      { endOperation_R1(ops[i]); }
+    for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe)
+      { endOperation_W1(ops[i$1]); }
+    for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM
+      { endOperation_R2(ops[i$2]); }
+    for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe)
+      { endOperation_W2(ops[i$3]); }
+    for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM
+      { endOperation_finish(ops[i$4]); }
+  }
+
+  function endOperation_R1(op) {
+    var cm = op.cm, display = cm.display;
+    maybeClipScrollbars(cm);
+    if (op.updateMaxLine) { findMaxLine(cm); }
+
+    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                         op.scrollToPos.to.line >= display.viewTo) ||
+      display.maxLineChanged && cm.options.lineWrapping;
+    op.update = op.mustUpdate &&
+      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+  }
+
+  function endOperation_W1(op) {
+    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+  }
+
+  function endOperation_R2(op) {
+    var cm = op.cm, display = cm.display;
+    if (op.updatedDisplay) { updateHeightsInViewport(cm); }
+
+    op.barMeasure = measureForScrollbars(cm);
+
+    // If the max line changed since it was last measured, measure it,
+    // and ensure the document's width matches it.
+    // updateDisplay_W2 will use these properties to do the actual resizing
+    if (display.maxLineChanged && !cm.options.lineWrapping) {
+      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+      cm.display.sizerWidth = op.adjustWidthTo;
+      op.barMeasure.scrollWidth =
+        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
+    }
+
+    if (op.updatedDisplay || op.selectionChanged)
+      { op.preparedSelection = display.input.prepareSelection(); }
+  }
+
+  function endOperation_W2(op) {
+    var cm = op.cm;
+
+    if (op.adjustWidthTo != null) {
+      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+      if (op.maxScrollLeft < cm.doc.scrollLeft)
+        { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); }
+      cm.display.maxLineChanged = false;
+    }
+
+    var takeFocus = op.focus && op.focus == activeElt(root(cm));
+    if (op.preparedSelection)
+      { cm.display.input.showSelection(op.preparedSelection, takeFocus); }
+    if (op.updatedDisplay || op.startHeight != cm.doc.height)
+      { updateScrollbars(cm, op.barMeasure); }
+    if (op.updatedDisplay)
+      { setDocumentHeight(cm, op.barMeasure); }
+
+    if (op.selectionChanged) { restartBlink(cm); }
+
+    if (cm.state.focused && op.updateInput)
+      { cm.display.input.reset(op.typing); }
+    if (takeFocus) { ensureFocus(op.cm); }
+  }
+
+  function endOperation_finish(op) {
+    var cm = op.cm, display = cm.display, doc = cm.doc;
+
+    if (op.updatedDisplay) { postUpdateDisplay(cm, op.update); }
+
+    // Abort mouse wheel delta measurement, when scrolling explicitly
+    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+      { display.wheelStartX = display.wheelStartY = null; }
+
+    // Propagate the scroll position to the actual DOM scroller
+    if (op.scrollTop != null) { setScrollTop(cm, op.scrollTop, op.forceScroll); }
+
+    if (op.scrollLeft != null) { setScrollLeft(cm, op.scrollLeft, true, true); }
+    // If we need to scroll a specific position into view, do so.
+    if (op.scrollToPos) {
+      var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
+      maybeScrollWindow(cm, rect);
+    }
+
+    // Fire events for markers that are hidden/unidden by editing or
+    // undoing
+    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
+    if (hidden) { for (var i = 0; i < hidden.length; ++i)
+      { if (!hidden[i].lines.length) { signal(hidden[i], "hide"); } } }
+    if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1)
+      { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide"); } } }
+
+    if (display.wrapper.offsetHeight)
+      { doc.scrollTop = cm.display.scroller.scrollTop; }
+
+    // Fire change events, and delayed event handlers
+    if (op.changeObjs)
+      { signal(cm, "changes", cm, op.changeObjs); }
+    if (op.update)
+      { op.update.finish(); }
+  }
+
+  // Run the given function in an operation
+  function runInOp(cm, f) {
+    if (cm.curOp) { return f() }
+    startOperation(cm);
+    try { return f() }
+    finally { endOperation(cm); }
+  }
+  // Wraps a function in an operation. Returns the wrapped function.
+  function operation(cm, f) {
+    return function() {
+      if (cm.curOp) { return f.apply(cm, arguments) }
+      startOperation(cm);
+      try { return f.apply(cm, arguments) }
+      finally { endOperation(cm); }
+    }
+  }
+  // Used to add methods to editor and doc instances, wrapping them in
+  // operations.
+  function methodOp(f) {
+    return function() {
+      if (this.curOp) { return f.apply(this, arguments) }
+      startOperation(this);
+      try { return f.apply(this, arguments) }
+      finally { endOperation(this); }
+    }
+  }
+  function docMethodOp(f) {
+    return function() {
+      var cm = this.cm;
+      if (!cm || cm.curOp) { return f.apply(this, arguments) }
+      startOperation(cm);
+      try { return f.apply(this, arguments) }
+      finally { endOperation(cm); }
+    }
+  }
+
+  // HIGHLIGHT WORKER
+
+  function startWorker(cm, time) {
+    if (cm.doc.highlightFrontier < cm.display.viewTo)
+      { cm.state.highlight.set(time, bind(highlightWorker, cm)); }
+  }
+
+  function highlightWorker(cm) {
+    var doc = cm.doc;
+    if (doc.highlightFrontier >= cm.display.viewTo) { return }
+    var end = +new Date + cm.options.workTime;
+    var context = getContextBefore(cm, doc.highlightFrontier);
+    var changedLines = [];
+
+    doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
+      if (context.line >= cm.display.viewFrom) { // Visible
+        var oldStyles = line.styles;
+        var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null;
+        var highlighted = highlightLine(cm, line, context, true);
+        if (resetState) { context.state = resetState; }
+        line.styles = highlighted.styles;
+        var oldCls = line.styleClasses, newCls = highlighted.classes;
+        if (newCls) { line.styleClasses = newCls; }
+        else if (oldCls) { line.styleClasses = null; }
+        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
+        for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i]; }
+        if (ischange) { changedLines.push(context.line); }
+        line.stateAfter = context.save();
+        context.nextLine();
+      } else {
+        if (line.text.length <= cm.options.maxHighlightLength)
+          { processLine(cm, line.text, context); }
+        line.stateAfter = context.line % 5 == 0 ? context.save() : null;
+        context.nextLine();
+      }
+      if (+new Date > end) {
+        startWorker(cm, cm.options.workDelay);
+        return true
+      }
+    });
+    doc.highlightFrontier = context.line;
+    doc.modeFrontier = Math.max(doc.modeFrontier, context.line);
+    if (changedLines.length) { runInOp(cm, function () {
+      for (var i = 0; i < changedLines.length; i++)
+        { regLineChange(cm, changedLines[i], "text"); }
+    }); }
+  }
+
+  // DISPLAY DRAWING
+
+  var DisplayUpdate = function(cm, viewport, force) {
+    var display = cm.display;
+
+    this.viewport = viewport;
+    // Store some values that we'll need later (but don't want to force a relayout for)
+    this.visible = visibleLines(display, cm.doc, viewport);
+    this.editorIsHidden = !display.wrapper.offsetWidth;
+    this.wrapperHeight = display.wrapper.clientHeight;
+    this.wrapperWidth = display.wrapper.clientWidth;
+    this.oldDisplayWidth = displayWidth(cm);
+    this.force = force;
+    this.dims = getDimensions(cm);
+    this.events = [];
+  };
+
+  DisplayUpdate.prototype.signal = function (emitter, type) {
+    if (hasHandler(emitter, type))
+      { this.events.push(arguments); }
+  };
+  DisplayUpdate.prototype.finish = function () {
+    for (var i = 0; i < this.events.length; i++)
+      { signal.apply(null, this.events[i]); }
+  };
+
+  function maybeClipScrollbars(cm) {
+    var display = cm.display;
+    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+      display.heightForcer.style.height = scrollGap(cm) + "px";
+      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+      display.scrollbarsClipped = true;
+    }
+  }
+
+  function selectionSnapshot(cm) {
+    if (cm.hasFocus()) { return null }
+    var active = activeElt(root(cm));
+    if (!active || !contains(cm.display.lineDiv, active)) { return null }
+    var result = {activeElt: active};
+    if (window.getSelection) {
+      var sel = win(cm).getSelection();
+      if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+        result.anchorNode = sel.anchorNode;
+        result.anchorOffset = sel.anchorOffset;
+        result.focusNode = sel.focusNode;
+        result.focusOffset = sel.focusOffset;
+      }
+    }
+    return result
+  }
+
+  function restoreSelection(snapshot) {
+    if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(rootNode(snapshot.activeElt))) { return }
+    snapshot.activeElt.focus();
+    if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+        snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+      var doc = snapshot.activeElt.ownerDocument;
+      var sel = doc.defaultView.getSelection(), range = doc.createRange();
+      range.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
+      range.collapse(false);
+      sel.removeAllRanges();
+      sel.addRange(range);
+      sel.extend(snapshot.focusNode, snapshot.focusOffset);
+    }
+  }
+
+  // Does the actual updating of the line display. Bails out
+  // (returning false) when there is nothing to be done and forced is
+  // false.
+  function updateDisplayIfNeeded(cm, update) {
+    var display = cm.display, doc = cm.doc;
+
+    if (update.editorIsHidden) {
+      resetView(cm);
+      return false
+    }
+
+    // Bail out if the visible area is already rendered and nothing changed.
+    if (!update.force &&
+        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+        display.renderedView == display.view && countDirtyView(cm) == 0)
+      { return false }
+
+    if (maybeUpdateLineNumberWidth(cm)) {
+      resetView(cm);
+      update.dims = getDimensions(cm);
+    }
+
+    // Compute a suitable new viewport (from & to)
+    var end = doc.first + doc.size;
+    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
+    if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom); }
+    if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo); }
+    if (sawCollapsedSpans) {
+      from = visualLineNo(cm.doc, from);
+      to = visualLineEndNo(cm.doc, to);
+    }
+
+    var different = from != display.viewFrom || to != display.viewTo ||
+      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
+    adjustView(cm, from, to);
+
+    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+    // Position the mover div to align with the current scroll position
+    cm.display.mover.style.top = display.viewOffset + "px";
+
+    var toUpdate = countDirtyView(cm);
+    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+      { return false }
+
+    // For big changes, we hide the enclosing element during the
+    // update, since that speeds up the operations on most browsers.
+    var selSnapshot = selectionSnapshot(cm);
+    if (toUpdate > 4) { display.lineDiv.style.display = "none"; }
+    patchDisplay(cm, display.updateLineNumbers, update.dims);
+    if (toUpdate > 4) { display.lineDiv.style.display = ""; }
+    display.renderedView = display.view;
+    // There might have been a widget with a focused element that got
+    // hidden or updated, if so re-focus it.
+    restoreSelection(selSnapshot);
+
+    // Prevent selection and cursors from interfering with the scroll
+    // width and height.
+    removeChildren(display.cursorDiv);
+    removeChildren(display.selectionDiv);
+    display.gutters.style.height = display.sizer.style.minHeight = 0;
+
+    if (different) {
+      display.lastWrapHeight = update.wrapperHeight;
+      display.lastWrapWidth = update.wrapperWidth;
+      startWorker(cm, 400);
+    }
+
+    display.updateLineNumbers = null;
+
+    return true
+  }
+
+  function postUpdateDisplay(cm, update) {
+    var viewport = update.viewport;
+
+    for (var first = true;; first = false) {
+      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+        // Clip forced viewport to actual scrollable area.
+        if (viewport && viewport.top != null)
+          { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}; }
+        // Updated line heights might result in the drawn area not
+        // actually covering the viewport. Keep looping until it does.
+        update.visible = visibleLines(cm.display, cm.doc, viewport);
+        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+          { break }
+      } else if (first) {
+        update.visible = visibleLines(cm.display, cm.doc, viewport);
+      }
+      if (!updateDisplayIfNeeded(cm, update)) { break }
+      updateHeightsInViewport(cm);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+      update.force = false;
+    }
+
+    update.signal(cm, "update", cm);
+    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+    }
+  }
+
+  function updateDisplaySimple(cm, viewport) {
+    var update = new DisplayUpdate(cm, viewport);
+    if (updateDisplayIfNeeded(cm, update)) {
+      updateHeightsInViewport(cm);
+      postUpdateDisplay(cm, update);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+      update.finish();
+    }
+  }
+
+  // Sync the actual display DOM structure with display.view, removing
+  // nodes for lines that are no longer in view, and creating the ones
+  // that are not there yet, and updating the ones that are out of
+  // date.
+  function patchDisplay(cm, updateNumbersFrom, dims) {
+    var display = cm.display, lineNumbers = cm.options.lineNumbers;
+    var container = display.lineDiv, cur = container.firstChild;
+
+    function rm(node) {
+      var next = node.nextSibling;
+      // Works around a throw-scroll bug in OS X Webkit
+      if (webkit && mac && cm.display.currentWheelTarget == node)
+        { node.style.display = "none"; }
+      else
+        { node.parentNode.removeChild(node); }
+      return next
+    }
+
+    var view = display.view, lineN = display.viewFrom;
+    // Loop over the elements in the view, syncing cur (the DOM nodes
+    // in display.lineDiv) with the view as we go.
+    for (var i = 0; i < view.length; i++) {
+      var lineView = view[i];
+      if (lineView.hidden) ; else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
+        var node = buildLineElement(cm, lineView, lineN, dims);
+        container.insertBefore(node, cur);
+      } else { // Already drawn
+        while (cur != lineView.node) { cur = rm(cur); }
+        var updateNumber = lineNumbers && updateNumbersFrom != null &&
+          updateNumbersFrom <= lineN && lineView.lineNumber;
+        if (lineView.changes) {
+          if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false; }
+          updateLineForChanges(cm, lineView, lineN, dims);
+        }
+        if (updateNumber) {
+          removeChildren(lineView.lineNumber);
+          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+        }
+        cur = lineView.node.nextSibling;
+      }
+      lineN += lineView.size;
+    }
+    while (cur) { cur = rm(cur); }
+  }
+
+  function updateGutterSpace(display) {
+    var width = display.gutters.offsetWidth;
+    display.sizer.style.marginLeft = width + "px";
+    // Send an event to consumers responding to changes in gutter width.
+    signalLater(display, "gutterChanged", display);
+  }
+
+  function setDocumentHeight(cm, measure) {
+    cm.display.sizer.style.minHeight = measure.docHeight + "px";
+    cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
+  }
+
+  // Re-align line numbers and gutter marks to compensate for
+  // horizontal scrolling.
+  function alignHorizontally(cm) {
+    var display = cm.display, view = display.view;
+    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
+    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
+    var gutterW = display.gutters.offsetWidth, left = comp + "px";
+    for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
+      if (cm.options.fixedGutter) {
+        if (view[i].gutter)
+          { view[i].gutter.style.left = left; }
+        if (view[i].gutterBackground)
+          { view[i].gutterBackground.style.left = left; }
+      }
+      var align = view[i].alignable;
+      if (align) { for (var j = 0; j < align.length; j++)
+        { align[j].style.left = left; } }
+    } }
+    if (cm.options.fixedGutter)
+      { display.gutters.style.left = (comp + gutterW) + "px"; }
+  }
+
+  // Used to ensure that the line number gutter is still the right
+  // size for the current document size. Returns true when an update
+  // is needed.
+  function maybeUpdateLineNumberWidth(cm) {
+    if (!cm.options.lineNumbers) { return false }
+    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+    if (last.length != display.lineNumChars) {
+      var test = display.measure.appendChild(elt("div", [elt("div", last)],
+                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
+      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
+      display.lineGutter.style.width = "";
+      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
+      display.lineNumWidth = display.lineNumInnerWidth + padding;
+      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
+      display.lineGutter.style.width = display.lineNumWidth + "px";
+      updateGutterSpace(cm.display);
+      return true
+    }
+    return false
+  }
+
+  function getGutters(gutters, lineNumbers) {
+    var result = [], sawLineNumbers = false;
+    for (var i = 0; i < gutters.length; i++) {
+      var name = gutters[i], style = null;
+      if (typeof name != "string") { style = name.style; name = name.className; }
+      if (name == "CodeMirror-linenumbers") {
+        if (!lineNumbers) { continue }
+        else { sawLineNumbers = true; }
+      }
+      result.push({className: name, style: style});
+    }
+    if (lineNumbers && !sawLineNumbers) { result.push({className: "CodeMirror-linenumbers", style: null}); }
+    return result
+  }
+
+  // Rebuild the gutter elements, ensure the margin to the left of the
+  // code matches their width.
+  function renderGutters(display) {
+    var gutters = display.gutters, specs = display.gutterSpecs;
+    removeChildren(gutters);
+    display.lineGutter = null;
+    for (var i = 0; i < specs.length; ++i) {
+      var ref = specs[i];
+      var className = ref.className;
+      var style = ref.style;
+      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className));
+      if (style) { gElt.style.cssText = style; }
+      if (className == "CodeMirror-linenumbers") {
+        display.lineGutter = gElt;
+        gElt.style.width = (display.lineNumWidth || 1) + "px";
+      }
+    }
+    gutters.style.display = specs.length ? "" : "none";
+    updateGutterSpace(display);
+  }
+
+  function updateGutters(cm) {
+    renderGutters(cm.display);
+    regChange(cm);
+    alignHorizontally(cm);
+  }
+
+  // The display handles the DOM integration, both for input reading
+  // and content drawing. It holds references to DOM nodes and
+  // display-related state.
+
+  function Display(place, doc, input, options) {
+    var d = this;
+    this.input = input;
+
+    // Covers bottom-right square when both scrollbars are present.
+    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    d.scrollbarFiller.setAttribute("cm-not-content", "true");
+    // Covers bottom of gutter when coverGutterNextToScrollbar is on
+    // and h scrollbar is present.
+    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+    d.gutterFiller.setAttribute("cm-not-content", "true");
+    // Will contain the actual code, positioned to cover the viewport.
+    d.lineDiv = eltP("div", null, "CodeMirror-code");
+    // Elements are added to these to represent selection and cursors.
+    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
+    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
+    // A visibility: hidden element used to find the size of things.
+    d.measure = elt("div", null, "CodeMirror-measure");
+    // When lines outside of the viewport are measured, they are drawn in this.
+    d.lineMeasure = elt("div", null, "CodeMirror-measure");
+    // Wraps everything that needs to exist inside the vertically-padded coordinate system
+    d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+                      null, "position: relative; outline: none");
+    var lines = eltP("div", [d.lineSpace], "CodeMirror-lines");
+    // Moved around its parent to cover visible view.
+    d.mover = elt("div", [lines], null, "position: relative");
+    // Set to the height of the document, allowing scrolling.
+    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+    d.sizerWidth = null;
+    // Behavior of elts with overflow: auto and padding is
+    // inconsistent across browsers. This is used to ensure the
+    // scrollable area is big enough.
+    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
+    // Will contain the gutters, if any.
+    d.gutters = elt("div", null, "CodeMirror-gutters");
+    d.lineGutter = null;
+    // Actual scrollable element.
+    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
+    d.scroller.setAttribute("tabIndex", "-1");
+    // The element in which the editor lives.
+    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+    // See #6982. FIXME remove when this has been fixed for a while in Chrome
+    if (chrome && chrome_version >= 105) { d.wrapper.style.clipPath = "inset(0px)"; }
+
+    // This attribute is respected by automatic translation systems such as Google Translate,
+    // and may also be respected by tools used by human translators.
+    d.wrapper.setAttribute('translate', 'no');
+
+    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
+    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+    if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; }
+
+    if (place) {
+      if (place.appendChild) { place.appendChild(d.wrapper); }
+      else { place(d.wrapper); }
+    }
+
+    // Current rendered range (may be bigger than the view window).
+    d.viewFrom = d.viewTo = doc.first;
+    d.reportedViewFrom = d.reportedViewTo = doc.first;
+    // Information about the rendered lines.
+    d.view = [];
+    d.renderedView = null;
+    // Holds info about a single rendered line when it was rendered
+    // for measurement, while not in view.
+    d.externalMeasured = null;
+    // Empty space (in pixels) above the view
+    d.viewOffset = 0;
+    d.lastWrapHeight = d.lastWrapWidth = 0;
+    d.updateLineNumbers = null;
+
+    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+    d.scrollbarsClipped = false;
+
+    // Used to only resize the line number gutter when necessary (when
+    // the amount of lines crosses a boundary that makes its width change)
+    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
+    // Set to true when a non-horizontal-scrolling line widget is
+    // added. As an optimization, line widget aligning is skipped when
+    // this is false.
+    d.alignWidgets = false;
+
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+
+    // Tracks the maximum line length so that the horizontal scrollbar
+    // can be kept static when scrolling.
+    d.maxLine = null;
+    d.maxLineLength = 0;
+    d.maxLineChanged = false;
+
+    // Used for measuring wheel scrolling granularity
+    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
+
+    // True when shift is held down.
+    d.shift = false;
+
+    // Used to track whether anything happened since the context menu
+    // was opened.
+    d.selForContextMenu = null;
+
+    d.activeTouch = null;
+
+    d.gutterSpecs = getGutters(options.gutters, options.lineNumbers);
+    renderGutters(d);
+
+    input.init(d);
+  }
+
+  // Since the delta values reported on mouse wheel events are
+  // unstandardized between browsers and even browser versions, and
+  // generally horribly unpredictable, this code starts by measuring
+  // the scroll effect that the first few mouse wheel events have,
+  // and, from that, detects the way it can convert deltas to pixel
+  // offsets afterwards.
+  //
+  // The reason we want to know the amount a wheel event will scroll
+  // is that it gives us a chance to update the display before the
+  // actual scrolling happens, reducing flickering.
+
+  var wheelSamples = 0, wheelPixelsPerUnit = null;
+  // Fill in a browser-detected starting value on browsers where we
+  // know one. These don't have to be accurate -- the result of them
+  // being wrong would just be a slight flicker on the first wheel
+  // scroll (if it is large enough).
+  if (ie) { wheelPixelsPerUnit = -.53; }
+  else if (gecko) { wheelPixelsPerUnit = 15; }
+  else if (chrome) { wheelPixelsPerUnit = -.7; }
+  else if (safari) { wheelPixelsPerUnit = -1/3; }
+
+  function wheelEventDelta(e) {
+    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
+    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; }
+    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; }
+    else if (dy == null) { dy = e.wheelDelta; }
+    return {x: dx, y: dy}
+  }
+  function wheelEventPixels(e) {
+    var delta = wheelEventDelta(e);
+    delta.x *= wheelPixelsPerUnit;
+    delta.y *= wheelPixelsPerUnit;
+    return delta
+  }
+
+  function onScrollWheel(cm, e) {
+    // On Chrome 102, viewport updates somehow stop wheel-based
+    // scrolling. Turning off pointer events during the scroll seems
+    // to avoid the issue.
+    if (chrome && chrome_version == 102) {
+      if (cm.display.chromeScrollHack == null) { cm.display.sizer.style.pointerEvents = "none"; }
+      else { clearTimeout(cm.display.chromeScrollHack); }
+      cm.display.chromeScrollHack = setTimeout(function () {
+        cm.display.chromeScrollHack = null;
+        cm.display.sizer.style.pointerEvents = "";
+      }, 100);
+    }
+    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+    var pixelsPerUnit = wheelPixelsPerUnit;
+    if (e.deltaMode === 0) {
+      dx = e.deltaX;
+      dy = e.deltaY;
+      pixelsPerUnit = 1;
+    }
+
+    var display = cm.display, scroll = display.scroller;
+    // Quit if there's nothing to scroll here
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) { return }
+
+    // Webkit browsers on OS X abort momentum scrolls when the target
+    // of the scroll event is removed from the scrollable element.
+    // This hack (see related code in patchDisplay) makes sure the
+    // element is kept around.
+    if (dy && mac && webkit) {
+      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+        for (var i = 0; i < view.length; i++) {
+          if (view[i].node == cur) {
+            cm.display.currentWheelTarget = cur;
+            break outer
+          }
+        }
+      }
+    }
+
+    // On some browsers, horizontal scrolling will cause redraws to
+    // happen before the gutter has been realigned, causing it to
+    // wriggle around in a most unseemly way. When we have an
+    // estimated pixels/delta value, we just handle horizontal
+    // scrolling entirely here. It'll be slightly off from native, but
+    // better than glitching out.
+    if (dx && !gecko && !presto && pixelsPerUnit != null) {
+      if (dy && canScrollY)
+        { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * pixelsPerUnit)); }
+      setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * pixelsPerUnit));
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        { e_preventDefault(e); }
+      display.wheelStartX = null; // Abort measurement, if in progress
+      return
+    }
+
+    // 'Project' the visible viewport to cover the area that is being
+    // scrolled into view (if we know enough to estimate it).
+    if (dy && pixelsPerUnit != null) {
+      var pixels = dy * pixelsPerUnit;
+      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
+      if (pixels < 0) { top = Math.max(0, top + pixels - 50); }
+      else { bot = Math.min(cm.doc.height, bot + pixels + 50); }
+      updateDisplaySimple(cm, {top: top, bottom: bot});
+    }
+
+    if (wheelSamples < 20 && e.deltaMode !== 0) {
+      if (display.wheelStartX == null) {
+        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
+        display.wheelDX = dx; display.wheelDY = dy;
+        setTimeout(function () {
+          if (display.wheelStartX == null) { return }
+          var movedX = scroll.scrollLeft - display.wheelStartX;
+          var movedY = scroll.scrollTop - display.wheelStartY;
+          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+            (movedX && display.wheelDX && movedX / display.wheelDX);
+          display.wheelStartX = display.wheelStartY = null;
+          if (!sample) { return }
+          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
+          ++wheelSamples;
+        }, 200);
+      } else {
+        display.wheelDX += dx; display.wheelDY += dy;
+      }
+    }
+  }
+
+  // Selection objects are immutable. A new one is created every time
+  // the selection changes. A selection is one or more non-overlapping
+  // (and non-touching) ranges, sorted, and an integer that indicates
+  // which one is the primary selection (the one that's scrolled into
+  // view, that getCursor returns, etc).
+  var Selection = function(ranges, primIndex) {
+    this.ranges = ranges;
+    this.primIndex = primIndex;
+  };
+
+  Selection.prototype.primary = function () { return this.ranges[this.primIndex] };
+
+  Selection.prototype.equals = function (other) {
+    if (other == this) { return true }
+    if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }
+    for (var i = 0; i < this.ranges.length; i++) {
+      var here = this.ranges[i], there = other.ranges[i];
+      if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { return false }
+    }
+    return true
+  };
+
+  Selection.prototype.deepCopy = function () {
+    var out = [];
+    for (var i = 0; i < this.ranges.length; i++)
+      { out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); }
+    return new Selection(out, this.primIndex)
+  };
+
+  Selection.prototype.somethingSelected = function () {
+    for (var i = 0; i < this.ranges.length; i++)
+      { if (!this.ranges[i].empty()) { return true } }
+    return false
+  };
+
+  Selection.prototype.contains = function (pos, end) {
+    if (!end) { end = pos; }
+    for (var i = 0; i < this.ranges.length; i++) {
+      var range = this.ranges[i];
+      if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
+        { return i }
+    }
+    return -1
+  };
+
+  var Range = function(anchor, head) {
+    this.anchor = anchor; this.head = head;
+  };
+
+  Range.prototype.from = function () { return minPos(this.anchor, this.head) };
+  Range.prototype.to = function () { return maxPos(this.anchor, this.head) };
+  Range.prototype.empty = function () { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch };
+
+  // Take an unsorted, potentially overlapping set of ranges, and
+  // build a selection out of it. 'Consumes' ranges array (modifying
+  // it).
+  function normalizeSelection(cm, ranges, primIndex) {
+    var mayTouch = cm && cm.options.selectionsMayTouch;
+    var prim = ranges[primIndex];
+    ranges.sort(function (a, b) { return cmp(a.from(), b.from()); });
+    primIndex = indexOf(ranges, prim);
+    for (var i = 1; i < ranges.length; i++) {
+      var cur = ranges[i], prev = ranges[i - 1];
+      var diff = cmp(prev.to(), cur.from());
+      if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) {
+        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
+        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
+        if (i <= primIndex) { --primIndex; }
+        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
+      }
+    }
+    return new Selection(ranges, primIndex)
+  }
+
+  function simpleSelection(anchor, head) {
+    return new Selection([new Range(anchor, head || anchor)], 0)
+  }
+
+  // Compute the position of the end of a change (its 'to' property
+  // refers to the pre-change end).
+  function changeEnd(change) {
+    if (!change.text) { return change.to }
+    return Pos(change.from.line + change.text.length - 1,
+               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
+  }
+
+  // Adjust a position to refer to the post-change position of the
+  // same text, or the end of the change if the change covers it.
+  function adjustForChange(pos, change) {
+    if (cmp(pos, change.from) < 0) { return pos }
+    if (cmp(pos, change.to) <= 0) { return changeEnd(change) }
+
+    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
+    if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch; }
+    return Pos(line, ch)
+  }
+
+  function computeSelAfterChange(doc, change) {
+    var out = [];
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      var range = doc.sel.ranges[i];
+      out.push(new Range(adjustForChange(range.anchor, change),
+                         adjustForChange(range.head, change)));
+    }
+    return normalizeSelection(doc.cm, out, doc.sel.primIndex)
+  }
+
+  function offsetPos(pos, old, nw) {
+    if (pos.line == old.line)
+      { return Pos(nw.line, pos.ch - old.ch + nw.ch) }
+    else
+      { return Pos(nw.line + (pos.line - old.line), pos.ch) }
+  }
+
+  // Used by replaceSelections to allow moving the selection to the
+  // start or around the replaced test. Hint may be "start" or "around".
+  function computeReplacedSel(doc, changes, hint) {
+    var out = [];
+    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+    for (var i = 0; i < changes.length; i++) {
+      var change = changes[i];
+      var from = offsetPos(change.from, oldPrev, newPrev);
+      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
+      oldPrev = change.to;
+      newPrev = to;
+      if (hint == "around") {
+        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
+        out[i] = new Range(inv ? to : from, inv ? from : to);
+      } else {
+        out[i] = new Range(from, from);
+      }
+    }
+    return new Selection(out, doc.sel.primIndex)
+  }
+
+  // Used to get the editor into a consistent state again when options change.
+
+  function loadMode(cm) {
+    cm.doc.mode = getMode(cm.options, cm.doc.modeOption);
+    resetModeState(cm);
+  }
+
+  function resetModeState(cm) {
+    cm.doc.iter(function (line) {
+      if (line.stateAfter) { line.stateAfter = null; }
+      if (line.styles) { line.styles = null; }
+    });
+    cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first;
+    startWorker(cm, 100);
+    cm.state.modeGen++;
+    if (cm.curOp) { regChange(cm); }
+  }
+
+  // DOCUMENT DATA STRUCTURE
+
+  // By default, updates that start and end at the beginning of a line
+  // are treated specially, in order to make the association of line
+  // widgets and marker elements with the text behave more intuitive.
+  function isWholeLineUpdate(doc, change) {
+    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
+      (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
+  }
+
+  // Perform a change on the document data structure.
+  function updateDoc(doc, change, markedSpans, estimateHeight) {
+    function spansFor(n) {return markedSpans ? markedSpans[n] : null}
+    function update(line, text, spans) {
+      updateLine(line, text, spans, estimateHeight);
+      signalLater(line, "change", line, change);
+    }
+    function linesFor(start, end) {
+      var result = [];
+      for (var i = start; i < end; ++i)
+        { result.push(new Line(text[i], spansFor(i), estimateHeight)); }
+      return result
+    }
+
+    var from = change.from, to = change.to, text = change.text;
+    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
+    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
+
+    // Adjust the line structure
+    if (change.full) {
+      doc.insert(0, linesFor(0, text.length));
+      doc.remove(text.length, doc.size - text.length);
+    } else if (isWholeLineUpdate(doc, change)) {
+      // This is a whole-line replace. Treated specially to make
+      // sure line objects move the way they are supposed to.
+      var added = linesFor(0, text.length - 1);
+      update(lastLine, lastLine.text, lastSpans);
+      if (nlines) { doc.remove(from.line, nlines); }
+      if (added.length) { doc.insert(from.line, added); }
+    } else if (firstLine == lastLine) {
+      if (text.length == 1) {
+        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
+      } else {
+        var added$1 = linesFor(1, text.length - 1);
+        added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
+        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+        doc.insert(from.line + 1, added$1);
+      }
+    } else if (text.length == 1) {
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
+      doc.remove(from.line + 1, nlines);
+    } else {
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
+      var added$2 = linesFor(1, text.length - 1);
+      if (nlines > 1) { doc.remove(from.line + 1, nlines - 1); }
+      doc.insert(from.line + 1, added$2);
+    }
+
+    signalLater(doc, "change", doc, change);
+  }
+
+  // Call f for all linked documents.
+  function linkedDocs(doc, f, sharedHistOnly) {
+    function propagate(doc, skip, sharedHist) {
+      if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) {
+        var rel = doc.linked[i];
+        if (rel.doc == skip) { continue }
+        var shared = sharedHist && rel.sharedHist;
+        if (sharedHistOnly && !shared) { continue }
+        f(rel.doc, shared);
+        propagate(rel.doc, doc, shared);
+      } }
+    }
+    propagate(doc, null, true);
+  }
+
+  // Attach a document to an editor.
+  function attachDoc(cm, doc) {
+    if (doc.cm) { throw new Error("This document is already in use.") }
+    cm.doc = doc;
+    doc.cm = cm;
+    estimateLineHeights(cm);
+    loadMode(cm);
+    setDirectionClass(cm);
+    cm.options.direction = doc.direction;
+    if (!cm.options.lineWrapping) { findMaxLine(cm); }
+    cm.options.mode = doc.modeOption;
+    regChange(cm);
+  }
+
+  function setDirectionClass(cm) {
+  (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl");
+  }
+
+  function directionChanged(cm) {
+    runInOp(cm, function () {
+      setDirectionClass(cm);
+      regChange(cm);
+    });
+  }
+
+  function History(prev) {
+    // Arrays of change events and selections. Doing something adds an
+    // event to done and clears undo. Undoing moves events from done
+    // to undone, redoing moves them in the other direction.
+    this.done = []; this.undone = [];
+    this.undoDepth = prev ? prev.undoDepth : Infinity;
+    // Used to track when changes can be merged into a single undo
+    // event
+    this.lastModTime = this.lastSelTime = 0;
+    this.lastOp = this.lastSelOp = null;
+    this.lastOrigin = this.lastSelOrigin = null;
+    // Used by the isClean() method
+    this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1;
+  }
+
+  // Create a history change event from an updateDoc-style change
+  // object.
+  function historyChangeFromChange(doc, change) {
+    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
+    linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true);
+    return histChange
+  }
+
+  // Pop all selection events off the end of a history array. Stop at
+  // a change event.
+  function clearSelectionEvents(array) {
+    while (array.length) {
+      var last = lst(array);
+      if (last.ranges) { array.pop(); }
+      else { break }
+    }
+  }
+
+  // Find the top change event in the history. Pop off selection
+  // events that are in the way.
+  function lastChangeEvent(hist, force) {
+    if (force) {
+      clearSelectionEvents(hist.done);
+      return lst(hist.done)
+    } else if (hist.done.length && !lst(hist.done).ranges) {
+      return lst(hist.done)
+    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
+      hist.done.pop();
+      return lst(hist.done)
+    }
+  }
+
+  // Register a change in the history. Merges changes that are within
+  // a single operation, or are close together with an origin that
+  // allows merging (starting with "+") into a single event.
+  function addChangeToHistory(doc, change, selAfter, opId) {
+    var hist = doc.history;
+    hist.undone.length = 0;
+    var time = +new Date, cur;
+    var last;
+
+    if ((hist.lastOp == opId ||
+         hist.lastOrigin == change.origin && change.origin &&
+         ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
+          change.origin.charAt(0) == "*")) &&
+        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
+      // Merge this change into the last event
+      last = lst(cur.changes);
+      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
+        // Optimized case for simple insertion -- don't want to add
+        // new changesets for every character typed
+        last.to = changeEnd(change);
+      } else {
+        // Add new sub-event
+        cur.changes.push(historyChangeFromChange(doc, change));
+      }
+    } else {
+      // Can not be merged, start a new event.
+      var before = lst(hist.done);
+      if (!before || !before.ranges)
+        { pushSelectionToHistory(doc.sel, hist.done); }
+      cur = {changes: [historyChangeFromChange(doc, change)],
+             generation: hist.generation};
+      hist.done.push(cur);
+      while (hist.done.length > hist.undoDepth) {
+        hist.done.shift();
+        if (!hist.done[0].ranges) { hist.done.shift(); }
+      }
+    }
+    hist.done.push(selAfter);
+    hist.generation = ++hist.maxGeneration;
+    hist.lastModTime = hist.lastSelTime = time;
+    hist.lastOp = hist.lastSelOp = opId;
+    hist.lastOrigin = hist.lastSelOrigin = change.origin;
+
+    if (!last) { signal(doc, "historyAdded"); }
+  }
+
+  function selectionEventCanBeMerged(doc, origin, prev, sel) {
+    var ch = origin.charAt(0);
+    return ch == "*" ||
+      ch == "+" &&
+      prev.ranges.length == sel.ranges.length &&
+      prev.somethingSelected() == sel.somethingSelected() &&
+      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
+  }
+
+  // Called whenever the selection changes, sets the new selection as
+  // the pending selection in the history, and pushes the old pending
+  // selection into the 'done' array when it was significantly
+  // different (in number of selected ranges, emptiness, or time).
+  function addSelectionToHistory(doc, sel, opId, options) {
+    var hist = doc.history, origin = options && options.origin;
+
+    // A new event is started when the previous origin does not match
+    // the current, or the origins don't allow matching. Origins
+    // starting with * are always merged, those starting with + are
+    // merged when similar and close together in time.
+    if (opId == hist.lastSelOp ||
+        (origin && hist.lastSelOrigin == origin &&
+         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
+          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
+      { hist.done[hist.done.length - 1] = sel; }
+    else
+      { pushSelectionToHistory(sel, hist.done); }
+
+    hist.lastSelTime = +new Date;
+    hist.lastSelOrigin = origin;
+    hist.lastSelOp = opId;
+    if (options && options.clearRedo !== false)
+      { clearSelectionEvents(hist.undone); }
+  }
+
+  function pushSelectionToHistory(sel, dest) {
+    var top = lst(dest);
+    if (!(top && top.ranges && top.equals(sel)))
+      { dest.push(sel); }
+  }
+
+  // Used to store marked span information in the history.
+  function attachLocalSpans(doc, change, from, to) {
+    var existing = change["spans_" + doc.id], n = 0;
+    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) {
+      if (line.markedSpans)
+        { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; }
+      ++n;
+    });
+  }
+
+  // When un/re-doing restores text containing marked spans, those
+  // that have been explicitly cleared should not be restored.
+  function removeClearedSpans(spans) {
+    if (!spans) { return null }
+    var out;
+    for (var i = 0; i < spans.length; ++i) {
+      if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i); } }
+      else if (out) { out.push(spans[i]); }
+    }
+    return !out ? spans : out.length ? out : null
+  }
+
+  // Retrieve and filter the old marked spans stored in a change event.
+  function getOldSpans(doc, change) {
+    var found = change["spans_" + doc.id];
+    if (!found) { return null }
+    var nw = [];
+    for (var i = 0; i < change.text.length; ++i)
+      { nw.push(removeClearedSpans(found[i])); }
+    return nw
+  }
+
+  // Used for un/re-doing changes from the history. Combines the
+  // result of computing the existing spans with the set of spans that
+  // existed in the history (so that deleting around a span and then
+  // undoing brings back the span).
+  function mergeOldSpans(doc, change) {
+    var old = getOldSpans(doc, change);
+    var stretched = stretchSpansOverChange(doc, change);
+    if (!old) { return stretched }
+    if (!stretched) { return old }
+
+    for (var i = 0; i < old.length; ++i) {
+      var oldCur = old[i], stretchCur = stretched[i];
+      if (oldCur && stretchCur) {
+        spans: for (var j = 0; j < stretchCur.length; ++j) {
+          var span = stretchCur[j];
+          for (var k = 0; k < oldCur.length; ++k)
+            { if (oldCur[k].marker == span.marker) { continue spans } }
+          oldCur.push(span);
+        }
+      } else if (stretchCur) {
+        old[i] = stretchCur;
+      }
+    }
+    return old
+  }
+
+  // Used both to provide a JSON-safe object in .getHistory, and, when
+  // detaching a document, to split the history in two
+  function copyHistoryArray(events, newGroup, instantiateSel) {
+    var copy = [];
+    for (var i = 0; i < events.length; ++i) {
+      var event = events[i];
+      if (event.ranges) {
+        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
+        continue
+      }
+      var changes = event.changes, newChanges = [];
+      copy.push({changes: newChanges});
+      for (var j = 0; j < changes.length; ++j) {
+        var change = changes[j], m = (void 0);
+        newChanges.push({from: change.from, to: change.to, text: change.text});
+        if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) {
+          if (indexOf(newGroup, Number(m[1])) > -1) {
+            lst(newChanges)[prop] = change[prop];
+            delete change[prop];
+          }
+        } } }
+      }
+    }
+    return copy
+  }
+
+  // The 'scroll' parameter given to many of these indicated whether
+  // the new cursor position should be scrolled into view after
+  // modifying the selection.
+
+  // If shift is held or the extend flag is set, extends a range to
+  // include a given position (and optionally a second position).
+  // Otherwise, simply returns the range between the given positions.
+  // Used for cursor motion and such.
+  function extendRange(range, head, other, extend) {
+    if (extend) {
+      var anchor = range.anchor;
+      if (other) {
+        var posBefore = cmp(head, anchor) < 0;
+        if (posBefore != (cmp(other, anchor) < 0)) {
+          anchor = head;
+          head = other;
+        } else if (posBefore != (cmp(head, other) < 0)) {
+          head = other;
+        }
+      }
+      return new Range(anchor, head)
+    } else {
+      return new Range(other || head, head)
+    }
+  }
+
+  // Extend the primary selection range, discard the rest.
+  function extendSelection(doc, head, other, options, extend) {
+    if (extend == null) { extend = doc.cm && (doc.cm.display.shift || doc.extend); }
+    setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options);
+  }
+
+  // Extend all selections (pos is an array of selections with length
+  // equal the number of selections)
+  function extendSelections(doc, heads, options) {
+    var out = [];
+    var extend = doc.cm && (doc.cm.display.shift || doc.extend);
+    for (var i = 0; i < doc.sel.ranges.length; i++)
+      { out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); }
+    var newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex);
+    setSelection(doc, newSel, options);
+  }
+
+  // Updates a single range in the selection.
+  function replaceOneSelection(doc, i, range, options) {
+    var ranges = doc.sel.ranges.slice(0);
+    ranges[i] = range;
+    setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options);
+  }
+
+  // Reset the selection to a single range.
+  function setSimpleSelection(doc, anchor, head, options) {
+    setSelection(doc, simpleSelection(anchor, head), options);
+  }
+
+  // Give beforeSelectionChange handlers a change to influence a
+  // selection update.
+  function filterSelectionChange(doc, sel, options) {
+    var obj = {
+      ranges: sel.ranges,
+      update: function(ranges) {
+        this.ranges = [];
+        for (var i = 0; i < ranges.length; i++)
+          { this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                     clipPos(doc, ranges[i].head)); }
+      },
+      origin: options && options.origin
+    };
+    signal(doc, "beforeSelectionChange", doc, obj);
+    if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj); }
+    if (obj.ranges != sel.ranges) { return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1) }
+    else { return sel }
+  }
+
+  function setSelectionReplaceHistory(doc, sel, options) {
+    var done = doc.history.done, last = lst(done);
+    if (last && last.ranges) {
+      done[done.length - 1] = sel;
+      setSelectionNoUndo(doc, sel, options);
+    } else {
+      setSelection(doc, sel, options);
+    }
+  }
+
+  // Set a new selection.
+  function setSelection(doc, sel, options) {
+    setSelectionNoUndo(doc, sel, options);
+    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
+  }
+
+  function setSelectionNoUndo(doc, sel, options) {
+    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+      { sel = filterSelectionChange(doc, sel, options); }
+
+    var bias = options && options.bias ||
+      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
+    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+    if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor")
+      { ensureCursorVisible(doc.cm); }
+  }
+
+  function setSelectionInner(doc, sel) {
+    if (sel.equals(doc.sel)) { return }
+
+    doc.sel = sel;
+
+    if (doc.cm) {
+      doc.cm.curOp.updateInput = 1;
+      doc.cm.curOp.selectionChanged = true;
+      signalCursorActivity(doc.cm);
+    }
+    signalLater(doc, "cursorActivity", doc);
+  }
+
+  // Verify that the selection does not partially select any atomic
+  // marked ranges.
+  function reCheckSelection(doc) {
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
+  }
+
+  // Return a selection that does not partially select any atomic
+  // ranges.
+  function skipAtomicInSelection(doc, sel, bias, mayClear) {
+    var out;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range = sel.ranges[i];
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = range.head == range.anchor ? newAnchor : skipAtomic(doc, range.head, old && old.head, bias, mayClear);
+      if (out || newAnchor != range.anchor || newHead != range.head) {
+        if (!out) { out = sel.ranges.slice(0, i); }
+        out[i] = new Range(newAnchor, newHead);
+      }
+    }
+    return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel
+  }
+
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+
+      // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+      // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+      // is with selectLeft/Right
+      var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;
+      var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;
+
+      if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) { break }
+            else {--i; continue}
+          }
+        }
+        if (!m.atomic) { continue }
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
+          if (dir < 0 ? preventCursorRight : preventCursorLeft)
+            { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            { return skipAtomicInner(doc, near, pos, dir, mayClear) }
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? preventCursorLeft : preventCursorRight)
+          { far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
+      }
+    } }
+    return pos
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0)
+    }
+    return found
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) }
+      else { return null }
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) }
+      else { return null }
+    } else {
+      return new Pos(pos.line, pos.ch + dir)
+    }
+  }
+
+  function selectAll(cm) {
+    cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);
+  }
+
+  // UPDATING
+
+  // Allow "beforeChange" event handlers to influence a change
+  function filterChange(doc, change, update) {
+    var obj = {
+      canceled: false,
+      from: change.from,
+      to: change.to,
+      text: change.text,
+      origin: change.origin,
+      cancel: function () { return obj.canceled = true; }
+    };
+    if (update) { obj.update = function (from, to, text, origin) {
+      if (from) { obj.from = clipPos(doc, from); }
+      if (to) { obj.to = clipPos(doc, to); }
+      if (text) { obj.text = text; }
+      if (origin !== undefined) { obj.origin = origin; }
+    }; }
+    signal(doc, "beforeChange", doc, obj);
+    if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj); }
+
+    if (obj.canceled) {
+      if (doc.cm) { doc.cm.curOp.updateInput = 2; }
+      return null
+    }
+    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
+  }
+
+  // Apply a change to a document, and add it to the document's
+  // history, and propagating it to all linked documents.
+  function makeChange(doc, change, ignoreReadOnly) {
+    if (doc.cm) {
+      if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) }
+      if (doc.cm.state.suppressEdits) { return }
+    }
+
+    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
+      change = filterChange(doc, change, true);
+      if (!change) { return }
+    }
+
+    // Possibly split or suppress the update based on the presence
+    // of read-only spans in its range.
+    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
+    if (split) {
+      for (var i = split.length - 1; i >= 0; --i)
+        { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin}); }
+    } else {
+      makeChangeInner(doc, change);
+    }
+  }
+
+  function makeChangeInner(doc, change) {
+    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return }
+    var selAfter = computeSelAfterChange(doc, change);
+    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+
+    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
+    var rebased = [];
+
+    linkedDocs(doc, function (doc, sharedHist) {
+      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+        rebaseHist(doc.history, change);
+        rebased.push(doc.history);
+      }
+      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
+    });
+  }
+
+  // Revert a change stored in a document's history.
+  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
+    var suppress = doc.cm && doc.cm.state.suppressEdits;
+    if (suppress && !allowSelectionOnly) { return }
+
+    var hist = doc.history, event, selAfter = doc.sel;
+    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+
+    // Verify that there is a useable event (so that ctrl-z won't
+    // needlessly clear selection events)
+    var i = 0;
+    for (; i < source.length; i++) {
+      event = source[i];
+      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
+        { break }
+    }
+    if (i == source.length) { return }
+    hist.lastOrigin = hist.lastSelOrigin = null;
+
+    for (;;) {
+      event = source.pop();
+      if (event.ranges) {
+        pushSelectionToHistory(event, dest);
+        if (allowSelectionOnly && !event.equals(doc.sel)) {
+          setSelection(doc, event, {clearRedo: false});
+          return
+        }
+        selAfter = event;
+      } else if (suppress) {
+        source.push(event);
+        return
+      } else { break }
+    }
+
+    // Build up a reverse change object to add to the opposite history
+    // stack (redo when undoing, and vice versa).
+    var antiChanges = [];
+    pushSelectionToHistory(selAfter, dest);
+    dest.push({changes: antiChanges, generation: hist.generation});
+    hist.generation = event.generation || ++hist.maxGeneration;
+
+    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+
+    var loop = function ( i ) {
+      var change = event.changes[i];
+      change.origin = type;
+      if (filter && !filterChange(doc, change, false)) {
+        source.length = 0;
+        return {}
+      }
+
+      antiChanges.push(historyChangeFromChange(doc, change));
+
+      var after = i ? computeSelAfterChange(doc, change) : lst(source);
+      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
+      if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); }
+      var rebased = [];
+
+      // Propagate to the linked documents
+      linkedDocs(doc, function (doc, sharedHist) {
+        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+          rebaseHist(doc.history, change);
+          rebased.push(doc.history);
+        }
+        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
+      });
+    };
+
+    for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) {
+      var returned = loop( i$1 );
+
+      if ( returned ) return returned.v;
+    }
+  }
+
+  // Sub-views need their line numbers shifted when text is added
+  // above or below them in the parent document.
+  function shiftDoc(doc, distance) {
+    if (distance == 0) { return }
+    doc.first += distance;
+    doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range(
+      Pos(range.anchor.line + distance, range.anchor.ch),
+      Pos(range.head.line + distance, range.head.ch)
+    ); }), doc.sel.primIndex);
+    if (doc.cm) {
+      regChange(doc.cm, doc.first, doc.first - distance, distance);
+      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+        { regLineChange(doc.cm, l, "gutter"); }
+    }
+  }
+
+  // More lower-level change function, handling only a single document
+  // (not linked ones).
+  function makeChangeSingleDoc(doc, change, selAfter, spans) {
+    if (doc.cm && !doc.cm.curOp)
+      { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) }
+
+    if (change.to.line < doc.first) {
+      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
+      return
+    }
+    if (change.from.line > doc.lastLine()) { return }
+
+    // Clip the change to the size of this doc
+    if (change.from.line < doc.first) {
+      var shift = change.text.length - 1 - (doc.first - change.from.line);
+      shiftDoc(doc, shift);
+      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
+                text: [lst(change.text)], origin: change.origin};
+    }
+    var last = doc.lastLine();
+    if (change.to.line > last) {
+      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
+                text: [change.text[0]], origin: change.origin};
+    }
+
+    change.removed = getBetween(doc, change.from, change.to);
+
+    if (!selAfter) { selAfter = computeSelAfterChange(doc, change); }
+    if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }
+    else { updateDoc(doc, change, spans); }
+    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+
+    if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+      { doc.cantEdit = false; }
+  }
+
+  // Handle the interaction of a change to a document with the editor
+  // that this document is part of.
+  function makeChangeSingleDocInEditor(cm, change, spans) {
+    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
+
+    var recomputeMaxLength = false, checkWidthStart = from.line;
+    if (!cm.options.lineWrapping) {
+      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
+      doc.iter(checkWidthStart, to.line + 1, function (line) {
+        if (line == display.maxLine) {
+          recomputeMaxLength = true;
+          return true
+        }
+      });
+    }
+
+    if (doc.sel.contains(change.from, change.to) > -1)
+      { signalCursorActivity(cm); }
+
+    updateDoc(doc, change, spans, estimateHeight(cm));
+
+    if (!cm.options.lineWrapping) {
+      doc.iter(checkWidthStart, from.line + change.text.length, function (line) {
+        var len = lineLength(line);
+        if (len > display.maxLineLength) {
+          display.maxLine = line;
+          display.maxLineLength = len;
+          display.maxLineChanged = true;
+          recomputeMaxLength = false;
+        }
+      });
+      if (recomputeMaxLength) { cm.curOp.updateMaxLine = true; }
+    }
+
+    retreatFrontier(doc, from.line);
+    startWorker(cm, 400);
+
+    var lendiff = change.text.length - (to.line - from.line) - 1;
+    // Remember that these lines changed, for updating the display
+    if (change.full)
+      { regChange(cm); }
+    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+      { regLineChange(cm, from.line, "text"); }
+    else
+      { regChange(cm, from.line, to.line + 1, lendiff); }
+
+    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+    if (changeHandler || changesHandler) {
+      var obj = {
+        from: from, to: to,
+        text: change.text,
+        removed: change.removed,
+        origin: change.origin
+      };
+      if (changeHandler) { signalLater(cm, "change", cm, obj); }
+      if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); }
+    }
+    cm.display.selForContextMenu = null;
+  }
+
+  function replaceRange(doc, code, from, to, origin) {
+    var assign;
+
+    if (!to) { to = from; }
+    if (cmp(to, from) < 0) { (assign = [to, from], from = assign[0], to = assign[1]); }
+    if (typeof code == "string") { code = doc.splitLines(code); }
+    makeChange(doc, {from: from, to: to, text: code, origin: origin});
+  }
+
+  // Rebasing/resetting history to deal with externally-sourced changes
+
+  function rebaseHistSelSingle(pos, from, to, diff) {
+    if (to < pos.line) {
+      pos.line += diff;
+    } else if (from < pos.line) {
+      pos.line = from;
+      pos.ch = 0;
+    }
+  }
+
+  // Tries to rebase an array of history events given a change in the
+  // document. If the change touches the same lines as the event, the
+  // event, and everything 'behind' it, is discarded. If the change is
+  // before the event, the event's positions are updated. Uses a
+  // copy-on-write scheme for the positions, to avoid having to
+  // reallocate them all on every rebase, but also avoid problems with
+  // shared position objects being unsafely updated.
+  function rebaseHistArray(array, from, to, diff) {
+    for (var i = 0; i < array.length; ++i) {
+      var sub = array[i], ok = true;
+      if (sub.ranges) {
+        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+        for (var j = 0; j < sub.ranges.length; j++) {
+          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
+          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+        }
+        continue
+      }
+      for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) {
+        var cur = sub.changes[j$1];
+        if (to < cur.from.line) {
+          cur.from = Pos(cur.from.line + diff, cur.from.ch);
+          cur.to = Pos(cur.to.line + diff, cur.to.ch);
+        } else if (from <= cur.to.line) {
+          ok = false;
+          break
+        }
+      }
+      if (!ok) {
+        array.splice(0, i + 1);
+        i = 0;
+      }
+    }
+  }
+
+  function rebaseHist(hist, change) {
+    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
+    rebaseHistArray(hist.done, from, to, diff);
+    rebaseHistArray(hist.undone, from, to, diff);
+  }
+
+  // Utility for applying a change to a line by handle or number,
+  // returning the number and optionally registering the line as
+  // changed.
+  function changeLine(doc, handle, changeType, op) {
+    var no = handle, line = handle;
+    if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)); }
+    else { no = lineNo(handle); }
+    if (no == null) { return null }
+    if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType); }
+    return line
+  }
+
+  // The document is represented as a BTree consisting of leaves, with
+  // chunk of lines in them, and branches, with up to ten leaves or
+  // other branch nodes below them. The top node is always a branch
+  // node, and is the document object itself (meaning it has
+  // additional methods and properties).
+  //
+  // All nodes have parent links. The tree is used both to go from
+  // line numbers to line objects, and to go from objects to numbers.
+  // It also indexes by height, and is used to convert between height
+  // and line object, and to find the total height of the document.
+  //
+  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
+
+  function LeafChunk(lines) {
+    this.lines = lines;
+    this.parent = null;
+    var height = 0;
+    for (var i = 0; i < lines.length; ++i) {
+      lines[i].parent = this;
+      height += lines[i].height;
+    }
+    this.height = height;
+  }
+
+  LeafChunk.prototype = {
+    chunkSize: function() { return this.lines.length },
+
+    // Remove the n lines at offset 'at'.
+    removeInner: function(at, n) {
+      for (var i = at, e = at + n; i < e; ++i) {
+        var line = this.lines[i];
+        this.height -= line.height;
+        cleanUpLine(line);
+        signalLater(line, "delete");
+      }
+      this.lines.splice(at, n);
+    },
+
+    // Helper used to collapse a small branch into a single leaf.
+    collapse: function(lines) {
+      lines.push.apply(lines, this.lines);
+    },
+
+    // Insert the given array of lines at offset 'at', count them as
+    // having the given height.
+    insertInner: function(at, lines, height) {
+      this.height += height;
+      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
+      for (var i = 0; i < lines.length; ++i) { lines[i].parent = this; }
+    },
+
+    // Used to iterate over a part of the tree.
+    iterN: function(at, n, op) {
+      for (var e = at + n; at < e; ++at)
+        { if (op(this.lines[at])) { return true } }
+    }
+  };
+
+  function BranchChunk(children) {
+    this.children = children;
+    var size = 0, height = 0;
+    for (var i = 0; i < children.length; ++i) {
+      var ch = children[i];
+      size += ch.chunkSize(); height += ch.height;
+      ch.parent = this;
+    }
+    this.size = size;
+    this.height = height;
+    this.parent = null;
+  }
+
+  BranchChunk.prototype = {
+    chunkSize: function() { return this.size },
+
+    removeInner: function(at, n) {
+      this.size -= n;
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this.children[i], sz = child.chunkSize();
+        if (at < sz) {
+          var rm = Math.min(n, sz - at), oldHeight = child.height;
+          child.removeInner(at, rm);
+          this.height -= oldHeight - child.height;
+          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
+          if ((n -= rm) == 0) { break }
+          at = 0;
+        } else { at -= sz; }
+      }
+      // If the result is smaller than 25 lines, ensure that it is a
+      // single leaf node.
+      if (this.size - n < 25 &&
+          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
+        var lines = [];
+        this.collapse(lines);
+        this.children = [new LeafChunk(lines)];
+        this.children[0].parent = this;
+      }
+    },
+
+    collapse: function(lines) {
+      for (var i = 0; i < this.children.length; ++i) { this.children[i].collapse(lines); }
+    },
+
+    insertInner: function(at, lines, height) {
+      this.size += lines.length;
+      this.height += height;
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this.children[i], sz = child.chunkSize();
+        if (at <= sz) {
+          child.insertInner(at, lines, height);
+          if (child.lines && child.lines.length > 50) {
+            // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
+            // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+            var remaining = child.lines.length % 25 + 25;
+            for (var pos = remaining; pos < child.lines.length;) {
+              var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
+              child.height -= leaf.height;
+              this.children.splice(++i, 0, leaf);
+              leaf.parent = this;
+            }
+            child.lines = child.lines.slice(0, remaining);
+            this.maybeSpill();
+          }
+          break
+        }
+        at -= sz;
+      }
+    },
+
+    // When a node has grown, check whether it should be split.
+    maybeSpill: function() {
+      if (this.children.length <= 10) { return }
+      var me = this;
+      do {
+        var spilled = me.children.splice(me.children.length - 5, 5);
+        var sibling = new BranchChunk(spilled);
+        if (!me.parent) { // Become the parent node
+          var copy = new BranchChunk(me.children);
+          copy.parent = me;
+          me.children = [copy, sibling];
+          me = copy;
+       } else {
+          me.size -= sibling.size;
+          me.height -= sibling.height;
+          var myIndex = indexOf(me.parent.children, me);
+          me.parent.children.splice(myIndex + 1, 0, sibling);
+        }
+        sibling.parent = me.parent;
+      } while (me.children.length > 10)
+      me.parent.maybeSpill();
+    },
+
+    iterN: function(at, n, op) {
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this.children[i], sz = child.chunkSize();
+        if (at < sz) {
+          var used = Math.min(n, sz - at);
+          if (child.iterN(at, used, op)) { return true }
+          if ((n -= used) == 0) { break }
+          at = 0;
+        } else { at -= sz; }
+      }
+    }
+  };
+
+  // Line widgets are block elements displayed above or below a line.
+
+  var LineWidget = function(doc, node, options) {
+    if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))
+      { this[opt] = options[opt]; } } }
+    this.doc = doc;
+    this.node = node;
+  };
+
+  LineWidget.prototype.clear = function () {
+    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+    if (no == null || !ws) { return }
+    for (var i = 0; i < ws.length; ++i) { if (ws[i] == this) { ws.splice(i--, 1); } }
+    if (!ws.length) { line.widgets = null; }
+    var height = widgetHeight(this);
+    updateLineHeight(line, Math.max(0, line.height - height));
+    if (cm) {
+      runInOp(cm, function () {
+        adjustScrollWhenAboveVisible(cm, line, -height);
+        regLineChange(cm, no, "widget");
+      });
+      signalLater(cm, "lineWidgetCleared", cm, this, no);
+    }
+  };
+
+  LineWidget.prototype.changed = function () {
+      var this$1 = this;
+
+    var oldH = this.height, cm = this.doc.cm, line = this.line;
+    this.height = null;
+    var diff = widgetHeight(this) - oldH;
+    if (!diff) { return }
+    if (!lineIsHidden(this.doc, line)) { updateLineHeight(line, line.height + diff); }
+    if (cm) {
+      runInOp(cm, function () {
+        cm.curOp.forceUpdate = true;
+        adjustScrollWhenAboveVisible(cm, line, diff);
+        signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line));
+      });
+    }
+  };
+  eventMixin(LineWidget);
+
+  function adjustScrollWhenAboveVisible(cm, line, diff) {
+    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+      { addToScrollTop(cm, diff); }
+  }
+
+  function addLineWidget(doc, handle, node, options) {
+    var widget = new LineWidget(doc, node, options);
+    var cm = doc.cm;
+    if (cm && widget.noHScroll) { cm.display.alignWidgets = true; }
+    changeLine(doc, handle, "widget", function (line) {
+      var widgets = line.widgets || (line.widgets = []);
+      if (widget.insertAt == null) { widgets.push(widget); }
+      else { widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget); }
+      widget.line = line;
+      if (cm && !lineIsHidden(doc, line)) {
+        var aboveVisible = heightAtLine(line) < doc.scrollTop;
+        updateLineHeight(line, line.height + widgetHeight(widget));
+        if (aboveVisible) { addToScrollTop(cm, widget.height); }
+        cm.curOp.forceUpdate = true;
+      }
+      return true
+    });
+    if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
+    return widget
+  }
+
+  // TEXTMARKERS
+
+  // Created with markText and setBookmark methods. A TextMarker is a
+  // handle that can be used to clear or find a marked position in the
+  // document. Line objects hold arrays (markedSpans) containing
+  // {from, to, marker} object pointing to such marker objects, and
+  // indicating that such a marker is present on that line. Multiple
+  // lines may point to the same marker when it spans across lines.
+  // The spans will have null for their from/to properties when the
+  // marker continues beyond the start/end of the line. Markers have
+  // links back to the lines they currently touch.
+
+  // Collapsed markers have unique ids, in order to be able to order
+  // them, which is needed for uniquely determining an outer marker
+  // when they overlap (they may nest, but not partially overlap).
+  var nextMarkerId = 0;
+
+  var TextMarker = function(doc, type) {
+    this.lines = [];
+    this.type = type;
+    this.doc = doc;
+    this.id = ++nextMarkerId;
+  };
+
+  // Clear the marker.
+  TextMarker.prototype.clear = function () {
+    if (this.explicitlyCleared) { return }
+    var cm = this.doc.cm, withOp = cm && !cm.curOp;
+    if (withOp) { startOperation(cm); }
+    if (hasHandler(this, "clear")) {
+      var found = this.find();
+      if (found) { signalLater(this, "clear", found.from, found.to); }
+    }
+    var min = null, max = null;
+    for (var i = 0; i < this.lines.length; ++i) {
+      var line = this.lines[i];
+      var span = getMarkedSpanFor(line.markedSpans, this);
+      if (cm && !this.collapsed) { regLineChange(cm, lineNo(line), "text"); }
+      else if (cm) {
+        if (span.to != null) { max = lineNo(line); }
+        if (span.from != null) { min = lineNo(line); }
+      }
+      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
+        { updateLineHeight(line, textHeight(cm.display)); }
+    }
+    if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {
+      var visual = visualLine(this.lines[i$1]), len = lineLength(visual);
+      if (len > cm.display.maxLineLength) {
+        cm.display.maxLine = visual;
+        cm.display.maxLineLength = len;
+        cm.display.maxLineChanged = true;
+      }
+    } }
+
+    if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1); }
+    this.lines.length = 0;
+    this.explicitlyCleared = true;
+    if (this.atomic && this.doc.cantEdit) {
+      this.doc.cantEdit = false;
+      if (cm) { reCheckSelection(cm.doc); }
+    }
+    if (cm) { signalLater(cm, "markerCleared", cm, this, min, max); }
+    if (withOp) { endOperation(cm); }
+    if (this.parent) { this.parent.clear(); }
+  };
+
+  // Find the position of the marker in the document. Returns a {from,
+  // to} object by default. Side can be passed to get a specific side
+  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+  // Pos objects returned contain a line object, rather than a line
+  // number (used to prevent looking up the same line twice).
+  TextMarker.prototype.find = function (side, lineObj) {
+    if (side == null && this.type == "bookmark") { side = 1; }
+    var from, to;
+    for (var i = 0; i < this.lines.length; ++i) {
+      var line = this.lines[i];
+      var span = getMarkedSpanFor(line.markedSpans, this);
+      if (span.from != null) {
+        from = Pos(lineObj ? line : lineNo(line), span.from);
+        if (side == -1) { return from }
+      }
+      if (span.to != null) {
+        to = Pos(lineObj ? line : lineNo(line), span.to);
+        if (side == 1) { return to }
+      }
+    }
+    return from && {from: from, to: to}
+  };
+
+  // Signals that the marker's widget changed, and surrounding layout
+  // should be recomputed.
+  TextMarker.prototype.changed = function () {
+      var this$1 = this;
+
+    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
+    if (!pos || !cm) { return }
+    runInOp(cm, function () {
+      var line = pos.line, lineN = lineNo(pos.line);
+      var view = findViewForLine(cm, lineN);
+      if (view) {
+        clearLineMeasurementCacheFor(view);
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+      }
+      cm.curOp.updateMaxLine = true;
+      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+        var oldHeight = widget.height;
+        widget.height = null;
+        var dHeight = widgetHeight(widget) - oldHeight;
+        if (dHeight)
+          { updateLineHeight(line, line.height + dHeight); }
+      }
+      signalLater(cm, "markerChanged", cm, this$1);
+    });
+  };
+
+  TextMarker.prototype.attachLine = function (line) {
+    if (!this.lines.length && this.doc.cm) {
+      var op = this.doc.cm.curOp;
+      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+        { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); }
+    }
+    this.lines.push(line);
+  };
+
+  TextMarker.prototype.detachLine = function (line) {
+    this.lines.splice(indexOf(this.lines, line), 1);
+    if (!this.lines.length && this.doc.cm) {
+      var op = this.doc.cm.curOp
+      ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
+    }
+  };
+  eventMixin(TextMarker);
+
+  // Create a marker, wire it up to the right lines, and
+  function markText(doc, from, to, options, type) {
+    // Shared markers (across linked documents) are handled separately
+    // (markTextShared will call out to this again, once per
+    // document).
+    if (options && options.shared) { return markTextShared(doc, from, to, options, type) }
+    // Ensure we are in an operation.
+    if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) }
+
+    var marker = new TextMarker(doc, type), diff = cmp(from, to);
+    if (options) { copyObj(options, marker, false); }
+    // Don't connect empty markers unless clearWhenEmpty is false
+    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
+      { return marker }
+    if (marker.replacedWith) {
+      // Showing up as a widget implies collapsed (widget replaces text)
+      marker.collapsed = true;
+      marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget");
+      if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true"); }
+      if (options.insertLeft) { marker.widgetNode.insertLeft = true; }
+    }
+    if (marker.collapsed) {
+      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
+          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
+        { throw new Error("Inserting collapsed marker partially overlapping an existing one") }
+      seeCollapsedSpans();
+    }
+
+    if (marker.addToHistory)
+      { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); }
+
+    var curLine = from.line, cm = doc.cm, updateMaxLine;
+    doc.iter(curLine, to.line + 1, function (line) {
+      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
+        { updateMaxLine = true; }
+      if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0); }
+      addMarkedSpan(line, new MarkedSpan(marker,
+                                         curLine == from.line ? from.ch : null,
+                                         curLine == to.line ? to.ch : null), doc.cm && doc.cm.curOp);
+      ++curLine;
+    });
+    // lineIsHidden depends on the presence of the spans, so needs a second pass
+    if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) {
+      if (lineIsHidden(doc, line)) { updateLineHeight(line, 0); }
+    }); }
+
+    if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }); }
+
+    if (marker.readOnly) {
+      seeReadOnlySpans();
+      if (doc.history.done.length || doc.history.undone.length)
+        { doc.clearHistory(); }
+    }
+    if (marker.collapsed) {
+      marker.id = ++nextMarkerId;
+      marker.atomic = true;
+    }
+    if (cm) {
+      // Sync editor state
+      if (updateMaxLine) { cm.curOp.updateMaxLine = true; }
+      if (marker.collapsed)
+        { regChange(cm, from.line, to.line + 1); }
+      else if (marker.className || marker.startStyle || marker.endStyle || marker.css ||
+               marker.attributes || marker.title)
+        { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text"); } }
+      if (marker.atomic) { reCheckSelection(cm.doc); }
+      signalLater(cm, "markerAdded", cm, marker);
+    }
+    return marker
+  }
+
+  // SHARED TEXTMARKERS
+
+  // A shared marker spans multiple linked documents. It is
+  // implemented as a meta-marker-object controlling multiple normal
+  // markers.
+  var SharedTextMarker = function(markers, primary) {
+    this.markers = markers;
+    this.primary = primary;
+    for (var i = 0; i < markers.length; ++i)
+      { markers[i].parent = this; }
+  };
+
+  SharedTextMarker.prototype.clear = function () {
+    if (this.explicitlyCleared) { return }
+    this.explicitlyCleared = true;
+    for (var i = 0; i < this.markers.length; ++i)
+      { this.markers[i].clear(); }
+    signalLater(this, "clear");
+  };
+
+  SharedTextMarker.prototype.find = function (side, lineObj) {
+    return this.primary.find(side, lineObj)
+  };
+  eventMixin(SharedTextMarker);
+
+  function markTextShared(doc, from, to, options, type) {
+    options = copyObj(options);
+    options.shared = false;
+    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
+    var widget = options.widgetNode;
+    linkedDocs(doc, function (doc) {
+      if (widget) { options.widgetNode = widget.cloneNode(true); }
+      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
+      for (var i = 0; i < doc.linked.length; ++i)
+        { if (doc.linked[i].isParent) { return } }
+      primary = lst(markers);
+    });
+    return new SharedTextMarker(markers, primary)
+  }
+
+  function findSharedMarkers(doc) {
+    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; })
+  }
+
+  function copySharedMarkers(doc, markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], pos = marker.find();
+      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+      if (cmp(mFrom, mTo)) {
+        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+        marker.markers.push(subMark);
+        subMark.parent = marker;
+      }
+    }
+  }
+
+  function detachSharedMarkers(markers) {
+    var loop = function ( i ) {
+      var marker = markers[i], linked = [marker.primary.doc];
+      linkedDocs(marker.primary.doc, function (d) { return linked.push(d); });
+      for (var j = 0; j < marker.markers.length; j++) {
+        var subMarker = marker.markers[j];
+        if (indexOf(linked, subMarker.doc) == -1) {
+          subMarker.parent = null;
+          marker.markers.splice(j--, 1);
+        }
+      }
+    };
+
+    for (var i = 0; i < markers.length; i++) loop( i );
+  }
+
+  var nextDocId = 0;
+  var Doc = function(text, mode, firstLine, lineSep, direction) {
+    if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep, direction) }
+    if (firstLine == null) { firstLine = 0; }
+
+    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
+    this.first = firstLine;
+    this.scrollTop = this.scrollLeft = 0;
+    this.cantEdit = false;
+    this.cleanGeneration = 1;
+    this.modeFrontier = this.highlightFrontier = firstLine;
+    var start = Pos(firstLine, 0);
+    this.sel = simpleSelection(start);
+    this.history = new History(null);
+    this.id = ++nextDocId;
+    this.modeOption = mode;
+    this.lineSep = lineSep;
+    this.direction = (direction == "rtl") ? "rtl" : "ltr";
+    this.extend = false;
+
+    if (typeof text == "string") { text = this.splitLines(text); }
+    updateDoc(this, {from: start, to: start, text: text});
+    setSelection(this, simpleSelection(start), sel_dontScroll);
+  };
+
+  Doc.prototype = createObj(BranchChunk.prototype, {
+    constructor: Doc,
+    // Iterate over the document. Supports two forms -- with only one
+    // argument, it calls that for each line in the document. With
+    // three, it iterates over the range given by the first two (with
+    // the second being non-inclusive).
+    iter: function(from, to, op) {
+      if (op) { this.iterN(from - this.first, to - from, op); }
+      else { this.iterN(this.first, this.first + this.size, from); }
+    },
+
+    // Non-public interface for adding and removing lines.
+    insert: function(at, lines) {
+      var height = 0;
+      for (var i = 0; i < lines.length; ++i) { height += lines[i].height; }
+      this.insertInner(at - this.first, lines, height);
+    },
+    remove: function(at, n) { this.removeInner(at - this.first, n); },
+
+    // From here, the methods are part of the public interface. Most
+    // are also available from CodeMirror (editor) instances.
+
+    getValue: function(lineSep) {
+      var lines = getLines(this, this.first, this.first + this.size);
+      if (lineSep === false) { return lines }
+      return lines.join(lineSep || this.lineSeparator())
+    },
+    setValue: docMethodOp(function(code) {
+      var top = Pos(this.first, 0), last = this.first + this.size - 1;
+      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
+                        text: this.splitLines(code), origin: "setValue", full: true}, true);
+      if (this.cm) { scrollToCoords(this.cm, 0, 0); }
+      setSelection(this, simpleSelection(top), sel_dontScroll);
+    }),
+    replaceRange: function(code, from, to, origin) {
+      from = clipPos(this, from);
+      to = to ? clipPos(this, to) : from;
+      replaceRange(this, code, from, to, origin);
+    },
+    getRange: function(from, to, lineSep) {
+      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
+      if (lineSep === false) { return lines }
+      if (lineSep === '') { return lines.join('') }
+      return lines.join(lineSep || this.lineSeparator())
+    },
+
+    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
+
+    getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }},
+    getLineNumber: function(line) {return lineNo(line)},
+
+    getLineHandleVisualStart: function(line) {
+      if (typeof line == "number") { line = getLine(this, line); }
+      return visualLine(line)
+    },
+
+    lineCount: function() {return this.size},
+    firstLine: function() {return this.first},
+    lastLine: function() {return this.first + this.size - 1},
+
+    clipPos: function(pos) {return clipPos(this, pos)},
+
+    getCursor: function(start) {
+      var range = this.sel.primary(), pos;
+      if (start == null || start == "head") { pos = range.head; }
+      else if (start == "anchor") { pos = range.anchor; }
+      else if (start == "end" || start == "to" || start === false) { pos = range.to(); }
+      else { pos = range.from(); }
+      return pos
+    },
+    listSelections: function() { return this.sel.ranges },
+    somethingSelected: function() {return this.sel.somethingSelected()},
+
+    setCursor: docMethodOp(function(line, ch, options) {
+      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
+    }),
+    setSelection: docMethodOp(function(anchor, head, options) {
+      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
+    }),
+    extendSelection: docMethodOp(function(head, other, options) {
+      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
+    }),
+    extendSelections: docMethodOp(function(heads, options) {
+      extendSelections(this, clipPosArray(this, heads), options);
+    }),
+    extendSelectionsBy: docMethodOp(function(f, options) {
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
+    }),
+    setSelections: docMethodOp(function(ranges, primary, options) {
+      if (!ranges.length) { return }
+      var out = [];
+      for (var i = 0; i < ranges.length; i++)
+        { out[i] = new Range(clipPos(this, ranges[i].anchor),
+                           clipPos(this, ranges[i].head || ranges[i].anchor)); }
+      if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); }
+      setSelection(this, normalizeSelection(this.cm, out, primary), options);
+    }),
+    addSelection: docMethodOp(function(anchor, head, options) {
+      var ranges = this.sel.ranges.slice(0);
+      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
+      setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options);
+    }),
+
+    getSelection: function(lineSep) {
+      var ranges = this.sel.ranges, lines;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+        lines = lines ? lines.concat(sel) : sel;
+      }
+      if (lineSep === false) { return lines }
+      else { return lines.join(lineSep || this.lineSeparator()) }
+    },
+    getSelections: function(lineSep) {
+      var parts = [], ranges = this.sel.ranges;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+        if (lineSep !== false) { sel = sel.join(lineSep || this.lineSeparator()); }
+        parts[i] = sel;
+      }
+      return parts
+    },
+    replaceSelection: function(code, collapse, origin) {
+      var dup = [];
+      for (var i = 0; i < this.sel.ranges.length; i++)
+        { dup[i] = code; }
+      this.replaceSelections(dup, collapse, origin || "+input");
+    },
+    replaceSelections: docMethodOp(function(code, collapse, origin) {
+      var changes = [], sel = this.sel;
+      for (var i = 0; i < sel.ranges.length; i++) {
+        var range = sel.ranges[i];
+        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
+      }
+      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+      for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)
+        { makeChange(this, changes[i$1]); }
+      if (newSel) { setSelectionReplaceHistory(this, newSel); }
+      else if (this.cm) { ensureCursorVisible(this.cm); }
+    }),
+    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
+    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
+    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
+    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
+
+    setExtending: function(val) {this.extend = val;},
+    getExtending: function() {return this.extend},
+
+    historySize: function() {
+      var hist = this.history, done = 0, undone = 0;
+      for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done; } }
+      for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } }
+      return {undo: done, redo: undone}
+    },
+    clearHistory: function() {
+      var this$1 = this;
+
+      this.history = new History(this.history);
+      linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true);
+    },
+
+    markClean: function() {
+      this.cleanGeneration = this.changeGeneration(true);
+    },
+    changeGeneration: function(forceSplit) {
+      if (forceSplit)
+        { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; }
+      return this.history.generation
+    },
+    isClean: function (gen) {
+      return this.history.generation == (gen || this.cleanGeneration)
+    },
+
+    getHistory: function() {
+      return {done: copyHistoryArray(this.history.done),
+              undone: copyHistoryArray(this.history.undone)}
+    },
+    setHistory: function(histData) {
+      var hist = this.history = new History(this.history);
+      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
+      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
+    },
+
+    setGutterMarker: docMethodOp(function(line, gutterID, value) {
+      return changeLine(this, line, "gutter", function (line) {
+        var markers = line.gutterMarkers || (line.gutterMarkers = {});
+        markers[gutterID] = value;
+        if (!value && isEmpty(markers)) { line.gutterMarkers = null; }
+        return true
+      })
+    }),
+
+    clearGutter: docMethodOp(function(gutterID) {
+      var this$1 = this;
+
+      this.iter(function (line) {
+        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+          changeLine(this$1, line, "gutter", function () {
+            line.gutterMarkers[gutterID] = null;
+            if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null; }
+            return true
+          });
+        }
+      });
+    }),
+
+    lineInfo: function(line) {
+      var n;
+      if (typeof line == "number") {
+        if (!isLine(this, line)) { return null }
+        n = line;
+        line = getLine(this, line);
+        if (!line) { return null }
+      } else {
+        n = lineNo(line);
+        if (n == null) { return null }
+      }
+      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+              widgets: line.widgets}
+    },
+
+    addLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        if (!line[prop]) { line[prop] = cls; }
+        else if (classTest(cls).test(line[prop])) { return false }
+        else { line[prop] += " " + cls; }
+        return true
+      })
+    }),
+    removeLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        var cur = line[prop];
+        if (!cur) { return false }
+        else if (cls == null) { line[prop] = null; }
+        else {
+          var found = cur.match(classTest(cls));
+          if (!found) { return false }
+          var end = found.index + found[0].length;
+          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+        }
+        return true
+      })
+    }),
+
+    addLineWidget: docMethodOp(function(handle, node, options) {
+      return addLineWidget(this, handle, node, options)
+    }),
+    removeLineWidget: function(widget) { widget.clear(); },
+
+    markText: function(from, to, options) {
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
+    },
+    setBookmark: function(pos, options) {
+      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
+                      insertLeft: options && options.insertLeft,
+                      clearWhenEmpty: false, shared: options && options.shared,
+                      handleMouseEvents: options && options.handleMouseEvents};
+      pos = clipPos(this, pos);
+      return markText(this, pos, pos, realOpts, "bookmark")
+    },
+    findMarksAt: function(pos) {
+      pos = clipPos(this, pos);
+      var markers = [], spans = getLine(this, pos.line).markedSpans;
+      if (spans) { for (var i = 0; i < spans.length; ++i) {
+        var span = spans[i];
+        if ((span.from == null || span.from <= pos.ch) &&
+            (span.to == null || span.to >= pos.ch))
+          { markers.push(span.marker.parent || span.marker); }
+      } }
+      return markers
+    },
+    findMarks: function(from, to, filter) {
+      from = clipPos(this, from); to = clipPos(this, to);
+      var found = [], lineNo = from.line;
+      this.iter(from.line, to.line + 1, function (line) {
+        var spans = line.markedSpans;
+        if (spans) { for (var i = 0; i < spans.length; i++) {
+          var span = spans[i];
+          if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
+                span.from == null && lineNo != from.line ||
+                span.from != null && lineNo == to.line && span.from >= to.ch) &&
+              (!filter || filter(span.marker)))
+            { found.push(span.marker.parent || span.marker); }
+        } }
+        ++lineNo;
+      });
+      return found
+    },
+    getAllMarks: function() {
+      var markers = [];
+      this.iter(function (line) {
+        var sps = line.markedSpans;
+        if (sps) { for (var i = 0; i < sps.length; ++i)
+          { if (sps[i].from != null) { markers.push(sps[i].marker); } } }
+      });
+      return markers
+    },
+
+    posFromIndex: function(off) {
+      var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
+      this.iter(function (line) {
+        var sz = line.text.length + sepSize;
+        if (sz > off) { ch = off; return true }
+        off -= sz;
+        ++lineNo;
+      });
+      return clipPos(this, Pos(lineNo, ch))
+    },
+    indexFromPos: function (coords) {
+      coords = clipPos(this, coords);
+      var index = coords.ch;
+      if (coords.line < this.first || coords.ch < 0) { return 0 }
+      var sepSize = this.lineSeparator().length;
+      this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value
+        index += line.text.length + sepSize;
+      });
+      return index
+    },
+
+    copy: function(copyHistory) {
+      var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                        this.modeOption, this.first, this.lineSep, this.direction);
+      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
+      doc.sel = this.sel;
+      doc.extend = false;
+      if (copyHistory) {
+        doc.history.undoDepth = this.history.undoDepth;
+        doc.setHistory(this.getHistory());
+      }
+      return doc
+    },
+
+    linkedDoc: function(options) {
+      if (!options) { options = {}; }
+      var from = this.first, to = this.first + this.size;
+      if (options.from != null && options.from > from) { from = options.from; }
+      if (options.to != null && options.to < to) { to = options.to; }
+      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction);
+      if (options.sharedHist) { copy.history = this.history
+      ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
+      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+      copySharedMarkers(copy, findSharedMarkers(this));
+      return copy
+    },
+    unlinkDoc: function(other) {
+      if (other instanceof CodeMirror) { other = other.doc; }
+      if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {
+        var link = this.linked[i];
+        if (link.doc != other) { continue }
+        this.linked.splice(i, 1);
+        other.unlinkDoc(this);
+        detachSharedMarkers(findSharedMarkers(this));
+        break
+      } }
+      // If the histories were shared, split them again
+      if (other.history == this.history) {
+        var splitIds = [other.id];
+        linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true);
+        other.history = new History(null);
+        other.history.done = copyHistoryArray(this.history.done, splitIds);
+        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
+      }
+    },
+    iterLinkedDocs: function(f) {linkedDocs(this, f);},
+
+    getMode: function() {return this.mode},
+    getEditor: function() {return this.cm},
+
+    splitLines: function(str) {
+      if (this.lineSep) { return str.split(this.lineSep) }
+      return splitLinesAuto(str)
+    },
+    lineSeparator: function() { return this.lineSep || "\n" },
+
+    setDirection: docMethodOp(function (dir) {
+      if (dir != "rtl") { dir = "ltr"; }
+      if (dir == this.direction) { return }
+      this.direction = dir;
+      this.iter(function (line) { return line.order = null; });
+      if (this.cm) { directionChanged(this.cm); }
+    })
+  });
+
+  // Public alias.
+  Doc.prototype.eachLine = Doc.prototype.iter;
+
+  // Kludge to work around strange IE behavior where it'll sometimes
+  // re-fire a series of drag-related events right after the drop (#1551)
+  var lastDrop = 0;
+
+  function onDrop(e) {
+    var cm = this;
+    clearDragCursor(cm);
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
+      { return }
+    e_preventDefault(e);
+    if (ie) { lastDrop = +new Date; }
+    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
+    if (!pos || cm.isReadOnly()) { return }
+    // Might be a file drop, in which case we simply extract the text
+    // and insert it.
+    if (files && files.length && window.FileReader && window.File) {
+      var n = files.length, text = Array(n), read = 0;
+      var markAsReadAndPasteIfAllFilesAreRead = function () {
+        if (++read == n) {
+          operation(cm, function () {
+            pos = clipPos(cm.doc, pos);
+            var change = {from: pos, to: pos,
+                          text: cm.doc.splitLines(
+                              text.filter(function (t) { return t != null; }).join(cm.doc.lineSeparator())),
+                          origin: "paste"};
+            makeChange(cm.doc, change);
+            setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))));
+          })();
+        }
+      };
+      var readTextFromFile = function (file, i) {
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1) {
+          markAsReadAndPasteIfAllFilesAreRead();
+          return
+        }
+        var reader = new FileReader;
+        reader.onerror = function () { return markAsReadAndPasteIfAllFilesAreRead(); };
+        reader.onload = function () {
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {
+            markAsReadAndPasteIfAllFilesAreRead();
+            return
+          }
+          text[i] = content;
+          markAsReadAndPasteIfAllFilesAreRead();
+        };
+        reader.readAsText(file);
+      };
+      for (var i = 0; i < files.length; i++) { readTextFromFile(files[i], i); }
+    } else { // Normal drop
+      // Don't do a replace if the drop happened inside of the selected text.
+      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
+        cm.state.draggingText(e);
+        // Ensure the editor is re-focused
+        setTimeout(function () { return cm.display.input.focus(); }, 20);
+        return
+      }
+      try {
+        var text$1 = e.dataTransfer.getData("Text");
+        if (text$1) {
+          var selected;
+          if (cm.state.draggingText && !cm.state.draggingText.copy)
+            { selected = cm.listSelections(); }
+          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
+          if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1)
+            { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag"); } }
+          cm.replaceSelection(text$1, "around", "paste");
+          cm.display.input.focus();
+        }
+      }
+      catch(e$1){}
+    }
+  }
+
+  function onDragStart(cm, e) {
+    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return }
+
+    e.dataTransfer.setData("Text", cm.getSelection());
+    e.dataTransfer.effectAllowed = "copyMove";
+
+    // Use dummy image instead of default browsers image.
+    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
+    if (e.dataTransfer.setDragImage && !safari) {
+      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
+      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+      if (presto) {
+        img.width = img.height = 1;
+        cm.display.wrapper.appendChild(img);
+        // Force a relayout, or Opera won't use our image for some obscure reason
+        img._top = img.offsetTop;
+      }
+      e.dataTransfer.setDragImage(img, 0, 0);
+      if (presto) { img.parentNode.removeChild(img); }
+    }
+  }
+
+  function onDragOver(cm, e) {
+    var pos = posFromMouse(cm, e);
+    if (!pos) { return }
+    var frag = document.createDocumentFragment();
+    drawSelectionCursor(cm, pos, frag);
+    if (!cm.display.dragCursor) {
+      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    }
+    removeChildrenAndAdd(cm.display.dragCursor, frag);
+  }
+
+  function clearDragCursor(cm) {
+    if (cm.display.dragCursor) {
+      cm.display.lineSpace.removeChild(cm.display.dragCursor);
+      cm.display.dragCursor = null;
+    }
+  }
+
+  // These must be handled carefully, because naively registering a
+  // handler for each editor will cause the editors to never be
+  // garbage collected.
+
+  function forEachCodeMirror(f) {
+    if (!document.getElementsByClassName) { return }
+    var byClass = document.getElementsByClassName("CodeMirror"), editors = [];
+    for (var i = 0; i < byClass.length; i++) {
+      var cm = byClass[i].CodeMirror;
+      if (cm) { editors.push(cm); }
+    }
+    if (editors.length) { editors[0].operation(function () {
+      for (var i = 0; i < editors.length; i++) { f(editors[i]); }
+    }); }
+  }
+
+  var globalsRegistered = false;
+  function ensureGlobalHandlers() {
+    if (globalsRegistered) { return }
+    registerGlobalHandlers();
+    globalsRegistered = true;
+  }
+  function registerGlobalHandlers() {
+    // When the window resizes, we need to refresh active editors.
+    var resizeTimer;
+    on(window, "resize", function () {
+      if (resizeTimer == null) { resizeTimer = setTimeout(function () {
+        resizeTimer = null;
+        forEachCodeMirror(onResize);
+      }, 100); }
+    });
+    // When the window loses focus, we want to show the editor as blurred
+    on(window, "blur", function () { return forEachCodeMirror(onBlur); });
+  }
+  // Called when the window resizes
+  function onResize(cm) {
+    var d = cm.display;
+    // Might be a text scaling operation, clear size caches.
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+    d.scrollbarsClipped = false;
+    cm.setSize();
+  }
+
+  var keyNames = {
+    3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock",
+    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+    221: "]", 222: "'", 224: "Mod", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+  };
+
+  // Number keys
+  for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i); }
+  // Alphabetic keys
+  for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1); }
+  // Function keys
+  for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; }
+
+  var keyMap = {};
+
+  keyMap.basic = {
+    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+    "Esc": "singleSelection"
+  };
+  // Note that the save and find-related commands aren't defined by
+  // default. User code or addons can define them. Unknown commands
+  // are simply ignored.
+  keyMap.pcDefault = {
+    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
+    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
+    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
+    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
+    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
+    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
+    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
+    "fallthrough": "basic"
+  };
+  // Very basic readline/emacs-style bindings, which are standard on Mac.
+  keyMap.emacsy = {
+    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp",
+    "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine",
+    "Ctrl-T": "transposeChars", "Ctrl-O": "openLine"
+  };
+  keyMap.macDefault = {
+    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+    "fallthrough": ["basic", "emacsy"]
+  };
+  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+
+  // KEYMAP DISPATCH
+
+  function normalizeKeyName(name) {
+    var parts = name.split(/-(?!$)/);
+    name = parts[parts.length - 1];
+    var alt, ctrl, shift, cmd;
+    for (var i = 0; i < parts.length - 1; i++) {
+      var mod = parts[i];
+      if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true; }
+      else if (/^a(lt)?$/i.test(mod)) { alt = true; }
+      else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true; }
+      else if (/^s(hift)?$/i.test(mod)) { shift = true; }
+      else { throw new Error("Unrecognized modifier name: " + mod) }
+    }
+    if (alt) { name = "Alt-" + name; }
+    if (ctrl) { name = "Ctrl-" + name; }
+    if (cmd) { name = "Cmd-" + name; }
+    if (shift) { name = "Shift-" + name; }
+    return name
+  }
+
+  // This is a kludge to keep keymaps mostly working as raw objects
+  // (backwards compatibility) while at the same time support features
+  // like normalization and multi-stroke key bindings. It compiles a
+  // new normalized keymap, and then updates the old object to reflect
+  // this.
+  function normalizeKeyMap(keymap) {
+    var copy = {};
+    for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) {
+      var value = keymap[keyname];
+      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue }
+      if (value == "...") { delete keymap[keyname]; continue }
+
+      var keys = map(keyname.split(" "), normalizeKeyName);
+      for (var i = 0; i < keys.length; i++) {
+        var val = (void 0), name = (void 0);
+        if (i == keys.length - 1) {
+          name = keys.join(" ");
+          val = value;
+        } else {
+          name = keys.slice(0, i + 1).join(" ");
+          val = "...";
+        }
+        var prev = copy[name];
+        if (!prev) { copy[name] = val; }
+        else if (prev != val) { throw new Error("Inconsistent bindings for " + name) }
+      }
+      delete keymap[keyname];
+    } }
+    for (var prop in copy) { keymap[prop] = copy[prop]; }
+    return keymap
+  }
+
+  function lookupKey(key, map, handle, context) {
+    map = getKeyMap(map);
+    var found = map.call ? map.call(key, context) : map[key];
+    if (found === false) { return "nothing" }
+    if (found === "...") { return "multi" }
+    if (found != null && handle(found)) { return "handled" }
+
+    if (map.fallthrough) {
+      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+        { return lookupKey(key, map.fallthrough, handle, context) }
+      for (var i = 0; i < map.fallthrough.length; i++) {
+        var result = lookupKey(key, map.fallthrough[i], handle, context);
+        if (result) { return result }
+      }
+    }
+  }
+
+  // Modifier key presses don't count as 'real' key presses for the
+  // purpose of keymap fallthrough.
+  function isModifierKey(value) {
+    var name = typeof value == "string" ? value : keyNames[value.keyCode];
+    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
+  }
+
+  function addModifierNames(name, event, noShift) {
+    var base = name;
+    if (event.altKey && base != "Alt") { name = "Alt-" + name; }
+    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; }
+    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") { name = "Cmd-" + name; }
+    if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name; }
+    return name
+  }
+
+  // Look up the name of a key as indicated by an event object.
+  function keyName(event, noShift) {
+    if (presto && event.keyCode == 34 && event["char"]) { return false }
+    var name = keyNames[event.keyCode];
+    if (name == null || event.altGraphKey) { return false }
+    // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
+    // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
+    if (event.keyCode == 3 && event.code) { name = event.code; }
+    return addModifierNames(name, event, noShift)
+  }
+
+  function getKeyMap(val) {
+    return typeof val == "string" ? keyMap[val] : val
+  }
+
+  // Helper for deleting text near the selection(s), used to implement
+  // backspace, delete, and similar functionality.
+  function deleteNearSelection(cm, compute) {
+    var ranges = cm.doc.sel.ranges, kill = [];
+    // Build up a set of ranges to kill first, merging overlapping
+    // ranges.
+    for (var i = 0; i < ranges.length; i++) {
+      var toKill = compute(ranges[i]);
+      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
+        var replaced = kill.pop();
+        if (cmp(replaced.from, toKill.from) < 0) {
+          toKill.from = replaced.from;
+          break
+        }
+      }
+      kill.push(toKill);
+    }
+    // Next, remove those actual ranges.
+    runInOp(cm, function () {
+      for (var i = kill.length - 1; i >= 0; i--)
+        { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); }
+      ensureCursorVisible(cm);
+    });
+  }
+
+  function moveCharLogically(line, ch, dir) {
+    var target = skipExtendingChars(line.text, ch + dir, dir);
+    return target < 0 || target > line.text.length ? null : target
+  }
+
+  function moveLogically(line, start, dir) {
+    var ch = moveCharLogically(line, start.ch, dir);
+    return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before")
+  }
+
+  function endOfLine(visually, cm, lineObj, lineNo, dir) {
+    if (visually) {
+      if (cm.doc.direction == "rtl") { dir = -dir; }
+      var order = getOrder(lineObj, cm.doc.direction);
+      if (order) {
+        var part = dir < 0 ? lst(order) : order[0];
+        var moveInStorageOrder = (dir < 0) == (part.level == 1);
+        var sticky = moveInStorageOrder ? "after" : "before";
+        var ch;
+        // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
+        // it could be that the last bidi part is not on the last visual line,
+        // since visual lines contain content order-consecutive chunks.
+        // Thus, in rtl, we are looking for the first (content-order) character
+        // in the rtl chunk that is on the last line (that is, the same line
+        // as the last (content-order) character).
+        if (part.level > 0 || cm.doc.direction == "rtl") {
+          var prep = prepareMeasureForLine(cm, lineObj);
+          ch = dir < 0 ? lineObj.text.length - 1 : 0;
+          var targetTop = measureCharPrepared(cm, prep, ch).top;
+          ch = findFirst(function (ch) { return measureCharPrepared(cm, prep, ch).top == targetTop; }, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch);
+          if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1); }
+        } else { ch = dir < 0 ? part.to : part.from; }
+        return new Pos(lineNo, ch, sticky)
+      }
+    }
+    return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
+  }
+
+  function moveVisually(cm, line, start, dir) {
+    var bidi = getOrder(line, cm.doc.direction);
+    if (!bidi) { return moveLogically(line, start, dir) }
+    if (start.ch >= line.text.length) {
+      start.ch = line.text.length;
+      start.sticky = "before";
+    } else if (start.ch <= 0) {
+      start.ch = 0;
+      start.sticky = "after";
+    }
+    var partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos];
+    if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
+      // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines,
+      // nothing interesting happens.
+      return moveLogically(line, start, dir)
+    }
+
+    var mv = function (pos, dir) { return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir); };
+    var prep;
+    var getWrappedLineExtent = function (ch) {
+      if (!cm.options.lineWrapping) { return {begin: 0, end: line.text.length} }
+      prep = prep || prepareMeasureForLine(cm, line);
+      return wrappedLineExtentChar(cm, line, prep, ch)
+    };
+    var wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch);
+
+    if (cm.doc.direction == "rtl" || part.level == 1) {
+      var moveInStorageOrder = (part.level == 1) == (dir < 0);
+      var ch = mv(start, moveInStorageOrder ? 1 : -1);
+      if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
+        // Case 2: We move within an rtl part or in an rtl editor on the same visual line
+        var sticky = moveInStorageOrder ? "before" : "after";
+        return new Pos(start.line, ch, sticky)
+      }
+    }
+
+    // Case 3: Could not move within this bidi part in this visual line, so leave
+    // the current bidi part
+
+    var searchInVisualLine = function (partPos, dir, wrappedLineExtent) {
+      var getRes = function (ch, moveInStorageOrder) { return moveInStorageOrder
+        ? new Pos(start.line, mv(ch, 1), "before")
+        : new Pos(start.line, ch, "after"); };
+
+      for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+        var part = bidi[partPos];
+        var moveInStorageOrder = (dir > 0) == (part.level != 1);
+        var ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1);
+        if (part.from <= ch && ch < part.to) { return getRes(ch, moveInStorageOrder) }
+        ch = moveInStorageOrder ? part.from : mv(part.to, -1);
+        if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) { return getRes(ch, moveInStorageOrder) }
+      }
+    };
+
+    // Case 3a: Look for other bidi parts on the same visual line
+    var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent);
+    if (res) { return res }
+
+    // Case 3b: Look for other bidi parts on the next visual line
+    var nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1);
+    if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
+      res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh));
+      if (res) { return res }
+    }
+
+    // Case 4: Nowhere to move
+    return null
+  }
+
+  // Commands are parameter-less actions that can be performed on an
+  // editor, mostly used for keybindings.
+  var commands = {
+    selectAll: selectAll,
+    singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); },
+    killLine: function (cm) { return deleteNearSelection(cm, function (range) {
+      if (range.empty()) {
+        var len = getLine(cm.doc, range.head.line).text.length;
+        if (range.head.ch == len && range.head.line < cm.lastLine())
+          { return {from: range.head, to: Pos(range.head.line + 1, 0)} }
+        else
+          { return {from: range.head, to: Pos(range.head.line, len)} }
+      } else {
+        return {from: range.from(), to: range.to()}
+      }
+    }); },
+    deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+      from: Pos(range.from().line, 0),
+      to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
+    }); }); },
+    delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+      from: Pos(range.from().line, 0), to: range.from()
+    }); }); },
+    delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+      return {from: leftPos, to: range.from()}
+    }); },
+    delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+      return {from: range.from(), to: rightPos }
+    }); },
+    undo: function (cm) { return cm.undo(); },
+    redo: function (cm) { return cm.redo(); },
+    undoSelection: function (cm) { return cm.undoSelection(); },
+    redoSelection: function (cm) { return cm.redoSelection(); },
+    goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); },
+    goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); },
+    goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); },
+      {origin: "+move", bias: 1}
+    ); },
+    goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); },
+      {origin: "+move", bias: 1}
+    ); },
+    goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); },
+      {origin: "+move", bias: -1}
+    ); },
+    goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+    }, sel_move); },
+    goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: 0, top: top}, "div")
+    }, sel_move); },
+    goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      var pos = cm.coordsChar({left: 0, top: top}, "div");
+      if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
+      return pos
+    }, sel_move); },
+    goLineUp: function (cm) { return cm.moveV(-1, "line"); },
+    goLineDown: function (cm) { return cm.moveV(1, "line"); },
+    goPageUp: function (cm) { return cm.moveV(-1, "page"); },
+    goPageDown: function (cm) { return cm.moveV(1, "page"); },
+    goCharLeft: function (cm) { return cm.moveH(-1, "char"); },
+    goCharRight: function (cm) { return cm.moveH(1, "char"); },
+    goColumnLeft: function (cm) { return cm.moveH(-1, "column"); },
+    goColumnRight: function (cm) { return cm.moveH(1, "column"); },
+    goWordLeft: function (cm) { return cm.moveH(-1, "word"); },
+    goGroupRight: function (cm) { return cm.moveH(1, "group"); },
+    goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },
+    goWordRight: function (cm) { return cm.moveH(1, "word"); },
+    delCharBefore: function (cm) { return cm.deleteH(-1, "codepoint"); },
+    delCharAfter: function (cm) { return cm.deleteH(1, "char"); },
+    delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },
+    delWordAfter: function (cm) { return cm.deleteH(1, "word"); },
+    delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); },
+    delGroupAfter: function (cm) { return cm.deleteH(1, "group"); },
+    indentAuto: function (cm) { return cm.indentSelection("smart"); },
+    indentMore: function (cm) { return cm.indentSelection("add"); },
+    indentLess: function (cm) { return cm.indentSelection("subtract"); },
+    insertTab: function (cm) { return cm.replaceSelection("\t"); },
+    insertSoftTab: function (cm) {
+      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+      for (var i = 0; i < ranges.length; i++) {
+        var pos = ranges[i].from();
+        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
+        spaces.push(spaceStr(tabSize - col % tabSize));
+      }
+      cm.replaceSelections(spaces);
+    },
+    defaultTab: function (cm) {
+      if (cm.somethingSelected()) { cm.indentSelection("add"); }
+      else { cm.execCommand("insertTab"); }
+    },
+    // Swap the two chars left and right of each selection's head.
+    // Move cursor behind the two swapped characters afterwards.
+    //
+    // Doesn't consider line feeds a character.
+    // Doesn't scan more than one line above to find a character.
+    // Doesn't do anything on an empty line.
+    // Doesn't do anything with non-empty selections.
+    transposeChars: function (cm) { return runInOp(cm, function () {
+      var ranges = cm.listSelections(), newSel = [];
+      for (var i = 0; i < ranges.length; i++) {
+        if (!ranges[i].empty()) { continue }
+        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
+        if (line) {
+          if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1); }
+          if (cur.ch > 0) {
+            cur = new Pos(cur.line, cur.ch + 1);
+            cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                            Pos(cur.line, cur.ch - 2), cur, "+transpose");
+          } else if (cur.line > cm.doc.first) {
+            var prev = getLine(cm.doc, cur.line - 1).text;
+            if (prev) {
+              cur = new Pos(cur.line, 1);
+              cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                              prev.charAt(prev.length - 1),
+                              Pos(cur.line - 1, prev.length - 1), cur, "+transpose");
+            }
+          }
+        }
+        newSel.push(new Range(cur, cur));
+      }
+      cm.setSelections(newSel);
+    }); },
+    newlineAndIndent: function (cm) { return runInOp(cm, function () {
+      var sels = cm.listSelections();
+      for (var i = sels.length - 1; i >= 0; i--)
+        { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input"); }
+      sels = cm.listSelections();
+      for (var i$1 = 0; i$1 < sels.length; i$1++)
+        { cm.indentLine(sels[i$1].from().line, null, true); }
+      ensureCursorVisible(cm);
+    }); },
+    openLine: function (cm) { return cm.replaceSelection("\n", "start"); },
+    toggleOverwrite: function (cm) { return cm.toggleOverwrite(); }
+  };
+
+
+  function lineStart(cm, lineN) {
+    var line = getLine(cm.doc, lineN);
+    var visual = visualLine(line);
+    if (visual != line) { lineN = lineNo(visual); }
+    return endOfLine(true, cm, visual, lineN, 1)
+  }
+  function lineEnd(cm, lineN) {
+    var line = getLine(cm.doc, lineN);
+    var visual = visualLineEnd(line);
+    if (visual != line) { lineN = lineNo(visual); }
+    return endOfLine(true, cm, line, lineN, -1)
+  }
+  function lineStartSmart(cm, pos) {
+    var start = lineStart(cm, pos.line);
+    var line = getLine(cm.doc, start.line);
+    var order = getOrder(line, cm.doc.direction);
+    if (!order || order[0].level == 0) {
+      var firstNonWS = Math.max(start.ch, line.text.search(/\S/));
+      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+      return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
+    }
+    return start
+  }
+
+  // Run a handler that was bound to a key.
+  function doHandleBinding(cm, bound, dropShift) {
+    if (typeof bound == "string") {
+      bound = commands[bound];
+      if (!bound) { return false }
+    }
+    // Ensure previous input has been read, so that the handler sees a
+    // consistent view of the document
+    cm.display.input.ensurePolled();
+    var prevShift = cm.display.shift, done = false;
+    try {
+      if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+      if (dropShift) { cm.display.shift = false; }
+      done = bound(cm) != Pass;
+    } finally {
+      cm.display.shift = prevShift;
+      cm.state.suppressEdits = false;
+    }
+    return done
+  }
+
+  function lookupKeyForEditor(cm, name, handle) {
+    for (var i = 0; i < cm.state.keyMaps.length; i++) {
+      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+      if (result) { return result }
+    }
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+      || lookupKey(name, cm.options.keyMap, handle, cm)
+  }
+
+  // Note that, despite the name, this function is also used to check
+  // for bound mouse clicks.
+
+  var stopSeq = new Delayed;
+
+  function dispatchKey(cm, name, e, handle) {
+    var seq = cm.state.keySeq;
+    if (seq) {
+      if (isModifierKey(name)) { return "handled" }
+      if (/\'$/.test(name))
+        { cm.state.keySeq = null; }
+      else
+        { stopSeq.set(50, function () {
+          if (cm.state.keySeq == seq) {
+            cm.state.keySeq = null;
+            cm.display.input.reset();
+          }
+        }); }
+      if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { return true }
+    }
+    return dispatchKeyInner(cm, name, e, handle)
+  }
+
+  function dispatchKeyInner(cm, name, e, handle) {
+    var result = lookupKeyForEditor(cm, name, handle);
+
+    if (result == "multi")
+      { cm.state.keySeq = name; }
+    if (result == "handled")
+      { signalLater(cm, "keyHandled", cm, name, e); }
+
+    if (result == "handled" || result == "multi") {
+      e_preventDefault(e);
+      restartBlink(cm);
+    }
+
+    return !!result
+  }
+
+  // Handle a key from the keydown event.
+  function handleKeyBinding(cm, e) {
+    var name = keyName(e, true);
+    if (!name) { return false }
+
+    if (e.shiftKey && !cm.state.keySeq) {
+      // First try to resolve full name (including 'Shift-'). Failing
+      // that, see if there is a cursor-motion command (starting with
+      // 'go') bound to the keyname without 'Shift-'.
+      return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); })
+          || dispatchKey(cm, name, e, function (b) {
+               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                 { return doHandleBinding(cm, b) }
+             })
+    } else {
+      return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); })
+    }
+  }
+
+  // Handle a key from the keypress event
+  function handleCharBinding(cm, e, ch) {
+    return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); })
+  }
+
+  var lastStoppedKey = null;
+  function onKeyDown(e) {
+    var cm = this;
+    if (e.target && e.target != cm.display.input.getField()) { return }
+    cm.curOp.focus = activeElt(root(cm));
+    if (signalDOMEvent(cm, e)) { return }
+    // IE does strange things with escape.
+    if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; }
+    var code = e.keyCode;
+    cm.display.shift = code == 16 || e.shiftKey;
+    var handled = handleKeyBinding(cm, e);
+    if (presto) {
+      lastStoppedKey = handled ? code : null;
+      // Opera has no cut event... we try to at least catch the key combo
+      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
+        { cm.replaceSelection("", null, "cut"); }
+    }
+    if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+      { document.execCommand("cut"); }
+
+    // Turn mouse into crosshair when Alt is held on Mac.
+    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
+      { showCrossHair(cm); }
+  }
+
+  function showCrossHair(cm) {
+    var lineDiv = cm.display.lineDiv;
+    addClass(lineDiv, "CodeMirror-crosshair");
+
+    function up(e) {
+      if (e.keyCode == 18 || !e.altKey) {
+        rmClass(lineDiv, "CodeMirror-crosshair");
+        off(document, "keyup", up);
+        off(document, "mouseover", up);
+      }
+    }
+    on(document, "keyup", up);
+    on(document, "mouseover", up);
+  }
+
+  function onKeyUp(e) {
+    if (e.keyCode == 16) { this.doc.sel.shift = false; }
+    signalDOMEvent(this, e);
+  }
+
+  function onKeyPress(e) {
+    var cm = this;
+    if (e.target && e.target != cm.display.input.getField()) { return }
+    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }
+    var keyCode = e.keyCode, charCode = e.charCode;
+    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
+    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return }
+    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+    // Some browsers fire keypress events for backspace
+    if (ch == "\x08") { return }
+    if (handleCharBinding(cm, e, ch)) { return }
+    cm.display.input.onKeyPress(e);
+  }
+
+  var DOUBLECLICK_DELAY = 400;
+
+  var PastClick = function(time, pos, button) {
+    this.time = time;
+    this.pos = pos;
+    this.button = button;
+  };
+
+  PastClick.prototype.compare = function (time, pos, button) {
+    return this.time + DOUBLECLICK_DELAY > time &&
+      cmp(pos, this.pos) == 0 && button == this.button
+  };
+
+  var lastClick, lastDoubleClick;
+  function clickRepeat(pos, button) {
+    var now = +new Date;
+    if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+      lastClick = lastDoubleClick = null;
+      return "triple"
+    } else if (lastClick && lastClick.compare(now, pos, button)) {
+      lastDoubleClick = new PastClick(now, pos, button);
+      lastClick = null;
+      return "double"
+    } else {
+      lastClick = new PastClick(now, pos, button);
+      lastDoubleClick = null;
+      return "single"
+    }
+  }
+
+  // A mouse down can be a single click, double click, triple click,
+  // start of selection drag, start of text drag, new cursor
+  // (ctrl-click), rectangle drag (alt-drag), or xwin
+  // middle-click-paste. Or it might be a click on something we should
+  // not interfere with, such as a scrollbar or widget.
+  function onMouseDown(e) {
+    var cm = this, display = cm.display;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return }
+    display.input.ensurePolled();
+    display.shift = e.shiftKey;
+
+    if (eventInWidget(display, e)) {
+      if (!webkit) {
+        // Briefly turn off draggability, to allow widgets to do
+        // normal dragging things.
+        display.scroller.draggable = false;
+        setTimeout(function () { return display.scroller.draggable = true; }, 100);
+      }
+      return
+    }
+    if (clickInGutter(cm, e)) { return }
+    var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single";
+    win(cm).focus();
+
+    // #3261: make sure, that we're not starting a second selection
+    if (button == 1 && cm.state.selectingText)
+      { cm.state.selectingText(e); }
+
+    if (pos && handleMappedButton(cm, button, pos, repeat, e)) { return }
+
+    if (button == 1) {
+      if (pos) { leftButtonDown(cm, pos, repeat, e); }
+      else if (e_target(e) == display.scroller) { e_preventDefault(e); }
+    } else if (button == 2) {
+      if (pos) { extendSelection(cm.doc, pos); }
+      setTimeout(function () { return display.input.focus(); }, 20);
+    } else if (button == 3) {
+      if (captureRightClick) { cm.display.input.onContextMenu(e); }
+      else { delayBlurEvent(cm); }
+    }
+  }
+
+  function handleMappedButton(cm, button, pos, repeat, event) {
+    var name = "Click";
+    if (repeat == "double") { name = "Double" + name; }
+    else if (repeat == "triple") { name = "Triple" + name; }
+    name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name;
+
+    return dispatchKey(cm,  addModifierNames(name, event), event, function (bound) {
+      if (typeof bound == "string") { bound = commands[bound]; }
+      if (!bound) { return false }
+      var done = false;
+      try {
+        if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+        done = bound(cm, pos) != Pass;
+      } finally {
+        cm.state.suppressEdits = false;
+      }
+      return done
+    })
+  }
+
+  function configureMouse(cm, repeat, event) {
+    var option = cm.getOption("configureMouse");
+    var value = option ? option(cm, repeat, event) : {};
+    if (value.unit == null) {
+      var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey;
+      value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line";
+    }
+    if (value.extend == null || cm.doc.extend) { value.extend = cm.doc.extend || event.shiftKey; }
+    if (value.addNew == null) { value.addNew = mac ? event.metaKey : event.ctrlKey; }
+    if (value.moveOnDrag == null) { value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); }
+    return value
+  }
+
+  function leftButtonDown(cm, pos, repeat, event) {
+    if (ie) { setTimeout(bind(ensureFocus, cm), 0); }
+    else { cm.curOp.focus = activeElt(root(cm)); }
+
+    var behavior = configureMouse(cm, repeat, event);
+
+    var sel = cm.doc.sel, contained;
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+        repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+        (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+        (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+      { leftButtonStartDrag(cm, event, pos, behavior); }
+    else
+      { leftButtonSelect(cm, event, pos, behavior); }
+  }
+
+  // Start a text drag. When it ends, see if any dragging actually
+  // happen, and treat as a click if it didn't.
+  function leftButtonStartDrag(cm, event, pos, behavior) {
+    var display = cm.display, moved = false;
+    var dragEnd = operation(cm, function (e) {
+      if (webkit) { display.scroller.draggable = false; }
+      cm.state.draggingText = false;
+      if (cm.state.delayingBlurEvent) {
+        if (cm.hasFocus()) { cm.state.delayingBlurEvent = false; }
+        else { delayBlurEvent(cm); }
+      }
+      off(display.wrapper.ownerDocument, "mouseup", dragEnd);
+      off(display.wrapper.ownerDocument, "mousemove", mouseMove);
+      off(display.scroller, "dragstart", dragStart);
+      off(display.scroller, "drop", dragEnd);
+      if (!moved) {
+        e_preventDefault(e);
+        if (!behavior.addNew)
+          { extendSelection(cm.doc, pos, null, null, behavior.extend); }
+        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+        if ((webkit && !safari) || ie && ie_version == 9)
+          { setTimeout(function () {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus();}, 20); }
+        else
+          { display.input.focus(); }
+      }
+    });
+    var mouseMove = function(e2) {
+      moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10;
+    };
+    var dragStart = function () { return moved = true; };
+    // Let the drag handler handle this.
+    if (webkit) { display.scroller.draggable = true; }
+    cm.state.draggingText = dragEnd;
+    dragEnd.copy = !behavior.moveOnDrag;
+    on(display.wrapper.ownerDocument, "mouseup", dragEnd);
+    on(display.wrapper.ownerDocument, "mousemove", mouseMove);
+    on(display.scroller, "dragstart", dragStart);
+    on(display.scroller, "drop", dragEnd);
+
+    cm.state.delayingBlurEvent = true;
+    setTimeout(function () { return display.input.focus(); }, 20);
+    // IE's approach to draggable
+    if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
+  }
+
+  function rangeForUnit(cm, pos, unit) {
+    if (unit == "char") { return new Range(pos, pos) }
+    if (unit == "word") { return cm.findWordAt(pos) }
+    if (unit == "line") { return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
+    var result = unit(cm, pos);
+    return new Range(result.from, result.to)
+  }
+
+  // Normal selection, as opposed to text dragging.
+  function leftButtonSelect(cm, event, start, behavior) {
+    if (ie) { delayBlurEvent(cm); }
+    var display = cm.display, doc = cm.doc;
+    e_preventDefault(event);
+
+    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
+    if (behavior.addNew && !behavior.extend) {
+      ourIndex = doc.sel.contains(start);
+      if (ourIndex > -1)
+        { ourRange = ranges[ourIndex]; }
+      else
+        { ourRange = new Range(start, start); }
+    } else {
+      ourRange = doc.sel.primary();
+      ourIndex = doc.sel.primIndex;
+    }
+
+    if (behavior.unit == "rectangle") {
+      if (!behavior.addNew) { ourRange = new Range(start, start); }
+      start = posFromMouse(cm, event, true, true);
+      ourIndex = -1;
+    } else {
+      var range = rangeForUnit(cm, start, behavior.unit);
+      if (behavior.extend)
+        { ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend); }
+      else
+        { ourRange = range; }
+    }
+
+    if (!behavior.addNew) {
+      ourIndex = 0;
+      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
+      startSel = doc.sel;
+    } else if (ourIndex == -1) {
+      ourIndex = ranges.length;
+      setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),
+                   {scroll: false, origin: "*mouse"});
+    } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
+      setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                   {scroll: false, origin: "*mouse"});
+      startSel = doc.sel;
+    } else {
+      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
+    }
+
+    var lastPos = start;
+    function extendTo(pos) {
+      if (cmp(lastPos, pos) == 0) { return }
+      lastPos = pos;
+
+      if (behavior.unit == "rectangle") {
+        var ranges = [], tabSize = cm.options.tabSize;
+        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
+        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
+        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
+        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+             line <= end; line++) {
+          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+          if (left == right)
+            { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); }
+          else if (text.length > leftPos)
+            { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); }
+        }
+        if (!ranges.length) { ranges.push(new Range(start, start)); }
+        setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+                     {origin: "*mouse", scroll: false});
+        cm.scrollIntoView(pos);
+      } else {
+        var oldRange = ourRange;
+        var range = rangeForUnit(cm, pos, behavior.unit);
+        var anchor = oldRange.anchor, head;
+        if (cmp(range.anchor, anchor) > 0) {
+          head = range.head;
+          anchor = minPos(oldRange.from(), range.anchor);
+        } else {
+          head = range.anchor;
+          anchor = maxPos(oldRange.to(), range.head);
+        }
+        var ranges$1 = startSel.ranges.slice(0);
+        ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head));
+        setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);
+      }
+    }
+
+    var editorSize = display.wrapper.getBoundingClientRect();
+    // Used to ensure timeout re-tries don't fire when another extend
+    // happened in the meantime (clearTimeout isn't reliable -- at
+    // least on Chrome, the timeouts still happen even when cleared,
+    // if the clear happens after their scheduled firing time).
+    var counter = 0;
+
+    function extend(e) {
+      var curCount = ++counter;
+      var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");
+      if (!cur) { return }
+      if (cmp(cur, lastPos) != 0) {
+        cm.curOp.focus = activeElt(root(cm));
+        extendTo(cur);
+        var visible = visibleLines(display, doc);
+        if (cur.line >= visible.to || cur.line < visible.from)
+          { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); }
+      } else {
+        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
+        if (outside) { setTimeout(operation(cm, function () {
+          if (counter != curCount) { return }
+          display.scroller.scrollTop += outside;
+          extend(e);
+        }), 50); }
+      }
+    }
+
+    function done(e) {
+      cm.state.selectingText = false;
+      counter = Infinity;
+      // If e is null or undefined we interpret this as someone trying
+      // to explicitly cancel the selection rather than the user
+      // letting go of the mouse button.
+      if (e) {
+        e_preventDefault(e);
+        display.input.focus();
+      }
+      off(display.wrapper.ownerDocument, "mousemove", move);
+      off(display.wrapper.ownerDocument, "mouseup", up);
+      doc.history.lastSelOrigin = null;
+    }
+
+    var move = operation(cm, function (e) {
+      if (e.buttons === 0 || !e_button(e)) { done(e); }
+      else { extend(e); }
+    });
+    var up = operation(cm, done);
+    cm.state.selectingText = up;
+    on(display.wrapper.ownerDocument, "mousemove", move);
+    on(display.wrapper.ownerDocument, "mouseup", up);
+  }
+
+  // Used when mouse-selecting to adjust the anchor to the proper side
+  // of a bidi jump depending on the visual position of the head.
+  function bidiSimplify(cm, range) {
+    var anchor = range.anchor;
+    var head = range.head;
+    var anchorLine = getLine(cm.doc, anchor.line);
+    if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range }
+    var order = getOrder(anchorLine);
+    if (!order) { return range }
+    var index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index];
+    if (part.from != anchor.ch && part.to != anchor.ch) { return range }
+    var boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1);
+    if (boundary == 0 || boundary == order.length) { return range }
+
+    // Compute the relative visual position of the head compared to the
+    // anchor (<0 is to the left, >0 to the right)
+    var leftSide;
+    if (head.line != anchor.line) {
+      leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0;
+    } else {
+      var headIndex = getBidiPartAt(order, head.ch, head.sticky);
+      var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1);
+      if (headIndex == boundary - 1 || headIndex == boundary)
+        { leftSide = dir < 0; }
+      else
+        { leftSide = dir > 0; }
+    }
+
+    var usePart = order[boundary + (leftSide ? -1 : 0)];
+    var from = leftSide == (usePart.level == 1);
+    var ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before";
+    return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head)
+  }
+
+
+  // Determines whether an event happened in the gutter, and fires the
+  // handlers for the corresponding event.
+  function gutterEvent(cm, e, type, prevent) {
+    var mX, mY;
+    if (e.touches) {
+      mX = e.touches[0].clientX;
+      mY = e.touches[0].clientY;
+    } else {
+      try { mX = e.clientX; mY = e.clientY; }
+      catch(e$1) { return false }
+    }
+    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }
+    if (prevent) { e_preventDefault(e); }
+
+    var display = cm.display;
+    var lineBox = display.lineDiv.getBoundingClientRect();
+
+    if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }
+    mY -= lineBox.top - display.viewOffset;
+
+    for (var i = 0; i < cm.display.gutterSpecs.length; ++i) {
+      var g = display.gutters.childNodes[i];
+      if (g && g.getBoundingClientRect().right >= mX) {
+        var line = lineAtHeight(cm.doc, mY);
+        var gutter = cm.display.gutterSpecs[i];
+        signal(cm, type, cm, line, gutter.className, e);
+        return e_defaultPrevented(e)
+      }
+    }
+  }
+
+  function clickInGutter(cm, e) {
+    return gutterEvent(cm, e, "gutterClick", true)
+  }
+
+  // CONTEXT MENU HANDLING
+
+  // To make the context menu work, we need to briefly unhide the
+  // textarea (making it as unobtrusive as possible) to let the
+  // right-click take effect on it.
+  function onContextMenu(cm, e) {
+    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return }
+    if (signalDOMEvent(cm, e, "contextmenu")) { return }
+    if (!captureRightClick) { cm.display.input.onContextMenu(e); }
+  }
+
+  function contextMenuInGutter(cm, e) {
+    if (!hasHandler(cm, "gutterContextMenu")) { return false }
+    return gutterEvent(cm, e, "gutterContextMenu", false)
+  }
+
+  function themeChanged(cm) {
+    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
+      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
+    clearCaches(cm);
+  }
+
+  var Init = {toString: function(){return "CodeMirror.Init"}};
+
+  var defaults = {};
+  var optionHandlers = {};
+
+  function defineOptions(CodeMirror) {
+    var optionHandlers = CodeMirror.optionHandlers;
+
+    function option(name, deflt, handle, notOnInit) {
+      CodeMirror.defaults[name] = deflt;
+      if (handle) { optionHandlers[name] =
+        notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old); }} : handle; }
+    }
+
+    CodeMirror.defineOption = option;
+
+    // Passed to option handlers when there is no old value.
+    CodeMirror.Init = Init;
+
+    // These two are, on init, called from the constructor because they
+    // have to be initialized before the editor can start at all.
+    option("value", "", function (cm, val) { return cm.setValue(val); }, true);
+    option("mode", null, function (cm, val) {
+      cm.doc.modeOption = val;
+      loadMode(cm);
+    }, true);
+
+    option("indentUnit", 2, loadMode, true);
+    option("indentWithTabs", false);
+    option("smartIndent", true);
+    option("tabSize", 4, function (cm) {
+      resetModeState(cm);
+      clearCaches(cm);
+      regChange(cm);
+    }, true);
+
+    option("lineSeparator", null, function (cm, val) {
+      cm.doc.lineSep = val;
+      if (!val) { return }
+      var newBreaks = [], lineNo = cm.doc.first;
+      cm.doc.iter(function (line) {
+        for (var pos = 0;;) {
+          var found = line.text.indexOf(val, pos);
+          if (found == -1) { break }
+          pos = found + val.length;
+          newBreaks.push(Pos(lineNo, found));
+        }
+        lineNo++;
+      });
+      for (var i = newBreaks.length - 1; i >= 0; i--)
+        { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
+    });
+    option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
+      cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+      if (old != Init) { cm.refresh(); }
+    });
+    option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true);
+    option("electricChars", true);
+    option("inputStyle", mobile ? "contenteditable" : "textarea", function () {
+      throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
+    }, true);
+    option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true);
+    option("autocorrect", false, function (cm, val) { return cm.getInputField().autocorrect = val; }, true);
+    option("autocapitalize", false, function (cm, val) { return cm.getInputField().autocapitalize = val; }, true);
+    option("rtlMoveVisually", !windows);
+    option("wholeLineUpdateBefore", true);
+
+    option("theme", "default", function (cm) {
+      themeChanged(cm);
+      updateGutters(cm);
+    }, true);
+    option("keyMap", "default", function (cm, val, old) {
+      var next = getKeyMap(val);
+      var prev = old != Init && getKeyMap(old);
+      if (prev && prev.detach) { prev.detach(cm, next); }
+      if (next.attach) { next.attach(cm, prev || null); }
+    });
+    option("extraKeys", null);
+    option("configureMouse", null);
+
+    option("lineWrapping", false, wrappingChanged, true);
+    option("gutters", [], function (cm, val) {
+      cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers);
+      updateGutters(cm);
+    }, true);
+    option("fixedGutter", true, function (cm, val) {
+      cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
+      cm.refresh();
+    }, true);
+    option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true);
+    option("scrollbarStyle", "native", function (cm) {
+      initScrollbars(cm);
+      updateScrollbars(cm);
+      cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+      cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+    }, true);
+    option("lineNumbers", false, function (cm, val) {
+      cm.display.gutterSpecs = getGutters(cm.options.gutters, val);
+      updateGutters(cm);
+    }, true);
+    option("firstLineNumber", 1, updateGutters, true);
+    option("lineNumberFormatter", function (integer) { return integer; }, updateGutters, true);
+    option("showCursorWhenSelecting", false, updateSelection, true);
+
+    option("resetSelectionOnContextMenu", true);
+    option("lineWiseCopyCut", true);
+    option("pasteLinesPerSelection", true);
+    option("selectionsMayTouch", false);
+
+    option("readOnly", false, function (cm, val) {
+      if (val == "nocursor") {
+        onBlur(cm);
+        cm.display.input.blur();
+      }
+      cm.display.input.readOnlyChanged(val);
+    });
+
+    option("screenReaderLabel", null, function (cm, val) {
+      val = (val === '') ? null : val;
+      cm.display.input.screenReaderLabelChanged(val);
+    });
+
+    option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true);
+    option("dragDrop", true, dragDropChanged);
+    option("allowDropFileTypes", null);
+
+    option("cursorBlinkRate", 530);
+    option("cursorScrollMargin", 0);
+    option("cursorHeight", 1, updateSelection, true);
+    option("singleCursorHeightPerLine", true, updateSelection, true);
+    option("workTime", 100);
+    option("workDelay", 100);
+    option("flattenSpans", true, resetModeState, true);
+    option("addModeClass", false, resetModeState, true);
+    option("pollInterval", 100);
+    option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; });
+    option("historyEventDelay", 1250);
+    option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true);
+    option("maxHighlightLength", 10000, resetModeState, true);
+    option("moveInputWithCursor", true, function (cm, val) {
+      if (!val) { cm.display.input.resetPosition(); }
+    });
+
+    option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; });
+    option("autofocus", null);
+    option("direction", "ltr", function (cm, val) { return cm.doc.setDirection(val); }, true);
+    option("phrases", null);
+  }
+
+  function dragDropChanged(cm, value, old) {
+    var wasOn = old && old != Init;
+    if (!value != !wasOn) {
+      var funcs = cm.display.dragFunctions;
+      var toggle = value ? on : off;
+      toggle(cm.display.scroller, "dragstart", funcs.start);
+      toggle(cm.display.scroller, "dragenter", funcs.enter);
+      toggle(cm.display.scroller, "dragover", funcs.over);
+      toggle(cm.display.scroller, "dragleave", funcs.leave);
+      toggle(cm.display.scroller, "drop", funcs.drop);
+    }
+  }
+
+  function wrappingChanged(cm) {
+    if (cm.options.lineWrapping) {
+      addClass(cm.display.wrapper, "CodeMirror-wrap");
+      cm.display.sizer.style.minWidth = "";
+      cm.display.sizerWidth = null;
+    } else {
+      rmClass(cm.display.wrapper, "CodeMirror-wrap");
+      findMaxLine(cm);
+    }
+    estimateLineHeights(cm);
+    regChange(cm);
+    clearCaches(cm);
+    setTimeout(function () { return updateScrollbars(cm); }, 100);
+  }
+
+  // A CodeMirror instance represents an editor. This is the object
+  // that user code is usually dealing with.
+
+  function CodeMirror(place, options) {
+    var this$1 = this;
+
+    if (!(this instanceof CodeMirror)) { return new CodeMirror(place, options) }
+
+    this.options = options = options ? copyObj(options) : {};
+    // Determine effective options based on given values and defaults.
+    copyObj(defaults, options, false);
+
+    var doc = options.value;
+    if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); }
+    else if (options.mode) { doc.modeOption = options.mode; }
+    this.doc = doc;
+
+    var input = new CodeMirror.inputStyles[options.inputStyle](this);
+    var display = this.display = new Display(place, doc, input, options);
+    display.wrapper.CodeMirror = this;
+    themeChanged(this);
+    if (options.lineWrapping)
+      { this.display.wrapper.className += " CodeMirror-wrap"; }
+    initScrollbars(this);
+
+    this.state = {
+      keyMaps: [],  // stores maps added by addKeyMap
+      overlays: [], // highlighting overlays, as added by addOverlay
+      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
+      overwrite: false,
+      delayingBlurEvent: false,
+      focused: false,
+      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
+      pasteIncoming: -1, cutIncoming: -1, // help recognize paste/cut edits in input.poll
+      selectingText: false,
+      draggingText: false,
+      highlight: new Delayed(), // stores highlight worker timeout
+      keySeq: null,  // Unfinished key sequence
+      specialChars: null
+    };
+
+    if (options.autofocus && !mobile) { display.input.focus(); }
+
+    // Override magic textarea content restore that IE sometimes does
+    // on our hidden textarea on reload
+    if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20); }
+
+    registerEventHandlers(this);
+    ensureGlobalHandlers();
+
+    startOperation(this);
+    this.curOp.forceUpdate = true;
+    attachDoc(this, doc);
+
+    if ((options.autofocus && !mobile) || this.hasFocus())
+      { setTimeout(function () {
+        if (this$1.hasFocus() && !this$1.state.focused) { onFocus(this$1); }
+      }, 20); }
+    else
+      { onBlur(this); }
+
+    for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))
+      { optionHandlers[opt](this, options[opt], Init); } }
+    maybeUpdateLineNumberWidth(this);
+    if (options.finishInit) { options.finishInit(this); }
+    for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this); }
+    endOperation(this);
+    // Suppress optimizelegibility in Webkit, since it breaks text
+    // measuring on line wrapping boundaries.
+    if (webkit && options.lineWrapping &&
+        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+      { display.lineDiv.style.textRendering = "auto"; }
+  }
+
+  // The default configuration options.
+  CodeMirror.defaults = defaults;
+  // Functions to run when options are changed.
+  CodeMirror.optionHandlers = optionHandlers;
+
+  // Attach the necessary event handlers when initializing the editor
+  function registerEventHandlers(cm) {
+    var d = cm.display;
+    on(d.scroller, "mousedown", operation(cm, onMouseDown));
+    // Older IE's will not fire a second mousedown for a double click
+    if (ie && ie_version < 11)
+      { on(d.scroller, "dblclick", operation(cm, function (e) {
+        if (signalDOMEvent(cm, e)) { return }
+        var pos = posFromMouse(cm, e);
+        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return }
+        e_preventDefault(e);
+        var word = cm.findWordAt(pos);
+        extendSelection(cm.doc, word.anchor, word.head);
+      })); }
+    else
+      { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }); }
+    // Some browsers fire contextmenu *after* opening the menu, at
+    // which point we can't mess with it anymore. Context menu is
+    // handled in onMouseDown for these browsers.
+    on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); });
+    on(d.input.getField(), "contextmenu", function (e) {
+      if (!d.scroller.contains(e.target)) { onContextMenu(cm, e); }
+    });
+
+    // Used to suppress mouse event handling when a touch happens
+    var touchFinished, prevTouch = {end: 0};
+    function finishTouch() {
+      if (d.activeTouch) {
+        touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000);
+        prevTouch = d.activeTouch;
+        prevTouch.end = +new Date;
+      }
+    }
+    function isMouseLikeTouchEvent(e) {
+      if (e.touches.length != 1) { return false }
+      var touch = e.touches[0];
+      return touch.radiusX <= 1 && touch.radiusY <= 1
+    }
+    function farAway(touch, other) {
+      if (other.left == null) { return true }
+      var dx = other.left - touch.left, dy = other.top - touch.top;
+      return dx * dx + dy * dy > 20 * 20
+    }
+    on(d.scroller, "touchstart", function (e) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) {
+        d.input.ensurePolled();
+        clearTimeout(touchFinished);
+        var now = +new Date;
+        d.activeTouch = {start: now, moved: false,
+                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
+        if (e.touches.length == 1) {
+          d.activeTouch.left = e.touches[0].pageX;
+          d.activeTouch.top = e.touches[0].pageY;
+        }
+      }
+    });
+    on(d.scroller, "touchmove", function () {
+      if (d.activeTouch) { d.activeTouch.moved = true; }
+    });
+    on(d.scroller, "touchend", function (e) {
+      var touch = d.activeTouch;
+      if (touch && !eventInWidget(d, e) && touch.left != null &&
+          !touch.moved && new Date - touch.start < 300) {
+        var pos = cm.coordsChar(d.activeTouch, "page"), range;
+        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+          { range = new Range(pos, pos); }
+        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+          { range = cm.findWordAt(pos); }
+        else // Triple tap
+          { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); }
+        cm.setSelection(range.anchor, range.head);
+        cm.focus();
+        e_preventDefault(e);
+      }
+      finishTouch();
+    });
+    on(d.scroller, "touchcancel", finishTouch);
+
+    // Sync scrolling between fake scrollbars and real scrollable
+    // area, ensure viewport is updated when scrolling.
+    on(d.scroller, "scroll", function () {
+      if (d.scroller.clientHeight) {
+        updateScrollTop(cm, d.scroller.scrollTop);
+        setScrollLeft(cm, d.scroller.scrollLeft, true);
+        signal(cm, "scroll", cm);
+      }
+    });
+
+    // Listen to wheel events in order to try and update the viewport on time.
+    on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); });
+    on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); });
+
+    // Prevent wrapper from ever scrolling
+    on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
+
+    d.dragFunctions = {
+      enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e); }},
+      over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+      start: function (e) { return onDragStart(cm, e); },
+      drop: operation(cm, onDrop),
+      leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
+    };
+
+    var inp = d.input.getField();
+    on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); });
+    on(inp, "keydown", operation(cm, onKeyDown));
+    on(inp, "keypress", operation(cm, onKeyPress));
+    on(inp, "focus", function (e) { return onFocus(cm, e); });
+    on(inp, "blur", function (e) { return onBlur(cm, e); });
+  }
+
+  var initHooks = [];
+  CodeMirror.defineInitHook = function (f) { return initHooks.push(f); };
+
+  // Indent the given line. The how parameter can be "smart",
+  // "add"/null, "subtract", or "prev". When aggressive is false
+  // (typically set to true for forced single-line indents), empty
+  // lines are not indented, and places where the mode returns Pass
+  // are left alone.
+  function indentLine(cm, n, how, aggressive) {
+    var doc = cm.doc, state;
+    if (how == null) { how = "add"; }
+    if (how == "smart") {
+      // Fall back to "prev" when the mode doesn't have an indentation
+      // method.
+      if (!doc.mode.indent) { how = "prev"; }
+      else { state = getContextBefore(cm, n).state; }
+    }
+
+    var tabSize = cm.options.tabSize;
+    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
+    if (line.stateAfter) { line.stateAfter = null; }
+    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
+    if (!aggressive && !/\S/.test(line.text)) {
+      indentation = 0;
+      how = "not";
+    } else if (how == "smart") {
+      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+      if (indentation == Pass || indentation > 150) {
+        if (!aggressive) { return }
+        how = "prev";
+      }
+    }
+    if (how == "prev") {
+      if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize); }
+      else { indentation = 0; }
+    } else if (how == "add") {
+      indentation = curSpace + cm.options.indentUnit;
+    } else if (how == "subtract") {
+      indentation = curSpace - cm.options.indentUnit;
+    } else if (typeof how == "number") {
+      indentation = curSpace + how;
+    }
+    indentation = Math.max(0, indentation);
+
+    var indentString = "", pos = 0;
+    if (cm.options.indentWithTabs)
+      { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} }
+    if (pos < indentation) { indentString += spaceStr(indentation - pos); }
+
+    if (indentString != curSpaceString) {
+      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      line.stateAfter = null;
+      return true
+    } else {
+      // Ensure that, if the cursor was in the whitespace at the start
+      // of the line, it is moved to the end of that space.
+      for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) {
+        var range = doc.sel.ranges[i$1];
+        if (range.head.line == n && range.head.ch < curSpaceString.length) {
+          var pos$1 = Pos(n, curSpaceString.length);
+          replaceOneSelection(doc, i$1, new Range(pos$1, pos$1));
+          break
+        }
+      }
+    }
+  }
+
+  // This will be set to a {lineWise: bool, text: [string]} object, so
+  // that, when pasting, we know what kind of selections the copied
+  // text was made out of.
+  var lastCopied = null;
+
+  function setLastCopied(newLastCopied) {
+    lastCopied = newLastCopied;
+  }
+
+  function applyTextInput(cm, inserted, deleted, sel, origin) {
+    var doc = cm.doc;
+    cm.display.shift = false;
+    if (!sel) { sel = doc.sel; }
+
+    var recent = +new Date - 200;
+    var paste = origin == "paste" || cm.state.pasteIncoming > recent;
+    var textLines = splitLinesAuto(inserted), multiPaste = null;
+    // When pasting N lines into N selections, insert one line per selection
+    if (paste && sel.ranges.length > 1) {
+      if (lastCopied && lastCopied.text.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.text.length == 0) {
+          multiPaste = [];
+          for (var i = 0; i < lastCopied.text.length; i++)
+            { multiPaste.push(doc.splitLines(lastCopied.text[i])); }
+        }
+      } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
+        multiPaste = map(textLines, function (l) { return [l]; });
+      }
+    }
+
+    var updateInput = cm.curOp.updateInput;
+    // Normal behavior is to insert the new text into every selection
+    for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {
+      var range = sel.ranges[i$1];
+      var from = range.from(), to = range.to();
+      if (range.empty()) {
+        if (deleted && deleted > 0) // Handle deletion
+          { from = Pos(from.line, from.ch - deleted); }
+        else if (cm.state.overwrite && !paste) // Handle overwrite
+          { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); }
+        else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n"))
+          { from = to = Pos(from.line, 0); }
+      }
+      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
+                         origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input")};
+      makeChange(cm.doc, changeEvent);
+      signalLater(cm, "inputRead", cm, changeEvent);
+    }
+    if (inserted && !paste)
+      { triggerElectric(cm, inserted); }
+
+    ensureCursorVisible(cm);
+    if (cm.curOp.updateInput < 2) { cm.curOp.updateInput = updateInput; }
+    cm.curOp.typing = true;
+    cm.state.pasteIncoming = cm.state.cutIncoming = -1;
+  }
+
+  function handlePaste(e, cm) {
+    var pasted = e.clipboardData && e.clipboardData.getData("Text");
+    if (pasted) {
+      e.preventDefault();
+      if (!cm.isReadOnly() && !cm.options.disableInput && cm.hasFocus())
+        { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }); }
+      return true
+    }
+  }
+
+  function triggerElectric(cm, inserted) {
+    // When an 'electric' character is inserted, immediately trigger a reindent
+    if (!cm.options.electricChars || !cm.options.smartIndent) { return }
+    var sel = cm.doc.sel;
+
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range = sel.ranges[i];
+      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) { continue }
+      var mode = cm.getModeAt(range.head);
+      var indented = false;
+      if (mode.electricChars) {
+        for (var j = 0; j < mode.electricChars.length; j++)
+          { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+            indented = indentLine(cm, range.head.line, "smart");
+            break
+          } }
+      } else if (mode.electricInput) {
+        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
+          { indented = indentLine(cm, range.head.line, "smart"); }
+      }
+      if (indented) { signalLater(cm, "electricInput", cm, range.head.line); }
+    }
+  }
+
+  function copyableRanges(cm) {
+    var text = [], ranges = [];
+    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+      var line = cm.doc.sel.ranges[i].head.line;
+      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+      ranges.push(lineRange);
+      text.push(cm.getRange(lineRange.anchor, lineRange.head));
+    }
+    return {text: text, ranges: ranges}
+  }
+
+  function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
+    field.setAttribute("autocorrect", autocorrect ? "on" : "off");
+    field.setAttribute("autocapitalize", autocapitalize ? "on" : "off");
+    field.setAttribute("spellcheck", !!spellcheck);
+  }
+
+  function hiddenTextarea() {
+    var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none");
+    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+    // The textarea is kept positioned near the cursor to prevent the
+    // fact that it'll be scrolled into view on input from scrolling
+    // our fake cursor out of view. On webkit, when wrap=off, paste is
+    // very slow. So make the area wide instead.
+    if (webkit) { te.style.width = "1000px"; }
+    else { te.setAttribute("wrap", "off"); }
+    // If border: 0; -- iOS fails to open keyboard (issue #1287)
+    if (ios) { te.style.border = "1px solid black"; }
+    return div
+  }
+
+  // The publicly visible API. Note that methodOp(f) means
+  // 'wrap f in an operation, performed on its `this` parameter'.
+
+  // This is not the complete set of editor methods. Most of the
+  // methods defined on the Doc type are also injected into
+  // CodeMirror.prototype, for backwards compatibility and
+  // convenience.
+
+  function addEditorMethods(CodeMirror) {
+    var optionHandlers = CodeMirror.optionHandlers;
+
+    var helpers = CodeMirror.helpers = {};
+
+    CodeMirror.prototype = {
+      constructor: CodeMirror,
+      focus: function(){win(this).focus(); this.display.input.focus();},
+
+      setOption: function(option, value) {
+        var options = this.options, old = options[option];
+        if (options[option] == value && option != "mode") { return }
+        options[option] = value;
+        if (optionHandlers.hasOwnProperty(option))
+          { operation(this, optionHandlers[option])(this, value, old); }
+        signal(this, "optionChange", this, option);
+      },
+
+      getOption: function(option) {return this.options[option]},
+      getDoc: function() {return this.doc},
+
+      addKeyMap: function(map, bottom) {
+        this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
+      },
+      removeKeyMap: function(map) {
+        var maps = this.state.keyMaps;
+        for (var i = 0; i < maps.length; ++i)
+          { if (maps[i] == map || maps[i].name == map) {
+            maps.splice(i, 1);
+            return true
+          } }
+      },
+
+      addOverlay: methodOp(function(spec, options) {
+        var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
+        if (mode.startState) { throw new Error("Overlays may not be stateful.") }
+        insertSorted(this.state.overlays,
+                     {mode: mode, modeSpec: spec, opaque: options && options.opaque,
+                      priority: (options && options.priority) || 0},
+                     function (overlay) { return overlay.priority; });
+        this.state.modeGen++;
+        regChange(this);
+      }),
+      removeOverlay: methodOp(function(spec) {
+        var overlays = this.state.overlays;
+        for (var i = 0; i < overlays.length; ++i) {
+          var cur = overlays[i].modeSpec;
+          if (cur == spec || typeof spec == "string" && cur.name == spec) {
+            overlays.splice(i, 1);
+            this.state.modeGen++;
+            regChange(this);
+            return
+          }
+        }
+      }),
+
+      indentLine: methodOp(function(n, dir, aggressive) {
+        if (typeof dir != "string" && typeof dir != "number") {
+          if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev"; }
+          else { dir = dir ? "add" : "subtract"; }
+        }
+        if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive); }
+      }),
+      indentSelection: methodOp(function(how) {
+        var ranges = this.doc.sel.ranges, end = -1;
+        for (var i = 0; i < ranges.length; i++) {
+          var range = ranges[i];
+          if (!range.empty()) {
+            var from = range.from(), to = range.to();
+            var start = Math.max(end, from.line);
+            end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+            for (var j = start; j < end; ++j)
+              { indentLine(this, j, how); }
+            var newRanges = this.doc.sel.ranges;
+            if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+              { replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); }
+          } else if (range.head.line > end) {
+            indentLine(this, range.head.line, how, true);
+            end = range.head.line;
+            if (i == this.doc.sel.primIndex) { ensureCursorVisible(this); }
+          }
+        }
+      }),
+
+      // Fetch the parser token for a given character. Useful for hacks
+      // that want to inspect the mode state (say, for completion).
+      getTokenAt: function(pos, precise) {
+        return takeToken(this, pos, precise)
+      },
+
+      getLineTokens: function(line, precise) {
+        return takeToken(this, Pos(line), precise, true)
+      },
+
+      getTokenTypeAt: function(pos) {
+        pos = clipPos(this.doc, pos);
+        var styles = getLineStyles(this, getLine(this.doc, pos.line));
+        var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+        var type;
+        if (ch == 0) { type = styles[2]; }
+        else { for (;;) {
+          var mid = (before + after) >> 1;
+          if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid; }
+          else if (styles[mid * 2 + 1] < ch) { before = mid + 1; }
+          else { type = styles[mid * 2 + 2]; break }
+        } }
+        var cut = type ? type.indexOf("overlay ") : -1;
+        return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
+      },
+
+      getModeAt: function(pos) {
+        var mode = this.doc.mode;
+        if (!mode.innerMode) { return mode }
+        return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
+      },
+
+      getHelper: function(pos, type) {
+        return this.getHelpers(pos, type)[0]
+      },
+
+      getHelpers: function(pos, type) {
+        var found = [];
+        if (!helpers.hasOwnProperty(type)) { return found }
+        var help = helpers[type], mode = this.getModeAt(pos);
+        if (typeof mode[type] == "string") {
+          if (help[mode[type]]) { found.push(help[mode[type]]); }
+        } else if (mode[type]) {
+          for (var i = 0; i < mode[type].length; i++) {
+            var val = help[mode[type][i]];
+            if (val) { found.push(val); }
+          }
+        } else if (mode.helperType && help[mode.helperType]) {
+          found.push(help[mode.helperType]);
+        } else if (help[mode.name]) {
+          found.push(help[mode.name]);
+        }
+        for (var i$1 = 0; i$1 < help._global.length; i$1++) {
+          var cur = help._global[i$1];
+          if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
+            { found.push(cur.val); }
+        }
+        return found
+      },
+
+      getStateAfter: function(line, precise) {
+        var doc = this.doc;
+        line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
+        return getContextBefore(this, line + 1, precise).state
+      },
+
+      cursorCoords: function(start, mode) {
+        var pos, range = this.doc.sel.primary();
+        if (start == null) { pos = range.head; }
+        else if (typeof start == "object") { pos = clipPos(this.doc, start); }
+        else { pos = start ? range.from() : range.to(); }
+        return cursorCoords(this, pos, mode || "page")
+      },
+
+      charCoords: function(pos, mode) {
+        return charCoords(this, clipPos(this.doc, pos), mode || "page")
+      },
+
+      coordsChar: function(coords, mode) {
+        coords = fromCoordSystem(this, coords, mode || "page");
+        return coordsChar(this, coords.left, coords.top)
+      },
+
+      lineAtHeight: function(height, mode) {
+        height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
+        return lineAtHeight(this.doc, height + this.display.viewOffset)
+      },
+      heightAtLine: function(line, mode, includeWidgets) {
+        var end = false, lineObj;
+        if (typeof line == "number") {
+          var last = this.doc.first + this.doc.size - 1;
+          if (line < this.doc.first) { line = this.doc.first; }
+          else if (line > last) { line = last; end = true; }
+          lineObj = getLine(this.doc, line);
+        } else {
+          lineObj = line;
+        }
+        return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top +
+          (end ? this.doc.height - heightAtLine(lineObj) : 0)
+      },
+
+      defaultTextHeight: function() { return textHeight(this.display) },
+      defaultCharWidth: function() { return charWidth(this.display) },
+
+      getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
+
+      addWidget: function(pos, node, scroll, vert, horiz) {
+        var display = this.display;
+        pos = cursorCoords(this, clipPos(this.doc, pos));
+        var top = pos.bottom, left = pos.left;
+        node.style.position = "absolute";
+        node.setAttribute("cm-ignore-events", "true");
+        this.display.input.setUneditable(node);
+        display.sizer.appendChild(node);
+        if (vert == "over") {
+          top = pos.top;
+        } else if (vert == "above" || vert == "near") {
+          var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
+          hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
+          // Default to positioning above (if specified and possible); otherwise default to positioning below
+          if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
+            { top = pos.top - node.offsetHeight; }
+          else if (pos.bottom + node.offsetHeight <= vspace)
+            { top = pos.bottom; }
+          if (left + node.offsetWidth > hspace)
+            { left = hspace - node.offsetWidth; }
+        }
+        node.style.top = top + "px";
+        node.style.left = node.style.right = "";
+        if (horiz == "right") {
+          left = display.sizer.clientWidth - node.offsetWidth;
+          node.style.right = "0px";
+        } else {
+          if (horiz == "left") { left = 0; }
+          else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2; }
+          node.style.left = left + "px";
+        }
+        if (scroll)
+          { scrollIntoView(this, {left: left, top: top, right: left + node.offsetWidth, bottom: top + node.offsetHeight}); }
+      },
+
+      triggerOnKeyDown: methodOp(onKeyDown),
+      triggerOnKeyPress: methodOp(onKeyPress),
+      triggerOnKeyUp: onKeyUp,
+      triggerOnMouseDown: methodOp(onMouseDown),
+
+      execCommand: function(cmd) {
+        if (commands.hasOwnProperty(cmd))
+          { return commands[cmd].call(null, this) }
+      },
+
+      triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
+      findPosH: function(from, amount, unit, visually) {
+        var dir = 1;
+        if (amount < 0) { dir = -1; amount = -amount; }
+        var cur = clipPos(this.doc, from);
+        for (var i = 0; i < amount; ++i) {
+          cur = findPosH(this.doc, cur, dir, unit, visually);
+          if (cur.hitSide) { break }
+        }
+        return cur
+      },
+
+      moveH: methodOp(function(dir, unit) {
+        var this$1 = this;
+
+        this.extendSelectionsBy(function (range) {
+          if (this$1.display.shift || this$1.doc.extend || range.empty())
+            { return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually) }
+          else
+            { return dir < 0 ? range.from() : range.to() }
+        }, sel_move);
+      }),
+
+      deleteH: methodOp(function(dir, unit) {
+        var sel = this.doc.sel, doc = this.doc;
+        if (sel.somethingSelected())
+          { doc.replaceSelection("", null, "+delete"); }
+        else
+          { deleteNearSelection(this, function (range) {
+            var other = findPosH(doc, range.head, dir, unit, false);
+            return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}
+          }); }
+      }),
+
+      findPosV: function(from, amount, unit, goalColumn) {
+        var dir = 1, x = goalColumn;
+        if (amount < 0) { dir = -1; amount = -amount; }
+        var cur = clipPos(this.doc, from);
+        for (var i = 0; i < amount; ++i) {
+          var coords = cursorCoords(this, cur, "div");
+          if (x == null) { x = coords.left; }
+          else { coords.left = x; }
+          cur = findPosV(this, coords, dir, unit);
+          if (cur.hitSide) { break }
+        }
+        return cur
+      },
+
+      moveV: methodOp(function(dir, unit) {
+        var this$1 = this;
+
+        var doc = this.doc, goals = [];
+        var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected();
+        doc.extendSelectionsBy(function (range) {
+          if (collapse)
+            { return dir < 0 ? range.from() : range.to() }
+          var headPos = cursorCoords(this$1, range.head, "div");
+          if (range.goalColumn != null) { headPos.left = range.goalColumn; }
+          goals.push(headPos.left);
+          var pos = findPosV(this$1, headPos, dir, unit);
+          if (unit == "page" && range == doc.sel.primary())
+            { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }
+          return pos
+        }, sel_move);
+        if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
+          { doc.sel.ranges[i].goalColumn = goals[i]; } }
+      }),
+
+      // Find the word at the given position (as returned by coordsChar).
+      findWordAt: function(pos) {
+        var doc = this.doc, line = getLine(doc, pos.line).text;
+        var start = pos.ch, end = pos.ch;
+        if (line) {
+          var helper = this.getHelper(pos, "wordChars");
+          if ((pos.sticky == "before" || end == line.length) && start) { --start; } else { ++end; }
+          var startChar = line.charAt(start);
+          var check = isWordChar(startChar, helper)
+            ? function (ch) { return isWordChar(ch, helper); }
+            : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); }
+            : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); };
+          while (start > 0 && check(line.charAt(start - 1))) { --start; }
+          while (end < line.length && check(line.charAt(end))) { ++end; }
+        }
+        return new Range(Pos(pos.line, start), Pos(pos.line, end))
+      },
+
+      toggleOverwrite: function(value) {
+        if (value != null && value == this.state.overwrite) { return }
+        if (this.state.overwrite = !this.state.overwrite)
+          { addClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+        else
+          { rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+
+        signal(this, "overwriteToggle", this, this.state.overwrite);
+      },
+      hasFocus: function() { return this.display.input.getField() == activeElt(root(this)) },
+      isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
+
+      scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),
+      getScrollInfo: function() {
+        var scroller = this.display.scroller;
+        return {left: scroller.scrollLeft, top: scroller.scrollTop,
+                height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+                width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+                clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
+      },
+
+      scrollIntoView: methodOp(function(range, margin) {
+        if (range == null) {
+          range = {from: this.doc.sel.primary().head, to: null};
+          if (margin == null) { margin = this.options.cursorScrollMargin; }
+        } else if (typeof range == "number") {
+          range = {from: Pos(range, 0), to: null};
+        } else if (range.from == null) {
+          range = {from: range, to: null};
+        }
+        if (!range.to) { range.to = range.from; }
+        range.margin = margin || 0;
+
+        if (range.from.line != null) {
+          scrollToRange(this, range);
+        } else {
+          scrollToCoordsRange(this, range.from, range.to, range.margin);
+        }
+      }),
+
+      setSize: methodOp(function(width, height) {
+        var this$1 = this;
+
+        var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; };
+        if (width != null) { this.display.wrapper.style.width = interpret(width); }
+        if (height != null) { this.display.wrapper.style.height = interpret(height); }
+        if (this.options.lineWrapping) { clearLineMeasurementCache(this); }
+        var lineNo = this.display.viewFrom;
+        this.doc.iter(lineNo, this.display.viewTo, function (line) {
+          if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
+            { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo, "widget"); break } } }
+          ++lineNo;
+        });
+        this.curOp.forceUpdate = true;
+        signal(this, "refresh", this);
+      }),
+
+      operation: function(f){return runInOp(this, f)},
+      startOperation: function(){return startOperation(this)},
+      endOperation: function(){return endOperation(this)},
+
+      refresh: methodOp(function() {
+        var oldHeight = this.display.cachedTextHeight;
+        regChange(this);
+        this.curOp.forceUpdate = true;
+        clearCaches(this);
+        scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
+        updateGutterSpace(this.display);
+        if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
+          { estimateLineHeights(this); }
+        signal(this, "refresh", this);
+      }),
+
+      swapDoc: methodOp(function(doc) {
+        var old = this.doc;
+        old.cm = null;
+        // Cancel the current text selection if any (#5821)
+        if (this.state.selectingText) { this.state.selectingText(); }
+        attachDoc(this, doc);
+        clearCaches(this);
+        this.display.input.reset();
+        scrollToCoords(this, doc.scrollLeft, doc.scrollTop);
+        this.curOp.forceScroll = true;
+        signalLater(this, "swapDoc", this, old);
+        return old
+      }),
+
+      phrase: function(phraseText) {
+        var phrases = this.options.phrases;
+        return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText
+      },
+
+      getInputField: function(){return this.display.input.getField()},
+      getWrapperElement: function(){return this.display.wrapper},
+      getScrollerElement: function(){return this.display.scroller},
+      getGutterElement: function(){return this.display.gutters}
+    };
+    eventMixin(CodeMirror);
+
+    CodeMirror.registerHelper = function(type, name, value) {
+      if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []}; }
+      helpers[type][name] = value;
+    };
+    CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
+      CodeMirror.registerHelper(type, name, value);
+      helpers[type]._global.push({pred: predicate, val: value});
+    };
+  }
+
+  // Used for horizontal relative motion. Dir is -1 or 1 (left or
+  // right), unit can be "codepoint", "char", "column" (like char, but
+  // doesn't cross line boundaries), "word" (across next word), or
+  // "group" (to the start of next group of word or
+  // non-word-non-whitespace chars). The visually param controls
+  // whether, in right-to-left text, direction 1 means to move towards
+  // the next index in the string, or towards the character to the right
+  // of the current position. The resulting position will have a
+  // hitSide=true property if it reached the end of the document.
+  function findPosH(doc, pos, dir, unit, visually) {
+    var oldPos = pos;
+    var origDir = dir;
+    var lineObj = getLine(doc, pos.line);
+    var lineDir = visually && doc.direction == "rtl" ? -dir : dir;
+    function findNextLine() {
+      var l = pos.line + lineDir;
+      if (l < doc.first || l >= doc.first + doc.size) { return false }
+      pos = new Pos(l, pos.ch, pos.sticky);
+      return lineObj = getLine(doc, l)
+    }
+    function moveOnce(boundToLine) {
+      var next;
+      if (unit == "codepoint") {
+        var ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1));
+        if (isNaN(ch)) {
+          next = null;
+        } else {
+          var astral = dir > 0 ? ch >= 0xD800 && ch < 0xDC00 : ch >= 0xDC00 && ch < 0xDFFF;
+          next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir);
+        }
+      } else if (visually) {
+        next = moveVisually(doc.cm, lineObj, pos, dir);
+      } else {
+        next = moveLogically(lineObj, pos, dir);
+      }
+      if (next == null) {
+        if (!boundToLine && findNextLine())
+          { pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); }
+        else
+          { return false }
+      } else {
+        pos = next;
+      }
+      return true
+    }
+
+    if (unit == "char" || unit == "codepoint") {
+      moveOnce();
+    } else if (unit == "column") {
+      moveOnce(true);
+    } else if (unit == "word" || unit == "group") {
+      var sawType = null, group = unit == "group";
+      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
+      for (var first = true;; first = false) {
+        if (dir < 0 && !moveOnce(!first)) { break }
+        var cur = lineObj.text.charAt(pos.ch) || "\n";
+        var type = isWordChar(cur, helper) ? "w"
+          : group && cur == "\n" ? "n"
+          : !group || /\s/.test(cur) ? null
+          : "p";
+        if (group && !first && !type) { type = "s"; }
+        if (sawType && sawType != type) {
+          if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after";}
+          break
+        }
+
+        if (type) { sawType = type; }
+        if (dir > 0 && !moveOnce(!first)) { break }
+      }
+    }
+    var result = skipAtomic(doc, pos, oldPos, origDir, true);
+    if (equalCursorPos(oldPos, result)) { result.hitSide = true; }
+    return result
+  }
+
+  // For relative vertical movement. Dir may be -1 or 1. Unit can be
+  // "page" or "line". The resulting position will have a hitSide=true
+  // property if it reached the end of the document.
+  function findPosV(cm, pos, dir, unit) {
+    var doc = cm.doc, x = pos.left, y;
+    if (unit == "page") {
+      var pageSize = Math.min(cm.display.wrapper.clientHeight, win(cm).innerHeight || doc(cm).documentElement.clientHeight);
+      var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
+      y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
+
+    } else if (unit == "line") {
+      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
+    }
+    var target;
+    for (;;) {
+      target = coordsChar(cm, x, y);
+      if (!target.outside) { break }
+      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
+      y += dir * 5;
+    }
+    return target
+  }
+
+  // CONTENTEDITABLE INPUT STYLE
+
+  var ContentEditableInput = function(cm) {
+    this.cm = cm;
+    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+    this.polling = new Delayed();
+    this.composing = null;
+    this.gracePeriod = false;
+    this.readDOMTimeout = null;
+  };
+
+  ContentEditableInput.prototype.init = function (display) {
+      var this$1 = this;
+
+    var input = this, cm = input.cm;
+    var div = input.div = display.lineDiv;
+    div.contentEditable = true;
+    disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize);
+
+    function belongsToInput(e) {
+      for (var t = e.target; t; t = t.parentNode) {
+        if (t == div) { return true }
+        if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { break }
+      }
+      return false
+    }
+
+    on(div, "paste", function (e) {
+      if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+      // IE doesn't fire input events, so we schedule a read for the pasted content in this way
+      if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }
+    });
+
+    on(div, "compositionstart", function (e) {
+      this$1.composing = {data: e.data, done: false};
+    });
+    on(div, "compositionupdate", function (e) {
+      if (!this$1.composing) { this$1.composing = {data: e.data, done: false}; }
+    });
+    on(div, "compositionend", function (e) {
+      if (this$1.composing) {
+        if (e.data != this$1.composing.data) { this$1.readFromDOMSoon(); }
+        this$1.composing.done = true;
+      }
+    });
+
+    on(div, "touchstart", function () { return input.forceCompositionEnd(); });
+
+    on(div, "input", function () {
+      if (!this$1.composing) { this$1.readFromDOMSoon(); }
+    });
+
+    function onCopyCut(e) {
+      if (!belongsToInput(e) || signalDOMEvent(cm, e)) { return }
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+        if (e.type == "cut") { cm.replaceSelection("", null, "cut"); }
+      } else if (!cm.options.lineWiseCopyCut) {
+        return
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.operation(function () {
+            cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+            cm.replaceSelection("", null, "cut");
+          });
+        }
+      }
+      if (e.clipboardData) {
+        e.clipboardData.clearData();
+        var content = lastCopied.text.join("\n");
+        // iOS exposes the clipboard API, but seems to discard content inserted into it
+        e.clipboardData.setData("Text", content);
+        if (e.clipboardData.getData("Text") == content) {
+          e.preventDefault();
+          return
+        }
+      }
+      // Old-fashioned briefly-focus-a-textarea hack
+      var kludge = hiddenTextarea(), te = kludge.firstChild;
+      disableBrowserMagic(te);
+      cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+      te.value = lastCopied.text.join("\n");
+      var hadFocus = activeElt(rootNode(div));
+      selectInput(te);
+      setTimeout(function () {
+        cm.display.lineSpace.removeChild(kludge);
+        hadFocus.focus();
+        if (hadFocus == div) { input.showPrimarySelection(); }
+      }, 50);
+    }
+    on(div, "copy", onCopyCut);
+    on(div, "cut", onCopyCut);
+  };
+
+  ContentEditableInput.prototype.screenReaderLabelChanged = function (label) {
+    // Label for screenreaders, accessibility
+    if(label) {
+      this.div.setAttribute('aria-label', label);
+    } else {
+      this.div.removeAttribute('aria-label');
+    }
+  };
+
+  ContentEditableInput.prototype.prepareSelection = function () {
+    var result = prepareSelection(this.cm, false);
+    result.focus = activeElt(rootNode(this.div)) == this.div;
+    return result
+  };
+
+  ContentEditableInput.prototype.showSelection = function (info, takeFocus) {
+    if (!info || !this.cm.display.view.length) { return }
+    if (info.focus || takeFocus) { this.showPrimarySelection(); }
+    this.showMultipleSelections(info);
+  };
+
+  ContentEditableInput.prototype.getSelection = function () {
+    return this.cm.display.wrapper.ownerDocument.getSelection()
+  };
+
+  ContentEditableInput.prototype.showPrimarySelection = function () {
+    var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
+    var from = prim.from(), to = prim.to();
+
+    if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
+      sel.removeAllRanges();
+      return
+    }
+
+    var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+    var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset);
+    if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+        cmp(minPos(curAnchor, curFocus), from) == 0 &&
+        cmp(maxPos(curAnchor, curFocus), to) == 0)
+      { return }
+
+    var view = cm.display.view;
+    var start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) ||
+        {node: view[0].measure.map[2], offset: 0};
+    var end = to.line < cm.display.viewTo && posToDOM(cm, to);
+    if (!end) {
+      var measure = view[view.length - 1].measure;
+      var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+      end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+    }
+
+    if (!start || !end) {
+      sel.removeAllRanges();
+      return
+    }
+
+    var old = sel.rangeCount && sel.getRangeAt(0), rng;
+    try { rng = range(start.node, start.offset, end.offset, end.node); }
+    catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+    if (rng) {
+      if (!gecko && cm.state.focused) {
+        sel.collapse(start.node, start.offset);
+        if (!rng.collapsed) {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
+      } else {
+        sel.removeAllRanges();
+        sel.addRange(rng);
+      }
+      if (old && sel.anchorNode == null) { sel.addRange(old); }
+      else if (gecko) { this.startGracePeriod(); }
+    }
+    this.rememberSelection();
+  };
+
+  ContentEditableInput.prototype.startGracePeriod = function () {
+      var this$1 = this;
+
+    clearTimeout(this.gracePeriod);
+    this.gracePeriod = setTimeout(function () {
+      this$1.gracePeriod = false;
+      if (this$1.selectionChanged())
+        { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }); }
+    }, 20);
+  };
+
+  ContentEditableInput.prototype.showMultipleSelections = function (info) {
+    removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+    removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+  };
+
+  ContentEditableInput.prototype.rememberSelection = function () {
+    var sel = this.getSelection();
+    this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+    this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+  };
+
+  ContentEditableInput.prototype.selectionInEditor = function () {
+    var sel = this.getSelection();
+    if (!sel.rangeCount) { return false }
+    var node = sel.getRangeAt(0).commonAncestorContainer;
+    return contains(this.div, node)
+  };
+
+  ContentEditableInput.prototype.focus = function () {
+    if (this.cm.options.readOnly != "nocursor") {
+      if (!this.selectionInEditor() || activeElt(rootNode(this.div)) != this.div)
+        { this.showSelection(this.prepareSelection(), true); }
+      this.div.focus();
+    }
+  };
+  ContentEditableInput.prototype.blur = function () { this.div.blur(); };
+  ContentEditableInput.prototype.getField = function () { return this.div };
+
+  ContentEditableInput.prototype.supportsTouch = function () { return true };
+
+  ContentEditableInput.prototype.receivedFocus = function () {
+      var this$1 = this;
+
+    var input = this;
+    if (this.selectionInEditor())
+      { setTimeout(function () { return this$1.pollSelection(); }, 20); }
+    else
+      { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); }
+
+    function poll() {
+      if (input.cm.state.focused) {
+        input.pollSelection();
+        input.polling.set(input.cm.options.pollInterval, poll);
+      }
+    }
+    this.polling.set(this.cm.options.pollInterval, poll);
+  };
+
+  ContentEditableInput.prototype.selectionChanged = function () {
+    var sel = this.getSelection();
+    return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+      sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
+  };
+
+  ContentEditableInput.prototype.pollSelection = function () {
+    if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return }
+    var sel = this.getSelection(), cm = this.cm;
+    // On Android Chrome (version 56, at least), backspacing into an
+    // uneditable block element will put the cursor in that element,
+    // and then, because it's not editable, hide the virtual keyboard.
+    // Because Android doesn't allow us to actually detect backspace
+    // presses in a sane way, this code checks for when that happens
+    // and simulates a backspace press in this case.
+    if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) {
+      this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs});
+      this.blur();
+      this.focus();
+      return
+    }
+    if (this.composing) { return }
+    this.rememberSelection();
+    var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+    var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+    if (anchor && head) { runInOp(cm, function () {
+      setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+      if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true; }
+    }); }
+  };
+
+  ContentEditableInput.prototype.pollContent = function () {
+    if (this.readDOMTimeout != null) {
+      clearTimeout(this.readDOMTimeout);
+      this.readDOMTimeout = null;
+    }
+
+    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+    var from = sel.from(), to = sel.to();
+    if (from.ch == 0 && from.line > cm.firstLine())
+      { from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); }
+    if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine())
+      { to = Pos(to.line + 1, 0); }
+    if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false }
+
+    var fromIndex, fromLine, fromNode;
+    if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+      fromLine = lineNo(display.view[0].line);
+      fromNode = display.view[0].node;
+    } else {
+      fromLine = lineNo(display.view[fromIndex].line);
+      fromNode = display.view[fromIndex - 1].node.nextSibling;
+    }
+    var toIndex = findViewIndex(cm, to.line);
+    var toLine, toNode;
+    if (toIndex == display.view.length - 1) {
+      toLine = display.viewTo - 1;
+      toNode = display.lineDiv.lastChild;
+    } else {
+      toLine = lineNo(display.view[toIndex + 1].line) - 1;
+      toNode = display.view[toIndex + 1].node.previousSibling;
+    }
+
+    if (!fromNode) { return false }
+    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+    while (newText.length > 1 && oldText.length > 1) {
+      if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+      else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+      else { break }
+    }
+
+    var cutFront = 0, cutEnd = 0;
+    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+    while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+      { ++cutFront; }
+    var newBot = lst(newText), oldBot = lst(oldText);
+    var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+                             oldBot.length - (oldText.length == 1 ? cutFront : 0));
+    while (cutEnd < maxCutEnd &&
+           newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+      { ++cutEnd; }
+    // Try to move start of change to start of selection if ambiguous
+    if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) {
+      while (cutFront && cutFront > from.ch &&
+             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) {
+        cutFront--;
+        cutEnd++;
+      }
+    }
+
+    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "");
+    newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "");
+
+    var chFrom = Pos(fromLine, cutFront);
+    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+    if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+      replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+      return true
+    }
+  };
+
+  ContentEditableInput.prototype.ensurePolled = function () {
+    this.forceCompositionEnd();
+  };
+  ContentEditableInput.prototype.reset = function () {
+    this.forceCompositionEnd();
+  };
+  ContentEditableInput.prototype.forceCompositionEnd = function () {
+    if (!this.composing) { return }
+    clearTimeout(this.readDOMTimeout);
+    this.composing = null;
+    this.updateFromDOM();
+    this.div.blur();
+    this.div.focus();
+  };
+  ContentEditableInput.prototype.readFromDOMSoon = function () {
+      var this$1 = this;
+
+    if (this.readDOMTimeout != null) { return }
+    this.readDOMTimeout = setTimeout(function () {
+      this$1.readDOMTimeout = null;
+      if (this$1.composing) {
+        if (this$1.composing.done) { this$1.composing = null; }
+        else { return }
+      }
+      this$1.updateFromDOM();
+    }, 80);
+  };
+
+  ContentEditableInput.prototype.updateFromDOM = function () {
+      var this$1 = this;
+
+    if (this.cm.isReadOnly() || !this.pollContent())
+      { runInOp(this.cm, function () { return regChange(this$1.cm); }); }
+  };
+
+  ContentEditableInput.prototype.setUneditable = function (node) {
+    node.contentEditable = "false";
+  };
+
+  ContentEditableInput.prototype.onKeyPress = function (e) {
+    if (e.charCode == 0 || this.composing) { return }
+    e.preventDefault();
+    if (!this.cm.isReadOnly())
+      { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); }
+  };
+
+  ContentEditableInput.prototype.readOnlyChanged = function (val) {
+    this.div.contentEditable = String(val != "nocursor");
+  };
+
+  ContentEditableInput.prototype.onContextMenu = function () {};
+  ContentEditableInput.prototype.resetPosition = function () {};
+
+  ContentEditableInput.prototype.needsContentAttribute = true;
+
+  function posToDOM(cm, pos) {
+    var view = findViewForLine(cm, pos.line);
+    if (!view || view.hidden) { return null }
+    var line = getLine(cm.doc, pos.line);
+    var info = mapFromLineView(view, line, pos.line);
+
+    var order = getOrder(line, cm.doc.direction), side = "left";
+    if (order) {
+      var partPos = getBidiPartAt(order, pos.ch);
+      side = partPos % 2 ? "right" : "left";
+    }
+    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+    result.offset = result.collapse == "right" ? result.end : result.start;
+    return result
+  }
+
+  function isInGutter(node) {
+    for (var scan = node; scan; scan = scan.parentNode)
+      { if (/CodeMirror-gutter-wrapper/.test(scan.className)) { return true } }
+    return false
+  }
+
+  function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
+
+  function domTextBetween(cm, from, to, fromLine, toLine) {
+    var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false;
+    function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
+    function close() {
+      if (closing) {
+        text += lineSep;
+        if (extraLinebreak) { text += lineSep; }
+        closing = extraLinebreak = false;
+      }
+    }
+    function addText(str) {
+      if (str) {
+        close();
+        text += str;
+      }
+    }
+    function walk(node) {
+      if (node.nodeType == 1) {
+        var cmText = node.getAttribute("cm-text");
+        if (cmText) {
+          addText(cmText);
+          return
+        }
+        var markerID = node.getAttribute("cm-marker"), range;
+        if (markerID) {
+          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+          if (found.length && (range = found[0].find(0)))
+            { addText(getBetween(cm.doc, range.from, range.to).join(lineSep)); }
+          return
+        }
+        if (node.getAttribute("contenteditable") == "false") { return }
+        var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName);
+        if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return }
+
+        if (isBlock) { close(); }
+        for (var i = 0; i < node.childNodes.length; i++)
+          { walk(node.childNodes[i]); }
+
+        if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; }
+        if (isBlock) { closing = true; }
+      } else if (node.nodeType == 3) {
+        addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "));
+      }
+    }
+    for (;;) {
+      walk(from);
+      if (from == to) { break }
+      from = from.nextSibling;
+      extraLinebreak = false;
+    }
+    return text
+  }
+
+  function domToPos(cm, node, offset) {
+    var lineNode;
+    if (node == cm.display.lineDiv) {
+      lineNode = cm.display.lineDiv.childNodes[offset];
+      if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) }
+      node = null; offset = 0;
+    } else {
+      for (lineNode = node;; lineNode = lineNode.parentNode) {
+        if (!lineNode || lineNode == cm.display.lineDiv) { return null }
+        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break }
+      }
+    }
+    for (var i = 0; i < cm.display.view.length; i++) {
+      var lineView = cm.display.view[i];
+      if (lineView.node == lineNode)
+        { return locateNodeInLineView(lineView, node, offset) }
+    }
+  }
+
+  function locateNodeInLineView(lineView, node, offset) {
+    var wrapper = lineView.text.firstChild, bad = false;
+    if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) }
+    if (node == wrapper) {
+      bad = true;
+      node = wrapper.childNodes[offset];
+      offset = 0;
+      if (!node) {
+        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+        return badPos(Pos(lineNo(line), line.text.length), bad)
+      }
+    }
+
+    var textNode = node.nodeType == 3 ? node : null, topNode = node;
+    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+      textNode = node.firstChild;
+      if (offset) { offset = textNode.nodeValue.length; }
+    }
+    while (topNode.parentNode != wrapper) { topNode = topNode.parentNode; }
+    var measure = lineView.measure, maps = measure.maps;
+
+    function find(textNode, topNode, offset) {
+      for (var i = -1; i < (maps ? maps.length : 0); i++) {
+        var map = i < 0 ? measure.map : maps[i];
+        for (var j = 0; j < map.length; j += 3) {
+          var curNode = map[j + 2];
+          if (curNode == textNode || curNode == topNode) {
+            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+            var ch = map[j] + offset;
+            if (offset < 0 || curNode != textNode) { ch = map[j + (offset ? 1 : 0)]; }
+            return Pos(line, ch)
+          }
+        }
+      }
+    }
+    var found = find(textNode, topNode, offset);
+    if (found) { return badPos(found, bad) }
+
+    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+      found = find(after, after.firstChild, 0);
+      if (found)
+        { return badPos(Pos(found.line, found.ch - dist), bad) }
+      else
+        { dist += after.textContent.length; }
+    }
+    for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) {
+      found = find(before, before.firstChild, -1);
+      if (found)
+        { return badPos(Pos(found.line, found.ch + dist$1), bad) }
+      else
+        { dist$1 += before.textContent.length; }
+    }
+  }
+
+  // TEXTAREA INPUT STYLE
+
+  var TextareaInput = function(cm) {
+    this.cm = cm;
+    // See input.poll and input.reset
+    this.prevInput = "";
+
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
+    this.pollingFast = false;
+    // Self-resetting timeout for the poller
+    this.polling = new Delayed();
+    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+    this.hasSelection = false;
+    this.composing = null;
+    this.resetting = false;
+  };
+
+  TextareaInput.prototype.init = function (display) {
+      var this$1 = this;
+
+    var input = this, cm = this.cm;
+    this.createField(display);
+    var te = this.textarea;
+
+    display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild);
+
+    // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+    if (ios) { te.style.width = "0px"; }
+
+    on(te, "input", function () {
+      if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null; }
+      input.poll();
+    });
+
+    on(te, "paste", function (e) {
+      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+
+      cm.state.pasteIncoming = +new Date;
+      input.fastPoll();
+    });
+
+    function prepareCopyCut(e) {
+      if (signalDOMEvent(cm, e)) { return }
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+      } else if (!cm.options.lineWiseCopyCut) {
+        return
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.setSelections(ranges.ranges, null, sel_dontScroll);
+        } else {
+          input.prevInput = "";
+          te.value = ranges.text.join("\n");
+          selectInput(te);
+        }
+      }
+      if (e.type == "cut") { cm.state.cutIncoming = +new Date; }
+    }
+    on(te, "cut", prepareCopyCut);
+    on(te, "copy", prepareCopyCut);
+
+    on(display.scroller, "paste", function (e) {
+      if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }
+      if (!te.dispatchEvent) {
+        cm.state.pasteIncoming = +new Date;
+        input.focus();
+        return
+      }
+
+      // Pass the `paste` event to the textarea so it's handled by its event listener.
+      var event = new Event("paste");
+      event.clipboardData = e.clipboardData;
+      te.dispatchEvent(event);
+    });
+
+    // Prevent normal selection in the editor (we handle our own)
+    on(display.lineSpace, "selectstart", function (e) {
+      if (!eventInWidget(display, e)) { e_preventDefault(e); }
+    });
+
+    on(te, "compositionstart", function () {
+      var start = cm.getCursor("from");
+      if (input.composing) { input.composing.range.clear(); }
+      input.composing = {
+        start: start,
+        range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+      };
+    });
+    on(te, "compositionend", function () {
+      if (input.composing) {
+        input.poll();
+        input.composing.range.clear();
+        input.composing = null;
+      }
+    });
+  };
+
+  TextareaInput.prototype.createField = function (_display) {
+    // Wraps and hides input textarea
+    this.wrapper = hiddenTextarea();
+    // The semihidden textarea that is focused when the editor is
+    // focused, and receives input.
+    this.textarea = this.wrapper.firstChild;
+    var opts = this.cm.options;
+    disableBrowserMagic(this.textarea, opts.spellcheck, opts.autocorrect, opts.autocapitalize);
+  };
+
+  TextareaInput.prototype.screenReaderLabelChanged = function (label) {
+    // Label for screenreaders, accessibility
+    if(label) {
+      this.textarea.setAttribute('aria-label', label);
+    } else {
+      this.textarea.removeAttribute('aria-label');
+    }
+  };
+
+  TextareaInput.prototype.prepareSelection = function () {
+    // Redraw the selection and/or cursor
+    var cm = this.cm, display = cm.display, doc = cm.doc;
+    var result = prepareSelection(cm);
+
+    // Move the hidden textarea near the cursor to prevent scrolling artifacts
+    if (cm.options.moveInputWithCursor) {
+      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+      result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                          headPos.top + lineOff.top - wrapOff.top));
+      result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                           headPos.left + lineOff.left - wrapOff.left));
+    }
+
+    return result
+  };
+
+  TextareaInput.prototype.showSelection = function (drawn) {
+    var cm = this.cm, display = cm.display;
+    removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+    removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+    if (drawn.teTop != null) {
+      this.wrapper.style.top = drawn.teTop + "px";
+      this.wrapper.style.left = drawn.teLeft + "px";
+    }
+  };
+
+  // Reset the input to correspond to the selection (or to be empty,
+  // when not typing and nothing is selected)
+  TextareaInput.prototype.reset = function (typing) {
+    if (this.contextMenuPending || this.composing && typing) { return }
+    var cm = this.cm;
+    this.resetting = true;
+    if (cm.somethingSelected()) {
+      this.prevInput = "";
+      var content = cm.getSelection();
+      this.textarea.value = content;
+      if (cm.state.focused) { selectInput(this.textarea); }
+      if (ie && ie_version >= 9) { this.hasSelection = content; }
+    } else if (!typing) {
+      this.prevInput = this.textarea.value = "";
+      if (ie && ie_version >= 9) { this.hasSelection = null; }
+    }
+    this.resetting = false;
+  };
+
+  TextareaInput.prototype.getField = function () { return this.textarea };
+
+  TextareaInput.prototype.supportsTouch = function () { return false };
+
+  TextareaInput.prototype.focus = function () {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(rootNode(this.textarea)) != this.textarea)) {
+      try { this.textarea.focus(); }
+      catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+    }
+  };
+
+  TextareaInput.prototype.blur = function () { this.textarea.blur(); };
+
+  TextareaInput.prototype.resetPosition = function () {
+    this.wrapper.style.top = this.wrapper.style.left = 0;
+  };
+
+  TextareaInput.prototype.receivedFocus = function () { this.slowPoll(); };
+
+  // Poll for input changes, using the normal rate of polling. This
+  // runs as long as the editor is focused.
+  TextareaInput.prototype.slowPoll = function () {
+      var this$1 = this;
+
+    if (this.pollingFast) { return }
+    this.polling.set(this.cm.options.pollInterval, function () {
+      this$1.poll();
+      if (this$1.cm.state.focused) { this$1.slowPoll(); }
+    });
+  };
+
+  // When an event has just come in that is likely to add or change
+  // something in the input textarea, we poll faster, to ensure that
+  // the change appears on the screen quickly.
+  TextareaInput.prototype.fastPoll = function () {
+    var missed = false, input = this;
+    input.pollingFast = true;
+    function p() {
+      var changed = input.poll();
+      if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+      else {input.pollingFast = false; input.slowPoll();}
+    }
+    input.polling.set(20, p);
+  };
+
+  // Read input from the textarea, and update the document to match.
+  // When something is selected, it is present in the textarea, and
+  // selected (unless it is huge, in which case a placeholder is
+  // used). When nothing is selected, the cursor sits after previously
+  // seen text (can be empty), which is stored in prevInput (we must
+  // not reset the textarea when typing, because that breaks IME).
+  TextareaInput.prototype.poll = function () {
+      var this$1 = this;
+
+    var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+    // Since this is called a *lot*, try to bail out as cheaply as
+    // possible when it is clear that nothing happened. hasSelection
+    // will be the case when there is a lot of text in the textarea,
+    // in which case reading its value would be expensive.
+    if (this.contextMenuPending || this.resetting || !cm.state.focused ||
+        (hasSelection(input) && !prevInput && !this.composing) ||
+        cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
+      { return false }
+
+    var text = input.value;
+    // If nothing changed, bail.
+    if (text == prevInput && !cm.somethingSelected()) { return false }
+    // Work around nonsensical selection resetting in IE9/10, and
+    // inexplicable appearance of private area unicode characters on
+    // some key combos in Mac (#2689).
+    if (ie && ie_version >= 9 && this.hasSelection === text ||
+        mac && /[\uf700-\uf7ff]/.test(text)) {
+      cm.display.input.reset();
+      return false
+    }
+
+    if (cm.doc.sel == cm.display.selForContextMenu) {
+      var first = text.charCodeAt(0);
+      if (first == 0x200b && !prevInput) { prevInput = "\u200b"; }
+      if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") }
+    }
+    // Find the part of the input that is actually new
+    var same = 0, l = Math.min(prevInput.length, text.length);
+    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same; }
+
+    runInOp(cm, function () {
+      applyTextInput(cm, text.slice(same), prevInput.length - same,
+                     null, this$1.composing ? "*compose" : null);
+
+      // Don't leave long text in the textarea, since it makes further polling slow
+      if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = ""; }
+      else { this$1.prevInput = text; }
+
+      if (this$1.composing) {
+        this$1.composing.range.clear();
+        this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
+                                           {className: "CodeMirror-composing"});
+      }
+    });
+    return true
+  };
+
+  TextareaInput.prototype.ensurePolled = function () {
+    if (this.pollingFast && this.poll()) { this.pollingFast = false; }
+  };
+
+  TextareaInput.prototype.onKeyPress = function () {
+    if (ie && ie_version >= 9) { this.hasSelection = null; }
+    this.fastPoll();
+  };
+
+  TextareaInput.prototype.onContextMenu = function (e) {
+    var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+    if (input.contextMenuPending) { input.contextMenuPending(); }
+    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+    if (!pos || presto) { return } // Opera is difficult.
+
+    // Reset the current text selection only if the click is done outside of the selection
+    // and 'resetSelectionOnContextMenu' option is true.
+    var reset = cm.options.resetSelectionOnContextMenu;
+    if (reset && cm.doc.sel.contains(pos) == -1)
+      { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); }
+
+    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+    var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect();
+    input.wrapper.style.cssText = "position: static";
+    te.style.cssText = "position: absolute; width: 30px; height: 30px;\n      top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n      z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+    var oldScrollY;
+    if (webkit) { oldScrollY = te.ownerDocument.defaultView.scrollY; } // Work around Chrome issue (#2712)
+    display.input.focus();
+    if (webkit) { te.ownerDocument.defaultView.scrollTo(null, oldScrollY); }
+    display.input.reset();
+    // Adds "Select all" to context menu in FF
+    if (!cm.somethingSelected()) { te.value = input.prevInput = " "; }
+    input.contextMenuPending = rehide;
+    display.selForContextMenu = cm.doc.sel;
+    clearTimeout(display.detectingSelectAll);
+
+    // Select-all will be greyed out if there's nothing to select, so
+    // this adds a zero-width space so that we can later check whether
+    // it got selected.
+    function prepareSelectAllHack() {
+      if (te.selectionStart != null) {
+        var selected = cm.somethingSelected();
+        var extval = "\u200b" + (selected ? te.value : "");
+        te.value = "\u21da"; // Used to catch context-menu undo
+        te.value = extval;
+        input.prevInput = selected ? "" : "\u200b";
+        te.selectionStart = 1; te.selectionEnd = extval.length;
+        // Re-set this, in case some other handler touched the
+        // selection in the meantime.
+        display.selForContextMenu = cm.doc.sel;
+      }
+    }
+    function rehide() {
+      if (input.contextMenuPending != rehide) { return }
+      input.contextMenuPending = false;
+      input.wrapper.style.cssText = oldWrapperCSS;
+      te.style.cssText = oldCSS;
+      if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); }
+
+      // Try to detect the user choosing select-all
+      if (te.selectionStart != null) {
+        if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack(); }
+        var i = 0, poll = function () {
+          if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+              te.selectionEnd > 0 && input.prevInput == "\u200b") {
+            operation(cm, selectAll)(cm);
+          } else if (i++ < 10) {
+            display.detectingSelectAll = setTimeout(poll, 500);
+          } else {
+            display.selForContextMenu = null;
+            display.input.reset();
+          }
+        };
+        display.detectingSelectAll = setTimeout(poll, 200);
+      }
+    }
+
+    if (ie && ie_version >= 9) { prepareSelectAllHack(); }
+    if (captureRightClick) {
+      e_stop(e);
+      var mouseup = function () {
+        off(window, "mouseup", mouseup);
+        setTimeout(rehide, 20);
+      };
+      on(window, "mouseup", mouseup);
+    } else {
+      setTimeout(rehide, 50);
+    }
+  };
+
+  TextareaInput.prototype.readOnlyChanged = function (val) {
+    if (!val) { this.reset(); }
+    this.textarea.disabled = val == "nocursor";
+    this.textarea.readOnly = !!val;
+  };
+
+  TextareaInput.prototype.setUneditable = function () {};
+
+  TextareaInput.prototype.needsContentAttribute = false;
+
+  function fromTextArea(textarea, options) {
+    options = options ? copyObj(options) : {};
+    options.value = textarea.value;
+    if (!options.tabindex && textarea.tabIndex)
+      { options.tabindex = textarea.tabIndex; }
+    if (!options.placeholder && textarea.placeholder)
+      { options.placeholder = textarea.placeholder; }
+    // Set autofocus to true if this textarea is focused, or if it has
+    // autofocus and no other element is focused.
+    if (options.autofocus == null) {
+      var hasFocus = activeElt(rootNode(textarea));
+      options.autofocus = hasFocus == textarea ||
+        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+    }
+
+    function save() {textarea.value = cm.getValue();}
+
+    var realSubmit;
+    if (textarea.form) {
+      on(textarea.form, "submit", save);
+      // Deplorable hack to make the submit method do the right thing.
+      if (!options.leaveSubmitMethodAlone) {
+        var form = textarea.form;
+        realSubmit = form.submit;
+        try {
+          var wrappedSubmit = form.submit = function () {
+            save();
+            form.submit = realSubmit;
+            form.submit();
+            form.submit = wrappedSubmit;
+          };
+        } catch(e) {}
+      }
+    }
+
+    options.finishInit = function (cm) {
+      cm.save = save;
+      cm.getTextArea = function () { return textarea; };
+      cm.toTextArea = function () {
+        cm.toTextArea = isNaN; // Prevent this from being ran twice
+        save();
+        textarea.parentNode.removeChild(cm.getWrapperElement());
+        textarea.style.display = "";
+        if (textarea.form) {
+          off(textarea.form, "submit", save);
+          if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
+            { textarea.form.submit = realSubmit; }
+        }
+      };
+    };
+
+    textarea.style.display = "none";
+    var cm = CodeMirror(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); },
+      options);
+    return cm
+  }
+
+  function addLegacyProps(CodeMirror) {
+    CodeMirror.off = off;
+    CodeMirror.on = on;
+    CodeMirror.wheelEventPixels = wheelEventPixels;
+    CodeMirror.Doc = Doc;
+    CodeMirror.splitLines = splitLinesAuto;
+    CodeMirror.countColumn = countColumn;
+    CodeMirror.findColumn = findColumn;
+    CodeMirror.isWordChar = isWordCharBasic;
+    CodeMirror.Pass = Pass;
+    CodeMirror.signal = signal;
+    CodeMirror.Line = Line;
+    CodeMirror.changeEnd = changeEnd;
+    CodeMirror.scrollbarModel = scrollbarModel;
+    CodeMirror.Pos = Pos;
+    CodeMirror.cmpPos = cmp;
+    CodeMirror.modes = modes;
+    CodeMirror.mimeModes = mimeModes;
+    CodeMirror.resolveMode = resolveMode;
+    CodeMirror.getMode = getMode;
+    CodeMirror.modeExtensions = modeExtensions;
+    CodeMirror.extendMode = extendMode;
+    CodeMirror.copyState = copyState;
+    CodeMirror.startState = startState;
+    CodeMirror.innerMode = innerMode;
+    CodeMirror.commands = commands;
+    CodeMirror.keyMap = keyMap;
+    CodeMirror.keyName = keyName;
+    CodeMirror.isModifierKey = isModifierKey;
+    CodeMirror.lookupKey = lookupKey;
+    CodeMirror.normalizeKeyMap = normalizeKeyMap;
+    CodeMirror.StringStream = StringStream;
+    CodeMirror.SharedTextMarker = SharedTextMarker;
+    CodeMirror.TextMarker = TextMarker;
+    CodeMirror.LineWidget = LineWidget;
+    CodeMirror.e_preventDefault = e_preventDefault;
+    CodeMirror.e_stopPropagation = e_stopPropagation;
+    CodeMirror.e_stop = e_stop;
+    CodeMirror.addClass = addClass;
+    CodeMirror.contains = contains;
+    CodeMirror.rmClass = rmClass;
+    CodeMirror.keyNames = keyNames;
+  }
+
+  // EDITOR CONSTRUCTOR
+
+  defineOptions(CodeMirror);
+
+  addEditorMethods(CodeMirror);
+
+  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
+  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
+  for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
+    { CodeMirror.prototype[prop] = (function(method) {
+      return function() {return method.apply(this.doc, arguments)}
+    })(Doc.prototype[prop]); } }
+
+  eventMixin(Doc);
+  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
+  // Extra arguments are stored as the mode's dependencies, which is
+  // used by (legacy) mechanisms like loadmode.js to automatically
+  // load a mode. (Preferred mechanism is the require/define calls.)
+  CodeMirror.defineMode = function(name/*, mode, โ€ฆ*/) {
+    if (!CodeMirror.defaults.mode && name != "null") { CodeMirror.defaults.mode = name; }
+    defineMode.apply(this, arguments);
+  };
+
+  CodeMirror.defineMIME = defineMIME;
+
+  // Minimal default mode.
+  CodeMirror.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); });
+  CodeMirror.defineMIME("text/plain", "null");
+
+  // EXTENSIONS
+
+  CodeMirror.defineExtension = function (name, func) {
+    CodeMirror.prototype[name] = func;
+  };
+  CodeMirror.defineDocExtension = function (name, func) {
+    Doc.prototype[name] = func;
+  };
+
+  CodeMirror.fromTextArea = fromTextArea;
+
+  addLegacyProps(CodeMirror);
+
+  CodeMirror.version = "5.65.19";
+
+  return CodeMirror;
+
+})));
+window.CodeMirror = CodeMirror;
diff --git a/waterfox/browser/components/sidebar/extlib/diff.js b/waterfox/browser/components/sidebar/extlib/diff.js
new file mode 100644
index 0000000000000..b77bb6e2cb39f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/diff.js
@@ -0,0 +1,774 @@
+/**
+ * Mainly ported from difflib.py, the standard diff library of Python.
+ * This code is distributed under the Python Software Foundation License.
+ * Contributor(s): Sutou Kouhei <kou@clear-code.com> (porting)
+ *                 YUKI "Piro" Hiroshi <yuki@clear-code.com> (encoded diff)
+ * ------------------------------------------------------------------------
+ * Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ * Python Software Foundation.
+ * All rights reserved.
+ *
+ * Copyright (c) 2000 BeOpen.com.
+ * All rights reserved.
+ *
+ * Copyright (c) 1995-2001 Corporation for National Research Initiatives.
+ * All rights reserved.
+ *
+ * Copyright (c) 1991-1995 Stichting Mathematisch Centrum.
+ * All rights reserved.
+ */
+
+export class SequenceMatcher {
+  constructor(from, to, junkPredicate) {
+    this.from = from;
+    this.to = to;
+    this.junkPredicate = junkPredicate;
+    this._updateToIndexes();
+  }
+
+  longestMatch(fromStart, fromEnd, toStart, toEnd) {
+    let bestInfo = this._findBestMatchPosition(fromStart, fromEnd,
+                                               toStart, toEnd);
+    const haveJunk = Object.keys(this.junks).length > 0;
+    if (haveJunk) {
+      const adjust = this._adjustBestInfoWithJunkPredicate;
+      const args = [fromStart, fromEnd, toStart, toEnd];
+
+      bestInfo = adjust.apply(this, [false, bestInfo].concat(args));
+      bestInfo = adjust.apply(this, [true, bestInfo].concat(args));
+    }
+
+    return bestInfo;
+  }
+
+  matches() {
+    if (!this._matches)
+      this._matches = this._computeMatches();
+    return this._matches;
+  }
+
+  blocks() {
+    if (!this._blocks)
+      this._blocks = this._computeBlocks();
+    return this._blocks;
+  }
+
+  operations() {
+    if (!this._operations)
+      this._operations = this._computeOperations();
+    return this._operations;
+  }
+
+  groupedOperations(contextSize) {
+    if (!contextSize)
+      contextSize = 3;
+
+    let operations = this.operations();
+    if (operations.length == 0)
+      operations = [['equal', 0, 0, 0, 0]];
+    operations = this._expandEdgeEqualOperations(operations, contextSize);
+
+    const groupWindow = contextSize * 2;
+    const groups = [];
+    let group = [];
+    for (const operation of operations) {
+      const tag = operation[0];
+      let fromStart = operation[1];
+      const fromEnd = operation[2];
+      let toStart = operation[3];
+      const toEnd = operation[4];
+
+      if (tag == 'equal' && fromEnd - fromStart > groupWindow) {
+        group.push([tag,
+          fromStart,
+          Math.min(fromEnd, fromStart + contextSize),
+          toStart,
+          Math.min(toEnd, toStart + contextSize)]);
+        groups.push(group);
+        group = [];
+        fromStart = Math.max(fromStart, fromEnd - contextSize);
+        toStart = Math.max(toStart, toEnd - contextSize);
+      }
+      group.push([tag, fromStart, fromEnd, toStart, toEnd]);
+    }
+
+    if (group.length > 0)
+      groups.push(group);
+
+    return groups;
+  }
+
+  ratio() {
+    if (!this._ratio)
+      this._ratio = this._computeRatio();
+    return this._ratio;
+  }
+
+  _updateToIndexes() {
+    this.toIndexes = {};
+    this.junks = {};
+
+    for (let i = 0, length = this.to.length; i < length; i++) {
+      const item = this.to[i];
+
+      if (!this.toIndexes[item])
+        this.toIndexes[item] = [];
+      this.toIndexes[item].push(i);
+    }
+
+    if (!this.junkPredicate)
+      return;
+
+    const toIndexesWithoutJunk = {};
+    for (const item in this.toIndexes) {
+      if (this.junkPredicate(item)) {
+        this.junks[item] = true;
+      } else {
+        toIndexesWithoutJunk[item] = this.toIndexes[item];
+      }
+    }
+    this.toIndexes = toIndexesWithoutJunk;
+  }
+
+  _findBestMatchPosition(fromStart, fromEnd, toStart, toEnd) {
+    let bestFrom = fromStart;
+    let bestTo = toStart;
+    let bestSize = 0;
+    let lastSizes = {};
+    let fromIndex;
+
+    for (fromIndex = fromStart; fromIndex <= fromEnd; fromIndex++) {
+      const sizes = {};
+
+      const toIndexes = this.toIndexes[this.from[fromIndex]] || [];
+      for (let i = 0, length = toIndexes.length; i < length; i++) {
+        const toIndex = toIndexes[i];
+
+        if (toIndex < toStart)
+          continue;
+        if (toIndex > toEnd)
+          break;
+
+        const size = sizes[toIndex] = (lastSizes[toIndex - 1] || 0) + 1;
+        if (size > bestSize) {
+          bestFrom = fromIndex - size + 1;
+          bestTo = toIndex - size + 1;
+          bestSize = size;
+        }
+      }
+      lastSizes = sizes;
+    }
+
+    return [bestFrom, bestTo, bestSize];
+  }
+
+  _adjustBestInfoWithJunkPredicate(shouldJunk, bestInfo,
+    fromStart, fromEnd,
+    toStart, toEnd) {
+    let [bestFrom, bestTo, bestSize] = bestInfo;
+
+    while (bestFrom > fromStart &&
+           bestTo > toStart &&
+           (shouldJunk ?
+             this.junks[this.to[bestTo - 1]] :
+             !this.junks[this.to[bestTo - 1]]) &&
+           this.from[bestFrom - 1] == this.to[bestTo - 1]) {
+      bestFrom -= 1;
+      bestTo -= 1;
+      bestSize += 1;
+    }
+
+    while (bestFrom + bestSize < fromEnd &&
+           bestTo + bestSize < toEnd &&
+           (shouldJunk ?
+             this.junks[this.to[bestTo + bestSize]] :
+             !this.junks[this.to[bestTo + bestSize]]) &&
+           this.from[bestFrom + bestSize] == this.to[bestTo + bestSize]) {
+      bestSize += 1;
+    }
+
+    return [bestFrom, bestTo, bestSize];
+  }
+
+  _computeMatches() {
+    const matches = [];
+    const queue = [[0, this.from.length, 0, this.to.length]];
+
+    while (queue.length > 0) {
+      const target = queue.pop();
+      const [fromStart, fromEnd, toStart, toEnd] = target;
+
+      const match = this.longestMatch(fromStart, fromEnd - 1, toStart, toEnd - 1);
+      const matchFromIndex = match[0];
+      const matchToIndex = match[1];
+      const size = match[2];
+      if (size > 0) {
+        if (fromStart < matchFromIndex && toStart < matchToIndex)
+          queue.push([fromStart, matchFromIndex, toStart, matchToIndex]);
+
+        matches.push(match);
+        if (matchFromIndex + size < fromEnd && matchToIndex + size < toEnd)
+          queue.push([matchFromIndex + size, fromEnd,
+            matchToIndex + size, toEnd]);
+      }
+    }
+
+    matches.sort((matchInfo1, matchInfo2) => {
+      const fromIndex1 = matchInfo1[0];
+      const fromIndex2 = matchInfo2[0];
+      return fromIndex1 - fromIndex2;
+    });
+    return matches;
+  }
+
+  _computeBlocks() {
+    const blocks = [];
+    let currentFromIndex = 0;
+    let currentToIndex = 0;
+    let currentSize = 0;
+
+    for (const match of this.matches()) {
+      const [fromIndex, toIndex, size] = match;
+
+      if (currentFromIndex + currentSize == fromIndex &&
+            currentToIndex + currentSize == toIndex) {
+        currentSize += size;
+      } else {
+        if (currentSize > 0)
+          blocks.push([currentFromIndex, currentToIndex, currentSize]);
+        currentFromIndex = fromIndex;
+        currentToIndex = toIndex;
+        currentSize = size;
+      }
+    }
+
+    if (currentSize > 0)
+      blocks.push([currentFromIndex, currentToIndex, currentSize]);
+
+    blocks.push([this.from.length, this.to.length, 0]);
+    return blocks;
+  }
+
+  _computeOperations() {
+    let fromIndex = 0;
+    let toIndex = 0;
+    const operations = [];
+
+    for (const block of this.blocks()) {
+      const [matchFromIndex, matchToIndex, size] = block;
+
+      const tag = this._determineTag(fromIndex, toIndex,
+                                     matchFromIndex, matchToIndex);
+      if (tag != 'equal')
+        operations.push([tag,
+          fromIndex, matchFromIndex,
+          toIndex, matchToIndex]);
+
+      fromIndex = matchFromIndex + size;
+      toIndex = matchToIndex + size;
+
+      if (size > 0)
+        operations.push(['equal',
+          matchFromIndex, fromIndex,
+          matchToIndex, toIndex]);
+    }
+
+    return operations;
+  }
+
+  _determineTag(fromIndex, toIndex,
+    matchFromIndex, matchToIndex) {
+    if (fromIndex < matchFromIndex && toIndex < matchToIndex) {
+      return 'replace';
+    } else if (fromIndex < matchFromIndex) {
+      return 'delete';
+    } else if (toIndex < matchToIndex) {
+      return 'insert';
+    } else {
+      return 'equal';
+    }
+  }
+
+  _expandEdgeEqualOperations(operations, contextSize) {
+    const expandedOperations = [];
+
+    for (let index = 0, length = operations.length; index < length; index++) {
+      const operation = operations[index];
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+
+      if (tag == 'equal' && index == 0) {
+        expandedOperations.push([tag,
+          Math.max(fromStart, fromEnd - contextSize),
+          fromEnd,
+          Math.max(toStart, toEnd - contextSize),
+          toEnd]);
+      } else if (tag == 'equal' && index == length - 1) {
+        expandedOperations.push([tag,
+          fromStart,
+          Math.min(fromEnd, fromStart + contextSize),
+          toStart,
+          Math.min(toEnd, toStart + contextSize),
+          toEnd]);
+      } else {
+        expandedOperations.push(operation);
+      }
+    }
+
+    return expandedOperations;
+  }
+
+  _computeRatio() {
+    const length = this.from.length + this.to.length;
+
+    if (length == 0)
+      return 1.0;
+
+    let matches = 0;
+    for (const block of this.blocks()) {
+      const size = block[2];
+      matches += size;
+    }
+    return 2.0 * matches / length;
+  }
+
+};
+
+
+export class ReadableDiffer {
+  constructor(from, to) {
+    this.from = from;
+    this.to = to;
+  }
+
+  diff() {
+    let lines = [];
+    const matcher = new SequenceMatcher(this.from, this.to);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      let target;
+
+      switch (tag) {
+        case 'replace':
+          target = this._diffLines(fromStart, fromEnd, toStart, toEnd);
+          lines = lines.concat(target);
+          break;
+        case 'delete':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagDeleted(target));
+          break;
+        case 'insert':
+          target = this.to.slice(toStart, toEnd);
+          lines = lines.concat(this._tagInserted(target));
+          break;
+        case 'equal':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagEqual(target));
+          break;
+        default:
+          throw 'unknown tag: ' + tag;
+          break;
+      }
+    }
+
+    return lines;
+  }
+
+  encodedDiff() {
+    let lines = [];
+    const matcher = new SequenceMatcher(this.from, this.to);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      let target;
+
+      switch (tag) {
+        case 'replace':
+          target = this._diffLines(fromStart, fromEnd, toStart, toEnd, true);
+          lines = lines.concat(target);
+          break;
+        case 'delete':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagDeleted(target, true));
+          break;
+        case 'insert':
+          target = this.to.slice(toStart, toEnd);
+          lines = lines.concat(this._tagInserted(target, true));
+          break;
+        case 'equal':
+          target = this.from.slice(fromStart, fromEnd);
+          lines = lines.concat(this._tagEqual(target, true));
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+          break;
+      }
+    }
+
+    const blocks = [];
+    let lastBlock = '';
+    let lastLineType = '';
+    for (const line of lines) {
+      const lineType = line.match(/^<span class="line ([^" ]+)/)[1];
+      if (lineType != lastLineType) {
+        blocks.push(lastBlock + (lastBlock ? '</span>' : '' ));
+        lastBlock = `<span class="block ${lineType}">`;
+        lastLineType = lineType;
+      }
+      lastBlock += line;
+    }
+    if (lastBlock)
+      blocks.push(`${lastBlock}</span>`);
+
+    return blocks.join('');
+  }
+
+  _tagLine(mark, contents) {
+    return contents.map(content => `${mark} ${content}`);
+  }
+
+  _encodedTagLine(encodedClass, contents) {
+    return contents.map(content => `<span class="line ${encodedClass}">${this._escapeForEncoded(content)}</span>`);
+  }
+
+  _escapeForEncoded(string) {
+    return string
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;');
+  }
+
+  _tagDeleted(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('deleted', contents) :
+      this._tagLine('-', contents);
+  }
+
+  _tagInserted(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('inserted', contents) :
+      this._tagLine('+', contents);
+  }
+
+  _tagEqual(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('equal', contents) :
+      this._tagLine(' ', contents);
+  }
+
+  _tagDifference(contents, encoded) {
+    return encoded ?
+      this._encodedTagLine('difference', contents) :
+      this._tagLine('?', contents);
+  }
+
+  _findDiffLineInfo(fromStart, fromEnd, toStart, toEnd) {
+    let bestRatio = 0.74;
+    let fromEqualIndex, toEqualIndex;
+    let fromBestIndex, toBestIndex;
+
+    for (let toIndex = toStart; toIndex < toEnd; toIndex++) {
+      for (let fromIndex = fromStart; fromIndex < fromEnd; fromIndex++) {
+        if (this.from[fromIndex] == this.to[toIndex]) {
+          if (fromEqualIndex === undefined)
+            fromEqualIndex = fromIndex;
+          if (toEqualIndex === undefined)
+            toEqualIndex = toIndex;
+          continue;
+        }
+
+        const matcher = new SequenceMatcher(this.from[fromIndex],
+                                            this.to[toIndex],
+                                            this._isSpaceCharacter);
+        if (matcher.ratio() > bestRatio) {
+          bestRatio = matcher.ratio();
+          fromBestIndex = fromIndex;
+          toBestIndex = toIndex;
+        }
+      }
+    }
+
+    return [bestRatio,
+      fromEqualIndex, toEqualIndex,
+      fromBestIndex, toBestIndex];
+  }
+
+  _diffLines(fromStart, fromEnd, toStart, toEnd, encoded) {
+    const cutOff = 0.75;
+    const info = this._findDiffLineInfo(fromStart, fromEnd, toStart, toEnd);
+    let bestRatio = info[0];
+    const fromEqualIndex = info[1];
+    const toEqualIndex = info[2];
+    let fromBestIndex = info[3];
+    let toBestIndex = info[4];
+
+    if (bestRatio < cutOff) {
+      if (fromEqualIndex === undefined) {
+        const taggedFrom = this._tagDeleted(this.from.slice(fromStart, fromEnd), encoded);
+        const taggedTo = this._tagInserted(this.to.slice(toStart, toEnd), encoded);
+        if (toEnd - toStart < fromEnd - fromStart)
+          return taggedTo.concat(taggedFrom);
+        else
+          return taggedFrom.concat(taggedTo);
+      }
+
+      fromBestIndex = fromEqualIndex;
+      toBestIndex = toEqualIndex;
+      bestRatio = 1.0;
+    }
+
+    return [].concat(
+      this.__diffLines(fromStart, fromBestIndex,
+                       toStart, toBestIndex,
+                       encoded),
+      (encoded ?
+        this._diffLineEncoded(this.from[fromBestIndex],
+                              this.to[toBestIndex]) :
+        this._diffLine(this.from[fromBestIndex],
+                       this.to[toBestIndex])
+      ),
+      this.__diffLines(fromBestIndex + 1, fromEnd,
+                       toBestIndex + 1, toEnd,
+                       encoded)
+    );
+  }
+
+  __diffLines(fromStart, fromEnd, toStart, toEnd, encoded) {
+    if (fromStart < fromEnd) {
+      if (toStart < toEnd) {
+        return this._diffLines(fromStart, fromEnd, toStart, toEnd, encoded);
+      } else {
+        return this._tagDeleted(this.from.slice(fromStart, fromEnd), encoded);
+      }
+    } else {
+      return this._tagInserted(this.to.slice(toStart, toEnd), encoded);
+    }
+  }
+
+  _diffLineEncoded(fromLine, toLine) {
+    const fromChars = fromLine.split('');
+    const toChars = toLine.split('');
+    const matcher = new SequenceMatcher(fromLine, toLine,
+                                        this._isSpaceCharacter);
+    const phrases = [];
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      const fromPhrase = fromChars.slice(fromStart, fromEnd).join('');
+      const toPhrase = toChars.slice(toStart, toEnd).join('');
+      switch (tag) {
+        case 'replace':
+        case 'delete':
+        case 'insert':
+        case 'equal':
+          phrases.push({ tag         : tag,
+            from        : fromPhrase,
+            encodedFrom : this._escapeForEncoded(fromPhrase),
+            to          : toPhrase,
+            encodedTo   : this._escapeForEncoded(toPhrase), });
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+      }
+    }
+
+    const encodedPhrases = [];
+    let current;
+    let replaced = 0;
+    let inserted = 0;
+    let deleted = 0;
+    for (let i = 0, maxi = phrases.length; i < maxi; i++)
+    {
+      current = phrases[i];
+      switch (current.tag) {
+        case 'replace':
+          encodedPhrases.push('<span class="phrase replaced">');
+          encodedPhrases.push(this._encodedTagPhrase('deleted', current.encodedFrom));
+          encodedPhrases.push(this._encodedTagPhrase('inserted', current.encodedTo));
+          encodedPhrases.push('</span>');
+          replaced++;
+          break;
+        case 'delete':
+          encodedPhrases.push(this._encodedTagPhrase('deleted', current.encodedFrom));
+          deleted++;
+          break;
+        case 'insert':
+          encodedPhrases.push(this._encodedTagPhrase('inserted', current.encodedTo));
+          inserted++;
+          break;
+        case 'equal':
+          // \95ฯX\93_\82ฬŠิ‚ษ‹\B2\82�‚๊‚ฝ1\95\B6\8E\9A\82\BE\82\AF\82ฬ–\B3\95ฯX\95\94\95\AA\82\BE\82\AF\82อ“\C1\95สˆ\B5\82\A2
+          if (
+            current.from.length == 1 &&
+                    (i > 0 && phrases[i-1].tag != 'equal') &&
+                    (i < maxi-1 && phrases[i+1].tag != 'equal')
+          ) {
+            encodedPhrases.push('<span class="phrase equal">');
+            encodedPhrases.push(this._encodedTagPhrase('duplicated', current.encodedFrom));
+            encodedPhrases.push(this._encodedTagPhrase('duplicated', current.encodedTo));
+            encodedPhrases.push('</span>');
+          }
+          else {
+            encodedPhrases.push(current.encodedFrom);
+          }
+          break;
+      }
+    }
+
+    const extraClass = (replaced || (deleted && inserted)) ?
+      ' includes-both-modification' :
+      '' ;
+
+    return [
+      `<span class="line replaced${extraClass}">${encodedPhrases.join('')}</span>`
+    ];
+  }
+
+  _encodedTagPhrase(encodedClass, content) {
+    return `<span class="phrase ${encodedClass}">${content}</span>`;
+  }
+
+  _diffLine(fromLine, toLine) {
+    let fromTags = '';
+    let toTags = '';
+    const matcher = new SequenceMatcher(fromLine, toLine,
+                                        this._isSpaceCharacter);
+
+    for (const operation of matcher.operations()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+
+      const fromLength = fromEnd - fromStart;
+      const toLength = toEnd - toStart;
+      switch (tag) {
+        case 'replace':
+          fromTags += this._repeat('^', fromLength);
+          toTags += this._repeat('^', toLength);
+          break;
+        case 'delete':
+          fromTags += this._repeat('-', fromLength);
+          break;
+        case 'insert':
+          toTags += this._repeat('+', toLength);
+          break;
+        case 'equal':
+          fromTags += this._repeat(' ', fromLength);
+          toTags += this._repeat(' ', toLength);
+          break;
+        default:
+          throw new Error(`unknown tag: ${tag}`);
+          break;
+      }
+    }
+
+    return this._formatDiffPoint(fromLine, toLine, fromTags, toTags);
+  }
+
+  _formatDiffPoint(fromLine, toLine, fromTags, toTags) {
+    let common;
+    let result;
+
+    common = Math.min(this._nLeadingCharacters(fromLine, '\t'),
+                      this._nLeadingCharacters(toLine, '\t'));
+    common = Math.min(common,
+                      this._nLeadingCharacters(fromTags.slice(0, common),
+                                               ' '));
+    fromTags = fromTags.slice(common).replace(/\s*$/, '');
+    toTags = toTags.slice(common).replace(/\s*$/, '');
+
+    result = this._tagDeleted([fromLine]);
+    if (fromTags.length > 0) {
+      fromTags = this._repeat('\t', common) + fromTags;
+      result = result.concat(this._tagDifference([fromTags]));
+    }
+    result = result.concat(this._tagInserted([toLine]));
+    if (toTags.length > 0) {
+      toTags = this._repeat('\t', common) + toTags;
+      result = result.concat(this._tagDifference([toTags]));
+    }
+
+    return result;
+  }
+
+  _nLeadingCharacters(string, character) {
+    let n = 0;
+    while (string[n] == character) {
+      n++;
+    }
+    return n;
+  }
+
+  _isSpaceCharacter(character) {
+    return character == ' ' || character == '\t';
+  }
+
+  _repeat(string, n) {
+    let result = '';
+    for (; n > 0; n--) {
+      result += string;
+    }
+    return result;
+  }
+
+};
+
+
+export const Diff = {
+
+  readable(from, to, encoded) {
+    const differ = new ReadableDiffer(this._splitWithLine(from), this._splitWithLine(to));
+    return encoded ?
+      differ.encodedDiff() :
+      differ.diff(encoded).join('\n') ;
+  },
+
+  foldedReadable(from, to, encoded) {
+    const differ = new ReadableDiffer(this._splitWithLine(this._fold(from)),
+                                      this._splitWithLine(this._fold(to)));
+    return encoded ?
+      differ.encodedDiff() :
+      differ.diff(encoded).join('\n') ;
+  },
+
+  isInterested(diff) {
+    if (!diff)
+      return false;
+
+    if (diff.length == 0)
+      return false;
+
+    if (!diff.match(/^[-+]/mg))
+      return false;
+
+    if (diff.match(/^[ ?]/mg))
+      return true;
+
+    if (diff.match(/(?:.*\n){2,}/g))
+      return true;
+
+    if (this.needFold(diff))
+      return true;
+
+    return false;
+  },
+
+  needFold(diff) {
+    if (!diff)
+      return false;
+
+    if (diff.match(/^[-+].{79}/mg))
+      return true;
+
+    return false;
+  },
+
+  _splitWithLine(string) {
+    string = String(string);
+    return string.length == 0 ? [] : string.split(/\r?\n/);
+  },
+
+  _fold(string) {
+    string = String(string);
+    const foldedLines = string.split('\n').map(line => line.replace(/(.{78})/g, '$1\n'));
+    return foldedLines.join('\n');
+  }
+
+};
diff --git a/waterfox/browser/components/sidebar/extlib/dom-updater.js b/waterfox/browser/components/sidebar/extlib/dom-updater.js
new file mode 100644
index 0000000000000..8f9c11d3681c8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/dom-updater.js
@@ -0,0 +1,145 @@
+/*
+ license: The MIT License, Copyright (c) 2020 YUKI "Piro" Hiroshi
+*/
+
+import { SequenceMatcher } from './diff.js';
+
+export const DOMUpdater = {
+  /**
+   * method
+   * @param before {Node}   - the node to be updated, e.g. Element
+   * @param after  {Node}   - the node describing updated state,
+   *                          e.g. DocumentFragment
+   * @return count {number} - the count of appied changes
+   */
+  update(before, after, context) {
+    let topLevel = false;
+    if (!context) {
+      topLevel = true;
+      context = {
+        count:       0,
+        beforeRange: before.ownerDocument.createRange(),
+        afterRange:  after.ownerDocument.createRange()
+      };
+    }
+    const { beforeRange, afterRange } = context;
+
+    if (before.nodeValue !== null ||
+        after.nodeValue !== null) {
+      if (before.nodeValue != after.nodeValue) {
+        //console.log('node value: ', after.nodeValue);
+        before.nodeValue = after.nodeValue;
+        context.count++;
+      }
+      return context.count;
+    }
+
+    const beforeNodes = Array.from(before.childNodes, this._getDiffableNodeString);
+    const afterNodes = Array.from(after.childNodes, this._getDiffableNodeString);
+    const nodeOerations = (new SequenceMatcher(beforeNodes, afterNodes)).operations();
+    // Update from back to front for safety!
+    for (const operation of nodeOerations.reverse()) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      switch (tag) {
+        case 'equal':
+          for (let i = 0, maxi = fromEnd - fromStart; i < maxi; i++) {
+            this.update(
+              before.childNodes[fromStart + i],
+              after.childNodes[toStart + i],
+              context
+            );
+          }
+          break;
+        case 'delete':
+          beforeRange.setStart(before, fromStart);
+          beforeRange.setEnd(before, fromEnd);
+          beforeRange.deleteContents();
+          context.count++;
+          break;
+        case 'insert':
+          beforeRange.setStart(before, fromStart);
+          beforeRange.setEnd(before, fromEnd);
+          afterRange.setStart(after, toStart);
+          afterRange.setEnd(after, toEnd);
+          beforeRange.insertNode(afterRange.cloneContents());
+          context.count++;
+          break;
+        case 'replace':
+          beforeRange.setStart(before, fromStart);
+          beforeRange.setEnd(before, fromEnd);
+          beforeRange.deleteContents();
+          context.count++;
+          afterRange.setStart(after, toStart);
+          afterRange.setEnd(after, toEnd);
+          beforeRange.insertNode(afterRange.cloneContents());
+          context.count++;
+          break;
+      }
+    }
+    if (topLevel) {
+      beforeRange.detach();
+      afterRange.detach();
+    }
+
+    if (before.nodeType == before.ELEMENT_NODE &&
+        after.nodeType == after.ELEMENT_NODE) {
+      const beforeAttrs = Array.from(before.attributes, attr => `${attr.name}:${attr.value}`).  sort();
+      const afterAttrs = Array.from(after.attributes, attr => `${attr.name}:${attr.value}`).  sort();
+      const attrOerations = (new SequenceMatcher(beforeAttrs, afterAttrs)).operations();
+      for (const operation of attrOerations) {
+        const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+        switch (tag) {
+          case 'equal':
+            break;
+          case 'delete':
+            for (let i = fromStart; i < fromEnd; i++) {
+              const name = beforeAttrs[i].split(':')[0];
+              //console.log('delete: delete attr: ', name);
+              before.removeAttribute(name);
+              context.count++;
+            }
+            break;
+          case 'insert':
+            for (let i = toStart; i < toEnd; i++) {
+              const attr = afterAttrs[i].split(':');
+              const name = attr[0];
+              const value = attr.slice(1).join(':');
+              //console.log('insert: set attr: ', name, value);
+              before.setAttribute(name, value);
+              context.count++;
+            }
+            break;
+          case 'replace':
+            const insertedAttrs = new Set();
+            for (let i = toStart; i < toEnd; i++) {
+              const attr = afterAttrs[i].split(':');
+              const name = attr[0];
+              const value = attr.slice(1).join(':');
+              //console.log('replace: set attr: ', name, value);
+              before.setAttribute(name, value);
+              insertedAttrs.add(name);
+              context.count++;
+            }
+            for (let i = fromStart; i < fromEnd; i++) {
+              const name = beforeAttrs[i].split(':')[0];
+              if (insertedAttrs.has(name))
+                continue;
+              //console.log('replace: delete attr: ', name);
+              before.removeAttribute(name);
+              context.count++;
+            }
+            break;
+        }
+      }
+    }
+    return context.count;
+  },
+
+  _getDiffableNodeString(node) {
+    if (node.nodeType == node.ELEMENT_NODE)
+      return `element:${node.tagName}#${node.id}#${node.getAttribute('anonid')}`;
+    else
+      return `node:${node.nodeType}`;
+  }
+
+};
diff --git a/waterfox/browser/components/sidebar/extlib/l10n-classic.js b/waterfox/browser/components/sidebar/extlib/l10n-classic.js
new file mode 100644
index 0000000000000..142cf595ba0e0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/l10n-classic.js
@@ -0,0 +1,57 @@
+/*
+ license: The MIT License, Copyright (c) 2016-2024 YUKI "Piro" Hiroshi
+ original:
+   http://github.com/piroor/webextensions-lib-l10n
+*/
+
+var l10n = {
+  updateString(string) {
+    return string.replace(/__MSG_([-@\.\w]+)__/g, (matched, key) => {
+      return chrome.i18n.getMessage(key) || matched;
+    });
+  },
+
+  $log(message, ...args) {
+    message = `l10s: ${message}`;
+    if (typeof window.log === 'function')
+      log(message, ...args);
+    else
+      console.log(message, ...args);
+  },
+
+  updateSubtree(node) {
+    const texts = document.evaluate(
+      'descendant::text()[contains(self::text(), "__MSG_")]',
+      node,
+      null,
+      XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+      null
+    );
+    for (let i = 0, maxi = texts.snapshotLength; i < maxi; i++) {
+      const text = texts.snapshotItem(i);
+      text.nodeValue = this.updateString(text.nodeValue);
+    }
+
+    const attributes = document.evaluate(
+      'descendant::*/attribute::*[contains(., "__MSG_")]',
+      node,
+      null,
+      XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+      null
+    );
+    for (let i = 0, maxi = attributes.snapshotLength; i < maxi; i++) {
+      const attribute = attributes.snapshotItem(i);
+      this.$log('apply', attribute);
+      attribute.value = this.updateString(attribute.value);
+    }
+  },
+
+  updateDocument() {
+    this.updateSubtree(document);
+  }
+};
+
+document.addEventListener('DOMContentLoaded', () => {
+  l10n.updateDocument();
+}, { once: true });
+window.l10n = l10n;
diff --git a/waterfox/browser/components/sidebar/extlib/l10n.js b/waterfox/browser/components/sidebar/extlib/l10n.js
new file mode 100644
index 0000000000000..f4e90c74402d9
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/l10n.js
@@ -0,0 +1,57 @@
+/*
+ license: The MIT License, Copyright (c) 2016-2024 YUKI "Piro" Hiroshi
+ original:
+   http://github.com/piroor/webextensions-lib-l10n
+*/
+
+var l10n = {
+  updateString(string) {
+    return string.replace(/__MSG_([-@\.\w]+)__/g, (matched, key) => {
+      return chrome.i18n.getMessage(key) || matched;
+    });
+  },
+
+  $log(message, ...args) {
+    message = `l10s: ${message}`;
+    if (typeof window.log === 'function')
+      log(message, ...args);
+    else
+      console.log(message, ...args);
+  },
+
+  updateSubtree(node) {
+    const texts = document.evaluate(
+      'descendant::text()[contains(self::text(), "__MSG_")]',
+      node,
+      null,
+      XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+      null
+    );
+    for (let i = 0, maxi = texts.snapshotLength; i < maxi; i++) {
+      const text = texts.snapshotItem(i);
+      text.nodeValue = this.updateString(text.nodeValue);
+    }
+
+    const attributes = document.evaluate(
+      'descendant::*/attribute::*[contains(., "__MSG_")]',
+      node,
+      null,
+      XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
+      null
+    );
+    for (let i = 0, maxi = attributes.snapshotLength; i < maxi; i++) {
+      const attribute = attributes.snapshotItem(i);
+      this.$log('apply', attribute);
+      attribute.value = this.updateString(attribute.value);
+    }
+  },
+
+  updateDocument() {
+    this.updateSubtree(document);
+  }
+};
+
+document.addEventListener('DOMContentLoaded', () => {
+  l10n.updateDocument();
+}, { once: true });
+export default l10n;
diff --git a/waterfox/browser/components/sidebar/extlib/placeholder-parser.js b/waterfox/browser/components/sidebar/extlib/placeholder-parser.js
new file mode 100644
index 0000000000000..69c4e8e51e212
--- /dev/null
+++ b/waterfox/browser/components/sidebar/extlib/placeholder-parser.js
@@ -0,0 +1,311 @@
+/*
+ license: The MIT License, Copyright (c) 2022 YUKI "Piro" Hiroshi
+*/
+'use strict';
+
+export class PlaceHolderParserError extends Error {
+  constructor(message, originalError) {
+    super(message);
+    this.originalError = originalError;
+  }
+}
+
+export function process(input, processor, processedInput = '', logger = (() => {})) {
+  let output = '';
+
+  let lastToken = '';
+  let inPlaceHolder = false;
+  let inArgsPart = false;
+  let inSingleQuoteString = false;
+  let inDoubleQuoteString = false;
+  let inBackQuoteString = false;
+  let escaped = false;
+
+  let name = '';
+  let args = [];
+  let rawArgs = '';
+
+  for (const character of input) {
+    processedInput += character;
+    //console.log({input, character, lastToken, inPlaceHolder, inSingleQuoteString, inDoubleQuoteString, inArgsPart, escaped, output, name, rawArgs, args});
+
+    if (escaped) {
+      if ((inDoubleQuoteString && character == '"') ||
+          (inSingleQuoteString && character == "'") ||
+          (inBackQuoteString && character == '`')) {
+        if (inArgsPart)
+          rawArgs += '\\';
+      }
+      else if ((inDoubleQuoteString && character != '"') ||
+               (inSingleQuoteString && character != "'") ||
+               (inBackQuoteString && character != '`') ||
+               (!inDoubleQuoteString &&
+                !inSingleQuoteString &&
+                !inBackQuoteString &&
+                inArgsPart &&
+                character != ')')) {
+        if (inArgsPart)
+          rawArgs += '\\';
+        lastToken += '\\';
+      }
+      lastToken += character;
+      if (inArgsPart)
+        rawArgs += character;
+      escaped = false;
+      continue;
+    }
+
+    switch (character) {
+      case '\\':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (!escaped) {
+          escaped = true;
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        lastToken += character;
+        continue;
+
+      case '%':
+        if (!inPlaceHolder) {
+          inPlaceHolder = true;
+          output += lastToken;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (inSingleQuoteString ||
+            inDoubleQuoteString ||
+            inBackQuoteString ||
+            inArgsPart) {
+          lastToken += character;
+          continue;
+        }
+
+        if (!name) {
+          if (lastToken != '')
+            name = lastToken;
+          else
+            throw new PlaceHolderParserError(`Missing placeholder name: ${processedInput}`);
+        }
+
+        inPlaceHolder = false;
+        try {
+          logger('parser: placeholder ', { name, rawArgs, args });
+          output += processor(name, rawArgs, ...args);
+        }
+        catch(error) {
+          throw new PlaceHolderParserError(`Unhandled error: ${error.message}\n${error.stack}`, error);
+        }
+        lastToken = '';
+        name = '';
+        args = [];
+        rawArgs = '';
+        continue;
+
+      case '(':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+        else if (rawArgs != '')
+          rawArgs += ', ';
+
+        if (inSingleQuoteString ||
+            inDoubleQuoteString ||
+            inBackQuoteString ||
+            inArgsPart) {
+          lastToken += character;
+          continue;
+        }
+
+        inArgsPart = true;
+        if (name == '' && lastToken != '')
+          name = lastToken;
+        lastToken = '';
+        continue;
+
+      case ')':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inSingleQuoteString ||
+            inDoubleQuoteString ||
+            inBackQuoteString ||
+            !inArgsPart) {
+          if (inArgsPart)
+            rawArgs += character;
+          lastToken += character;
+          continue;
+        }
+
+        inArgsPart = false;
+        if (rawArgs.trim() != '') {
+          try {
+            args.push(process(lastToken, processor, processedInput));
+          }
+          catch(error) {
+            throw new PlaceHolderParserError(`Unhandled error: ${error.message}\n${error.stack}`, error);
+          }
+        }
+        lastToken = '';
+        continue;
+
+      case ',':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (inSingleQuoteString ||
+            inDoubleQuoteString ||
+            inBackQuoteString ||
+            !inArgsPart) {
+          lastToken += character;
+          continue;
+        }
+
+        try {
+          args.push(process(lastToken, processor, processedInput));
+        }
+        catch(error) {
+          throw new PlaceHolderParserError(`Unhandled error: ${error.message}\n${error.stack}`, error);
+        }
+        lastToken = '';
+        continue;
+
+      case '"':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (inSingleQuoteString ||
+            inBackQuoteString) {
+          lastToken += character;
+          continue;
+        }
+
+        if (inDoubleQuoteString) {
+          inDoubleQuoteString = false;
+          continue;
+        }
+
+        inDoubleQuoteString = true;
+        continue;
+
+      case "'":
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (inDoubleQuoteString ||
+            inBackQuoteString) {
+          lastToken += character;
+          continue;
+        }
+
+        if (inSingleQuoteString) {
+          inSingleQuoteString = false;
+          continue;
+        }
+
+        inSingleQuoteString = true;
+        continue;
+
+      case '`':
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (inDoubleQuoteString ||
+            inSingleQuoteString) {
+          lastToken += character;
+          continue;
+        }
+
+        if (inBackQuoteString) {
+          inBackQuoteString = false;
+          continue;
+        }
+
+        inBackQuoteString = true;
+        continue;
+
+      default:
+        if (!inPlaceHolder) {
+          output += character;
+          lastToken = '';
+          continue;
+        }
+
+        if (inArgsPart)
+          rawArgs += character;
+
+        if (character.trim() == '') { // whitespace
+          if (inSingleQuoteString ||
+              inDoubleQuoteString ||
+              inBackQuoteString ||
+              !inArgsPart) {
+            lastToken += character;
+          }
+        }
+        else {
+          lastToken += character;
+        }
+        continue;
+    }
+  }
+
+  if (inPlaceHolder)
+    throw new PlaceHolderParserError(`Unterminated placeholder: ${processedInput}`);
+
+  if (inArgsPart)
+    throw new PlaceHolderParserError(`Unterminated arguments for the placeholder "${name}": ${processedInput}`);
+
+  if (inSingleQuoteString ||
+      inDoubleQuoteString ||
+      inBackQuoteString)
+    throw new PlaceHolderParserError(`Unterminated string: ${processedInput}`);
+
+  if (escaped)
+    output += '\\';
+
+  return output;
+}
diff --git a/waterfox/browser/components/sidebar/manifest.json b/waterfox/browser/components/sidebar/manifest.json
new file mode 100644
index 0000000000000..76e320874e116
--- /dev/null
+++ b/waterfox/browser/components/sidebar/manifest.json
@@ -0,0 +1,276 @@
+{
+  "manifest_version": 2,
+  "name": "__MSG_extensionName__",
+  "version": "1.1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "sidebar@waterfox.net",
+      "strict_min_version": "139.0"
+    }
+  },
+  "author": "Waterfox",
+  "hidden": true,
+  "description": "__MSG_extensionDescription__",
+  "permissions": [
+    "activeTab",
+    "bookmarks",
+    "clipboardRead",
+    "contextualIdentities",
+    "cookies",
+    "menus",
+    "menus.overrideContext",
+    "notifications",
+    "search",
+    "sessions",
+    "storage",
+    "tabGroups",
+    "tabs",
+    "theme",
+    "<all_urls>"
+  ],
+  "background": {
+    "page": "background/background.html"
+  },
+  "commands": {
+    "reloadTree": {
+      "description": "__MSG_context_reloadTree_command__"
+    },
+    "reloadDescendants": {
+      "description": "__MSG_context_reloadDescendants_command__"
+    },
+    "unblockAutoplayTree": {
+      "description": "__MSG_context_unblockAutoplayTree_command__"
+    },
+    "unblockAutoplayDescendants": {
+      "description": "__MSG_context_unblockAutoplayDescendants_command__"
+    },
+    "toggleMuteTree": {
+      "description": "__MSG_context_toggleMuteTree_command__"
+    },
+    "toggleMuteDescendants": {
+      "description": "__MSG_context_toggleMuteDescendants_command__"
+    },
+    "closeTree": {
+      "description": "__MSG_context_closeTree_command__"
+    },
+    "closeDescendants": {
+      "description": "__MSG_context_closeDescendants_command__"
+    },
+    "closeOthers": {
+      "description": "__MSG_context_closeOthers_command__"
+    },
+    "toggleSticky": {
+      "description": "__MSG_context_toggleSticky_command__"
+    },
+    "collapseTree": {
+      "description": "__MSG_context_collapseTree_command__"
+    },
+    "collapseTreeRecursively": {
+      "description": "__MSG_context_collapseTreeRecursively_command__"
+    },
+    "collapseAll": {
+      "description": "__MSG_context_collapseAll_command__"
+    },
+    "expandTree": {
+      "description": "__MSG_context_expandTree_command__"
+    },
+    "expandTreeRecursively": {
+      "description": "__MSG_context_expandTreeRecursively_command__"
+    },
+    "expandAll": {
+      "description": "__MSG_context_expandAll_command__"
+    },
+    "toggleTreeCollapsed": {
+      "description": "__MSG_command_toggleTreeCollapsed__"
+    },
+    "toggleTreeCollapsedRecursively": {
+      "description": "__MSG_command_toggleTreeCollapsedRecursively__"
+    },
+    "bookmarkTree": {
+      "description": "__MSG_context_bookmarkTree_command__"
+    },
+    "newIndependentTab": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_independent_command__"
+    },
+    "newChildTab": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_child_command__"
+    },
+    "newChildTabTop": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_childTop_command__"
+    },
+    "newChildTabEnd": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_childEnd_command__"
+    },
+    "newSiblingTab": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_sibling_command__"
+    },
+    "newNextSiblingTab": {
+      "description": "__MSG_tabbar_newTabButton_tooltip__: __MSG_tabbar_newTabAction_nextSibling_command__"
+    },
+    "newContainerTab": {
+      "description": "__MSG_tabbar_newTabWithContexualIdentity_tooltip__"
+    },
+    "tabMoveUp": {
+      "description": "__MSG_command_tabMoveUp__"
+    },
+    "treeMoveUp": {
+      "description": "__MSG_command_treeMoveUp__"
+    },
+    "tabMoveDown": {
+      "description": "__MSG_command_tabMoveDown__"
+    },
+    "treeMoveDown": {
+      "description": "__MSG_command_treeMoveDown__"
+    },
+    "focusPrevious": {
+      "description": "__MSG_command_focusPrevious__"
+    },
+    "focusPreviousSilently": {
+      "description": "__MSG_command_focusPreviousSilently__"
+    },
+    "focusNext": {
+      "description": "__MSG_command_focusNext__"
+    },
+    "focusNextSilently": {
+      "description": "__MSG_command_focusNextSilently__"
+    },
+    "focusParent": {
+      "description": "__MSG_command_focusParent__"
+    },
+    "focusParentOrCollapse": {
+      "description": "__MSG_command_focusParentOrCollapse__"
+    },
+    "focusFirstChild": {
+      "description": "__MSG_command_focusFirstChild__"
+    },
+    "focusFirstChildOrExpand": {
+      "description": "__MSG_command_focusFirstChildOrExpand__"
+    },
+    "focusLastChild": {
+      "description": "__MSG_command_focusLastChild__"
+    },
+    "focusPreviousSibling": {
+      "description": "__MSG_command_focusPreviousSibling__"
+    },
+    "focusNextSibling": {
+      "description": "__MSG_command_focusNextSibling__"
+    },
+    "simulateUpOnTree": {
+      "description": "__MSG_command_simulateUpOnTree__",
+      "suggested_key": {
+        "default": "Alt+Shift+Up",
+        "mac":     "MacCtrl+Shift+Up"
+      }
+    },
+    "simulateDownOnTree": {
+      "description": "__MSG_command_simulateDownOnTree__",
+      "suggested_key": {
+        "default": "Alt+Shift+Down",
+        "mac":     "MacCtrl+Shift+Down"
+      }
+    },
+    "simulateLeftOnTree": {
+      "description": "__MSG_command_simulateLeftOnTree__",
+      "suggested_key": {
+        "default": "Alt+Shift+Left",
+        "mac":     "MacCtrl+Shift+Left"
+      }
+    },
+    "simulateRightOnTree": {
+      "description": "__MSG_command_simulateRightOnTree__",
+      "suggested_key": {
+        "default": "Alt+Shift+Right",
+        "mac":     "MacCtrl+Shift+Right"
+      }
+    },
+    "tabbarUp": {
+      "description": "__MSG_command_tabbarUp__",
+      "suggested_key": {
+        "default": "Alt+Up"
+      }
+    },
+    "tabbarPageUp": {
+      "description": "__MSG_command_tabbarPageUp__",
+      "suggested_key": {
+        "default": "Alt+PageUp"
+      }
+    },
+    "tabbarHome": {
+      "description": "__MSG_command_tabbarHome__",
+      "suggested_key": {
+        "default": "Alt+Shift+Home"
+      }
+    },
+    "tabbarDown": {
+      "description": "__MSG_command_tabbarDown__",
+      "suggested_key": {
+        "default": "Alt+Down"
+      }
+    },
+    "tabbarPageDown": {
+      "description": "__MSG_command_tabbarPageDown__",
+      "suggested_key": {
+        "default": "Alt+PageDown"
+      }
+    },
+    "tabbarEnd": {
+      "description": "__MSG_command_tabbarEnd__",
+      "suggested_key": {
+        "default": "Alt+End"
+      }
+    },
+    "toggleSubPanel": {
+      "description": "__MSG_command_toggleSubPanel__",
+      "suggested_key": {
+        "default": "F2"
+      }
+    },
+    "switchSubPanel": {
+      "description": "__MSG_command_switchSubPanel__"
+    },
+    "increaseSubPanel": {
+      "description": "__MSG_command_increaseSubPanel__"
+    },
+    "decreaseSubPanel": {
+      "description": "__MSG_command_decreaseSubPanel__"
+    }
+  },
+  "web_accessible_resources": [
+    "/resources/blank.html",
+    "/resources/group-tab.html*",
+    "/resources/icons/*",
+    "/sidebar/styles/icons/*"
+  ],
+  "protocol_handlers": [
+    { "protocol":    "ext+ws",
+      "name":        "Waterfox",
+      "uriTemplate": "/resources/protocol-handler.html?%s" }
+  ],
+  "experiment_apis": {
+    "prefs": {
+      "schema": "experiments/prefs.json",
+      "parent": {
+        "scopes": ["addon_parent"],
+        "paths": [["prefs"]],
+        "script": "experiments/prefs.js"
+      }
+    },
+    "syncPrefs": {
+      "schema": "experiments/syncPrefs.json",
+      "child": {
+        "scopes": ["addon_child"],
+        "paths": [["syncPrefs"]],
+        "script": "experiments/syncPrefs.js"
+      }
+    },
+    "waterfoxBridge": {
+      "schema": "experiments/waterfoxBridge.json",
+      "parent": {
+        "scopes": ["addon_parent"],
+        "paths": [["waterfoxBridge"]],
+        "script": "experiments/waterfoxBridge.js"
+      }
+    }
+  },
+  "default_locale": "en"
+}
diff --git a/waterfox/browser/components/sidebar/moz.build b/waterfox/browser/components/sidebar/moz.build
new file mode 100644
index 0000000000000..9a9c62662524f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["addon-jar.mn"]
+
+EXTRA_JS_MODULES += [
+    "SidebarPreferencesHandler.sys.mjs",
+]
diff --git a/waterfox/browser/components/sidebar/options/as-child.png b/waterfox/browser/components/sidebar/options/as-child.png
new file mode 100644
index 0000000000000..81cfd7bf58011
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/as-child.png differ
diff --git a/waterfox/browser/components/sidebar/options/as-independent.png b/waterfox/browser/components/sidebar/options/as-independent.png
new file mode 100644
index 0000000000000..a00d814e0ce10
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/as-independent.png differ
diff --git a/waterfox/browser/components/sidebar/options/as-next-sibling.png b/waterfox/browser/components/sidebar/options/as-next-sibling.png
new file mode 100644
index 0000000000000..59977d8a66bc9
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/as-next-sibling.png differ
diff --git a/waterfox/browser/components/sidebar/options/as-sibling.png b/waterfox/browser/components/sidebar/options/as-sibling.png
new file mode 100644
index 0000000000000..e0a92ab44fd3b
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/as-sibling.png differ
diff --git a/waterfox/browser/components/sidebar/options/init-ws.js b/waterfox/browser/components/sidebar/options/init-ws.js
new file mode 100644
index 0000000000000..eb5a4887fc0fa
--- /dev/null
+++ b/waterfox/browser/components/sidebar/options/init-ws.js
@@ -0,0 +1,10 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import './init.js';
+
+import '/common/sync-provider.js';
diff --git a/waterfox/browser/components/sidebar/options/init.js b/waterfox/browser/components/sidebar/options/init.js
new file mode 100644
index 0000000000000..ee6e19a8ff43b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/options/init.js
@@ -0,0 +1,1075 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import Options from '/extlib/Options.js';
+import '/extlib/l10n.js';
+import RichConfirm from '/extlib/RichConfirm.js';
+
+import {
+  DEVICE_SPECIFIC_CONFIG_KEYS,
+  log,
+  wait,
+  configs,
+  sanitizeForHTMLText,
+  loadUserStyleRules,
+  saveUserStyleRules,
+  sanitizeAccesskeyMark,
+  isRTL,
+} from '/common/common.js';
+
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as BrowserTheme from '/common/browser-theme.js';
+import * as TSTAPI from '/common/tst-api.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Sync from '/common/sync.js';
+
+// Waterfox Tabs Sidebar specific
+import '/common/sync-provider.js';
+
+log.context = 'Options';
+
+const options = new Options(configs, {
+  steps: {
+    faviconizedTabScale: '0.01'
+  },
+  onImporting(values) {
+    for (const key of DEVICE_SPECIFIC_CONFIG_KEYS) {
+      if (JSON.stringify(configs[key]) != JSON.stringify(configs.$default[key]))
+        values[key] = configs[key];
+      else
+        delete values[key];
+    }
+    return values;
+  },
+  onExporting(values) {
+    for (const key of DEVICE_SPECIFIC_CONFIG_KEYS) {
+      delete values[key];
+    }
+    return values;
+  },
+});
+
+document.title = browser.i18n.getMessage('config_title');
+if ((location.hash &&
+     /^#!?$/.test(location.hash)) ||
+    /independent=true/.test(location.search))
+  document.body.classList.add('independent');
+
+document.documentElement.classList.toggle('rtl', isRTL());
+
+const CODEMIRROR_THEMES = `
+3024-day
+3024-night
+abcdef
+ambiance-mobile
+ambiance
+ayu-dark
+ayu-mirage
+base16-dark
+base16-light
+bespin
+blackboard
+cobalt
+colorforth
+darcula
+dracula
+duotone-dark
+duotone-light
+eclipse
+elegant
+erlang-dark
+gruvbox-dark
+hopscotch
+icecoder
+idea
+isotope
+lesser-dark
+liquibyte
+lucario
+material-darker
+material-ocean
+material-palenight
+material
+mbo
+mdn-like
+midnight
+monokai
+moxer
+neat
+neo
+night
+nord
+oceanic-next
+panda-syntax
+paraiso-dark
+paraiso-light
+pastel-on-dark
+railscasts
+rubyblue
+seti
+shadowfox
+solarized
+ssms
+the-matrix
+tomorrow-night-bright
+tomorrow-night-eighties
+ttcn
+twilight
+vibrant-ink
+xq-dark
+xq-light
+yeti
+yonce
+zenburn
+`.trim().split(/\s+/);
+{
+  document.querySelector('#userStyleRulesFieldTheme').insertAdjacentHTML(
+    'beforeend',
+    CODEMIRROR_THEMES.map(theme => `
+      <option value=${JSON.stringify(sanitizeForHTMLText(theme))}>${sanitizeForHTMLText(theme)}</option>
+    `.trim()).join('')
+  );
+}
+
+const mUserStyleRulesField = document.getElementById('userStyleRulesField');
+let mUserStyleRulesFieldEditor;
+
+const mDarkModeMedia = window.matchMedia('(prefers-color-scheme: dark)');
+
+let mShowExpertOptionsTemporarily = false;
+
+function onConfigChanged(key) {
+  const value = configs[key];
+  switch (key) {
+    case 'successorTabControlLevel': {
+      const checkbox = document.getElementById('simulateSelectOwnerOnClose');
+      const label = checkbox.parentNode;
+      if (value == Constants.kSUCCESSOR_TAB_CONTROL_NEVER) {
+        checkbox.setAttribute('disabled', true);
+        label.setAttribute('disabled', true);
+      }
+      else {
+        checkbox.removeAttribute('disabled');
+        label.removeAttribute('disabled');
+      }
+    }; break;
+
+    case 'parentTabOperationBehaviorMode': {
+      const nodes = document.querySelectorAll('#parentTabOperationBehaviorModeGroup > ul > li > :not(label)');
+      for (const node of nodes) {
+        node.style.display = node.parentNode.querySelector('input[type="radio"]').checked ? '' : 'none';
+        const chosen = node.querySelector(`[type="radio"][data-config-key="closeParentBehavior"][value="${configs.closeParentBehavior}"]`);
+        if (chosen) {
+          chosen.checked = true;
+          continue;
+        }
+        const chooser = node.querySelector('[data-config-key="closeParentBehavior"]');
+        if (chooser)
+          chooser.value = configs.closeParentBehavior;
+      }
+    }; break;
+
+    case 'autoAttachOnAnyOtherTrigger': {
+      const nodes = document.querySelectorAll('.sub.autoAttachOnAnyOtherTrigger label, .sub.autoAttachOnAnyOtherTrigger select');
+      const disabled = configs.autoAttachOnAnyOtherTrigger == Constants.kNEWTAB_DO_NOTHING;
+      for (const node of nodes) {
+        if ('disabled' in node)
+          node.disabled = disabled;
+        else
+          node.setAttribute('disabled', disabled);
+      }
+    }; break;
+
+    case 'showExpertOptions': {
+      if (mShowExpertOptionsTemporarily && !configs.showExpertOptions)
+        document.querySelector('#showExpertOptions').checked = true;
+      const show = mShowExpertOptionsTemporarily || configs.showExpertOptions;
+      document.documentElement.classList.toggle('show-expert-options', show);
+      for (const item of document.querySelectorAll('#parentTabOperationBehaviorModeGroup li li')) {
+        const radio = item.querySelector('input[type="radio"]');
+        if (show || radio.checked) {
+          item.style.display =  '';
+          radio.style.display = show || radio.checked ? '' : 'none';
+        }
+        else {
+          item.style.display = radio.style.display = 'none';
+        }
+      }
+      if (mShowExpertOptionsTemporarily && !configs.showExpertOptions)
+        mShowExpertOptionsTemporarily = false;
+    }; break;
+
+    case 'syncDeviceInfo': {
+      const name = (configs.syncDeviceInfo || {}).name || '';
+      const nameField = document.querySelector('#syncDeviceInfoName');
+      if (name != nameField.value)
+        nameField.value = name;
+      const icon = (configs.syncDeviceInfo || {}).icon || '';
+      const iconRadio = document.querySelector(`#syncDeviceInfoIcon input[type="radio"][value=${JSON.stringify(sanitizeForHTMLText(icon))}]`);
+      if (iconRadio && !iconRadio.checked)
+        iconRadio.checked = true;
+    }; break;
+
+    case 'syncDevices':
+      initOtherDevices();
+      break;
+
+    case 'userStyleRulesFieldTheme':
+      applyUserStyleRulesFieldTheme();
+      break;
+
+    case 'userStyleRulesFieldHeight':
+      mUserStyleRulesField.style.height = configs.userStyleRulesFieldHeight;
+      break;
+
+    default:
+      if (key.startsWith('chunkedUserStyleRules') &&
+          !mUserStyleRulesField.$saving)
+        mUserStyleRulesFieldEditor.setValue(loadUserStyleRules());
+      break;
+  }
+}
+
+function removeAccesskeyMark(node) {
+  if (!node.nodeValue)
+    return;
+  node.nodeValue = sanitizeAccesskeyMark(node.nodeValue);
+}
+
+function onChangeParentCheckbox(event) {
+  const container = event.currentTarget.closest('fieldset');
+  for (const checkbox of container.querySelectorAll('p input[type="checkbox"]')) {
+    checkbox.checked = event.currentTarget.checked;
+  }
+  saveLogForConfig();
+}
+
+function onChangeChildCheckbox(event) {
+  getParentCheckboxFromChild(event.currentTarget).checked = isAllChildrenChecked(event.currentTarget);
+  saveLogForConfig();
+}
+
+function getParentCheckboxFromChild(child) {
+  const container = child.closest('fieldset');
+  return container.querySelector('legend input[type="checkbox"]');
+}
+
+async function onChangeBookmarkPermissionRequiredCheckboxState(event) {
+  const permissionCheckbox = document.getElementById('bookmarksPermissionGranted');
+  if (permissionCheckbox.checked)
+    return;
+
+  permissionCheckbox.checked = true;
+  permissionCheckbox.requestPermissions();
+
+  const checkbox = event.currentTarget;
+  const key = checkbox.name || checkbox.id || checkbox.dataset.configKey;
+  setTimeout(() => {
+    checkbox.checked = true;
+    setTimeout(() => {
+      configs[key] = true;
+    }, 300); // 250 msec is the minimum delay of throttle update
+  }, 100);
+}
+
+function updateCtrlTabSubItems(enabled) {
+  const elements = document.querySelectorAll('#ctrlTabSubItemsContainer label, #ctrlTabSubItemsContainer input, #ctrlTabSubItemsContainer select');
+  if (enabled) {
+    for (const element of elements) {
+      element.removeAttribute('disabled');
+    }
+  }
+  else {
+    for (const element of elements) {
+      element.setAttribute('disabled', true);
+    }
+  }
+}
+
+
+function reserveToSaveUserStyleRules() {
+  if (reserveToSaveUserStyleRules.timer)
+    clearTimeout(reserveToSaveUserStyleRules.timer);
+  reserveToSaveUserStyleRules.timer = setTimeout(() => {
+    reserveToSaveUserStyleRules.timer = null;
+    const caution = document.querySelector('#tooLargeUserStyleRulesCaution');
+    mUserStyleRulesField.$saving = true;
+    if (reserveToSaveUserStyleRules.clearFlagTimer)
+      clearTimeout(reserveToSaveUserStyleRules.clearFlagTimer);
+    try {
+      saveUserStyleRules(mUserStyleRulesFieldEditor.getValue());
+      mUserStyleRulesField.classList.remove('invalid');
+      caution.classList.remove('invalid');
+    }
+    catch(_error) {
+      mUserStyleRulesField.classList.add('invalid');
+      caution.classList.add('invalid');
+    }
+    finally {
+      reserveToSaveUserStyleRules.clearFlagTimer = setTimeout(() => {
+        delete reserveToSaveUserStyleRules.clearFlagTimer;
+        mUserStyleRulesField.$saving = false;
+      }, 1000);
+    }
+  }, 250);
+}
+reserveToSaveUserStyleRules.timer = null;
+
+function getUserStyleRulesFieldTheme() {
+  if (configs.userStyleRulesFieldTheme != 'auto')
+    return configs.userStyleRulesFieldTheme;
+
+  return mDarkModeMedia.matches ? 'bespin' : 'default';
+}
+
+function applyUserStyleRulesFieldTheme() {
+  const theme = getUserStyleRulesFieldTheme();
+  if (theme != 'default' &&
+      !document.querySelector(`link[href$="/extlib/codemirror-theme/${theme}.css"]`)) {
+    document.querySelector('head').insertAdjacentHTML('beforeend', `
+      <link rel="stylesheet"
+            type="text/css"
+            href="/extlib/codemirror-theme/${theme}.css"/>
+    `.trim());
+  }
+  mUserStyleRulesFieldEditor.setOption('theme', theme);
+}
+
+
+function saveLogForConfig() {
+  const config = {};
+  for (const checkbox of document.querySelectorAll('p input[type="checkbox"][id^="logFor-"]')) {
+    config[checkbox.id.replace(/^logFor-/, '')] = checkbox.checked;
+  }
+  configs.logFor = config;
+}
+
+function isAllChildrenChecked(aMasger) {
+  const container = aMasger.closest('fieldset');
+  const checkboxes = container.querySelectorAll('p input[type="checkbox"]');
+  return Array.from(checkboxes).every(checkbox => checkbox.checked);
+}
+
+async function updateBookmarksUI(enabled) {
+  const elements = document.querySelectorAll('.with-bookmarks-permission, .with-bookmarks-permission label, .with-bookmarks-permission input, .with-bookmarks-permission button');
+  if (enabled) {
+    for (const element of elements) {
+      element.removeAttribute('disabled');
+    }
+    const defaultParentFolder = (
+      (await Bookmark.getItemById(configs.defaultBookmarkParentId)) ||
+      (await Bookmark.getItemById(configs.$default.defaultBookmarkParentId))
+    );
+    document.querySelector('#defaultBookmarkParentChooserStyle').textContent = Bookmark.FOLDER_CHOOSER_STYLE;
+    Bookmark.initFolderChooser({
+      defaultValue: defaultParentFolder.id,
+      rootItems: (await browser.bookmarks.getTree().catch(ApiTabs.createErrorHandler()))[0].children,
+      container: document.querySelector('#defaultBookmarkParentGroup'),
+      inline: true,
+    });
+  }
+  else {
+    for (const element of elements) {
+      element.setAttribute('disabled', true);
+    }
+  }
+
+  const triboolChecks = document.querySelectorAll('input[type="checkbox"].require-bookmarks-permission, .require-bookmarks-permission input[type="checkbox"]');
+  if (enabled) {
+    for (const checkbox of triboolChecks) {
+      checkbox.classList.remove('missing-permission');
+      const message = checkbox.dataset.requestPermissionMessage;
+      if (message && checkbox.parentNode.getAttribute('title') == message)
+        checkbox.parentNode.removeAttribute('title');
+    }
+  }
+  else {
+    for (const checkbox of triboolChecks) {
+      checkbox.classList.add('missing-permission');
+      const message = checkbox.dataset.requestPermissionMessage;
+      if (message)
+        checkbox.parentNode.setAttribute('title', message);
+    }
+  }
+}
+
+async function initOtherDevices() {
+  const devices = await Sync.getOtherDevices();
+  const container = document.querySelector('#otherDevices');
+  const range = document.createRange();
+  range.selectNodeContents(container);
+  range.deleteContents();
+  range.detach();
+  for (const device of devices) {
+    const icon = device.icon ? `<img src="/resources/icons/${sanitizeForHTMLText(device.icon)}.svg">` : '';
+    container.insertAdjacentHTML('beforeend', `
+      <li id="otherDevice:${sanitizeForHTMLText(String(device.id))}"
+         ><label>${icon}${sanitizeForHTMLText(String(device.name))}
+                 <button title=${JSON.stringify(sanitizeForHTMLText(browser.i18n.getMessage('config_removeDeviceButton_label')))}
+                        >${sanitizeForHTMLText(browser.i18n.getMessage('config_removeDeviceButton_label'))}</button></label></li>
+    `.trim());
+  }
+}
+
+function removeOtherDevice(id) {
+  const devices = JSON.parse(JSON.stringify(configs.syncDevices));
+  if (!(id in devices))
+    return;
+  delete devices[id];
+  configs.syncDevices = devices;
+}
+
+
+async function showLogs() {
+  browser.tabs.create({
+    url: '/resources/logs.html'
+  });
+}
+
+function initUserStyleImportExportButtons() {
+  const exportButton = document.getElementById('userStyleRules-export');
+  exportButton.addEventListener('keydown', event => {
+    if (event.key == 'Enter' || event.key == ' ')
+      exportUserStyleToFile();
+  });
+  exportButton.addEventListener('click', event => {
+    if (event.button == 0)
+      exportUserStyleToFile();
+  });
+
+  const importButton = document.getElementById('userStyleRules-import');
+  importButton.addEventListener('keydown', event => {
+    if (event.key == 'Enter' || event.key == ' ')
+      document.getElementById('userStyleRules-import-file').click();
+  });
+  importButton.addEventListener('click', event => {
+    if (event.button == 0)
+      document.getElementById('userStyleRules-import-file').click();
+  });
+
+  const fileField = document.getElementById('userStyleRules-import-file');
+  fileField.addEventListener('change', async _event => {
+    importFilesToUserStyleRulesField(fileField.files);
+  });
+}
+
+function exportUserStyleToFile() {
+  const styleRules = mUserStyleRulesFieldEditor.getValue();
+  const link = document.getElementById('userStyleRules-export-file');
+  link.href = URL.createObjectURL(new Blob([styleRules], { type: 'text/css' }));
+  link.click();
+}
+
+// Due to https://bugzilla.mozilla.org/show_bug.cgi?id=1408756 we cannot accept dropped files on an embedded options page...
+function initFileDragAndDropHandlers() {
+  mUserStyleRulesField.addEventListener('dragenter', event => {
+    event.stopPropagation();
+    event.preventDefault();
+  }, { capture: true });
+
+  mUserStyleRulesField.addEventListener('dragover', event => {
+    event.stopPropagation();
+    event.preventDefault();
+
+    const dt = event.dataTransfer;
+    const hasFile = Array.from(dt.items, item => item.kind).some(kind => kind == 'file');
+    dt.dropEffect = hasFile ? 'link' : 'none';
+  }, { capture: true });
+
+  mUserStyleRulesField.addEventListener('drop', event => {
+    event.stopPropagation();
+    event.preventDefault();
+
+    const dt = event.dataTransfer;
+    const files = dt.files;
+    if (files && files.length > 0)
+      importFilesToUserStyleRulesField(files);
+  }, { capture: true });
+}
+
+async function importFilesToUserStyleRulesField(files) {
+  files = Array.from(files);
+  if (files.some(file => file.type.startsWith('image/'))) {
+    const contents = await Promise.all(Array.from(files, file => {
+      switch (file.type) {
+        case 'text/plain':
+        case 'text/css':
+          return file.text();
+
+        default:
+          return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.addEventListener('load', () => {
+              resolve(`url(${JSON.stringify(reader.result)})`);
+            });
+            reader.addEventListener('error', event => {
+              reject(event);
+            });
+            reader.readAsDataURL(file);
+          });
+      }
+    }));
+    mUserStyleRulesFieldEditor.replaceSelection(contents.join('\n'), true);
+  }
+  else {
+    const style = (await Promise.all(files.map(file => file.text()))).join('\n');
+    const current = mUserStyleRulesFieldEditor.getValue().trim();
+    if (current == '') {
+      mUserStyleRulesFieldEditor.setValue(style);
+      return;
+    }
+    let result;
+    try {
+      result = await RichConfirm.showInPopup({
+        modal:   true,
+        type:    'common-dialog',
+        url:     ((await Permissions.isGranted(Permissions.ALL_URLS)) ? null : '/resources/blank.html'),
+        title:   browser.i18n.getMessage('config_userStyleRules_overwrite_title'),
+        message: browser.i18n.getMessage('config_userStyleRules_overwrite_message'),
+        buttons: [
+          browser.i18n.getMessage('config_userStyleRules_overwrite_overwrite'),
+          browser.i18n.getMessage('config_userStyleRules_overwrite_append')
+        ]
+      });
+    }
+    catch(_error) {
+      result = { buttonIndex: -1 };
+    }
+    switch (result.buttonIndex) {
+      case 0:
+        mUserStyleRulesFieldEditor.setValue(style);
+        break;
+      case 1:
+        mUserStyleRulesFieldEditor.setValue(`${current}\n${style}`);
+        break;
+      default:
+        break;
+    }
+  }
+  mUserStyleRulesField.focus();
+}
+
+function updateThemeInformation(theme) {
+  const rules = BrowserTheme.generateThemeRules(theme)
+    .replace(/--theme-[^:]*-[0-9]+:[^;]*;\s*/g, '') /* hide alpha variations */
+    .replace(/(#(?:[0-9a-f]{3,8})|(?:rgb|hsl)a?\([^\)]+\))/gi, `$1<span style="
+      background-color: $1;
+      border-radius:    0.2em;
+      box-shadow:       1px 1px 1.5px black;
+      display:          inline-block;
+      height:           1em;
+      width:            1em;
+    ">\u200b</span>`);
+  const container = document.getElementById('browserThemeCustomRules');
+  const range = document.createRange();
+  range.selectNodeContents(container);
+  range.deleteContents();
+  range.detach();
+  container.insertAdjacentHTML('beforeend', rules);
+  document.getElementById('browserThemeCustomRulesBlock').style.display = rules ? 'block' : 'none';
+}
+
+function autoDetectDuplicatedTabDetectionDelay() {
+  browser.runtime.sendMessage({ type: Constants.kCOMMAND_AUTODETECT_DUPLICATED_TAB_DETECTION_DELAY });
+}
+
+async function testDuplicatedTabDetection() {
+  const successRate = await browser.runtime.sendMessage({ type: Constants.kCOMMAND_TEST_DUPLICATED_TAB_DETECTION });
+  document.querySelector('#delayForDuplicatedTabDetection_testResult').textContent = browser.i18n.getMessage('config_delayForDuplicatedTabDetection_test_resultMessage', [successRate * 100]);
+}
+
+
+configs.$addObserver(onConfigChanged);
+window.addEventListener('DOMContentLoaded', async () => {
+  try {
+    document.documentElement.classList.toggle('successor-tab-support', typeof browser.tabs.moveInSuccession == 'function');
+    document.documentElement.classList.toggle('expose-unblock-autoplay-features', configs.exposeUnblockAutoplayFeatures);
+
+    initAccesskeys();
+    initLogsButton();
+    initDuplicatedTabDetection();
+    initLinks();
+    initTheme();
+  }
+  catch(error) {
+    console.error(error);
+  }
+
+  await configs.$loaded;
+
+  let focusedItem;
+  try {
+    focusedItem = initFocusedItem();
+    initCollapsibleSections({ focusedItem });
+    initPermissionOptions();
+    initLogCheckboxes();
+    initPreviews();
+    initExternalAddons();
+    initSync();
+  }
+  catch(error) {
+    console.error(error);
+  }
+
+  mShowExpertOptionsTemporarily = !!(
+    location.hash &&
+    !/^#!?$/.test(location.hash) &&
+    document.querySelector(`.expert #${location.hash.replace(/^#!?/, '')}, .expert#${location.hash.replace(/^#!?/, '')}`)
+  );
+
+  try {
+    options.buildUIForAllConfigs(document.querySelector('#group-allConfigs'));
+    onConfigChanged('successorTabControlLevel');
+    onConfigChanged('showExpertOptions');
+    await wait(0);
+    onConfigChanged('parentTabOperationBehaviorMode');
+    onConfigChanged('autoAttachOnAnyOtherTrigger');
+    onConfigChanged('syncDeviceInfo');
+
+    if (focusedItem)
+      focusedItem.scrollIntoView({ block: 'start' });
+  }
+  catch(error) {
+    console.error(error);
+  }
+
+  document.documentElement.classList.add('initialized');
+}, { once: true });
+
+function initAccesskeys() {
+  for (const label of document.querySelectorAll('.contextConfigs label')) {
+    for (const child of label.childNodes) {
+      if (child.nodeType == Node.TEXT_NODE)
+        removeAccesskeyMark(child);
+    }
+  }
+}
+
+function initLogsButton() {
+  const showLogsButton = document.getElementById('showLogsButton');
+  showLogsButton.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    showLogs();
+  });
+  showLogsButton.addEventListener('keydown', event => {
+    if (event.key != 'Enter')
+      return;
+    showLogs();
+  });
+}
+
+function initDuplicatedTabDetection() {
+  const autoDetectDuplicatedTabDetectionDelayButton = document.getElementById('delayForDuplicatedTabDetection_autoDetectButton');
+  autoDetectDuplicatedTabDetectionDelayButton.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    autoDetectDuplicatedTabDetectionDelay();
+  });
+  autoDetectDuplicatedTabDetectionDelayButton.addEventListener('keydown', event => {
+    if (event.key != 'Enter')
+      return;
+    autoDetectDuplicatedTabDetectionDelay();
+  });
+
+  const testDuplicatedTabDetectionButton = document.getElementById('delayForDuplicatedTabDetection_testButton');
+  testDuplicatedTabDetectionButton.addEventListener('click', event => {
+    if (event.button != 0)
+      return;
+    testDuplicatedTabDetection();
+  });
+  testDuplicatedTabDetectionButton.addEventListener('keydown', event => {
+    if (event.key != 'Enter')
+      return;
+    testDuplicatedTabDetection();
+  });
+}
+
+function initLinks() {
+  document.getElementById('link-optionsPage-top').setAttribute('href', `${location.href.split('#')[0]}#!`);
+  document.getElementById('link-optionsPage').setAttribute('href', `${location.href.split('#')[0]}#!`);
+  document.getElementById('link-startupPage').setAttribute('href', Constants.kSHORTHAND_URIS.startup);
+  document.getElementById('link-groupPage').setAttribute('href', Constants.kSHORTHAND_URIS.group);
+  document.getElementById('link-tabbarPage').setAttribute('href', Constants.kSHORTHAND_URIS.tabbar);
+  const runTestLink = document.getElementById('link-runTests');
+  const runTestParameters = document.getElementById('runTestsParameters');
+  runTestLink.setAttribute('href', '#');
+  runTestLink.addEventListener('mousedown', _event => {
+    runTestLink.href = `${Constants.kSHORTHAND_URIS.testRunner}?${runTestParameters.value || ''}`;
+  }, true);
+  runTestLink.addEventListener('keydown', _event => {
+    runTestLink.href = `${Constants.kSHORTHAND_URIS.testRunner}?${runTestParameters.value || ''}`;
+  }, true);
+  runTestParameters.addEventListener('keydown', event => {
+    if (event.key != 'Enter')
+      return;
+    browser.tabs.create({
+      url: `${Constants.kSHORTHAND_URIS.testRunner}?${runTestParameters.value || ''}`,
+    });
+  });
+  document.getElementById('link-runBenchmark').setAttribute('href', `${Constants.kSHORTHAND_URIS.testRunner}?benchmark=true`);
+}
+
+function initTheme() {
+  if (browser.theme?.getCurrent) {
+    browser.theme.getCurrent().then(updateThemeInformation);
+    browser.theme.onUpdated.addListener(updateInfo => updateThemeInformation(updateInfo.theme));
+  }
+}
+
+function initFocusedItem() {
+  const focusedItem = document.querySelector(':target');
+  for (const fieldset of document.querySelectorAll('fieldset.collapsible')) {
+    if (configs.optionsExpandedGroups.includes(fieldset.id) ||
+        (focusedItem && fieldset.contains(focusedItem)))
+      fieldset.classList.remove('collapsed');
+    else
+      fieldset.classList.add('collapsed');
+
+    const onChangeCollapsed = () => {
+      if (!fieldset.id)
+        return;
+      const otherExpandedSections = configs.optionsExpandedGroups.filter(id => id != fieldset.id);
+      if (fieldset.classList.contains('collapsed'))
+        configs.optionsExpandedGroups = otherExpandedSections;
+      else
+        configs.optionsExpandedGroups = otherExpandedSections.concat([fieldset.id]);
+    };
+
+    const legend = fieldset.querySelector(':scope > legend');
+    legend.addEventListener('click', () => {
+      fieldset.classList.toggle('collapsed');
+      onChangeCollapsed();
+    });
+    legend.addEventListener('keydown', event => {
+      if (event.key != 'Enter')
+        return;
+      fieldset.classList.toggle('collapsed');
+      onChangeCollapsed();
+    });
+  }
+
+  return focusedItem;
+}
+
+function initCollapsibleSections({ focusedItem }) {
+  for (const heading of document.querySelectorAll('body > section > h1')) {
+    const section = heading.parentNode;
+    section.style.maxHeight = `${heading.offsetHeight}px`;
+    if (!configs.optionsExpandedSections.includes(section.id) &&
+          (!focusedItem || !section.contains(focusedItem)))
+      section.classList.add('collapsed');
+    heading.addEventListener('click', () => {
+      section.classList.toggle('collapsed');
+      const otherExpandedSections = configs.optionsExpandedSections.filter(id => id != section.id);
+      if (section.classList.contains('collapsed'))
+        configs.optionsExpandedSections = otherExpandedSections;
+      else
+        configs.optionsExpandedSections = otherExpandedSections.concat([section.id]);
+    });
+  }
+}
+
+function initPermissionOptions() {
+  configs.requestingPermissionsNatively = null;
+
+  Permissions.isGranted(Permissions.BOOKMARKS).then(granted => updateBookmarksUI(granted));
+  Permissions.isGranted(Permissions.ALL_URLS).then(granted => updateCtrlTabSubItems(granted));
+
+  Permissions.bindToCheckbox(
+    Permissions.ALL_URLS,
+    document.querySelector('#allUrlsPermissionGranted_tabPreviewTooltip')
+  );
+  Permissions.bindToCheckbox(
+    Permissions.ALL_URLS,
+    document.querySelector('#allUrlsPermissionGranted_ctrlTabTracking'),
+    {
+      onChanged(granted) {
+        updateCtrlTabSubItems(granted);
+      },
+    }
+  );
+
+  const bookmarksPermissionCheckboxes = [
+    document.querySelector('#bookmarksPermissionGranted'),
+    document.querySelector('#bookmarksPermissionGranted_autoGroup'),
+    document.querySelector('#bookmarksPermissionGranted_context'),
+  ];
+  for (const checkbox of bookmarksPermissionCheckboxes) {
+    Permissions.bindToCheckbox(
+      Permissions.BOOKMARKS,
+      checkbox,
+      { onChanged: (granted) => updateBookmarksUI(granted) }
+    );
+  }
+
+  Permissions.bindToCheckbox(
+    Permissions.CLIPBOARD_READ,
+    document.querySelector('#clipboardReadPermissionGranted_middleClickPasteURLOnNewTabButton'),
+    {
+      onInitialized: (granted) => {
+        return granted && configs.middleClickPasteURLOnNewTabButton;
+      },
+      onChanged: (granted) => {
+        configs.middleClickPasteURLOnNewTabButton = granted;
+      }
+    }
+  );
+
+  Permissions.bindToCheckbox(
+    Permissions.TAB_HIDE,
+    document.querySelector('#tabHidePermissionGranted'),
+    { onChanged: async (granted) => {
+      if (granted) {
+        // try to hide/show the tab to ensure the permission is really granted
+        let activeTabs = await browser.tabs.query({ active: true, currentWindow: true });
+        if (activeTabs.length == 0)
+          activeTabs = await browser.tabs.query({ currentWindow: true });
+        const tab = await browser.tabs.create({ active: false, windowId: activeTabs[0].windowId });
+        await wait(200);
+        let aborted = false;
+        const onRemoved = tabId => {
+          if (tabId != tab.id)
+            return;
+          aborted = true;
+          browser.tabs.onRemoved.removeListener(onRemoved);
+          // eslint-disable-next-line no-use-before-define
+          browser.tabs.onUpdated.removeListener(onUpdated);
+        };
+        const onUpdated = async (tabId, changeInfo, tab) => {
+          if (tabId != tab.id ||
+                !('hidden' in changeInfo))
+            return;
+          await wait(60 * 1000);
+          if (aborted)
+            return;
+          await browser.tabs.show([tab.id]);
+          await browser.tabs.remove(tab.id);
+        };
+        browser.tabs.onRemoved.addListener(onRemoved);
+        browser.tabs.onUpdated.addListener(onUpdated);
+        await browser.tabs.hide([tab.id]);
+      }
+    }}
+  );
+
+  for (const checkbox of document.querySelectorAll('input[type="checkbox"].require-bookmarks-permission')) {
+    checkbox.addEventListener('change', onChangeBookmarkPermissionRequiredCheckboxState);
+  }
+
+  for (const node of document.querySelectorAll('.with-bookmarks-permission')) {
+    Permissions.bindToClickable(
+      Permissions.BOOKMARKS,
+      node,
+      {
+        onChanged: (granted) => updateBookmarksUI(granted),
+      }
+    );
+  }
+}
+
+function initLogCheckboxes() {
+  for (const checkbox of document.querySelectorAll('p input[type="checkbox"][id^="logFor-"]')) {
+    checkbox.addEventListener('change', onChangeChildCheckbox);
+    checkbox.checked = configs.logFor[checkbox.id.replace(/^logFor-/, '')];
+  }
+  for (const checkbox of document.querySelectorAll('legend input[type="checkbox"][id^="logFor-"]')) {
+    checkbox.checked = isAllChildrenChecked(checkbox);
+    checkbox.addEventListener('change', onChangeParentCheckbox);
+  }
+}
+
+function initPreviews() {
+  for (const previewImage of document.querySelectorAll('select ~ .preview-image')) {
+    const container = previewImage.parentNode;
+    container.classList.add('has-preview-image');
+    const select = container.querySelector('select');
+    container.dataset.value = select.dataset.value = select.value;
+    container.addEventListener('mouseover', event => {
+      if (event.target != select &&
+            select.contains(event.target))
+        return;
+      const rect = select.getBoundingClientRect();
+      previewImage.style.insetInlineStart = `${isRTL() ? rect.right : rect.left}px`;
+      previewImage.style.top  = `${rect.top - 5 - previewImage.offsetHeight}px`;
+    });
+    select.addEventListener('change', () => {
+      container.dataset.value = select.dataset.value = select.value;
+    });
+    select.addEventListener('mouseover', event => {
+      if (event.target == select)
+        return;
+      container.dataset.value = select.dataset.value = event.target.value;
+    });
+    select.addEventListener('mouseout', () => {
+      container.dataset.value = select.dataset.value = select.value;
+    });
+  }
+}
+
+async function initExternalAddons() {
+  let addons;
+  while (true) {
+    // This API call will fail if the background page is not initialized yet, so we need to retry it a while.
+    addons = await browser.runtime.sendMessage({
+      type: TSTAPI.kCOMMAND_GET_ADDONS,
+    });
+    if (addons)
+      break;
+    await wait(250);
+  }
+
+  const description = document.getElementById('externalAddonPermissionsGroupDescription');
+  description.insertAdjacentHTML('beforeend', browser.i18n.getMessage('config_externaladdonpermissions_description'));
+
+  const container = document.getElementById('externalAddonPermissions');
+  for (const addon of addons) {
+    if (addon.id == browser.runtime.id)
+      continue;
+    const row = document.createElement('tr');
+
+    const nameCell = row.appendChild(document.createElement('td'));
+    const nameLabel = nameCell.appendChild(document.createElement('label'));
+    nameLabel.appendChild(document.createTextNode(addon.label));
+    const controlledId = `api-permissions-${encodeURIComponent(addon.id)}`;
+    nameLabel.setAttribute('for', controlledId);
+
+    const incognitoCell = row.appendChild(document.createElement('td'));
+    const incognitoLabel = incognitoCell.appendChild(document.createElement('label'));
+    const incognitoCheckbox = incognitoLabel.appendChild(document.createElement('input'));
+    if (addon.permissions.length == 0)
+      incognitoCheckbox.setAttribute('id', controlledId);
+    incognitoCheckbox.setAttribute('type', 'checkbox');
+    incognitoCheckbox.checked = configs.incognitoAllowedExternalAddons.includes(addon.id);
+    incognitoCheckbox.addEventListener('change', () => {
+      const updatedValue = new Set(configs.incognitoAllowedExternalAddons);
+      if (incognitoCheckbox.checked)
+        updatedValue.add(addon.id);
+      else
+        updatedValue.delete(addon.id);
+      configs.incognitoAllowedExternalAddons = Array.from(updatedValue);
+      browser.runtime.sendMessage({
+        type: TSTAPI.kCOMMAND_NOTIFY_PERMISSION_CHANGED,
+        id:   addon.id
+      });
+    });
+
+    const permissionsCell = row.appendChild(document.createElement('td'));
+    if (addon.permissions.length > 0) {
+      const permissionsLabel = permissionsCell.appendChild(document.createElement('label'));
+      const permissionsCheckbox = permissionsLabel.appendChild(document.createElement('input'));
+      permissionsCheckbox.setAttribute('id', controlledId);
+      permissionsCheckbox.setAttribute('type', 'checkbox');
+      permissionsCheckbox.checked = addon.permissionsGranted;
+      permissionsCheckbox.addEventListener('change', () => {
+        browser.runtime.sendMessage({
+          type:        TSTAPI.kCOMMAND_SET_API_PERMISSION,
+          id:          addon.id,
+          permissions: permissionsCheckbox.checked ? addon.permissions : addon.permissions.map(permission => `!  ${permission}`)
+        });
+      });
+      const permissionNames = addon.permissions.map(permission => {
+        try {
+          return browser.i18n.getMessage(`api_requestedPermissions_type_${permission}`) || permission;
+        }
+        catch(_error) {
+          return permission;
+        }
+      }).join(', ');
+      permissionsLabel.appendChild(document.createTextNode(permissionNames));
+    }
+
+    container.appendChild(row);
+  }
+}
+
+function initSync() {
+  const section = document.querySelector('#syncTabsToDeviceOptions');
+  if (Sync.hasExternalProvider()) {
+    section.classList.add('hidden');
+    return;
+  }
+
+  section.classList.remove('hidden');
+
+  const deviceInfoNameField = document.querySelector('#syncDeviceInfoName');
+  deviceInfoNameField.addEventListener('input', () => {
+    if (deviceInfoNameField.$throttling)
+      clearTimeout(deviceInfoNameField.$throttling);
+    deviceInfoNameField.$throttling = setTimeout(async () => {
+      delete deviceInfoNameField.$throttling;
+      configs.syncDeviceInfo = JSON.parse(JSON.stringify({
+        ...(configs.syncDeviceInfo || await Sync.generateDeviceInfo()),
+        name: deviceInfoNameField.value
+      }));
+    }, 250);
+  });
+
+  const deviceInfoIconRadiogroup = document.querySelector('#syncDeviceInfoIcon');
+  deviceInfoIconRadiogroup.addEventListener('change', _event => {
+    if (deviceInfoIconRadiogroup.$throttling)
+      clearTimeout(deviceInfoIconRadiogroup.$throttling);
+    deviceInfoIconRadiogroup.$throttling = setTimeout(async () => {
+      delete deviceInfoIconRadiogroup.$throttling;
+      const checkedRadio = deviceInfoIconRadiogroup.querySelector('input[type="radio"]:checked');
+      configs.syncDeviceInfo = JSON.parse(JSON.stringify({
+        ...(configs.syncDeviceInfo || await Sync.generateDeviceInfo()),
+        icon: checkedRadio.value
+      }));
+    }, 250);
+  });
+
+  initOtherDevices();
+
+  const otherDevices = document.querySelector('#otherDevices');
+  otherDevices.addEventListener('click', event => {
+    if (event.target.localName != 'button')
+      return;
+    const item = event.target.closest('li');
+    removeOtherDevice(item.id.replace(/^otherDevice:/, ''));
+  });
+  otherDevices.addEventListener('keydown', event => {
+    if (event.key != 'Enter' ||
+        event.target.localName != 'button')
+      return;
+    const item = event.target.closest('li');
+    removeOtherDevice(item.id.replace(/^otherDevice:/, ''));
+  });
+}
+
+import('/extlib/codemirror.js').then(async () => {
+  await Promise.all([
+    configs.$loaded,
+    import('/extlib/codemirror-mode-css.js'),
+    import('/extlib/codemirror-colorpicker.js')
+  ]);
+  mUserStyleRulesFieldEditor = CodeMirror(mUserStyleRulesField, { // eslint-disable-line no-undef
+    colorpicker: {
+      mode: 'edit'
+    },
+    lineNumbers: true,
+    lineWrapping: true,
+    mode: 'css',
+    theme: getUserStyleRulesFieldTheme()
+  });
+  mDarkModeMedia.addListener(async _event => {
+    applyUserStyleRulesFieldTheme();
+  });
+  applyUserStyleRulesFieldTheme();
+  window.mUserStyleRulesFieldEditor = mUserStyleRulesFieldEditor;
+  mUserStyleRulesFieldEditor.setValue(loadUserStyleRules());
+  mUserStyleRulesFieldEditor.on('change', reserveToSaveUserStyleRules);
+  mUserStyleRulesFieldEditor.on('update', reserveToSaveUserStyleRules);
+  initUserStyleImportExportButtons();
+  initFileDragAndDropHandlers();
+  mUserStyleRulesField.style.height = configs.userStyleRulesFieldHeight;
+  (new ResizeObserver(_entries => {
+    configs.userStyleRulesFieldHeight = `${mUserStyleRulesField.offsetHeight}px`;
+  })).observe(mUserStyleRulesField);
+});
diff --git a/waterfox/browser/components/sidebar/options/options.css b/waterfox/browser/components/sidebar/options/options.css
new file mode 100644
index 0000000000000..14a5b94ebf104
--- /dev/null
+++ b/waterfox/browser/components/sidebar/options/options.css
@@ -0,0 +1,388 @@
+/*
+# 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/.
+*/
+
+@import url(/resources/ui-base.css);
+@import url(/resources/ui-color.css);
+
+:root.rtl {
+  direction: rtl;
+}
+
+:root > * {
+  transition: opacity 0.25s ease-out;
+}
+:root:not(.initialized) > * {
+  opacity: 0;
+}
+
+/*
+body {
+  background: var(--in-content-box-background);
+  color: var(--text-color);
+}
+*/
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background: var(--in-content-box-background);
+    color: var(--text-color);
+  }
+}
+
+body.independent {
+  background: var(--bg-color);
+  box-sizing: border-box;
+  color: var(--text-color);
+  cursor: default;
+  display: flex;
+  flex-direction: column;
+  font: caption;
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 1em 100%;
+  padding-inline: 1em;
+  -moz-user-select: none;
+}
+
+em {
+  font-style: normal;
+  font-weight: bold;
+}
+
+p, ul {
+  margin-block: 0 0.5em;
+  margin-inline: 0;
+  padding-block: 0;
+  padding-inline: 0;
+}
+
+ul,
+ul li {
+  list-style: none;
+}
+
+p.sub,
+div.sub {
+  padding-inline-start: 2em;
+}
+
+ul p.sub,
+ul div.sub p {
+  margin-block: 0;
+}
+
+pre {
+  white-space: pre-wrap;
+}
+
+label[disabled="true"],
+input[disabled="true"] {
+  opacity: 0.5;
+}
+label[disabled="true"] input,
+label[disabled="true"] button {
+  opacity: 1;
+}
+
+label.has-checkbox:not(.inline),
+label.has-radio:not(.inline) {
+  margin-inline-start: 2em;
+  text-indent: -2em;
+  display: block;
+  width: -moz-fit-content;
+}
+
+.hidden,
+:root:not(.expose-unblock-autoplay-features) .unblock-autoplay-features {
+  display: none;
+}
+
+
+#style-radiogroup {
+  align-content: flex-start;
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  padding-block: 0;
+  padding-inline: 0;
+}
+
+#style-radiogroup li {
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  margin-block-end: 0.5em;
+  padding-block: 0;
+  padding-inline: 0;
+  width: calc(1em + 100px + 8em); /* radio + image + label */
+}
+
+#style-radiogroup li img {
+  max-width: 100px;
+}
+
+.style-name {
+  white-space: pre;
+}
+
+#applyThemeColorToIcon ~ img {
+  max-width: 85px;
+}
+
+#showTabDragBehaviorNotification ~ img {
+  max-width: 120px;
+}
+
+label input[type="radio"] ~ img,
+label input[type="checkbox"] ~ img {
+  border: 1px solid var(--ThreeDShadow);
+  vertical-align: middle;
+  margin-block: 0.15em;
+}
+
+#syncTabsToDeviceOptions label input[type="radio"] ~ img {
+  border: 0 none;
+}
+
+.preview-image {
+  background: no-repeat;
+  background-size: contain;
+  box-shadow: 0.25em 0.25em 0.5em rgba(0, 0, 0, 0.45);
+  display: inline-block;
+  height: 125px /*83px*/;
+  inset-inline-end: 0;
+  margin-inline-start: 0.5em;
+  opacity: 0;
+  pointer-events: none;
+  position: fixed;
+  top: 1.5em;
+  transition: opacity 0.25s ease-out;
+  width: 120px /*80px*/;
+}
+.has-preview-image:not([data-value="-1"]):hover .preview-image {
+  opacity: 1;
+}
+.has-preview-image[data-value="0"] .preview-image {
+  background-image: url("as-independent.png");
+}
+.has-preview-image[data-value="1"] .preview-image,
+.has-preview-image[data-value="5"] .preview-image,
+.has-preview-image[data-value="6"] .preview-image,
+.has-preview-image[data-value="7"] .preview-image {
+  background-image: url("as-child.png");
+}
+.has-preview-image[data-value="2"] .preview-image {
+  background-image: url("as-sibling.png");
+}
+.has-preview-image[data-value="3"] .preview-image,
+.has-preview-image[data-value="4"] .preview-image {
+  background-image: url("as-next-sibling.png");
+}
+
+
+
+#browserThemeCustomRules {
+  -moz-user-select: text;
+  cursor: text;
+}
+
+#tooLargeUserStyleRulesCaution {
+  color: var(--red-50);
+  margin-block-end: 0;
+  visibility: hidden;
+}
+#tooLargeUserStyleRulesCaution.invalid {
+  visibility: visible;
+}
+
+#userStyleRulesField {
+  margin-block: 0;
+  margin-inline: -5px;
+  min-height: 10em;
+  overflow: hidden;
+  resize: vertical;
+}
+
+#userStyleRulesField > .CodeMirror {
+  border: thin solid;
+  height: calc(100% - 10px);
+  margin-block: 5px;
+  margin-inline: 5px;
+}
+
+#userStyleRulesField > .CodeMirror.CodeMirror-focused {
+  border-color: var(--in-content-border-focus);
+  box-shadow: 0 0 0 1px var(--in-content-border-active),
+              0 0 0 4px var(--in-content-border-active-shadow);
+}
+
+#userStyleRulesField.invalid > .CodeMirror {
+  border-color: var(--red-50);
+  --in-content-border-active: var(--red-50);
+  --in-content-border-active-shadow: var(--red-50-a30);
+}
+
+#userStyleRulesField.invalid .CodeMirror-scroll {
+  background-color: var(--red-50-a10);
+}
+
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+  word-break: break-all !important;
+}
+
+#userStyleRules-footer-bar {
+  display: flex;
+  flex-direction: row;
+}
+
+#userStyleRules-footer-bar button {
+  margin-inline-end: 0.5em;
+}
+
+#userStyleRules-footer-bar .spacer {
+  display: flex;
+  flex-grow: 1;
+}
+
+
+table {
+  border-collapse: collapse;
+}
+th + *,
+td + * {
+  border-inline-start: 1px solid light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
+}
+tbody tr {
+  border-block-start: 1px solid light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.2));
+}
+
+
+.contextConfigs tbody th,
+.tabDragBehaviorConfigs tbody th {
+  font-weight: normal;
+}
+
+.contextConfigs tbody th,
+.tabDragBehaviorConfigs thead th,
+.tabDragBehaviorConfigs tbody th {
+  text-align: start;
+}
+
+.contextConfigs td,
+.tabDragBehaviorConfigs td {
+  text-align: center;
+}
+
+.contextConfigs table input[type="checkbox"],
+.tabDragBehaviorConfigs table input[type="radio"] {
+  margin-inline: 1.5em;
+}
+
+
+#externalAddonPermissionsGroup td:nth-child(2) {
+  text-align: center;
+}
+#externalAddonPermissionsGroup td:nth-child(2) input[type="checkbox"] {
+  margin-inline: 3em;
+}
+
+
+fieldset.collapsible.collapsed > *:not(legend):not(div) /* "div" is for the container of "import" and "export" buttons */ {
+  display: none;
+}
+
+fieldset.collapsible > legend::before,
+body > section > h1:first-child::before {
+  content: "โ–ผ";
+  display: inline-block;
+  font-size: 65%;
+  margin-inline-end: 0.5em;
+  position: relative;
+  transition: transform 0.2s ease;
+}
+
+fieldset.collapsible.collapsed > legend::before,
+body > section.collapsed > h1:first-child::before {
+  transform: rotate(-90deg);
+}
+
+:root.rtl fieldset.collapsible.collapsed > legend::before,
+:root.rtl body > section.collapsed > h1:first-child::before {
+  transform: rotate(90deg);
+}
+
+
+:root.successor-tab-support .without-successor-tab-support,
+:root:not(.successor-tab-support) .with-successor-tab-support {
+  display: none;
+}
+
+
+body > section {
+  margin-block-start: 1em;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out;
+}
+body > section:not(.collapsed) {
+  max-height: none !important;
+}
+
+body > section > h1:first-child {
+  margin-block-start: 0;
+  cursor: pointer;
+}
+
+body > section > h1:first-child ~ * {
+  opacity: 1;
+  transition: opacity 0.2s ease-out;
+}
+body > section.collapsed > h1:first-child ~ * {
+  opacity: 0;
+}
+
+
+#defaultBookmarkParentChooser {
+  max-width: 100%;
+}
+
+:target {
+  box-shadow: 0 0 0.5em highlight;
+  margin-block: 0.5em;
+}
+
+
+:root:not(.show-expert-options) .expert:not(option.expert[selected]) {
+  display: none;
+}
+
+.expert:not(option) {
+  background: var(--in-content-box-info-background);
+  box-shadow: 0 0 0.5em var(--in-content-box-info-background),
+              0 0 0.5em var(--in-content-box-info-background),
+              0 0 0.5em var(--in-content-box-info-background);
+}
+
+
+#link-optionsPage-top {
+  float: inline-end;
+  padding-inline-end: 1em;
+}
+
+body.independent #link-optionsPage-top {
+  display: none;
+}
+
+
+input[type="checkbox"].missing-permission {
+  opacity: 0.5;
+}
+input[type="checkbox"].missing-permission,
+input[type="checkbox"].missing-permission ~ * {
+  cursor: help;
+}
diff --git a/waterfox/browser/components/sidebar/options/options.html b/waterfox/browser/components/sidebar/options/options.html
new file mode 100644
index 0000000000000..0de0c80ad66de
--- /dev/null
+++ b/waterfox/browser/components/sidebar/options/options.html
@@ -0,0 +1,1661 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/resources/16x16.svg">
+    <script type="module" src="./init-ws.js"></script>
+    <link rel="stylesheet" type="text/css" href="options.css"/>
+    <link rel="stylesheet" type="text/css" href="/extlib/codemirror.css"/>
+    <link rel="stylesheet" type="text/css" href="/extlib/codemirror-colorpicker.css"/>
+  </head>
+  <body>
+    <p><a id="link-optionsPage-top" target="_blank">__MSG_config_openOptionsInTab_label__</a>
+       <label class="has-checkbox"
+             ><input id="showExpertOptions"
+                     type="checkbox">
+              __MSG_config_showExpertOptions_label__</label></p>
+    <section id="section-appearance">
+    <h1>__MSG_config_appearance_caption__</h1>
+
+    <p>__MSG_config_sidebarPosition_caption__
+       <label class="has-radio inline"
+             ><input type="radio"
+                     name="sidebarPosition"
+                     value="1">
+              __MSG_config_sidebarPosition_left__</label>
+       <label class="has-radio inline"
+                   ><input type="radio"
+                           name="sidebarPosition"
+                           value="2">
+              __MSG_config_sidebarPosition_right__</label>
+       <label class="has-radio inline"
+             ><input type="radio"
+                     name="sidebarPosition"
+                     value="0">
+              __MSG_config_sidebarPosition_auto__</label>
+    </p>
+    <p class="sub">__MSG_config_sidebarPosition_description__</p>
+    <fieldset>
+      <legend>__MSG_config_style_caption__</legend>
+      <ul id="style-radiogroup">
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="style"
+                          value="proton">
+              <img src="style-proton.png" alt=""/>
+              <span class="style-name">__MSG_config_style_proton__</span></label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="style"
+                          value="photon">
+              <img src="style-photon.png" alt=""/>
+              <span class="style-name">__MSG_config_style_photon__</span></label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="style"
+                          value="sidebar">
+              <img src="style-sidebar.png" alt=""/>
+              <span class="style-name">__MSG_config_style_sidebar__</span></label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="style"
+                          value="highcontrast">
+              <img src="style-highcontrast.png" alt=""/>
+              <span class="style-name">__MSG_config_style_highcontrast__</span></label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="style"
+                          value="none">
+              __MSG_config_style_none__
+              __MSG_config_style_none_info__</label></li>
+      </ul>
+    </fieldset>
+    <p><label class="has-checkbox"
+             ><input id="animation"
+                     type="checkbox">
+             __MSG_config_animation_label__</label></p>
+    <div class="expert">
+    <p class="sub"
+      ><label class="has-checkbox"
+             ><input id="animationForce"
+                     type="checkbox">
+             __MSG_config_animationForce_label__</label></p>
+    <p>__MSG_config_labelOverflowStyle_caption__
+       <label class="has-radio inline"
+             ><input type="radio"
+                     name="labelOverflowStyle"
+                     value="fade">
+         __MSG_config_labelOverflowStyle_fade__</label>
+       <label class="has-radio inline"
+             ><input type="radio"
+                     name="labelOverflowStyle"
+                     value="crop">
+         __MSG_config_labelOverflowStyle_crop__</label>
+    </p>
+    <p><label>__MSG_config_maxTreeLevel_before__
+              <input id="maxTreeLevel"
+                     type="number"
+                     size="3">
+             __MSG_config_maxTreeLevel_after__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="faviconizePinnedTabs"
+                     type="checkbox">
+             __MSG_config_faviconizePinnedTabs_label__</label></p>
+    <p class="sub"><label>__MSG_config_maxFaviconizedPinnedTabsInOneRow_label_before__
+              <input id="maxFaviconizedPinnedTabsInOneRow"
+                     type="number"
+                     size="3">
+             __MSG_config_maxFaviconizedPinnedTabsInOneRow_label_after__</label></p>
+    <p class="sub"><label>__MSG_config_maxPinnedTabsRowsAreaPercentage_label_before__
+                   <input id="maxPinnedTabsRowsAreaPercentage"
+                          type="number"
+                          size="5"
+                          min="0"
+                          max="100">
+                   __MSG_config_maxPinnedTabsRowsAreaPercentage_label_after__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="fadeOutPendingTabs"
+                     type="checkbox">
+             __MSG_config_fadeOutPendingTabs_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="fadeOutDiscardedTabs"
+                     type="checkbox">
+             __MSG_config_fadeOutDiscardedTabs_label__</label></p>
+    </div>
+    <p><label class="has-checkbox"
+             ><input id="allUrlsPermissionGranted_tabPreviewTooltip"
+                     type="checkbox"
+                     data-related-config-key="tabPreviewTooltip">
+             __MSG_config_tabPreviewTooltip_label__</label></p>
+    <div class="expert">
+    <p class="sub"
+      ><label>__MSG_config_tabPreviewTooltipRenderIn_label_before__
+              <select id="tabPreviewTooltipRenderIn">
+                <option value="3">__MSG_config_tabPreviewTooltipRenderIn_anywhere__</option>
+                <option value="2">__MSG_config_tabPreviewTooltipRenderIn_content__</option>
+                <option value="1">__MSG_config_tabPreviewTooltipRenderIn_sidebar__</option>
+              </select>
+             __MSG_config_tabPreviewTooltipRenderIn_label_after__</label></p>
+    <p class="sub"
+      ><label>__MSG_config_inContentUIOffsetTop_label_before__
+              <input id="inContentUIOffsetTop"
+                     type="number"
+                     size="5">
+              __MSG_config_inContentUIOffsetTop_label_after__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="showCollapsedDescendantsByTooltip"
+                     type="checkbox">
+             __MSG_config_showCollapsedDescendantsByTooltip_label__</label></p>
+    <p class="sub"
+      ><label class="has-checkbox"
+             ><input id="showCollapsedDescendantsByLegacyTooltipOnSidebar"
+                     type="checkbox">
+             __MSG_config_showCollapsedDescendantsByLegacyTooltipOnSidebar_label__</label></p>
+    <p><label>__MSG_config_shiftTabsForScrollbarDistance_label_before__
+       <input id="shiftTabsForScrollbarDistance"
+              size="8"
+              placeholder="__MSG_config_shiftTabsForScrollbarDistance_placeholder__">
+       __MSG_config_shiftTabsForScrollbarDistance_label_after__</label></p>
+    <p class="sub"><label class="has-checkbox"
+                         ><input id="shiftTabsForScrollbarOnlyOnHover"
+                                 type="checkbox">
+                         __MSG_config_shiftTabsForScrollbarOnlyOnHover_label__</label></p>
+    <fieldset>
+      <legend>__MSG_config_suppressGapFromShownOrHiddenToolbar_caption__</legend>
+      <p><label class="has-checkbox"
+               ><input id="suppressGapFromShownOrHiddenToolbarOnFullScreen"
+                       type="checkbox">
+               __MSG_config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label__</label></p>
+      <p><label class="has-checkbox"
+               ><input id="suppressGapFromShownOrHiddenToolbarOnNewTab"
+                       type="checkbox">
+               __MSG_config_suppressGapFromShownOrHiddenToolbarOnNewTab_label__</label></p>
+      <hr>
+      <p><label class="has-checkbox"
+               ><input id="suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation"
+                       type="checkbox">
+               __MSG_config_suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation_label__</label></p>
+    </fieldset>
+    <p><label class="has-checkbox"
+             ><input id="showDialogInSidebar"
+                     type="checkbox">
+                     __MSG_config_showDialogInSidebar_label__</label></p>
+
+    <p><label>__MSG_config_outOfScreenTabsRenderingPages_label__
+              <input id="outOfScreenTabsRenderingPages"
+                     type="number"
+                     min="-1"
+                     size="6"></label></p>
+    <p class="sub"
+      ><label for="outOfScreenTabsRenderingPages"
+             >__MSG_config_outOfScreenTabsRenderingPages_description__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="renderHiddenTabs"
+                     type="checkbox">
+                     __MSG_config_renderHiddenTabs_label__</label></p>
+    </div>
+    </section>
+
+    <section id="section-contextMenu">
+    <h1>__MSG_config_context_caption__</h1>
+    <fieldset class="contextConfigs expert">
+    <legend>__MSG_config_extraItems_tabs_caption__</legend>
+    <table>
+      <thead>
+        <tr>
+          <th>__MSG_config_extraItems_tabs_topLevel__</th>
+          <th>__MSG_config_extraItems_tabs_subMenu__</th>
+          <td></td>
+          <th>__MSG_config_extraItems_tabs_middleClick__</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><label><input id="context_topLevel_toggleSticky"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_toggleSticky"
+                            type="checkbox"></label></td>
+          <th><label for="context_toggleSticky">__MSG_context_toggleSticky_command__</label></th>
+          <td></td>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_reloadTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_reloadTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_reloadTree">__MSG_context_reloadTree_label__</label></th>
+          <th><label for="context_reloadTree">__MSG_context_reloadDescendants_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_reloadDescendants"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_reloadDescendants"
+                            type="checkbox"></label></td>
+          <th><label for="context_reloadDescendants">__MSG_context_reloadDescendants_label__</label></th>
+          <th><label for="context_reloadDescendants">__MSG_context_reloadTree_label__</label></th>
+        </tr>
+        <tr class="unblock-autoplay-features">
+          <td><label><input id="context_topLevel_unblockAutoplayTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_unblockAutoplayTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_unblockAutoplayTree">__MSG_context_unblockAutoplayTree_command__</label></th>
+          <th><label for="context_unblockAutoplayTree">__MSG_context_unblockAutoplayDescendants_command__</label></th>
+        </tr>
+        <tr class="unblock-autoplay-features">
+          <td><label><input id="context_topLevel_unblockAutoplayDescendants"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_unblockAutoplayDescendants"
+                            type="checkbox"></label></td>
+          <th><label for="context_unblockAutoplayDescendants">__MSG_context_unblockAutoplayDescendants_command__</label></th>
+          <th><label for="context_unblockAutoplayDescendants">__MSG_context_unblockAutoplayTree_command__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_toggleMuteTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_toggleMuteTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_toggleMuteTree">__MSG_context_toggleMuteTree_command__</label></th>
+          <th><label for="context_toggleMuteTree">__MSG_context_toggleMuteDescendants_command__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_toggleMuteDescendants"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_toggleMuteDescendants"
+                            type="checkbox"></label></td>
+          <th><label for="context_toggleMuteDescendants">__MSG_context_toggleMuteDescendants_command__</label></th>
+          <th><label for="context_toggleMuteDescendants">__MSG_context_toggleMuteTree_command__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_closeTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_closeTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_closeTree">__MSG_context_closeTree_label__</label></th>
+          <th><label for="context_closeTree">__MSG_context_closeDescendants_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_closeDescendants"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_closeDescendants"
+                            type="checkbox"></label></td>
+          <th><label for="context_closeDescendants">__MSG_context_closeDescendants_label__</label></th>
+          <th><label for="context_closeDescendants">__MSG_context_closeTree_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_closeOthers"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_closeOthers"
+                            type="checkbox"></label></td>
+          <th><label for="context_closeOthers">__MSG_context_closeOthers_label__</label></th>
+          <td></td>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_collapseTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_collapseTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_collapseTree">__MSG_context_collapseTree_label__</label></th>
+          <th><label for="context_collapseTree">__MSG_context_collapseTreeRecursively_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_collapseTreeRecursively"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_collapseTreeRecursively"
+                            type="checkbox"></label></td>
+          <th><label for="context_collapseTreeRecursively">__MSG_context_collapseTreeRecursively_label__</label></th>
+          <th><label for="context_collapseTreeRecursively">__MSG_context_collapseTree_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_collapseAll"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_collapseAll"
+                            type="checkbox"></label></td>
+          <th><label for="context_collapseAll">__MSG_context_collapseAll_label__</label></th>
+          <td></td>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_expandTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_expandTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_expandTree">__MSG_context_expandTree_label__</label></th>
+          <th><label for="context_expandTree">__MSG_context_expandTreeRecursively_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_expandTreeRecursively"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_expandTreeRecursively"
+                            type="checkbox"></label></td>
+          <th><label for="context_expandTreeRecursively">__MSG_context_expandTreeRecursively_label__</label></th>
+          <th><label for="context_expandTreeRecursively">__MSG_context_expandTree_label__</label></th>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_expandAll"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_expandAll"
+                            type="checkbox"></label></td>
+          <th><label for="context_expandAll">__MSG_context_expandAll_label__</label></th>
+          <td></td>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_bookmarkTree"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_bookmarkTree"
+                            type="checkbox"></label></td>
+          <th><label for="context_bookmarkTree">__MSG_context_bookmarkTree_label__</label></th>
+          <td></td>
+        </tr>
+        <tr>
+          <td><label><input id="context_topLevel_sendTreeToDevice"
+                            type="checkbox"></label></td>
+          <td><label><input id="context_sendTreeToDevice"
+                            type="checkbox"></label></td>
+          <th><label for="context_sendTreeToDevice">__MSG_context_sendTreeToDevice_label__</label></th>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+    <p><label class="has-checkbox"
+             ><input id="showTreeCommandsInTabsContextMenuGlobally"
+                     type="checkbox">
+              __MSG_config_showTreeCommandsInTabsContextMenuGlobally_label__</label></p>
+    </fieldset>
+    <fieldset id="bookmarksPermissionSection">
+    <legend><label class="has-checkbox"
+                  ><input id="bookmarksPermissionGranted"
+                          type="checkbox">
+                          __MSG_config_requestPermissions_bookmarks__</label></legend>
+    <div class="expert">
+    <p class="with-bookmarks-permission"><label>__MSG_config_bookmarkTreeFolderName_before__
+                          <input id="bookmarkTreeFolderName"
+                                 type="text"
+                                 style="width: 100%">
+                          __MSG_config_bookmarkTreeFolderName_after__</label></p>
+    <p class="with-bookmarks-permission"><label for="bookmarkTreeFolderName">__MSG_config_bookmarkTreeFolderName_description__</label></p>
+    </div>
+    <div class="with-bookmarks-permission"
+         id="defaultBookmarkParentGroup">
+      <style type="text/css" id="defaultBookmarkParentChooserStyle"></style>
+      <p><label for="defaultBookmarkParentChooser">__MSG_config_defaultBookmarkParentId_label__</label>
+         <span class="parentIdChooserMiniContainer">
+           <select id="defaultBookmarkParentId"
+                   class="parentIdChooserMini"></select>
+           <button class="showAllFolders"
+                   title="__MSG_bookmarkDialog_showAllFolders_tooltip__"></button>
+         </span></p>
+      <div class="parentIdChooserFullContainer">
+        <div class="parentIdChooserFullTreeContainer"
+             tabindex="0"
+             data-no-accept-by-enter="true">
+          <ul class="parentIdChooserFull"></ul>
+        </div>
+        <span><button class="newFolder"
+                      accesskey="__MSG_bookmarkDialog_newFolder_accessKey__"
+                      data-no-accept-by-enter="true">__MSG_bookmarkDialog_newFolder__</button></span>
+      </div>
+    </div>
+    </fieldset>
+    <fieldset id="syncTabsToDeviceOptions">
+      <legend>__MSG_config_sendTabsToDevice_caption__</legend>
+      <p>__MSG_config_syncRequirements_description__</p>
+      <p><label>__MSG_config_syncDeviceInfo_name_label__
+                <input id="syncDeviceInfoName"
+                       type="text"
+                       size="30"></label></p>
+      <p id="syncDeviceInfoIcon"
+         class="sub"
+        ><label><input type="radio" name="syncDeviceInfoIcon" value="device-desktop">
+                <img src="/resources/icons/device-desktop.svg" alt="device-desktop"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="device-mobile">
+                <img src="/resources/icons/device-mobile.svg" alt="device-mobile"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="device-tablet">
+                <img src="/resources/icons/device-tablet.svg" alt="device-tablet"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="device-vr">
+                <img src="/resources/icons/device-vr.svg" alt="device-vr"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="home">
+                <img src="/resources/icons/home.svg" alt="home"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="developer">
+                <img src="/resources/icons/developer.svg" alt="developer"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="customize">
+                <img src="/resources/icons/customize.svg" alt="customize"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="edit">
+                <img src="/resources/icons/edit.svg" alt="edit"></label>
+         <label><input type="radio" name="syncDeviceInfoIcon" value="experiments">
+                <img src="/resources/icons/experiments.svg" alt="experiments"></label>
+      </p>
+      <p class="sub">__MSG_config_syncDeviceInfo_name_description_before__<a href="__MSG_config_syncDeviceInfo_name_description_href__">__MSG_config_syncDeviceInfo_name_description_link__</a>__MSG_config_syncDeviceInfo_name_description_after__</p>
+      <fieldset id="syncTabsToDeviceOptions">
+        <legend>__MSG_config_otherDevices_caption__</legend>
+        <ul id="otherDevices"></ul>
+      </fieldset>
+      <div class="expert">
+        <p><label>__MSG_config_syncDeviceExpirationDays_label_before__
+                  <input id="syncDeviceExpirationDays"
+                         type="number"
+                         size="5">
+                  __MSG_config_syncDeviceExpirationDays_label_after__</label></p>
+        <p><label>__MSG_config_syncUnsendableUrlPattern_label__
+                  <input id="syncUnsendableUrlPattern"
+                         type="text"
+                         size="45"></label></p>
+      </div>
+    </fieldset>
+    <fieldset class="contextConfigs expert">
+      <legend>__MSG_config_extraItems_bookmarks_caption__</legend>
+      <p class="with-bookmarks-permission"
+        ><label class="has-checkbox"
+               ><input id="context_openAllBookmarksWithStructure"
+                       type="checkbox">
+                __MSG_context_openAllBookmarksWithStructure_label__</label></p>
+      <p class="with-bookmarks-permission"
+        ><label class="has-checkbox"
+               ><input id="context_openAllBookmarksWithStructureRecursively"
+                       type="checkbox">
+                __MSG_context_openAllBookmarksWithStructureRecursively_label__</label></p>
+      <hr>
+      <p class="with-bookmarks-permission"
+        ><label class="has-checkbox"
+               ><input id="openAllBookmarksWithStructureDiscarded"
+                       type="checkbox">
+                __MSG_config_openAllBookmarksWithStructureDiscarded_label__</label></p>
+      <p class="with-bookmarks-permission"
+        ><label class="has-checkbox"
+               ><input id="suppressGroupTabForStructuredTabsFromBookmarks"
+                       type="checkbox">
+                __MSG_config_suppressGroupTabForStructuredTabsFromBookmarks_label__</label></p>
+    </fieldset>
+    <p class="expert"
+      ><label>__MSG_config_autoAttachOnContextNewTabCommand_before__
+              <select id="autoAttachOnContextNewTabCommand">
+                <option value="-1">__MSG_config_autoAttachOnContextNewTabCommand_noControl__</option>
+                <option value="0">__MSG_config_autoAttachOnContextNewTabCommand_independent__</option>
+                <option value="6">__MSG_config_autoAttachOnContextNewTabCommand_childTop__</option>
+                <option value="7">__MSG_config_autoAttachOnContextNewTabCommand_childEnd__</option>
+                <option value="2">__MSG_config_autoAttachOnContextNewTabCommand_sibling__</option>
+                <option value="3">__MSG_config_autoAttachOnContextNewTabCommand_nextSibling__ </option>
+                <option value="4">__MSG_config_autoAttachOnContextNewTabCommand_nextSiblingWithInheritedContainer__ __MSG_config_firefoxCompatible_choice__</option>
+              </select>
+              __MSG_config_autoAttachOnContextNewTabCommand_after__
+              <span class="preview-image"></span></label></p>
+    </section>
+
+
+    <section id="section-newTabWithOwner">
+    <h1>__MSG_config_newTabWithOwner_caption__</h1>
+
+    <p><label>__MSG_config_autoAttachOnOpenedWithOwner_before__
+              <select id="autoAttachOnOpenedWithOwner">
+                <option value="-1">__MSG_config_autoAttachOnOpenedWithOwner_noControl__</option>
+                <option value="0">__MSG_config_autoAttachOnOpenedWithOwner_independent__</option>
+                <option value="6">__MSG_config_autoAttachOnOpenedWithOwner_childTop__</option>
+                <option value="7">__MSG_config_autoAttachOnOpenedWithOwner_childEnd__ __MSG_config_recommended_choice__</option>
+                <option value="5">__MSG_config_autoAttachOnOpenedWithOwner_childNextToLastRelatedTab__ __MSG_config_firefoxCompatible_choice__</option>
+                <option value="2">__MSG_config_autoAttachOnOpenedWithOwner_sibling__</option>
+                <option value="3">__MSG_config_autoAttachOnOpenedWithOwner_nextSibling__</option>
+              </select>
+              __MSG_config_autoAttachOnOpenedWithOwner_after__
+              <span class="preview-image"></span></label></p>
+    <div class="expert">
+    <fieldset>
+      <legend>__MSG_config_insertNewTabFromFirefoxViewAt_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromFirefoxViewAt" value="-1">
+              __MSG_config_insertNewTabFromFirefoxViewAt_noControl__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromFirefoxViewAt" value="3">
+              __MSG_config_insertNewTabFromFirefoxViewAt_nextToLastRelatedTab__ __MSG_config_firefoxCompatible_choice__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromFirefoxViewAt" value="0">
+              __MSG_config_insertNewTabFromFirefoxViewAt_top__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromFirefoxViewAt" value="1">
+              __MSG_config_insertNewTabFromFirefoxViewAt_end__</label></li>
+      </ul>
+      <hr>
+      <p><label class="has-checkbox"
+               ><input id="autoGroupNewTabsFromFirefoxView"
+                       type="checkbox">
+                __MSG_config_autoGroupNewTabsFromFirefoxView_label__</p>
+      <p><label>__MSG_config_groupTabTemporaryStateForChildrenOfFirefoxView_label__
+                <select id="groupTabTemporaryStateForChildrenOfFirefoxView">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+    </fieldset>
+    <fieldset>
+      <legend>__MSG_config_insertNewTabFromPinnedTabAt_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromPinnedTabAt" value="-1">
+              __MSG_config_insertNewTabFromPinnedTabAt_noControl__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromPinnedTabAt" value="3">
+              __MSG_config_insertNewTabFromPinnedTabAt_nextToLastRelatedTab__ __MSG_config_firefoxCompatible_choice__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromPinnedTabAt" value="0">
+              __MSG_config_insertNewTabFromPinnedTabAt_top__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewTabFromPinnedTabAt" value="1">
+              __MSG_config_insertNewTabFromPinnedTabAt_end__</label></li>
+      </ul>
+      <hr>
+      <p><label class="has-checkbox"
+               ><input id="autoGroupNewTabsFromPinned"
+                       type="checkbox">
+                __MSG_config_autoGroupNewTabsFromPinned_label__</p>
+      <p><label>__MSG_config_groupTabTemporaryStateForChildrenOfPinned_label__
+                <select id="groupTabTemporaryStateForChildrenOfPinned">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+    </fieldset>
+    </div>
+    </section>
+
+
+    <section id="section-newTab">
+    <h1>__MSG_config_newTab_caption__</h1>
+
+    <fieldset>
+      <legend>__MSG_config_newTabAction_caption__</legend>
+    <p><label>__MSG_config_autoAttachOnNewTabCommand_before__
+              <select id="autoAttachOnNewTabCommand">
+                <option value="-1">__MSG_config_autoAttachOnNewTabCommand_noControl__ __MSG_config_recommended_choice__</option>
+                <option value="0">__MSG_config_autoAttachOnNewTabCommand_independent__ __MSG_config_firefoxCompatible_choice__</option>
+                <option value="6">__MSG_config_autoAttachOnNewTabCommand_childTop__</option>
+                <option value="7">__MSG_config_autoAttachOnNewTabCommand_childEnd__</option>
+                <option value="2">__MSG_config_autoAttachOnNewTabCommand_sibling__</option>
+                <option value="3">__MSG_config_autoAttachOnNewTabCommand_nextSibling__</option>
+              </select>
+              __MSG_config_autoAttachOnNewTabCommand_after__
+              <span class="preview-image"></span></label></p>
+    <p class="sub"><label class="has-checkbox"
+                         ><input id="guessNewOrphanTabAsOpenedByNewTabCommand"
+                                 type="checkbox">
+                          __MSG_config_guessNewOrphanTabAsOpenedByNewTabCommandTitle_before__
+                          <input id="guessNewOrphanTabAsOpenedByNewTabCommandTitle"
+                                 size="40">
+                          __MSG_config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_before__
+                          <input id="guessNewOrphanTabAsOpenedByNewTabCommandUrl"
+                                 size="40">
+                           __MSG_config_guessNewOrphanTabAsOpenedByNewTabCommandUrl_after__</label></p>
+    <p class="sub expert"
+      ><label>__MSG_config_inheritContextualIdentityToChildTabMode_label__
+              <select id="inheritContextualIdentityToChildTabMode">
+                <option value="0">__MSG_config_inheritContextualIdentityToChildTabMode_default__</option>
+                <option value="1">__MSG_config_inheritContextualIdentityToChildTabMode_parent__</option>
+                <option value="2">__MSG_config_inheritContextualIdentityToChildTabMode_lastActive__</option>
+              </select></label></p>
+    </fieldset>
+    <div class="expert">
+    <fieldset>
+      <legend>__MSG_config_newTabButton_caption__</legend>
+    <p><label>__MSG_config_autoAttachOnNewTabButtonMiddleClick_before__
+              <select id="autoAttachOnNewTabButtonMiddleClick">
+                <option value="-1">__MSG_config_autoAttachOnNewTabButtonMiddleClick_noControl__</option>
+                <option value="0">__MSG_config_autoAttachOnNewTabButtonMiddleClick_independent__</option>
+                <option value="6">__MSG_config_autoAttachOnNewTabButtonMiddleClick_childTop__</option>
+                <option value="7">__MSG_config_autoAttachOnNewTabButtonMiddleClick_childEnd__</option>
+                <option value="2">__MSG_config_autoAttachOnNewTabButtonMiddleClick_sibling__</option>
+                <option value="3">__MSG_config_autoAttachOnNewTabButtonMiddleClick_nextSibling__</option>
+                <option value="4">__MSG_config_autoAttachOnNewTabButtonMiddleClick_nextSiblingWithInheritedContainer__ __MSG_config_firefoxCompatible_choice__</option>
+              </select>
+              __MSG_config_autoAttachOnNewTabButtonMiddleClick_after__
+              <span class="preview-image"></span></label></p>
+    <p><label class="sub has-checkbox"
+             ><input id="clipboardReadPermissionGranted_middleClickPasteURLOnNewTabButton"
+                     type="checkbox"
+                     data-related-config-key="middleClickPasteURLOnNewTabButton">
+             __MSG_config_middleClickPasteURLOnNewTabButton_label__</label></p>
+    <p><label>__MSG_config_autoAttachOnNewTabButtonAccelClick_before__
+              <select id="autoAttachOnNewTabButtonAccelClick">
+                <option value="-1">__MSG_config_autoAttachOnNewTabButtonAccelClick_noControl__</option>
+                <option value="0">__MSG_config_autoAttachOnNewTabButtonAccelClick_independent__</option>
+                <option value="6">__MSG_config_autoAttachOnNewTabButtonAccelClick_childTop__</option>
+                <option value="7">__MSG_config_autoAttachOnNewTabButtonAccelClick_childEnd__</option>
+                <option value="2">__MSG_config_autoAttachOnNewTabButtonAccelClick_sibling__</option>
+                <option value="3">__MSG_config_autoAttachOnNewTabButtonAccelClick_nextSibling__ </option>
+                <option value="4">__MSG_config_autoAttachOnNewTabButtonAccelClick_nextSiblingWithInheritedContainer__ __MSG_config_firefoxCompatible_choice__</option>
+              </select>
+              __MSG_config_autoAttachOnNewTabButtonAccelClick_after__
+              <span class="preview-image"></span></label></p>
+    <p><label>__MSG_config_longPressOnNewTabButton_before__
+              <select id="longPressOnNewTabButton">
+                <option value="newtab-action-selector">__MSG_config_longPressOnNewTabButton_newTabAction__</option>
+                <option value="contextual-identities-selector">__MSG_config_longPressOnNewTabButton_contextualIdentities__</option>
+                <option value="">__MSG_config_longPressOnNewTabButton_none__</option>
+              </select>
+              __MSG_config_longPressOnNewTabButton_after__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="showNewTabActionSelector"
+                     type="checkbox">
+             __MSG_config_showNewTabActionSelector_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="showContextualIdentitiesSelector"
+                     type="checkbox">
+             __MSG_config_showContextualIdentitiesSelector_label__</label></p>
+    </fieldset>
+    <fieldset>
+      <legend>__MSG_config_autoAttachWithURL_caption__</legend>
+      <p><label>__MSG_config_duplicateTabAction_caption__: __MSG_config_autoAttachOnDuplicated_before__
+                <select id="autoAttachOnDuplicated">
+                  <option value="-1">__MSG_config_autoAttachOnDuplicated_noControl__</option>
+                  <option value="0">__MSG_config_autoAttachOnDuplicated_independent__</option>
+                  <option value="6">__MSG_config_autoAttachOnDuplicated_childTop__</option>
+                  <option value="7">__MSG_config_autoAttachOnDuplicated_childEnd__</option>
+                  <option value="2">__MSG_config_autoAttachOnDuplicated_sibling__</option>
+                  <option value="3">__MSG_config_autoAttachOnDuplicated_nextSibling__ __MSG_config_recommended_choice__</option>
+                </select>
+                __MSG_config_autoAttachOnDuplicated_after__
+              <span class="preview-image"></span></label></p>
+      <p><label>__MSG_config_sameSiteOrphan_caption__: __MSG_config_autoAttachSameSiteOrphan_before__
+                <select id="autoAttachSameSiteOrphan">
+                  <option value="-1">__MSG_config_autoAttachSameSiteOrphan_noControl__</option>
+                  <option value="0">__MSG_config_autoAttachSameSiteOrphan_independent__</option>
+                  <option value="6">__MSG_config_autoAttachSameSiteOrphan_childTop__</option>
+                  <option value="7">__MSG_config_autoAttachSameSiteOrphan_childEnd__ __MSG_config_recommended_choice__</option>
+                  <option value="2">__MSG_config_autoAttachSameSiteOrphan_sibling__</option>
+                  <option value="3">__MSG_config_autoAttachSameSiteOrphan_nextSibling__</option>
+                </select>
+                __MSG_config_autoAttachSameSiteOrphan_after__
+              <span class="preview-image"></span></label></p>
+      <p class="sub"
+        ><label>__MSG_config_inheritContextualIdentityToSameSiteOrphanMode_label__
+                <select id="inheritContextualIdentityToSameSiteOrphanMode">
+                  <option value="0">__MSG_config_inheritContextualIdentityToSameSiteOrphanMode_default__</option>
+                  <option value="1">__MSG_config_inheritContextualIdentityToSameSiteOrphanMode_parent__</option>
+                  <option value="2">__MSG_config_inheritContextualIdentityToSameSiteOrphanMode_lastActive__</option>
+                </select></label></p>
+      <p><label>__MSG_config_fromExternal_caption__: __MSG_config_autoAttachOnOpenedFromExternal_before__
+                <select id="autoAttachOnOpenedFromExternal">
+                  <option value="-1">__MSG_config_autoAttachOnOpenedFromExternal_noControl__ __MSG_config_recommended_choice__</option>
+                  <option value="0">__MSG_config_autoAttachOnOpenedFromExternal_independent__</option>
+                  <option value="6">__MSG_config_autoAttachOnOpenedFromExternal_childTop__</option>
+                  <option value="7">__MSG_config_autoAttachOnOpenedFromExternal_childEnd__</option>
+                  <option value="2">__MSG_config_autoAttachOnOpenedFromExternal_sibling__</option>
+                  <option value="3">__MSG_config_autoAttachOnOpenedFromExternal_nextSibling__</option>
+                </select>
+                __MSG_config_autoAttachOnOpenedFromExternal_after__
+              <span class="preview-image"></span></label></p>
+      <p class="sub"
+        ><label>__MSG_config_inheritContextualIdentityToTabsFromExternalMode_label__
+                <select id="inheritContextualIdentityToTabsFromExternalMode">
+                  <option value="0">__MSG_config_inheritContextualIdentityToTabsFromExternalMode_default__</option>
+                  <option value="1">__MSG_config_inheritContextualIdentityToTabsFromExternalMode_parent__</option>
+                  <option value="2">__MSG_config_inheritContextualIdentityToTabsFromExternalMode_lastActive__</option>
+                </select></label></p>
+      <p><label><input id="inheritContextualIdentityToUnopenableURLTabs"
+                       type="checkbox">
+                __MSG_config_inheritContextualIdentityToUnopenableURLTabs_label__</label></p>
+      <hr>
+      <p><label>__MSG_config_anyOtherTrigger_caption__: __MSG_config_autoAttachOnAnyOtherTrigger_before__
+                <select id="autoAttachOnAnyOtherTrigger">
+                  <option value="-1">__MSG_config_autoAttachOnAnyOtherTrigger_noControl__ __MSG_config_recommended_choice__</option>
+                  <option value="0">__MSG_config_autoAttachOnAnyOtherTrigger_independent__</option>
+                  <option value="6">__MSG_config_autoAttachOnAnyOtherTrigger_childTop__</option>
+                  <option value="7">__MSG_config_autoAttachOnAnyOtherTrigger_childEnd__</option>
+                  <option value="2">__MSG_config_autoAttachOnAnyOtherTrigger_sibling__</option>
+                  <option value="3">__MSG_config_autoAttachOnAnyOtherTrigger_nextSibling__</option>
+                </select>
+                __MSG_config_autoAttachOnAnyOtherTrigger_after__
+              <span class="preview-image"></span></label>
+              <strong>__MSG_config_autoAttachOnAnyOtherTrigger_caution__</strong></p>
+      <p class="sub autoAttachOnAnyOtherTrigger"
+        ><label>__MSG_config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_label__
+                <select id="inheritContextualIdentityToTabsFromAnyOtherTriggerMode">
+                  <option value="0">__MSG_config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_default__</option>
+                  <option value="1">__MSG_config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_parent__</option>
+                  <option value="2">__MSG_config_inheritContextualIdentityToTabsFromAnyOtherTriggerMode_lastActive__</option>
+                </select></label></p>
+    </fieldset>
+
+    <fieldset id="autoGroupNewTabsSection">
+      <legend>__MSG_config_groupTab_caption__</legend>
+      <p><label id="autoGroupNewTabsFromBookmarks_label"
+                class="has-checkbox"
+               ><input id="bookmarksPermissionGranted_autoGroup"
+                       type="checkbox">
+                __MSG_config_tabBunchesDetectionTimeout_before__
+                <label><input id="tabBunchesDetectionTimeout"
+                              type="number"
+                              class="with-bookmarks-permission"
+                              size="4">
+                       __MSG_config_tabBunchesDetectionTimeout_after__</label>
+                </label></p>
+      <p class="sub with-bookmarks-permission"
+        ><label><input id="autoGroupNewTabsFromBookmarks"
+                       type="checkbox"
+                       class="require-bookmarks-permission"
+                       data-request-permission-message="__MSG_config_requireBookmarksPermission_tooltiptext__">
+                __MSG_config_autoGroupNewTabsFromBookmarks_label__</label></p>
+      <p class="sub with-bookmarks-permission"
+        ><label><input id="restoreTreeForTabsFromBookmarks"
+                       type="checkbox"
+                       class="require-bookmarks-permission"
+                       data-request-permission-message="__MSG_config_requireBookmarksPermission_tooltiptext__">
+                __MSG_config_restoreTreeForTabsFromBookmarks_label__</label></p>
+      <p class="sub with-bookmarks-permission"
+        ><label>__MSG_config_tabsFromSameFolderMinThresholdPercentage_before__
+                <input id="tabsFromSameFolderMinThresholdPercentage"
+                       type="number"
+                       size="3"
+                       max="100"
+                       min="0">
+                __MSG_config_tabsFromSameFolderMinThresholdPercentage_after__</label></p>
+      <p><label class="has-checkbox"
+               ><input id="autoGroupNewTabsFromOthers"
+                       type="checkbox">
+                __MSG_config_autoGroupNewTabsFromOthers_label__</label></p>
+      <p class="sub"><label>__MSG_config_tabBunchesDetectionDelayOnNewWindow_before__
+                            <input id="tabBunchesDetectionDelayOnNewWindow"
+                                   type="number"
+                                   size="4">
+                            __MSG_config_tabBunchesDetectionDelayOnNewWindow_after__</label></p>
+      <p class="sub"><label class="has-checkbox"
+                           ><input id="warnOnAutoGroupNewTabs"
+                                   type="checkbox">
+                            __MSG_config_warnOnAutoGroupNewTabs_label__</label></p>
+      <div class="sub">
+        <p class="sub"><label class="has-checkbox"
+          ><input id="warnOnAutoGroupNewTabsWithListing"
+                  type="checkbox">
+           __MSG_config_warnOnAutoGroupNewTabsWithListing_label__</label></p>
+      </div>
+      <hr>
+      <p><label class="has-checkbox"
+               ><input id="renderTreeInGroupTabs"
+                       type="checkbox">
+                __MSG_config_renderTreeInGroupTabs_label__</p>
+    </fieldset>
+
+    <fieldset>
+      <legend>__MSG_config_groupTabTemporaryState_caption__</legend>
+      <p><label>__MSG_config_groupTabTemporaryStateForNewTabsFromBookmarks_label__
+                <select id="groupTabTemporaryStateForNewTabsFromBookmarks">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+      <p><label>__MSG_config_groupTabTemporaryStateForNewTabsFromOthers_label__
+                <select id="groupTabTemporaryStateForNewTabsFromOthers">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+      <p><label>__MSG_config_groupTabTemporaryStateForOrphanedTabs_label__
+                <select id="groupTabTemporaryStateForOrphanedTabs">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+      <p><label>__MSG_config_groupTabTemporaryStateForAPI_label__
+                <select id="groupTabTemporaryStateForAPI">
+                  <option value="0">__MSG_config_groupTabTemporaryState_option_default__</option>
+                  <option value="1">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporary_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                  <option value="2">__MSG_config_groupTabTemporaryState_option_checked_before__
+                                    __MSG_groupTab_temporaryAggressive_label__
+                                    __MSG_config_groupTabTemporaryState_option_checked_after__</option>
+                </select></label></p>
+    </fieldset>
+
+    </div>
+
+    </section>
+
+
+    <section id="section-treeBehavior">
+    <h1>__MSG_config_treeBehavior_caption__</h1>
+
+    <div class="expert">
+    <p><label class="has-checkbox"
+             ><input id="autoCollapseExpandSubtreeOnAttach"
+                     type="checkbox">
+             __MSG_config_autoCollapseExpandSubtreeOnAttach_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="autoCollapseExpandSubtreeOnSelect"
+                     type="checkbox">
+             __MSG_config_autoCollapseExpandSubtreeOnSelect_label__</label></p>
+    <p class="sub">
+       <label class="has-checkbox"
+             ><input
+                     id="autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove"
+                     type="checkbox">
+             __MSG_config_autoCollapseExpandSubtreeOnSelectExceptActiveTabRemove_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="unfocusableCollapsedTab"
+                     type="checkbox">
+             __MSG_config_unfocusableCollapsedTab_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="autoDiscardTabForUnexpectedFocus"
+                     type="checkbox">
+             __MSG_config_autoDiscardTabForUnexpectedFocus_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="avoidDiscardedTabToBeActivatedIfPossible"
+                     type="checkbox">
+             __MSG_config_avoidDiscardedTabToBeActivatedIfPossible_label__</label></p>
+    </div>
+
+    <p><label class="has-checkbox"
+             ><input id="allUrlsPermissionGranted_ctrlTabTracking"
+                     type="checkbox"
+                     data-related-config-key="skipCollapsedTabsForTabSwitchingShortcuts">
+              __MSG_config_requestPermissions_allUrls_ctrlTabTracking__</label></p>
+    <div id="ctrlTabSubItemsContainer" class="expert">
+      <p class="sub"><label class="has-checkbox"
+                           ><input id="autoExpandOnTabSwitchingShortcuts"
+                                   type="checkbox">
+                            __MSG_config_autoExpandOnTabSwitchingShortcutsDelay_before__
+                            <input id="autoExpandOnTabSwitchingShortcutsDelay"
+                                   size="20">
+                             __MSG_config_autoExpandOnTabSwitchingShortcutsDelay_after__</label></p>
+      <p class="sub"><label>__MSG_config_accelKey_label__
+                            <select id="accelKey">
+                              <option value="">__MSG_config_accelKey_auto__</option>
+                              <option value="alt">__MSG_config_accelKey_alt__</option>
+                              <option value="control">__MSG_config_accelKey_control__</option>
+                              <option value="meta">__MSG_config_accelKey_meta__</option>
+                            </select></label></p>
+    </div>
+
+    <fieldset>
+      <legend>__MSG_config_treeDoubleClickBehavior_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="treeDoubleClickBehavior" value="1">
+              __MSG_config_treeDoubleClickBehavior_toggleCollapsed__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="treeDoubleClickBehavior" value="4">
+              __MSG_config_treeDoubleClickBehavior_toggleSticky__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="treeDoubleClickBehavior" value="3">
+              __MSG_config_treeDoubleClickBehavior_close__ __MSG_config_treeDoubleClickBehavior_close_note__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="treeDoubleClickBehavior" value="0">
+              __MSG_config_treeDoubleClickBehavior_none__</label></li>
+      </ul>
+    </fieldset>
+    <fieldset>
+      <legend>__MSG_config_successorTabControlLevel_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="successorTabControlLevel" value="2">
+              __MSG_config_successorTabControlLevel_inTree__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="successorTabControlLevel" value="1">
+              __MSG_config_successorTabControlLevel_simulateDefault__</label></li>
+        <li class="with-successor-tab-support"><label class="has-radio"
+                  ><input type="radio"
+                          name="successorTabControlLevel" value="0">
+              __MSG_config_successorTabControlLevel_never__</label></li>
+      </ul>
+      <p class="without-successor-tab-support">__MSG_config_successorTabControlLevel_legacyDescription__</p>
+      <p class="with-successor-tab-support">
+        <label class="has-checkbox"
+              ><input id="simulateSelectOwnerOnClose"
+                      type="checkbox">
+               __MSG_config_simulateSelectOwnerOnClose_label__</label></p>
+    </fieldset>
+    <fieldset id="parentTabOperationBehaviorModeGroup">
+      <legend>__MSG_config_parentTabOperationBehaviorMode_caption__</legend>
+      <p style="white-space: pre-wrap">__MSG_config_parentTabOperationBehaviorMode_noteForPermanentlyConsistentBehaviors__</p>
+      <hr>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="parentTabOperationBehaviorMode" value="0">
+              <em>__MSG_config_parentTabOperationBehaviorMode_parallel__</em></label>
+          <div class="sub">
+            <p>__MSG_config_closeParentBehavior_insideSidebar__</p>
+            <ul>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded0" value="5">
+                    __MSG_config_closeParentBehavior_replaceWithGroupTab__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded0" value="3">
+                    __MSG_config_closeParentBehavior_promoteFirst__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded0" value="0">
+                    __MSG_config_closeParentBehavior_promoteAll__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded0" value="6">
+                    __MSG_config_closeParentBehavior_promoteIntelligently__</label></li>
+            </ul>
+            <hr>
+            <p>__MSG_config_closeParentBehavior_outsideSidebar__</p>
+            <ul>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_outsideSidebar_expanded"
+                                name="closeParentBehavior_outsideSidebar_expanded0" value="5">
+                    __MSG_config_closeParentBehavior_replaceWithGroupTab__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_outsideSidebar_expanded"
+                                name="ccloseParentBehavior_outsideSidebar_expanded0" value="3">
+                    __MSG_config_closeParentBehavior_promoteFirst__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_outsideSidebar_expanded"
+                                name="closeParentBehavior_outsideSidebar_expanded0" value="0">
+                    __MSG_config_closeParentBehavior_promoteAll__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_outsideSidebar_expanded"
+                                name="closeParentBehavior_outsideSidebar_expanded0" value="6">
+                    __MSG_config_closeParentBehavior_promoteIntelligently__</label></li>
+            </ul>
+            <hr>
+            <p>__MSG_config_moveParentBehavior_outsideSidebar__</p>
+            <ul>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="moveParentBehavior_outsideSidebar_expanded"
+                                name="moveParentBehavior_outsideSidebar_expanded0" value="2">
+                    __MSG_config_moveParentBehavior_entireTree__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="moveParentBehavior_outsideSidebar_expanded"
+                                name="moveParentBehavior_outsideSidebar_expanded0" value="5">
+                    __MSG_config_moveParentBehavior_replaceWithGroupTab__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="moveParentBehavior_outsideSidebar_expanded"
+                                name="cmoveParentBehavior_outsideSidebar_expanded0" value="3">
+                    __MSG_config_moveParentBehavior_promoteFirst__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="moveParentBehavior_outsideSidebar_expanded"
+                                name="moveParentBehavior_outsideSidebar_expanded0" value="0">
+                    __MSG_config_moveParentBehavior_promoteAll__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="moveParentBehavior_outsideSidebar_expanded"
+                                name="moveParentBehavior_outsideSidebar_expanded0" value="6">
+                    __MSG_config_moveParentBehavior_promoteIntelligently__</label></li>
+            </ul>
+          </div>
+        </li>
+        <li><label class="has-radio"
+                  ><input
+                    type="radio"
+                    name="parentTabOperationBehaviorMode" value="1">
+              <em>__MSG_config_parentTabOperationBehaviorMode_consistent__</em></label>
+          <div class="sub">
+            <p>__MSG_config_parentTabOperationBehaviorMode_consistent_caption__</p>
+            <ul>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded1" value="5">
+                    __MSG_config_parentTabOperationBehavior_replaceWithGroupTab__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded1" value="3">
+                    __MSG_config_parentTabOperationBehavior_promoteFirst__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded1" value="0">
+                    __MSG_config_parentTabOperationBehavior_promoteAll__</label></li>
+              <li><label class="has-radio"
+                        ><input type="radio"
+                                data-config-key="closeParentBehavior_insideSidebar_expanded"
+                                name="closeParentBehavior_insideSidebar_expanded1" value="6">
+                    __MSG_config_parentTabOperationBehavior_promoteIntelligently__</label></li>
+            </ul>
+            <p>__MSG_config_parentTabOperationBehaviorMode_consistent_notes__</p>
+          </div>
+        </li>
+        <li class="expert"
+           ><label class="has-radio"
+                  ><input
+                    type="radio"
+                    name="parentTabOperationBehaviorMode" value="-1">
+              <em>__MSG_config_parentTabOperationBehaviorMode_custom__</em></label>
+          <div class="sub">
+            <p>
+            <label>__MSG_config_closeParentBehavior_insideSidebar_expanded_caption__
+              <select id="closeParentBehavior_insideSidebar_expanded2" data-config-key="closeParentBehavior_insideSidebar_expanded">
+                <option value="2">__MSG_config_closeParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_closeParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_closeParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_closeParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_closeParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_closeParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <hr>
+            <p>
+            <label>__MSG_config_closeParentBehavior_outsideSidebar_collapsed_caption__
+              <select id="closeParentBehavior_outsideSidebar_collapsed2" data-config-key="closeParentBehavior_outsideSidebar_collapsed">
+                <option value="2">__MSG_config_closeParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_closeParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_closeParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_closeParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_closeParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_closeParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <p class="sub">
+            <label>__MSG_config_closeParentBehavior_noSidebar_collapsed_caption__
+              <select id="closeParentBehavior_noSidebar_collapsed2" data-config-key="closeParentBehavior_noSidebar_collapsed">
+                <option value="2">__MSG_config_closeParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_closeParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_closeParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_closeParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_closeParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_closeParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <hr>
+            <p>
+            <label>__MSG_config_closeParentBehavior_outsideSidebar_expanded_caption__
+              <select id="closeParentBehavior_outsideSidebar_expanded2" data-config-key="closeParentBehavior_outsideSidebar_expanded">
+                <option value="2">__MSG_config_closeParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_closeParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_closeParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_closeParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_closeParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_closeParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <p class="sub">
+            <label>__MSG_config_closeParentBehavior_noSidebar_expanded_caption__
+              <select id="closeParentBehavior_noSidebar_expanded2" data-config-key="closeParentBehavior_noSidebar_expanded">
+                <option value="2">__MSG_config_closeParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_closeParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_closeParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_closeParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_closeParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_closeParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <hr>
+            <p>
+            <label>__MSG_config_moveParentBehavior_outsideSidebar_collapsed_caption__
+              <select id="moveParentBehavior_outsideSidebar_collapsed2" data-config-key="moveParentBehavior_outsideSidebar_collapsed">
+                <option value="2">__MSG_config_moveParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_moveParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_moveParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_moveParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_moveParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_moveParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <p class="sub">
+            <label>__MSG_config_moveParentBehavior_noSidebar_collapsed_caption__
+              <select id="moveParentBehavior_noSidebar_collapsed2" data-config-key="moveParentBehavior_noSidebar_collapsed">
+                <option value="2">__MSG_config_moveParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_moveParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_moveParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_moveParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_moveParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_moveParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <hr>
+            <p>
+            <label>__MSG_config_moveParentBehavior_outsideSidebar_expanded_caption__
+              <select id="moveParentBehavior_outsideSidebar_expanded2" data-config-key="moveParentBehavior_outsideSidebar_expanded">
+                <option value="2">__MSG_config_moveParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_moveParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_moveParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_moveParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_moveParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_moveParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+            <p class="sub">
+            <label>__MSG_config_moveParentBehavior_noSidebar_expanded_caption__
+              <select id="moveParentBehavior_noSidebar_expanded2" data-config-key="moveParentBehavior_noSidebar_expanded">
+                <option value="2">__MSG_config_moveParentBehavior_entireTree__</option>
+                <option value="5">__MSG_config_moveParentBehavior_replaceWithGroupTab__</option>
+                <option value="3">__MSG_config_moveParentBehavior_promoteFirst__</option>
+                <option value="0">__MSG_config_moveParentBehavior_promoteAll__</option>
+                <option value="6">__MSG_config_moveParentBehavior_promoteIntelligently__</option>
+                <option value="1">__MSG_config_moveParentBehavior_detach__</option>
+              </select>
+            </label>
+            </p>
+          </div>
+        </li>
+      </ul>
+    </fieldset>
+    <fieldset>
+      <legend>__MSG_config_fixupTreeOnTabVisibilityChanged_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="fixupTreeOnTabVisibilityChanged" value="true">
+              __MSG_config_fixupTreeOnTabVisibilityChanged_fix__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="fixupTreeOnTabVisibilityChanged" value="false">
+              __MSG_config_fixupTreeOnTabVisibilityChanged_keep__</label></li>
+      </ul>
+    </fieldset>
+
+    <fieldset class="expert">
+      <legend>__MSG_config_insertNewChildAt_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewChildAt" value="-1">
+              __MSG_config_insertNewChildAt_noControl__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewChildAt" value="3">
+              __MSG_config_insertNewChildAt_nextToLastRelatedTab__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewChildAt" value="0">
+              __MSG_config_insertNewChildAt_top__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertNewChildAt" value="1">
+              __MSG_config_insertNewChildAt_end__</label></li>
+      </ul>
+    </fieldset>
+    </section>
+
+
+    <section id="section-drag">
+    <h1>__MSG_config_drag_caption__</h1>
+    <fieldset class="tabDragBehaviorConfigs" id="tabDragBehaviorConfigsGroup">
+      <legend>__MSG_config_tabDragBehavior_caption__</legend>
+      <p>__MSG_config_tabDragBehavior_description__</p>
+      <table>
+        <thead>
+          <tr>
+            <th>__MSG_config_tabDragBehavior_label__</th>
+            <th>__MSG_config_tabDragBehaviorShift_label__</th>
+            <th>__MSG_config_tabDragBehavior_label_behaviorInsideSidebar__</th>
+            <th>__MSG_config_tabDragBehavior_label_behaviorOutsideSidebar__</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_tearoff_tree"
+                              type="radio"
+                              value="13"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="13"></label></td>
+            <th rowspan="3"><label for="tabDragBehavior_tearoff_tree">__MSG_config_tabDragBehavior_moveEntireTreeAlways__</label></th>
+            <th><label for="tabDragBehavior_tearoff_tree">__MSG_config_tabDragBehavior_detachEntireTreeAlways__</label></th>
+          </tr>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_bookmark_tree"
+                              type="radio"
+                              value="11"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="11"></label></td>
+            <th><label for="tabDragBehavior_bookmark_tree">__MSG_config_tabDragBehavior_bookmarkEntireTreeAlways__</label></th>
+          </tr>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_none_tree"
+                              type="radio"
+                              value="9"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="9"></label></td>
+            <th><label for="tabDragBehavior_none">__MSG_config_tabDragBehavior_doNothing__</label></th>
+          </tr>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_tearoff_tab"
+                              type="radio"
+                              value="12"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="12"></label></td>
+            <th rowspan="3"><label for="tabDragBehavior_tearoff_tab">__MSG_config_tabDragBehavior_moveSoloTabIfExpanded__</label></th>
+            <th><label for="tabDragBehavior_tearoff_tab">__MSG_config_tabDragBehavior_detachSoloTabIfExpanded__</label></th>
+          </tr>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_bookmark_tab"
+                              type="radio"
+                              value="10"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="10"></label></td>
+            <th><label for="tabDragBehavior_bookmark_tab">__MSG_config_tabDragBehavior_bookmarkSoloTabIfExpanded__</label></th>
+          </tr>
+          <tr>
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_none_tab"
+                              type="radio"
+                              value="8"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="8"></label></td>
+            <th><label for="tabDragBehavior_none">__MSG_config_tabDragBehavior_doNothing__</label></th>
+          </tr>
+          <tr class="expert">
+            <td><label><input name="tabDragBehavior" id="tabDragBehavior_none_none"
+                              type="radio"
+                              value="0"></label></td>
+            <td><label><input name="tabDragBehaviorShift"
+                              type="radio"
+                              value="0"></label></td>
+            <th><label for="tabDragBehavior_none_none">__MSG_config_tabDragBehavior_doNothing__</label></th>
+            <th><label for="tabDragBehavior_none_none">__MSG_config_tabDragBehavior_doNothing__</label></th>
+          </tr>
+        </tbody>
+      </table>
+      <p class="expert"
+        ><label class="has-checkbox"
+               ><input id="showTabDragBehaviorNotification"
+                       type="checkbox">
+               <img src="tab-drag-behavior-notification.png" alt=""/>
+               __MSG_config_showTabDragBehaviorNotification_label__</label></p>
+      <p>__MSG_config_tabDragBehavior_noteForDragstartOutsideSidebar__</p>
+    </fieldset>
+    <div class="expert">
+    <fieldset>
+      <legend>__MSG_config_dropLinksOnTabBehavior_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="dropLinksOnTabBehavior" value="0">
+              __MSG_config_dropLinksOnTabBehavior_ask__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="dropLinksOnTabBehavior" value="1">
+              __MSG_config_dropLinksOnTabBehavior_load__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="dropLinksOnTabBehavior" value="2">
+              __MSG_config_dropLinksOnTabBehavior_newtab__</label></li>
+      </ul>
+      <hr>
+      <p><label class="has-checkbox"
+               ><input id="simulateTabsLoadInBackgroundInverted"
+                       type="checkbox">
+                __MSG_config_simulateTabsLoadInBackgroundInverted_label__</label></p>
+      <p class="sub"
+        ><label class="has-checkbox"
+               ><input id="tabsLoadInBackgroundDiscarded"
+                       type="checkbox">
+                __MSG_config_tabsLoadInBackgroundDiscarded_label__</label></p>
+    </fieldset>
+    <fieldset>
+      <legend>__MSG_config_insertDroppedTabsAt_caption__</legend>
+      <ul>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertDroppedTabsAt" value="-2">
+              __MSG_config_insertDroppedTabsAt_inherit__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertDroppedTabsAt" value="0">
+              __MSG_config_insertDroppedTabsAt_first__</label></li>
+        <li><label class="has-radio"
+                  ><input type="radio"
+                          name="insertDroppedTabsAt" value="1">
+              __MSG_config_insertDroppedTabsAt_end__</label></li>
+      </ul>
+    </fieldset>
+    </div>
+    <p><label class="has-checkbox"
+             ><input id="autoCreateFolderForBookmarksFromTree"
+                     type="checkbox">
+              __MSG_config_autoCreateFolderForBookmarksFromTree_label__</label></p>
+    <div class="expert">
+    <p><label class="has-checkbox"
+             ><input id="autoExpandOnLongHover"
+                     type="checkbox">
+              __MSG_config_autoExpandOnLongHoverDelay_before__
+              <input id="autoExpandOnLongHoverDelay"
+                     size="20">
+               __MSG_config_autoExpandOnLongHoverDelay_after__</label></p>
+    <p class="sub"><label class="has-checkbox"
+                         ><input id="autoExpandOnLongHoverRestoreIniitalState"
+                                 type="checkbox">
+                          __MSG_config_autoExpandOnLongHoverRestoreIniitalState_label__</label></p>
+    <p class="sub"><label class="has-checkbox"
+                         ><input id="autoExpandIntelligently"
+                                 type="checkbox">
+                          __MSG_config_autoExpandIntelligently_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="ignoreTabDropNearSidebarArea"
+                     type="checkbox">
+              __MSG_config_ignoreTabDropNearSidebarArea_label__</label></p>
+    </div>
+    </section>
+
+
+    <section id="section-advanced">
+    <h1>__MSG_config_advanced_caption__</h1>
+    <p><label class="has-checkbox"
+             ><input id="warnOnCloseTabs"
+                     type="checkbox">
+              __MSG_config_warnOnCloseTabs_label__</label></p>
+    <p class="sub"><label class="has-checkbox"
+             ><input id="warnOnCloseTabsByClosebox"
+                     type="checkbox">
+              __MSG_config_warnOnCloseTabsByClosebox_label__</label></p>
+    <div class="expert">
+    <p class="sub"><label class="has-checkbox"
+             ><input id="warnOnCloseTabsWithListing"
+                     type="checkbox">
+              __MSG_config_warnOnCloseTabsWithListing_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="useCachedTree"
+                     type="checkbox">
+             __MSG_config_useCachedTree_label__</label></p>
+    <div class="sub">
+      <p>__MSG_config_useCachedTree_description__</p>
+      <p><label class="has-checkbox"
+               ><input id="persistCachedTree"
+                       type="checkbox">
+               __MSG_config_persistCachedTree_label__</label></p>
+      <p class="sub">__MSG_config_persistCachedTree_description__</p>
+    </div>
+    <p><label class="has-checkbox"
+             ><input id="tabGroupsEnabled"
+                     type="checkbox">
+              __MSG_config_tabGroupsEnabled_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="undoMultipleTabsClose"
+                     type="checkbox">
+              __MSG_config_undoMultipleTabsClose_label__</label></p>
+    </div>
+    <p><label class="has-checkbox"
+             ><input id="bookmarksPermissionGranted_context"
+                     type="checkbox">
+                     __MSG_config_requestPermissions_bookmarks_context__</label></p>
+    <div class="expert">
+    <p><label>__MSG_config_scrollLines_label_before__
+              <input id="scrollLines"
+                     type="number"
+                     size="5">
+             __MSG_config_scrollLines_label_after__</label></p>
+    </div>
+    <fieldset>
+      <legend>__MSG_config_userStyleRules_label__</legend>
+      <p>__MSG_config_userStyleRules_description_before__
+         <a href="__MSG_config_userStyleRules_description_link_uri__" target="_blank">__MSG_config_userStyleRules_description_link_label__</a>
+         __MSG_config_userStyleRules_description_after__</p>
+      <div id="browserThemeCustomRulesBlock">
+        <p>__MSG_config_userStyleRules_themeRules_description__</p>
+        <pre id="browserThemeCustomRules"></pre>
+        <p>__MSG_config_userStyleRules_themeRules_description_alphaVariations__</p>
+      </div>
+      <p id="tooLargeUserStyleRulesCaution">__MSG_config_tooLargeUserStyleRulesCaution__</p>
+      <div id="userStyleRulesField"
+           contenteditable="true"
+           style="height: 10em; width: 100%;"></div>
+      <div id="userStyleRules-footer-bar">
+        <button id="userStyleRules-export">__MSG_config_userStyleRules_export__</button>
+        <a id="userStyleRules-export-file"
+           type="text/css"
+           download="treestyletab.css"
+           style="display:none"></a>
+        <button id="userStyleRules-import">__MSG_config_userStyleRules_import__</button>
+        <input id="userStyleRules-import-file"
+               type="file"
+               accept="text/css,text/plain,image/*"
+               style="display:none">
+        <span class="spacer"></span>
+        <label>
+          __MSG_config_userStyleRulesTheme_label__
+          <select id="userStyleRulesFieldTheme">
+            <option value="auto">__MSG_config_userStyleRulesTheme_auto__</option>
+            <option disabled="true">__MSG_config_userStyleRulesTheme_separator__</option>
+            <option value="default">__MSG_config_userStyleRulesTheme_default__</option>
+          </select>
+        </label>
+      </div>
+    </fieldset>
+    </section>
+
+    <section id="section-addons">
+    <h1>__MSG_config_addons_caption__</h1>
+    <p>__MSG_config_addons_description_before__
+       <a href="__MSG_helper_addons_list_link_uri__" target="_blank">__MSG_config_addons_description_link_label__</a>
+       __MSG_config_addons_description_after__</p>
+    <fieldset id="externalAddonPermissionsGroup">
+      <legend>__MSG_config_externalAddonPermissions_label__</legend>
+      <p id="externalAddonPermissionsGroupDescription"></p>
+      <table>
+        <thead>
+          <tr>
+            <th>__MSG_config_externalAddonPermissions_header_name__</th>
+            <th>__MSG_config_externalAddonPermissions_header_incognito__</th>
+            <th>__MSG_config_externalAddonPermissions_header_permissions__</th>
+          </tr>
+        </thead>
+        <tbody id="externalAddonPermissions"></tbody>
+      </table>
+    </fieldset>
+
+    <fieldset>
+      <legend><a href="__MSG_addon_containerBookmarks_uri__"
+                 target="_blank">__MSG_addon_containerBookmarks_label__</a></legend>
+      <p><label>__MSG_config_containerRedirectKey_label__
+                <br/>
+                <input id="containerRedirectKey"
+                       type="text"
+                       style="width: 100%"></label></p>
+    </fieldset>
+    </section>
+
+    <hr/>
+
+    <section id="section-debug">
+    <h1>__MSG_config_debug_caption__</h1>
+    <ul class="expert">
+      <li><a id="link-optionsPage" target="_blank">__MSG_config_title__</a>
+      <li><a id="link-startupPage" target="_blank">__MSG_config_link_startupPage_label__</a></li>
+      <li><a id="link-groupPage" target="_blank">__MSG_config_link_groupPage_label__</a></li>
+      <li><a id="link-tabbarPage" target="_blank">__MSG_config_link_tabbarPage_label__</a></li>
+      <li><a id="link-runTests" target="_blank">__MSG_config_runTests_label__</a>
+          <label>__MSG_config_runTestsParameters_label__<input id="runTestsParameters" type="text" size="30"></label></li>
+      <li><a id="link-runBenchmark" target="_blank">__MSG_config_runBenchmark_label__</a>
+        <ul>
+          <li><label class="has-checkbox"
+                    ><input id="tabHidePermissionGranted"
+                            type="checkbox">
+                __MSG_config_requestPermissions_tabHide__</label></li>
+        </ul>
+      </li>
+    </ul>
+    <p>__MSG_config_colorScheme_caption__
+       <label class="has-radio"
+             ><input type="radio"
+                     name="colorScheme" value="photon">
+         __MSG_config_colorScheme_photon__</label>
+       <label class="has-radio"
+             ><input type="radio"
+                     name="colorScheme" value="system-color">
+         __MSG_config_colorScheme_systemColor__</label>
+    </p>
+    <div class="expert">
+    <p><label class="has-checkbox"
+             ><input id="enableLinuxBehaviors"
+                     type="checkbox">
+             __MSG_config_enableLinuxBehaviors_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="enableMacOSBehaviors"
+                     type="checkbox">
+             __MSG_config_enableMacOSBehaviors_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="enableWindowsBehaviors"
+                     type="checkbox">
+             __MSG_config_enableWindowsBehaviors_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="simulateSVGContextFill"
+                     type="checkbox">
+             __MSG_config_simulateSVGContextFill_label__</label></p>
+    <p><label class="has-checkbox"
+             ><input id="acceleratedTabCreation"
+                     type="checkbox">
+             __MSG_config_acceleratedTabCreation_label__</label></p>
+    <p><label>__MSG_config_maximumAcceptableDelayForTabDuplication_before__
+              <input id="maximumAcceptableDelayForTabDuplication"
+                     type="number"
+                     size="6">
+             __MSG_config_maximumAcceptableDelayForTabDuplication_after__</label></p>
+    <p><label>__MSG_config_delayForDuplicatedTabDetection_label_before__
+              <input id="delayForDuplicatedTabDetection"
+                     type="number"
+                     size="6"
+                     min="0">
+             __MSG_config_delayForDuplicatedTabDetection_label_after__</label></p>
+    <p class="sub"
+      ><button id="delayForDuplicatedTabDetection_autoDetectButton">__MSG_config_delayForDuplicatedTabDetection_autoDetect__</button>
+       <button id="delayForDuplicatedTabDetection_testButton">__MSG_config_delayForDuplicatedTabDetection_test__</button>
+       <em id="delayForDuplicatedTabDetection_testResult"></em></p>
+    <p><label class="has-checkbox inline"
+             ><input id="loggingQueries"
+                     type="checkbox">
+              __MSG_config_loggingQueries_label__</label>
+       <label class="has-checkbox inline"
+             ><input id="loggingConnectionMessages"
+                     type="checkbox">
+              __MSG_config_loggingConnectionMessages_label__</label>
+       <button id="showLogsButton">__MSG_config_showLogsButton_label__</button></p>
+    </div>
+    <p><label class="has-checkbox"
+             ><input id="debug"
+                     type="checkbox">
+             __MSG_config_debug_label__</label></p>
+    <fieldset id="group-logFor" class="collapsible collapsed">
+      <legend>__MSG_config_log_caption__</legend>
+      <p><label class="has-checkbox"
+               ><input id="logTimestamp"
+                       type="checkbox">
+               __MSG_config_logTimestamp_label__</label></p>
+      <!-- <p>git grep configs.logFor | grep -v common.js | cut -d "'" -f 2 | sed -r -e 's;^(.+)$;            <p><label class="has-checkbox"><input
+                     id="logFor-\1" type="checkbox">\1</label></p>;' -->
+      <fieldset>
+        <legend><label class="has-checkbox"><input id="logFor-common" type="checkbox">__MSG_config_logFor_common__</label></legend>
+          <p><label class="has-checkbox"><input id="logFor-common/TreeItem" type="checkbox">common/TreeItem</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/Window" type="checkbox">common/Window</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/api-tabs" type="checkbox">common/api-tabs</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/bookmark" type="checkbox">common/bookmark</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/contextual-identities" type="checkbox">common/contextual-identities</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/dialog" type="checkbox">common/dialog</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/permissions" type="checkbox">common/permissions</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/sidebar-connection" type="checkbox">common/sidebar-connection</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/sync" type="checkbox">common/sync</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/tabs-internal-operation" type="checkbox">common/tabs-internal-operation</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/tabs-update" type="checkbox">common/tabs-update</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/tree-behavior" type="checkbox">common/tree-behavior</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/tst-api" type="checkbox">common/tst-api</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/unique-id" type="checkbox">common/unique-id</label></p>
+          <p><label class="has-checkbox"><input id="logFor-common/user-operation-blocker" type="checkbox">common/user-operation-blocker</label></p>
+      </fieldset>
+      <fieldset>
+        <legend><label class="has-checkbox"><input id="logFor-background" type="checkbox">__MSG_config_logFor_background__</label></legend>
+          <p><label class="has-checkbox"><input id="logFor-background/api-tabs-listener" type="checkbox">background/api-tabs-listener</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/background-cache" type="checkbox">background/background-cache</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/background" type="checkbox">background/background</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/browser-action-menu" type="checkbox">background/browser-action-menu</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/commands" type="checkbox">background/commands</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/context-menu" type="checkbox">background/context-menu</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-misc" type="checkbox">background/handle-misc</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-moved-tabs" type="checkbox">background/handle-moved-tabs</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-new-tabs" type="checkbox">background/handle-new-tabs</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-removed-tabs" type="checkbox">background/handle-removed-tabs</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-tab-bunches" type="checkbox">background/handle-tab-bunches</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-tab-focus" type="checkbox">background/handle-tab-focus</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-tab-multiselect" type="checkbox">background/handle-tab-multiselect</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/handle-tree-changes" type="checkbox">background/handle-tree-changes</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/migration" type="checkbox">background/migration</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/native-tab-groups" type="checkbox">background/native-tab-groups</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/successor-tab" type="checkbox">background/successor-tab</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tab-context-menu" type="checkbox">background/tab-context-menu</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tabs-group" type="checkbox">background/tabs-group</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tabs-move" type="checkbox">background/tabs-move</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tabs-open" type="checkbox">background/tabs-open</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tree" type="checkbox">background/tree</label></p>
+          <p><label class="has-checkbox"><input id="logFor-background/tree-structure" type="checkbox">background/tree-structure</label></p>
+      </fieldset>
+      <fieldset>
+        <legend><label class="has-checkbox"><input id="logFor-sidebar" type="checkbox">__MSG_config_logFor_sidebar__</label></legend>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/background-connection" type="checkbox">sidebar/background-connection</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/collapse-expand" type="checkbox">sidebar/collapse-expand</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/drag-and-drop" type="checkbox">sidebar/drag-and-drop</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/event-utils" type="checkbox">sidebar/event-utils</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/gap-canceller" type="checkbox">sidebar/gap-canceller</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/indent" type="checkbox">sidebar/indent</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/mouse-event-listener" type="checkbox">sidebar/mouse-event-listener</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/pinned-tabs" type="checkbox">sidebar/pinned-tabs</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/scroll" type="checkbox">sidebar/scroll</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/sidebar-items" type="checkbox">sidebar/sidebar-items</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/sidebar" type="checkbox">sidebar/sidebar</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/size" type="checkbox">sidebar/size</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/subpanel" type="checkbox">sidebar/subpanel</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/tab-context-menu" type="checkbox">sidebar/tab-context-menu</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/tab-group-context-menu" type="checkbox">sidebar/tab-group-context-menu</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/tab-preview-tooltip" type="checkbox">sidebar/tab-preview-tooltip</label></p>
+          <p><label class="has-checkbox"><input id="logFor-sidebar/tst-api-frontend" type="checkbox">sidebar/tst-api-frontend</label></p>
+      </fieldset>
+    </fieldset>
+    <fieldset id="group-allConfigs" class="collapsible collapsed">
+      <legend>__MSG_config_all_caption__</legend>
+    </fieldset>
+    </section>
+  </body>
+</html>
diff --git a/waterfox/browser/components/sidebar/options/style-highcontrast.png b/waterfox/browser/components/sidebar/options/style-highcontrast.png
new file mode 100644
index 0000000000000..c1676ceb85e4f
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/style-highcontrast.png differ
diff --git a/waterfox/browser/components/sidebar/options/style-photon.png b/waterfox/browser/components/sidebar/options/style-photon.png
new file mode 100644
index 0000000000000..adf7a3ef7bd9c
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/style-photon.png differ
diff --git a/waterfox/browser/components/sidebar/options/style-proton.png b/waterfox/browser/components/sidebar/options/style-proton.png
new file mode 100644
index 0000000000000..e20a628ce646a
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/style-proton.png differ
diff --git a/waterfox/browser/components/sidebar/options/style-sidebar.png b/waterfox/browser/components/sidebar/options/style-sidebar.png
new file mode 100644
index 0000000000000..27a8c11ebe76b
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/style-sidebar.png differ
diff --git a/waterfox/browser/components/sidebar/options/tab-drag-behavior-notification.png b/waterfox/browser/components/sidebar/options/tab-drag-behavior-notification.png
new file mode 100644
index 0000000000000..668d82246b284
Binary files /dev/null and b/waterfox/browser/components/sidebar/options/tab-drag-behavior-notification.png differ
diff --git a/waterfox/browser/components/sidebar/resources/16x16.svg b/waterfox/browser/components/sidebar/resources/16x16.svg
new file mode 100644
index 0000000000000..1d66875d4573a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/16x16.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M12,1H4C2.346,1,1,2.346,1,4v8c0,1.654,1.346,3,3,3h8c1.654,0,3-1.346,3-3V4C15,2.346,13.654,1,12,1z M3,4
+		c0-0.551,0.449-1,1-1h8c0.552,0,1,0.449,1,1v2H4C3.5,6,3,5.5,3,5V4z M7,10c-0.5,0-1-0.5-1-1H5.99V7H13v3H7z M12,13h-2
+		c-0.5,0-1-0.5-1-1v-1h4v1C13,12.552,12.552,13,12,13z"/>
+	<circle cx="4.5" cy="4.5" r="0.5"/>
+	<circle cx="7.5" cy="8.5" r="0.5"/>
+	<circle cx="10.5" cy="12" r="0.5"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/20x20.svg b/waterfox/browser/components/sidebar/resources/20x20.svg
new file mode 100644
index 0000000000000..36e15fcd62632
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/20x20.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M16,1H4C2.346,1,1,2.346,1,4v12c0,1.654,1.346,3,3,3h12c1.654,0,3-1.346,3-3V4C19,2.346,17.654,1,16,1z
+		 M8,12c-0.5,0-1-0.5-1-1V8h10v4H8z M3,4c0-0.551,0.449-1,1-1h12c0.552,0,1,0.449,1,1v3H4C3.5,7,3,6.5,3,6V4z M16,17h-4
+		c-0.5,0-1-0.5-1-1v-3h6v3C17,16.552,16.552,17,16,17z"/>
+	<circle cx="5" cy="5" r="1"/>
+	<circle cx="9" cy="10" r="1"/>
+	<circle cx="13" cy="15" r="1"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/24x24.svg b/waterfox/browser/components/sidebar/resources/24x24.svg
new file mode 100644
index 0000000000000..c171fcf3cb4ca
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/24x24.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M20,1H4C2.346,1,1,2.346,1,4v16c0,1.654,1.346,3,3,3h16c1.654,0,3-1.346,3-3V4C23,2.346,21.654,1,20,1z
+		 M9,15c-0.5,0-1-0.5-1-1v-4h13v5H9z M3,4c0-0.551,0.449-1,1-1h16c0.552,0,1,0.449,1,1v5H4C3.5,9,3,8.5,3,8V4z M20,21h-6
+		c-0.5,0-1-0.5-1-1v-4h8v4C21,20.552,20.552,21,20,21z"/>
+	<circle cx="6" cy="6" r="1"/>
+	<circle cx="11" cy="12.375" r="1"/>
+	<circle cx="16" cy="18.5" r="1"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/32x32.svg b/waterfox/browser/components/sidebar/resources/32x32.svg
new file mode 100644
index 0000000000000..8cb5a6f0c52c3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/32x32.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M26,2H6C3.8,2,2,3.8,2,6v20c0,2.2,1.8,4,4,4h20c2.2,0,4-1.8,4-4V6C30,3.8,28.2,2,26,2z M12,20
+		c-0.552,0-1-0.447-1-1v-6l16,0v7H12z M5,6c0-0.542,0.458-1,1-1h20c0.542,0,1,0.458,1,1v6.012l-21,0V12c-0.552,0-1-0.448-1-1V6z
+		 M26,27h-8c-0.553,0-1-0.447-1-1v-5.013h10V26C27,26.542,26.542,27,26,27z"/>
+	<path d="M10,8.5C10,9.325,9.325,10,8.5,10S7,9.325,7,8.5S7.675,7,8.5,7S10,7.675,10,8.5z"/>
+	<path d="M16,16.5c0,0.825-0.675,1.5-1.5,1.5S13,17.325,13,16.5s0.675-1.5,1.5-1.5S16,15.675,16,16.5z"/>
+	<path d="M22,23.5c0,0.825-0.675,1.5-1.5,1.5S19,24.325,19,23.5s0.675-1.5,1.5-1.5S22,22.675,22,23.5z"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/64x64.svg b/waterfox/browser/components/sidebar/resources/64x64.svg
new file mode 100644
index 0000000000000..7468a0e18e70d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/64x64.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M52,4H12c-4.4,0-8,3.6-8,8v40c0,4.4,3.6,8,8,8h40c4.4,0,8-3.6,8-8V12C60,7.6,56.401,4,52,4z M24,40c-1.104,0-2-0.894-2-2
+		V26h32v14H24z M10,12c0-1.084,0.916-2,2-2h40c1.084,0,2,0.916,2,2v12.024H12V24c-1.104,0-2-0.896-2-2V12z M52,54H36
+		c-1.107,0-2-0.894-2-2V41.974h20V52C54,53.084,53.084,54,52,54z"/>
+	<path d="M20,17c0,1.65-1.35,3-3,3s-3-1.35-3-3s1.35-3,3-3S20,15.35,20,17z"/>
+	<path d="M32,33c0,1.65-1.35,3-3,3s-3-1.35-3-3s1.35-3,3-3S32,31.35,32,33z"/>
+	<path d="M44,47c0,1.65-1.35,3-3,3s-3-1.35-3-3s1.35-3,3-3S44,45.35,44,47z"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/blank.html b/waterfox/browser/components/sidebar/resources/blank.html
new file mode 100644
index 0000000000000..3fc507fe2f4d2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/blank.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<meta charset="UTF-8">
+<link rel="icon" href="./16x16.svg">
+<script type="module" src="/extlib/l10n.js"></script>
+<title></title>
+<p>__MSG_blank_allUrlsPermissionRequiredMessage__</p>
diff --git a/waterfox/browser/components/sidebar/resources/group-tab.html b/waterfox/browser/components/sidebar/resources/group-tab.html
new file mode 100644
index 0000000000000..560ed731e4921
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/group-tab.html
@@ -0,0 +1,319 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<html class="group-tab">
+<meta charset="UTF-8">
+<link rel="favicon" href="">
+<title></title>
+<link rel="stylesheet" href="/resources/ui-color.css">
+<style type="text/css"><!--
+  :root > * {
+    transition: opacity 0.25s ease-out;
+  }
+  :root:not(.initialized) > * {
+    opacity: 0;
+  }
+
+  :root.rtl {
+    direction: rtl;
+  }
+
+  :root {
+    background: var(--bg-color);
+    color: var(--text-color);
+    font: message-box;
+    line-height: 1.2;
+    --column-width: 20em;
+    --favicon-size: 16px;
+  }
+
+  main {
+    bottom: 0;
+    display: flex;
+    flex-direction: column;
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+    padding-block: 1em 0;
+    padding-inline: 0;
+    position: fixed;
+    top: 0;
+  }
+
+  h1 {
+    display: flex;
+    flex-direction: row;
+    line-height: 1.25;
+    margin-block: 0;
+    margin-inline: 0;
+  }
+
+  h1::before {
+    background: var(--text-color);
+    content: "";
+    display: inline-block;
+    height: 1.25em;
+    margin-inline-end: 0.25em;
+    mask: url("./icons/folder.svg") no-repeat center / 100%;
+    width: 1.25em;
+  }
+
+  h1 > * {
+    flex-grow: 1;
+  }
+
+  #title-field {
+    display: none;
+  }
+
+  header p {
+    margin-block: 0.5em 1em;
+    margin-inline: 0;
+  }
+
+  header {
+    border-block-end: 1px solid;
+    margin-block: 0 1em;
+    margin-inline: 1em;
+  }
+
+  #tabs {
+    display: flex;
+    flex-grow: 1;
+    overflow-x: auto;
+    padding-block: 0;
+    padding-inline: 0 1em;
+  }
+
+  #tabs ul {
+    margin-block: 0;
+    margin-inline: 20px 0;
+    padding-block: 0;
+    padding-inline: 0;
+  }
+
+  #tabs li {
+    display: flex;
+    flex-direction: row;
+    flex-grow: 1;
+    list-style: none;
+    margin-block: 0;
+    margin-inline: 0.15em 0;
+    padding-block: 0;
+    padding-inline: 0;
+    white-space: pre;
+  }
+
+  #tabs li ul {
+    width: 100%;
+  }
+
+  #tabs li img,
+  #tabs li.use-default-favicon .default-favicon,
+  #tabs li.favicon-loading .default-favicon,
+  #tabs li .closebox,
+  #tabs li .closebox::before,
+  #tabs li .closebox::after {
+    height: var(--favicon-size);
+    max-width: var(--favicon-size);
+    max-height: var(--favicon-size);
+    min-width: var(--favicon-size);
+    width: var(--favicon-size);
+  }
+
+  #tabs li.use-default-favicon img,
+  #tabs li.favicon-loading img {
+    display: none;
+  }
+
+  #tabs li.use-default-favicon .default-favicon,
+  #tabs li.favicon-loading .default-favicon {
+    background: var(--text-color);
+    break-inside: avoid; /* This is required to avoid unexpected slicing. See also: https://github.com/piroor/treestyletab/issues/3361 */
+    display: inline-block;
+    mask: url("./icons/defaultFavicon.svg") no-repeat center / 100%;
+  }
+
+  #tabs li.use-default-favicon.group-tab .default-favicon {
+    mask-image: url("./icons/folder.svg");
+  }
+
+  .closebox {
+    position: relative;
+    opacity: 0;
+  }
+
+  #tabs li:hover > .closebox {
+    opacity: 1;
+  }
+
+  .closebox::before {
+    background: var(--text-color);
+    box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.3);
+    content: " ";
+    display: inline-block;
+    inset-inline-end: 0;
+    opacity: 0;
+    position: absolute;
+    top: 0;
+  }
+
+  .closebox:hover::before {
+    opacity: 0.1;
+  }
+
+  .closebox::after {
+    background: var(--text-color);
+    content: " ";
+    display: inline-block;
+    inset-inline-end: 0;
+    mask: url("/sidebar/styles/icons/close-16.svg") no-repeat center / 100%;
+    position: absolute;
+    top: 0;
+  }
+
+  #tabs a,
+  #tabs span.link {
+    align-items: start;
+    color: inherit;
+    cursor: pointer;
+    display: flex;
+    flex-direction: row;
+    flex-grow: 1;
+    text-decoration: none;
+    padding-block: 0.25em;
+    padding-inline: 0;
+  }
+
+  #tabs a:hover,
+  #tabs span.link:hover {
+    text-decoration: underline;
+  }
+
+  .contextual-identity-marker {
+    background-color: transparent;
+    content: ' ';
+    display: inline-bock;
+    height: var(--favicon-size);
+    margin-inline-end: 0.25em;
+    width: calc(var(--favicon-size) / 5);
+  }
+
+  #tabs a span.label,
+  #tabs span.link span.label {
+    display: inline-block;
+    vertical-align: calc(var(--favicon-size) - 1em);
+    margin-block: 0;
+    margin-inline: 0;
+    padding-block: 0;
+    padding-inline: 0.25em 0;
+    white-space: pre-wrap;
+  }
+
+
+  :root {
+    --throbber-size: 1em;
+  }
+
+  @keyframes throbber {
+    0%   { transform: translateX(0); }
+    100% { transform: translateX(-100%); }
+  }
+
+  :root:not(.updating) .throbber {
+    display: none !important;
+  }
+
+  :root.updating:not(.has-contents) .throbber {
+    display: inline-block;
+    font-size: var(--throbber-size);
+    height: var(--throbber-size);
+    max-height: var(--throbber-size);
+    max-width: var(--throbber-size);
+    overflow: hidden;
+    padding-block: 0;
+    padding-inline: 0;
+    pointer-events: none;
+    position: relative;
+    width: var(--throbber-size);
+
+    position: absolute;
+    top: calc(50% - var(--throbber-size));
+    inset-inline-start: calc(50% - var(--throbber-size));
+    transform: scale(2, 2);
+  }
+
+  :root.updating:not(.has-contents) .throbber::before {
+    animation: throbber 1.05s steps(30) infinite; /* The FPS is reduced from 60 to 30 at https://bugzilla.mozilla.org/show_bug.cgi?id=1511095 */
+    background: Highlight;
+    box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.35);
+    content: "";
+    fill: Highlight;
+    height: var(--throbber-size);
+    position: absolute;
+    width: calc(var(--throbber-size) * 60);
+  }
+  :root.updating:not(.has-contents):not(.rtl) .throbber::before {
+    mask: url("/sidebar/styles/throbber.svg") no-repeat left center / 100%;
+  }
+  :root.updating:not(.has-contents).rtl .throbber::before {
+    mask: url("/sidebar/styles/throbber.svg") no-repeat right center / 100%;
+  }
+
+
+  #optionHint {
+    background: #0c0c0dCC;
+    border-radius: 0.5em;
+    box-shadow: 0.2em 0.2em 0.5em rgba(0, 0, 0, 0.35);
+    color: #efefef;
+    display: none;
+    inset-inline-end: 0.5em;
+    line-height: 1;
+    margin-block: 1em 0;
+    margin-inline: 1em 0;
+    opacity: 0.75;
+    padding-block: 0.5em;
+    padding-inline: 0.5em;
+    position: fixed;
+    top: 0.5em;
+    transition: opacity 150ms ease-out;
+    z-idnex: 1000;
+  }
+  #optionHint:hover {
+    opacity: 1;
+  }
+
+  #optionHint a {
+    color: white;
+  }
+
+  #dismissOptionHint {
+    background: white;
+    border: none;
+    display: inline-block;
+    height: 1em;
+    mask: url("/sidebar/styles/icons/close-16.svg") no-repeat center / 100%;
+    vertical-align: text-bottom;
+    width: 1em;
+  }
+--></style>
+<style id="browser-theme-definition" type="text/css"></style>
+<style id="user-style-rules" type="text/css"></style>
+<!--
+  Don't load scripts statically, to prevent the tab is closed by Firefox.
+  See also: https://github.com/piroor/treestyletab/issues/1670#issuecomment-350964087
+<script defer type="application/javascript" src="/common/l10n.js"></script>
+<script defer type="application/javascript" src="./group-tab.js"></script>
+-->
+<main>
+<header>
+<h1><span id="title"></span><input id="title-field" type="text"></h1>
+<p><label><input id="temporary" type="checkbox">__MSG_groupTab_temporary_label__</label>
+   <label><input id="temporaryAggressive" type="checkbox">__MSG_groupTab_temporaryAggressive_label__</label></p>
+<p id="optionHint"><a href="#">__MSG_groupTab_options_label__</a>
+                   <button id="dismissOptionHint" title="__MSG_groupTab_options_dismiss__"></button></p>
+</header>
+<div id="tabs"><ul id="top-level-tree"></ul></div>
+<span class="throbber"></span>
+</main>
+</html>
diff --git a/waterfox/browser/components/sidebar/resources/group-tab.js b/waterfox/browser/components/sidebar/resources/group-tab.js
new file mode 100644
index 0000000000000..37ceeff8c818a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/group-tab.js
@@ -0,0 +1,632 @@
+/*
+# 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/.
+*/
+'use strict';
+
+(async function prepare(retryCount = 0) {
+  if (retryCount > 10)
+    throw new Error('could not prepare group tab contents');
+
+  if (!document.documentElement) {
+    setTimeout(prepare, 100, retryCount + 1);
+    return false;
+  }
+
+  if (window.prepared ||
+      document.documentElement.classList.contains('initialized'))
+    return false;
+
+  window.prepared = true;
+
+  let gTitle;
+  let gTitleField;
+  let gTemporaryCheck;
+  let gTemporaryAggressiveCheck;
+  let gBrowserThemeDefinition;
+  let gUserStyleRules;
+
+  // Firefox sometimes clears the document title set at here, so we need to re-set it later.
+  document.title = getTitle();
+  // Failsafe 1: This is effective on newly opened tabs,
+  // but won't effective on already opened and reinitialized tabs.
+  window.addEventListener('DOMContentLoaded', () => {
+    document.title = getTitle();
+  }, { once: true });
+
+  function getTitle() {
+    const url = new URL(location.href);
+    let title = url.searchParams.get('title');
+    if (!title) {
+      const matched = location.search.match(/^\?([^&;]*)/);
+      if (matched)
+        title = decodeURIComponent(matched[1]);
+    }
+    return title || browser.i18n.getMessage('groupTab_label_default');
+  }
+
+  function setTitle(title) {
+    if (!gTitle)
+      init();
+    document.title = gTitle.textContent = gTitleField.value = title;
+    updateParameters({ title });
+  }
+
+  function isTemporary() {
+    const url = new URL(location.href);
+    return url.searchParams.get('temporary') == 'true';
+  }
+
+  function isTemporaryAggressive() {
+    const url = new URL(location.href);
+    return url.searchParams.get('temporaryAggressive') == 'true';
+  }
+
+  function getOpenerTabId() {
+    const url = new URL(location.href);
+    return url.searchParams.get('openerTabId');
+  }
+
+  function getAliasTabId() {
+    const url = new URL(location.href);
+    return url.searchParams.get('aliasTabId');
+  }
+
+  function getReplacedParentCount() {
+    const url = new URL(location.href);
+    const count = parseInt(url.searchParams.get('replacedParentCount'));
+    return isNaN(count) ? 0 : count;
+  }
+
+  function enterTitleEdit() {
+    if (!gTitle)
+      init();
+    gTitle.style.display = 'none';
+    gTitleField.style.display = 'inline';
+    gTitleField.select();
+    gTitleField.focus();
+  }
+
+  function exitTitleEdit() {
+    if (!gTitle)
+      init();
+    gTitle.style.display = '';
+    gTitleField.style.display = '';
+  }
+
+  function hasModifier(event) {
+    return event.altKey ||
+           event.ctrlKey ||
+           event.metaKey ||
+           event.shiftKey;
+  }
+
+  function isAcceled(event) {
+    return /^Mac/i.test(navigator.platform) ? event.metaKey : event.ctrlKey;
+  }
+
+  function updateParameters({ title } = {}) {
+    const url = new URL(location.href);
+    url.searchParams.set('title', title || getTitle() || '');
+
+    if (gTemporaryCheck.checked)
+      url.searchParams.set('temporary', 'true');
+    else
+      url.searchParams.delete('temporary');
+
+    if (gTemporaryAggressiveCheck.checked)
+      url.searchParams.set('temporaryAggressive', 'true');
+    else
+      url.searchParams.delete('temporaryAggressive');
+
+    const opener = getOpenerTabId();
+    if (opener)
+      url.searchParams.set('openerTabId', opener);
+    else
+      url.searchParams.delete('openerTabId');
+
+    const aliasTabId = getAliasTabId();
+    if (aliasTabId)
+      url.searchParams.set('aliasTabId', aliasTabId);
+    else
+      url.searchParams.delete('aliasTabId');
+
+    const replacedParentCount = getReplacedParentCount();
+    if (replacedParentCount > 0)
+      url.searchParams.set('replacedParentCount', replacedParentCount);
+    else
+      url.searchParams.delete('replacedParentCount');
+
+    history.replaceState({}, document.title, url.href);
+  }
+
+  async function init(retryCount = 0) {
+    if (gTitle &&
+        gTitleField &&
+        gTemporaryCheck &&
+        gTemporaryAggressiveCheck &&
+        gBrowserThemeDefinition &&
+        gUserStyleRules)
+      return;
+
+    if (retryCount > 10)
+      throw new Error('could not initialize group tab contents');
+
+    gTitle                    = document.querySelector('#title');
+    gTitleField               = document.querySelector('#title-field');
+    gTemporaryCheck           = document.querySelector('#temporary');
+    gTemporaryAggressiveCheck = document.querySelector('#temporaryAggressive');
+    gBrowserThemeDefinition   = document.querySelector('#browser-theme-definition');
+    gUserStyleRules           = document.querySelector('#user-style-rules');
+
+    if (!gTitle ||
+        !gTitleField ||
+        !gTemporaryCheck ||
+        !gTemporaryAggressiveCheck ||
+        !gBrowserThemeDefinition ||
+        !gUserStyleRules) {
+      setTimeout(init, 100, retryCount + 1);
+      return;
+    }
+
+    gTitle.addEventListener('click', event => {
+      if (event.button == 0 &&
+          !hasModifier(event)) {
+        enterTitleEdit();
+        event.stopPropagation();
+      }
+    });
+    gTitleField.addEventListener('keydown', event => {
+      // Event.isComposing for the Enter key to finish composition is always
+      // "false" on keyup, so we need to handle this on keydown.
+      if (hasModifier(event) ||
+          event.isComposing)
+        return;
+
+      switch (event.key) {
+        case 'Escape':
+          gTitleField.value = gTitle.textContent;
+          exitTitleEdit();
+          break;
+
+        case 'Enter':
+          setTitle(gTitleField.value);
+          exitTitleEdit();
+          break;
+
+        case 'F2':
+          event.stopPropagation();
+          break;
+      }
+    });
+    window.addEventListener('mouseup', event => {
+      const closebox = event.target.closest('li span.closebox');
+      if (closebox) {
+        const tabId = closebox.dataset.tabId;
+        browser.runtime.sendMessage({
+          type:             'ws:remove-tabs-internally',
+          tabIds:           [parseInt(tabId)],
+          byMouseOperation: true,
+          keepDescendants:  true,
+        });
+        return;
+      }
+
+      const link  = event.target.closest('a, span.link');
+      const tabId = link?.dataset?.tabId;
+      if (tabId) {
+        event.stopImmediatePropagation();
+        event.preventDefault();
+        if ((event.button == 0 && isAcceled(event)) ||
+            (event.button == 1 && !hasModifier(event))) {
+          browser.runtime.sendMessage({
+            type:             'ws:remove-tabs-internally',
+            tabIds:           [parseInt(tabId)],
+            byMouseOperation: true,
+            keepDescendants:  true,
+          });
+        }
+        else {
+          browser.runtime.sendMessage({
+            type: 'ws:api:focus',
+            tab:  parseInt(tabId),
+          });
+        }
+        return false;
+      }
+      if (event.button != 0 ||
+          hasModifier(event))
+        return false;
+      if (event.target != gTitleField) {
+        setTitle(gTitleField.value);
+        exitTitleEdit();
+        event.stopPropagation();
+      }
+    }, { useCapture: true });
+    window.addEventListener('keyup', event => {
+      if (event.key == 'F2' &&
+          !hasModifier(event))
+        enterTitleEdit();
+    });
+
+    window.addEventListener('resize', reflow);
+
+    gTitle.textContent = gTitleField.value = getTitle();
+
+    gTemporaryCheck.checked = isTemporary();
+    gTemporaryCheck.addEventListener('change', _event => {
+      if (gTemporaryCheck.checked)
+        gTemporaryAggressiveCheck.checked = false;
+      updateParameters();
+    });
+
+    gTemporaryAggressiveCheck.checked = isTemporaryAggressive();
+    gTemporaryAggressiveCheck.addEventListener('change', _event => {
+      if (gTemporaryAggressiveCheck.checked)
+        gTemporaryCheck.checked = false;
+      updateParameters();
+    });
+
+    window.setTitle    = window.setTitle || setTitle;
+    window.updateTree  = window.updateTree || updateTree;
+
+    window.l10n.updateDocument();
+
+    const [themeDeclarations, contextualIdentitiesColorInfo, configs, userStyleRules] = await Promise.all([
+      browser.runtime.sendMessage({
+        type: 'ws:get-theme-declarations'
+      }),
+      browser.runtime.sendMessage({
+        type: 'ws:get-contextual-identities-color-info'
+      }),
+      browser.runtime.sendMessage({
+        type: 'ws:get-config-value',
+        keys: [
+          'renderTreeInGroupTabs',
+          'showAutoGroupOptionHint',
+          'showAutoGroupOptionHintWithOpener',
+          'rtl',
+        ]
+      }),
+      browser.runtime.sendMessage({
+        type: 'ws:get-user-style-rules'
+      })
+    ]);
+
+    const contextualIdentitiesMarkerDeclarations = Object.keys(contextualIdentitiesColorInfo.colors).map(id =>
+      `#tabs a[data-cookie-store-id="${id}"] .contextual-identity-marker {
+         background-color: ${contextualIdentitiesColorInfo.colors[id]};
+       }`).join('\n');
+    gBrowserThemeDefinition.textContent = `
+      ${themeDeclarations}
+      ${contextualIdentitiesMarkerDeclarations}
+      ${contextualIdentitiesColorInfo.colorDeclarations}
+    `;
+    gUserStyleRules.textContent = userStyleRules;
+
+    document.documentElement.classList.toggle('rtl', configs.rtl);
+
+    updateTree.enabled = configs.renderTreeInGroupTabs;
+    updateTree();
+
+    const optionPageSection = getOpenerTabId() ? 'autoGroupNewTabsFromPinned' : 'autoGroupNewTabsSection';
+    const optionKey = getOpenerTabId() ? 'showAutoGroupOptionHintWithOpener' : 'showAutoGroupOptionHint';
+    let show = configs[optionKey];
+    if (!isTemporary() && !isTemporaryAggressive())
+      show = false;
+
+    const hint = document.getElementById('optionHint');
+    hint.style.display = show ? 'block' : 'none';
+
+    if (show) {
+      const uri = `moz-extension://${location.host}/options/options.html#${optionPageSection}`;
+      hint.firstChild.addEventListener('click', event => {
+        if (event.button != 0)
+          return;
+        browser.runtime.sendMessage({
+          type: 'ws:open-tab',
+          uri,
+          active: true,
+        });
+      });
+      hint.firstChild.addEventListener('keydown', event => {
+        if (event.key != 'Enter' &&
+            event.key != 'Space')
+          return;
+        browser.runtime.sendMessage({
+          type: 'ws:open-tab',
+          uri,
+          active: true,
+        });
+      });
+
+      const closebox = document.getElementById('dismissOptionHint');
+      closebox.addEventListener('click', event => {
+        if (event.button != 0)
+          return;
+        hint.style.display = 'none';
+        browser.runtime.sendMessage({
+          type: 'ws:set-config-value',
+          key:  optionKey,
+          value: false
+        });
+      });
+      closebox.addEventListener('keydown', event => {
+        if (event.key != 'Enter' &&
+            event.key != 'Space')
+          return;
+        hint.style.display = 'none';
+        browser.runtime.sendMessage({
+          type: 'ws:set-config-value',
+          key:  optionKey,
+          value: false
+        });
+      });
+    }
+
+    browser.runtime.onMessage.addListener((message, _sender) => {
+      switch (message?.type) {
+        case 'ws:clear-temporary-state':
+          gTemporaryCheck.checked = gTemporaryAggressiveCheck.checked = false;
+          updateParameters();
+          return Promise.resolve(true);
+
+        case 'ws:replace-state-url':
+          history.replaceState({}, document.title, message.url);
+          return Promise.resolve(true);
+
+        case 'ws:update-tree':
+          updateTree();
+          return Promise.resolve(true);
+
+        case 'ws:update-title':
+          setTitle(message.title);
+          return Promise.resolve(true);
+      }
+    });
+
+    // Failsafe 2: This is effective on any case, but too slow for newly opened tabs.
+    document.title = getTitle();
+
+    document.documentElement.classList.add('initialized');
+  }
+  //document.addEventListener('DOMContentLoaded', init, { once: true });
+
+
+  const loadedIconUrls = new Set();
+  const failedIconUrls = new Set();
+
+  async function updateTree() {
+    const runAt = updateTree.lastRun = Date.now();
+
+    const container = document.getElementById('tabs');
+    function clear() {
+      const range = document.createRange();
+      range.selectNodeContents(container.firstChild);
+      range.deleteContents();
+      range.detach();
+    }
+
+    const rootClassList = document.documentElement.classList;
+    if (!updateTree.enabled) {
+      rootClassList.remove('updating');
+      clear();
+      return;
+    }
+
+    rootClassList.add('updating');
+
+    const baseRequest = {
+      type: 'ws:api:get-tree',
+      interval: 50,
+    };
+    const [thisTab, openerTab, aliasTab] = await Promise.all([
+      // We need to request them separately because
+      // get-tree always compact the returned array (null tab will be removved).
+      browser.runtime.sendMessage({
+        ...baseRequest,
+        tab: 'senderTab',
+      }),
+      browser.runtime.sendMessage({
+        ...baseRequest,
+        tab: getOpenerTabId(),
+      }),
+      browser.runtime.sendMessage({
+        ...baseRequest,
+        tab: getAliasTabId(),
+      }),
+    ]);
+
+    /*
+    console.log('updateTree ', {
+      ur: location.href,
+      openerTabId: getOpenerTabId(),
+      openerTab,
+      aliasTabId: getAliasTabId(),
+      aliasTab,
+    });
+    */
+
+    // called again while waiting
+    if (runAt != updateTree.lastRun)
+      return;
+
+    if (!thisTab) {
+      console.error(new Error('Couldn\'t get tree of tabs unexpectedly.'));
+      clear();
+      rootClassList.remove('updating');
+      return;
+    }
+
+    if (aliasTab)
+      thisTab.children = aliasTab.children;
+
+    let tree;
+    if (!aliasTab && openerTab) {
+      openerTab.children = thisTab.children;
+      tree = buildChildren({
+        children: [
+          openerTab,
+        ],
+      });
+    }
+    else
+      tree = buildChildren(thisTab);
+
+    if (tree) {
+      const { DOMUpdater } = await import('/extlib/dom-updater.js');
+      tree.setAttribute('id', 'top-level-tree');
+      const newContents = document.createDocumentFragment();
+      newContents.appendChild(tree);
+      DOMUpdater.update(container, newContents);
+      for (const icon of container.querySelectorAll('li.favicon-loading img')) {
+        const item = icon.closest('li');
+        const url  = icon.dataset.faviconUrl;
+        icon.onerror = () => {
+          item.classList.remove('favicon-loading');
+          item.classList.add('use-default-favicon');
+          failedIconUrls.add(url);
+        };
+        icon.onload = () => {
+          item.classList.remove('favicon-loading');
+          loadedIconUrls.add(url);
+        };
+        icon.src = url;
+      }
+      reflow();
+    }
+    else {
+      clear();
+    }
+
+    rootClassList.remove('updating');
+    rootClassList.add('has-contents');
+  }
+  updateTree.enabled = true;
+
+  function reflow() {
+    const container = document.getElementById('tabs');
+    columnizeTree(container.firstChild, {
+      columnWidth: 'var(--column-width, 20em)',
+      containerRect: container.getBoundingClientRect()
+    });
+  }
+
+  function buildItem(tab) {
+    const item = document.createElement('li');
+    item.setAttribute('id', `tab-item-${tab.id}`);
+
+    const link = item.appendChild(document.createElement('span'));
+    link.setAttribute('id', `tab-link-${tab.id}`);
+    link.setAttribute('class', 'link');
+    link.setAttribute('title', tab.cookieStoreName ? `${tab.title} - ${tab.cookieStoreName}` : tab.title);
+    link.dataset.tabId = tab.id;
+    link.dataset.cookieStoreId = tab.cookieStoreId;
+
+    const contextualIdentityMarker = link.appendChild(document.createElement('span'));
+    contextualIdentityMarker.setAttribute('id', `tab-contextual-identity-marker-${tab.id}`);
+    contextualIdentityMarker.classList.add('contextual-identity-marker');
+
+    const defaultFavIcon = link.appendChild(document.createElement('span'));
+    defaultFavIcon.setAttribute('id', `tab-default-favicon-${tab.id}`);
+    defaultFavIcon.classList.add('default-favicon');
+
+    const icon = link.appendChild(document.createElement('img'));
+    icon.setAttribute('id', `tab-icon-${tab.id}`);
+    const favIconUrl = tab.effectiveFavIconUrl || tab.favIconUrl;
+    if (favIconUrl && !failedIconUrls.has(favIconUrl)) {
+      if (loadedIconUrls.has(favIconUrl)) {
+        icon.src = favIconUrl;
+      }
+      else {
+        icon.dataset.faviconUrl = favIconUrl;
+        item.classList.add('favicon-loading');
+      }
+    }
+    else {
+      item.classList.add('use-default-favicon');
+    }
+
+    if (Array.isArray(tab.states) &&
+        tab.states.includes('group-tab'))
+      item.classList.add('group-tab');
+
+    const label = link.appendChild(document.createElement('span'));
+    label.setAttribute('id', `tab-label-${tab.id}`);
+    label.classList.add('label');
+    label.textContent = tab.title;
+
+    const closeBox = item.appendChild(document.createElement('span'));
+    closeBox.setAttribute('id', `tab-closebox-${tab.id}`);
+    closeBox.classList.add('closebox');
+    closeBox.dataset.tabId = tab.id;
+
+    const children = buildChildren(tab);
+    if (!children)
+      return item;
+
+    children.setAttribute('id', `tab-${tab.id}-children`);
+    const fragment = document.createDocumentFragment();
+    fragment.appendChild(item);
+    const childrenWrapped = document.createElement('li');
+    childrenWrapped.setAttribute('id', `tabr-${tab.id}-children-wrappe`);
+    childrenWrapped.appendChild(children);
+    fragment.appendChild(childrenWrapped);
+    return fragment;
+  }
+
+  function buildChildren(tab) {
+    if (tab.children && tab.children.length > 0) {
+      const list = document.createElement('ul');
+      for (const child of tab.children) {
+        list.appendChild(buildItem(child));
+      }
+      return list;
+    }
+    return null;
+  }
+
+  function columnizeTree(aTree, options) {
+    options = options || {};
+    options.columnWidth = options.columnWidth || 'var(--column-width, 20em)';
+    const containerRect = options.containerRect || aTree.parentNode.getBoundingClientRect();
+
+    const uncolumnizedTree = aTree.cloneNode(true);
+    const uncolumnizedTreeStyle = uncolumnizedTree.style;
+    uncolumnizedTreeStyle.visibility = 'hidden';
+    uncolumnizedTreeStyle.position = 'absolute';
+    uncolumnizedTreeStyle.maxWidth = `${containerRect.width}px`;
+    uncolumnizedTreeStyle.height = uncolumnizedTreeStyle.maxHeight = '';
+    uncolumnizedTreeStyle.columnWidth = '';
+    aTree.parentNode.appendChild(uncolumnizedTree);
+    const totalContentsHeight = uncolumnizedTree.offsetHeight;
+    aTree.parentNode.removeChild(uncolumnizedTree);
+
+    const style = aTree.style;
+    if (totalContentsHeight > containerRect.height) {
+      style.columnWidth = style.MozColumnWidth = `calc(${options.columnWidth})`;
+      const computedStyle = window.getComputedStyle(aTree, null);
+      aTree.columnWidth = Number((computedStyle.MozColumnWidth || computedStyle.columnWidth).replace(/px/, ''));
+      style.columnGap   = style.MozColumnGap = '1em';
+      style.columnFill  = style.MozColumnFill = 'auto';
+      style.columnCount = style.MozColumnCount = 'auto';
+      const treeContentsRange = document.createRange();
+      treeContentsRange.selectNodeContents(aTree);
+      const overflow = treeContentsRange.getBoundingClientRect().width > window.innerWidth;
+      treeContentsRange.detach();
+      style.maxWidth = '';
+      const blankSpace = overflow ? 2 : 1;
+      style.height = style.maxHeight =
+        `calc(${containerRect.height}px - ${blankSpace}em)`;
+    }
+    else {
+      style.columnWidth = style.MozColumnWidth = '';
+      style.maxWidth = `calc(${containerRect.width}px - 1em /* right-padding of #tabs */ - 20px /* left-margin of the tree */)`;
+      style.height = style.maxHeight = '';
+    }
+  }
+
+  init();
+  return true;
+})();
diff --git a/waterfox/browser/components/sidebar/resources/icons/blocked.svg b/waterfox/browser/components/sidebar/resources/icons/blocked.svg
new file mode 100644
index 0000000000000..e3b775c1a5d55
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/blocked.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.6 1.1c-4.1 0-7.5 3.4-7.5 7.5s3.4 7.5 7.5 7.5 7.5-3.4 7.5-7.5-3.3-7.5-7.5-7.5zM12 8c.3 0 .6.3.6.6s-.3.6-.6.6l-6.8 0c-.3 0-.6-.3-.6-.6s.3-.6.6-.6L12 8z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/briefcase.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/briefcase.svg
new file mode 100644
index 0000000000000..7dc050964c76f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/briefcase.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  fill-rule="evenodd"        d="M22,9.99887085 L21.635468,10 L29.0034652,10 C29.5538362,10 30,10.4449463 30,10.9933977 L30,27.0066023 C30,27.5552407 29.5601869,28 29.0034652,28 L2.99653482,28 C2.44616384,28 2,27.5550537 2,27.0066023 L2,10.9933977 C2,10.4447593 2.43981314,10 2.99653482,10 L8,10 L8,7.99922997 C8,5.79051625 10.0426627,4 12.5635454,4 L19.4364546,4 C21.9568311,4 24,5.79246765 24,7.99922997 L24,9.99267578 L22,9.99887085 L22,10 L10,10 L10,7.99922997 C10,6.89421235 11.0713286,6 12.3917227,6 L19.6082773,6 C20.9273761,6 22,6.89552665 22,7.99922997 L22,9.99887085 Z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/cart.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/cart.svg
new file mode 100644
index 0000000000000..afc79f4601aae
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/cart.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  fill-rule="evenodd"        d="M20.8195396,14 L15.1804604,14 L15.1804604,14 L15.8471271,18 L20.1528729,18 L20.8195396,14 Z M22.8471271,14 L27.6125741,14 L27.6125741,14 L26.2792408,18 L22.1804604,18 L22.8471271,14 Z M21.1528729,12 L14.8471271,12 L14.8471271,12 L14.1804604,8 L21.8195396,8 L21.1528729,12 Z M23.1804604,12 L28.2792408,12 L28.2792408,12 L29.6125741,8 L23.8471271,8 L23.1804604,12 Z M13.1528729,14 L8.47703296,14 L10.077033,18 L10.077033,18 L13.8195396,18 L13.1528729,14 Z M12.8195396,12 L7.67703296,12 L6.07703296,8 L12.1528729,8 L12.8195396,12 L12.8195396,12 Z M31.7207592,8 L32,8 L32,6 L31,6 L5.27703296,6 L5.27703296,6 L4,2.8074176 L4,2 L3,2 L1,2 L0,2 L0,4 L1,4 L2.32296704,4 L9.78931928,22.6658806 L9.78931928,22.6658806 C8.71085924,23.3823847 8,24.6081773 8,26 C8,28.209139 9.790861,30 12,30 C14.209139,30 16,28.209139 16,26 C16,25.2714257 15.8052114,24.5883467 15.4648712,24 L22.5351288,24 C22.1947886,24.5883467 22,25.2714257 22,26 C22,28.209139 23.790861,30 26,30 C28.209139,30 30,28.209139 30,26 C30,23.790861 28.209139,22 26,22 L11.677033,22 L10.877033,20 L27,20 L28,20 L28,19.1622777 L31.7207592,8 L31.7207592,8 Z M26,28 C27.1045695,28 28,27.1045695 28,26 C28,24.8954305 27.1045695,24 26,24 C24.8954305,24 24,24.8954305 24,26 C24,27.1045695 24.8954305,28 26,28 Z M12,28 C13.1045695,28 14,27.1045695 14,26 C14,24.8954305 13.1045695,24 12,24 C10.8954305,24 10,24.8954305 10,26 C10,27.1045695 10.8954305,28 12,28 Z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/chill.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/chill.svg
new file mode 100644
index 0000000000000..65cd45a2885f1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/chill.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M9.1,18.5l-5.7,5.9C3.2,23.8,3,23.3,3,22.6c0-2.5,2-4.4,4.4-4.4C7.8,18.1,8.5,18.3,9.1,18.5 M26.5,18.5l-5.7,5.9  c-0.2-0.5-0.4-1.1-0.4-1.8c0-2.5,2-4.4,4.4-4.4C25.4,18.1,26,18.3,26.5,18.5 M24.7,2L24.7,2c-0.7,0-1.4,0.7-1.4,1.4s0.7,1.4,1.4,1.4  c2.5,0,4.4,2,4.4,4.4v7.6c-1.6-1.2-3.6-1.8-5.5-1.4c-2.1,0.4-3.9,1.6-5,3.4c-1.6-1.2-3.9-1.2-5.5,0c-1.1-1.8-2.8-3-5-3.4  c-2-0.4-3.9,0.2-5.5,1.4V9.2c0-2.5,2-4.4,4.4-4.4c0.5,0,0.9-0.4,1.2-0.7c0.2-0.4,0.2-0.9,0-1.4C8.2,2.3,7.6,2,7.1,2  C3.2,2,0,5.2,0,9.2v13.5C0,26.7,3.2,30,7.1,30l0,0c3.9,0,7.1-3.2,7.1-7.3c0-0.2,0-0.4,0-0.5c0.2-0.9,0.9-1.4,1.8-1.4  s1.6,0.5,1.8,1.4v0.2c0,0.2,0,0.2,0,0.4c0,2,0.7,3.7,2.1,5c1.4,1.4,3,2.1,5,2.1l0,0c2,0,3.6-0.7,5-2.1c1.4-1.2,2.1-3.2,2.1-5V9.2  C32,5.2,28.8,2,24.7,2"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/circle.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/circle.svg
new file mode 100644
index 0000000000000..e3ceed77be7c2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/circle.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <circle  cx="16" cy="16" r="16"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/dollar.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/dollar.svg
new file mode 100644
index 0000000000000..ac8780134eb22
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/dollar.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M17.3857868,14.0527919 C14.2304569,13.0862944 13.4913706,12.4609137 13.4913706,11.0964467 C13.4913706,9.61827411 14.7137056,8.85076142 16.4192893,8.85076142 C17.9827411,8.85076142 19.3187817,9.33401015 20.5979695,10.4994924 L22.4456853,8.42436548 C21.1664975,7.20203046 19.3187819,6.26535905 17,6.00952148 L17,2 L15,2 L15,6.00952148 C12.3827412,6.43591742 9.76751269,8.53807107 9.76751269,11.3238579 C9.76751269,14.1664975 11.4730964,15.786802 15.4812183,17.0091371 C18.4375635,17.9187817 19.2335025,18.6294416 19.2335025,20.2213198 C19.2335025,22.0690355 17.7553299,23.035533 15.7370558,23.035533 C13.7756345,23.035533 12.2406091,22.3248731 10.9329949,21.1025381 L9,23.2345178 C10.4213198,24.6274112 12.8659899,25.8324934 15,26.0030518 L15,30 L17,30 L17,26.0030518 C20.7116753,25.4060974 22.9857868,22.893401 22.9857868,20.022335 C22.9857868,16.4690355 20.7116751,15.1045685 17.3857868,14.0527919 Z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fence.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fence.svg
new file mode 100644
index 0000000000000..d4396cb881237
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fence.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path d="M28,4l-2,2v4h-4V6l-2-2l-2,2v4h-4V6l-2-2l-2,2v4H6V6L4,4L2,6v22h4v-4h4v4h4v-4h4v4h4v-4h4v4h4V6L28,4z M6,22V12 h4v10H6z M14,22V12h4v10H14z M22,22V12h4v10H22z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fingerprint.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fingerprint.svg
new file mode 100644
index 0000000000000..26926675a150c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fingerprint.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M7.17741905,12 C7.10965537,12 7.041327,11.9953181 6.97243393,11.985018 C6.33263187,11.8918489 5.90515601,11.3862071 6.01809547,10.8552833 C7.41798011,4.26321358 12.2613889,2.57493207 15.0238882,2.15590491 C19.6448063,1.45690206 24.3408291,3.21541158 25.8344535,5.29743816 C26.1664955,5.76047488 25.9835336,6.35881757 25.4244832,6.63364321 C24.8654329,6.9098734 24.1437497,6.75583996 23.8122724,6.29327142 C22.8923805,5.01043967 19.1749781,3.51130562 15.4479759,4.07406612 C12.8080159,4.474834 9.43056132,6.03623689 8.33561323,11.1942506 C8.23453242,11.666651 7.73816348,12 7.17741905,12 Z M16.63127,26 C16.1452186,26 15.6509104,25.9658335 15.147795,25.8938767 C10.637921,25.257137 6.71207921,21.8114952 6.01575422,17.8807924 C5.91171832,17.2932317 6.33391695,16.7382846 6.95813239,16.6404441 C7.58454965,16.5343208 8.17298555,16.9406954 8.27757192,17.5272206 C8.80876054,20.5255916 11.9766264,23.26409 15.4885263,23.7610576 C17.3975027,24.02766 20.959494,23.8221432 23.3220449,19.3789425 C24.4625867,17.2331815 23.0049831,11.881462 19.9521622,9.34692739 C18.2380468,7.92384005 16.4573263,7.76905536 14.6628445,8.89499751 C13.26469,9.77142052 11.8070864,12.2857658 11.8665355,14.6287608 C11.9127737,16.4835887 12.8386382,17.9325598 14.6171568,18.9363308 C15.2210054,19.2764429 16.9411759,19.4933486 17.9424527,18.8296898 C18.7257495,18.3104622 18.9591422,17.2761485 18.6365758,15.7583267 C18.3822659,14.5650869 17.2219077,12.4452096 16.6664991,12.3711821 C16.6692513,12.3722175 16.4666841,12.4312324 16.1276041,12.9095636 C15.8545786,13.2936782 15.58981,14.7297074 15.9476054,15.3581643 C16.0142104,15.4761941 16.0725586,15.5465978 16.3202632,15.5465978 C16.9532859,15.5465978 17.46686,16.0290705 17.46686,16.6249139 C17.46686,17.2207573 16.9543868,17.7042653 16.3213641,17.7042653 C15.2644914,17.7042653 14.4140391,17.2336992 13.9268868,16.3774655 C13.1083609,14.9388479 13.5536787,12.6548678 14.2202791,11.7137354 C15.2540327,10.2564816 16.3631986,10.1151564 17.1123672,10.2564816 C19.7066595,10.7389543 20.8763754,15.2908666 20.8857331,15.3359043 C21.5303153,18.3648181 20.3594985,19.8665919 19.264094,20.593407 C17.4151172,21.8192603 14.6920186,21.493643 13.4380832,20.7859819 C10.3280151,19.0310652 9.62013053,16.497566 9.5744428,14.6805283 C9.49022326,11.3643051 11.4779146,8.30018945 13.391845,7.10021984 C16.0417332,5.43848454 18.9877658,5.66781436 21.4714167,7.72919442 C25.1176276,10.7565552 27.0871539,17.1229168 25.3746898,20.3433702 C23.4326862,23.9950465 20.2983981,26 16.63127,26 Z M16.0845157,30 C14.9348455,30 13.9050564,29.8557557 13.0394288,29.6610017 C10.2114238,29.0257442 7.58700058,27.4599412 6.18892823,25.5735955 C5.84440518,25.1078371 5.98426642,24.4803503 6.50105099,24.1700066 C7.01675554,23.8596629 7.71552172,23.986423 8.06112477,24.4507244 C9.89498097,26.9252176 15.9397944,29.9781448 22.2508301,26.1937972 C22.7676147,25.8844249 23.4658409,26.0087566 23.8109039,26.474515 C24.155427,26.9397877 24.0161057,27.5672745 23.4993212,27.8776182 C20.7987573,29.4963593 18.2315746,30 16.0845157,30 Z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/food.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/food.svg
new file mode 100644
index 0000000000000..cd3558287212d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/food.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M14.1,0.9v5.3h-1.4V0.9c0-1.1-1.4-1.1-1.4,0v5.3h-1.2V0.9c0-1.1-1.4-1.1-1.4,0v5.3H7.2V0.9c0-1.2-1.6-1.1-1.6,0  v10.4c0,1.8,1.2,3,2.8,3v15.2c0,1.6,1.1,2.5,2.1,2.5s2.1-0.9,2.1-2.5V14.3c1.6,0,2.8-1.4,2.8-2.8V0.9C15.6-0.4,14.1-0.2,14.1,0.9z   M19.8,3.7v25.8c0,3.2,4.2,3.2,4.2,0V17.1h2.3V3.7C26.5-1.2,19.8-1.2,19.8,3.7z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fruit.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fruit.svg
new file mode 100644
index 0000000000000..d4147f1cb7c6e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/fruit.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M16.5,8c-2.1-0.9-3.9-1.2-6.6-0.9C4.6,8,1.8,12.6,1.8,18c0,5.9,4.8,14,9.8,14c1.6,0,3.9-1.2,4.4-1.2  c0.5,0,2.8,1.2,4.4,1.2c5,0,9.8-8.4,9.8-14c0-5.9-3.2-10.8-9.8-10.8C19,7.1,17.8,7.5,16.5,8z M11.7,0c1.1,0.2,3.2,0.9,4.1,2.3  c0.9,1.4,0.5,3.6,0.2,4.6c-1.2-0.2-3.2-0.7-4.1-2.3C11,3.2,11.4,1.1,11.7,0L11.7,0z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/gift.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/gift.svg
new file mode 100644
index 0000000000000..56029ec672678
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/gift.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M30.3,8.1h-4.5V8c0.7-0.7,1.3-1.9,1.3-3.2c0-2.6-2.1-4.7-4.9-4.7c-1.5,0-4.5,1.5-6.4,3.4C14,1.6,11,0.1,9.5,0.1  c-2.6,0-4.9,2.1-4.9,4.7C4.7,6.1,5.2,7.2,6,8H1.7C0.6,8,0,8.7,0,9.6v4.5c0,0.2,0.2,0.4,0.4,0.4h13.8V9.6h3.2v4.9h14.2  c0.2,0,0.4-0.2,0.4-0.4V9.6C32,8.7,31.4,8.1,30.3,8.1z M9.5,6.5C8.6,6.5,8,5.9,8,4.8s0.6-1.5,1.5-1.5s3.7,1.9,4.7,2.8  C13.7,6.3,9.5,6.5,9.5,6.5z M22.3,6.5c0,0-4.1-0.2-4.7-0.4c0.9-1.1,3.7-2.8,4.7-2.8S24,3.8,24,4.8S23.2,6.5,22.3,6.5z M1.7,17.7  h12.7v14.2H1.7V17.7z M17.6,17.7h12.7v14.2H17.6V17.7z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/pet.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/pet.svg
new file mode 100644
index 0000000000000..4c1899bde5d33
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/pet.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M28.5,8.1c0-1.1-1-1.9-2.1-2.4V3.7c-0.2-0.2-0.3-0.3-0.6-0.3c-0.6,0-1.1,0.8-1.3,2.1c-0.2,0-0.3,0-0.5,0l0,0  c0-0.2,0-0.3-0.2-0.5c-0.3-1.1-0.8-1.9-1.3-2.6C22,2.6,21.7,3.2,21.7,4L22,6.3c-0.3,0.2-0.6,0.3-1,0.6l-3.5,3.7l0,0  c0,0-6.3-0.8-10.9,0.2c-0.6,0-1,0.2-1.1,0.3c-0.5,0.2-0.8,0.3-1.1,0.6c-1.1-0.8-2.2-2.1-3.2-4c0-0.3-0.5-0.5-0.8-0.5s-0.5,0.6-0.3,1  c0.8,2.1,2.1,3.5,3.4,4.5c-0.5,0.5-0.8,1-1,1.6c0,0-0.3,2.2-0.3,5.5l1.4,8c0,1,0.8,1.8,1.9,1.8c1,0,1.9-0.8,1.9-1.8V23l0.5-1.3h8.8  l0.8,1.3v4.7c0,1,0.8,1.8,1.9,1.8c1,0,1.6-0.6,1.8-1.4l0,0l1.9-9l0,0l2.1-6.4h3c3.4,0,3.7-2.9,3.7-2.9L28.5,8.1z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/tree.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/tree.svg
new file mode 100644
index 0000000000000..888d98837c1e2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/tree.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M0.7,18c0,4.9,3.6,8.8,8.1,9.5v4.3c0.2,0,3.2,0,3.2,0v-4.3c1.8-0.4,3.6-1.1,4.9-2.5c0.2-0.2,0.2-0.2,0.2-0.5  c-0.2-0.4-0.2-1.1-0.2-1.6c0-2,0.2-4.9,1.6-7.9c0,0,0.9-1.6,0.7-1.8C18,7.2,14.4,0,10.4,0C5,0,0.7,12.6,0.7,18z M18.3,22.8  c0,3.1,2.2,5.6,4.9,6.3V32h3.2v-2.9c2.7-0.7,4.9-3.2,4.9-6.3c0-3.6-2.9-12.9-6.5-12.9S18.3,19.2,18.3,22.8z"/>
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/contextual-identities/vacation.svg b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/vacation.svg
new file mode 100644
index 0000000000000..dfdc9b12ba854
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/contextual-identities/vacation.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <path  d="M3.6,27l-2.5-1.8L0.8,25c-0.7-0.4-0.7-1.2-0.4-2c0.4-0.5,1.1-0.7,1.6-0.5l3.6,1.2c0-0.4,0.2-0.9,0.4-1.4  c0.2-0.7,0.5-1.6,1.1-2.3c0.2-0.4,0.5-0.7,0.7-1.2c0.2-0.4,0.5-0.9,0.9-1.2c0.4-0.9,1.1-1.6,1.8-2.5c0.7-0.9,1.4-1.6,2.3-2.5  c0.4-0.4,0.9-0.7,1.2-1.2c0.4-0.2,0.9-0.7,1.2-1.1c0.2-0.2,0.2-0.2,0.4-0.4L3.1,7.3c-0.2,0-0.2,0-0.4,0l-2,0.9  C0.2,8.3-0.3,7.6,0.2,7.1l2-2C2.4,5,2.4,5,2.5,5h17.9c0.5-0.5,1.2-1.1,1.8-1.6c0.7-0.7,1.4-1.2,2.1-1.8c0.4-0.4,0.7-0.5,1.1-0.7  c0.4-0.2,0.7-0.4,1.1-0.5c0.5,0,0.9-0.2,1.2-0.2s0.7,0,1.1,0s0.7,0,1.1,0c0.4,0,0.5,0,0.7,0.2c0.5,0,0.7,0.2,0.7,0.2  c0.2,0,0.2,0.2,0.4,0.4c0,0,0,0.4,0.2,0.7c0,0.2,0,0.5,0.2,0.7c0,0.4,0,0.7,0,1.1s0,0.7,0,1.1c0,0.4,0,0.9-0.2,1.2  c-0.2,0.4-0.4,0.7-0.5,1.1c-0.2,0.4-0.5,0.7-0.7,1.1c-0.5,0.7-1.1,1.4-1.8,2.1c-0.4,0.4-0.7,0.7-1.1,1.1v17.8c0,0.2,0,0.4-0.2,0.4  l-2,2c-0.5,0.5-1.2,0-1.1-0.5l0.7-2c0-0.2,0-0.2,0-0.4L22.8,16c-0.4,0.4-0.7,0.7-0.9,0.9c-0.4,0.4-0.7,0.9-1.2,1.2  c-0.4,0.4-0.7,0.9-1.2,1.2c-0.7,0.9-1.6,1.6-2.5,2.3c-0.9,0.7-1.6,1.4-2.5,2c-0.4,0.4-0.9,0.5-1.2,0.9c-0.4,0.2-0.7,0.5-1.2,0.7  c-0.7,0.4-1.6,0.7-2.3,1.1c-0.4,0.2-0.7,0.2-1.2,0.4L9.6,30c0.4,0.7,0,1.4-0.7,1.8c-0.5,0.2-1.2,0-1.6-0.5l-0.2-0.4l-1.8-2.3  c-0.2,0-0.2,0-0.4,0.2c-0.4,0-0.5,0.2-0.7,0.2s-0.2,0-0.4,0c-0.2,0-0.2,0-0.4,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.2,0-0.2,0s0,0,0-0.2  c0-0.2,0-0.2,0-0.5c0-0.2,0-0.2,0-0.4c0-0.2,0-0.2,0-0.4C3.4,27.5,3.4,27.3,3.6,27L3.6,27z M5.7,28.4L5.7,28.4L5.7,28.4L5.7,28.4z"  />
+</symbol>
+<g id="blue" fill="#37adff"><use href="#icon"/></g><g id="turquoise" fill="#00c79a"><use href="#icon"/></g><g id="green" fill="#51cd00"><use href="#icon"/></g><g id="yellow" fill="#ffcb00"><use href="#icon"/></g><g id="orange" fill="#ff9f00"><use href="#icon"/></g><g id="red" fill="#ff613d"><use href="#icon"/></g><g id="pink" fill="#ff4bda"><use href="#icon"/></g><g id="purple" fill="#af51f5"><use href="#icon"/></g><g id="toolbar-dark" fill="#F9F9FA"><use href="#icon"/></g><g id="toolbar-light" fill="#0C0C0D"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/customize.svg b/waterfox/browser/components/sidebar/resources/icons/customize.svg
new file mode 100644
index 0000000000000..a280290f08c29
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/customize.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M4 10a1.994 1.994 0 0 0-1.911 1.44c0 .01-.014.015-.017.025-.362 1.135-.705 2.11-1.759 2.573l-.023.012-.024.012A.5.5 0 0 0 0 14.5a.5.5 0 0 0 .5.5 6.974 6.974 0 0 0 4.825-1.5c.006-.006.007-.013.013-.019A1.993 1.993 0 0 0 4 10zM15.693.307a.984.984 0 0 0-1.338-.046l-8.031 7a.982.982 0 0 0-.049 1.433l1.032 1.031a.983.983 0 0 0 .693.287h.033a.982.982 0 0 0 .706-.335l7-8.031a.982.982 0 0 0-.046-1.339z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/dashboard.svg b/waterfox/browser/components/sidebar/resources/icons/dashboard.svg
new file mode 100644
index 0000000000000..e2908d9485364
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/dashboard.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg data-name="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 12H4a2 2 0 0 1-2-2V3a1 1 0 0 0-2 0v7a4 4 0 0 0 4 4h11a1 1 0 0 0 0-2z"/><path fill="context-fill" fill-opacity="context-fill-opacity" d="M4 11a1 1 0 0 0 1-1V8a1 1 0 0 0-2 0v2a1 1 0 0 0 1 1zM7 11a1 1 0 0 0 1-1V4a1 1 0 0 0-2 0v6a1 1 0 0 0 1 1zM10 11a1 1 0 0 0 1-1V6a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1zM13 11a1 1 0 0 0 1-1V7a1 1 0 0 0-2 0v3a1 1 0 0 0 1 1z"/></svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/defaultFavicon.svg b/waterfox/browser/components/sidebar/resources/icons/defaultFavicon.svg
new file mode 100644
index 0000000000000..e1689b5e6d649
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/defaultFavicon.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.5 1a7.5 7.5 0 1 0 0 15 7.5 7.5 0 0 0 0-15zm2.447 1.75a6.255 6.255 0 0 1 3.756 5.125l-2.229 0A9.426 9.426 0 0 0 10.54 2.75l.407 0zm-2.049 0a8.211 8.211 0 0 1 2.321 5.125l-5.438 0A8.211 8.211 0 0 1 8.102 2.75l.796 0zm-2.846 0 .408 0a9.434 9.434 0 0 0-1.934 5.125l-2.229 0A6.254 6.254 0 0 1 6.052 2.75zm0 11.5a6.252 6.252 0 0 1-3.755-5.125l2.229 0A9.426 9.426 0 0 0 6.46 14.25l-.408 0zm2.05 0a8.211 8.211 0 0 1-2.321-5.125l5.437 0a8.211 8.211 0 0 1-2.321 5.125l-.795 0zm2.846 0-.409 0a9.418 9.418 0 0 0 1.934-5.125l2.229 0a6.253 6.253 0 0 1-3.754 5.125z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/developer.svg b/waterfox/browser/components/sidebar/resources/icons/developer.svg
new file mode 100644
index 0000000000000..d02257d4d13c5
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/developer.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.555 3.2l-2.434 2.436a1.243 1.243 0 1 1-1.757-1.757L12.8 1.445A3.956 3.956 0 0 0 11 1a3.976 3.976 0 0 0-3.434 6.02l-6.273 6.273a1 1 0 1 0 1.414 1.414L8.98 8.434A3.96 3.96 0 0 0 11 9a4 4 0 0 0 4-4 3.956 3.956 0 0 0-.445-1.8z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/device-desktop.svg b/waterfox/browser/components/sidebar/resources/icons/device-desktop.svg
new file mode 100644
index 0000000000000..deeb20f6214d1
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/device-desktop.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M15.5 12H15V3a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v9H.5a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h15a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5zM10 13H6v-1h4zm3-2H3V4h10z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/device-mobile.svg b/waterfox/browser/components/sidebar/resources/icons/device-mobile.svg
new file mode 100644
index 0000000000000..c3798bbfb2f60
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/device-mobile.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M12 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM9 15H7v-1h2zm3-2.5a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/device-tablet.svg b/waterfox/browser/components/sidebar/resources/icons/device-tablet.svg
new file mode 100644
index 0000000000000..4936f1aa83ad8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/device-tablet.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm-1 11.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h10a.5.5 0 0 1 .5.5v9zM15 9h-1V7h1v2z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/device-vr.svg b/waterfox/browser/components/sidebar/resources/icons/device-vr.svg
new file mode 100644
index 0000000000000..d30e351e7b2fa
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/device-vr.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M13.5 3h-11A2.5 2.5 0 0 0 0 5.5v5A2.5 2.5 0 0 0 2.5 13h3.02a1.987 1.987 0 0 0 1.562-.751.965.965 0 0 0 .1-.146l.384-.7a.5.5 0 0 1 .878 0l.383.7a.965.965 0 0 0 .1.146A1.987 1.987 0 0 0 10.48 13h3.02a2.5 2.5 0 0 0 2.5-2.5v-5A2.5 2.5 0 0 0 13.5 3zm.5 7.5a.5.5 0 0 1-.5.5h-3l-.3-.556a2.5 2.5 0 0 0-4.392 0L5.5 11h-3a.5.5 0 0 1-.5-.5v-5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 .5.5z"></path><path fill="context-fill" d="M12.5 6h-9a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/edit.svg b/waterfox/browser/components/sidebar/resources/icons/edit.svg
new file mode 100644
index 0000000000000..73057c847187f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/edit.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M14.354 2.353l-.708-.707a2.007 2.007 0 0 0-2.828 0l-.379.379a.5.5 0 0 0 0 .707l2.829 2.829a.5.5 0 0 0 .707 0l.379-.379a2.008 2.008 0 0 0 0-2.829zM9.732 3.439a.5.5 0 0 0-.707 0L3.246 9.218a1.986 1.986 0 0 0-.452.712l-1.756 4.39A.5.5 0 0 0 1.5 15a.5.5 0 0 0 .188-.037l4.382-1.752a1.966 1.966 0 0 0 .716-.454l5.779-5.778a.5.5 0 0 0 0-.707zM5.161 12.5l-2.549 1.02a.1.1 0 0 1-.13-.13L3.5 10.831a.1.1 0 0 1 .16-.031l1.54 1.535a.1.1 0 0 1-.039.165z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/experiments.svg b/waterfox/browser/components/sidebar/resources/icons/experiments.svg
new file mode 100644
index 0000000000000..870914287b510
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/experiments.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M13.9 9.81a1.23 1.23 0 0 0 0-.17v-.08a5.67 5.67 0 0 0-2.4-3.36 1.17 1.17 0 0 1-.56-.95V3a1 1 0 0 0-1-1H6.06a1 1 0 0 0-1 1v2.25a1.17 1.17 0 0 1-.56 1 5.66 5.66 0 0 0-2.35 3.33v.12a.53.53 0 0 0 0 .11 5.35 5.35 0 0 0-.11 1 5.65 5.65 0 0 0 3.24 5.09 1 1 0 0 0 .44.1h4.57a1 1 0 0 0 .44-.1A5.65 5.65 0 0 0 14 10.83a5.3 5.3 0 0 0-.1-1.02zm-8.27-2a3.18 3.18 0 0 0 1.43-2.6V4h1.88v1.25a3.18 3.18 0 0 0 1.43 2.6 3.68 3.68 0 0 1 1.54 2.24v.22a2.82 2.82 0 0 1-3.68-.59A3.48 3.48 0 0 0 4.56 9a3.76 3.76 0 0 1 1.07-1.15z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/extensionGeneric-16.svg b/waterfox/browser/components/sidebar/resources/icons/extensionGeneric-16.svg
new file mode 100644
index 0000000000000..8f79707214e39
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/extensionGeneric-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/extensions.svg b/waterfox/browser/components/sidebar/resources/icons/extensions.svg
new file mode 100644
index 0000000000000..4bf376bbae478
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/extensions.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m13.375 16-9.75 0A1.626 1.626 0 0 1 2 14.375L2 11.5a.75.75 0 0 1 .75-.75l1.75 0c.689 0 1.25-.561 1.25-1.25S5.189 8.25 4.5 8.25l-1.75 0A.75.75 0 0 1 2 7.5l0-1.875C2 4.728 2.728 4 3.625 4L6 4l0-1.352C6 1.341 6.938.147 8.238.014A2.502 2.502 0 0 1 11 2.5L11 4l2.375 0C14.272 4 15 4.728 15 5.625l0 8.75c0 .897-.728 1.625-1.625 1.625zM3.25 12l0 2.15.6.6 9.3 0 .6-.6 0-8.3-.6-.6-2.65 0a.75.75 0 0 1-.75-.75l0-2c0-.689-.561-1.25-1.25-1.25s-1.25.561-1.25 1.25l0 2a.75.75 0 0 1-.75.75l-2.75 0-.5.6 0 1.15 1.103 0c1.308 0 2.502.939 2.634 2.24A2.503 2.503 0 0 1 4.5 12l-1.25 0z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/folder-16.svg b/waterfox/browser/components/sidebar/resources/icons/folder-16.svg
new file mode 100644
index 0000000000000..a17ebffcd8f05
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/folder-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M14 3H8.151L6.584 1.538A2 2 0 0 0 5.219 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zM5.219 3l1.072 1H2V3zM14 13H2V5h6v-.014c.05 0 .1.014.151.014H14z"></path>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/folder.svg b/waterfox/browser/components/sidebar/resources/icons/folder.svg
new file mode 100644
index 0000000000000..eef51c2d784ae
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/folder.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m13.995 14-10.99 0A2.007 2.007 0 0 1 1 11.995l0-8.99C1 1.899 1.899 1 3.005 1l2.958 0a2.01 2.01 0 0 1 1.47.641L8.693 3l5.302 0C15.101 3 16 3.899 16 5.005l0 6.99A2.007 2.007 0 0 1 13.995 14zM2.85 2.25l-.6.6 0 9.3.6.6 11.3 0 .6-.6 0-7.3-.6-.6-5.73 0-.458-.2-1.445-1.559a.758.758 0 0 0-.554-.241l-3.113 0z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/globe-16.svg b/waterfox/browser/components/sidebar/resources/icons/globe-16.svg
new file mode 100644
index 0000000000000..3387136a3c77f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/globe-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M8 0a8 8 0 1 0 8 8 8.009 8.009 0 0 0-8-8zm5.163 4.958h-1.552a7.7 7.7 0 0 0-1.051-2.376 6.03 6.03 0 0 1 2.603 2.376zM14 8a5.963 5.963 0 0 1-.335 1.958h-1.821A12.327 12.327 0 0 0 12 8a12.327 12.327 0 0 0-.156-1.958h1.821A5.963 5.963 0 0 1 14 8zm-6 6c-1.075 0-2.037-1.2-2.567-2.958h5.135C10.037 12.8 9.075 14 8 14zM5.174 9.958a11.084 11.084 0 0 1 0-3.916h5.651A11.114 11.114 0 0 1 11 8a11.114 11.114 0 0 1-.174 1.958zM2 8a5.963 5.963 0 0 1 .335-1.958h1.821a12.361 12.361 0 0 0 0 3.916H2.335A5.963 5.963 0 0 1 2 8zm6-6c1.075 0 2.037 1.2 2.567 2.958H5.433C5.963 3.2 6.925 2 8 2zm-2.56.582a7.7 7.7 0 0 0-1.051 2.376H2.837A6.03 6.03 0 0 1 5.44 2.582zm-2.6 8.46h1.549a7.7 7.7 0 0 0 1.051 2.376 6.03 6.03 0 0 1-2.603-2.376zm7.723 2.376a7.7 7.7 0 0 0 1.051-2.376h1.552a6.03 6.03 0 0 1-2.606 2.376z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/home.svg b/waterfox/browser/components/sidebar/resources/icons/home.svg
new file mode 100644
index 0000000000000..f933e2bd6873e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/home.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15.7 7.3l-7-7c-.4-.4-1-.4-1.4 0l-7 7c-.4.4-.4 1 0 1.4.4.4 1 .4 1.4 0l.3-.3V13c0 1.7 1.3 3 3 3h6c1.7 0 3-1.3 3-3V8.4l.3.3c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4zM8 11.5c0-.3.2-.5.5-.5s.5.2.5.5-.2.5-.5.5-.5-.2-.5-.5zm4 1.5c0 .6-.4 1-1 1h-1V9c0-.6-.4-1-1-1H7c-.6 0-1 .4-1 1v5H5c-.6 0-1-.4-1-1V6.4l4-4 4 4V13z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/hourglass.svg b/waterfox/browser/components/sidebar/resources/icons/hourglass.svg
new file mode 100644
index 0000000000000..4687846c91b74
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/hourglass.svg
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="context-fill" d="M13,1 C13.5522847,1 14,1.44771525 14,2 C14,2.55228475 13.5522847,3 13,3 L12.9854217,2.99990801 C12.9950817,3.16495885 13,3.33173274 13,3.5 C13,5.24679885 10.9877318,6.01090495 10.9877318,8.0017538 C10.9877318,9.99260264 13,10.7536922 13,12.5 C13,12.6686079 12.9950617,12.8357163 12.985363,13.0010943 L13,13 C13.5522847,13 14,13.4477153 14,14 C14,14.5522847 13.5522847,15 13,15 L3,15 C2.44771525,15 2,14.5522847 2,14 C2,13.4477153 2.44771525,13 3,13 L3.01463704,13.0010943 C3.00493827,12.8357163 3,12.6686079 3,12.5 C3,10.7536922 4.9877318,9.99260264 5,8.0017538 C5.0122682,6.01090495 3,5.24679885 3,3.5 C3,3.33173274 3.00491834,3.16495885 3.01457832,2.99990801 L3,3 C2.44771525,3 2,2.55228475 2,2 C2,1.44771525 2.44771525,1 3,1 L13,1 Z M10.987,3 L5.012,3 L5.00308914,3.24815712 C5.00103707,3.33163368 5,3.4155948 5,3.5 C5,5.36125069 6.99153646,6.01774089 6.99153646,8.0017538 C6.99153646,9.98576671 5,10.6393737 5,12.5 L5.00307746,12.7513676 L5.01222201,12.9998392 L5.60191711,12.9988344 L6.0425138,12.2959826 C7.02362731,10.7653275 7.67612271,10 8,10 C8.37014547,10 9.16950644,10.9996115 10.3980829,12.9988344 L10.987778,12.9998392 C10.9958674,12.8352104 11,12.66849 11,12.5 C11,10.6393737 8.98689779,10.0147381 8.98689779,8.0017538 C8.98689779,5.98876953 11,5.36125069 11,3.5 L10.9969109,3.24815712 L10.987,3 Z"/>
+    <path fill="context-fill" d="M6,4 L10,4 C8.95166016,6 8.28499349,7 8,7 C7.71500651,7 7.04833984,6 6,4 Z"/>
+  </g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/info.svg b/waterfox/browser/components/sidebar/resources/icons/info.svg
new file mode 100644
index 0000000000000..f85c206417189
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/info.svg
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.25 6.938a.625.625 0 0 0-1.25 0l0 4.438a.625.625 0 0 0 1.25-.001l0-4.437z"/>
+  <path d="m8 4-.75 0-.25.25L7 5l.25.25.75 0L8.25 5l0-.75z"/>
+  <path d="M7.625 1.75c3.446 0 6.25 2.804 6.25 6.25s-2.804 6.25-6.25 6.25-6.25-2.804-6.25-6.25 2.804-6.25 6.25-6.25m0-1.25a7.5 7.5 0 1 0 0 15 7.5 7.5 0 0 0 0-15z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/lockwise.svg b/waterfox/browser/components/sidebar/resources/icons/lockwise.svg
new file mode 100644
index 0000000000000..884cb63ae4776
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/lockwise.svg
@@ -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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32">
+  <defs>
+    <linearGradient id="b" x1="24.684" y1="5.756" x2="6.966" y2="26.663" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ff9640"/>
+      <stop offset=".6" stop-color="#fc4055"/>
+      <stop offset="1" stop-color="#e31587"/>
+    </linearGradient>
+    <linearGradient id="c" x1="26.362" y1="4.459" x2="10.705" y2="21.897" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e" stop-opacity=".8"/>
+      <stop offset=".094" stop-color="#fff36e" stop-opacity=".699"/>
+      <stop offset=".752" stop-color="#fff36e" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="d" x1="7.175" y1="27.275" x2="23.418" y2="11.454" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#0090ed"/>
+      <stop offset=".386" stop-color="#5b6df8"/>
+      <stop offset=".629" stop-color="#9059ff"/>
+      <stop offset="1" stop-color="#b833e1"/>
+    </linearGradient>
+    <linearGradient id="a" x1="29.104" y1="15.901" x2="26.135" y2="21.045" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#722291" stop-opacity=".5"/>
+      <stop offset=".5" stop-color="#722291" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="e" x1="20.659" y1="21.192" x2="13.347" y2="28.399" xlink:href="#a"/>
+    <linearGradient id="f" x1="2.97" y1="19.36" x2="10.224" y2="21.105" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#054096" stop-opacity=".5"/>
+      <stop offset=".054" stop-color="#0f3d9c" stop-opacity=".441"/>
+      <stop offset=".261" stop-color="#2f35b1" stop-opacity=".249"/>
+      <stop offset=".466" stop-color="#462fbf" stop-opacity=".111"/>
+      <stop offset=".669" stop-color="#542bc8" stop-opacity=".028"/>
+      <stop offset=".864" stop-color="#592acb" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <path d="M15.986 31.076A5.635 5.635 0 0 1 12.3 29.76 103.855 103.855 0 0 1 2.249 19.7a5.841 5.841 0 0 1-.006-7.4A103.792 103.792 0 0 1 12.3 2.247a5.837 5.837 0 0 1 7.4-.006A104.1 104.1 0 0 1 29.751 12.3a5.842 5.842 0 0 1 .006 7.405c-.423.484-.584.661-.917 1.025l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 100.308 100.308 0 0 0-9.7-9.714 2.352 2.352 0 0 0-2.814.007 100.323 100.323 0 0 0-9.7 9.7 2.354 2.354 0 0 0 .006 2.815 100.375 100.375 0 0 0 9.7 9.708 2.352 2.352 0 0 0 2.815-.006c1.311-1.145 2.326-2.031 3.434-3.086l-3.4-3.609a2.834 2.834 0 0 1-.776-2.008 2.675 2.675 0 0 1 .834-1.9l.194-.184a2.493 2.493 0 0 0 1.124-2.333 2.81 2.81 0 0 0-5.6 0 2.559 2.559 0 0 0 1.092 2.279l.127.118a2.735 2.735 0 0 1 .324 3.7 1.846 1.846 0 0 1-.253.262l-1.578 1.326a1.75 1.75 0 0 1-2.252-2.68l.755-.634a5.758 5.758 0 0 1-1.715-4.366 6.305 6.305 0 0 1 12.6 0 5.642 5.642 0 0 1-1.854 4.528l3.84 4.082a2.071 2.071 0 0 1 .59 1.446 2.128 2.128 0 0 1-.628 1.526c-1.6 1.592-2.895 2.72-4.533 4.15a5.745 5.745 0 0 1-3.753 1.354z" fill="url(#b)"/>
+  <path d="M15.986 31.076A5.635 5.635 0 0 1 12.3 29.76 103.855 103.855 0 0 1 2.249 19.7a5.841 5.841 0 0 1-.006-7.4A103.792 103.792 0 0 1 12.3 2.247a5.837 5.837 0 0 1 7.4-.006A104.1 104.1 0 0 1 29.751 12.3a5.842 5.842 0 0 1 .006 7.405c-.423.484-.584.661-.917 1.025l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 100.308 100.308 0 0 0-9.7-9.714 2.352 2.352 0 0 0-2.814.007 100.323 100.323 0 0 0-9.7 9.7 2.354 2.354 0 0 0 .006 2.815 100.375 100.375 0 0 0 9.7 9.708 2.352 2.352 0 0 0 2.815-.006c1.311-1.145 2.326-2.031 3.434-3.086l-3.4-3.609a2.834 2.834 0 0 1-.776-2.008 2.675 2.675 0 0 1 .834-1.9l.194-.184a2.493 2.493 0 0 0 1.124-2.333 2.81 2.81 0 0 0-5.6 0 2.559 2.559 0 0 0 1.092 2.279l.127.118a2.735 2.735 0 0 1 .324 3.7 1.846 1.846 0 0 1-.253.262l-1.578 1.326a1.75 1.75 0 0 1-2.252-2.68l.755-.634a5.758 5.758 0 0 1-1.715-4.366 6.305 6.305 0 0 1 12.6 0 5.642 5.642 0 0 1-1.854 4.528l3.84 4.082a2.071 2.071 0 0 1 .59 1.446 2.128 2.128 0 0 1-.628 1.526c-1.6 1.592-2.895 2.72-4.533 4.15a5.745 5.745 0 0 1-3.753 1.354z" fill="url(#c)"/>
+  <path d="M29.58 17.75a34.267 34.267 0 0 0-2.473-3.15 2.352 2.352 0 0 1 .008 2.814c-.393.45-.546.617-.86.961l-.234.258a1.749 1.749 0 1 0 2.585 2.357l.234-.255c.231-.253.379-.415.59-.653a2.161 2.161 0 0 0 .15-2.332zm-8.734 6.275c-1.108 1.055-2.123 1.941-3.434 3.086a2.352 2.352 0 0 1-2.815.006 100.375 100.375 0 0 1-9.7-9.708 2.354 2.354 0 0 1-.006-2.815s-2.131 1.984-2.4 3.424a2.956 2.956 0 0 0 .724 2.782 103.772 103.772 0 0 0 9.085 8.96 5.635 5.635 0 0 0 3.683 1.316 5.745 5.745 0 0 0 3.753-1.351c.926-.808 1.741-1.52 2.565-2.273a1.558 1.558 0 0 0 0-1.476 11.55 11.55 0 0 0-1.455-1.951z" fill="url(#d)"/>
+  <path d="M29.43 20.079c-.211.238-.359.4-.59.653l-.234.255a1.749 1.749 0 1 1-2.585-2.357l.234-.258c.314-.344.467-.511.86-.961a2.352 2.352 0 0 0-.008-2.814 34.267 34.267 0 0 1 2.473 3.153 2.161 2.161 0 0 1-.15 2.329z" fill="url(#a)"/>
+  <path d="M22.3 25.976a11.55 11.55 0 0 0-1.458-1.951c-1.108 1.055-2.123 1.941-3.434 3.086a2.352 2.352 0 0 1-2.815.006c-1.414-1.234-2.768-2.5-4.095-3.8L8.023 25.8c1.384 1.35 2.8 2.668 4.28 3.958a5.635 5.635 0 0 0 3.683 1.316 5.745 5.745 0 0 0 3.753-1.351c.926-.808 1.741-1.52 2.565-2.273a1.558 1.558 0 0 0-.004-1.474z" fill="url(#e)"/>
+  <path d="M4.892 17.409a2.354 2.354 0 0 1-.006-2.815s-2.131 1.984-2.4 3.424a2.956 2.956 0 0 0 .729 2.782c1.56 1.739 3.158 3.4 4.808 5.007l2.479-2.48c-1.935-1.891-3.802-3.844-5.61-5.918z" opacity=".9" fill="url(#f)"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/more-horiz-16.svg b/waterfox/browser/components/sidebar/resources/icons/more-horiz-16.svg
new file mode 100644
index 0000000000000..efb6784651728
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/more-horiz-16.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4,8c0,1.104-0.896,2-2,2S0,9.104,0,8s0.896-2,2-2S4,6.896,4,8z M10,8 c0,1.104-0.896,2-2,2S6,9.104,6,8s0.896-2,2-2S10,6.896,10,8z M14,10c1.104,0,2-0.896,2-2s-0.896-2-2-2s-2,0.896-2,2 S12.896,10,14,10z" fill="#0C0C0D" fill-opacity=".8"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/performance.svg b/waterfox/browser/components/sidebar/resources/icons/performance.svg
new file mode 100644
index 0000000000000..f8960495ceebc
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/performance.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M8 1a8 8 0 0 0-8 8 7.89 7.89 0 0 0 .78 3.43 1 1 0 0 0 .9.57.94.94 0 0 0 .43-.1 1 1 0 0 0 .47-1.33A6.07 6.07 0 0 1 2 9a6 6 0 0 1 12 0 5.93 5.93 0 0 1-.59 2.57 1 1 0 0 0 1.81.86A7.89 7.89 0 0 0 16 9a8 8 0 0 0-8-8z"/>
+  <path fill="context-fill" d="M11.77 7.08a.5.5 0 0 0-.69.15L8.62 11.1A2.12 2.12 0 0 0 8 11a2 2 0 0 0 0 4 2.05 2.05 0 0 0 1.12-.34 2.31 2.31 0 0 0 .54-.54 2 2 0 0 0 0-2.24 2.31 2.31 0 0 0-.2-.24l2.46-3.87a.5.5 0 0 0-.15-.69z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/privatebrowsing-favicon.svg b/waterfox/browser/components/sidebar/resources/icons/privatebrowsing-favicon.svg
new file mode 100644
index 0000000000000..5968f31cb1552
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/privatebrowsing-favicon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <circle cx="8" cy="8" r="8" fill="#8d20ae"/>
+  <circle cx="8" cy="8" r="7.5" stroke="#7b149a" stroke-width="1" fill="none"/>
+  <path d="M11.309,10.995C10.061,10.995,9.2,9.5,8,9.5s-2.135,1.5-3.309,1.5c-1.541,0-2.678-1.455-2.7-3.948C1.983,5.5,2.446,5.005,4.446,5.005S7.031,5.822,8,5.822s1.555-.817,3.555-0.817S14.017,5.5,14.006,7.047C13.987,9.54,12.85,10.995,11.309,10.995ZM5.426,6.911a1.739,1.739,0,0,0-1.716.953A2.049,2.049,0,0,0,5.3,8.544c0.788,0,1.716-.288,1.716-0.544A1.428,1.428,0,0,0,5.426,6.911Zm5.148,0A1.429,1.429,0,0,0,8.981,8c0,0.257.928,0.544,1.716,0.544a2.049,2.049,0,0,0,1.593-.681A1.739,1.739,0,0,0,10.574,6.911Z" stroke="#670c83" stroke-width="2" fill="none"/>
+  <path d="M11.309,10.995C10.061,10.995,9.2,9.5,8,9.5s-2.135,1.5-3.309,1.5c-1.541,0-2.678-1.455-2.7-3.948C1.983,5.5,2.446,5.005,4.446,5.005S7.031,5.822,8,5.822s1.555-.817,3.555-0.817S14.017,5.5,14.006,7.047C13.987,9.54,12.85,10.995,11.309,10.995ZM5.426,6.911a1.739,1.739,0,0,0-1.716.953A2.049,2.049,0,0,0,5.3,8.544c0.788,0,1.716-.288,1.716-0.544A1.428,1.428,0,0,0,5.426,6.911Zm5.148,0A1.429,1.429,0,0,0,8.981,8c0,0.257.928,0.544,1.716,0.544a2.049,2.049,0,0,0,1.593-.681A1.739,1.739,0,0,0,10.574,6.911Z" fill="#fff"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/profiler-stopwatch.svg b/waterfox/browser/components/sidebar/resources/icons/profiler-stopwatch.svg
new file mode 100644
index 0000000000000..c453ff8856810
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/profiler-stopwatch.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M10.85 6.85a.5.5 0 0 0-.7-.7l-2.5 2.5.7.7 2.5-2.5zM8 10a1 1 0 1 0 0-2 1 1 0 0 0 0 2zM5 1a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1zM8 4a5 5 0 1 0 0 10A5 5 0 0 0 8 4zM1 9a7 7 0 1 1 14 0A7 7 0 0 1 1 9z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/robot.ico b/waterfox/browser/components/sidebar/resources/icons/robot.ico
new file mode 100644
index 0000000000000..8913387fc93dc
Binary files /dev/null and b/waterfox/browser/components/sidebar/resources/icons/robot.ico differ
diff --git a/waterfox/browser/components/sidebar/resources/icons/settings-photon.svg b/waterfox/browser/components/sidebar/resources/icons/settings-photon.svg
new file mode 100644
index 0000000000000..67569204f1e34
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/settings-photon.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/settings.svg b/waterfox/browser/components/sidebar/resources/icons/settings.svg
new file mode 100644
index 0000000000000..8d8f791abef2b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/settings.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m8.628 16-1.25 0a1.632 1.632 0 0 1-1.562-1.177l-.406-1.414a5.939 5.939 0 0 1-.78-.466l-1.448.36a1.632 1.632 0 0 1-1.799-.765l-.625-1.082a1.633 1.633 0 0 1 .229-1.931l1.045-1.101A3.279 3.279 0 0 1 2 8c0-.153.014-.302.032-.45L.999 6.479a1.63 1.63 0 0 1-.238-1.94l.625-1.083a1.636 1.636 0 0 1 1.787-.768l1.477.355c.258-.179.51-.329.761-.452l.406-1.414A1.63 1.63 0 0 1 7.378 0l1.25 0c.714 0 1.354.478 1.559 1.163l.425 1.436c.242.121.484.266.739.444l1.478-.355a1.635 1.635 0 0 1 1.786.768l.625 1.083c.36.625.263 1.422-.237 1.941l-1.035 1.07c.018.148.032.297.032.45 0 .145-.014.285-.031.424l1.045 1.101c.492.519.586 1.312.229 1.931l-.625 1.083a1.63 1.63 0 0 1-1.8.764l-1.447-.36c-.259.182-.51.333-.759.458l-.425 1.437A1.638 1.638 0 0 1 8.628 16zm-4.016-4.341.528.109a4.72 4.72 0 0 0 1.032.615l.359.404.485 1.691c.046.16.194.271.36.271l1.25 0a.37.37 0 0 0 .359-.269l.506-1.707.355-.398c.324-.137.645-.33 1.01-.608l.529-.109 1.731.431a.378.378 0 0 0 .416-.176l.625-1.083a.378.378 0 0 0-.053-.446l-1.25-1.317-.167-.505.022-.174c.021-.127.041-.255.041-.388 0-.149-.021-.293-.042-.437l-.021-.15.171-.513 1.244-1.289a.378.378 0 0 0 .055-.448l-.625-1.082a.38.38 0 0 0-.412-.177l-1.758.422-.521-.108a4.7 4.7 0 0 0-.991-.594l-.356-.398-.506-1.707a.373.373 0 0 0-.36-.269l-1.25 0a.377.377 0 0 0-.36.271l-.486 1.691-.36.405a4.71 4.71 0 0 0-1.013.6l-.521.109-1.757-.422a.383.383 0 0 0-.413.177l-.625 1.083a.375.375 0 0 0 .055.447L3.142 6.9l.171.514-.021.15A2.981 2.981 0 0 0 3.25 8c0 .133.02.261.037.389l.022.174-.167.505-1.25 1.317a.38.38 0 0 0-.053.446l.625 1.083a.38.38 0 0 0 .415.176l1.733-.431z"/>
+  <path d="M8 6.25c.965 0 1.75.785 1.75 1.75S8.965 9.75 8 9.75 6.25 8.965 6.25 8 7.035 6.25 8 6.25M8 5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/tab-group-chicklet.svg b/waterfox/browser/components/sidebar/resources/icons/tab-group-chicklet.svg
new file mode 100644
index 0000000000000..5d452e0ca7ab9
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/tab-group-chicklet.svg
@@ -0,0 +1,33 @@
+<!-- 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/. -->
+<!-- https://searchfox.org/mozilla-central/source/browser/themes/shared/tabbrowser/tab-group-chicklet.svg -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="16" height="16" viewBox="0 0 16 16">
+<style>
+  g:not(:target) {
+    display: none;
+  }
+</style>
+<symbol id="icon">
+  <rect width="15" height="15" x="0.5" y="0.5" rx="4" stroke="context-stroke" stroke-width="1"/>
+</symbol>
+<g id="blue"          fill="oklch(48% 0.2 260)"  stroke="oklch(48% 0.2 260)"><use href="#icon"/></g>
+<g id="blue-invert"   fill="oklch(83% 0.17 260)" stroke="oklch(83% 0.17 260)"><use href="#icon"/></g>
+<g id="purple"        fill="oklch(48% 0.2 315)"  stroke="oklch(48% 0.2 315)"><use href="#icon"/></g>
+<g id="purple-invert" fill="oklch(83% 0.14 315)" stroke="oklch(83% 0.14 315)"><use href="#icon"/></g>
+<g id="cyan"          fill="oklch(48% 0.2 205)"  stroke="oklch(48% 0.2 205)"><use href="#icon"/></g>
+<g id="cyan-invert"   fill="oklch(83% 0.11 205)" stroke="oklch(83% 0.11 205)"><use href="#icon"/></g>
+<g id="orange"        fill="oklch(48% 0.20 50)"  stroke="oklch(48% 0.20 50)"><use href="#icon"/></g>
+<g id="orange-invert" fill="oklch(86% 0.14 50)"  stroke="oklch(86% 0.14 50)"><use href="#icon"/></g>
+<g id="yellow"        fill="oklch(51% 0.23 90)"  stroke="oklch(51% 0.23 90)"><use href="#icon"/></g>
+<g id="yellow-invert" fill="oklch(86% 0.14 90)"  stroke="oklch(86% 0.14 90)"><use href="#icon"/></g>
+<g id="pink"          fill="oklch(48% 0.2 360)"  stroke="oklch(48% 0.2 360)"><use href="#icon"/></g>
+<g id="pink-invert"   fill="oklch(83% 0.14 360)" stroke="oklch(83% 0.14 360)"><use href="#icon"/></g>
+<g id="green"         fill="oklch(48% 0.2 145)"  stroke="oklch(48% 0.2 145)"><use href="#icon"/></g>
+<g id="green-invert"  fill="oklch(83% 0.14 145)" stroke="oklch(83% 0.14 145)"><use href="#icon"/></g>
+<g id="red"           fill="oklch(48% 0.2 15)"   stroke="oklch(48% 0.2 15)"><use href="#icon"/></g>
+<g id="red-invert"    fill="oklch(83% 0.14 15)"  stroke="oklch(83% 0.14 15)"><use href="#icon"/></g>
+<g id="grey"          fill="#5b5b66"             stroke="#5b5b66"><use href="#icon"/></g>
+<g id="grey-invert"   fill="#bac2ca"             stroke="#bac2ca"><use href="#icon"/></g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/icons/warning.svg b/waterfox/browser/components/sidebar/resources/icons/warning.svg
new file mode 100644
index 0000000000000..46743bb3ef990
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/warning.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M14.742 12.106L9.789 2.2a2 2 0 0 0-3.578 0l-4.953 9.91A2 2 0 0 0 3.047 15h9.905a2 2 0 0 0 1.79-2.894zM7 5a1 1 0 0 1 2 0v4a1 1 0 0 1-2 0zm1 8.25A1.25 1.25 0 1 1 9.25 12 1.25 1.25 0 0 1 8 13.25z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/resources/icons/window.svg b/waterfox/browser/components/sidebar/resources/icons/window.svg
new file mode 100644
index 0000000000000..251e90758bd13
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/icons/window.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+        - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h11a2 2 0 0 0 2-2V4a3 3 0 0 0-3-3zm1 11a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V6h12zm0-7H2V4a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/resources/logs.html b/waterfox/browser/components/sidebar/resources/logs.html
new file mode 100644
index 0000000000000..23dce1cdfa7b3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/logs.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<meta charset="UTF-8">
+<link rel="icon" href="./16x16.svg">
+<script type="module" src="module/logs.js"></script>
+<title>Logs for Performance Tuning</title>
+
+<h1>Query Logs</h1>
+<pre>[</pre>
+<pre id="queryLogs"></pre>
+<pre>];</pre>
+<pre id="queryLogsAnalysis"></pre>
+
+<h1>Internal Messaging Logs</h1>
+<pre>{</pre>
+<pre id="connectionMessageLogs"></pre>
+<pre>};</pre>
+<pre id="connectionMessageLogsAnalysis"></pre>
diff --git a/waterfox/browser/components/sidebar/resources/module/InContentPanel.js b/waterfox/browser/components/sidebar/resources/module/InContentPanel.js
new file mode 100644
index 0000000000000..82cf04200b27f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/InContentPanel.js
@@ -0,0 +1,598 @@
+/*
+# 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/.
+*/
+'use strict';
+
+// This is the base class of implementations to show custom UI on contents.
+
+// This script can be loaded in three ways:
+//  * REGULAR case:
+//    loaded into a public webpage
+//  * SIDEBAR case:
+//    loaded into the TST sidebar
+
+export default class InContentPanel {
+  static TYPE = 'in-content-panel';
+  get type() {
+    return this.constructor.TYPE;
+  }
+
+  panel;
+  root;
+  windowId; // for SIDEBAR case
+
+  // -moz-platform @media rules looks unavailable on Web contents...
+  isWindows = /^Win/i.test(navigator.platform);
+  isLinux = /Linux/i.test(navigator.platform);
+  isMac = /^Mac/i.test(navigator.platform);
+
+  get styleRules() {
+    return `
+      .in-content-panel-root {
+        --in-content-panel-show-hide-animation: opacity 0.1s ease-out;
+        --in-content-panel-scale: 1; /* Web contents may be zoomed by the user, and we need to cancel the zoom effect. */
+        --max-32bit-integer: 2147483647;
+        background: transparent;
+        border: 0 none;
+        bottom: auto;
+        height: 0px;
+        left: 0;
+        opacity: 1;
+        overflow: hidden;
+        position: fixed;
+        right: 0;
+        top: 0;
+        transition: var(--in-content-panel-show-hide-animation);
+        width: 100%;
+        z-index: var(--max-32bit-integer);
+
+        .in-content-panel {
+          /* https://searchfox.org/mozilla-central/rev/dfaf02d68a7cb018b6cad7e189f450352e2cde04/toolkit/themes/shared/popup.css#11-63 */
+          color-scheme: light dark;
+
+          --panel-background: Menu;
+          --panel-color: MenuText;
+          --panel-padding-block: calc(4px / var(--in-content-panel-scale));
+          --panel-padding: var(--panel-padding-block) 0;
+          --panel-border-radius: calc(4px / var(--in-content-panel-scale));
+          --panel-border-color: ThreeDShadow;
+          --panel-width: initial;
+
+          --panel-shadow-margin: 0px;
+          --panel-shadow: 0px 0px var(--panel-shadow-margin) hsla(0,0%,0%,.2);
+          -moz-window-input-region-margin: var(--panel-shadow-margin);
+          margin: calc(-1 * var(--panel-shadow-margin));
+
+          /* Panel design token theming */
+          --background-color-canvas: var(--panel-background);
+
+          /*@media (-moz-platform: linux) {*/
+          ${this.isLinux ? '' : '/*'}
+            --panel-border-radius: calc(8px / var(--in-content-panel-scale));
+            --panel-padding-block: calc(3px / var(--in-content-panel-scale));
+
+            @media (prefers-contrast) {
+              --panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
+            }
+          ${this.isLinux ? '' : '*/'}
+          /*}*/
+
+          /*@media (-moz-platform: linux) or (-moz-platform: windows) {*/
+          ${this.isLinux || this.isWindows ? '' : '/*'}
+            --panel-shadow-margin: calc(4px / var(--in-content-panel-scale));
+          ${this.isLinux || this.isWindows ? '' : '*/'}
+          /*}*/
+
+          /* On some linux WMs we need to draw square menus because alpha is not available */
+          @media /*(-moz-platform: linux) and*/ (not (-moz-gtk-csd-transparency-available)) {
+            ${this.isLinux ? '' : '/*'}
+            --panel-shadow-margin: 0px !important;
+            --panel-border-radius: 0px !important;
+            ${this.isLinux ? '' : '*/'}
+          }
+
+          /*@media (-moz-platform: macos) {*/
+          ${this.isMac ? '' : '/*'}
+            appearance: auto;
+            -moz-default-appearance: menupopup;
+            background-color: Menu;
+            --panel-background: white /* https://searchfox.org/mozilla-central/rev/86c208f86f35d53dc824f18f8e540fe5b0663870/browser/themes/shared/browser-colors.css#89 https://searchfox.org/mozilla-central/rev/86c208f86f35d53dc824f18f8e540fe5b0663870/toolkit/themes/shared/global-shared.css#128 */;
+            --panel-border-color: transparent;
+            --panel-border-radius: calc(6px / var(--in-content-panel-scale));
+          ${this.isMac ? '' : '*/'}
+          /*}*/
+
+          /* https://searchfox.org/mozilla-central/rev/dfaf02d68a7cb018b6cad7e189f450352e2cde04/browser/themes/shared/tabbrowser/tab-hover-preview.css#5 */
+          --panel-width: min(100%, calc(${this.BASE_PANEL_WIDTH}px / var(--in-content-panel-scale)));
+          --panel-padding: 0;
+
+          /* https://searchfox.org/mozilla-central/rev/b576bae69c6f3328d2b08108538cbbf535b1b99d/toolkit/themes/shared/global-shared.css#111 */
+          /* https://searchfox.org/mozilla-central/rev/b576bae69c6f3328d2b08108538cbbf535b1b99d/browser/themes/shared/browser-colors.css#90 */
+          --panel-border-color: light-dark(rgb(240, 240, 244), rgb(82, 82, 94));
+
+
+          @media (prefers-color-scheme: dark) {
+            --panel-background: ${this.isMac ? 'rgb(66, 65, 77)' /* https://searchfox.org/mozilla-central/rev/86c208f86f35d53dc824f18f8e540fe5b0663870/browser/themes/shared/browser-colors.css#89 https://searchfox.org/mozilla-central/rev/86c208f86f35d53dc824f18f8e540fe5b0663870/toolkit/themes/shared/global-shared.css#128 */ : 'var(--dark-popup)'};
+            --panel-color: var(--dark-popup-text);
+            --panel-border-color: var(--dark-popup-border);
+          }
+
+          background: var(--panel-background);
+          border: var(--panel-border-color) solid calc(1px / var(--in-content-panel-scale));
+          border-radius: var(--panel-border-radius);
+          box-shadow: var(--panel-shadow);
+          box-sizing: border-box;
+          color: var(--panel-color);
+          direction: ltr;
+          font: Message-Box;
+          left: auto;
+          line-height: 1.5;
+          margin-block-start: 0px;
+          max-width: var(--panel-width);
+          min-width: var(--panel-width);
+          opacity: 0;
+          padding: 0;
+          position: fixed;
+          right: auto;
+          z-index: var(--max-32bit-integer);
+
+          &.rtl {
+            direction: rtl;
+          }
+          &.animation {
+            transition: var(--in-content-panel-show-hide-animation),
+                        left 0.1s ease-out,
+                        margin-block-start 0.1s ease-out,
+                        right 0.1s ease-out;
+          }
+          &.open {
+            opacity: 1;
+          }
+
+          &.updating,
+          & .updating {
+            visibility: hidden;
+          }
+        }
+
+        .in-content-panel-contents {
+          max-width: calc(var(--panel-width) - (2px / var(--in-content-panel-scale)));
+          min-width: calc(var(--panel-width) - (2px / var(--in-content-panel-scale)));
+        }
+
+        .in-content-panel-contents {
+          max-height: calc(var(--panel-max-height) - (2px / var(--in-content-panel-scale)));
+        }
+      }
+    `;
+  }
+
+  constructor(givenRoot, ...args) {
+    this.lastTimestamp = 0;
+    this.lastTimestampFor = new Map();
+
+    this.BASE_PANEL_WIDTH  = '280px';
+
+    try {
+      this.init(givenRoot, ...args);
+
+      browser.runtime.sendMessage({
+        type: `ws:${this.type}:ready`,
+      });
+    }
+    catch (error) {
+      console.log('TST In Content Panel fatal error: ', error);
+      this.root = this.onMessageSelf = this.destroySelf = null;
+    }
+  }
+  init(givenRoot) { // this can be overridden by subclasses
+    this.destroySelf = this.destroy.bind(this);
+    this.onMessageSelf = this.onMessage.bind(this);
+
+    this.root = givenRoot || document.documentElement;
+    this.root.classList.add('in-content-panel-root');
+
+    const style = document.createElement('style');
+    style.setAttribute('type', 'text/css');
+    style.textContent = this.styleRules;
+    this.root.appendChild(style);
+
+    browser.runtime.onMessage.addListener(this.onMessageSelf);
+    window.addEventListener('unload', this.destroySelf, { once: true });
+    window.addEventListener('pagehide', this.destroySelf, { once: true });
+  }
+
+  async onBeforeShow(_message, _sender) {} // this can be overridden by subclasses
+
+  onMessage(message, sender) {
+    if ((this.windowId &&
+        message?.windowId != this.windowId))
+      return;
+
+    if (message?.logging)
+      console.log(`${message.type}: `, message);
+
+    switch (message?.type) {
+      case `ws:${this.type}:show`:
+        return (async () => {
+          await this.onBeforeShow(message, sender);
+          if (message.timestamp < this.lastTimestamp ||
+              message.timestamp < (this.lastTimestampFor.get(message.targetId) || 0)) {
+            if (message?.logging)
+              console.log(`${this.type} show ${message.targetId}: expired, give up to show/update `, message.timestamp);
+            return true;
+          }
+          if (message?.logging)
+            console.log(`${this.type} show ${message.targetId}: invoked, let's show/update `, message.timestamp);
+          this.lastTimestamp = message.timestamp;
+          this.lastTimestampFor.set(message.targetId, message.timestamp);
+          this.prepareUI();
+          this.updateUI(message);
+          this.panel.classList.add('open');
+          return true;
+        })();
+
+      case `ws:${this.type}:hide`:
+        return (async () => {
+          // Ensure the order of messages: "show" for new target =>
+          // "hide" for previous target.
+          await new Promise(requestAnimationFrame);
+          if (!this.panel ||
+              (message.targetId &&
+               this.panel.dataset.targetId != message.targetId)) {
+            if (message?.logging)
+              console.log(`${this.type} hide ${message.targetId}: already hidden, nothing to do `, message.timestamp);
+            if (!this.panel && !message.targetId) { // on initial case
+              this.lastTimestamp = message.timestamp;
+            }
+            if (message.targetId) {
+              this.lastTimestampFor.set(message.targetId, message.timestamp);
+            }
+            return;
+          }
+          if (message.timestamp < this.lastTimestamp ||
+              (message.targetId &&
+               message.timestamp < (this.lastTimestampFor.get(message.targetId) || 0))) {
+            if (message?.logging)
+              console.log(`${this.type} hide ${message.targetId}: expired, give up to hide `, message.timestamp);
+            return true;
+          }
+          if (message?.logging)
+            console.log(`${this.type} hide ${message.targetId}: invoked, let's hide  `, message.timestamp);
+          this.lastTimestamp = message.timestamp;
+          if (message.targetId) {
+            this.lastTimestampFor.set(message.targetId, message.timestamp);
+          }
+          this.panel.classList.remove('open');
+          return true;
+        })();
+
+      case 'ws:notify-sidebar-closed':
+        if (this.panel) {
+          this.panel.classList.remove('open');
+        }
+        break;
+    }
+  }
+
+  onBeforeDestroy() {} // this can be overridden by subclasses
+
+  destroy() {
+    this.onBeforeDestroy();
+
+    if (!this.onMessageSelf)
+      return;
+
+    if (this.panel) {
+      this.panel.parentNode.removeChild(this.panel);
+      this.panel = null;
+    }
+
+    browser.runtime.onMessage.removeListener(this.onMessageSelf);
+    window.removeEventListener('unload', this.destroySelf);
+    window.removeEventListener('pagehide', this.destroySelf);
+
+    this.lastTimestampFor.clear();
+    this.root = this.onMessageSelf = this.destroySelf = null;
+  }
+
+  get UISource() { // this can be overridden by subclasses
+    return '';
+  }
+
+  prepareUI() {
+    if (this.panel) {
+      return;
+    }
+    this.root.insertAdjacentHTML('beforeend', `
+      <div class="in-content-panel">
+        <div class="in-content-panel-contents">
+          <div class="in-content-panel-contents-inner-box">
+            ${this.UISource}
+          </div>
+        </div>
+      </div>
+    `.trim().replace(/>\s+</g, '><'));
+    this.panel = this.root.querySelector('.in-content-panel');
+  }
+
+  onUpdateUI() {} // this can be overridden by subclasses
+  onBeforeCompleteUpdate() {} // this can be overridden by subclasses
+  onCompleteUpdate() {} // this can be overridden by subclasses
+  onShown() {} // this can be overridden by subclasses
+
+  updateUI({ targetId, anchorTabRect, offsetTop, align, rtl, scale, logging, animation, backgroundColor, borderColor, color, widthInOuterWorld, fixedOffsetTop, ...params }) {
+    if (!this.panel)
+      return;
+
+    const startAt = this.lastStartedAt = Date.now();
+
+    if (logging)
+      console.log(`${this.type} updateUI `, { panel: this.panel, targetId, anchorTabRect, offsetTop, align, rtl, scale, widthInOuterWorld, fixedOffsetTop });
+
+    this.panel.classList.add('updating');
+    this.panel.classList.toggle('animation', animation);
+
+    if (backgroundColor) {
+      this.panel.style.setProperty('--panel-background', backgroundColor);
+    }
+    if (borderColor) {
+      this.panel.style.setProperty('--panel-border-color', borderColor);
+    }
+    if (color) {
+      this.panel.style.setProperty('--panel-color', color);
+    }
+
+    // This cancels the zoom effect by the user.
+    // We need to calculate the scale with two devicePixelRatio values
+    // from both the sidebar and the content area, because all contents
+    // of the browser window can be scaled on a high-DPI display by the
+    // platform.
+    const isResistFingerprintingMode = window.mozInnerScreenY == window.screenY;
+    const devicePixelRatio = window.devicePixelRatio != 1 ?
+      window.devicePixelRatio : // devicePixelRatio is always available on macOS with Retina
+      ((widthInOuterWorld || window.innerWidth) / window.innerWidth);
+    if (logging)
+      console.log(`${this.type} updateUI: isResistFingerprintingMode `, isResistFingerprintingMode, { devicePixelRatio });
+    // But window.devicePixelRatio is not available if privacy.resistFingerprinting=true,
+    // thus we need to calculate it based on tabs.Tab.width.
+    scale = devicePixelRatio * (scale || 1);
+    this.root.style.setProperty('--in-content-panel-scale', scale);
+    this.panel.style.setProperty('--panel-width', `min(${window.innerWidth}px, calc(${this.BASE_PANEL_WIDTH} / ${scale}))`);
+
+    const offsetFromWindowEdge = isResistFingerprintingMode ?
+      0 :
+      (window.mozInnerScreenY - window.screenY) * scale;
+    const sidebarContentsOffset = isResistFingerprintingMode ?
+      (fixedOffsetTop || 0) :
+      (offsetTop - offsetFromWindowEdge) / scale;
+
+    if (anchorTabRect) {
+      const panelTopEdge = this.windowId ? anchorTabRect.bottom : anchorTabRect.top;
+      const panelBottomEdge = this.windowId ? anchorTabRect.bottom : anchorTabRect.top;
+      const panelMaxHeight = Math.max(window.innerHeight - panelTopEdge - sidebarContentsOffset, panelBottomEdge);
+      this.panel.style.maxHeight = `${panelMaxHeight}px`;
+      this.panel.style.setProperty('--panel-max-height', `${panelMaxHeight}px`);
+      if (logging)
+        console.log('updateUI: limit panel height to ', this.panel.style.maxHeight, { anchorTabRect, maxHeight: window.innerHeight, sidebarContentsOffset, offsetFromWindowEdge });
+    }
+
+    this.panel.classList.toggle('rtl', !!rtl);
+
+    this.panel.dataset.targetId = targetId;
+    if (align)
+      this.panel.dataset.align = align;
+
+    const complete = () => {
+      if (complete.completed) {
+        return;
+      }
+
+      this.onBeforeCompleteUpdate({ logging, complete });
+
+      if (this.panel.dataset.targetId != targetId ||
+          this.lastStartedAt != startAt)
+        return;
+
+      if (!anchorTabRect) {
+        this.panel.classList.remove('updating');
+        if (logging)
+          console.log(`${this.type} updateUI/complete: no tab rect, no need to update the position`);
+        return;
+      }
+
+      const panelBox = this.panel.getBoundingClientRect();
+      if (!panelBox.height &&
+          complete.retryCount++ < 10) {
+        if (logging)
+          console.log(`${this.type} updateUI/complete: panel size is zero, retrying `, complete.retryCount);
+        requestAnimationFrame(complete);
+        return;
+      }
+
+      complete.completed = true;
+
+      this.onCompleteUpdate({ logging });
+
+      const maxY = window.innerHeight / scale;
+      const panelHeight = panelBox.height;
+
+      let top;
+      if (this.windowId) { // in-sidebar
+        if (logging)
+          console.log(`${this.type} updateUI/complete: in-sidebar, alignment calculating: `, { half: window.innerHeight, maxY, scale, anchorTabRect });
+        if (anchorTabRect.top > (window.innerHeight / 2)) { // align to bottom edge of the tab
+          top = `${Math.min(maxY, anchorTabRect.bottom / scale) - panelHeight - anchorTabRect.height}px`;
+          if (logging)
+            console.log(`${this.type}  => align to bottom edge of the tab, top=`, top);
+        }
+        else { // align to top edge of the tab
+          top = `${Math.max(0, anchorTabRect.top / scale) + anchorTabRect.height}px`;
+          if (logging)
+            console.log(`${this.type}  => align to top edge of the tab, top=`, top);
+        }
+
+        if (logging)
+          console.log(`${this.type}  => top=`, top);
+      }
+      else { // in-content
+        // We need to shift the position with the height of the sidebar header.
+        const alignToTopPosition = Math.max(0, anchorTabRect.top / scale) + sidebarContentsOffset;
+        const alignToBottomPosition = Math.min(maxY, anchorTabRect.bottom + sidebarContentsOffset / scale) - panelHeight;
+
+        if (logging)
+          console.log(`${this.type} updateUI/complete: in-content, alignment calculating: `, { offsetFromWindowEdge, sidebarContentsOffset, alignToTopPosition, panelHeight, maxY, scale });
+        if (alignToTopPosition + panelHeight >= maxY &&
+            alignToBottomPosition >= 0) { // align to bottom edge of the tab
+          top = `${alignToBottomPosition}px`;
+          if (logging)
+            console.log(`${this.type}  => align to bottom edge of the tab, top=`, top);
+        }
+        else { // align to top edge of the tab
+          top = `${alignToTopPosition}px`;
+          if (logging)
+            console.log(`${this.type}  => align to top edge of the tab, top=`, top);
+        }
+      }
+      // updateUI() may be called multiple times for a target tab
+      // (with/without previewURL), so we should not set positions again
+      // if not needed. Otherwise the animation may be canceled in middle.
+      if (top &&
+        this.panel.style.top != top) {
+        this.panel.style.top = top;
+      }
+
+      let left, right;
+      if (align == 'left') {
+        left  = 'var(--panel-shadow-margin)';
+        right = '';
+      }
+      else {
+        left  = '';
+        right = 'var(--panel-shadow-margin)';
+      }
+      if (this.panel.style.left != left) {
+        this.panel.style.left = left;
+      }
+      if (this.panel.style.right != right) {
+        this.panel.style.right = right;
+      }
+
+      this.panel.classList.remove('updating');
+
+      this.onShown({ logging });
+    };
+    complete.retryCount = 0;
+
+    const completed = this.onUpdateUI({
+      // common args
+      align,
+      anchorTabRect,
+      animation,
+      backgroundColor,
+      borderColor,
+      color,
+      fixedOffsetTop,
+      logging,
+      offsetTop,
+      rtl,
+      scale,
+      widthInOuterWorld,
+      // calculated values
+      complete,
+      // extra args for subclasses
+      ...params,
+    });
+    if (!completed) {
+      complete();
+    }
+  }
+
+  // for SIDEBAR case
+  set windowId(id) {
+    return this.windowId = id;
+  }
+  get windowId() {
+    return this.windowId;
+  }
+
+  // for SIDEBAR case
+  handleMessage(message) {
+    return this.onMessage(message);
+  }
+
+  getColors() {
+    this.prepareUI();
+
+    const style = window.getComputedStyle(this.panel, null);
+    try {
+      // Computed style's colors may be unexpected value if the element
+      // is not rendered on the screen yet and it has colors for light
+      // and dark schemes. So we need to get preferred colors manually.
+      const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      return {
+        backgroundColor: this.getPreferredColor(style.getPropertyValue('--panel-background'), { isDark }),
+        borderColor: this.getPreferredColor(style.getPropertyValue('--panel-border-color'), { isDark }),
+        color: this.getPreferredColor(style.getPropertyValue('--panel-color'), { isDark }),
+      };
+    }
+    catch(_error) {
+    }
+    return {
+      backgroundColor: style.backgroundColor,
+      borderColor: style.borderColor,
+      color: style.color,
+    };
+  }
+
+  // Parse light-dark(<light color>, <dark color>) and return preferred color
+  getPreferredColor(color, { isDark } = {}) {
+    if (!color.startsWith('light-dark('))
+      return color;
+
+    const values = [];
+    let buffer = '';
+    let inParenCount = 0;
+    color = color.substring(11); // remove "light-dark(" prefix
+    ColorParse:
+    for (let i = 0, maxi = color.length; i < maxi; i++) {
+      const character = color.charAt(i);
+      switch (character) {
+        case '(':
+          inParenCount++;
+          buffer += character;
+          break;
+
+        case ')':
+          inParenCount--;
+          if (inParenCount < 0) {
+            values.push(buffer);
+            buffer = '';
+            break ColorParse;
+          }
+          buffer += character;
+          break;
+
+        case ',':
+          if (inParenCount > 0) {
+            buffer += character;
+          }
+          else {
+            values.push(buffer);
+            buffer = '';
+          }
+          break;
+
+        default:
+          buffer += character;
+          break;
+      }
+    }
+
+    if (typeof isDark != 'boolean')
+      isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    return isDark ? values[1] : values[0];
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/InContentPanelController.js b/waterfox/browser/components/sidebar/resources/module/InContentPanelController.js
new file mode 100644
index 0000000000000..5894fe77ea087
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/InContentPanelController.js
@@ -0,0 +1,606 @@
+/*
+# 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/.
+*/
+'use strict';
+
+// Overview of the in-content UI implementation:
+//
+// In-content UI is processed by the combination of this script
+// and content scripts. Players are:
+//
+// * The playground tab (TAB): tab active tab which the in-content UI is
+//   rendered in.
+// * The controller module (CONTROLLER): this class.
+// * The playground manager (MANAGER): a small content script injected to the
+//   playground tab by InContentPanelController#preparePlaygroundTab().
+// * The UI implementation module (IMPL): imported as a class (based on
+//   `./InContentPanel.js`) and injected to the playground tab by
+//   InContentPanelController#preparePlaygroundTab().
+//
+// When we need to show an in-content UI:
+//
+// S.1. The CONTROLLER sends a message to the MANAGER in the TAB, like
+//      "are you already have a playground to embed in-content UI?"
+//      We move toward if the MANAGER responces like "OK, I'm ready!".
+//   S.1.1. If no response, the CONTROLLER injects MANAGER and IMPL into
+//          the TAB and waits until the IMPL respond.
+//   S.1.2. The MANAGER in the TAB starts to instanciate the IMPL.
+//   S.1.3. The IMPL responds to the CONTROLLER, like "OK, I'm ready!"
+//     S.1.3.1. If these operation is not finished until some seconds, the
+//              CONTROLLER gives up and falls back to the UI in sidebar.
+//   S.1.4. The CONTROLLER receives the "I'm ready" response from the IMPL
+//          in the TAB, and moves toward.
+// S.2. The CONTROLLER sends a message to show the UI with less delay.
+// S.3. The IMPL shows the UI as soon as possible, for better user experience.
+// S.4. If there is more UI parts which require longer load time,
+//      we wait until the required resource is prepared successfully.
+// S.5. The CONTROLLER sends a follow-up messaeg to the IMPL to complete the
+//      UI initialization.
+//
+// When we need to hide the UI:
+//
+// H.1. The CONTROLLER sends a message to the MANAGER in the TAB, like
+//      "are you already prepared as a playground?"
+//      We move toward if the MANAGER responces like "OK, I'm ready!".
+//   H.1.1. If no response, the MANAGER gives up to hide the UI.
+//          We have nothing to do.
+// H.2. The CONTROLLER sends a message to hide the UI in the TAB, to the IMPL,
+//      like "hide the UI"
+// H.3. The IMPL hides the panel.
+
+import {
+  configs,
+  shouldApplyAnimation,
+  isRTL,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import InContentPanel from './InContentPanel.js';
+
+export default class InContentPanelController {
+  constructor({
+    // required
+    type,
+    UIClass,
+    inSidebarUI,
+    initializerCode,
+    canRenderInSidebar,
+    canRenderInContent,
+    shouldFallbackToSidebar,
+    // optional
+    logger,
+    shouldLog,
+    canSendPossibleExpiredMessage,
+  }) {
+    this.type            = type;
+    this.log             = logger || ((...messages) => console.log(...messages));
+    this.shouldLog       = shouldLog;
+    this.canRenderInSidebar      = canRenderInSidebar;
+    this.canRenderInContent      = canRenderInContent;
+    this.shouldFallbackToSidebar = shouldFallbackToSidebar;
+    this.canSendPossibleExpiredMessage = canSendPossibleExpiredMessage || (message => message.type != `ws:${this.type}:show`);
+    this.UIClass         = UIClass;
+    this.inSidebarUI     = inSidebarUI;
+    this.initializerCode = initializerCode;
+
+    browser.tabs.onActivated.addListener(activeInfo => {
+      const timestamp = Date.now();
+
+      if (activeInfo.windowId != TabsStore.getCurrentWindowId())
+        return;
+
+      this.hideInSidebar({ timestamp });
+      this.hideIn(activeInfo.tabId, { timestamp });
+      this.hideIn(activeInfo.previousTabId, { timestamp });
+    });
+  }
+
+  value(property) {
+    if (typeof property == 'function') {
+      return property();
+    }
+    return property;
+  }
+
+  // Generates a custom element name at random. This mainly aims to avoid
+  // conflicting of custom element names defined by webpage scripts.
+  // The generated name is user-unfriendly, this aims to guard your privacy.
+  generateOneTimeCustomElementName() {
+    const alphabets = 'abcdefghijklmnopqrstuvwxyz';
+    const prefix = alphabets[Math.floor(Math.random() * alphabets.length)];
+    return prefix + '-' + Date.now() + '-' + Math.round(Math.random() * 65000);
+  }
+
+  // S.1.1. Injects the MANAGER and IMPL into the TAB
+  async preparePlaygroundTab(playgroundTabId) {
+    const playgroundTab = Tab.get(playgroundTabId);
+    if (!playgroundTab)
+      return;
+
+    this.log(`preparePlaygroundTab (${this.type}): insert container to the tab contents `, playgroundTab.url);
+    await browser.tabs.executeScript(playgroundTabId, {
+      matchAboutBlank: true,
+      runAt: 'document_start',
+      code: `(() => { // the MANAGER
+        const logging = ${!!this.value(this.shouldLog)};
+
+        ${InContentPanel.toString()}
+        ${this.UIClass.toString()}
+
+        // We cannot use multiple custom element types with contents scripts -
+        // otherwise second custom type must fail its construction ("super()" in
+        // its constructor raises unexpected error), so we just use only one
+        // custom element type and recycle it for multiple purposes.
+        window.closedContainerType = window.closedContainerType || '${this.generateOneTimeCustomElementName()}';
+
+        const version = '${browser.runtime.getManifest().version}';
+        if (window.lastClosedContainerVersion &&
+            window.lastClosedContainerVersion != version) {
+          window.clearClosedContents();
+        }
+        window.lastClosedContainerVersion = version;
+
+        // We cannot undefine custom element types, so we define it just one time.
+        if (!window.customElements.get(window.closedContainerType)) {
+          window.closedContentsDestructors = new Set();
+          // We use a wrapper custom element to enclose all preview elements
+          // which can contain privacy information.
+          // It should guard them from accesses by webpage scripts.
+          class ClosedContainer extends HTMLElement {
+            constructor() {
+              super();
+              const shadow = this.attachShadow({ mode: 'closed' });
+              window.appendClosedContents = element => shadow.appendChild(element);
+              window.removeClosedContents = element => shadow.removeChild(element);
+              window.clearClosedContents = () => {
+                for (const destructor of window.closedContentsDestructors) {
+                  try {
+                    destructor();
+                  }
+                  catch(error) {
+                    console.error(error);
+                  }
+                }
+                for (const element of shadow.childNodes) {
+                  removeClosedContents(element);
+                }
+                closedContentsDestructors.clear();
+                lastClosedContainer.parentNode.removeChild(lastClosedContainer);
+                window.lastClosedContainer = null;
+              };
+            }
+          }
+          window.customElements.define(window.closedContainerType, ClosedContainer);
+          window.destroyClosedContents = destructor => {
+            try{
+              destructor();
+            }
+            catch(error) {
+              console.error(error);
+            }
+            window.closedContentsDestructors.delete(destructor);
+            if (window.closedContentsDestructors.size > 0) {
+              return;
+            }
+            window.lastClosedContainer.parentNode.removeChild(window.lastClosedContainer);
+            window.lastClosedContainer = null;
+          };
+          window.createClosedContentsDestructor = (instance, onDestroy) => {
+            let destructor;
+
+            const onMessage = (message, _sender) => {
+              switch (message?.type) {
+                case 'ws:' + instance.type + ':ask-container-ready':
+                  return Promise.resolve(true); // S.1.1. Responds to the CONTROLLER
+
+                case '${Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW}':
+                  window.destroyClosedContents(destructor);
+                  break;
+              }
+            };
+            browser.runtime.onMessage.addListener(onMessage);
+
+            destructor = () => {
+              const root = instance.root;
+              UIInstances.delete(instance.type);
+              instance.destroy();
+              onDestroy();
+              browser.runtime.onMessage.removeListener(onMessage);
+              window.removeEventListener('unload', destructor);
+              window.removeEventListener('pagehide', destructor);
+              window.removeClosedContents(root);
+            };
+            window.addEventListener('unload', destructor, { once: true });
+            window.addEventListener('pagehide', destructor, { once: true });
+
+            window.closedContentsDestructors.add(destructor);
+
+            return destructor;
+          };
+        }
+
+        if (!window.lastClosedContainer) {
+          window.lastClosedContainer = document.createElement(window.closedContainerType);
+          document.documentElement.appendChild(window.lastClosedContainer);
+        }
+
+        window.UIInstances = window.UIInstances || new Map();
+        const oldInstance = UIInstances.get('${this.type}');
+        if (oldInstance) {
+          try {
+            const root = oldInstance.root;
+            oldInstance.destroy();
+            removeClosedContents(root);
+          }
+          catch(_error) {
+          }
+        }
+
+        UIInstances.set('${this.type}', (() => {
+          ${this.initializerCode}
+        })());
+      })()`,
+    });
+  }
+
+  // S.1.4 Wait until "I'm ready" message from the IMPL
+  async waitUntilPlaygroundTabIsReady(playgroundTabId) {
+    let resolver;
+    const promisedLoaded = new Promise((resolve, _reject) => {
+      resolver = resolve;
+    });
+    let timeout;
+    const onMessage = (message, sender) => {
+      if (message?.type != `ws:${this.type}:ready` ||
+          sender.tab?.id != playgroundTabId)
+        return;
+      this.log(`waitUntilPlaygroundTabIsReady(${this.type}): ready in the tab `, playgroundTabId);
+      if (timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+      }
+      resolver();
+    };
+    browser.runtime.onMessage.addListener(onMessage);
+    timeout = setTimeout(() => {
+      if (!timeout)
+        return;
+      this.log(`waitUntilPlaygroundTabIsReady(${this.type}): timeout for the tab `, playgroundTabId);
+      timeout = null;
+      browser.runtime.onMessage.removeListener(onMessage);
+      resolver();
+    }, 1000);
+    return promisedLoaded;
+  }
+
+  // S.1. - S.5.
+  // returns succeeded or not (boolean)
+  async sendMessage(playgroundTabId, message, { promisedMessage, canRenderInSidebar, shouldFallbackToSidebar, deferredResultResolver } = {}) {
+    if (!playgroundTabId ||
+        !this.value(this.canRenderInContent)) { // in-sidebar mode
+      if (this.value(canRenderInSidebar || this.canRenderInSidebar)) {
+        this.log(`sendMessage (${this.type}) (${message.type}): no tab specified or sidebar only mode, fallback to in-sidebar UI`);
+        return this.sendInSidebarMessage(message, { promisedMessage });
+      }
+      else {
+        this.log(`sendMessage (${this.type}) (${message.type}): no tab specified or not allowed, cancel`);
+        return false;
+      }
+    }
+
+    const retrying = !!deferredResultResolver;
+    const playgroundTab = Tab.get(playgroundTabId);
+    if (!playgroundTab)
+      return false;
+
+    // S.1. Sends a messaeg to the MANAGER
+    let rawTab;
+    try {
+      const [ready, gotRawTab] = await Promise.all([
+        browser.tabs.sendMessage(playgroundTabId, {
+          type: `ws:${this.type}:ask-container-ready`,
+        }).catch(_error => {}),
+        browser.tabs.get(playgroundTabId),
+      ]);
+      rawTab = gotRawTab;
+      this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}): response from the tab: `, { ready });
+      if (!ready) {
+        if (!message.canRetry) {
+          this.log(`sendMessage (${this.type}) => no response, give up to send`);
+          return false;
+        }
+
+        if (retrying) {
+          // Retried to init tab preview panel, but failed, so
+          // now we fall back to the in-sidebar tab preview.
+          if (!this.value(shouldFallbackToSidebar || this.shouldFallbackToSidebar) ||
+              !this.canSendPossibleExpiredMessage(message)) {
+            this.log(`sendMessage (${this.type}) => no response after retrying, give up to send`);
+            deferredResultResolver(false);
+            return false;
+          }
+          this.log(`sendMessage (${this.type}) => no response after retrying, fall back to in-sidebar previes`);
+          return this.sendInSidebarMessage(message, { promisedMessage })
+            .then(() => {
+              deferredResultResolver(true);
+              return true;
+            });
+        }
+
+        // We prepare tab preview panel now, and retry sending after that.
+        this.log(`sendMessage (${this.type}) => no response, retry`);
+        let resultResolver;
+        const promisedResult = new Promise((resolve, _reject) => {
+          resultResolver = resolve;
+        });
+        this.waitUntilPlaygroundTabIsReady(playgroundTabId).then(() => {
+          this.sendMessage(playgroundTabId, message, {
+            promisedMessage,
+            canRenderInSidebar,
+            shouldFallbackToSidebar,
+            deferredResultResolver: resultResolver,
+          });
+        });
+        // S.1.1. Injects the IMPL
+        await this.preparePlaygroundTab(playgroundTabId);
+        return promisedResult;
+      }
+    }
+    catch (error) {
+      this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}): failed to ask to the tab `, error);
+      // We cannot show in-content UI in a tab with privileged contents.
+      // Let's fall back to the in-sidebar UI.
+      await this.sendInSidebarMessage(message, { promisedMessage });
+      if (deferredResultResolver)
+        deferredResultResolver(true);
+      return true;
+    }
+
+    // hide in-sidebar tab preview if in-content tab preview is available
+    this.hideInSidebar();
+
+    let response;
+    try {
+      // S.2. Sends a message to the UI with less delay.
+      const timestamp = Date.now();
+      response = await browser.tabs.sendMessage(playgroundTabId, {
+        timestamp,
+        ...message,
+        ...this.inSidebarUI.getColors(),
+        widthInOuterWorld: rawTab.width,
+        fixedOffsetTop: configs.inContentUIOffsetTop,
+        animation: shouldApplyAnimation(),
+        logging: this.value(this.shouldLog),
+      });
+      this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}): message was sent, response=`, response, ', promisedMessage =',   promisedMessage);
+      if (deferredResultResolver)
+        deferredResultResolver(!!response);
+
+      if (response && promisedMessage) {
+        // S.5. Sends a follow-up message.
+        this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}, with proimsed properties): trying to wait until promised properties are resolved`);
+        promisedMessage.then(async resolvedMessage => {
+          const response = await browser.tabs.sendMessage(playgroundTabId, {
+            timestamp,
+            ...message,
+            ...(resolvedMessage || {}),
+            ...this.inSidebarUI.getColors(),
+            widthInOuterWorld: rawTab.width,
+            fixedOffsetTop: configs.inContentUIOffsetTop,
+            animation: shouldApplyAnimation(),
+            logging: this.value(this.shouldLog),
+          });
+          this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}, with previewURL): message was sent again, response = `,   response);
+        });
+      }
+    }
+    catch (error) {
+      this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}): failed to send message `, error);
+      if (!message.canRetry) {
+        this.log(`sendMessage (${this.type}) => no response, give up to send`);
+        return false;
+      }
+
+      if (retrying) {
+        // Retried to initialize in-content UI, but failed, so
+        // now we fall back to the in-sidebar UI.
+        if (!this.value(shouldFallbackToSidebar || this.shouldFallbackToSidebar) ||
+            !this.canSendPossibleExpiredMessage(message)) {
+          this.log(`sendMessage (${this.type}) => no response after retrying, give up to send`);
+          deferredResultResolver(false);
+          return false;
+        }
+        this.log(`sendMessage (${this.type}) => no response after retrying, fall back to in-sidebar previes`);
+        return this.sendInSidebarMessage(message, { promisedMessage })
+          .then(() => {
+            deferredResultResolver(true);
+            return true;
+          });
+      }
+
+      if (!this.canSendPossibleExpiredMessage(message)) {
+        this.log(`sendMessage (${this.type}) => no response, already canceled, give up to send`);
+        return false;
+      }
+
+      // the panel was destroyed unexpectedly, so we re-prepare it.
+      this.log(`sendMessage (${this.type}) => no response, retry`);
+      let resultResolver;
+      const promisedResult = new Promise((resolve, _reject) => {
+        resultResolver = resolve;
+      });
+      this.waitUntilPlaygroundTabIsReady(playgroundTabId).then(() => {
+        this.sendMessage(playgroundTabId, message, {
+          promisedMessage,
+          canRenderInSidebar,
+          shouldFallbackToSidebar,
+          deferredResultResolver: resultResolver,
+        });
+      });
+      await this.preparePlaygroundTab(playgroundTabId);
+      return promisedResult;
+    }
+
+    if (typeof response != 'boolean' &&
+        this.canSendPossibleExpiredMessage(message)) {
+      this.log(`sendMessage (${this.type}) (${message.type}${retrying ? ', retrying' : ''}): got invalid response, fallback to in-sidebar preview`);
+      // Failed to send message to the in-content UI, so
+      // now we fall back to the in-sidebar UI.
+      return this.sendInSidebarMessage(message, { promisedMessage });
+    }
+
+    // Everything is OK!
+    return !!response;
+  }
+
+  async sendInSidebarMessage(message, { promisedMessage } = {}) {
+    const timestamp = message.timestamp || Date.now();
+    this.log(`sendInSidebarMessage(${message.type}})`);
+    await this.inSidebarUI.handleMessage({
+      timestamp,
+      ...message,
+      windowId: TabsStore.getCurrentWindowId(),
+      animation: shouldApplyAnimation(),
+      logging: this.value(this.shouldLog),
+    });
+    if (promisedMessage) {
+      promisedMessage.then(resolvedMessage => {
+        if (!resolvedMessage) {
+          return;
+        }
+        this.inSidebarUI.handleMessage({
+          timestamp,
+          ...message,
+          ...resolvedMessage,
+          windowId: TabsStore.getCurrentWindowId(),
+          animation: shouldApplyAnimation(),
+          logging: this.value(this.shouldLog),
+        });
+      });
+    }
+    return true;
+  }
+
+  async show({
+    // required
+    anchorItem,
+    targetItem,
+    // optional
+    messageParams,
+    promisedMessageParams,
+    canRenderInSidebar,
+    shouldFallbackToSidebar,
+    timestamp,
+  }) {
+    if (!timestamp) {
+      timestamp = Date.now();
+    }
+
+    const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+    const playgroundTabId = Permissions.canInjectScriptToTabSync(activeTab) ?
+      activeTab.id :
+      null;
+
+    const anchorTabRawRect = anchorItem?.$TST.element?.substanceElement?.getBoundingClientRect();
+    const anchorTabRect = {
+      bottom: anchorTabRawRect?.bottom || 0,
+      height: anchorTabRawRect?.height || 0,
+      left:   anchorTabRawRect?.left || 0,
+      right:  anchorTabRawRect?.right || 0,
+      top:    anchorTabRawRect?.top || 0,
+      width:  anchorTabRawRect?.width || 0,
+    };
+    const prevItem = anchorItem?.$TST.unsafePreviousTab;
+    if (prevItem?.$TST.states.has(Constants.kTAB_STATE_REMOVING)) {
+      // When we close a tab by mouse operation and the next tab raises up under the cursor,
+      // in-content UI rendered in the sidebar positioned based on the anchorItem will cover
+      // the anchorItem itself because it is still shifted for removing tab under the cursor.
+      // Thus we calculate the safer anchor coordinates here.
+      const prevItemRect = prevItem.$TST.previousTab?.$TST.element?.getBoundingClientRect();
+      anchorTabRect.top = (prevItemRect?.bottom || 0) + 1;
+      anchorTabRect.bottom = anchorTabRect.top + anchorTabRect.height;
+    }
+
+    const mayBeRight = window.mozInnerScreenX - window.screenX > (window.outerWidth - window.innerWidth) / 2;
+
+    this.log(`show (${this.type}, ${targetItem.id}}) [${Date.now() - timestamp}msec from start]: show in ${playgroundTabId || 'sidebar'} `, messageParams);
+    const succeeded = await this.sendMessage(
+      playgroundTabId,
+      {
+        type:     `ws:${this.type}:show`,
+        targetId: targetItem.id,
+        ...(messageParams || {}),
+        anchorTabRect,
+        /* These information is used to calculate offset of the sidebar header */
+        offsetTop: window.mozInnerScreenY - window.screenY,
+        offsetLeft: window.mozInnerScreenX - window.screenX,
+        align: mayBeRight ? 'right' : 'left',
+        rtl: isRTL(),
+        scale: 1 / window.devicePixelRatio,
+        // Don't call Date.now() here, because it can become larger than
+        // the timestamp on mouseleave.
+        timestamp,
+        canRetry: !!playgroundTabId,
+      },
+      {
+        promisedMessage: promisedMessageParams,
+        canRenderInSidebar,
+        shouldFallbackToSidebar,
+      }
+    ).catch(error => {
+      this.log(`show (${this.type}$, {targetItem.id}}) failed: `, error);
+    });
+    this.log(` => ${succeeded ? 'succeeded' : 'failed'}`);
+    return succeeded;
+  }
+
+  async hide({ timestamp, targetItem } = {}) {
+    if (!timestamp) {
+      timestamp = Date.now();
+    }
+
+    const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+    const playgroundTabId = await Permissions.canInjectScriptToTab(activeTab) ?
+      activeTab.id :
+      null;
+
+    if (playgroundTabId) {
+      this.hideIn(playgroundTabId, { timestamp, targetItem });
+    }
+    else {
+      this.hideInSidebar({ timestamp, targetItem });
+    }
+  }
+
+  async hideIn(playgroundTabId, { timestamp, targetItem } = {}) {
+    if (!timestamp) {
+      timestamp = Date.now();
+    }
+
+    this.log(`hide (${this.type}) (${targetItem?.id}}) hide UI in ${playgroundTabId} `, timestamp);
+    this.sendMessage(playgroundTabId, {
+      type: `ws:${this.type}:hide`,
+      targetId: targetItem?.id,
+      timestamp,
+    });
+  }
+
+  async hideInSidebar({ timestamp, targetItem } = {}) {
+    if (!timestamp) {
+      timestamp = Date.now();
+    }
+
+    this.log(`hide (${this.type}) (${targetItem?.id}}) hide UI in sidebar `, timestamp);
+    this.sendInSidebarMessage({
+      type: `ws:${this.type}:hide`,
+      targetId: targetItem?.id,
+      timestamp,
+    });
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/TabGroupMenuPanel.js b/waterfox/browser/components/sidebar/resources/module/TabGroupMenuPanel.js
new file mode 100644
index 0000000000000..79de26b7448fe
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/TabGroupMenuPanel.js
@@ -0,0 +1,635 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import InContentPanel from './InContentPanel.js';
+
+export default class TabGroupMenuPanel extends InContentPanel {
+  static TYPE = 'tab-group-menu';
+
+  get styleRules() {
+    return super.styleRules + `
+      .in-content-panel-root.tab-group-menu-panel {
+        .in-content-panel {
+          &:not(.open) {
+            pointer-events: none;
+          }
+
+          overflow-y: auto;
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/browser/themes/shared/tabbrowser/tabs.css#1145 */
+
+          /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#266 */
+          /** Size **/
+          --size-item-small: 16px;
+          --size-item-medium: 28px;
+          --size-item-large: 32px;
+
+          /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#271 */
+          /** Space **/
+          --space-xxsmall: calc(0.5 * var(--space-xsmall)); /* 2px */
+          --space-xsmall: 0.267rem; /* 4px */
+          --space-small: calc(2 * var(--space-xsmall)); /* 8px */
+          --space-medium: calc(3 * var(--space-xsmall)); /* 12px */
+          --space-large: calc(4 * var(--space-xsmall)); /* 16px */
+          --space-xlarge: calc(6 * var(--space-xsmall)); /* 24px */
+          --space-xxlarge: calc(8 * var(--space-xsmall)); /* 32px */
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/browser/themes/shared/customizableui/panelUI-shared.css#20 */
+          --panel-separator-margin-vertical: 4px;
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-shared.css#107 */
+          /** Color **/
+          --color-blue-20: oklch(83% 0.17 260);
+          --color-blue-60: oklch(55% 0.24 260);
+          --color-blue-70: oklch(48% 0.2 260);
+          --color-blue-80: oklch(41% 0.17 260);
+          --color-cyan-10: oklch(90% 0.07 205);
+          --color-cyan-20: oklch(83% 0.11 205);
+          --color-cyan-30: oklch(76% 0.14 205);
+          --color-cyan-70: oklch(48% 0.2 205);
+          --color-gray-05: #fbfbfe;
+          --color-gray-100: #15141a;
+          --color-green-20: oklch(83% 0.14 145);
+          --color-green-70: oklch(48% 0.2 145);
+          --color-orange-20: oklch(86% 0.14 50);
+          --color-orange-70: oklch(48% 0.20 50);
+          --color-pink-20: oklch(83% 0.14 360);
+          --color-pink-70: oklch(48% 0.2 360);
+          --color-purple-20: oklch(83% 0.14 315);
+          --color-purple-70: oklch(48% 0.2 315);
+          --color-red-20: oklch(83% 0.14 15);
+          --color-red-70: oklch(48% 0.2 15);
+          --color-white: #ffffff;
+          --color-yellow-20: oklch(86% 0.14 90);
+          --color-yellow-70: oklch(51% 0.23 90);
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-platform.css#31 */
+          --color-accent-primary: AccentColor;
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-shared.css#226 */
+          /** Focus Outline **/
+          --focus-outline: var(--focus-outline-width) solid var(--focus-outline-color);
+          --focus-outline-color: var(--color-accent-primary);
+          --focus-outline-inset: calc(-1 * var(--focus-outline-width));
+          --focus-outline-offset: 2px;
+          --focus-outline-width: 2px;
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-shared.css#20 */
+          /** Border **/
+          --border-color-card: color-mix(in srgb, currentColor 10%, transparent);
+          --border-color-interactive-hover: var(--border-color-interactive);
+          --border-color-interactive-active: var(--border-color-interactive);
+          --border-color-interactive-disabled: var(--border-color-interactive);
+          --border-radius-circle: 9999px;
+          --border-radius-small: 4px;
+          --border-radius-medium: 8px;
+          --border-width: 1px;
+
+          /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/browser/themes/shared/tabbrowser/tabs.css#79 */
+          --tab-group-color-blue: var(--color-blue-70);
+          --tab-group-color-blue-invert: var(--color-blue-20);
+          --tab-group-color-purple: var(--color-purple-70);
+          --tab-group-color-purple-invert: var(--color-purple-20);
+          --tab-group-color-cyan: var(--color-cyan-70);
+          --tab-group-color-cyan-invert: var(--color-cyan-20);
+          --tab-group-color-orange: var(--color-orange-70);
+          --tab-group-color-orange-invert: var(--color-orange-20);
+          --tab-group-color-yellow: var(--color-yellow-70);
+          --tab-group-color-yellow-invert: var(--color-yellow-20);
+          --tab-group-color-pink: var(--color-pink-70);
+          --tab-group-color-pink-invert: var(--color-pink-20);
+          --tab-group-color-green: var(--color-green-70);
+          --tab-group-color-green-invert: var(--color-green-20);
+          --tab-group-color-red: var(--color-red-70);
+          --tab-group-color-red-invert: var(--color-red-20);
+          --tab-group-color-gray: #5E6A77;
+          --tab-group-color-gray-invert: #99A6B4;
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-shared.css#286 */
+          --text-color-error: light-dark(var(--color-red-70), var(--color-red-20));
+
+          input[value="blue"] {
+            --tabgroup-swatch-color: var(--tab-group-color-blue);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-blue-invert);
+          }
+          input[value="purple"] {
+            --tabgroup-swatch-color: var(--tab-group-color-purple);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-purple-invert);
+          }
+          input[value="cyan"] {
+            --tabgroup-swatch-color: var(--tab-group-color-cyan);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-cyan-invert);
+          }
+          input[value="orange"] {
+            --tabgroup-swatch-color: var(--tab-group-color-orange);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-orange-invert);
+          }
+          input[value="yellow"] {
+            --tabgroup-swatch-color: var(--tab-group-color-yellow);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-yellow-invert);
+          }
+          input[value="pink"] {
+            --tabgroup-swatch-color: var(--tab-group-color-pink);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-pink-invert);
+          }
+          input[value="green"] {
+            --tabgroup-swatch-color: var(--tab-group-color-green);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-green-invert);
+          }
+          input[value="red"] {
+            --tabgroup-swatch-color: var(--tab-group-color-red);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-red-invert);
+          }
+          input[value="grey"] {
+            --tabgroup-swatch-color: var(--tab-group-color-gray);
+            --tabgroup-swatch-color-invert: var(--tab-group-color-gray-invert);
+          }
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/popup.css#63 */
+          .in-content-panel-contents-inner-box {
+            padding: var(--panel-padding);
+          }
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/browser/themes/shared/tabbrowser/tabs.css#37 */
+          --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
+
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-brand.css#23 */
+          --button-background-color: color-mix(in srgb, currentColor 7%, transparent);
+          --button-background-color-hover: color-mix(in srgb, currentColor 14%, transparent);
+          --button-background-color-active: color-mix(in srgb, currentColor 21%, transparent);
+          --button-text-color: light-dark(var(--color-gray-100), var(--color-gray-05));
+          --button-text-color-primary: light-dark(var(--color-white), var(--color-gray-100));
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-brand.css#30 */
+          --color-accent-primary: light-dark(var(--color-blue-60), var(--color-cyan-30));
+          --color-accent-primary-hover: light-dark(var(--color-blue-70), var(--color-cyan-20));
+          --color-accent-primary-active: light-dark(var(--color-blue-80), var(--color-cyan-10));
+          /* https://searchfox.org/mozilla-central/rev/126697140e711e04a9d95edae537541c3bde89cc/toolkit/themes/shared/design-system/tokens-shared.css#99 */
+          --button-text-color-primary-hover: var(--button-text-color-primary);
+          --button-text-color-primary-active: var(--button-text-color-primary-hover);
+          --button-text-color-primary-disabled: var(--button-text-color-primary);
+
+
+          --panel-width: 22em;
+          --panel-padding: var(--space-large);
+          --panel-separator-margin: var(--panel-separator-margin-vertical) 0;
+          font: menu;
+
+          .panel-header {
+            min-height: auto;
+            > h1 {
+              text-align: center;
+              font: menu;
+              font-weight: bold;
+
+              margin-top: 0;
+            }
+          }
+
+          hr /*toolbarseparator*/ {
+            margin-block: var(--space-medium);
+            border: 1px solid;
+            border-width: 1px 0 0 0;
+            opacity: 0.5;
+          }
+
+          .panel-body {
+            padding-block: var(--space-medium);
+          }
+
+          &.tab-group-editor-mode-create .tab-group-edit-mode-only,
+          &:not(.tab-group-editor-mode-create) .tab-group-create-mode-only {
+            display: none;
+          }
+
+          .tab-group-editor-name > label {
+            display: flex;
+            flex-direction: column;
+            > label {
+              margin-inline: 0;
+              margin-bottom: var(--space-small);
+            }
+            > input[type="text"] {
+              padding: var(/*--space-medium*/--space-xsmall);
+            }
+          }
+
+          .tab-group-editor-swatches {
+            display: flex;
+            flex-flow: row nowrap;
+            justify-content: space-between;
+
+            #tabGroupContextMenuRoot & {
+              flex-flow: row wrap;
+              justify-content: flex-start;
+            }
+          }
+
+          .tab-group-editor-swatch {
+            appearance: none;
+            box-sizing: content-box;
+            margin: 0;
+
+            font-size: 0;
+            width: 16px;
+            height: 16px;
+            padding: var(--focus-outline-offset);
+            border: var(--focus-outline-width) solid transparent;
+            border-radius: var(--border-radius-medium);
+            background-clip: content-box;
+            background-color: light-dark(var(--tabgroup-swatch-color), var(--tabgroup-swatch-color-invert));
+
+            &:checked {
+              border-color: var(--focus-outline-color);
+            }
+
+            &:disabled {
+              opacity: 0.5;
+            }
+
+            &:focus-visible {
+              outline: 1px solid var(--focus-outline-color);
+              outline-offset: 1px;
+            }
+
+            + .label-text {
+              font-size: 0;
+            }
+          }
+
+          .tab-group-edit-actions,
+          .tab-group-delete {
+            padding-block: 0;
+            > button /*toolbarbutton*/ {
+             appearance: none;
+             background: transparent;
+             border: none;
+             border-radius: var(--space-xsmall);
+             display: block;
+             font: menu;
+             margin: 0;
+             padding: var(--space-small);
+             text-align: start;
+             width: 100%;
+
+             justify-content: flex-start;
+
+             &:hover {
+               background-color: var(--tab-hover-background-color);
+             }
+
+             &:focus {
+               box-shadow: none;
+             }
+            }
+          }
+
+          /* cancel /resources/base.css */
+          input:focus {
+            box-shadow: none;
+          }
+        }
+
+        .tab-group-editor-panel.tab-group-editor-panel-expanded {
+          --panel-width: 25em;
+        }
+
+        @media not (prefers-contrast) {
+          .tabGroupEditor_deleteGroup {
+            color: var(--text-color-error);
+          }
+        }
+
+        .tab-group-create-actions {
+          text-align: end;
+
+          button {
+            appearance: none;
+            border: none;
+            border-radius: var(--space-xsmall);
+            margin-inline: var(--space-xsmall);
+            padding: var(--space-small);
+
+            &.primary {
+              color: var(--button-text-color-primary);
+              background-color: var(--color-accent-primary);
+              &:hover {
+                color: var(--button-text-color-primary-hover);
+                background-color: var(--color-accent-primary-hover);
+              }
+              &:hover:active,
+              &[open] {
+                color: var(--button-text-color-primary-active);
+                background-color: var(--color-accent-primary-active);
+              }
+            }
+
+            &:focus {
+              box-shadow: none;
+            }
+          }
+        }
+      }
+    `;
+  }
+
+  init(givenRoot, i18n) {
+    // https://searchfox.org/mozilla-central/source/browser/themes/shared/tabbrowser/tabs.css#1143
+    this.BASE_PANEL_WIDTH = '22em';
+
+    super.init(givenRoot);
+
+    this.onClickSelf = this.onClick.bind(this);
+    this.onKeyDownSelf = this.onKeyDown.bind(this);
+
+    this.i18n = i18n;
+
+    this.root.classList.add('tab-group-menu-panel');
+  }
+
+  onMessage(message, sender) {
+    if ((this.windowId &&
+        message?.windowId != this.windowId))
+      return;
+
+    switch (message?.type) {
+      default:
+        return super.onMessage(message, sender);
+
+      case `ws:${this.type}:hide-if-shown`:
+        if (!this.panel ||
+            (message.targetId &&
+             this.panel.dataset.targetId != message.targetId) ||
+            !this.panel.classList.contains('open')) {
+          return;
+        }
+        return super.onMessage({
+          ...message,
+          type: `ws:${this.type}:hide`,
+        }, sender);
+    }
+  }
+
+  onClick(event) {
+    event.stopPropagation();
+    const command = event.target?.closest('input, button')?.dataset?.command;
+    if (!command) {
+      return;
+    }
+    browser.runtime.sendMessage({
+      type:     'ws:invoke-native-tab-group-menu-panel-command',
+      windowId: this.windowId,
+      groupId:  parseInt(this.panel.dataset.targetId),
+      command,
+    });
+    this.onMessage({
+      type:      `ws:${this.type}:hide`,
+      windowId:  this.windowId,
+      timestamp: Date.now(),
+    });
+  }
+
+  onKeyDown(event) {
+    event.stopPropagation();
+    const target = event.target?.closest('input, button');
+    if (!target) {
+      return;
+    }
+    switch (event.key) {
+      case 'Tab':
+        this.advanceFocus(event.shiftKey ? -1 : 1);
+        event.preventDefault();
+        return;
+
+      case 'Enter':
+      case 'Return':
+        browser.runtime.sendMessage({
+          type:     'ws:invoke-native-tab-group-menu-panel-command',
+          windowId: this.windowId,
+          groupId:  parseInt(this.panel.dataset.targetId),
+          command:  target.dataset?.command,
+        });
+        this.onMessage({
+          type:      `ws:${this.type}:hide`,
+          windowId:  this.windowId,
+          timestamp: Date.now(),
+        });
+        return;
+
+      case 'Escape':
+        this.onMessage({
+          type:      `ws:${this.type}:hide`,
+          windowId:  this.windowId,
+          timestamp: Date.now(),
+        });
+        return;
+    }
+  }
+
+  advanceFocus(direction) {
+    const lastFocused = this.panel.querySelector('input:focus, button:focus');
+    const focusibleItems = this.focusibleItems;
+    const index = lastFocused ? focusibleItems.indexOf(lastFocused) : -1;
+    const lastIndex = focusibleItems.length - 1;
+    if (index < 0) {
+      if (direction < 0) {
+        this.focusTo(focusibleItems[lastIndex]);
+      }
+      else {
+        this.focusTo(focusibleItems[0]);
+      }
+      return;
+    }
+    this.focusTo(direction < 0 ?
+      (index == 0 ? focusibleItems[lastIndex] : focusibleItems[index - 1]) :
+      (index == lastIndex ? focusibleItems[0] : focusibleItems[index + 1])
+    );
+  }
+
+  focusTo(item) {
+    if (!item) {
+      return;
+    }
+    item.focus();
+  }
+
+  get focusibleItems() {
+    return [...this.panel.querySelectorAll('input[type="text"], input[type="radio"]:checked, button')]
+      .filter(item => item.offsetWidth > 0 && item.offsetHeight > 0);
+  }
+
+  onBeforeDestroy() {
+    if (!this.onMessageSelf)
+      return;
+
+    if (this.panel) {
+      this.panel.removeEventListener('click', this.onClickSelf);
+      this.panel.removeEventListener('keydown', this.onKeyDownSelf);
+    }
+
+    this.onClickSelf = this.onKeyDownSelf = this.i18n = null;
+  }
+
+  get UISource() {
+    const i18n = this.i18n;
+    const doneButton = `
+      <button class="primary tab-group-editor-button-done"
+              data-command="done"
+              accesskey=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_done_accesskey)}
+             >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_done_label)}</button>
+    `;
+    const cancelButton = `
+      <button class="tab-group-editor-button-cancel"
+              data-command="cancel"
+              accesskey=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_cancel_accesskey)}
+             >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_cancel_label)}</button>
+    `;
+    return `
+      <div class="tab-group-default-header">
+        <div class="panel-header">
+          <h1 class="tab-group-editor-title-create tab-group-create-mode-only"
+             >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_title_create)}</h1>
+          <h1 class="tab-group-editor-title-edit tab-group-edit-mode-only"
+             >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_title_edit)}</h1>
+        </div>
+      </div>
+      <hr/>
+      <div class="panel-body tab-group-editor-name">
+        <label>
+          <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_name_label)}</span>
+          <input class="in-content-panel-title-field" type="text"
+                 placeholder=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_name_field_placeholder)}/>
+        </label>
+      </div>
+      <div class="tab-group-main">
+        <div class="panel-body tab-group-editor-swatches" role="radiogroup"
+             aria-label=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector_aria_label)}>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_blue_title)}>
+            <input type="radio" name="tab-group-color" value="blue" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_blue)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_purple_title)}>
+            <input type="radio" name="tab-group-color" value="purple" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_purple)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_cyan_title)}>
+            <input type="radio" name="tab-group-color" value="cyan" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_cyan)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_orange_title)}>
+            <input type="radio" name="tab-group-color" value="orange" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_orange)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_yellow_title)}>
+            <input type="radio" name="tab-group-color" value="yellow" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_yellow)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_pink_title)}>
+            <input type="radio" name="tab-group-color" value="pink" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_pink)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_green_title)}>
+            <input type="radio" name="tab-group-color" value="green" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_green)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_gray_title)}>
+            <input type="radio" name="tab-group-color" value="grey" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_gray)}</span>
+          </label>
+          <label title=${JSON.stringify(i18n.tabGroupMenu_tab_group_editor_color_selector2_red_title)}>
+            <input type="radio" name="tab-group-color" value="red" class="tab-group-editor-swatch"/>
+            <span class="label-text">${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_color_selector2_red)}</span>
+          </label>
+        </div>
+        <hr/>
+        <div class="panel-body tab-group-edit-actions tab-group-edit-mode-only">
+          <button tabindex="0" class="tabGroupEditor_addNewTabInGroup subviewbutton"
+                  data-command="addNewTabInGroup"
+                 >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_action_new_tab_label)}</button>
+          <button tabindex="0" class="tabGroupEditor_moveGroupToNewWindow subviewbutton"
+                  data-command="moveGroupToNewWindow"
+                 >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_action_new_window_label)}</button>
+          <!--
+          <button tabindex="0" class="tabGroupEditor_saveAndCloseGroup subviewbutton"
+                  data-command="saveAndCloseGroup"
+                 >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_action_save_label)}</button>
+          -->
+          <button tabindex="0" class="tabGroupEditor_ungroupTabs subviewbutton"
+                  data-command="ungroupTabs"
+                 >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_action_ungroup_label)}</button>
+        </div>
+        <hr class="tab-group-edit-mode-only"/>
+        <div class="tab-group-edit-mode-only panel-body tab-group-delete">
+          <button tabindex="0" class="tabGroupEditor_deleteGroup subviewbutton"
+                  data-command="deleteGroup"
+                 >${this.sanitizeForHTMLText(i18n.tabGroupMenu_tab_group_editor_action_delete_label)}</button>
+        </div>
+        <!-hr class="tab-group-create-mode-only"/>
+        <div class="tab-group-create-actions tab-group-create-mode-only">
+          ${ this.isWindows ? doneButton + cancelButton : cancelButton + doneButton /* https://searchfox.org/mozilla-central/rev/b7b6aa5e8ffc27bc70d4c129c95adc5921766b93/toolkit/content/widgets/moz-button-group/moz-button-group.mjs#74 */ }
+        </div>
+      </div>
+    `;
+  }
+  sanitizeForHTMLText(text) {
+    return (text || '')
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;');
+  }
+
+  prepareUI() {
+    if (this.panel) {
+      return;
+    }
+    super.prepareUI();
+
+    const titleField = this.panel.querySelector('.in-content-panel-title-field');
+    titleField.addEventListener('input', event => {
+      browser.runtime.sendMessage({
+        type:    'ws:update-native-tab-group',
+        groupId: parseInt(this.panel.dataset.targetId),
+        title:   event.target.value,
+      });
+    });
+    const colorRadioGroup = this.panel.querySelector('.tab-group-editor-swatches');
+    colorRadioGroup.addEventListener('change', event => {
+      if (!event.target.checked) {
+        return;
+      }
+      browser.runtime.sendMessage({
+        type:    'ws:update-native-tab-group',
+        groupId: parseInt(this.panel.dataset.targetId),
+        color:   event.target.value,
+      });
+    });
+    this.panel.addEventListener('click', this.onClickSelf);
+    this.panel.addEventListener('keydown', this.onKeyDownSelf);
+  }
+
+  onUpdateUI({ targetId, groupTitle, groupColor, creating, anchorTabRect, logging, complete, ...params }) {
+    if (logging)
+      console.log(`${this.type} updateUI `, { panel: this.panel, targetId, groupTitle, groupColor, creating, anchorTabRect, ...params });
+
+    this.panel.classList.toggle('tab-group-editor-mode-create', creating);
+
+    const titleField = this.panel.querySelector('.in-content-panel-title-field');
+    titleField.value = groupTitle || '';
+
+    const colorRadio = this.panel.querySelector(`.tab-group-editor-swatches input[value="${groupColor}"]`)
+    if (colorRadio) {
+      colorRadio.checked = true;
+    }
+
+    complete();
+  }
+
+  onShown() {
+    const titleField = this.panel.querySelector('.in-content-panel-title-field');
+    titleField.focus();
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/TabPreviewPanel.js b/waterfox/browser/components/sidebar/resources/module/TabPreviewPanel.js
new file mode 100644
index 0000000000000..0a7e393bdfdf8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/TabPreviewPanel.js
@@ -0,0 +1,331 @@
+/*
+# 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/.
+*/
+'use strict';
+
+// This is the main implementation to show the tab preview panel.
+// See also: /siedbar/in-content-panel-tooltip.js
+
+import InContentPanel from './InContentPanel.js';
+
+export default class TabPreviewPanel extends InContentPanel {
+  static TYPE = 'tab-preview';
+
+  get styleRules() {
+    return super.styleRules + `
+      .in-content-panel-root.tab-preview-panel {
+        bottom: 0;
+        height: 100%;
+        pointer-events: none;
+        z-index: calc(var(--max-32bit-integer) - 100); /* put preview panel below tab group menu always */
+
+        &:hover {
+          opacity: 0;
+        }
+
+        .in-content-panel {
+          overflow: hidden; /* clip the preview with the rounded edges */
+          pointer-events: none;
+
+          &.extended {
+            max-width: min(100%, calc(var(--panel-width) * 2));
+          }
+
+          &.animation.updating,
+          &.animation:not(.open) {
+            margin-block-start: 1ch; /* The native tab preview panel "popups up" on the vertical tab bar. */
+          }
+          /*
+          &[data-align="left"].updating,
+          &[data-align="left"]:not(.open) {
+            left: -1ch !important;
+          }
+          &[data-align="right"].updating,
+          &[data-align="right"]:not(.open) {
+            right: -1ch !important;
+          }
+          */
+
+          &.extended .in-content-panel-title,
+          &.extended .in-content-panel-url,
+          &.extended .in-content-panel-image-container,
+          &:not(.extended) .in-content-panel-extended-content {
+            display: none;
+          }
+          &.extended .in-content-panel-contents,
+          &.extended .in-content-panel-contents-inner-box {
+            max-width: calc(min(100%, calc(var(--panel-width) * 2)) - (2px / var(--in-content-panel-scale)));
+          }
+
+          &.blank,
+          & .blank,
+          &.hidden,
+          & .hidden {
+            display: none;
+          }
+
+          &.loading,
+          & .loading {
+            opacity: 0;
+          }
+
+          &.updating,
+          & .updating {
+            visibility: hidden;
+          }
+        }
+
+        .in-content-panel-contents-inner-box {
+          max-width: calc(var(--panel-width) - (2px / var(--in-content-panel-scale)));
+          min-width: calc(var(--panel-width) - (2px / var(--in-content-panel-scale)));
+        }
+
+        .in-content-panel.overflow .in-content-panel-contents {
+          mask-image: linear-gradient(to top, transparent 0, black 2em);
+        }
+
+        .in-content-panel-title {
+          font-size: calc(1em / var(--in-content-panel-scale));
+          font-weight: bold;
+          margin: var(--panel-border-radius) var(--panel-border-radius) 0;
+          max-height: 3em; /* -webkit-line-clamp looks unavailable, so this is a workaround */
+          overflow: hidden;
+          /* text-overflow: ellipsis; */
+          -webkit-line-clamp: 2; /* https://searchfox.org/mozilla-central/rev/dfaf02d68a7cb018b6cad7e189f450352e2cde04/browser/themes/shared/tabbrowser/tab-hover-preview.css#15-18 */
+        }
+
+        .in-content-panel-url {
+          font-size: calc(1em / var(--in-content-panel-scale));
+          margin: 0 var(--panel-border-radius);
+          opacity: 0.69; /* https://searchfox.org/mozilla-central/rev/234f91a9d3ebef0d514868701cfb022d5f199cb5/toolkit/themes/shared/design-system/tokens-shared.css#182 */
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .in-content-panel-extended-content {
+          font-size: calc(1em / var(--in-content-panel-scale));
+          margin: var(--panel-border-radius);
+          white-space: pre;
+        }
+
+        .in-content-panel-image-container {
+          border-block-start: calc(1px / var(--in-content-panel-scale)) solid var(--panel-border-color);
+          margin-block-start: 0.25em;
+          max-height: calc(var(--panel-width) * ${parseInt(this.BASE_PANEL_HEIGHT) / parseInt(this.BASE_PANEL_WIDTH)}); /* use relative value instead of 140px */
+          overflow: hidden;
+        }
+
+        .in-content-panel-image {
+          max-width: 100%;
+          opacity: 1;
+
+          .in-content-panel.animation:not(.updating) & {
+            transition: opacity 0.2s ease-out;
+          }
+
+          &.loading {
+            min-height: ${this.BASE_PANEL_HEIGHT};
+          }
+        }
+
+        /* tree */
+        .in-content-panel-extended-content {
+          ul,
+          ul ul {
+            margin-block: 0;
+            margin-inline: 1em 0;
+            padding: 0;
+            list-style: disc;
+          }
+
+          .title-line {
+            display: flex;
+            flex-direction: row;
+            max-width: 100%;
+            white-space: nowrap;
+
+            &.title {
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .cookieStoreName {
+              display: flex;
+              margin-inline-start: 1ch;
+
+              &::before {
+                content: "- ";
+              }
+            }
+          }
+        }
+      }
+    `;
+  }
+
+  init(givenRoot) {
+    // https://searchfox.org/mozilla-central/rev/dfaf02d68a7cb018b6cad7e189f450352e2cde04/browser/themes/shared/tabbrowser/tab-hover-preview.css#5
+    this.BASE_PANEL_WIDTH  = '280px';
+    this.BASE_PANEL_HEIGHT = '140px';
+    this.DATA_URI_BLANK_PNG = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQI12NgAAIAAAUAAeImBZsAAAAASUVORK5CYII=';
+
+    super.init(givenRoot);
+
+    this.root.classList.add('tab-preview-panel');
+  }
+
+  async onBeforeShow(message, _sender) {
+    // Simulate the behavior: show tab preview panel with delay
+    // only when the panel is not shown yet.
+    if (typeof message.waitInitialShowUntil == 'number' &&
+        (!this.panel ||
+         !this.panel.classList.contains('open'))) {
+      const delay = Math.max(0, message.waitInitialShowUntil - Date.now());
+      if (delay > 0) {
+        await new Promise((resolve, _reject) => {
+          setTimeout(resolve, delay);
+        });
+      }
+    }
+  }
+
+  get UISource() {
+    return `
+      <div class="in-content-panel-title"></div>
+      <div class="in-content-panel-url"></div>
+      <div class="in-content-panel-extended-content"></div>
+      <div class="in-content-panel-image-container">
+        <img class="in-content-panel-image"/>
+      </div>
+    `;
+  }
+
+  prepareUI() {
+    if (this.panel) {
+      return;
+    }
+    super.prepareUI();
+
+    const preview = this.panel.querySelector('.in-content-panel-image');
+    preview.addEventListener('load', () => {
+      if (preview.src)
+        preview.classList.remove('loading');
+    });
+  }
+
+  onUpdateUI({ targetId, title, url, tooltipHtml, hasPreview, previewURL, logging, complete, scale, ...params }) {
+    if (logging)
+      console.log(`${this.type} onUpdateUI `, { panel: this.panel, targetId, title, url, tooltipHtml, hasPreview, previewURL, ...params });
+
+    const hasLoadablePreviewURL = previewURL && /^((https?|moz-extension):|data:image\/[^,]+,.+)/.test(previewURL);
+    if (previewURL)
+      hasPreview = hasLoadablePreviewURL;
+
+    const previewImage = this.panel.querySelector('.in-content-panel-image');
+    previewImage.classList.toggle('blank', !hasPreview && !hasLoadablePreviewURL);
+    if (!previewURL ||
+        (previewURL &&
+         previewURL != previewImage.src)) {
+      previewImage.classList.add('loading');
+      previewImage.src = previewURL || this.DATA_URI_BLANK_PNG;
+    }
+
+    if (tooltipHtml) {
+      const extendedContent = this.panel.querySelector('.in-content-panel-extended-content');
+      extendedContent.innerHTML = tooltipHtml;
+      this.panel.classList.add('extended');
+    }
+
+    if (typeof title == 'string' ||
+        typeof url == 'string') {
+      const titleElement = this.panel.querySelector('.in-content-panel-title');
+      titleElement.textContent = title;
+      const urlElement = this.panel.querySelector('.in-content-panel-url');
+      urlElement.textContent = url;
+      urlElement.classList.toggle('blank', !url);
+      this.panel.classList.remove('extended');
+    }
+
+    if (!hasPreview) {
+      if (logging) {
+        console.log('updateUI: no preview, complete now');
+      }
+      return;
+    }
+
+    try {
+      const { width, height } = !previewImage.src || previewImage.src == this.DATA_URI_BLANK_PNG ?
+        { width: this.BASE_PANEL_WIDTH, height: this.BASE_PANEL_HEIGHT } :
+        this.getPngDimensionsFromDataUri(previewURL);
+      if (logging)
+        console.log('updateUI: determined preview size: ', { width, height });
+      const imageWidth = Math.min(window.innerWidth, Math.min(width, parseInt(this.BASE_PANEL_WIDTH)) / scale);
+      const imageHeight = imageWidth / width * height;
+      previewImage.style.width = previewImage.style.maxWidth = `min(100%, ${imageWidth}px)`;
+      previewImage.style.height = previewImage.style.maxHeight = `${imageHeight}px`;
+      requestAnimationFrame(complete);
+      return true;
+    }
+    catch (error) {
+      if (logging)
+        console.log('updateUI: could not detemine preview size ', error, previewURL);
+    }
+
+    // failsafe: if it is not a png or failed to get dimensions, give up to determine the image size before loading.
+    previewImage.style.width =
+    previewImage.style.height =
+    previewImage.style.maxWidth =
+    previewImage.style.maxHeight = '';
+    previewImage.addEventListener('load', complete, { once: true });
+    previewImage.addEventListener('error', complete, { once: true });
+    return true;
+  }
+
+  onBeforeCompleteUpdate({ complete }) {
+    const previewImage = this.panel.querySelector('.in-content-panel-image');
+    previewImage.removeEventListener('load', complete);
+    previewImage.removeEventListener('error', complete);
+  }
+
+  onCompleteUpdate({ logging }) {
+    const panelBox = this.panel.getBoundingClientRect();
+    const panelHeight = panelBox.height;
+
+    const contentsHeight = this.panel.querySelector('.in-content-panel-contents-inner-box').getBoundingClientRect().height;
+    this.panel.classList.toggle('overflow', contentsHeight > panelHeight);
+    if (logging)
+      console.log(`${this.type} updateUI/complete: overflow: `, contentsHeight, ' > ', panelHeight);
+  }
+
+  getPngDimensionsFromDataUri(uri) {
+    if (!/^data:image\/png;base64,/i.test(uri))
+      throw new Error('impossible to parse as PNG image data ', uri);
+
+    const base64Data = uri.split(',')[1];
+    const binaryData = atob(base64Data);
+    const byteArray = new Uint8Array(binaryData.length);
+    const requiredScanSize = Math.min(binaryData.length, 24);
+    for (let i = 0; i < requiredScanSize; i++) {
+      byteArray[i] = binaryData.charCodeAt(i);
+    }
+    const pngSignature = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
+    for (let i = 0; i < pngSignature.length; i++) {
+      if (byteArray[i] !== pngSignature[i])
+        throw new Error('invalid PNG header');
+    }
+    const width =
+    (byteArray[16] << 24) |
+    (byteArray[17] << 16) |
+    (byteArray[18] << 8) |
+    byteArray[19];
+    const height =
+    (byteArray[20] << 24) |
+    (byteArray[21] << 16) |
+    (byteArray[22] << 8) |
+    byteArray[23];
+    return { width, height };
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/logs.js b/waterfox/browser/components/sidebar/resources/module/logs.js
new file mode 100644
index 0000000000000..61377b5a2c1e8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/logs.js
@@ -0,0 +1,151 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as Constants from '/common/constants.js';
+
+window.addEventListener('DOMContentLoaded', () => {
+  browser.runtime.onMessage.addListener((message, _sender) => {
+    if (!message ||
+        typeof message != 'object')
+      return;
+    switch (message.type) {
+      case Constants.kCOMMAND_RESPONSE_QUERY_LOGS: {
+        if (!message.logs || message.logs.length < 1)
+          return;
+        document.getElementById('queryLogs').textContent += message.logs.reduce((output, log, index) => {
+          if (log) {
+            log.windowId = message.windowId || 'background';
+            output += `${index == 0 ? '' : ',\n'}${JSON.stringify(log)}`;
+          }
+          return output;
+        }, '') + ',\n';
+        analyzeQueryLogs();
+      }; break;
+
+      case Constants.kCOMMAND_RESPONSE_CONNECTION_MESSAGE_LOGS: {
+        const logs = document.getElementById('connectionMessageLogs');
+        logs.textContent += message.windowId ? `"${message.windowId} => background"` : '"background => sidebar"';
+        logs.textContent += ': ' + JSON.stringify(message.logs, null, 2) + ',\n';
+        analyzeConnectionMessageLogs();
+      }; break;
+    }
+  });
+  browser.runtime.sendMessage({ type: Constants.kCOMMAND_REQUEST_QUERY_LOGS });
+  browser.runtime.sendMessage({ type: Constants.kCOMMAND_REQUEST_CONNECTION_MESSAGE_LOGS });
+}, { once: true });
+
+function analyzeQueryLogs() {
+  const logs = JSON.parse(`[${document.getElementById('queryLogs').textContent.replace(/,\s*$/, '')}]`);
+
+  function toString(data) {
+    return JSON.stringify(data);
+  }
+
+  function fromString(data) {
+    return JSON.parse(data);
+  }
+
+  const totalElapsedTimes = {};
+  function normalize(log) {
+    const elapsedTime = log.elapsed || log.elasped || 0;
+    log = fromString(toString(log));
+    delete log.elasped;
+    delete log.elapsed;
+    delete log.tabs;
+    log.source = (typeof log.windowId == 'number') ? 'sidebar' : log.windowId;
+    delete log.windowId;
+    if (log.indexedTabs)
+      log.indexedTabs = log.indexedTabs.replace(/\s+in window \d+$/i, '');
+    if (log.fromId)
+      log.fromId = 'given';
+    if (log.toId)
+      log.toId = 'given';
+    if (log.fromIndex)
+      log.fromIndex = 'given';
+    if (log.logicalIndex)
+      log.logicalIndex = 'given';
+    for (const key of ['id', '!id']) {
+      if (log[key])
+        log[key] = Array.isArray(log[key]) ? 'array' : (typeof log[key]);
+    }
+    const sorted = {};
+    for (const key of Object.keys(log).sort()) {
+      sorted[key] = log[key];
+    }
+    const type = toString(sorted);
+    const total = totalElapsedTimes[type] || 0;
+    totalElapsedTimes[type] = total + elapsedTime;
+    return sorted;
+  }
+  const normalizedLogs = logs.map(normalize).map(toString).sort().map(fromString);
+
+  function uniq(logs) {
+    const logTypes = logs.map(toString);
+    let lastType;
+    let lastCount;
+    const results = [];
+    for (const type of logTypes) {
+      if (type != lastType) {
+        if (lastType) {
+          results.push({
+            count: lastCount,
+            query: fromString(lastType),
+            totalElapsed: totalElapsedTimes[lastType]
+          });
+        }
+        lastType = type;
+        lastCount = 0;
+      }
+      lastCount++;
+    }
+    if (lastType)
+      results.push({
+        count: lastCount,
+        query: fromString(lastType),
+        totalElapsed: totalElapsedTimes[lastType]
+      });
+    return results;
+  }
+
+  const results = [];
+  results.push('Top 10 slowest queries:\n' + logs.sort((a,b) => (b.elasped || b.elapsed || 0) - (a.elasped || a.elapsed || 0)).slice(0, 10).map(toString).join('\n'));
+  results.push('Count of query tyepes:\n' + uniq(normalizedLogs).sort((a, b) => b.count - a.count).map(toString).join('\n'));
+  results.push('Sorted in total elapsed time:\n' + uniq(normalizedLogs).sort((a, b) => b.totalElapsed - a.totalElapsed).map(toString).join('\n'));
+  document.getElementById('queryLogsAnalysis').textContent = '`\n' + results.join('\n') + '\n`';
+}
+
+function analyzeConnectionMessageLogs() {
+  const logs = JSON.parse(`{${document.getElementById('connectionMessageLogs').textContent.replace(/,\s*$/, '')}}`);
+
+  const counts = {};
+  for (const direction of Object.keys(logs)) {
+    let partialLogs = logs[direction];
+    const isBackground = direction.startsWith('background');
+    if (!isBackground) {
+      partialLogs = {};
+      partialLogs[direction] = logs[direction];
+    }
+    for (const part of Object.keys(partialLogs)) {
+      for (const type of Object.keys(partialLogs[part])) {
+        const typeLabel = `${type} (${isBackground ? 'background => sidebar' : 'sidebar => background'})`;
+        counts[typeLabel] = counts[typeLabel] || 0;
+        counts[typeLabel] += partialLogs[part][type];
+      }
+    }
+  }
+
+  let totalCount = 0;
+  const sortableCounts = [];
+  for (const type of Object.keys(counts)) {
+    sortableCounts.push({ type, count: counts[type] });
+    totalCount += counts[type];
+  }
+
+  const results = [];
+  results.push('Top 10 message types:\n' + sortableCounts.sort((a,b) => b.count- a.count).slice(0, 10).map(count => `${count.type}: ${count.count} (${parseInt(count.count / totalCount * 100)} %)`).join('\n'));
+  document.getElementById('connectionMessageLogsAnalysis').textContent = '`\n' + results.join('\n') + '\n`';
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/protocol-handler.js b/waterfox/browser/components/sidebar/resources/module/protocol-handler.js
new file mode 100644
index 0000000000000..a99b1df531895
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/protocol-handler.js
@@ -0,0 +1,55 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as Constants from '/common/constants.js';
+
+const uri = decodeURIComponent(location.search.replace(/^\?/, ''));
+const matched = uri?.match(Constants.kSHORTHAND_CUSTOM_URI);
+if (matched) {
+  const name = matched[1];
+  const params = new URLSearchParams(matched[2] || '');
+  const hash = matched[3] || '';
+  const delimiter = params.toString() ? '?' : '';
+  switch (name.toLowerCase()) {
+    case 'group':
+      location.href = `${Constants.kSHORTHAND_URIS.group}${delimiter}${params.toString()}${hash}`;
+      break;
+
+    case 'startup':
+      location.href = `${Constants.kSHORTHAND_URIS.startup}${hash}`;
+      break;
+
+    case 'test-runner':
+    case 'testrunner':
+      location.href = `${Constants.kSHORTHAND_URIS.testRunner}${delimiter}${params.toString()}${hash}`;
+      break;
+
+    case 'options':
+      location.href = `${Constants.kSHORTHAND_URIS.options}${delimiter}${params.toString()}${hash}`;
+      break;
+
+    case 'tabbar':
+    case 'sidebar':
+      if (!params.has('style')) {
+        browser.runtime.sendMessage({
+          type: 'ws:get-config-value',
+          keys: ['style']
+        }).then(configs => {
+          params.set('style', configs.style);
+          location.href = `${Constants.kSHORTHAND_URIS.tabbar}?${params.toString()}${hash}`;
+        });
+      }
+      else {
+        location.href = `${Constants.kSHORTHAND_URIS.tabbar}${delimiter}${params.toString()}${hash}`;
+      }
+      break;
+
+    case 'forbidden':
+      location.href = `about:blank?${new URL(location.href).searchParams.get('url') || ''}`;
+      break;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/module/startup.js b/waterfox/browser/components/sidebar/resources/module/startup.js
new file mode 100644
index 0000000000000..c4668c0bf8679
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/module/startup.js
@@ -0,0 +1,46 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import '/extlib/l10n.js';
+
+import {
+  configs,
+  isRTL,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+
+document.documentElement.classList.toggle('rtl', isRTL());
+
+window.addEventListener('DOMContentLoaded', () => {
+  document.querySelector('#title').textContent = document.title = `${browser.i18n.getMessage('extensionName')} ${browser.runtime.getManifest().version}`;
+  document.querySelector('#syncTabsToDeviceOptionsLink').href = `${Constants.kSHORTHAND_URIS.options}#syncTabsToDeviceOptions`;
+
+  Permissions.bindToCheckbox(
+    Permissions.ALL_URLS,
+    document.querySelector('#allUrlsPermissionGranted'),
+    {
+      onChanged: (granted) => {
+        if (!granted)
+          return;
+        configs.tabPreviewTooltip = true;
+        configs.skipCollapsedTabsForTabSwitchingShortcuts = true;
+      },
+    }
+  );
+  Permissions.bindToCheckbox(
+    Permissions.BOOKMARKS,
+    document.querySelector('#bookmarksPermissionGranted')
+  );
+  Permissions.bindToCheckbox(
+    Permissions.CLIPBOARD_READ,
+    document.querySelector('#clipboardReadPermissionGranted')
+  );
+  document.querySelector('#clipboardReadPermissionGranted').style.display = configs.middleClickPasteURLOnNewTabButton ? 'none' : '';
+
+  document.documentElement.classList.add('initialized');
+}, { once: true });
diff --git a/waterfox/browser/components/sidebar/resources/protocol-handler.html b/waterfox/browser/components/sidebar/resources/protocol-handler.html
new file mode 100644
index 0000000000000..99f8a2745554c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/protocol-handler.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<meta charset="UTF-8">
+<title></title>
+<script type="module" src="./module/protocol-handler.js"></script>
diff --git a/waterfox/browser/components/sidebar/resources/startup.html b/waterfox/browser/components/sidebar/resources/startup.html
new file mode 100644
index 0000000000000..888d0084c9bc2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/startup.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<meta charset="UTF-8">
+<link rel="icon" href="./16x16.svg">
+<title></title>
+<link rel="stylesheet" href="/resources/ui-color.css">
+<style type="text/css"><!--
+  :root > * {
+    transition: opacity 0.25s ease-out;
+  }
+  :root:not(.initialized) > * {
+    opacity: 0;
+  }
+
+  :root.rtl {
+    direction: rtl;
+  }
+
+  body {
+    background: var(--bg-color);
+    color: var(--text-color);
+    padding-block: 2em;
+    padding-inline: 12%;
+    font: message-box;
+  }
+
+  body,
+  body > * {
+    text-align: center;
+  }
+
+  #icon::before {
+    background: var(--text-color);
+    content: "";
+    display: inline-block;
+    height: 10em;
+    mask: url("24x24.svg") no-repeat center / 100%;
+    opacity: 0.7;
+    width: 10em;
+  }
+
+  em {
+    font-style: normal;
+    font-weight: bold;
+  }
+
+  .permissions {
+    text-align: start;
+    margin-inline: 8%;
+    padding-block: 0;
+    padding-inline: 0;
+  }
+  ul.permissions,
+  ul.permissions > li {
+    list-style: none;
+  }
+  label.has-checkbox:not(.inline),
+  label.has-radio:not(.inline) {
+    margin-inline-start: 2em;
+    text-indent: -2em;
+    display: block;
+  }
+  label[disabled="true"] {
+    opacity: 0.5;
+  }
+  label[disabled="true"] input {
+    opacity: 1;
+  }
+
+  .user-chrome-css {
+    position: fixed;
+    top: 0;
+    font-size: 95%;
+    inset-inline-start: 0;
+    text-align: start;
+    transition: opacity 0.3s ease;
+  }
+  .user-chrome-css:not(:hover) {
+    opacity: 0.65;
+  }
+  .user-chrome-css:hover {
+    width: 80em;
+    max-width: 70%;
+  }
+  .user-chrome-css .arrow {
+    position: absolute;
+    line-height: 1;
+  }
+  .user-chrome-css .arrow.top-tabbar {
+    inset-inline-start: 2em;
+    top: 0;
+    transform: rotate(180deg);
+  }
+  .user-chrome-css .arrow.sidebar-header {
+    inset-inline-start: 0;
+    top: 1.8em;
+    transform: rotate(90deg);
+  }
+  .user-chrome-css p {
+    margin-block: 1em 0;
+    margin-inline: 1em 0;
+    color: #efefef;
+    background: #0c0c0d;
+    border: 1px solid;
+    border-radius: 0.5em;
+    padding-block: 0.5em;
+    padding-inline: 0.5em;
+    box-shadow: 0.2em 0.2em 0.5em rgba(0, 0, 0, 0.35);
+    min-width: 2em
+  }
+  .user-chrome-css :link,
+  .user-chrome-css :visited {
+    color: white;
+  }
+  .user-chrome-css:hover p.notify,
+  .user-chrome-css:not(:hover) p.description {
+    display: none;
+  }
+  .user-chrome-css p.notify {
+    text-align: center;
+    font-weight: bold;
+  }
+--></style>
+<script type="module" src="./module/startup.js"></script>
+
+<h1 id="title">__MSG_extensionName__</h1>
+<div id="icon"></div>
+<p>__MSG_message_startup_description_1__<em
+  >__MSG_message_startup_description_key__</em
+  >__MSG_message_startup_description_2__<em
+  >__MSG_extensionName__</em
+  >__MSG_message_startup_description_3__</p>
+<p>__MSG_message_startup_description_sync_before__<a
+  id="syncTabsToDeviceOptionsLink" href="#" target="_blank"
+  >__MSG_message_startup_description_sync_link__</a
+  >__MSG_message_startup_description_sync_after__</p>
+<p>__MSG_config_addons_description_before__<a
+  href="__MSG_helper_addons_list_link_uri__" target="_blank"
+  >__MSG_config_addons_description_link_label__</a
+  >__MSG_config_addons_description_after__</p>
+<p>__MSG_config_theme_description_before__<a
+  href="__MSG_helper_theme_list_link_uri__" target="_blank"
+  >__MSG_config_theme_description_link_label__</a
+  >__MSG_config_theme_description_after__</p>
+<p>__MSG_message_startup_history_before__<a
+  href="__MSG_message_startup_history_link_uri__" target="_blank"
+  >__MSG_message_startup_history_link_label__</a
+  >__MSG_message_startup_history_after__</p>
+
+<p>__MSG_message_startup_requestPermissions_description__</p>
+<ul class="permissions">
+  <li><label class="has-checkbox"
+            ><input id="bookmarksPermissionGranted"
+                    type="checkbox">
+             __MSG_message_startup_requestPermissions_bookmarks__</label>
+      <ul>
+        <li><label for="bookmarksPermissionGranted">__MSG_message_startup_requestPermissions_bookmarks_contextMenuItems__</label></li>
+        <li><label for="bookmarksPermissionGranted">__MSG_message_startup_requestPermissions_bookmarks_migrationForImportedBookmarks__</label></li>
+        <li><label for="bookmarksPermissionGranted">__MSG_message_startup_requestPermissions_bookmarks_detectTabsFromBookmarks__</label></li>
+      </ul>
+  </li>
+  <li><label class="has-checkbox"
+            ><input id="allUrlsPermissionGranted"
+                    type="checkbox">
+             __MSG_message_startup_requestPermissions_allUrls__</label>
+      <ul>
+        <li><label for="allUrlsPermissionGranted">__MSG_message_startup_requestPermissions_allUrls_tabPreviewPanel__</label></li>
+        <li><label for="allUrlsPermissionGranted">__MSG_message_startup_requestPermissions_allUrls_skipCollapsedTabsWithCtrlTab__</label></li>
+        <li><label for="allUrlsPermissionGranted">__MSG_message_startup_requestPermissions_allUrls_preventBlankDialogRestoration__</label></li>
+      </ul>
+  </li>
+  <li><label class="has-checkbox"
+            ><input id="clipboardReadPermissionGranted"
+                    type="checkbox">
+             __MSG_message_startup_requestPermissions_clipboardRead__</label>
+      <ul>
+        <li><label for="clipboardReadPermissionGranted">__MSG_message_startup_requestPermissions_clipboardRead_newTabButtonMiddleClick__</label></li>
+      </ul>
+  </li>
+</ul>
+
+<div class="user-chrome-css">
+  <span class="arrow top-tabbar">โ–ผ</span>
+  <span class="arrow sidebar-header">โ–ผ</span>
+  <p class="notify">__MSG_message_startup_userChromeCss_notify__</span>
+  <p class="description"
+    >__MSG_message_startup_userChromeCss_description_1__<a
+    href="__MSG_message_startup_userChromeCss_description_link_uri__" target="_blank"
+    >__MSG_message_startup_userChromeCss_description_link_label__</a
+    >__MSG_message_startup_userChromeCss_description_2__<em
+    >__MSG_message_startup_userChromeCss_description_note__</em
+    >__MSG_message_startup_userChromeCss_description_3__</p
+    >
+</div>
diff --git a/waterfox/browser/components/sidebar/resources/ui-base.css b/waterfox/browser/components/sidebar/resources/ui-base.css
new file mode 100644
index 0000000000000..a993bcbcc3c8c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/ui-base.css
@@ -0,0 +1,30 @@
+/*
+# 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/.
+*/
+
+/*
+ Global styles for extensions page from chrome://browser/content/extension.css
+ They are applied to sidebar contents automatically but not provided for
+ in-page contents, so we manually define them here.
+*/
+html,
+body {
+  box-sizing: border-box;
+  cursor: default;
+  display: flex;
+  flex-direction: column;
+  font: caption;
+  font-weight: normal; /* This is required to cancel unexpected bold weight produced by the "caption" system font name on Windows 7 Classic theme. See also: https://github.com/piroor/treestyletab/issues/2636 */
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 0;
+  padding-inline: 0;
+  -moz-user-select: none;
+
+  * {
+    box-sizing: border-box;
+    text-align: start;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/resources/ui-color.css b/waterfox/browser/components/sidebar/resources/ui-color.css
new file mode 100644
index 0000000000000..10cfc0241d6e5
--- /dev/null
+++ b/waterfox/browser/components/sidebar/resources/ui-color.css
@@ -0,0 +1,395 @@
+/*
+# 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/.
+*/
+
+:root {
+  /* https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/themes/shared/in-content/common.inc.css */
+  --in-content-page-color: var(--grey-90);
+  --in-content-page-background: var(--grey-10);
+  --in-content-text-color: var(--in-content-page-color);
+  --in-content-deemphasized-text: var(--grey-60);
+  --in-content-selected-text: #fff;
+  --in-content-box-background: #fff;
+  --in-content-box-background-hover: var(--grey-20);
+  --in-content-box-background-active: var(--grey-30);
+  --in-content-box-border-color: var(--grey-90-a30);
+  --in-content-box-border-color-mixed: color-mix(in srgb, var(--in-content-box-border-color) 100%, var(--in-content-page-background));
+  --in-content-box-info-background: var(--grey-20);
+  --in-content-item-hover: rgba(69, 161, 255, 0.2); /* blue 40 a20 */
+  --in-content-item-hover-mixed: color-mix(in srgb, var(--in-content-item-hover) 100%, var(--in-content-page-background));
+  --in-content-item-selected: var(--blue-50);
+  --in-content-border-highlight: var(--blue-50);
+  --in-content-border-focus: var(--blue-50);
+  --in-content-border-hover: var(--grey-90-a50);
+  --in-content-border-hover-mixed: color-mix(in srgb, var(--in-content-border-hover) 100%, var(--in-content-page-background));
+  --in-content-border-active: var(--blue-50);
+  --in-content-border-active-shadow: var(--blue-50-a30);
+  --in-content-border-invalid: var(--red-50);
+  --in-content-border-invalid-shadow: var(--red-50-a30);
+  --in-content-border-color: var(--grey-30);
+  --in-content-border-color-mixed: #d7d7db;
+  --in-content-category-outline-focus: 1px dotted var(--blue-50);
+  --in-content-category-text-selected: var(--blue-50);
+  --in-content-category-text-selected-active: var(--blue-60);
+  --in-content-category-background-hover: rgba(12,12,13,0.1);
+  --in-content-category-background-active: rgba(12,12,13,0.15);
+  --in-content-category-background-selected-hover: rgba(12,12,13,0.15);
+  --in-content-category-background-selected-active: rgba(12,12,13,0.2);
+  --in-content-tab-color: #424f5a;
+  --in-content-link-color: var(--blue-60);
+  --in-content-link-color-hover: var(--blue-70);
+  --in-content-link-color-active: var(--blue-80);
+  --in-content-link-color-visited: var(--blue-60);
+  --in-content-button-background: var(--grey-90-a10);
+  --in-content-button-background-mixed: color-mix(in srgb, var(--in-content-button-background) 100%, var(--in-content-page-background));
+  --in-content-button-background-hover: var(--grey-90-a20);
+  --in-content-button-background-hover-mixed: color-mix(in srgb, var(--in-content-button-background-hover) 100%, var(--in-content-page-background));
+  --in-content-button-background-active: var(--grey-90-a30);
+  --in-content-button-background-active-mixed: color-mix(in srgb, var(--in-content-button-background-active) 100%, var(--in-content-page-background));
+
+  --blue-40: #45a1ff;
+  --blue-40-a10: rgb(69, 161, 255, 0.1);
+  --blue-50: #0a84ff;
+  --blue-50-a30: rgba(10, 132, 255, 0.3);
+  --blue-60: #0060df;
+  --blue-70: #003eaa;
+  --blue-80: #002275;
+  --grey-10: #f9f9fa;
+  --grey-10-a015: rgba(249, 249, 250, 0.015);
+  --grey-10-a20: rgba(249, 249, 250, 0.2);
+  --grey-20: #ededf0;
+  --grey-30: #d7d7db;
+  --grey-40: #b1b1b3;
+  --grey-60: #4a4a4f;
+  --grey-90: #0c0c0d;
+  --grey-90-a10: rgba(12, 12, 13, 0.1);
+  --grey-90-a11: rgba(12, 12, 13, 0.11);
+  --grey-90-a20: rgba(12, 12, 13, 0.2);
+  --grey-90-a30: rgba(12, 12, 13, 0.3);
+  --grey-90-a40: rgba(12, 12, 13, 0.4);
+  --grey-90-a50: rgba(12, 12, 13, 0.5);
+  --grey-90-a60: rgba(12, 12, 13, 0.6);
+  --green-50: #30e60b;
+  --green-60: #12bc00;
+  --green-70: #058b00;
+  --green-80: #006504;
+  --green-90: #003706;
+  --orange-50: #ff9400;
+  --purple-70: #6200a4;
+  --red-50: #ff0039;
+  --red-50-a10: rgba(255, 0, 57, 0.1);
+  --red-50-a30: rgba(255, 0, 57, 0.3);
+  --red-60: #d70022;
+  --red-70: #a4000f;
+  --red-80: #5a0002;
+  --red-90: #3e0200;
+  --yellow-10: #ffff98;
+  --yellow-50: #ffe900;
+  --yellow-60: #d7b600;
+  --yellow-60-a30: rgba(215, 182, 0, 0.3);
+  --yellow-70: #a47f00;
+  --yellow-80: #715100;
+  --yellow-90: #3e2800;
+
+  /* https://hg.mozilla.org/mozilla-central/raw-file/tip/browser/themes/addons/dark/manifest.json */
+  --dark-frame: #1c1b22;
+  --dark-icons: rgb(251,251,254);
+  --dark-ntp-background: #2A2A2E;
+  --dark-ntp-text: rgb(251, 251, 254);
+  --dark-popup: rgb(66,65,77);
+  --dark-popup-border: rgb(82,82,94);
+  --dark-popup-text: rgb(251,251,254);
+  --dark-sidebar: #38383D;
+  --dark-sidebar-text: rgb(249, 249, 250);
+  --dark-sidebar-border: rgba(255, 255, 255, 0.1);
+  --dark-tab-background-text: #fbfbfe;
+  --dark-tab-line: transparent;
+  --dark-toolbar: rgb(43,42,51);
+  --dark-toolbar-bottom-separator: hsl(240, 5%, 5%);
+  --dark-toolbar-field: rgb(28,27,34);
+  --dark-toolbar-field-border: transparent;
+  --dark-toolbar-field-separator: #5F6670;
+  --dark-toolbar-field-text: rgb(251,251,254);
+
+  /* https://searchfox.org/mozilla-central/rev/35873cfc312a6285f54aa5e4ec2d4ab911157522/browser/themes/shared/tabs.inc.css#24 */
+  --tab-loading-fill: #0A84FF;
+
+  --focus-outline-color: #0061E0; /* https://searchfox.org/mozilla-central/rev/f60e5304300b286376664b25143cdc6b38a0f0d7/browser/themes/shared/browser-shared.css#124 */
+
+  /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#107 */
+  --color-blue-0: oklch(97% 0.05 260);
+  --color-blue-10: oklch(90% 0.13 260);
+  --color-blue-20: oklch(83% 0.17 260);
+  --color-blue-30: oklch(76% 0.2 260);
+  --color-blue-40: oklch(69% 0.22 260);
+  --color-blue-50: oklch(62% 0.24 260);
+  --color-blue-60: oklch(55% 0.24 260);
+  --color-blue-70: oklch(48% 0.2 260);
+  --color-blue-80: oklch(41% 0.17 260);
+  --color-blue-90: oklch(34% 0.14 260);
+  --color-blue-100: oklch(27% 0.1 260);
+  --color-blue-110: oklch(20% 0.05 260);
+  --color-cyan-0: oklch(97% 0.05 205);
+  --color-cyan-10: oklch(90% 0.07 205);
+  --color-cyan-20: oklch(83% 0.11 205);
+  --color-cyan-30: oklch(76% 0.14 205);
+  --color-cyan-40: oklch(69% 0.19 205);
+  --color-cyan-50: oklch(62% 0.21 205);
+  --color-cyan-60: oklch(55% 0.21 205);
+  --color-cyan-70: oklch(48% 0.2 205);
+  --color-cyan-80: oklch(41% 0.17 205);
+  --color-cyan-90: oklch(34% 0.14 205);
+  --color-cyan-100: oklch(27% 0.1 205);
+  --color-cyan-110: oklch(20% 0.05 205);
+  --color-gray-05: #fbfbfe;
+  --color-gray-30: #bac2ca;
+  --color-gray-50: #bfbfc9;
+  --color-gray-60: #8f8f9d;
+  --color-gray-70: #5b5b66;
+  --color-gray-80: #23222b;
+  --color-gray-90: #1c1b22;
+  --color-gray-100: #15141a;
+  --color-green-0: oklch(97% 0.05 145);
+  --color-green-10: oklch(90% 0.1 145);
+  --color-green-20: oklch(83% 0.14 145);
+  --color-green-30: oklch(76% 0.17 145);
+  --color-green-40: oklch(69% 0.19 145);
+  --color-green-50: oklch(62% 0.21 145);
+  --color-green-60: oklch(55% 0.21 145);
+  --color-green-70: oklch(48% 0.2 145);
+  --color-green-80: oklch(41% 0.17 145);
+  --color-green-90: oklch(34% 0.14 145);
+  --color-green-100: oklch(27% 0.1 145);
+  --color-green-110: oklch(20% 0.05 145);
+  --color-orange-0: oklch(97% 0.05 50);
+  --color-orange-10: oklch(90% 0.10 50);
+  --color-orange-20: oklch(86% 0.14 50);
+  --color-orange-30: oklch(79% 0.17 50);
+  --color-orange-40: oklch(72% 0.19 50);
+  --color-orange-50: oklch(65% 0.21 50);
+  --color-orange-60: oklch(58% 0.21 50);
+  --color-orange-70: oklch(48% 0.20 50);
+  --color-orange-80: oklch(41% 0.17 50);
+  --color-orange-90: oklch(34% 0.14 50);
+  --color-orange-100: oklch(27% 0.10 50);
+  --color-orange-110: oklch(20% 0.05 50);
+  --color-pink-0: oklch(97% 0.05 360);
+  --color-pink-10: oklch(90% 0.1 360);
+  --color-pink-20: oklch(83% 0.14 360);
+  --color-pink-30: oklch(76% 0.17 360);
+  --color-pink-40: oklch(69% 0.19 360);
+  --color-pink-50: oklch(62% 0.21 360);
+  --color-pink-60: oklch(55% 0.21 360);
+  --color-pink-70: oklch(48% 0.2 360);
+  --color-pink-80: oklch(41% 0.17 360);
+  --color-pink-90: oklch(34% 0.14 360);
+  --color-pink-100: oklch(27% 0.1 360);
+  --color-pink-110: oklch(20% 0.05 360);
+  --color-purple-0: oklch(97% 0.05 315);
+  --color-purple-10: oklch(90% 0.1 315);
+  --color-purple-20: oklch(83% 0.14 315);
+  --color-purple-30: oklch(76% 0.17 315);
+  --color-purple-40: oklch(69% 0.19 315);
+  --color-purple-50: oklch(62% 0.21 315);
+  --color-purple-60: oklch(55% 0.21 315);
+  --color-purple-70: oklch(48% 0.2 315);
+  --color-purple-80: oklch(41% 0.17 315);
+  --color-purple-90: oklch(34% 0.14 315);
+  --color-purple-100: oklch(27% 0.1 315);
+  --color-purple-110: oklch(20% 0.05 315);
+  --color-red-0: oklch(97% 0.05 15);
+  --color-red-10: oklch(90% 0.1 15);
+  --color-red-20: oklch(83% 0.14 15);
+  --color-red-30: oklch(76% 0.17 15);
+  --color-red-40: oklch(69% 0.19 15);
+  --color-red-50: oklch(62% 0.21 15);
+  --color-red-60: oklch(55% 0.21 15);
+  --color-red-70: oklch(48% 0.2 15);
+  --color-red-80: oklch(41% 0.17 15);
+  --color-red-90: oklch(34% 0.14 15);
+  --color-red-100: oklch(27% 0.1 15);
+  --color-red-110: oklch(20% 0.05 15);
+  --color-violet-0: oklch(97% 0.05 290);
+  --color-violet-10: oklch(90% 0.13 290);
+  --color-violet-20: oklch(83% 0.17 290);
+  --color-violet-30: oklch(76% 0.2 290);
+  --color-violet-40: oklch(69% 0.22 290);
+  --color-violet-50: oklch(62% 0.24 290);
+  --color-violet-60: oklch(55% 0.24 290);
+  --color-violet-70: oklch(48% 0.2 290);
+  --color-violet-80: oklch(41% 0.17 290);
+  --color-violet-90: oklch(34% 0.14 290);
+  --color-violet-100: oklch(27% 0.1 290);
+  --color-violet-110: oklch(20% 0.05 290);
+  --color-white: #ffffff;
+  --color-yellow-0: oklch(97% 0.05 90);
+  --color-yellow-10: oklch(93% 0.1 90);
+  --color-yellow-20: oklch(86% 0.14 90);
+  --color-yellow-30: oklch(79% 0.2 90);
+  --color-yellow-40: oklch(72% 0.22 90);
+  --color-yellow-50: oklch(65% 0.24 90);
+  --color-yellow-60: oklch(58% 0.24 90);
+  --color-yellow-70: oklch(51% 0.23 90);
+  --color-yellow-80: oklch(41% 0.2 90);
+  --color-yellow-90: oklch(34% 0.17 90);
+  --color-yellow-100: oklch(27% 0.13 90);
+  --color-yellow-110: oklch(20% 0.08 90);
+
+  /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/browser/themes/shared/tabbrowser/tabs.css#79 */
+  --tab-group-color-blue: var(--color-blue-70);
+  --tab-group-color-blue-invert: var(--color-blue-20);
+  --tab-group-color-blue-pale: var(--color-blue-0);
+  --tab-group-color-purple: var(--color-purple-70);
+  --tab-group-color-purple-invert: var(--color-purple-20);
+  --tab-group-color-purple-pale: var(--color-purple-0);
+  --tab-group-color-cyan: var(--color-cyan-70);
+  --tab-group-color-cyan-invert: var(--color-cyan-20);
+  --tab-group-color-cyan-pale: var(--color-cyan-0);
+  --tab-group-color-orange: var(--color-orange-70);
+  --tab-group-color-orange-invert: var(--color-orange-20);
+  --tab-group-color-orange-pale: var(--color-orange-0);
+  --tab-group-color-yellow: var(--color-yellow-70);
+  --tab-group-color-yellow-invert: var(--color-yellow-20);
+  --tab-group-color-yellow-pale: var(--color-yellow-0);
+  --tab-group-color-pink: var(--color-pink-70);
+  --tab-group-color-pink-invert: var(--color-pink-20);
+  --tab-group-color-pink-pale: var(--color-pink-0);
+  --tab-group-color-green: var(--color-green-70);
+  --tab-group-color-green-invert: var(--color-green-20);
+  --tab-group-color-green-pale: var(--color-green-0);
+  --tab-group-color-red: var(--color-red-70);
+  --tab-group-color-red-invert: var(--color-red-20);
+  --tab-group-color-red-pale: var(--color-red-0);
+  --tab-group-color-grey: #5E6A77;
+  --tab-group-color-grey-invert: #99A6B4;
+  --tab-group-color-grey-pale: #F2F9FF;
+  --tab-group-label-text-dark: var(--color-gray-100);
+
+
+  --bg-color: var(--grey-10);
+  --text-color: var(--grey-90);
+
+
+  /* simulating deprecated CSS system colors */
+  --ThreeDShadow: color-mix(in srgb, ButtonText 30%, ButtonFace);
+  --ThreeDHighlight: color-mix(in srgb, ButtonText 5%, ButtonFace);
+  --AppWorkspace: color-mix(in srgb, CanvasText 20%, Canvas);
+  --MenuText: color-mix(in srgb, ButtonText 85%, ButtonFace);
+  --Menu: ButtonFace;
+}
+
+:link {
+  color: var(--in-content-link-color);
+
+  &:hover {
+    color: var(--in-content-link-color-hover);
+  }
+  &:active {
+    color: var(--in-content-link-color-active);
+  }
+}
+:visited {
+  color: var(--in-content-link-color-visited);
+
+  &:hover {
+    color: var(--in-content-link-color-hover);
+  }
+  &:active {
+    color: var(--in-content-link-color-active);
+  }
+}
+
+textarea,
+input {
+  background: var(--in-content-box-background);
+  border: thin solid var(--in-content-box-border-color-mixed);
+  color: var(--in-content-text-color);
+
+  &:hover {
+    border-color: var(--in-content-border-hover-mixed);
+  }
+  &:focus {
+    border-color: var(--in-content-border-focus);
+    box-shadow: 0 0 0 1px var(--in-content-border-active),
+                0 0 0 4px var(--in-content-border-active-shadow);
+  }
+}
+
+button,
+select {
+  background: var(--in-content-button-background-mixed);
+  border: 0 none transparent;
+  color: var(--in-content-text-color);
+
+  &:hover {
+    background: var(--in-content-button-background-hover-mixed);
+  }
+  &:focus {
+    background: var(--in-content-button-background-active-mixed);
+    box-shadow: 0 0 0 1px var(--in-content-border-active),
+                0 0 0 4px var(--in-content-border-active-shadow);
+  }
+}
+
+option {
+  background: transparent /* var(--in-content-button-background-mixed) */;
+  color: var(--text-color);
+
+  &:active,
+  &:focus {
+    background: var(--in-content-item-selected);
+  }
+  &:hover {
+    background: var(--in-content-item-hover-mixed);
+  }
+}
+
+fieldset,
+hr {
+  border: thin solid var(--in-content-box-border-color-mixed);
+}
+
+hr {
+  border-width: thin 0 0 0;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root.sidebar,
+  :root:not(.sidebar) {
+    /* https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/themes/shared/in-content/common.inc.css */
+    --in-content-page-background: #2A2A2E /* rgb(42, 42, 46) */;
+    --in-content-page-color: rgb(249, 249, 250);
+    --in-content-text-color: var(--in-content-page-color);
+    --in-content-deemphasized-text: var(--grey-40);
+    --in-content-box-background: #202023;
+    --in-content-box-background-hover: color-mix(in srgb, rgba(249,249,250,0.15) 100%, var(--in-content-page-background));
+    --in-content-box-background-active: color-mix(in srgb, rgba(249,249,250,0.2) 100%, var(--in-content-page-background));
+    --in-content-box-background-odd: rgba(249,249,250,0.05);
+    --in-content-box-info-background: rgba(249,249,250,0.15);
+
+    --in-content-border-color: rgba(249,249,250,0.2);
+    --in-content-border-color-mixed: color-mix(in srgb, var(--in-content-border-color) 100%, var(--in-content-page-background));
+    --in-content-border-hover: rgba(249,249,250,0.3);
+    --in-content-border-hover-mixed: color-mix(in srgb, var(--in-content-border-hover) 100%, var(--in-content-page-background));
+    --in-content-box-border-color: rgba(249,249,250,0.2);
+    --in-content-box-border-color-mixed: color-mix(in srgb, var(--in-content-box-border-color) 100%, var(--in-content-page-background));
+
+    --in-content-button-background: rgba(249,249,250,0.1);
+    --in-content-button-background-mixed: color-mix(in srgb, var(--in-content-button-background) 100%, var(--in-content-page-background));
+    --in-content-button-background-hover: rgba(249,249,250,0.15);
+    --in-content-button-background-hover-mixed: color-mix(in srgb, var(--in-content-button-background-hover) 100%, var(--in-content-page-background));
+    --in-content-button-background-active: rgba(249,249,250,0.2);
+    --in-content-button-background-active-mixed: color-mix(in srgb, var(--in-content-button-background-active) 100%, var(--in-content-page-background));
+
+    --in-content-link-color: var(--blue-40);
+    --in-content-link-color-hover: var(--blue-50);
+    --in-content-link-color-active: var(--blue-60);
+
+    --focus-outline-color: #00DDFF; /* https://searchfox.org/mozilla-central/rev/f60e5304300b286376664b25143cdc6b38a0f0d7/browser/themes/shared/browser-shared.css#129 */
+
+    --bg-color: var(--in-content-page-background);
+    --text-color: var(--in-content-text-color);
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/background-connection.js b/waterfox/browser/components/sidebar/sidebar/background-connection.js
new file mode 100644
index 0000000000000..ec30294f57ca0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/background-connection.js
@@ -0,0 +1,170 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  mapAndFilterUniq,
+  configs
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+function log(...args) {
+  internalLogger('sidebar/background-connection', ...args);
+}
+
+export const onMessage = new EventListenerManager();
+
+let mConnectionPort = null;
+let mHeartbeatTimer = null;
+
+export function connect() {
+  if (mConnectionPort)
+    return;
+  const type = /windowId=([1-9][0-9]*)/i.test(location.search) ? 'unknown' : 'sidebar';
+  mConnectionPort = browser.runtime.connect({
+    name: `${Constants.kCOMMAND_REQUEST_CONNECT_PREFIX}${TabsStore.getCurrentWindowId()}:${type}`
+  });
+  mConnectionPort.onMessage.addListener(onConnectionMessage);
+  mConnectionPort.onDisconnect.addListener(() => {
+    log(`Disconnected accidentally: try to reconnect.`);
+    location.reload();
+  });
+  if (mHeartbeatTimer)
+    clearInterval(mHeartbeatTimer);
+  mHeartbeatTimer = setInterval(() => {
+    sendMessage({
+      type: Constants.kCONNECTION_HEARTBEAT
+    });
+  }, configs.heartbeatInterval);
+}
+
+let mPromisedStartedResolver;
+let mPromisedStarted = new Promise((resolve, _reject) => {
+  mPromisedStartedResolver = resolve;
+});
+
+export function start() {
+  if (!mPromisedStartedResolver)
+    return;
+  mPromisedStartedResolver();
+  mPromisedStartedResolver = undefined;
+  mPromisedStarted = undefined;
+}
+
+export const counts = {};
+
+let mReservedMessages = [];
+let mOnFrame;
+
+export function sendMessage(message) {
+  if (configs.loggingConnectionMessages) {
+    counts[message.type] = counts[message.type] || 0;
+    counts[message.type]++;
+  }
+  // We should not send messages immediately, instead we should throttle
+  // it and bulk-send multiple messages, for better user experience.
+  // Sending too much messages in one event loop may block everything
+  // and makes Firefox like frozen.
+  //
+  // Heartbeats, however, are the one exception. They run constantly, even
+  // in an idle browser. Consequently, they should be computationally cheap.
+  // Moreover, they run in a predictable pattern with plenty of time in between
+  // so we can be fairly certain they won't cause the US to freeze.
+  //
+  // Processing an individual heartbeat message in the general batch message
+  // flow is inefficient, boxing the single message into an array and using
+  // iterators to process the list unnecessarily.
+  if (message.type == Constants.kCONNECTION_HEARTBEAT) {
+    mConnectionPort.postMessage(message);
+    return;
+  }
+
+  mReservedMessages.push(message);
+  if (!mOnFrame) {
+    mOnFrame = () => {
+      mOnFrame = null;
+      const messages = mReservedMessages;
+      mReservedMessages = [];
+      mConnectionPort.postMessage(messages);
+      if (configs.debug) {
+        const types = mapAndFilterUniq(messages,
+                                       message => message.type || undefined).join(', ');
+        log(`${messages.length} messages sent (${types}):`, messages);
+      }
+    };
+    // Because sidebar is always visible, we may not need to avoid using
+    // window.requestAnimationFrame.
+    window.requestAnimationFrame(mOnFrame);
+  }
+}
+
+async function onConnectionMessage(message) {
+  if (Array.isArray(message)) {
+    for (const oneMessage of message) {
+      onConnectionMessage(oneMessage);
+    }
+    return;
+  }
+
+  switch (message.type) {
+    case 'echo': // for testing
+      mConnectionPort.postMessage(message);
+      break;
+
+    case 'external':
+      TSTAPI.onMessageExternal.dispatch(message.message, message.sender);
+      break;
+
+    default:
+      if (mPromisedStarted)
+        await mPromisedStarted;
+      onMessage.dispatch(message);
+      break;
+  }
+}
+
+
+// Mechanism to apply only most recently notified message.
+// See also: https://github.com/piroor/treestyletab/issues/2568#issuecomment-657188062
+
+const mBufferedMessages = new Map();
+
+export function handleBufferedMessage(message, key) {
+  const bufferKey = `${message.type}:${key}`;
+  const hasLastMessage = mBufferedMessages.has(bufferKey);
+  mBufferedMessages.set(bufferKey, message);
+  return hasLastMessage;
+}
+
+export function fetchBufferedMessage(type, key) {
+  const bufferKey = `${type}:${key}`;
+  const message = mBufferedMessages.get(bufferKey);
+  mBufferedMessages.delete(bufferKey);
+  return message;
+}
+
+
+//===================================================================
+// Logging
+//===================================================================
+
+browser.runtime.onMessage.addListener((message, _sender) => {
+  if (!message ||
+      typeof message != 'object' ||
+      message.type != Constants.kCOMMAND_REQUEST_CONNECTION_MESSAGE_LOGS)
+    return;
+
+  browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_RESPONSE_CONNECTION_MESSAGE_LOGS,
+    logs: JSON.parse(JSON.stringify(counts)),
+    windowId: TabsStore.getCurrentWindowId()
+  });
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/cache-storage.js b/waterfox/browser/components/sidebar/sidebar/cache-storage.js
new file mode 100644
index 0000000000000..997a5dd1c0303
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/cache-storage.js
@@ -0,0 +1,201 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import { Tab } from '/common/TreeItem.js';
+
+const DB_NAME = 'SidebarStorage';
+const DB_VERSION = 1;
+const EXPIRATION_TIME_IN_MSEC = 7 * 24 * 60 * 60 * 1000; // 7 days
+
+export const PREVIEW = 'previewCaches';
+
+let mOpenedDB;
+
+async function openDB() {
+  if (mOpenedDB)
+    return mOpenedDB;
+  return new Promise((resolve, _reject) => {
+    const request = indexedDB.open(DB_NAME, DB_VERSION);
+
+    request.onerror = () => {
+      // This can fail if this is in a private window.
+      // See: https://github.com/piroor/treestyletab/issues/3387
+      //reject(new Error('Failed to open database'));
+      resolve(null);
+    };
+
+    request.onsuccess = () => {
+      const db = request.result;
+      mOpenedDB = db;
+      resolve(db);
+    };
+
+    request.onupgradeneeded = (event) => {
+      const db = event.target.result;
+      if (event.oldVersion < DB_VERSION) {
+        try {
+          db.deleteObjectStore(PREVIEW);
+        }
+        catch(_error) {
+        }
+
+        const previewCacheStore = db.createObjectStore(PREVIEW, { keyPath: 'tabId', unique: true });
+        previewCacheStore.createIndex('timestamp', 'timestamp');
+      }
+    };
+  });
+}
+
+export async function setValue({ tabId, value, store } = {}) {
+  const [db, uniqueId] = await Promise.all([
+    openDB(),
+    Tab.get(tabId)?.$TST.promisedUniqueId,
+  ]);
+  if (!db || !uniqueId || !uniqueId.id)
+    return;
+
+  reserveToExpireOldEntries();
+
+  const timestamp = Date.now();
+  try {
+    const transaction = db.transaction([store], 'readwrite');
+    const cacheStore = transaction.objectStore(store);
+
+    cacheStore.put({
+      tabId: uniqueId.id,
+      value,
+      timestamp,
+    });
+
+    transaction.oncomplete = () => {
+      //db.close();
+      tabId = undefined;
+      value = undefined;
+      store = undefined;
+    };
+  }
+  catch(error) {
+    console.error(`Failed to store cached value for ${uniqueId.id} in the store ${store}`, error);
+  }
+}
+
+export async function deleteValue({ tabId, store } = {}) {
+  const [db, uniqueId] = await Promise.all([
+    openDB(),
+    Tab.get(tabId)?.$TST.promisedUniqueId,
+  ]);
+  if (!db || !uniqueId || !uniqueId.id)
+    return;
+
+  reserveToExpireOldEntries();
+
+  try {
+    const transaction = db.transaction([store], 'readwrite');
+    const cacheStore = transaction.objectStore(store);
+    cacheStore.delete(uniqueId.id);
+    transaction.oncomplete = () => {
+      //db.close();
+      tabId = undefined;
+      store = undefined;
+    };
+  }
+  catch(error) {
+    console.error(`Failed to delete cached value for ${uniqueId.id} in the store ${store}`, error);
+  }
+}
+
+export async function getValue({ tabId, store } = {}) {
+  return new Promise(async (resolve, _reject) => {
+    const [db, uniqueId] = await Promise.all([
+      openDB(),
+      Tab.get(tabId)?.$TST.promisedUniqueId,
+    ]);
+    if (!db || !uniqueId || !uniqueId.id) {
+      resolve(null);
+      return;
+    }
+
+    const timestamp = Date.now();
+    try {
+      const transaction = db.transaction([store], 'readwrite');
+      const cacheStore = transaction.objectStore(store);
+      const cacheRequest = cacheStore.get(uniqueId.id);
+
+      cacheRequest.onsuccess = () => {
+        const cache = cacheRequest.result;
+        if (!cache) {
+          resolve(null);
+          return;
+        }
+        // IndexedDB does not support partial update, so
+        // we need to put all properties not only timestamp.
+        cacheStore.put({
+          tabId: uniqueId.id,
+          value: cache.value,
+          timestamp,
+        });
+        resolve(cache.value);
+        cache.tabId = undefined;
+        cache.value = undefined;
+      };
+
+      transaction.oncomplete = () => {
+        //db.close();
+        tabId = undefined;
+        store = undefined;
+      };
+    }
+    catch(error) {
+      console.error('Failed to get from cached value:', error);
+      resolve(null);
+    }
+  });
+}
+
+async function reserveToExpireOldEntries() {
+  if (reserveToExpireOldEntries.reservedExpiration)
+    clearTimeout(reserveToExpireOldEntries.reservedExpiration);
+  reserveToExpireOldEntries.reservedExpiration = setTimeout(() => {
+    reserveToExpireOldEntries.reservedExpiration = null;
+    expireOldEntries();
+  }, 500);
+}
+
+async function expireOldEntries() {
+  return new Promise(async (resolve, reject) => {
+    const db = await openDB();
+    if (!db) {
+      resolve();
+      return;
+    }
+
+    try {
+      const transaction = db.transaction([PREVIEW], 'readwrite');
+      const previewCacheStore = transaction.objectStore(PREVIEW);
+      const previewCacheIndex = previewCacheStore.index('timestamp');
+      const expirationTimestamp = Date.now() - EXPIRATION_TIME_IN_MSEC;
+      const previewCacheRequest = previewCacheIndex.openCursor(IDBKeyRange.upperBound(expirationTimestamp));
+      previewCacheRequest.onsuccess = (event) => {
+        const cursor = event.target.result;
+        if (!cursor)
+          return;
+        const key = cursor.primaryKey;
+        cursor.continue();
+        previewCacheStore.delete(key);
+      };
+
+      transaction.oncomplete = () => {
+        //db.close();
+        resolve();
+      };
+    }
+    catch(error) {
+      console.error('Failed to expire old entries:', error);
+      reject(error);
+    }
+  });
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/collapse-expand.js b/waterfox/browser/components/sidebar/sidebar/collapse-expand.js
new file mode 100644
index 0000000000000..8fbb2a6e9caae
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/collapse-expand.js
@@ -0,0 +1,259 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2024
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  configs,
+  shouldApplyAnimation,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+
+import { TabInvalidationTarget } from './components/TreeItemElement.js';
+
+function log(...args) {
+  internalLogger('sidebar/collapse-expand', ...args);
+}
+
+export const onUpdating = new EventListenerManager();
+export const onUpdated = new EventListenerManager();
+export const onReadyToExpand = new EventListenerManager();
+
+export async function setCollapsed(tab, info = {}) {
+  log('setCollapsed ', tab.id, info);
+  if (!TabsStore.ensureLivingItem(tab)) // do nothing for closed tab!
+    return;
+
+  const changed = (
+    info.collapsed != tab.$TST.collapsed ||
+    info.collapsed != tab.$TST.collapsedCompletely
+  );
+
+  tab.$TST.shouldExpandLater = false; // clear flag
+
+  if (info.collapsed) {
+    tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED);
+    TabsStore.removeVisibleTab(tab);
+    TabsStore.removeExpandedTab(tab);
+  }
+  else {
+    if (tab.$TST.states.has(Constants.kTAB_STATE_COLLAPSED_DONE)) {
+      tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED_DONE);
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      await onReadyToExpand.dispatch(tab);
+    }
+    tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED);
+    TabsStore.addVisibleTab(tab);
+    TabsStore.addExpandedTab(tab);
+  }
+
+  if (tab.$TST.onEndCollapseExpandAnimation) {
+    clearTimeout(tab.$TST.onEndCollapseExpandAnimation.timeout);
+    delete tab.$TST.onEndCollapseExpandAnimation;
+  }
+
+  if (tab.status == 'loading')
+    tab.$TST.addState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+
+  const manager = tab.$TST.collapsedStateChangedManager || new EventListenerManager();
+
+  if (tab.$TST.updatingCollapsedStateCanceller) {
+    tab.$TST.updatingCollapsedStateCanceller(tab.$TST.collapsed);
+    delete tab.$TST.updatingCollapsedStateCanceller;
+  }
+
+  let cancelled = false;
+  const canceller = (aNewToBeCollapsed) => {
+    cancelled = true;
+    if (aNewToBeCollapsed != tab.$TST.collapsed) {
+      tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSING);
+      tab.$TST.removeState(Constants.kTAB_STATE_EXPANDING);
+    }
+  };
+  const onCompleted = (tab, info = {}) => {
+    manager.removeListener(onCompleted);
+    if (cancelled ||
+        !TabsStore.ensureLivingItem(tab)) // do nothing for closed tab!
+      return;
+
+    if (shouldApplyAnimation() &&
+        !info.justNow &&
+        configs.collapseDuration > 0 &&
+        changed)
+      return; // force completion is required only for non-animation case
+
+    //log('=> skip animation');
+    if (tab.$TST.collapsed) {
+      tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSING);
+      tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED_DONE);
+    }
+    else {
+      tab.$TST.removeState(Constants.kTAB_STATE_EXPANDING);
+    }
+
+    TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+    onUpdated.dispatch(tab, {
+      collapsed: tab.$TST.collapsed,
+      anchor:    info.anchor,
+      last:      info.last
+    });
+  };
+  manager.addListener(onCompleted);
+
+  if (!shouldApplyAnimation() ||
+      info.justNow ||
+      configs.collapseDuration < 1 ||
+      !changed) {
+    //log('=> skip animation');
+    onCompleted(tab, info);
+    return;
+  }
+
+  tab.$TST.updatingCollapsedStateCanceller = canceller;
+
+  if (tab.$TST.collapsed) {
+    tab.$TST.addState(Constants.kTAB_STATE_COLLAPSING);
+  }
+  else {
+    tab.$TST.addState(Constants.kTAB_STATE_EXPANDING);
+    tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSED_DONE);
+  }
+
+  TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+  onUpdated.dispatch(tab, { collapsed: info.collapsed });
+
+  const onCanceled = () => {
+    manager.removeListener(onCompleted);
+  };
+
+  window.requestAnimationFrame(() => {
+    if (cancelled ||
+        !TabsStore.ensureLivingItem(tab)) { // it was removed while waiting
+      onCanceled();
+      return;
+    }
+
+    //log('start animation for ', dumpTab(tab));
+    onUpdating.dispatch(tab, {
+      collapsed: tab.$TST.collapsed,
+      anchor:    info.anchor,
+      last:      info.last
+    });
+
+    tab.$TST.onEndCollapseExpandAnimation = (() => {
+      if (cancelled) {
+        onCanceled();
+        return;
+      }
+
+      //log('=> finish animation for ', dumpTab(tab));
+      tab.$TST.removeState(Constants.kTAB_STATE_COLLAPSING);
+      tab.$TST.removeState(Constants.kTAB_STATE_EXPANDING);
+
+      // The collapsed state of the tab can be changed by different trigger,
+      // so we must respect the actual status of the tab, instead of the
+      // "expected status" given via arguments.
+      if (tab.$TST.collapsed)
+        tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED_DONE);
+
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      onUpdated.dispatch(tab, {
+        collapsed: tab.$TST.collapsed
+      });
+    });
+    tab.$TST.onEndCollapseExpandAnimation.timeout = setTimeout(() => {
+      if (cancelled ||
+          !TabsStore.ensureLivingItem(tab) ||
+          !tab.$TST.onEndCollapseExpandAnimation) {
+        onCanceled();
+        return;
+      }
+      delete tab.$TST.onEndCollapseExpandAnimation.timeout;
+      tab.$TST.onEndCollapseExpandAnimation();
+      delete tab.$TST.onEndCollapseExpandAnimation;
+    }, configs.collapseDuration);
+  });
+}
+
+const BUFFER_KEY_PREFIX = 'collapse-expand-';
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.$TST.toggleState(Constants.kTAB_STATE_SUBTREE_COLLAPSED, lastMessage.collapsed);
+      tab.$TST.invalidateElement(TabInvalidationTarget.Twisty | TabInvalidationTarget.Tooltip);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_COLLAPSED_STATE_CHANGED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      if (tab.$TST.collapsedOnCreated) { // it may be already expanded by others!
+        if (!tab.$TST.collapsed) // expanded by someone, so clear the flag.
+          tab.$TST.collapsedOnCreated = false;
+
+        // Unexpectedly kept as collapsed case may happen when only "collapsed"
+        // state was applied by broadcasting, so we clear it for now
+        if (tab.$TST.states.has(Constants.kTAB_STATE_EXPANDING) ||
+            !tab.$TST.states.has(Constants.kTAB_STATE_COLLAPSED_DONE))
+          return;
+        if (!tab.$TST.collapsed) {
+          tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED_DONE);
+          tab.$TST.addState(Constants.kTAB_STATE_COLLAPSED);
+          TabsStore.removeVisibleTab(tab);
+          TabsStore.removeExpandedTab(tab);
+        }
+      }
+      setCollapsed(tab, {
+        collapsed: lastMessage.collapsed,
+        justNow:   lastMessage.justNow,
+        anchor:    Tab.get(lastMessage.anchorId),
+        last:      lastMessage.last
+      });
+    }; break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TabCloseBoxElement.js b/waterfox/browser/components/sidebar/sidebar/components/TabCloseBoxElement.js
new file mode 100644
index 0000000000000..4d55bf8f26e61
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TabCloseBoxElement.js
@@ -0,0 +1,93 @@
+/*
+# 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/.
+*/
+
+const NORMAL_TOOLTIP        = 'tab_closebox_tab_tooltip';
+const MULTISELECTED_TOOLTIP = 'tab_closebox_tab_tooltip_multiselected';
+const TREE_TOOLTIP          = 'tab_closebox_tree_tooltip';
+
+export const kTAB_CLOSE_BOX_ELEMENT_NAME = 'tab-closebox';
+
+const kTAB_CLOSE_BOX_CLASS_NAME = 'closebox';
+
+export class TabCloseBoxElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTAB_CLOSE_BOX_ELEMENT_NAME, TabCloseBoxElement);
+  }
+
+  constructor() {
+    super();
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this._reservedUpdate = null;
+
+    this.initialized = false;
+  }
+
+  connectedCallback() {
+    if (this.initialized) {
+      this.invalidate();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //  * `browser.i18n.getMessage()` might be a costly operation.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(kTAB_CLOSE_BOX_CLASS_NAME);
+
+    this.setAttribute('role', 'button');
+    //this.setAttribute('tabindex', '0');
+
+    this.invalidate();
+    this.setAttribute('draggable', true); // this is required to cancel click by dragging
+
+    this.initialized = true;
+  }
+
+  disconnectedCallback() {
+    if (this._reservedUpdate) {
+      this.removeEventListener('mouseover', this._reservedUpdate);
+      this._reservedUpdate = null;
+    }
+  }
+
+  invalidate() {
+    if (this._reservedUpdate)
+      return;
+
+    this._reservedUpdate = () => {
+      this._reservedUpdate = null;
+      this._updateTooltip();
+    };
+    this.addEventListener('mouseover', this._reservedUpdate, { once: true });
+  }
+
+  _updateTooltip() {
+    const tab = this.owner;
+    if (!tab || !tab.$TST)
+      return;
+
+    let key;
+    if (tab.$TST.multiselected)
+      key = MULTISELECTED_TOOLTIP;
+    else if (tab.$TST.hasChild && tab.$TST.subtreeCollapsed)
+      key = TREE_TOOLTIP;
+    else
+      key = NORMAL_TOOLTIP;
+
+    const tooltip = browser.i18n.getMessage(key);
+    this.setAttribute('title', tooltip);
+  }
+
+  makeAccessible() {
+    this.setAttribute('aria-label', browser.i18n.getMessage('tab_closebox_aria_label', [this.owner.id]));
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TabCounterElement.js b/waterfox/browser/components/sidebar/sidebar/components/TabCounterElement.js
new file mode 100644
index 0000000000000..cd8670ca33d3a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TabCounterElement.js
@@ -0,0 +1,60 @@
+/*
+# 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/.
+*/
+
+import {
+  configs
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+
+export const kTAB_COUNTER_ELEMENT_NAME = 'tab-counter';
+
+const kTAB_COUNTER_CLASS_NAME = 'counter';
+
+export class TabCounterElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTAB_COUNTER_ELEMENT_NAME, TabCounterElement);
+  }
+
+  constructor() {
+    super();
+
+    this.initialized = false;
+  }
+
+  connectedCallback() {
+    if (this.initialized) {
+      this.update();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //  * `browser.i18n.getMessage()` might be a costly operation.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(kTAB_COUNTER_CLASS_NAME);
+
+    this.update();
+
+    this.initialized = true;
+  }
+
+  update() {
+    const tab = this.owner;
+    if (!tab || !tab.$TST)
+      return;
+
+    const descendants = tab.$TST.descendants;
+    let count = descendants.length;
+    if (configs.counterRole == Constants.kCOUNTER_ROLE_ALL_TABS)
+      count += 1;
+    this.textContent = count;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TabFaviconElement.js b/waterfox/browser/components/sidebar/sidebar/components/TabFaviconElement.js
new file mode 100644
index 0000000000000..979abba59af06
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TabFaviconElement.js
@@ -0,0 +1,109 @@
+/*
+# 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/.
+*/
+
+import * as Constants from '/common/constants.js';
+
+export const kTAB_FAVICON_ELEMENT_NAME = 'tab-favicon';
+
+const KFAVICON_CLASS_NAME = 'favicon';
+
+const kATTR_NAME_SRC = 'src';
+
+export class TabFaviconElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTAB_FAVICON_ELEMENT_NAME, TabFaviconElement);
+  }
+
+  static get observedAttributes() {
+    return [kATTR_NAME_SRC];
+  }
+
+  constructor() {
+    super();
+  }
+
+  connectedCallback() {
+    if (this.initialized) {
+      this._applySrc();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //
+    // FIXME:
+    //  Ideally, these descendants should be in shadow tree. Thus I don't change these element to custom elements.
+    //  However, I hesitate to do it at this moment by these reasons.
+    //  If we move these to shadow tree,
+    //    * We need some rewrite our style.
+    //      * This includes that we need to move almost CSS code into this file as a string.
+    //    * I'm not sure about that whether we should require [CSS Shadow Parts](https://bugzilla.mozilla.org/show_bug.cgi?id=1559074).
+    //      * I suspect we can resolve almost problems by using CSS Custom Properties.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(KFAVICON_CLASS_NAME);
+
+    this.insertAdjacentHTML('beforeend', `
+      <img class="${Constants.kFAVICON_IMAGE}"
+           src="${this.getAttribute(kATTR_NAME_SRC)}"/>
+      <span class="${Constants.kFAVICON_BUILTIN} ${Constants.kFAVICON_DEFAULT /* just for backward compatibility, and this should be removed from future versions */}"></span>
+      <span class="${Constants.kFAVICON_SHARING_STATE /* for faviconized tabs */}"></span>
+      <span class="${Constants.kFAVICON_STICKY_STATE}"></span>
+      <span class="${Constants.kTHROBBER}"></span>
+    `.trim().replace(/>\s+</g, '><'));
+
+    this._applySrc();
+  }
+
+  get initialized() {
+    return !!this._imgElement;
+  }
+
+  attributeChangedCallback(name, oldValue, newValue, _namespace) {
+    if (oldValue === newValue) {
+      return;
+    }
+
+    switch (name) {
+      case kATTR_NAME_SRC:
+        this._applySrc();
+        break;
+
+      default:
+        throw new RangeError(`Handling \`${name}\` attribute has not been defined.`);
+    }
+  }
+
+  _applySrc() {
+    const img = this._imgElement;
+    if (!img)
+      return;
+    const url = this.src;
+    if (url)
+      img.setAttribute('src', url);
+    else
+      img.removeAttribute('src');
+  }
+
+  get _imgElement() {
+    return this.firstElementChild;
+  }
+
+  // These setter/getter is required by webextensions-lib-tab-favicon-helper
+  get src() {
+    return this.getAttribute(kATTR_NAME_SRC);
+  }
+  set src(value) {
+    if (value)
+      this.setAttribute(kATTR_NAME_SRC, value);
+    else
+      this.removeAttribute(kATTR_NAME_SRC);
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TabSoundButtonElement.js b/waterfox/browser/components/sidebar/sidebar/components/TabSoundButtonElement.js
new file mode 100644
index 0000000000000..adc82b71d32ea
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TabSoundButtonElement.js
@@ -0,0 +1,89 @@
+/*
+# 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/.
+*/
+
+export const kTAB_SOUND_BUTTON_ELEMENT_NAME = 'tab-sound-button';
+
+const kTAB_SOUND_BUTTON_CLASS_NAME = 'sound-button';
+
+export class TabSoundButtonElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTAB_SOUND_BUTTON_ELEMENT_NAME, TabSoundButtonElement);
+  }
+
+  constructor() {
+    super();
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this._reservedUpdate = null;
+
+    this.initialized = false;
+  }
+
+  connectedCallback() {
+    if (this.initialized) {
+      this.invalidate();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //  * `browser.i18n.getMessage()` might be a costly operation.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(kTAB_SOUND_BUTTON_CLASS_NAME);
+
+    this.setAttribute('role', 'button');
+    //this.setAttribute('tabindex', '0');
+
+    this.invalidate();
+
+    this.initialized = true;
+  }
+
+  disconnectedCallback() {
+    if (this._reservedUpdate) {
+      this.removeEventListener('mouseover', this._reservedUpdate);
+      this._reservedUpdate = null;
+    }
+  }
+
+  invalidate() {
+    if (this._reservedUpdate)
+      return;
+
+    this._reservedUpdate = () => {
+      this._reservedUpdate = null;
+      this._updateTooltip();
+    };
+    this.addEventListener('mouseover', this._reservedUpdate, { once: true });
+  }
+
+  _updateTooltip() {
+    const tab = this.owner;
+    if (!tab || !tab.$TST)
+      return;
+
+    const suffix = tab.$TST.multiselected ? '_multiselected' : '' ;
+    let key;
+    if (tab.$TST.maybeAutoplayBlocked)
+      key = `tab_soundButton_autoplayBlocked_tooltip${suffix}`;
+    else if (tab.$TST.maybeMuted)
+      key = `tab_soundButton_muted_tooltip${suffix}`;
+    else
+      key = `tab_soundButton_playing_tooltip${suffix}`;
+
+    const tooltip = browser.i18n.getMessage(key);
+    this.setAttribute('title', tooltip);
+  }
+
+  makeAccessible() {
+    this.setAttribute('aria-label', browser.i18n.getMessage('tab_soundButton_aria_label', [this.owner.id]));
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TabTwistyElement.js b/waterfox/browser/components/sidebar/sidebar/components/TabTwistyElement.js
new file mode 100644
index 0000000000000..04bfa4562335e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TabTwistyElement.js
@@ -0,0 +1,87 @@
+/*
+# 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/.
+*/
+
+const EXPANDED_TOOLTIP  = 'tab_twisty_expanded_tooltip';
+const COLLAPSED_TOOLTIP = 'tab_twisty_collapsed_tooltip';
+
+export const kTAB_TWISTY_ELEMENT_NAME = 'tab-twisty';
+
+const kTAB_TWISTY_CLASS_NAME = 'twisty';
+
+export class TabTwistyElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTAB_TWISTY_ELEMENT_NAME, TabTwistyElement);
+  }
+
+  constructor() {
+    super();
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this._reservedUpdate = null;
+
+    this.initialized = false;
+  }
+
+  connectedCallback() {
+    if (this.initialized) {
+      this.invalidate();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //  * `browser.i18n.getMessage()` might be a costly operation.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(kTAB_TWISTY_CLASS_NAME);
+
+    this.setAttribute('role', 'button');
+    //this.setAttribute('tabindex', '0');
+
+    this.invalidate();
+
+    this.initialized = true;
+  }
+
+  disconnectedCallback() {
+    if (this._reservedUpdate) {
+      this.removeEventListener('mouseover', this._reservedUpdate);
+      this._reservedUpdate = null;
+    }
+  }
+
+  invalidate() {
+    if (this._reservedUpdate)
+      return;
+
+    this._reservedUpdate = () => {
+      this._reservedUpdate = null;
+      this._updateTooltip();
+    };
+    this.addEventListener('mouseover', this._reservedUpdate, { once: true });
+  }
+
+  _updateTooltip() {
+    const tab = this.owner;
+
+    let key;
+    if (tab?.$TST.subtreeCollapsed)
+      key = COLLAPSED_TOOLTIP;
+    else
+      key = EXPANDED_TOOLTIP;
+
+    const tooltip = browser.i18n.getMessage(key);
+    this.setAttribute('title', tooltip);
+  }
+
+  makeAccessible() {
+    this.setAttribute('aria-label', browser.i18n.getMessage('tab_twisty_aria_label', [this.owner.id]));
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TreeItemElement.js b/waterfox/browser/components/sidebar/sidebar/components/TreeItemElement.js
new file mode 100644
index 0000000000000..0a887fb10f9da
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TreeItemElement.js
@@ -0,0 +1,833 @@
+/*
+# 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/.
+*/
+
+import {
+  configs,
+  sanitizeForHTMLText,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import TabFavIconHelper from '/extlib/TabFavIconHelper.js';
+
+import { kTAB_TWISTY_ELEMENT_NAME } from './TabTwistyElement.js';
+import { kTAB_FAVICON_ELEMENT_NAME } from './TabFaviconElement.js';
+import { kTREE_ITEM_LABEL_ELEMENT_NAME } from './TreeItemLabelElement.js';
+import { kTAB_COUNTER_ELEMENT_NAME } from './TabCounterElement.js';
+import { kTAB_SOUND_BUTTON_ELEMENT_NAME } from './TabSoundButtonElement.js';
+import { kTAB_CLOSE_BOX_ELEMENT_NAME } from './TabCloseBoxElement.js';
+
+export const kTREE_ITEM_ELEMENT_NAME = 'tab-item';
+export const kTREE_ITEM_SUBSTANCE_ELEMENT_NAME = 'tab-item-substance';
+
+export const kEVENT_TREE_ITEM_SUBSTANCE_ENTER = 'tab-item-substance-enter';
+export const kEVENT_TREE_ITEM_SUBSTANCE_LEAVE = 'tab-item-substance-leave';
+
+export const TabInvalidationTarget = Object.freeze({
+  Twisty:      1 << 0,
+  SoundButton: 1 << 1,
+  CloseBox:    1 << 2,
+  Tooltip:     1 << 3,
+  Overflow:    1 << 4,
+  All:         1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4,
+});
+
+export const TabUpdateTarget = Object.freeze({
+  Counter:                1 << 0,
+  Overflow:               1 << 1,
+  DescendantsHighlighted: 1 << 2,
+  CollapseExpandState:    1 << 3,
+  TabProperties:          1 << 4,
+  All:                    1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4,
+});
+
+const kTAB_CLASS_NAME = 'tab';
+
+const NATIVE_PROPERTIES = new Set([
+  'active',
+  'attention',
+  'audible',
+  'discarded',
+  'hidden',
+  'highlighted',
+  'pinned'
+]);
+const IGNORE_CLASSES = new Set([
+  'tab',
+  Constants.kTAB_STATE_ANIMATION_READY,
+  Constants.kTAB_STATE_SUBTREE_COLLAPSED
+]);
+
+export class TreeItemElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTREE_ITEM_ELEMENT_NAME, TreeItemElement);
+  }
+
+  constructor() {
+    super();
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this._raw = null;
+    this._reservedUpdateTooltip = null;
+    this.__onMouseOver = null;
+    this.__onMouseEnter = null;
+    this.__onMouseLeave = null;
+    this.__onWindowResize = null;
+    this.__onConfigChange = null;
+  }
+
+  connectedCallback() {
+    this.setAttribute('role', 'option');
+
+    if (this.initialized) {
+      this.initializeContents();
+      this.invalidate(TabInvalidationTarget.All);
+      this.update(TabUpdateTarget.TabProperties);
+      this.applyAttributes();
+      this._initExtraItemsContainers();
+      this._startListening();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //
+    // FIXME:
+    //  Ideally, these descendants should be in shadow tree. Thus I don't change these element to custom elements.
+    //  However, I hesitate to do it at this moment by these reasons.
+    //  If we move these to shadow tree,
+    //    * We need some rewrite our style.
+    //      * This includes that we need to move almost CSS code into this file as a string.
+    //    * I'm not sure about that whether we should require [CSS Shadow Parts](https://bugzilla.mozilla.org/show_bug.cgi?id=1559074).
+    //      * I suspect we can resolve almost problems by using CSS Custom Properties.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(kTAB_CLASS_NAME);
+
+    this.insertAdjacentHTML('beforeend', `
+      <span class="native-tab-group-line"></span>
+      <span class="${Constants.kEXTRA_ITEMS_CONTAINER} indent"></span>
+      <${kTREE_ITEM_SUBSTANCE_ELEMENT_NAME} draggable="true">
+        <span class="${Constants.kBACKGROUND} base"></span>
+        <span class="${Constants.kBACKGROUND}">
+          <span class="${Constants.kBURSTER}"></span>
+        </span>
+        <${kTAB_TWISTY_ELEMENT_NAME}></${kTAB_TWISTY_ELEMENT_NAME}>
+        <span class="ui">
+          <span class="${Constants.kEXTRA_ITEMS_CONTAINER} above"></span>
+          <span class="caption">
+            <${kTAB_FAVICON_ELEMENT_NAME}></${kTAB_FAVICON_ELEMENT_NAME}>
+            <${kTAB_SOUND_BUTTON_ELEMENT_NAME}></${kTAB_SOUND_BUTTON_ELEMENT_NAME}>
+            <${kTREE_ITEM_LABEL_ELEMENT_NAME}></${kTREE_ITEM_LABEL_ELEMENT_NAME}>
+            <${kTAB_COUNTER_ELEMENT_NAME}></${kTAB_COUNTER_ELEMENT_NAME}>
+            <${kTAB_CLOSE_BOX_ELEMENT_NAME}></${kTAB_CLOSE_BOX_ELEMENT_NAME}>
+          </span>
+          <span class="${Constants.kEXTRA_ITEMS_CONTAINER} below"></span>
+          <span class="${Constants.kEXTRA_ITEMS_CONTAINER} behind"></span>
+          <span class="${Constants.kEXTRA_ITEMS_CONTAINER} front"></span>
+        </span>
+        <span class="${Constants.kHIGHLIGHTER}"></span>
+        <span class="${Constants.kCONTEXTUAL_IDENTITY_MARKER}"></span>
+      </${kTREE_ITEM_SUBSTANCE_ELEMENT_NAME}>
+    `.trim().replace(/>\s+</g, '><'));
+
+    this.removeAttribute('draggable');
+
+    this.initializeContents();
+    this.invalidate(TabInvalidationTarget.All);
+    this.update(TabUpdateTarget.TabProperties);
+    this._initExtraItemsContainers();
+    this.applyAttributes();
+    this._startListening();
+  }
+
+  disconnectedCallback() {
+    if (this._reservedUpdateTooltip) {
+      this.removeEventListener('mouseover', this._reservedUpdateTooltip);
+      this._reservedUpdateTooltip = null;
+    }
+    this._endListening();
+    this._raw = null;
+  }
+
+  get initialized() {
+    return !!this.substanceElement;
+  }
+
+  initializeContents() {
+    // This can be called after the tab is removed, so
+    // we need to initialize contents safely.
+    if (this._labelElement) {
+      if (!this._labelElement.owner) {
+        this._labelElement.addOverflowChangeListener(() => {
+          if (!this.$TST ||
+              this.$TST.tab?.pinned)
+            return;
+          this.invalidateTooltip();
+        });
+      }
+      this._labelElement.owner = this;
+    }
+    if (this.twisty) {
+      this.twisty.owner = this;
+      this.twisty.makeAccessible();
+    }
+    if (this._counterElement)
+      this._counterElement.owner = this;
+    if (this._soundButtonElement) {
+      this._soundButtonElement.owner = this;
+      this._soundButtonElement.makeAccessible();
+    }
+    if (this.closeBox) {
+      this.closeBox.owner = this;
+      this.closeBox.makeAccessible();
+    }
+  }
+
+  get type() {
+    return this.getAttribute('type');
+  }
+
+  // Elements restored from cache are initialized without bundled tabs.
+  // Thus we provide abiltiy to get tab and service objects from cached/restored information.
+  get raw() {
+    return this._raw || (
+      this._raw = (this.type == TreeItem.TYPE_GROUP ?
+        TabsStore.tabGroups.get(parseInt(this.getAttribute(Constants.kAPI_NATIVE_TAB_GROUP_ID))) :
+        this.type == TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER ?
+          TabsStore.tabGroups.get(parseInt(this.getAttribute(Constants.kAPI_NATIVE_TAB_GROUP_ID))).$TST.collapsedMembersCounterItem :
+          Tab.get(parseInt(this.getAttribute(Constants.kAPI_TAB_ID)))
+      )
+    );
+  }
+  set raw(value) {
+    return this._raw = value;
+  }
+
+  get tab() { // for backward compatibility
+    return this.raw;
+  }
+  set tab(value) {
+    return this.raw = value;
+  }
+
+  get $TST() {
+    return this._$TST || (this._$TST = this.raw && this.raw.$TST);
+  }
+  set $TST(value) {
+    return this._$TST = value;
+  }
+
+  get substanceElement() {
+    return this.querySelector(kTREE_ITEM_SUBSTANCE_ELEMENT_NAME);
+  }
+
+  get twisty() {
+    return this.querySelector(kTAB_TWISTY_ELEMENT_NAME);
+  }
+
+  get favicon() {
+    return this.querySelector(kTAB_FAVICON_ELEMENT_NAME);
+  }
+
+  get _labelElement() {
+    return this.querySelector(kTREE_ITEM_LABEL_ELEMENT_NAME);
+  }
+
+  get _soundButtonElement() {
+    return this.querySelector(kTAB_SOUND_BUTTON_ELEMENT_NAME);
+  }
+
+  get _counterElement() {
+    return this.querySelector(kTAB_COUNTER_ELEMENT_NAME);
+  }
+
+  get closeBox() {
+    return this.querySelector(kTAB_CLOSE_BOX_ELEMENT_NAME);
+  }
+
+  applyAttributes() {
+    this._labelElement.value = this.dataset.title;
+    this.favIconUrl = this._favIconUrl;
+    this.setAttribute('aria-selected', this.classList.contains(Constants.kTAB_STATE_HIGHLIGHTED) ? 'true' : 'false');
+
+    // for convenience on customization with custom user styles
+    this.substanceElement.setAttribute(Constants.kAPI_TAB_ID, this.getAttribute(Constants.kAPI_TAB_ID));
+    this.substanceElement.setAttribute(Constants.kAPI_WINDOW_ID, this.getAttribute(Constants.kAPI_WINDOW_ID));
+    this._labelElement.setAttribute(Constants.kAPI_TAB_ID, this.getAttribute(Constants.kAPI_TAB_ID));
+    this._labelElement.setAttribute(Constants.kAPI_WINDOW_ID, this.getAttribute(Constants.kAPI_WINDOW_ID));
+
+
+    switch (this.getAttribute('type')) {
+      case TreeItem.TYPE_TAB:
+        if (this.tab) {
+          this.dataset.index =
+            this.substanceElement.dataset.index =
+              this._labelElement.dataset.index = this.tab.index;
+        }
+      case TreeItem.TYPE_GROUP:
+        this.substanceElement.setAttribute('draggable', true);
+        break;
+
+      default:
+        this.substanceElement.removeAttribute('draggable');
+        break;
+    }
+
+    this._labelElement.applyAttributes();
+  }
+
+  invalidate(targets) {
+    if (!this.initialized)
+      return;
+
+    if (targets & TabInvalidationTarget.Twisty)
+      this.twisty?.invalidate();
+
+    if (targets & TabInvalidationTarget.SoundButton)
+      this._soundButtonElement?.invalidate();
+
+    if (targets & TabInvalidationTarget.CloseBox)
+      this.closeBox?.invalidate();
+
+    if (targets & TabInvalidationTarget.Tooltip)
+      this.invalidateTooltip();
+
+    if (targets & TabInvalidationTarget.Overflow) {
+      this._labelElement.invalidateOverflow();
+      this._needToUpdateOverflow = true;
+    }
+  }
+
+  invalidateTooltip() {
+    if (this._reservedUpdateTooltip)
+      return;
+
+    this.useTabPreviewTooltip = false;
+    this.hasCustomTooltip = false;
+    Permissions.isGranted(Permissions.ALL_URLS); // cache last state for the _updateTooltip()
+    this._reservedUpdateTooltip = () => {
+      this._reservedUpdateTooltip = null;
+      this._updateTooltip();
+    };
+    this.addEventListener('mouseover', this._reservedUpdateTooltip, { once: true });
+  }
+
+  update(targets) {
+    if (!this.initialized)
+      return;
+
+    if (targets & TabUpdateTarget.Counter)
+      this._counterElement?.update();
+
+    if (targets & TabUpdateTarget.Overflow)
+      this._updateOverflow();
+
+    if (targets & TabUpdateTarget.DescendantsHighlighted)
+      this._updateDescendantsHighlighted();
+
+    if (targets & TabUpdateTarget.CollapseExpandState)
+      this._updateCollapseExpandState();
+
+    if (targets & TabUpdateTarget.TabProperties)
+      this._updateTabProperties();
+  }
+
+  updateOverflow() {
+    if (this._needToUpdateOverflow ||
+        configs.labelOverflowStyle == 'fade')
+      this._updateOverflow();
+    this.invalidateTooltip();
+  }
+
+  _updateOverflow() {
+    this._needToUpdateOverflow = false;
+    this._labelElement?.updateOverflow();
+  }
+
+  _updateTooltip() {
+    if (!this.$TST) // called before binding on restoration from cache
+      return;
+
+    const raw = this.$TST.raw;
+    const tabElement = raw?.$TST.element;
+    if (!tabElement)
+      return;
+
+    // Priority of tooltip contents and methods
+    // 1. Is the tab preview panel activated by the user? (option)
+    //    * NO => Use legacy tooltip anyway.
+    //      - Set "title" attribute for the legacy tooltip, if the tab is faviconized,
+    //        or the tab has long title with overflow state, or custom tooltip.
+    //      - Otherwise remove "title" attribute to suppress the legacy tooltip.
+    //    * YES => Go ahead.
+    // 2. Can we show tab preview panel in the active tab? (permission)
+    //    * YES => Remove "title" attribute to suppress the legacy tooltip.
+    //             Tooltip will be shown with tab preview panel in the active tab.
+    //    * NO => Go ahead.
+    // 3. Do we have custom tooltip? (for collapsed tree, specified via API, etc.)
+    //    * YES => Set "title" attribute for the legacy tooltip with custom contents.
+    //    * NO => Go ahead for the default tooltip.
+    // 4. Can we show tab preview panel in the sidebar for the default tooltip? (option)
+    //    * YES => Remove "title" attribute to suppress the legacy tooltip.
+    //             The default tooltip will be shown with tab preview panel in the sidebar.
+    //    * NO => Set "title" attribute for the legacy tooltip, if the tab is faviconized,
+    //            or the tab has long title with overflow state.
+
+    const canCaptureTab = Permissions.isGrantedSync(Permissions.ALL_URLS);
+    const canInjectScriptToTab = Permissions.canInjectScriptToTabSync(Tab.getActiveTab(TabsStore.getCurrentWindowId()));
+    this.useTabPreviewTooltip = !!(
+      configs.tabPreviewTooltip &&
+      canCaptureTab &&
+      (((configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_CONTENT) &&
+        canInjectScriptToTab) ||
+       (configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR))
+    );
+
+    let debugTooltip;
+    if (configs.debug) {
+      debugTooltip = `
+${raw.title}
+#${raw.id}
+(${tabElement.className})
+uniqueId = <${this.$TST.uniqueId.id}>
+duplicated = <${!!this.$TST.uniqueId.duplicated}> / <${this.$TST.uniqueId.originalTabId}> / <${this.$TST.uniqueId.originalId}>
+restored = <${!!this.$TST.uniqueId.restored}>
+rawId = ${raw.id}
+windowId = ${raw.windowId}
+index = ${raw.index}
+`.trim();
+      this.$TST.setAttribute('title', debugTooltip);
+      if (!this.useTabPreviewTooltip) {
+        this.tooltip = debugTooltip;
+        this.tooltipHtml = `<pre>${sanitizeForHTMLText(debugTooltip)}</pre>`;
+        return;
+      }
+    }
+
+    this.tooltip                = this.$TST.defaultTooltipText;
+    this.tooltipWithDescendants = this.$TST.tooltipTextWithDescendants;
+    this.tooltipHtml            = this.$TST.tooltipHtml;
+    this.tooltipHtmlWithDescendants = this.$TST.tooltipHtmlWithDescendants;
+
+    const appliedTooltipText = this.appliedTooltipText;
+    this.hasCustomTooltip = (
+      appliedTooltipText !== null &&
+      appliedTooltipText != this.$TST.defaultTooltipText
+    );
+    //console.log('this.useTabPreviewTooltip ', { useTabPreviewTooltip: this.useTabPreviewTooltip, canRunScript, canInjectScriptToTab, hasCustomTooltip: this.hasCustomTooltip });
+
+    const tooltipText = configs.debug ?
+      debugTooltip :
+      (this.useTabPreviewTooltip &&
+       (canInjectScriptToTab ||
+        !(this.hasCustomTooltip && configs.showCollapsedDescendantsByLegacyTooltipOnSidebar))) ?
+        null :
+        appliedTooltipText;
+    if (typeof tooltipText == 'string')
+      this.$TST.setAttribute('title', tooltipText);
+    else
+      this.$TST.removeAttribute('title');
+  }
+
+  get appliedTooltipText() {
+    if (configs.showCollapsedDescendantsByTooltip &&
+        this.$TST.subtreeCollapsed &&
+        this.$TST.hasChild) {
+      return this.tooltipWithDescendants;
+    }
+
+    const highPriorityTooltipText = this.$TST.highPriorityTooltipText;
+    if (typeof highPriorityTooltipText == 'string') {
+      if (highPriorityTooltipText)
+        return highPriorityTooltipText;
+
+      return null;
+    }
+
+    let tooltip = null;
+
+    const raw = this.$TST.raw;
+    if (this.classList.contains('faviconized') ||
+        this.overflow ||
+        this.tooltip != raw.title)
+      tooltip = this.tooltip;
+    else
+      tooltip = null;
+
+    const lowPriorityTooltipText = this.$TST.lowPriorityTooltipText;
+    if (typeof lowPriorityTooltipText == 'string' &&
+        !this.getAttribute('title')) {
+      if (lowPriorityTooltipText)
+        tooltip = lowPriorityTooltipText;
+      else
+        tooltip = null;
+    }
+    return tooltip;
+  }
+
+  get appliedTooltipHtml() {
+    if (configs.showCollapsedDescendantsByTooltip &&
+        this.$TST.subtreeCollapsed &&
+        this.$TST.hasChild) {
+      return this.tooltipHtmlWithDescendants;
+    }
+
+    const highPriorityTooltipText = this.$TST.highPriorityTooltipText;
+    if (typeof highPriorityTooltipText == 'string') {
+      if (highPriorityTooltipText)
+        return sanitizeForHTMLText(highPriorityTooltipText);
+
+      return null;
+    }
+
+    let tooltip = null;
+
+    const raw = this.$TST.raw;
+    if (this.classList.contains('faviconized') ||
+        this.overflow ||
+        this.tooltip != raw.title)
+      tooltip = this.tooltipHtml;
+    else
+      tooltip = null;
+
+    const lowPriorityTooltipText = this.$TST.lowPriorityTooltipText;
+    if (typeof lowPriorityTooltipText == 'string' &&
+        !this.getAttribute('title')) {
+      if (lowPriorityTooltipText)
+        tooltip = sanitizeForHTMLText(lowPriorityTooltipText);
+      else
+        tooltip = null;
+    }
+    return tooltip;
+  }
+
+  _initExtraItemsContainers() {
+    if (!this.extraItemsContainerIndentRoot) {
+      this.extraItemsContainerIndentRoot = this.querySelector(`.${Constants.kEXTRA_ITEMS_CONTAINER}.indent`).attachShadow({ mode: 'open' });
+      this.extraItemsContainerIndentRoot.itemById = new Map();
+    }
+    if (!this.extraItemsContainerBehindRoot) {
+      this.extraItemsContainerBehindRoot = this.querySelector(`.${Constants.kEXTRA_ITEMS_CONTAINER}.behind`).attachShadow({ mode: 'open' });
+      this.extraItemsContainerBehindRoot.itemById = new Map();
+    }
+    if (!this.extraItemsContainerFrontRoot) {
+      this.extraItemsContainerFrontRoot = this.querySelector(`.${Constants.kEXTRA_ITEMS_CONTAINER}.front`).attachShadow({ mode: 'open' });
+      this.extraItemsContainerFrontRoot.itemById = new Map();
+    }
+    if (!this.extraItemsContainerAboveRoot) {
+      this.extraItemsContainerAboveRoot = this.querySelector(`.${Constants.kEXTRA_ITEMS_CONTAINER}.above`).attachShadow({ mode: 'open' });
+      this.extraItemsContainerAboveRoot.itemById = new Map();
+    }
+    if (!this.extraItemsContainerBelowRoot) {
+      this.extraItemsContainerBelowRoot = this.querySelector(`.${Constants.kEXTRA_ITEMS_CONTAINER}.below`).attachShadow({ mode: 'open' });
+      this.extraItemsContainerBelowRoot.itemById = new Map();
+    }
+  }
+
+  _startListening() {
+    if (this.__onMouseOver)
+      return;
+    this.addEventListener('mouseover', this.__onMouseOver = this._onMouseOver.bind(this));
+    this.addEventListener('mouseenter', this.__onMouseEnter = this._onMouseEnter.bind(this));
+    this.substanceElement?.addEventListener('mouseenter', this.__onMouseEnter);
+    this.addEventListener('mouseleave', this.__onMouseLeave = this._onMouseLeave.bind(this));
+    this.substanceElement?.addEventListener('mouseleave', this.__onMouseLeave);
+    window.addEventListener('resize', this.__onWindowResize = this._onWindowResize.bind(this));
+    configs.$addObserver(this.__onConfigChange = this._onConfigChange.bind(this));
+  }
+
+  _endListening() {
+    if (!this.__onMouseOver)
+      return;
+    this.removeEventListener('mouseover', this.__onMouseOver);
+    this.__onMouseOver = null;
+    this.removeEventListener('mouseenter', this.__onMouseEnter);
+    this.substanceElement?.removeEventListener('mouseenter', this.__onMouseEnter);
+    this.__onMouseEnter = null;
+    this.removeEventListener('mouseleave', this.__onMouseLeave);
+    this.substanceElement?.removeEventListener('mouseleave', this.__onMouseLeave);
+    this.__onMouseLeave = null;
+    window.removeEventListener('resize', this.__onWindowResize);
+    this.__onWindowResize = null;
+    configs.$removeObserver(this.__onConfigChange);
+    this.__onConfigChange = null;
+  }
+
+  _onMouseOver(_event) {
+    this._updateTabAndAncestorsTooltip(this.$TST.raw);
+  }
+
+  _onMouseEnter(event) {
+    if (this.classList.contains('faviconized') != (event.target == this))
+      return;
+    if (this._reservedUpdateTooltip) {
+      this.removeEventListener('mouseover', this._reservedUpdateTooltip);
+      this._updateTooltip();
+    }
+    const tabSubstanceEnterEvent = new MouseEvent(kEVENT_TREE_ITEM_SUBSTANCE_ENTER, {
+      ...event,
+      clientX: event.clientX,
+      clientY: event.clientY,
+      screenX: event.screenX,
+      screenY: event.screenY,
+      bubbles: true,
+      composed: true,
+    });
+    this.dispatchEvent(tabSubstanceEnterEvent);
+  }
+
+  _onMouseLeave(event) {
+    if (this.classList.contains('faviconized') != (event.target == this))
+      return;
+    const tabSubstanceLeaveEvent = new UIEvent(kEVENT_TREE_ITEM_SUBSTANCE_LEAVE, {
+      ...event,
+      bubbles: true,
+      composed: true,
+    });
+    this.dispatchEvent(tabSubstanceLeaveEvent);
+  }
+
+  _onWindowResize(_event) {
+    this.invalidateTooltip();
+  }
+
+  _onConfigChange(changedKey) {
+    switch (changedKey) {
+      case 'showCollapsedDescendantsByTooltip':
+        this.invalidateTooltip();
+        break;
+
+      case 'labelOverflowStyle':
+        this.updateOverflow();
+        break;
+    }
+  }
+
+  _updateTabAndAncestorsTooltip(tab) {
+    if (!TabsStore.ensureLivingItem(tab))
+      return;
+    for (const updateTab of [tab].concat(tab.$TST.ancestors)) {
+      const tabElement = updateTab.$TST.element;
+      if (!tabElement)
+        continue;
+      tabElement.invalidateTooltip();
+      // on the "fade" mode, overflow style was already updated,
+      // so we don' need to update the status here.
+      if (configs.labelOverflowStyle != 'fade')
+        tabElement.updateOverflow();
+    }
+  }
+
+  _updateDescendantsHighlighted() {
+    if (!this.$TST) // called before binding on restoration from cache
+      return;
+
+    const children = this.$TST.children;
+    if (!this.$TST.hasChild) {
+      this.$TST.removeState(Constants.kTAB_STATE_SOME_DESCENDANTS_HIGHLIGHTED);
+      this.$TST.removeState(Constants.kTAB_STATE_ALL_DESCENDANTS_HIGHLIGHTED);
+      return;
+    }
+    let someHighlighted = false;
+    let allHighlighted  = true;
+    for (const child of children) {
+      if (child.$TST.states.has(Constants.kTAB_STATE_HIGHLIGHTED)) {
+        someHighlighted = true;
+        allHighlighted = (
+          allHighlighted &&
+          (!child.$TST.hasChild ||
+           child.$TST.states.has(Constants.kTAB_STATE_ALL_DESCENDANTS_HIGHLIGHTED))
+        );
+      }
+      else {
+        if (!someHighlighted &&
+            child.$TST.states.has(Constants.kTAB_STATE_SOME_DESCENDANTS_HIGHLIGHTED)) {
+          someHighlighted = true;
+        }
+        allHighlighted = false;
+      }
+    }
+    if (someHighlighted) {
+      this.$TST.addState(Constants.kTAB_STATE_SOME_DESCENDANTS_HIGHLIGHTED);
+      this.$TST.toggleState(Constants.kTAB_STATE_ALL_DESCENDANTS_HIGHLIGHTED, allHighlighted);
+    }
+    else {
+      this.$TST.removeState(Constants.kTAB_STATE_SOME_DESCENDANTS_HIGHLIGHTED);
+      this.$TST.removeState(Constants.kTAB_STATE_ALL_DESCENDANTS_HIGHLIGHTED);
+    }
+  }
+
+  _updateCollapseExpandState() {
+    if (!this.$TST) // called before binding on restoration from cache
+      return;
+
+    const classList = this.classList;
+    const parent = this.$TST.parent;
+    if (this.$TST.collapsed ||
+        (parent &&
+         (parent.$TST.collapsed ||
+          parent.$TST.subtreeCollapsed))) {
+      if (!classList.contains(Constants.kTAB_STATE_COLLAPSED))
+        classList.add(Constants.kTAB_STATE_COLLAPSED);
+      if (!classList.contains(Constants.kTAB_STATE_COLLAPSED_DONE))
+        classList.add(Constants.kTAB_STATE_COLLAPSED_DONE);
+    }
+    else {
+      if (classList.contains(Constants.kTAB_STATE_COLLAPSED))
+        classList.remove(Constants.kTAB_STATE_COLLAPSED);
+      if (classList.contains(Constants.kTAB_STATE_COLLAPSED_DONE))
+        classList.remove(Constants.kTAB_STATE_COLLAPSED_DONE);
+    }
+  }
+
+  _updateTabProperties() {
+    if (!this.$TST) // called before binding on restoration from cache
+      return;
+
+    const raw       = this.$TST.raw;
+    const classList = this.classList;
+
+    this.label = raw.$TST.title;
+
+    const tab = this.$TST.tab;
+    if (tab) {
+      const openerOfGroupTab = tab && this.$TST.isGroupTab && Tab.getOpenerFromGroupTab(tab);
+      this.favIconUrl = openerOfGroupTab?.favIconUrl || tab?.favIconUrl;
+
+      for (const state of classList) {
+        if (IGNORE_CLASSES.has(state) ||
+            NATIVE_PROPERTIES.has(state))
+          continue;
+        if (!this.$TST.states.has(state))
+          classList.remove(state);
+      }
+      for (const state of this.$TST.states) {
+        if (IGNORE_CLASSES.has(state))
+          continue;
+        if (!classList.contains(state))
+          classList.add(state);
+      }
+
+      for (const state of NATIVE_PROPERTIES) {
+        if (raw[state] == classList.contains(state))
+          continue;
+        classList.toggle(state, raw[state]);
+      }
+
+      if (this.$TST.childIds.length > 0)
+        this.setAttribute(Constants.kCHILDREN, `|${this.$TST.childIds.join('|')}|`);
+      else
+        this.removeAttribute(Constants.kCHILDREN);
+
+      if (this.$TST.parentId)
+        this.setAttribute(Constants.kPARENT, this.$TST.parentId);
+      else
+        this.removeAttribute(Constants.kPARENT);
+
+      const alreadyGrouped = this.$TST.getAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER) || '';
+      if (this.getAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER) != alreadyGrouped)
+        this.setAttribute(Constants.kPERSISTENT_ALREADY_GROUPED_FOR_PINNED_OPENER, alreadyGrouped);
+
+      const opener = this.$TST.getAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID) || '';
+      if (this.getAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID) != opener)
+        this.setAttribute(Constants.kPERSISTENT_ORIGINAL_OPENER_TAB_ID, opener);
+
+      const uri = this.$TST.getAttribute(Constants.kCURRENT_URI) || tab?.url;
+      if (this.getAttribute(Constants.kCURRENT_URI) != uri)
+        this.setAttribute(Constants.kCURRENT_URI, uri);
+
+      const favIconUri = this.$TST.getAttribute(Constants.kCURRENT_FAVICON_URI) || tab?.favIconUrl;
+      if (this.getAttribute(Constants.kCURRENT_FAVICON_URI) != favIconUri)
+        this.setAttribute(Constants.kCURRENT_FAVICON_URI, favIconUri);
+
+      const level = this.$TST.getAttribute(Constants.kLEVEL) || 0;
+      if (this.getAttribute(Constants.kLEVEL) != level)
+        this.setAttribute(Constants.kLEVEL, level);
+
+      const id = this.$TST.uniqueId.id;
+      if (this.getAttribute(Constants.kPERSISTENT_ID) != id)
+        this.setAttribute(Constants.kPERSISTENT_ID, id);
+
+      if (this.$TST.subtreeCollapsed) {
+        if (!classList.contains(Constants.kTAB_STATE_SUBTREE_COLLAPSED))
+          classList.add(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+      }
+      else {
+        if (classList.contains(Constants.kTAB_STATE_SUBTREE_COLLAPSED))
+          classList.remove(Constants.kTAB_STATE_SUBTREE_COLLAPSED);
+      }
+    }
+
+    const group = this.$TST.nativeTabGroup || this.$TST.group;
+    if (group) {
+      this.style.setProperty('--tab-group-color', `var(--tab-group-color-${group.color})`);
+      this.style.setProperty('--tab-group-color-pale', `var(--tab-group-color-${group.color}-pale)`);
+      this.style.setProperty('--tab-group-color-invert', `var(--tab-group-color-${group.color}-invert)`);
+    }
+    if (this.$TST.group) {
+      classList.toggle(Constants.kTAB_STATE_SUBTREE_COLLAPSED, group.collapsed);
+    }
+  }
+
+  get favIconUrl() {
+    if (!this.initialized)
+      return null;
+
+    return this.favicon.src;
+  }
+
+  set favIconUrl(url) {
+    this._favIconUrl = url;
+    if (!this.initialized || !this.$TST)
+      return url;
+
+    if (!url || url.startsWith('data:')) { // we don't need to use the helper for data: URI.
+      this.favicon.src = url;
+      this.favicon.classList.remove('error');
+      return url;
+    }
+
+    TabFavIconHelper.loadToImage({
+      image: this.favicon,
+      tab: this.$TST.tab,
+      url
+    });
+    return url;
+  }
+
+  get overflow() {
+    const label = this._labelElement;
+    return label?.overflow;
+  }
+
+  get label() {
+    const label = this._labelElement;
+    return label ? label.value : null;
+  }
+  set label(value) {
+    const label = this._labelElement;
+    if (label)
+      label.value = value;
+
+    this.dataset.title = value; // for custom CSS https://github.com/piroor/treestyletab/issues/2242
+
+    if (!this.$TST) // called before binding on restoration from cache
+      return;
+
+    this.invalidateTooltip();
+    if (this.$TST.collapsed) {
+      this._labelElement.invalidateOverflow();
+      this._needToUpdateOverflow = true;
+    }
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/components/TreeItemLabelElement.js b/waterfox/browser/components/sidebar/sidebar/components/TreeItemLabelElement.js
new file mode 100644
index 0000000000000..0da7d8217dfd7
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/components/TreeItemLabelElement.js
@@ -0,0 +1,234 @@
+/*
+# 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/.
+*/
+
+import {
+  watchOverflowStateChange,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+
+export const kTREE_ITEM_LABEL_ELEMENT_NAME = 'tab-label';
+
+const KLABEL_CLASS_NAME   = 'label';
+const kCONTENT_CLASS_NAME = `${KLABEL_CLASS_NAME}-content`;
+
+const kATTR_NAME_VALUE = 'value';
+
+//****************************************************************************
+// isRTL https://github.com/kavirajk/isRTL
+// The MIT License (MIT)
+// Copyright (c) 2013 dhilipsiva
+const rtlChars = [
+  /* arabic ranges*/
+  '\u0600-\u06FF',
+  '\u0750-\u077F',
+  '\uFB50-\uFDFF',
+  '\uFE70-\uFEFF',
+  /* hebrew range*/
+  '\u05D0-\u05FF'
+].join('');
+
+const reRTL = new RegExp(`[${rtlChars}]`, 'g');
+
+function isRTL(text) {
+  if (!text)
+    return false;
+  if (/^\s*\u200f[^\u200e]/.test(text)) // title starting with right-to-left-mark
+    return true;
+  const textCount = text.replace(/[0-9\s\\\/.,\-+="']/g, '').length; // remove multilengual characters from count
+  const rtlCount  = (text.match(reRTL) || []).length;
+  return rtlCount >= (textCount-rtlCount) && textCount > 0;
+};
+//****************************************************************************
+
+export class TreeItemLabelElement extends HTMLElement {
+  static define() {
+    window.customElements.define(kTREE_ITEM_LABEL_ELEMENT_NAME, TreeItemLabelElement);
+  }
+
+  static get observedAttributes() {
+    return [kATTR_NAME_VALUE];
+  }
+
+  constructor() {
+    super();
+
+    // We should initialize private properties with blank value for better performance with a fixed shape.
+    this.__unwatch     = null;
+  }
+
+  connectedCallback() {
+    this.setAttribute('role', 'button');
+
+    if (this.initialized) {
+      this._startListening();
+      this.applyAttributes();
+      this.updateTextContent();
+      return;
+    }
+
+    // I make ensure to call these operation only once conservatively because:
+    //  * If we do these operations in a constructor of this class, Gecko throws `NotSupportedError: Operation is not supported`.
+    //    * I'm not familiar with details of the spec, but this is not Gecko's bug.
+    //      See https://dom.spec.whatwg.org/#concept-create-element
+    //      "6. If result has children, then throw a "NotSupportedError" DOMException."
+    //  * `connectedCallback()` may be called multiple times by append/remove operations.
+    //
+    // FIXME:
+    //  Ideally, these descendants should be in shadow tree. Thus I don't change these element to custom elements.
+    //  However, I hesitate to do it at this moment by these reasons.
+    //  If we move these to shadow tree,
+    //    * We need some rewrite our style.
+    //      * This includes that we need to move almost CSS code into this file as a string.
+    //    * I'm not sure about that whether we should require [CSS Shadow Parts](https://bugzilla.mozilla.org/show_bug.cgi?id=1559074).
+    //      * I suspect we can resolve almost problems by using CSS Custom Properties.
+
+    // We preserve this class for backward compatibility with other addons.
+    this.classList.add(KLABEL_CLASS_NAME);
+
+    const content = this.appendChild(document.createElement('span'));
+    content.classList.add(kCONTENT_CLASS_NAME);
+
+    this._startListening();
+    this.applyAttributes();
+    this.updateTextContent();
+  }
+
+  disconnectedCallback() {
+    this._overflowChangeListeners.clear();
+    this._endListening();
+  }
+
+  get initialized() {
+    return !!this._content;
+  }
+
+  attributeChangedCallback(name, oldValue, newValue, _namespace) {
+    if (oldValue === newValue) {
+      return;
+    }
+
+    switch (name) {
+      case kATTR_NAME_VALUE:
+        this.updateTextContent();
+        break;
+
+      default:
+        throw new RangeError(`Handling \`${name}\` attribute has not been defined.`);
+    }
+  }
+
+  applyAttributes() {
+    // for convenience on customization with custom user styles
+    this._content.setAttribute(Constants.kAPI_TAB_ID, this.getAttribute(Constants.kAPI_TAB_ID));
+    this._content.setAttribute(Constants.kAPI_WINDOW_ID, this.getAttribute(Constants.kAPI_WINDOW_ID));
+    this._content.dataset.index = this.dataset.index;
+  }
+
+  updateTextContent() {
+    const content = this._content;
+    if (!content)
+      return;
+    content.textContent = this.getAttribute(kATTR_NAME_VALUE) || '';
+    this.classList.toggle('rtl', isRTL(content.textContent));
+    this.invalidateOverflow();
+    // Don't touch to offsetWidth if not needed - touching it will triggers indent animation unexpectedly
+    this.closest('tab-item[type="group"]')?.style.setProperty('--tab-label-width', `${content.offsetWidth}px`);
+  }
+
+  updateOverflow() {
+    // Accessing to the real size of the element triggers layouting and hits the performance,
+    // like https://github.com/piroor/treestyletab/issues/3477 .
+    // So we need to throttle the process for better formance.
+    if (this.updateOverflow.invoked)
+      return;
+    this.updateOverflow.invoked = true;
+    window.requestAnimationFrame(() => {
+      this.updateOverflow.invoked = false;
+      if (!this.closest('body')) // already detached from document!
+        return;
+      const tab = this.owner;
+      const overflow = tab && !tab.pinned && this._content.offsetWidth > this.offsetWidth;
+      this.classList.toggle('overflow', overflow);
+      // Don't touch to offsetWidth if not needed - touching it will triggers indent animation unexpectedly
+      this.closest('tab-item[type="group"]')?.style.setProperty('--tab-label-width', `${this._content.offsetWidth}px`);
+    });
+  }
+
+  invalidateOverflow() {
+    this.updateOverflow.invoked = false;
+  }
+
+  get _content() {
+    return this.querySelector(`.${kCONTENT_CLASS_NAME}`);
+  }
+
+  get value() {
+    return this.getAttribute(kATTR_NAME_VALUE);
+  }
+  set value(value) {
+    this.setAttribute(kATTR_NAME_VALUE, value);
+  }
+
+  get overflow() {
+    return this.classList.contains('overflow');
+  }
+
+  _startListening() {
+    if (this.__unwatch)
+      return;
+
+    // Accessing to the real size of the element triggers layouting and hits the performance,
+    // like https://github.com/piroor/treestyletab/issues/3557 .
+    // So we need to throttle the process for better formance.
+    if (this._startListening_invoked)
+      return;
+    this._startListening_invoked = true;
+    window.requestAnimationFrame(() => {
+      this._startListening_invoked = false;
+      if (!this.closest('body')) // already detached from document!
+        return;
+      this.__unwatch     = watchOverflowStateChange({
+        target:      this,
+        horizontal:  true,
+        onOverflow:  () => this._onOverflow(),
+        onUnderflow: () => this._onUnderflow(),
+      });
+    });
+  }
+
+  _endListening() {
+    if (!this.__unwatch)
+      return;
+    this.__unwatch();
+    this.__unwatch = null;
+  }
+
+  _onOverflow() {
+    this.classList.add('overflow');
+    for (const listener of this._overflowChangeListeners) {
+      listener();
+    }
+  }
+
+  _onUnderflow() {
+    this.classList.remove('overflow');
+    for (const listener of this._overflowChangeListeners) {
+      listener();
+    }
+  }
+
+  addOverflowChangeListener(listener) {
+    this._overflowChangeListeners.add(listener);
+  }
+
+  removeOverflowChangeListener(listener) {
+    this._overflowChangeListeners.delete(listener);
+  }
+
+  get _overflowChangeListeners() {
+    return this.__overflowChangeListeners || (this.__overflowChangeListeners = new Set());
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/drag-and-drop.js b/waterfox/browser/components/sidebar/sidebar/drag-and-drop.js
new file mode 100644
index 0000000000000..0ee2c6083445b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/drag-and-drop.js
@@ -0,0 +1,1814 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2010-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 Infocatcher <https://github.com/Infocatcher>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+
+import RichConfirm from '/extlib/RichConfirm.js';
+
+import {
+  log as internalLogger,
+  wait,
+  mapAndFilter,
+  configs,
+  shouldApplyAnimation,
+  sha1sum,
+  isMacOS,
+  isLinux,
+  isRTL,
+  dumpTab,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as BackgroundConnection from './background-connection.js';
+import * as Constants from '/common/constants.js';
+import * as EventUtils from './event-utils.js';
+import * as RetrieveURL from '/common/retrieve-url.js';
+import * as Scroll from './scroll.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import * as Notifications from './notifications.js';
+import * as Size from './size.js';
+
+function log(...args) {
+  internalLogger('sidebar/drag-and-drop', ...args);
+}
+
+
+const kTREE_DROP_TYPE   = 'application/x-ws-tree';
+const kTYPE_ADDON_DRAG_DATA = `application/x-ws-drag-data;provider=${browser.runtime.id}&id=`;
+
+const kDROP_BEFORE  = 'before';
+const kDROP_ON_SELF = 'self';
+const kDROP_AFTER   = 'after';
+const kDROP_HEAD    = 'head';
+const kDROP_TAIL    = 'tail';
+const kDROP_IMPOSSIBLE = 'impossible';
+
+const kDROP_POSITION = 'data-drop-position';
+const kINLINE_DROP_POSITION = 'data-inline-drop-position';
+const kNEXT_GROUP_COLOR = 'data-next-group-color';
+
+let mLongHoverExpandedTabs = [];
+let mLongHoverTimer;
+let mLongHoverTimerNext;
+
+let mDraggingOnSelfWindow = false;
+let mDraggingOnDraggedItems = false;
+
+let mCapturingForDragging = false;
+let mReadyToCaptureMouseEvents = false;
+let mLastDragEnteredTarget = null;
+let mLastDropPosition      = null;
+let mLastInlineDropPosition = null;
+let mLastDragEventCoordinates = null;
+let mDragTargetIsClosebox  = false;
+let mCurrentDragData       = null;
+
+let mInstanceId;
+
+export function init() {
+  document.addEventListener('dragstart', onDragStart);
+  document.addEventListener('dragover', onDragOver);
+  document.addEventListener('dragenter', onDragEnter);
+  document.addEventListener('dragleave', onDragLeave);
+  document.addEventListener('dragend', onDragEnd);
+  document.addEventListener('drop', onDrop);
+
+  browser.runtime.onMessage.addListener(onMessage);
+
+  browser.runtime.sendMessage({ type: Constants.kCOMMAND_GET_INSTANCE_ID }).then(id => mInstanceId = id);
+}
+
+
+export function isCapturingForDragging() {
+  return mCapturingForDragging;
+}
+
+export function endMultiDrag(tab, coordinates) {
+  if (mCapturingForDragging) {
+    window.removeEventListener('mouseover', onTSTAPIDragEnter, { capture: true });
+    window.removeEventListener('mouseout',  onTSTAPIDragExit, { capture: true });
+    document.releaseCapture();
+
+    TSTAPI.broadcastMessage({
+      type:    TSTAPI.kNOTIFY_TAB_DRAGEND,
+      tab,
+      window:  tab?.windowId,
+      windowId: tab?.windowId,
+      clientX: coordinates.clientX,
+      clientY: coordinates.clientY
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+
+    mLastDragEnteredTarget = null;
+  }
+  else if (mReadyToCaptureMouseEvents) {
+    TSTAPI.broadcastMessage({
+      type:    TSTAPI.kNOTIFY_TAB_DRAGCANCEL,
+      tab,
+      window:  tab?.windowId,
+      windowId: tab?.windowId,
+      clientX: coordinates.clientX,
+      clientY: coordinates.clientY
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+  }
+  mCapturingForDragging = false;
+  mReadyToCaptureMouseEvents = false;
+}
+
+function setDragData(dragData) {
+  return mCurrentDragData = dragData;
+}
+
+
+/* helpers */
+
+function getDragDataFromOneItem(item, options = {}) {
+  const sessionId = `${Date.now()}-${Math.floor(Math.random() * 65000)}`;
+  if (!item)
+    return {
+      tab:      null,
+      tabs:     [],
+      item:     null,
+      items:    [],
+      structure:      [],
+      nextGroupColor: TabGroup.getNextUnusedColor(),
+      windowId:       null,
+      instanceId:     mInstanceId,
+      sessionId,
+    };
+  const items = getDraggedItemsFromOneItem(item, options);
+  const tab  = item.$TST.tab;
+  const tabs = items.filter(item => item.type == TreeItem.TYPE_TAB);
+  return {
+    item,
+    items,
+    tab,
+    tabs,
+    structure:      TreeBehavior.getTreeStructureFromTabs(tabs),
+    nextGroupColor: TabGroup.getNextUnusedColor(),
+    windowId:       item.windowId,
+    instanceId:     mInstanceId,
+    sessionId,
+  };
+}
+
+function getDraggedItemsFromOneItem(item, { asTree } = {}) {
+  if (item.$TST.group) {
+    return [item];
+  }
+  if (item.$TST.multiselected) {
+    return Tab.getSelectedTabs(item.windowId);
+  }
+  if (asTree) {
+    return [item].concat(item.$TST.descendants);
+  }
+  return [item];
+}
+
+function sanitizeDragData(dragData) {
+  return {
+    item:       dragData.item?.$TST.sanitized,
+    items:      dragData.items.map(item => item?.$TST.sanitized),
+    tab:        dragData.tab?.$TST.sanitized,
+    tabs:       dragData.tabs.map(tab => tab?.$TST.sanitized),
+    structure:  dragData.structure,
+    nextGroupColor: dragData.nextGroupColor,
+    windowId:   dragData.windowId,
+    instanceId: dragData.instanceId,
+    sessionId:  dragData.sessionId,
+    behavior:   dragData.behavior,
+    individualOnOutside: dragData.individualOnOutside,
+  };
+}
+
+function getDropAction(event) {
+  const dragOverItem = EventUtils.getTreeItemFromEvent(event);
+  const targetItem   = dragOverItem || EventUtils.getTreeItemFromTabbarEvent(event);
+  const info = {
+    dragOverItem,
+    targetItem,
+    substanceTargetItem: targetItem?.pinned && targetItem.$TST.bundledTab,
+    dropPosition:  null,
+    inlineDropPosition: '',
+    action:        null,
+    parent:        null,
+    insertBefore:  null,
+    insertAfter:   null,
+    defineGetter(name, getter) {
+      delete this[name];
+      Object.defineProperty(this, name, {
+        get() {
+          delete this[name];
+          return this[name] = getter.call(this);
+        },
+        configurable: true,
+        enumerable:   true
+      });
+    }
+  };
+  info.defineGetter('dragData', () => {
+    const dragData = event.dataTransfer.getData(kTREE_DROP_TYPE);
+    return (dragData && JSON.parse(dragData)) || mCurrentDragData;
+  });
+  info.defineGetter('draggedItem', () => {
+    const dragData = info.dragData;
+    if (dragData?.instanceId != mInstanceId)
+      return null;
+    const item = dragData?.item;
+    return TreeItem.get(item) || item;
+  });
+  info.defineGetter('draggedItems', () => {
+    const dragData = info.dragData;
+    if (dragData?.instanceId != mInstanceId)
+      return [];
+    const itemIds = dragData?.items;
+    return !itemIds ? [] : mapAndFilter(itemIds, id =>
+      Tab.get(id) ||
+      TabGroup.get(id) ||
+      undefined
+    );
+  });
+  info.defineGetter('draggedItemIds', () => {
+    return info.draggedItems.map(item => item.id);
+  });
+  info.defineGetter('firstTargetableItem', () => {
+    const items = Scroll.getRenderableTreeItems();
+    return items.length > 0 ? items[0] : Tab.getFirstTab(TabsStore.getCurrentWindowId());
+  });
+  info.defineGetter('lastTargetableItem', () => {
+    const items = Scroll.getRenderableTreeItems();
+    return items.length > 0 ? items[items.length - 1] : Tab.getLastTab(TabsStore.getCurrentWindowId());
+  });
+  info.defineGetter('sanitizedDropOnTargetItem', () => { // the drop target we are trying to drop on itself
+    return info.dropPosition == kDROP_ON_SELF ?
+      (targetItem?.$TST.sanitized || targetItem) :
+      null;
+  });
+  info.defineGetter('sanitizedDropBeforeTargetItem', () => { // the drop target we are trying to drop before it
+    return info.dropPosition == kDROP_BEFORE ?
+      (targetItem?.$TST.sanitized || targetItem) :
+      null;
+  });
+  info.defineGetter('sanitizedDropAfterTargetItem', () => { // the drop target we are trying to drop after it
+    return info.dropPosition == kDROP_AFTER ?
+      (targetItem?.$TST.sanitized || targetItem) :
+      null;
+  });
+  info.defineGetter('groupId', () => { // the group ID the dropped items should be grouped under
+    if (!targetItem) {
+      return null;
+    }
+    const draggedGroup = info.draggedItem?.type == TreeItem.TYPE_GROUP ? info.draggedItem : null;
+    switch (info.dropPosition) {
+      case kDROP_ON_SELF:
+      default:
+        return targetItem.groupId || targetItem.id;
+
+      case kDROP_AFTER:
+        if (targetItem.type == TreeItem.TYPE_GROUP) {
+          return targetItem.collapsed ?
+            draggedGroup?.id : // dropping after a collapsed group => keep the original group
+            targetItem.id; // otherwise we try to insert items at the top of a group
+        }
+        return targetItem.groupId == -1 ?
+          draggedGroup?.id : // dropping after ungrouped tab => keep the original group
+          targetItem.groupId; // otherwise we try to add items to the group of the tab
+
+      case kDROP_BEFORE:
+        if (targetItem.type == TreeItem.TYPE_GROUP) {
+          const previousTab = targetItem.$TST?.firstMember?.$TST?.unsafePreviousTab;
+          if (!draggedGroup &&
+              (previousTab?.$TST?.nativeTabGroup?.collapsed ||
+               (previousTab &&
+                previousTab.groupId != -1 &&
+                info.draggedItems.some(tab => tab == previousTab)))) {
+            // Keep dropped tabs ungrouped (or remove from groups) when tabs are explicitly dropped between groups
+            return -1;
+          }
+          return previousTab?.groupId || -1;
+        }
+        return targetItem.groupId == -1 ?
+          draggedGroup?.id : // dropping before ungrouped tab => keep the original group
+          targetItem.groupId; // otherwise we are trying to add items to the group of the tab
+    }
+  });
+  info.defineGetter('canDrop', () => {
+    if (info.dropPosition == kDROP_IMPOSSIBLE) {
+      log('canDrop:undroppable: dropPosition == kDROP_IMPOSSIBLE');
+      return false;
+    }
+
+    const draggedItem = info.dragData?.item;
+    const isPrivateBrowsingTabDragged = draggedItem?.incognito;
+    const isPrivateBrowsingDropTarget = (info.dragOverItem || Tab.getFirstTab(TabsStore.getCurrentWindowId())).incognito;
+    if (draggedItem &&
+        isPrivateBrowsingTabDragged != isPrivateBrowsingDropTarget) {
+      log('canDrop:undroppable: mismatched incognito status');
+      return false;
+    }
+    else if (info.draggedItem) {
+      if (info.action & Constants.kACTION_ATTACH) {
+        if (info.draggedItem.windowId != TabsStore.getCurrentWindowId()) {
+          return true;
+        }
+        if (!configs.moveSoloTabOnDropParentToDescendant &&
+            info.parent?.id == info.draggedItem.id) {
+          log('canDrop:undroppable: drop on child');
+          return false;
+        }
+        if (info.dragOverItem) {
+          if (info.draggedItem.id == info.dragOverItem.id) {
+            log('canDrop:undroppable: on self');
+            return false;
+          }
+          if (info.draggedItem.highlighted &&
+              info.dragOverItem.highlighted &&
+              info.draggedItemIds.includes(info.dragOverItem.id)) {
+            log('canDrop:undroppable: on dragging multiselected tabs');
+            return false;
+          }
+          if (configs.moveSoloTabOnDropParentToDescendant)
+            return true;
+          const ancestors = info.dragOverItem.$TST.ancestors;
+          /* too many function call in this way, so I use alternative way for better performance.
+          return !info.draggedItemIds.includes(info.dragOverItem.id) &&
+                   Tab.collectRootTabs(info.draggedItems).every(rootTab =>
+                     !ancestors.includes(rootTab)
+                   );
+          */
+          for (const item of info.draggedItems.slice(0).reverse()) {
+            const parent = item.$TST.parent;
+            if (!parent && ancestors.includes(parent)) {
+              log('canDrop:undroppable: on descendant');
+              return false;
+            }
+          }
+          return true;
+        }
+      }
+    }
+
+    if (info.dragOverItem &&
+        (info.dragOverItem.hidden ||
+         (info.dragOverItem.$TST.collapsed &&
+          info.dropPosition != kDROP_AFTER))) {
+      log('canDrop:undroppable: on hidden tab');
+      return false;
+    }
+
+    return true;
+  });
+  info.defineGetter('canCreateGroup', () => {
+    if (!configs.tabGroupsEnabled ||
+        !targetItem ||
+        targetItem.groupId != -1 ||
+        [targetItem, ...info.draggedItems].some(item => item?.type != TreeItem.TYPE_TAB || item?.pinned || item.groupId != -1)) {
+      return false;
+    }
+    return info.dropPosition == kDROP_ON_SELF && info.inlineDropPosition == kDROP_HEAD;
+  });
+  info.defineGetter('EventUtils.isCopyAction', () => EventUtils.isCopyAction(event));
+  info.defineGetter('dropEffect', () => getDropEffectFromDropAction(info));
+
+  if (!targetItem) {
+    //log('dragging on non-tab element');
+    const action = Constants.kACTION_MOVE | Constants.kACTION_DETACH;
+    if (event.clientY < Scroll.getItemRect(info.firstTargetableItem).top) {
+      //log('dragging above the first tab');
+      info.targetItem   = info.insertBefore = info.firstTargetableItem;
+      info.dropPosition = kDROP_BEFORE;
+      info.action       = action;
+      if (info.draggedItem &&
+          !info.draggedItem.pinned &&
+          info.targetItem.pinned) {
+        log('undroppable: above the first tab');
+        info.dropPosition = kDROP_IMPOSSIBLE;
+      }
+    }
+    else if (event.clientY > Scroll.getItemRect(info.lastTargetableItem).bottom) {
+      //log('dragging below the last tab');
+      info.targetItem   = info.insertAfter = info.lastTargetableItem;
+      info.dropPosition = kDROP_AFTER;
+      info.action       = action;
+      if (info.draggedItem?.pinned &&
+          !info.targetItem.pinned) {
+        log('undroppable: below the last tab');
+        info.dropPosition = kDROP_IMPOSSIBLE;
+      }
+    }
+    return info;
+  }
+
+  /**
+   * Basically, tabs should have three areas for dropping of items:
+   * [start][center][end], but, pinned tabs couldn't have its tree.
+   * So, if a tab is dragged and the target tab is pinned, then, we
+   * have to ignore the [center] area.
+   */
+  const onFaviconizedTab    = targetItem.pinned && configs.faviconizePinnedTabs;
+  const dropAreasCount      = (
+    info.draggedItem &&
+    ((targetItem.pinned && !info.substanceTargetItem) ||
+     (info.draggedItem.type == TreeItem.TYPE_GROUP &&
+      targetItem.type != TreeItem.TYPE_GROUP))
+  ) ? 2 : 3 ;
+  const targetItemRect       = Scroll.getItemRect(targetItem);
+  const targetItemCoordinate = onFaviconizedTab ? targetItemRect.left : targetItemRect.top ;
+  const targetItemSize       = onFaviconizedTab ? targetItemRect.width : targetItemRect.height ;
+  let beforeOrAfterDropAreaSize;
+  if (dropAreasCount == 2) {
+    beforeOrAfterDropAreaSize = Math.round(targetItemSize / dropAreasCount);
+  }
+  else { // enlarge the area to dop something on the tab itself
+    beforeOrAfterDropAreaSize = Math.round(targetItemSize / 4);
+  }
+  const eventCoordinate = onFaviconizedTab ? event.clientX : event.clientY;
+  /*
+  log('coordinates: ', {
+    event: eventCoordinate,
+    targetItem: targetItemCoordinate,
+    targetItemActual: configs.debug && (targetItem?.$TST.element?.offsetTop + Size.getScrollBoxRect().top),
+    targetItemSize,
+    area: beforeOrAfterDropAreaSize,
+    before: `< ${targetItemCoordinate + beforeOrAfterDropAreaSize}`,
+    after: `> ${targetItemCoordinate + targetItemSize - beforeOrAfterDropAreaSize}`,
+  });
+  */
+  const shouldInvertArea = onFaviconizedTab && isRTL();
+  if (eventCoordinate < targetItemCoordinate + beforeOrAfterDropAreaSize) {
+    info.dropPosition = shouldInvertArea ? kDROP_AFTER : kDROP_BEFORE;
+    info.insertBefore = info.firstTargetableItem;
+  }
+  else if (dropAreasCount == 2 ||
+           eventCoordinate > targetItemCoordinate + targetItemSize - beforeOrAfterDropAreaSize) {
+    info.dropPosition = shouldInvertArea ? kDROP_BEFORE : kDROP_AFTER;
+    info.insertAfter  = info.lastTargetableItem;
+  }
+  else {
+    info.dropPosition = kDROP_ON_SELF;
+  }
+
+  switch (info.dropPosition) {
+    case kDROP_ON_SELF: {
+      log('drop position = on ', info.targetItem.id);
+      const insertAt = configs.insertDroppedTabsAt == Constants.kINSERT_INHERIT ? configs.insertNewChildAt : configs.insertDroppedTabsAt;
+      info.action       = Constants.kACTION_ATTACH;
+      info.parent       = info.substanceTargetItem || targetItem;
+      info.insertBefore = insertAt == Constants.kINSERT_TOP ?
+        (info.parent?.$TST.firstChild || info.parent?.$TST.unsafeNextTab /* instead of nearestVisibleFollowingTab, to avoid placing the tab after hidden tabs (too far from the target) */) :
+        (info.parent?.$TST.nextSiblingTab || info.parent?.$TST.unsafeNearestFollowingForeignerTab /* instead of nearestFollowingForeignerTab, to avoid placing the tab after hidden tabs (too far from the target) */);
+      info.insertAfter  = insertAt == Constants.kINSERT_TOP ?
+        info.parent :
+        (info.parent.$TST.lastDescendant || info.parent);
+      if ((info.draggedItem && // we cannot drop pinned tab on unpinned tab, or unpinned tab on pinned tab
+           !!info.draggedItem.pinned != !!targetItem.pinned &&
+           !info.substanceTargetItem) ||
+          (info.draggedItem?.type == TreeItem.TYPE_GROUP && // we cannot drop group on tab
+           targetItem.type == TreeItem.TYPE_TAB))
+        info.dropPosition = kDROP_IMPOSSIBLE;
+      if (info.draggedItem &&
+          info.insertBefore == info.draggedItem) // failsafe
+        info.insertBefore = insertAt == Constants.kINSERT_TOP ?
+          info.draggedItem.$TST.unsafeNextTab :
+          (info.draggedItem.$TST.nextSiblingTab ||
+           info.draggedItem.$TST.unsafeNearestFollowingForeignerTab);
+      const isRightside = document.documentElement.classList.contains('right');
+      const substanceElement = targetItem?.$TST?.element?.substanceElement;
+      if (isRTL() == isRightside) {
+        const neck = substanceElement.offsetLeft + Size.getFavIconSize();
+        info.inlineDropPosition = event.clientX < neck ? kDROP_HEAD : kDROP_TAIL;
+      }
+      else {
+        const neck = substanceElement.offsetLeft + substanceElement.offsetWidth - Size.getFavIconSize();
+        info.inlineDropPosition = event.clientX > neck ? kDROP_HEAD : kDROP_TAIL;
+      }
+      if (configs.debug)
+        log(' calculated info: ', info);
+    }; break;
+
+    case kDROP_BEFORE: {
+      log('drop position = before ', info.targetItem.id);
+      const referenceItems = TreeBehavior.calculateReferenceItemsFromInsertionPosition(info.draggedItem, {
+        context:      Constants.kINSERTION_CONTEXT_MOVED,
+        insertBefore: targetItem.$TST.firstMember || targetItem,
+      });
+      if (referenceItems.parent)
+        info.parent = referenceItems.parent;
+      if (referenceItems.insertBefore)
+        info.insertBefore = referenceItems.insertBefore;
+      if (referenceItems.insertAfter)
+        info.insertAfter = referenceItems.insertAfter;
+      info.action = Constants.kACTION_MOVE | (info.parent ? Constants.kACTION_ATTACH : Constants.kACTION_DETACH );
+      //if (info.insertBefore)
+      //  log('insertBefore = ', dumpTab(info.insertBefore));
+      if ((info.draggedItem && // we cannot drop pinned tab beteen unpinned tabs, or unpinned tab between pinned tabs
+           ((info.draggedItem.pinned &&
+             targetItem.$TST.followsUnpinnedTab) ||
+            (!info.draggedItem.pinned &&
+             targetItem.pinned))) ||
+          (info.draggedItem?.type == TreeItem.TYPE_GROUP && // we cannot drop group on its member
+           targetItem.type == TreeItem.TYPE_TAB &&
+           targetItem.groupId == info.draggedItem.id))
+        info.dropPosition = kDROP_IMPOSSIBLE;
+      if (configs.debug)
+        log(' calculated info: ', info);
+    }; break;
+
+    case kDROP_AFTER: {
+      log('drop position = after ', info.targetItem.id);
+      const referenceItems = TreeBehavior.calculateReferenceItemsFromInsertionPosition(info.draggedItem, {
+        insertAfter: targetItem.$TST.lastMember || (targetItem.$TST.subtreeCollapsed && targetItem.$TST.lastDescendant || targetItem),
+      });
+      if (referenceItems.parent)
+        info.parent = referenceItems.parent;
+      if (referenceItems.insertBefore)
+        info.insertBefore = referenceItems.insertBefore;
+      if (referenceItems.insertAfter)
+        info.insertAfter = referenceItems.insertAfter;
+      info.action = Constants.kACTION_MOVE | (info.parent ? Constants.kACTION_ATTACH : Constants.kACTION_DETACH );
+      if (info.insertBefore) {
+        /* strategy
+             +-----------------------------------------------------
+             |[TARGET   ]
+             |     <= attach dragged tab to the parent of the target as its next sibling
+             |  [DRAGGED]
+             +-----------------------------------------------------
+        */
+        if (info.draggedItem &&
+            info.draggedItem.$TST &&
+            info.draggedItem.$TST.nearestVisibleFollowingTab &&
+            info.draggedItem.$TST.nearestVisibleFollowingTab.id == info.insertBefore.id) {
+          log('special case: promote tab');
+          info.action      = Constants.kACTION_MOVE | Constants.kACTION_ATTACH;
+          info.parent      = targetItem.$TST.parent;
+          let insertBefore = targetItem.$TST.nextSiblingTab;
+          let ancestor     = info.parent;
+          while (ancestor && !insertBefore) {
+            insertBefore = ancestor.$TST.nextSiblingTab;
+            ancestor     = ancestor.$TST.parent;
+          }
+          info.insertBefore = insertBefore;
+          info.insertAfter  = targetItem.$TST.lastDescendant;
+        }
+      }
+      if ((info.draggedItem && // we cannot drop pinned tab beteen unpinned tabs, or unpinned tab between pinned tabs
+           ((info.draggedItem.pinned &&
+             !targetItem.pinned) ||
+            (!info.draggedItem.pinned &&
+             targetItem.$TST.precedesPinnedTab))) ||
+          (info.draggedItem?.type == TreeItem.TYPE_GROUP && // we cannot drop group on its member
+           targetItem.type == TreeItem.TYPE_TAB &&
+           targetItem.groupId == info.draggedItem.id))
+        info.dropPosition = kDROP_IMPOSSIBLE;
+      if (configs.debug)
+        log(' calculated info: ', info);
+    }; break;
+  }
+
+  return info;
+}
+function getDropEffectFromDropAction(actionInfo) {
+  if (!actionInfo.canDrop)
+    return 'none';
+  if (actionInfo.dragData &&
+      actionInfo.dragData.instanceId != mInstanceId)
+    return 'copy';
+  if (!actionInfo.draggedItem)
+    return 'link';
+  if (actionInfo.isCopyAction)
+    return 'copy';
+  return 'move';
+}
+
+const mDropPositionHolderItems = new Set();
+
+export function clearDropPosition() {
+  for (const tab of mDropPositionHolderItems) {
+    tab.$TST.removeAttribute(kDROP_POSITION);
+    tab.$TST.removeAttribute(kINLINE_DROP_POSITION);
+    tab.$TST.removeAttribute(kNEXT_GROUP_COLOR);
+  }
+  mDropPositionHolderItems.clear();
+  configs.lastDragOverSidebarOwnerWindowId = null;
+}
+
+export function clearDraggingItemsState() {
+  for (const tab of Tab.getDraggingTabs(TabsStore.getCurrentWindowId(), { iterator: true })) {
+    tab.$TST.removeState(Constants.kTAB_STATE_DRAGGING);
+    TabsStore.removeDraggingTab(tab);
+  }
+  for (const group of TabsStore.windows.get(TabsStore.getCurrentWindowId()).tabGroups.values()) {
+    if (group.$TST.states.has(Constants.kTAB_STATE_DRAGGING)) {
+      group.$TST.removeState(Constants.kTAB_STATE_DRAGGING);
+    }
+  }
+}
+
+export function clearDraggingState() {
+  const win = TabsStore.windows.get(TabsStore.getCurrentWindowId());
+  win.containerClassList.remove(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  win.pinnedContainerClassList.remove(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  document.documentElement.classList.remove(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  document.documentElement.classList.remove(Constants.kTABBAR_STATE_LINK_DRAGGING);
+}
+
+function isDraggingAllActiveTabs(tab) {
+  const draggingTabsCount = TabsStore.draggingTabsInWindow.get(tab.windowId).size;
+  const allTabsCount      = TabsStore.windows.get(tab.windowId).tabs.size;
+  return draggingTabsCount == allTabsCount;
+}
+
+function collapseAutoExpandedItemsWhileDragging() {
+  if (mLongHoverExpandedTabs.length > 0 &&
+      configs.autoExpandOnLongHoverRestoreIniitalState) {
+    for (const tab of mLongHoverExpandedTabs) {
+      BackgroundConnection.sendMessage({
+        type:      Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE,
+        tabId:     tab.id,
+        collapsed: false,
+        justNow:   true,
+        stack:     configs.debug && new Error().stack
+      });
+    }
+  }
+  mLongHoverExpandedTabs = [];
+}
+
+async function handleDroppedNonTreeItems(event, dropActionInfo) {
+  event.stopPropagation();
+
+  const uris = await RetrieveURL.fromDragEvent(event);
+  // uris.forEach(uRI => {
+  //   if (uRI.indexOf(Constants.kURI_BOOKMARK_FOLDER) != 0)
+  //     securityCheck(uRI, event);
+  // });
+  log('handleDroppedNonTreeItems: ', uris);
+
+  const dragOverItem = dropActionInfo.dragOverItem;
+  if (dragOverItem &&
+      dropActionInfo.dropPosition == kDROP_ON_SELF &&
+      !dragOverItem.pinned) {
+    const behavior = await getDroppedLinksOnTabBehavior();
+    if (behavior <= Constants.kDROPLINK_ASK)
+      return;
+    if (behavior & Constants.kDROPLINK_LOAD) {
+      BackgroundConnection.sendMessage({
+        type:  Constants.kCOMMAND_ACTIVATE_TAB,
+        tabId: dropActionInfo.dragOverItem.id,
+        byMouseOperation: true
+      });
+      BackgroundConnection.sendMessage({
+        type:  Constants.kCOMMAND_LOAD_URI,
+        uri:   uris.shift(),
+        tabId: dropActionInfo.dragOverItem.id
+      });
+    }
+  }
+  const active = !!configs.simulateTabsLoadInBackgroundInverted;
+  BackgroundConnection.sendMessage({
+    type:           Constants.kCOMMAND_NEW_TABS,
+    uris,
+    windowId:       TabsStore.getCurrentWindowId(),
+    parentId:       dropActionInfo.parent?.id,
+    insertBeforeId: dropActionInfo.insertBefore?.id,
+    insertAfterId:  dropActionInfo.insertAfter?.id,
+    active,
+    discarded:      !active && configs.tabsLoadInBackgroundDiscarded,
+  });
+}
+
+async function getDroppedLinksOnTabBehavior() {
+  let behavior = configs.dropLinksOnTabBehavior;
+  if (behavior != Constants.kDROPLINK_ASK)
+    return behavior;
+
+  const confirm = new RichConfirm({
+    message: browser.i18n.getMessage('dropLinksOnTabBehavior_message'),
+    buttons: [
+      browser.i18n.getMessage('dropLinksOnTabBehavior_load'),
+      browser.i18n.getMessage('dropLinksOnTabBehavior_newtab')
+    ],
+    checkMessage: browser.i18n.getMessage('dropLinksOnTabBehavior_save')
+  });
+  const result = await confirm.show();
+  switch (result.buttonIndex) {
+    case 0:
+      behavior = Constants.kDROPLINK_LOAD;
+      break;
+    case 1:
+      behavior = Constants.kDROPLINK_NEWTAB;
+      break;
+    default:
+      return result.buttonIndex;
+  }
+  if (result.checked)
+    configs.dropLinksOnTabBehavior = behavior;
+  return behavior;
+}
+
+
+/* DOM event listeners */
+
+let mFinishCanceledDragOperation;
+let mCurrentDragDataForExternalsId = null;
+let mCurrentDragDataForExternals = null;
+
+function onDragStart(event, options = {}) {
+  log('onDragStart: start ', event, options);
+  clearDraggingItemsState(); // clear previous state anyway
+  if (configs.enableWorkaroundForBug1548949)
+    configs.workaroundForBug1548949DroppedItems = '';
+
+  let draggedItem = options.item || EventUtils.getTreeItemFromEvent(event);
+  let behavior = 'behavior' in options ? options.behavior :
+    event.shiftKey ? configs.tabDragBehaviorShift :
+      configs.tabDragBehavior;
+
+  if (draggedItem?.$TST.subtreeCollapsed ||
+      draggedItem?.$TST.group)
+    behavior |= Constants.kDRAG_BEHAVIOR_ENTIRE_TREE;
+
+  mCurrentDragDataForExternalsId = `${parseInt(Math.random() * 65000)}-${Date.now()}`;
+  mCurrentDragDataForExternals = {};
+
+  const originalTarget = EventUtils.getElementOriginalTarget(event);
+  const extraTabContentsDragData = JSON.parse(originalTarget?.dataset?.dragData || 'null');
+  log('onDragStart: extraTabContentsDragData = ', extraTabContentsDragData);
+  let dataOverridden = false;
+  if (extraTabContentsDragData) {
+    const dataSet = detectOverrideDragDataSet(extraTabContentsDragData, event);
+    log('onDragStart: detected override data set = ', dataSet);
+    /*
+      expected drag data format:
+        Tab:
+          { type: 'tab',
+            data: { asTree:      (boolean),
+                    allowDetach: (boolean, will detach the tab to new window),
+                    allowLink:   (boolean, will create link/bookmark from the tab) }}
+        other arbitrary types:
+          { type:          'text/plain',
+            data:          'something text',
+            effectAllowed: 'copy' }
+          { type:          'text/x-moz-url',
+            data:          'http://example.com/\nExample Link',
+            effectAllowed: 'copyMove' }
+          ...
+    */
+    let tabIsGiven = false;
+    for (const data of dataSet) {
+      if (!data)
+        continue;
+      switch (data.type) {
+        case 'tab':
+          if (data.data.id) {
+            const tab = Tab.get(data.data.id);
+            if (tab) {
+              tabIsGiven = true;
+              draggedItem = tab;
+              behavior   = data.data.allowMove === false ? Constants.kDRAG_BEHAVIOR_NONE : Constants.kDRAG_BEHAVIOR_MOVE;
+              if (data.data.allowDetach)
+                behavior |= Constants.kDRAG_BEHAVIOR_TEAR_OFF;
+              if (data.data.allowLink)
+                behavior |= Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK;
+              if (data.data.asTree)
+                behavior |= Constants.kDRAG_BEHAVIOR_ENTIRE_TREE;
+            }
+          }
+          break;
+        default: {
+          const dt = event.dataTransfer;
+          dt.effectAllowed = data.effectAllowed || 'copy';
+          const type       = String(data.type);
+          const stringData = String(data.data);
+          dt.setData(type, stringData);
+          //*** We need to sanitize drag data from helper addons, because
+          //they can have sensitive data...
+          //mCurrentDragDataForExternals[type] = stringData;
+          dataOverridden = true;
+        }; break;
+      }
+    }
+    if (!tabIsGiven && dataOverridden)
+      return;
+  }
+
+  const allowBookmark = !!(behavior & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK);
+  const asTree = !!(behavior & Constants.kDRAG_BEHAVIOR_ENTIRE_TREE);
+  const dragData = getDragDataFromOneItem(draggedItem, { asTree });
+  dragData.individualOnOutside = dragData.item && !dragData.item.$TST.multiselected && !asTree
+  dragData.behavior = behavior;
+  if (!dragData.item) {
+    log('onDragStart: canceled / no dragged item from drag data');
+    return;
+  }
+  log('dragData: ', dragData);
+
+  if (!(behavior & Constants.kDRAG_BEHAVIOR_MOVE) &&
+      !(behavior & Constants.kDRAG_BEHAVIOR_TEAR_OFF) &&
+      !allowBookmark) {
+    log('ignore drag action because it can do nothing');
+    event.stopPropagation();
+    event.preventDefault();
+    return;
+  }
+
+  const item      = dragData.item;
+  const mousedown = EventUtils.getLastMousedown(event.button);
+
+  if (mousedown &&
+      mousedown.detail.lastInnerScreenY != window.mozInnerScreenY) {
+    log('ignore accidental drag from updated visual gap');
+    event.stopPropagation();
+    event.preventDefault();
+    return;
+  }
+
+  if (mousedown?.expired) {
+    log('onDragStart: canceled / expired');
+    event.stopPropagation();
+    event.preventDefault();
+    mLastDragEnteredTarget = item.$TST.element || null;
+    const startOnClosebox = mDragTargetIsClosebox = mousedown.detail.closebox;
+    if (startOnClosebox)
+      mLastDragEnteredTarget = item.$TST.element?.closeBox || null;
+    const windowId = TabsStore.getCurrentWindowId();
+    TSTAPI.broadcastMessage({
+      type:   TSTAPI.kNOTIFY_TAB_DRAGSTART,
+      item,
+      tab:    item.$TST.tab, // for backward compatibility
+      window: windowId,
+      windowId,
+      startOnClosebox
+    }, { tabProperties: ['item', 'tab'] }).catch(_error => {});
+    window.addEventListener('mouseover', onTSTAPIDragEnter, { capture: true });
+    window.addEventListener('mouseout',  onTSTAPIDragExit, { capture: true });
+    document.body.setCapture(false);
+    mCapturingForDragging = true;
+    return;
+  }
+
+  // dragging on clickable element will be expected to cancel the operation
+  if (EventUtils.isEventFiredOnClosebox(options.item?.$TST.element || event) ||
+      EventUtils.isEventFiredOnClickable(options.item?.$TST.element || event)) {
+    log('onDragStart: canceled / on undraggable element');
+    event.stopPropagation();
+    event.preventDefault();
+    return;
+  }
+
+  EventUtils.cancelHandleMousedown();
+
+  mDraggingOnSelfWindow = true;
+  mDraggingOnDraggedItems = true;
+  mLastDropPosition = mLastInlineDropPosition = null;
+
+  const dt = event.dataTransfer;
+  dt.effectAllowed = 'copyMove';
+
+  const sanitizedDragData = sanitizeDragData(dragData);
+  dt.setData(kTREE_DROP_TYPE, JSON.stringify(sanitizedDragData));
+
+  log(`onDragStart: starting drag session ${sanitizedDragData.sessionId}`);
+
+  // Because addon cannot read drag data across private browsing mode,
+  // we need to share detailed information of dragged items in different way!
+  mCurrentDragData = sanitizedDragData;
+  browser.runtime.sendMessage({
+    type:     Constants.kCOMMAND_BROADCAST_CURRENT_DRAG_DATA,
+    windowId: TabsStore.getCurrentWindowId(),
+    dragData: sanitizedDragData
+  }).catch(ApiTabs.createErrorSuppressor());
+
+  if (!dataOverridden &&
+      dragData.tab) {
+    const urls    = [];
+    const mozUrl  = [];
+    const urlList = [];
+    for (const draggedTab of dragData.tabs) {
+      draggedTab.$TST.addState(Constants.kTAB_STATE_DRAGGING);
+      TabsStore.addDraggingTab(draggedTab);
+      if (!dragData.individualOnOutside ||
+          mozUrl.length == 0) {
+        urls.push(draggedTab.url);
+        mozUrl.push(`${draggedTab.url}\n${draggedTab.title}`);
+        urlList.push(`#${draggedTab.title}\n${draggedTab.url}`);
+      }
+    }
+    mCurrentDragDataForExternals[RetrieveURL.kTYPE_PLAIN_TEXT] = urls.join('\n');
+    mCurrentDragDataForExternals[RetrieveURL.kTYPE_X_MOZ_URL] = mozUrl.join('\n');
+    mCurrentDragDataForExternals[RetrieveURL.kTYPE_URI_LIST] = urlList.join('\n');
+    if (allowBookmark) {
+      log('set kTYPE_PLAIN_TEXT ', mCurrentDragDataForExternals[RetrieveURL.kTYPE_PLAIN_TEXT]);
+      dt.setData(RetrieveURL.kTYPE_PLAIN_TEXT, mCurrentDragDataForExternals[RetrieveURL.kTYPE_PLAIN_TEXT]);
+      log('set kTYPE_X_MOZ_URL ', mCurrentDragDataForExternals[RetrieveURL.kTYPE_X_MOZ_URL]);
+      dt.setData(RetrieveURL.kTYPE_X_MOZ_URL, mCurrentDragDataForExternals[RetrieveURL.kTYPE_X_MOZ_URL]);
+      log('set kTYPE_URI_LIST ', mCurrentDragDataForExternals[RetrieveURL.kTYPE_URI_LIST]);
+      dt.setData(RetrieveURL.kTYPE_URI_LIST, mCurrentDragDataForExternals[RetrieveURL.kTYPE_URI_LIST]);
+    }
+  }
+  {
+    const dragDataType    = `${kTYPE_ADDON_DRAG_DATA}${mCurrentDragDataForExternalsId}`;
+    const dragDataContent = JSON.stringify(mCurrentDragDataForExternals);
+    try {
+      dt.setData(dragDataType, dragDataContent);
+    }
+    catch(error) {
+      console.error(error);
+      console.log(`Failed to set drag data with the type ${dragDataType}:`, dragDataContent);
+    }
+  }
+
+  if (item.$TST.element) {
+    // We set negative offsets to get more visibility about drop targets.
+    // See also: https://github.com/piroor/treestyletab/issues/2826
+    const offset = -16;
+    dt.setDragImage(item.$TST.element, offset, offset);
+  }
+
+  const win = TabsStore.windows.get(TabsStore.getCurrentWindowId());
+  win.containerClassList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  win.pinnedContainerClassList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  document.documentElement.classList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+
+  if (!('behavior' in options) &&
+      configs.showTabDragBehaviorNotification) {
+    const invertedBehavior = event.shiftKey ? configs.tabDragBehavior : configs.tabDragBehaviorShift;
+    const count            = dragData.tabs.length;
+    const currentResult    = getTabDragBehaviorNotificationMessageType(behavior, count);
+    const invertedResult   = getTabDragBehaviorNotificationMessageType(invertedBehavior, count);
+    if (currentResult || invertedResult) {
+      const invertSuffix = event.shiftKey ? 'without_shift' : 'with_shift';
+      Notifications.add('tab-drag-behavior-description', {
+        message: [
+          currentResult && browser.i18n.getMessage(`tabDragBehaviorNotification_message_base`, [
+            browser.i18n.getMessage(`tabDragBehaviorNotification_message_${currentResult}`)]),
+          invertedResult && browser.i18n.getMessage(`tabDragBehaviorNotification_message_inverted_base_${invertSuffix}`, [
+            browser.i18n.getMessage(`tabDragBehaviorNotification_message_${invertedResult}`)]),
+        ].join('\n'),
+        onCreated(notification) {
+          notification.style.animationDuration = !shouldApplyAnimation() ?
+            0 :
+            browser.i18n.getMessage(`tabDragBehaviorNotification_message_duration_${currentResult && invertedResult ? 'both' : 'single'}`)
+        },
+      });
+    }
+  }
+
+  TSTAPI.broadcastMessage({
+    type:     TSTAPI.kNOTIFY_NATIVE_TAB_DRAGSTART,
+    item,
+    tab:      item.$TST.tab, // for backward compatibility
+    windowId: TabsStore.getCurrentWindowId()
+  }, { tabProperties: ['item', 'tab'] }).catch(_error => {});
+
+  updateLastDragEventCoordinates(event);
+  // Don't store raw URLs to save privacy!
+  sha1sum(dragData.tabs.map(tab => tab.url).join('\n')).then(digest => {
+    configs.lastDraggedTabs = {
+      tabIds:     dragData.tabs.map(tab => tab.id),
+      urlsDigest: digest
+    };
+  });
+
+  log('onDragStart: started');
+}
+onDragStart = EventUtils.wrapWithErrorHandler(onDragStart);
+
+/* acceptable input:
+  {
+    "default":    { type: ..., data: ... },
+    "Ctrl":       { type: ..., data: ... },
+    "MacCtrl":    { type: ..., data: ... },
+    "Ctrl+Shift": { type: ..., data: ... },
+    "Alt-Shift":  { type: ..., data: ... },
+    ...
+  }
+*/
+function detectOverrideDragDataSet(dataSet, event) {
+  if (Array.isArray(dataSet))
+    return dataSet.map(oneDataSet => detectOverrideDragDataSet(oneDataSet, event)).flat();
+
+  if ('type' in dataSet)
+    return [dataSet];
+
+  const keys = [];
+  if (event.altKey)
+    keys.push('alt');
+  if (event.ctrlKey) {
+    if (isMacOS())
+      keys.push('macctrl');
+    else
+      keys.push('ctrl');
+  }
+  if (event.metaKey) {
+    if (isMacOS())
+      keys.push('command');
+    else
+      keys.push('meta');
+  }
+  if (event.shiftKey)
+    keys.push('shift');
+  const findKey = keys.sort().join('+') || 'default';
+
+  for (const key of Object.keys(dataSet)) {
+    const normalizedKey = key.split(/[-\+]/).filter(part => !!part).sort().join('+').toLowerCase();
+    if (normalizedKey != findKey)
+      continue;
+    if (Array.isArray(dataSet[key]))
+      return dataSet[key];
+    else
+      return [dataSet[key]];
+  }
+  return [];
+}
+
+function getTabDragBehaviorNotificationMessageType(behavior, count) {
+  if (behavior & Constants.kDRAG_BEHAVIOR_ENTIRE_TREE && count > 1) {
+    if (behavior & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK)
+      return 'tree_bookmark';
+    else if (behavior & Constants.kDRAG_BEHAVIOR_TEAR_OFF)
+      return 'tree_tearoff';
+    else
+      return '';
+  }
+  else {
+    if (behavior & Constants.kDRAG_BEHAVIOR_ALLOW_BOOKMARK)
+      return 'tab_bookmark';
+    else if (behavior & Constants.kDRAG_BEHAVIOR_TEAR_OFF)
+      return 'tab_tearoff';
+    else
+      return '';
+  }
+}
+
+let mLastDragOverTimestamp = null;
+let mDelayedClearDropPosition = null;
+
+function onDragOver(event) {
+  const dt = event.dataTransfer;
+  if (dt.types.length == 0) {
+    // On Linux, unexpected invalid dragover events can be fired on various triggers unrelated to drag and drop.
+    // TST ignores such events as a workaround.
+    // See also: https://github.com/piroor/treestyletab/issues/3374
+    log('onDragOver: ignore invalid dragover event');
+    return;
+  }
+
+  if (mFinishCanceledDragOperation) {
+    clearTimeout(mFinishCanceledDragOperation);
+    mFinishCanceledDragOperation = null;
+  }
+
+  if (!isLinux()) {
+    if (mDelayedClearDropPosition)
+      clearTimeout(mDelayedClearDropPosition);
+    mDelayedClearDropPosition = setTimeout(() => {
+      mDelayedClearDropPosition = null;
+      clearDropPosition();
+    }, 250);
+  }
+
+  event.preventDefault(); // this is required to override default dragover actions!
+  Scroll.autoScrollOnMouseEvent(event);
+
+  updateLastDragEventCoordinates(event);
+
+  // reduce too much handling of too frequent dragover events...
+  const now = Date.now();
+  if (now - (mLastDragOverTimestamp || 0) < configs.minimumIntervalToProcessDragoverEvent)
+    return;
+  mLastDragOverTimestamp = now;
+
+  const info = getDropAction(event);
+
+  let dragData = dt.getData(kTREE_DROP_TYPE);
+  dragData = (dragData && JSON.parse(dragData)) || mCurrentDragData;
+  const sessionId = dragData?.sessionId || '';
+  log(`onDragOver: sessionId=${sessionId}, types=${dt.types}, dropEffect=${dt.dropEffect}, effectAllowed=${dt.effectAllowed}, item=`, dragData?.item);
+
+  if (isEventFiredOnItemDropBlocker(event) ||
+      !info.canDrop) {
+    log(`onDragOver: not droppable sessionId=${sessionId}`);
+    dt.dropEffect = 'none';
+    if (mLastDropPosition)
+      clearDropPosition();
+    mLastDropPosition = mLastInlineDropPosition = null;
+    return;
+  }
+
+  if (EventUtils.isEventFiredOnNewTabButton(event)) {
+    log(`onDragOver: dragging something on the new tab button sessionId=${sessionId}`);
+    dt.dropEffect = 'move';
+    if (mLastDropPosition)
+      clearDropPosition();
+    mLastDropPosition = mLastInlineDropPosition = null;
+    return;
+  }
+
+  let dropPositionTargetItem = info.targetItem;
+  if (dropPositionTargetItem?.$TST?.collapsed)
+    dropPositionTargetItem = info.targetItem.$TST.nearestVisiblePrecedingTab || info.targetItem;
+  if (!dropPositionTargetItem) {
+    log(`onDragOver: no drop target item sessionId=${sessionId}`);
+    dt.dropEffect = 'none';
+    mLastDropPosition = mLastInlineDropPosition = null;
+    return;
+  }
+
+  const dropPosition = `${dropPositionTargetItem.id}:${info.dropPosition}`;
+  const inlineDropPosition = `${dropPositionTargetItem.id}:${info.inlineDropPosition}`;
+  if (!info.draggedItem ||
+      dropPositionTargetItem.id != info.draggedItem.id ||
+      dropPosition != mLastDropPosition ||
+      inlineDropPosition != mLastInlineDropPosition) {
+    if (dropPosition == mLastDropPosition &&
+        inlineDropPosition == mLastInlineDropPosition) {
+      log(`onDragOver: no move, sessionId=${sessionId}`);
+      return;
+    }
+    clearDropPosition();
+    dropPositionTargetItem.$TST.setAttribute(kDROP_POSITION, info.dropPosition);
+    dropPositionTargetItem.$TST.setAttribute(kINLINE_DROP_POSITION, info.inlineDropPosition);
+    mDropPositionHolderItems.add(dropPositionTargetItem);
+    if (info.canCreateGroup) {
+      dropPositionTargetItem.$TST.setAttribute(kNEXT_GROUP_COLOR, dragData.nextGroupColor);
+    }
+    const substanceTargetItem = info.substanceTargetItem;
+    if (substanceTargetItem &&
+        info.dropPosition == kDROP_ON_SELF) {
+      substanceTargetItem.$TST.setAttribute(kDROP_POSITION, info.dropPosition);
+      substanceTargetItem.$TST.setAttribute(kINLINE_DROP_POSITION, info.inlineDropPosition);
+      mDropPositionHolderItems.add(substanceTargetItem);
+    }
+    mLastDropPosition = dropPosition;
+    mLastInlineDropPosition = inlineDropPosition;
+    log(`onDragOver: set drop position to ${dropPosition}, sessionId=${sessionId}`);
+  }
+  else {
+    mLastDropPosition = mLastInlineDropPosition = null;
+  }
+}
+onDragOver = EventUtils.wrapWithErrorHandler(onDragOver);
+
+function isEventFiredOnItemDropBlocker(event) {
+  let node = event.target;
+  if (node.nodeType != Node.ELEMENT_NODE)
+    node = node.parentNode;
+  return node && !!node.closest('.item-drop-blocker');
+}
+
+function onDragEnter(event) {
+  configs.lastDragOverSidebarOwnerWindowId = TabsStore.getCurrentWindowId();
+
+  mDraggingOnSelfWindow = true;
+
+  const info = getDropAction(event);
+  try {
+    const enteredItem = EventUtils.getTreeItemFromEvent(event);
+    const leftItem    = SidebarItems.getItemFromDOMNode(event.relatedTarget);
+    if (leftItem != enteredItem) {
+      mDraggingOnDraggedItems = (
+        info.dragData &&
+        info.dragData.tabs.some(tab => tab.id == enteredItem.id)
+      );
+    }
+    const win = TabsStore.windows.get(TabsStore.getCurrentWindowId());
+    win.containerClassList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+    win.pinnedContainerClassList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+    document.documentElement.classList.add(Constants.kTABBAR_STATE_TAB_DRAGGING);
+  }
+  catch(_e) {
+  }
+
+  const dt   = event.dataTransfer;
+  dt.dropEffect = info.dropEffect;
+  if (info.dropEffect == 'link')
+    document.documentElement.classList.add(Constants.kTABBAR_STATE_LINK_DRAGGING);
+
+  updateLastDragEventCoordinates(event);
+
+  if (!info.canDrop ||
+      !info.dragOverItem)
+    return;
+
+  reserveToProcessLongHover.cancel();
+
+  if (info.draggedItem &&
+      info.dragOverItem.id == info.draggedItem.id)
+    return;
+
+  reserveToProcessLongHover({
+    dragOverItemId: info.targetItem?.id,
+    draggedItemId:  info.draggedItem?.id,
+    dropEffect:     info.dropEffect,
+  });
+}
+onDragEnter = EventUtils.wrapWithErrorHandler(onDragEnter);
+
+function reserveToProcessLongHover({ dragOverItemId, draggedItemId, dropEffect }) {
+  mLongHoverTimerNext = setTimeout(() => {
+    if (!mLongHoverTimerNext)
+      return; // already canceled
+    mLongHoverTimerNext = null;
+    mLongHoverTimer = setTimeout(async () => {
+      if (!mLongHoverTimer)
+        return; // already canceled
+
+      mLongHoverTimer = null;
+      log('reservedProcessLongHover: ', { dragOverItemId, draggedItemId, dropEffect });
+
+      const dragOverItem = Tab.get(dragOverItemId);
+      if (!dragOverItem ||
+          dragOverItem.$TST.getAttribute(kDROP_POSITION) != 'self')
+        return;
+
+      // auto-switch for staying on tabs
+      if (!dragOverItem.active &&
+          dropEffect == 'link') {
+        BackgroundConnection.sendMessage({
+          type:  Constants.kCOMMAND_ACTIVATE_TAB,
+          tabId: dragOverItem.id,
+          byMouseOperation: true
+        });
+      }
+
+      if (!configs.autoExpandOnLongHover ||
+          !dragOverItem ||
+          !dragOverItem.$TST.isAutoExpandable)
+        return;
+
+      // auto-expand for staying on a parent
+      if (configs.autoExpandIntelligently) {
+        BackgroundConnection.sendMessage({
+          type:  Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE_INTELLIGENTLY_FOR,
+          tabId: dragOverItem.id
+        });
+      }
+      else {
+        if (!mLongHoverExpandedTabs.includes(dragOverItemId))
+          mLongHoverExpandedTabs.push(dragOverItemId);
+        BackgroundConnection.sendMessage({
+          type:      Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE,
+          tabId:     dragOverItem.id,
+          collapsed: false,
+          stack:     configs.debug && new Error().stack
+        });
+      }
+    }, configs.autoExpandOnLongHoverDelay);
+  }, 0);
+}
+reserveToProcessLongHover.cancel = function() {
+  if (mLongHoverTimer) {
+    clearTimeout(mLongHoverTimer);
+    mLongHoverTimer = null;
+  }
+  if (mLongHoverTimerNext) {
+    clearTimeout(mLongHoverTimerNext);
+    mLongHoverTimerNext = null;
+  }
+};
+
+function onDragLeave(event) {
+  if (configs.lastDragOverSidebarOwnerWindowId == TabsStore.getCurrentWindowId())
+    configs.lastDragOverSidebarOwnerWindowId = null;
+
+  let leftFromTabBar = false;
+  try {
+    const info        = getDropAction(event);
+    const leftItem    = EventUtils.getTreeItemFromEvent(event);
+    const enteredItem = SidebarItems.getItemFromDOMNode(event.relatedTarget);
+    if (leftItem != enteredItem) {
+      if (info.dragData &&
+          info.dragData.items.some(item => item.id == leftItem.id) &&
+          (!enteredItem ||
+           !info.dragData.items.every(item => item.id == enteredItem.id))) {
+        onDragLeave.delayedLeftFromDraggedItems = setTimeout(() => {
+          delete onDragLeave.delayedLeftFromDraggedItems;
+          mDraggingOnDraggedItems = false;
+        }, 10);
+      }
+      else {
+        leftFromTabBar = !enteredItem || enteredItem.windowId != TabsStore.getCurrentWindowId();
+        if (onDragLeave.delayedLeftFromDraggedItems) {
+          clearTimeout(onDragLeave.delayedLeftFromDraggedItems);
+          delete onDragLeave.delayedLeftFromDraggedItems;
+        }
+      }
+    }
+  }
+  catch(_e) {
+    leftFromTabBar = true;
+  }
+
+  if (leftFromTabBar) {
+    onDragLeave.delayedLeftFromTabBar = setTimeout(() => {
+      delete onDragLeave.delayedLeftFromTabBar;
+      mDraggingOnSelfWindow = false;
+      mDraggingOnDraggedItems = false;
+      clearDropPosition();
+      clearDraggingState();
+      mLastDropPosition = null;
+      mLastInlineDropPosition = null;
+      reserveToProcessLongHover.cancel();
+    }, 10);
+  }
+  else if (onDragLeave.delayedLeftFromTabBar) {
+    clearTimeout(onDragLeave.delayedLeftFromTabBar);
+    delete onDragLeave.delayedLeftFromTabBar;
+  }
+
+  updateLastDragEventCoordinates(event);
+  clearTimeout(mLongHoverTimer);
+  mLongHoverTimer = null;
+}
+onDragLeave = EventUtils.wrapWithErrorHandler(onDragLeave);
+
+function onDrop(event) {
+  setTimeout(() => {
+    collapseAutoExpandedItemsWhileDragging();
+    // Don't clear flags immediately, because they are referred by following operations in this function.
+    finishDrag('onDrop');
+  }, 0);
+
+  const dropActionInfo = getDropAction(event);
+
+  let dragData = event.dataTransfer.getData(kTREE_DROP_TYPE);
+  dragData = (dragData && JSON.parse(dragData)) || mCurrentDragData;
+  const sessionId = dragData?.sessionId || '';
+  log(`onDrop ${sessionId}`, dropActionInfo, event.dataTransfer);
+
+  if (!dropActionInfo.canDrop) {
+    log('undroppable');
+    return;
+  }
+
+  const dt = event.dataTransfer;
+  if (dt.dropEffect != 'link' &&
+      dt.dropEffect != 'move' &&
+      dropActionInfo.dragData &&
+      !dropActionInfo.dragData.item) {
+    log('invalid drop');
+    return;
+  }
+
+  // We need to cancel the drop event explicitly to prevent Firefox tries to load the dropped URL to the tab itself.
+  // This is required to use "ext+ws:tabbar" in a regular tab.
+  // See also: https://github.com/piroor/treestyletab/issues/3056
+  event.preventDefault();
+
+  if (dropActionInfo.dragData &&
+      dropActionInfo.dragData.item) {
+    log('there are dragged items: ', () => dropActionInfo.dragData.items.map(dumpTab));
+    if (configs.enableWorkaroundForBug1548949) {
+      configs.workaroundForBug1548949DroppedItems = dropActionInfo.dragData.items.map(item => `${mInstanceId}/${item.id}`).join('\n');
+      log('workaround for bug 1548949: setting last dropped items: ', configs.workaroundForBug1548949DroppedItems);
+    }
+    const { draggedItems, structure, insertBefore, insertAfter } = sanitizeDraggedItems({
+      draggedItems: dropActionInfo.dragData.items,
+      structure:    dropActionInfo.dragData.structure,
+      insertBefore: dropActionInfo.insertBefore,
+      insertAfter:  dropActionInfo.insertAfter,
+      parent:       dropActionInfo.parent,
+      isCopy:       dt.dropEffect == 'copy',
+    });
+    const fromOtherProfile = dropActionInfo.dragData.instanceId != mInstanceId;
+    BackgroundConnection.sendMessage({
+      type:                Constants.kCOMMAND_PERFORM_TABS_DRAG_DROP,
+      windowId:            dropActionInfo.dragData.windowId,
+      items:               draggedItems.map(item => item?.$TST?.sanitized || item),
+      droppedOn:           dropActionInfo.sanitizedDropOnTargetItem,
+      droppedBefore:       dropActionInfo.sanitizedDropBeforeTargetItem,
+      droppedAfter:        dropActionInfo.sanitizedDropAfterTargetItem,
+      groupId:             dropActionInfo.groupId,
+      structure,
+      action:              dropActionInfo.action,
+      allowedActions:      dropActionInfo.dragData.behavior,
+      attachToId:          dropActionInfo.parent?.id,
+      insertBefore:        insertBefore?.$TST?.sanitized || insertBefore,
+      insertAfter:         insertAfter?.$TST?.sanitized || insertAfter,
+      destinationWindowId: TabsStore.getCurrentWindowId(),
+      duplicate:           !fromOtherProfile && dt.dropEffect == 'copy',
+      nextGroupColor:      dropActionInfo.dragData.nextGroupColor,
+      canCreateGroup:      dropActionInfo.canCreateGroup,
+      import:              fromOtherProfile
+    });
+    return;
+  }
+
+  if (dt.types.includes(RetrieveURL.kTYPE_MOZ_TEXT_INTERNAL) &&
+      configs.guessDraggedNativeTabs) {
+    const url = dt.getData(RetrieveURL.kTYPE_MOZ_TEXT_INTERNAL);
+    log(`finding native tabs with the dropped URL: ${url}`);
+    browser.tabs.query({ url, active: true }).then(async tabs => {
+      if (!tabs.length && url.includes('#')) {
+        log(`=> find again without the fragment part`);
+        tabs = await browser.tabs.query({ url: url.replace(/#.*$/, ''), active: true });
+        if (!tabs.length) {
+          log('=> no such tabs, maybe dropped from other profile');
+          handleDroppedNonTreeItems(event, dropActionInfo);
+          return;
+        }
+      }
+      log('=> possible dragged tabs: ', tabs);
+      tabs = tabs.sort((a, b) => b.lastAccessed - a.lastAccessed);
+      if (configs.enableWorkaroundForBug1548949) {
+        configs.workaroundForBug1548949DroppedItems = tabs.map(tab => `${mInstanceId}/${tab.id}`).join('\n');
+        log('workaround for bug 1548949: setting last dropped tabs: ', configs.workaroundForBug1548949DroppedItems);
+      }
+      const recentTab = tabs[0];
+
+      const multiselectedTabs = await browser.tabs.query({
+        windowId:    recentTab.windowId,
+        highlighted: true,
+      });
+      const structureFromMultiselectedTabs = (recentTab.windowId == TabsStore.getCurrentWindowId()) ?
+        TreeBehavior.getTreeStructureFromTabs(multiselectedTabs.map(tab => Tab.get(tab.id))) :
+        (await browser.runtime.sendMessage({
+          type: Constants.kCOMMAND_PULL_TREE_STRUCTURE,
+          tabIds: multiselectedTabs.map(tab => tab.id),
+        })).structure;
+      log('maybe dragged tabs: ', multiselectedTabs, structureFromMultiselectedTabs);
+
+      const { draggedItems, structure, insertBefore, insertAfter } = sanitizeDraggedItems({
+        draggedItems: multiselectedTabs,
+        structure:    structureFromMultiselectedTabs,
+        insertBefore: dropActionInfo.insertBefore,
+        insertAfter:  dropActionInfo.insertAfter,
+        parent:       dropActionInfo.parent,
+        isCopy:       dt.dropEffect == 'copy',
+      });
+
+      const allowedActions = event.shiftKey ?
+        configs.tabDragBehaviorShift :
+        configs.tabDragBehavior;
+      BackgroundConnection.sendMessage({
+        type:                Constants.kCOMMAND_PERFORM_TABS_DRAG_DROP,
+        windowId:            recentTab.windowId,
+        items:               draggedItems.map(item => item?.$TST?.sanitized || item),
+        droppedOn:           dropActionInfo.sanitizedDropOnTargetItem,
+        droppedBefore:       dropActionInfo.sanitizedDropBeforeTargetItem,
+        droppedAfter:        dropActionInfo.sanitizedDropAfterTargetItem,
+        groupId:             dropActionInfo.groupId,
+        structure,
+        action:              dropActionInfo.action,
+        allowedActions,
+        attachToId:          dropActionInfo.parent?.id,
+        insertBefore:        insertBefore?.$TST?.sanitized || insertBefore,
+        insertAfter:         insertAfter?.$TST?.sanitized || insertAfter,
+        destinationWindowId: TabsStore.getCurrentWindowId(),
+        duplicate:           dt.dropEffect == 'copy',
+        nextGroupColor:      dropActionInfo.dragData?.nextGroupColor,
+        canCreateGroup:      dropActionInfo.canCreateGroup,
+        import:              false
+      });
+    });
+    return;
+  }
+
+  log('link or bookmark item is dropped');
+  handleDroppedNonTreeItems(event, dropActionInfo);
+}
+onDrop = EventUtils.wrapWithErrorHandler(onDrop);
+
+function sanitizeDraggedItems({ draggedItems, structure, insertBefore, insertAfter, parent, isCopy }) {
+  const parentId = parent?.id;
+  log('sanitizeDraggedItems: ', () => ({ draggedItems: draggedItems.map(dumpTab), structure, insertBefore: dumpTab(insertBefore), insertAfter: dumpTab(insertAfter), parentId, isCopy }));
+  if (isCopy ||
+      !configs.moveSoloTabOnDropParentToDescendant ||
+      draggedItems.every(item => item.id != parentId))
+    return { draggedItems, structure, insertBefore, insertAfter };
+
+  log('=> dropping parent to a descendant: partial attach mode');
+  for (let i = draggedItems.length - 1; i > -1; i--) {
+    if (structure[i].parent < 0)
+      continue;
+    draggedItems.splice(i, 1);
+    structure.splice(i, 1);
+  }
+  insertBefore = parent?.$TST.nextSiblingTab;
+  insertAfter  = parent;
+  return { draggedItems, structure, insertBefore, insertAfter };
+}
+
+async function onDragEnd(event) {
+  log('onDragEnd, ', { event, mDraggingOnSelfWindow, mDraggingOnDraggedItems, dropEffect: event.dataTransfer?.dropEffect });
+  if (!mLastDragEventCoordinates) {
+    log('dragend is handled after finishDrag - already handled by ondrop handler.');
+    return;
+  }
+  const lastDragEventCoordinatesX = mLastDragEventCoordinates.x;
+  const lastDragEventCoordinatesY = mLastDragEventCoordinates.y;
+  const lastDragEventCoordinatesTimestamp = mLastDragEventCoordinates.timestamp;
+  const droppedOnSidebarArea = !!configs.lastDragOverSidebarOwnerWindowId;
+
+  let dragData = event.dataTransfer?.getData(kTREE_DROP_TYPE);
+  dragData = (dragData && JSON.parse(dragData)) || mCurrentDragData;
+  if (dragData) {
+    dragData.item  = TreeItem.get(dragData.item) || dragData.item;
+    dragData.items = dragData.items && dragData.items.map(item => TreeItem.get(item) || item);
+    log(`onDragEnd: finishing drag session ${dragData.sessionId}`);
+  }
+
+  TSTAPI.broadcastMessage({
+    type:     TSTAPI.kNOTIFY_NATIVE_TAB_DRAGEND,
+    windowId: TabsStore.getCurrentWindowId()
+  }).catch(_error => {});
+
+  // Don't clear flags immediately, because they are referred by following operations in this function.
+  setTimeout(finishDrag, 0, 'onDragEnd');
+
+  if (!dragData ||
+      !(dragData.behavior & Constants.kDRAG_BEHAVIOR_TEAR_OFF))
+    return;
+
+  let handledBySomeone = event.dataTransfer?.dropEffect != 'none';
+
+  if (event.dataTransfer?.getData(RetrieveURL.kTYPE_URI_LIST)) {
+    log('do nothing by TST for dropping just for bookmarking or linking');
+    return;
+  }
+  else if (configs.enableWorkaroundForBug1548949) {
+    // Due to the bug 1548949, "dropEffect" can become "move" even if no one
+    // actually handles the drop. Basically kTREE_DROP_TYPE is not processible
+    // by anyone except TST, so, we can treat the dropend as "dropped outside
+    // the sidebar" when all dragged tabs are exact same to last tabs dropped
+    // to a sidebar on this Firefox instance.
+    // The only one exception is the case: tabs have been dropped to a TST
+    // sidebar on any other Firefox instance. In this case tabs dropped to the
+    // foreign Firefox will become duplicated: imported to the foreign Firefox
+    // and teared off from the source window. This is clearly undesider
+    // behavior from misdetection, but I decide to ignore it because it looks
+    // quite rare case.
+    await wait(250); // wait until "workaroundForBug1548949DroppedItems" is synchronized
+    const draggedItems = dragData.items.map(item => `${mInstanceId}/${item.id}`).join('\n');
+    const lastDroppedItems = configs.workaroundForBug1548949DroppedItems;
+    handledBySomeone = draggedItems == lastDroppedItems;
+    log('workaround for bug 1548949: detect dragged tabs are handled by me or not.',
+        { handledBySomeone, draggedItems, lastDroppedItems });
+    configs.workaroundForBug1548949DroppedItems = null;
+  }
+
+  if (event.dataTransfer?.mozUserCancelled ||
+      handledBySomeone) {
+    log('dragged items are processed by someone: ', event.dataTransfer?.dropEffect);
+    return;
+  }
+
+  if (droppedOnSidebarArea) {
+    log('dropped on the tab bar (from event): detaching is canceled');
+    return;
+  }
+
+  if (configs.ignoreTabDropNearSidebarArea) {
+    const windowX = window.mozInnerScreenX;
+    const windowY = window.mozInnerScreenY;
+    const windowW = window.innerWidth;
+    const windowH = window.innerHeight;
+    const offset  = Scroll.getItemRect(dragData.item).height / 2;
+    const now = Date.now();
+    log('dragend at: ', {
+      windowX,
+      windowY,
+      windowW,
+      windowH,
+      eventScreenX: event.screenX,
+      eventScreenY: event.screenY,
+      eventClientX: event.clientX,
+      eventClientY: event.clientY,
+      lastDragEventCoordinatesX,
+      lastDragEventCoordinatesY,
+      offset,
+    });
+    if (event.screenX >= windowX - offset &&
+        event.screenY >= windowY - offset &&
+        event.screenX <= windowX + windowW + offset &&
+        event.screenY <= windowY + windowH + offset) {
+      log('dropped near the tab bar (from coordinates): detaching is canceled');
+      return;
+    }
+    // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1561879
+    // On macOS sometimes drag gesture is canceled immediately with (0,0) coordinates.
+    // (This happens on Windows also.)
+    const delayFromLast = now - lastDragEventCoordinatesTimestamp;
+    const rawOffsetX    = Math.abs(event.screenX - lastDragEventCoordinatesX);
+    const rawOffsetY    = Math.abs(event.screenY - lastDragEventCoordinatesY);
+    log('check: ', {
+      now,
+      lastDragEventCoordinatesTimestamp,
+      delayFromLast,
+      maxDelay: configs.maximumDelayForBug1561879,
+      offset,
+      rawOffsetX,
+      rawOffsetY,
+    });
+    if (event.screenX == 0 &&
+        event.screenY == 0 &&
+        // We need to accept intentional drag and drop at left edge of the screen.
+        // For safety, cancel only when the coordinates become (0,0) accidently from the bug.
+        delayFromLast < configs.maximumDelayForBug1561879 &&
+        rawOffsetX > offset &&
+        rawOffsetY > offset) {
+      log('dropped at unknown position: detaching is canceled');
+      return;
+    }
+  }
+
+  log('trying to detach item from window');
+  event.stopPropagation();
+  event.preventDefault();
+
+  if (dragData.tab) {
+    if (isDraggingAllActiveTabs(dragData.tab)) {
+      log('all tabs are dragged, so it is nonsence to tear off them from the window');
+      return;
+    }
+
+    const detachTabs = dragData.individualOnOutside ? [dragData.tab] : dragData.tabs;
+    BackgroundConnection.sendMessage({
+      type:      Constants.kCOMMAND_NEW_WINDOW_FROM_TABS,
+      tabIds:    detachTabs.map(tab => tab.id),
+      duplicate: EventUtils.isAccelKeyPressed(event),
+      left:      event.screenX,
+      top:       event.screenY,
+    });
+  }
+
+  if (dragData.item?.$TST.group) {
+    if (dragData.item?.$TST.members.length == TabsStore.windows.get(dragData.item.windowId).tabs.size) {
+      log('the last one group containing all tabs is dragged, so it is nonsence to tear off it from the window');
+      return;
+    }
+
+    BackgroundConnection.sendMessage({
+      type:      Constants.kCOMMAND_NEW_WINDOW_FROM_NATIVE_TAB_GROUP,
+      windowId:  dragData.item.windowId,
+      groupId:   dragData.item.id,
+      duplicate: EventUtils.isAccelKeyPressed(event),
+      left:      event.screenX,
+      top:       event.screenY,
+    });
+  }
+
+}
+onDragEnd = EventUtils.wrapWithErrorHandler(onDragEnd);
+
+function finishDrag(trigger) {
+  log(`finishDrag from ${trigger || 'unknown'}`);
+
+  Notifications.remove('tab-drag-behavior-description');
+
+  mDraggingOnSelfWindow = false;
+
+  wait(100).then(() => {
+    mCurrentDragData = null;
+    mCurrentDragDataForExternalsId = null;
+    mCurrentDragDataForExternals = null;
+    browser.runtime.sendMessage({
+      type:     Constants.kCOMMAND_BROADCAST_CURRENT_DRAG_DATA,
+      windowId: TabsStore.getCurrentWindowId(),
+      dragData: null
+    }).catch(ApiTabs.createErrorSuppressor());
+  });
+
+  onFinishDrag();
+}
+
+function onFinishDrag() {
+  clearDraggingItemsState();
+  clearDropPosition();
+  mLastDropPosition = null;
+  mLastInlineDropPosition = null;
+  updateLastDragEventCoordinates();
+  mLastDragOverTimestamp = null;
+  clearDraggingState();
+  collapseAutoExpandedItemsWhileDragging();
+  mDraggingOnSelfWindow = false;
+  mDraggingOnDraggedItems = false;
+  reserveToProcessLongHover.cancel();
+}
+
+function updateLastDragEventCoordinates(event = null) {
+  mLastDragEventCoordinates = !event ? null : {
+    x: event.screenX,
+    y: event.screenY,
+    timestamp: Date.now(),
+  };
+}
+
+
+/* drag on tabs API */
+
+const mDragExitTimeoutForTarget = new WeakMap();
+
+function onTSTAPIDragEnter(event) {
+  Scroll.autoScrollOnMouseEvent(event);
+  const item = EventUtils.getTreeItemFromEvent(event);
+  if (!item)
+    return;
+  let target = item.$TST.element;
+  if (mDragTargetIsClosebox && EventUtils.isEventFiredOnClosebox(event))
+    target = target && item.$TST.element.closeBox;
+  cancelDelayedTSTAPIDragExitOn(target);
+  if (item &&
+      (!mDragTargetIsClosebox ||
+       EventUtils.isEventFiredOnClosebox(event))) {
+    if (target != mLastDragEnteredTarget) {
+      TSTAPI.broadcastMessage({
+        type:     TSTAPI.kNOTIFY_TAB_DRAGENTER,
+        item,
+        tab:      item.$TST.tab, // for backward compatibility
+        window:   item.windowId,
+        windowId: item.windowId
+      }, { tabProperties: ['item', 'tab'] }).catch(_error => {});
+    }
+  }
+  mLastDragEnteredTarget = target;
+}
+
+function onTSTAPIDragExit(event) {
+  if (mDragTargetIsClosebox &&
+      !EventUtils.isEventFiredOnClosebox(event))
+    return;
+  const item = EventUtils.getTreeItemFromEvent(event);
+  if (!item)
+    return;
+  let target = item.$TST.element;
+  if (mDragTargetIsClosebox && EventUtils.isEventFiredOnClosebox(event))
+    target = target && item.$TST.element.closeBox;
+  cancelDelayedTSTAPIDragExitOn(target);
+  const timeout = setTimeout(() => {
+    if (target)
+      mDragExitTimeoutForTarget.delete(target);
+    if (!target || !target.parentNode) // already removed
+      return;
+    TSTAPI.broadcastMessage({
+      type:     TSTAPI.kNOTIFY_TAB_DRAGEXIT,
+      item,
+      tab:      item.$TST.tab, // for backward compatibility
+      window:   item.windowId,
+      windowId: item.windowId
+    }, { tabProperties: ['item', 'tab'] }).catch(_error => {});
+    target = null;
+  }, 10);
+  mDragExitTimeoutForTarget.set(target, timeout);
+}
+
+function cancelDelayedTSTAPIDragExitOn(target) {
+  const timeout = target && mDragExitTimeoutForTarget.get(target);
+  if (timeout) {
+    clearTimeout(timeout);
+    mDragExitTimeoutForTarget.delete(target);
+  }
+}
+
+
+function onMessage(message, _sender, _respond) {
+  if (!message ||
+      typeof message.type != 'string')
+    return;
+
+  switch (message.type) {
+    case Constants.kCOMMAND_BROADCAST_CURRENT_DRAG_DATA:
+      setDragData(message.dragData || null);
+      if (!message.dragData)
+        onFinishDrag();
+      break;
+  }
+}
+
+
+TSTAPI.onMessageExternal.addListener((message, _sender) => {
+  switch (message.type) {
+    case TSTAPI.kGET_DRAG_DATA:
+      if (mCurrentDragDataForExternals &&
+          message.id == mCurrentDragDataForExternalsId)
+        return Promise.resolve(mCurrentDragDataForExternals);
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/event-utils.js b/waterfox/browser/components/sidebar/sidebar/event-utils.js
new file mode 100644
index 0000000000000..e7df012aa54fd
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/event-utils.js
@@ -0,0 +1,325 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  countMatched,
+  configs,
+  isMacOS,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as Size from './size.js';
+
+import { TreeItem } from '/common/TreeItem.js';
+
+import { kTAB_CLOSE_BOX_ELEMENT_NAME } from './components/TabCloseBoxElement.js';
+import { kTAB_FAVICON_ELEMENT_NAME } from './components/TabFaviconElement.js';
+import { kTAB_SOUND_BUTTON_ELEMENT_NAME } from './components/TabSoundButtonElement.js';
+import { kTAB_TWISTY_ELEMENT_NAME } from './components/TabTwistyElement.js';
+import { kTREE_ITEM_ELEMENT_NAME } from './components/TreeItemElement.js';
+
+// eslint-disable-next-line no-unused-vars
+function log(...args) {
+  internalLogger('sidebar/event-utils', ...args);
+}
+
+let mTargetWindow;
+
+export function setTargetWindowId(windowId) {
+  mTargetWindow = windowId;
+}
+
+
+export function isMiddleClick(event) {
+  return event.button == 1;
+}
+
+export function isAccelAction(event) {
+  return isMiddleClick(event) || (event.button == 0 && isAccelKeyPressed(event));
+}
+
+export function isAccelKeyPressed(event) {
+  return isMacOS() ?
+    (event.metaKey || event.key == 'Meta') :
+    (event.ctrlKey || event.key == 'Control') ;
+}
+
+export function isCopyAction(event) {
+  return isAccelKeyPressed(event) ||
+           (event.dataTransfer?.dropEffect == 'copy');
+}
+
+export function getElementTarget(eventOrTarget) {
+  const target = eventOrTarget instanceof Node ?
+    eventOrTarget :
+    eventOrTarget.target;
+  if (target.nodeType == Node.TEXT_NODE)
+    return target.parentNode;
+  return target instanceof Element ? target : null;
+}
+
+export function getElementOriginalTarget(eventOrTarget) {
+  const target = eventOrTarget instanceof Node ?
+    eventOrTarget :
+    (event => {
+      try {
+        if (event.originalTarget &&
+            event.originalTarget.nodeType)
+          return event.originalTarget;
+      }
+      catch(_error) {
+        // Access to the origianlTarget can be restricted on some cases,
+        // ex. mousedown in extra contents of the new tab button. Why?
+      }
+      return event.explicitOriginalTarget || eventOrTarget.target;
+    })(eventOrTarget);
+  if (target.nodeType == Node.TEXT_NODE)
+    return target.parentNode;
+  return target instanceof Element ? target : null;
+}
+
+export function isEventFiredOnTwisty(event) {
+  const tab = getTreeItemFromEvent(event);
+  if (!tab || !tab.$TST.hasChild)
+    return false;
+
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(kTAB_TWISTY_ELEMENT_NAME);
+}
+
+export function isEventFiredOnSharingState(event) {
+  const target = getElementTarget(event);
+  if (!target?.closest(kTAB_FAVICON_ELEMENT_NAME)) {
+    return false;
+  }
+  const tab = target.closest(kTREE_ITEM_ELEMENT_NAME);
+  const sharingState = tab?.raw?.sharingState;
+  return !!(sharingState?.microphone || sharingState?.camera || sharingState?.screen);
+}
+
+export function isEventFiredOnSoundButton(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(kTAB_SOUND_BUTTON_ELEMENT_NAME);
+}
+
+export function isEventFiredOnClosebox(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(kTAB_CLOSE_BOX_ELEMENT_NAME);
+}
+
+export function isEventFiredOnNewTabButton(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(`.${Constants.kNEWTAB_BUTTON}`);
+}
+
+export function isEventFiredOnMenuOrPanel(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest('ul.menu, ul.panel');
+}
+
+export function isEventFiredOnAnchor(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(`[data-menu-ui]`);
+}
+
+export function isEventFiredOnClickable(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest(`button, scrollbar, select`);
+}
+
+export function isEventFiredOnTabbarTop(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest('#tabbar-top');
+}
+
+export function isEventFiredOnTabbarBottom(event) {
+  const target = getElementTarget(event);
+  return target?.closest && !!target.closest('#tabbar-bottom');
+}
+
+
+export function getTreeItemFromEvent(event, options = {}) {
+  return SidebarItems.getItemFromDOMNode(event.target, options);
+}
+
+function getTabbarFromEvent(event) {
+  let node = event.target;
+  if (!node)
+    return null;
+  if (!(node instanceof Element))
+    node = node.parentNode;
+  return node?.closest('.tabs');
+}
+
+export function getTreeItemFromTabbarEvent(event, options = {}) {
+  if (!configs.shouldDetectClickOnIndentSpaces ||
+      isEventFiredOnClickable(event))
+    return null;
+  return getTreeItemFromCoordinates(event, options);
+}
+
+function getTreeItemFromCoordinates(event, options = {}) {
+  const item = SidebarItems.getItemFromDOMNode(document.elementFromPoint(event.clientX, event.clientY), options);
+  if (item)
+    return item;
+
+  const container = getTabbarFromEvent(event);
+  if (!container ||
+      container.classList.contains('pinned'))
+    return null;
+
+  // because item style can be modified, we try to find item from
+  // left, middle, and right.
+  const containerRect = container.getBoundingClientRect();
+  const trialPoints = [
+    Size.getFavIconSize(),
+    containerRect.width / 2,
+    containerRect.width - Size.getFavIconSize()
+  ];
+  for (const x of trialPoints) {
+    const item = SidebarItems.getItemFromDOMNode(document.elementFromPoint(x, event.clientY), options);
+    if (item)
+      return item.type == TreeItem.TYPE_TAB && item; // we should find only tabs from their indent space
+  }
+
+  // document.elementFromPoint cannot find elements being in animation effect,
+  // so I try to find a item from previous or next item.
+  const height = Size.getTabHeight();
+  for (const x of trialPoints) {
+    let item = SidebarItems.getItemFromDOMNode(document.elementFromPoint(x, event.clientY - height), options);
+    item = SidebarItems.getItemFromDOMNode(item?.$TST.element.nextSibling, options);
+    if (item)
+      return item.type == TreeItem.TYPE_TAB && item; // we should find only tabs from their indent space
+  }
+  for (const x of trialPoints) {
+    let item = SidebarItems.getItemFromDOMNode(document.elementFromPoint(x, event.clientY + height), options);
+    item = SidebarItems.getItemFromDOMNode(item?.$TST.element.previousSibling, options);
+    if (item)
+      return item.type == TreeItem.TYPE_TAB && item; // we should find only tabs from their indent space
+  }
+
+  return null;
+}
+
+
+const lastMousedown = new Map();
+
+export function getLastMousedown(button) {
+  return lastMousedown.get(button);
+}
+
+export function setLastMousedown(button, details) {
+  lastMousedown.set(button, details);
+}
+
+export function cancelHandleMousedown(button = null) {
+  if (!button && button !== 0) {
+    return countMatched(Array.from(lastMousedown.keys()),
+                        button => cancelHandleMousedown(button)) > 0;
+  }
+
+  const lastMousedownForButton = lastMousedown.get(button);
+  if (lastMousedownForButton) {
+    clearTimeout(lastMousedownForButton.timeout);
+    lastMousedown.delete(button);
+    return true;
+  }
+  return false;
+}
+
+
+export function getEventDetail(event) {
+  return {
+    targetType: getEventTargetType(event),
+    window:     mTargetWindow,
+    windowId:   mTargetWindow,
+    ctrlKey:    event.ctrlKey,
+    shiftKey:   event.shiftKey,
+    altKey:     event.altKey,
+    metaKey:    event.metaKey,
+  };
+}
+
+export function getTreeItemEventDetail(event, tab) {
+  return {
+    ...getEventDetail(event),
+    tab:   tab?.id,
+    tabId: tab?.id,
+    tabType: tab?.$TST?.type || tab?.type,
+  };
+}
+
+export function getMouseEventDetail(event, tab) {
+  return {
+    ...getTreeItemEventDetail(event, tab),
+    twisty:        isEventFiredOnTwisty(event),
+    sharingState:  isEventFiredOnSharingState(event),
+    soundButton:   isEventFiredOnSoundButton(event),
+    closebox:      isEventFiredOnClosebox(event),
+    button:        event.button,
+    isMiddleClick: isMiddleClick(event),
+    isAccelClick:  isAccelAction(event),
+    lastInnerScreenY: window.mozInnerScreenY,
+  };
+}
+
+export function getEventTargetType(event) {
+  const element = event.target.closest ?
+    event.target :
+    event.target.parentNode;
+  if (element &&
+      element.closest('.rich-confirm, #blocking-screen'))
+    return 'outside';
+
+  if (getTreeItemFromEvent(event))
+    return 'tab';
+
+  if (isEventFiredOnNewTabButton(event))
+    return 'newtabbutton';
+
+  if (isEventFiredOnMenuOrPanel(event) ||
+      isEventFiredOnAnchor(event))
+    return 'selector';
+
+  if (isEventFiredOnTabbarTop(event))
+    return 'tabbar-top';
+  if (isEventFiredOnTabbarBottom(event))
+    return 'tabbar-bottom';
+
+  const allRange = document.createRange();
+  allRange.selectNodeContents(document.body);
+  const containerRect = allRange.getBoundingClientRect();
+  allRange.detach();
+  if (event.clientX < containerRect.left ||
+      event.clientX > containerRect.right ||
+      event.clientY < containerRect.top ||
+      event.clientY > containerRect.bottom)
+    return 'outside';
+
+  return 'blank';
+}
+
+
+export function wrapWithErrorHandler(func) {
+  return (...args) => {
+    try {
+      const result = func(...args);
+      if (result && result instanceof Promise)
+        return result.catch(e => {
+          console.log('Fatal async error: ', e);
+          throw e;
+        });
+      else
+        return result;
+    }
+    catch(e) {
+      console.log('Fatal error: ', e);
+      throw e;
+    }
+  };
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/gap-canceller.js b/waterfox/browser/components/sidebar/sidebar/gap-canceller.js
new file mode 100644
index 0000000000000..ee1bb397f5668
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/gap-canceller.js
@@ -0,0 +1,235 @@
+/*
+# 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/.
+*/
+'use strict';
+
+// workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=727668
+
+import {
+  log as internalLogger,
+  configs,
+  isNewTabCommandTab,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+
+function log(...args) {
+  internalLogger('sidebar/gap-canceller', ...args);
+}
+
+let mWindowId;
+const mStyle = document.documentElement.style;
+const mDataset = document.documentElement.dataset;
+
+let mByMouseOperation    = false;
+let mLastWindowDimension = getWindowDimension();
+let mLastMozInnerScreenY = window.mozInnerScreenY;
+let mOffset              = 0;
+
+export function init() {
+  mWindowId = TabsStore.getCurrentWindowId();
+
+  browser.tabs.query({ active: true, windowId: mWindowId }).then(async tabs => {
+    if (tabs.length == 0)
+      tabs = await browser.tabs.query({ windowId: mWindowId });
+    onLocationChange(tabs[0]);
+  });
+  BackgroundConnection.onMessage.addListener(async message => {
+    switch (message.type) {
+      case Constants.kCOMMAND_NOTIFY_TAB_ACTIVATING:
+        const tab = Tab.get(message.tabId);
+        if (tab) {
+          onLocationChange(tab, { byMouseOperation: message.byMouseOperation });
+          if (!message.byMouseOperation)
+            updateOffset();
+        }
+        break;
+    }
+  });
+  browser.tabs.onUpdated.addListener((_tabId, changeInfo, tab) => {
+    if (tab.active && changeInfo.status == 'complete')
+      onLocationChange(tab);
+  }, { windowId: mWindowId, properties: ['status'] });
+
+  if (shouldWatchVisualGap())
+    startWatching();
+
+  configs.$addObserver(changedKey => {
+    switch (changedKey) {
+      case 'suppressGapFromShownOrHiddenToolbarOnFullScreen':
+      case 'suppressGapFromShownOrHiddenToolbarOnNewTab':
+      case 'suppressGapFromShownOrHiddenToolbarInterval':
+        if (shouldWatchVisualGap())
+          startWatching();
+        else
+          stopWatching();
+        break;
+    }
+  });
+}
+
+function shouldWatchVisualGap() {
+  return (
+    configs.suppressGapFromShownOrHiddenToolbarOnFullScreen ||
+    configs.suppressGapFromShownOrHiddenToolbarOnNewTab
+  );
+}
+
+function getWindowDimension() {
+  return `(${window.screenX},${window.screenY}), ${window.outerWidth}x${window.outerHeight}, innerX=${window.mozInnerScreenX}`;
+}
+
+export function getOffset() {
+  return mOffset;
+}
+
+function updateOffset() {
+  const dimension = getWindowDimension();
+
+  const isNewTab     = isNewTabCommandTab({
+    title: mDataset.activeTabTitle,
+    url:   mDataset.activeTabUrl,
+  });
+  const isFullScreen = mDataset.ownerWindowState == 'fullscreen'
+  const shouldSuppressGapOnNewTab = (
+    configs.suppressGapFromShownOrHiddenToolbarOnNewTab &&
+    isNewTab &&
+    !isFullScreen
+  );
+  const shouldSuppressGapOnFullScreen = (
+    configs.suppressGapFromShownOrHiddenToolbarOnFullScreen &&
+    isFullScreen
+  );
+  const shouldSuppressGap = (
+    (shouldSuppressGapOnNewTab || shouldSuppressGapOnFullScreen) &&
+    (mByMouseOperation || !configs.suppressGapFromShownOrHiddenToolbarOnlyOnMouseOperation)
+  );
+  log('updateOffset: ', {
+    title:             mDataset.activeTabTitle,
+    url:               mDataset.activeTabUrl,
+    isNewTab,
+    state:             mDataset.ownerWindowState,
+    mByMouseOperation,
+    dimension,
+    lastDimension:     mLastWindowDimension,
+    innerScreenY:      window.mozInnerScreenY,
+    lastInnerScreenY:  mLastMozInnerScreenY,
+    windowNotChanged:  dimension == mLastWindowDimension,
+    sidebarMoved:      mLastMozInnerScreenY != window.mozInnerScreenY
+  });
+  if (dimension == mLastWindowDimension &&
+      mLastMozInnerScreenY != window.mozInnerScreenY) {
+    if (shouldSuppressGap) {
+      mOffset = Math.min(0, mLastMozInnerScreenY - window.mozInnerScreenY);
+      mStyle.setProperty('--visual-gap-offset', `${mOffset}px`);
+      const currentState = document.documentElement.classList.contains(Constants.kTABBAR_STATE_HAS_VISUAL_GAP);
+      const newState = mOffset < 0;
+      document.documentElement.classList.toggle(Constants.kTABBAR_STATE_HAS_VISUAL_GAP, newState);
+      log(' => should suppress visual gap: offset = ', mOffset);
+      if (currentState != newState) {
+        cancelUpdateOffset();
+        if (newState)
+          startListenMouseEvents()
+        else
+          endListenMouseEvents();
+      }
+      cancelUpdateOffset();
+    }
+    else {
+      mStyle.setProperty('--visual-gap-offset', '0px');
+      log(' => should not suppress, but there is a visual gap ');
+    }
+  }
+  else if (!shouldSuppressGap) {
+    mStyle.setProperty('--visual-gap-offset', '0px');
+    log(' => should not suppress, no visual gap ');
+  }
+  mLastWindowDimension = dimension;
+  mLastMozInnerScreenY = window.mozInnerScreenY;
+  browser.windows.get(mWindowId).then(win => {
+    mDataset.ownerWindowState = win.state;
+  });
+}
+
+function startWatching() {
+  stopWatching();
+  window.addEventListener('resize', onResize);
+}
+
+function stopWatching() {
+  cancelUpdateOffset();
+  window.removeEventListener('resize', onResize);
+}
+
+function onResize() {
+  cancelUpdateOffset();
+  // We need to try checking updateed mozInnerScreenY, because the
+  // mozInnerScreenY is sometimes not updated yet when a resize event
+  // is dispatched.
+  // (ResizeObserver has same problem.)
+  updateOffset.intervalTimer = window.setInterval(
+    updateOffset,
+    configs.suppressGapFromShownOrHiddenToolbarInterval
+  );
+  updateOffset.timeoutTimer = setTimeout(() => {
+    cancelUpdateOffset();
+  }, configs.suppressGapFromShownOrHiddenToolbarTimeout);
+}
+
+function cancelUpdateOffset() {
+  if (updateOffset.intervalTimer) {
+    window.clearInterval(updateOffset.intervalTimer);
+    delete updateOffset.intervalTimer;
+    mByMouseOperation = false;
+  }
+  if (updateOffset.timeoutTimer) {
+    window.clearTimeout(updateOffset.timeoutTimer);
+    delete updateOffset.timeoutTimer;
+  }
+}
+
+function onLocationChange(tab, { byMouseOperation } = {}) {
+  mDataset.activeTabTitle = tab.title;
+  mDataset.activeTabUrl   = tab.url;
+  if (byMouseOperation)
+    mByMouseOperation = true;
+}
+
+function startListenMouseEvents() {
+  if (!onMouseMove.listening) {
+    window.addEventListener('mousemove', onMouseMove);
+    window.addEventListener('mouseout', onMouseMove);
+    onMouseMove.listening = true;
+  }
+}
+
+function endListenMouseEvents() {
+  if (onMouseMove.listening) {
+    window.removeEventListener('mousemove', onMouseMove);
+    window.removeEventListener('mouseout', onMouseMove);
+    onMouseMove.listening = false;
+  }
+}
+
+let mClearHoverTopEdgeTimer;
+
+function onMouseMove(event) {
+  if (mClearHoverTopEdgeTimer)
+    clearTimeout(mClearHoverTopEdgeTimer);
+  const onTopEdge = event.screenY < window.mozInnerScreenY - mOffset;
+  if (onTopEdge) {
+    document.documentElement.classList.add(Constants.kTABBAR_STATE_HOVER_ON_TOP_EDGE);
+  }
+  else {
+    mClearHoverTopEdgeTimer = setTimeout(() => {
+      mClearHoverTopEdgeTimer = null;
+      document.documentElement.classList.remove(Constants.kTABBAR_STATE_HOVER_ON_TOP_EDGE);
+    }, configs.cancelGapSuppresserHoverDelay);
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/indent.js b/waterfox/browser/components/sidebar/sidebar/indent.js
new file mode 100644
index 0000000000000..dd7e691805b96
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/indent.js
@@ -0,0 +1,284 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  shouldApplyAnimation
+} from '/common/common.js';
+
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as CollapseExpand from './collapse-expand.js';
+
+function log(...args) {
+  internalLogger('sidebar/indent', ...args);
+}
+
+let mPromisedInitializedResolver;
+let mPromisedInitialized = new Promise((resolve, _reject) => {
+  mPromisedInitializedResolver = resolve;
+});
+let mIndentDefinition;
+let mLastMaxLevel  = -1;
+let mLastMaxIndent = -1;
+let mTargetWindow;
+let mTabBar;
+
+export function init() {
+  mTargetWindow = TabsStore.getCurrentWindowId();
+  mTabBar       = document.querySelector('#tabbar');
+
+  window.addEventListener('resize', reserveToUpdateIndent);
+
+  mPromisedInitializedResolver();
+  mPromisedInitialized = mPromisedInitializedResolver = null;
+}
+
+export function updateRestoredTree(cachedIndent) {
+  updateVisualMaxTreeLevel();
+  update({
+    force: true,
+    cache: cachedIndent
+  });
+}
+
+export function update(options = {}) {
+  if (!options.cache) {
+    const maxLevel  = getMaxTreeLevel(mTargetWindow);
+    const maxIndent = mTabBar.offsetWidth * (0.33);
+    if (maxLevel <= mLastMaxLevel &&
+        maxIndent == mLastMaxIndent &&
+        !options.force)
+      return;
+
+    mLastMaxLevel  = maxLevel + 5;
+    mLastMaxIndent = maxIndent;
+  }
+  else {
+    mLastMaxLevel  = options.cache.lastMaxLevel;
+    mLastMaxIndent = options.cache.lastMaxIndent;
+  }
+
+  if (!mIndentDefinition) {
+    mIndentDefinition = document.createElement('style');
+    mIndentDefinition.setAttribute('type', 'text/css');
+    document.head.appendChild(mIndentDefinition);
+  }
+
+  if (options.cache &&
+      options.cache.definition) {
+    mIndentDefinition.textContent = options.cache.definition;
+  }
+  else {
+    const indentToSelectors = {};
+    const defaultIndentToSelectors = {};
+    const indentUnitDefinitions = [];
+    for (let i = 0; i <= mLastMaxLevel; i++) {
+      generateIndentAndSelectorsForMaxLevel(i, indentToSelectors, defaultIndentToSelectors, indentUnitDefinitions);
+    }
+
+    const definitions = [];
+    for (const indentSet of [defaultIndentToSelectors, indentToSelectors]) {
+      const indents = Object.keys(indentSet);
+      indents.sort((aA, aB) => parseInt(aA) - parseInt(aB));
+      for (const indent of indents) {
+        definitions.push(`${indentSet[indent].join(',\n')} { --tab-indent: ${indent}; }`);
+      }
+    }
+    mIndentDefinition.textContent = indentUnitDefinitions.concat(definitions).join('\n');
+  }
+}
+function generateIndentAndSelectorsForMaxLevel(maxLevel, indentToSelectors, defaultIndentToSelectors, indentUnitDefinitions) {
+  const indentUnit = calculateIndentUnit(maxLevel);
+
+  let configuredMaxLevel = configs.maxTreeLevel;
+  if (configuredMaxLevel < 0)
+    configuredMaxLevel = Number.MAX_SAFE_INTEGER;
+
+  const base = `:root[${Constants.kMAX_TREE_LEVEL}="${maxLevel}"]:not(.initializing) .tab:not(.${Constants.kTAB_STATE_PINNED}):not(.${Constants.kTAB_STATE_COLLAPSED_DONE})[${Constants.kLEVEL}]`;
+
+  // default indent for unhandled (deep) level tabs
+  const defaultIndent = `${Math.min(maxLevel + 1, configuredMaxLevel) * indentUnit}px`;
+  if (!defaultIndentToSelectors[defaultIndent])
+    defaultIndentToSelectors[defaultIndent] = [];
+  defaultIndentToSelectors[defaultIndent].push(`${base}:not([${Constants.kLEVEL}="0"])`);
+
+  indentUnitDefinitions.push(`:root[${Constants.kMAX_TREE_LEVEL}="${maxLevel}"]:not(.initializing)  {
+    --indent-size: ${indentUnit}px;
+  }`);
+
+  for (let level = 1; level <= maxLevel; level++) {
+    const indent = `${Math.min(level, configuredMaxLevel) * indentUnit}px`;
+    if (!indentToSelectors[indent])
+      indentToSelectors[indent] = [];
+    indentToSelectors[indent].push(`${base}[${Constants.kLEVEL}="${level}"]`);
+  }
+}
+function calculateIndentUnit(maxLevel) {
+  const minIndent  = Math.max(Constants.kDEFAULT_MIN_INDENT, configs.minIndent);
+  return Math.min(configs.baseIndent, Math.max(Math.floor(mLastMaxIndent / maxLevel), minIndent));
+}
+
+export function getCacheInfo() {
+  return {
+    lastMaxLevel:  mLastMaxLevel,
+    lastMaxIndent: mLastMaxIndent,
+    definition:    mIndentDefinition.textContent
+  };
+}
+
+
+export function tryUpdateVisualMaxTreeLevel() {
+  log('tryUpdateVisualMaxTreeLevel');
+  if (updateVisualMaxTreeLevel.waiting) {
+    clearTimeout(updateVisualMaxTreeLevel.waiting);
+    delete updateVisualMaxTreeLevel.waiting;
+  }
+
+  tryUpdateVisualMaxTreeLevel.calledCount++;
+
+  const animation = shouldApplyAnimation();
+
+  // On no-animation mode, we should update max indent level immediately
+  // as possible as we can without delay, to reduce visual flicking which
+  // can trigger an epileptic seizure.
+  // But we also have to reduce needless function calls for better performance.
+  // This threshold is a safe guard for uncared cases with too many call
+  // of updateVisualMaxTreeLevel().
+  // See also: https://github.com/piroor/treestyletab/issues/3383
+  if (tryUpdateVisualMaxTreeLevel.calledCount <= configs.maxAllowedImmediateRefreshCount &&
+      !animation) {
+    updateVisualMaxTreeLevel();
+    if (tryUpdateVisualMaxTreeLevel.waitingToResetCalledCount)
+      clearTimeout(tryUpdateVisualMaxTreeLevel.waitingToResetCalledCount);
+    tryUpdateVisualMaxTreeLevel.waitingToResetCalledCount = setTimeout(() => {
+      delete tryUpdateVisualMaxTreeLevel.waitingToResetCalledCount;
+      tryUpdateVisualMaxTreeLevel.calledCount = 0;
+    }, 0);
+    return;
+  }
+
+  const delay = animation ? Math.max(0, configs.collapseDuration) * 1.5 : 0;
+
+  updateVisualMaxTreeLevel.waiting = setTimeout(() => {
+    delete updateVisualMaxTreeLevel.waiting;
+    tryUpdateVisualMaxTreeLevel.calledCount = 0;
+    updateVisualMaxTreeLevel();
+  }, delay);
+}
+tryUpdateVisualMaxTreeLevel.calledCount = 0;
+
+async function updateVisualMaxTreeLevel() {
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+
+  const maxLevel = getMaxTreeLevel(mTargetWindow, {
+    onlyVisible: configs.indentAutoShrinkOnlyForVisible
+  });
+  log('updateVisualMaxTreeLevel ', { maxLevel });
+  document.documentElement.setAttribute(Constants.kMAX_TREE_LEVEL, Math.max(1, maxLevel));
+}
+
+function getMaxTreeLevel(windowId, options = {}) {
+  if (typeof options != 'object')
+    options = {};
+  const tabs = options.onlyVisible ?
+    Tab.getVisibleTabs(windowId, { ordered: false }) :
+    Tab.getTabs(windowId, { ordered: false }) ;
+  let maxLevel = Math.max(...tabs.map(tab => parseInt(tab.$TST.attributes[Constants.kLEVEL] || 0)));
+  if (configs.maxTreeLevel > -1)
+    maxLevel = Math.min(maxLevel, configs.maxTreeLevel);
+  return maxLevel;
+}
+
+async function reserveToUpdateIndent() {
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+  log('reserveToUpdateIndent');
+  if (reserveToUpdateIndent.waiting)
+    clearTimeout(reserveToUpdateIndent.waiting);
+  const delay = shouldApplyAnimation() ? Math.max(configs.indentDuration, configs.collapseDuration) * 1.5 : 100;
+  reserveToUpdateIndent.waiting = setTimeout(() => {
+    delete reserveToUpdateIndent.waiting;
+    update();
+  }, delay);
+}
+
+
+const restVisibilityChangedTabIds = new Set();
+
+CollapseExpand.onUpdated.addListener((tab, _options) => {
+  const isFinishBatch = restVisibilityChangedTabIds.has(tab.id);
+  restVisibilityChangedTabIds.delete(tab.id);
+
+  if ((configs.indentAutoShrink &&
+       configs.indentAutoShrinkOnlyForVisible) ||
+      // On no-animation mode, we should update max indent level immediately
+      // as possible as we can without delay, to reduce visual flicking which
+      // can trigger an epileptic seizure.
+      // But we also have to reduce needless function calls for better performance.
+      // So we throttle the function call of updateVisualMaxTreeLevel() until
+      // collapsed state of all tabs notified with "kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED"
+      // are completely updated.
+      // See also: https://github.com/piroor/treestyletab/issues/3383
+      (isFinishBatch &&
+       restVisibilityChangedTabIds.size == 0))
+    tryUpdateVisualMaxTreeLevel();
+});
+
+const BUFFER_KEY_PREFIX = 'indent-';
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED:
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVING:
+      log('listen: ', message.type);
+      tryUpdateVisualMaxTreeLevel();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_SHOWN:
+    case Constants.kCOMMAND_NOTIFY_TAB_HIDDEN:
+    case Constants.kCOMMAND_NOTIFY_CHILDREN_CHANGED:
+      log('listen: ', message.type);
+      reserveToUpdateIndent();
+      tryUpdateVisualMaxTreeLevel();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_LEVEL_CHANGED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      log('listen: ', message.type, tab, lastMessage);
+      if (!tab ||
+          !lastMessage)
+        return;
+      if (tab.$TST.getAttribute(Constants.kLEVEL) != lastMessage.level) {
+        tab.$TST.setAttribute(Constants.kLEVEL, lastMessage.level);
+        tryUpdateVisualMaxTreeLevel();
+      }
+      reserveToUpdateIndent();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED:
+      for (const id of message.visibilityChangedTabIds) {
+        restVisibilityChangedTabIds.add(id);
+      }
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_COLLAPSED_STATE_CHANGED:
+      if (!restVisibilityChangedTabIds.has(message.tabId))
+        tryUpdateVisualMaxTreeLevel();
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/index-ws.js b/waterfox/browser/components/sidebar/sidebar/index-ws.js
new file mode 100644
index 0000000000000..55c0a231a6dff
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/index-ws.js
@@ -0,0 +1,40 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import './index.js';
+
+import * as RetrieveURL from '/common/retrieve-url.js';
+import { Tab } from '/common/TreeItem.js';
+
+import * as Sidebar from './sidebar.js';
+import './tab-context-menu.js';
+import './tab-preview-tooltip.js';
+import './tab-preview.js';
+
+RetrieveURL.registerFileURLResolver(async file => {
+  return  file && browser.waterfoxBridge.getFileURL({
+    lastModified: file.lastModified,
+    name:         file.name,
+    size:         file.size,
+    type:         file.type,
+  });
+});
+
+RetrieveURL.registerSelectionClipboardProvider({
+  isAvailable: () => browser.waterfoxBridge.isSelectionClipboardAvailable(),
+  getTextData: () => browser.waterfoxBridge.getSelectionClipboardContents(),
+});
+
+// Deactivate tab tooltip for tab hover previews
+Tab.onCreated.addListener(tab => {
+  tab.$TST.registerTooltipText(browser.runtime.id, '', true);
+});
+Sidebar.onReady.addListener(() => {
+  for (const tab of Tab.getAllTabs()) {
+    tab.$TST.registerTooltipText(browser.runtime.id, '', true);
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/index.js b/waterfox/browser/components/sidebar/sidebar/index.js
new file mode 100644
index 0000000000000..d51858546e4fc
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/index.js
@@ -0,0 +1,47 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import '/extlib/l10n.js';
+
+import {
+  log,
+  configs
+} from '/common/common.js';
+
+import * as TabsStore from '/common/tabs-store.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as Sidebar from './sidebar.js';
+import './collapse-expand.js';
+import './mouse-event-listener.js';
+import './tab-context-menu.js';
+import './tab-preview-tooltip.js';
+import './tst-api-frontend.js';
+
+log.context = 'Sidebar-?';
+
+MetricsData.add('Loaded');
+
+window.addEventListener('load', Sidebar.init, { once: true });
+
+window.dumpMetricsData = () => {
+  return MetricsData.toString();
+};
+window.dumpLogs = () => {
+  return log.logs.join('\n');
+};
+
+// for old debugging method
+window.log = log;
+window.gMetricsData = MetricsData;
+window.Tab = Tab;
+window.TabsStore = TabsStore;
+window.BackgroundConnection = BackgroundConnection;
+window.configs = configs;
diff --git a/waterfox/browser/components/sidebar/sidebar/mouse-event-listener.js b/waterfox/browser/components/sidebar/sidebar/mouse-event-listener.js
new file mode 100644
index 0000000000000..286e28235accd
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/mouse-event-listener.js
@@ -0,0 +1,1227 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import MenuUI from '/extlib/MenuUI.js';
+
+import {
+  log as internalLogger,
+  wait,
+  dumpTab,
+  countMatched,
+  configs,
+  shouldApplyAnimation,
+  mapAndFilter,
+  isMacOS,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as RetrieveURL from '/common/retrieve-url.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TreeBehavior from '/common/tree-behavior.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as EventUtils from './event-utils.js';
+import * as DragAndDrop from './drag-and-drop.js';
+import * as Scroll from './scroll.js';
+import * as Sidebar from './sidebar.js';
+import * as TabContextMenu from './tab-context-menu.js';
+import * as TSTAPIFrontend from './tst-api-frontend.js';
+
+import { kTAB_CLOSE_BOX_ELEMENT_NAME } from './components/TabCloseBoxElement.js';
+import { kTAB_FAVICON_ELEMENT_NAME } from './components/TabFaviconElement.js';
+import { kTAB_TWISTY_ELEMENT_NAME } from './components/TabTwistyElement.js';
+
+function log(...args) {
+  internalLogger('sidebar/mouse-event-listener', ...args);
+}
+
+let mTargetWindow;
+
+const mTabBar = document.querySelector('#tabbar');
+const mContextualIdentitySelector = document.getElementById(Constants.kCONTEXTUAL_IDENTITY_SELECTOR);
+const mNewTabActionSelector       = document.getElementById(Constants.kNEWTAB_ACTION_SELECTOR);
+const mRootClasses = document.documentElement.classList;
+
+let mHasMouseOverListeners = false;
+
+Sidebar.onInit.addListener(() => {
+  mTargetWindow = TabsStore.getCurrentWindowId();
+});
+
+Sidebar.onBuilt.addListener(async () => {
+  document.addEventListener('mousedown', onMouseDown);
+  document.addEventListener('mouseup', onMouseUp);
+  document.addEventListener('click', onClick);
+  document.addEventListener('auxclick', onAuxClick);
+  document.addEventListener('dragstart', onDragStart);
+  mTabBar.addEventListener('dblclick', onDblClick);
+  mTabBar.addEventListener('mouseover', onMouseOver);
+
+  MetricsData.add('mouse-event-listener: Sidebar.onBuilt: apply configs');
+
+  browser.runtime.onMessage.addListener(onMessage);
+  BackgroundConnection.onMessage.addListener(onBackgroundMessage);
+
+  if (!mRootClasses.contains('incognito'))
+    mContextualIdentitySelector.ui = new MenuUI({
+      root:       mContextualIdentitySelector,
+      appearance: 'panel',
+      onCommand:  onContextualIdentitySelect,
+      animationDuration: shouldApplyAnimation() ? configs.collapseDuration : 0.001
+    });
+
+  mNewTabActionSelector.ui = new MenuUI({
+    root:       mNewTabActionSelector,
+    appearance: 'panel',
+    onCommand:  onNewTabActionSelect,
+    animationDuration: shouldApplyAnimation() ? configs.collapseDuration : 0.001
+  });
+});
+
+Sidebar.onReady.addListener(() => {
+  updateSpecialEventListenersForAPIListeners();
+});
+
+Sidebar.onLayoutUpdated.addListener(() => {
+  updateSpecialEventListenersForAPIListeners();
+});
+
+TSTAPI.onRegistered.addListener(() => {
+  updateSpecialEventListenersForAPIListeners();
+});
+
+TSTAPI.onUnregistered.addListener(() => {
+  updateSpecialEventListenersForAPIListeners();
+});
+
+configs.$addObserver(changedKey => {
+  switch (changedKey) {
+    case 'shiftTabsForScrollbarDistance':
+    case 'shiftTabsForScrollbarOnlyOnHover':
+      updateSpecialEventListenersForAPIListeners();
+      break;
+  }
+});
+
+function updateSpecialEventListenersForAPIListeners() {
+  const shouldListenMouseMove = (
+    TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_MOUSEMOVE) ||
+    (configs.shiftTabsForScrollbarOnlyOnHover &&
+     mTabBar.classList.contains(Constants.kTABBAR_STATE_SCROLLBAR_AUTOHIDE))
+  );
+  if (shouldListenMouseMove != onMouseMove.listening) {
+    if (!onMouseMove.listening) {
+      window.addEventListener('mousemove', onMouseMove, { capture: true, passive: true });
+      onMouseMove.listening = true;
+    }
+    else {
+      window.removeEventListener('mousemove', onMouseMove, { capture: true, passive: true });
+      onMouseMove.listening = false;
+    }
+  }
+
+  const shouldListenMouseOut = TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_MOUSEOUT);
+  if (shouldListenMouseOut != onMouseOut.listening) {
+    if (!onMouseOut.listening) {
+      window.addEventListener('mouseout', onMouseOut, { capture: true, passive: true });
+      onMouseOut.listening = true;
+    }
+    else {
+      window.removeEventListener('mouseout', onMouseOut, { capture: true, passive: true });
+      onMouseOut.listening = false;
+    }
+  }
+
+  mHasMouseOverListeners = shouldListenMouseOut || TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_MOUSEOVER);
+}
+
+
+/* handlers for DOM events */
+
+const mCloseBoxSizeBox = document.querySelector(`#dummy-tab ${kTAB_CLOSE_BOX_ELEMENT_NAME}`);
+const mFaviconSizeBox  = document.querySelector(`#dummy-tab ${kTAB_FAVICON_ELEMENT_NAME}`);
+const mTwistySizeBox   = document.querySelector(`#dummy-tab ${kTAB_TWISTY_ELEMENT_NAME}`);
+const mDistanceBox     = document.querySelector('#dummy-shift-tabs-for-scrollbar-distance-box');
+
+function onMouseMove(event) {
+  const tab = EventUtils.getTreeItemFromEvent(event);
+  if (mTabBar.classList.contains(Constants.kTABBAR_STATE_SCROLLBAR_AUTOHIDE)) {
+    const onTabBar    = mTabBar.contains(event.target);
+    const tabbarRect  = mTabBar.getBoundingClientRect();
+    const twistyRect  = mTwistySizeBox.getBoundingClientRect();
+    const faviconRect = mFaviconSizeBox.getBoundingClientRect();
+    const closeRect   = mCloseBoxSizeBox.getBoundingClientRect();
+    const placeholderSizeRect = mDistanceBox.getBoundingClientRect();
+    const isRightSide = mRootClasses.contains('right');
+    const leftAreaSize = onTabBar &&(
+      isRightSide ? closeRect.width :
+        Math.max(twistyRect.right, faviconRect.right) - Math.min(twistyRect.left, faviconRect.left)
+    ) + placeholderSizeRect.width;
+    const rightAreaSize = onTabBar &&(
+      !isRightSide ? closeRect.width :
+        Math.max(twistyRect.right, faviconRect.right) - Math.min(twistyRect.left, faviconRect.left)
+    ) + placeholderSizeRect.width;
+    mRootClasses.toggle('on-scrollbar-area', (
+      onTabBar &&
+      isRightSide ? event.clientX >= tabbarRect.right - rightAreaSize :
+        event.clientX <= tabbarRect.left + leftAreaSize
+    ));
+  }
+
+  if (TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_MOUSEMOVE) &&
+      tab) {
+    TSTAPI.broadcastMessage({
+      type:     TSTAPI.kNOTIFY_TAB_MOUSEMOVE,
+      tab,
+      window:   mTargetWindow,
+      windowId: mTargetWindow,
+      ctrlKey:  event.ctrlKey,
+      shiftKey: event.shiftKey,
+      altKey:   event.altKey,
+      metaKey:  event.metaKey,
+      dragging: DragAndDrop.isCapturingForDragging()
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+  }
+}
+onMouseMove = EventUtils.wrapWithErrorHandler(onMouseMove);
+
+let mLastWarmUpTab = -1;
+
+function onMouseOver(event) {
+  const tab = EventUtils.getTreeItemFromEvent(event);
+
+  if (tab?.$TST.tab &&
+      mLastWarmUpTab != tab.id &&
+      typeof browser.tabs.warmup == 'function') {
+    browser.tabs.warmup(tab.id);
+    mLastWarmUpTab = tab.id;
+  }
+
+  if (!mHasMouseOverListeners)
+    return;
+
+  // We enter the tab or one of its children, but not from any of the tabs
+  // (other) children, so we are now starting to hover this tab (relatedTarget
+  // contains the target of the mouseout event or null if there is none). This
+  // also includes the case where we enter the tab directly without going
+  // through another tab or the sidebar, which causes relatedTarget to be null
+  const enterTabFromAncestor = tab && !tab.$TST.element.contains(event.relatedTarget);
+
+  if (enterTabFromAncestor) {
+    TSTAPI.broadcastMessage({
+      type:     TSTAPI.kNOTIFY_TAB_MOUSEOVER,
+      tab,
+      window:   mTargetWindow,
+      windowId: mTargetWindow,
+      ctrlKey:  event.ctrlKey,
+      shiftKey: event.shiftKey,
+      altKey:   event.altKey,
+      metaKey:  event.metaKey,
+      dragging: DragAndDrop.isCapturingForDragging()
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+  }
+}
+onMouseOver = EventUtils.wrapWithErrorHandler(onMouseOver);
+
+function onMouseOut(event) {
+  const tab = EventUtils.getTreeItemFromEvent(event);
+
+  // We leave the tab or any of its children, but not for one of the tabs
+  // (other) children, so we are no longer hovering this tab (relatedTarget
+  // contains the target of the mouseover event or null if there is none). This
+  // also includes the case where we leave the tab directly without going
+  // through another tab or the sidebar, which causes relatedTarget to be null
+  const leaveTabToAncestor = tab && !tab.$TST.element.contains(event.relatedTarget);
+
+  if (leaveTabToAncestor) {
+    TSTAPI.broadcastMessage({
+      type:     TSTAPI.kNOTIFY_TAB_MOUSEOUT,
+      tab,
+      window:   mTargetWindow,
+      windowId: mTargetWindow,
+      ctrlKey:  event.ctrlKey,
+      shiftKey: event.shiftKey,
+      altKey:   event.altKey,
+      metaKey:  event.metaKey,
+      dragging: DragAndDrop.isCapturingForDragging()
+    }, { tabProperties: ['tab'] }).catch(_error => {});
+  }
+}
+onMouseOut = EventUtils.wrapWithErrorHandler(onMouseOut);
+
+let mLastDragStartTimestamp = -1;
+
+function onMouseDown(event) {
+  EventUtils.cancelHandleMousedown(event.button);
+  TabContextMenu.close();
+  DragAndDrop.clearDropPosition();
+  DragAndDrop.clearDraggingState();
+
+  if (EventUtils.isEventFiredOnAnchor(event) &&
+      !EventUtils.isAccelAction(event) &&
+      event.button != 2) {
+    log('onMouseDown: canceled / mouse down on a selector anchor');
+    event.stopPropagation();
+    event.preventDefault();
+    const selector = document.getElementById(EventUtils.getElementTarget(event).closest('[data-menu-ui]').dataset.menuUi);
+    selector.ui.open({
+      anchor: event.target
+    });
+    return;
+  }
+
+  const target = event.target;
+  const tab = EventUtils.getTreeItemFromEvent(event) || EventUtils.getTreeItemFromTabbarEvent(event);
+  log('onMouseDown: found target tab: ', tab, event);
+
+  const extraContentsInfo = TSTAPIFrontend.getOriginalExtraContentsTarget(event);
+  const mousedownDetail   = EventUtils.getMouseEventDetail(event, tab);
+  mousedownDetail.$extraContentsInfo = extraContentsInfo;
+  log('onMouseDown ', mousedownDetail);
+
+  if (mousedownDetail.targetType == 'selector')
+    return;
+
+  if (mousedownDetail.isMiddleClick) {
+    log('onMouseDown: canceled / middle click');
+    event.stopPropagation();
+    event.preventDefault();
+  }
+
+  const mousedown = {
+    detail: mousedownDetail,
+    tab,
+    promisedMousedownNotified: Promise.resolve(),
+    timestamp: Date.now(),
+  };
+
+  const apiEventType = (tab && mousedownDetail.targetType == 'tab') ?
+    TSTAPI.kNOTIFY_TAB_MOUSEDOWN :
+    mousedownDetail.targetType == 'newtabbutton' ?
+      TSTAPI.kNOTIFY_NEW_TAB_BUTTON_MOUSEDOWN :
+      TSTAPI.kNOTIFY_TABBAR_MOUSEDOWN;
+
+  mousedown.promisedMousedownNotified = Promise.all([
+    browser.runtime.sendMessage({
+      type:     apiEventType,
+      button:   mousedownDetail.button,
+      altKey:   mousedownDetail.altKey,
+      ctrlKey:  mousedownDetail.ctrlKey,
+      metaKey:  mousedownDetail.metaKey,
+      shiftKey: mousedownDetail.shiftKey,
+      tab:      tab?.$TST?.export(true) || tab,
+    }).catch(ApiTabs.createErrorHandler()),
+    (async () => {
+      log('Sending message to mousedown listeners ', { extraContentsInfo });
+      const allowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+        TSTAPI.kNOTIFY_EXTRA_CONTENTS_MOUSEDOWN,
+        apiEventType,
+        mousedown,
+        extraContentsInfo
+      );
+      if (!allowed) {
+        log(' => canceled');
+        return true;
+      }
+
+      log(' => allowed');
+      return false;
+    })()
+  ]).then(results => results[1]);
+
+  // Firefox switches tab focus on mousedown, and keeps
+  // tab multiselection for draging of them together.
+  // We simulate the behavior here.
+  mousedown.promisedMousedownNotified.then(canceled => {
+    if (canceled)
+      EventUtils.cancelHandleMousedown(event.button);
+
+    if (!EventUtils.getLastMousedown(event.button) ||
+        mousedown.expired ||
+        canceled)
+      return;
+
+    const onRegularArea = (
+      !mousedown.detail.twisty &&
+      !mousedown.detail.soundButton &&
+      !mousedown.detail.closebox
+    );
+    const wasMultiselectionAction = (
+      mousedown.detail.ctrlKey ||
+      mousedown.detail.shiftKey
+    );
+    if (mousedown.detail.button == 0 &&
+        onRegularArea &&
+        !wasMultiselectionAction &&
+        tab?.$TST?.type == TreeItem.TYPE_TAB) {
+      BackgroundConnection.sendMessage({
+        type:  Constants.kCOMMAND_ACTIVATE_TAB,
+        tabId: tab.id,
+        byMouseOperation:   true,
+        keepMultiselection: true
+      });
+      if (tab.active || tab.$TST.states.has(Constants.kTAB_STATE_BUNDLED_ACTIVE)) // sticky active tab
+        Scroll.scrollToItem(tab);
+    }
+  });
+
+  EventUtils.setLastMousedown(event.button, mousedown);
+  mousedown.timeout = setTimeout(async () => {
+    if (!EventUtils.getLastMousedown(event.button))
+      return;
+
+    if (event.button == 0 &&
+        mousedownDetail.targetType == 'newtabbutton' &&
+        configs.longPressOnNewTabButton &&
+        mLastDragStartTimestamp < mousedown.timestamp) {
+      mousedown.expired = true;
+      const selector = document.getElementById(configs.longPressOnNewTabButton);
+      if (selector) {
+        const anchor = target.parentNode.querySelector(`[data-menu-ui="${selector.id}"]`);
+        const anchorVisible = anchor && window.getComputedStyle(anchor, null).display != 'none';
+        selector.ui.open({
+          anchor: anchorVisible && anchor || target
+        });
+      }
+      return;
+    }
+
+    if (TSTAPI.getListenersForMessageType(TSTAPI.kNOTIFY_TAB_DRAGREADY).length == 0)
+      return;
+
+    if (event.button == 0 &&
+        tab) {
+      log('onMouseDown expired');
+      mousedown.expired = true;
+    }
+  }, configs.longPressDuration);
+}
+onMouseDown = EventUtils.wrapWithErrorHandler(onMouseDown);
+
+let mLastMouseUpX = -1;
+let mLastMouseUpY = -1;
+let mLastMouseUpOnTab = -1;
+
+async function onMouseUp(event) {
+  const unsafeTab = EventUtils.getTreeItemFromEvent(event, { force: true }) || EventUtils.getTreeItemFromTabbarEvent(event, { force: true });
+  const tab       = EventUtils.getTreeItemFromEvent(event) || EventUtils.getTreeItemFromTabbarEvent(event);
+  log('onMouseUp: ', unsafeTab, { living: !!tab });
+
+  DragAndDrop.endMultiDrag(unsafeTab, event);
+
+  if (EventUtils.isEventFiredOnMenuOrPanel(event) ||
+      EventUtils.isEventFiredOnAnchor(event)) {
+    log(' => on menu or anchor');
+    return;
+  }
+
+  const lastMousedown = EventUtils.getLastMousedown(event.button);
+  EventUtils.cancelHandleMousedown(event.button);
+  const extraContentsInfo = lastMousedown?.detail?.$extraContentsInfo;
+  if (!lastMousedown) {
+    log(' => no lastMousedown');
+    return;
+  }
+  if (lastMousedown.detail.targetType == 'outside') {
+    log(' => out of contents');
+    return;
+  }
+
+  if (tab) {
+    const notifiedTab = lastMousedown.detail?.targetType == 'tab' ? tab : null;
+    const mouseupInfo = {
+      ...lastMousedown,
+      detail: EventUtils.getMouseEventDetail(event, tab),
+      tab:    notifiedTab,
+    };
+
+    const mouseupAllowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_MOUSEUP,
+      notifiedTab ? TSTAPI.kNOTIFY_TAB_MOUSEUP : TSTAPI.kNOTIFY_TABBAR_MOUSEUP,
+      mouseupInfo,
+      extraContentsInfo
+    );
+    if (!mouseupAllowed) {
+      log(' => not allowed (mouseup)');
+      return true;
+    }
+
+    const clickAllowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_CLICKED,
+      notifiedTab ? TSTAPI.kNOTIFY_TAB_CLICKED : TSTAPI.kNOTIFY_TABBAR_CLICKED,
+      mouseupInfo,
+      extraContentsInfo
+    );
+    if (!clickAllowed) {
+      log(' => not allowed (clicked');
+      return true;
+    }
+  }
+
+  let promisedCanceled = null;
+  if (lastMousedown.tab && lastMousedown.detail.targetType == 'tab')
+    promisedCanceled = lastMousedown.promisedMousedownNotified;
+
+  const lastMousedownTab = lastMousedown.detail.tabType == TreeItem.TYPE_GROUP ?
+    TabGroup.get(lastMousedown.detail.tabId) :
+    lastMousedown.detail.tabType == TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER ?
+      TabGroup.get(lastMousedown.detail.tabId).$TST.collapsedMembersCounterItem :
+      Tab.get(lastMousedown.detail.tabId);
+  if (lastMousedown.expired ||
+      lastMousedown.detail.targetType != EventUtils.getEventTargetType(event) || // when the cursor was moved before mouseup
+      (tab && tab != lastMousedownTab)) { // when the tab was already removed
+    log(' => expired, different type, or different tab ', {
+      expired: lastMousedown.expired,
+      targetType: lastMousedown.detail.targetType,
+      targetTypeFromEvent: EventUtils.getEventTargetType(event),
+    });
+    return;
+  }
+
+  if (promisedCanceled && await promisedCanceled) {
+    log('onMouseUp: canceled / by other addons');
+    return;
+  }
+
+  // not canceled, then fallback to default behavior
+  return handleDefaultMouseUp({ lastMousedown, tab, event });
+}
+onMouseUp = EventUtils.wrapWithErrorHandler(onMouseUp);
+
+let mLastMouseupOnClosebox = false;
+async function handleDefaultMouseUp({ lastMousedown, tab, event }) {
+  log(`handleDefaultMouseUp on ${tab?.id} `, lastMousedown.detail);
+
+  if (tab &&
+      lastMousedown.detail.button != 2 &&
+      await handleDefaultMouseUpOnTab({ lastMousedown, tab, event })) {
+    log(`onMouseUp: click on the tab ${tab?.id}, handled by default handler`);
+    return;
+  }
+
+  if (tab) {
+    mLastMouseUpX = event.clientX;
+    mLastMouseUpY = event.clientY;
+    mLastMouseUpOnTab = Date.now();
+  }
+
+  // following codes are for handlig of click event on the tab bar itself.
+  const actionForNewTabCommand = lastMousedown.detail.isMiddleClick ?
+    configs.autoAttachOnNewTabButtonMiddleClick :
+    lastMousedown.detail.isAccelClick ?
+      configs.autoAttachOnNewTabButtonAccelClick :
+      configs.autoAttachOnNewTabCommand;
+  if (EventUtils.isEventFiredOnNewTabButton(event)) {
+    log('onMouseUp: click on the new tab button');
+    if (lastMousedown.detail.button != 2) {
+      log('onMouseUp: not a context menu request');
+      const mouseupInfo = {
+        ...lastMousedown,
+        detail: EventUtils.getMouseEventDetail(event),
+        tab:    null,
+      };
+
+      const mouseUpAllowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+        TSTAPI.kNOTIFY_EXTRA_CONTENTS_MOUSEUP,
+        TSTAPI.kNOTIFY_NEW_TAB_BUTTON_MOUSEUP,
+        mouseupInfo,
+        lastMousedown.detail.$extraContentsInfo
+      );
+      if (!mouseUpAllowed)
+        return;
+
+      const clickAllowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+        TSTAPI.kNOTIFY_EXTRA_CONTENTS_CLICKED,
+        TSTAPI.kNOTIFY_NEW_TAB_BUTTON_CLICKED,
+        mouseupInfo,
+        lastMousedown.detail.$extraContentsInfo
+      );
+      if (!clickAllowed)
+        return;
+
+      // Simulation of Firefox's built-in behavior.
+      // See also: https://github.com/piroor/treestyletab/issues/2593
+      if (event.shiftKey && !lastMousedown.detail.isAccelClick) {
+        browser.windows.create({});
+      }
+      else {
+        const activeTab = Tab.getActiveTab(mTargetWindow);
+        const cookieStoreId = (actionForNewTabCommand == Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING_WITH_INHERITED_CONTAINER) ? activeTab.cookieStoreId : null
+        const urls = lastMousedown.detail.isMiddleClick && configs.middleClickPasteURLOnNewTabButton ?
+          (await RetrieveURL.fromClipboard({ selection: true })) :
+          [];
+        log('urls: ', urls);
+        handleNewTabAction(event, {
+          action: actionForNewTabCommand,
+          cookieStoreId,
+          url: urls.length > 0 ? urls[0] : null,
+        });
+      }
+    }
+    return;
+  }
+
+  const wasMouseupOnClosebox = mLastMouseupOnClosebox;
+  mLastMouseupOnClosebox = !!lastMousedown.detail.closebox;
+
+  // Multiple middle clicks to close tabs can be detected as a middle click on the tab bar.
+  // We should ignore if the cursor is not moved and the closing tab is still in animation.
+  // See also: https://github.com/piroor/treestyletab/issues/1968
+  if (shouldApplyAnimation() &&
+      (lastMousedown.detail.isMiddleClick ||
+       (lastMousedown.detail.button == 0 &&
+        !lastMousedown.detail.isAccelClick &&
+        wasMouseupOnClosebox)) &&
+      Date.now() - mLastMouseUpOnTab <= configs.collapseDuration &&
+      Math.abs(mLastMouseUpX - event.clientX) < configs.acceptableFlickerToIgnoreClickOnTabAndTabbar / 2 &&
+      Math.abs(mLastMouseUpY - event.clientY) < configs.acceptableFlickerToIgnoreClickOnTabAndTabbar / 2) {
+    log('onMouseUp: ignore multi-clicking while closing tab animation');
+    return;
+  }
+
+  const onTabbarTop = EventUtils.isEventFiredOnTabbarTop(event);
+  const onTabbarBottom = EventUtils.isEventFiredOnTabbarBottom(event);
+
+  log('onMouseUp: notify as a blank area click to other addons');
+  if (onTabbarTop || onTabbarBottom) {
+    log('onMouseUp: on tab bar top or bottom');
+    const allowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_MOUSEUP,
+      TSTAPI.kNOTIFY_TABBAR_MOUSEUP,
+      {
+        ...lastMousedown,
+        detail:   EventUtils.getMouseEventDetail(event),
+        tab:      null,
+      },
+      lastMousedown.detail.$extraContentsInfo
+    );
+    if (!allowed) {
+      log('onMouseUp: canceled');
+      return;
+    }
+  }
+  else {
+    log('onMouseUp: on somewhere, tab = ', !!lastMousedown.tab);
+    const mouseUpAllowed = await TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TABBAR_MOUSEUP,
+      {
+        ...lastMousedown.detail,
+        window:             mTargetWindow,
+        windowId:           mTargetWindow,
+        tab:                lastMousedown.tab,
+        $extraContentsInfo: null
+      },
+      { tabProperties: ['tab'] }
+    );
+    if (!mouseUpAllowed) {
+      log('onMouseUp: canceled');
+      return;
+    }
+  }
+
+  if (onTabbarTop || onTabbarBottom) {
+    log('onMouseUp: extra contents on tab bar top or bottom');
+    const allowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_CLICKED,
+      TSTAPI.kNOTIFY_TABBAR_CLICKED,
+      {
+        ...lastMousedown,
+        detail:   EventUtils.getMouseEventDetail(event),
+        tab:      null,
+      },
+      lastMousedown.detail.$extraContentsInfo
+    );
+    if (!allowed) {
+      log('onMouseUp: canceled');
+      return;
+    }
+  }
+  else {
+    log('onMouseUp: on somewhere, tab = ', !!lastMousedown.tab);
+    const clickAllowed = await TSTAPI.tryOperationAllowed(
+      TSTAPI.kNOTIFY_TABBAR_CLICKED,
+      {
+        ...lastMousedown.detail,
+        window:             mTargetWindow,
+        windowId:           mTargetWindow,
+        tab:                lastMousedown.tab,
+        $extraContentsInfo: null
+      },
+      { tabProperties: ['tab'] }
+    );
+    if (!clickAllowed) {
+      log('onMouseUp: canceled');
+      return;
+    }
+  }
+
+  if (lastMousedown.detail.isMiddleClick) { // Ctrl-click does nothing on Firefox's tab bar!
+    log('onMouseUp: default action for middle click on the blank area');
+    handleNewTabAction(event, {
+      action: configs.autoAttachOnNewTabCommand
+    });
+  }
+}
+handleDefaultMouseUp = EventUtils.wrapWithErrorHandler(handleDefaultMouseUp);
+
+async function handleDefaultMouseUpOnTab({ lastMousedown, tab, event } = {}) {
+  log(`Ready to handle click action on the tab ${tab.id}`);
+
+  const onRegularArea = (
+    !lastMousedown.detail.twisty &&
+    !lastMousedown.detail.soundButton &&
+    !lastMousedown.detail.closebox
+  );
+  const wasMultiselectionAction = updateMultiselectionByTabClick(tab, lastMousedown.detail);
+  log(' => ', { onRegularArea, wasMultiselectionAction });
+
+  // Firefox clears tab multiselection after the mouseup, so
+  // we simulate the behavior.
+  if (lastMousedown.detail.button == 0 &&
+      onRegularArea &&
+      !wasMultiselectionAction) {
+    switch (tab.$TST.type) {
+      case TreeItem.TYPE_TAB:
+        log(' => activate');
+        BackgroundConnection.sendMessage({
+          type:  Constants.kCOMMAND_ACTIVATE_TAB,
+          tabId: tab.id,
+          byMouseOperation:   true,
+          keepMultiselection: false // tab.highlighted
+        });
+        break;
+
+      case TreeItem.TYPE_GROUP:
+        log(' => toggle group collapsed');
+        await browser.tabGroups.update(tab.id, { collapsed: !tab.collapsed });
+        break;
+
+      case TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER:
+        log(' => toggle owner group collapsed');
+        await browser.tabGroups.update(tab.id, { collapsed: !tab.group.collapsed });
+        break;
+    }
+  }
+
+  if (lastMousedown.detail.isMiddleClick) { // Ctrl-click doesn't close tab on Firefox's tab bar!
+    log(`onMouseUp: middle click on the tab ${tab.id}: targetType = `, lastMousedown.detail.targetType);
+    if (lastMousedown.detail.targetType != 'tab' || // ignore middle click on blank area
+        tab.type == TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER)
+      return false;
+    const tabs = TreeBehavior.getClosingTabsFromParent(tab, {
+      byInternalOperation: true
+    });
+    log('tabs: ', tabs);
+    const sanitizedTabsToClose = mapAndFilter(tabs, tab => tab.type == TreeItem.TYPE_GROUP ? undefined : tab.$TST.sanitized);
+    log('sanitizedTabsToClose: ', sanitizedTabsToClose);
+    (tab.type == TreeItem.TYPE_GROUP ? Promise.resolve(true) : // on Firefox 139, middle click on a group closes it with no warning!
+      Sidebar.confirmToCloseTabs(sanitizedTabsToClose))
+      .then(async confirmed => {
+        if (!confirmed)
+          return;
+        const tabIds = sanitizedTabsToClose.map(tab => tab.id);
+        await Scroll.tryLockPosition(tabIds, Scroll.LOCK_REASON_REMOVE);
+        BackgroundConnection.sendMessage({
+          type:   Constants.kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION,
+          tabIds
+        });
+      });
+  }
+  else if (wasMultiselectionAction) {
+    // On Firefox's native tabs, Ctrl-Click or Shift-Click always
+    // ignore actions on closeboxes and sound playing icons.
+    // Thus we should simulate the behavior.
+    return true;
+  }
+  else if (lastMousedown.detail.twisty &&
+           EventUtils.isEventFiredOnTwisty(event)) {
+    log(`clicked on twisty of the tab ${tab.id}`);
+    if (tab.$TST.hasChild) {
+      if (!tab.$TST.subtreeCollapsed) // going to collapse
+        await Scroll.tryLockPosition(
+          tab.$TST.descendants.filter(tab => !tab.$TST.collapsed).map(tab => tab.id),
+          Scroll.LOCK_REASON_COLLAPSE
+        );
+      else // going to expand
+        Scroll.tryUnlockPosition(tab.$TST.descendants.map(tab => tab.id));
+      BackgroundConnection.sendMessage({
+        type:            Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE,
+        tabId:           tab.id,
+        collapsed:       !tab.$TST.subtreeCollapsed,
+        manualOperation: true,
+        stack:           configs.debug && new Error().stack
+      });
+    }
+  }
+  else if (lastMousedown.detail.soundButton &&
+           EventUtils.isEventFiredOnSoundButton(event)) {
+    log(`clicked on sound button of the tab ${tab.id}`);
+    if (tab.$TST.states.has(Constants.kTAB_STATE_AUTOPLAY_BLOCKED) ||
+        tab.$TST.states.has(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER)) {
+      // Note: there is no built-in handler for this command.
+      // We need to provide something extra module to handle
+      // this command with experiments API.
+      BackgroundConnection.sendMessage({
+        type:  Constants.kCOMMAND_UNBLOCK_AUTOPLAY_FROM_SOUND_BUTTON,
+        tabId: tab.id,
+      });
+    }
+    else {
+      BackgroundConnection.sendMessage({
+        type:  Constants.kCOMMAND_TOGGLE_MUTED_FROM_SOUND_BUTTON,
+        tabId: tab.id,
+      });
+    }
+  }
+  else if (lastMousedown.detail.closebox &&
+           EventUtils.isEventFiredOnClosebox(event)) {
+    log(`clicked on closebox of the tab ${tab.id}`);
+    //if (!warnAboutClosingTabSubtreeOf(tab)) {
+    //  event.stopPropagation();
+    //  event.preventDefault();
+    //  return;
+    //}
+    const multiselected  = tab.$TST.multiselected;
+    const tabsToBeClosed = multiselected ?
+      Tab.getSelectedTabs(tab.windowId) :
+      TreeBehavior.getClosingTabsFromParent(tab, {
+        byInternalOperation: true
+      }) ;
+    Sidebar.confirmToCloseTabs(tabsToBeClosed.map(tab => tab.$TST.sanitized), {
+      configKey: 'warnOnCloseTabsByClosebox'
+    })
+      .then(async confirmed => {
+        if (!confirmed)
+          return;
+        const tabIds = tabsToBeClosed.map(tab => tab.id);
+        await Scroll.tryLockPosition(tabIds, Scroll.LOCK_REASON_REMOVE);
+        BackgroundConnection.sendMessage({
+          type:   Constants.kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION,
+          tabIds
+        });
+      });
+  }
+
+  return true;
+}
+handleDefaultMouseUpOnTab = EventUtils.wrapWithErrorHandler(handleDefaultMouseUpOnTab);
+
+let mLastClickedTab       = null;
+let mIsInSelectionSession = false;
+
+function updateMultiselectionByTabClick(tab, event) {
+  const ctrlKeyPressed     = event.ctrlKey || (event.metaKey && isMacOS());
+  const activeTab          = Tab.getActiveTab(tab.windowId);
+  const highlightedTabIds  = new Set(Tab.getHighlightedTabs(tab.windowId).map(tab => tab.id));
+  log(`updateMultiselectionByTabClick on ${tab.id} `, { ctrlKeyPressed, activeTab, highlightedTabIds, mIsInSelectionSession });
+  if (event.shiftKey) {
+    // select the clicked tab and tabs between last activated tab
+    const lastClickedTab   = mLastClickedTab || activeTab;
+    const betweenTabs      = Tab.getTabsBetween(lastClickedTab, tab);
+    const targetTabs       = new Set([lastClickedTab].concat(betweenTabs));
+    targetTabs.add(tab);
+
+    log(' => ', { lastClickedTab, betweenTabs, targetTabs });
+
+    try {
+      if (!ctrlKeyPressed) {
+        const alreadySelectedTabs = Tab.getHighlightedTabs(tab.windowId, { iterator: true });
+        log(`clear old selection by shift-click on ${tab.id}`);
+        for (const alreadySelectedTab of alreadySelectedTabs) {
+          if (!targetTabs.has(alreadySelectedTab))
+            highlightedTabIds.delete(alreadySelectedTab.id);
+        }
+      }
+
+      log(`set selection by shift-click on ${tab.id}: `, configs.debug && Array.from(targetTabs, dumpTab));
+      for (const toBeSelectedTab of targetTabs) {
+        highlightedTabIds.add(toBeSelectedTab.id);
+      }
+
+      const rootTabs = [tab];
+      if (tab != activeTab &&
+          !mIsInSelectionSession)
+        rootTabs.push(activeTab);
+      for (const root of rootTabs) {
+        if (!root.$TST.subtreeCollapsed)
+          continue;
+        for (const descendant of root.$TST.descendants) {
+          highlightedTabIds.add(descendant.id);
+        }
+      }
+      log(' => highlightedTabIds: ', highlightedTabIds);
+
+      BackgroundConnection.sendMessage({
+        type:   Constants.kCOMMAND_HIGHLIGHT_TABS,
+        tabIds: [...highlightedTabIds],
+        inheritToCollapsedDescendants: false,
+      });
+    }
+    catch(_e) { // not implemented on old Firefox
+      return false;
+    }
+    mIsInSelectionSession = true;
+    return true;
+  }
+  else if (ctrlKeyPressed) {
+    try {
+      log(`change selection by ctrl-click on ${tab.id}`);
+      /* Special operation to toggle selection of collapsed descendants for the active tab.
+         - When there is no other multiselected foreign tab
+           => toggle multiselection only descendants.
+         - When there is one or more multiselected foreign tab
+           => toggle multiselection of the active tab and descendants.
+              => one of multiselected foreign tabs will be activated.
+         - When a foreign tab is highlighted and there is one or more unhighlighted descendants 
+           => highlight all descendants (to prevent only the root tab is dragged).
+       */
+      const activeTabDescendants = activeTab.$TST.descendants;
+      let toBeHighlighted = !tab.highlighted;
+      log('toBeHighlighted: ', toBeHighlighted);
+      if (tab == activeTab &&
+          tab.$TST.subtreeCollapsed &&
+          activeTabDescendants.length > 0) {
+        const highlightedCount  = countMatched(activeTabDescendants, tab => tab.highlighted);
+        const partiallySelected = highlightedCount != 0 && highlightedCount != activeTabDescendants.length;
+        toBeHighlighted = partiallySelected || !activeTabDescendants[0].highlighted;
+        log(' => ', toBeHighlighted, { partiallySelected });
+      }
+      if (toBeHighlighted)
+        highlightedTabIds.add(tab.id);
+      else
+        highlightedTabIds.delete(tab.id);
+
+      if (tab.$TST.subtreeCollapsed) {
+        const descendants = tab == activeTab ? activeTabDescendants : tab.$TST.descendants;
+        for (const descendant of descendants) {
+          if (toBeHighlighted)
+            highlightedTabIds.add(descendant.id);
+          else
+            highlightedTabIds.delete(descendant.id);
+        }
+      }
+
+      if (tab == activeTab) {
+        if (highlightedTabIds.size == 0) {
+          log('Don\'t unhighlight only one highlighted active tab!');
+          highlightedTabIds.add(tab.id);
+        }
+      }
+      else if (!mIsInSelectionSession) {
+        log('Select active tab and its descendants, for new selection session');
+        highlightedTabIds.add(activeTab.id);
+        if (activeTab.$TST.subtreeCollapsed) {
+          for (const descendant of activeTabDescendants) {
+            highlightedTabIds.add(descendant.id);
+          }
+        }
+      }
+
+      BackgroundConnection.sendMessage({
+        type:   Constants.kCOMMAND_HIGHLIGHT_TABS,
+        tabIds: [...highlightedTabIds],
+        inheritToCollapsedDescendants: false,
+      });
+    }
+    catch(_e) { // not implemented on old Firefox
+      return false;
+    }
+    mLastClickedTab       = tab;
+    mIsInSelectionSession = true;
+    return true;
+  }
+  else {
+    mLastClickedTab       = null;
+    mIsInSelectionSession = false;
+    return false;
+  }
+}
+
+Tab.onActivated.addListener((tab, _info = {}) => {
+  if (tab.windowId != mTargetWindow)
+    return;
+
+  if (mLastClickedTab &&
+      tab.id != mLastClickedTab.id &&
+      Tab.getHighlightedTabs(mTargetWindow).length == 1) {
+    mLastClickedTab       = null;
+    mIsInSelectionSession = false;
+  }
+});
+
+function onClick(_event) {
+  // clear unexpectedly left "dragging" state
+  // (see also https://github.com/piroor/treestyletab/issues/1921 )
+  DragAndDrop.clearDraggingItemsState();
+}
+onClick = EventUtils.wrapWithErrorHandler(onClick);
+
+function onAuxClick(event) {
+  if (event.button != 1) {
+    return;
+  }
+  // This is required to prevent new tab from middle-click on a UI link.
+  event.stopPropagation();
+  event.preventDefault();
+}
+onAuxClick = EventUtils.wrapWithErrorHandler(onAuxClick);
+
+function onDragStart(event) {
+  log('onDragStart ', event);
+  mLastDragStartTimestamp = Date.now();
+
+  if (!event.target.closest('.newtab-button')) {
+    log('not a draggable item in the tab bar');
+    return;
+  }
+
+  const modifiers = String(configs.newTabButtonDragGestureModifiers).toLowerCase();
+  if (!configs.allowDragNewTabButton ||
+      modifiers.includes('alt') != event.altKey ||
+      modifiers.includes('ctrl') != event.ctrlKey ||
+      modifiers.includes('meta') != event.metaKey ||
+      modifiers.includes('shift') != event.shiftKey) {
+    log('not allowed drag action on the new tab button');
+    event.stopPropagation();
+    event.preventDefault();
+    return;
+  }
+
+  log('new tab button is going to be dragged');
+
+  const selector = document.getElementById(configs.longPressOnNewTabButton);
+  if (selector &&
+      selector.ui.opened) {
+    log('menu is shown: don\'t start dragging');
+    event.stopPropagation();
+    event.preventDefault();
+    return;
+  }
+
+  const dt = event.dataTransfer;
+  dt.effectAllowed = 'copy';
+  dt.setData('text/uri-list', 'about:newtab');
+}
+onDragStart = EventUtils.wrapWithErrorHandler(onDragStart);
+
+function handleNewTabAction(event, options = {}) {
+  log('handleNewTabAction ', { event, options });
+
+  if (!configs.autoAttach && !('action' in options))
+    options.action = Constants.kNEWTAB_DO_NOTHING;
+
+  BackgroundConnection.sendMessage({
+    type:          Constants.kCOMMAND_NEW_TAB_AS,
+    baseTabId:     Tab.getActiveTab(mTargetWindow).id,
+    as:            options.action,
+    cookieStoreId: options.cookieStoreId,
+    inBackground:  event.shiftKey,
+    url:           options.url,
+  });
+}
+
+async function onDblClick(event) {
+  if (EventUtils.isEventFiredOnNewTabButton(event))
+    return;
+
+  const tab = EventUtils.getTreeItemFromEvent(event, { force: true }) || EventUtils.getTreeItemFromTabbarEvent(event, { force: true });
+  const livingTab = EventUtils.getTreeItemFromEvent(event);
+  log('dblclick tab: ', tab, { living: !!livingTab });
+
+  if (livingTab &&
+      !EventUtils.isEventFiredOnTwisty(event) &&
+      !EventUtils.isEventFiredOnSoundButton(event)) {
+    const detail   = EventUtils.getMouseEventDetail(event, livingTab);
+    const extraContentsInfo = TSTAPIFrontend.getOriginalExtraContentsTarget(event);
+    const allowed = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_DBLCLICKED,
+      TSTAPI.kNOTIFY_TAB_DBLCLICKED,
+      { detail, tab: livingTab },
+      extraContentsInfo
+    );
+    if (!allowed)
+      return;
+
+    if (!EventUtils.isEventFiredOnClosebox(event) && // closebox action is already processed by onclick listener, so we should not handle it here!
+        configs.treeDoubleClickBehavior != Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_NONE) {
+      switch (configs.treeDoubleClickBehavior) {
+        case Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_COLLAPSED:
+          //event.stopPropagation();
+          //event.preventDefault();
+          BackgroundConnection.sendMessage({
+            type:            Constants.kCOMMAND_SET_SUBTREE_COLLAPSED_STATE,
+            tabId:           livingTab.id,
+            collapsed:       !livingTab.$TST.subtreeCollapsed,
+            manualOperation: true,
+            stack:           configs.debug && new Error().stack
+          });
+          break;
+
+        case Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_TOGGLE_STICKY:
+          BackgroundConnection.sendMessage({
+            type:  Constants.kCOMMAND_TOGGLE_STICKY,
+            tabId: livingTab.id,
+            stack: configs.debug && new Error().stack
+          });
+          break;
+
+        case Constants.kTREE_DOUBLE_CLICK_BEHAVIOR_CLOSE:
+          //event.stopPropagation();
+          //event.preventDefault();
+          const tabIds = [livingTab.id];
+          await Scroll.tryLockPosition(tabIds, Scroll.LOCK_REASON_REMOVE);
+          BackgroundConnection.sendMessage({
+            type:   Constants.kCOMMAND_REMOVE_TABS_BY_MOUSE_OPERATION,
+            tabIds
+          });
+          break;
+      }
+    }
+    return;
+  }
+
+  if (tab) // ignore dblclick on closing tab or something
+    return;
+
+  const detail            = EventUtils.getMouseEventDetail(event, null);
+  const extraContentsInfo = TSTAPIFrontend.getOriginalExtraContentsTarget(event);
+  const allowed           = await TSTAPIFrontend.tryMouseOperationAllowedWithExtraContents(
+    TSTAPI.kNOTIFY_EXTRA_CONTENTS_DBLCLICKED,
+    null,
+    { detail },
+    extraContentsInfo
+  );
+  if (!allowed)
+    return;
+
+  //event.stopPropagation();
+  //event.preventDefault();
+  handleNewTabAction(event, {
+    action: configs.autoAttachOnNewTabCommand
+  });
+}
+
+
+
+function onNewTabActionSelect(item, event) {
+  if (item.dataset.value) {
+    let action;
+    switch (item.dataset.value) {
+      default:
+        action = Constants.kNEWTAB_OPEN_AS_ORPHAN;
+        break;
+      case 'child':
+        const hints = new Set([
+          configs.autoAttachOnNewTabButtonMiddleClick,
+          configs.autoAttachOnNewTabButtonAccelClick,
+        ]);
+        if (configs.autoAttachOnNewTabCommand == Constants.kNEWTAB_OPEN_AS_CHILD_TOP)
+          action = Constants.kNEWTAB_OPEN_AS_CHILD_TOP;
+        else if (configs.autoAttachOnNewTabCommand == Constants.kNEWTAB_OPEN_AS_CHILD_END)
+          action = Constants.kNEWTAB_OPEN_AS_CHILD_END;
+        else if (hints.has(Constants.kNEWTAB_OPEN_AS_CHILD_TOP))
+          action = Constants.kNEWTAB_OPEN_AS_CHILD_TOP;
+        else if (hints.has(Constants.kNEWTAB_OPEN_AS_CHILD_END))
+          action = Constants.kNEWTAB_OPEN_AS_CHILD_END;
+        else
+          action = Constants.kNEWTAB_OPEN_AS_CHILD;
+        break;
+      case 'sibling':
+        action = Constants.kNEWTAB_OPEN_AS_SIBLING;
+        break;
+      case 'next-sibling':
+        action = Constants.kNEWTAB_OPEN_AS_NEXT_SIBLING;
+        break;
+    }
+    handleNewTabAction(event, { action });
+  }
+  mNewTabActionSelector.ui.close();
+}
+
+function onContextualIdentitySelect(item, event) {
+  if (item.dataset.value) {
+    const action = EventUtils.isAccelAction(event) ?
+      configs.autoAttachOnNewTabButtonMiddleClick :
+      configs.autoAttachOnNewTabCommand;
+    handleNewTabAction(event, {
+      action,
+      cookieStoreId: item.dataset.value
+    });
+  }
+  if (mContextualIdentitySelector.ui)
+    mContextualIdentitySelector.ui.close();
+}
+
+
+function onMessage(message, _sender, _respond) {
+  if (!message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case TSTAPI.kCOMMAND_BROADCAST_API_REGISTERED:
+      wait(0).then(() => { // wait until addons are updated
+        updateSpecialEventListenersForAPIListeners();
+      });
+      break;
+
+    case TSTAPI.kCOMMAND_BROADCAST_API_UNREGISTERED:
+      wait(0).then(() => { // wait until addons are updated
+        updateSpecialEventListenersForAPIListeners();
+      });
+      break;
+  }
+}
+
+function onBackgroundMessage(message) {
+  switch (message.type) {
+    case Constants.kNOTIFY_TAB_MOUSEDOWN_EXPIRED:
+      if (message.windowId == mTargetWindow) {
+        const lastMousedown = EventUtils.getLastMousedown(message.button || 0);
+        if (lastMousedown)
+          lastMousedown.expired = true;
+      }
+      break;
+
+    case Constants.kCOMMAND_SHOW_CONTAINER_SELECTOR: {
+      if (!mContextualIdentitySelector.ui)
+        return;
+      const anchor = document.querySelector(`
+        :root.contextual-identity-selectable .contextual-identities-selector-anchor,
+        .newtab-button
+      `);
+      mContextualIdentitySelector.ui.open({ anchor });
+    }; break;
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/notifications.js b/waterfox/browser/components/sidebar/sidebar/notifications.js
new file mode 100644
index 0000000000000..deeee785dcb72
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/notifications.js
@@ -0,0 +1,64 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+} from '/common/common.js';
+
+const mNotificationsContainer = document.querySelector('#notifications');
+
+export function add(id, { message, contents, onCreated } = {}) {
+  const elementId = `notification_${id}`;
+  let notification = document.getElementById(elementId);
+  if (!notification) {
+    notification = document.createElement('span');
+    notification.id = elementId;
+  }
+
+  if (contents) {
+    const range = document.createRange();
+    range.selectNodeContents(notification);
+    range.deleteContents();
+    range.detach();
+    notification.appendChild(contents);
+  }
+  else if (message) {
+    notification.textContent = message;
+  }
+
+  if (notification.parentNode)
+    return notification;
+
+  mNotificationsContainer.appendChild(notification);
+
+  if (typeof onCreated == 'function')
+    onCreated(notification);
+
+  if (mNotificationsContainer.childNodes.length > 0) {
+    mNotificationsContainer.classList.remove('hiding');
+    mNotificationsContainer.classList.add('shown');
+  }
+
+  return notification;
+}
+
+export function remove(id) {
+  const elementId = `notification_${id}`;
+  const existingNotification = document.getElementById(elementId);
+  if (!existingNotification)
+    return;
+
+  existingNotification.parentNode.removeChild(existingNotification);
+  if (mNotificationsContainer.childNodes.length > 0)
+    return;
+
+  mNotificationsContainer.classList.add('hiding');
+  mNotificationsContainer.classList.remove('shown');
+  setTimeout(() => {
+    mNotificationsContainer.classList.remove('hiding');
+  }, configs.collapseDuration);
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/pinned-tabs.js b/waterfox/browser/components/sidebar/sidebar/pinned-tabs.js
new file mode 100644
index 0000000000000..233d1f3dcda37
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/pinned-tabs.js
@@ -0,0 +1,388 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+import {
+  log as internalLogger,
+  configs,
+  isRTL,
+} from '/common/common.js';
+
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as GapCanceller from './gap-canceller.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as Size from './size.js';
+
+function log(...args) {
+  internalLogger('sidebar/pinned-tabs', ...args);
+}
+
+let mTargetWindow;
+let mContentsHeight = 0;
+let mAreaHeight     = 0;
+let mMaxVisibleRows = 0;
+let mMaxCol         = 0;
+let mMaxColLastRow  = 0;
+let mMaxRow         = 0;
+const mTabsMatrix = new Map();
+let mDragStartY = 0;
+let mDragStartHeight = 0;
+let mFixedContainerHeight = -1;
+
+const mContainerResizer = document.querySelector('#pinned-tabs-container-resizer');
+
+export async function init() {
+  mTargetWindow = TabsStore.getCurrentWindowId();
+  browser.runtime.onMessage.addListener(onMessage);
+  const restoredFixedHeight = await browser.sessions.getWindowValue(mTargetWindow, 'pinned-container-fixed-height');
+  if (typeof restoredFixedHeight == 'number') {
+    const allTabsAreaHeight   = Size.getAllTabsAreaSize() + GapCanceller.getOffset();
+    mFixedContainerHeight = Math.min(restoredFixedHeight, (allTabsAreaHeight || window.innerHeight) * 0.9);
+  }
+}
+
+function getTabHeight() {
+  return configs.faviconizePinnedTabs ? Size.getRenderedFavIconizedTabHeight() : Size.getRenderedTabHeight();
+}
+
+export function reposition(options = {}) {
+  //log('reposition');
+  const pinnedTabs = Tab.getPinnedTabs(mTargetWindow);
+  if (pinnedTabs.length == 0) {
+    reset();
+    document.documentElement.classList.remove('have-pinned-tabs');
+    return;
+  }
+
+  document.documentElement.classList.add('have-pinned-tabs');
+
+  const maxWidth    = Size.getPinnedTabsContainerWidth();
+  const faviconized = configs.faviconizePinnedTabs;
+
+  const xOffset = faviconized ? 0 : Size.getFavIconizedTabXOffset();
+  const yOffset = faviconized ? Size.getFavIconizedTabYOffset() : Size.getTabYOffset();
+
+  const width  = faviconized ? Size.getRenderedFavIconizedTabWidth() : maxWidth + xOffset;
+  const height = getTabHeight();
+  const maxCol = faviconized ? Math.max(
+    1,
+    configs.maxFaviconizedPinnedTabsInOneRow > 0 ?
+      configs.maxFaviconizedPinnedTabsInOneRow :
+      Math.floor(maxWidth / width)
+  ) : 1;
+  const maxRow = Math.ceil(pinnedTabs.length / maxCol);
+
+  const pinnedTabsAreaRatio = Math.min(Math.max(0, configs.maxPinnedTabsRowsAreaPercentage), 100) / 100;
+  const allTabsAreaHeight   = Size.getAllTabsAreaSize() + GapCanceller.getOffset();
+  mMaxVisibleRows = Math.max(1, Math.floor((allTabsAreaHeight * pinnedTabsAreaRatio) / height));
+  mContentsHeight = height * maxRow + yOffset;
+  mAreaHeight = Math.max(
+    height,
+    mFixedContainerHeight < 0 ?
+      Math.min(
+        mContentsHeight,
+        mMaxVisibleRows * height
+      ) :
+      Math.min(
+        mFixedContainerHeight,
+        allTabsAreaHeight * 0.9
+      )
+  );
+  document.documentElement.style.setProperty('--pinned-tab-width', `${width}px`);
+  document.documentElement.style.setProperty('--pinned-tabs-area-size', `${mAreaHeight}px`);
+  if (configs.faviconizePinnedTabs && configs.maxFaviconizedPinnedTabsInOneRow > 0)
+    document.documentElement.style.setProperty('--pinned-tabs-max-column', configs.maxFaviconizedPinnedTabsInOneRow);
+  else
+    document.documentElement.style.removeProperty('--pinned-tabs-max-column');
+
+  Size.updateContainers();
+  mTabsMatrix.clear();
+
+  let count = 0;
+  let row = 0;
+  let col = 0;
+  mMaxCol = 0;
+  mMaxColLastRow = 0;
+  mMaxRow = 0;
+  for (const tab of pinnedTabs) {
+    mMaxCol = Math.max(col, mMaxCol);
+    mMaxRow = row;
+
+    count++;
+    if (options.justNow)
+      tab.$TST.removeState(Constants.kTAB_STATE_ANIMATION_READY);
+
+    tab.$TST.toggleState(Constants.kTAB_STATE_FAVICONIZED, faviconized);
+    tab.$TST.toggleState(Constants.kTAB_STATE_LAST_ROW, row == maxRow - 1);
+
+    if (row == maxRow - 1)
+      mMaxColLastRow = col;
+
+    if (options.justNow)
+      tab.$TST.addState(Constants.kTAB_STATE_ANIMATION_READY);
+
+    mTabsMatrix.set(`${col}:${row}`, tab.id);
+
+    /*
+    log('pinned tab: ', {
+      tab:    dumpTab(tab),
+      col:    col,
+      width:  width,
+      height: height
+    });
+    */
+
+    col++;
+    if (count > 0 &&
+        count % maxCol == 0) {
+      row++;
+      col = 0;
+      //log('=> new row');
+    }
+  }
+  log('reposition: ', { maxWidth, faviconized, width, height, maxCol, maxRow, pinnedTabsAreaRatio, allTabsAreaHeight, xOffset, yOffset, mMaxVisibleRows, mAreaHeight });
+  log('overflow: mContentsHeight > mAreaHeight : ', mContentsHeight > mAreaHeight);
+  SidebarItems.pinnedContainer.classList.toggle('overflow', mContentsHeight > mAreaHeight);
+}
+
+export function reserveToReposition(options = {}) {
+  if (reserveToReposition.waiting)
+    clearTimeout(reserveToReposition.waiting);
+  reserveToReposition.waiting = setTimeout(() => {
+    delete reserveToReposition.waiting;
+    reposition(options);
+  }, 10);
+}
+
+function reset() {
+  document.documentElement.style.setProperty('--pinned-tabs-area-size', '0px');
+  for (const tab of Tab.getPinnedTabs(mTargetWindow, { iterator: true })) {
+    clearStyle(tab);
+  }
+  mAreaHeight     = 0;
+  mMaxVisibleRows = 0;
+  mMaxCol         = 0;
+  mMaxColLastRow  = 0;
+  mMaxRow         = 0;
+  mTabsMatrix.clear();
+  Size.updateContainers();
+}
+
+function clearStyle(tab) {
+  tab.$TST.removeState(Constants.kTAB_STATE_FAVICONIZED);
+  tab.$TST.removeState(Constants.kTAB_STATE_LAST_ROW);
+}
+
+function getTabPosition(tab) {
+  if (!tab)
+    throw new Error('missing tab');
+
+  log('getTabPosition from ', [...mTabsMatrix.keys()]);
+  for (const [position, tabId] of mTabsMatrix.entries()) {
+    if (tabId != tab.id)
+      continue;
+    const [col, row] = position.split(':');
+    log(` => ${col}:${row}`);
+    return {
+      col: parseInt(col),
+      row: parseInt(row),
+    };
+  }
+
+  throw new Error(`no pinned tab with id ${tab.id}`);
+}
+
+// This must be synchronous and return Promise on demando, to avoid
+// blocking to other listeners.
+function onMessage(message, _sender, _respond) {
+  if (!message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  if (message.windowId &&
+      message.windowId != mTargetWindow)
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case Constants.kCOMMAND_GET_ABOVE_TAB: {
+      try {
+        const { col, row } = getTabPosition(Tab.get(message.tabId));
+        const nextRow = row - 1;
+        log(`above tab: ${col}:${row} => ${col}:${nextRow}`);
+        return Promise.resolve(
+          mTabsMatrix.get(`${col}:${nextRow}`) ||
+          null
+        );
+      }
+      catch(_error) {
+        return Promise.resolve(
+          mTabsMatrix.get(`0:${mMaxRow}`) ||
+          null
+        );
+      }
+    }; break;
+
+    case Constants.kCOMMAND_GET_BELOW_TAB: {
+      const { col, row } = getTabPosition(Tab.get(message.tabId));
+      const nextRow = row + 1;
+      log(`below tab: ${col}:${row} => ${col}:${nextRow}`);
+      return Promise.resolve(
+        mTabsMatrix.get(`${col}:${nextRow}`) ||
+        mTabsMatrix.get(`${mMaxColLastRow}:${nextRow}`) ||
+        null
+      );
+    }; break;
+
+    case Constants.kCOMMAND_GET_LEFT_TAB:
+      return isRTL() ? getTabInlineNextTab(message) : getTabInlinePreviousTab(message);
+
+    case Constants.kCOMMAND_GET_RIGHT_TAB:
+      return isRTL() ? getTabInlinePreviousTab(message) : getTabInlineNextTab(message);
+  }
+}
+
+function getTabInlinePreviousTab(message) {
+  const { col, row } = getTabPosition(Tab.get(message.tabId));
+  const maxCol = row == mMaxRow ? mMaxColLastRow : mMaxCol;
+  const nextCol = col == 0 ? maxCol : col - 1;
+  log(`left tab: ${col}:${row} => ${nextCol}:${row}`);
+  return Promise.resolve(
+    mTabsMatrix.get(`${nextCol}:${row}`) ||
+    null
+  );
+}
+
+function getTabInlineNextTab(message) {
+  const { col, row } = getTabPosition(Tab.get(message.tabId));
+  const maxCol = row == mMaxRow ? mMaxColLastRow : mMaxCol;
+  const nextCol = col == maxCol ? 0 : col + 1;
+  log(`right tab: ${col}:${row} => ${nextCol}:${row}`);
+  return Promise.resolve(
+    mTabsMatrix.get(`${nextCol}:${row}`) ||
+    null
+  );
+}
+
+const BUFFER_KEY_PREFIX = 'pinned-tabs-';
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      if (tab.pinned)
+        reserveToReposition();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVING:
+    case Constants.kCOMMAND_NOTIFY_TAB_MOVED:
+    case Constants.kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED: {
+      // don't wait until tracked here, because removing or detaching tab will become untracked!
+      const tab = Tab.get(message.tabId);
+      if (tab?.pinned)
+        reserveToReposition();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_SHOWN:
+    case Constants.kCOMMAND_NOTIFY_TAB_HIDDEN:
+      reserveToReposition();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW:
+      if (message.wasPinned)
+        reserveToReposition();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_PINNED:
+    case Constants.kCOMMAND_NOTIFY_TAB_UNPINNED: {
+      if (BackgroundConnection.handleBufferedMessage({ type: 'pinned/unpinned', message }, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId, { element: true });
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage('pinned/unpinned', `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      if (lastMessage.message.type == Constants.kCOMMAND_NOTIFY_TAB_UNPINNED)
+        clearStyle(tab);
+      reserveToReposition();
+    }; break;
+  }
+});
+
+mContainerResizer.addEventListener('mousedown', event => {
+  event.stopPropagation();
+  event.preventDefault();
+  mContainerResizer.setCapture(true);
+  mDragStartY = event.clientY;
+  mDragStartHeight = mAreaHeight;
+  mContainerResizer.addEventListener('mousemove', onMouseMove);
+});
+
+mContainerResizer.addEventListener('mouseup', event => {
+  mContainerResizer.removeEventListener('mousemove', onMouseMove);
+  event.stopPropagation();
+  event.preventDefault();
+  document.releaseCapture();
+  mFixedContainerHeight = Math.max(
+    getTabHeight(),
+    Math.min(
+      Math.max(0, mDragStartHeight + (event.clientY - mDragStartY)),
+      mContentsHeight
+    )
+  );
+  reposition();
+  saveLastHeight();
+});
+
+function onMouseMove(event) {
+  event.stopPropagation();
+  event.preventDefault();
+  mFixedContainerHeight = Math.max(0, mDragStartHeight + (event.clientY - mDragStartY));
+  reposition();
+}
+
+function saveLastHeight() {
+  browser.sessions.setWindowValue(mTargetWindow, 'pinned-container-fixed-height', mFixedContainerHeight);
+}
+
+mContainerResizer.addEventListener('dblclick', async event => {
+  event.stopPropagation();
+  event.preventDefault();
+  mFixedContainerHeight = -1;
+  reposition();
+  saveLastHeight();
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/restoring-tab-count.js b/waterfox/browser/components/sidebar/sidebar/restoring-tab-count.js
new file mode 100644
index 0000000000000..231551c8938c7
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/restoring-tab-count.js
@@ -0,0 +1,35 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as Constants from '/common/constants.js';
+
+let mCount = 0;
+
+export function increment() {
+  mCount++;
+}
+
+export function decrement() {
+  mCount--;
+}
+
+export function hasMultipleRestoringTabs() {
+  return mCount > 1;
+}
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TAB_RESTORING:
+      increment();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_RESTORED:
+      decrement();
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/scroll.js b/waterfox/browser/components/sidebar/sidebar/scroll.js
new file mode 100644
index 0000000000000..483293e20cfb2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/scroll.js
@@ -0,0 +1,1710 @@
+/* ***** BEGIN LICENSE BLOCK ***** 
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Tree Style Tab.
+ *
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2011-2025
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ *                 wanabe <https://github.com/wanabe>
+ *                 Tetsuharu OHZEKI <https://github.com/saneyuki>
+ *                 Xidorn Quan <https://github.com/upsuper> (Firefox 40+ support)
+ *                 lv7777 (https://github.com/lv7777)
+ *
+ * ***** END LICENSE BLOCK ******/
+'use strict';
+
+/* ***** IMPORTANT NOTE FOR BETTER PERFORMANCE *****
+   Functions in this module will be called very frequently while
+   scrolling. We should not do operations causing style computation
+   like calling getBoundingClientRect() or accessing to
+   offsetWidth/Height/Top/Left. Instead use Size.getXXXXX() methods
+   which return statically calculated sizes. If you need to get
+   something more new size, add a logic to calculate it to
+   Size.updateTabs() or Size.updateContainers().
+   ************************************************* */
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+import { SequenceMatcher } from '/extlib/diff.js';
+
+import {
+  log as internalLogger,
+  wait,
+  nextFrame,
+  configs,
+  shouldApplyAnimation,
+  watchOverflowStateChange,
+  mapAndFilter,
+} from '/common/common.js';
+
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as CollapseExpand from './collapse-expand.js';
+import * as EventUtils from './event-utils.js';
+import * as RestoringTabCount from './restoring-tab-count.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as Size from './size.js';
+
+export const onPositionUnlocked = new EventListenerManager();
+export const onVirtualScrollViewportUpdated = new EventListenerManager();
+export const onNormalTabsOverflow = new EventListenerManager();
+export const onNormalTabsUnderflow = new EventListenerManager();
+
+function log(...args) {
+  internalLogger('sidebar/scroll', ...args);
+}
+
+
+export const LOCK_REASON_REMOVE   = 'remove';
+export const LOCK_REASON_COLLAPSE = 'collapse';
+
+const mPinnedScrollBox  = document.querySelector('#pinned-tabs-container');
+const mNormalScrollBox  = document.querySelector('#normal-tabs-container');
+const mTabBar           = document.querySelector('#tabbar');
+const mOutOfViewTabNotifier = document.querySelector('#out-of-view-tab-notifier');
+
+let mTabbarSpacerSize = 0;
+
+let mScrollingInternallyCount = 0;
+
+export function init(scrollPosition) {
+  // We should cached scroll positions, because accessing to those properties is slow.
+  mPinnedScrollBox.$scrollTop    = 0;
+  mPinnedScrollBox.$scrollTopMax = mPinnedScrollBox.scrollTopMax;
+  mPinnedScrollBox.$offsetHeight = mPinnedScrollBox.offsetHeight;
+  mNormalScrollBox.$scrollTop    = 0;
+  mNormalScrollBox.$scrollTopMax = mNormalScrollBox.scrollTopMax;
+  mNormalScrollBox.$offsetHeight = mNormalScrollBox.offsetHeight;
+
+  // We need to register the lister as non-passive to cancel the event.
+  // https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#Improving_scrolling_performance_with_passive_listeners
+  document.addEventListener('wheel', onWheel, { capture: true, passive: false });
+  mPinnedScrollBox.addEventListener('scroll', onScroll);
+  mNormalScrollBox.addEventListener('scroll', onScroll);
+  startObserveOverflowStateChange();
+  browser.runtime.onMessage.addListener(onMessage);
+  BackgroundConnection.onMessage.addListener(onBackgroundMessage);
+  TSTAPI.onMessageExternal.addListener(onMessageExternal);
+  SidebarItems.onNormalTabsChanged.addListener(_tab => {
+    reserveToRenderVirtualScrollViewport({ trigger: 'tabsChanged' });
+  });
+  Tab.onNativeGroupModified.addListener(_tab => {
+    reserveToRenderVirtualScrollViewport({ trigger: 'tabsChanged' });
+  });
+  Size.onUpdated.addListener(() => {
+    mPinnedScrollBox.$scrollTopMax = mPinnedScrollBox.scrollTopMax;
+    mPinnedScrollBox.$offsetHeight = mPinnedScrollBox.offsetHeight;
+    mNormalScrollBox.$scrollTopMax = mNormalScrollBox.scrollTopMax;
+    mNormalScrollBox.$offsetHeight = mNormalScrollBox.offsetHeight;
+    reserveToRenderVirtualScrollViewport({ trigger: 'resized', force: true });
+  });
+
+  reserveToRenderVirtualScrollViewport({ trigger: 'initialize' });
+  if (typeof scrollPosition != 'number')
+    return;
+
+  if (scrollPosition <= mNormalScrollBox.$scrollTopMax) {
+    mNormalScrollBox.scrollTop =
+      mNormalScrollBox.$scrollTop = Math.max(0, scrollPosition);
+    return;
+  }
+
+  mScrollingInternallyCount++;
+  restoreScrollPosition.scrollPosition = scrollPosition;
+  onNormalTabsOverflow.addListener(onInitialOverflow);
+  onVirtualScrollViewportUpdated.addListener(onInitialUpdate);
+  wait(1000).then(() => {
+    onNormalTabsOverflow.removeListener(onInitialOverflow);
+    onVirtualScrollViewportUpdated.removeListener(onInitialUpdate);
+    if (restoreScrollPosition.scrollPosition != -1 &&
+        mScrollingInternallyCount > 0)
+      mScrollingInternallyCount--;
+    restoreScrollPosition.scrollPosition = -1;
+    log('timeout: give up to restore scroll position');
+  });
+}
+
+function startObserveOverflowStateChange() {
+  watchOverflowStateChange({
+    target: mNormalScrollBox,
+    vertical: true,
+    moreResizeTargets: [
+      // We need to watch resizing of the virtual scroll container to detect the changed state correctly.
+      mNormalScrollBox.querySelector('.virtual-scroll-container'),
+    ],
+    onOverflow() { onNormalTabsOverflow.dispatch(); },
+    onUnderflow() { onNormalTabsUnderflow.dispatch(); },
+  });
+
+  onNormalTabsOverflow.addListener(() => {
+    reserveToUpdateScrolledState(mNormalScrollBox);
+  });
+  onNormalTabsUnderflow.addListener(() => {
+    reserveToUpdateScrolledState(mNormalScrollBox);
+  });
+}
+
+function onInitialOverflow() {
+  onNormalTabsOverflow.removeListener(onInitialOverflow);
+  onInitialOverflow.done = true;
+  if (onInitialUpdate.done)
+    restoreScrollPosition();
+}
+function onInitialUpdate() {
+  onVirtualScrollViewportUpdated.removeListener(onInitialUpdate);
+  onInitialUpdate.done = true;
+  if (onInitialOverflow.done)
+    restoreScrollPosition();
+}
+function restoreScrollPosition() {
+  if (restoreScrollPosition.retryCount < 10 &&
+      restoreScrollPosition.scrollPosition > mNormalScrollBox.$scrollTopMax) {
+    restoreScrollPosition.retryCount++;
+    return window.requestAnimationFrame(restoreScrollPosition);
+  }
+
+  if (restoreScrollPosition.scrollPosition <= mNormalScrollBox.$scrollTopMax)
+    mNormalScrollBox.scrollTop =
+      mNormalScrollBox.$scrollTop = Math.max(
+        0,
+        restoreScrollPosition.scrollPosition
+      );
+  restoreScrollPosition.scrollPosition = -1;
+  if (mScrollingInternallyCount > 0) {
+    window.requestAnimationFrame(() => {
+      if (mScrollingInternallyCount > 0)
+        mScrollingInternallyCount--;
+    });
+  }
+}
+restoreScrollPosition.retryCount = 0;
+restoreScrollPosition.scrollPosition = -1;
+
+
+/* virtual scrolling */
+
+export function reserveToRenderVirtualScrollViewport({ trigger, force } = {}) {
+  if (!force &&
+      mScrollingInternallyCount > 0)
+    return;
+
+  if (trigger)
+    renderVirtualScrollViewport.triggers.add(trigger);
+
+  if (renderVirtualScrollViewport.invoked)
+    return;
+  renderVirtualScrollViewport.invoked = true;
+  window.requestAnimationFrame(() => renderVirtualScrollViewport());
+}
+
+let mLastRenderableItems;
+let mLastDisappearingItems;
+let mLastRenderedVirtualScrollItemIds = [];
+const STICKY_SPACER_MATCHER = /^tab:(\d+):sticky$/;
+let mScrollPosition = 0;
+
+export function getRenderableTreeItems(windowId = null) {
+  if (!windowId) {
+    windowId = TabsStore.getCurrentWindowId();
+  }
+  if (TabsStore.nativelyGroupedTabsInWindow.get(windowId).size == 0) {
+    log('getRenderableTreeItems: no native tab group');
+    return TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.virtualScrollRenderableTabsInWindow, windowId),
+      skipMatching: true,
+      ordered: true,
+    });
+  }
+
+  const mixedItems = TreeItem.sort([
+    ...TabsStore.queryAll({
+      windowId,
+      tabs:    TabsStore.getTabsMap(TabsStore.virtualScrollRenderableTabsInWindow, windowId),
+      skipMatching: true,
+    }),
+    ...mapAndFilter(
+      [...TabsStore.windows.get(windowId).tabGroups.values()],
+      group => {
+        group.$TST.reindex();
+        if (group.collapsed &&
+            group.$TST.members.some(tab => tab.active)) {
+          const counterItem = group.$TST.collapsedMembersCounterItem;
+          counterItem.$TST.update();
+          return [group, counterItem];
+        }
+        return group;
+      }
+    ).flat(),
+  ]);
+  log('getRenderableTreeItems: mixedItems = ', mixedItems);
+
+  return mixedItems;
+};
+
+renderVirtualScrollViewport.triggers = new Set();
+
+function renderVirtualScrollViewport(scrollPosition = undefined) {
+  renderVirtualScrollViewport.invoked = false;
+  const triggers = new Set([...renderVirtualScrollViewport.triggers]);
+  renderVirtualScrollViewport.triggers.clear();
+
+  const startAt = Date.now();
+
+  const windowId = TabsStore.getCurrentWindowId();
+  const win      = TabsStore.windows.get(windowId);
+  if (!win ||
+      !win.containerElement)
+    return; // not initialized yet
+
+
+  const outOfScreenPages = configs.outOfScreenTabsRenderingPages;
+  const staticRendering  = outOfScreenPages < 0;
+  const skipRefreshItems = staticRendering && triggers.size == 1 && triggers.has('scroll');
+
+  const itemSize           = Size.getRenderedTabHeight();
+  const renderableItems   = skipRefreshItems && mLastRenderableItems || getRenderableTreeItems(windowId);
+  const disappearingItems = skipRefreshItems && mLastDisappearingItems || renderableItems.filter(item => item.$TST.removing || item.$TST.states.has(Constants.kTAB_STATE_COLLAPSING));
+  const totalRenderableItemsSize = Size.getTabMarginBlockStart() + (itemSize * (renderableItems.length - disappearingItems.length)) + Size.getTabMarginBlockEnd();
+  const viewPortSize = Size.getNormalTabsViewPortSize();
+
+  if (staticRendering) {
+    mLastRenderableItems = renderableItems;
+    mLastDisappearingItems = disappearingItems;
+  }
+
+  // For underflow case, we need to unset min-height to put the "new tab"
+  // button next to the last tab immediately.
+  // We need to set the style value directly instead of using custom properties, to reduce needless style computation.
+  mNormalScrollBox.querySelector('.virtual-scroll-container').style.minHeight = `${viewPortSize < totalRenderableItemsSize ? totalRenderableItemsSize : 0}px`;
+
+  const totalItemsSizeHolder = win.containerElement.parentNode;
+  const resized              = totalItemsSizeHolder.$lastHeight != totalRenderableItemsSize;
+  totalItemsSizeHolder.$lastHeight = totalRenderableItemsSize;
+  if (resized) {
+    mNormalScrollBox.$offsetHeight = mNormalScrollBox.offsetHeight;
+    mNormalScrollBox.$scrollTopMax = /*mNormalScrollBox.scrollTopMax*/Math.max(0, totalRenderableItemsSize - viewPortSize);
+  }
+
+  const renderablePaddingSize = staticRendering ?
+    totalRenderableItemsSize :
+    viewPortSize * outOfScreenPages;
+  scrollPosition = Math.max(
+    0,
+    Math.min(
+      totalRenderableItemsSize + mTabbarSpacerSize - viewPortSize,
+      typeof scrollPosition == 'number' ?
+        scrollPosition :
+        restoreScrollPosition.scrollPosition > -1 ?
+          restoreScrollPosition.scrollPosition :
+          mNormalScrollBox.$scrollTop
+    )
+  );
+  mScrollPosition = scrollPosition;
+
+  const firstRenderableIndex = Math.max(
+    0,
+    Math.floor((scrollPosition - renderablePaddingSize) / itemSize)
+  );
+  const lastRenderableIndex = Math.max(
+    0,
+    Math.min(
+      renderableItems.length - 1,
+      Math.ceil((scrollPosition + viewPortSize + renderablePaddingSize) / itemSize)
+    )
+  );
+  const renderedOffset = itemSize * firstRenderableIndex;
+  // We need to set the style value directly instead of using custom properties, to reduce needless style computation.
+  mNormalScrollBox.querySelector('.tabs').style.transform = staticRendering ?
+    '' :
+    `translateY(${renderedOffset}px)`;
+  // We need to shift contents one more, to cover the reduced height due to the sticky tab.
+
+  if (resized) {
+    reserveToUpdateScrolledState(mNormalScrollBox)
+    onVirtualScrollViewportUpdated.dispatch(resized);
+  }
+
+  const stickyItems = updateStickyItems(renderableItems, { staticRendering, skipRefreshItems });
+
+  if (skipRefreshItems) {
+    log('renderVirtualScrollViewport: skip re-rendering of items, rendered = ', renderableItems);
+    if (mLastRenderedVirtualScrollItemIds.length != renderableItems.length) {
+      mLastRenderedVirtualScrollItemIds = renderableItems.map(item => item.$TST.renderingId);
+    }
+  }
+  else {
+    const toBeRenderedItems = renderableItems.slice(firstRenderableIndex, lastRenderableIndex + 1);
+    const toBeRenderedItemIds = toBeRenderedItems.map(item => item.$TST.renderingId);
+    const toBeRenderedItemIdsSet = new Set(toBeRenderedItemIds);
+    for (const stickyItem of stickyItems) {
+      const id = stickyItem.$TST.renderingId;
+      if (toBeRenderedItemIdsSet.has(id)) {
+        toBeRenderedItemIds.splice(toBeRenderedItemIds.indexOf(id), 1, `${id}:sticky`);
+      }
+    }
+
+    const renderOperations = (new SequenceMatcher(mLastRenderedVirtualScrollItemIds, toBeRenderedItemIds)).operations();
+    log('renderVirtualScrollViewport ', {
+      firstRenderableIndex,
+      firstRenderableItemIndex: renderableItems[firstRenderableIndex]?.index,
+      lastRenderableIndex,
+      lastRenderableItemIndex: renderableItems[lastRenderableIndex]?.index,
+      old: mLastRenderedVirtualScrollItemIds.slice(0),
+      new: toBeRenderedItemIds.slice(0),
+      renderOperations,
+      scrollPosition,
+      viewPortSize,
+      totalRenderableItemsSize,
+    });
+
+    const toBeRenderedItemIdSet = new Set(toBeRenderedItemIds);
+    for (const operation of renderOperations) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      switch (tag) {
+        case 'equal':
+          break;
+
+        case 'delete': {
+          const ids = mLastRenderedVirtualScrollItemIds.slice(fromStart, fromEnd);
+          //log('delete: ', { fromStart, fromEnd, toStart, toEnd }, ids);
+          for (const id of ids) {
+            if (STICKY_SPACER_MATCHER.test(id)) {
+              const spacer = win.containerElement.querySelector(`.sticky-tab-spacer[data-tab-id="${RegExp.$1}"]`);
+              if (spacer)
+                spacer.parentNode.removeChild(spacer);
+              continue;
+            }
+            const item = getRenderableItemById(id);
+            if (item?.$TST.element?.parentNode != win.containerElement) // already sticky
+              continue;
+            // We don't need to remove already rendered item,
+            // because it is automatically moved by insertBefore().
+            if (toBeRenderedItemIdSet.has(id) ||
+                !item ||
+                !mNormalScrollBox.contains(item.$TST.element))
+              continue;
+            SidebarItems.unrenderItem(item);
+          }
+        }; break;
+
+        case 'insert':
+        case 'replace': {
+          const deleteIds = mLastRenderedVirtualScrollItemIds.slice(fromStart, fromEnd);
+          const insertIds = toBeRenderedItemIds.slice(toStart, toEnd);
+          //log('insert or replace: ', { fromStart, fromEnd, toStart, toEnd }, deleteIds, ' => ', insertIds);
+          for (const id of deleteIds) {
+            if (STICKY_SPACER_MATCHER.test(id)) {
+              const spacer = win.containerElement.querySelector(`.sticky-tab-spacer[data-tab-id="${RegExp.$1}"]`);
+              if (spacer)
+                spacer.parentNode.removeChild(spacer);
+              continue;
+            }
+            const item = getRenderableItemById(id);
+            if (item?.$TST.element?.parentNode != win.containerElement) // already sticky
+              continue;
+            // We don't need to remove already rendered item,
+            // because it is automatically moved by insertBefore().
+            if (toBeRenderedItemIdSet.has(id) ||
+                !item ||
+                !mNormalScrollBox.contains(item.$TST.element))
+              continue;
+            SidebarItems.unrenderItem(item);
+          }
+          const referenceItem = fromEnd < mLastRenderedVirtualScrollItemIds.length ?
+            getRenderableItemById(mLastRenderedVirtualScrollItemIds[fromEnd]) :
+            null;
+          const referenceItemHasValidReferenceElement = referenceItem?.$TST.element?.parentNode == win.containerElement;
+          for (const id of insertIds) {
+            if (STICKY_SPACER_MATCHER.test(id)) {
+              const spacer = document.createElement('li');
+              spacer.classList.add('sticky-tab-spacer');
+              spacer.setAttribute('data-tab-id', RegExp.$1);
+              win.containerElement.insertBefore(
+                spacer,
+                (referenceItem && win.containerElement.querySelector(`.sticky-tab-spacer[data-tab-id="${referenceItem.id}"]`)) ||
+                (referenceItemHasValidReferenceElement &&
+                 referenceItem.$TST.element) ||
+                null
+              );
+              continue;
+            }
+            const item = getRenderableItemById(id);
+            SidebarItems.renderItem(item, {
+              insertBefore: referenceItemHasValidReferenceElement ? referenceItem :
+                (referenceItem && win.containerElement.querySelector(`.sticky-tab-spacer[data-tab-id="${referenceItem.id}"]`)) ||
+                null,
+            });
+          }
+        }; break;
+      }
+    }
+    mLastRenderedVirtualScrollItemIds = toBeRenderedItemIds;
+  }
+
+  log(`${Date.now() - startAt} msec, offset = ${renderedOffset}`);
+}
+function getRenderableItemById(id) {
+  if (STICKY_SPACER_MATCHER.test(id)) {
+    return Tab.get(parseInt(RegExp.$1));
+  }
+
+  const [type, rawId] = id.split(':');
+  switch (type) {
+    case TreeItem.TYPE_GROUP:
+      return TabGroup.get(parseInt(rawId));
+
+    case TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER:
+      return TabGroup.get(parseInt(rawId)).$TST.collapsedMembersCounterItem;
+
+    case TreeItem.TYPE_TAB:
+    default:
+      return Tab.get(parseInt(rawId));
+  }
+
+  return null;
+}
+
+let mLastStickyItemIdsAbove = new Set();
+let mLastStickyItemIdsBelow = new Set();
+let mLastCanBeStickyItems;
+
+function updateStickyItems(renderableItems, { staticRendering, skipRefreshItems } = {}) {
+  const itemSize       = Size.getRenderedTabHeight();
+  const windowId       = TabsStore.getCurrentWindowId();
+  const scrollPosition = mScrollPosition;
+  const viewPortSize   = Size.getNormalTabsViewPortSize();
+
+  const firstInViewportIndex = Math.ceil(scrollPosition / itemSize);
+  const lastInViewportIndex  = Math.floor((scrollPosition + viewPortSize - itemSize) / itemSize);
+
+  const stickyItemIdsAbove = new Set();
+  const stickyItemIdsBelow = new Set();
+  const stickyItems = [];
+
+  const canBeStickyItems = skipRefreshItems && mLastCanBeStickyItems || renderableItems.filter(item => item.$TST.canBecomeSticky);
+  log('canBeStickyItems ', canBeStickyItems);
+  if (staticRendering)
+    mLastCanBeStickyItems = canBeStickyItems;
+
+  const removedOrCollapsedTabsCount = parseInt(mNormalScrollBox.querySelector(`.${Constants.kTABBAR_SPACER}`).dataset.removedOrCollapsedTabsCount || 0);
+  for (const item of canBeStickyItems.slice(0).reverse()) { // first try: find bottom sticky items from bottom
+    const index = renderableItems.indexOf(item);
+    if (index > -1 &&
+        index > (lastInViewportIndex - stickyItemIdsBelow.size) &&
+        mNormalScrollBox.$scrollTop < mNormalScrollBox.$scrollTopMax &&
+        (index - (lastInViewportIndex - stickyItemIdsBelow.size) > 1 ||
+         removedOrCollapsedTabsCount == 0)) {
+      stickyItemIdsBelow.add(item.id);
+      continue;
+    }
+    if (stickyItemIdsBelow.size > 0)
+      break;
+  }
+
+  for (const item of canBeStickyItems) { // second try: find top sticky items and set bottom sticky items
+    const index = renderableItems.indexOf(item);
+    if (index > -1 &&
+        index < (firstInViewportIndex + stickyItemIdsAbove.size) &&
+        mNormalScrollBox.$scrollTop > 0) {
+      stickyItems.push(item);
+      stickyItemIdsAbove.add(item.id);
+      continue;
+    }
+    if (stickyItemIdsBelow.has(item.id)) {
+      stickyItems.push(item);
+      continue;
+    }
+    if (item.$TST.element &&
+        item.$TST.element.parentNode != TabsStore.windows.get(windowId).containerElement) {
+      SidebarItems.unrenderItem(item);
+      continue;
+    }
+  }
+
+  for (const [lastIds, currentIds, place] of [
+    [[...mLastStickyItemIdsAbove], [...stickyItemIdsAbove], 'above'],
+    [[...mLastStickyItemIdsBelow].reverse(), [...stickyItemIdsBelow].reverse(), 'below'],
+  ]) {
+    const renderOperations = (new SequenceMatcher(lastIds, currentIds)).operations();
+    for (const operation of renderOperations) {
+      const [tag, fromStart, fromEnd, toStart, toEnd] = operation;
+      switch (tag) {
+        case 'equal':
+          break;
+
+        case 'delete': {
+          const ids = lastIds.slice(fromStart, fromEnd);
+          for (const id of ids) {
+            if (!stickyItemIdsAbove.has(id) &&
+                !stickyItemIdsBelow.has(id))
+              SidebarItems.unrenderItem(Tab.get(id));
+          }
+        }; break;
+
+        case 'insert':
+        case 'replace': {
+          const deleteIds = lastIds.slice(fromStart, fromEnd);
+          for (const id of deleteIds) {
+            if (!stickyItemIdsAbove.has(id) &&
+                !stickyItemIdsBelow.has(id))
+              SidebarItems.unrenderItem(Tab.get(id));
+          }
+          const insertIds = currentIds.slice(toStart, toEnd);
+          const referenceItem = (fromEnd < lastIds.length && currentIds.includes(lastIds[fromEnd])) ?
+            Tab.get(lastIds[fromEnd]) :
+            null;
+          for (const id of insertIds) {
+            SidebarItems.renderItem(Tab.get(id), {
+              containerElement: document.querySelector(`.sticky-tabs-container.${place}`),
+              insertBefore:     referenceItem,
+            });
+          }
+        }; break;
+      }
+    }
+  }
+
+  log('updateStickyItems ', stickyItems, { above: [...stickyItemIdsAbove], below: [...stickyItemIdsBelow] });
+  mLastStickyItemIdsAbove = stickyItemIdsAbove;
+  mLastStickyItemIdsBelow = stickyItemIdsBelow;
+
+  return stickyItems;
+}
+
+function getScrollBoxFor(item, { allowFallback } = {}) {
+  if (!item || !item.pinned)
+    return mNormalScrollBox; // the default
+  if (allowFallback &&
+      mPinnedScrollBox.$scrollTopMax == 0) {
+    log('pinned tabs are not scrollable, fallback to normal tabs');
+    return mNormalScrollBox;
+  }
+  return mPinnedScrollBox;
+}
+
+export function getItemRect(item, { afterAnimation } = {}) {
+  if (item.pinned)
+    return item.$TST.element.getBoundingClientRect();
+
+  let renderableItems;
+  if (afterAnimation) {
+    // We need to ignore preceding "going to be collapsed" tabs on determination of the
+    // final tab position.
+    const calculationTargetTabs = TabsStore.scrollPositionCalculationTargetTabsInWindow.get(item.windowId);
+    // On the other hand, preceding "going to be expanded" tabs are naturally included
+    // in the "renderable" tabs (because they are still visible in the tab bar).
+    const sourceRenderableItems = getRenderableTreeItems(item.windowId);
+    // So, we can get the collection of finally visible tabs with "renderable tabs" - "collapsing tabs".
+    renderableItems = mapAndFilter(sourceRenderableItems, item => {
+      if (item.type == 'tab' && !calculationTargetTabs.has(item.id)) {
+        return undefined;
+      }
+      return item.id;
+    });
+  }
+  else {
+    renderableItems = getRenderableTreeItems(item.windowId).map(item => item.id);
+  }
+  const itemSize       = Size.getTabHeight();
+  const scrollBox      = getScrollBoxFor(item);
+  const scrollBoxRect  = Size.getScrollBoxRect(scrollBox);
+
+  let index = renderableItems.indexOf(item.id);
+  if (index < 0) { // the item is not renderable yet, so we calculate the index based on other items.
+    const following = item.$TST.nearestVisibleFollowingTab;
+    if (following) {
+      index = renderableItems.indexOf(following.id);
+    }
+    else {
+      const preceding = item.$TST.nearestVisiblePrecedingTab;
+      if (preceding) {
+        index = renderableItems.indexOf(preceding.id);
+        if (index > -1)
+          index++;
+      }
+    }
+    if (index < -1) // no nearest visible item: treat as a last item
+      index = renderableItems.length;
+  }
+  const itemTop = Size.getRenderedTabHeight() * index + scrollBoxRect.top - scrollBox.$scrollTop;
+  /*
+  console.log('coordinates of item rect ', {
+    index,
+    renderableItemHeight: Size.getRenderedTabHeight(),
+    scrollBox_rectTop: scrollBoxRect.top,
+    scrollBox_$scrollTop: scrollBox.$scrollTop,
+  });
+  */
+  return {
+    top:    itemTop,
+    bottom: itemTop + itemSize,
+    height: itemSize,
+  };
+}
+
+configs.$addObserver(key => {
+  switch (key) {
+    case 'outOfScreenTabsRenderingPages':
+      mLastRenderableItems   = null;
+      mLastDisappearingItems = null;
+      mLastCanBeStickyItems  = null;
+      break;
+  }
+});
+
+
+/* basic operations */
+
+function scrollTo(params = {}) {
+  log('scrollTo ', params);
+  if (!params.justNow &&
+      shouldApplyAnimation(true) &&
+      configs.smoothScrollEnabled)
+    return smoothScrollTo(params);
+
+  //cancelPerformingAutoScroll();
+  const scrollBox = params.scrollBox || getScrollBoxFor(params.item, { allowFallback: true });
+  const scrollTop = params.item ?
+    scrollBox.$scrollTop + calculateScrollDeltaForItem(params.item) :
+    typeof params.position == 'number' ?
+      params.position :
+      typeof params.delta == 'number' ?
+        mNormalScrollBox.$scrollTop + params.delta :
+        undefined;
+  if (scrollTop === undefined)
+    throw new Error('No parameter to indicate scroll position');
+
+  // render before scroll, to prevent showing blank area
+  mScrollingInternallyCount++;
+  renderVirtualScrollViewport(scrollTop);
+  scrollBox.scrollTop =
+    scrollBox.$scrollTop = Math.min(
+      scrollBox.$scrollTopMax,
+      Math.max(0, scrollTop)
+    );
+  window.requestAnimationFrame(() => {
+    if (mScrollingInternallyCount > 0)
+      mScrollingInternallyCount--;
+  });
+}
+
+function cancelRunningScroll() {
+  scrollToItem.stopped = true;
+  stopSmoothScroll();
+}
+
+function calculateScrollDeltaForItem(item, { over } = {}) {
+  item = TreeItem.get(item);
+  if (!item)
+    return 0;
+
+  item = item.$TST.collapsed && item.$TST.nearestVisibleAncestorOrSelf || item;
+
+  const itemRect      = getItemRect(item, { afterAnimation: true });
+  const scrollBox     = getScrollBoxFor(item, { allowFallback: true });
+  const scrollBoxRect = Size.getScrollBoxRect(scrollBox);
+  const overScrollOffset = over === false ?
+    0 :
+    Math.ceil(Math.min(
+      itemRect.height / (item.pinned ? 3 : 2),
+      (scrollBoxRect.height - itemRect.height) / 3
+    ));
+  let delta = 0;
+  if (scrollBoxRect.bottom < itemRect.bottom) { // should scroll down
+    delta = itemRect.bottom - scrollBoxRect.bottom + overScrollOffset;
+    if (!item.pinned) {
+      if (mLastStickyItemIdsBelow.has(item.id) &&
+          mLastStickyItemIdsBelow.size > 0)
+        delta += itemRect.height * (mLastStickyItemIdsBelow.size - 1);
+      else
+        delta += itemRect.height * mLastStickyItemIdsBelow.size;
+    }
+  }
+  else if (scrollBoxRect.top > itemRect.top) { // should scroll up
+    delta = itemRect.top - scrollBoxRect.top - overScrollOffset;
+    if (!item.pinned) {
+      if (mLastStickyItemIdsAbove.has(item.id) &&
+          mLastStickyItemIdsAbove.size > 0)
+        delta -= itemRect.height * (mLastStickyItemIdsAbove.size - 1);
+      else
+        delta -= itemRect.height * mLastStickyItemIdsAbove.size;
+    }
+  }
+  log('calculateScrollDeltaForItem ', item.id, {
+    delta,
+    itemTop:         itemRect.top,
+    itemBottom:      itemRect.bottom,
+    scrollBoxBottom: scrollBoxRect.bottom,
+    itemHeight:      itemRect.height,
+    overScrollOffset,
+  });
+  return delta;
+}
+
+export function isItemInViewport(item, { allowPartial } = {}) {
+  item = Tab.get(item?.id);
+  if (!TabsStore.ensureLivingItem(item))
+    return false;
+
+  const itemRect      = getItemRect(item, { afterAnimation: true });
+  const allowedOffset = allowPartial ? (itemRect.height / 2) : 0;
+  const scrollBoxRect = Size.getScrollBoxRect(getScrollBoxFor(item));
+  log('isItemInViewport ', item.id, {
+    allowedOffset,
+    itemTop:        itemRect.top + allowedOffset,
+    itemBottom:     itemRect.bottom - allowedOffset,
+    viewPortTop:    scrollBoxRect.top,
+    viewPortBottom: scrollBoxRect.bottom,
+  });
+  return (
+    itemRect.top + allowedOffset >= scrollBoxRect.top &&
+    itemRect.bottom - allowedOffset <= scrollBoxRect.bottom
+  );
+}
+
+async function smoothScrollTo(params = {}) {
+  log('smoothScrollTo ', params, new Error().stack);
+  //cancelPerformingAutoScroll(true);
+
+  smoothScrollTo.stopped = false;
+
+  const scrollBox = params.scrollBox || getScrollBoxFor(params.item, { allowFallback: true });
+
+  let delta, startPosition, endPosition;
+  if (params.item) {
+    startPosition = scrollBox.$scrollTop;
+    delta       = calculateScrollDeltaForItem(params.item);
+    endPosition = startPosition + delta;
+  }
+  else if (typeof params.position == 'number') {
+    startPosition = scrollBox.$scrollTop;
+    endPosition = params.position;
+    delta       = endPosition - startPosition;
+  }
+  else if (typeof params.delta == 'number') {
+    startPosition = scrollBox.$scrollTop;
+    endPosition = startPosition + params.delta;
+    delta       = params.delta;
+  }
+  else {
+    throw new Error('No parameter to indicate scroll position');
+  }
+  smoothScrollTo.currentOffset = delta;
+
+  const duration  = Math.max(0, typeof params.duration == 'number' ? params.duration : configs.smoothScrollDuration);
+  const startTime = Date.now();
+
+  return new Promise((resolve, _reject) => {
+    const radian = 90 * Math.PI / 180;
+    const scrollStep = () => {
+      if (smoothScrollTo.stopped) {
+        smoothScrollTo.currentOffset = 0;
+        //reject('smooth scroll is canceled');
+        resolve();
+        return;
+      }
+      const nowTime = Date.now();
+      const spentTime = nowTime - startTime;
+      if (spentTime >= duration) {
+        scrollTo({
+          scrollBox,
+          position: endPosition,
+          justNow: true
+        });
+        smoothScrollTo.stopped       = true;
+        smoothScrollTo.currentOffset = 0;
+        resolve();
+        return;
+      }
+      const power        = Math.sin(spentTime / duration * radian);
+      const currentDelta = parseInt(delta * power);
+      const newPosition  = startPosition + currentDelta;
+      scrollTo({
+        scrollBox,
+        position: newPosition,
+        justNow:  true
+      });
+      smoothScrollTo.currentOffset = currentDelta;
+      window.requestAnimationFrame(scrollStep);
+    };
+    window.requestAnimationFrame(scrollStep);
+  });
+}
+smoothScrollTo.currentOffset= 0;
+
+async function smoothScrollBy(delta) {
+  const scrollBox = getScrollBoxFor(
+    Tab.getActiveTab(TabsStore.getCurrentWindowId()),
+    { allowFallback: true }
+  );
+  return smoothScrollTo({
+    position: scrollBox.$scrollTop + delta,
+    scrollBox,
+  });
+}
+
+function stopSmoothScroll() {
+  smoothScrollTo.stopped = true;
+}
+
+/* advanced operations */
+
+export function scrollToNewTab(item, options = {}) {
+  if (!canScrollToItem(item))
+    return;
+
+  if (configs.scrollToNewTabMode == Constants.kSCROLL_TO_NEW_TAB_IF_POSSIBLE) {
+    const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+    scrollToItem(item, {
+      ...options,
+      anchor:            !activeTab.pinned && isItemInViewport(activeTab) && activeTab,
+      notifyOnOutOfView: true
+    });
+  }
+}
+
+function canScrollToItem(item) {
+  item = Tab.get(item?.id);
+  return (
+    TabsStore.ensureLivingItem(item) &&
+    !item.hidden
+  );
+}
+
+export async function scrollToItem(item, options = {}) {
+  scrollToItem.lastTargetId = null;
+
+  log('scrollToItem to ', item?.id, ' anchor = ', options.anchor?.id, options,
+      { stack: configs.debug && new Error().stack });
+  cancelRunningScroll();
+  if (!canScrollToItem(item)) {
+    log('=> unscrollable');
+    return;
+  }
+
+  scrollToItem.stopped = false;
+  cancelNotifyOutOfViewItem();
+  //cancelPerformingAutoScroll(true);
+
+  await nextFrame();
+  if (scrollToItem.stopped)
+    return;
+  cancelNotifyOutOfViewItem();
+
+  const anchorTab = options.anchor;
+  const hasAnchor = TabsStore.ensureLivingItem(anchorTab) && anchorTab != item;
+  const openedFromPinnedTab = hasAnchor && anchorTab.pinned;
+
+  if (isItemInViewport(item) &&
+      (!hasAnchor ||
+       !openedFromPinnedTab)) {
+    log('=> already visible');
+    return;
+  }
+
+  // wait for one more frame, to start collapse/expand animation
+  await nextFrame();
+  if (scrollToItem.stopped)
+    return;
+  cancelNotifyOutOfViewItem();
+  scrollToItem.lastTargetId = item.id;
+
+  const scrollBox = getScrollBoxFor(item);
+  if (hasAnchor &&
+      !anchorTab.pinned) {
+    const targetItemRect = getItemRect(item, { afterAnimation: true });
+    const anchorItemRect = getItemRect(anchorTab, { afterAnimation: true });
+    const scrollBoxRect = Size.getScrollBoxRect(scrollBox);
+    let delta = calculateScrollDeltaForItem(item, { over: false });
+
+    const calculationTargetTabIds = new Set(TabsStore.scrollPositionCalculationTargetTabsInWindow.get(item.windowId).keys());
+    const topStickyItems = anchorTab.$TST.precedingCanBecomeStickyTabs.filter(tab => calculationTargetTabIds.has(tab.id));
+    const topStickyItemsAreaSize = Size.getRenderedTabHeight() * (topStickyItems.length - (mLastStickyItemIdsAbove.has(anchorTab.id) ? 1 : 0));
+    const bottomStickyItems = item.$TST.followingCanBecomeStickyTabs.filter(tab => calculationTargetTabIds.has(tab.id));
+    const bottomStickyItemsAreaSize = Size.getRenderedTabHeight() * (bottomStickyItems.length - (mLastStickyItemIdsBelow.has(item.id) ? 1 : 0));
+
+    if (targetItemRect.top > anchorItemRect.top) {
+      log('=> will scroll down');
+      const boundingHeight = (targetItemRect.bottom + bottomStickyItemsAreaSize) - (anchorItemRect.top - topStickyItemsAreaSize);
+      const overHeight     = boundingHeight - scrollBoxRect.height;
+      if (overHeight > 0) {
+        delta -= overHeight;
+        if (options.notifyOnOutOfView)
+          notifyOutOfViewItem(item);
+      }
+      log('calculated result: ', {
+        boundingHeight, overHeight, delta,
+        container:      scrollBoxRect.height
+      });
+    }
+    else if (targetItemRect.bottom < anchorItemRect.bottom) {
+      log('=> will scroll up');
+      const boundingHeight = anchorItemRect.bottom - targetItemRect.top;
+      const overHeight     = boundingHeight - scrollBoxRect.height;
+      if (overHeight > 0)
+        delta += overHeight;
+      log('calculated result: ', {
+        boundingHeight, overHeight, delta,
+        container:      scrollBoxRect.height
+      });
+    }
+    await scrollTo({
+      ...options,
+      scrollBox,
+      position: scrollBox.$scrollTop + delta,
+    });
+  }
+  else {
+    await scrollTo({
+      ...options,
+      scrollBox,
+      item,
+    });
+  }
+  // A tab can be moved after the tabbar is scrolled to the tab.
+  // To retry "scroll to tab" behavior for such cases, we need to
+  // keep "last scrolled-to tab" information until the tab is
+  // actually moved.
+  await wait(configs.tabBunchesDetectionTimeout);
+  if (scrollToItem.stopped)
+    return;
+  const retryOptions = {
+    retryCount: options.retryCount || 0,
+    anchor:     options.anchor
+  };
+  if (scrollToItem.lastTargetId == item.id &&
+      !isItemInViewport(item) &&
+      (!options.anchor ||
+       !isItemInViewport(options.anchor)) &&
+      retryOptions.retryCount < 3) {
+    retryOptions.retryCount++;
+    return scrollToItem(item, retryOptions);
+  }
+  if (scrollToItem.lastTargetId == item.id)
+    scrollToItem.lastTargetId = null;
+}
+scrollToItem.lastTargetId = null;
+
+/*
+function scrollToItemSubtree(item) {
+  return scrollToItem(item.$TST.lastDescendant, {
+    anchor:            item,
+    notifyOnOutOfView: true
+  });
+}
+
+function scrollToItems(items) {
+  return scrollToItem(items[items.length - 1], {
+    anchor:            items[0],
+    notifyOnOutOfView: true
+  });
+}
+*/
+
+export function autoScrollOnMouseEvent(event) {
+  if (!event.target.closest ||
+      autoScrollOnMouseEvent.invoked)
+    return;
+
+  const scrollBox = event.target.closest(`#${mPinnedScrollBox.id}, #${mNormalScrollBox.id}`);
+  if (!scrollBox ||
+      !scrollBox.classList.contains(Constants.kTABBAR_STATE_OVERFLOW))
+    return;
+
+  autoScrollOnMouseEvent.invoked = true;
+  window.requestAnimationFrame(() => {
+    autoScrollOnMouseEvent.invoked = false;
+
+    const tabbarRect = Size.getScrollBoxRect(scrollBox);
+    const scrollPixels = Math.round(Size.getRenderedTabHeight() * 0.5);
+    if (event.clientY < tabbarRect.top + autoScrollOnMouseEvent.areaSize) {
+      if (scrollBox.$scrollTop > 0)
+        scrollBox.scrollTop =
+          scrollBox.$scrollTop = Math.min(
+            scrollBox.$scrollTopMax,
+            Math.max(
+              0,
+              scrollBox.$scrollTop - scrollPixels
+            )
+          );
+    }
+    else if (event.clientY > tabbarRect.bottom - autoScrollOnMouseEvent.areaSize) {
+      if (scrollBox.$scrollTop < scrollBox.$scrollTopMax)
+        scrollBox.scrollTop =
+          scrollBox.$scrollTop = Math.min(
+            scrollBox.$scrollTopMax,
+            Math.max(
+              0,
+              scrollBox.$scrollTop + scrollPixels
+            )
+          );
+    }
+  });
+}
+autoScrollOnMouseEvent.areaSize = 20;
+
+
+async function notifyOutOfViewItem(item) {
+  item = Tab.get(item?.id);
+  if (RestoringTabCount.hasMultipleRestoringTabs()) {
+    log('notifyOutOfViewItem: skip until completely restored');
+    wait(100).then(() => notifyOutOfViewItem(item));
+    return;
+  }
+  await nextFrame();
+  cancelNotifyOutOfViewItem();
+  if (item && isItemInViewport(item))
+    return;
+  mOutOfViewTabNotifier.classList.add('notifying');
+  await wait(configs.outOfViewTabNotifyDuration);
+  cancelNotifyOutOfViewItem();
+}
+
+function cancelNotifyOutOfViewItem() {
+  mOutOfViewTabNotifier.classList.remove('notifying');
+}
+
+
+/* event handling */
+
+async function onWheel(event) {
+  // Ctrl-WheelScroll produces zoom-in/out on all platforms
+  // including macOS (not Meta-WheelScroll!).
+  // Pinch-in/out on macOS also produces zoom-in/out and
+  // it is cancelable via synthesized `wheel` event.
+  // (See also: https://bugzilla.mozilla.org/show_bug.cgi?id=1777199#c5 )
+  if (!configs.zoomable &&
+      event.ctrlKey) {
+    event.preventDefault();
+    return;
+  }
+
+  const item = EventUtils.getTreeItemFromEvent(event);
+  const scrollBox = getScrollBoxFor(item, { allowFallback: true });
+
+  if (!TSTAPI.isScrollLocked()) {
+    cancelRunningScroll();
+    if (EventUtils.getElementTarget(event).closest('.sticky-tabs-container') ||
+        (item?.pinned &&
+         scrollBox != mPinnedScrollBox)) {
+      event.stopImmediatePropagation();
+      event.preventDefault();
+      scrollTo({ delta: event.deltaY, scrollBox });
+    }
+    return;
+  }
+
+  event.stopImmediatePropagation();
+  event.preventDefault();
+
+  TSTAPI.notifyScrolled({
+    tab: item,
+    scrollContainer: scrollBox,
+    overflow: scrollBox.classList.contains(Constants.kTABBAR_STATE_OVERFLOW),
+    event
+  });
+}
+
+function onScroll(event) {
+  const scrollBox = event.currentTarget;
+  scrollBox.$scrollTopMax = scrollBox.scrollTopMax;
+  scrollBox.$scrollTop = Math.min(scrollBox.$scrollTopMax, scrollBox.scrollTop);
+  reserveToUpdateScrolledState(scrollBox);
+  if (scrollBox == mNormalScrollBox) {
+    reserveToRenderVirtualScrollViewport({ trigger: 'scroll' });
+  }
+  reserveToSaveScrollPosition();
+}
+
+
+function reserveToUpdateScrolledState(scrollBox) {
+  if (scrollBox.__reserveToUpdateScrolledState_invoked) // eslint-disable-line no-underscore-dangle
+    return;
+  scrollBox.__reserveToUpdateScrolledState_invoked = true; // eslint-disable-line no-underscore-dangle
+  window.requestAnimationFrame(() => {
+    scrollBox.__reserveToUpdateScrolledState_invoked = false; // eslint-disable-line no-underscore-dangle
+
+    const scrolled = scrollBox.$scrollTop > 0;
+    const fullyScrolled = scrollBox.$scrollTop == scrollBox.$scrollTopMax;
+    scrollBox.classList.toggle(Constants.kTABBAR_STATE_SCROLLED, scrolled);
+    scrollBox.classList.toggle(Constants.kTABBAR_STATE_FULLY_SCROLLED, fullyScrolled);
+
+    if (scrollBox == mNormalScrollBox) {
+      mTabBar.classList.toggle(Constants.kTABBAR_STATE_SCROLLED, scrolled);
+      mTabBar.classList.toggle(Constants.kTABBAR_STATE_FULLY_SCROLLED, fullyScrolled);
+    }
+
+    Size.updateContainers();
+  });
+}
+
+function reserveToSaveScrollPosition() {
+  if (reserveToSaveScrollPosition.reserved)
+    clearTimeout(reserveToSaveScrollPosition.reserved);
+  reserveToSaveScrollPosition.reserved = setTimeout(() => {
+    delete reserveToSaveScrollPosition.reserved;
+    browser.sessions.setWindowValue(
+      TabsStore.getCurrentWindowId(),
+      Constants.kWINDOW_STATE_SCROLL_POSITION,
+      mNormalScrollBox.$scrollTop
+    ).catch(ApiTabs.createErrorSuppressor());
+  }, 150);
+}
+
+const mReservedScrolls = new WeakMap();
+
+function reserveToScrollToItem(item, options = {}) {
+  if (!item)
+    return;
+
+  const scrollBox = getScrollBoxFor(item);
+  const reservedScroll = {
+    itemId: item.id,
+    options,
+  };
+  mReservedScrolls.set(scrollBox, reservedScroll);
+  window.requestAnimationFrame(() => {
+    if (mReservedScrolls.get(scrollBox) != reservedScroll)
+      return;
+    mReservedScrolls.delete(scrollBox);
+    const options = reservedScroll.options;
+    delete reservedScroll.itemId;
+    delete reservedScroll.options;
+    scrollToItem(item, options);
+  });
+}
+
+function reserveToScrollToNewTab(item) {
+  if (!item)
+    return;
+  const scrollBox = getScrollBoxFor(item);
+  const reservedScroll = {
+    itemId: item.id,
+  };
+  mReservedScrolls.set(scrollBox, reservedScroll);
+  window.requestAnimationFrame(() => {
+    if (mReservedScrolls.get(scrollBox) != reservedScroll)
+      return;
+    mReservedScrolls.delete(scrollBox);
+    delete reservedScroll.itemId;
+    scrollToNewTab(item);
+  });
+}
+
+
+function reReserveScrollingForItem(item) {
+  if (!item)
+    return false;
+  if (reserveToScrollToItem.reservedTabId == item.id) {
+    reserveToScrollToItem(item);
+    return true;
+  }
+  if (reserveToScrollToNewTab.reservedTabId == item.id) {
+    reserveToScrollToNewTab(item);
+    return true;
+  }
+  return false;
+}
+
+
+function onMessage(message, _sender, _respond) {
+  if (!message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  if (message.windowId &&
+      message.windowId != TabsStore.getCurrentWindowId())
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    case Constants.kCOMMAND_GET_RENDERED_TAB_IDS:
+      return Promise.resolve([...new Set([
+        ...Tab.getPinnedTabs(message.windowId).map(tab => tab.id),
+        ...mapAndFilter(mLastRenderedVirtualScrollItemIds, id => {
+          const [type, rawId] = id.split(':');
+          return type == TreeItem.TYPE_TAB ? parseInt(rawId) : undefined;
+        }),
+      ])]);
+
+    case Constants.kCOMMAND_ASK_TAB_IS_IN_VIEWPORT:
+      return Promise.resolve(isItemInViewport(Tab.get(message.tabId), {
+        allowPartial: message.allowPartial,
+      }));
+  }
+}
+
+let mLastToBeActivatedTabId = null;
+
+async function onBackgroundMessage(message) {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TAB_ATTACHED_COMPLETELY: {
+      await Tab.waitUntilTracked([
+        message.tabId,
+        message.parentId
+      ]);
+      const item = Tab.get(message.tabId);
+      const parent = Tab.get(message.parentId);
+      if (item && parent?.active)
+        reserveToScrollToNewTab(item);
+    }; break;
+
+    case Constants.kCOMMAND_SCROLL_TABBAR: {
+      const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+      const scrollBox = getScrollBoxFor(activeTab, { allowFallback: true });
+      switch (String(message.by).toLowerCase()) {
+        case 'lineup':
+          smoothScrollBy(-Size.getRenderedTabHeight() * configs.scrollLines);
+          break;
+
+        case 'pageup':
+          smoothScrollBy(-scrollBox.$offsetHeight + Size.getRenderedTabHeight());
+          break;
+
+        case 'linedown':
+          smoothScrollBy(Size.getRenderedTabHeight() * configs.scrollLines);
+          break;
+
+        case 'pagedown':
+          smoothScrollBy(scrollBox.$offsetHeight - Size.getRenderedTabHeight());
+          break;
+
+        default:
+          switch (String(message.to).toLowerCase()) {
+            case 'top':
+              smoothScrollTo({ position: 0 });
+              break;
+
+            case 'bottom':
+              smoothScrollTo({ position: scrollBox.$scrollTopMax });
+              break;
+          }
+          break;
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED: {
+      await Tab.waitUntilTracked(message.tabId);
+      if (message.maybeMoved)
+        await SidebarItems.waitUntilNewTabIsMoved(message.tabId);
+      const item = Tab.get(message.tabId);
+      if (!item) // it can be closed while waiting
+        break;
+      const needToWaitForTreeExpansion = (
+        item.$TST.collapsedOnCreated &&
+        !item.active &&
+        !Tab.getActiveTab(item.windowId).pinned
+      );
+      if (shouldApplyAnimation(true) ||
+          needToWaitForTreeExpansion) {
+        wait(10).then(() => { // wait until the tab is moved by TST itself
+          const parent = item.$TST.parent;
+          if (parent?.$TST.subtreeCollapsed) // possibly collapsed by other trigger intentionally
+            return;
+          const active = item.active;
+          item.$TST.collapsedOnCreated = false;
+          const activeTab = Tab.getActiveTab(item.windowId);
+          CollapseExpand.setCollapsed(item, { // this is required to scroll to the tab with the "last" parameter
+            collapsed: false,
+            anchor:    (active || activeTab?.$TST.canBecomeSticky) ? null : activeTab,
+            last:      !active
+          });
+          if (!active)
+            notifyOutOfViewItem(item);
+        });
+      }
+      else {
+        reserveToScrollToNewTab(item);
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED: {
+      if (tryLockScrollToSuccessor.tabId == message.tabId) {
+        log('tryLockScrollToSuccessor: wait until unlocked for ', message.tabId);
+        mLastToBeActivatedTabId = message.tabId;
+        const canContinueToScroll = await tryLockScrollToSuccessor.promisedUnlocked;
+        if (!canContinueToScroll ||
+            mLastToBeActivatedTabId != message.tabId) {
+          mLastToBeActivatedTabId = null;
+          break;
+        }
+        log('tryLockScrollToSuccessor: unlocked, scroll to ', message.tabId);
+      }
+      unlockScrollToSuccessor(false);
+      mLastToBeActivatedTabId = null;
+      await Tab.waitUntilTracked(message.tabId);
+      const item = Tab.get(message.tabId);
+      if (!item)
+        break;
+      const allowed = await TSTAPI.tryOperationAllowed(
+        TSTAPI.kNOTIFY_TRY_SCROLL_TO_ACTIVATED_TAB,
+        { tab: item },
+        { tabProperties: ['tab'] }
+      );
+      if (allowed)
+        reserveToScrollToItem(item);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_UNPINNED:
+      await Tab.waitUntilTracked(message.tabId);
+      reserveToScrollToItem(Tab.get(message.tabId));
+      break;
+
+    case Constants.kCOMMAND_BROADCAST_TAB_STATE: {
+      if (!message.tabIds.length ||
+          message.tabIds.length > 1 ||
+          !message.add ||
+          !message.add.includes(Constants.kTAB_STATE_BUNDLED_ACTIVE))
+        break;
+      await Tab.waitUntilTracked(message.tabIds);
+      const item = Tab.get(message.tabIds[0]);
+      if (!item ||
+          item.active)
+        break;
+      const bundled = message.add.includes(Constants.kTAB_STATE_BUNDLED_ACTIVE);
+      if (bundled &&
+          (!configs.scrollToExpandedTree ||
+           !configs.syncActiveStateToBundledTabs))
+        break;
+      const activeTab = bundled ?
+        item.$TST.bundledTab : // bundled-active state may be applied before the bundled tab become active
+        Tab.getActiveTab(item.windowId);
+      if (!activeTab)
+        break;
+      reserveToScrollToItem(item, {
+        anchor:            !activeTab.pinned && isItemInViewport(activeTab) && activeTab,
+        notifyOnOutOfView: true
+      });
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_MOVED:
+    case Constants.kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED: {
+      await Tab.waitUntilTracked(message.tabId);
+      const item = Tab.get(message.tabId);
+      if (!item) // it can be closed while waiting
+        break;
+      if (!reReserveScrollingForItem(item) &&
+          item.active)
+        reserveToScrollToItem(item);
+    }; break;
+  }
+}
+
+function onMessageExternal(message, _aSender) {
+  switch (message.type) {
+    case TSTAPI.kSCROLL:
+      return (async () => {
+        const params = {};
+        const currentWindow = TabsStore.getCurrentWindowId();
+        if ('tabId' in message || 'tab' in message) {
+          await Tab.waitUntilTracked(message.tabId || message.tab);
+          params.item = Tab.get(message.tabId || message.tab);
+          if (!params.item || params.item.windowId != currentWindow)
+            return;
+        }
+        else if ('groupId' in message || 'group' in message) {
+          params.item = TabGroup.get(message.gorupId || message.group);
+          if (!params.item || params.item.windowId != currentWindow)
+            return;
+        }
+        else {
+          const windowId = message.window || message.windowId;
+          if (windowId == 'active') {
+            const currentWindow = await browser.windows.get(TabsStore.getCurrentWindowId());
+            if (!currentWindow.focused)
+              return;
+          }
+          else if (windowId != currentWindow) {
+            return;
+          }
+          if ('delta' in message) {
+            params.delta = message.delta;
+            if (typeof params.delta == 'string')
+              params.delta = Size.calc(params.delta);
+          }
+          if ('position' in message) {
+            params.position = message.position;
+            if (typeof params.position == 'string')
+              params.position = Size.calc(params.position);
+          }
+          if ('duration' in message && typeof message.duration == 'number')
+            params.duration = message.duration;
+        }
+        return scrollTo(params).then(() => {
+          return true;
+        });
+      })();
+
+    case TSTAPI.kSTOP_SCROLL:
+      return (async () => {
+        const currentWindow = TabsStore.getCurrentWindowId();
+        const windowId = message.window || message.windowId;
+        if (windowId == 'active') {
+          const currentWindow = await browser.windows.get(TabsStore.getCurrentWindowId());
+          if (!currentWindow.focused)
+            return;
+        }
+        else if (windowId != currentWindow) {
+          return;
+        }
+        cancelRunningScroll();
+        return true;
+      })();
+  }
+}
+
+CollapseExpand.onUpdating.addListener((item, options) => {
+  if (!configs.scrollToExpandedTree)
+    return;
+  if (!item.pinned)
+    reserveToRenderVirtualScrollViewport({ trigger: 'collapseExpand' });
+  if (options.last)
+    scrollToItem(item, {
+      anchor:            options.anchor,
+      notifyOnOutOfView: true
+    });
+});
+
+CollapseExpand.onUpdated.addListener((item, options) => {
+  if (!configs.scrollToExpandedTree)
+    return;
+  if (!item.pinned)
+    reserveToRenderVirtualScrollViewport({ trigger: 'collapseExpand' });
+  if (options.last)
+    scrollToItem(item, {
+      anchor:            options.anchor,
+      notifyOnOutOfView: true
+    });
+  else if (item.active && !options.collapsed)
+    scrollToItem(item);
+});
+
+
+// Simulate "lock tab sizing while closing tabs via mouse click" behavior of Firefox itself
+// https://github.com/piroor/treestyletab/issues/2691
+// https://searchfox.org/mozilla-central/rev/27932d4e6ebd2f4b8519865dad864c72176e4e3b/browser/base/content/tabbrowser-tabs.js#1207
+export async function tryLockPosition(tabIds, reason) {
+  if ((!configs.simulateLockTabSizing &&
+       !configs.deferScrollingToOutOfViewportSuccessor) ||
+      tabIds.every(id => {
+        const tab = Tab.get(id);
+        return !tab || tab.pinned || tab.hidden;
+      })) {
+    log('tryLockPosition: ignore pinned or hidden tabs ', tabIds);
+    return;
+  }
+
+  if (configs.deferScrollingToOutOfViewportSuccessor)
+    await tryLockScrollToSuccessor(tabIds, reason);
+
+  if (configs.simulateLockTabSizing)
+    trySimulateLockTabSizing(tabIds, reason);
+
+  if (!tryFinishPositionLocking.listening) {
+    tryFinishPositionLocking.listening = true;
+    window.addEventListener('mousemove', tryFinishPositionLocking);
+    window.addEventListener('mouseout', tryFinishPositionLocking);
+  }
+}
+tryLockPosition.tabIds = new Set();
+
+async function tryLockScrollToSuccessor(tabIds, reason) {
+  if (reason != LOCK_REASON_REMOVE)
+    return;
+
+  // We need to get tabs via WE API here to see its successorTabId certainly.
+  const tabs = await Promise.all(tabIds.map(id => browser.tabs.get(id)));
+  for (const tab of tabs) {
+    if (!tab.active ||
+        !tab.successorTabId ||
+        tab.successorTabId == tab.id)
+      continue;
+
+    const successor = Tab.get(tab.successorTabId);
+    if (!successor ||
+        isItemInViewport(successor))
+      return;
+
+    log('tryLockScrollToSuccessor successor = ', tab.successorTabId);
+    unlockScrollToSuccessor(false);
+    // The successor tab is out of screen, so the tab bar will be scrolled.
+    // We need to defer the scroll after unlocked.
+    tryLockScrollToSuccessor.tabId = tab.successorTabId;
+    tryLockScrollToSuccessor.promisedUnlocked = new Promise((resolve, _reject) => {
+      tryLockScrollToSuccessor.onUnlocked.add(resolve);
+    });
+    return;
+  }
+}
+tryLockScrollToSuccessor.tabId = null;
+tryLockScrollToSuccessor.promisedUnlocked = Promise.resolve(true);
+tryLockScrollToSuccessor.onUnlocked = new Set();
+
+function trySimulateLockTabSizing(tabIds, reason) {
+  // Don't lock scroll position when the last tab is closed.
+  const lastTab = Tab.getLastVisibleTab();
+  if (reason == LOCK_REASON_REMOVE &&
+      tabIds.includes(lastTab.id)) {
+    if (tryLockPosition.tabIds.size > 0) {
+      // but we need to add tabs to the list of "close with locked scroll position"
+      // tabs to prevent unexpected unlocking.
+      for (const id of tabIds) {
+        tryLockPosition.tabIds.add(id);
+      }
+    }
+    log('trySimulateLockTabSizing: ignore last tab remove ', tabIds);
+    return;
+  }
+
+  // Lock scroll position only when the closing affects to the max scroll position.
+  if (mNormalScrollBox.$scrollTop < mNormalScrollBox.$scrollTopMax - Size.getRenderedTabHeight() - mTabbarSpacerSize) {
+    log('trySimulateLockTabSizing: scroll position is not affected ', tabIds, {
+      scrollTop: mNormalScrollBox.$scrollTop,
+      scrollTopMax: mNormalScrollBox.$scrollTopMax,
+      height: Size.getRenderedTabHeight(),
+    });
+    return;
+  }
+
+  for (const id of tabIds) {
+    tryLockPosition.tabIds.add(id);
+  }
+
+  log('trySimulateLockTabSizing: ', tabIds);
+  const spacer = mNormalScrollBox.querySelector(`.${Constants.kTABBAR_SPACER}`);
+  const count = tryLockPosition.tabIds.size;
+  const height = Size.getRenderedTabHeight() * count;
+  spacer.style.minHeight = `${height}px`;
+  spacer.dataset.removedOrCollapsedTabsCount = count;
+  mTabbarSpacerSize = height;
+}
+
+function unlockScrollToSuccessor(canContinueToScroll) {
+  tryLockScrollToSuccessor.tabId = null;
+  for (const callback of tryLockScrollToSuccessor.onUnlocked) {
+    try {
+      callback(canContinueToScroll);
+    }
+    catch (_error) {
+    }
+  }
+  tryLockScrollToSuccessor.onUnlocked.clear();
+}
+
+export function tryUnlockPosition(tabIds) {
+  if ((!configs.simulateLockTabSizing &&
+       !configs.deferScrollingToOutOfViewportSuccessor) ||
+      tabIds.every(id => {
+        const tab = Tab.get(id);
+        return !tab || tab.pinned || tab.hidden;
+      }))
+    return;
+
+  unlockScrollToSuccessor(true);
+
+  if (configs.simulateLockTabSizing) {
+    for (const id of tabIds) {
+      tryLockPosition.tabIds.delete(id);
+    }
+
+    log('tryUnlockPosition/simulateLockTabSizing');
+    const spacer = mNormalScrollBox.querySelector(`.${Constants.kTABBAR_SPACER}`);
+    const count = tryLockPosition.tabIds.size;
+    const timeout = shouldApplyAnimation() ?
+      Math.max(0, configs.collapseDuration) + 250 /* safety margin to wait finishing of the min-height animation of virtual-scroll-container */ :
+      0;
+    setTimeout(() => {
+      const height = Size.getRenderedTabHeight() * count;
+      spacer.style.minHeight = `${height}px`;
+      spacer.dataset.removedOrCollapsedTabsCount = count;
+      mTabbarSpacerSize = height;
+    }, timeout);
+  }
+}
+
+function tryFinishPositionLocking(event) {
+  log('tryFinishPositionLocking ', tryLockPosition.tabIds, event);
+
+  switch (event?.type) {
+    case 'mouseout':
+      const relatedTarget = event.relatedTarget;
+      if (relatedTarget?.ownerDocument == document) {
+        log(' => ignore mouseout in the tabbar window itself');
+        return;
+      }
+
+    case 'mousemove':
+      if (tryFinishPositionLocking.contextMenuOpen ||
+          (event.type == 'mousemove' &&
+           EventUtils.getElementTarget(event)?.closest('#tabContextMenu'))) {
+        log(' => ignore events while the context menu is opened');
+        return;
+      }
+      if (event.type == 'mousemove' &&
+          EventUtils.getElementTarget(event).closest('#tabbar, .after-tabs, #subpanel-container')) {
+        log(' => ignore mousemove on the tab bar');
+        return;
+      }
+      break;
+
+    default:
+      break;
+  }
+
+  window.removeEventListener('mousemove', tryFinishPositionLocking);
+  window.removeEventListener('mouseout', tryFinishPositionLocking);
+  tryFinishPositionLocking.listening = false;
+
+  unlockScrollToSuccessor(true);
+
+  tryLockPosition.tabIds.clear();
+  const spacer = mNormalScrollBox.querySelector(`.${Constants.kTABBAR_SPACER}`);
+  spacer.dataset.removedOrCollapsedTabsCount = 0;
+  spacer.style.minHeight = '';
+  mTabbarSpacerSize = 0;
+  onPositionUnlocked.dispatch();
+}
+tryFinishPositionLocking.contextMenuOpen = false;
+
+browser.menus.onShown.addListener((info, tab) => {
+  tryFinishPositionLocking.contextMenuOpen = info.contexts.includes('tab') && (tab.windowId == TabsStore.getCurrentWindowId());
+});
+
+browser.menus.onHidden.addListener((_info, _tab) => {
+  tryFinishPositionLocking.contextMenuOpen = false;
+});
+
+browser.tabs.onCreated.addListener(_tab => {
+  tryFinishPositionLocking('on tab created');
+});
+
+browser.tabs.onRemoved.addListener(tabId => {
+  if (tryLockPosition.tabIds.has(tabId) ||
+      Tab.get(tabId)?.$TST.collapsed)
+    return;
+  if (tryLockScrollToSuccessor.tabId) {
+    log(`tryLockScrollToSuccessor ignore tab remove ${tabId}`);
+    return;
+  }
+  tryFinishPositionLocking(`on tab removed ${tabId}`);
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/sidebar-items.js b/waterfox/browser/components/sidebar/sidebar/sidebar-items.js
new file mode 100644
index 0000000000000..0262c9159214c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/sidebar-items.js
@@ -0,0 +1,1433 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  wait,
+  configs,
+  shouldApplyAnimation,
+  mapAndFilter,
+  nextFrame,
+} from '/common/common.js';
+
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as CollapseExpand from './collapse-expand.js';
+
+import {
+  kTREE_ITEM_ELEMENT_NAME,
+  kTREE_ITEM_SUBSTANCE_ELEMENT_NAME,
+  TabInvalidationTarget,
+  TabUpdateTarget,
+} from './components/TreeItemElement.js';
+
+function log(...args) {
+  internalLogger('sidebar/sidebar-items', ...args);
+}
+
+let mPromisedInitializedResolver;
+let mPromisedInitialized = new Promise((resolve, _reject) => {
+  mPromisedInitializedResolver = resolve;
+});
+
+export const pinnedContainer = document.querySelector('#pinned-tabs-container');
+export const normalContainer = document.querySelector('#normal-tabs-container');
+
+export const onPinnedTabsChanged = new EventListenerManager();
+export const onNormalTabsChanged = new EventListenerManager();
+export const onTabsRendered   = new EventListenerManager();
+export const onTabsUnrendered = new EventListenerManager();
+export const onSyncFailed = new EventListenerManager();
+export const onReuseTreeItemElement = new EventListenerManager();
+
+export function init() {
+  document.querySelector('#sync-throbber').addEventListener('animationiteration', synchronizeThrobberAnimation);
+
+  document.documentElement.setAttribute(Constants.kLABEL_OVERFLOW, configs.labelOverflowStyle);
+
+  mPromisedInitializedResolver();
+  mPromisedInitialized = mPromisedInitializedResolver = null;
+}
+
+function getItemContainerElement(item) {
+  return document.querySelector(`.tabs.${item.pinned ? 'pinned' : 'normal'}`);
+}
+
+export function getItemFromDOMNode(node, options = {}) {
+  if (typeof options != 'object')
+    options = {};
+  if (!node)
+    return null;
+  if (!(node instanceof Element))
+    node = node.parentNode;
+  const itemSubstance = node?.closest(kTREE_ITEM_SUBSTANCE_ELEMENT_NAME);
+  const item = itemSubstance?.closest(kTREE_ITEM_ELEMENT_NAME);
+  const raw = item?.apiRaw;
+  if (options.force ||
+      raw?.type == TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER) {
+    return raw;
+  }
+  return TabsStore.ensureLivingItem(raw);
+}
+
+
+export async function reserveToUpdateLoadingState() {
+  if (mPromisedInitialized)
+    await mPromisedInitialized;
+  if (reserveToUpdateLoadingState.waiting)
+    clearTimeout(reserveToUpdateLoadingState.waiting);
+  reserveToUpdateLoadingState.waiting = setTimeout(() => {
+    delete reserveToUpdateLoadingState.waiting;
+    updateLoadingState();
+  }, 0);
+}
+
+function updateLoadingState() {
+  const classList = document.documentElement.classList;
+  const windowId  = TabsStore.getCurrentWindowId();
+  classList.toggle(Constants.kTABBAR_STATE_HAVE_LOADING_TAB, Tab.hasLoadingTab(windowId));
+  classList.toggle(Constants.kTABBAR_STATE_HAVE_UNSYNCHRONIZED_THROBBER, Tab.hasNeedToBeSynchronizedTab(windowId));
+}
+
+async function synchronizeThrobberAnimation() {
+  let processedCount = 0;
+  for (const tab of Tab.getNeedToBeSynchronizedTabs(TabsStore.getCurrentWindowId(), { iterator: true })) {
+    tab.$TST.removeState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+    TabsStore.removeUnsynchronizedTab(tab);
+    processedCount++;
+  }
+  if (processedCount == 0)
+    return;
+
+  const classList = document.documentElement.classList;
+  classList.remove(Constants.kTABBAR_STATE_HAVE_UNSYNCHRONIZED_THROBBER);
+
+  classList.add(Constants.kTABBAR_STATE_THROBBER_SYNCHRONIZING);
+  void document.documentElement.offsetWidth; // ensure to apply updated appearance
+  classList.remove(Constants.kTABBAR_STATE_THROBBER_SYNCHRONIZING);
+}
+
+
+
+export function updateAll() {
+  updateLoadingState();
+  synchronizeThrobberAnimation();
+  // We need to update from bottom to top, because
+  // TabUpdateTarget.DescendantsHighlighted refers results of descendants.
+  for (const tab of Tab.getAllTabs(TabsStore.getCurrentWindowId(), { iterator: true, reverse: true })) {
+    tab.$TST.invalidateElement(TabInvalidationTarget.Twisty | TabInvalidationTarget.CloseBox | TabInvalidationTarget.Tooltip);
+    tab.$TST.updateElement(TabUpdateTarget.Counter | TabUpdateTarget.DescendantsHighlighted);
+    if (!tab.$TST.collapsed)
+      tab.$TST.element?.updateOverflow();
+  }
+}
+
+
+
+export function reserveToSyncTabsOrder() {
+  if (configs.delayToRetrySyncTabsOrder <= 0) {
+    syncTabsOrder();
+    return;
+  }
+  if (reserveToSyncTabsOrder.timer)
+    clearTimeout(reserveToSyncTabsOrder.timer);
+  reserveToSyncTabsOrder.timer = setTimeout(() => {
+    delete reserveToSyncTabsOrder.timer;
+    syncTabsOrder();
+  }, configs.delayToRetrySyncTabsOrder);
+}
+reserveToSyncTabsOrder.retryCount = 0;
+
+async function syncTabsOrder() {
+  log('syncTabsOrder');
+  const windowId      = TabsStore.getCurrentWindowId();
+  const [internalOrder, nativeOrder] = await Promise.all([
+    browser.runtime.sendMessage({
+      type: Constants.kCOMMAND_PULL_TABS_ORDER,
+      windowId
+    }).catch(ApiTabs.createErrorHandler()),
+    browser.tabs.query({ windowId }).then(tabs => tabs.map(tab => tab.id))
+  ]);
+
+  const trackedWindow = TabsStore.windows.get(windowId);
+  const actualOrder   = trackedWindow.order;
+
+  log('syncTabsOrder: ', { internalOrder, nativeOrder, actualOrder });
+
+  if (internalOrder.join('\n') == actualOrder.join('\n') &&
+      internalOrder.join('\n') == nativeOrder.join('\n')) {
+    reserveToSyncTabsOrder.retryCount = 0;
+    return; // no need to sync
+  }
+
+  const expectedTabs = internalOrder.slice(0).sort().join('\n');
+  const nativeTabs   = nativeOrder.slice(0).sort().join('\n');
+  if (expectedTabs != nativeTabs) {
+    if (reserveToSyncTabsOrder.retryCount > 10) {
+      console.error(new Error(`Fatal error: native tabs are not same to the tabs tracked by the background process, for the window ${windowId}. Reloading all...`));
+      reserveToSyncTabsOrder.retryCount = 0;
+      browser.runtime.sendMessage({
+        type: Constants.kCOMMAND_RELOAD,
+        all:  true
+      }).catch(ApiTabs.createErrorSuppressor());
+      return;
+    }
+    log(`syncTabsOrder: retry / Native tabs are not same to the tabs tracked by the background process, but this can happen when synchronization and tab removing are done in parallel. Retry count = ${reserveToSyncTabsOrder.retryCount}`);
+    reserveToSyncTabsOrder.retryCount++;
+    return reserveToSyncTabsOrder();
+  }
+
+  const actualTabs = actualOrder.slice(0).sort().join('\n');
+  if (expectedTabs != actualTabs) {
+    log(`syncTabsOrder: retry / Native tabs are not same to the tabs tracked by the background process, but this can happen on synchronization and tab removing are. Retry count = ${reserveToSyncTabsOrder.retryCount}`);
+    if (reserveToSyncTabsOrder.retryCount > 10) {
+      console.error(new Error(`Error: tracked tabs are not same to pulled tabs, for the window ${windowId}. Rebuilding...`));
+      reserveToSyncTabsOrder.retryCount = 0;
+      return onSyncFailed.dispatch();
+    }
+    log(`syncTabsOrder: retry / Native tabs are not same to tab elements, but this can happen on synchronization and tab removing are. Retry count = ${reserveToSyncTabsOrder.retryCount}`);
+    reserveToSyncTabsOrder.retryCount++;
+    return reserveToSyncTabsOrder();
+  }
+
+  reserveToSyncTabsOrder.retryCount = 0;
+  trackedWindow.order = internalOrder;
+  let count = 0;
+  for (const tab of trackedWindow.getOrderedTabs()) {
+    tab.index = count++;
+    tab.reindexedBy = `syncTabsOrder (${tab.index})`;
+    tab.$TST.invalidateCache();
+  }
+}
+
+function getItemElementId(item) {
+  return `${item.$TST.type}-${item.id}`;
+}
+
+const mRenderedItemIds = new Set();
+const mUnrenderedItemIds = new Set();
+let mItemElementsPool = [];
+
+export function renderItem(item, { containerElement, insertBefore } = {}) {
+  if (!item) {
+    console.log('WARNING: Null item has requested to be rendered! ', new Error().stack);
+    return false;
+  }
+  if (!item.$TST) {
+    console.log('WARNING: Alerady destroyed item has requested to be rendered! ', item.id, new Error().stack);
+    return false;
+  }
+
+  let created = false;
+  if (!item.$TST.element ||
+      !item.$TST.element.parentNode) {
+    const reuseFromPool = (mItemElementsPool.length > 0);
+    const itemElement = reuseFromPool ?
+      mItemElementsPool.pop() :
+      document.createElement(kTREE_ITEM_ELEMENT_NAME);
+    item.$TST.bindElement(itemElement);
+    item.$TST.setAttribute('id', getItemElementId(item));
+    item.$TST.setAttribute('type', item.$TST.type);
+    item.$TST.setAttribute(Constants.kAPI_WINDOW_ID, item.windowId || -1);
+    switch (item.type) {
+      case TreeItem.TYPE_GROUP:
+        item.$TST.setAttribute(Constants.kAPI_NATIVE_TAB_GROUP_ID, item.id || -1);
+        item.$TST.removeAttribute(Constants.kGROUP_ID);
+        break;
+
+      case TreeItem.TYPE_GROUP_COLLAPSED_MEMBERS_COUNTER:
+        item.$TST.setAttribute(Constants.kAPI_NATIVE_TAB_GROUP_ID, item.id || -1);
+        item.$TST.setAttribute(Constants.kGROUP_ID, item.id);
+        break;
+
+      default:
+        item.$TST.setAttribute(Constants.kAPI_TAB_ID, item.id || -1);
+        item.$TST.setAttribute(Constants.kGROUP_ID, item.groupId);
+        item.$TST.addState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+        TabsStore.addUnsynchronizedTab(item);
+        break;
+    }
+    if (reuseFromPool) {
+      itemElement.favIconUrl = null;
+      onReuseTreeItemElement.dispatch(itemElement);
+    }
+    created = true;
+  }
+
+  const win = TabsStore.windows.get(item.windowId);
+  const itemElement = item.$TST.element;
+  containerElement = containerElement || (
+    item.pinned ?
+      win.pinnedContainerElement :
+      win.containerElement
+  );
+
+  if (item.pinned) {
+    // Pinned tabs are always rendered physically, so we use the next
+    // same type item as the reference.
+    insertBefore = item.$TST.nearestSameTypeRenderedTab;
+  }
+  let nextElement = insertBefore?.nodeType == Node.ELEMENT_NODE ?
+    insertBefore :
+    insertBefore?.$TST.element;
+  if (insertBefore &&
+      nextElement === undefined &&
+      (containerElement == win.containerElement ||
+       containerElement == win.pinnedContainerElement)) {
+    const nextTab = item.$TST.nearestSameTypeRenderedTab;
+    log(`render item element for ${item.id} (pinned=${item.pinned}) before ${nextTab?.id} (originally ${insertBefore?.id}), item, nextTab, insertBefore = `, item, nextTab, insertBefore);
+    nextElement = nextTab?.$TST.element.parentNode == containerElement ?
+      nextTab.$TST.element :
+      null;
+  }
+
+  if (itemElement.parentNode == containerElement &&
+      itemElement.nextSibling == nextElement)
+    return false;
+
+  containerElement.insertBefore(itemElement, nextElement);
+
+  if (created) {
+    if (!item.active && item.$TST.states.has(Constants.kTAB_STATE_ACTIVE)) {
+      console.log('WARNING: Inactive item has invalid "active" state! ', item.id)
+      item.$TST.removeState(Constants.kTAB_STATE_ACTIVE);
+    }
+
+    item.$TST.invalidateElement(TabInvalidationTarget.Twisty | TabInvalidationTarget.CloseBox | TabInvalidationTarget.Tooltip | TabInvalidationTarget.Overflow);
+    item.$TST.updateElement(TabUpdateTarget.Counter | TabUpdateTarget.Overflow | TabUpdateTarget.TabProperties);
+    item.$TST.applyStatesToElement();
+
+    // To apply animation effect, we need to set and remove
+    // the "collapsed" state again.
+    if (shouldApplyAnimation() &&
+        item.$TST.states.has(Constants.kTAB_STATE_EXPANDING) &&
+        !item.$TST.states.has(Constants.kTAB_STATE_COLLAPSED)) {
+      itemElement.classList.remove(Constants.kTAB_STATE_ANIMATION_READY);
+      itemElement.classList.add(Constants.kTAB_STATE_COLLAPSED);
+      window.requestAnimationFrame(() => {
+        itemElement.classList.add(Constants.kTAB_STATE_ANIMATION_READY);
+        itemElement.classList.remove(Constants.kTAB_STATE_COLLAPSED);
+      });
+    }
+    else {
+      itemElement.classList.add(Constants.kTAB_STATE_ANIMATION_READY);
+    }
+
+    mRenderedItemIds.add(item.id);
+    mUnrenderedItemIds.delete(item.id);
+    reserveToNotifyItemsRendered();
+  }
+
+  return true;
+}
+
+function reserveToNotifyItemsRendered() {
+  const hasInternalListener = onTabsRendered.hasListener();
+  const hasExternalListener = TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TABS_RENDERED);
+  if (!hasInternalListener && !hasExternalListener) {
+    mRenderedItemIds.clear();
+    return;
+  }
+
+  if (reserveToNotifyItemsRendered.invoked)
+    return;
+  reserveToNotifyItemsRendered.invoked = true;
+  window.requestAnimationFrame(() => {
+    reserveToNotifyItemsRendered.invoked = false;
+
+    const ids = [...mRenderedItemIds];
+    mRenderedItemIds.clear();
+    const tabs =  mapAndFilter(ids, id => Tab.get(id));
+    if (tabs.length == 0) {
+      return;
+    }
+
+    if (hasInternalListener)
+      onTabsRendered.dispatch(tabs);
+
+    if (hasExternalListener) {
+      let cache = {};
+      TSTAPI.broadcastMessage({
+        type: TSTAPI.kNOTIFY_TABS_RENDERED,
+        tabs,
+      }, { tabProperties: ['tabs'], cache }).catch(_error => {});
+      cache = null;
+    }
+  });
+}
+
+let mClearPoolTimer = null;
+
+export function unrenderItem(item) {
+  if (!item?.$TST?.element)
+    return false;
+
+  mRenderedItemIds.delete(item.id);
+  mUnrenderedItemIds.add(item.id);
+
+  const itemElement = item.$TST.element;
+
+  if (item.type == TreeItem.TYPE_TAB) {
+    item.$TST.removeState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+    TabsStore.removeUnsynchronizedTab(item);
+  }
+
+  const hasInternalListener = onTabsUnrendered.hasListener();
+  const hasExternalListener = TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TABS_UNRENDERED);
+  if (hasInternalListener || hasExternalListener) {
+    if (!unrenderItem.invoked) {
+      unrenderItem.invoked = true;
+      window.requestAnimationFrame(() => {
+        unrenderItem.invoked = false;
+
+        const ids = [...mUnrenderedItemIds];
+        mUnrenderedItemIds.clear();
+        const tabs = mapAndFilter(ids, id => Tab.get(id));
+
+        if (hasInternalListener)
+          onTabsUnrendered.dispatch(tabs);
+
+        if (hasExternalListener) {
+          let cache = {};
+          TSTAPI.broadcastMessage({
+            type: TSTAPI.kNOTIFY_TABS_UNRENDERED,
+            tabs,
+          }, { tabProperties: ['tabs'], cache }).catch(_error => {});
+          cache = null;
+        }
+      });
+    }
+  }
+  else {
+    mUnrenderedItemIds.clear();
+  }
+
+  if (!itemElement ||
+      !itemElement.parentNode)
+    return false;
+
+  itemElement.parentNode.removeChild(itemElement);
+  item.$TST.unbindElement();
+
+  // We reuse already generated elements for better performance.
+  // See also: https://github.com/piroor/treestyletab/issues/3477
+  mItemElementsPool.push(itemElement);
+  if (mClearPoolTimer)
+    clearTimeout(mClearPoolTimer);
+  mClearPoolTimer = setTimeout(() => {
+    mItemElementsPool = [];
+  }, configs.generatedTreeItemElementsPoolLifetimeMsec);
+
+  return true;
+}
+
+Window.onInitialized.addListener(win => {
+  const windowId = win.id;
+  win = TabsStore.windows.get(windowId);
+
+  let innerPinnedContainer = document.getElementById(`window-${windowId}-pinned`);
+  if (!innerPinnedContainer) {
+    innerPinnedContainer = document.createElement('ul');
+    pinnedContainer.appendChild(innerPinnedContainer);
+  }
+  innerPinnedContainer.dataset.windowId = windowId;
+  innerPinnedContainer.setAttribute('id', `window-${windowId}-pinned`);
+  innerPinnedContainer.classList.add('tabs');
+  innerPinnedContainer.classList.add('pinned');
+  innerPinnedContainer.setAttribute('role', 'listbox');
+  innerPinnedContainer.setAttribute('aria-multiselectable', 'true');
+  innerPinnedContainer.$TST = win;
+  win.bindPinnedContainerElement(innerPinnedContainer);
+
+  let innerNormalContainer = document.getElementById(`window-${windowId}`);
+  if (!innerNormalContainer) {
+    innerNormalContainer = document.querySelector('#normal-tabs-container .virtual-scroll-container').appendChild(document.createElement('ul'));
+  }
+  innerNormalContainer.dataset.windowId = windowId;
+  innerNormalContainer.setAttribute('id', `window-${windowId}`);
+  innerNormalContainer.classList.add('tabs');
+  innerNormalContainer.classList.add('normal');
+  innerNormalContainer.setAttribute('role', 'listbox');
+  innerNormalContainer.setAttribute('aria-multiselectable', 'true');
+  innerNormalContainer.$TST = win;
+  win.bindContainerElement(innerNormalContainer);
+});
+
+
+let mReservedUpdateActiveTab;
+
+configs.$addObserver(async changedKey => {
+  switch (changedKey) {
+    case 'labelOverflowStyle':
+      document.documentElement.setAttribute(Constants.kLABEL_OVERFLOW, configs.labelOverflowStyle);
+      break;
+
+    case 'renderHiddenTabs': {
+      let hasNormalTab = false;
+      for (const tab of Tab.getHiddenTabs(TabsStore.getCurrentWindowId(), { iterator: true })) {
+        TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+        if (!tab.pinned)
+          hasNormalTab = true;
+      }
+      if (hasNormalTab)
+        onNormalTabsChanged.dispatch();
+    }; break;
+  }
+});
+
+
+// Mechanism to override "index" of newly opened tabs by TST's detection logic
+
+const mMovedNewTabResolvers = new Map();
+const mPromsiedMovedNewTabs = new Map();
+const mAlreadyMovedNewTabs = new Set();
+
+export async function waitUntilNewTabIsMoved(tabId) {
+  if (mAlreadyMovedNewTabs.has(tabId))
+    return true;
+  if (mPromsiedMovedNewTabs.has(tabId))
+    return mPromsiedMovedNewTabs.get(tabId);
+  const timer = setTimeout(() => {
+    if (mMovedNewTabResolvers.has(tabId))
+      mMovedNewTabResolvers.get(tabId)();
+  }, Math.max(0, configs.tabBunchesDetectionTimeout));
+  const promise = new Promise((resolve, _reject) => {
+    mMovedNewTabResolvers.set(tabId, resolve);
+  }).then(newIndex => {
+    mMovedNewTabResolvers.delete(tabId);
+    mPromsiedMovedNewTabs.delete(tabId);
+    clearTimeout(timer);
+    return newIndex;
+  });
+  mPromsiedMovedNewTabs.set(tabId, promise);
+  return promise;
+}
+
+function maybeNewTabIsMoved(tabId) {
+  if (mMovedNewTabResolvers.has(tabId)) {
+    mMovedNewTabResolvers.get(tabId)();
+  }
+  else {
+    mAlreadyMovedNewTabs.add(tabId);
+    setTimeout(() => {
+      mAlreadyMovedNewTabs.delete(tabId);
+    }, Math.min(10 * 1000, configs.tabBunchesDetectionTimeout));
+  }
+}
+
+
+const mPendingUpdates = new Map();
+
+function setupPendingUpdate(update) {
+  const pendingUpdate = mPendingUpdates.get(update.tabId) || { tabId: update.tabId };
+
+  update.addedStates       = new Set(update.addedStates || []);
+  update.removedStates     = new Set(update.removedStates || []);
+  update.removedAttributes = new Set(update.removedAttributes || []);
+  update.addedAttributes   = update.addedAttributes || {};
+  update.updatedProperties = update.updatedProperties || {};
+
+  pendingUpdate.updatedProperties = {
+    ...(pendingUpdate.updatedProperties || {}),
+    ...update.updatedProperties
+  };
+
+  if (update.removedAttributes.size > 0) {
+    pendingUpdate.removedAttributes = new Set([...(pendingUpdate.removedAttributes || []), ...update.removedAttributes]);
+    if (pendingUpdate.addedAttributes)
+      for (const attribute of update.removedAttributes) {
+        delete pendingUpdate.addedAttributes[attribute];
+      }
+  }
+
+  if (Object.keys(update.addedAttributes).length > 0) {
+    pendingUpdate.addedAttributes = {
+      ...(pendingUpdate.addedAttributes || {}),
+      ...update.addedAttributes
+    };
+    if (pendingUpdate.removedAttributes)
+      for (const attribute of Object.keys(update.removedAttributes)) {
+        pendingUpdate.removedAttributes.delete(attribute);
+      }
+  }
+
+  if (update.removedStates.size > 0) {
+    pendingUpdate.removedStates = new Set([...(pendingUpdate.removedStates || []), ...update.removedStates]);
+    if (pendingUpdate.addedStates)
+      for (const state of update.removedStates) {
+        pendingUpdate.addedStates.delete(state);
+      }
+  }
+
+  if (update.addedStates.size > 0) {
+    pendingUpdate.addedStates = new Set([...(pendingUpdate.addedStates || []), ...update.addedStates]);
+    if (pendingUpdate.removedStates)
+      for (const state of update.addedStates) {
+        pendingUpdate.removedStates.delete(state);
+      }
+  }
+
+  pendingUpdate.soundStateChanged = pendingUpdate.soundStateChanged || update.soundStateChanged;
+
+  mPendingUpdates.set(update.tabId, pendingUpdate);
+}
+
+function tryApplyUpdate(update) {
+  const tab = Tab.get(update.tabId);
+  if (!tab)
+    return;
+
+  const highlightedChanged = update.updatedProperties && 'highlighted' in update.updatedProperties;
+
+  if (update.updatedProperties) {
+    const oldGroupId = tab.groupId;
+    for (const [key, value] of Object.entries(update.updatedProperties)) {
+      if (Tab.UNSYNCHRONIZABLE_PROPERTIES.has(key))
+        continue;
+      tab[key] = value;
+    }
+
+    if ('groupId' in update.updatedProperties) {
+      tab.$TST.onNativeGroupModified(oldGroupId);
+      tab.$TST.updateElement(TabUpdateTarget.TabProperties);
+    }
+  }
+
+  if (update.addedAttributes) {
+    for (const key of Object.keys(update.addedAttributes)) {
+      tab.$TST.setAttribute(key, update.addedAttributes[key]);
+    }
+  }
+
+  if (update.removedAttributes) {
+    for (const key of update.removedAttributes) {
+      tab.$TST.removeAttribute(key, );
+    }
+  }
+
+  if (update.soundStateChanged) {
+    const parent = tab.$TST.parent;
+    if (parent)
+      parent.$TST.inheritSoundStateFromChildren();
+  }
+
+  if (update.sharingStateChanged) {
+    const parent = tab.$TST.parent;
+    if (parent)
+      parent.$TST.inheritSharingStateFromChildren();
+  }
+
+  tab.$TST.invalidateElement(TabInvalidationTarget.SoundButton | TabInvalidationTarget.Tooltip);
+
+  if (highlightedChanged) {
+    tab.$TST.invalidateElement(TabInvalidationTarget.CloseBox);
+    for (const ancestor of tab.$TST.ancestors) {
+      ancestor.$TST.updateElement(TabUpdateTarget.DescendantsHighlighted);
+    }
+    if (mReservedUpdateActiveTab)
+      clearTimeout(mReservedUpdateActiveTab);
+    mReservedUpdateActiveTab = setTimeout(() => {
+      mReservedUpdateActiveTab = null;
+      const activeTab = Tab.getActiveTab(tab.windowId);
+      activeTab.$TST.invalidateElement(TabInvalidationTarget.SoundButton | TabInvalidationTarget.CloseBox);
+    }, 50);
+  }
+}
+
+async function activateRealActiveTab(windowId) {
+  const tabs = await browser.tabs.query({ active: true, windowId });
+  if (tabs.length <= 0)
+    throw new Error(`FATAL ERROR: No active tab in the window ${windowId}`);
+  const id = tabs[0].id;
+  await Tab.waitUntilTracked(id);
+  const tab = Tab.get(id);
+  if (!tab)
+    throw new Error(`FATAL ERROR: Active tab ${id} in the window ${windowId} is not tracked`);
+  TabsInternalOperation.setTabActive(tab);
+}
+
+Tab.onActivated.addListener(tab => {
+  getItemContainerElement(tab)?.setAttribute('aria-activedescendant', getItemElementId(tab));
+  if (tab.groupId != -1) {
+    reserveToRefreshNativeTabGroup(tab.groupId);
+  }
+});
+
+Tab.onUnactivated.addListener(tab => {
+  getItemContainerElement(tab)?.removeAttribute('aria-activedescendant');
+  if (tab.groupId != -1) {
+    reserveToRefreshNativeTabGroup(tab.groupId);
+  }
+});
+
+const mReindexedTabIds = new Set();
+
+function reserveToUpdateTabsIndex() {
+  if (reserveToUpdateTabsIndex.invoked)
+    return;
+  reserveToUpdateTabsIndex.invoked = true;
+  window.requestAnimationFrame(() => {
+    reserveToUpdateTabsIndex.invoked = false;
+
+    const ids = [...mReindexedTabIds];
+    mReindexedTabIds.clear();
+    for (const id of ids) {
+      const tab = Tab.get(id);
+      if (!tab)
+        continue;
+      tab.$TST.applyAttributesToElement();
+    }
+  });
+}
+
+function reserveToRefreshNativeTabGroup(id) {
+  if (reserveToRefreshNativeTabGroup.invoked.has(id))
+    return;
+  reserveToRefreshNativeTabGroup.invoked.add(id);
+  window.requestAnimationFrame(() => {
+    reserveToRefreshNativeTabGroup.invoked.delete(id);
+
+    const group = TabGroup.get(id);
+    if (!group) {
+      return;
+    }
+    group.$TST.updateElement(TabUpdateTarget.TabProperties);
+    for (const tab of group.$TST.members) {
+      CollapseExpand.setCollapsed(tab, {
+        collapsed: tab.$TST.collapsedByParent,
+      });
+      tab.$TST.updateElement(TabUpdateTarget.TabProperties);
+    }
+  });
+}
+reserveToRefreshNativeTabGroup.invoked = new Set();
+
+Tab.onNativeGroupModified.addListener(async tab => {
+  CollapseExpand.setCollapsed(tab, {
+    collapsed: await tab.$TST.promisedCollapsedByParent,
+  });
+  tab.$TST.updateElement(TabUpdateTarget.TabProperties);
+});
+
+
+const BUFFER_KEY_PREFIX = 'sidebar-tab-';
+
+const mRemovedTabIdsNotifiedBeforeTracked = new Set();
+const mWaitingTasksOnSameTick = new Map();
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_SYNC_TABS_ORDER:
+      reserveToSyncTabsOrder();
+      break;
+
+    case Constants.kCOMMAND_BROADCAST_TAB_STATE: {
+      if (!message.tabIds.length)
+        break;
+      await Tab.waitUntilTracked(message.tabIds);
+      const add    = message.add || [];
+      const remove = message.remove || [];
+      log('apply broadcasted tab state ', message.tabIds, {
+        add:    add.join(','),
+        remove: remove.join(',')
+      });
+      const modified = new Set([...add, ...remove]);
+      let stickyStateChanged = false;
+      for (const id of message.tabIds) {
+        const tab = Tab.get(id);
+        if (!tab)
+          continue;
+        for (const state of add) {
+          tab.$TST.addState(state, { toTab: true });
+        }
+        for (const state of remove) {
+          tab.$TST.removeState(state, { toTab: true });
+        }
+        if (modified.has(Constants.kTAB_STATE_AUDIBLE) ||
+            modified.has(Constants.kTAB_STATE_SOUND_PLAYING) ||
+            modified.has(Constants.kTAB_STATE_MUTED) ||
+            modified.has(Constants.kTAB_STATE_AUTOPLAY_BLOCKED)) {
+          tab.$TST.invalidateElement(TabInvalidationTarget.SoundButton);
+        }
+        if (modified.has(Constants.kTAB_STATE_STICKY))
+          stickyStateChanged = true;
+      }
+      if (stickyStateChanged ||
+          [...TreeItem.autoStickyStates.values()].some(states => (new Set([...states, ...modified])).size < states.size + modified.size))
+        onNormalTabsChanged.dispatch();
+    }; break;
+
+    case Constants.kCOMMAND_BROADCAST_TAB_TOOLTIP_TEXT: {
+      if (!message.tabIds.length)
+        break;
+      await Tab.waitUntilTracked(message.tabIds);
+      log('apply broadcasted tab tooltip text ', message.changes);
+      for (const change of message.changes) {
+        const tab = Tab.get(change.tabId);
+        if (!tab)
+          continue;
+        tab.$TST.registerTooltipText(browser.runtime.id, change.high, true);
+        tab.$TST.registerTooltipText(browser.runtime.id, change.low, false);
+        tab.$TST.invalidateElement(TabInvalidationTarget.Tooltip);
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATING: {
+      const nativeTab = message.tab;
+      nativeTab.reindexedBy = `creating (${nativeTab.index})`;
+
+      if (mRemovedTabIdsNotifiedBeforeTracked.has(nativeTab.id)) {
+        log(`ignore kCOMMAND_NOTIFY_TAB_CREATING for already closed tab: ${nativeTab.id}`);
+        return;
+      }
+
+      // The "index" property of the tab was already updated by the background process
+      // with other newly opened tabs. However, such other tabs are not tracked on
+      // this sidebar namespace yet. Thus we need to correct the index of the tab
+      // to be inserted to already tracked tabs.
+      // For example:
+      //  - tabs in the background page: [a,b,X,Y,Z,c,d]
+      //  - tabs in the sidebar page:    [a,b,c,d]
+      //  - notified tab:                Z (as index=4) (X and Y will be notified later)
+      // then the new tab Z must be treated as index=2 and the result must become
+      // [a,b,Z,c,d] instead of [a,b,c,d,Z]. How should we calculate the index with
+      // less amount?
+      const win = TabsStore.windows.get(message.windowId);
+      let index = 0;
+      for (const id of message.order) {
+        if (win.tabs.has(id)) {
+          nativeTab.index = ++index;
+          nativeTab.reindexedBy = `creating/fixed (${nativeTab.index})`;
+        }
+        if (id == message.tabId)
+          break;
+      }
+
+      const tab = Tab.init(nativeTab, { inBackground: true });
+      TabsUpdate.updateTab(tab, tab, { forceApply: true });
+
+      for (const tab of Tab.getAllTabs(message.windowId, { fromId: nativeTab.id })) {
+        mReindexedTabIds.add(tab.id);
+      }
+      reserveToUpdateTabsIndex();
+
+      TabsStore.addLoadingTab(tab);
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      if (shouldApplyAnimation()) {
+        CollapseExpand.setCollapsed(tab, {
+          collapsed: true,
+          justNow:   true
+        });
+        tab.$TST.collapsedOnCreated = true;
+      }
+      else {
+        reserveToUpdateLoadingState();
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED: {
+      if (message.active) {
+        BackgroundConnection.handleBufferedMessage({
+          type:  Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED,
+          tabId: message.tabId,
+          windowId: message.windowId
+        }, `${BUFFER_KEY_PREFIX}window-${message.windowId}`);
+      }
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab) {
+        log(`ignore kCOMMAND_NOTIFY_TAB_CREATED for already closed tab: ${message.tabId}`);
+        return;
+      }
+      tab.$TST.removeState(Constants.kTAB_STATE_ANIMATION_READY);
+      tab.$TST.resolveOpened();
+      if (message.maybeMoved)
+        await waitUntilNewTabIsMoved(message.tabId);
+      if (tab.pinned) {
+        renderItem(tab);
+        onPinnedTabsChanged.dispatch(tab);
+      }
+      else {
+        onNormalTabsChanged.dispatch(tab);
+      }
+      reserveToUpdateLoadingState();
+      const needToWaitForTreeExpansion = (
+        tab.$TST.shouldExpandLater &&
+        !tab.active &&
+        !Tab.getActiveTab(tab.windowId).pinned
+      );
+      if (shouldApplyAnimation(true) ||
+          needToWaitForTreeExpansion) {
+        wait(10).then(() => { // wait until the tab is moved by TST itself
+          // On this case we don't need to expand the tab here, because
+          // it will be expanded by scroll.js's kCOMMAND_NOTIFY_TAB_CREATED handler
+          // for scrolling to a newly opened tab via CollapseExpand.setCollapsed().
+          reserveToUpdateLoadingState();
+        });
+      }
+      if (tab.active) {
+        if (shouldApplyAnimation()) {
+          await wait(0); // nextFrame() is too fast!
+          if (!message.collapsed /* the new tab may be really collapsed not just for animation, and we should not expand */ &&
+              tab.$TST.collapsedOnCreated) {
+            CollapseExpand.setCollapsed(tab, {
+              collapsed: false,
+            });
+            reserveToUpdateLoadingState();
+          }
+        }
+        const lastMessage = BackgroundConnection.fetchBufferedMessage(Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED, `${BUFFER_KEY_PREFIX}window-${message.windowId}`);
+        if (!lastMessage)
+          break;
+        await Tab.waitUntilTracked(lastMessage.tabId);
+        const activeTab = Tab.get(lastMessage.tabId);
+        TabsInternalOperation.setTabActive(activeTab);
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_RESTORED: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      tab.$TST.addState(Constants.kTAB_STATE_RESTORED);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}window-${message.windowId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}window-${message.windowId}`);
+      if (!lastMessage)
+        return;
+      const tab = Tab.get(lastMessage.tabId);
+      if (!tab)
+        return;
+      TabsInternalOperation.setTabActive(tab);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_UPDATED: {
+      // We don't use BackgroundConnection.handleBufferedMessage/BackgroundConnection.fetchBufferedMessage for this type message because update type messages need to be merged more intelligently.
+      const hasPendingUpdate = mPendingUpdates.has(message.tabId);
+
+      // Updates may be notified before the tab element is actually created,
+      // so we should apply updates ASAP. We can update already tracked tab
+      // while "creating" is notified and waiting for "created".
+      // See also: https://github.com/piroor/treestyletab/issues/2275
+      tryApplyUpdate(message);
+      setupPendingUpdate(message);
+
+      // Already pending update will be processed later, so we don't need
+      // process this update.
+      if (hasPendingUpdate)
+        return;
+
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+
+      const update = mPendingUpdates.get(message.tabId) || message;
+      mPendingUpdates.delete(update.tabId);
+
+      tryApplyUpdate(update);
+
+      TabsStore.updateIndexesForTab(tab);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_MOVED: {
+      // Tab move messages are notified as an array at a time,
+      // but Tab.waitUntilTracked() may break their order.
+      // So we do a hack to wait messages as a group received at a time.
+      maybeNewTabIsMoved(message.tabId);
+      const promises = mWaitingTasksOnSameTick.get(message.type) || [];
+      promises.push(Tab.waitUntilTracked([message.tabId, message.nextTabId]));
+      mWaitingTasksOnSameTick.set(message.type, promises);
+      await nextFrame();
+      mWaitingTasksOnSameTick.delete(message.type);
+      await Promise.all(promises);
+
+      const tab     = Tab.get(message.tabId);
+      if (!tab ||
+          tab.index == message.toIndex)
+        return;
+      if (mPromisedInitialized)
+        await mPromisedInitialized;
+      if (tab.$TST.parent)
+        tab.$TST.parent.$TST.invalidateElement(TabInvalidationTarget.Tooltip);
+
+      tab.$TST.addState(Constants.kTAB_STATE_MOVING);
+
+      let shouldAnimate = false;
+      if (shouldApplyAnimation() &&
+          !tab.pinned &&
+          !tab.$TST.opening &&
+          !tab.$TST.collapsed) {
+        shouldAnimate = true;
+        CollapseExpand.setCollapsed(tab, {
+          collapsed: true,
+          justNow:   true
+        });
+        tab.$TST.shouldExpandLater = true;
+      }
+
+      tab.index = message.toIndex;
+      tab.reindexedBy = `moved (${tab.index})`;
+      const win = TabsStore.windows.get(message.windowId);
+      win.trackTab(tab);
+
+      for (const tab of Tab.getAllTabs(message.windowId, {
+        fromIndex: Math.min(message.fromIndex, message.toIndex),
+        toIndex:   Math.max(message.fromIndex, message.toIndex),
+        iterator:  true,
+      })) {
+        mReindexedTabIds.add(tab.id);
+      }
+      reserveToUpdateTabsIndex();
+
+      if (tab.pinned) {
+        renderItem(tab);
+        onPinnedTabsChanged.dispatch(tab);
+      }
+      else {
+        onNormalTabsChanged.dispatch(tab);
+      }
+      tab.$TST.applyAttributesToElement();
+
+      if (shouldAnimate && tab.$TST.shouldExpandLater) {
+        CollapseExpand.setCollapsed(tab, {
+          collapsed: false
+        });
+        await wait(configs.collapseDuration);
+      }
+      tab.$TST.removeState(Constants.kTAB_STATE_MOVING);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_INTERNALLY_MOVED: {
+      // Tab move also should be stabilized with BackgroundConnection.handleBufferedMessage/BackgroundConnection.fetchBufferedMessage but the buffering mechanism is not designed for messages which need to be applied sequentially...
+      maybeNewTabIsMoved(message.tabId);
+      await Tab.waitUntilTracked([message.tabId, message.nextTabId]);
+      const tab         = Tab.get(message.tabId);
+      if (!tab ||
+          tab.index == message.toIndex)
+        return;
+      tab.index = message.toIndex;
+      tab.reindexedBy = `internally moved (${tab.index})`;
+      Tab.track(tab);
+
+      for (const tab of Tab.getAllTabs(message.windowId, {
+        fromIndex: Math.min(message.fromIndex, message.toIndex),
+        toIndex:   Math.max(message.fromIndex, message.toIndex),
+        iterator:  true,
+      })) {
+        mReindexedTabIds.add(tab.id);
+      }
+      reserveToUpdateTabsIndex();
+
+      if (tab.pinned) {
+        renderItem(tab);
+        onPinnedTabsChanged.dispatch(tab);
+      }
+      else {
+        onNormalTabsChanged.dispatch(tab);
+      }
+      tab.$TST.applyAttributesToElement();
+      if (!message.broadcasted) {
+        // Tab element movement triggered by sidebar itself can break order of
+        // tabs synchronized from the background, so for safetyl we trigger
+        // synchronization.
+        reserveToSyncTabsOrder();
+      }
+    }; break;
+
+    case Constants.kCOMMAND_UPDATE_LOADING_STATE: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (tab &&
+          lastMessage) {
+        if (lastMessage.status == 'loading') {
+          tab.$TST.removeState(Constants.kTAB_STATE_BURSTING);
+          TabsStore.addLoadingTab(tab);
+          tab.$TST.addState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+          TabsStore.addUnsynchronizedTab(tab);
+        }
+        else {
+          if (lastMessage.reallyChanged) {
+            tab.$TST.addState(Constants.kTAB_STATE_BURSTING);
+            if (tab.$TST.delayedBurstEnd)
+              clearTimeout(tab.$TST.delayedBurstEnd);
+            tab.$TST.delayedBurstEnd = setTimeout(() => {
+              delete tab.$TST.delayedBurstEnd;
+              tab.$TST.removeState(Constants.kTAB_STATE_BURSTING);
+              if (!tab.active)
+                tab.$TST.addState(Constants.kTAB_STATE_NOT_ACTIVATED_SINCE_LOAD);
+            }, configs.burstDuration);
+          }
+          tab.$TST.removeState(Constants.kTAB_STATE_THROBBER_UNSYNCHRONIZED);
+          TabsStore.removeUnsynchronizedTab(tab);
+          TabsStore.removeLoadingTab(tab);
+        }
+      }
+      reserveToUpdateLoadingState();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVING: {
+      const tab = Tab.get(message.tabId);
+      if (!tab) {
+        log(`ignore kCOMMAND_NOTIFY_TAB_REMOVING for already closed tab: ${message.tabId}`);
+        mRemovedTabIdsNotifiedBeforeTracked.add(message.tabId);
+        wait(10000).then(() => {
+          mRemovedTabIdsNotifiedBeforeTracked.delete(message.tabId);
+        });
+        return;
+      }
+      tab.$TST.parent = null;
+      // remove from "highlighted tabs" cache immediately, to prevent misdetection for "multiple highlighted".
+      TabsStore.removeHighlightedTab(tab);
+      TabsStore.removeGroupTab(tab);
+      TabsStore.addRemovingTab(tab);
+      TabsStore.addRemovedTab(tab); // reserved
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      reserveToUpdateLoadingState();
+      if (tab.active) {
+        // This should not, but sometimes happens on some edge cases for example:
+        // https://github.com/piroor/treestyletab/issues/2385
+        activateRealActiveTab(message.windowId);
+      }
+      if (!tab.$TST.collapsed &&
+          shouldApplyAnimation()) {
+        tab.$TST.addState(Constants.kTAB_STATE_REMOVING); // addState()'s result from the background page may not be notified yet, so we set this state manually here
+        CollapseExpand.setCollapsed(tab, {
+          collapsed: true
+        });
+        if (tab.pinned)
+          onPinnedTabsChanged.dispatch(tab);
+        else
+          onNormalTabsChanged.dispatch(tab);
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVED: {
+      const tab = Tab.get(message.tabId);
+      // Don't untrack tab here because we need to keep it rendered for removing animation.
+      //TabsStore.windows.get(message.windowId).detachTab(message.tabId);
+      if (!tab) {
+        log(`ignore kCOMMAND_NOTIFY_TAB_REMOVED for already closed tab: ${message.tabId}`);
+        return;
+      }
+      if (tab.active) {
+        // This should not, but sometimes happens on some edge cases for example:
+        // https://github.com/piroor/treestyletab/issues/2385
+        activateRealActiveTab(message.windowId);
+      }
+      if (shouldApplyAnimation())
+        await wait(configs.collapseDuration);
+      TabsStore.windows.get(message.windowId).detachTab(message.tabId);
+      tab.$TST.destroy();
+      unrenderItem(tab);
+      if (tab.pinned)
+        onPinnedTabsChanged.dispatch(tab);
+      else
+        onNormalTabsChanged.dispatch(tab);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TREE_ITEM_LABEL_UPDATED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.title = lastMessage.title;
+      tab.$TST.label = lastMessage.label;
+      if (tab.$TST.element)
+        tab.$TST.element.label = lastMessage.label;
+      tab.$TST.invalidateCache();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_FAVICON_UPDATED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.favIconUrl = lastMessage.favIconUrl;
+      tab.$TST.favIconUrl = lastMessage.favIconUrl;
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_SOUND_STATE_UPDATED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.$TST.toggleState(Constants.kTAB_STATE_HAS_SOUND_PLAYING_MEMBER, lastMessage.hasSoundPlayingMember);
+      tab.$TST.toggleState(Constants.kTAB_STATE_HAS_MUTED_MEMBER, lastMessage.hasMutedMember);
+      tab.$TST.toggleState(Constants.kTAB_STATE_HAS_AUTOPLAY_BLOCKED_MEMBER, lastMessage.hasAutoplayBlockedMember);
+      tab.$TST.invalidateElement(TabInvalidationTarget.SoundButton);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_HIGHLIGHTED_TABS_CHANGED: {
+      BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}window-${message.windowId}`);
+      await Tab.waitUntilTracked(message.tabIds);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}window-${message.windowId}`);
+      if (!lastMessage ||
+          lastMessage.tabIds.join(',') != message.tabIds.join(','))
+        return;
+      TabsUpdate.updateTabsHighlighted(message);
+      const win = TabsStore.windows.get(message.windowId);
+      if (!win || !win.containerElement)
+        return;
+      document.documentElement.classList.toggle(Constants.kTABBAR_STATE_MULTIPLE_HIGHLIGHTED, message.tabIds.length > 1);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_PINNED:
+    case Constants.kCOMMAND_NOTIFY_TAB_UNPINNED: {
+      if (BackgroundConnection.handleBufferedMessage({ type: 'pinned/unpinned', message }, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage('pinned/unpinned', `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.$TST.invalidateCache();
+      if (lastMessage.message.type == Constants.kCOMMAND_NOTIFY_TAB_PINNED) {
+        tab.pinned = true;
+        TabsStore.removeUnpinnedTab(tab);
+        TabsStore.addPinnedTab(tab);
+        renderItem(tab);
+      }
+      else {
+        tab.pinned = false;
+        TabsStore.removePinnedTab(tab);
+        TabsStore.addUnpinnedTab(tab);
+        unrenderItem(tab);
+      }
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      onPinnedTabsChanged.dispatch(tab.pinned && tab);
+      onNormalTabsChanged.dispatch(!tab.pinned && tab);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_HIDDEN:
+    case Constants.kCOMMAND_NOTIFY_TAB_SHOWN: {
+      if (BackgroundConnection.handleBufferedMessage({ type: 'shown/hidden', message }, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage('shown/hidden', `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.$TST.invalidateCache();
+      if (lastMessage.message.type == Constants.kCOMMAND_NOTIFY_TAB_HIDDEN) {
+        tab.hidden = true;
+        TabsStore.removeVisibleTab(tab);
+        TabsStore.removeControllableTab(tab);
+      }
+      else {
+        tab.hidden = false;
+        if (!tab.$TST.collapsed)
+          TabsStore.addVisibleTab(tab);
+        TabsStore.addControllableTab(tab);
+      }
+      TabsStore.updateVirtualScrollRenderabilityIndexForTab(tab);
+      if (tab.pinned)
+        onPinnedTabsChanged.dispatch(tab);
+      else
+        onNormalTabsChanged.dispatch(tab);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGING: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      const changingDescendants = tab.$TST.descendants.filter(descendant => descendant.collapsed != message.collapsed);
+      if (message.collapsed) {
+        for (const tab of changingDescendants) {
+          TabsStore.removeScrollPositionCalculationTargetTab(tab);
+        }
+      }
+      else {
+        for (const tab of changingDescendants) {
+          TabsStore.addScrollPositionCalculationTargetTab(tab);
+        }
+      }
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_SUBTREE_COLLAPSED_STATE_CHANGED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage)
+        return;
+      tab.$TST.invalidateCache();
+      tab.$TST.invalidateElement(TabInvalidationTarget.CloseBox);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_COLLAPSED_STATE_CHANGED: {
+      if (BackgroundConnection.handleBufferedMessage(message, `${BUFFER_KEY_PREFIX}${message.tabId}`) ||
+          message.collapsed)
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage(message.type, `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!tab ||
+          !lastMessage ||
+          lastMessage.collapsed)
+        return;
+      TabsStore.addVisibleTab(tab);
+      TabsStore.addExpandedTab(tab);
+      reserveToUpdateLoadingState();
+      tab.$TST.invalidateCache();
+      tab.$TST.invalidateElement(TabInvalidationTarget.Twisty | TabInvalidationTarget.CloseBox | TabInvalidationTarget.Tooltip);
+      tab.$TST.element?.updateOverflow();
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_ATTACHED_TO_WINDOW: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      tab.$TST.invalidateCache();
+      if (tab.active)
+        TabsInternalOperation.setTabActive(tab); // to clear "active" state of other tabs
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW: {
+      // don't wait until tracked here, because detaching tab will become untracked!
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      tab.$TST.invalidateElement(TabInvalidationTarget.Tooltip);
+      tab.$TST.parent = null;
+      TabsStore.addRemovedTab(tab);
+      const win = TabsStore.windows.get(message.windowId);
+      win.untrackTab(message.tabId);
+      unrenderItem(tab);
+      if (tab.pinned)
+        onPinnedTabsChanged.dispatch(tab);
+      else
+        onNormalTabsChanged.dispatch(tab);
+      // Allow to move tabs to this window again, after a timeout.
+      // https://github.com/piroor/treestyletab/issues/2316
+      wait(500).then(() => TabsStore.removeRemovedTab(tab));
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_GROUP_TAB_DETECTED: {
+      await Tab.waitUntilTracked(message.tabId);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+      // When a group tab is restored but pending, TST cannot update title of the tab itself.
+      // For failsafe now we update the title based on its URL.
+      const url = new URL(tab.url);
+      let title = url.searchParams.get('title');
+      if (!title) {
+        const parameters = tab.url.replace(/^[^\?]+/, '');
+        title = parameters.match(/^\?([^&;]*)/);
+        title = title && decodeURIComponent(title[1]);
+      }
+      title = title || browser.i18n.getMessage('groupTab_label_default');
+      tab.title = title;
+      wait(0).then(() => {
+        TabsUpdate.updateTab(tab, { title });
+      });
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_CHILDREN_CHANGED: {
+      if (mPromisedInitialized)
+        return;
+      // We need to wait not only for added children but removed children also,
+      // to construct same number of promises for "attached but detached immediately"
+      // cases.
+      const relatedTabIds = [message.tabId].concat(message.addedChildIds, message.removedChildIds);
+      await Tab.waitUntilTracked(relatedTabIds);
+      const tab = Tab.get(message.tabId);
+      if (!tab)
+        return;
+
+      if (message.addedChildIds.length > 0) {
+        // set initial level for newly opened child, to avoid annoying jumping of new tab
+        const childLevel = parseInt(tab.$TST.getAttribute(Constants.kLEVEL) || 0) + 1;
+        for (const childId of message.addedChildIds) {
+          const child = Tab.get(childId);
+          if (!child || child.$TST.hasChild)
+            continue;
+          const currentLevel = child.$TST.getAttribute(Constants.kLEVEL) || 0;
+          if (currentLevel == 0)
+            child.$TST.setAttribute(Constants.kLEVEL, childLevel);
+        }
+      }
+
+      tab.$TST.children = message.childIds;
+
+      tab.$TST.invalidateElement(TabInvalidationTarget.Twisty | TabInvalidationTarget.CloseBox | TabInvalidationTarget.Tooltip);
+      if (message.newlyAttached || message.detached) {
+        const ancestors = [tab].concat(tab.$TST.ancestors);
+        for (const ancestor of ancestors) {
+          ancestor.$TST.updateElement(TabUpdateTarget.Counter | TabUpdateTarget.DescendantsHighlighted);
+        }
+      }
+    }; break;
+
+    case Constants.kCOMMAND_BROADCAST_TAB_AUTO_STICKY_STATE:
+      if (message.add)
+        TreeItem.registerAutoStickyState(message.providerId, message.add);
+      if (message.remove)
+        TreeItem.unregisterAutoStickyState(message.providerId, message.remove);
+      onNormalTabsChanged.dispatch();
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_GROUP_CREATED:
+      TabGroup.init(message.group)
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_GROUP_UPDATED: {
+      const group = TabGroup.get(message.group.id);
+      if (!group) {
+        return;
+      }
+      group.$TST.apply(message.group);
+      reserveToRefreshNativeTabGroup(message.group.id);
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_GROUP_REMOVED:
+      TabGroup.get(message.group.id)?.$TST.destroy();
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/sidebar.css b/waterfox/browser/components/sidebar/sidebar/sidebar.css
new file mode 100644
index 0000000000000..373dee3e7133e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/sidebar.css
@@ -0,0 +1,16 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+@import url("styles/base.css");
+@import url("styles/twisty.css");
+@import url("styles/favicon.css");
+@import url("styles/throbber.css");
+@import url("styles/sound-button.css");
+@import url("styles/sharing-state.css");
+@import url("styles/drag-and-drop.css");
+@import url("styles/highlighter.css");
+
diff --git a/waterfox/browser/components/sidebar/sidebar/sidebar.html b/waterfox/browser/components/sidebar/sidebar/sidebar.html
new file mode 100644
index 0000000000000..152a5f3626ec0
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/sidebar.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<!-- 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/. -->
+<html class="left initializing sidebar flexible">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/resources/16x16.svg">
+    <script type="module" src="./index-ws.js"></script>
+    <script type="module" src="/common/handle-accel-key.js"></script>
+    <link rel="stylesheet" type="text/css" href="./sidebar.css"/>
+    <style id="size-definition" type="text/css"></style>
+    <style id="contextual-identity-styling" type="text/css"></style>
+    <link id="style-loader" rel="stylesheet" type="text/css" href=""/>
+    <style id="browser-theme-definition" type="text/css"></style>
+    <style id="addons-style-rules" type="text/css"></style><!-- this is just a dummy to determine insertion position of actual style definitions -->
+    <style id="active-tree-rules" type="text/css"></style>
+    <style id="user-style-rules" type="text/css"></style>
+  </head>
+  <body class="flexible">
+    <div id="tabbar-top" class="vbox"><div class="extra-items-container"></div></div>
+    <div id="tabbar-container" class="vbox">
+      <div id="tabbar" class="vbox">
+        <div id="pinned-tabs-container" class="vbox">
+        </div>
+        <div id="pinned-tabs-container-resizer"></div>
+        <div id="normal-tabs-container" class="vbox">
+          <div class="virtual-scroll-container vbox"></div>
+          <div class="tabs-spacer"></div>
+          <div class="overflow-indicator start"></div>
+          <div class="overflow-indicator end"></div>
+          <div class="sticky-tabs-container above vbox"></div>
+          <div class="sticky-tabs-container below vbox"></div>
+        </div>
+        <div class="after-tabs vbox">
+          <div class="newtab-button-box vbox">
+            <button class="newtab-action-selector-anchor"
+                    title="__MSG_tabbar_newTabAction_tooltip__"
+                    data-menu-ui="newtab-action-selector"
+                    tabindex="-1"></button>
+            <button class="contextual-identities-selector-anchor"
+                    title="__MSG_tabbar_newTabWithContexualIdentity_tooltip__"
+                    data-menu-ui="contextual-identities-selector"
+                    tabindex="-1"></button>
+            <div class="newtab-button"
+                 role="button"
+                 title="__MSG_tabbar_newTabButton_tooltip__"
+                 tabindex="-1"
+                 draggable="true"><div class="extra-items-container"></div></div>
+          </div>
+        </div>
+      </div>
+      <div class="after-tabs vbox">
+        <div id="out-of-view-tab-notifier"></div>
+        <div class="newtab-button-box vbox">
+          <button class="newtab-action-selector-anchor"
+                  title="__MSG_tabbar_newTabAction_tooltip__"
+                  data-menu-ui="newtab-action-selector"
+                  tabindex="-1"></button>
+          <button class="contextual-identities-selector-anchor"
+                  title="__MSG_tabbar_newTabWithContexualIdentity_tooltip__"
+                  data-menu-ui="contextual-identities-selector"
+                  tabindex="-1"></button>
+          <div class="newtab-button"
+               role="button"
+               title="__MSG_tabbar_newTabButton_tooltip__"
+               tabindex="-1"
+               draggable="true"><div class="extra-items-container"></div></div>
+        </div>
+      </div>
+      <div id="tabbar-bottom" class="vbox"><div class="extra-items-container"></div></div>
+    </div>
+    <div id="subpanel-container">
+      <div id="subpanel-header">
+        <span id="subpanel-header-main">
+          <span id="subpanel-selector-anchor"
+                data-menu-ui="subpanel-selector"
+                class="clickable"
+                role="button">
+            <span class="icon"><img></span>
+            <span class="label"></span>
+          </span>
+        </span>
+        <span id="subpanel-toggler"
+              class="clickable"
+              role="button"
+              title="__MSG_command_toggleSubPanel__"
+              aria-label="__MSG_command_toggleSubPanel__"></span>
+      </div>
+    </div>
+    <ul id="subpanel-selector"></ul>
+    <ul id="newtab-action-selector">
+      <li data-value="independent"
+          data-icon="/sidebar/styles/icons/newtab-independent.svg"
+          data-icon-color="currentColor"
+         >__MSG_tabbar_newTabAction_independent_label__</li>
+      <li data-value="child"
+          data-icon="/sidebar/styles/icons/newtab-child.svg"
+          data-icon-color="currentColor"
+         >__MSG_tabbar_newTabAction_child_label__</li>
+      <li data-value="sibling"
+          data-icon="/sidebar/styles/icons/newtab-sibling.svg"
+          data-icon-color="currentColor"
+         >__MSG_tabbar_newTabAction_sibling_label__</li>
+      <li data-value="next-sibling"
+          data-icon="/sidebar/styles/icons/newtab-next-sibling.svg"
+          data-icon-color="currentColor"
+         >__MSG_tabbar_newTabAction_nextSibling_label__</li>
+    </ul>
+    <ul id="contextual-identities-selector"></ul>
+    <div class="item-drop-blocker" id="item-drop-blocker-top"></div>
+    <div class="item-drop-blocker" id="item-drop-blocker-right"></div>
+    <div class="item-drop-blocker" id="item-drop-blocker-bottom"></div>
+    <div class="item-drop-blocker" id="item-drop-blocker-left"></div>
+    <div id="notifications" class="vbox"></div>
+    <div id="background"></div><!-- This is required to hide dummy elements without offscreen rendering outside of the viewport. See also: https://github.com/piroor/treestyletab/issues/1703#issuecomment-354646405 -->
+    <ul id="dummy-tabs">
+      <span id="dummy-favicon-size-box" class="dummy"></span>
+      <span id="dummy-tab-color-box" class="dummy"></span>
+      <span id="dummy-highlight-color-box" class="dummy"></span>
+      <span id="dummy-shift-tabs-for-scrollbar-distance-box" class="dummy"></span>
+      <span class="throbber dummy"><span id="sync-throbber"></span></span>
+      <tab-item id="dummy-tab" class="tab dummy">
+        <span class="extra-items-container indent"></span>
+        <tab-item-substance>
+          <tab-twisty class="twisty"></tab-twisty>
+          <span class="ui">
+            <span class="extra-items-container above"></span>
+            <span class="caption">
+              <tab-favicon class="favicon"><span class="throbber" id="conductor-throbber-container"><span id="conductor-throbber"></span></span></tab-favicon>
+              <tab-label class="label" value="-"></tab-label>
+              <tab-counter class="counter">0</tab-counter>
+              <tab-closebox class="close-box"></tab-closebox>
+              <span class="extra-items-container behind"></span>
+              <span class="extra-items-container front"></span>
+            </span>
+            <span class="extra-items-container below"></span>
+          </span>
+        </tab-item-substance>
+      </tab-item>
+      <tab-item id="dummy-sizer-tab" class="tab">
+        <span class="extra-items-container indent"></span>
+        <tab-item-substance>
+          <tab-twisty class="twisty"></tab-twisty>
+          <span class="ui">
+            <span class="extra-items-container above"></span>
+            <span class="caption">
+              <tab-favicon class="favicon"><span class="throbber" id="conductor-throbber-container"><span id="conductor-throbber"></span></span></tab-favicon>
+              <tab-label class="label" value="-"></tab-label>
+              <tab-counter class="counter">0</tab-counter>
+              <tab-closebox class="close-box"></tab-closebox>
+              <span class="extra-items-container behind"></span>
+              <span class="extra-items-container front"></span>
+            </span>
+            <span class="extra-items-container below"></span>
+          </span>
+        </tab-item-substance>
+      </tab-item>
+      <tab-item id="dummy-faviconized-tab" class="tab faviconized dummy">
+        <span class="extra-items-container indent"></span>
+        <tab-item-substance>
+          <tab-twisty class="twisty"></tab-twisty>
+          <span class="ui">
+            <span class="extra-items-container above"></span>
+            <span class="caption">
+              <tab-favicon class="favicon"><span class="throbber" id="conductor-throbber-container"><span id="conductor-throbber"></span></span></tab-favicon>
+              <tab-label class="label" value="-"></tab-label>
+              <tab-counter class="counter">0</tab-counter>
+              <tab-closebox class="close-box"></tab-closebox>
+              <span class="extra-items-container behind"></span>
+              <span class="extra-items-container front"></span>
+            </span>
+            <span class="extra-items-container below"></span>
+          </span>
+        </tab-item-substance>
+      </tab-item>
+    </ul>
+    <div id="blocking-screen">
+      <span class="throbber"></span>
+      <progress max="100" value="0"></progress>
+    </div>
+
+    <div id="tabPreviewRoot"></div>
+    <ul id="tabContextMenu"></ul>
+    <ul id="newTabButtonContextMenu"></ul>
+    <div id="tabGroupContextMenuRoot"></div>
+  </body>
+</html>
diff --git a/waterfox/browser/components/sidebar/sidebar/sidebar.js b/waterfox/browser/components/sidebar/sidebar/sidebar.js
new file mode 100644
index 0000000000000..5627bd3aa4d50
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/sidebar.js
@@ -0,0 +1,1215 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+import RichConfirm from '/extlib/RichConfirm.js';
+
+import {
+  log as internalLogger,
+  nextFrame,
+  mapAndFilter,
+  configs,
+  shouldApplyAnimation,
+  loadUserStyleRules,
+  isMacOS,
+  isRTL,
+  notify,
+  waitUntilStartupOperationsUnblocked,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Bookmark from '/common/bookmark.js';
+import * as BrowserTheme from '/common/browser-theme.js';
+import * as Color from '/common/color.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as CssSelectorParser from '/common/css-selector-parser.js';
+import * as TabsInternalOperation from '/common/tabs-internal-operation.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TabsUpdate from '/common/tabs-update.js';
+import * as TSTAPI from '/common/tst-api.js';
+import * as UserOperationBlocker from '/common/user-operation-blocker.js';
+
+import MetricsData from '/common/MetricsData.js';
+import { Tab, TabGroup } from '/common/TreeItem.js';
+import Window from '/common/Window.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as CollapseExpand from './collapse-expand.js';
+import * as DragAndDrop from './drag-and-drop.js';
+import * as EventUtils from './event-utils.js';
+import * as GapCanceller from './gap-canceller.js';
+import * as Indent from './indent.js';
+import * as Notifications from './notifications.js';
+import * as PinnedTabs from './pinned-tabs.js';
+import * as RestoringTabCount from './restoring-tab-count.js';
+import * as Scroll from './scroll.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as Size from './size.js';
+import * as SubPanel from './subpanel.js';
+import * as TabContextMenu from './tab-context-menu.js';
+
+import { TabCloseBoxElement } from './components/TabCloseBoxElement.js';
+import { TabCounterElement } from './components/TabCounterElement.js';
+import {
+  TreeItemElement,
+  TabInvalidationTarget,
+} from './components/TreeItemElement.js';
+import { TabFaviconElement } from './components/TabFaviconElement.js';
+import { TreeItemLabelElement } from './components/TreeItemLabelElement.js';
+import { TabSoundButtonElement } from './components/TabSoundButtonElement.js';
+import { TabTwistyElement } from './components/TabTwistyElement.js';
+
+function log(...args) {
+  internalLogger('sidebar/sidebar', ...args);
+}
+
+export const onInit    = new EventListenerManager();
+export const onBuilt   = new EventListenerManager();
+export const onReady   = new EventListenerManager();
+export const onLayoutUpdated = new EventListenerManager();
+
+
+let mTargetWindow = null;
+let mConnectionOpenCount = 0;
+let mInitialized = false;
+let mReloadMaskImage = false; // workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1763420
+
+let mPromisedTargetWindowResolver;
+const mPromisedTargetWindow = new Promise((resolve, _reject) => {
+  mPromisedTargetWindowResolver = resolve;
+});
+
+const mTabBar                     = document.querySelector('#tabbar');
+const mStyleLoader                = document.querySelector('#style-loader');
+const mBrowserThemeDefinition     = document.querySelector('#browser-theme-definition');
+const mUserStyleRules             = document.querySelector('#user-style-rules');
+const mContextualIdentitiesStyle  = document.querySelector('#contextual-identity-styling');
+
+// allow customiation for platform specific styles with selectors like `:root[data-user-agent*="Windows NT 10"]`
+document.documentElement.dataset.userAgent = navigator.userAgent;
+document.documentElement.classList.toggle('platform-mac', isMacOS());
+document.documentElement.classList.toggle('rtl', isRTL());
+
+{
+  const url = new URL(location.href);
+
+  mTargetWindow = parseInt(url.searchParams.get('windowId') || 0);
+  if (isNaN(mTargetWindow) || mTargetWindow < 1)
+    mTargetWindow = null;
+
+  EventUtils.setTargetWindowId(mTargetWindow);
+  mTabBar.dataset.windowId = mTargetWindow;
+
+  mReloadMaskImage = url.searchParams.get('reloadMaskImage') == 'true';
+
+  // apply style ASAP!
+  const style = url.searchParams.get('style');
+  applyTheme({ style });
+
+  const title = url.searchParams.get('title');
+  if (title)
+    document.title = title;
+}
+
+applyAnimationState(shouldApplyAnimation());
+UserOperationBlocker.block({ throbber: true });
+
+export async function init() {
+  MetricsData.add('init: start');
+  log('initialize sidebar on load');
+
+  // If we call `window.customElements.define(localName, constructor)`;` from a file defining a custom element,
+  // it would be a side-effect and happen accidentally that defining a custom element
+  // when we import a new file which defines a new custom element.
+  // It causes a complex side-effect relations and usually causes a bug. It's tough to fix.
+  //
+  // I have not concluded the best practice about it yet,
+  // but I think that it's safely to call `window.customElements.define(localName, constructor)` separately
+  // in the application initialization phase.
+  //
+  // XXX:
+  //  We define our custom elements at first to avoid a problem which calls a method of custom element
+  //  which has not been defined yet.
+  TabTwistyElement.define();
+  TabCloseBoxElement.define();
+  TabFaviconElement.define();
+  TreeItemLabelElement.define();
+  TabCounterElement.define();
+  TabSoundButtonElement.define();
+  TreeItemElement.define();
+
+  let promisedAllTabsTracked;
+  UserOperationBlocker.setProgress(0);
+  await Promise.all([
+    MetricsData.addAsync('getting native tabs', async () => {
+      const win = await MetricsData.addAsync(
+        'getting window',
+        mTargetWindow ?
+          browser.windows.get(mTargetWindow, { populate: true }) :
+          browser.windows.getCurrent({ populate: true })
+      ).catch(ApiTabs.createErrorHandler());
+      if (win.focused)
+        document.documentElement.classList.add('active');
+      const trackedWindow = TabsStore.windows.get(win.id) || new Window(win.id);
+      trackedWindow.incognito = win.incognito;
+      if (win.incognito)
+        document.documentElement.classList.add('incognito');
+
+      const tabs = win.tabs;
+      if (!mTargetWindow) {
+        mTargetWindow = tabs[0].windowId;
+        EventUtils.setTargetWindowId(mTargetWindow);
+      }
+      TabsStore.setCurrentWindowId(mTargetWindow);
+      mTabBar.dataset.windowId = mTargetWindow;
+      mPromisedTargetWindowResolver(mTargetWindow);
+      internalLogger.context   = `Sidebar-${mTargetWindow}`;
+
+      // Track only the first tab for now, because it is required to initialize
+      // the container.
+      Tab.track(tabs[0]);
+
+      promisedAllTabsTracked = MetricsData.addAsync('tracking all native tabs', async () => {
+        let lastDraw = Date.now();
+        let count = 0;
+        const maxCount = tabs.length - 1;
+        for (const tab of tabs.slice(1)) {
+          Tab.track(tab);
+          if (Date.now() - lastDraw > configs.intervalToUpdateProgressForBlockedUserOperation) {
+            UserOperationBlocker.setProgress(Math.round(++count / maxCount * 16) + 16); // 2/6: track all tabs
+            await nextFrame();
+            lastDraw = Date.now();
+          }
+        }
+      });
+
+      PinnedTabs.init();
+      Indent.init();
+
+      return tabs;
+    }),
+    configs.$loaded.then(waitUntilStartupOperationsUnblocked),
+  ]);
+  MetricsData.add('browser.tabs.query finish, configs are loaded.');
+  EventListenerManager.debug = configs.debug;
+
+  onConfigChange('colorScheme');
+  onConfigChange('simulateSVGContextFill');
+  onInit.dispatch();
+
+  const promisedScrollPosition = browser.sessions.getWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SCROLL_POSITION).catch(ApiTabs.createErrorHandler());
+  const promisedInitializedContextualIdentities = ContextualIdentities.init();
+
+  UserOperationBlocker.setProgress(16); // 1/6: wait background page
+  const promisedResults = Promise.all([
+    MetricsData.addAsync('importWindowFromBackground()', importWindowFromBackground()),
+    MetricsData.addAsync('promisedAllTabsTracked', promisedAllTabsTracked)
+  ]);
+  log('Start queuing of messages from the background page');
+  BackgroundConnection.connect();
+  const [importedWindow] = await promisedResults;
+
+  // we don't need await for these features
+  MetricsData.addAsync('API for other addons', TSTAPI.initAsFrontend());
+
+  await Promise.all([
+    MetricsData.addAsync('parallel initialization: main', async () => {
+      await MetricsData.addAsync('parallel initialization: main: rebuildAll', rebuildAll(importedWindow));
+      Size.init(); // this must be called after rebuildAll()
+
+      TabsUpdate.completeLoadingTabs(mTargetWindow);
+
+      log('Start to process messages including queued ones');
+      BackgroundConnection.start();
+
+      configs.$addObserver(onConfigChange);
+      onConfigChange('debug');
+      onConfigChange('sidebarPosition');
+      onConfigChange('faviconizePinnedTabs');
+      onConfigChange('showContextualIdentitiesSelector');
+      onConfigChange('showNewTabActionSelector');
+      onConfigChange('shiftTabsForScrollbarOnlyOnHover');
+      onConfigChange('fadeOutPendingTabs');
+      onConfigChange('fadeOutDiscardedTabs');
+
+      document.addEventListener('focus', onFocus);
+      document.addEventListener('blur', onBlur);
+      window.addEventListener('resize', onResize);
+      mTabBar.addEventListener('transitionend', onTransisionEnd);
+
+      browser.theme.onUpdated.addListener(onBrowserThemeChanged);
+
+      // We need to re-calculate mixed colors when the system color scheme is changed.
+      // See also: https://github.com/piroor/treestyletab/issues/2314
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(async _event => {
+        const theme = await browser.theme.getCurrent(mTargetWindow);
+        applyBrowserTheme(theme);
+      });
+
+      browser.runtime.onMessage.addListener(onMessage);
+
+      onBuilt.dispatch();
+
+      DragAndDrop.init();
+    }),
+    MetricsData.addAsync('parallel initialization: contextual identities', async () => {
+      await promisedInitializedContextualIdentities;
+      updateContextualIdentitiesStyle();
+      updateContextualIdentitiesSelector();
+      ContextualIdentities.startObserve();
+    }),
+    MetricsData.addAsync('parallel initialization: TabContextMenu', async () => {
+      TabContextMenu.init();
+    })
+  ]);
+
+  await MetricsData.addAsync('parallel initialization: post process', Promise.all([
+    MetricsData.addAsync('parallel initialization: post process: main', async () => {
+      Indent.updateRestoredTree();
+      SidebarItems.updateAll();
+      updateTabbarLayout({ justNow: true });
+      SubPanel.onResized.addListener(() => {
+        reserveToUpdateTabbarLayout();
+      });
+      SubPanel.init();
+
+      SidebarItems.init();
+      Indent.tryUpdateVisualMaxTreeLevel();
+
+      shouldApplyAnimation.onChanged.addListener(applyAnimationState);
+      applyAnimationState(shouldApplyAnimation());
+
+      onReady.dispatch();
+    }),
+    MetricsData.addAsync('parallel initialization: post process: Scroll.init', async () => {
+      Scroll.init(await promisedScrollPosition);
+      Scroll.onPositionUnlocked.addListener(() => {
+        reserveToUpdateTabbarLayout({
+          reason:  Constants.kTABBAR_UPDATE_REASON_TAB_CLOSE,
+          timeout: shouldApplyAnimation() ? configs.collapseDuration : 0
+        });
+      });
+      Scroll.onVirtualScrollViewportUpdated.addListener(resized => {
+        if (!resized)
+          return;
+        updateTabbarLayout({
+          reason: Constants.kTABBAR_UPDATE_REASON_VIRTUAL_SCROLL_VIEWPORT_UPDATE,
+        });
+      });
+    })
+  ]));
+
+  TabsUpdate.completeLoadingTabs(mTargetWindow); // failsafe
+
+  // Failsafe. If the sync operation fail after retryings,
+  // SidebarItems.onSyncFailed is notified then this sidebar page will be
+  // reloaded for complete retry.
+  SidebarItems.onSyncFailed.addListener(() => rebuildAll());
+  SidebarItems.reserveToSyncTabsOrder();
+
+  Size.onUpdated.addListener(() => {
+    updateTabbarLayout({
+      reason: Constants.kTABBAR_UPDATE_REASON_RESIZE,
+    });
+  });
+
+  document.documentElement.classList.remove('initializing');
+  mInitialized = true;
+  UserOperationBlocker.unblock({ throbber: true });
+
+  TSTAPI.broadcastMessage({
+    type:      TSTAPI.kNOTIFY_SIDEBAR_SHOW,
+    window:    mTargetWindow,
+    windowId:  mTargetWindow,
+    openCount: mConnectionOpenCount,
+  });
+
+  GapCanceller.init();
+
+  MetricsData.add('init: end');
+  if (configs.debug)
+    log(`Startup metrics for ${Tab.getTabs(mTargetWindow).length} tabs: `, MetricsData.toString());
+}
+
+function applyAnimationState(active) {
+  const rootClasses = document.documentElement.classList;
+  if (active)
+    rootClasses.add('animation');
+  else
+    rootClasses.remove('animation');
+}
+
+async function applyTheme({ style } = {}) {
+  const [theme, ] = await Promise.all([
+    browser.theme.getCurrent(mTargetWindow),
+    style && applyOwnTheme(style),
+    !style && configs.$loaded.then(() => applyOwnTheme()),
+    configs.$loaded
+  ]);
+  applyBrowserTheme(theme);
+  applyUserStyleRules();
+  if (mReloadMaskImage)
+    reloadAllMaskImages();
+
+  Size.updateTabs();
+}
+
+async function applyOwnTheme(style) {
+  if (!style)
+    style = configs.style;
+  switch (style) {
+    case 'proton':
+      mStyleLoader.setAttribute('href', 'styles/proton/proton.css');
+      break;
+    case 'sidebar':
+      mStyleLoader.setAttribute('href', 'styles/sidebar/sidebar.css');
+      break;
+    case 'photon':
+    // for backward compatibility, fall back to plain.
+    case 'plain':
+    case 'flat':
+    case 'vertigo':
+    case 'mixed':
+      mStyleLoader.setAttribute('href', 'styles/photon/photon.css');
+      break;
+    case 'highcontrast':
+      mStyleLoader.setAttribute('href', 'styles/photon/highcontrast.css');
+      break;
+    default:
+      // as the base of customization. see also:
+      // https://github.com/piroor/treestyletab/issues/1604
+      mStyleLoader.setAttribute('href', 'data:text/css,');
+      break;
+  }
+  return new Promise((resolve, _reject) => {
+    mStyleLoader.addEventListener('load', () => {
+      window.requestAnimationFrame(resolve);
+    }, { once: true });
+  });
+}
+
+const CSS_SPECIFICITY_INCREASER = ':not(#___NEVER___#___USED___#___ID___)';
+
+function applyUserStyleRules() {
+  Size.clear();
+
+  mUserStyleRules.textContent = loadUserStyleRules();
+
+  // Simple selectors in user styles may have specificity lower than the one of
+  // built-in CSS declarations of TST itself.
+  // So TST adds needless selector which increase specificity of the selector.
+  // See also:
+  //   https://github.com/piroor/treestyletab/issues/3153
+  //   https://github.com/piroor/treestyletab/issues/3163
+  processAllStyleRulesIn(mUserStyleRules.sheet, rule => {
+    if (!rule.selectorText)
+      return;
+
+    log('updating selector: ', rule.selectorText);
+    rule.selectorText = CssSelectorParser.splitSelectors(rule.selectorText)
+      .map(selector => {
+        const parts = CssSelectorParser.splitSelectorParts(selector);
+        parts[0] = CssSelectorParser.appendPart(parts[0], CSS_SPECIFICITY_INCREASER);
+        return parts.join(' ');
+      })
+      .join(', ');
+    log(' => ', rule.selectorText);
+  });
+
+  Size.updateTabs();
+}
+
+function processAllStyleRulesIn(sheetOrRule, processor) {
+  for (const rule of sheetOrRule.cssRules) {
+    if (rule.styleSheet)
+      processAllStyleRulesIn(rule.styleSheet, processor);
+    else if (rule.cssRules && rule.cssRules.length > 0) // @media and so son
+      processAllStyleRulesIn(rule, processor);
+    else
+      processor(rule);
+  }
+}
+
+
+async function applyBrowserTheme(theme) {
+  log('applying theme ', theme);
+
+  const browserThemeStyle = await BrowserTheme.generateThemeDeclarations(theme);
+  // Apply theme color at first, to use given colors as the base of following "face-*" colors.
+  mBrowserThemeDefinition.textContent = browserThemeStyle;
+
+  const baseColor = Color.parseCSSColor(window.getComputedStyle(document.querySelector('#dummy-tab-color-box'), null).backgroundColor);
+  const highlightColor = Color.parseCSSColor(window.getComputedStyle(document.querySelector('#dummy-highlight-color-box'), null).backgroundColor);
+  const defaultColors = `:root {
+    --face-highlight-lighter: ${Color.mixCSSColors(baseColor, { ...highlightColor, alpha: 0.35 })};
+    --face-highlight-more-lighter: ${Color.mixCSSColors(baseColor, { ...highlightColor, alpha: 0.2 })};
+    --face-highlight-more-more-lighter: ${Color.mixCSSColors(baseColor, { ...highlightColor, alpha: 0.1 })};
+    --face-gradient-start-active: rgba(${baseColor.red}, ${baseColor.green}, ${baseColor.blue}, 0.4);
+    --face-gradient-start-inactive: rgba(${baseColor.red}, ${baseColor.green}, ${baseColor.blue}, 0.2);
+    --face-gradient-end: rgba(${baseColor.red}, ${baseColor.green}, ${baseColor.blue}, 0);
+  }`;
+
+  mBrowserThemeDefinition.textContent = [
+    defaultColors,
+    browserThemeStyle
+  ].join('\n');
+}
+
+function updateContextualIdentitiesStyle() {
+  const colorInfo = ContextualIdentities.getColorInfo();
+  const definitions = Object.keys(colorInfo.colors).map(id =>
+    `.tab.contextual-identity-${id} .contextual-identity-marker {
+       background-color: ${colorInfo.colors[id]};
+     }`);
+
+  // This is required to map different color for color names.
+  // See also: https://github.com/piroor/treestyletab/issues/2296
+  definitions.push(colorInfo.colorDeclarations);
+
+  mContextualIdentitiesStyle.textContent = definitions.join('\n');
+}
+
+
+// Workaround for https://github.com/piroor/treestyletab/issues/3142
+// Firefox 101 and later versions may have something edge case bug around CSS
+// mask-iamge, it sometimes fails to apply masks on the initial loading.
+// After I disable and re-enable a CSS rule for a mask image by the DOM inspector
+// the problem looks solved. These codes simulates the operation by scanning all
+// CSS rules via CSSOM automatically.
+// Related bug on Fierfox side: https://bugzilla.mozilla.org/show_bug.cgi?id=1763420
+
+const URL_PATTERN = /^(?:url\()?(?:'(.+)'|"(.+)")(?:\))?$/;
+function reloadAllMaskImages() {
+  const delayedTasks = [];
+  for (const sheet of document.styleSheets) {
+    processAllStyleRulesIn(sheet, rule => {
+      if (!rule.style ||
+          !rule.style.maskImage ||
+          !URL_PATTERN.test(rule.style.maskImage))
+        return;
+
+      const background = rule.style.background;
+      const image = rule.style.maskImage;
+
+      if (background)
+        rule.style.background = 'none';
+      rule.style.maskImage = '';
+
+      delayedTasks.push(() => {
+        rule.style.maskImage = image;
+        if (background)
+          rule.style.background = background;
+      });
+    });
+  }
+  setTimeout(() => {
+    for (const task of delayedTasks) {
+      task();
+    }
+  }, 0);
+}
+
+
+function updateContextualIdentitiesSelector() {
+  const disabled = document.documentElement.classList.contains('incognito') || ContextualIdentities.getCount() == 0;
+
+  const anchors = document.querySelectorAll(`.${Constants.kCONTEXTUAL_IDENTITY_SELECTOR}-marker`);
+  for (const anchor of anchors) {
+    if (disabled)
+      anchor.setAttribute('disabled', true);
+    else
+      anchor.removeAttribute('disabled');
+  }
+
+  const selector = document.getElementById(Constants.kCONTEXTUAL_IDENTITY_SELECTOR);
+  const range    = document.createRange();
+  range.selectNodeContents(selector);
+  range.deleteContents();
+
+  if (disabled)
+    return;
+
+  const fragment = ContextualIdentities.generateMenuItems({
+    hasDefault: configs.inheritContextualIdentityToChildTabMode != Constants.kCONTEXTUAL_IDENTITY_DEFAULT,
+  });
+  range.insertNode(fragment);
+  range.detach();
+}
+
+async function rebuildAll(importedWindow) {
+  MetricsData.add('rebuildAll: start');
+  const trackedWindow = TabsStore.windows.get(mTargetWindow);
+  if (!trackedWindow)
+    Window.init(mTargetWindow);
+
+  if (!importedWindow)
+    importedWindow = await MetricsData.addAsync('rebuildAll: import tabs and groups', browser.runtime.sendMessage({
+      type:     Constants.kCOMMAND_PING_TO_BACKGROUND,
+      windowId: mTargetWindow
+    }).catch(ApiTabs.createErrorHandler()));
+
+  // Ignore tabs already closed. It can happen when the first tab is
+  // immediately reopened by other addons like Temporary Container.
+  const importedTabIds = new Set(importedWindow.tabs.map(tab => tab.id));
+  for (const tab of Tab.getAllTabs()) {
+    if (!importedTabIds.has(tab.id))
+      Tab.untrack(tab.id);
+  }
+
+  const tabs = importedWindow.tabs.map(importedTab => Tab.import(importedTab));
+
+  Window.init(mTargetWindow, importedWindow.tabGroups.map(TabGroup.init));
+  let lastDraw = Date.now();
+  let count = 0;
+  const maxCount = tabs.length;
+  for (const tab of tabs) {
+    const trackedTab = Tab.init(tab, { existing: true, inBackground: true });
+    const group = trackedTab.$TST.nativeTabGroup;
+    if (group?.collapsed) {
+      CollapseExpand.setCollapsed(tab, {
+        collapsed: true,
+      });
+    }
+    TabsUpdate.updateTab(trackedTab, tab, { forceApply: true });
+    if (tab.active)
+      TabsInternalOperation.setTabActive(trackedTab);
+    if (trackedTab.pinned)
+      SidebarItems.renderItem(trackedTab);
+    if (Date.now() - lastDraw > configs.intervalToUpdateProgressForBlockedUserOperation) {
+      UserOperationBlocker.setProgress(Math.round(++count / maxCount * 33) + 66); // 3/3: build tab elements
+      await nextFrame();
+      lastDraw = Date.now();
+    }
+  }
+  MetricsData.add('rebuildAll: end (from scratch)');
+
+  document.documentElement.classList.toggle(Constants.kTABBAR_STATE_MULTIPLE_HIGHLIGHTED, Tab.getHighlightedTabs(mTargetWindow).length > 1);
+  SidebarItems.reserveToUpdateLoadingState();
+
+  importedWindow = null; // wipe it out from the RAM.
+  return false;
+}
+
+let mGiveUpImportWindow = false;
+const mImportedWindow = new Promise((resolve, _reject) => {
+  log('preparing mImportedWindow');
+  // This must be synchronous , to avoid blocking to other listeners.
+  const onBackgroundIsReady = message => {
+    if (mGiveUpImportWindow) {
+      log('mImportedWindow (${windowId}): give up to import, unregister onBackgroundIsReady listener');
+      browser.runtime.onMessage.removeListener(onBackgroundIsReady);
+      resolve({ tabs: [], tabGroups: [] });
+      return;
+    }
+    // This handler may be called before mTargetWindow is initialized, so
+    // we need to wait until it is resolved.
+    // See also: https://github.com/piroor/treestyletab/issues/2200
+    mPromisedTargetWindow.then(windowId => {
+      if (mGiveUpImportWindow) {
+        log('mImportedWindow (${windowId}): give up to import, unregister onBackgroundIsReady listener (with promised target window)');
+        browser.runtime.onMessage.removeListener(onBackgroundIsReady);
+        resolve({ tabs: [], tabGroups: [] });
+        return;
+      }
+      log(`mImportedWindow (${windowId}): onBackgroundIsReady `, message?.type, message?.windowId);
+      if (message?.type != Constants.kCOMMAND_NOTIFY_BACKGROUND_READY ||
+          message?.windowId != windowId)
+        return;
+      browser.runtime.onMessage.removeListener(onBackgroundIsReady);
+      log(`mImportedWindow is resolved with ${message.exported.tabs.length} tabs`);
+      resolve(message.exported);
+    });
+  };
+  browser.runtime.onMessage.addListener(onBackgroundIsReady);
+});
+
+async function importWindowFromBackground() {
+  log('importWindowFromBackground: start');
+  try {
+    const importedWin = await MetricsData.addAsync('importWindowFromBackground: kCOMMAND_PING_TO_BACKGROUND', browser.runtime.sendMessage({
+      type:     Constants.kCOMMAND_PING_TO_BACKGROUND,
+      windowId: mTargetWindow
+    }).catch(ApiTabs.createErrorHandler()));
+    if (importedWin) {
+      log('importWindowFromBackground: use response of kCOMMAND_PING_TO_BACKGROUND');
+      mGiveUpImportWindow = true;
+      return importedWin;
+    }
+  }
+  catch(e) {
+    log('importWindowFromBackground: error: ', e);
+  }
+  log('importWindowFromBackground: waiting for mImportedWindow');
+  return MetricsData.addAsync('importWindowFromBackground: kCOMMAND_PING_TO_SIDEBAR', mImportedWindow);
+}
+
+
+export async function confirmToCloseTabs(tabs, { configKey } = {}) {
+  const tabIds = [];
+  if (!configKey)
+    configKey = 'warnOnCloseTabs';
+  tabs = tabs.filter(tab => {
+    if (!configs.grantedRemovingTabIds.includes(tab.id)) {
+      tabIds.push(tab.id);
+      return true;
+    }
+    return false;
+  });
+  log(`confirmToCloseTabs (${configKey}): `, tabIds);
+  const count = tabIds.length;
+  if (count <= 1 ||
+      !configs[configKey])
+    return true;
+
+  try {
+    const granted = await browser.runtime.sendMessage({
+      type:     Constants.kCOMMAND_CONFIRM_TO_CLOSE_TABS,
+      windowId: mTargetWindow,
+      configKey,
+      tabs
+    });
+    if (granted) {
+      configs.lastConfirmedToCloseTabs = Date.now();
+      configs.grantedRemovingTabIds = Array.from(new Set((configs.grantedRemovingTabIds   || []).concat(tabIds)));
+      log('confirmToCloseTabs: granted ', configs.grantedRemovingTabIds);
+      reserveToClearGrantedRemovingTabs();
+      return true;
+    }
+  }
+  catch(error) {
+    console.error(error);
+  }
+
+  return false;
+}
+TabContextMenu.onTabsClosing.addListener(confirmToCloseTabs);
+
+function reserveToClearGrantedRemovingTabs() {
+  const lastGranted = configs.grantedRemovingTabIds.join(',');
+  setTimeout(() => {
+    if (configs.grantedRemovingTabIds.join(',') == lastGranted)
+      configs.grantedRemovingTabIds = [];
+  }, 1000);
+}
+
+
+export function reserveToUpdateTabbarLayout({ reason, timeout } = {}) {
+  //log('reserveToUpdateTabbarLayout');
+  if (reserveToUpdateTabbarLayout.waiting)
+    clearTimeout(reserveToUpdateTabbarLayout.waiting);
+  if (reason && !(reserveToUpdateTabbarLayout.reasons & reason))
+    reserveToUpdateTabbarLayout.reasons |= reason;
+  if (typeof timeout != 'number')
+    timeout = 10;
+  reserveToUpdateTabbarLayout.timeout = Math.max(timeout, reserveToUpdateTabbarLayout.timeout);
+  reserveToUpdateTabbarLayout.waiting = setTimeout(() => {
+    delete reserveToUpdateTabbarLayout.waiting;
+    reserveToUpdateTabbarLayout.timeout = 0;
+    updateTabbarLayout();
+  }, reserveToUpdateTabbarLayout.timeout);
+}
+reserveToUpdateTabbarLayout.reasons = 0;
+reserveToUpdateTabbarLayout.timeout = 0;
+
+let mLastVisibleTabId = null;
+
+function updateTabbarLayout({ reason, reasons, timeout, justNow } = {}) {
+  if (reason && !reasons)
+    reasons = reason;
+  if (reserveToUpdateTabbarLayout.reasons) {
+    reasons = (reasons || 0) & reserveToUpdateTabbarLayout.reasons;
+    reserveToUpdateTabbarLayout.reasons = 0;
+  }
+  updateTabbarLayout.lastUpdateReasons = reasons;
+  if (RestoringTabCount.hasMultipleRestoringTabs()) {
+    log('updateTabbarLayout: skip until completely restored');
+    reserveToUpdateTabbarLayout({
+      reason:  reasons,
+      timeout: Math.max(100, timeout)
+    });
+    return;
+  }
+  const readableReasons = [];
+  if (configs.debug) {
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_RESIZE)
+      readableReasons.push('resize');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_COLLAPSE)
+      readableReasons.push('collapse');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_EXPAND)
+      readableReasons.push('expand');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_ANIMATION_END)
+      readableReasons.push('animation end');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_TAB_OPEN)
+      readableReasons.push('tab open');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_TAB_CLOSE)
+      readableReasons.push('tab close');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_TAB_MOVE)
+      readableReasons.push('tab move');
+    if (reasons & Constants.kTABBAR_UPDATE_REASON_VIRTUAL_SCROLL_VIEWPORT_UPDATE)
+      readableReasons.push('virtual scroll viewport update');
+  }
+  log(`updateTabbarLayout reasons: ${readableReasons.join(',')}`);
+
+  const lastVisibleTab = Tab.getLastVisibleTab(mTargetWindow);
+  const previousLastVisibleTab = Tab.get(mLastVisibleTabId);
+  if (previousLastVisibleTab &&
+      (!lastVisibleTab ||
+       lastVisibleTab.id != previousLastVisibleTab.id))
+    previousLastVisibleTab.$TST.removeState(Constants.kTAB_STATE_LAST_VISIBLE);
+  if (lastVisibleTab)
+    lastVisibleTab.$TST.addState(Constants.kTAB_STATE_LAST_VISIBLE);
+  mLastVisibleTabId = lastVisibleTab?.id;
+
+  const visibleNewTabButton = document.querySelector('#tabbar:not(.overflow) .after-tabs .newtab-button-box, #tabbar.overflow ~ .after-tabs .newtab-button-box');
+  const newTabButtonSize    = visibleNewTabButton.offsetHeight;
+  const extraTabbarTopContainerSize    = document.querySelector('#tabbar-top > *').offsetHeight;
+  const extraTabbarBottomContainerSize = document.querySelector('#tabbar-bottom > *').offsetHeight;
+  log('height: ', { newTabButtonSize, extraTabbarTopContainerSize, extraTabbarBottomContainerSize });
+
+  document.documentElement.style.setProperty('--tabbar-top-area-size', `${extraTabbarTopContainerSize}px`);
+  document.documentElement.style.setProperty('--tabbar-bottom-area-size', `${extraTabbarBottomContainerSize}px`);
+  document.documentElement.style.setProperty('--after-tabs-area-size', `${newTabButtonSize}px`);
+  Size.updateContainers();
+
+  const sidebarWidthInWindow = { ...configs.sidebarWidthInWindow };
+  sidebarWidthInWindow[TabsStore.getCurrentWindowId()] = window.innerWidth;
+  configs.sidebarWidthInWindow = sidebarWidthInWindow;
+
+  if (!(reasons & Constants.kTABBAR_UPDATE_REASON_VIRTUAL_SCROLL_VIEWPORT_UPDATE))
+    Scroll.reserveToRenderVirtualScrollViewport({ trigger: 'resized' });
+
+  if (SidebarItems.normalContainer.classList.contains(Constants.kTABBAR_STATE_OVERFLOW)) {
+    const updatedAt = updateTabbarLayout.lastScrollbarAutohideUpdatedAt = Date.now();
+    window.requestAnimationFrame(() => {
+      if (updatedAt != updateTabbarLayout.lastScrollbarAutohideUpdatedAt ||
+          !SidebarItems.normalContainer.classList.contains(Constants.kTABBAR_STATE_OVERFLOW))
+        return;
+
+      // scrollbar is shown only when hover on Windows 11, Linux, and macOS.
+      const virtualScrollContainer = document.querySelector('.virtual-scroll-container');
+      const scrollbarOffset = mTabBar.offsetWidth - virtualScrollContainer.offsetWidth;
+
+      const lastState = mTabBar.classList.contains(Constants.kTABBAR_STATE_SCROLLBAR_AUTOHIDE);
+      const newState = scrollbarOffset == 0;
+      if (lastState == newState)
+        return;
+
+      mTabBar.classList.toggle(Constants.kTABBAR_STATE_SCROLLBAR_AUTOHIDE, newState);
+      onLayoutUpdated.dispatch()
+    });
+  }
+
+  if (justNow)
+    PinnedTabs.reposition({ reasons, timeout, justNow });
+  else
+    PinnedTabs.reserveToReposition({ reasons, timeout, justNow });
+}
+updateTabbarLayout.lastUpdateReasons = 0;
+updateTabbarLayout.lastScrollbarAutohideUpdatedAt = 0;
+
+
+Scroll.onNormalTabsOverflow.addListener(() => {
+  log('Normal Tabs Overflow');
+  const windowId = TabsStore.getCurrentWindowId();
+  SidebarItems.normalContainer.classList.add(Constants.kTABBAR_STATE_OVERFLOW);
+  mTabBar.classList.add(Constants.kTABBAR_STATE_OVERFLOW);
+  TSTAPI.broadcastMessage({
+    type: TSTAPI.kNOTIFY_TABBAR_OVERFLOW,
+    windowId,
+  });
+  window.requestAnimationFrame(() => {
+    // Tab at the end of the tab bar can be hidden completely or
+    // partially (newly opened in small tab bar, or scrolled out when
+    // the window is shrunken), so we need to scroll to it explicitely.
+    const activeTab = Tab.getActiveTab(windowId);
+    if (activeTab && !Scroll.isItemInViewport(activeTab)) {
+      log('scroll to active tab on updateTabbarLayout');
+      Scroll.scrollToItem(activeTab);
+      onLayoutUpdated.dispatch()
+      return;
+    }
+    const lastOpenedTab = Tab.getLastOpenedTab(windowId);
+    if (updateTabbarLayout.lastUpdateReasons & Constants.kTABBAR_UPDATE_REASON_TAB_OPEN &&
+        !Scroll.isItemInViewport(lastOpenedTab)) {
+      log('scroll to last opened tab on updateTabbarLayout ', updateTabbarLayout.lastUpdateReasons);
+      Scroll.scrollToItem(lastOpenedTab, {
+        anchor:            activeTab,
+        notifyOnOutOfView: true
+      });
+    }
+    onLayoutUpdated.dispatch()
+  });
+});
+
+Scroll.onNormalTabsUnderflow.addListener(() => {
+  log('Normal Tabs Underflow');
+  SidebarItems.normalContainer.classList.remove(Constants.kTABBAR_STATE_OVERFLOW);
+  mTabBar.classList.remove(Constants.kTABBAR_STATE_OVERFLOW);
+  TSTAPI.broadcastMessage({
+    type:     TSTAPI.kNOTIFY_TABBAR_UNDERFLOW,
+    windowId: TabsStore.getCurrentWindowId(),
+  });
+  window.requestAnimationFrame(() => {
+    onLayoutUpdated.dispatch()
+  });
+});
+
+
+function onFocus(_event) {
+  BackgroundConnection.sendMessage({
+    type: Constants.kNOTIFY_SIDEBAR_FOCUS
+  });
+}
+
+function onBlur(_event) {
+  BackgroundConnection.sendMessage({
+    type: Constants.kNOTIFY_SIDEBAR_BLUR
+  });
+}
+
+function onResize(_event) {
+  reserveToUpdateTabbarLayout({
+    reason: Constants.kTABBAR_UPDATE_REASON_RESIZE
+  });
+}
+
+function onTransisionEnd(event) {
+  if (event.pseudoElement || // ignore size change of pseudo elements because they won't change height of tabbar contents
+      !event.target.parentNode ||
+      !event.target.parentNode.classList.contains('tabs') || // ignore animations on elements not affect to the tab bar scroll size
+      !/margin|height|border-((top|bottom)-)?/.test(event.propertyName))
+    return;
+  //log('transitionend ', event);
+  reserveToUpdateTabbarLayout({
+    reason: Constants.kTABBAR_UPDATE_REASON_ANIMATION_END
+  });
+}
+
+function onBrowserThemeChanged(updateInfo) {
+  if (!updateInfo.windowId || // reset to default
+      updateInfo.windowId == mTargetWindow)
+    applyBrowserTheme(updateInfo.theme);
+}
+
+
+ContextualIdentities.onUpdated.addListener(() => {
+  updateContextualIdentitiesStyle();
+  updateContextualIdentitiesSelector();
+});
+
+CollapseExpand.onReadyToExpand.addListener(async _tab => {
+  await nextFrame();
+});
+
+CollapseExpand.onUpdated.addListener((tab, options) => {
+  const reason = options.collapsed ? Constants.kTABBAR_UPDATE_REASON_COLLAPSE : Constants.kTABBAR_UPDATE_REASON_EXPAND ;
+  reserveToUpdateTabbarLayout({ reason });
+});
+
+async function onConfigChange(changedKey) {
+  const rootClasses = document.documentElement.classList;
+  switch (changedKey) {
+    case 'debug': {
+      EventListenerManager.debug = configs.debug;
+      if (mInitialized) {
+        // We have no need to re-update tabs on the startup process.
+        // Moreover, we should not re-update tabs at the time to avoid
+        // breaking of initialized tab states.
+        for (const tab of Tab.getAllTabs(mTargetWindow, { iterator: true })) {
+          TabsUpdate.updateTab(tab, tab, { forceApply: true });
+          tab.$TST.invalidateElement(TabInvalidationTarget.Tooltip);
+        }
+      }
+      rootClasses.toggle('debug', configs.debug);
+    }; break;
+
+    case 'sidebarPosition': {
+      const isRight = await isSidebarRightSide();
+      rootClasses.toggle('right', isRight);
+      rootClasses.toggle('left', !isRight);
+      Indent.update({ force: true });
+    }; break;
+
+    case 'baseIndent':
+    case 'minIndent':
+    case 'maxTreeLevel':
+    case 'indentAutoShrink':
+    case 'indentAutoShrinkOnlyForVisible':
+      Indent.update({ force: true });
+      break;
+
+    case 'faviconizePinnedTabs':
+    case 'maxFaviconizedPinnedTabsInOneRow':
+    case 'maxPinnedTabsRowsAreaPercentage':
+      rootClasses.toggle(Constants.kTABBAR_STATE_FAVICONIZE_PINNED_TABS, configs[changedKey]);
+      PinnedTabs.reserveToReposition();
+      break;
+
+    case 'fadeOutPendingTabs':
+      document.documentElement.classList.toggle('fade-out-pending-tabs', !!configs[changedKey]);
+      break;
+
+    case 'fadeOutDiscardedTabs':
+      document.documentElement.classList.toggle('fade-out-discarded-tabs', !!configs[changedKey]);
+      break;
+
+    case 'style':
+      log('reload for changed style');
+      location.reload();
+      break;
+
+    case 'colorScheme':
+      document.documentElement.setAttribute('color-scheme', configs.colorScheme);
+      break;
+
+    case 'inheritContextualIdentityToChildTabMode':
+      updateContextualIdentitiesSelector();
+      break;
+
+    case 'showContextualIdentitiesSelector':
+      rootClasses.toggle(Constants.kTABBAR_STATE_CONTEXTUAL_IDENTITY_SELECTABLE, configs[changedKey]);
+      break;
+
+    case 'showNewTabActionSelector':
+      rootClasses.toggle(Constants.kTABBAR_STATE_NEWTAB_ACTION_SELECTABLE, configs[changedKey]);
+      break;
+
+    case 'simulateSVGContextFill':
+      rootClasses.toggle('simulate-svg-context-fill', configs[changedKey]);
+      break;
+
+    case 'enableWorkaroundForBug1763420_reloadMaskImage':
+      mReloadMaskImage = configs[changedKey];
+      break;
+
+    case 'shiftTabsForScrollbarDistance':
+      Size.updateTabs();
+      break;
+
+    case 'shiftTabsForScrollbarOnlyOnHover':
+      document.documentElement.classList.toggle('shift-tabs-for-scrollbar-only-on-hover', !!configs[changedKey]);
+      break;
+
+    default:
+      if (changedKey.startsWith('chunkedUserStyleRules'))
+        applyUserStyleRules();
+      break;
+  }
+}
+
+async function isSidebarRightSide() {
+  const mayBeRight = window.mozInnerScreenX - window.screenX > (window.outerWidth - window.innerWidth) / 2;
+  if (configs.sidebarPosition == Constants.kTABBAR_POSITION_AUTO &&
+      mayBeRight &&
+      !isRTL() &&
+      !configs.sidebarPositionRighsideNotificationShown) {
+    if (mTargetWindow != (await browser.windows.getLastFocused({})).id)
+      return;
+
+    let result;
+    do {
+      result = await RichConfirm.show({
+        message: browser.i18n.getMessage('sidebarPositionRighsideNotification_message'),
+        buttons: [
+          browser.i18n.getMessage('sidebarPositionRighsideNotification_rightside'),
+          browser.i18n.getMessage('sidebarPositionRighsideNotification_leftside'),
+        ],
+      });
+    } while (result.buttonIndex < 0);
+
+    const notificationParams = {
+      title:   browser.i18n.getMessage('sidebarPositionOptionNotification_title'),
+      message: browser.i18n.getMessage('sidebarPositionOptionNotification_message'),
+      url:     `moz-extension://${location.host}/options/options.html#section-appearance`,
+      timeout: configs.sidebarPositionOptionNotificationTimeout,
+    };
+    configs.sidebarPositionRighsideNotificationShown = true;
+    switch (result.buttonIndex) {
+      case 0:
+        notify(notificationParams);
+        break;
+
+      case 1:
+      default:
+        configs.sidebarPosition = Constants.kTABBAR_POSITION_LEFT;
+        notify(notificationParams);
+        return;
+    }
+  }
+  return configs.sidebarPosition == Constants.kTABBAR_POSITION_AUTO ?
+    (mayBeRight || isRTL()) :
+    configs.sidebarPosition == Constants.kTABBAR_POSITION_RIGHT;
+}
+
+
+// This must be synchronous and return Promise on demando, to avoid
+// blocking to other listeners.
+function onMessage(message, _sender, _respond) {
+  if (!message ||
+      typeof message.type != 'string' ||
+      message.type.indexOf('ws:') != 0)
+    return;
+
+  if (message.windowId &&
+      message.windowId != mTargetWindow)
+    return;
+
+  //log('onMessage: ', message, sender);
+  switch (message.type) {
+    // for a vital check from SidebarConnection
+    case Constants.kCOMMAND_PING_TO_SIDEBAR:
+      return Promise.resolve(true);
+
+    case Constants.kCOMMAND_RELOAD:
+      log('reload triggered by the reload command');
+      location.reload();
+      return;
+
+    case Constants.kCOMMAND_SHOW_DIALOG:
+      return RichConfirm.show({
+        ...message.params,
+        onHidden() {
+          UserOperationBlocker.unblockIn(mTargetWindow, message.userOperationBlockerParams || {});
+        }
+      });
+
+    case Constants.kCOMMAND_GET_SIDEBAR_POSITION:
+      return Promise.resolve(document.documentElement.classList.contains('right') ?
+        Constants.kTABBAR_POSITION_RIGHT :
+        Constants.kTABBAR_POSITION_LEFT);
+
+    // for automated tests
+    case Constants.kCOMMAND_GET_BOUNDING_CLIENT_RECT: {
+      const range = document.createRange();
+      if (message.selector) {
+        const node = document.querySelector(message.selector);
+        if (!node) {
+          range.detach();
+          return Promise.resolve(null);
+        }
+        range.selectNode(node);
+      }
+      else {
+        range.setStartBefore(document.querySelector(message.startBefore));
+        range.setEndAfter(document.querySelector(message.endAfter));
+      }
+      const rect = range.getBoundingClientRect();
+      range.detach();
+      return Promise.resolve({
+        bottom: rect.bottom,
+        height: rect.height,
+        left:   rect.left,
+        right:  rect.right,
+        top:    rect.top,
+        width:  rect.width,
+      });
+    }; break;
+  }
+}
+
+const BUFFER_KEY_PREFIX = 'sidebar-';
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_CONNECTION_READY:
+      mConnectionOpenCount = message.openCount;
+      break;
+
+    case Constants.kCOMMAND_BLOCK_USER_OPERATIONS:
+      UserOperationBlocker.blockIn(mTargetWindow, message);
+      break;
+
+    case Constants.kCOMMAND_UNBLOCK_USER_OPERATIONS:
+      UserOperationBlocker.unblockIn(mTargetWindow, message);
+      break;
+
+    case Constants.kCOMMAND_PROGRESS_USER_OPERATIONS:
+      UserOperationBlocker.setProgress(message.percentage, mTargetWindow);
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED:
+    case Constants.kCOMMAND_NOTIFY_TAB_MOVED:
+    case Constants.kCOMMAND_NOTIFY_TAB_ATTACHED_TO_WINDOW:
+      if (message.tabId)
+        await Tab.waitUntilTracked(message.tabId);
+      reserveToUpdateTabbarLayout({
+        reason:  Constants.kTABBAR_UPDATE_REASON_TAB_OPEN,
+        timeout: configs.collapseDuration
+      });
+      break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVING:
+    case Constants.kCOMMAND_NOTIFY_TAB_DETACHED_FROM_WINDOW: {
+      await Tab.waitUntilTracked(message.tabId);
+      reserveToUpdateTabbarLayout({
+        reason:  Constants.kTABBAR_UPDATE_REASON_TAB_CLOSE,
+        timeout: configs.collapseDuration
+      });
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TAB_SHOWN:
+    case Constants.kCOMMAND_NOTIFY_TAB_HIDDEN: {
+      if (BackgroundConnection.handleBufferedMessage({ type: 'shown/hidden', message }, `${BUFFER_KEY_PREFIX}${message.tabId}`))
+        return;
+      await Tab.waitUntilTracked(message.tabId);
+      const lastMessage = BackgroundConnection.fetchBufferedMessage('shown/hidden', `${BUFFER_KEY_PREFIX}${message.tabId}`);
+      if (!lastMessage)
+        return;
+      if (lastMessage.message.type == Constants.kCOMMAND_NOTIFY_TAB_SHOWN) {
+        reserveToUpdateTabbarLayout({
+          reason: Constants.kTABBAR_UPDATE_REASON_TAB_OPEN
+        });
+      }
+      else {
+        reserveToUpdateTabbarLayout({
+          reason: Constants.kTABBAR_UPDATE_REASON_TAB_CLOSE
+        });
+      }
+    }; break;
+
+    case Constants.kCOMMAND_BOOKMARK_TAB_WITH_DIALOG: {
+      Bookmark.bookmarkTab(Tab.get(message.tabId), {
+        ...(message.options || {}),
+        showDialog: true
+      });
+    }; break;
+
+    case Constants.kCOMMAND_BOOKMARK_TABS_WITH_DIALOG: {
+      Bookmark.bookmarkTabs(mapAndFilter(message.tabIds, id => Tab.get(id)), {
+        ...(message.options || {}),
+        showDialog: true
+      });
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_IN_PROGRESS: {
+      const notification = Notifications.add('tabs-highlighing-progress', {
+        message: browser.i18n.getMessage('tabsHighlightingNotification_message', [message.progress]),
+        onCreated(notification) {
+          notification.classList.add('hbox');
+        },
+      });
+      notification.style.backgroundImage = `
+        linear-gradient(
+          90deg,
+          Highlight 0%,
+          Highlight ${message.progress}%,
+          transparent ${message.progress}%,
+          transparent 100%
+        )
+      `;
+    }; break;
+
+    case Constants.kCOMMAND_NOTIFY_TABS_HIGHLIGHTING_COMPLETE:
+      Notifications.remove('tabs-highlighing-progress');
+      break;
+  }
+});
+
+
+browser.windows.onFocusChanged.addListener(windowId => {
+  document.documentElement.classList.toggle('active', windowId == mTargetWindow);
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/size.js b/waterfox/browser/components/sidebar/sidebar/size.js
new file mode 100644
index 0000000000000..8b1bd42e19c47
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/size.js
@@ -0,0 +1,286 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import {
+  log as internalLogger,
+  configs,
+  isRTL,
+} from '/common/common.js';
+
+function log(...args) {
+  internalLogger('sidebar/size', ...args);
+}
+
+export const onUpdated = new EventListenerManager();
+
+const mPinnedScrollBox  = document.querySelector('#pinned-tabs-container');
+const mNormalScrollBox  = document.querySelector('#normal-tabs-container');
+const mTabBar           = document.querySelector('#tabbar');
+
+let mTabHeight          = 0;
+let mTabXOffset         = 0;
+let mTabYOffset         = 0;
+let mTabMarginBlockStart = 0;
+let mTabMarginBlockEnd  = 0;
+let mFavIconSize        = 0;
+let mFavIconizedTabSize = 0;
+let mFavIconizedTabWidth = 0;
+let mFavIconizedTabHeight = 0;
+let mFavIconizedTabXOffset = 0;
+let mFavIconizedTabYOffset = 0;
+let mPinnedTabsScrollBoxRect;
+let mPinnedTabsContainerWidth
+let mNormalTabsScrollBoxRect;
+let mNormalTabsViewPortSize = 0;
+let mAllTabsAreaSize    = 0;
+
+export function getTabHeight() {
+  return mTabHeight;
+}
+
+export function getRenderedTabHeight() {
+  return mTabHeight + mTabYOffset;
+}
+
+export function getTabXOffset() {
+  return mTabXOffset;
+}
+
+export function getTabYOffset() {
+  return mTabYOffset;
+}
+
+export function getTabMarginBlockStart() {
+  return mTabMarginBlockStart;
+}
+
+export function getTabMarginBlockEnd() {
+  return mTabMarginBlockEnd;
+}
+
+export function getFavIconSize() {
+  return mFavIconSize;
+}
+
+export function getFavIconizedTabSize() {
+  return mFavIconizedTabSize;
+}
+
+export function getFavIconizedTabXOffset() {
+  return mFavIconizedTabYOffset;
+}
+
+export function getFavIconizedTabYOffset() {
+  return mFavIconizedTabYOffset;
+}
+
+export function getRenderedFavIconizedTabWidth() {
+  return mFavIconizedTabWidth + mFavIconizedTabXOffset;
+}
+
+export function getRenderedFavIconizedTabHeight() {
+  return mFavIconizedTabHeight + mFavIconizedTabYOffset;
+}
+
+export function getScrollBoxRect(scrollBox) {
+  return scrollBox == mPinnedScrollBox ?
+    (mPinnedTabsScrollBoxRect ||= mPinnedScrollBox.getBoundingClientRect()) :
+    (mNormalTabsScrollBoxRect ||= mNormalScrollBox.getBoundingClientRect());
+}
+
+export function getNormalTabsViewPortSize() {
+  return mNormalTabsViewPortSize;
+}
+
+export function getPinnedTabsContainerWidth() {
+  return mPinnedTabsContainerWidth;
+}
+
+export function getAllTabsAreaSize() {
+  return mAllTabsAreaSize;
+}
+
+export function init() {
+  updateTabs();
+  updateContainers();
+  matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`).addListener(() => {
+    updateTabs();
+    updateContainers();
+  });
+}
+
+export function clear() {
+  document.querySelector('#size-definition').textContent = '';
+}
+
+export function updateTabs() {
+  // first, calculate actual favicon size.
+  mFavIconSize = document.querySelector('#dummy-favicon-size-box').offsetHeight;
+  const scale = Math.max(configs.faviconizedTabScale, 1);
+  mFavIconizedTabSize = parseInt(mFavIconSize * scale);
+  log('mFavIconSize / mFavIconizedTabSize ', mFavIconSize, mFavIconizedTabSize);
+  let sizeDefinition = `:root {
+    --favicon-size:         ${mFavIconSize}px;
+    --faviconized-tab-size: ${mFavIconizedTabSize}px;
+  }`;
+  const dummyFaviconizedTab = document.querySelector('#dummy-faviconized-tab');
+  const faviconizedTabStyle = window.getComputedStyle(dummyFaviconizedTab);
+  mFavIconizedTabWidth  = dummyFaviconizedTab.offsetWidth;
+  mFavIconizedTabHeight = dummyFaviconizedTab.offsetHeight;
+  // simulating margin collapsing
+  const favIconizedMarginInlineStart = parseFloat(faviconizedTabStyle.marginInlineStart);
+  const favIconizedMarginInlineEnd   = parseFloat(faviconizedTabStyle.marginInlineEnd);
+  mFavIconizedTabXOffset = (favIconizedMarginInlineStart > 0 && favIconizedMarginInlineEnd > 0) ?
+    Math.max(favIconizedMarginInlineStart, favIconizedMarginInlineEnd) :
+    favIconizedMarginInlineStart + favIconizedMarginInlineEnd;
+  const favIconizedMarginBlockStart = parseFloat(faviconizedTabStyle.marginBlockStart);
+  const favIconizedMarginBlockEnd   = parseFloat(faviconizedTabStyle.marginBlockEnd);
+  mFavIconizedTabYOffset = (favIconizedMarginBlockStart > 0 && favIconizedMarginBlockEnd > 0) ?
+    Math.max(favIconizedMarginBlockStart, favIconizedMarginBlockEnd) :
+    favIconizedMarginBlockStart + favIconizedMarginBlockEnd;
+
+  const dummyTab = document.querySelector('#dummy-tab');
+  const tabStyle  = window.getComputedStyle(dummyTab);
+  mTabXOffset = parseFloat(tabStyle.marginInlineStart) + parseFloat(tabStyle.marginInlineEnd);
+  // simulating margin collapsing
+  mTabMarginBlockStart = parseFloat(tabStyle.marginBlockStart);
+  mTabMarginBlockEnd   = parseFloat(tabStyle.marginBlockEnd);
+  mTabYOffset = (mTabMarginBlockStart > 0 && mTabMarginBlockEnd > 0) ?
+    Math.max(mTabMarginBlockStart, mTabMarginBlockEnd) :
+    mTabMarginBlockStart + mTabMarginBlockEnd;
+
+  const substanceRect = dummyTab.querySelector('tab-item-substance').getBoundingClientRect();
+  const uiRect = dummyTab.querySelector('tab-item-substance > .ui').getBoundingClientRect();
+  const captionRect = dummyTab.querySelector('tab-item-substance > .ui > .caption').getBoundingClientRect();
+  const favIconRect = dummyTab.querySelector('tab-favicon').getBoundingClientRect();
+  const labelRect = dummyTab.querySelector('tab-label').getBoundingClientRect();
+  const closeBoxRect = dummyTab.querySelector('tab-closebox').getBoundingClientRect();
+
+  let shiftTabsForScrollbarDistance = configs.shiftTabsForScrollbarDistance.trim() || '0';
+  if (!/^[0-9\.]+(cm|mm|Q|in|pc|pt|px|em|ex|ch|rem|lh|vw|vh|vmin|vmax|%)$/.test(shiftTabsForScrollbarDistance))
+    shiftTabsForScrollbarDistance = '0'; // ignore invalid length
+  if (shiftTabsForScrollbarDistance == '0')
+    shiftTabsForScrollbarDistance += 'px'; // it is used with CSS calc() and it requires any length unit for each value.
+
+  // Phase 1: setting `--tab-size` based on the auto-calculated height of the
+  // dummy tab, which may be expanded by inserted extra tab contents.
+  const baseLeft  = substanceRect.left;
+  const baseRight = substanceRect.right;
+  sizeDefinition += `:root {
+    --tab-size: ${dummyTab.offsetHeight}px;
+    --tab-substance-size: ${substanceRect.height}px;
+    --tab-ui-size: ${uiRect.height}px;
+    --tab-caption-size: ${captionRect.height}px;
+    --tab-x-offset: ${mTabXOffset}px;
+    --tab-y-offset: ${mTabYOffset}px;
+    --tab-height: var(--tab-size); /* for backward compatibility of custom user styles */
+    --tab-favicon-start-offset: ${isRTL() ? baseRight - favIconRect.right : favIconRect.left - baseLeft}px;
+    --tab-favicon-end-offset: ${isRTL() ? favIconRect.left - baseLeft : baseRight - favIconRect.right}px;
+    --tab-label-start-offset: ${isRTL() ? baseRight - labelRect.right : labelRect.left - baseLeft}px;
+    --tab-label-end-offset: ${isRTL() ? labelRect.left - baseLeft : baseRight - labelRect.right}px;
+    --tab-closebox-start-offset: ${isRTL() ? baseRight - closeBoxRect.right : closeBoxRect.left - baseLeft}px;
+    --tab-closebox-end-offset: ${isRTL() ? closeBoxRect.left - baseLeft : baseRight - closeBoxRect.right}px;
+
+    --tab-burst-duration: ${configs.burstDuration}ms;
+    --indent-duration:    ${configs.indentDuration}ms;
+    --collapse-duration:  ${configs.collapseDuration}ms;
+    --out-of-view-tab-notify-duration: ${configs.outOfViewTabNotifyDuration}ms;
+    --visual-gap-hover-animation-delay: ${configs.cancelGapSuppresserHoverDelay}ms;
+
+    --shift-tabs-for-scrollbar-distance: ${shiftTabsForScrollbarDistance};
+  }`;
+
+  const sizeDefinitionHolder = document.querySelector('#size-definition');
+  const modifiedAtPhase1 = sizeDefinitionHolder.textContent != sizeDefinition;
+  if (modifiedAtPhase1)
+    sizeDefinitionHolder.textContent = sizeDefinition;
+
+  // Phase 2: setting `--tab-size` again based on the "sizer" dummy tab.
+  // In general cases it is sized by the `--tab-size` defined at the phase 1,
+  // but tab size defined in the user style sheet is always preferred to it.
+  // The customized tab height is applied only to the "sizer" dummy.
+  // As the result, TST treats the priority of tab size as:
+  //   user-defined tab size (never expanded by extra tab contents)
+  //     > auto-calculated tab size (may be expanded by extra tab contents)
+  //     > initial tab size
+  mTabHeight = document.querySelector('#dummy-sizer-tab').offsetHeight;
+  log('mTabHeight ', mTabHeight);
+  const finalSizeDefinition = sizeDefinition.replace(/--tab-size:[^;]+;/, `--tab-size: ${mTabHeight}px;`);
+  const modifiedAtPhase2 = sizeDefinitionHolder.textContent != finalSizeDefinition;
+  if (modifiedAtPhase2)
+    sizeDefinitionHolder.textContent = finalSizeDefinition;
+
+  if (modifiedAtPhase1 || modifiedAtPhase2)
+    onUpdated.dispatch();
+}
+
+export function updateContainers() {
+  let modifiedCount = 0;
+
+  mPinnedTabsScrollBoxRect = mPinnedScrollBox.getBoundingClientRect();
+  mNormalTabsScrollBoxRect = mNormalScrollBox.getBoundingClientRect();
+
+  const pinnedContainerBox     = mPinnedScrollBox.querySelector('.tabs');
+  const pinnedContainerBoxRect = pinnedContainerBox.getBoundingClientRect();
+  const pinnedContainerStyle   = window.getComputedStyle(pinnedContainerBox, null);
+  const newPinnedTabsContainerWidth = pinnedContainerBoxRect.width - parseFloat(pinnedContainerStyle.paddingInlineStart) - parseFloat(pinnedContainerStyle.borderInlineStartWidth) - parseFloat(pinnedContainerStyle.paddingInlineEnd) - parseFloat(pinnedContainerStyle.borderInlineEndWidth);
+  if (newPinnedTabsContainerWidth != mPinnedTabsContainerWidth)
+    modifiedCount++;
+  mPinnedTabsContainerWidth    = newPinnedTabsContainerWidth;
+
+  const range = document.createRange();
+  //range.selectNodeContents(mTabBar);
+  //range.setEndBefore(mNormalScrollBox);
+  const normalTabsViewPortPrecedingAreaSize = mPinnedScrollBox.offsetHeight; //range.getBoundingClientRect().height;
+  range.selectNodeContents(mTabBar);
+  range.setStartAfter(mNormalScrollBox);
+  const normalTabsViewPortFollowingAreaSize = range.getBoundingClientRect().height;
+  const newNormalTabsViewportSize = mTabBar.offsetHeight - normalTabsViewPortPrecedingAreaSize - normalTabsViewPortFollowingAreaSize;
+  range.detach();
+  if (newNormalTabsViewportSize != mNormalTabsViewPortSize)
+    modifiedCount++;
+  mNormalTabsViewPortSize = newNormalTabsViewportSize;
+
+  const newAllTabsAreaSize = mTabBar.parentNode.offsetHeight;
+  if (newAllTabsAreaSize != mAllTabsAreaSize)
+    modifiedCount++;
+  mAllTabsAreaSize = newAllTabsAreaSize;
+
+  if (modifiedCount > 0)
+    onUpdated.dispatch();
+}
+
+export function calc(expression) {
+  expression = expression.replace(/^\s*calc\((.+)\)\s*$/, '$1');
+  const box = document.createElement('span');
+  const style = box.style;
+  style.display       = 'inline-block';
+  style.insetInlineStart = 0;
+  style.height        = 0;
+  style.overflow      = 'hidden';
+  style.pointerEvents = 'none';
+  style.position      = 'fixed';
+  style.top           = 0;
+  style.zIndex        = 0;
+
+  const innerBox = box.appendChild(document.createElement('span'));
+  const innerStyle = innerBox.style;
+  innerStyle.display       = 'inline-block';
+  innerStyle.insetInlineStart = 0;
+  innerStyle.height        = 0;
+  innerStyle.pointerEvents = 'none';
+  innerStyle.position      = 'fixed';
+  innerStyle.top           = `calc(${expression})`;
+  innerStyle.zIndex        = 0;
+
+  document.body.appendChild(box);
+  const result = innerBox.offsetTop - box.offsetTop;
+  box.parentNode.removeChild(box);
+  return result;
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/base.css b/waterfox/browser/components/sidebar/sidebar/styles/base.css
new file mode 100644
index 0000000000000..2e9753adcbbea
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/base.css
@@ -0,0 +1,1660 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+@import url("/resources/ui-base.css");
+
+:root {
+  /* default size, they will be overridden. */
+  --favicon-size: 16px;
+  --tab-size: unset;
+  --tab-group-member-indent: 0px;
+  --tab-indent: 0px;
+  --tab-margin-block-start: 0px;
+  --tab-margin-block-end: 0px;
+  --tab-margin-inline-start: 0px;
+  --tab-margin-inline-end: 0px;
+  --faviconized-tab-size: 28px;
+  --svg-small-icon-size: 16px;
+  --new-tab-button-anchor-size: 1.5em;
+  --tabbar-top-area-size: 0px;
+  --tabbar-bottom-area-size: 0px;
+  --after-tabs-area-size: 0px;
+  --pinned-tabs-area-size: 0px;
+  --pinned-tabs-container-resizer-size: 2px;
+  --subpanel-area-size: 0px;
+  --subpanel-content-size: auto;
+
+  --color-animation: 0.25s ease-out;
+  --indent-animation: var(--indent-duration) ease-out;
+  --collapse-animation: var(--collapse-duration) ease-out;
+  --tab-basic-animation: background    var(--color-animation),
+                         color         var(--color-animation),
+                         inset-inline-start var(--collapse-animation),
+                         inset-inline-end   var(--collapse-animation),
+                         margin-block-start var(--collapse-animation),
+                         margin-block-end   var(--collapse-animation),
+                         max-height    var(--collapse-animation),
+                         max-width     var(--collapse-animation),
+                         min-height    var(--collapse-animation),
+                         min-width     var(--collapse-animation),
+                         opacity       var(--collapse-animation),
+                         /* for extra margin on overlay-scrollbar mode */
+                         padding-inline-start var(--collapse-animation),
+                         padding-inline-end   var(--collapse-animation);
+  --tab-animation: var(--tab-basic-animation),
+                   background    var(--color-animation),
+                   top           var(--collapse-animation);
+  --tab-indent-animation: margin-inline-start var(--indent-animation),
+                          margin-inline-end   var(--indent-animation);
+  --tab-indent-positioning-animation: inset-inline-start var(--indent-animation),
+                                      inset-inline-end   var(--indent-animation);
+
+  --button-opacity: 0.75;
+  --button-hover-opacity: 1;
+  --button-active-opacity: 1;
+
+  --tab-highlighted-highlight: white;
+  --tab-highlighted-glow: Highlight;
+  --tab-highlighted-base: transparent;
+
+  /* Default color for "No Decoration" */
+  --tab-text-regular: ButtonText;
+
+  --tab-surface: var(--tab-surface-regular);
+  --tab-text: var(--tab-text-regular);
+  --tab-text-shadow: none;
+
+  --multiselected-color: transparent;
+  --multiselected-color-opacity: 0.35;
+
+  /* z-index of elements: we should define them here to keep their strict priorities */
+  --invisible-z-index:       -100;
+  --dummy-element-z-index:   1; /* dummy tab */
+  --background-z-index:      10; /* background screen */
+  --accessible-ui-z-index:   100; /* tabbar itself, and others */
+  --over-tabs-z-index:       200; /* buttons after tabs, pinned tabs (required to make pinned tabs clickable) */
+  --over-buttons-z-index:    300; /* buttons on buttons after tabs */
+  --notification-ui-z-index: 9000;
+  --tooltip-ui-z-index:      10000;
+  --blocking-ui-z-index:     20000; /* frontmost of others */
+
+  --tab-background-z-index:            10;
+  --tab-extra-contents-behind-z-index: 20;
+  --tab-indent-z-index:                90;
+  --tab-base-z-index:                  100;
+  --tab-extra-contents-beside-z-index: 150;
+  --tab-favicon-z-index:               200;
+  --tab-burster-z-index:               4000;
+  --tab-highlighter-z-index:           5000;
+  --tab-extra-contents-front-z-index:  6000;
+  --tab-ui-z-index:                    9000;
+  --tab-drop-marker-z-index:           10000;
+
+  --visual-gap-offset: 0px;
+  --visual-gap-animation: top var(--collapse-animation);
+  --visual-gap-hover-animation: top var(--collapse-animation) var(--visual-gap-hover-animation-delay);
+
+  /* Some users may use physical properties to customize tab margins, so we should map them to logical propertis for better compatibility.
+     https://github.com/piroor/treestyletab/wiki/Code-snippets-for-custom-style-rules#change-tab-margin */
+  &:not(.rtl),
+  &:not(.rtl) tab-item {
+    --tab-margin-block-start: var(--tab-margin-top, 0px);
+    --tab-margin-block-end: var(--tab-margin-bottom, 0px);
+    --tab-margin-inline-start: var(--tab-margin-left, 0px);
+    --tab-margin-inline-end: var(--tab-margin-right, 0px);
+  }
+  &.rtl,
+  &.rtl tab-item {
+    --tab-margin-block-start: var(--tab-margin-top, 0px);
+    --tab-margin-block-end: var(--tab-margin-bottom, 0px);
+    --tab-margin-inline-start: var(--tab-margin-right, 0px);
+    --tab-margin-inline-end: var(--tab-margin-left, 0px);
+  }
+
+  &.debug {
+    * {
+      outline: 1px dotted rgba(255, 0, 0, 0.5);
+    }
+
+    /* Show internal tab id in the debug mode */
+    tab-item::after {
+      bottom: 0;
+      inset-inline-end: 0;
+      opacity: 0.65;
+      overflow: hidden;
+      pointer-events: none;
+      position: absolute;
+      text-align: end;
+      z-index: var(--tab-favicon-z-index);
+    }
+    /* override definition for the highlighting marker */
+    tab-item[data-tab-id]::after {
+      content: attr(data-tab-id) !important;
+    }
+    tab-item[data-native-tab-group-id]::after {
+      content: attr(data-native-tab-group-id) !important;
+    }
+  }
+}
+
+
+body {
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 0;
+  padding-inline: 0;
+}
+
+tab-item {
+  --tab-current-size: var(--tab-size);
+  --attention-marker-x-offset: calc(0px - ((var(--tab-current-size) - var(--favicon-size)) / 2));
+  --attention-marker-y-offset: calc(0px - ((var(--tab-current-size) - var(--favicon-size)) / 2));
+  --attention-marker-gradient: radial-gradient(circle farthest-corner at 50% calc(100% - 14% + 1px),
+                                               var(--tab-highlighted-glow) 0,
+                                               var(--tab-highlighted-glow) 7%,
+                                               rgba(255, 255, 255, 0) 7%);
+  --attention-marker-gradient-hover: var(--attention-marker-gradient);
+  /* old style
+  --attention-marker-gradient: radial-gradient(circle farthest-corner at 50% calc(100% - 3px),
+                                               var(--tab-highlighted-highlight) 3%,
+                                               var(--tab-highlighted-glow) 10%,
+                                               rgba(255, 255, 255, 0) 20%);
+  --attention-marker-gradient-hover: radial-gradient(circle farthest-corner at 50% calc(100% - 3px),
+                                                     var(--tab-highlighted-highlight) 3%,
+                                                     var(--tab-highlighted-glow) 10%,
+                                                     rgba(255, 255, 255, 0) 23%);
+  */
+  --tab-label-width: 100%;
+
+  &.faviconized {
+    --attention-marker-x-offset: calc(0px - ((var(--tab-current-size) - var(--favicon-size)) / 2) + ((var(--tab-current-size) - var(--faviconized-tab-size)) / 2));
+    --attention-marker-y-offset: calc(0px - ((var(--tab-current-size) - var(--favicon-size)) / 2) + ((var(--tab-current-size) - var(--faviconized-tab-size))));
+  }
+
+  &:not(.faviconized):not(.dummy) {
+    height: var(--tab-size); /* make tab height consistent even if only some tabs have extra contents */
+
+    tab-item-substance {
+      height: 100%; /* tab substance should be expanded if it has no extra contents */
+    }
+  }
+
+  &:focus {
+    outline: none;
+  }
+
+  &:not(.faviconized):focus tab-label,
+  &.faviconized:focus tab-favicon {
+    outline: 1px dotted;
+  }
+}
+
+.sticky-tab-spacer {
+  height: var(--tab-size); /* make tab height consistent even if only some tabs have extra contents */
+}
+
+
+@keyframes blink {
+  0% { opacity: 0; }
+  50% { opacity: 1; }
+  100% { opacity: 0; }
+}
+
+
+/* This is required to prevent dragging of images (ex. favicon).
+   Otherwise they are unexpectedly dragged just as an image and
+   it is downloadable via dropping on the desktop or others. */
+img {
+  pointer-events: none;
+}
+
+button,
+.after-tabs [role="button"] /*,
+tab-item,
+tab-twisty,
+tab-closebox,
+tab-sound-button */ {
+  -moz-user-focus: ignore !important;
+}
+
+.vbox {
+  align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+}
+
+.hbox {
+  align-items: stretch;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+}
+
+.flexible {
+  height: 100%; /* to make #content flexible */
+}
+
+
+/* tabbar */
+
+:root,
+body {
+  color-scheme: light dark;
+  font: message-box; /* this is same to Firefox's UI. */
+}
+
+#tabbar-container,
+#tabbar,
+#pinned-tabs-container,
+#pinned-tabs-container-resizer,
+#tabbar-top,
+#tabbar-bottom,
+#background,
+#subpanel-container {
+  bottom: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  margin-block: 0;
+  margin-inline: 0;
+  overflow: hidden;
+  padding-block: 0;
+  padding-inline: 0;
+  position: fixed;
+  top: 0;
+  z-index: var(--accessible-ui-z-index);
+}
+
+#tabbar-container {
+  bottom: var(--subpanel-area-size);
+  top: calc(var(--tabbar-top-area-size) + var(--visual-gap-offset));
+  transition: var(--visual-gap-animation);
+
+  :root.hover-on-top-edge:hover & {
+    top: var(--tabbar-top-area-size) !important;
+    transition: var(--visual-gap-hover-animation);
+  }
+}
+
+#tabbar {
+  position: absolute;
+
+  &.overflow {
+    bottom: calc(var(--after-tabs-area-size) + var(--tabbar-bottom-area-size));
+  }
+
+  :root.initializing & {
+    opacity: 0;
+  }
+
+  :root.animation:not(.minimized) & {
+    transition: margin-block-start var(--collapse-animation);
+  }
+}
+
+#normal-tabs-container {
+  margin-block-start: var(--pinned-tabs-area-size);
+  max-height: 100%;
+  min-height: 0;
+  overflow: hidden;
+}
+
+:root.rtl,
+:root.rtl tab-item-substance .caption {
+  direction: rtl;
+}
+
+.virtual-scroll-container {
+  /* We need to use min-height instead of height for a flexbox. */
+  min-height: 0px; /* this will be updated dynamically by scroll.js */
+  overflow: hidden;
+
+  :root.animation & {
+    transition: min-height var(--collapse-animation);
+  }
+}
+
+
+#normal-tabs-container.overflow {
+  /* Scroll anchoring by Firefox itself may break virtual scrolling, so I disable anchoring and control all by myself. */
+  overflow-anchor: none;
+  overflow-y: scroll;
+}
+
+/* overflow-start-indicator and overflow-end-indicator
+   ref: https://searchfox.org/mozilla-central/rev/1ef947827852125825dda93d8f4f83d1f55739eb/browser/themes/shared/tabs.css#527-563 */
+.overflow-indicator {
+  background-repeat: no-repeat;
+  opacity: 0;
+  position: fixed;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  pointer-events: none;
+  z-index: var(--over-tabs-z-index);
+
+  :root.animation & {
+    transition: opacity 150ms ease;
+  }
+
+  &.start {
+    top: calc(var(--tabbar-top-area-size) + var(--pinned-tabs-area-size));
+  }
+  &.end {
+    bottom: calc(var(--subpanel-area-size) + var(--tabbar-bottom-area-size) + var(--after-tabs-area-size));
+  }
+
+  #normal-tabs-container.overflow.scrolled &.start,
+  #normal-tabs-container.overflow:not(.fully-scrolled) &.end {
+    opacity: 1;
+  }
+}
+
+.tabs-spacer {
+  display: none;
+  min-height: 0;
+  pointer-events: none;
+  visibility: hidden;
+
+  :root.animation:not(.minimized) & {
+    transition: min-height var(--collapse-animation);
+  }
+
+  #normal-tabs-container.overflow & {
+    display: block;
+  }
+}
+
+.sticky-tabs-container {
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  min-height: 0;
+  pointer-events: none;
+  position: fixed;
+  z-index: var(--tab-ui-z-index);
+
+  &.above {
+    top: calc(var(--tabbar-top-area-size) + var(--pinned-tabs-area-size));
+  }
+  &.below {
+    bottom: calc(var(--after-tabs-area-size) + var(--tabbar-bottom-area-size) + var(--tabbar-bottom-area-size) + var(--subpanel-area-size));
+  }
+}
+
+
+#background {
+  background-color: -moz-dialog; /* This is required to cover dummy elements. See also: https://github.com/piroor/treestyletab/issues/1703#issuecomment-354646405 */
+  pointer-events: none;
+  z-index: var(--background-z-index);
+}
+
+
+/* put scrollbar farside from the content area */
+:root.left:not(.rtl) {
+  #tabbar {
+    direction: rtl;
+    .after-tabs {
+      direction: ltr;
+    }
+  }
+  #pinned-tabs-container > *,
+  #normal-tabs-container > * {
+    direction: ltr;
+  }
+}
+:root.right.rtl {
+  /* put scrollbar farside from the content area */
+  #tabbar {
+    direction: ltr;
+    .after-tabs {
+      direction: rtl;
+    }
+  }
+  #pinned-tabs-container > *,
+  #normal-tabs-container > * {
+    direction: rtl;
+  }
+}
+
+
+
+#pinned-tabs-container,
+#normal-tabs-container {
+  scrollbar-width: thin;
+}
+
+
+ul {
+  flex-grow: 1;
+  list-style: none;
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 0;
+  padding-inline: 0;
+}
+
+
+/* dummy elements to calculate actual size of boxes */
+
+#dummy-tabs {
+  bottom: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  overflow-y: scroll;
+  pointer-events: none;
+  position: fixed;
+  z-index: var(--dummy-element-z-index); /* Put it below the background. See also: https://github.com/piroor/treestyletab/issues/1703#issuecomment-354646405 */
+
+  :root:not(.have-unsynchronized-throbber) & {
+    clip: rect(0, 0, 0, 0); /* Don't hide animated throbber when its appearance is copied with -moz-element since doing so causes stuttering in the copied animation */
+  }
+}
+
+#dummy-favicon-size-box {
+  background: -moz-dialog;
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  max-width: 1em;
+  max-height: 1em;
+  min-width: 16px;
+  min-height: 16px;
+}
+
+#dummy-tab-color-box {
+  background: -moz-dialog;
+}
+
+#dummy-highlight-color-box {
+  background: Highlight;
+  color: HighlightText;
+}
+
+#dummy-shift-tabs-for-scrollbar-distance-box {
+  width: var(--shift-tabs-for-scrollbar-distance, 0);
+}
+
+
+/* tabs */
+
+tab-item,
+.sticky-tab-spacer {
+  align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: stretch;
+  line-height: 1;
+  list-style: none;
+  margin-block: 0;
+  margin-inline: 0;
+  max-width: 100%;
+  /*overflow: hidden;*/ /* we should not apply overflow:hidden here to allow rendering box-shadow of contents */
+  pointer-events: none;
+  position: relative;
+}
+
+tab-item-substance {
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  line-height: 1;
+  margin-block: var(--tab-margin-block-start) var(--tab-margin-block-end);
+  margin-inline: var(--tab-margin-inline-start) var(--tab-margin-inline-end);
+  max-width: 100%;
+  min-height: 0;
+  /*overflow: hidden;*/ /* we should not apply overflow:hidden here to allow rendering box-shadow of contents */
+  opacity: 1;
+  pointer-events: auto;
+  position: relative;
+  z-index: var(--tab-base-z-index);
+
+  .ui {
+    align-items: stretch;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    max-width: calc(100% - var(--favicon-size));
+  }
+
+  .caption {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    line-height: 1;
+    margin-block: 0;
+    margin-inline: 0;
+    width: 100%;
+    max-height: var(--tab-size); /* Limit tab contents height for tabs customized as thinner. See also https://github.com/piroor/treestyletab/issues/3478 */
+    min-height: 0;
+    pointer-events: auto;
+    position: static;
+  }
+
+  :root:not(.rtl).left tab-item:not(.pinned) &,
+  :root.rtl.right tab-item:not(.pinned) & {
+    margin-inline-start: calc(var(--tab-margin-inline-start) + var(--tab-group-member-indent) + var(--tab-indent));
+  }
+
+  tab-item.removing &,
+  tab-item:not(.pinned).collapsed &,
+  tab-item.duplicating & {
+    opacity: 0;
+  }
+
+  tab-item.duplicating & {
+    transition: none;
+  }
+}
+
+
+/* auto-hidden scrollbar placeholder workaround */
+:root:not(.rtl).left.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover,
+:root:not(.rtl).left:not(.shift-tabs-for-scrollbar-only-on-hover),
+:root.rtl.right.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover,
+:root.rtl.right:not(.shift-tabs-for-scrollbar-only-on-hover) {
+  #tabbar.scrollbar-autohide
+    #normal-tabs-container.overflow
+    tab-item:not(.pinned)
+    tab-item-substance {
+    margin-inline-start: calc(var(--tab-margin-inline-start) + var(--tab-group-member-indent) + var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
+  }
+
+  #normal-tabs-container.overflow
+    .native-tab-group-line {
+    inset-inline-start: calc(var(--tab-group-member-indent) * 0.5 + var(--shift-tabs-for-scrollbar-distance));
+  }
+}
+
+:root:not(.rtl).right tab-item:not(.pinned),
+:root.rtl.left tab-item:not(.pinned) {
+  tab-item-substance {
+    margin-inline-end: calc(var(--tab-margin-inline-end) + var(--tab-group-member-indent) + var(--tab-indent));
+  }
+}
+
+/* auto-hidden scrollbar placeholder workaround */
+:root:not(.rtl).right.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover,
+:root:not(.rtl).right:not(.shift-tabs-for-scrollbar-only-on-hover),
+:root.rtl.left.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover,
+:root.rtl.left:not(.shift-tabs-for-scrollbar-only-on-hover) {
+  #tabbar.scrollbar-autohide
+    #normal-tabs-container.overflow
+    tab-item:not(.pinned)
+    tab-item-substance {
+    margin-inline-end: calc(var(--tab-margin-inline-end) + var(--tab-group-member-indent) + var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
+  }
+
+  #normal-tabs-container.overflow
+    .native-tab-group-line {
+    inset-inline-end: calc(var(--tab-group-member-indent) * 0.5 + var(--shift-tabs-for-scrollbar-distance));
+  }
+}
+
+tab-item {
+  vertical-align: middle;
+
+  * {
+    vertical-align: middle;
+  }
+
+  tab-favicon {
+    z-index: var(--tab-favicon-z-index);
+  }
+
+  &.hidden {
+    opacity: 0.6;
+  }
+
+  &.removing,
+  &:not(.pinned).collapsed,
+  &.duplicating {
+    pointer-events: none;
+    z-index: var(--invisible-z-index);
+  }
+  &.removing:not(.pinned.faviconized),
+  &:not(.pinned.faviconized).collapsed,
+  &.duplicating {
+    margin-block-start: calc(0px - var(--tab-current-size) - var(--tab-margin-block-end));
+  }
+  :root.left &.removing.pinned.faviconized {
+    margin-inline-start: calc(0px - var(--tab-current-size) - var(--tab-margin-inline-end));
+  }
+  :root.right &.removing.pinned.faviconized {
+    margin-inline-end: calc(0px - var(--tab-current-size) - var(--tab-margin-inline-start));
+  }
+
+  &:not(.pinned).collapsed.collapsed-completely {
+    visibility: hidden;
+  }
+
+  &.duplicating {
+    transition: none;
+  }
+}
+
+:root.animation:not(.minimized) {
+  tab-item.animation-ready,
+  tab-item.animation-ready tab-item-substance,
+  .after-tabs button,
+  .after-tabs [role="button"] {
+    transition: var(--tab-animation);
+  }
+
+  tab-item.animation-ready {
+    &:not(.expanding),
+    &:not(.expanding) tab-item-substance,
+    &.expanding.moving,
+    &.expanding.moving tab-item-substance {
+      transition: var(--tab-animation),
+                  var(--tab-indent-animation);
+    }
+  }
+}
+
+
+tab-item tab-twisty {
+  :root.left:not(.rtl) &,
+  :root.right.rtl & {
+    order: -1;
+  }
+  :root.right:not(.rtl) &,
+  :root.left.rtl & {
+    order: 10000;
+  }
+}
+tab-item tab-closebox {
+  :root.left:not(.rtl) &,
+  :root.right.rtl & {
+    order: 10000;
+  }
+  :root.right:not(.rtl) &,
+  :root.left.rtl & {
+    order: -1;
+  }
+}
+
+
+tab-item .highlighter,
+tab-item .burster,
+tab-item.faviconized.unread tab-favicon::before,
+tab-item.attention tab-favicon::before,
+tab-item .background,
+tab-item .native-tab-group-line {
+  bottom: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+}
+
+.extra-items-container {
+  tab-item &.indent,
+  tab-item &.behind,
+  tab-item &.front,
+  .newtab-button & {
+    bottom: 0;
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+  }
+
+  tab-item &.above,
+  tab-item &.below {
+    align-items: stretch;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    overflow: visible;
+    pointer-events: none;
+    position: relative;
+    z-index: var(--tab-extra-contents-beside-z-index);
+  }
+
+  tab-item &,
+  .newtab-button & {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    overflow: hidden;
+  }
+
+  tab-item &.indent {
+    width: var(--tab-indent);
+    z-index: var(--tab-indent-z-index);
+
+    :root:not(.rtl).left &,
+    :root.rtl.right & {
+      inset-inline-start: var(--tab-group-member-indent);
+    }
+    :root:not(.rtl).right &,
+    :root.rtl.left & {
+      inset-inline-end: var(--tab-group-member-indent);
+    }
+
+    .sticky-tabs-container & {
+      display: none;
+    }
+  }
+
+  /* auto-hidden scrollbar placeholder workaround */
+  #tabbar.scrollbar-autohide
+    #normal-tabs-container.overflow tab-item &.indent{
+    width: calc(var(--tab-group-member-indent) + var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
+  }
+  :root:not(.rtl).left tab-item &.indent,
+  :root.rtl.right tab-item &.indent {
+    inset-inline-end: auto;
+  }
+  :root:not(.rtl).right tab-item &.indent,
+  :root.rtl.left tab-item &.indent {
+    inset-inline-start: auto;
+  }
+
+  tab-item &.front {
+    inset-inline-start: var(--tab-label-start-offset);
+    inset-inline-end: var(--tab-label-end-offset);
+    justify-content: flex-end;
+    pointer-events: auto;
+    z-index: var(--tab-extra-contents-front-z-index);
+  }
+  tab-item:not(.faviconized).sound-playing &.front,
+  tab-item:not(.faviconized).muted &.front {
+    inset-inline-start: calc(var(--tab-label-start-offset) + var(--svg-small-icon-size));
+  }
+  tab-item.faviconized &.front {
+    inset-inline-start: var(--faviconized-tab-padding);
+    inset-inline-end: var(--faviconized-tab-padding);
+  }
+
+  tab-item &.behind {
+    z-index: var(--tab-extra-contents-behind-z-index);
+  }
+
+  .newtab-button & {
+    pointer-events: auto;
+    z-index: var(--tab-extra-contents-front-z-index);
+  }
+
+  :root.newtab-action-selectable
+    .newtab-button
+    &,
+  :root:not(.newtab-action-selectable).contextual-identity-selectable:not(.incognito)
+    .newtab-button
+    &,
+  :root.newtab-action-selectable.contextual-identity-selectable:not(.incognito)
+    .newtab-button
+    & {
+    inset-inline-end: var(--new-tab-button-anchor-size);
+  }
+}
+
+
+.burster {
+  tab-item & {
+    z-index: var(--tab-burster-z-index);
+  }
+
+  tab-item:not(.bursting) & {
+    display: none;
+  }
+}
+
+tab-item .highlighter {
+  z-index: var(--tab-highlighter-z-index);
+}
+
+
+tab-item.faviconized.unread tab-favicon::before,
+tab-item.attention tab-favicon::before {
+  bottom: auto;
+  content: '';
+  height: var(--tab-current-size);
+  inset-inline-start: var(--attention-marker-x-offset);
+  inset-inline-end: auto;
+  top: var(--attention-marker-y-offset);
+  width: var(--tab-current-size);
+}
+
+.background {
+  tab-item & {
+    overflow: hidden; /* to crop burster*/
+    z-index: var(--tab-background-z-index);
+
+    &.base {
+      display: none;
+
+      .sticky-tabs-container & {
+        display: inline-block;
+      }
+    }
+  }
+}
+
+
+/* pinned tabs */
+
+#pinned-tabs-container {
+  align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  max-height: var(--pinned-tabs-area-size);
+  overflow: hidden;
+  top: calc(var(--tabbar-top-area-size) + var(--visual-gap-offset));
+  transition: max-height var(--collapse-animation),
+              var(--visual-gap-animation);
+  z-index: var(--over-tabs-z-index);
+
+  :root.hover-on-top-edge:hover & {
+    top: 0 !important;
+    transition: max-height var(--collapse-animation),
+                var(--visual-gap-hover-animation);
+  }
+
+  &.overflow {
+    overflow-y: scroll;
+  }
+}
+
+#pinned-tabs-container-resizer {
+  background-color: transparent;
+  cursor: ns-resize;
+  height: var(--pinned-tabs-container-resizer-size);
+  top: calc(var(--tabbar-top-area-size) + var(--visual-gap-offset) + max(0px, var(--pinned-tabs-area-size) - var(--pinned-tabs-container-resizer-size)));
+  transition: background-color var(--color-animation);
+  z-index: var(--over-tabs-z-index);
+
+  &:hover {
+    background-color: Highlight;
+  }
+
+  :root:not(.have-pinned-tabs) & {
+    display: none;
+  }
+}
+
+.tabs.pinned {
+  align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  flex-grow: 0;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  padding-inline-end: max(1px, calc(100% - (var(--pinned-tab-width, 100%) * var(--pinned-tabs-max-column, 99999)) - (var(--pinned-tab-width, 100%) / 2)));
+  transition: padding-inline-end var(--collapse-animation);
+
+  :root.faviconize-pinned-tabs & {
+    align-items: flex-start;
+    flex-direction: row;
+  }
+
+  /* auto-hidden scrollbar placeholder workaround */
+  :root.left.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover
+    #tabbar.scrollbar-autohide
+    #pinned-tabs-container.overflow &,
+  :root.left:not(.shift-tabs-for-scrollbar-only-on-hover)
+    #tabbar.scrollbar-autohide
+    #pinned-tabs-container.overflow & {
+    padding-inline-start: var(--shift-tabs-for-scrollbar-distance);
+  }
+  :root.right.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover
+    #tabbar.scrollbar-autohide
+    #pinned-tabs-container.overflow &,
+  :root.right:not(.shift-tabs-for-scrollbar-only-on-hover)
+    #tabbar.scrollbar-autohide
+    #pinned-tabs-container.overflow & {
+    padding-inline-end: var(--shift-tabs-for-scrollbar-distance);
+  }
+
+  :root.hover-on-top-edge:hover & {
+    top: var(--pinned-position-top) !important;
+  }
+  :root.hover-on-top-edge:hover &,
+  :root.hover-on-top-edge.animation:not(.minimized):hover & {
+    transition: var(--visual-gap-hover-animation);
+  }
+
+  tab-closebox {
+    display: none;
+  }
+}
+
+
+tab-item.faviconized {
+  --faviconized-tab-padding: calc((var(--tab-current-size) - var(--favicon-size)) / 2);
+  --tab-current-size: var(--faviconized-tab-size);
+  height: var(--tab-current-size);
+  margin-block: 0;
+  margin-inline: 0;
+  max-height: var(--tab-current-size);
+  max-width: var(--tab-current-size);
+  width: var(--tab-current-size);
+
+  tab-item-substance {
+    border-block-start: none;
+    border-inline-start: none;
+    margin-block: 0;
+    margin-inline: 0;
+    padding-block: var(--faviconized-tab-padding);
+    padding-inline: var(--faviconized-tab-padding);
+  }
+
+  tab-twisty,
+  .extra-items-container.indent,
+  .extra-items-container.above,
+  .extra-items-container.below {
+    display: none;
+  }
+}
+
+
+/* Keep label in faviconized tabs for voice operations. See also: https://github.com/piroor/treestyletab/issues/2864 */
+tab-item.faviconized tab-label,
+tab-item.faviconized tab-label * {
+  bottom: 0;
+  display: flex;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  opacity: 0;
+  overflow: hidden;
+  position: absolute;
+  top: 0;
+}
+
+tab-item.faviconized.unread:not(.active) tab-item-substance:not(:hover) tab-favicon::before,
+tab-item.attention tab-item-substance:not(:hover) tab-favicon::before {
+  background-image: var(--attention-marker-gradient);
+}
+
+tab-item.faviconized.unread:not(.active) tab-item-substance:hover tab-favicon::before,
+tab-item.attention tab-item-substance:hover tab-favicon::before {
+  background-image: var(--attention-marker-gradient-hover);
+}
+
+tab-item.attention tab-label {
+  font-weight: bold;
+}
+
+tab-item.faviconized.active:not([data-drop-position]) tab-item-substance {
+  /* For high contrast mode */
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+}
+
+
+/* tab label */
+
+tab-item tab-label {
+  flex-grow: 1;
+  overflow: hidden;
+  position: relative;
+  white-space: nowrap;
+  z-index: var(--tab-base-z-index);
+
+  :root:not([data-label-overflow="fade"]) & {
+    text-overflow: ".."; /*ellipsis*/;
+  }
+
+  :root[data-label-overflow="fade"] &.overflow {
+    mask-image: linear-gradient(to left, transparent 0, black 2em);
+  }
+  :root[data-label-overflow="fade"] &.overflow.rtl {
+    direction: rtl;
+    mask-image: linear-gradient(to right, transparent 0, black 2em);
+  }
+}
+
+
+/* This is for backward compatibility about custom user style rules like https://github.com/piroor/treestyletab/issues/1363 */
+tab-item .label-content {
+  color: inherit;
+}
+
+.counter {
+  tab-item:not([data-child-ids]) &,
+  tab-item:not(.subtree-collapsed) & {
+    display: none;
+  }
+
+  &::before {
+    content: "(";
+  }
+
+  &::after {
+    content: ")";
+  }
+}
+
+
+/* tab-closebox */
+
+tab-closebox {
+  line-height: 0;
+  opacity: var(--button-opacity);
+  position: relative;
+  z-index: var(--tab-ui-z-index);
+
+  &:hover {
+    /* For high contrast mode */
+    outline: thin solid transparent;
+  }
+
+  &::after {
+    /*
+      There are some possible characters for this purpose:
+      https://en.wikipedia.org/wiki/X_mark
+      - X: upper case X
+        * Too narrow
+      - ร—: U+00D7 MULTIPLICATION SIGN (z notation Cartesian product)
+        * Too small on macOS
+      - โ•ณ: U+2573 BOX DRAWINGS LIGHT DIAGONAL CROSS
+        * Too large on Ubuntu
+      - โ˜“ : U+2613 SALTIRE (St Andrew's Cross)
+        * Narrow a little on Windows and macOS
+      - โœ•: U+2715 MULTIPLICATION X
+        * Too small on macOS
+      - โœ–: U+2716 HEAVY MULTIPLICATION X
+        * Too small on macOS
+      - โŒ : U+274C CROSS MARK
+        * Colored on macOS
+      - โŽ : U+274E NEGATIVE SQUARED CROSS MARK
+        * Colored on macOS
+        * Box around the mark is unnecessary
+      - โจ‰ : U+2A09 N-ARY TIMES OPERATOR
+      - โจฏ: U+2A2F VECTOR OR CROSS PRODUCT
+        * Too small on macOS
+      - ๐Ÿ—™: U+1F5D9 CANCELLATION X
+        * Unavailable on macOS
+      - ๐Ÿ—ด : U+1F5F4 BALLOT SCRIPT X
+        * Unavailable on macOS
+      - ๐Ÿžฉ: U+1F7A9 LIGHT SALTIRE
+        * Unavailable on macOS
+      So โจ‰ (U+2A09) looks good for me on Windows, macOS, and Linux (tested on Ubuntu).
+      But it is not guaranteed, so now we use SVG icon instead.
+    */
+    -moz-context-properties: fill;
+    background: url("./icons/close-16.svg") no-repeat center / 100%;
+    content: "";
+    display: inline-block;
+    fill: var(--tab-text);
+    height: var(--svg-small-icon-size);
+    width: var(--svg-small-icon-size);
+  }
+
+  :root.simulate-svg-context-fill &::after {
+    background: var(--tab-text);
+    mask: url("./icons/close-16.svg") no-repeat center / 100%;
+  }
+
+  tab-item:not(.collapsed) & {
+    &:hover {
+      opacity: var(--button-hover-opacity);
+    }
+
+    &:active {
+      opacity: var(--button-active-opacity);
+    }
+  }
+
+  /* hide closebox on non-active and non-hover tabs, like vertical tabs of Firefox itself */
+  tab-item:not(.active):not(#dummy-tab) tab-item-substance:not(:hover) & {
+    /* but only on regular mode. On the inverted mode, auto-hiding closeboxes produces jumping
+       of favicons and labels - it is too painful.
+       See also: https://github.com/piroor/treestyletab/issues/3736 */
+    :root.left:not(.rtl) &,
+    :root.right.rtl & {
+      display: none;
+    }
+  }
+}
+
+
+/* contextual identity (aka Container Tab) */
+
+.contextual-identity-marker {
+  --contextual-identity-marker-width: calc(var(--favicon-size) / 5.5);
+  position: absolute;
+  z-index: var(--tab-ui-z-index);
+
+  tab-item:not(.faviconized) & {
+    --contextual-identity-marker-margin: min(calc((var(--tab-current-size) - var(--favicon-size)) / 2), calc(var(--tab-current-size) * 0.15));
+    bottom: var(--contextual-identity-marker-margin);
+    inset-inline-end: 0;
+    top: var(--contextual-identity-marker-margin);
+    width: var(--contextual-identity-marker-width);
+  }
+
+  tab-item.faviconized & {
+    --contextual-identity-marker-margin: min(calc((var(--tab-current-size) - var(--favicon-size)) / 2), calc(var(--tab-current-size) * 0.33));
+    bottom: 0;
+    height: var(--contextual-identity-marker-width);
+    inset-inline-start: var(--contextual-identity-marker-margin);
+    inset-inline-end: var(--contextual-identity-marker-margin);
+  }
+}
+
+
+
+/* tab groups */
+
+tab-item[type="group"] {
+  tab-twisty,
+  tab-favicon,
+  tab-closebox,
+  .highlighter,
+  .contextual-identity-marker {
+    display: none;
+  }
+
+  .ui {
+    max-width: 100%;
+  }
+
+  tab-item-substance {
+    max-width: calc(max(var(--tab-label-width), calc(var(--favicon-size) / 2)) +
+                    0.25em /* margin-inline of tab-label */);
+  }
+
+  tab-label {
+    font-weight: bold;
+  }
+
+  &,
+  &:hover,
+  tab-item-substance,
+  tab-item-substance:hover {
+    --tab-surface: light-dark(var(--tab-group-color), var(--tab-group-color-invert)) !important;
+    --tab-border: light-dark(var(--tab-group-color), var(--tab-group-color-invert)) !important;
+    --tab-text: light-dark(var(--tab-group-color-pale), var(--tab-group-label-text-dark)) !important;
+  }
+
+  &.subtree-collapsed {
+    &,
+    &:hover,
+    tab-item-substance,
+    tab-item-substance:hover {
+      --tab-surface: light-dark(var(--tab-group-color-pale), var(--tab-group-color)) !important;
+      --tab-text: light-dark(var(--tab-group-color), var(--tab-group-color-pale)) !important;
+    }
+  }
+}
+
+tab-item[data-group-id]:not([data-group-id="-1"]) {
+  --space-xsmall: 0.267rem; /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#273 */
+  --space-xxsmall: calc(0.5 * var(--space-xsmall)); /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#272 */
+  --space-medium: calc(3 * var(--space-xsmall)); /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/toolkit/themes/shared/design-system/tokens-shared.css#275 */
+  --tab-group-member-indent: var(--space-medium); /* https://searchfox.org/mozilla-central/rev/7d73613454bfe426fdceb635b33cd3061a69def4/browser/themes/shared/tabbrowser/tabs.css#1016 */
+  --tab-group-line-color: light-dark(var(--tab-group-color), var(--tab-group-color-invert));
+
+  .native-tab-group-line {
+    background: var(--tab-group-line-color);
+    display: block;
+    max-width: 2px;
+    min-width: 2px;
+    opacity: 1;
+  }
+  &.collapsed .native-tab-group-line {
+    opacity: 0;
+  }
+  &.animation-ready .native-tab-group-line {
+    transition: var(--tab-indent-positioning-animation),
+                opacity var(--collapse-animation);
+  }
+}
+
+.native-tab-group-line {
+  :root:not(.rtl).left &,
+  :root.rtl.right & {
+    inset-inline-start: calc(var(--tab-group-member-indent) * 0.5);
+    inset-inline-end: auto;
+  }
+
+  :root:not(.rtl).right &,
+  :root.rtl.left & {
+    inset-inline-start: auto;
+    inset-inline-end: calc(var(--tab-group-member-indent) * 0.5);
+  }
+}
+
+tab-item[type="group-collapsed-members-counter"] {
+  tab-twisty,
+  tab-favicon,
+  tab-closebox,
+  .highlighter,
+  .contextual-identity-marker {
+    display: none;
+  }
+
+  &,
+  &:hover,
+  tab-item-substance,
+  tab-item-substance:hover {
+    --tab-surface: transparent !important;
+    --tab-border: transparent !important;
+    --tab-text: light-dark(var(--tab-group-color), var(--tab-group-color-pale)) !important;
+  }
+}
+
+
+/* non-tab items */
+
+#tabbar-top,
+#tabbar-bottom,
+#tabbar ~ .after-tabs {
+  height: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  overflow: visible;
+  position: absolute;
+  z-index: var(--over-tabs-z-index);
+}
+
+#tabbar-top {
+  top: 0;
+}
+
+#tabbar-bottom {
+  bottom: 0;
+  justify-content: flex-end;
+  top: auto;
+}
+
+.after-tabs {
+  #tabbar.overflow &,
+  #tabbar:not(.overflow) ~ & {
+    display: none;
+  }
+
+  #tabbar ~ & {
+    bottom: var(--tabbar-bottom-area-size);
+    justify-content: flex-end;
+  }
+
+  .newtab-action-selector-anchor,
+  .contextual-identities-selector-anchor {
+    background: none;
+    bottom: 0;
+    color: var(--tab-text);
+    display: none;
+    max-width: var(--new-tab-button-anchor-size);
+    opacity: 0;
+    overflow: hidden;
+    padding-block: calc((var(--new-tab-button-anchor-size) - var(--svg-small-icon-size)) / 2);
+    padding-inline: calc((var(--new-tab-button-anchor-size) - var(--svg-small-icon-size)) / 2);
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    transition: opacity var(--collapse-animation);
+    z-index: var(--over-buttons-z-index);
+  }
+}
+
+
+.newtab-button-box {
+  position: relative;
+}
+
+.newtab-button {
+  background: none transparent;
+  margin-block: 0;
+  margin-inline: 0;
+  text-align: center;
+
+  &::after {
+    -moz-context-properties: fill;
+    background: url("./icons/new-16.svg") no-repeat center / 100%;
+    content: "";
+    display: inline-block;
+    fill: var(--tab-text);
+    height: var(--svg-small-icon-size);
+    opacity: var(--button-opacity);
+    width: var(--svg-small-icon-size);
+  }
+  :root.simulate-svg-context-fill &::after {
+    background: var(--tab-text);
+    mask: url("./icons/new-16.svg") no-repeat center / 100%;
+  }
+
+  &:hover::before {
+    opacity: var(--button-hover-opacity);
+  }
+}
+
+
+:root.newtab-action-selectable
+  .after-tabs
+  .newtab-button-box:hover
+  .newtab-action-selector-anchor,
+.after-tabs
+  .newtab-action-selector-anchor.open,
+:root.contextual-identity-selectable:not(.incognito)
+  .after-tabs
+  .newtab-button-box:hover
+  .contextual-identities-selector-anchor:not([disabled="true"]),
+.after-tabs
+  .contextual-identities-selector-anchor.open {
+  pointer-events: auto;
+  opacity: 1;
+}
+
+:root.contextual-identity-selectable
+  .after-tabs
+  .newtab-action-selector-anchor,
+:root:not(.contextual-identity-selectable)
+  .after-tabs
+  .newtab-action-selector-anchor,
+:root.contextual-identity-selectable
+  .after-tabs
+  .contextual-identities-selector-anchor {
+  border-width: 0;
+  border-inline-end-width: 1px;
+  display: flex;
+  inset-inline-start: 0;
+}
+
+.newtab-action-selector-anchor::-moz-focus-inner,
+.contextual-identities-selector-anchor::-moz-focus-inner {
+  border: none;
+}
+
+#subpanel-toggler::before {
+  content: "โ–ผ";
+  font-size: 0.65em;
+  margin-block: 0.125em;
+  margin-inline: 0.125em;
+}
+
+.newtab-action-selector-anchor::after,
+.contextual-identities-selector-anchor::after,
+#subpanel-selector-anchor::after {
+  -moz-context-properties: fill;
+  background: url("./icons/ArrowheadDown.svg") no-repeat center / 60%;
+  content: "";
+  display: inline-block;
+  fill: var(--tab-text);
+  height: var(--svg-small-icon-size);
+  line-height: 1;
+  margin-block-start: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+  max-height: var(--favicon-size);
+  max-width: var(--favicon-size);
+  width: var(--svg-small-icon-size);
+}
+:root.simulate-svg-context-fill .newtab-action-selector-anchor::after,
+:root.simulate-svg-context-fill .contextual-identities-selector-anchor::after,
+:root.simulate-svg-context-fill #subpanel-selector-anchor::after {
+  background: var(--tab-text);
+  mask: url("./icons/ArrowheadDown.svg") no-repeat center / 60%;
+}
+
+
+#out-of-view-tab-notifier {
+  background: transparent repeat-x bottom;
+  background-image: linear-gradient(
+                      to top,
+                      var(--tab-highlighted-glow) 0,
+                      transparent 100%
+                    );
+  display: none;
+  margin-block-start: calc(0 - var(--tab-size));
+  min-height: var(--tab-size);
+  pointer-events: none;
+  position: relative;
+  opacity: 0;
+
+  &.notifying {
+    display: block;
+
+    :root:not(.animation) & {
+      opacity: 1;
+    }
+
+    :root.animation:not(.minimized) & {
+      animation: blink var(--out-of-view-tab-notify-duration) ease-in-out 1;
+    }
+  }
+}
+
+
+/* notification message */
+
+#notifications {
+  background: var(--tab-surface, var(--bg-color));
+  bottom: var(--subpanel-area-size);
+  color: var(--tab-text);
+  font-size: var(--svg-small-icon-size);
+  height: calc(var(--svg-small-icon-size) * 1.5);
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  line-height: 1;
+  opacity: 0;
+  padding-block: calc(var(--svg-small-icon-size) * 0.25);
+  padding-inline: 0;
+  pointer-events: none;
+  position: fixed;
+  transition: opacity var(--collapse-animation);
+  z-index: var(--notification-ui-z-index);
+
+  &.shown {
+    opacity: 0.85;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  &::before {
+    content: "";
+    display: inline-block;
+    white-space: nowrap;
+  }
+}
+
+#notification_tabs-highlighing-progress {
+  background-position: center bottom;
+  background-repeat: no-repeat;
+  background-size: 100% 0.2em;
+  font: message-box;
+  padding-block-end: 0.25em;
+  width: 100%;
+}
+
+
+/* sub panel */
+
+#subpanel-container {
+  top: auto;
+  height: var(--subpanel-area-size);
+}
+
+iframe#subpanel {
+  border: none;
+  height: var(--subpanel-content-size);
+  margin-block: 0;
+  margin-inline: 0;
+  max-height: none;
+  max-width: 100%;
+  min-height: 0;
+  min-width: 0;
+  padding-block: 0;
+  padding-inline: 0;
+  width: 100%;
+
+  #subpanel-container.collapsed & {
+    visibility: collapse;
+  }
+}
+
+#subpanel-header {
+  background: var(--tab-surface);
+  border-block-start: 1px solid var(--tab-border);
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  line-height: 1;
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 0.3em 0.2em;
+  padding-inline: 0.2em;
+
+  &.resizable {
+    cursor: ns-resize;
+  }
+
+  #subpanel-container:not(.collapsed) & {
+    border-block-end: 1px solid var(--tab-border);
+  }
+}
+
+#subpanel-header-main {
+  display: flex;
+  flex-grow: 1;
+  justify-content: flex-start;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+#subpanel-selector-anchor,
+#subpanel-toggler {
+  align-items: center;
+  background: none;
+  border: none;
+  color: var(--tab-text);
+  display: flex;
+  flex-direction: row;
+  font: -moz-button;
+  padding-block: 0;
+  padding-inline: 0.5em 0;
+}
+
+#subpanel-selector-anchor {
+  cursor: default;
+
+  > * {
+    pointer-events: none;
+  }
+}
+
+span.icon {
+  #subpanel-selector-anchor &,
+  #subpanel-selector & {
+    > img {
+      height: 1em;
+      max-height: 1em;
+      max-width: 1em;
+      width: 1em;
+    }
+  }
+
+  #subpanel-selector-anchor & > img:not([src]) {
+    display: none;
+  }
+
+  #subpanel-selector & > :not([src]) {
+    visibility: hidden;
+  }
+
+  #subpanel-selector & {
+    margin-inline-end: 0.25em;
+  }
+}
+
+#subpanel-toggler {
+  cursor: default;
+  padding-block: 0;
+  padding-inline: 0.5em;
+  max-width: 1.5em;
+
+  #subpanel-container.collapsed &::before {
+    content: "โ–ฒ";
+  }
+}
+
+
+/* fake context menu */
+
+#tabContextMenu:not([data-tab-id]) li.extra {
+  display: none !important;
+}
+
+
+/* bookmark dialog */
+
+.rich-confirm .bookmark-dialog {
+  input[type="text"],
+  button {
+    max-width: 100%;
+  }
+}
+
+
+/* blocking UI */
+
+#blocking-screen {
+  bottom: 0;
+  display: none;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  position: fixed;
+  top: 0;
+  z-index: var(--blocking-ui-z-index);
+
+  :root.blocking-throbber &,
+  :root.blocking-shade & {
+    background: rgba(0, 0, 0, 0.01);
+  }
+  :root.animation.blocking-throbber:not(.minimized) &,
+  :root.animation.blocking-shade:not(.minimized) & {
+    background: rgba(0, 0, 0, 0.35);
+  }
+
+  :root.blocking & {
+    display: block;
+  }
+
+  :root:not(.animation).blocking-throbber & *,
+  :root:not(.animation).blocking-shade & * {
+    visibility: hidden;
+  }
+}
+
+
+/*
+MenuUI.js workaround: prevent menu elements revealed by the custom user styles.
+See also: https://github.com/piroor/treestyletab/issues/2777
+*/
+body > ul[id$="selector"] {
+  opacity: 0;
+}
+
+
+/* Workaround for issues */
+
+/*
+  Workaround for https://github.com/piroor/treestyletab/issues/3413
+  ( https://bugzilla.mozilla.org/show_bug.cgi?id=1875100 )
+  The RAM usage will be unexpectedly get increased when the window is
+  minimized and it contains animated background image. To avoid it
+  we deactivate all dangerous (possibly from outside) background images
+  while the window is minimized.
+*/
+:root.minimized {
+  --browser-bg-images: none !important;
+  --theme-images-theme_frame: none !important;
+}
+
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/drag-and-drop.css b/waterfox/browser/components/sidebar/sidebar/styles/drag-and-drop.css
new file mode 100644
index 0000000000000..ea6cf25fb644e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/drag-and-drop.css
@@ -0,0 +1,166 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --tab-dropmarker-size: 0.15em;
+  --tab-dropmarker: -moz-fieldtext;
+}
+
+tab-item.dragging {
+  opacity: 0.5 !important;
+}
+
+tab-item[data-drop-position="self"] {
+  &:not([data-next-group-color]) tab-item-substance {
+    outline: var(--tab-dropmarker-size) solid var(--tab-dropmarker) !important;
+    outline-offset: calc(0px - var(--tab-dropmarker-size));
+    -moz-outline-radius: calc(var(--tab-dropmarker-size) * 2);
+  }
+
+  &[data-next-group-color="blue"] {
+    --next-group-color: var(--tab-group-color-blue);
+    --next-group-color-invert: var(--tab-group-color-blue-invert);
+    --next-group-color-pale: var(--tab-group-color-blue-pale);
+  }
+  &[data-next-group-color="purple"] {
+    --next-group-color: var(--tab-group-color-purple);
+    --next-group-color-invert: var(--tab-group-color-purple-invert);
+    --next-group-color-pale: var(--tab-group-color-purple-pale);
+  }
+  &[data-next-group-color="cyan"] {
+    --next-group-color: var(--tab-group-color-cyan);
+    --next-group-color-invert: var(--tab-group-color-cyan-invert);
+    --next-group-color-pale: var(--tab-group-color-cyan-pale);
+  }
+  &[data-next-group-color="orange"] {
+    --next-group-color: var(--tab-group-color-orange);
+    --next-group-color-invert: var(--tab-group-color-orange-invert);
+    --next-group-color-pale: var(--tab-group-color-orange-pale);
+  }
+  &[data-next-group-color="yellow"] {
+    --next-group-color: var(--tab-group-color-yellow);
+    --next-group-color-invert: var(--tab-group-color-yellow-invert);
+    --next-group-color-pale: var(--tab-group-color-yellow-pale);
+  }
+  &[data-next-group-color="pink"] {
+    --next-group-color: var(--tab-group-color-pink);
+    --next-group-color-invert: var(--tab-group-color-pink-invert);
+    --next-group-color-pale: var(--tab-group-color-pink-pale);
+  }
+  &[data-next-group-color="green"] {
+    --next-group-color: var(--tab-group-color-green);
+    --next-group-color-invert: var(--tab-group-color-green-invert);
+    --next-group-color-pale: var(--tab-group-color-green-pale);
+  }
+  &[data-next-group-color="gray"] {
+    --next-group-color: var(--tab-group-color-grey);
+    --next-group-color-invert: var(--tab-group-color-grey-invert);
+    --next-group-color-pale: var(--tab-group-color-grey-pale);
+  }
+  &[data-next-group-color="red"] {
+    --next-group-color: var(--tab-group-color-red);
+    --next-group-color-invert: var(--tab-group-color-red-invert);
+    --next-group-color-pale: var(--tab-group-color-red-pale);
+  }
+}
+
+tab-item[data-drop-position]:not([data-drop-position="self"]) tab-item-substance::before {
+  content: "";
+  display: block;
+  max-height: var(--tab-dropmarker-size);
+  min-height: var(--tab-dropmarker-size);
+  background: var(--tab-dropmarker) !important;
+  border-radius: var(--tab-dropmarker-size);
+  overflow: hidden;
+  position: absolute;
+  z-index: var(--tab-drop-marker-z-index);
+}
+tab-item[data-drop-position]:not([data-drop-position="self"]).faviconized tab-item-substance::before {
+  max-height: none;
+  max-width: var(--tab-dropmarker-size);
+  min-height: 0;
+  min-width: var(--tab-dropmarker-size);
+}
+
+tab-item:not(.faviconized)[data-drop-position="before"] tab-item-substance::before {
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  top: 0;
+}
+
+tab-item:not(.faviconized)[data-drop-position="after"] tab-item-substance::before {
+  bottom: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+}
+
+tab-item.faviconized[data-drop-position="before"] tab-item-substance::before {
+  bottom: 0;
+  inset-inline-start: 0;
+  top: 0;
+}
+
+tab-item.faviconized[data-drop-position="after"] tab-item-substance::before {
+  bottom: 0;
+  inset-inline-end: 0;
+  top: 0;
+}
+
+
+.item-drop-blocker {
+  display: none;
+  min-height: calc(var(--favicon-size) / 5);
+  min-width: calc(var(--favicon-size) / 5);
+  position: fixed;
+  z-index: var(--blocking-ui-z-index);
+
+  :root.debug & {
+    background: rgba(255, 0, 0, 0.5);
+  }
+
+  :root.tab-dragging &,
+  :root.link-dragging & {
+    display: block;
+  }
+
+  &#item-drop-blocker-top {
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+    top: 0;
+  }
+
+  &#item-drop-blocker-right {
+    bottom: 0;
+    inset-inline-end: 0;
+    top: 0;
+  }
+
+  &#item-drop-blocker-bottom {
+    bottom: 0;
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+  }
+
+  &#item-drop-blocker-left {
+    bottom: 0;
+    inset-inline-start: 0;
+    top: 0;
+  }
+}
+
+
+/* notification message */
+
+#notification_tab-drag-behavior-description {
+  white-space: nowrap;
+  animation: marquee linear 20s infinite;
+}
+
+@keyframes marquee {
+    0% { inset-inline-start: 100%; transform: translateX(0); }
+  100% { inset-inline-start: 0;    transform: translateX(-100%); }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/favicon.css b/waterfox/browser/components/sidebar/sidebar/styles/favicon.css
new file mode 100644
index 0000000000000..3f536ccfa07ce
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/favicon.css
@@ -0,0 +1,288 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+tab-favicon {
+  display: inline-block;
+  font-size: var(--favicon-size);
+  height: var(--favicon-size);
+  margin-block: 0;
+  margin-inline: 0;
+  max-height: var(--favicon-size);
+  max-width: var(--favicon-size);
+  min-height: var(--favicon-size);
+  min-width: var(--favicon-size);
+  padding-block: 0;
+  padding-inline: 0;
+  position: relative;
+  white-space: pre;
+  width: var(--favicon-size);
+  z-index: var(--tab-base-z-index);
+
+  --favicon-base-z-index:            20;
+  --favicon-preferred-image-z-index: 100;
+
+  tab-item &,
+  tab-item & * {
+    vertical-align: baseline;
+  }
+  tab-item & * {
+    position: relative;
+    z-index: var(--favicon-base-z-index);
+  }
+}
+
+.favicon-image {
+  max-height: var(--favicon-size);
+  max-width: var(--favicon-size);
+
+  /* https://searchfox.org/mozilla-central/rev/b7b6aa5e8ffc27bc70d4c129c95adc5921766b93/browser/themes/shared/tabbrowser/tabs.css#466-503 */
+  :root.fade-out-pending-tabs tab-item.pending &,
+  :root.fade-out-discarded-tabs tab-item:not(.pending).discarded & {
+    filter: grayscale(100%);
+    @media (prefers-color-scheme: dark) {
+      filter: grayscale(100%) invert();
+    }
+    opacity: 0.5;
+    transition-property: filter, opacity;
+    transition-duration: 1s;
+  }
+  :root.fade-out-pending-tabs tab-item:not(.pending) &,
+  :root.fade-out-discarded-tabs tab-item:not(.pending) & {
+    transition: none;
+  }
+}
+
+.favicon-builtin::before,
+.favicon-sharing-state::before,
+.favicon-sticky-state::after {
+  -moz-context-properties: fill;
+  background: url("/resources/icons/defaultFavicon.svg") no-repeat center / 100%;
+  content: "";
+  display: inline-block;
+  fill: var(--tab-text);
+  height: var(--svg-small-icon-size);
+  line-height: 1;
+  margin-block-start: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+  max-height: var(--favicon-size);
+  max-width: var(--favicon-size);
+  width: var(--svg-small-icon-size);
+}
+:root.simulate-svg-context-fill tab-item {
+  .favicon-builtin::before,
+  .favicon-sharing-state::before,
+  .favicon-sticky-state::after {
+    background: var(--tab-text);
+    mask: url("/resources/icons/defaultFavicon.svg") no-repeat center / 100%;
+  }
+}
+
+tab-item.group-tab .favicon-builtin::before {
+  background: url("/resources/icons/folder.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item.group-tab .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/folder.svg") no-repeat center / 100%;
+}
+
+
+tab-item[data-current-uri^="chrome:"] .favicon-builtin::before {
+  background: url("/resources/icons/defaultFavicon.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="chrome:"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/defaultFavicon.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:addons"] .favicon-builtin::before {
+  background: url("/resources/icons/extensions.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:addons"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/extensions.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:debugging"] .favicon-builtin::before {
+  background: url("/resources/icons/developer.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:debugging"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/developer.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:devtools-toolbox"] .favicon-builtin::before {
+  background: url("/resources/icons/window.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:devtools-toolbox"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/window.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:logins"] .favicon-builtin::before,
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:logins"] .favicon-builtin::before {
+  background: url("/resources/icons/lockwise.svg") no-repeat center / 100%;
+  mask: none;
+}
+
+tab-item[data-current-uri^="about:performance"] .favicon-builtin::before,
+tab-item[data-current-uri^="about:processes"] .favicon-builtin::before {
+  background: url("/resources/icons/performance.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:performance"] .favicon-builtin::before,
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:processes"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/performance.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:config"] .favicon-builtin::before,
+tab-item[data-current-uri^="about:preferences"] .favicon-builtin::before {
+  background: url("/resources/icons/settings.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:config"] .favicon-builtin::before,
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:preferences"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/settings.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:privatebrowsing"] .favicon-builtin::before,
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:privatebrowsing"] .favicon-builtin::before {
+  background: url("/resources/icons/privatebrowsing-favicon.svg") no-repeat center / 100%;
+  mask: none;
+}
+
+tab-item[data-current-uri^="about:profiling"] .favicon-builtin::before {
+  background: url("/resources/icons/profiler-stopwatch.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:profiling"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/profiler-stopwatch.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:protections"] .favicon-builtin::before {
+  background: url("/resources/icons/dashboard.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:protections"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/dashboard.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-uri^="about:robots"] .favicon-builtin::before,
+:root.simulate-svg-context-fill tab-item[data-current-uri^="about:robots"] .favicon-builtin::before {
+  background: url("/resources/icons/robot.ico") no-repeat center / 100%;
+  mask: none;
+}
+
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/blocked.svg"] .favicon-builtin::before {
+  background: url("/resources/icons/blocked.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-favicon-uri="chrome://global/skin/icons/blocked.svg"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/blocked.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/info.svg"] .favicon-builtin::before {
+  background: url("/resources/icons/info.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-favicon-uri="chrome://global/skin/icons/info.svg"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/info.svg") no-repeat center / 100%;
+}
+
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/warning.svg"] .favicon-builtin::before {
+  background: url("/resources/icons/warning.svg") no-repeat center / 100%;
+}
+:root.simulate-svg-context-fill tab-item[data-current-favicon-uri="chrome://global/skin/icons/warning.svg"] .favicon-builtin::before {
+  background: var(--tab-text);
+  mask: url("/resources/icons/warning.svg") no-repeat center / 100%;
+}
+
+
+tab-item.group-tab tab-favicon:not(.error) .favicon-image[src] {
+  bottom: 0;
+  inset-inline-end: 0;
+  max-height: 10px;
+  max-width: 10px;
+  position: absolute;
+  z-index: var(--favicon-preferred-image-z-index);
+}
+
+
+tab-favicon.error .favicon-image,
+.favicon-image:not([src]),
+tab-item[data-current-uri^="chrome:"] .favicon-image,
+tab-item[data-current-uri^="about:addons"] .favicon-image,
+tab-item[data-current-uri^="about:config"] .favicon-image,
+tab-item[data-current-uri^="about:debugging"] .favicon-image,
+tab-item[data-current-uri^="about:devtools-toolbox"] .favicon-image,
+tab-item[data-current-uri^="about:logins"] .favicon-image,
+tab-item[data-current-uri^="about:performance"] .favicon-image,
+tab-item[data-current-uri^="about:preferences"] .favicon-image,
+tab-item[data-current-uri^="about:privatebrowsing"] .favicon-image,
+tab-item[data-current-uri^="about:processes"] .favicon-image,
+tab-item[data-current-uri^="about:profiling"] .favicon-image,
+tab-item[data-current-uri^="about:protections"] .favicon-image,
+tab-item[data-current-uri^="about:robots"] .favicon-image,
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/blocked.svg"] .favicon-image,
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/info.svg"] .favicon-image,
+tab-item[data-current-favicon-uri="chrome://global/skin/icons/warning.svg"] .favicon-image,
+tab-item:not(.group-tab
+       ):not([data-current-uri^="chrome:"]
+       ):not([data-current-uri^="about:addons"]
+       ):not([data-current-uri^="about:config"]
+       ):not([data-current-uri^="about:debugging"]
+       ):not([data-current-uri^="about:logins"]
+       ):not([data-current-uri^="about:devtools-toolbox"]
+       ):not([data-current-uri^="about:performance"]
+       ):not([data-current-uri^="about:preferences"]
+       ):not([data-current-uri^="about:privatebrowsing"]
+       ):not([data-current-uri^="about:processes"]
+       ):not([data-current-uri^="about:profiling"]
+       ):not([data-current-uri^="about:protections"]
+       ):not([data-current-uri^="about:robots"]
+       ):not([data-current-favicon-uri="chrome://global/skin/icons/blocked.svg"]
+       ):not([data-current-favicon-uri="chrome://global/skin/icons/info.svg"]
+       ):not([data-current-favicon-uri="chrome://global/skin/icons/warning.svg"])
+  tab-favicon:not(.error) .favicon-image[src] ~ .favicon-builtin::before,
+tab-item.loading .favicon-image,
+tab-item.loading .favicon-builtin::before {
+  display: none !important;
+}
+
+
+/* Sticky status */
+
+.favicon-sticky-state {
+  --svg-small-icon-size: 12px;
+  inset-inline-start: calc(var(--svg-small-icon-size) - var(--favicon-size));
+  position: absolute;
+  top: calc(var(--svg-small-icon-size) - var(--favicon-size));
+
+  &::before {
+    background: var(--tab-text-inverted);
+    border-radius: 150%;
+    content: "";
+    display: inline-block;
+    height: var(--svg-small-icon-size);
+    inset-inline-start: -10%;
+    opacity: 0.75;
+    position: absolute;
+    top: 10%;
+    transform: scale(1.3, 1.3);
+    width: var(--svg-small-icon-size);
+  }
+
+  tab-item:not(.sticky) &,
+  tab-item.pinned & {
+    display: none;
+  }
+
+  tab-item.sticky &::after {
+    background-image: url("./icons/pin-12.svg")
+  }
+  :root.simulate-svg-context-fill tab-item.sticky &::after {
+    mask-image: url("./icons/pin-12.svg");
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/highlighter.css b/waterfox/browser/components/sidebar/sidebar/styles/highlighter.css
new file mode 100644
index 0000000000000..8c6535d846879
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/highlighter.css
@@ -0,0 +1,96 @@
+/*
+# 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/.
+*/
+
+:root {
+  --tab-highlighter: light-dark(
+    var(--browser-tab-highlighter, Highlight),
+    var(--browser-tab-highlighter, var(--dark-tab-line))
+  );
+  --tab-highlighter-inactive: var(--grey-10-a20);
+  --tab-highlighter-size: calc(var(--favicon-size) / 8);
+  --tab-highlighter-animation: 0.25s cubic-bezier(0.07, 0.95, 0, 1);
+}
+
+.highlighter::before,
+tab-item:not(.faviconized).subtree-collapsed.some-descendants-highlighted .highlighter::after,
+tab-item:not(.faviconized).subtree-collapsed.all-descendants-highlighted .highlighter::after {
+  content: "";
+  opacity: 0;
+  position: absolute;
+}
+
+:root.animation {
+  .highlighter::before,
+  .highlighter::after {
+    transition: opacity var(--tab-highlighter-animation),
+                transform var(--tab-highlighter-animation),
+                width var(--tab-highlighter-animation);
+  }
+}
+
+tab-item:not(.active):not(.bundled-active):not(.highlighted) tab-item-substance:hover,
+tab-item:not(.active):not(.bundled-active):not(.highlighted):not(.faviconized) tab-item-substance:hover {
+  .highlighter::before,
+  .highlighter::after {
+    background: var(--tab-highlighter-inactive);
+  }
+}
+tab-item.active .highlighter::before,
+tab-item.bundled-active .highlighter::before,
+tab-item.highlighted .highlighter::before,
+tab-item:not(.faviconized).bundled-active .highlighter::after,
+tab-item:not(.faviconized).highlighted .highlighter::after {
+  background: var(--tab-highlighter);
+}
+
+tab-item:not(.faviconized) {
+  .highlighter::before,
+  .highlighter::after {
+    bottom: 0;
+    inset-inline-start: 0;
+    top: 0;
+    transform: scaleY(0);
+    width: var(--tab-highlighter-size);
+  }
+}
+tab-item:not(.faviconized) tab-item-substance:hover,
+tab-item.active:not(.faviconized),
+tab-item.bundled-active:not(.faviconized),
+tab-item.highlighted:not(.faviconized) {
+ .highlighter::before,
+ .highlighter::after {
+    opacity: 1;
+    transform: scaleY(1);
+  }
+}
+
+tab-item.faviconized .highlighter::before {
+  height: var(--tab-highlighter-size);
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  top: 0;
+  transform: scaleX(0);
+}
+tab-item.faviconized tab-item-substance:hover .highlighter::before,
+tab-item.active.faviconized .highlighter::before,
+tab-item.bundled-active.faviconized .highlighter::before,
+tab-item.highlighted.faviconized .highlighter::before {
+  opacity: 1;
+  transform: scaleX(1);
+}
+
+
+tab-item.bundled-active:not(.highlighted) .highlighter::before {
+  opacity: 0.4;
+}
+
+tab-item[data-child-ids].subtree-collapsed.highlighted.some-descendants-highlighted .highlighter::after {
+  opacity: 0.5;
+}
+
+tab-item[data-child-ids].subtree-collapsed.highlighted.all-descendants-highlighted .highlighter::after {
+  opacity: 1;
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/ArrowheadDown.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/ArrowheadDown.svg
new file mode 100644
index 0000000000000..86d851dfc4073
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/ArrowheadDown.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M8 12a1 1 0 0 1-.707-.293l-5-5a1 1 0 0 1 1.414-1.414L8 9.586l4.293-4.293a1 1 0 0 1 1.414 1.414l-5 5A1 1 0 0 1 8 12z"></path></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-blocked.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-blocked.svg
new file mode 100644
index 0000000000000..abc2e97375c00
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-blocked.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" width="12" height="12">
+  <path d="M6 1.5c2.5 0 4.5 2 4.5 4.5s-2 4.5-4.5 4.5-4.5-2-4.5-4.5 2-4.5 4.5-4.5m0-1C3 .5.5 3 .5 6S3 11.5 6 11.5 11.5 9 11.5 6 9 .5 6 .5zM4.2 8V4c0-.4.4-.6.7-.4l3.5 2c.3.2.3.7 0 .9L5 8.4c-.3.2-.8 0-.8-.4z" fill="context-fill" fill-opacity="context-fill-opacity"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-mute.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-mute.svg
new file mode 100644
index 0000000000000..2dd48b5e8ad53
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16-mute.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="12" height="12" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="m2.791 3.581 1.347-2.294C4.654.408 6 .774 6 1.793v8.413c0 1.02-1.346 1.386-1.862.507L2.791 8.419c-.031-.053-.051-.111-.071-.169H1a1 1 0 0 1-1-1v-2.5a1 1 0 0 1 1-1h1.72a.93.93 0 0 1 .071-.169zm8.325-.081L9.5 5.116 7.884 3.5 7 4.384 8.616 6 7 7.616l.884.884L9.5 6.884 11.116 8.5 12 7.616 10.384 6 12 4.384l-.884-.884z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16.svg
new file mode 100644
index 0000000000000..872c38445d1ff
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/audio-16.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="12" height="12" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7.5 1.881V.595A5.499 5.499 0 0 1 12 6a5.499 5.499 0 0 1-4.5 5.405v-1.286C9.36 9.666 10.75 7.997 10.75 6c0-1.997-1.39-3.666-3.25-4.119zm-3.362-.594L2.791 3.581c-.031.053-.051.111-.071.169H1a1 1 0 0 0-1 1v2.5a1 1 0 0 0 1 1h1.72a.93.93 0 0 0 .071.169l1.347 2.294c.516.879 1.862.513 1.862-.507V1.793C6 .774 4.654.408 4.138 1.287z"/>
+  <path d="M7.5 3.193v5.613c1.161-.413 2-1.504 2-2.807s-.839-2.393-2-2.806z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/camera.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/camera.svg
new file mode 100644
index 0000000000000..f653b3bcc74ba
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/camera.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M13.986 2.824c-.491 0-.992.182-1.4.59L12 4a2 2 0 0 0-2-2L3 2a2 2 0 0 0-2 2l0 8a2 2 0 0 0 2 2l7 0a2 2 0 0 0 2-2l.586.586c.407.407.908.59 1.4.59 1.028 0 2.014-.798 2.014-2.004l0-6.344c0-1.205-.986-2.004-2.014-2.004zm.764 8.348c0 .52-.447.754-.764.754a.71.71 0 0 1-.516-.224l-.586-.586L11.268 9.5l-.518 0 0 2.65-.6.6-7.3 0-.6-.6 0-8.3.6-.6 7.3 0 .6.6 0 2.65.518 0 1.616-1.616.586-.586a.713.713 0 0 1 .516-.224c.317 0 .764.234.764.754l0 6.344z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/close-16.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/close-16.svg
new file mode 100644
index 0000000000000..771ddb4384a2a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/close-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M9.061 8l3.47-3.47a.75.75 0 0 0-1.061-1.06L8 6.939 4.53 3.47a.75.75 0 1 0-1.06 1.06L6.939 8 3.47 11.47a.75.75 0 1 0 1.06 1.06L8 9.061l3.47 3.47a.75.75 0 0 0 1.06-1.061z"></path>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/microphone.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/microphone.svg
new file mode 100644
index 0000000000000..183793d25c2a3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/microphone.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m7.875 11.617 0 2.133-1.75 0a.625.625 0 0 0 0 1.25l4.75 0a.625.625 0 0 0 0-1.25l-1.75 0 0-2.133.272-.237a4.468 4.468 0 0 0 3.541-3.651.625.625 0 0 0-.513-.72.62.62 0 0 0-.72.513c-.263 1.57-1.611 2.71-3.206 2.71s-2.943-1.14-3.206-2.71a.63.63 0 0 0-.72-.513.625.625 0 0 0-.513.72 4.468 4.468 0 0 0 3.525 3.648l.29.24z"/>
+  <path d="M8.5 2.25c.689 0 1.25.561 1.25 1.25l0 3c0 .689-.561 1.25-1.25 1.25S7.25 7.189 7.25 6.5l0-3c0-.689.561-1.25 1.25-1.25M8.5 1A2.5 2.5 0 0 0 6 3.5l0 3a2.5 2.5 0 1 0 5 0l0-3A2.5 2.5 0 0 0 8.5 1z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/moon.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/moon.svg
new file mode 100644
index 0000000000000..b4ae15efab61c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/moon.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<g fill="#FFF">
+  <circle cx="8" cy="8" r="8"/>
+  <circle stroke="#737373" cx="8" cy="8" r="6.5"/>
+</g>
+<g fill="#737373">
+  <path d="M10.972 5.08c-.201.075-.205-.209-.601-.174-.198.017-.275.074-.3.299-.023.226-.325.025-.65.025s-.201.275-.124.5c.076.225.325.2.523.115.201-.085.127-.39.302-.29.177.1.201.326.551.275.349-.05.399.05.569 0 .173-.05-.17-.25-.045-.375.124-.125-.024-.45-.225-.375z"/>
+  <path d="M9.271 2.504c-.125.35.149.375-.3.5-.45.125-.2.625-.566.375-.366-.25-.285.2-.309.35-.025.15-.5-.05-.997 0-.495.05-.055.6-.005.8.051.2-.275 0-.65-.226-.374-.223-.45.126-.775.302-.325.175-.775-.125-.7.125.075.25-.036.216-.25.675-.175.375.075.651.351.976.274.326.825.25 1.125 0 .3-.25.375-.475.45-.676.075-.2.075-.35.375-.425s.075.15.451.525c.374.375.6.075 1.075 0 .475-.076.125-.201.5-.4.375-.201 0-.3-.15-.4-.15-.099-.1-.375.1-.525s-.1-.3 0-.475c.1-.176.35.075.75.025.399-.05.725-.101.978.1.248.2.598.475.948.425s.1-.25-.176-.475c-.275-.225.051-.125 0-.55-.048-.425-.95-.175-1.049-.375-.074-.149-.177-.495-.321-.774a5.553 5.553 0 0 0-.652-.204.918.918 0 0 0-.203.327z"/>
+  <path d="M7.864 12.133c.068 0 .181-.276.388-.226.206.053.369.226.152.5-.217.276.716.325 1.042.252.326-.074.425-.302 0-.676-.426-.376-.451.075-.675-.1-.226-.178.1-.276-.12-.45-.221-.177-.356-.101-.632.023-.276.127-.224.175-.499 0s-.049-.475.175-.475c.225 0 .25.226.557.216.306-.01.068-.19.152-.416.083-.226.316.076.441.275.125.201.275.174.575 0 .301-.175.476-.101.83-.101s.072-.3 0-.551c-.072-.249-.155-.399 0-.599.153-.201-.028-.45-.28-.426-.248.028-.348.379-.6-.072-.25-.45-.45-.175-.524.125-.074.299-.326-.5-.441-.15-.116.351-.309.025-.541.176-.231.148-.594.175-.344 0 .25-.177.125-.551-.075-.626-.2-.075-.024-.226.174-.35.201-.125.351-.601 0-.675-.35-.076-.45.375-.542.7-.091.325-.332-.151-.451-.351-.118-.2.119-.375 0-.425-.118-.049-.056-.174.194-.25.25-.075.2-.399.258-.45.058-.05.317-.45 0-.65s-.058.325-.283.217c-.225-.109-.596.232-.775.558-.114.207-.1.225-.35.05-.25-.176-.3.075-.701.475-.4.399-.375-.125-.125-.425.251-.301.25-.65-.35-.775s-1.301.35-1.325.625c-.025.274-.15.225-.351.451-.2.225.3.675.076.7-.226.025-.15.375-.125.65.025.275.3.375.45.475.15.1-.2.274-.049.45.149.177.299.274.249.625-.05.352-.649-.699-.95-1.3-.3-.601-.2-1.051-.15-1.526.028-.267-.132-.65-.245-.457A5.925 5.925 0 0 0 2.01 8a6 6 0 0 0 2.87 5.118c.202.039.22-.131.514-.086.325.051.275.051.426.347.15.298.524.306.7 0 .175-.304.225-.121.558-.021.333.102.468-.15.317-.469-.15-.32.225-.055.469-.005.244.049-.094-.35-.194-.601-.1-.252.125-.15.194-.15zm-.769-9.605c.022.177 0 .15.176.351.175.2.675.05 1.134 0 .458-.05.166-.226 0-.625A.584.584 0 0 0 8.202 2c-.061-.002-.121-.009-.183-.009-.311 0-.613.031-.911.077-.03.126-.035.283-.013.46zM2.668 6.056c-.113.253-.075.275 0 .542s.275-.417.633-.542c.358-.126.517-.475.443-.993-.076-.517.375-.859.1-.984-.276-.125-.853 1.25-1.176 1.977z"/>
+</g>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/new-16.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/new-16.svg
new file mode 100644
index 0000000000000..7a17e41c930ad
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/new-16.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M14 7H9V2a1 1 0 0 0-2 0v5H2a1 1 0 1 0 0 2h5v5a1 1 0 0 0 2 0V9h5a1 1 0 0 0 0-2z"></path>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-child.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-child.svg
new file mode 100644
index 0000000000000..ea5cd1675f9c5
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-child.svg
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px"
+	 y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M12.001,2.037c0.553,0,1,0.449,1,1v3.001c0,0.553-0.447,1-1,1H3c-0.551,0-1-0.447-1-1V3.037c0-0.551,0.449-1,1-1H12.001
+	 M12.001,1.038H3c-1.1,0-2,0.9-2,2v3.001c0,1.1,0.9,2,2,2h9c1.101,0,2-0.9,2-2V3.038C14.001,1.937,13.1,1.038,12.001,1.038
+	L12.001,1.038z"/>
+<path d="M12,7H6.001c-1.1,0-2,0.75-2,1.667v3.664c0,0.916,0.9,1.668,2,1.668H12c1.101,0,2-0.752,2-1.668V8.668
+	C14,7.751,13.099,7,12,7z M11,10.999L9.75,11v1.25c0,0.275-0.224,0.5-0.5,0.5c-0.275,0-0.5-0.225-0.5-0.5V11l-1.249-0.001
+	c-0.275,0-0.5-0.224-0.5-0.5s0.225-0.5,0.5-0.5H8.75V8.752c0-0.276,0.225-0.501,0.5-0.501c0.276,0,0.5,0.225,0.5,0.501v1.247H11
+	c0.276,0,0.5,0.224,0.5,0.5S11.276,10.999,11,10.999z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-independent.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-independent.svg
new file mode 100644
index 0000000000000..693e846306a0f
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-independent.svg
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px"
+	 y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M12,4.001H3c-1.1,0-2,0.75-2,1.667v3.665C1,10.249,1.9,11,3,11h9c1.101,0,2-0.751,2-1.667V5.668
+	C14,4.751,13.099,4.001,12,4.001z M8.999,8l-1.25,0.001V9.25c0,0.276-0.224,0.5-0.5,0.5c-0.275,0-0.5-0.224-0.5-0.5V8.001L5.5,8
+	C5.225,8,5,7.775,5,7.5S5.225,7,5.5,7h1.249V5.752c0-0.275,0.225-0.5,0.5-0.5c0.276,0,0.5,0.225,0.5,0.5V7h1.25
+	c0.276,0,0.5,0.224,0.5,0.5S9.275,8,8.999,8z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-next-sibling.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-next-sibling.svg
new file mode 100644
index 0000000000000..8d9114a04ba07
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-next-sibling.svg
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px"
+	 y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M12.001,2.037c0.553,0,1,0.449,1,1v3.001c0,0.553-0.447,1-1,1H3c-0.551,0-1-0.447-1-1V3.037c0-0.551,0.449-1,1-1H12.001
+	 M12.001,1.038H3c-1.1,0-2,0.9-2,2v3.001c0,1.1,0.9,2,2,2h9c1.101,0,2-0.9,2-2V3.038C14.001,1.937,13.1,1.038,12.001,1.038
+	L12.001,1.038z"/>
+<path d="M12,7H3c-1.1,0-2,0.75-2,1.667v3.664C1,13.248,1.9,14,3,14h9c1.101,0,2-0.752,2-1.668V8.668C14,7.751,13.099,7,12,7z
+	 M8.999,10.999L7.749,11v1.25c0,0.275-0.224,0.5-0.5,0.5c-0.275,0-0.5-0.225-0.5-0.5V11L5.5,10.999c-0.275,0-0.5-0.224-0.5-0.5
+	s0.225-0.5,0.5-0.5h1.249V8.752c0-0.276,0.225-0.501,0.5-0.501c0.276,0,0.5,0.225,0.5,0.501v1.247h1.25c0.276,0,0.5,0.224,0.5,0.5
+	S9.275,10.999,8.999,10.999z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-sibling.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-sibling.svg
new file mode 100644
index 0000000000000..e0fdf1762bbe2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/newtab-sibling.svg
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px"
+	 y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M12.001,0.999c0.553,0,1,0.449,1,1V5c0,0.553-0.447,1-1,1H3C2.449,6,2,5.553,2,5V1.999c0-0.551,0.449-1,1-1H12.001
+	 M12.001,0H3C1.9,0,1,0.9,1,2v3.001c0,1.1,0.9,2,2,2h9c1.101,0,2-0.9,2-2V2C14.001,0.899,13.1,0,12.001,0L12.001,0z"/>
+<path d="M12,9H3c-1.1,0-2,0.751-2,1.668v3.664C1,15.248,1.9,16,3,16h9c1.101,0,2-0.752,2-1.668v-3.664C14,9.751,13.099,9,12,9z
+	 M8.999,12.999L7.749,13v1.25c0,0.275-0.224,0.5-0.5,0.5c-0.275,0-0.5-0.225-0.5-0.5V13L5.5,12.999c-0.275,0-0.5-0.224-0.5-0.5
+	s0.225-0.5,0.5-0.5h1.249v-1.247c0-0.276,0.225-0.501,0.5-0.501c0.276,0,0.5,0.225,0.5,0.501v1.247h1.25c0.276,0,0.5,0.224,0.5,0.5
+	S9.275,12.999,8.999,12.999z"/>
+</svg>
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/pin-12.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/pin-12.svg
new file mode 100644
index 0000000000000..10eb79188b269
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/pin-12.svg
@@ -0,0 +1,4 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><path fill="context-fill" d="M10.53 9.47L8.25 7.19 9.8 5.643a.694.694 0 0 0 0-.98 3.04 3.04 0 0 0-2.161-.894h-.122A1.673 1.673 0 0 1 5.846 2.1v-.408A.693.693 0 0 0 4.664 1.2L1.2 4.664a.693.693 0 0 0 .49 1.182h.41a1.672 1.672 0 0 1 1.669 1.671v.117a2.8 2.8 0 0 0 .925 2.192.693.693 0 0 0 .949-.026L7.19 8.251l2.28 2.28a.75.75 0 0 0 1.06-1.061z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/icons/screen.svg b/waterfox/browser/components/sidebar/sidebar/styles/icons/screen.svg
new file mode 100644
index 0000000000000..0a6831c3532dd
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/icons/screen.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m1 4 0 8.25a2 2 0 0 0 2 2l11 0a2 2 0 0 0 2-2L16 4a2 2 0 0 0-2-2L3 2a2 2 0 0 0-2 2zm13.75-.15 0 8.55-.6.6-11.3 0-.6-.6 0-8.55.6-.6 11.3 0 .6.6z"/>
+  <path d="M9.25 11.375a.625.625 0 0 1-1.25 0L7.999 8 5.943 8a.5.5 0 0 1-.354-.854l2.823-2.823.424 0 2.823 2.823a.5.5 0 0 1-.352.854L9.25 8l0 3.375z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/photon/base.css b/waterfox/browser/components/sidebar/sidebar/styles/photon/base.css
new file mode 100644
index 0000000000000..646f0314eb49b
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/photon/base.css
@@ -0,0 +1,215 @@
+/*
+# 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/.
+*/
+
+:root {
+  --tab-vertical-padding: 0.3em; /* We should define this as a variable to reuse calculation of extra tab contents size. */
+}
+
+tab-item-substance,
+.after-tabs button,
+.after-tabs [role="button"] {
+  border: 1px solid var(--tab-border);
+  border-width: 1px 0;
+  padding-block: var(--tab-vertical-padding);
+  padding-inline: 0.25em;
+}
+tab-item,
+.after-tabs button,
+.after-tabs [role="button"] {
+  margin-block-end: -1px;
+}
+
+tab-item[type="group"] tab-item-substance {
+  max-width: calc(max(var(--tab-label-width), calc(var(--favicon-size) / 2)) +
+                  0.25em /* margin-inline of tab-label */ +
+                  0.35em + 0.25em /* padding-inline */);
+}
+
+tab-item[data-next-group-color] {
+  tab-item-substance {
+    --tab-surface: light-dark(var(--next-group-color-pale), var(--next-group-color)) !important;
+    --tab-border: light-dark(var(--next-group-color), var(--next-group-color-invert)) !important;
+    border: 1px solid var(--tab-border);
+  }
+}
+
+tab-item.pinned tab-item-substance {
+  border-block-width: 0 1px;
+  border-inline-width: 0 1px;
+}
+
+
+.after-tabs button,
+.after-tabs [role="button"] {
+  padding-block: 0em;
+  padding-inline: 0em;
+}
+
+#tabbar + .after-tabs button,
+#tabbar + .after-tabs [role="button"] {
+  /* IMPORTANT NOTE!!
+     We need to keep sizes of the .after-tabs boxes inside/outside #tabbar exact same,
+     to prevent flashing of the scrollbar from repeatedly switched overflow/underflow
+     state. See also: https://github.com/piroor/treestyletab/issues/3589 */
+  /* border-block-end: none; */
+  border-block-end-color: transparent;
+}
+
+
+:root.left tab-item:not(.pinned) tab-item-substance,
+:root.left .after-tabs button:not([data-menu-ui]),
+:root.left .after-tabs [role="button"]:not([data-menu-ui]) {
+  padding-inline-end: 0.35em;
+}
+:root.left tab-item:not(.pinned)[data-parent-id] tab-item-substance {
+  border-inline-start-width: 1px;
+}
+
+:root.right tab-item:not(.pinned) tab-item-substance,
+:root.right .after-tabs button:not([data-menu-ui]),
+:root.right .after-tabs [role="button"]:not([data-menu-ui]) {
+  padding-inline-start: 0.35em;
+}
+:root.right tab-item:not(.pinned)[data-parent-id] tab-item-substance {
+  border-inline-end-width: 1px;
+}
+
+#tabbar tab-item.pinned + tab-item:not(.pinned) tab-item-substance,
+#tabbar tab-item:not(.pinned):first-of-type tab-item-substance {
+  border-block-start: none;
+}
+
+:root.have-pinned-tabs #pinned-tabs-container {
+  border-block-end: 1px solid var(--tab-border);
+}
+
+
+/* overflow-start-indicator and overflow-end-indicator
+   ref: https://searchfox.org/mozilla-central/rev/1ef947827852125825dda93d8f4f83d1f55739eb/browser/themes/shared/tabs.css#527-563 */
+.overflow-indicator {
+  height: 0.6em;
+}
+.overflow-indicator.start {
+  background-position: 0 -0.3em;
+}
+.overflow-indicator.end {
+  background-position: 0 0.3em;
+  border-block-end: 1px solid var(--tab-border);
+}
+:root.left .overflow-indicator.start,
+:root.left .overflow-indicator.end {
+  background-image: radial-gradient(ellipse at right,
+                                    rgba(0,0,0,0.2) 0%,
+                                    rgba(0,0,0,0.2) 7.6%,
+                                    rgba(0,0,0,0) 87.5%);
+}
+:root.right .overflow-indicator.start,
+:root.right .overflow-indicator.end {
+  background-image: radial-gradient(ellipse at left,
+                                    rgba(0,0,0,0.2) 0%,
+                                    rgba(0,0,0,0.2) 7.6%,
+                                    rgba(0,0,0,0) 87.5%);
+}
+
+
+tab-item tab-label {
+  margin-inline-start: 0.25em;
+  padding-block: 0 0.25em;
+  padding-inline: 0;
+}
+
+tab-item tab-favicon {
+  margin-block: 0.25em;
+}
+
+tab-item {
+  --in-tab-button-offset: calc((var(--tab-caption-size) - 1em) / 2);
+  --in-tab-button-negative-offset: calc((1em - var(--tab-caption-size)) / 2);
+
+  /* expand closebox to fill full height of tab */
+  tab-closebox,
+  &:not(.faviconized) tab-sound-button {
+    margin-block: var(--in-tab-button-negative-offset);
+    padding-block: var(--in-tab-button-offset);
+    padding-inline: 0.25em;
+
+    &::before {
+      border-radius: 10%;
+      content: "";
+      display: inline-block;
+      height: calc(var(--svg-small-icon-size) + 0.2em);
+      margin-block-start: -0.1em;
+      margin-inline-start: -0.1em;
+      width: calc(var(--svg-small-icon-size) + 0.2em);
+      position: absolute;
+    }
+
+    &:hover::before {
+      background: var(--tab-text);
+      box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.3);
+      opacity: 0.1;
+    }
+
+    &:active::before {
+      opacity: 0.2;
+    }
+
+    &::after {
+      position: relative;
+    }
+  }
+}
+
+
+
+tab-item.active tab-closebox:hover::before {
+  background: var(--tab-text);
+}
+
+/* This is required to avoid needless padding in the scrollbox produced by the box-shadow.
+   See also: https://github.com/piroor/treestyletab/issues/3364 */
+#normal-tabs-container.overflow tab-item:not(.pinned).last-visible,
+#normal-tabs-container.overflow tab-item:not(.pinned).last-visible ~ tab-item {
+  overflow: hidden;
+}
+
+
+
+.sticky-tabs-container tab-item .background:not(.base) {
+  box-shadow: 0 0 0.4em rgba(0, 0, 0, 0.2);
+}
+
+
+/* multiselection of tabs */
+
+:root {
+  --multiselected-color: Highlight;
+}
+
+:root.mutiple-highlighted tab-item.highlighted tab-item-substance::after {
+  background: var(--multiselected-color);
+  bottom: 0;
+  content: " ";
+  display: block;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  opacity: var(--multiselected-color-opacity);
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+  z-index: 10;
+}
+
+
+/* show more-highlighter like as tree */
+
+tab-item:not(.faviconized) .highlighter::after {
+   top: calc(var(--tab-highlighter-size) * 2);
+}
+
+tab-item[data-child-ids].subtree-collapsed.highlighted.some-descendants-highlighted .highlighter::after {
+  width: calc(var(--tab-highlighter-size) * 2);
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/photon/highcontrast.css b/waterfox/browser/components/sidebar/sidebar/styles/photon/highcontrast.css
new file mode 100644
index 0000000000000..b18990f64cf1c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/photon/highcontrast.css
@@ -0,0 +1,128 @@
+/*
+# 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/.
+*/
+
+@import url("base.css");
+
+:root {
+  --tab-like-surface: ButtonFace;
+  --tab-surface-regular: var(--tab-like-surface);
+  --tab-surface-active: Highlight;
+  --tab-surface-hover: var(--tab-like-surface);
+  --tab-text-regular: ButtonText;
+  --tab-text-active: HighlightText;
+  --tab-text-hover: ButtonText;
+  --tab-text-inverted: AccentColorText;
+  --tab-border: GrayText; /* it should be between ButtonText and ButtonFace. */
+  --tab-dropmarker: ButtonText;
+}
+
+
+/* Tab Bar */
+
+:root,
+#background {
+  background: Canvas;
+}
+
+#background::after {
+  background: GrayText;
+  opacity: 0.5;
+
+  bottom: 0;
+  content: "";
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  margin-block: 0;
+  margin-inline: 0;
+  overflow: hidden;
+  padding-block: 0;
+  padding-inline: 0;
+  position: fixed;
+  top: 0;
+  z-index: 20;
+}
+
+
+/* Tab */
+
+tab-item-substance,
+.after-tabs button,
+.after-tabs [role="button"] {
+  background: var(--tab-surface);
+  color: var(--tab-text);
+}
+
+tab-item * {
+  color: var(--tab-text);
+}
+
+tab-item:not(.collapsed) tab-item-substance:hover,
+.after-tabs button:hover,
+.after-tabs [role="button"]:hover,
+#subpanel-selector-anchor:hover {
+  opacity: 0.7;
+  /*mix-blend-mode: multiply;*/
+}
+
+tab-item.active {
+  --throbber-color: HighlightText;
+  --tab-border: Highlight;
+  --tab-surface: var(--tab-surface-active);
+  --tab-text: var(--tab-text-active);
+  --tab-text-inverted: var(--tab-surface-active);
+}
+
+tab-item:not(.active) {
+  --throbber-color: Highlight;
+}
+
+.newtab-button-box {
+  border-color: var(--tab-border);
+  border-style: solid;
+  border-width: 1px;
+}
+
+
+/* tab-closebox */
+
+tab-item tab-closebox:hover {
+  --tab-text: HighlightText;
+  opacity: 0.75;
+}
+tab-item tab-closebox:hover::before {
+  --tab-text: Highlight;
+  border-radius: 0;
+  height: calc(var(--svg-small-icon-size) + 0.3em);
+  margin-block-start: -0.15em;
+  margin-inline-start: -0.15em;
+  opacity: 1;
+  width: calc(var(--svg-small-icon-size) + 0.3em);
+}
+
+tab-item.active tab-closebox:hover {
+  --tab-text: Highlight;
+  opacity: 0.5;
+}
+tab-item.active tab-closebox:hover::before {
+  --tab-text: HighlightText;
+}
+
+
+/* hide regular active tab marker */
+tab-item:not(.bundled-active) .highlighter::before {
+  display: none !important;
+}
+
+tab-item.bundled-active:not(.highlighted) .highlighter::before {
+  opacity: 1;
+}
+
+
+tab-item.active tab-label {
+  text-decoration: underline;
+  text-decoration-color: transparent;
+  text-underline-offset: 0.25em;
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/photon/photon.css b/waterfox/browser/components/sidebar/sidebar/styles/photon/photon.css
new file mode 100644
index 0000000000000..003106cbd57f2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/photon/photon.css
@@ -0,0 +1,191 @@
+/*
+# 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/.
+*/
+
+@import url("/resources/ui-color.css");
+@import url("base.css");
+
+
+/* Coloring */
+
+:root {
+  --toolbar-non-lwt-bgcolor: var(--in-content-page-background);
+  --toolbar-non-lwt-textcolor: var(--in-content-page-color);
+
+  --tab-like-surface: var(--browser-bg-base, var(--toolbar-non-lwt-bgcolor));
+  --tab-surface-regular: var(--browser-bg-for-header-image, var(--tab-like-surface));
+  --tab-text-regular: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+  --tab-text-inverted: var(--browser-bg-more-lighter, var(--toolbar-non-lwt-bgcolor));
+  --tab-text-active: var(--tab-text);
+  --tab-text-active-inverted: var(--toolbar-non-lwt-bgcolor);
+  --tab-border: var(--browser-border, var(--browser-bg-more-darker, var(--in-content-box-border-color-mixed)));
+  --tab-surface-hover: var(--browser-bg-hover-for-header-image, var(--browser-bg-more-lighter, var(--in-content-box-background-hover)));
+  --tab-surface-active: var(--browser-bg-active-for-header-image, var(--face-highlight-more-lighter, var(--in-content-button-background-mixed)));
+  --tab-surface-active-hover: var(--browser-bg-active-for-header-image, var(--face-highlight-more-more-lighter, var(--in-content-button-background-active-mixed)));
+  --tab-dropmarker: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+  --throbber-color: var(--browser-loading-indicator, var(--tab-text));
+  --throbber-color-active: var(--browser-loading-indicator, var(--tab-text-active));
+
+  --tabbar-bg: light-dark(
+    var(--browser-bg-darker, darkgray),
+    var(--browser-bg-darker, var(--dark-frame))
+  );
+}
+
+:root,
+body,
+#background {
+  background-color: var(--browser-background, var(--tabbar-bg));
+  background-image: var(--browser-bg-images, none);
+  background-position: var(--browser-bg-position, left);
+  background-size: var(--browser-bg-size, auto);
+  background-repeat: var(--browser-bg-repeat, none);
+}
+:root.right,
+:root.right #background {
+  background-position: right;
+}
+
+@media not (prefers-color-scheme: dark) {
+  :root[color-scheme="system-color"] {
+    --tab-surface-regular: var(--browser-bg-for-header-image, var(--browser-bg-base, -moz-dialog));
+    --tab-text-regular: var(--browser-fg, -moz-dialogtext);
+    --tab-text-inverted: var(--browser-bg-more-lighter, -moz-dialog);
+    --tab-text-active: var(--tab-text-regular);
+    --tab-text-active-inverted: Highlight;
+    --tab-border: var(--browser-border, var(--browser-bg-more-darker, var(--ThreeDShadow)));
+    --tab-surface-hover: var(--browser-bg-hover-for-header-image, var(--browser-bg-more-lighter, var(--ThreeDHighlight)));
+    --tab-surface-active: var(--browser-bg-active-for-header-image, var(--face-highlight-more-lighter, Highlight));
+    --tab-surface-active-hover: var(--browser-bg-active-for-header-image, var(--face-highlight-more-more-lighter, Highlight));
+    --tab-dropmarker: var(--browser-fg, -moz-dialogtext);
+    --tabbar-bg: var(--browser-bg-darker, var(--ThreeDShadow));
+  }
+  :root[color-scheme="system-color"] #background::after {
+    background: var(--browser-bg-darker,var(--AppWorkspace));
+    opacity: 0.15;
+
+    bottom: 0;
+    content: "";
+    inset-inline-start: 0;
+    inset-inline-end: 0;
+    margin-block: 0;
+    margin-inline: 0;
+    overflow: hidden;
+    padding-block: 0;
+    padding-inline: 0;
+    position: fixed;
+    top: 0;
+    z-index: 20;
+  }
+}
+
+#tabbar:not(.scrollbar-autohide) #pinned-tabs-container,
+#tabbar:not(.scrollbar-autohide) #normal-tabs-container {
+  scrollbar-color: var(--browser-toolbar_text-darker, var(--theme-colors-toolbar_bottom_separator, var(--in-content-button-background-hover-mixed)))
+                   var(--theme-colors-toolbar, var(--in-content-box-background));
+}
+
+tab-item,
+.after-tabs button,
+.after-tabs [role="button"],
+#subpanel-container,
+#dummy-tab-color-box {
+  --tab-surface: var(--tab-surface-regular);
+  --tab-text: var(--tab-text-regular);
+  --tab-text-shadow: var(--browser-textshadow-for-header-image, none);
+}
+tab-item-substance,
+.after-tabs button,
+.after-tabs [role="button"],
+#subpanel-container,
+#dummy-tab-color-box {
+  background: var(--tab-surface);
+  color: var(--tab-text);
+  text-shadow: var(--tab-text-shadow);
+}
+
+tab-item * {
+  color: var(--tab-text);
+}
+
+tab-item:not(.active) tab-item-substance:hover,
+.after-tabs button:hover,
+.after-tabs [role="button"]:hover {
+  --tab-surface: var(--tab-surface-hover);
+  --tab-text: var(--tab-text-regular);
+}
+
+#subpanel-selector-anchor:hover {
+  background: var(--tab-surface-hover);
+  color: var(--tab-text-regular);
+}
+
+tab-item.active {
+  --tab-surface: var(--tab-surface-active);
+  --throbber-color: var(--throbber-color-active);
+  --tab-text: var(--tab-text-active);
+  --tab-text-inverted: var(--tab-text-active-inverted);
+}
+tab-item.bundled-active,
+tab-item.active tab-item-substance:hover {
+  --tab-surface: var(--tab-surface-active-hover);
+}
+
+tab-closebox {
+  background: none transparent;
+  border: none 0 transparent;
+  margin-block: 0;
+  margin-inline: 0;
+  padding-block: 0.1em;
+  padding-inline: 0.1em;
+}
+
+tab-item .burster {
+  --throbber-color: var(--tab-loading-fill);
+}
+
+
+
+/* Dropshadow */
+
+:root {
+  --shadow-color: rgba(0, 0, 0, 0.04);
+  --shadow-blur: 0.2em;
+}
+
+:root.left tab-item:not(.pinned):not(collapsed):not(#dummy-tab) tab-item-substance {
+  box-shadow: -0.3em 0.3em var(--shadow-blur) var(--shadow-color);
+}
+
+:root.right tab-item:not(.pinned):not(collapsed):not(#dummy-tab) tab-item-substance {
+  box-shadow: 0.3em 0.3em var(--shadow-blur) var(--shadow-color);
+}
+
+.after-tabs button,
+.after-tabs [role="button"] {
+  box-shadow: 0 0.3em var(--shadow-blur) var(--shadow-color);
+}
+
+
+:root.left #tabbar {
+  box-shadow: inset -0.2em 0.2em var(--shadow-blur) var(--shadow-color);
+}
+
+:root.right #tabbar {
+  box-shadow: inset 0.2em 0.2em var(--shadow-blur) var(--shadow-color);
+}
+
+
+/* Transparent tabs are shown above solid tabs.
+   We have to set z-index to show all tabs in the same layer. */
+tab-item {
+  z-index: auto;
+}
+
+.after-tabs button,
+.after-tabs [role="button"] {
+  z-index: 100;
+}
+
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/proton/proton.css b/waterfox/browser/components/sidebar/sidebar/styles/proton/proton.css
new file mode 100644
index 0000000000000..c4516a050c88e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/proton/proton.css
@@ -0,0 +1,464 @@
+/*
+# 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/.
+*/
+
+@import url("/resources/ui-color.css");
+
+:root {
+  --color-animation: 0s ease-out;
+  --tab-vertical-padding: 0.45em; /* We should define this as a variable to reuse calculation of extra tab contents size. */
+  --tab-border-radius-size: 0.35em;
+  --tab-dropshadow-blur: 0.4em;
+  --tab-dropshadow-padding: 0.2em;
+  --tab-dropshadow-size: var(--tab-dropshadow-padding); /* for backward compatibility */
+  --in-tab-button-offset: calc(((var(--tab-caption-size) - 1em) / 2) + var(--tab-dropshadow-padding));
+  --in-tab-button-negative-offset: calc(((1em - var(--tab-caption-size)) / 2) - var(--tab-dropshadow-padding));
+  --tab-twisty-offset: calc(((var(--tab-ui-size) - var(--favicon-size)) / 2) + var(--tab-dropshadow-padding));
+  --tab-twisty-negative-offset: calc(((var(--favicon-size) - var(--tab-ui-size)) / 2) - var(--tab-dropshadow-padding));
+
+  /* Coloring */
+
+  --in-content-page-background: white;
+  --toolbar-non-lwt-bgcolor: light-dark(
+    var(--in-content-page-background),
+    rgb(66,65,77) /* https://searchfox.org/mozilla-central/rev/0c7c41109902cb8967ec3ef2c0ddb326701cfbee/toolkit/mozapps/extensions/default-theme/manifest.json#23 */
+  );
+  --toolbar-non-lwt-textcolor: var(--in-content-page-color);
+  /* linear-gradient is from https://searchfox.org/mozilla-central/rev/6338ce9f059dbcf98072ad29033f3a4327085ddb/browser/themes/shared/tabs.inc.css#599 */
+  --toolbar-non-lwt-bgimage: linear-gradient(var(--browser-selected-tab-bg,
+                                                 var(--non-lwt-selected-tab-background-color-proton,
+                                                     transparent)),
+                                             var(--browser-selected-tab-bg,
+                                                 var(--non-lwt-selected-tab-background-color-proton,
+                                                     transparent))),
+                             linear-gradient(var(--toolbar-bgcolor, transparent),
+                                             var(--toolbar-bgcolor, transparent)),
+                             var(--lwt-header-image, none);
+
+  --tab-like-surface: var(--theme-colors-toolbar, var(--browser-bg-active-for-header-image, var(--browser-bg-base, var(--toolbar-non-lwt-bgcolor))));
+  --tab-surface-regular: transparent;
+  --tab-surface-active-bgimage: var(--toolbar-non-lwt-bgimage);
+  --tab-text-regular: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+  --tab-text-inverted: var(--browser-bg-more-lighter, var(--toolbar-non-lwt-bgcolor));
+  --tab-text-active: var(--browser-fg-active, var(--toolbar-non-lwt-textcolor));
+  --tab-text-active-inverted: var(--toolbar-non-lwt-bgcolor);
+  --tab-border: var(--browser-border, var(--browser-bg-more-darker, var(--in-content-box-border-color-mixed)));
+  --tab-active-border: var(--browser-bg-active-for-header-image, transparent);
+  --tab-surface-active: var(--browser-selected-tab-bg, var(--tab-like-surface, var(--in-content-button-background-mixed)));
+  --tab-dropmarker: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+  --throbber-color: var(--browser-loading-indicator, var(--tab-text));
+  --throbber-color-active: var(--browser-loading-indicator, var(--tab-text-active));
+
+  --tabbar-bg: light-dark(
+    -moz-dialog,
+    var(--browser-bg-darker, var(--dark-frame))
+  );
+
+  --tab-highlighted-glow: light-dark(
+    rgb(42, 195, 162), /* https://searchfox.org/mozilla-central/rev/74f3c420ee54001059e1850bef3be876749ff873/browser/themes/shared/tabs.inc.css#927 */
+    rgb(84, 255, 189) /* https://searchfox.org/mozilla-central/rev/74f3c420ee54001059e1850bef3be876749ff873/browser/themes/shared/tabs.inc.css#931 */
+  );
+  --multiselected-color: var(--tab-surface-active);
+}
+:root[data-user-agent*="Mac"] {
+  --non-lwt-selected-tab-background-color-proton: transparent;
+}
+
+:root[data-user-agent*="Win"] {
+  --toolbar-non-lwt-textcolor: light-dark(rgb(21, 20, 26), rgb(251, 251, 254));
+  --tabbar-bg: light-dark(rgb(240, 240, 244), var(--browser-bg-darker, rgb(28, 27, 34)));
+}
+/* Firefox does not apply pale color to tabs in inactive windows when tabs are placed not in the titlebar, so we follow the decision. */
+/*
+:root[data-user-agent*="Win"]:-moz-window-inactive {
+  --toolbar-non-lwt-textcolor: light-dark(rgb(31, 30, 37), rgb(235, 235, 239));
+  --tabbar-bg: light-dark(rgb(235, 235, 239), var(--browser-bg-darker, rgb(31, 30, 37)));
+}
+*/
+
+:root[color-scheme="system-color"][data-user-agent*="Linux"] {
+  --toolbar-non-lwt-textcolor: -moz-dialogtext;
+  --toolbar-non-lwt-bgcolor: -moz-dialog;
+  --in-content-box-border-color-mixed: var(--ThreeDShadow);
+}
+:root[color-scheme="system-color"][data-user-agent*="Linux"] #background {
+  --tabbar-bg: var(--AppWorkspace);
+}
+
+@media not (prefers-color-scheme: dark) {
+  :root.platform-mac {
+    --tabbar-bg: #f0f0f4; /* https://searchfox.org/mozilla-central/rev/e9eb869e90a8d717678c3f38bf75843e345729ab/browser/themes/osx/browser.css#52 */
+  }
+
+  /* we cannot know the GNOME3 "headerbar" color, so use inverted menu color instead. */
+  :root[color-scheme="system-color"][data-user-agent*="Linux"]
+    tab-item:not(.active):not(.bundled-active):not(.highlighted),
+  :root[color-scheme="system-color"][data-user-agent*="Linux"]
+    .after-tabs button,
+  :root[color-scheme="system-color"][data-user-agent*="Linux"]
+    .after-tabs [role="button"],
+  :root[color-scheme="system-color"][data-user-agent*="Linux"]
+    #subpanel-selector-anchor,
+  :root[color-scheme="system-color"][data-user-agent*="Linux"]
+    #background {
+    --toolbar-non-lwt-bgcolor: var(--MenuText);
+    --toolbar-non-lwt-textcolor: var(--Menu);
+    --tabbar-bg: var(--toolbar-non-lwt-bgcolor);
+    /* these colors need to redefined here to apply new --toolbar-non-lwt-textcolor */
+    --tab-text-regular: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+    --tab-text-active: var(--browser-fg-active, var(--toolbar-non-lwt-textcolor));
+    --tab-dropmarker: var(--browser-fg, var(--toolbar-non-lwt-textcolor));
+  }
+}
+
+
+/* root container, background */
+
+:root,
+body,
+#background {
+  background-color: var(--browser-background, var(--tabbar-bg));
+  background-image: var(--browser-bg-images, none);
+  background-position: var(--browser-bg-position, left);
+  background-size: var(--browser-bg-size, auto);
+  background-repeat: var(--browser-bg-repeat, none);
+}
+:root.right,
+:root.right #background {
+  background-position: right;
+}
+
+
+/* overflow-start-indicator and overflow-end-indicator
+   ref: https://searchfox.org/mozilla-central/rev/1ef947827852125825dda93d8f4f83d1f55739eb/browser/themes/shared/tabs.css#527-563 */
+.overflow-indicator {
+  height: 0.6em;
+
+  &.start {
+    background-position: 0 -0.3em;
+    border-block-start: 0.05em solid rgba(255, 255, 255, 0.2);
+  }
+  &.end {
+    background-position: 0 0.3em;
+    border-block-end: 0.05em solid rgba(255, 255, 255, 0.2);
+  }
+  :root.left &.start,
+  :root.left &.end {
+    background-image: radial-gradient(ellipse at right,
+                                      rgba(0,0,0,0.1) 0%,
+                                      rgba(0,0,0,0.1) 7.6%,
+                                      rgba(0,0,0,0) 87.5%);
+  }
+  :root.right &.start,
+  :root.right &.end {
+    background-image: radial-gradient(ellipse at left,
+                                      rgba(0,0,0,0.1) 0%,
+                                      rgba(0,0,0,0.1) 7.6%,
+                                      rgba(0,0,0,0) 87.5%);
+  }
+}
+
+
+/* tab bar */
+
+#tabbar:not(.scrollbar-autohide) {
+  #pinned-tabs-container,
+  #normal-tabs-container {
+    scrollbar-color: var(--browser-toolbar_text-darker, var(--theme-colors-toolbar_bottom_separator, var(--in-content-button-background-hover-mixed)))
+                     var(--theme-colors-toolbar, var(--in-content-box-background));
+  }
+}
+
+
+/* tab and tab-like items */
+
+tab-item-substance,
+.after-tabs button,
+.after-tabs [role="button"],
+#subpanel-selector-anchor {
+  border: 1px solid transparent;
+  border-width: 1px 0;
+  position: relative;
+}
+
+tab-item,
+.after-tabs button,
+.after-tabs [role="button"],
+#subpanel-container,
+#dummy-tab-color-box {
+  --tab-surface: var(--tab-surface-regular);
+  --tab-text: var(--tab-text-regular);
+  --tab-text-shadow: var(--browser-textshadow-for-header-image, none);
+}
+tab-item-substance,
+.after-tabs button,
+.after-tabs [role="button"],
+#subpanel-container,
+#dummy-tab-color-box {
+  background: transparent;
+  color: var(--tab-text);
+  line-height: 1;
+  text-shadow: var(--tab-text-shadow);
+}
+
+tab-item.active,
+tab-item.active:hover,
+tab-item.bundled-active,
+tab-item.bundled-active:hover,
+.mutiple-highlighted > tab-item.highlighted,
+.mutiple-highlighted > tab-item.highlighted:hover {
+  --tab-surface: var(--tab-surface-active);
+  --tab-surface-bgimage: var(--tab-surface-active-bgimage);
+  --throbber-color: var(--throbber-color-active);
+  --tab-text: var(--tab-text-active);
+  --tab-text-inverted: var(--tab-text-active-inverted);
+}
+
+tab-item:not(.active):not(.bundled-active):not(.highlighted):hover,
+.after-tabs button:hover,
+.after-tabs [role="button"]:hover,
+#subpanel-selector-anchor:hover {
+  --tab-surface: var(--tab-text-regular);
+  --tab-text: var(--tab-text-regular);
+}
+
+tab-item-substance {
+  padding-block: var(--tab-vertical-padding);
+  padding-inline: 0.25em;
+  /* Transparent tabs are shown above solid tabs.
+     We have to set z-index to show all tabs in the same layer. */
+  z-index: auto;
+}
+
+.after-tabs button,
+.after-tabs [role="button"] {
+  --tab-like-button-padding: 0.2em;
+  padding-block: calc(var(--tab-dropshadow-blur) + var(--tab-like-button-padding));
+  padding-inline: 0;
+  z-index: 100;
+}
+
+:root.left:not(.rtl),
+:root.right.rtl {
+  tab-item:not(.pinned) tab-item-substance,
+  .after-tabs button:not([data-menu-ui]),
+  .after-tabs [role="button"]:not([data-menu-ui]) {
+    padding-inline-end: 0.35em;
+  }
+}
+
+:root.right:not(.rtl),
+:root.left.rtl {
+  tab-item:not(.pinned) tab-item-substance,
+  .after-tabs button:not([data-menu-ui]),
+  .after-tabs [role="button"]:not([data-menu-ui]) {
+    padding-inline-start: 0.35em;
+  }
+}
+
+tab-item[type="group"] tab-item-substance {
+  max-width: calc(max(var(--tab-label-width), calc(var(--favicon-size) / 2)) +
+                  0.25em /* margin-inline of tab-label */ +
+                  var(--tab-border-radius-size) + var(--tab-border-radius-size) /* radius of tab-item-substance */ +
+                  0.35em + 0.25em /* padding-inline of tab-item-substance */);
+}
+
+
+/* tab background */
+
+.after-tabs button::before,
+.after-tabs [role="button"]::before,
+#subpanel-selector-anchor::before {
+  content: " ";
+  display: inline-block;
+  position: absolute;
+}
+
+tab-item .background,
+.after-tabs button:hover::before,
+.after-tabs [role="button"]:hover::before,
+#subpanel-selector-anchor:hover::before {
+  background-color: var(--tab-surface);
+  background-image: var(--tab-surface-bgimage);
+  border-radius: var(--tab-border-radius-size);
+}
+
+tab-item .background,
+.after-tabs button:hover::before,
+.after-tabs [role="button"]:hover::before {
+  bottom: var(--tab-dropshadow-padding);
+  inset-inline-start: var(--tab-dropshadow-padding);
+  inset-inline-end: var(--tab-dropshadow-padding);
+  top: var(--tab-dropshadow-padding);
+}
+
+tab-item.faviconized .background {
+  --tab-dropshadow-padding: 0.13em;
+}
+
+tab-item[type="group"] .background {
+  border: 1px solid var(--tab-border);
+}
+
+tab-item[data-next-group-color] {
+  .background,
+  tab-item-substance:hover .background {
+    --tab-surface: light-dark(var(--next-group-color-pale), var(--next-group-color)) !important;
+    --tab-border: light-dark(var(--next-group-color), var(--next-group-color-invert)) !important;
+    border: 1px solid var(--tab-border);
+    opacity: 1 !important;
+  }
+}
+
+#subpanel-selector-anchor:hover::before {
+  bottom: 0;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  top: 0;
+}
+
+tab-item.active,
+tab-item.bundled-active,
+:root.mutiple-highlighted tab-item.highlighted {
+  .background:not(.base),
+  tab-item-substance:hover .background:not(.base) {
+    box-shadow: 0 0 var(--tab-dropshadow-blur) rgba(0, 0, 0, 0.4);
+    outline: 1px solid var(--browser-tab-highlighter, var(--tab-active-border, currentcolor));
+    outline-offset: -1px;
+  }
+}
+.sticky-tabs-container tab-item:not(.active):not(.bundled-active) .background.base {
+  box-shadow: 0 0 var(--tab-dropshadow-blur) rgba(0, 0, 0, 0.2);
+}
+
+tab-item:not([type="group"]):not(.active):not(.bundled-active):not(.highlighted) tab-item-substance:hover .background:not(.base),
+.after-tabs button:hover::before,
+.after-tabs [role="button"]:hover::before,
+#subpanel-selector-anchor:hover::before {
+  opacity: 0.11;
+}
+
+/* extra focus ring for multiselected tabs https://bugzilla.mozilla.org/show_bug.cgi?id=1751807 */
+:root.mutiple-highlighted tab-item.highlighted {
+  .background:not(.base),
+  tab-item-substance:hover .background:not(.base) {
+    outline: 1px solid var(--focus-outline-color);
+    outline-offset: -1px;
+  }
+}
+:root.mutiple-highlighted tab-item.highlighted.active {
+  .background:not(.base),
+  tab-item-substance:hover .background:not(.base) {
+    outline-width: 2px;
+    outline-offset: -2px;
+  }
+}
+
+
+.sticky-tabs-container tab-item:not(.active):not(.bundled-active) .background.base {
+  background-color: var(--browser-background, var(--tabbar-bg, var(--bg-color, ButtonFace)));
+  background-image: var(--browser-bg-images, none);
+  background-position: var(--browser-bg-position, left);
+  background-size: var(--browser-bg-size, auto);
+  background-repeat: var(--browser-bg-repeat, none);
+  opacity: 1;
+}
+
+
+
+/* in-tab contents */
+
+tab-item {
+  * {
+    color: var(--tab-text);
+  }
+
+  tab-label {
+    margin-inline-start: 0.25em;
+    padding-block: 0 0.25em;
+    padding-inline: 0;
+  }
+
+  tab-favicon {
+    margin-block: 0.25em;
+  }
+
+  /* expand buttons to fill full height of tab */
+  tab-closebox,
+  &:not(.faviconized) tab-sound-button {
+    background: none transparent;
+    border: none 0 transparent;
+    margin-block: var(--in-tab-button-negative-offset);
+    margin-inline: 0;
+    padding-block: var(--in-tab-button-offset);
+    padding-inline: 0.25em;
+
+    &::before {
+      border-radius: 10%;
+      content: "";
+      display: inline-block;
+      height: calc(var(--svg-small-icon-size) + 0.2em);
+      margin-block-start: -0.1em;
+      margin-inline-start: -0.1em;
+      width: calc(var(--svg-small-icon-size) + 0.2em);
+      position: absolute;
+    }
+
+    &:hover::before {
+      background: var(--tab-text);
+      box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.3);
+      opacity: 0.1;
+    }
+
+    &:active::before {
+      opacity: 0.2;
+    }
+
+    &::after {
+      position: relative;
+    }
+  }
+
+  &.active tab-closebox:hover::before {
+    background: var(--tab-text);
+  }
+
+  .burster {
+    --throbber-color: var(--tab-loading-fill);
+  }
+}
+
+/* hide active tab marker and highlighter for collapsed tree */
+.highlighter::before,
+tab-item:not(.faviconized).subtree-collapsed.some-descendants-highlighted .highlighter::after,
+tab-item:not(.faviconized).subtree-collapsed.all-descendants-highlighted .highlighter::after {
+  display: none;
+}
+
+/* contextual identity marker in tabs */
+
+tab-item:not(.faviconized) .contextual-identity-marker {
+  :root.left:not(.rtl) &,
+  :root.right.rtl & {
+    inset-inline-end: calc(var(--tab-dropshadow-blur) - var(--tab-highlighter-size));
+  }
+
+  :root.right:not(.rtl) &,
+  :root.left.rtl & {
+    inset-inline-start: calc(var(--tab-dropshadow-blur) - var(--tab-highlighter-size));
+  }
+}
+
+tab-item.faviconized .contextual-identity-marker {
+  bottom: auto;
+  top: 0;
+}
+
+.after-tabs {
+  button.newtab-action-selector-anchor::after,
+  button.contextual-identities-selector-anchor::after {
+    margin-block-start: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2 + var(--tab-dropshadow-blur) + var(--tab-like-button-padding));
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sharing-state.css b/waterfox/browser/components/sidebar/sidebar/styles/sharing-state.css
new file mode 100644
index 0000000000000..14ea3c46e80e2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/sharing-state.css
@@ -0,0 +1,94 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --sharing-state-size: var(--svg-small-icon-size);
+
+  /* https://searchfox.org/mozilla-central/rev/6b8a3f804789fb865f42af54e9d2fef9dd3ec74d/browser/themes/shared/tabs.css#284-316 */
+  --sharing-state-color: rgb(224, 41, 29);
+
+  /* https://searchfox.org/mozilla-central/rev/6b8a3f804789fb865f42af54e9d2fef9dd3ec74d/browser/themes/shared/tabs.css#271-282 */
+  --tab-sharing-icon-animation: 3s linear tab-sharing-icon-pulse infinite;
+  --tab-sharing-icon-animation-inverted: 3s linear tab-sharing-icon-pulse-inverted infinite;
+}
+
+@keyframes tab-sharing-icon-pulse {
+  0%, 16.66%, 83.33%, 100% {
+    opacity: 0;
+  }
+  33.33%, 66.66% {
+    opacity: 1;
+  }
+}
+@keyframes tab-sharing-icon-pulse-inverted {
+  0%, 16.66%, 83.33%, 100% {
+    opacity: 1;
+  }
+  33.33%, 66.66% {
+    opacity: 0;
+  }
+}
+
+/* Show sharing status on favicons.
+   See also favicon.css */
+
+.favicon-sharing-state {
+  bottom: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+  inset-inline-start: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+  inset-inline-end: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+  position: absolute;
+  top: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+
+  tab-item.active &,
+  tab-item.loading &,
+  tab-item:not(.sharing-camera):not(.sharing-microphone):not(.sharing-screen) & {
+    display: none;
+  }
+
+  /* The priority is: screen > camera > microphone
+     See also https://searchfox.org/mozilla-central/rev/85d6bf1b521040c79ed72f3966274a25a2f987c7/browser/modules/webrtcUI.sys.mjs#316-331 */
+  tab-item.sharing-microphone &::before {
+    background-image: url("./icons/microphone.svg")
+  }
+  :root.simulate-svg-context-fill tab-item.sharing-microphone &::before {
+    mask-image: url("./icons/microphone.svg");
+  }
+
+  tab-item.sharing-camera &::before {
+    background-image: url("./icons/camera.svg")
+  }
+  :root.simulate-svg-context-fill tab-item.sharing-camera &::before {
+    mask-image: url("./icons/camera.svg");
+  }
+
+  tab-item.sharing-screen &::before {
+    background-image: url("./icons/screen.svg")
+  }
+  :root.simulate-svg-context-fill tab-item.sharing-screen &::before {
+    mask-image: url("./icons/screen.svg");
+  }
+
+  &::before {
+    fill: var(--sharing-state-color);
+    animation: var(--tab-sharing-icon-animation);
+  }
+  :root.simulate-svg-context-fill tab-item &::before {
+    /* put this here to override background-image specivied rules above! */
+    background: var(--sharing-state-color);
+  }
+}
+
+tab-item:not(.active):not(.loading) {
+  &.sharing-camera,
+  &.sharing-microphone,
+  &.sharing-screen {
+    .favicon-image,
+    .favicon-builtin::before {
+      animation: var(--tab-sharing-icon-animation-inverted);
+    }
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab-white.png b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab-white.png
new file mode 100644
index 0000000000000..f647118a8f3d5
Binary files /dev/null and b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab-white.png differ
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab.png b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab.png
new file mode 100644
index 0000000000000..7f6f03cea9ee2
Binary files /dev/null and b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/closetab.png differ
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sidebar/dropmarker.png b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/dropmarker.png
new file mode 100644
index 0000000000000..eeb33d9a9c05f
Binary files /dev/null and b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/dropmarker.png differ
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sidebar/sidebar.css b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/sidebar.css
new file mode 100644
index 0000000000000..433ebd838760d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/sidebar/sidebar.css
@@ -0,0 +1,366 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ * 
+ * The contents of these files are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use these files except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ * 
+ * The Original Code is the SidebarStyleTab.
+ * 
+ * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
+ * Portions created by the Initial Developer are Copyright (C) 2010-2025
+ * the Initial Developer. All Rights Reserved.
+ * 
+ * Contributor(s): Philipp von Weitershausen <philipp@weitershausen.de>
+ *                 YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+@import url("/resources/ui-color.css");
+
+@media (prefers-color-scheme: dark), not (prefers-color-scheme: dark) {
+  :root.sidebar,
+  :root:not(.sidebar) {
+    --bg-color: #d4dde5;
+    --bg-color-inactive: #e8e8e8;
+    --shadow-color: #404040;
+    --shadow-color-inactive: #868686;
+    --tab-like-surface: #d4dde5;
+    --tab-surface-regular: transparent;
+    --tab-surface-active-color: #94A1C0;
+    --tab-surface-active-color-pale: #B4C1E0;
+    --tab-surface-active-gradient: linear-gradient(to bottom, #A0B0CF, #7386AB) repeat-x;
+    --tab-surface-active-gradient-pale: linear-gradient(to bottom, #C0D0EF, #93A6CB) repeat-x;
+    --tab-surface-active-gradient-inactive: linear-gradient(to bottom, #B4B4B4, #8A8A8A) repeat-x;
+    --tab-surface-active: var(--tab-surface-active-gradient);
+    --tab-surface-active-hover: var(--tab-surface-active);
+    --tab-text-regular: black;
+    --tab-text-inverted: white;
+    --tab-text-active: white;
+    --badge-bg-color: #91a0c0;
+    --badge-color-inactive: #b5b5b5;
+    --badge-bg-color-inactive: #929292;
+    --dropmarker-border-color: #577bf3;
+    --dropmarker-bg-color: #d0def5;
+    --throbber-color: white;
+    --throbber-color-active: white;
+    --throbber-shadow-color: var(--dropmarker-border-color);
+    --tab-text-shadow: 0 1px var(--shadow-color);
+
+    --tab-highlighted-highlight: white;
+    --tab-highlighted-glow: var(--dropmarker-border-color);
+    --tab-highlighted-base: var(--bg-color);
+
+    --multiselected-color: var(--tab-surface-active-gradient);
+    --multiselected-color-opacity: 0.35;
+
+    --tab-vertical-padding: 0.075em; /* We should define this as a variable to reuse calculation of extra tab contents size. */
+  }
+
+  tab-item:not(.active) {
+    --throbber-color: var(--dropmarker-border-color);
+    --throbber-shadow-color: white;
+  }
+
+  /* Background colour for the tree sidebar (light blue when window is
+     active, grey otherwise) */
+  :root,
+  body,
+  #background {
+    background: var(--bg-color);
+  }
+
+  :root:not(.active),
+  :root:not(.active) #background {
+    background: var(--bg-color-inactive);
+  }
+
+  /* Use the splitter to display the border of tab-items */
+  :root.left:not(.rtl),
+  :root.right.rtl {
+    border-inline-end: 1px solid var(--shadow-color);
+  }
+  :root:not(.active).left:not(.rtl),
+  :root:not(.active).right.rtl {
+    border-inline-end-color: var(--shadow-color-inactive);
+  }
+
+  :root.right:not(.rtl),
+  :root.left.rtl {
+    border-inline-start: 1px solid var(--shadow-color);
+  }
+  :root:not(.active).right:not(.rtl),
+  :root:not(.active).left.rtl {
+    border-inline-start-color: var(--shadow-color-inactive);
+  }
+}
+
+
+/* overflow-start-indicator and overflow-end-indicator
+   ref: https://searchfox.org/mozilla-central/rev/1ef947827852125825dda93d8f4f83d1f55739eb/browser/themes/shared/tabs.css#527-563 */
+.overflow-indicator {
+  height: 0.6em;
+}
+.overflow-indicator.start {
+  background-position: 0 -0.3em;
+}
+.overflow-indicator.end {
+  background-position: 0 0.3em;
+}
+:root.left .overflow-indicator.start,
+:root.left .overflow-indicator.end {
+  background-image: radial-gradient(ellipse at right,
+                                    rgba(0,0,0,0.2) 0%,
+                                    rgba(0,0,0,0.2) 7.6%,
+                                    rgba(0,0,0,0) 87.5%);
+}
+:root.right .overflow-indicator.start,
+:root.right .overflow-indicator.end {
+  background-image: radial-gradient(ellipse at left,
+                                    rgba(0,0,0,0.2) 0%,
+                                    rgba(0,0,0,0.2) 7.6%,
+                                    rgba(0,0,0,0) 87.5%);
+}
+
+
+/* Style tabs themselves.  Get rid of most of the initial XUL styling */
+tab-item-substance {
+  border-block-start: 1px solid transparent;
+  min-height: 2.2em;     /* height including border! */
+  padding-block: var(--tab-vertical-padding) var(--tab-vertical-padding);
+  padding-inline: 2px 3px;
+  z-index: 0;
+}
+
+tab-item[type="group"] tab-item-substance {
+  max-width: calc(max(var(--tab-label-width), calc(var(--favicon-size) / 2)) +
+                  2px + 3px /* padding-inline of tab-item-substance */ +
+                  0.25em /* margin-inline of tab-label */ +
+                  0.25em /* margin-inline of tab-label-content */);
+}
+
+tab-item.active {
+  --tab-surface: var(--tab-surface-active-gradient);
+}
+tab-item.active tab-item-substance {
+  background: var(--tab-surface);
+  border-block-start: 1px solid var(--tab-surface-active-color);
+}
+
+tab-item.bundled-active {
+  --tab-surface: var(--tab-surface-active-gradient-pale);
+}
+tab-item.bundled-active tab-item-substance {
+  background: var(--tab-surface);
+  border-block-start: 1px solid var(--tab-surface-active-color-pale);
+}
+
+:root:not(.active) tab-item.active {
+  --tab-surface: var(--tab-surface-active-gradient-inactive);
+}
+:root:not(.active) tab-item.active tab-item-substance {
+  background: var(--tab-surface);
+  border-block-start: 1px solid var(--tab-surface-active-color-inactive);
+}
+
+.sticky-tabs-container tab-item:not(.active):not(.bundled-active) .background.base {
+  background: var(--tabbar-bg, var(--bg-color, ButtonFace));
+  box-shadow: 0 0 0.4em rgba(0, 0, 0, 0.2);
+}
+:root:not(.active) .sticky-tabs-container tab-item:not(.active):not(.bundled-active) .background.base {
+  background: var(--tabbar-bg, var(--bg-color-inactive, ButtonFace));
+}
+
+
+tab-item[type="group"] .background {
+  background: var(--tab-surface);
+  border: 1px solid var(--tab-border);
+  border-radius: 0.35em;
+}
+
+tab-item[data-next-group-color] {
+  .background {
+    --tab-surface: light-dark(var(--next-group-color-pale), var(--next-group-color)) !important;
+    --tab-border: light-dark(var(--next-group-color), var(--next-group-color-invert)) !important;
+    background: var(--tab-surface);
+    border: 2px solid var(--tab-border);
+    border-radius: 0.3em;
+  }
+}
+
+
+tab-item:not(.faviconized).active tab-sound-button::after {
+  --tab-text: white;
+}
+
+
+/* Keep the close button at a safe distance from the tab label. */
+tab-closebox::after {
+  display: none;
+}
+tab-closebox {
+  width: 1.5em;
+  min-width: 1.5em;
+  height: 1.5em;
+  margin-inline-start: 3px;
+  background: url("closetab.png") center center no-repeat;
+  opacity: 0.27;  /* turn black into #b9b9b9 */
+  border: 0 none;
+}
+
+tab-closebox:active {
+  opacity: 0.46;  /* turn black into #8a8a8a */
+}
+
+tab-item.active tab-closebox {
+  background-image: url("closetab-white.png");
+  opacity: 1;
+}
+
+/* Tab label is without special decoration except when selected: then
+   the text is white and bold.
+   We need to apply text-shadow for .label-content instead of tab-label
+   because transparent underline for the high contrast mode should not
+   have text-shadow. */
+tab-item tab-label .label-content {
+  font-weight: normal;
+  line-height: 1.4;
+  color: var(--tab-text);
+  text-align: start;
+  text-shadow: none;
+  margin-block-end: 1px;
+  margin-inline-start: 0.25em;
+  padding-block: 0 0.25em;
+  padding-inline: 0;
+}
+
+tab-item.active tab-label .label-content {
+  font-weight: bold;
+  color: var(--tab-text-active);
+  text-shadow: var(--tab-text-shadow);
+}
+
+tab-item.active tab-twisty {
+  color: white;
+}
+
+/* Make the tab counter look like the bubbles in Mail.app et.al. */
+.counter::before,
+.counter::after {
+  display: none;
+}
+
+.counter {
+  background-color: var(--badge-bg-color);
+  border-radius: 0.75em;
+  box-sizing: content-box;
+  color: var(--tab-text-active);
+  flex-shrink: 0;
+  font-size: 85%;
+  font-weight: bold;
+  min-width: 1em;
+  padding-block: 0.25em;
+  padding-inline: 0.25em;
+  text-shadow: none;
+  text-align: center;
+}
+
+tab-item.active .counter {
+  background-color: var(--tab-text-active);
+  color: var(--badge-bg-color);
+}
+
+:root:not(.active) .counter {
+  background-color: var(--badge-bg-color-inactive);
+}
+:root:not(.active) tab-item.active .counter {
+  background-color: var(--tab-text-active);
+  color: var(--badge-color-inactive);
+}
+
+
+
+/* Drag'n'drop styling */
+
+/* Round blue rectangle around tabs that are dropping targets. */
+tab-item[data-drop-position="self"]:not([data-next-group-color]) tab-item-substance {
+  background: var(--dropmarker-bg-color);
+  border: 2px solid var(--dropmarker-border-color); /* not OSX's colour but Firefox's */
+  border-radius: 0.3em;
+  padding-block: 0;
+  padding-inline: 8px 1px;
+  outline: none !important;
+}
+
+/* White-blue-white separator for drop indicator. */
+tab-item[data-drop-position]:not([data-drop-position="self"]) tab-item-substance::before {
+  background: transparent !important;
+  max-height: 6px;
+  min-height: 6px;
+  border-image: url("dropmarker.png") 12 0 0 11 fill / 12px 0 0 11px;
+  border-image-outset: 6px 0 0 0;
+}
+
+tab-item:not(.faviconized)[data-drop-position="before"] tab-item-substance::before {
+  top: 6px;
+}
+
+
+:root.mutiple-highlighted tab-item:not(.highlighted) tab-item-substance {
+  opacity: 0.5;
+}
+
+
+
+/* changed from original SidebarStyleTab */
+
+.after-tabs button,
+.after-tabs [role="button"] {
+  background: transparent;
+  border: 0 none;
+}
+
+/* for rightside tab bar: "display:none" breaks the order of tab contents. */
+:root
+  tab-item:not(.active):not(#dummy-tab)
+  tab-item-substance:not(:hover)
+  tab-closebox {
+  display: -moz-box !important;
+  visibility: collapse !important;
+}
+
+
+/* for Multiple Tab Handler */
+tab-item:not(.active)[multipletab-ready-to-close="true"] tab-item-substance:not(:hover) tab-closebox {
+  visibility: visible;
+}
+
+
+
+/* hide regular active tab marker */
+.highlighter::before {
+  display: none !important;
+}
+
+
+/* multiselection of tabs */
+
+:root.mutiple-highlighted tab-item.highlighted tab-item-substance::after {
+  background: var(--multiselected-color);
+  bottom: 0;
+  content: " ";
+  display: block;
+  inset-inline-start: 0;
+  inset-inline-end: 0;
+  opacity: var(--multiselected-color-opacity);
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+  z-index: 10;
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/sound-button.css b/waterfox/browser/components/sidebar/sidebar/styles/sound-button.css
new file mode 100644
index 0000000000000..039dc3444ba5d
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/sound-button.css
@@ -0,0 +1,135 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --sound-button-size: calc(var(--svg-small-icon-size) * 0.75);
+}
+
+tab-sound-button {
+  background: none transparent;
+  border: none 0 transparent;
+  display: none;
+  height: calc(var(--svg-small-icon-size) + (var(--in-tab-button-offset) * 2));
+  line-height: 0;
+  min-height: var(--svg-small-icon-size);
+  min-width: var(--svg-small-icon-size); /* this is required to prevent shrinking of the box which has no position:static content */
+  opacity: 1;
+  position: relative;
+  z-index: var(--tab-ui-z-index);
+
+  &::after {
+    -moz-context-properties: fill;
+    background: none no-repeat center / 100%;
+    content: "";
+    display: inline-block;
+    fill: var(--tab-text);
+    height: var(--sound-button-size);
+    inset-block-start: calc((var(--svg-small-icon-size) - var(--sound-button-size)) / 2);
+    inset-inline-start: calc((var(--svg-small-icon-size) - var(--sound-button-size)) / 2);
+    position: absolute;
+    width: var(--sound-button-size);
+  }
+  :root.simulate-svg-context-fill &::after {
+    background: var(--tab-text);
+    mask-position: center;
+    mask-repeat: no-repeat;
+    mask-size: 100%;
+  }
+
+  /* background circle */
+  tab-item.faviconized & {
+    --sound-button-size: 10px;
+    inset-block-start: calc(var(--faviconized-tab-size) - (var(--sound-button-size) * 1.2)); /* cancel negative margin of the background circle */
+    inset-inline-end: 0;
+    margin-block: 0;
+    margin-inline: calc(var(--sound-button-size) * 0.2 /* prevent overrapping of this button's background circle on other buttons */ + 0.2em /* and put spaces between other UIs */);
+    min-height: var(--sound-button-size);
+    min-width: var(--sound-button-size); /* this is required to prevent shrinking of the box which has no position:static content */
+    padding-block: 0;
+    padding-inline: 0;
+    position: absolute;
+
+    &::before {
+      background: var(--tab-text-inverted);
+      border-radius: 150%;
+      content: "";
+      display: inline-block;
+      height: calc(var(--sound-button-size) * 1.4);
+      inset-inline-start: calc(0px - (var(--sound-button-size) * 0.2));
+      top: calc(0px - (var(--sound-button-size) * 0.2));
+      width: calc(var(--sound-button-size) * 1.4);
+      opacity: 0.95;
+      position: absolute;
+    }
+    &:hover::before {
+      opacity: 0.8;
+    }
+
+    &::after {
+      inset-block-start: 0;
+      inset-inline-start: 0;
+    }
+  }
+}
+
+tab-item:not(.collapsed) {
+  tab-sound-button:hover {
+    opacity: var(--button-hover-opacity);
+  }
+
+  tab-sound-button:active {
+    opacity: var(--button-active-opacity);
+  }
+
+  &.sound-playing tab-sound-button,
+  &.has-sound-playing-member.subtree-collapsed[data-child-ids] tab-sound-button,
+  &.muted tab-sound-button,
+  &.has-muted-member.subtree-collapsed[data-child-ids] tab-sound-button,
+  &.autoplay-blocked tab-sound-button,
+  &.has-autoplay-blocked-member.subtree-collapsed[data-child-ids] tab-sound-button {
+    display: inline-block;
+  }
+
+  &.muted tab-sound-button::after,
+  &.has-muted-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+    background-image: url("./icons/audio-16-mute.svg");
+  }
+  :root.simulate-svg-context-fill & {
+    &.muted tab-sound-button::after,
+    &.has-muted-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+      background-image: none;
+      mask-image: url("./icons/audio-16-mute.svg");
+    }
+  }
+
+  &.autoplay-blocked tab-sound-button::after,
+  &.has-autoplay-blocked-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+    background-image: url("./icons/audio-16-blocked.svg");
+  }
+  :root.simulate-svg-context-fill & {
+    &.autoplay-blocked tab-sound-button::after,
+    &.has-autoplay-blocked-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+      background-image: none;
+      mask-image: url("./icons/audio-16-blocked.svg");
+    }
+  }
+
+  /* put style definition for sound-playing tab after muted tab,
+     because "sound-playing" is more important than muted for
+     mixed state tree. */
+  &.sound-playing:not(.muted) tab-sound-button::after,
+  &.has-sound-playing-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+    background-image: url("./icons/audio-16.svg");
+  }
+  :root.simulate-svg-context-fill & {
+    &.sound-playing:not(.muted) tab-sound-button::after,
+    &.has-sound-playing-member.subtree-collapsed[data-child-ids] tab-sound-button::after {
+      background-image: none;
+      mask-image: url("./icons/audio-16.svg");
+    }
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/tab-preview.css b/waterfox/browser/components/sidebar/sidebar/styles/tab-preview.css
new file mode 100644
index 0000000000000..55c93d64d3410
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/tab-preview.css
@@ -0,0 +1,37 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --tab-preview-reference-width: 400px;
+  --tab-preview-reference-height: 300px;
+}
+
+::part(extra-contents-by-tabs-sidebar_waterfox_net container) {
+  text-align: center;
+}
+
+::part(extra-contents-by-tabs-sidebar_waterfox_net frame) {
+  border: var(--tab-border) 1px solid;
+  display: inline-block;
+  margin-right: auto;
+  max-width: var(--tab-preview-size);
+  overflow: hidden;
+}
+
+:root.left ::part(extra-contents-by-tabs-sidebar_waterfox_net frame) {
+  --tab-preview-size: calc(100% + var(--favicon-size) - var(--tab-closebox-end-offset) - 0.25em /* proton closebox padding */);
+}
+:root.right ::part(extra-contents-by-tabs-sidebar_waterfox_net frame) {
+  --tab-preview-size: calc(100% + var(--favicon-size) - var(--tab-closebox-start-offset) - 0.25em /* proton closebox padding */);
+}
+
+::part(extra-contents-by-tabs-sidebar_waterfox_net preview) {
+  --tab-preview-image-size: calc(100% + var(--tab-indent));
+  max-height: calc(var(--tab-preview-reference-height) / var(--tab-preview-reference-width) * var(--tab-preview-image-size));
+  max-width: var(--tab-preview-image-size);
+  min-width: var(--tab-preview-image-size);
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/throbber.css b/waterfox/browser/components/sidebar/sidebar/styles/throbber.css
new file mode 100644
index 0000000000000..2f87e0080b7e8
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/throbber.css
@@ -0,0 +1,196 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --throbber-color: var(--browser-loading-indicator, Highlight);
+  --throbber-shadow-color: transparent;
+  --throbber-size: var(--svg-small-icon-size);
+  --throbber-animation-steps: steps(30); /* The FPS is reduced from 60 to 30 at https://bugzilla.mozilla.org/show_bug.cgi?id=1511095 */
+  --tab-burster-size: 5px;
+  --tab-burster-translation: translate(calc(var(--tab-size) / 2), calc(var(--tab-size) / 2 - var(--tab-burster-size)));
+}
+
+tab-item.faviconized {
+  --tab-burster-translation: translate(calc(var(--favicon-size) / 2), calc(var(--tab-size) / 2 - var(--tab-burster-size)));
+}
+
+@keyframes throbber {
+  0%   { transform: translateX(0); }
+  100% { transform: translateX(-100%); }
+}
+
+
+:root:not(.blocking-throbber) #blocking-screen .throbber,
+:root:not(.have-loading-tab) #tabbar .throbber,
+#tabbar tab-item:not(.loading) .throbber,
+#tabbar tab-item.collapsed .throbber {
+  display: none !important;
+}
+
+
+#blocking-screen .throbber,
+tab-item:not(.collapsed) .throbber {
+  display: inline-block;
+  font-size: var(--throbber-size);
+  height: var(--throbber-size);
+  max-height: var(--throbber-size);
+  max-width: var(--throbber-size);
+  overflow: hidden;
+  padding-block: 0;
+  padding-inline: 0;
+  pointer-events: none;
+  position: relative;
+  width: var(--throbber-size);
+}
+
+:root.animation:not(.throbber-synchronizing) tab-item:not(.collapsed).loading:not(.throbber-unsynchronized) .throbber::before,
+:root.animation:not(.throbber-synchronizing).have-loading-tab #conductor-throbber,
+:root.animation.have-loading-tab #sync-throbber,
+:root.animation.blocking-throbber #blocking-screen .throbber::before {
+  animation: throbber 1.05s var(--throbber-animation-steps) infinite;
+}
+
+:root.blocking-throbber #blocking-screen .throbber::before,
+#tabbar tab-item:not(.collapsed).loading .throbber::before,
+:root.have-loading-tab #conductor-throbber {
+  content: "";
+  height: var(--throbber-size);
+  position: absolute;
+  width: var(--throbber-size);
+}
+:root.animation.blocking-throbber #blocking-screen .throbber::before,
+:root.animation #tabbar tab-item:not(.collapsed).loading .throbber::before,
+:root.animation.have-loading-tab #conductor-throbber {
+  width: calc(var(--throbber-size) * 60);
+}
+
+
+:root.blocking-throbber #blocking-screen .throbber::before,
+#tabbar tab-item:not(.collapsed).loading .throbber::before {
+  fill: var(--throbber-color);
+  box-shadow: 0 0 2px var(--throbber-shadow-color);
+}
+:root.simulate-svg-context-fill.blocking-throbber #blocking-screen .throbber::before,
+:root.simulate-svg-context-fill #tabbar tab-item:not(.collapsed).loading .throbber::before,
+#tabbar tab-item:not(.collapsed).loading.throbber-unsynchronized .throbber::before {
+  background: var(--throbber-color);
+}
+
+:root.blocking-throbber #blocking-screen .throbber::before,
+#tabbar tab-item:not(.collapsed).loading .throbber::before {
+  -moz-context-properties: fill;
+  background: url("/resources/icons/hourglass.svg") no-repeat;
+}
+:root.simulate-svg-context-fill:not(.rtl) {
+  &.blocking-throbber #blocking-screen .throbber::before,
+  #tabbar tab-item:not(.collapsed).loading .throbber::before {
+    background-image: none;
+    mask: url("/resources/icons/hourglass.svg") no-repeat left center / 100%;
+  }
+}
+:root.simulate-svg-context-fill.rtl {
+  &.blocking-throbber #blocking-screen .throbber::before,
+  #tabbar tab-item:not(.collapsed).loading .throbber::before {
+    background-image: none;
+    mask: url("/resources/icons/hourglass.svg") no-repeat right center / 100%;
+  }
+}
+
+:root.animation.blocking-throbber #blocking-screen .throbber::before,
+:root.animation #tabbar tab-item:not(.collapsed).loading .throbber::before {
+  background-image: url("./throbber.svg");
+}
+:root.animation.simulate-svg-context-fill.blocking-throbber #blocking-screen .throbber::before,
+:root.animation.simulate-svg-context-fill #tabbar tab-item:not(.collapsed).loading .throbber::before {
+  background-image: none;
+  mask-image: url("./throbber.svg");
+}
+
+#tabbar tab-item:not(.collapsed).loading.throbber-unsynchronized .throbber::before {
+  background-image: none;
+}
+:root:not(.rtl)
+  #tabbar tab-item:not(.collapsed).loading.throbber-unsynchronized .throbber::before {
+  mask: -moz-element(#conductor-throbber) no-repeat left center / 100%;
+}
+:root.rtl
+  #tabbar tab-item:not(.collapsed).loading.throbber-unsynchronized .throbber::before {
+  mask: -moz-element(#conductor-throbber) no-repeat right center / 100%;
+}
+:root.simulate-svg-context-fill
+  #tabbar tab-item:not(.collapsed).loading.throbber-unsynchronized .throbber::before {
+  mask: -moz-element(#conductor-throbber-container) no-repeat;
+}
+
+:root:not(.rtl) #conductor-throbber {
+  background: url("/resources/icons/hourglass.svg") no-repeat left center;
+}
+:root.rtl #conductor-throbber {
+  background: url("/resources/icons/hourglass.svg") no-repeat right center;
+}
+:root.animation:not(.rtl) #conductor-throbber,
+:root.animation.rtl #conductor-throbber {
+  background-image: url("./throbber.svg");
+}
+
+
+
+:root.blocking-throbber #blocking-screen .throbber {
+  inset-inline-start: calc(50% - var(--throbber-size));
+  position: absolute;
+  top: calc(50% - var(--throbber-size));
+  transform: scale(2, 2);
+}
+
+:root.blocking-throbber #blocking-screen .throbber::before {
+  fill: white;
+  box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.35);
+}
+:root.simulate-svg-context-fill.blocking-throbber  #blocking-screen .throbber::before {
+  background: white;
+}
+
+#blocking-screen progress {
+  display: none;
+}
+
+:root.blocking-throbber #blocking-screen progress.shown {
+  display: block;
+  --progressbar-width: calc(var(--throbber-size) * 8);
+  max-height: calc(var(--throbber-size) / 2);
+  max-width: var(--progressbar-width);
+  position: absolute;
+  top: calc(50% + var(--throbber-size));
+  inset-inline-start: calc((100% - var(--progressbar-width)) / 2);
+}
+
+
+
+@keyframes tab-burst-animation {
+  0%   { opacity: 0.4; transform: var(--tab-burster-translation) scale(1); }
+  100% { opacity: 0;   transform: var(--tab-burster-translation) scale(40); }
+}
+
+@keyframes tab-burst-animation-light {
+  0%   { opacity: 0.2; transform: var(--tab-burster-translation) scale(1); }
+  100% { opacity: 0;   transform: var(--tab-burster-translation) scale(40); }
+}
+
+:root.animation tab-item:not(.collapsed).bursting .burster::before {
+  animation: tab-burst-animation var(--tab-burst-duration) cubic-bezier(0, 0, 0.58, 1);
+  background: var(--throbber-color);
+  border-radius: 100%;
+  border: var(--tab-burster-size) solid var(--throbber-color);
+  content: "";
+  display: inline-block;
+  opacity: 0;
+  transform-origin: 50% 50%;
+}
+
+:root.animation tab-item:not(.collapsed).not-activated-since-load.bursting .burster::before {
+  animation-name: tab-burst-animation-light;
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/throbber.svg b/waterfox/browser/components/sidebar/sidebar/styles/throbber.svg
new file mode 100644
index 0000000000000..eb992fd77c8d6
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/throbber.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="960" height="16" fill="context-fill">
+  <path d="M2 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM18.392 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM35.565 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM53.024 6.049c1.198 0 2.17.874 2.17 1.951s-.972 1.951-2.17 1.951-2.17-.874-2.17-1.951.972-1.951 2.17-1.951zM70.33 6.099c1.295 0 2.346.852 2.346 1.901 0 1.05-1.05 1.901-2.345 1.901-1.295 0-2.346-.852-2.346-1.901 0-1.05 1.051-1.901 2.346-1.901zM87.423 6.149c1.391 0 2.52.83 2.52 1.851 0 1.022-1.129 1.851-2.52 1.851s-2.52-.83-2.52-1.851c0-1.022 1.129-1.851 2.52-1.851zM104.337 6.199c1.488 0 2.696.807 2.696 1.801 0 .994-1.208 1.801-2.696 1.801-1.488 0-2.696-.807-2.696-1.801 0-.994 1.208-1.801 2.696-1.801zM121.112 6.249c1.584 0 2.87.784 2.87 1.751 0 .967-1.286 1.751-2.87 1.751-1.585 0-2.872-.784-2.872-1.751 0-.967 1.286-1.751 2.87-1.751zM137.776 6.299c1.68 0 3.045.762 3.045 1.701 0 .939-1.364 1.701-3.045 1.701-1.681 0-3.046-.761-3.046-1.701 0-.939 1.365-1.701 3.046-1.701zM154.351 6.349c1.778 0 3.221.74 3.221 1.651s-1.443 1.651-3.22 1.651c-1.779 0-3.222-.74-3.222-1.651s1.443-1.651 3.22-1.651zM170.854 6.399c1.874 0 3.395.717 3.395 1.601s-1.521 1.601-3.395 1.601-3.396-.717-3.396-1.601 1.522-1.601 3.396-1.601zM187.294 6.344c1.769 0 3.205.742 3.205 1.656 0 .914-1.436 1.656-3.205 1.656-1.768 0-3.204-.742-3.204-1.656 0-.914 1.436-1.656 3.204-1.656zM203.683 6.287c1.657 0 3.003.767 3.003 1.713 0 .946-1.346 1.713-3.003 1.713-1.658 0-3.004-.767-3.004-1.713 0-.946 1.346-1.713 3.004-1.713zM220.025 6.23c1.547 0 2.803.793 2.803 1.77s-1.256 1.77-2.803 1.77-2.803-.792-2.803-1.77 1.256-1.77 2.803-1.77zM236.328 6.172c1.436 0 2.602.82 2.602 1.828 0 1.009-1.166 1.828-2.602 1.828s-2.602-.82-2.602-1.828c0-1.009 1.166-1.828 2.602-1.828zM252.596 6.115c1.325 0 2.401.845 2.401 1.885s-1.076 1.885-2.401 1.885c-1.326 0-2.402-.845-2.402-1.885s1.076-1.885 2.402-1.885zM268.832 6.057c1.214 0 2.2.87 2.2 1.943 0 1.072-.986 1.943-2.2 1.943-1.215 0-2.2-.87-2.2-1.943 0-1.072.985-1.943 2.2-1.943zM285.04 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM301.222 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM317.38 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM333.517 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM349.635 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM365.734 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM381.816 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM397.883 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM413.934 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM429.972 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM445.997 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM462.01 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM478.01 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM494 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM509.84 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM525.344 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM540.294 6.049c1.171 0 2.122.874 2.122 1.951s-.95 1.951-2.122 1.951c-1.171 0-2.122-.874-2.122-1.951s.95-1.951 2.122-1.951zM554.717 6.1c1.24 0 2.248.85 2.248 1.9 0 1.05-1.008 1.9-2.248 1.9-1.24 0-2.248-.85-2.248-1.9 0-1.05 1.008-1.9 2.248-1.9zM569.174 6.15c1.31 0 2.373.829 2.373 1.85 0 1.021-1.063 1.85-2.373 1.85-1.31 0-2.374-.828-2.374-1.85 0-1.021 1.063-1.85 2.373-1.85zM583.938 6.2c1.378 0 2.498.806 2.498 1.8s-1.12 1.8-2.498 1.8c-1.38 0-2.499-.806-2.499-1.8s1.12-1.8 2.499-1.8zM598.964 6.25c1.448 0 2.624.784 2.624 1.75s-1.176 1.75-2.624 1.75c-1.448 0-2.624-.784-2.624-1.75s1.176-1.75 2.624-1.75zM614.18 6.3c1.517 0 2.75.762 2.75 1.7s-1.234 1.7-2.75 1.7-2.75-.762-2.75-1.7 1.233-1.7 2.75-1.7zM629.534 6.35c1.587 0 2.875.74 2.875 1.65 0 .91-1.288 1.65-2.875 1.65-1.586 0-2.874-.74-2.874-1.65 0-.91 1.289-1.65 2.875-1.65zM644.992 6.4c1.656 0 3 .717 3 1.6 0 .883-1.344 1.6-3 1.6-1.655 0-3-.717-3-1.6 0-.883 1.345-1.6 3-1.6zM660.532 6.343c1.578 0 2.858.742 2.858 1.657s-1.28 1.657-2.858 1.657c-1.577 0-2.857-.742-2.857-1.657s1.28-1.657 2.857-1.657zM676.138 6.286c1.498 0 2.714.768 2.714 1.714s-1.216 1.714-2.714 1.714-2.714-.768-2.714-1.714 1.216-1.714 2.714-1.714zM691.798 6.229c1.419 0 2.571.793 2.571 1.771 0 .978-1.152 1.771-2.571 1.771-1.42 0-2.572-.793-2.572-1.771 0-.978 1.152-1.771 2.572-1.771zM707.503 6.171c1.34 0 2.428.82 2.428 1.829 0 1.01-1.088 1.829-2.428 1.829-1.34 0-2.429-.82-2.429-1.829 0-1.01 1.088-1.829 2.429-1.829zM723.247 6.114c1.261 0 2.285.845 2.285 1.886 0 1.04-1.024 1.886-2.285 1.886-1.262 0-2.287-.846-2.287-1.886s1.024-1.886 2.286-1.886zM739.024 6.057c1.183 0 2.143.87 2.143 1.943 0 1.072-.96 1.943-2.143 1.943-1.182 0-2.143-.87-2.143-1.943 0-1.072.96-1.943 2.143-1.943zM754.831 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM770.665 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM786.521 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM802.399 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM818.295 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM834.21 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM850.139 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM866.083 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM882.04 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM898.01 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM913.993 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM929.985 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM945.988 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4zM962 6a2.001 2.001 0 0 1 0 4 2.001 2.001 0 0 1 0-4z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/components/sidebar/sidebar/styles/twisty.css b/waterfox/browser/components/sidebar/sidebar/styles/twisty.css
new file mode 100644
index 0000000000000..1b635f2c098a2
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/styles/twisty.css
@@ -0,0 +1,87 @@
+@charset "UTF-8";
+/*
+# 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/.
+*/
+
+:root {
+  --tab-twisty-offset: calc((var(--tab-ui-size) - var(--favicon-size)) / 2);
+  --tab-twisty-negative-offset: calc((var(--favicon-size) - var(--tab-ui-size)) / 2);
+}
+
+tab-item tab-twisty {
+  display: inline-block;
+  font-size: var(--favicon-size);
+  /*height: var(--favicon-size);*/
+  margin-block: var(--tab-twisty-negative-offset);
+  margin-inline: 0;
+  /*max-height: var(--favicon-size);*/
+  max-width: var(--favicon-size);
+  min-height: var(--favicon-size);
+  min-width: var(--favicon-size);
+  padding-block: var(--tab-twisty-offset);
+  padding-inline: 0;
+  position: relative;
+  transform-origin: 50% 50%;
+  white-space: pre;
+  width: var(--favicon-size);
+  z-index: var(--tab-ui-z-index);
+}
+
+tab-item:not([data-child-ids]) tab-twisty,
+tab-item.pinned tab-twisty,
+tab-item.collapsed tab-twisty {
+  visibility: hidden !important;
+  pointer-events: none !important;
+}
+
+tab-item:not(.collapsed) {
+  &.subtree-collapsed tab-twisty {
+    opacity: 0.9;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  &:not(.subtree-collapsed) tab-twisty {
+    opacity: 0.9;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  tab-twisty::before {
+    -moz-context-properties: fill;
+    background: url("./icons/ArrowheadDown.svg") no-repeat center / 60%;
+    content: "";
+    display: inline-block;
+    fill: var(--tab-text);
+    height: var(--svg-small-icon-size);
+    line-height: 1;
+    margin-block-start: calc((var(--favicon-size) - var(--svg-small-icon-size)) / 2);
+    max-height: var(--favicon-size);
+    max-width: var(--favicon-size);
+    width: var(--svg-small-icon-size);
+  }
+  :root.simulate-svg-context-fill & tab-twisty::before {
+    background: var(--tab-text);
+    mask: url("./icons/ArrowheadDown.svg") no-repeat center / 60%;
+  }
+
+  :root.animation & tab-twisty::before {
+    transition: transform 0.2s ease-out,
+                opacity 0.15s ease-out;
+    transform: rotatez(0);
+  }
+  :root.left
+    &.subtree-collapsed tab-twisty::before {
+    transform: rotatez(-90deg);
+  }
+  :root.right
+    &.subtree-collapsed tab-twisty::before {
+    transform: rotatez(90deg);
+  }
+}
diff --git a/waterfox/browser/components/sidebar/sidebar/subpanel.js b/waterfox/browser/components/sidebar/sidebar/subpanel.js
new file mode 100644
index 0000000000000..7fc38a858129e
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/subpanel.js
@@ -0,0 +1,430 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+import MenuUI from '/extlib/MenuUI.js';
+
+import {
+  log as internalLogger,
+  wait,
+  configs,
+  shouldApplyAnimation,
+  compareAsNumber,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import * as BackgroundConnection from './background-connection.js';
+import * as Size from './size.js';
+
+function log(...args) {
+  internalLogger('sidebar/subpanel', ...args);
+}
+
+export const onResized = new EventListenerManager();
+
+let mTargetWindow;
+let mInitialized = false;
+
+const mContainer       = document.querySelector('#subpanel-container');
+const mHeader          = document.querySelector('#subpanel-header');
+const mSelector        = document.querySelector('#subpanel-selector');
+const mSelectorAnchor  = document.querySelector('#subpanel-selector-anchor');
+const mToggler         = document.querySelector('#subpanel-toggler');
+
+// Don't put iframe statically, because statically embedded iframe
+// produces reflowing on the startup unexpectedly.
+const mSubPanel = document.createElement('iframe');
+mSubPanel.setAttribute('id', 'subpanel');
+mSubPanel.setAttribute('src', 'about:blank');
+
+let mHeight = 0;
+let mDragStartY = 0;
+let mDragStartHeight = 0;
+let mProviderId = null;
+
+updateLayout();
+
+export async function init() {
+  if (mInitialized)
+    return;
+  mInitialized = true;
+  mTargetWindow = TabsStore.getCurrentWindowId();
+
+  const [providerId, height] = await Promise.all([
+    browser.sessions.getWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_PROVIDER_ID).catch(ApiTabs.createErrorHandler()),
+    browser.sessions.getWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_HEIGHT).catch(ApiTabs.createErrorHandler())
+  ]);
+  const providerSpecificHeight = providerId && await browser.sessions.getWindowValue(mTargetWindow, `${Constants.kWINDOW_STATE_SUBPANEL_HEIGHT}:${providerId}`).catch(ApiTabs.createErrorHandler());
+  mHeight = (typeof providerSpecificHeight == 'number') ?
+    providerSpecificHeight :
+    (typeof height == 'number') ?
+      height :
+      Math.max(configs.lastSubPanelHeight, 0);
+
+  log('initialize ', { providerId, height: mHeight });
+
+  mContainer.appendChild(mSubPanel);
+
+  browser.runtime.onMessage.addListener((message, _sender, _respond) => {
+    if (!message ||
+        typeof message.type != 'string' ||
+        message.type.indexOf('ws:') != 0)
+      return;
+
+    //log('onMessage: ', message, sender);
+    switch (message.type) {
+      case TSTAPI.kCOMMAND_BROADCAST_API_REGISTERED:
+        wait(0).then(async () => { // wait until addons are updated
+          updateSelector();
+          const provider = TSTAPI.getAddon(message.sender.id);
+          if (provider &&
+              provider.subPanel &&
+              (mProviderId == provider.id ||
+               provider.newlyInstalled)) {
+            if (mHeight == 0)
+              mHeight = getDefaultHeight();
+            await applyProvider(provider.id);
+          }
+        });
+        break;
+
+      case TSTAPI.kCOMMAND_BROADCAST_API_UNREGISTERED:
+        wait(0).then(() => { // wait until addons are updated
+          updateSelector();
+          if (message.sender.id == mProviderId)
+            restoreLastProvider();
+        });
+        break;
+    }
+  });
+
+  log('initialize: finish ');
+}
+
+TSTAPI.onInitialized.addListener(async () => {
+  await init();
+  updateSelector();
+
+  const providerId = await browser.sessions.getWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_PROVIDER_ID).catch(ApiTabs.createErrorHandler());
+  if (providerId)
+    await applyProvider(providerId);
+  else
+    restoreLastProvider();
+});
+
+function getProviderIconUrl(provider) {
+  if (!provider.icons || typeof provider.icons != 'object')
+    return null;
+
+  if ('16' in provider.icons)
+    return provider.icons['16'];
+
+  const sizes = Object.keys(provider.icons, size => parseInt(size)).sort(compareAsNumber);
+  if (sizes.length == 0)
+    return null;
+
+  // find a size most nearest to 16
+  sizes.sort((a, b) => {
+    if (a < 16) {
+      if (b >= 16)
+        return 1;
+      else
+        return b - a;
+    }
+    if (b < 16) {
+      if (a >= 16)
+        return -1;
+      else
+        return b - a;
+    }
+    return a - b;
+  });
+  return provider.icons[sizes[0]];
+}
+
+async function applyProvider(id) {
+  const provider = TSTAPI.getAddon(id);
+  log('applyProvider ', id, provider);
+  if (provider &&
+      provider.subPanel) {
+    log('applyProvider: load ', id);
+    configs.lastSelectedSubPanelProviderId = mProviderId = id;
+    const lastHeight = await browser.sessions.getWindowValue(mTargetWindow, `${Constants.kWINDOW_STATE_SUBPANEL_HEIGHT}:${id}`).catch(ApiTabs.createErrorHandler());
+    for (const item of mSelector.querySelectorAll('.radio')) {
+      item.classList.remove('checked');
+    }
+    const activeItem = mSelector.querySelector(`[data-value="${id}"]`);
+    if (activeItem)
+      activeItem.classList.add('checked');
+    browser.sessions.setWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_PROVIDER_ID, id).catch(ApiTabs.createErrorHandler());
+
+    const icon = mSelectorAnchor.querySelector('.icon > img');
+    const iconUrl = getProviderIconUrl(provider);
+    if (iconUrl)
+      icon.src = iconUrl;
+    else
+      icon.removeAttribute('src');
+
+    mSelectorAnchor.querySelector('.label').textContent = provider.subPanel.title || provider.name || provider.id;
+
+    if ('fixedHeight' in provider.subPanel) {
+      if (typeof provider.subPanel.fixedHeight == 'number')
+        mHeight = provider.subPanel.fixedHeight;
+      else
+        mHeight = Size.calc(provider.subPanel.fixedHeight);
+      mHeader.classList.remove('resizable');
+    }
+    else {
+      mHeader.classList.add('resizable');
+      if (typeof lastHeight == 'number') {
+        mHeight = lastHeight;
+      }
+      else if ('initialHeight' in provider.subPanel) {
+        if (typeof provider.subPanel.initialHeight == 'number')
+          mHeight = provider.subPanel.initialHeight;
+        else
+          mHeight = Size.calc(provider.subPanel.initialHeight);
+      }
+    }
+
+    const url = new URL(provider.subPanel.url);
+    url.searchParams.set('windowId', mTargetWindow);
+    provider.subPanel.url = url.href;
+
+    if (mHeight > 0)
+      load(provider.subPanel);
+    else
+      load();
+  }
+  else {
+    log('applyProvider: unload missing/invalid provider ', id);
+    const icon = mSelectorAnchor.querySelector('.icon > img');
+    icon.removeAttribute('src');
+    mSelectorAnchor.querySelector('.label').textContent = '';
+    mHeader.classList.add('resizable');
+    load();
+  }
+}
+
+async function restoreLastProvider() {
+  const lastProvider = TSTAPI.getAddon(configs.lastSelectedSubPanelProviderId);
+  log('restoreLastProvider ', lastProvider);
+  if (lastProvider?.subPanel)
+    await applyProvider(lastProvider.id);
+  else if (mSelector.hasChildNodes())
+    await applyProvider(mSelector.firstChild.dataset.value);
+  else
+    await applyProvider(mProviderId = null);
+}
+
+function getDefaultHeight() {
+  return Math.floor(window.innerHeight * 0.5);
+}
+
+async function load(params) {
+  params = params || {};
+  const url = params.url || 'about:blank';
+  if (url == mSubPanel.src &&
+      url != 'about:blank') {
+    mSubPanel.src = 'about:blank?'; // force reload
+    await wait(0);
+  }
+  mSubPanel.src = url;
+  updateLayout();
+}
+
+function updateLayout() {
+  if (!mProviderId && !mSelector.hasChildNodes()) {
+    mContainer.classList.add('collapsed');
+    document.documentElement.style.setProperty('--subpanel-area-size', '0px');
+  }
+  else {
+    mHeight = Math.max(0, mHeight);
+    mContainer.classList.toggle('collapsed', mHeight == 0);
+    const headerSize = mHeader.offsetHeight;
+    const maxHeight = window.innerHeight * Math.max(0, Math.min(1, configs.maxSubPanelSizeRatio));
+    const appliedHeight = Math.min(maxHeight, mHeight);
+    document.documentElement.style.setProperty('--subpanel-content-size', `${appliedHeight}px`);
+    document.documentElement.style.setProperty('--subpanel-area-size', `${appliedHeight + headerSize}px`);
+
+    if (mHeight > 0 &&
+        (!mSubPanel.src || mSubPanel.src == 'about:blank')) {
+      // delayed load
+      const provider = TSTAPI.getAddon(mProviderId);
+      if (provider?.subPanel)
+        mSubPanel.src = provider.subPanel.url;
+    }
+    else if (mHeight == 0) {
+      mSubPanel.src = 'about:blank';
+    }
+  }
+
+  if (!mInitialized)
+    return;
+
+  onResized.dispatch();
+
+  if (mProviderId) {
+    browser.sessions.setWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_HEIGHT, mHeight).catch(ApiTabs.createErrorHandler());
+    browser.sessions.setWindowValue(mTargetWindow, `${Constants.kWINDOW_STATE_SUBPANEL_HEIGHT}:${mProviderId}`, mHeight).catch(ApiTabs.createErrorHandler());
+  }
+}
+
+async function toggle() {
+  const lastEffectiveHeight = await browser.sessions.getWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_EFFECTIVE_HEIGHT).catch(ApiTabs.createErrorHandler());
+  if (mHeight > 0)
+    browser.sessions.setWindowValue(mTargetWindow, Constants.kWINDOW_STATE_SUBPANEL_EFFECTIVE_HEIGHT, mHeight).catch(ApiTabs.createErrorHandler());
+  mHeight = mHeight > 0 ? 0 : (lastEffectiveHeight || getDefaultHeight());
+  updateLayout();
+}
+
+// We should save the last height only when it is changed by the user intentonally.
+function saveLastHeight() {
+  configs.lastSubPanelHeight = mContainer.classList.contains('collapsed') ? 0 : mHeight;
+}
+
+function isFiredOnClickable(event) {
+  let target = event.target;
+  if (!(target instanceof Element))
+    target = target.parentNode;
+  return !!target.closest('.clickable');
+}
+
+function isResizable() {
+  const provider = mProviderId && TSTAPI.getAddon(mProviderId);
+  return !provider || !provider.subPanel || !('fixedHeight' in provider.subPanel);
+}
+
+mHeader.addEventListener('mousedown', event => {
+  if (isFiredOnClickable(event))
+    return;
+  event.stopPropagation();
+  event.preventDefault();
+  mHeader.setCapture(true);
+  mDragStartY = event.clientY;
+  mDragStartHeight = mHeight;
+  mHeader.addEventListener('mousemove', onMouseMove);
+});
+
+mHeader.addEventListener('mouseup', event => {
+  if (isFiredOnClickable(event))
+    return;
+  mHeader.removeEventListener('mousemove', onMouseMove);
+  event.stopPropagation();
+  event.preventDefault();
+  document.releaseCapture();
+  if (!isResizable())
+    return;
+  mHeight = mDragStartHeight - (event.clientY - mDragStartY);
+  updateLayout();
+  saveLastHeight();
+});
+
+mHeader.addEventListener('dblclick', async event => {
+  if (isFiredOnClickable(event))
+    return;
+  event.stopPropagation();
+  event.preventDefault();
+  await toggle();
+  saveLastHeight();
+});
+
+mToggler.addEventListener('click', async event => {
+  event.stopPropagation();
+  event.preventDefault();
+  await toggle();
+  saveLastHeight();
+});
+
+window.addEventListener('resize', _event => {
+  updateLayout();
+});
+
+function onMouseMove(event) {
+  event.stopPropagation();
+  event.preventDefault();
+  if (!isResizable())
+    return;
+  mHeight = mDragStartHeight - (event.clientY - mDragStartY);
+  updateLayout();
+}
+
+
+function updateSelector() {
+  log('updateSelector start');
+  const range = document.createRange();
+  range.selectNodeContents(mSelector);
+  range.deleteContents();
+
+  const items = [];
+  for (const [id, addon] of TSTAPI.getAddons()) {
+    if (!addon.subPanel)
+      continue;
+    log('  subpanel provider detected: ', addon);
+    const item = document.createElement('li');
+    item.classList.add('radio');
+    item.dataset.value = id;
+    const iconContainer = item.appendChild(document.createElement('span'));
+    iconContainer.classList.add('icon');
+    const icon = iconContainer.appendChild(document.createElement('img'));
+    const url = getProviderIconUrl(addon);
+    if (url)
+      icon.src = url;
+    item.appendChild(document.createTextNode(addon.subPanel.title || addon.name || id));
+    items.push(item);
+  }
+
+  items.sort((a, b) => a.textContent < b.textContent ? -1 : 1);
+
+  const itemsFragment = document.createDocumentFragment();
+  for (const item of items) {
+    itemsFragment.appendChild(item);
+  }
+  range.insertNode(itemsFragment);
+  range.detach();
+  log('updateSelector end');
+}
+
+mSelector.ui = new MenuUI({
+  root:       mSelector,
+  appearance: 'panel',
+  onCommand:  onSelect,
+  animationDuration: shouldApplyAnimation() ? configs.collapseDuration : 0.001
+});
+
+async function onSelect(item, _event) {
+  if (item.dataset.value) {
+    await applyProvider(item.dataset.value);
+    saveLastHeight();
+  }
+  mSelector.ui.close();
+}
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_TOGGLE_SUBPANEL:
+      toggle();
+      break;
+
+    case Constants.kCOMMAND_SWITCH_SUBPANEL:
+      mSelector.ui.open({ anchor: mSelectorAnchor });
+      break;
+
+    case Constants.kCOMMAND_INCREASE_SUBPANEL:
+      mHeight += Size.getRenderedTabHeight();
+      updateLayout();
+      break;
+
+    case Constants.kCOMMAND_DECREASE_SUBPANEL:
+      mHeight -= Size.getRenderedTabHeight();
+      updateLayout();
+      break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/tab-context-menu.js b/waterfox/browser/components/sidebar/sidebar/tab-context-menu.js
new file mode 100644
index 0000000000000..8b2e65d45bc4c
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/tab-context-menu.js
@@ -0,0 +1,808 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import MenuUI from '/extlib/MenuUI.js';
+
+import {
+  log as internalLogger,
+  wait,
+  notify,
+  configs,
+  shouldApplyAnimation,
+  compareAsNumber,
+  isLinux,
+  isMacOS,
+} from '/common/common.js';
+import * as ApiTabs from '/common/api-tabs.js';
+import * as BackgroundConnection from './background-connection.js';
+import * as Constants from '/common/constants.js';
+import * as ContextualIdentities from '/common/contextual-identities.js';
+import * as EventUtils from './event-utils.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab, TabGroup, TreeItem } from '/common/TreeItem.js';
+
+import EventListenerManager from '/extlib/EventListenerManager.js';
+
+import * as TabGroupContextMenu from './tab-group-context-menu.js';
+
+function log(...args) {
+  internalLogger('sidebar/tab-context-menu', ...args);
+}
+
+export const onTabsClosing = new EventListenerManager();
+
+let mUI;
+let mMenu;
+
+let mNewTabButtonUI;
+let mNewTabButtonMenu;
+
+let mContextTab      = null;
+let mLastOpenOptions = null;
+let mIsDirty         = false;
+
+const mExtraItems = new Map();
+
+export function init() {
+  mMenu = document.querySelector('#tabContextMenu');
+  mNewTabButtonMenu = document.querySelector('#newTabButtonContextMenu');
+  document.addEventListener('contextmenu', onContextMenu, { capture: true });
+
+  const commonOptions = {
+    appearance:        'menu',
+    animationDuration: shouldApplyAnimation() ? configs.collapseDuration : 0.001,
+    subMenuOpenDelay:  configs.subMenuOpenDelay,
+    subMenuCloseDelay: configs.subMenuCloseDelay,
+  };
+  mUI = new MenuUI({
+    ...commonOptions,
+    root: mMenu,
+    onCommand,
+    //onShown,
+    onHidden,
+  });
+  mNewTabButtonUI = new MenuUI({
+    ...commonOptions,
+    root: mNewTabButtonMenu,
+    onCommand: onNewTabButtonMenuCommand,
+  });
+
+  browser.runtime.onMessage.addListener(onMessage);
+  TSTAPI.onMessageExternal.addListener(onMessageExternal);
+
+  browser.runtime.sendMessage({
+    type: Constants.kCOMMAND_GET_CONTEXT_MENU_ITEMS
+  }).then(items => {
+    importExtraItems(items);
+    mIsDirty = true;
+  }).catch(ApiTabs.createErrorSuppressor());
+
+  updateContextualIdentitiesSelector();
+}
+
+async function rebuild() {
+  if (!mIsDirty)
+    return;
+
+  mIsDirty = false;
+
+  const firstExtraItem = mMenu.querySelector('.extra, .imitated');
+  if (firstExtraItem) {
+    const range = document.createRange();
+    range.selectNodeContents(mMenu);
+    range.setStartBefore(firstExtraItem);
+    range.deleteContents();
+    range.detach();
+  }
+
+  if (mExtraItems.size == 0)
+    return;
+
+  const extraItemNodes = document.createDocumentFragment();
+  const incognitoParams = { windowId: TabsStore.getCurrentWindowId() };
+  for (const [id, extraItems] of mExtraItems.entries()) {
+    const addon = TSTAPI.getAddon(id);
+    if (!TSTAPI.isSafeAtIncognito(id, incognitoParams) ||
+        !addon)
+      continue;
+    let addonItem = document.createElement('li');
+    const name = getAddonName(id);
+    addonItem.appendChild(document.createTextNode(name));
+    addonItem.setAttribute('title', name);
+    addonItem.classList.add('extra');
+    const icon = getAddonIcon(id);
+    if (icon)
+      addonItem.dataset.icon = icon;
+    prepareAsSubmenu(addonItem);
+
+    const toBeBuiltItems = [];
+    for (const item of extraItems) {
+      if (item.visible === false)
+        continue;
+      if (item.contexts && !item.contexts.includes('tab'))
+        continue;
+      if (item.documentUrlPatterns &&
+          (!item.viewTypes ||
+           !item.viewTypes.includes('sidebar') ||
+           item.documentUrlPatterns.some(pattern => !/^moz-extension:/.test(pattern)) ||
+           !matchesToPattern(location.href, item.documentUrlPatterns)) &&
+          mContextTab &&
+          !matchesToPattern(mContextTab.url, item.documentUrlPatterns))
+        continue;
+      toBeBuiltItems.push(item);
+    }
+    const topLevelItems = toBeBuiltItems.filter(item => !item.parentId);
+    if (topLevelItems.length == 1 &&
+        !topLevelItems[0].icons)
+      topLevelItems[0].icons = addon.icons || {};
+
+    const addonSubMenu = addonItem.lastChild;
+    const knownItems   = {};
+    for (const item of toBeBuiltItems) {
+      const itemNode = buildExtraItem(item, id);
+      if (item.parentId) {
+        if (item.parentId in knownItems) {
+          const parent = knownItems[item.parentId];
+          prepareAsSubmenu(parent);
+          parent.lastChild.appendChild(itemNode);
+        }
+        else {
+          continue;
+        }
+      }
+      else {
+        addonSubMenu.appendChild(itemNode);
+      }
+      knownItems[item.id] = itemNode;
+    }
+    if (id == browser.runtime.id) {
+      for (const item of addonSubMenu.children) {
+        if (!item.nextSibling) // except the last "Tree Style Tab" menu
+          continue;
+        item.classList.remove('extra');
+        item.classList.add('imitated');
+      }
+      const range = document.createRange();
+      range.selectNodeContents(addonSubMenu);
+      extraItemNodes.appendChild(range.extractContents());
+      range.detach();
+      continue;
+    }
+    switch (addonSubMenu.childNodes.length) {
+      case 0:
+        break;
+      case 1:
+        addonItem = addonSubMenu.removeChild(addonSubMenu.firstChild);
+        extraItemNodes.appendChild(addonItem);
+      default:
+        extraItemNodes.appendChild(addonItem);
+        break;
+    }
+  }
+  if (!extraItemNodes.hasChildNodes())
+    return;
+
+  mMenu.appendChild(extraItemNodes);
+}
+
+function getAddonName(id) {
+  if (id == browser.runtime.id)
+    return browser.i18n.getMessage('extensionName');
+  const addon = TSTAPI.getAddon(id) || {};
+  return addon.name || id.replace(/@.+$/, '');
+}
+
+function getAddonIcon(id) {
+  const addon = TSTAPI.getAddon(id) || {};
+  return chooseIconForAddon({
+    id:         id,
+    internalId: addon.internalId,
+    icons:      addon.icons || {}
+  });
+}
+
+function chooseIconForAddon(params) {
+  const icons = params.icons || {};
+  const addon = TSTAPI.getAddon(params.id) || {};
+  let sizes = Object.keys(icons).map(aSize => parseInt(aSize)).sort(compareAsNumber);
+  const reducedSizes = sizes.filter(aSize => aSize < 16);
+  if (reducedSizes.length > 0)
+    sizes = reducedSizes;
+  const size = sizes[0] || null;
+  if (!size)
+    return null;
+  let url = icons[size];
+  if (!/^\w+:\/\//.test(url))
+    url = `moz-extension://${addon.internalId || params.internalId}/${url.replace(/^\//, '')}`;
+  return url;
+}
+
+function prepareAsSubmenu(itemNode) {
+  if (itemNode.querySelector('ul'))
+    return itemNode;
+  itemNode.appendChild(document.createElement('ul'));
+  return itemNode;
+}
+
+function buildExtraItem(item, ownerAddonId) {
+  const itemNode = document.createElement('li');
+  itemNode.setAttribute('id', `${ownerAddonId}-${item.id}`);
+  itemNode.setAttribute('data-item-id', item.id);
+  itemNode.setAttribute('data-item-owner-id', ownerAddonId);
+  itemNode.classList.add('extra');
+  itemNode.classList.add(item.type || 'normal');
+  if (item.type == 'checkbox' || item.type == 'radio') {
+    if (item.checked)
+      itemNode.classList.add('checked');
+  }
+  if (item.type != 'separator') {
+    itemNode.appendChild(document.createTextNode(item.title));
+    itemNode.setAttribute('title', item.title);
+  }
+  itemNode.classList.toggle('disabled', item.enabled === false);
+  const addon = TSTAPI.getAddon(ownerAddonId) || {};
+  const icon = chooseIconForAddon({
+    id:         ownerAddonId,
+    internalId: addon.internalId,
+    icons:      item.icons || {}
+  });
+  if (icon)
+    itemNode.dataset.icon = icon;
+  return itemNode;
+}
+
+function matchesToPattern(url, patterns) {
+  if (!Array.isArray(patterns))
+    patterns = [patterns];
+  for (const pattern of patterns) {
+    if (matchPatternToRegExp(pattern).test(url))
+      return true;
+  }
+  return false;
+}
+// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns
+const matchPattern = /^(?:(\*|http|https|file|ftp|app|moz-extension):\/\/([^\/]+|)\/?(.*))$/i;
+function matchPatternToRegExp(pattern) {
+  if (pattern === '<all_urls>')
+    return (/^(?:https?|file|ftp|app):\/\//);
+  const match = matchPattern.exec(pattern);
+  if (!match)
+    throw new TypeError(`"${pattern}" is not a valid MatchPattern`);
+
+  const [, scheme, host, path,] = match;
+  return new RegExp('^(?:'
+                    + (scheme === '*' ? 'https?' : escape(scheme)) + ':\\/\\/'
+                    + (host === '*' ? '[^\\/]*' : escape(host).replace(/^\*\./g, '(?:[^\\/]+)?'))
+                    + (path ? (path == '*' ? '(?:\\/.*)?' : ('\\/' + escape(path).replace(/\*/g, '.*'))) : '\\/?')
+                    + ')$');
+}
+
+export async function open(options = {}) {
+  await close();
+  mLastOpenOptions = options;
+  mContextTab      = Tab.get(options.tab?.id);
+  await rebuild();
+  if (mIsDirty) {
+    return await open(options);
+  }
+  applyContext();
+  const originalCanceller = options.canceller;
+  options.canceller = () => {
+    return (typeof originalCanceller == 'function' && originalCanceller()) || mIsDirty;
+  };
+  await mUI.open(options);
+  if (mIsDirty) {
+    return await open(options);
+  }
+}
+
+export async function close() {
+  await mUI.close();
+  mMenu.removeAttribute('data-tab-id');
+  mMenu.removeAttribute('data-tab-states');
+  mContextTab      = null;
+  mLastOpenOptions = null;
+}
+
+function applyContext() {
+  if (mContextTab) {
+    mMenu.setAttribute('data-tab-id', mContextTab.id);
+    const states = [];
+    if (mContextTab.active)
+      states.push('active');
+    if (mContextTab.pinned)
+      states.push('pinned');
+    if (mContextTab.audible)
+      states.push('audible');
+    if (mContextTab.$TST.muted)
+      states.push('muted');
+    if (mContextTab.discarded)
+      states.push('discarded');
+    if (mContextTab.incognito)
+      states.push('incognito');
+    if (mContextTab.$TST.multiselected)
+      states.push('multiselected');
+    mMenu.setAttribute('data-tab-states', states.join(' '));
+  }
+}
+
+async function onCommand(item, event) {
+  if (event.button == 1)
+    return;
+
+  const contextTab = mContextTab;
+  wait(0).then(() => close()); // close the menu immediately!
+
+  const id = item.getAttribute('data-item-id');
+  if (!id)
+    return;
+
+  const modifiers = [];
+  if (event.metaKey)
+    modifiers.push('Command');
+  if (event.ctrlKey) {
+    modifiers.push('Ctrl');
+    if (isMacOS())
+      modifiers.push('MacCtrl');
+  }
+  if (event.shiftKey)
+    modifiers.push('Shift');
+  const owner      = item.getAttribute('data-item-owner-id');
+  const checked    = item.matches('.radio, .checkbox:not(.checked)');
+  const wasChecked = item.matches('.radio.checked, .checkbox.checked');
+  const message = {
+    type: TSTAPI.kCONTEXT_MENU_CLICK,
+    info: {
+      checked,
+      editable:         false,
+      frameUrl:         null,
+      linkUrl:          null,
+      mediaType:        null,
+      menuItemId:       id,
+      button:           event.button,
+      modifiers:        modifiers,
+      pageUrl:          null,
+      parentMenuItemId: null,
+      selectionText:    null,
+      srcUrl:           null,
+      wasChecked
+    },
+    tab: contextTab?.$TST.sanitized || contextTab,
+  };
+  if (owner == browser.runtime.id) {
+    await browser.runtime.sendMessage(message).catch(ApiTabs.createErrorSuppressor());
+  }
+  else if (TSTAPI.isSafeAtIncognito(owner, { tab: contextTab, windowId: TabsStore.getCurrentWindowId() })) {
+    const cache = {};
+    await Promise.all([
+      TSTAPI.sendMessage(
+        owner,
+        message,
+        { tabProperties: ['tab'], cache, isContextTab: true }
+      ).catch(ApiTabs.createErrorSuppressor()),
+      TSTAPI.sendMessage(
+        owner,
+        {
+          ...message,
+          type: TSTAPI.kFAKE_CONTEXT_MENU_CLICK
+        },
+        { tabProperties: ['tab'], cache, isContextTab: true }
+      ).catch(ApiTabs.createErrorSuppressor())
+    ]);
+  }
+
+  if (item.matches('.checkbox')) {
+    item.classList.toggle('checked');
+    for (const itemData of mExtraItems.get(item.dataset.itemOwnerId)) {
+      if (itemData.id != item.dataset.itemId)
+        continue;
+      itemData.checked = item.matches('.checked');
+      browser.runtime.sendMessage({
+        type:    Constants.kCOMMAND_NOTIFY_CONTEXT_ITEM_CHECKED_STATUS_CHANGED,
+        id:      item.dataset.itemId,
+        ownerId: item.dataset.itemOwnerId,
+        checked: itemData.checked
+      }).catch(ApiTabs.createErrorSuppressor());
+      break;
+    }
+    mIsDirty = true;
+  }
+  else if (item.matches('.radio')) {
+    const currentRadioItems = new Set();
+    let radioItems = null;
+    for (const itemData of mExtraItems.get(item.dataset.itemOwnerId)) {
+      if (itemData.type == 'radio') {
+        currentRadioItems.add(itemData);
+      }
+      else if (radioItems == currentRadioItems) {
+        break;
+      }
+      else {
+        currentRadioItems.clear();
+      }
+      if (itemData.id == item.dataset.itemId)
+        radioItems = currentRadioItems;
+    }
+    if (radioItems) {
+      for (const itemData of radioItems) {
+        itemData.checked = itemData.id == item.dataset.itemId;
+        const radioItem = document.getElementById(`${item.dataset.itemOwnerId}-${itemData.id}`);
+        if (radioItem)
+          radioItem.classList.toggle('checked', itemData.checked);
+        browser.runtime.sendMessage({
+          type:    Constants.kCOMMAND_NOTIFY_CONTEXT_ITEM_CHECKED_STATUS_CHANGED,
+          id:      item.dataset.itemId,
+          ownerId: item.dataset.itemOwnerId,
+          checked: itemData.checked
+        }).catch(ApiTabs.createErrorSuppressor());
+      }
+    }
+    mIsDirty = true;
+  }
+}
+
+async function onShown(contextTab) {
+  contextTab = contextTab || mContextTab
+  const message = {
+    type: TSTAPI.kCONTEXT_MENU_SHOWN,
+    info: {
+      editable:         false,
+      frameUrl:         null,
+      linkUrl:          null,
+      mediaType:        null,
+      pageUrl:          null,
+      selectionText:    null,
+      srcUrl:           null,
+      contexts:         ['tab'],
+      menuIds:          [],
+      viewType:         'sidebar',
+      bookmarkId:       null
+    },
+    tab: contextTab,
+    windowId: TabsStore.getCurrentWindowId()
+  };
+  const cache = {};
+  const result = Promise.all([
+    browser.runtime.sendMessage({
+      ...message,
+      tab: message.tab && await TSTAPI.exportTab(message.tab, browser.runtime.id, { cache })
+    }).catch(ApiTabs.createErrorSuppressor()),
+    TSTAPI.broadcastMessage(
+      message,
+      { tabProperties: ['tab'], cache, isContextTab: true }
+    ),
+    TSTAPI.broadcastMessage(
+      {
+        ...message,
+        type: TSTAPI.kFAKE_CONTEXT_MENU_SHOWN
+      },
+      { tabProperties: ['tab'], cache, isContextTab: true }
+    ),
+  ]);
+  return result;
+}
+
+async function onHidden() {
+  const message = {
+    type: TSTAPI.kCONTEXT_MENU_HIDDEN,
+    windowId: TabsStore.getCurrentWindowId()
+  };
+  return Promise.all([
+    browser.runtime.sendMessage(message).catch(ApiTabs.createErrorSuppressor()),
+    TSTAPI.broadcastMessage(message),
+    TSTAPI.broadcastMessage({
+      ...message,
+      type: TSTAPI.kFAKE_CONTEXT_MENU_HIDDEN
+    })
+  ]);
+}
+
+
+function updateContextualIdentitiesSelector() {
+  const disabled = document.documentElement.classList.contains('incognito') || ContextualIdentities.getCount() == 0;
+
+  const range    = document.createRange();
+  range.selectNodeContents(mNewTabButtonMenu);
+  range.deleteContents();
+
+  if (disabled)
+    return;
+
+  const fragment = ContextualIdentities.generateMenuItems({
+    hasDefault: true,
+  });
+  range.insertNode(fragment);
+  range.detach();
+}
+
+ContextualIdentities.onUpdated.addListener(() => {
+  updateContextualIdentitiesSelector();
+});
+
+async function onNewTabButtonMenuCommand(item, event) {
+  if (item.dataset.value) {
+    const action = EventUtils.isAccelAction(event) ?
+      configs.autoAttachOnNewTabButtonMiddleClick :
+      configs.autoAttachOnNewTabCommand;
+    BackgroundConnection.sendMessage({
+      type:          Constants.kCOMMAND_NEW_TAB_AS,
+      baseTabId:     Tab.getActiveTab(TabsStore.getCurrentWindowId()).id,
+      as:            action,
+      cookieStoreId: item.dataset.value,
+      inBackground:  event.shiftKey,
+    });
+  }
+
+  mNewTabButtonUI.close();
+}
+
+
+function onMessage(message, _sender) {
+  log('tab-context-menu: internally called:', message);
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TABS_CLOSING:
+      // Don't respond to message for other windows, because
+      // the sender receives only the firstmost response.
+      if (message.windowId != TabsStore.getCurrentWindowId())
+        return;
+      return Promise.resolve(onTabsClosing.dispatch(message.tabs));
+
+    case Constants.kCOMMAND_NOTIFY_CONTEXT_MENU_UPDATED: {
+      importExtraItems(message.items);
+      mIsDirty = true;
+      if (mUI.opened)
+        open(mLastOpenOptions);
+    }; break;
+  }
+}
+
+function importExtraItems(importedItems) {
+  mExtraItems.clear();
+  for (const [id, items] of Object.entries(importedItems)) {
+    mExtraItems.set(id, items);
+  }
+}
+
+let mReservedOverrideContext = null;
+
+function onMessageExternal(message, sender) {
+  switch (message.type) {
+    case TSTAPI.kCONTEXT_MENU_OPEN:
+    case TSTAPI.kFAKE_CONTEXT_MENU_OPEN:
+      log('TSTAPI.kCONTEXT_MENU_OPEN:', message, { id: sender.id, url: sender.url });
+      return (async () => {
+        const tab      = message.tab ? Tab.get(message.tab) : null ;
+        const windowId = message.window || tab?.windowId;
+        if (windowId != TabsStore.getCurrentWindowId())
+          return;
+        await onShown(tab);
+        await wait(25);
+        return open({
+          tab,
+          left:     message.left,
+          top:      message.top
+        });
+      })();
+
+    case TSTAPI.kOVERRIDE_CONTEXT:
+      if (message.windowId != TabsStore.getCurrentWindowId())
+        return;
+      mReservedOverrideContext = (
+        message.context == 'bookmark' ?
+          { context:    'bookmark',
+            bookmarkId: message.bookmarkId } :
+          message.context == 'tab' ?
+            { context:    'tab',
+              tabId:      message.tabId } :
+            null
+      );
+      if (mReservedOverrideContext) {
+        if (reserveToActivateSubpanel.reserved) {
+          clearTimeout(reserveToActivateSubpanel.reserved);
+          reserveToActivateSubpanel.reserved = null;
+        }
+        browser.runtime.sendMessage({
+          type:     Constants.kCOMMAND_NOTIFY_CONTEXT_OVERRIDDEN,
+          context:  mReservedOverrideContext,
+          windowId: message.windowId,
+          owner:    sender.id
+        });
+        // We need to ignore mouse events on the iframe, to handle
+        // the contextmenu event on this parent frame side.
+        document.getElementById('subpanel').style.pointerEvents = 'none';
+      }
+      break;
+  }
+}
+
+function reserveToActivateSubpanel() {
+  if (reserveToActivateSubpanel.reserved)
+    clearTimeout(reserveToActivateSubpanel.reserved);
+  reserveToActivateSubpanel.reserved = setTimeout(() => {
+    reserveToActivateSubpanel.reserved = null;
+    document.getElementById('subpanel').style.pointerEvents = '';
+  }, 100);
+}
+reserveToActivateSubpanel.reserved = null;
+
+// safe guard
+window.addEventListener('mouseup', _event => {
+  reserveToActivateSubpanel();
+});
+
+async function onContextMenu(event) {
+  reserveToActivateSubpanel();
+  const focused = document.querySelector(':focus');
+  log('onContextMenu: start ', event, focused);
+
+  const context = mReservedOverrideContext;
+  mReservedOverrideContext = null;
+
+  const openedByKeyboardOperation = (
+    event.button == 0 &&
+    !event.aleKey &&
+    !event.ctrlKey &&
+    !event.shiftKey &&
+    !event.metaKey
+  );
+  const keyboardOperationTarget = focused?.closest('[data-tab-id]') ||
+    Tab.getActiveTab(TabsStore.getCurrentWindowId()).$TST.element;
+  const target = openedByKeyboardOperation ?
+    keyboardOperationTarget :
+    EventUtils.getElementTarget(event);
+  const originalTarget = openedByKeyboardOperation ?
+    keyboardOperationTarget :
+    EventUtils.getElementOriginalTarget(event);
+  const onInputField   = (
+    target.closest('input, textarea') ||
+    originalTarget.closest('input, textarea')
+  );
+  log('onContextMenu: ', { target, originalTarget, onInputField, context });
+
+  if (!onInputField && context?.context) {
+    log('onContextMenu: override context aso something given: ', context);
+    try {
+      browser.menus.overrideContext(context);
+    }
+    catch(error) {
+      console.log('failed to override context: ', error);
+      try {
+        if (context.context == 'bookmark' &&
+            !(await Permissions.isGranted(Permissions.BOOKMARKS)))
+          notify({
+            title:   browser.i18n.getMessage('bookmarkContext_notification_notPermitted_title'),
+            message: browser.i18n.getMessage(`bookmarkContext_notification_notPermitted_message${isLinux() ? '_linux' : ''}`),
+            url:     `moz-extension://${location.host}/options/options.html#bookmarksPermissionGranted_context`
+          });
+        else
+          console.error(error);
+      }
+      catch(error) {
+        console.error(error);
+      }
+    }
+    return;
+  }
+
+  console.log('notify context menu is overridden');
+  browser.runtime.sendMessage({
+    type:    Constants.kCOMMAND_NOTIFY_CONTEXT_OVERRIDDEN,
+    context: null
+  });
+
+  if (onInputField) {
+    console.log('ignroe request on a input field');
+    return;
+  }
+
+  const modifierKeyPressed = isMacOS() ? event.metaKey : event.ctrlKey;
+
+  const originalTargetBookmarkElement = originalTarget?.closest('[data-bookmark-id]');
+  const bookmarkId = originalTargetBookmarkElement?.dataset.bookmarkId;
+  if (bookmarkId &&
+      !modifierKeyPressed) {
+    log('onContextMenu: override context as bookmark context menu');
+    browser.menus.overrideContext({
+      context:    'bookmark',
+      bookmarkId: bookmarkId
+    });
+    return;
+  }
+
+  const originalTargetTreeItemElement = originalTarget?.closest('[data-tab-id]');
+  const tab = originalTargetTreeItemElement ?
+    TabsStore.ensureLivingItem(Tab.get(parseInt(originalTargetTreeItemElement.dataset.tabId))) :
+    EventUtils.getTreeItemFromEvent(event);
+  if (tab &&
+      !modifierKeyPressed) {
+    log('onContextMenu: override context as tab context menu');
+    browser.menus.overrideContext({
+      context: 'tab',
+      tabId: tab.id
+    });
+    return;
+  }
+
+  if (EventUtils.isEventFiredOnNewTabButton(event)) {
+    log('onContextMenu: on new tab button');
+    event.stopPropagation();
+    event.preventDefault();
+    mNewTabButtonUI.open({
+      left: event.clientX,
+      top:  event.clientY,
+    });
+    return;
+  }
+
+  const originalTargetNativeTabGroupElement = originalTarget?.closest(`[type="${TreeItem.TYPE_GROUP}"][data-native-tab-group-id]`);
+  const nativeTabGroup = originalTargetNativeTabGroupElement?.$TST.group;
+  if (nativeTabGroup &&
+      !modifierKeyPressed) {
+    log('onContextMenu: on native tab group');
+    event.stopPropagation();
+    event.preventDefault();
+    TabGroupContextMenu.show(nativeTabGroup);
+    return;
+  }
+
+  if (event.target == document.body) { // when the application key is pressed
+    log('onContextMenu: override context as tab context menu for blank area');
+    browser.menus.overrideContext({
+      context: 'tab',
+      tabId:   Tab.getActiveTab(TabsStore.getCurrentWindowId()).id,
+    });
+    return;
+  }
+
+  if (!configs.emulateDefaultContextMenu) {
+    log('onContextMenu: no emulation');
+    return;
+  }
+
+  log('onContextMenu: show emulated context menu');
+  event.stopPropagation();
+  event.preventDefault();
+  await onShown(tab);
+  await wait(25);
+  await open({
+    tab,
+    left: event.clientX,
+    top:  event.clientY
+  });
+}
+
+BackgroundConnection.onMessage.addListener(async message => {
+  switch (message.type) {
+    case Constants.kCOMMAND_NOTIFY_TAB_CREATED:
+    case Constants.kCOMMAND_NOTIFY_TAB_MOVED:
+    case Constants.kCOMMAND_NOTIFY_TAB_REMOVING:
+    case Constants.kCOMMAND_NOTIFY_TAB_ACTIVATED:
+    case Constants.kCOMMAND_NOTIFY_TAB_PINNED:
+    case Constants.kCOMMAND_NOTIFY_TAB_UNPINNED:
+    case Constants.kCOMMAND_NOTIFY_TAB_SHOWN:
+    case Constants.kCOMMAND_NOTIFY_TAB_HIDDEN:
+    case Constants.kCOMMAND_NOTIFY_CHILDREN_CHANGED:
+      close();
+      mNewTabButtonUI.close();
+      break;
+
+    case Constants.kCOMMAND_SHOW_NATIVE_TAB_GROUP_MENU_PANEL: {
+      close();
+      mNewTabButtonUI.close();
+      const group = TabGroup.get(message.groupId);
+      Promise.race([
+        group.$TST?.promisedElement,
+        wait(250),
+      ]).then(() => {
+        TabGroupContextMenu.show(group, true);
+      });
+    }; break;
+  }
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/tab-group-context-menu.js b/waterfox/browser/components/sidebar/sidebar/tab-group-context-menu.js
new file mode 100644
index 0000000000000..a3a3c237addee
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/tab-group-context-menu.js
@@ -0,0 +1,145 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+  log as internalLogger,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import { Tab } from '/common/TreeItem.js';
+
+import InContentPanelController from '/resources/module/InContentPanelController.js';
+import TabGroupMenuPanel from '/resources/module/TabGroupMenuPanel.js'; // the IMPL
+
+function log(...args) {
+  internalLogger('sidebar/tab-group-context-menu', ...args);
+}
+
+const TAB_GROUP_MENU_LABELS = Object.fromEntries(`
+  tabGroupMenu_tab-group-editor-title-create
+  tabGroupMenu_tab-group-editor-title-edit
+  tabGroupMenu_tab-group-editor-name-label
+  tabGroupMenu_tab-group-editor-name-field_placeholder
+  tabGroupMenu_tab-group-editor-cancel_label
+  tabGroupMenu_tab-group-editor-cancel_accesskey
+  tabGroupMenu_tab-group-editor-color-selector_aria-label
+  tabGroupMenu_tab-group-editor-color-selector2-blue
+  tabGroupMenu_tab-group-editor-color-selector2-blue_title
+  tabGroupMenu_tab-group-editor-color-selector2-purple
+  tabGroupMenu_tab-group-editor-color-selector2-purple_title
+  tabGroupMenu_tab-group-editor-color-selector2-cyan
+  tabGroupMenu_tab-group-editor-color-selector2-cyan_title
+  tabGroupMenu_tab-group-editor-color-selector2-orange
+  tabGroupMenu_tab-group-editor-color-selector2-orange_title
+  tabGroupMenu_tab-group-editor-color-selector2-yellow
+  tabGroupMenu_tab-group-editor-color-selector2-yellow_title
+  tabGroupMenu_tab-group-editor-color-selector2-pink
+  tabGroupMenu_tab-group-editor-color-selector2-pink_title
+  tabGroupMenu_tab-group-editor-color-selector2-green
+  tabGroupMenu_tab-group-editor-color-selector2-green_title
+  tabGroupMenu_tab-group-editor-color-selector2-gray
+  tabGroupMenu_tab-group-editor-color-selector2-gray_title
+  tabGroupMenu_tab-group-editor-color-selector2-red
+  tabGroupMenu_tab-group-editor-color-selector2-red_title
+  tabGroupMenu_tab-group-editor-action-new-tab_label
+  tabGroupMenu_tab-group-editor-action-new-window_label
+  tabGroupMenu_tab-group-editor-action-save_label
+  tabGroupMenu_tab-group-editor-action-ungroup_label
+  tabGroupMenu_tab-group-editor-action-delete_label
+  tabGroupMenu_tab-group-editor-done_label
+  tabGroupMenu_tab-group-editor-done_accesskey
+`.trim().split(/\s+/).map(key => [key.replace(/-/g, '_'), browser.i18n.getMessage(key)]));
+const TAB_GROUP_MENU_LABELS_CODE = JSON.stringify(TAB_GROUP_MENU_LABELS);
+
+const mTabGroupMenuPanel = new TabGroupMenuPanel(document.querySelector('#tabGroupContextMenuRoot'), TAB_GROUP_MENU_LABELS);
+const mController = new InContentPanelController({
+  type:    TabGroupMenuPanel.TYPE,
+  logger:  log,
+  shouldLog() {
+    return configs.logFor['sidebar/tab-group-context-menu'] && configs.debug;
+  },
+  canRenderInSidebar() {
+    return !!(configs.tabGroupMenuPanelRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR);
+  },
+  canRenderInContent() {
+    return !!(configs.tabGroupMenuPanelRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_CONTENT);
+  },
+  shouldFallbackToSidebar() {
+    return !!(configs.tabGroupMenuPanelRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR);
+  },
+  UIClass: TabGroupMenuPanel,
+  inSidebarUI: mTabGroupMenuPanel,
+  initializerCode: `
+    const root = document.createElement('div');
+    appendClosedContents(root);
+    const tabGroupMenuPanel = new TabGroupMenuPanel(root, ${TAB_GROUP_MENU_LABELS_CODE});
+
+    let destroy;
+
+    const onMouseDown = event => {
+      if (event.target?.closest(window.closedContainerType)) {
+        return;
+      }
+      if (logging)
+        console.log('mouse down on out of tab group menu panel, destroy tab group menu container');
+      browser.runtime.sendMessage({
+        type: 'ws:${TabGroupMenuPanel.TYPE}:hide',
+        timestamp: Date.now(),
+      });
+      destroyClosedContents(destroy);
+    };
+    document.documentElement.addEventListener('mousedown', onMouseDown, { captuer: true });
+
+    destroy = createClosedContentsDestructor(tabGroupMenuPanel, () => {
+      document.documentElement.removeEventListener('mousedown', onMouseDown, { captuer: true });
+    });
+
+    return tabGroupMenuPanel;
+  `,
+});
+
+export async function show(group, creating = false) {
+  if (!group?.id) {
+    return;
+  }
+
+  if (!mTabGroupMenuPanel.windowId) {
+    const windowId = TabsStore.getCurrentWindowId();
+    mTabGroupMenuPanel.windowId = windowId;
+  }
+
+  mController.show({
+    anchorItem: group,
+    targetItem: group,
+    messageParams: {
+      groupTitle: group.title,
+      groupColor: group.color,
+      creating: !!creating,
+    },
+  });
+}
+
+document.querySelector('#tabbar').addEventListener('mousedown', event => {
+  if (event.target?.closest('#tabGroupContextMenuRoot')) {
+    return;
+  }
+
+  const timestamp = Date.now();
+  mController.sendInSidebarMessage({
+    type: `ws:${TabGroupMenuPanel.TYPE}:hide`,
+    timestamp,
+  });
+
+  const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+  if (activeTab) {
+    mController.sendMessage(activeTab.id, {
+      type: `ws:${TabGroupMenuPanel.TYPE}:hide-if-shown`,
+      timestamp,
+    });
+  }
+}, { capture: true });
diff --git a/waterfox/browser/components/sidebar/sidebar/tab-preview-tooltip.js b/waterfox/browser/components/sidebar/sidebar/tab-preview-tooltip.js
new file mode 100644
index 0000000000000..221410605f48a
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/tab-preview-tooltip.js
@@ -0,0 +1,230 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  configs,
+  log as internalLogger,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as Permissions from '/common/permissions.js';
+import * as TabsStore from '/common/tabs-store.js';
+import { Tab, TreeItem } from '/common/TreeItem.js';
+
+import InContentPanelController from '/resources/module/InContentPanelController.js';
+import TabPreviewPanel from '/resources/module/TabPreviewPanel.js'; // the IMPL
+
+import * as EventUtils from './event-utils.js';
+import * as Sidebar from './sidebar.js';
+
+import { kEVENT_TREE_ITEM_SUBSTANCE_ENTER, kEVENT_TREE_ITEM_SUBSTANCE_LEAVE } from './components/TreeItemElement.js';
+
+const CAPTURABLE_URLS_MATCHER         = /^(https?|data):/;
+const PREVIEW_WITH_HOST_URLS_MATCHER  = /^(https?|moz-extension):/;
+const PREVIEW_WITH_TITLE_URLS_MATCHER = /^file:/;
+
+document.addEventListener(kEVENT_TREE_ITEM_SUBSTANCE_ENTER, onTabSubstanceEnter);
+document.addEventListener(kEVENT_TREE_ITEM_SUBSTANCE_LEAVE, onTabSubstanceLeave);
+
+function log(...args) {
+  internalLogger('sidebar/tab-preview-tooltip', ...args);
+}
+
+const hoveringTabIds = new Set();
+
+const mTabPreviewPanel = new TabPreviewPanel(document.querySelector('#tabPreviewRoot'));
+const mController = new InContentPanelController({
+  type:    TabPreviewPanel.TYPE,
+  logger:  log,
+  shouldLog() {
+    return configs.logFor['sidebar/tab-preview-tooltip'] && configs.debug;
+  },
+  canRenderInSidebar() {
+    return !!(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR);
+  },
+  canRenderInContent() {
+    return !!(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_CONTENT);
+  },
+  shouldFallbackToSidebar() {
+    return !!(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR);
+  },
+  canSendPossibleExpiredMessage(message) {
+    return (
+      message.type != `ws:${TabPreviewPanel.TYPE}:show` ||
+      hoveringTabIds.has(message.targetId)
+    );
+  },
+  UIClass: TabPreviewPanel,
+  inSidebarUI: mTabPreviewPanel,
+  initializerCode: `
+    const root = document.createElement('div');
+    appendClosedContents(root);
+    const tabPreviewPanel = new TabPreviewPanel(root);
+
+    let destroy;
+
+    const onMouseMove = () => {
+      if (logging)
+        console.log('mouse move on the content area, destroy tab preview container');
+      browser.runtime.sendMessage({
+        type: 'ws:${TabPreviewPanel.TYPE}:hide',
+        timestamp: Date.now(),
+      });
+      destroyClosedContents(destroy);
+    };
+    document.documentElement.addEventListener('mousemove', onMouseMove, { once: true });
+
+    destroy = createClosedContentsDestructor(tabPreviewPanel, () => {
+      window.removeEventListener('mousemove', onMouseMove);
+    });
+
+    return tabPreviewPanel;
+  `,
+});
+
+async function onTabSubstanceEnter(event) {
+  const timestamp = Date.now();
+
+  const canCaptureTab = Permissions.isGrantedSync(Permissions.ALL_URLS);
+  if (!canCaptureTab)
+    return;
+
+  const windowId = TabsStore.getCurrentWindowId();
+  const activeTab = Tab.getActiveTab(windowId) || (await browser.tabs.query({ active: true, windowId }))[0];
+
+  if (!configs.tabPreviewTooltip ||
+      !(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_ANYWHERE)) {;
+    mController.hideIn(activeTab.id);
+    return;
+  }
+
+  if (!event.target.tab ||
+      event.target.tab.type != TreeItem.TYPE_TAB ||
+      document.documentElement.classList.contains(Constants.kTABBAR_STATE_TAB_DRAGGING)) {
+    return;
+  }
+
+  const active = event.target.tab?.id == activeTab.id;
+  const url = PREVIEW_WITH_HOST_URLS_MATCHER.test(event.target.tab?.url) ? new URL(event.target.tab?.url).host :
+    PREVIEW_WITH_TITLE_URLS_MATCHER.test(event.target.tab?.url) ? null :
+      event.target.tab?.url;
+  const hasCustomTooltip = !!event.target.hasCustomTooltip;
+  const hasPreview = (
+    !active &&
+    !event.target.tab?.discarded &&
+    CAPTURABLE_URLS_MATCHER.test(event.target.tab?.url) &&
+    !hasCustomTooltip
+  );
+  const previewURL = (
+    hasPreview &&
+    canCaptureTab &&
+    configs.tabPreviewTooltip &&
+    (async () => { // We just define a getter function for now, because further operations may contain async operations and we can call this at there for more optimization.
+      try {
+        return await browser.tabs.captureTab(event.target.tab?.id);
+      }
+      catch (_error) {
+      }
+      return null;
+    })
+  ) || null;
+
+  if (!event.target.tab)
+    return;
+
+  log(`onTabSubstanceEnter(${event.target.tab.id}}) start `, timestamp);
+
+  hoveringTabIds.add(event.target.tab.id);
+
+  const succeeded = await mController.show({
+    anchorItem: event.target.tab,
+    targetItem: event.target.tab,
+    messageParams: {
+      hasCustomTooltip,
+      ...(hasCustomTooltip ?
+        {
+          tooltipHtml: event.target.appliedTooltipHtml,
+        } :
+        {
+          title: event.target.tab.title,
+          url,
+        }
+      ),
+      hasPreview,
+      previewURL: null,
+      // This is required to simulate the behavior:
+      // show tab preview panel with delay only when the panel is not shown yet.
+      waitInitialShowUntil: timestamp + Math.max(configs.tabPreviewTooltipDelayMsec, 0),
+    },
+    promisedMessageParams: new Promise(async (resolve, _reject) => {
+      const promisedPreviewURL = typeof previewURL == 'function' && previewURL();
+      if (!promisedPreviewURL) {
+        return resolve(null);
+      }
+      resolve({
+        previewURL: await promisedPreviewURL,
+      });
+    }),
+    canRenderInSidebar() {
+      return !!(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR) &&
+        !(hasCustomTooltip && configs.showCollapsedDescendantsByLegacyTooltipOnSidebar);
+    },
+    shouldFallbackToSidebar() {
+      return !!(configs.tabPreviewTooltipRenderIn & Constants.kIN_CONTENT_PANEL_RENDER_IN_SIDEBAR) &&
+        !(hasCustomTooltip && configs.showCollapsedDescendantsByLegacyTooltipOnSidebar);
+    },
+  });
+
+  if (!event.target.tab) // the tab may be destroyied while we capturing tab preview
+    return;
+
+  if (event.target.tab.$TST.element &&
+      succeeded)
+    event.target.tab.$TST.element.invalidateTooltip();
+}
+onTabSubstanceEnter = EventUtils.wrapWithErrorHandler(onTabSubstanceEnter);
+
+async function onTabSubstanceLeave(event) {
+  const timestamp = Date.now();
+  if (!event.target.tab)
+    return;
+
+  hoveringTabIds.delete(event.target.tab.id);
+
+  if (!event.target.tab) // the tab was closed while waiting
+    return;
+
+  mController.hide({ targetItem: event.target.tab, timestamp });
+}
+onTabSubstanceLeave = EventUtils.wrapWithErrorHandler(onTabSubstanceLeave);
+
+Sidebar.onReady.addListener(() => {
+  const windowId = TabsStore.getCurrentWindowId();
+  mTabPreviewPanel.windowId = windowId;
+});
+
+function hideOnUserAction(timestamp) {
+  hoveringTabIds.clear();
+
+  mController.hideInSidebar({ timestamp });
+
+  const activeTab = Tab.getActiveTab(TabsStore.getCurrentWindowId());
+  if (activeTab) {
+    mController.hide({ timestamp });
+  }
+}
+
+document.querySelector('#tabbar').addEventListener('mouseleave', async () => {
+  const timestamp = Date.now();
+  log('mouse is left from the tab bar ', timestamp);
+  hideOnUserAction(timestamp);
+});
+
+document.querySelector('#tabbar').addEventListener('dragover', async () => {
+  const timestamp = Date.now();
+  log('mouse is dragover on the tab bar ', timestamp);
+  hideOnUserAction(timestamp);
+});
diff --git a/waterfox/browser/components/sidebar/sidebar/tab-preview.js b/waterfox/browser/components/sidebar/sidebar/tab-preview.js
new file mode 100644
index 0000000000000..afdb670399be3
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/tab-preview.js
@@ -0,0 +1,53 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import {
+  wait,
+} from '/common/common.js';
+import * as TabsStore from '/common/tabs-store.js';
+
+let mLastHoverTabId = null;
+
+document.querySelector('#tabbar').addEventListener('mouseenter', async event => {
+  if (event.target.localName != 'tab-item-substance')
+    return;
+
+  const tab = event.target.closest('tab-item').apiRaw;
+
+  mLastHoverTabId = tab.id;
+
+  if (mLastHoverTabId != tab.id ||
+      tab.active)
+    return;
+
+  browser.waterfoxBridge.showPreviewPanel(
+    tab.id,
+    Math.round(event.target.getBoundingClientRect().top)
+  );
+}, { capture: true });
+
+document.querySelector('#tabbar').addEventListener('mouseleave', async event => {
+  const windowId = TabsStore.getCurrentWindowId();
+  if (event.target == event.currentTarget &&
+      windowId) {
+    browser.waterfoxBridge.hidePreviewPanel(windowId); // clear for safety
+    return;
+  }
+
+  if (event.target.localName != 'tab-item-substance')
+    return;
+
+  const tab = event.target.closest('tab-item').apiRaw;
+
+  await wait(0);
+
+  if (mLastHoverTabId != tab.id)
+    return;
+
+  mLastHoverTabId = null;
+  browser.waterfoxBridge.hidePreviewPanel(tab.windowId);
+}, { capture: true });
diff --git a/waterfox/browser/components/sidebar/sidebar/tst-api-frontend.js b/waterfox/browser/components/sidebar/sidebar/tst-api-frontend.js
new file mode 100644
index 0000000000000..f16fddb81dcc4
--- /dev/null
+++ b/waterfox/browser/components/sidebar/sidebar/tst-api-frontend.js
@@ -0,0 +1,1032 @@
+/*
+# 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/.
+*/
+'use strict';
+
+import { DOMUpdater } from '/extlib/dom-updater.js';
+
+import {
+  configs,
+  log as internalLogger,
+} from '/common/common.js';
+import * as Constants from '/common/constants.js';
+import * as TabsStore from '/common/tabs-store.js';
+import * as TSTAPI from '/common/tst-api.js';
+
+import { Tab } from '/common/TreeItem.js';
+
+import * as EventUtils from './event-utils.js';
+import * as Sidebar from './sidebar.js';
+import * as SidebarItems from './sidebar-items.js';
+import * as Size from './size.js';
+
+import {
+  kTREE_ITEM_ELEMENT_NAME,
+} from './components/TreeItemElement.js';
+
+function log(...args) {
+  internalLogger('sidebar/tst-api-frontend', ...args);
+}
+
+// Above/below extra contents need to be inserted here, because missing those
+// contents will shrink height of the tab and may triggers "underflow" of the
+// tab bar unexpectedly.
+const AUTO_REINSERT_PLACES = new Set([
+  'tab-above',
+  'tab-below',
+]);
+
+let mTargetWindow;
+
+Sidebar.onInit.addListener(() => {
+  mTargetWindow = TabsStore.getCurrentWindowId();
+});
+
+SidebarItems.onReuseTreeItemElement.addListener(tabElement => {
+  setExtraTabContentsToElement(tabElement, '*', { place: 'tab-indent' });
+  setExtraTabContentsToElement(tabElement, '*', { place: 'tab-front' });
+  setExtraTabContentsToElement(tabElement, '*', { place: 'tab-behind' });
+  setExtraTabContentsToElement(tabElement, '*', { place: 'tab-above' });
+  setExtraTabContentsToElement(tabElement, '*', { place: 'tab-below' });
+});
+
+const mAddonsWithExtraContents = new Set();
+
+const mNewTabButtonExtraItemsContainerRoots = Array.from(
+  document.querySelectorAll(`.${Constants.kNEWTAB_BUTTON} .${Constants.kEXTRA_ITEMS_CONTAINER}`),
+  container => {
+    const root = container.attachShadow({ mode: 'open' });
+    root.itemById = new Map();
+    return root;
+  }
+);
+
+const mTabbarTopExtraItemsContainerRoot = (() => {
+  const container = document.querySelector(`#tabbar-top > .${Constants.kEXTRA_ITEMS_CONTAINER}`);
+  const root = container.attachShadow({ mode: 'open' });
+  root.itemById = new Map();
+  return root;
+})();
+
+const mTabbarBottomExtraItemsContainerRoot = (() => {
+  const container = document.querySelector(`#tabbar-bottom > .${Constants.kEXTRA_ITEMS_CONTAINER}`);
+  const root = container.attachShadow({ mode: 'open' });
+  root.itemById = new Map();
+  return root;
+})();
+
+const mDummyTab = document.getElementById('dummy-tab');
+
+TSTAPI.onRegistered.addListener(addon => {
+  // Install stylesheet always, even if the addon is not allowed to access
+  // private windows, because the client addon can be alloed on private
+  // windows by Firefox itself and extra context menu commands may be called
+  // via Firefox's native context menu (or shortcuts).
+  if (addon.style)
+    installStyle(addon.id, addon.style);
+});
+
+TSTAPI.onUnregistered.addListener(addon => {
+  clearAllExtraTabContents(addon.id);
+  uninstallStyle(addon.id)
+});
+
+TSTAPI.onMessageExternal.addListener((message, sender) => {
+  if ((!configs.incognitoAllowedExternalAddons.includes(sender.id) &&
+       document.documentElement.classList.contains('incognito')))
+    return;
+
+  if (!message.windowId)
+    message.windowId = message.window || mTargetWindow;
+
+  if (message.windowId != mTargetWindow)
+    return;
+
+  switch (message.type) {
+    case TSTAPI.kCLEAR_ALL_EXTRA_TAB_CONTENTS: // for backward compatibility
+      clearAllExtraTabContents(sender.id);
+      return;
+
+    case TSTAPI.kSET_EXTRA_NEW_TAB_BUTTON_CONTENTS: // for backward compatibility
+      setExtraNewTabButtonContents(sender.id, message);
+      return;
+
+    case TSTAPI.kCLEAR_EXTRA_NEW_TAB_BUTTON_CONTENTS: // for backward compatibility
+      clearExtraNewTabButtonContents(sender.id);
+      return;
+
+    case TSTAPI.kSET_EXTRA_CONTENTS:
+      log('setting contents: ', message, sender.id);
+      switch (String(message.place).toLowerCase()) {
+        case 'newtabbutton':
+        case 'new-tab-button':
+        case 'newtab-button':
+          setExtraNewTabButtonContents(sender.id, message);
+          return;
+
+        case 'tabbar-top':
+          setExtraTabbarTopContents(sender.id, message);
+          return;
+
+        case 'tabbar-bottom':
+          setExtraTabbarBottomContents(sender.id, message);
+          return;
+
+        default: // tabs
+          TSTAPI.getTargetTabs(message, sender).then(tabs => {
+            log(' => setting contents in tabs: ', tabs, message);
+            for (const tab of tabs) {
+              setExtraContentsTo(tab, sender.id, message);
+            }
+          });
+          return;
+      }
+      return;
+
+    case TSTAPI.kCLEAR_EXTRA_CONTENTS:
+      log('clearing contents: ', message, sender.id);
+      switch (String(message.place).toLowerCase()) {
+        case 'newtabbutton':
+        case 'new-tab-button':
+        case 'newtab-button':
+          clearExtraNewTabButtonContents(sender.id);
+          return;
+
+        case 'tabbar-top':
+          clearExtraTabbarTopContents(sender.id);
+          return;
+
+        case 'tabbar-bottom':
+          clearExtraTabbarBottomContents(sender.id);
+          return;
+
+        default: // tabs
+          TSTAPI.getTargetTabs(message, sender).then(tabs => {
+            log(' => clearing contents in tabs: ', tabs, message);
+            for (const tab of tabs) {
+              clearExtraTabContentsIn(tab, sender.id);
+            }
+          });
+          return;
+      }
+      return;
+
+    case TSTAPI.kCLEAR_ALL_EXTRA_CONTENTS:
+      log('clearing all contents: ', sender.id);
+      clearAllExtraTabContents(sender.id);
+      return;
+
+    case TSTAPI.kSET_EXTRA_CONTENTS_PROPERTIES:
+      log('setting properties for contents: ', message, sender.id);
+      TSTAPI.getTargetTabs(message, sender).then(tabs => {
+        log(' => setting properties for contents in tabs: ', tabs, message);
+        setExtraContentsProperties({
+          id:    sender.id,
+          tabs,
+          place: message.place || null,
+          part:  message.part,
+          properties: message.properties || {},
+        });
+      });
+      return;
+
+    case TSTAPI.kFOCUS_TO_EXTRA_CONTENTS:
+      log('focus to contents: ', message, sender.id);
+      TSTAPI.getTargetTabs(message, sender).then(tabs => {
+        log(' => focus to contents in tabs: ', tabs, message);
+        focusToExtraContents({
+          id:    sender.id,
+          tabs,
+          place: message.place || null,
+          part:  message.part,
+        });
+      });
+      return;
+
+    default:
+      Tab.waitUntilTracked(message.id).then(() => {
+        const tabElement = document.querySelector(`#tab-${message.id}`);
+        if (!tabElement)
+          return;
+
+        switch (message.type) {
+          case TSTAPI.kSET_EXTRA_TAB_CONTENTS: // for backward compatibility
+            setExtraTabContentsToElement(tabElement, sender.id, message);
+            break;
+
+          case TSTAPI.kCLEAR_EXTRA_TAB_CONTENTS: // for backward compatibility
+            clearExtraTabContentsInElement(tabElement, sender.id);
+            break;
+        }
+      });
+      return;
+  }
+});
+
+// https://developer.mozilla.org/docs/Web/HTML/Element
+const SAFE_CONTENTS = `
+a
+abbr
+acronym
+address
+//applet
+area
+article
+aside
+b
+//base
+//basefont
+bdi
+bdo
+//bgsound
+big
+blink
+blockquote
+//body
+br
+button
+canvas
+caption
+center
+cite
+code
+col
+colgroup
+command
+//content
+data
+datalist
+dd
+del
+details
+dfn
+dialog
+dir
+div
+dl
+dt
+//element
+em
+//embed
+fieldset
+figcaption
+figure
+font
+footer
+//form
+//frame
+//frameset
+h1
+//head
+header
+hgroup
+hr
+//html
+i
+//iframe
+image
+img
+input
+ins
+isindex
+kbd
+keygen
+label
+legend
+li
+//link
+listing
+main
+map
+mark
+marquee
+menu
+menuitem
+//meta
+//meter
+multicol
+nav
+nextid
+nobr
+//noembed
+//noframes
+//noscript
+object
+ol
+optgroup
+option
+output
+p
+param
+picture
+plaintext
+pre
+progress
+q
+rb
+rp
+rt
+rtc
+duby
+s
+samp
+//script
+section
+select
+//shadow
+slot
+small
+source
+spacer
+span
+strike
+strong
+//style
+sub
+summary
+sup
+table
+tbody
+td
+template
+textarea
+tfoot
+th
+thead
+time
+//title
+tr
+track
+tt
+u
+ul
+var
+//video
+wbr
+xmp
+`.trim().split('\n').filter(selector => !selector.startsWith('//'));
+const DANGEROUS_CONTENTS_SELECTOR = SAFE_CONTENTS.map(selector => `:not(${selector})`).join('');
+
+export function setExtraContentsTo(tab, id, params = {}) {
+  if (!tab || !tab.$TST.element)
+    return;
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  setExtraTabContentsToElement(tab.$TST.element, id, params);
+}
+
+function setExtraContentsToContainer(container, id, params = {}) {
+  if (id == '*') {
+    for (const id of container.itemById.keys()) {
+      setExtraContentsToContainer(container, id, params = {});
+    }
+    return;
+  }
+
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+
+  let cacheHolder, cacheKey;
+  const place = String(params.place).toLowerCase();
+  if (AUTO_REINSERT_PLACES.has(place)) {
+    const cacheHolderElement = container?.host?.closest(kTREE_ITEM_ELEMENT_NAME) || container;
+    cacheHolder = cacheHolderElement.$TST || cacheHolderElement;
+    cacheKey = `$$lastContentsSourceFor_${id}`;
+    params = {
+      ...params,
+      contents: (
+        params.contents ||
+        (!('contents' in params) && cacheHolder[cacheKey]) ||
+        null
+      ),
+    };
+    switch (place) {
+      case 'tab-above':
+        onExtraContentsAboveChanged(id, params);
+        break;
+
+      case 'tab-below':
+        onExtraContentsBelowChanged(id, params);
+        break;
+    }
+  }
+
+  let item = container.itemById.get(id);
+  if (!params.style &&
+      item &&
+      item.styleElement &&
+      item.styleElement.parentNode) {
+    container.removeChild(item.styleElement);
+    item.styleElement = null;
+  }
+  if (!params.contents) {
+    if (item) {
+      if (item.styleElement)
+        container.removeChild(item.styleElement);
+      container.removeChild(item);
+      container.itemById.delete(id);
+    }
+    if (cacheHolder)
+      cacheHolder[cacheKey] = null;
+    return;
+  }
+
+  const extraContentsPartName = getExtraContentsPartName(id);
+
+  if (!item) {
+    item = document.createElement('span');
+    item.setAttribute('part', `${extraContentsPartName} container`);
+    item.classList.add('extra-item');
+    item.classList.add(extraContentsPartName);
+    item.dataset.owner = id;
+    container.itemById.set(id, item);
+  }
+  if ('style' in params && !item.styleElement) {
+    const style = document.createElement('style');
+    style.setAttribute('type', 'text/css');
+    item.styleElement = style;
+  }
+
+  const contentsSource = String(params.contents || '').trim();
+  if (cacheHolder)
+    cacheHolder[cacheKey] = contentsSource;
+
+  const range = document.createRange();
+  range.selectNodeContents(item);
+  const contents = range.createContextualFragment(contentsSource);
+  range.detach();
+
+  const dangerousContents = contents.querySelectorAll(DANGEROUS_CONTENTS_SELECTOR);
+  for (const node of dangerousContents) {
+    node.parentNode.removeChild(node);
+  }
+  if (dangerousContents.length > 0)
+    console.log(`Could not include some elements as extra contents. provider=${id}, container:`, container, dangerousContents);
+
+  // Sanitize remote resources
+  for (const node of contents.querySelectorAll('*[href], *[src], *[srcset], *[part]')) {
+    for (const attribute of node.attributes) {
+      if (attribute.name == 'part')
+        attribute.value += ` ${extraContentsPartName}`;
+      if (/^(href|src|srcset)$/.test(attribute.name) &&
+          attribute.value &&
+          !/^(data|resource|chrome|about|moz-extension):/.test(attribute.value)) {
+        attribute.value = '#';
+        node.setAttribute('part', `${node.getAttribute('part') || ''} sanitized`);
+      }
+    }
+  }
+  // We don't need to handle inline event handlers because
+  // they are blocked by the CSP mechanism.
+
+  if ('style' in params)
+    item.styleElement.textContent = (params.style || '')
+      .replace(/%EXTRA_CONTENTS_PART%/gi, `${extraContentsPartName}`);
+
+  DOMUpdater.update(item, contents);
+
+  if (item.styleElement &&
+      !item.styleElement.parentNode)
+    container.appendChild(item.styleElement);
+  if (!item.parentNode)
+    container.appendChild(item);
+
+  mAddonsWithExtraContents.add(id);
+}
+
+function getExtraContentsPartName(id) {
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+  return `extra-contents-by-${id.replace(/[^-a-z0-9_]/gi, '_')}`;
+}
+
+
+function setExtraTabContentsToElement(tabElement, id, params = {}) {
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  let container;
+  switch (String(params.place).toLowerCase()) {
+    case 'indent': // for backward compatibility
+    case 'tab-indent':
+      container = tabElement.extraItemsContainerIndentRoot;
+      break;
+
+    case 'behind': // for backward compatibility
+    case 'tab-behind':
+      container = tabElement.extraItemsContainerBehindRoot;
+      break;
+
+    case 'front': // for backward compatibility
+    case 'tab-front':
+    default:
+      container = tabElement.extraItemsContainerFrontRoot;
+      break;
+
+    case 'tab-above':
+      container = tabElement.extraItemsContainerAboveRoot;
+      break;
+
+    case 'tab-below':
+      container = tabElement.extraItemsContainerBelowRoot;
+      break;
+  }
+
+  if (container)
+    return setExtraContentsToContainer(container, id, params);
+}
+
+function onExtraContentsAboveChanged(id, params) {
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  if (onExtraContentsAboveChanged.invoked)
+    return;
+  onExtraContentsAboveChanged.invoked = true;
+  window.requestAnimationFrame(() => {
+    onExtraContentsAboveChanged.invoked = false;
+    if (params.container != mDummyTab.extraItemsContainerAboveRoot) {
+      setExtraContentsToContainer(mDummyTab.extraItemsContainerAboveRoot, id, {
+        ...params,
+        container: mDummyTab.extraItemsContainerAboveRoot,
+      });
+    }
+    throttledUpdateSize();
+  });
+}
+
+function onExtraContentsBelowChanged(id, params) {
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  if (onExtraContentsBelowChanged.invoked)
+    return;
+  onExtraContentsBelowChanged.invoked = true;
+  window.requestAnimationFrame(() => {
+    onExtraContentsBelowChanged.invoked = false;
+    if (params.container != mDummyTab.extraItemsContainerBelowRoot) {
+      setExtraContentsToContainer(mDummyTab.extraItemsContainerBelowRoot, id, {
+        ...params,
+        container: mDummyTab.extraItemsContainerBelowRoot,
+      });
+    }
+    throttledUpdateSize();
+  });
+}
+
+function throttledUpdateSize() {
+  if (throttledUpdateSize.invoked)
+    return;
+  throttledUpdateSize.invoked = true;
+  window.requestAnimationFrame(() => {
+    throttledUpdateSize.invoked = false;
+    Size.updateTabs();
+    Size.updateContainers();
+  });
+}
+
+export function clearExtraTabContentsIn(tab, id) {
+  if (!tab || !tab.$TST.element)
+    return;
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+  clearExtraTabContentsInElement(tab.$TST.element, id);
+}
+
+function clearExtraTabContentsInElement(tabElement, id) {
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+  setExtraTabContentsToElement(tabElement, id, { place: 'tab-indent' });
+  setExtraTabContentsToElement(tabElement, id, { place: 'tab-front' });
+  setExtraTabContentsToElement(tabElement, id, { place: 'tab-behind' });
+  setExtraTabContentsToElement(tabElement, id, { place: 'tab-above' });
+  setExtraTabContentsToElement(tabElement, id, { place: 'tab-below' });
+  onExtraContentsAboveChanged(id);
+  onExtraContentsBelowChanged(id);
+}
+
+export function clearAllExtraTabContents(id) {
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+
+  if (!mAddonsWithExtraContents.has(id))
+    return;
+
+  for (const tabElement of document.querySelectorAll(kTREE_ITEM_ELEMENT_NAME)) {
+    clearExtraTabContentsInElement(tabElement, id);
+  }
+  setExtraNewTabButtonContents(id);
+  clearExtraTabbarTopContents(id);
+  clearExtraTabbarBottomContents(id);
+  onExtraContentsAboveChanged(id);
+  onExtraContentsBelowChanged(id);
+  mAddonsWithExtraContents.delete(id);
+}
+
+
+export function setExtraNewTabButtonContents(id, params = {}) {
+  if (typeof id != 'string') { // addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  for (const container of mNewTabButtonExtraItemsContainerRoots) {
+    setExtraContentsToContainer(container, id, params);
+  }
+  Sidebar.reserveToUpdateTabbarLayout({
+    reason:  Constants.kTABBAR_UPDATE_REASON_RESIZE,
+    timeout: 100,
+  });
+}
+
+export function clearExtraNewTabButtonContents(id) {
+  if (!id)
+    setExtraNewTabButtonContents({});
+  setExtraNewTabButtonContents(id, {});
+}
+
+
+export function setExtraTabbarTopContents(id, params = {}) {
+  if (typeof id != 'string') { // the addon id is optional
+    params = id;
+    id = browser.runtime.id;
+  }
+  setExtraContentsToContainer(mTabbarTopExtraItemsContainerRoot, id, params);
+  Sidebar.reserveToUpdateTabbarLayout({
+    reason:  Constants.kTABBAR_UPDATE_REASON_RESIZE,
+    timeout: 100,
+  });
+}
+
+export function clearExtraTabbarTopContents(id) {
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+  setExtraTabbarTopContents(id, {});
+}
+
+
+export function setExtraTabbarBottomContents(id, params = {}) {
+  if (typeof id != 'string') {
+    params = id;
+    id = browser.runtime.id;
+  }
+  setExtraContentsToContainer(mTabbarBottomExtraItemsContainerRoot, id, params);
+  Sidebar.reserveToUpdateTabbarLayout({
+    reason:  Constants.kTABBAR_UPDATE_REASON_RESIZE,
+    timeout: 100,
+  });
+}
+
+export function clearExtraTabbarBottomContents(id) {
+  if (!id) // the addon id is optional
+    id = browser.runtime.id;
+  setExtraTabbarBottomContents(id, {});
+}
+
+function collectExtraContentsRoots({ tabs, place }) {
+  switch (String(place).toLowerCase()) {
+    case 'indent': // for backward compatibility
+    case 'tab-indent':
+      return (tabs || Tab.getAllTabs(mTargetWindow)).map(tab => tab.$TST.element.extraItemsContainerIndentRoot);
+
+    case 'behind': // for backward compatibility
+    case 'tab-behind':
+      return (tabs || Tab.getAllTabs(mTargetWindow)).map(tab => tab.$TST.element.extraItemsContainerBehindRoot);
+
+    case 'front': // for backward compatibility
+    case 'tab-front':
+      return (tabs || Tab.getAllTabs(mTargetWindow)).map(tab => tab.$TST.element.extraItemsContainerFrontRoot);
+
+    case 'tab-above':
+      return [
+        ...(tabs || Tab.getAllTabs(mTargetWindow)).map(tab => tab.$TST.element.extraItemsContainerAboveRoot),
+        mDummyTab.extraItemsContainerAboveRoot,
+      ];
+
+    case 'tab-below':
+      return [
+        ...(tabs || Tab.getAllTabs(mTargetWindow)).map(tab => tab.$TST.element.extraItemsContainerBelowRoot),
+        mDummyTab.extraItemsContainerBelowRoot,
+      ];
+
+    case 'newtabbutton':
+    case 'new-tab-button':
+    case 'newtab-button':
+      return mNewTabButtonExtraItemsContainerRoots;
+
+    case 'tabbar-top':
+      return [mTabbarTopExtraItemsContainerRoot];
+
+    case 'tabbar-bottom':
+      return [mTabbarBottomExtraItemsContainerRoot];
+
+    default:
+      return [];
+  }
+}
+
+function setExtraContentsProperties({ id, tabs, place, part, properties }) {
+  if (!id || !part || !properties)
+    return;
+
+  const roots = collectExtraContentsRoots({ id, tabs, place });
+  for (const root of roots) {
+    const node = root.querySelector(`[part~="${getExtraContentsPartName(id)}"][part~="${part}"]`);
+    if (!node)
+      continue;
+    for (const [property, value] of Object.entries(properties)) {
+      node[property] = value;
+    }
+  }
+}
+
+function focusToExtraContents({ id, tabs, place, part }) {
+  if (!id || !part)
+    return;
+
+  const roots = collectExtraContentsRoots({ id, tabs, place });
+  for (const root of roots) {
+    const node = root.querySelector(`[part~="${getExtraContentsPartName(id)}"][part~="${part}"]`);
+    if (!node || typeof node.focus != 'function')
+      continue;
+    node.focus();
+  }
+}
+
+
+const mAddonStyles = new Map();
+
+function installStyle(id, style) {
+  let styleElement = mAddonStyles.get(id);
+  if (!styleElement) {
+    styleElement = document.createElement('style');
+    styleElement.setAttribute('type', 'text/css');
+    document.head.insertBefore(styleElement, document.querySelector('#addons-style-rules'));
+    mAddonStyles.set(id, styleElement);
+  }
+  styleElement.textContent = (style || '').replace(/%EXTRA_CONTENTS_PART%/gi, getExtraContentsPartName(id));
+}
+
+function uninstallStyle(id) {
+  const styleElement = mAddonStyles.get(id);
+  if (!styleElement)
+    return;
+  document.head.removeChild(styleElement);
+  mAddonStyles.delete(id);
+}
+
+
+// we should not handle dblclick on #tabbar here - it is handled by mouse-event-listener.js
+for (const container of document.querySelectorAll('#tabbar-top, #tabbar-bottom')) {
+  container.addEventListener('dblclick', onExtraContentsDblClick, { capture: true });
+}
+document.addEventListener('keydown',  onExtraContentsKeyEvent, { capture: true });
+document.addEventListener('keyup',    onExtraContentsKeyEvent, { capture: true });
+document.addEventListener('input',    onExtraContentsInput,    { capture: true });
+document.addEventListener('change',   onExtraContentsChange,   { capture: true });
+document.addEventListener('compositionstart',  onExtraContentsCompositionEvent, { capture: true });
+document.addEventListener('compositionupdate', onExtraContentsCompositionEvent, { capture: true });
+document.addEventListener('compositionend',    onExtraContentsCompositionEvent, { capture: true });
+document.addEventListener('focus',    onExtraContentsFocusEvent, { capture: true });
+document.addEventListener('blur',     onExtraContentsFocusEvent, { capture: true });
+
+async function onExtraContentsDblClick(event) {
+  const detail            = EventUtils.getMouseEventDetail(event, null);
+  const extraContentsInfo = getOriginalExtraContentsTarget(event);
+  const allowed = await tryMouseOperationAllowedWithExtraContents(
+    TSTAPI.kNOTIFY_EXTRA_CONTENTS_DBLCLICKED,
+    null,
+    { detail },
+    extraContentsInfo
+  );
+  if (allowed)
+    return;
+}
+
+async function notifyExtraContentsEvent(event, eventType, details = {}) {
+  const extraContentsInfo = getOriginalExtraContentsTarget(event);
+  if (!extraContentsInfo ||
+      !extraContentsInfo.owners ||
+      extraContentsInfo.owners.size == 0)
+    return;
+
+  const target = EventUtils.getElementOriginalTarget(event);
+  if (target &&
+      target.closest('tab-item, button, *[role="button"], input[type="submit"]')) {
+    event.stopPropagation();
+    event.stopImmediatePropagation();
+    event.preventDefault();
+  }
+
+  const livingTab = EventUtils.getTreeItemFromEvent(event);
+  const eventInfo = {
+    ...EventUtils.getTreeItemEventDetail(event, livingTab),
+    ...extraContentsInfo.fieldValues,
+    originalTarget:     extraContentsInfo.target,
+    originalTargetPart: extraContentsInfo.targetPart,
+    $extraContentsInfo: null,
+    ...details,
+  };
+  const options = {
+    targets: extraContentsInfo.owners,
+  };
+  if (livingTab) {
+    eventInfo.tab = livingTab;
+    options.tabProperties = ['tab'];
+    options.cache = {};
+  }
+
+  await TSTAPI.tryOperationAllowed(
+    eventType,
+    eventInfo,
+    options
+  );
+  if (eventInfo.tab)
+    eventInfo.tab.clearCache();
+}
+
+async function onExtraContentsKeyEvent(event) {
+  await notifyExtraContentsEvent(
+    event,
+    event.type == 'keydown' ?
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_KEYDOWN :
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_KEYUP,
+    {
+      key:         event.key,
+      isComposing: event.isComposing,
+      locale:      event.locale,
+      location:    event.location,
+      repeat:      event.repeat,
+    }
+  );
+}
+
+async function onExtraContentsInput(event) {
+  await notifyExtraContentsEvent(
+    event,
+    TSTAPI.kNOTIFY_EXTRA_CONTENTS_INPUT,
+    {
+      data:        event.data,
+      inputType:   event.inputType,
+      isComposing: event.isComposing,
+    }
+  );
+}
+
+async function onExtraContentsChange(event) {
+  await notifyExtraContentsEvent(
+    event,
+    TSTAPI.kNOTIFY_EXTRA_CONTENTS_CHANGE
+  );
+}
+
+async function onExtraContentsCompositionEvent(event) {
+  await notifyExtraContentsEvent(
+    event,
+    event.type == 'compositionstart' ?
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_COMPOSITIONSTART : 
+      event.type == 'compositionupdate' ?
+        TSTAPI.kNOTIFY_EXTRA_CONTENTS_COMPOSITIONUPDATE :
+        TSTAPI.kNOTIFY_EXTRA_CONTENTS_COMPOSITIONEND,
+    {
+      data:   event.data,
+      locale: event.locale,
+    }
+  );
+}
+
+async function onExtraContentsFocusEvent(event) {
+  const target = EventUtils.getElementOriginalTarget(event);
+  if (!target)
+    return {};
+
+  const extraContents = target.closest(`.extra-item`);
+
+  let relatedTarget = null;
+  const relatedTargetNode    = event.relatedTarget && EventUtils.getElementTarget(event.relatedTarget);
+  const relatedExtraContents = relatedTargetNode?.closest(`.extra-item`)
+  if (relatedExtraContents &&
+      extraContents.dataset.owner == relatedExtraContents.dataset.owner)
+    relatedTarget = relatedTargetNode.outerHTML;
+
+  await notifyExtraContentsEvent(
+    event,
+    event.type == 'focus' ?
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_FOCUS : 
+      TSTAPI.kNOTIFY_EXTRA_CONTENTS_BLUR,
+    { relatedTarget }
+  );
+}
+
+function getFieldValues(event) {
+  const target = EventUtils.getElementOriginalTarget(event);
+  if (!target)
+    return {};
+
+  const fieldNode = target.closest('input, select, textarea');
+  if (!fieldNode)
+    return {};
+
+  return {
+    fieldValue:   'value' in fieldNode ? fieldNode.value : null,
+    fieldChecked: 'checked' in fieldNode ? fieldNode.checked : null,
+  };
+}
+
+export function getOriginalExtraContentsTarget(event) {
+  try {
+    const target        = EventUtils.getElementOriginalTarget(event);
+    const extraContents = target?.closest(`.extra-item`);
+    if (extraContents) {
+      const targetPart = target.closest(`[part]`)
+      return {
+        owners: new Set([extraContents.dataset.owner]),
+        target: cleanupExtraContentsPartName(target.outerHTML),
+        targetPart: cleanupExtraContentsPartName(targetPart.getAttribute('part')).trim(),
+        fieldValues: getFieldValues(event),
+      };
+    }
+  }
+  catch(_error) {
+    // this may happen by mousedown on scrollbar
+  }
+
+  return {
+    owners: new Set(),
+    target: null,
+    targetPart: null,
+    fieldValues: {},
+  };
+}
+
+function cleanupExtraContentsPartName(string) {
+  return string
+    .replace(/ extra-contents-by-[-a-z0-9_]+\b/gi, '');
+}
+
+export async function tryMouseOperationAllowedWithExtraContents(eventType, rawEventType, mousedown, extraContentsInfo) {
+  const cache = {};
+
+  if (extraContentsInfo &&
+      extraContentsInfo.owners &&
+      extraContentsInfo.owners.size > 0) {
+    const eventInfo = {
+      ...mousedown.detail,
+      originalTarget:     extraContentsInfo.target,
+      originalTargetPart: extraContentsInfo.targetPart,
+      ...extraContentsInfo.fieldValues,
+      $extraContentsInfo: null,
+    };
+    const options = {
+      targets: extraContentsInfo.owners,
+    };
+    if (mousedown.tab) {
+      eventInfo.tab = mousedown.tab;
+      options.tabProperties = ['tab'];
+      options.cache = cache;
+    }
+    const allowed = (await TSTAPI.tryOperationAllowed(
+      eventType,
+      eventInfo,
+      options
+    )) && (!rawEventType || await TSTAPI.tryOperationAllowed(
+      rawEventType, // for backward compatibility
+      eventInfo,
+      options
+    ));
+    if (!allowed)
+      return false;
+  }
+
+  if (rawEventType) {
+    const eventInfo = {
+      ...mousedown.detail,
+      $extraContentsInfo: null,
+    };
+    const options = {
+      except: extraContentsInfo?.owners,
+    };
+    if (mousedown.tab) {
+      eventInfo.tab = mousedown.tab;
+      options.tabProperties = ['tab'];
+      options.cache = cache;
+    }
+    const allowed = await TSTAPI.tryOperationAllowed(
+      rawEventType,
+      eventInfo,
+      options
+    );
+    if (!allowed)
+      return false;
+  }
+
+  return true;
+}
diff --git a/waterfox/browser/components/statusbar/StatusBar.sys.mjs b/waterfox/browser/components/statusbar/StatusBar.sys.mjs
new file mode 100644
index 0000000000000..71e385d441557
--- /dev/null
+++ b/waterfox/browser/components/statusbar/StatusBar.sys.mjs
@@ -0,0 +1,228 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
+  BrowserUtils: "resource:///modules/BrowserUtils.sys.mjs",
+  PrefUtils: "resource:///modules/PrefUtils.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+});
+
+export const StatusBar = {
+  PREF_ENABLED: "browser.statusbar.enabled",
+  PREF_STATUSTEXT: "browser.statusbar.appendStatusText",
+
+  get enabled() {
+    return lazy.PrefUtils.get(this.PREF_ENABLED);
+  },
+
+  get showLinks() {
+    return lazy.PrefUtils.get(this.PREF_STATUSTEXT);
+  },
+
+  get textInBar() {
+    return this.enabled && this.showLinks;
+  },
+
+  get style() {
+    return `
+     @-moz-document url('chrome://browser/content/browser.xhtml') {
+       #status-bar {
+           color: initial !important;
+           border-top: 1px solid var(--chrome-content-separator-color);
+           background-color: var(--toolbar-bgcolor);
+         }
+         :root[customizing] #status-bar {
+           visibility: visible !important;
+         }
+         #status-text > #statuspanel-label {
+           border-top: 0 !important;
+           background-color: unset !important;
+         }
+         #wrapper-status-text label::after {
+           content: "Status text" !important;
+           color: red !important;
+           border: 1px #aaa solid !important;
+           border-radius: 3px !important;
+           font-weight: bold !important;
+         }
+         #wrapper-status-text > #status-text > #statuspanel-label {
+           display: none;
+         }
+         #status-bar #status-text {
+           display: flex !important;
+           justify-content: center !important;
+           align-items: center !important;
+           height: calc(2 * var(--toolbarbutton-inner-padding) + 16px);
+         }
+         toolbarpaletteitem #status-text:before {
+           content: "Status text";
+           color: red;
+           border: 1px #aaa solid;
+           border-radius: 3px;
+           font-weight: bold;
+           display: flex;
+           justify-content: center;
+           align-content: center;
+           flex-direction: column;
+           align-items: center;
+           margin-inline: var(--toolbarbutton-outer-padding);
+           width: 100%;
+           height: 100%;
+        }
+         /* Ensure text color of status bar widgets set correctly */
+         toolbar .toolbarbutton-1 {
+           color: var(--toolbarbutton-icon-fill) !important;
+         }
+       }
+           `;
+  },
+
+  init(window) {
+    if (!window.document.getElementById("status-dummybar")) {
+      lazy.setTimeout(() => {
+        this.init(window);
+      }, 25);
+    } else if (!window.statusbar.node) {
+      this.configureDummyBar(window, "status-dummybar");
+      this.configureStatusBar(window);
+      this.overrideStatusPanelLabel(window);
+      this.configureBottomBox(window);
+      this.initPrefListeners();
+      this.registerArea(window, "status-bar");
+      lazy.BrowserUtils.setStyle(this.style);
+    }
+  },
+
+  async initPrefListeners() {
+    this.enabledListener = lazy.PrefUtils.addObserver(
+      this.PREF_ENABLED,
+      (isEnabled) => {
+        this.setStatusBarVisibility(isEnabled);
+        this.setStatusTextVisibility();
+      }
+    );
+    this.textListener = lazy.PrefUtils.addObserver(
+      this.PREF_STATUSTEXT,
+      (_isEnabled) => {
+        this.setStatusTextVisibility();
+      }
+    );
+  },
+
+  async setStatusBarVisibility(isEnabled) {
+    const instances =
+      lazy.CustomizableUI.getWidget("status-dummybar").instances;
+    for (const dummyBar of instances) {
+      dummyBar.node.setAttribute("collapsed", !isEnabled);
+    }
+  },
+  async setStatusTextVisibility() {
+    if (this.enabled && this.showLinks) {
+      // Status bar enabled and want to display links in it
+      this.executeInAllWindows((window) => {
+        const StatusPanel = window.StatusPanel;
+        window.statusbar.textNode.appendChild(StatusPanel._labelElement);
+      });
+    } else if (!this.enabled && this.showLinks) {
+      // Status bar disabled so display links in StatusPanel
+      this.executeInAllWindows((window) => {
+        const StatusPanel = window.StatusPanel;
+        StatusPanel.panel.appendChild(StatusPanel._labelElement);
+        StatusPanel.panel.firstChild.hidden = false;
+      });
+    } else {
+      // Don't display links
+      this.executeInAllWindows((window) => {
+        const StatusPanel = window.StatusPanel;
+        StatusPanel.panel.appendChild(StatusPanel._labelElement);
+        StatusPanel.panel.firstChild.hidden = true;
+      });
+    }
+  },
+
+  async registerArea(aWindow, aArea) {
+    if (!lazy.CustomizableUI.areas.includes("status-bar")) {
+      lazy.CustomizableUI.registerArea(aArea, {
+        type: lazy.CustomizableUI.TYPE_TOOLBAR,
+        defaultPlacements: ["screenshot-button", "fullscreen-button"],
+      });
+      const tb = aWindow.document.getElementById("status-dummybar");
+      lazy.CustomizableUI.registerToolbarNode(tb);
+    }
+  },
+
+  async configureDummyBar(aWindow, aId) {
+    const { document } = aWindow;
+    const el = document.getElementById(aId);
+    el.collapsed = !this.enabled;
+    el.setAttribute = function (att, value, ...rest) {
+      const result = Element.prototype.setAttribute.apply(this, [
+        att,
+        value,
+        ...rest,
+      ]);
+
+      if (att === "collapsed") {
+        const StatusPanel = aWindow.StatusPanel;
+        if (value === true) {
+          lazy.PrefUtils.set(StatusBar.PREF_ENABLED, false);
+          aWindow.statusbar.node.setAttribute("collapsed", true);
+          StatusPanel.panel.appendChild(StatusPanel._labelElement);
+        } else {
+          lazy.PrefUtils.set(StatusBar.PREF_ENABLED, true);
+          aWindow.statusbar.node.setAttribute("collapsed", false);
+          if (StatusBar.textInBar) {
+            aWindow.statusbar.textNode.appendChild(StatusPanel._labelElement);
+          }
+        }
+      }
+
+      return result;
+    };
+  },
+
+  configureStatusBar(aWindow) {
+    const StatusPanel = aWindow.StatusPanel;
+    aWindow.statusbar.node = aWindow.document.getElementById("status-bar");
+    aWindow.statusbar.textNode = aWindow.document.getElementById("status-text");
+    if (this.textInBar) {
+      aWindow.statusbar.textNode.appendChild(StatusPanel._labelElement);
+    }
+    aWindow.statusbar.node.appendChild(aWindow.statusbar.textNode);
+    aWindow.statusbar.node.setAttribute("collapsed", !this.enabled);
+  },
+
+  async overrideStatusPanelLabel(aWindow) {
+    const { StatusPanel } = aWindow.wrappedJSObject;
+
+    const originalSetter = Object.getOwnPropertyDescriptor(
+      StatusPanel,
+      "_label"
+    ).set;
+
+    Object.defineProperty(StatusPanel, "_label", {
+      set(val) {
+        if (this._labelElement) {
+          this._labelElement.value = val;
+        }
+        originalSetter.call(this, val);
+      },
+      enumerable: true,
+      configurable: true,
+    });
+  },
+
+  async configureBottomBox(aWindow) {
+    const { document } = aWindow;
+    const bottomBox = document.getElementById("browser-bottombox");
+    lazy.CustomizableUI.registerToolbarNode(aWindow.statusbar.node);
+    bottomBox.appendChild(aWindow.statusbar.node);
+  },
+};
+
+// Inherited props
+StatusBar.executeInAllWindows = lazy.BrowserUtils.executeInAllWindows;
diff --git a/waterfox/browser/components/statusbar/content/statusbar.xhtml b/waterfox/browser/components/statusbar/content/statusbar.xhtml
new file mode 100644
index 0000000000000..380ce9f942f5f
--- /dev/null
+++ b/waterfox/browser/components/statusbar/content/statusbar.xhtml
@@ -0,0 +1,17 @@
+<?xml version="1.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/. -->
+
+<overlay id="tabfeature-overlay" xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <toolbox id="navigator-toolbox">
+        <toolbar id="status-dummybar" toolbarname="Status Bar" accesskey="" hidden="true" />
+    </toolbox>
+    <vbox id="browser-bottombox">
+        <toolbar id="status-bar" customizable="true" context="toolbar-context-menu" mode="icons"
+            insertbefore="a11y-announcement">
+            <toolbaritem id="status-text" flex="1" width="100" />
+        </toolbar>
+    </vbox>
+</overlay>
diff --git a/waterfox/browser/components/statusbar/jar.mn b/waterfox/browser/components/statusbar/jar.mn
new file mode 100644
index 0000000000000..b27cc80c5c15d
--- /dev/null
+++ b/waterfox/browser/components/statusbar/jar.mn
@@ -0,0 +1,3 @@
+browser.jar:
+%  content browser %content/browser/ contentaccessible=yes
+     content/browser/overlays/statusbar.xhtml            (content/statusbar.xhtml)
\ No newline at end of file
diff --git a/waterfox/browser/components/statusbar/moz.build b/waterfox/browser/components/statusbar/moz.build
new file mode 100644
index 0000000000000..c2c36a2b95234
--- /dev/null
+++ b/waterfox/browser/components/statusbar/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "StatusBar.sys.mjs",
+]
+
+BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/statusbar/test/browser/browser.ini b/waterfox/browser/components/statusbar/test/browser/browser.ini
new file mode 100644
index 0000000000000..39b4e4aeb1ce3
--- /dev/null
+++ b/waterfox/browser/components/statusbar/test/browser/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+tags = waterfox_statusbar
+firefox-appdir = browser
+support-files =
+    head.js
+
+[browser_statusbar.js]
diff --git a/waterfox/browser/components/statusbar/test/browser/browser_statusbar.js b/waterfox/browser/components/statusbar/test/browser/browser_statusbar.js
new file mode 100644
index 0000000000000..0f49108723fa9
--- /dev/null
+++ b/waterfox/browser/components/statusbar/test/browser/browser_statusbar.js
@@ -0,0 +1,74 @@
+// Test status bar is present
+add_task(async function testStatusBarPresent() {
+  let el = document.getElementById("status-bar");
+  ok(el, "Status bar exists");
+
+  is(
+    el.parentElement.id,
+    "browser-bottombox",
+    "Status bar located in browser bottombox"
+  );
+});
+
+// Test can be toggled on/off
+add_task(async function testToggleStatusBar() {
+  Services.prefs.setBoolPref(STATUSBAR_ENABLED_PREF, false);
+  let statusbar = document.getElementById("status-bar");
+  ok(statusbar.collapsed, "Status bar is collapsed");
+
+  // Toggle with context menu item
+  let toolbarContextMenu = document.getElementById("toolbar-context-menu");
+  let target = document.getElementById("PanelUI-menu-button");
+  await openToolbarContextMenu(toolbarContextMenu, target);
+  let toggle = document.getElementById("toggle_status-dummybar");
+  await EventUtils.synthesizeMouseAtCenter(toggle, {}); // Not actually clicking?
+  //   is(statusbar.collapsed, false, "Status bar is not collapsed");
+
+  // Toggle with preference
+  Services.prefs.setBoolPref(STATUSBAR_ENABLED_PREF, false);
+  ok(statusbar.collapsed, "Status bar is collapsed");
+  Services.prefs.setBoolPref(STATUSBAR_ENABLED_PREF, true);
+  is(statusbar.collapsed, false, "Status bar is not collapsed");
+
+  // Clear pref
+  Services.prefs.clearUserPref(STATUSBAR_ENABLED_PREF);
+});
+
+// Test can add widgets
+add_task(async function testAddWidgets() {
+  Services.prefs.setBoolPref(STATUSBAR_ENABLED_PREF, true);
+
+  await startCustomizing();
+  let btn = document.getElementById("new-window-button");
+  let panel = document.getElementById("status-bar");
+
+  assertAreaPlacements(panel.id, [
+    "screenshot-button",
+    "zoom-controls",
+    "fullscreen-button",
+    "status-text",
+  ]);
+
+  let placementsAfterAppend = [
+    "screenshot-button",
+    "zoom-controls",
+    "fullscreen-button",
+    "status-text",
+  ];
+  simulateItemDrag(btn, panel); // Doesn't work in test, does in prod?
+  assertAreaPlacements(panel.id, placementsAfterAppend);
+  await endCustomizing();
+  // Clear pref
+  Services.prefs.clearUserPref(STATUSBAR_ENABLED_PREF);
+});
+
+add_task(async function testShowStatusBarCustomizing() {
+  // Status bar should be hidden
+  let statusBar = document.querySelector("#status-bar");
+  let style = window.getComputedStyle(statusBar);
+  is(style.visibility, "collapse", "Status bar is collapsed");
+  // When we start customizing should be displayed
+  await startCustomizing();
+  is(style.visibility, "visible", "Status bar is displayed when customizing");
+  await endCustomizing();
+});
diff --git a/waterfox/browser/components/statusbar/test/browser/head.js b/waterfox/browser/components/statusbar/test/browser/head.js
new file mode 100644
index 0000000000000..61012a2502657
--- /dev/null
+++ b/waterfox/browser/components/statusbar/test/browser/head.js
@@ -0,0 +1,109 @@
+const { synthesizeDrop, synthesizeMouseAtCenter } = EventUtils;
+
+const _STATUSBAR_ENABLED_PREF = "browser.statusbar.enabled";
+
+/**
+ * Helper for opening toolbar context menu.
+ */
+async function _openToolbarContextMenu(contextMenu, target) {
+  const popupshown = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
+  EventUtils.synthesizeMouseAtCenter(target, { type: "contextmenu" });
+  await popupshown;
+}
+
+/**
+ * Helpers for Customizable UI
+ */
+
+function _startCustomizing(aWindow = window) {
+  if (aWindow.document.documentElement.getAttribute("customizing") === "true") {
+    return null;
+  }
+  const customizationReadyPromise = BrowserTestUtils.waitForEvent(
+    aWindow.gNavToolbox,
+    "customizationready"
+  );
+  aWindow.gCustomizeMode.enter();
+  return customizationReadyPromise;
+}
+
+function _endCustomizing(aWindow = window) {
+  if (aWindow.document.documentElement.getAttribute("customizing") !== "true") {
+    return true;
+  }
+  const afterCustomizationPromise = BrowserTestUtils.waitForEvent(
+    aWindow.gNavToolbox,
+    "aftercustomization"
+  );
+  aWindow.gCustomizeMode.exit();
+  return afterCustomizationPromise;
+}
+
+function _assertAreaPlacements(areaId, expectedPlacements) {
+  const actualPlacements = getAreaWidgetIds(areaId);
+  placementArraysEqual(areaId, actualPlacements, expectedPlacements);
+}
+
+function getAreaWidgetIds(areaId) {
+  return CustomizableUI.getWidgetIdsInArea(areaId);
+}
+
+function placementArraysEqual(areaId, actualPlacements, expectedPlacements) {
+  info(`Actual placements: ${actualPlacements.join(", ")}`);
+  info(`Expected placements: ${expectedPlacements.join(", ")}`);
+  is(
+    actualPlacements.length,
+    expectedPlacements.length,
+    `Area ${areaId} should have ${expectedPlacements.length} items.`
+  );
+  const minItems = Math.min(expectedPlacements.length, actualPlacements.length);
+  for (let i = 0; i < minItems; i++) {
+    if (typeof expectedPlacements[i] === "string") {
+      is(
+        actualPlacements[i],
+        expectedPlacements[i],
+        `Item ${i} in ${areaId} should match expectations.`
+      );
+    } else if (expectedPlacements[i] instanceof RegExp) {
+      ok(
+        expectedPlacements[i].test(actualPlacements[i]),
+        `Item ${i} (${actualPlacements[i]}) in ${areaId} should match ${expectedPlacements[i]}`
+      );
+    } else {
+      ok(
+        false,
+        "Unknown type of expected placement passed to " +
+          " assertAreaPlacements. Is your test broken?"
+      );
+    }
+  }
+}
+
+function _simulateItemDrag(aToDrag, aTarget, aEvent = {}, aOffset = 2) {
+  let ev = aEvent;
+  if (ev === "end" || ev === "start") {
+    const win = aTarget.ownerGlobal;
+    const dwu = win.windowUtils;
+    const bounds = dwu.getBoundsWithoutFlushing(aTarget);
+    if (ev === "end") {
+      ev = {
+        clientX: bounds.right - aOffset,
+        clientY: bounds.bottom - aOffset,
+      };
+    } else {
+      ev = { clientX: bounds.left + aOffset, clientY: bounds.top + aOffset };
+    }
+  }
+  ev._domDispatchOnly = true;
+  synthesizeDrop(
+    aToDrag.parentNode,
+    aTarget,
+    null,
+    null,
+    aToDrag.ownerGlobal,
+    aTarget.ownerGlobal,
+    ev
+  );
+  // Ensure dnd suppression is cleared.
+  synthesizeMouseAtCenter(aTarget, { type: "mouseup" }, aTarget.ownerGlobal);
+}
diff --git a/waterfox/browser/components/tabfeatures/TabFeatures.sys.mjs b/waterfox/browser/components/tabfeatures/TabFeatures.sys.mjs
new file mode 100644
index 0000000000000..5906e0cd1df99
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/TabFeatures.sys.mjs
@@ -0,0 +1,393 @@
+/* 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/. */
+
+const { AppConstants } = ChromeUtils.importESModule(
+  "resource://gre/modules/AppConstants.sys.mjs"
+);
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+});
+
+export const TabFeatures = {
+  NEW_TAB_CONFIG_PATH: "browser.newtab.url",
+  newTabURL: null,
+  prefListener: null,
+  PREF_ACTIVETAB: "browser.tabs.copyurl.activetab",
+  PREF_REQUIRECONFIRM: "browser.restart_menu.requireconfirm",
+  PREF_PURGECACHE: "browser.restart_menu.purgecache",
+  PREF_COPYURL_SHORTCUT: "browser.tabs.copyurl.shortcut",
+
+  init(aWindow) {
+    // Wait for XUL elements to be available before initializing listeners.
+    // 'context_copyTabUrl' is an element from our associated XUL, which we will now wait for.
+    if (!aWindow.document.getElementById("context_copyTabUrl")) {
+      lazy.setTimeout(() => {
+        this.init(aWindow);
+      }, 50); // Retry after 50ms
+      return;
+    }
+
+    aWindow.TabFeatures = this;
+    this.initListeners(aWindow);
+    this.initNewTabConfig(); // Does not require aWindow
+    this.initNewTabFocus(aWindow);
+    this.initShortcutCopyUrl(aWindow);
+  },
+
+  destroy() {
+    this.destroyNewTabConfig();
+  },
+
+  initListeners(aWindow) {
+    const doc = aWindow.document;
+
+    doc
+      .getElementById("tabContextMenu")
+      ?.addEventListener("popupshowing", this.tabContext.bind(this));
+    if (AppConstants.platform === "macosx") {
+      doc
+        .getElementById("file-menu")
+        ?.addEventListener("popupshowing", this.tabContext.bind(this));
+    } else {
+      doc
+        .getElementById("appMenu-popup")
+        ?.addEventListener("popupshowing", this.tabContext.bind(this));
+    }
+
+    const copyTabUrlElement = doc.getElementById("context_copyTabUrl");
+    if (copyTabUrlElement) {
+      copyTabUrlElement.addEventListener("command", (_event) => {
+        if (aWindow.TabContextMenu?.contextTab?.linkedBrowser) {
+          try {
+            this.copyTabUrl(
+              aWindow.TabContextMenu.contextTab.linkedBrowser.currentURI.spec,
+              aWindow
+            );
+          } catch (e) {
+            console.error(
+              "TabFeatures: Error inside copyTabUrl listener execution:",
+              e
+            );
+          }
+        } else {
+          // console.warn("TabFeatures: copyTabUrl not called, context or linkedBrowser not available.");
+        }
+      });
+    } else {
+      console.error(
+        "TabFeatures: FAILED to find element 'context_copyTabUrl'. Listener NOT attached."
+      );
+    }
+
+    doc
+      .getElementById("context_copyAllTabUrls")
+      ?.addEventListener("command", (_event) => {
+        this.copyAllTabUrls(aWindow);
+      });
+
+    doc
+      .getElementById("context_unloadTab")
+      ?.addEventListener("command", (_event) => {
+        if (
+          aWindow.gBrowser &&
+          aWindow.TabContextMenu &&
+          aWindow.TabContextMenu.contextTab
+        ) {
+          // Prevent unloading if it's the last tab or the only non-pinned tab in the window
+          if (
+            aWindow.gBrowser.tabs.length > 1 &&
+            (Array.from(aWindow.gBrowser.tabs).filter((t) => !t.pinned).length >
+              1 ||
+              !aWindow.TabContextMenu.contextTab.pinned)
+          ) {
+            aWindow.gBrowser.discardBrowser(aWindow.TabContextMenu.contextTab);
+          } else {
+            // console.log("TabFeatures: discardBrowser not called, conditions not met (e.g., last tab).");
+          }
+        } else {
+          // console.warn("TabFeatures: discardBrowser not called, context not available.");
+        }
+      });
+
+    const restartMac = doc.getElementById("app_restartBrowser");
+    if (restartMac) {
+      restartMac.addEventListener("command", (_event) => {
+        this.restartBrowser();
+      });
+    }
+
+    const restartOther = doc.getElementById("appMenu-restart-button");
+    if (restartOther && restartOther.getAttribute("data-tabfeatures-handler-attached") !== "true") {
+      restartOther.addEventListener("command", (_event) => {
+        this.restartBrowser();
+      });
+      restartOther.setAttribute("data-tabfeatures-handler-attached", "true");
+    }
+  },
+
+  initNewTabConfig() {
+    // Fetch pref if it exists
+    this.newTabURL = Services.prefs.getStringPref(this.NEW_TAB_CONFIG_PATH, "");
+
+    // Only proceed if a value is actually set
+    if (this.newTabURL) {
+      try {
+        lazy.AboutNewTab.newTabURL = this.newTabURL;
+        this.prefListener = Services.prefs.addObserver(
+          this.NEW_TAB_CONFIG_PATH,
+          (_subject, _topic, _data) => {
+            const newURL = Services.prefs.getStringPref(
+              this.NEW_TAB_CONFIG_PATH,
+              ""
+            );
+            if (newURL) {
+              lazy.AboutNewTab.newTabURL = newURL;
+            } else {
+              // If the pref is cleared, revert to default behavior
+              lazy.AboutNewTab.resetNewTabURL();
+            }
+          }
+        );
+      } catch (e) {
+        console.error("Error initializing new tab config:", e);
+      }
+    }
+  },
+
+  initNewTabFocus(window) {
+    window.gBrowser.tabContainer.addEventListener("TabOpen", (event) => {
+      const tab = event.target;
+      const browser = window.gBrowser.getBrowserForTab(tab);
+
+      browser.addEventListener(
+        "load",
+        function onLoad() {
+          browser.removeEventListener("load", onLoad);
+          window.setTimeout(() => {
+            browser.contentWindow.focus();
+          }, 0);
+        },
+        { once: true }
+      );
+    });
+  },
+
+  initShortcutCopyUrl(aWindow) {
+    const doc = aWindow.document;
+
+    const handler = (e) => {
+      try {
+        // Allow disabling via pref; default to enabled if unset
+        if (!Services.prefs.getBoolPref(this.PREF_COPYURL_SHORTCUT, true)) {
+          return;
+        }
+
+        const isMac = AppConstants.platform === "macosx";
+        const accelPressed = isMac ? e.metaKey : e.ctrlKey;
+
+        if (!accelPressed || !e.shiftKey || e.key?.toLowerCase() !== "u") {
+          return;
+        }
+
+        const url = aWindow.gBrowser?.currentURI?.spec;
+        if (!url) {
+          return;
+        }
+
+        // Prevent default so we don't trigger other shortcuts
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.copyTabUrl(url, aWindow);
+        this._showCopyNotification(url, aWindow);
+      } catch (err) {
+        console.error("TabFeatures: shortcut copy failed", err);
+      }
+    };
+
+    // Capture phase to beat page-level handlers
+    doc.addEventListener("keydown", handler, true);
+
+    aWindow.addEventListener(
+      "unload",
+      () => {
+        try {
+          doc.removeEventListener("keydown", handler, true);
+        } catch (_) {}
+      },
+      { once: true }
+    );
+  },
+
+  _showCopyNotification(url, aWindow) {
+    try {
+      const alerts = Cc["@mozilla.org/alerts-service;1"].getService(
+        Ci.nsIAlertsService
+      );
+      const title = "๐Ÿ”— URL Copied";
+      const text = url.length > 50 ? url.substring(0, 47) + "..." : url;
+
+      alerts.showAlertNotification(
+        null,
+        title,
+        text,
+        false,
+        "",
+        null,
+        "tabfeatures-copyurl"
+      );
+    } catch (e) {
+      console.log("URL copied to clipboard:", url);
+    }
+  },
+
+  destroyNewTabConfig() {
+    if (this.prefListener) {
+      Services.prefs.removeObserver(
+        this.NEW_TAB_CONFIG_PATH,
+        this.prefListener
+      );
+      this.prefListener = null;
+    }
+  },
+
+  tabContext(aEvent) {
+    let win = aEvent.view;
+    if (!win) {
+      win = Services.wm.getMostRecentWindow("navigator:browser");
+    }
+    const { document } = win;
+    const elements = document.getElementsByClassName("tabFeature");
+    for (let i = 0; i < elements.length; i++) {
+      const el = elements[i];
+      const pref = el.getAttribute("preference");
+      if (pref) {
+        const visible = Services.prefs.getBoolPref(pref);
+        el.hidden = !visible;
+      }
+    }
+    // Can't unload selected tab, so don't show menu item in that case
+    if (win.TabContextMenu.contextTab === win.gBrowser.selectedTab) {
+      const el = document.getElementById("context_unloadTab");
+      el.hidden = true;
+    }
+
+    // Ensure restart button in App Menu (Windows/Linux) has its handler after template instantiation
+    const restartBtn = document.getElementById("appMenu-restart-button");
+    if (restartBtn) {
+      // Toggle iconic styling to match icon prefs so alignment matches Exit when icons are disabled
+      const iconsDisabled = Services.prefs.getBoolPref("userChrome.icon.disabled", false);
+      const iconsInPanel = Services.prefs.getBoolPref("userChrome.icon.panel", false);
+      const shouldIconic = iconsInPanel && !iconsDisabled;
+      restartBtn.classList.toggle("subviewbutton-iconic", shouldIconic);
+
+      if (restartBtn.getAttribute("data-tabfeatures-handler-attached") !== "true") {
+        restartBtn.addEventListener("command", (_event) => {
+          this.restartBrowser();
+        });
+        restartBtn.setAttribute("data-tabfeatures-handler-attached", "true");
+      }
+    }
+  },
+
+  // Copies current tab url to clipboard
+  copyTabUrl(aUri, aWindow) {
+    const gClipboardHelper = Cc[
+      "@mozilla.org/widget/clipboardhelper;1"
+    ].getService(Ci.nsIClipboardHelper);
+    try {
+      Services.prefs.getBoolPref(this.PREF_ACTIVETAB)
+        ? gClipboardHelper.copyString(aWindow.gBrowser.currentURI.spec)
+        : gClipboardHelper.copyString(aUri);
+    } catch (e) {
+      throw new Error(
+        `We're sorry but something has gone wrong with 'CopyTabUrl' ${e}`
+      );
+    }
+  },
+
+  // Copies all tab urls to clipboard
+  copyAllTabUrls(aWindow) {
+    const gClipboardHelper = Cc[
+      "@mozilla.org/widget/clipboardhelper;1"
+    ].getService(Ci.nsIClipboardHelper);
+    //Get all urls
+    const urlArr = this._getAllUrls(aWindow);
+    try {
+      // Enumerate all urls in to a list.
+      let urlList = urlArr.join("\n");
+      // Send list to clipboard.
+      gClipboardHelper.copyString(urlList.trim());
+      // Clear url list after clipboard event
+      urlList = "";
+    } catch (e) {
+      throw new Error(
+        `We're sorry but something has gone wrong with 'copyAllTabUrls' ${e}`
+      );
+    }
+  },
+
+  // Get all the tab urls into an array.
+  _getAllUrls(aWindow) {
+    // We don't want to copy about uri's
+    const blocklist = /^about:.*/i;
+    const urlArr = [];
+    const tabCount = aWindow.gBrowser.browsers.length;
+    Array(tabCount)
+      .fill()
+      .map((_, i) => {
+        const spec = aWindow.gBrowser.getBrowserAtIndex(i).currentURI.spec;
+        if (!blocklist.test(spec)) {
+          urlArr.push(spec);
+        }
+      });
+    return urlArr;
+  },
+
+  async restartBrowser() {
+    try {
+      if (Services.prefs.getBoolPref(this.PREF_REQUIRECONFIRM)) {
+        // Need brand in here to be able to expand { -brand-short-name }
+        const l10n = new Localization([
+          "branding/brand.ftl",
+          "browser/waterfox.ftl",
+        ]);
+        const [title, question] = (
+          await l10n.formatMessages([
+            { id: "restart-prompt-title" },
+            { id: "restart-prompt-question" },
+          ])
+        ).map(({ value }) => value);
+
+        if (Services.prompt.confirm(null, title, question)) {
+          // only restart if confirmation given
+          this._attemptRestart();
+        }
+      } else {
+        this._attemptRestart();
+      }
+    } catch (e) {
+      console.error(
+        "We're sorry but something has gone wrong with 'restartBrowser' ",
+        e
+      );
+    }
+  },
+
+  _attemptRestart() {
+    // Purge cache if required
+    if (Services.prefs.getBoolPref(this.PREF_PURGECACHE)) {
+      Services.appinfo.invalidateCachesOnRestart();
+    }
+
+    // Initiate the restart
+    Services.startup.quit(
+      Services.startup.eRestart | Services.startup.eAttemptQuit
+    );
+  },
+};
diff --git a/waterfox/browser/components/tabfeatures/content/pinnedtab.css b/waterfox/browser/components/tabfeatures/content/pinnedtab.css
new file mode 100644
index 0000000000000..80a7d8ca7d9b3
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/content/pinnedtab.css
@@ -0,0 +1,25 @@
+@supports not -moz-bool-pref("browser.tabs.pinnedIconOnly") {
+  .tabbrowser-tab:is([pinned]) {
+    -moz-box-flex: 100;
+    max-width: 225px;
+    min-width: var(--tab-min-width);
+    width: 0;
+    transition:
+      min-width 100ms ease-out,
+      max-width 100ms ease-out;
+  }
+
+  .tabbrowser-tab:is([pinned]):not([fadein]) {
+    max-width: 0.1px;
+    min-width: 0.1px;
+    visibility: hidden;
+  }
+
+  .tabbrowser-tab:is([pinned]) .tab-throbber,
+  .tabbrowser-tab:is([pinned]) .tab-icon-pending,
+  .tabbrowser-tab:is([pinned]) .tab-icon-image,
+  .tabbrowser-tab:is([pinned]) .tab-sharing-icon-overlay,
+  .tabbrowser-tab:is([pinned]) .tab-icon-overlay {
+    margin-inline-end: 5.5px;
+  }
+}
diff --git a/waterfox/browser/components/tabfeatures/content/tabfeatures.xhtml b/waterfox/browser/components/tabfeatures/content/tabfeatures.xhtml
new file mode 100644
index 0000000000000..a5878d2aeb0ef
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/content/tabfeatures.xhtml
@@ -0,0 +1,39 @@
+#filter substitution
+<?xml version="1.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/. -->
+
+<overlay id="tabfeature-overlay" xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <popupset id="mainPopupSet">
+        <menupopup id="tabContextMenu">
+            <menuitem id="context_copyTabUrl" class="tabFeature"
+                data-lazy-l10n-id="copy-url" preference="browser.tabs.copyurl" />
+            <menuitem id="context_copyAllTabUrls" class="tabFeature"
+                data-lazy-l10n-id="copy-all-urls" preference="browser.tabs.copyallurls"
+                insertafter="context_copyTabUrl" />
+            <menuitem id="context_unloadTab" class="tabFeature"
+                data-lazy-l10n-id="unload-tab"
+                preference="browser.tabs.unloadTab" insertafter="context_copyAllTabUrls" />
+        </menupopup>
+    </popupset>
+#ifdef XP_MACOSX
+    <menubar id="main-menubar">
+        <menuitem id="app_restartBrowser" class="tabFeature"
+            data-l10n-id="appmenuitem-restart-browser" preference="browser.restart_menu.showpanelmenubtn" hidden="true"
+            insertafter="goOfflineMenuitem" />
+    </menubar>
+#else
+   <html:template id="appMenu-viewCache">
+       <panelview id="appMenu-mainView">
+           <vbox class="panel-subview-body">
+               <toolbarbutton id="appMenu-restart-button" class="subviewbutton subviewbutton-iconic tabFeature"
+                   data-l10n-id="appmenuitem-restart-browser"
+                   preference="browser.restart_menu.showpanelmenubtn" hidden="true"
+                   insertbefore="appMenu-quit-button2" />
+           </vbox>
+       </panelview>
+   </html:template>
+#endif
+</overlay>
diff --git a/waterfox/browser/components/tabfeatures/jar.mn b/waterfox/browser/components/tabfeatures/jar.mn
new file mode 100644
index 0000000000000..72985e3ca2612
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/jar.mn
@@ -0,0 +1,4 @@
+browser.jar:
+%  content browser %content/browser/ contentaccessible=yes
+*    content/browser/overlays/tabfeatures.xhtml            (content/tabfeatures.xhtml)
+     content/browser/tabfeatures/pinnedtab.css             (content/pinnedtab.css)
\ No newline at end of file
diff --git a/waterfox/browser/components/tabfeatures/moz.build b/waterfox/browser/components/tabfeatures/moz.build
new file mode 100644
index 0000000000000..0d421f29e4547
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "TabFeatures.sys.mjs",
+]
+
+BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
+
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/waterfox/browser/components/tabfeatures/test/browser/browser.ini b/waterfox/browser/components/tabfeatures/test/browser/browser.ini
new file mode 100644
index 0000000000000..ca12b41ae8594
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/test/browser/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+tags = waterfox_tabfeatures
+firefox-appdir = browser
+support-files =
+    head.js
+
+[browser_tabfeatures.js]
diff --git a/waterfox/browser/components/tabfeatures/test/browser/browser_tabfeatures.js b/waterfox/browser/components/tabfeatures/test/browser/browser_tabfeatures.js
new file mode 100644
index 0000000000000..f86ba098bf83c
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/test/browser/browser_tabfeatures.js
@@ -0,0 +1,112 @@
+add_task(async function testCopyTabUrls() {
+  // Make sure elements are present
+  const copyTabUrl = document.getElementById("context_copyTabUrl");
+  const copyAllTabUrls = document.getElementById("context_copyAllTabUrls");
+  ok(copyTabUrl, "Copy tab URL is included");
+  ok(copyAllTabUrls, "Copy all tab URLs is included");
+  // Make sure that defaults are set correctly
+  await openAndCloseTabContextMenu(gBrowser.selectedTab);
+  is(copyTabUrl.hidden, false, "Copy tab URL visible by default");
+  is(copyAllTabUrls.hidden, true, "Copy all tab URLs hidden by default");
+  // Make sure changing prefs causes elements to be shown/hidden
+  Services.prefs.setBoolPref(COPY_URL_PREF, false);
+  Services.prefs.setBoolPref(COPY_ALL_URLS_PREF, false);
+  await openAndCloseTabContextMenu(gBrowser.selectedTab);
+  is(copyTabUrl.hidden, true, "Copy tab URL hidden");
+  is(copyAllTabUrls.hidden, true, "Copy all tab URLs hidden");
+  Services.prefs.setBoolPref(COPY_URL_PREF, true);
+  Services.prefs.setBoolPref(COPY_ALL_URLS_PREF, true);
+  await openAndCloseTabContextMenu(gBrowser.selectedTab);
+  is(copyTabUrl.hidden, false, "Copy tab URL visible");
+  is(copyAllTabUrls.hidden, false, "Copy all tab URLs visible");
+  Services.prefs.clearUserPref(COPY_URL_PREF);
+  Services.prefs.clearUserPref(COPY_ALL_URLS_PREF);
+});
+
+add_task(async function testHideDuplicateTab() {
+  // Setting duplicateTab pref to false should hide element in all windows
+  const duplicateTab = document.getElementById("context_duplicateTab");
+  Services.prefs.setBoolPref(DUPLICATE_TAB_PREF, false);
+  await openAndCloseTabContextMenu(gBrowser.selectedTab);
+  is(duplicateTab.hidden, true, "Duplicate tab hidden");
+  // Should fall back to default value of true, i.e. element showing
+  Services.prefs.clearUserPref(DUPLICATE_TAB_PREF);
+  // Ensure showing
+  await openAndCloseTabContextMenu(gBrowser.selectedTab);
+  is(duplicateTab.hidden, false, "Duplicate tab showing");
+});
+
+add_task(async function testRestartItem() {
+  // Make sure element is present
+  const restartBrowserMenu = document.getElementById("app_restartBrowser");
+  // Need to use PanelMultiView to get PanelUI elements
+  const restartBrowserApp = PanelMultiView.getViewNode(
+    document,
+    "appMenu-restart-button"
+  );
+  if (OS === "macosx") {
+    ok(restartBrowserMenu, "Restart browser menu bar item is included");
+    is(restartBrowserApp, null, "Restart browser appMenu item not included");
+    await openAndCloseFileMenu();
+    is(
+      restartBrowserMenu.hidden,
+      false,
+      "Restart browser menu bar item is visible"
+    );
+  } else {
+    is(
+      restartBrowserMenu,
+      null,
+      "Restart browser menu bar item is not included"
+    );
+    ok(restartBrowserApp, "Restart browser appMenu item included");
+  }
+  // Make sure element is hidden
+  Services.prefs.setBoolPref(RESTART_PREF, false);
+  if (OS === "macosx") {
+    await openAndCloseFileMenu();
+    is(
+      restartBrowserMenu.hidden,
+      true,
+      "Restart browser menu bar item is hidden"
+    );
+  }
+  Services.prefs.clearUserPref(RESTART_PREF);
+});
+
+add_task(async function testCopyUrlFunctionality() {
+  const copyTabUrl = document.getElementById("context_copyTabUrl");
+  const copyAllTabUrls = document.getElementById("context_copyAllTabUrls");
+  const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URI1);
+  const browser = tab.linkedBrowser;
+  // Test copy tab url copies URL
+  await openTabContextMenu(tab);
+  EventUtils.synthesizeMouseAtCenter(copyTabUrl, {});
+  const tabURI = await pasteFromClipboard(browser);
+  is(tabURI, URI1);
+  // Test copy all tab urls
+  Services.prefs.setBoolPref(COPY_ALL_URLS_PREF, true);
+  const tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, URI2);
+  await openTabContextMenu(tab);
+  EventUtils.synthesizeMouseAtCenter(copyAllTabUrls, {});
+  const tabURIs = await pasteFromClipboard(browser);
+  is(tabURIs, `${URI1}\n${URI2}`);
+  // Test copy active tab pref
+  Services.prefs.setBoolPref(COPY_ACTIVE_URL_PREF, true);
+  await openTabContextMenu(tab);
+  EventUtils.synthesizeMouseAtCenter(copyTabUrl, {});
+  let activeURI = await pasteFromClipboard(browser);
+  // URI2 should be active, so we copy from tab1 to verify
+  is(activeURI, URI2);
+  // Then we verify that URI1 is copied when active pref is false
+  Services.prefs.setBoolPref(COPY_ACTIVE_URL_PREF, false);
+  await openTabContextMenu(tab);
+  EventUtils.synthesizeMouseAtCenter(copyTabUrl, {});
+  activeURI = await pasteFromClipboard(browser);
+  is(activeURI, URI1);
+  // Cleanup
+  Services.prefs.clearUserPref(COPY_ALL_URLS_PREF);
+  Services.prefs.clearUserPref(COPY_ACTIVE_URL_PREF);
+  BrowserTestUtils.removeTab(tab);
+  BrowserTestUtils.removeTab(tab2);
+});
diff --git a/waterfox/browser/components/tabfeatures/test/browser/head.js b/waterfox/browser/components/tabfeatures/test/browser/head.js
new file mode 100644
index 0000000000000..6d261b7413b01
--- /dev/null
+++ b/waterfox/browser/components/tabfeatures/test/browser/head.js
@@ -0,0 +1,87 @@
+const { synthesizeDrop, synthesizeMouseAtCenter } = EventUtils;
+
+const _COPY_URL_PREF = "browser.tabs.copyurl";
+const _COPY_ALL_URLS_PREF = "browser.tabs.copyallurls";
+const _COPY_ACTIVE_URL_PREF = "browser.tabs.copyurl.activetab";
+const _DUPLICATE_TAB_PREF = "browser.tabs.duplicateTab";
+const _RESTART_PREF = "browser.restart_menu.showpanelmenubtn";
+
+const _URI1 = "https://test1.example.com/";
+const _URI2 = "https://example.com/";
+
+const _OS = AppConstants.platform;
+/**
+ * Helper for opening the toolbar context menu.
+ */
+async function openTabContextMenu(tab) {
+  info("Opening tab context menu");
+  const contextMenu = document.getElementById("tabContextMenu");
+  const openTabContextMenuPromise = BrowserTestUtils.waitForPopupEvent(
+    contextMenu,
+    "shown"
+  );
+
+  EventUtils.synthesizeMouseAtCenter(tab, { type: "contextmenu" });
+  await openTabContextMenuPromise;
+  return contextMenu;
+}
+
+async function _openAndCloseTabContextMenu(tab) {
+  await openTabContextMenu(tab);
+  info("Opened tab context menu");
+  await EventUtils.synthesizeKey("VK_ESCAPE", {});
+  info("Closed tab context menu");
+}
+
+/**
+ * Helper for opening the file menu.
+ */
+async function openFileMenu() {
+  info("Opening file menu");
+  const fileMenu = document.getElementById("file-menu");
+  const openFileMenuPromise = BrowserTestUtils.waitForPopupEvent(
+    fileMenu,
+    "shown"
+  );
+  EventUtils.synthesizeMouseAtCenter(fileMenu, {});
+  await openFileMenuPromise;
+  return fileMenu;
+}
+
+async function _openAndCloseFileMenu() {
+  await openFileMenu();
+  await EventUtils.synthesizeKey("VK_ESCAPE", {});
+  info("Closed file menu");
+}
+
+/**
+ * Helper for opening toolbar context menu.
+ */
+async function _openToolbarContextMenu(contextMenu, target) {
+  const popupshown = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
+  EventUtils.synthesizeMouseAtCenter(target, { type: "contextmenu" });
+  await popupshown;
+}
+
+/**
+ * Helper to paste from clipboard
+ */
+
+async function _pasteFromClipboard(browser) {
+  return SpecialPowers.spawn(browser, [], () => {
+    const { document } = content;
+    document.body.contentEditable = true;
+    document.body.focus();
+    const pastePromise = new Promise((resolve) => {
+      document.addEventListener(
+        "paste",
+        (e) => {
+          resolve(e.clipboardData.getData("text/plain"));
+        },
+        { once: true }
+      );
+    });
+    document.execCommand("paste");
+    return pastePromise;
+  });
+}
diff --git a/waterfox/browser/components/tabgrouping/LICENSE b/waterfox/browser/components/tabgrouping/LICENSE
new file mode 100644
index 0000000000000..86dd6354ba906
--- /dev/null
+++ b/waterfox/browser/components/tabgrouping/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 David Demri
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the โ€œSoftwareโ€), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED โ€œAS ISโ€, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/waterfox/browser/components/tabgrouping/README.md b/waterfox/browser/components/tabgrouping/README.md
new file mode 100644
index 0000000000000..e51c89eafd757
--- /dev/null
+++ b/waterfox/browser/components/tabgrouping/README.md
@@ -0,0 +1,58 @@
+# Automatic Tab Grouping Feature
+
+This feature is inspired by the Firefox WebExtension "New Tab Same Group" by onlybets.
+(Source: https://github.com/onlybets/firefox-addon-new-tab-same-group/blob/main/README.md)
+
+This module implements automatic tab grouping functionality, which automatically adds new tabs to the same group as the currently active tab.
+
+## Features
+
+- **Automatic Grouping**: When enabled, new tabs are automatically added to the same group as the source tab (the tab that was active when the new tab was created).
+
+- **Configurable Placement**: Users can choose where new tabs appear within the group:
+  - After the source tab (default)
+  - At the beginning of the group
+  - At the end of the group
+
+- **Optional Delay**: Users can enable a 1-second delay before grouping occurs, allowing them to cancel the operation if desired.
+
+- **Keyboard Shortcut**: When delay is enabled, users can press a keyboard shortcut (default: Ctrl+` on Windows/Linux, Alt+` on macOS) to cancel pending grouping operations.
+
+- **Bypass Shortcut**: Press Alt+Shift+T to open a new tab in the standard way (no grouping). This can be configured via preferences.
+
+- **Smart Tab Tracking**: The feature maintains a history of active tabs to handle edge cases where the source tab might not be immediately available.
+
+## Implementation
+
+The feature consists of:
+
+1. **TabGrouping.sys.mjs**: Core module that handles all the grouping logic
+2. **Preferences**: User-configurable settings with defaults
+3. **UI Overlays**: Integration with the preferences UI
+4. **Localization**: User-facing strings in tabgrouping.ftl
+
+## Preferences
+
+- `browser.tabs.autoGroupNewTabs`: Enable/disable the feature (default: true)
+- `browser.tabs.autoGroupNewTabs.placement`: Tab placement mode (default: "after")
+- `browser.tabs.autoGroupNewTabs.delayEnabled`: Enable grouping delay (default: false)
+- `browser.tabs.autoGroupNewTabs.delayMs`: Delay duration in milliseconds (default: 1000)
+- `browser.tabs.autoGroupNewTabs.cancelShortcut`: Keyboard shortcut to cancel (platform-specific default)
+- `browser.tabs.autoGroupNewTabs.bypassShortcut`: Keyboard shortcut to open a standard new tab without grouping (default: "Alt+Shift+T")
+
+## Architecture
+
+The module:
+- Listens for tab creation events via observer notifications
+- Tracks active tab history to determine the appropriate source tab
+- Manages pending grouping operations with timers
+- Handles keyboard shortcuts dynamically when delay is enabled
+- Integrates with the existing tab group infrastructure in tabbrowser.js
+
+## Usage
+
+The feature is automatically initialized when the browser starts via WaterfoxGlue.sys.mjs.
+
+This project contains code under two licenses:
+- Original implementation: MIT License (see LICENSE)
+- Rewritten portions: Mozilla Public License 2.0
diff --git a/waterfox/browser/components/tabgrouping/TabGrouping.sys.mjs b/waterfox/browser/components/tabgrouping/TabGrouping.sys.mjs
new file mode 100644
index 0000000000000..1fdee2893cfd6
--- /dev/null
+++ b/waterfox/browser/components/tabgrouping/TabGrouping.sys.mjs
@@ -0,0 +1,1045 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  PrefUtils: "resource:///modules/PrefUtils.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  clearTimeout: "resource://gre/modules/Timer.sys.mjs",
+  setInterval: "resource://gre/modules/Timer.sys.mjs",
+  clearInterval: "resource://gre/modules/Timer.sys.mjs",
+});
+
+/**
+ * Preferences used by the TabGrouping module.
+ * - ENABLED: Master switch for auto-grouping.
+ * - PLACEMENT: Positioning of the newly grouped tab within the source group.
+ * - DELAY_ENABLED: Whether to delay grouping to allow cancellation.
+ * - DELAY_MS: Delay window duration in milliseconds.
+ * - CANCEL_SHORTCUT: Temporary shortcut to cancel pending grouping.
+ * - BYPASS_SHORTCUT: Always-on shortcut to open a standard new tab without grouping.
+ */
+const PREFS = {
+  ENABLED: "browser.tabs.autoGroupNewTabs",
+  PLACEMENT: "browser.tabs.autoGroupNewTabs.placement",
+  DELAY_ENABLED: "browser.tabs.autoGroupNewTabs.delayEnabled",
+  DELAY_MS: "browser.tabs.autoGroupNewTabs.delayMs",
+  CANCEL_SHORTCUT: "browser.tabs.autoGroupNewTabs.cancelShortcut",
+  BYPASS_SHORTCUT: "browser.tabs.autoGroupNewTabs.bypassShortcut",
+  DEBUG_LOG: "browser.tabs.autoGroupNewTabs.debugLog",
+  RESUME_GRACE_MS: "browser.tabs.autoGroupNewTabs.resumeGraceMs",
+};
+
+/**
+ * Enumerates placement modes for positioning a new tab within a group.
+ * - AFTER: Immediately after the source tab.
+ * - FIRST: At the beginning of the group.
+ * - LAST: At the end of the group (no explicit move post-grouping).
+ */
+const PLACEMENT_MODES = {
+  AFTER: "after",
+  FIRST: "first",
+  LAST: "last",
+};
+
+/**
+ * Core module that implements automatic tab grouping.
+ *
+ * Responsibilities:
+ * - Track active tab snapshot and per-window history to infer source tab.
+ * - Group newly created tabs into the source tabโ€™s group.
+ * - Optionally delay grouping with a cancel window.
+ * - Provide an always-on bypass shortcut to open a standard new tab (no grouping).
+ *
+ * State fields:
+ * - _enabled, _placement, _delayEnabled, _delayMs, _cancelShortcut, _bypassShortcut
+ * - _lastActiveTab, _activeHistory, _snapshotInterval
+ * - _pendingTimers, _cancelShortcutActive, _suspended
+ *
+ * Public API:
+ * - init(): Initialize listeners and state.
+ * - shutdown(): Tear down listeners and timers.
+ * - cancelPendingGrouping(): Cancel all pending delayed groupings.
+ */
+export const TabGrouping = {
+  _initialized: false,
+  _enabled: true,
+  _placement: PLACEMENT_MODES.AFTER,
+  _delayEnabled: false,
+  _delayMs: 1000,
+  _cancelShortcut: "",
+  _bypassShortcut: "",
+  /** Enable verbose debug logging for TabGrouping. */
+  _debugLog: false,
+  _lastActiveTab: null,
+  _activeHistory: new Map(),
+  _snapshotInterval: null,
+  _pendingTimers: new Map(),
+  _cancelShortcutActive: false,
+  /** True while grouping is suspended (e.g., during session restore/startup). */
+  _suspended: false,
+  /** Grace period (ms) after restore before resuming grouping. */
+  _resumeGraceMs: 1000,
+  /** Timer handle for delayed resume after restore. */
+  _resumeTimer: null,
+
+  /**
+   * Initialize the TabGrouping module.
+   * - Loads preferences and observers
+   * - Starts active tab tracking (snapshot + history)
+   * - Registers tab listeners and keyboard shortcuts
+   */
+  init() {
+    if (this._initialized) {
+      return;
+    }
+    this._initialized = true;
+
+    // 1) Preferences
+    this._loadPreferences();
+    this._setupPrefObservers();
+
+    // 2) Active tab tracking (snapshot + history)
+    this._startActiveTabTracking();
+
+    // 3) Tab lifecycle listeners
+    this._addEventListeners();
+
+    // 4) Cancel shortcut wiring (observer)
+    this._setupKeyboardShortcuts();
+    this._updateBypassShortcut();
+    // Register collapse guards
+    this._registerCollapseGuards();
+    // Start in suspended mode during startup/session restore; resume once ready.
+    this._suspended = true;
+    Services.obs.addObserver(this, "sessionstore-windows-restored");
+    Services.obs.addObserver(this, "browser-delayed-startup-finished");
+  },
+
+  /**
+   * Shutdown the TabGrouping module.
+   * Cleans up timers, observers, and keyboard shortcuts and clears state.
+   */
+  shutdown() {
+    if (!this._initialized) {
+      return;
+    }
+    this._initialized = false;
+
+    // Stop snapshot
+    if (this._snapshotInterval) {
+      lazy.clearInterval(this._snapshotInterval);
+      this._snapshotInterval = null;
+    }
+
+    // Cancel pending
+    this._cancelAllPending();
+
+    // Remove observers
+    this._removeEventListeners();
+
+    // Shortcut cleanup
+    this._cleanupKeyboardShortcuts();
+    this._unregisterBypassShortcut();
+    this._unregisterCollapseGuards();
+    if (this._resumeTimer) {
+      lazy.clearTimeout(this._resumeTimer);
+      this._resumeTimer = null;
+    }
+    try {
+      Services.obs.removeObserver(this, "sessionstore-windows-restored");
+    } catch (_e) {}
+    try {
+      Services.obs.removeObserver(this, "browser-delayed-startup-finished");
+    } catch (_e) {}
+
+    // Clear state
+    this._lastActiveTab = null;
+    this._activeHistory.clear();
+  },
+
+  /**
+   * Load user preferences for automatic tab grouping.
+   * Reads current values for feature enablement, placement mode, delay settings,
+   * cancel shortcut, and bypass shortcut.
+   */
+  _loadPreferences() {
+    this._enabled = lazy.PrefUtils.get(PREFS.ENABLED, true);
+    this._placement = lazy.PrefUtils.get(
+      PREFS.PLACEMENT,
+      PLACEMENT_MODES.AFTER
+    );
+    this._delayEnabled = lazy.PrefUtils.get(PREFS.DELAY_ENABLED, false);
+    this._delayMs = lazy.PrefUtils.get(PREFS.DELAY_MS, 1000);
+    this._cancelShortcut = lazy.PrefUtils.get(
+      PREFS.CANCEL_SHORTCUT,
+      Services.appinfo.OS === "Darwin" ? "Option+`" : "Ctrl+`"
+    );
+    this._bypassShortcut = lazy.PrefUtils.get(
+      PREFS.BYPASS_SHORTCUT,
+      Services.appinfo.OS === "Darwin" ? "Option+Shift+T" : "Alt+Shift+T"
+    );
+    this._resumeGraceMs = lazy.PrefUtils.get(PREFS.RESUME_GRACE_MS, 1000);
+    this._debugLog = lazy.PrefUtils.get(PREFS.DEBUG_LOG, false);
+  },
+
+  /**
+   * Register observers for preference changes that affect tab grouping behavior.
+   * Updates in-memory state and toggles runtime listeners as needed.
+   */
+  _setupPrefObservers() {
+    this._prefObservers = [
+      lazy.PrefUtils.addObserver(PREFS.ENABLED, (v) => {
+        this._enabled = v;
+        if (!v) {
+          this._cancelAllPending();
+        }
+      }),
+      lazy.PrefUtils.addObserver(PREFS.PLACEMENT, (v) => {
+        this._placement = v;
+      }),
+      lazy.PrefUtils.addObserver(PREFS.DELAY_ENABLED, (v) => {
+        this._delayEnabled = v;
+        if (!v) {
+          this._cancelAllPending();
+        }
+      }),
+      lazy.PrefUtils.addObserver(PREFS.BYPASS_SHORTCUT, (v) => {
+        this._bypassShortcut = v;
+        this._updateBypassShortcut();
+      }),
+      lazy.PrefUtils.addObserver(PREFS.DEBUG_LOG, (v) => {
+        this._debugLog = v;
+      }),
+    ];
+  },
+
+  /**
+   * Start tracking the active tab via periodic snapshot and activation events.
+   * Maintains a per-window history [current, previous] to support robust
+   * source tab detection during tab creation.
+   */
+  _startActiveTabTracking() {
+    this._refreshSnapshot();
+    this._snapshotInterval = lazy.setInterval(
+      () => this._refreshSnapshot(),
+      5000
+    );
+
+    // Observe tab/window activation to maintain per-window history
+    Services.obs.addObserver(this, "browser-tab-activated");
+    Services.obs.addObserver(this, "browser-window-focus-changed");
+  },
+
+  _refreshSnapshot() {
+    const win = Services.wm.getMostRecentWindow("navigator:browser");
+    if (win?.gBrowser) {
+      const tab = win.gBrowser.selectedTab;
+      if (tab) {
+        this._lastActiveTab = tab;
+      }
+    }
+  },
+
+  _handleTabActivated(tab) {
+    if (!tab || !tab.ownerGlobal) {
+      return;
+    }
+    const window = tab.ownerGlobal;
+    const windowId = window.docShell.outerWindowID;
+    const history = this._activeHistory.get(windowId) || [];
+
+    // [current, previous]
+    if (history[0] && history[0] !== tab) {
+      history.unshift(tab);
+    } else {
+      history[0] = tab;
+    }
+    this._activeHistory.set(windowId, history.slice(0, 2));
+    this._lastActiveTab = tab;
+  },
+
+  _addEventListeners() {
+    Services.obs.addObserver(this, "browser-tab-created");
+    Services.obs.addObserver(this, "browser-tab-removed");
+  },
+
+  _removeEventListeners() {
+    try {
+      Services.obs.removeObserver(this, "browser-tab-created");
+    } catch (_) {}
+    try {
+      Services.obs.removeObserver(this, "browser-tab-removed");
+    } catch (_) {}
+    try {
+      Services.obs.removeObserver(this, "browser-tab-activated");
+    } catch (_) {}
+    try {
+      Services.obs.removeObserver(this, "browser-window-focus-changed");
+    } catch (_) {}
+  },
+
+  /**
+   * Global observer entry point for tab and window events.
+   * Handles: tab created/removed/activated, window focus changes,
+   * and cancel-auto-grouping notifications.
+   *
+   * @param {any} subject - Event subject (often a tab element)
+   * @param {string} topic - Observer topic identifier
+   * @param {string} _data - Reserved extra data (unused)
+   */
+  observe(subject, topic, _data) {
+    switch (topic) {
+      case "browser-tab-created":
+        this._handleTabCreated(subject);
+        break;
+      case "browser-tab-removed":
+        this._handleTabRemoved(subject);
+        break;
+      case "browser-tab-activated":
+        this._handleTabActivated(subject);
+        break;
+      case "browser-window-focus-changed":
+        this._refreshSnapshot();
+        break;
+      case "browser-cancel-auto-grouping":
+        this.cancelPendingGrouping();
+        break;
+      case "sessionstore-windows-restored":
+        // Schedule resume after grace period to avoid acting during restore churn
+        if (this._resumeTimer) {
+          lazy.clearTimeout(this._resumeTimer);
+          this._resumeTimer = null;
+        }
+        this._resumeTimer = lazy.setTimeout(() => {
+          this._suspended = false;
+          this._resumeTimer = null;
+          this._log(
+            `Session restore complete: resuming grouping after ${this._resumeGraceMs}ms`
+          );
+        }, this._resumeGraceMs);
+        try {
+          Services.obs.removeObserver(this, "sessionstore-windows-restored");
+        } catch (_e) {}
+        try {
+          Services.obs.removeObserver(this, "browser-delayed-startup-finished");
+        } catch (_e) {}
+        break;
+      case "browser-delayed-startup-finished":
+        // Defensive: if sessionstore didn't notify (e.g., no restore), schedule resume now
+        if (this._suspended) {
+          if (this._resumeTimer) {
+            lazy.clearTimeout(this._resumeTimer);
+            this._resumeTimer = null;
+          }
+          this._resumeTimer = lazy.setTimeout(() => {
+            this._suspended = false;
+            this._resumeTimer = null;
+            this._log(
+              `Delayed startup finished: resuming grouping after ${this._resumeGraceMs}ms`
+            );
+          }, this._resumeGraceMs);
+        }
+        try {
+          Services.obs.removeObserver(this, "browser-delayed-startup-finished");
+        } catch (_e) {}
+        try {
+          Services.obs.removeObserver(this, "sessionstore-windows-restored");
+        } catch (_e) {}
+        break;
+    }
+  },
+
+  /**
+   * Handle new tab creation:
+   * - Determines the source tab via snapshot + per-window history fallback.
+   * - Skips grouping during session restore while grouping is suspended (_suspended is true).
+   * - Skips grouping if a bypass-open was just requested for this window.
+   * - Skips grouping if the new tab already has a group (e.g., from session restore).
+   * - Applies optional delay window to allow cancellation via the cancel shortcut.
+   * @param {XULElement} newTab - The newly created tab element.
+   * @returns {Promise<void>}
+   */
+  async _handleTabCreated(newTab) {
+    if (!this._enabled || !newTab || !newTab.ownerGlobal) {
+      return;
+    }
+
+    // Skip grouping during session restore
+    if (this._suspended) {
+      this._log("Suspended (session restore): skipping grouping for new tab");
+      return;
+    }
+    const window = newTab.ownerGlobal;
+    const gBrowser = window.gBrowser;
+
+    // If tab groups are collapsed in this window, skip grouping to avoid reverse order/merging
+    if (window.__tabGroupingCollapsed) {
+      this._log("Groups collapsed: skipping grouping for new tab");
+      return;
+    }
+
+    // Bypass shortcut: skip grouping for this creation
+    if (window.__tabGroupingBypassNext) {
+      this._log("Bypass flag detected for new tab: skipping grouping");
+      window.__tabGroupingBypassNext = false;
+      return;
+    }
+
+    // If the new tab already has a group (e.g., session restore), do not regroup.
+    if (newTab.group) {
+      this._log(
+        "New tab already has a group (likely restore): skipping regrouping"
+      );
+      return;
+    }
+    // 1) Snapshot source
+    const sourceTab = this._findSourceTab(newTab, window);
+    if (!sourceTab || !sourceTab.group) {
+      this._log(
+        "No valid source tab or source has no group: skipping grouping"
+      );
+      return;
+    }
+
+    // 2) Delay or immediate
+    if (this._delayEnabled) {
+      this._log("Scheduling delayed grouping");
+      this._scheduleGrouping(newTab, sourceTab, gBrowser);
+    } else {
+      this._log("Grouping immediately");
+      this._groupTab(newTab, sourceTab, gBrowser);
+    }
+  },
+
+  /**
+   * Resolve the source tab for grouping a newly created tab.
+   * Prefers the last active snapshot, with a history fallback:
+   * - If the new tab is selected and snapshot points to itself, use previous active in history.
+   * - Otherwise use current active in history for that window.
+   * @param {XULElement} newTab - The new tab being grouped.
+   * @param {Window} window - The browser window where the tab was created.
+   * @returns {XULElement|null} The inferred source tab or null if not found.
+   */
+  _findSourceTab(newTab, window) {
+    // Start with snapshot
+    let source = this._lastActiveTab;
+
+    // Fallback to history if snapshot is self or missing
+    if (newTab.selected && source && source === newTab) {
+      source = null;
+    }
+    if (!source || source.ownerGlobal !== window) {
+      const windowId = window.docShell.outerWindowID;
+      const history = this._activeHistory.get(windowId) || [];
+      source = newTab.selected ? history[1] : history[0];
+    }
+    return source;
+  },
+
+  /**
+   * Schedule grouping after a delay to allow cancellation.
+   * Enables the cancel shortcut only while at least one pending timer exists.
+   * @param {XULElement} newTab - The newly created tab.
+   * @param {XULElement} sourceTab - The inferred source tab (must have a group).
+   * @param {object} gBrowser - The tab browser instance for the window.
+   */
+  _scheduleGrouping(newTab, sourceTab, gBrowser) {
+    // Cancel existing timer for this tab
+    this._cancelPendingForTab(newTab);
+
+    // Enable cancel shortcut while something is pending
+    if (!this._cancelShortcutActive) {
+      this._enableCancelShortcut();
+    }
+
+    const timer = lazy.setTimeout(() => {
+      this._pendingTimers.delete(newTab);
+      if (this._pendingTimers.size === 0) {
+        this._disableCancelShortcut();
+      }
+      this._groupTab(newTab, sourceTab, gBrowser);
+    }, this._delayMs);
+
+    this._pendingTimers.set(newTab, timer);
+  },
+
+  /**
+   * Group the new tab into the source tab's group and apply placement policy.
+   * Validates both tabs are still in the same window and the source has a group.
+   * @param {XULElement} newTab - The newly created tab.
+   * @param {XULElement} sourceTab - The source tab providing the group.
+   * @param {object} gBrowser - The tab browser instance for the window.
+   * @returns {Promise<void>}
+   */
+  async _groupTab(newTab, sourceTab, gBrowser) {
+    try {
+      // Ensure tabs are still valid and in same window
+      if (
+        !sourceTab ||
+        sourceTab === newTab ||
+        !sourceTab.group ||
+        newTab.group ||
+        newTab.ownerGlobal !== sourceTab.ownerGlobal
+      ) {
+        return;
+      }
+
+      // Add to the same group
+      this._log("Grouping new tab into source group");
+      gBrowser.moveTabToGroup(newTab, sourceTab.group);
+
+      // Apply placement
+      await this._applyPlacement(newTab, sourceTab, gBrowser);
+    } catch (error) {
+      Cu.reportError(`TabGrouping: Failed to group tab: ${error}`);
+    }
+  },
+
+  /**
+   * Apply placement mode for the newly grouped tab within the source group.
+   * Modes:
+   * - "after": Move after the source tab.
+   * - "first": Move to the beginning of the group (or before source if it is the only other tab).
+   * - "last": Do not explicitly move; rely on default placement at the end.
+   * @param {XULElement} newTab - The newly grouped tab.
+   * @param {XULElement} sourceTab - The source tab within the same group.
+   * @param {object} gBrowser - The tab browser instance for the window.
+   * @returns {Promise<void>}
+   */
+  async _applyPlacement(newTab, sourceTab, gBrowser) {
+    // Defensive: tabs may have moved or been restored; ensure we are still in same window and group
+    if (!newTab || !sourceTab) {
+      return;
+    }
+    if (newTab.ownerGlobal !== sourceTab.ownerGlobal) {
+      return;
+    }
+    if (!newTab.group || !sourceTab.group) {
+      return;
+    }
+    if (newTab.group !== sourceTab.group) {
+      return;
+    }
+    switch (this._placement) {
+      case PLACEMENT_MODES.AFTER: {
+        // Move after the source tab (keeps inside the group)
+        gBrowser.moveTabAfter(newTab, sourceTab);
+        break;
+      }
+
+      case PLACEMENT_MODES.FIRST: {
+        // Move to the first position in the group
+        const groupTabs = gBrowser.tabs.filter(
+          (t) => t.group === sourceTab.group && t !== newTab
+        );
+        if (groupTabs.length > 0) {
+          const firstTab = groupTabs.reduce(
+            (min, t) => (t._tPos < min._tPos ? t : min),
+            groupTabs[0]
+          );
+          gBrowser.moveTabBefore(newTab, firstTab);
+        } else {
+          // No other tabs yet: place before source
+          gBrowser.moveTabBefore(newTab, sourceTab);
+        }
+        break;
+      }
+
+      case PLACEMENT_MODES.LAST: {
+        // Match addon behavior: don't move explicitly after grouping
+        // (rely on default placement of moveTabToGroup for "end" semantics)
+        break;
+      }
+    }
+  },
+
+  /**
+   * Handle tab removal by canceling any pending delayed grouping for that tab.
+   * @param {XULElement} tab - The removed tab element.
+   */
+  _handleTabRemoved(tab) {
+    this._cancelPendingForTab(tab);
+  },
+
+  /**
+   * Cancel a pending delayed grouping timer for a specific tab, if present.
+   * Disables the cancel shortcut when no timers remain.
+   * @param {XULElement} tab - The tab whose pending timer should be canceled.
+   */
+  _cancelPendingForTab(tab) {
+    if (this._pendingTimers.has(tab)) {
+      lazy.clearTimeout(this._pendingTimers.get(tab));
+      this._pendingTimers.delete(tab);
+
+      if (this._pendingTimers.size === 0) {
+        this._disableCancelShortcut();
+      }
+    }
+  },
+
+  /**
+   * Cancel all pending delayed grouping timers and disable the cancel shortcut.
+   */
+  _cancelAllPending() {
+    this._log("Cancel all pending grouping operations");
+    for (const timer of this._pendingTimers.values()) {
+      lazy.clearTimeout(timer);
+    }
+    this._pendingTimers.clear();
+    this._disableCancelShortcut();
+  },
+
+  /**
+   * Cancel all pending delayed grouping operations and disable the cancel shortcut.
+   */
+  cancelPendingGrouping() {
+    this._log("Cancel pending grouping requested");
+    this._cancelAllPending();
+  },
+
+  /**
+   * Register the observer used by the temporary cancel shortcut.
+   * This observer is active only while delayed operations are pending.
+   */
+  _setupKeyboardShortcuts() {
+    Services.obs.addObserver(this, "browser-cancel-auto-grouping");
+  },
+
+  /**
+   * Remove the observer for the temporary cancel shortcut and unregister it
+   * from all browser windows.
+   */
+  _cleanupKeyboardShortcuts() {
+    try {
+      Services.obs.removeObserver(this, "browser-cancel-auto-grouping");
+    } catch (_e) {}
+    this._unregisterKeyboardShortcut();
+  },
+
+  /**
+   * Enable the temporary cancel shortcut globally while timers are pending.
+   */
+  _enableCancelShortcut() {
+    this._cancelShortcutActive = true;
+    this._log("Cancel shortcut enabled");
+    this._updateKeyboardShortcut();
+  },
+
+  /**
+   * Disable the temporary cancel shortcut when no timers remain.
+   */
+  _disableCancelShortcut() {
+    this._cancelShortcutActive = false;
+    this._log("Cancel shortcut disabled");
+    this._unregisterKeyboardShortcut();
+  },
+
+  /**
+   * Register or unregister the temporary cancel shortcut based on current state.
+   */
+  _updateKeyboardShortcut() {
+    if (this._cancelShortcutActive && this._cancelShortcut) {
+      this._registerKeyboardShortcut();
+    } else {
+      this._unregisterKeyboardShortcut();
+    }
+  },
+
+  /**
+   * Register the temporary cancel shortcut on all open browser windows.
+   */
+  _registerKeyboardShortcut() {
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._addShortcutToWindow(window);
+    }
+  },
+
+  /**
+   * Unregister the temporary cancel shortcut from all open browser windows.
+   */
+  _unregisterKeyboardShortcut() {
+    // Unregister the shortcut from all browser windows
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._removeShortcutFromWindow(window);
+    }
+  },
+
+  /**
+   * Register or unregister the always-on bypass shortcut depending on preference.
+   * When set, the shortcut opens a standard new tab and bypasses grouping.
+   */
+  _updateBypassShortcut() {
+    // Always-on: register if a non-empty shortcut is configured
+    if (this._bypassShortcut) {
+      this._registerBypassShortcut();
+    } else {
+      this._unregisterBypassShortcut();
+    }
+  },
+
+  /**
+   * Register the bypass shortcut on all open browser windows.
+   */
+  _registerBypassShortcut() {
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._addBypassShortcutToWindow(window);
+    }
+  },
+
+  /**
+   * Unregister the bypass shortcut from all open browser windows.
+   */
+  _unregisterBypassShortcut() {
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._removeBypassShortcutFromWindow(window);
+    }
+  },
+
+  /**
+   * Attach the bypass shortcut keydown handler to a browser window.
+   * @param {Window} window - The target browser window.
+   */
+  _addBypassShortcutToWindow(window) {
+    if (!window?.gBrowser || !this._bypassShortcut) {
+      return;
+    }
+
+    const [modifiers, key] = this._parseShortcut(this._bypassShortcut);
+    if (!key) {
+      return;
+    }
+
+    const handler = (event) => {
+      if (this._matchesShortcut(event, modifiers, key)) {
+        event.preventDefault();
+        event.stopPropagation();
+        try {
+          this._log(
+            "Bypass new tab shortcut triggered: opening standard new tab"
+          );
+          // Mark bypass for the next created tab in this window
+          window.__tabGroupingBypassNext = true;
+          // Open a new tab "standard way" (no grouping)
+          if (typeof window.BrowserOpenTab === "function") {
+            window.BrowserOpenTab();
+          } else if (window.gBrowser?.addTab) {
+            window.gBrowser.selectedTab =
+              window.gBrowser.addTab("about:newtab");
+          }
+        } catch (_e) {}
+      }
+    };
+
+    if (window.__tabGroupingBypassHandler) {
+      window.removeEventListener(
+        "keydown",
+        window.__tabGroupingBypassHandler,
+        true
+      );
+    }
+    window.__tabGroupingBypassHandler = handler;
+    window.addEventListener("keydown", handler, true);
+  },
+
+  /**
+   * Detach the bypass shortcut keydown handler from a browser window.
+   * @param {Window} window - The target browser window.
+   */
+  _removeBypassShortcutFromWindow(window) {
+    if (window.__tabGroupingBypassHandler) {
+      window.removeEventListener(
+        "keydown",
+        window.__tabGroupingBypassHandler,
+        true
+      );
+      delete window.__tabGroupingBypassHandler;
+    }
+  },
+
+  /**
+   * Attach the temporary cancel shortcut keydown handler to a browser window.
+   * Active only while delayed grouping operations are pending.
+   * @param {Window} window - The target browser window.
+   */
+  _addShortcutToWindow(window) {
+    if (!window?.gBrowser || !this._cancelShortcut) {
+      return;
+    }
+
+    const [modifiers, key] = this._parseShortcut(this._cancelShortcut);
+    if (!key) {
+      return;
+    }
+
+    const handler = (event) => {
+      if (this._matchesShortcut(event, modifiers, key)) {
+        event.preventDefault();
+        event.stopPropagation();
+        Services.obs.notifyObservers(null, "browser-cancel-auto-grouping");
+      }
+    };
+
+    if (window.__tabGroupingShortcutHandler) {
+      window.removeEventListener(
+        "keydown",
+        window.__tabGroupingShortcutHandler,
+        true
+      );
+    }
+    window.__tabGroupingShortcutHandler = handler;
+    window.addEventListener("keydown", handler, true);
+  },
+
+  /**
+   * Detach the temporary cancel shortcut keydown handler from a browser window.
+   * @param {Window} window - The target browser window.
+   */
+  _removeShortcutFromWindow(window) {
+    if (window.__tabGroupingShortcutHandler) {
+      window.removeEventListener(
+        "keydown",
+        window.__tabGroupingShortcutHandler,
+        true
+      );
+      delete window.__tabGroupingShortcutHandler;
+    }
+  },
+
+  /**
+   * Parse a human-readable shortcut string into modifiers and a normalized key.
+   * Supports synonyms for the backquote key and normalizes to event.code "Backquote".
+   * @param {string} shortcut - Shortcut string (e.g., "Alt+Shift+T").
+   * @returns {[Set<string>, string]} Tuple of (modifiers, keyCodeOrKey).
+   */
+  _parseShortcut(shortcut) {
+    const parts = shortcut.split("+");
+    const rawKey = (parts.pop() || "").trim();
+    const normalized = parts.map((m) => {
+      const s = m.trim().toLowerCase();
+      return s === "option" || s === "opt" ? "alt" : s;
+    });
+    const modifiers = new Set(normalized);
+    // Normalize backquote variants to event.code 'Backquote' for reliable matching
+    const lower = rawKey.toLowerCase();
+    const key =
+      rawKey === "`" ||
+      lower === "backquote" ||
+      lower === "backtick" ||
+      lower === "grave"
+        ? "Backquote"
+        : rawKey;
+    return [modifiers, key];
+  },
+
+  /**
+   * Check whether a keyboard event matches the given shortcut definition.
+   * Requires exact modifier match (no extra modifiers).
+   * Special-cases Backquote to accept either event.key or event.code.
+   * @param {KeyboardEvent} event - The keydown event to test.
+   * @param {Set<string>} modifiers - Required modifiers (e.g., "ctrl", "alt", "shift", "cmd"|"meta").
+   * @param {string} key - Normalized key or code (e.g., "Backquote", "T").
+   * @returns {boolean} True if the event matches the shortcut.
+   */
+  _matchesShortcut(event, modifiers, key) {
+    // Key match: accept either event.key or event.code for Backquote
+    const isBackquote = key === "Backquote" || key === "`";
+    const keyOk = isBackquote
+      ? event.key === "`" || event.code === "Backquote"
+      : event.key === key || event.code === key;
+    if (!keyOk) {
+      return false;
+    }
+
+    // Required modifiers
+    const requiresCtrl = modifiers.has("ctrl");
+    const requiresMeta = modifiers.has("cmd") || modifiers.has("meta");
+    const requiresAlt = modifiers.has("alt");
+    const requiresShift = modifiers.has("shift");
+
+    // Pressed modifiers
+    const pressedCtrl = event.ctrlKey;
+    const pressedMeta = event.metaKey; // Cmd on macOS
+    const pressedAlt = event.altKey;
+    const pressedShift = event.shiftKey;
+
+    // Exact match: required present, others absent
+    if (pressedCtrl !== requiresCtrl) return false;
+    if (pressedMeta !== requiresMeta) return false;
+    if (pressedAlt !== requiresAlt) return false;
+    if (pressedShift !== requiresShift) return false;
+
+    return true;
+  },
+
+  /**
+   * Debug log helper. Logs when debug pref is enabled.
+   * @param {...any} args - Values to log to the console.
+   */
+  _log(...args) {
+    if (!this._debugLog) {
+      return;
+    }
+    try {
+      console.log("[TabGrouping]", ...args);
+    } catch (_e) {}
+  },
+  /**
+   * Register collapse guards across browser windows:
+   * - TabGroupCollapse: mark window as collapsed and skip the very next reopen
+   * - TabGroupExpand: clear collapsed state
+   * - TabOpen: if collapse-skip is set, ensure first reopen is not grouped
+   */
+  _registerCollapseGuards() {
+    // Attach to existing windows
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._addCollapseGuardsToWindow(window);
+    }
+    // Attach to future windows
+    if (!this._windowOpenObserver) {
+      this._windowOpenObserver = (subject, topic, _data) => {
+        if (topic !== "domwindowopened") {
+          return;
+        }
+        subject.addEventListener(
+          "load",
+          () => {
+            try {
+              if (
+                subject.document?.documentElement?.getAttribute(
+                  "windowtype"
+                ) === "navigator:browser"
+              ) {
+                this._addCollapseGuardsToWindow(subject);
+              }
+            } catch (_e) {}
+          },
+          { once: true }
+        );
+      };
+      Services.obs.addObserver(this._windowOpenObserver, "domwindowopened");
+    }
+  },
+
+  /**
+   * Unregister collapse guards across browser windows.
+   */
+  _unregisterCollapseGuards() {
+    // Detach from existing windows
+    for (const window of Services.wm.getEnumerator("navigator:browser")) {
+      this._removeCollapseGuardsFromWindow(window);
+    }
+    // Detach from future windows
+    if (this._windowOpenObserver) {
+      try {
+        Services.obs.removeObserver(
+          this._windowOpenObserver,
+          "domwindowopened"
+        );
+      } catch (_e) {}
+      this._windowOpenObserver = null;
+    }
+  },
+
+  /**
+   * Add collapse/expand and TabOpen guards to a specific browser window.
+   * @param {Window} window - The browser window.
+   */
+  _addCollapseGuardsToWindow(window) {
+    if (!window?.gBrowser) {
+      return;
+    }
+
+    const collapseHandler = () => {
+      window.__tabGroupingCollapsed = true;
+      window.__tabGroupingSkipNextCreated = true; // do not regroup the very next reopen
+      this._log(
+        "TabGroupCollapse detected: marking window as collapsed and skipping next reopen"
+      );
+    };
+
+    const expandHandler = () => {
+      window.__tabGroupingCollapsed = false;
+      this._log("TabGroupExpand detected: clearing collapsed state");
+    };
+
+    const tabOpenHandler = (evt) => {
+      // If we just collapsed, ensure the very next reopen is not grouped
+      if (window.__tabGroupingSkipNextCreated) {
+        window.__tabGroupingSkipNextCreated = false;
+        const tab = evt.target;
+        try {
+          if (tab?.group && window.gBrowser?.ungroupTab) {
+            window.gBrowser.ungroupTab(tab);
+          }
+        } catch (_e) {}
+        this._log("First reopen after collapse: ensured ungrouped");
+      }
+    };
+
+    // Remove previous handlers if present
+    if (window.__tabGroupingCollapseGuard) {
+      window.removeEventListener(
+        "TabGroupCollapse",
+        window.__tabGroupingCollapseGuard,
+        true
+      );
+    }
+    if (window.__tabGroupingExpandGuard) {
+      window.removeEventListener(
+        "TabGroupExpand",
+        window.__tabGroupingExpandGuard,
+        true
+      );
+    }
+    if (window.__tabGroupingTabOpenGuard) {
+      window.removeEventListener(
+        "TabOpen",
+        window.__tabGroupingTabOpenGuard,
+        true
+      );
+    }
+
+    // Store and add
+    window.__tabGroupingCollapseGuard = collapseHandler;
+    window.__tabGroupingExpandGuard = expandHandler;
+    window.__tabGroupingTabOpenGuard = tabOpenHandler;
+
+    window.addEventListener("TabGroupCollapse", collapseHandler, true);
+    window.addEventListener("TabGroupExpand", expandHandler, true);
+    window.addEventListener("TabOpen", tabOpenHandler, true);
+  },
+
+  /**
+   * Remove collapse/expand and TabOpen guards from a browser window.
+   * @param {Window} window - The browser window.
+   */
+  _removeCollapseGuardsFromWindow(window) {
+    if (window.__tabGroupingCollapseGuard) {
+      window.removeEventListener(
+        "TabGroupCollapse",
+        window.__tabGroupingCollapseGuard,
+        true
+      );
+      delete window.__tabGroupingCollapseGuard;
+    }
+    if (window.__tabGroupingExpandGuard) {
+      window.removeEventListener(
+        "TabGroupExpand",
+        window.__tabGroupingExpandGuard,
+        true
+      );
+      delete window.__tabGroupingExpandGuard;
+    }
+    if (window.__tabGroupingTabOpenGuard) {
+      window.removeEventListener(
+        "TabOpen",
+        window.__tabGroupingTabOpenGuard,
+        true
+      );
+      delete window.__tabGroupingTabOpenGuard;
+    }
+  },
+};
diff --git a/waterfox/browser/components/tabgrouping/moz.build b/waterfox/browser/components/tabgrouping/moz.build
new file mode 100644
index 0000000000000..628914b628020
--- /dev/null
+++ b/waterfox/browser/components/tabgrouping/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "TabGrouping.sys.mjs",
+]
+
+JS_PREFERENCE_PP_FILES += [
+    "prefs-tabgroups.js",
+]
diff --git a/waterfox/browser/components/tabgrouping/prefs-tabgroups.js b/waterfox/browser/components/tabgrouping/prefs-tabgroups.js
new file mode 100644
index 0000000000000..2198ae311b8f9
--- /dev/null
+++ b/waterfox/browser/components/tabgrouping/prefs-tabgroups.js
@@ -0,0 +1,40 @@
+/* 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/. */
+
+// Default preferences for automatic tab grouping feature
+
+// Enable automatic tab grouping
+pref("browser.tabs.autoGroupNewTabs", false);
+
+// Placement mode for new tabs in groups
+// Options: "after" (after source tab), "first" (beginning of group), "last" (end of group)
+pref("browser.tabs.autoGroupNewTabs.placement", "after");
+
+// Enable delay before grouping (allows user to cancel)
+pref("browser.tabs.autoGroupNewTabs.delayEnabled", false);
+
+// Delay in milliseconds before grouping occurs
+pref("browser.tabs.autoGroupNewTabs.delayMs", 1000);
+
+// Keyboard shortcut to cancel pending grouping
+// Default: Ctrl+` on Windows/Linux, Option+` on macOS
+#ifdef XP_MACOSX
+pref("browser.tabs.autoGroupNewTabs.cancelShortcut", "Option+`");
+#else
+pref("browser.tabs.autoGroupNewTabs.cancelShortcut", "Ctrl+`");
+#endif
+
+// Keyboard shortcut to open a standard new tab (bypass grouping)
+// Default: Alt+Shift+T (Windows/Linux), Option+Shift+T (macOS)
+#ifdef XP_MACOSX
+pref("browser.tabs.autoGroupNewTabs.bypassShortcut", "Option+Shift+T");
+#else
+pref("browser.tabs.autoGroupNewTabs.bypassShortcut", "Alt+Shift+T");
+#endif
+
+// Enable verbose debug logging for TabGrouping
+pref("browser.tabs.autoGroupNewTabs.debugLog", false);
+
+// Grace period after session restore before resuming auto-grouping (ms)
+pref("browser.tabs.autoGroupNewTabs.resumeGraceMs", 1000);
diff --git a/waterfox/browser/components/uicustomizations/UICustomizations.sys.mjs b/waterfox/browser/components/uicustomizations/UICustomizations.sys.mjs
new file mode 100644
index 0000000000000..dceed7c481494
--- /dev/null
+++ b/waterfox/browser/components/uicustomizations/UICustomizations.sys.mjs
@@ -0,0 +1,296 @@
+/* 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/. */
+
+import { BrowserUtils } from "resource:///modules/BrowserUtils.sys.mjs";
+import { PrefUtils } from "resource:///modules/PrefUtils.sys.mjs";
+
+export const UICustomizations = {
+  PREF_TOOLBARPOS: "browser.tabs.toolbarposition",
+  PREF_BOOKMARKPOS: "browser.bookmarks.toolbarposition",
+
+  init(window) {
+    this.styleButtonBox(window.document);
+    this.styleMenuBar(window.document, window);
+    this.moveTabBar(window);
+    this.moveBookmarksBar(window);
+    this.initListeners(window);
+    this.initPrefObservers();
+  },
+
+  initPrefObservers() {
+    // Set Tab toolbar position
+    this.toolbarPositionListener = PrefUtils.addObserver(
+      this.PREF_TOOLBARPOS,
+      (value) => {
+        UICustomizations.executeInAllWindows((window) => {
+          const { document } = window;
+          UICustomizations.moveTabBar(window, value);
+          UICustomizations.styleMenuBar(document, window);
+        });
+      }
+    );
+    // Set Bookmark bar position
+    this.bookmarkBarPositionListener = PrefUtils.addObserver(
+      this.PREF_BOOKMARKPOS,
+      (value) => {
+        UICustomizations.executeInAllWindows((window) => {
+          UICustomizations.moveBookmarksBar(window, value);
+        });
+      }
+    );
+  },
+
+  initListeners(aWindow) {
+      // Hide tabs toolbar buttonbox if menubar displayed
+      if (aWindow.document) {
+        const menuBar = aWindow.document.getElementById("toolbar-menubar");
+        const observer = new aWindow.MutationObserver((mutations) => {
+          for (const mutation of mutations) {
+            if (
+              mutation.type === "attributes" &&
+              mutation.attributeName === "autohide"
+            ) {
+              UICustomizations.styleButtonBox(aWindow.document);
+              UICustomizations.styleMenuBar(aWindow.document, aWindow);
+            }
+          }
+        });
+
+        observer.observe(menuBar, {
+          attributes: true, //configure it to listen to attribute changes
+        });
+      }
+      // Ensure menu bar/ nav bar not cut off when maximized in Windows
+      aWindow.addEventListener(
+        "sizemodechange",
+        function updateTitleBarStyling() {
+          UICustomizations.styleMenuBar(aWindow.document, aWindow);
+        }
+      );
+    },
+
+    styleButtonBox(doc) {
+        const menuBar = doc.getElementById("toolbar-menubar");
+        const buttonBox = doc.querySelector(
+          "#TabsToolbar .titlebar-buttonbox-container"
+        );
+
+        // If menuBar is not found, we cannot get its "autohide" attribute.
+        if (!menuBar) {
+          console.warn(
+            "UICustomizations.sys.mjs: #toolbar-menubar element not found in styleButtonBox. Cannot determine button box visibility."
+          );
+          return;
+        }
+
+        // If buttonBox is not found, we cannot style it.
+        if (!buttonBox) {
+          console.warn(
+            "UICustomizations.sys.mjs: #TabsToolbar .titlebar-buttonbox-container element not found in styleButtonBox. Cannot style button box."
+          );
+          return;
+        }
+
+        if (menuBar.getAttribute("autohide") === "false") {
+          buttonBox.style.display = "none";
+        } else {
+          buttonBox.style.display = "-moz-box";
+        }
+      },
+
+  styleMenuBar(doc, win) {
+    const menuBar = doc.getElementById("toolbar-menubar");
+    // If menuBar (toolbar-menubar) doesn't exist, we can't proceed with its styling.
+    if (!menuBar) {
+      console.warn(
+        "UICustomizations.sys.mjs: toolbar-menubar element not found. Cannot apply custom menubar styling."
+      );
+      return;
+    }
+
+    // The original code used a 'titleBar' element which has been removed in recent changes.
+    // We will now apply the conditional styling directly to the 'menuBar' element itself.
+
+    const fullscreen = win.windowState === win.STATE_MAXIMIZED;
+    if (
+      PrefUtils.get(this.PREF_TOOLBARPOS) !== "topabove" &&
+      menuBar.getAttribute("autohide") === "true"
+    ) {
+      if (fullscreen) {
+        menuBar.setAttribute("style", "appearance: none; padding-top: 6px;");
+      } else {
+        menuBar.setAttribute("style", "appearance: none;");
+      }
+    } else {
+      // If conditions are not met, clear any inline style from menuBar.
+      menuBar.setAttribute("style", "");
+    }
+  },
+
+  moveTabBar(aWindow, aValue) {
+      const doc = aWindow.document; // Use a shorthand for document
+
+      // Get elements used in various cases, check them early if crucial.
+      const tabsToolbar = doc.querySelector("#TabsToolbar");
+      if (!tabsToolbar) {
+        console.warn(
+          "UICustomizations.sys.mjs: #TabsToolbar not found. Cannot move tab bar."
+        );
+        return;
+      }
+
+      const navigatorToolbox = doc.querySelector("#navigator-toolbox");
+      const bottomBox = doc.querySelector("#browser-bottombox");
+      // bottomBookmarksBar is queried specifically in the 'bottomabove' case.
+
+      let effectiveValue = aValue;
+      if (!effectiveValue) {
+        effectiveValue = PrefUtils.get(this.PREF_TOOLBARPOS);
+      }
+
+      switch (effectiveValue) {
+        case "topabove": {
+          // Original logic used 'titlebar'. #titlebar is removed.
+          // #titlebar used to contain #toolbar-menubar then #TabsToolbar.
+          // So, "beforeend" of #titlebar meant #TabsToolbar came after #toolbar-menubar.
+          const menuBar = doc.querySelector("#toolbar-menubar");
+          // Ensure menuBar exists and is a child of navigatorToolbox for sensible placement.
+          if (menuBar && menuBar.parentElement === navigatorToolbox) {
+            menuBar.insertAdjacentElement("afterend", tabsToolbar);
+          } else if (navigatorToolbox) {
+            // Fallback: if menubar isn't suitable/found, place tabs at the start of navigator-toolbox.
+            navigatorToolbox.insertAdjacentElement("afterbegin", tabsToolbar);
+          } else {
+            console.warn(
+              "UICustomizations.sys.mjs: Could not place TabsToolbar 'topabove'. #navigator-toolbox or #toolbar-menubar not suitable."
+            );
+          }
+          break;
+        }
+        case "topbelow":
+          if (navigatorToolbox) {
+            navigatorToolbox.appendChild(tabsToolbar);
+          } else {
+            console.warn(
+              "UICustomizations.sys.mjs: #navigator-toolbox not found. Cannot move tab bar to 'topbelow'."
+            );
+          }
+          break;
+        case "bottomabove": {
+          // Above status bar
+          if (!bottomBox) {
+            console.warn(
+              "UICustomizations.sys.mjs: #browser-bottombox not found for 'bottomabove'."
+            );
+            break;
+          }
+          bottomBox.collapsed = false;
+          const bottomBookmarksBar = doc.querySelector(
+            "#browser-bottombox #PersonalToolbar"
+          );
+          if (bottomBookmarksBar) {
+            bottomBookmarksBar.insertAdjacentElement("afterend", tabsToolbar);
+          } else {
+            bottomBox.insertAdjacentElement("afterbegin", tabsToolbar);
+          }
+          break;
+        }
+        case "bottombelow":
+          // Below status bar
+          if (!bottomBox) {
+            console.warn(
+              "UICustomizations.sys.mjs: #browser-bottombox not found for 'bottombelow'."
+            );
+            break;
+          }
+          bottomBox.collapsed = false;
+          bottomBox.insertAdjacentElement("beforeend", tabsToolbar);
+          break;
+      }
+
+      // This call was common to all cases, so move it after the switch.
+      // Also, ensure the first tab exists before trying to set its title.
+      const firstTab = doc.querySelector(".tabbrowser-tab:first-child");
+      if (firstTab && aWindow.gBrowser) {
+        aWindow.gBrowser.setTabTitle(firstTab);
+      }
+
+      // Set title on top bar when title bar is disabled and tab bar position is different than default
+      const topBar = doc.querySelector("#toolbar-menubar-pagetitle");
+      const activeTab = doc.querySelector('tab[selected="true"]');
+      if (topBar && activeTab) {
+        topBar.textContent = activeTab.getAttribute("label");
+      }
+    },
+
+    moveBookmarksBar(aWindow, aValue) {
+            const doc = aWindow.document;
+            const bottomTabs = doc.querySelector("#browser-bottombox #TabsToolbar");
+            const bookmarksBar = doc.querySelector("#PersonalToolbar");
+
+            let effectiveValue = aValue;
+            if (!effectiveValue) {
+              effectiveValue = PrefUtils.get(this.PREF_BOOKMARKPOS, "top");
+            }
+            // Don't move if already in correct position
+            // Note: The original code has a potential null pointer issue here if bookmarksBar is null
+            // and bookmarksBar.parentElement is accessed. This change only addresses the
+            // "parameter reassignment" diagnostic and does not alter that specific behavior.
+            if (
+              bookmarksBar?.parentElement && // Added a guard for parentElement before accessing its id
+              ((effectiveValue === "top" &&
+                bookmarksBar.parentElement.id === "navigator-toolbox") ||
+              (effectiveValue === "bottom" &&
+                bookmarksBar.parentElement.id === "browser-bottombox"))
+            ) {
+              return;
+            }
+
+            switch (effectiveValue) {
+              case "top": {
+                const navBar = doc.querySelector("#nav-bar");
+                if (navBar && bookmarksBar) {
+                  navBar.insertAdjacentElement("afterend", bookmarksBar);
+                } else {
+                  if (!bookmarksBar) {
+                    console.warn(
+                      "UICustomizations.sys.mjs: #PersonalToolbar not found. Cannot move bookmarks bar."
+                    );
+                  }
+                  // Ensure this warning is only logged if navBar is indeed the missing element,
+                  // and not because bookmarksBar was also missing (though the above handles that).
+                  if (!navBar && bookmarksBar) {
+                    console.warn(
+                      "UICustomizations.sys.mjs: #nav-bar not found. Cannot move bookmarks bar to top."
+                    );
+                  }
+                }
+                break;
+              }
+              case "bottom":
+                if (!bookmarksBar) {
+                  console.warn(
+                    "UICustomizations.sys.mjs: #PersonalToolbar not found. Cannot move bookmarks bar."
+                  );
+                  break;
+                }
+                if (bottomTabs) {
+                  bottomTabs.insertAdjacentElement("beforebegin", bookmarksBar);
+                } else {
+                  const bottomBox = doc.querySelector("#browser-bottombox");
+                  if (bottomBox) {
+                    bottomBox.insertAdjacentElement("afterbegin", bookmarksBar);
+                  } else {
+                    console.warn(
+                      "UICustomizations.sys.mjs: #browser-bottombox not found. Cannot move bookmarks bar to bottom."
+                    );
+                  }
+                }
+                break;
+            }
+          },
+};
+
+// Inherited props
+UICustomizations.executeInAllWindows = BrowserUtils.executeInAllWindows;
diff --git a/waterfox/browser/components/uicustomizations/moz.build b/waterfox/browser/components/uicustomizations/moz.build
new file mode 100644
index 0000000000000..db5ea8ceb3b95
--- /dev/null
+++ b/waterfox/browser/components/uicustomizations/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "UICustomizations.sys.mjs",
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    "test/browser/browser.ini",
+]
diff --git a/waterfox/browser/components/uicustomizations/test/browser/browser.ini b/waterfox/browser/components/uicustomizations/test/browser/browser.ini
new file mode 100644
index 0000000000000..3d0d167e7386f
--- /dev/null
+++ b/waterfox/browser/components/uicustomizations/test/browser/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+tags = waterfox_uicustomizations
+firefox-appdir = browser
+support-files = 
+    head.js
+
+[browser_uicustomizations.js]
diff --git a/waterfox/browser/components/uicustomizations/test/browser/browser_uicustomizations.js b/waterfox/browser/components/uicustomizations/test/browser/browser_uicustomizations.js
new file mode 100644
index 0000000000000..57890a4d5e2bb
--- /dev/null
+++ b/waterfox/browser/components/uicustomizations/test/browser/browser_uicustomizations.js
@@ -0,0 +1,61 @@
+add_task(async function testMoveTabBar() {
+  // Test default (topabove)
+  const el = document.querySelector("#TabsToolbar");
+  const bottomBox = document.querySelector("#browser-bottombox");
+  is(el.parentElement.id, "titlebar", "Tab toolbar is below menu bar");
+  // Test topbelow
+  Services.prefs.setCharPref(TABBAR_POSITION_PREF, "topbelow");
+  is(el.parentElement.id, "navigator-toolbox", "Tabs toolbar is below nav bar");
+  // Test bottom above
+  Services.prefs.setCharPref(TABBAR_POSITION_PREF, "bottomabove");
+  is(el.parentElement.id, "browser-bottombox", "Tabs toolbar is in bottom box");
+  is(
+    bottomBox.firstChild.id,
+    "TabsToolbar",
+    "Tabs toolbar is first element in bottom box"
+  );
+  // Test bottom below (reliance upon StatusBar.jsm)
+  Services.prefs.setCharPref(TABBAR_POSITION_PREF, "bottombelow");
+  is(el.parentElement.id, "browser-bottombox", "Tabs toolbar is in bottom box");
+  is(
+    bottomBox.firstChild.id,
+    "status-bar",
+    "Tabs toolbar is not first element in bottom box"
+  );
+  // Clear pref
+  Services.prefs.clearUserPref(TABBAR_POSITION_PREF);
+});
+
+add_task(async function testMoveBookmarksBar() {
+  // Test default (top)
+  const el = document.querySelector("#PersonalToolbar");
+  is(
+    el.parentElement.id,
+    "navigator-toolbox",
+    "Bookmarks bar is below nav bar"
+  );
+  // Test bottom
+  Services.prefs.setCharPref(BOOKMARKBAR_POSITION_PREF, "bottom");
+  is(
+    el.parentElement.id,
+    "browser-bottombox",
+    "Bookmarks bar is in bottom box"
+  );
+  // Test bottom buttons not disabled
+  // Test bottom context menu item still visible
+  // Clear pref
+  Services.prefs.clearUserPref(BOOKMARKBAR_POSITION_PREF);
+});
+
+add_task(async function testWindowButtons() {
+  // Test menu bar visible and tabs in default position
+  // Test menu bar visible and tabs not in default position
+  // Test menu bar hidden and tabs in default position
+  // Test menu bar hidden and tabs not in default position
+});
+
+add_task(async function testSecondWindow() {
+  // Change all prefs to non default values
+  // Open new browser window
+  // Test all cases reflected in new window
+});
diff --git a/waterfox/browser/components/uicustomizations/test/browser/head.js b/waterfox/browser/components/uicustomizations/test/browser/head.js
new file mode 100644
index 0000000000000..4e5c332fdf55d
--- /dev/null
+++ b/waterfox/browser/components/uicustomizations/test/browser/head.js
@@ -0,0 +1,2 @@
+const _TABBAR_POSITION_PREF = "browser.tabs.toolbarposition";
+const _BOOKMARKBAR_POSITION_PREF = "browser.bookmarks.toolbarposition";
diff --git a/waterfox/browser/components/utils/AboutPages.sys.mjs b/waterfox/browser/components/utils/AboutPages.sys.mjs
new file mode 100644
index 0000000000000..104b753747253
--- /dev/null
+++ b/waterfox/browser/components/utils/AboutPages.sys.mjs
@@ -0,0 +1,74 @@
+/* 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/. */
+
+const registrar = Components.manager.QueryInterface(
+  Components.interfaces.nsIComponentRegistrar
+);
+
+function generateFreeCID() {
+  let uuid = Components.ID(Services.uuid.generateUUID().toString());
+  while (registrar.isCIDRegistered(uuid)) {
+    uuid = Components.ID(Services.uuid.generateUUID().toString());
+  }
+  return uuid;
+}
+
+function AboutPage(pageInfo) {
+  this.pageInfo = pageInfo;
+}
+
+AboutPage.prototype = {
+  get uri() {
+    if (!this._uri) {
+      this._uri = Services.io.newURI(this.pageInfo.chrome);
+    }
+    return this._uri;
+  },
+  newChannel: function (_uri, loadInfo) {
+    const ch = Services.io.newChannelFromURIWithLoadInfo(this.uri, loadInfo);
+    ch.owner = Services.scriptSecurityManager.getSystemPrincipal();
+    return ch;
+  },
+  getURIFlags: (_uri) =>
+    Components.interfaces.nsIAboutModule.ALLOW_SCRIPT |
+    Components.interfaces.nsIAboutModule.IS_SECURE_CHROME_UI,
+  getChromeURI: function (_uri) {
+    return this.uri;
+  },
+  QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
+};
+
+// Define the pages to register
+const ABOUT_PAGES = [
+  {
+    about: "cfg",
+    chrome: "chrome://browser/content/aboutcfg/aboutcfg.xhtml",
+    contract: "@mozilla.org/network/protocol/about;1?what=cfg",
+  },
+  {
+    about: "passwords",
+    chrome: "chrome://browser/content/passwordManager.xhtml",
+    contract: "@mozilla.org/network/protocol/about;1?what=passwords",
+  },
+];
+
+export const AboutPages = {
+  init() {
+    for (const pageInfo of ABOUT_PAGES) {
+      const AboutModuleFactory = {
+        createInstance(aIID) {
+          return new AboutPage(pageInfo).QueryInterface(aIID);
+        },
+        QueryInterface: ChromeUtils.generateQI(["nsIFactory"]),
+      };
+
+      registrar.registerFactory(
+        generateFreeCID(),
+        `about:${pageInfo.about}`,
+        pageInfo.contract,
+        AboutModuleFactory
+      );
+    }
+  },
+};
diff --git a/waterfox/browser/components/utils/BrowserUtils.sys.mjs b/waterfox/browser/components/utils/BrowserUtils.sys.mjs
new file mode 100644
index 0000000000000..ad1a80f9c9161
--- /dev/null
+++ b/waterfox/browser/components/utils/BrowserUtils.sys.mjs
@@ -0,0 +1,133 @@
+/* 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/. */
+
+import { CustomizableUI } from "resource:///modules/CustomizableUI.sys.mjs";
+import { PanelMultiView } from "resource:///modules/PanelMultiView.sys.mjs";
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+
+const lazy = {};
+
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "styleSheetService",
+  "@mozilla.org/content/style-sheet-service;1",
+  "nsIStyleSheetService"
+);
+
+export const BrowserUtils = {
+  // internal functions/props
+  get mostRecentWindow() {
+    return Services.wm.getMostRecentWindow("navigator:browser");
+  },
+
+  get document() {
+    return Services.wm.getMostRecentWindow("navigator:browser").document;
+  },
+  createElement(aDoc, aTag, aAttrs) {
+    // Create element
+    const el = aDoc.createXULElement(aTag);
+    for (const att in aAttrs) {
+      // don't set null attrs
+      if (aAttrs[att]) {
+        el.setAttribute(att, aAttrs[att]);
+      }
+    }
+    return el;
+  },
+
+  // api endpoints
+  createAndPositionElement(aWindow, aTag, aAttrs, aAdjacentTo, aPosition) {
+    const doc = aWindow.document;
+    // Create element
+    const el = this.createElement(doc, aTag, aAttrs);
+    // Place it in certain location
+    let pos = doc.getElementById(aAdjacentTo);
+    if (aPosition) {
+      // App Menu items are not retrieved successfully with doc.getElementById
+      if (!pos) {
+        pos = PanelMultiView.getViewNode(this.document, aAdjacentTo);
+      }
+      // If neither method to retrieve a positional element succeeded
+      // don't attempt to insert as it will fail
+      if (pos) {
+        pos.insertAdjacentElement(aPosition, el);
+      }
+    } else if (aAdjacentTo === "gNavToolbox") {
+      aWindow.gNavToolbox.appendChild(el);
+    } else {
+      pos.appendChild(el);
+    }
+  },
+
+  /**
+   * Helper function to execute a given function with some args in every open browser window.
+   * Window must be the functions first arg, subsequent args are passed in the same manner
+   * as to executeInAllWindows().
+   *
+   * @param func - The function to be called in each open browser window.
+   * @param args - The arguments to supply to the function.
+   * Example:
+   * BrowserUtils.executeInAllWindows(Urlbar.addDynamicStylesheet, "chrome://browser/skin/waterfox.css")
+   */
+  executeInAllWindows(func, ...args) {
+    const windows = Services.wm.getEnumerator("navigator:browser");
+    while (windows.hasMoreElements()) {
+      const window = windows.getNext();
+      func(window, ...args);
+    }
+  },
+
+  /**
+   * Helper method to register or unregister a given stylesheet depending on the bool arg passed.
+   *
+   * @param uri - The URI of the stylesheet to register or unregister.
+   * @param enabled - A boolean indicating whether to register or unregister the sheet.
+   */
+  registerOrUnregisterSheet(uri, enabled = false) {
+    if (enabled) {
+      BrowserUtils.registerStylesheet(uri);
+    } else {
+      BrowserUtils.unregisterStylesheet(uri);
+    }
+  },
+
+  registerStylesheet(uri) {
+    if (!this.sheetRegistered(uri)) {
+      const url = Services.io.newURI(uri);
+      const type = lazy.styleSheetService.USER_SHEET;
+      lazy.styleSheetService.loadAndRegisterSheet(url, type);
+    }
+  },
+
+  unregisterStylesheet(uri) {
+    if (this.sheetRegistered(uri)) {
+      const url = Services.io.newURI(uri);
+      const type = lazy.styleSheetService.USER_SHEET;
+      lazy.styleSheetService.unregisterSheet(url, type);
+    }
+  },
+
+  sheetRegistered(uri) {
+    const url = Services.io.newURI(uri);
+    const type = lazy.styleSheetService.USER_SHEET;
+    return lazy.styleSheetService.sheetRegistered(url, type);
+  },
+
+  setStyle(aStyleSheet) {
+    const styleSheetService = Cc[
+      "@mozilla.org/content/style-sheet-service;1"
+    ].getService(Ci.nsIStyleSheetService);
+
+    const url = Services.io.newURI(
+      `data:text/css;charset=UTF-8,${encodeURIComponent(aStyleSheet)}`
+    );
+    const type = styleSheetService.USER_SHEET;
+
+    styleSheetService.loadAndRegisterSheet(url, type);
+  },
+
+  registerArea(aArea) {
+    CustomizableUI.registerArea(aArea, {});
+  },
+};
diff --git a/waterfox/browser/components/utils/PrefUtils.sys.mjs b/waterfox/browser/components/utils/PrefUtils.sys.mjs
new file mode 100644
index 0000000000000..b623fc51519d3
--- /dev/null
+++ b/waterfox/browser/components/utils/PrefUtils.sys.mjs
@@ -0,0 +1,80 @@
+/* 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/. */
+
+export const PrefUtils = {
+  get(prefPath, valueIfUndefined, def = false, setDefault = true) {
+    const sPrefs = def ? Services.prefs.getDefaultBranch(null) : Services.prefs;
+
+    try {
+      switch (sPrefs.getPrefType(prefPath)) {
+        case 0:
+          if (valueIfUndefined !== undefined) {
+            return this.set(prefPath, valueIfUndefined, setDefault);
+          }
+          return undefined;
+        case 32:
+          return sPrefs.getStringPref(prefPath);
+        case 64:
+          return sPrefs.getIntPref(prefPath);
+        case 128:
+          return sPrefs.getBoolPref(prefPath);
+      }
+    } catch (_ex) {}
+    return undefined;
+  },
+
+  set(prefPath, value, def = false) {
+    const sPrefs = def ? Services.prefs.getDefaultBranch(null) : Services.prefs;
+
+    switch (typeof value) {
+      case "string":
+        return sPrefs.setCharPref(prefPath, value) || value;
+      case "number":
+        return sPrefs.setIntPref(prefPath, value) || value;
+      case "boolean":
+        return sPrefs.setBoolPref(prefPath, value) || value;
+    }
+    return undefined;
+  },
+
+  lock(prefPath, value) {
+    const sPrefs = Services.prefs;
+    this.lockedBackupDef[prefPath] = this.get(prefPath, true);
+    if (sPrefs.prefIsLocked(prefPath)) {
+      sPrefs.unlockPref(prefPath);
+    }
+
+    this.set(prefPath, value, true);
+    sPrefs.lockPref(prefPath);
+  },
+
+  lockedBackupDef: {},
+
+  unlock(prefPath) {
+    Services.prefs.unlockPref(prefPath);
+    const bkp = this.lockedBackupDef[prefPath];
+    if (bkp === undefined) {
+      Services.prefs.deleteBranch(prefPath);
+    } else {
+      this.set(prefPath, bkp, true);
+    }
+  },
+
+  clear: Services.prefs.clearUserPref,
+
+  addObserver(aPrefPath, aCallback) {
+    this.observer = (_aSubject, _aTopic, prefPath) =>
+      aCallback(PrefUtils.get(prefPath), prefPath);
+
+    Services.prefs.addObserver(aPrefPath, this.observer);
+    return {
+      prefPath: aPrefPath,
+      observer: this.observer,
+    };
+  },
+
+  removeObserver(obs) {
+    Services.prefs.removeObserver(obs.prefPath, obs.observer);
+  },
+};
diff --git a/waterfox/browser/components/utils/moz.build b/waterfox/browser/components/utils/moz.build
new file mode 100644
index 0000000000000..148cb41f32681
--- /dev/null
+++ b/waterfox/browser/components/utils/moz.build
@@ -0,0 +1,15 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "AboutPages.sys.mjs",
+    "BrowserUtils.sys.mjs",
+    "PrefUtils.sys.mjs",
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    "test/browser/browser.ini",
+]
diff --git a/waterfox/browser/components/utils/test/browser/browser.ini b/waterfox/browser/components/utils/test/browser/browser.ini
new file mode 100644
index 0000000000000..df8ea074ae08f
--- /dev/null
+++ b/waterfox/browser/components/utils/test/browser/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+tags = waterfox_utils
+firefox-appdir = browser
+support-files = 
+    head.js
+
+[browser_prefutils.js]
diff --git a/waterfox/browser/components/utils/test/browser/browser_prefutils.js b/waterfox/browser/components/utils/test/browser/browser_prefutils.js
new file mode 100644
index 0000000000000..3afd4e29deb70
--- /dev/null
+++ b/waterfox/browser/components/utils/test/browser/browser_prefutils.js
@@ -0,0 +1,93 @@
+// Test setting and getting different types of pref
+add_task(async function testGetSetPrefs() {
+  // String pref
+  PrefUtils.set(STRING_PREF, "some string");
+  const strPref = PrefUtils.get(STRING_PREF);
+  is(typeof strPref, "string", "String pref is string");
+  is(strPref, "some string", "String pref is set");
+
+  // Int pref
+  PrefUtils.set(INT_PREF, 999);
+  const intPref = PrefUtils.get(INT_PREF);
+  is(typeof intPref, "number", "Int pref is int");
+  is(intPref, 999, "Int pref is set");
+
+  // Bool pref
+  PrefUtils.set(BOOL_PREF, false);
+  const boolPref = PrefUtils.get(BOOL_PREF);
+  is(typeof boolPref, "boolean", "Bool pref is bool");
+  is(boolPref, false, "Bool pref is set");
+
+  // Cleanup
+  Services.prefs.clearUserPref(STRING_PREF);
+  Services.prefs.clearUserPref(INT_PREF);
+  Services.prefs.clearUserPref(BOOL_PREF);
+});
+
+// Test observing a pref
+add_task(async function testObservePref() {
+  const msg = "Callback succeeded";
+
+  // Set up the observer
+  async function callback(_pref, _path) {
+    Services.prefs.setCharPref(STRING_PREF, msg);
+  }
+  const obs = PrefUtils.addObserver(BOOL_PREF, callback);
+
+  // Trigger the obs callback
+  is(
+    Services.prefs.getCharPref(STRING_PREF, ""),
+    "",
+    "String pref initially blank"
+  );
+  Services.prefs.setBoolPref(BOOL_PREF, true);
+  is(
+    Services.prefs.getCharPref(STRING_PREF),
+    msg,
+    "Pref observer executes callback"
+  );
+
+  //Cleanup
+  Services.prefs.clearUserPref(STRING_PREF);
+  Services.prefs.clearUserPref(BOOL_PREF);
+  PrefUtils.removeObserver(obs);
+});
+// Test locking a pref and setting a locked pref
+add_task(async function testLockPref() {
+  // Lock pref
+  PrefUtils.lock(BOOL_PREF, true);
+  is(Services.prefs.getBoolPref(BOOL_PREF), true, "Lock sets pref value");
+
+  // Update locked pref
+  PrefUtils.lock(BOOL_PREF, false);
+  is(
+    Services.prefs.getBoolPref(BOOL_PREF),
+    false,
+    "Lock can update pref value"
+  );
+
+  // Attempt to change locked pref with Services.prefs
+  Services.prefs.setBoolPref(BOOL_PREF, true);
+  is(Services.prefs.getBoolPref(BOOL_PREF), false, "Can't set locked pref");
+
+  // Cleanup
+  Services.prefs.clearUserPref(BOOL_PREF);
+});
+
+add_task(async function testUnlockPref() {
+  // Lock pref
+  PrefUtils.lock(BOOL_PREF, true);
+  is(Services.prefs.getBoolPref(BOOL_PREF), true, "Lock sets pref value");
+
+  // Attempt to change locked pref with Services.prefs
+  Services.prefs.setBoolPref(BOOL_PREF, false);
+  is(Services.prefs.getBoolPref(BOOL_PREF), true, "Can't set locked pref");
+
+  // Unlock and set
+  PrefUtils.unlock(BOOL_PREF);
+  Services.prefs.setBoolPref(BOOL_PREF, false);
+  is(Services.prefs.getBoolPref(BOOL_PREF), false, "Pref unlocked");
+
+  // Cleanup
+  Services.prefs.clearUserPref(BOOL_PREF);
+});
diff --git a/waterfox/browser/components/utils/test/browser/head.js b/waterfox/browser/components/utils/test/browser/head.js
new file mode 100644
index 0000000000000..38629137556c9
--- /dev/null
+++ b/waterfox/browser/components/utils/test/browser/head.js
@@ -0,0 +1,7 @@
+const { PrefUtils } = ChromeUtils.importESModule(
+  "resource:///modules/PrefUtils.sys.mjs"
+);
+
+const _STRING_PREF = "browser.test.stringPref";
+const _INT_PREF = "browser.test.intPref";
+const _BOOL_PREF = "browser.test.boolPref";
diff --git a/waterfox/browser/extensions/common/BootstrapLoader.sys.mjs b/waterfox/browser/extensions/common/BootstrapLoader.sys.mjs
new file mode 100644
index 0000000000000..bfde811844ab3
--- /dev/null
+++ b/waterfox/browser/extensions/common/BootstrapLoader.sys.mjs
@@ -0,0 +1,502 @@
+/* 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/. */
+
+import { AddonManager } from "resource://gre/modules/AddonManager.sys.mjs";
+import { Log } from "resource://gre/modules/Log.sys.mjs";
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AddonInternal: "resource://gre/modules/addons/XPIDatabase.sys.mjs",
+  Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
+  ConsoleAPI: "resource://gre/modules/Console.sys.mjs",
+  InstallRDF: "resource:///modules/RDFManifestConverter.sys.mjs",
+  XPIExports: "resource://gre/modules/addons/XPIExports.sys.mjs",
+});
+
+Services.obs.addObserver((doc) => {
+  if (
+    doc.location.protocol + doc.location.pathname === "about:addons" ||
+    doc.location.protocol + doc.location.pathname ===
+      "chrome://mozapps/content/extensions/aboutaddons.html"
+  ) {
+    const win = doc.defaultView;
+    const handleEvent_orig =
+      win.customElements.get("addon-card").prototype.handleEvent;
+    win.customElements.get("addon-card").prototype.handleEvent = function (e) {
+      if (
+        e.type === "click" &&
+        e.target.getAttribute("action") === "preferences" &&
+        this.addon.optionsType === AddonManager.OPTIONS_TYPE_DIALOG
+      ) {
+        const windows = Services.wm.getEnumerator(null);
+        while (windows.hasMoreElements()) {
+          const win2 = windows.getNext();
+          if (win2.closed) {
+            continue;
+          }
+          if (win2.document.documentURI === this.addon.optionsURL) {
+            win2.focus();
+            return;
+          }
+        }
+        let features = "chrome,titlebar,toolbar,centerscreen";
+        const instantApply = Services.prefs.getBoolPref(
+          "browser.preferences.instantApply"
+        );
+        features += instantApply ? ",dialog=no" : "";
+        win.docShell.rootTreeItem.domWindow.openDialog(
+          this.addon.optionsURL,
+          this.addon.id,
+          features
+        );
+      } else {
+        handleEvent_orig.apply(this, [e]);
+      }
+    };
+    const update_orig = win.customElements.get("addon-options").prototype.update;
+    win.customElements.get("addon-options").prototype.update = function (
+      _card,
+      addon
+    ) {
+      update_orig.apply(this, [_card, addon]);
+      if (addon.optionsType === AddonManager.OPTIONS_TYPE_DIALOG) {
+        this.querySelector('panel-item[action="preferences"]').hidden = false;
+      }
+    };
+  }
+}, "chrome-document-loaded");
+
+ChromeUtils.defineLazyGetter(lazy, "BOOTSTRAP_REASONS", () => {
+  return lazy.XPIExports.XPIProvider.BOOTSTRAP_REASONS;
+});
+
+const logger = Log.repository.getLogger("addons.bootstrap");
+
+/**
+ * Valid IDs fit this pattern.
+ */
+const gIDTest =
+  /^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}|[a-z0-9-._]*@[a-z0-9-._]+)$/i;
+
+// Properties that exist in the install manifest
+const PROP_METADATA = [
+  "id",
+  "version",
+  "type",
+  "internalName",
+  "updateURL",
+  "optionsURL",
+  "optionsType",
+  "aboutURL",
+  "iconURL",
+];
+const PROP_LOCALE_SINGLE = ["name", "description", "creator", "homepageURL"];
+const PROP_LOCALE_MULTI = ["developers", "translators", "contributors"];
+
+// Map new string type identifiers to old style nsIUpdateItem types.
+// Retired values:
+// 32 = multipackage xpi file
+// 8 = locale
+// 256 = apiextension
+// 128 = experiment
+// theme = 4
+const TYPES = {
+  extension: 2,
+  dictionary: 64,
+};
+
+const VALID_OPTION_TYPES = [
+  AddonManager.OPTIONS_TYPE_DIALOG,
+  AddonManager.OPTIONS_TYPE_INLINE_BROWSER,
+  AddonManager.OPTIONS_TYPE_TAB,
+];
+
+const COMPATIBLE_BY_DEFAULT_TYPES = {
+  extension: true,
+  dictionary: true,
+};
+
+const objectHasOwnProperty = Function.call.bind(Object.prototype.hasOwnProperty);
+
+function isXPI(filename) {
+  const ext = filename.slice(-4).toLowerCase();
+  return ext === ".xpi" || ext === ".zip";
+}
+
+/**
+ * Creates a jar: URI for a file inside a ZIP file.
+ *
+ * @param {nsIFile} aJarfile
+ *        The ZIP file as an nsIFile
+ * @param {string} aPath
+ *        The path inside the ZIP file
+ * @returns {nsIURI}
+ *        An nsIURI for the file
+ */
+function buildJarURI(aJarfile, aPath) {
+  let uri = Services.io.newFileURI(aJarfile);
+  uri = `jar:${uri.spec}!/${aPath}`;
+  return Services.io.newURI(uri);
+}
+
+/**
+ * Gets an nsIURI for a file within another file, either a directory or an XPI
+ * file. If aFile is a directory then this will return a file: URI, if it is an
+ * XPI file then it will return a jar: URI.
+ *
+ * @param {nsIFile} aFile
+ *        The file containing the resources, must be either a directory or an
+ *        XPI file
+ * @param {string} aPath
+ *        The path to find the resource at, "/" separated. If aPath is empty
+ *        then the uri to the root of the contained files will be returned
+ * @returns {nsIURI}
+ *        An nsIURI pointing at the resource
+ */
+ function getURIForResourceInFile(aFile, aPath) {
+   if (!isXPI(aFile.leafName)) {
+     const resource = aFile.clone();
+     if (aPath) {
+       for (const part of aPath.split("/")) {
+         resource.append(part);
+       }
+     }
+
+     return Services.io.newFileURI(resource);
+   }
+
+   return buildJarURI(aFile, aPath);
+ }
+
+export const BootstrapLoader = {
+  name: "bootstrap",
+  manifestFile: "install.rdf",
+  async loadManifest(pkg) {
+    /**
+     * Reads locale properties from either the main install manifest root or
+     * an em:localized section in the install manifest.
+     *
+     * @param {object} aSource
+     *        The resource to read the properties from.
+     * @param {boolean} isDefault
+     *        True if the locale is to be read from the main install manifest
+     *        root
+     * @param {string[]} aSeenLocales
+     *        An array of locale names already seen for this install manifest.
+     *        Any locale names seen as a part of this function will be added to
+     *        this array
+     * @returns {object}
+     *        an object containing the locale properties
+     */
+    function readLocale(aSource, isDefault, aSeenLocales) {
+      const locale = {};
+      if (!isDefault) {
+        locale.locales = [];
+        for (const localeName of aSource.locales || []) {
+          if (!localeName?.trim()) {
+            logger.warn("Ignoring empty locale in localized properties");
+            continue;
+          }
+          if (aSeenLocales.includes(localeName)) {
+            logger.warn("Ignoring duplicate locale in localized properties");
+            continue;
+          }
+          aSeenLocales.push(localeName);
+          locale.locales.push(localeName);
+        }
+
+        if (locale.locales.length === 0) {
+          logger.warn("Ignoring localized properties with no listed locales");
+          return null;
+        }
+      }
+
+      for (const prop of [...PROP_LOCALE_SINGLE, ...PROP_LOCALE_MULTI]) {
+        if (objectHasOwnProperty(aSource, prop)) {
+          locale[prop] = aSource[prop];
+        }
+      }
+
+      return locale;
+    }
+
+    let manifest;
+    try {
+      const manifestData = await pkg.readString("install.rdf");
+      manifest = lazy.InstallRDF.loadFromString(manifestData).decode();
+    } catch (e) {
+      logger.error(`Failed to parse install.rdf for addon:`, e);
+      throw new Error(`Invalid install.rdf format: ${e.message}`);
+    }
+
+    const addon = new lazy.AddonInternal();
+    for (const prop of PROP_METADATA) {
+      if (objectHasOwnProperty(manifest, prop) && manifest[prop] != null) {
+        addon[prop] = manifest[prop];
+      }
+    }
+
+    if (!addon.type || addon.type === null || addon.type === undefined) {
+      addon.type = "extension";
+    } else if (typeof addon.type === "number") {
+      // Handle legacy numeric types
+      const numericType = addon.type;
+      addon.type = null;
+      for (const name in TYPES) {
+        if (TYPES[name] === numericType) {
+          addon.type = name;
+          break;
+        }
+      }
+      if (!addon.type) {
+        logger.info(`Unknown numeric type ${numericType}, defaulting to extension`);
+        addon.type = "extension";
+      }
+    } else if (typeof addon.type === "string") {
+      // Handle modern string types - verify it's a known type
+      if (!(addon.type in TYPES)) {
+        logger.info(`Unknown string type "${addon.type}", defaulting to extension`);
+        addon.type = "extension";
+      }
+    } else {
+      // Unknown type format
+      logger.info(`Unknown type format for ${addon.type}, defaulting to extension`);
+      addon.type = "extension";
+    }
+
+    if (!(addon.type in TYPES)) {
+      throw new Error(`Install manifest specifies unknown type: ${addon.type}`);
+    }
+
+    if (!addon.id) {
+      throw new Error("No ID in install manifest");
+    }
+    if (!gIDTest.test(addon.id)) {
+      throw new Error(`Illegal add-on ID ${addon.id}`);
+    }
+    if (!addon.version) {
+      throw new Error("No version in install manifest");
+    }
+
+    addon.strictCompatibility =
+      !(addon.type in COMPATIBLE_BY_DEFAULT_TYPES) ||
+      manifest.strictCompatibility === "true";
+
+    // Only read these properties for extensions.
+    if (addon.type === "extension") {
+      if (manifest.bootstrap !== "true") {
+        throw new Error("Non-restartless extensions no longer supported");
+      }
+
+      // Convert legacy numeric optionsType to string constants
+      if (addon.optionsType) {
+        try {
+          let numericType = addon.optionsType;
+          let originalType = addon.optionsType;
+          
+          // Convert string numbers to actual numbers
+          if (typeof addon.optionsType === "string") {
+            numericType = parseInt(addon.optionsType, 10);
+          }
+          
+          if (typeof numericType === "number" && !isNaN(numericType)) {
+            switch (numericType) {
+              case 1:
+                addon.optionsType = AddonManager.OPTIONS_TYPE_DIALOG;
+                break;
+              case 2:
+                // Legacy inline type - no longer supported, remove it
+                logger.warn(`Extension ${addon.id} uses unsupported optionsType 2 (inline), removing`);
+                addon.optionsType = null;
+                break;
+              case 3:
+                addon.optionsType = AddonManager.OPTIONS_TYPE_TAB;
+                break;
+              case 4:
+                addon.optionsType = AddonManager.OPTIONS_TYPE_INLINE_BROWSER;
+                break;
+              default:
+                logger.warn(`Extension ${addon.id} has unknown numeric optionsType ${numericType}, removing`);
+                addon.optionsType = null;
+                break;
+            }
+          }
+          
+          if (addon.optionsType && !VALID_OPTION_TYPES.includes(addon.optionsType)) {
+            throw new Error(
+              `Install manifest specifies unknown optionsType: ${addon.optionsType} (original: ${originalType})`
+            );
+          }
+        } catch (e) {
+          logger.error(`Failed to process optionsType for extension ${addon.id}:`, e);
+          addon.optionsType = null;
+        }
+      }
+    } else {
+      // Convert legacy dictionaries into a format the WebExtension
+      // dictionary loader can process.
+      if (addon.type === "dictionary") {
+        addon.loader = null;
+        const dictionaries = {};
+        await pkg.iterFiles(({ path }) => {
+          const match = /^dictionaries\/([^/]+)\.dic$/.exec(path);
+          if (match) {
+            const lang = match[1].replace(/_/g, "-");
+            dictionaries[lang] = match[0];
+          }
+        });
+        addon.startupData = { dictionaries };
+      }
+
+      // Only extensions are allowed to provide an optionsURL, optionsType,
+      // optionsBrowserStyle, or aboutURL. For all other types they are silently ignored
+      addon.aboutURL = null;
+      addon.optionsBrowserStyle = null;
+      addon.optionsType = null;
+      addon.optionsURL = null;
+    }
+
+    addon.defaultLocale = readLocale(manifest, true);
+
+    const seenLocales = [];
+    addon.locales = (manifest.localized || [])
+      .map(localeData => readLocale(localeData, false, seenLocales))
+      .filter(Boolean);
+
+    const dependencies = new Set(manifest.dependencies);
+    addon.dependencies = Object.freeze(Array.from(dependencies));
+
+    const seenApplications = [];
+    addon.targetApplications = (manifest.targetApplications || [])
+      .filter(targetApp => {
+        if (!targetApp?.id || !targetApp?.minVersion || !targetApp?.maxVersion) {
+          logger.warn("Ignoring invalid targetApplication entry in install manifest");
+          return false;
+        }
+        if (seenApplications.includes(targetApp.id)) {
+          logger.warn(`Ignoring duplicate targetApplication entry for ${targetApp.id} in install manifest`);
+          return false;
+        }
+        seenApplications.push(targetApp.id);
+        return true;
+      });
+
+    // Note that we don't need to check for duplicate targetPlatform entries since
+    // the RDF service coalesces them for us.
+    addon.targetPlatforms = [];
+    for (const targetPlatform of manifest.targetPlatforms || []) {
+      const platform = {
+        os: null,
+        abi: null,
+      };
+
+      const pos = targetPlatform.indexOf("_");
+      if (pos !== -1) {
+        platform.os = targetPlatform.substring(0, pos);
+        platform.abi = targetPlatform.substring(pos + 1);
+      } else {
+        platform.os = targetPlatform;
+      }
+
+      addon.targetPlatforms.push(platform);
+    }
+
+    addon.userDisabled = false;
+    addon.softDisabled =
+      addon.blocklistState === lazy.Blocklist.STATE_SOFTBLOCKED;
+    addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_DEFAULT;
+
+    addon.userPermissions = null;
+
+    addon.icons = {};
+    if (await pkg.hasResource("icon.png")) {
+      addon.icons[32] = "icon.png";
+      addon.icons[48] = "icon.png";
+    }
+
+    if (await pkg.hasResource("icon64.png")) {
+      addon.icons[64] = "icon64.png";
+    }
+
+    return addon;
+  },
+
+  loadScope(addon) {
+    const file = addon.file || addon._sourceBundle;
+    const uri = getURIForResourceInFile(file, "bootstrap.js").spec;
+    const principal = Services.scriptSecurityManager.getSystemPrincipal();
+
+    const sandbox = new Cu.Sandbox(principal, {
+      sandboxName: uri,
+      addonId: addon.id,
+      wantGlobalProperties: ["ChromeUtils"],
+      metadata: { addonID: addon.id, URI: uri },
+    });
+
+    try {
+      Object.assign(sandbox, lazy.BOOTSTRAP_REASONS);
+
+      ChromeUtils.defineLazyGetter(
+        sandbox,
+        "console",
+        () => new lazy.ConsoleAPI({ consoleID: `addon/${addon.id}` })
+      );
+
+      Services.scriptloader.loadSubScript(uri, sandbox);
+    } catch (e) {
+      logger.error(`Error loading bootstrap.js for ${addon.id}:`, e);
+      throw new Error(`Failed to load bootstrap script for ${addon.id}: ${e.message}`);
+    }
+
+    function findMethod(name) {
+      if (sandbox.name) {
+        return sandbox.name;
+      }
+
+      try {
+        const method = Cu.evalInSandbox(name, sandbox);
+        return method;
+      } catch (_err) {}
+
+      return () => {
+        logger.warn(`Add-on ${addon.id} is missing bootstrap method ${name}`);
+      };
+    }
+
+    const install = findMethod("install");
+    const uninstall = findMethod("uninstall");
+    const startup = findMethod("startup");
+    const shutdown = findMethod("shutdown");
+
+    return {
+      install: (...args) => install(...args),
+
+      uninstall(...args) {
+        uninstall(...args);
+        // Forget any cached files we might've had from this extension.
+        Services.obs.notifyObservers(null, "startupcache-invalidate");
+      },
+
+      startup(...args) {
+        if (addon.type === "extension") {
+          logger.debug(`Registering manifest for ${file.path}\n`);
+          Components.manager.addBootstrappedManifestLocation(file);
+        }
+        return startup(...args);
+      },
+
+      shutdown(data, reason) {
+        try {
+          return shutdown(data, reason);
+        } finally {
+          if (reason !== lazy.BOOTSTRAP_REASONS.APP_SHUTDOWN) {
+            logger.debug(`Removing manifest for ${file.path}\n`);
+            Components.manager.removeBootstrappedManifestLocation(file);
+          }
+        }
+      },
+    };
+  },
+};
diff --git a/waterfox/browser/extensions/common/ChromeManifest.sys.mjs b/waterfox/browser/extensions/common/ChromeManifest.sys.mjs
new file mode 100644
index 0000000000000..917a5092e33e0
--- /dev/null
+++ b/waterfox/browser/extensions/common/ChromeManifest.sys.mjs
@@ -0,0 +1,363 @@
+/* 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/. */
+
+/**
+ * A parser for chrome.manifest files. Implements a subset of
+ * https://developer.mozilla.org/en-US/docs/Mozilla/Chrome_Registration
+ */
+export class ChromeManifest {
+  /**
+   * Constructs the chrome.manifest parser
+   *
+   * @param {Function} loader           An asynchronous function that will load further files, e.g.
+   *                                      those included via the |manifest| instruction. The
+   *                                      function will take the file as an argument and should
+   *                                      resolve with the string contents of that file
+   * @param {object} options            Object describing the current system. The keys are manifest
+   *                                      instructions
+   */
+  constructor(loader, options) {
+    this.loader = loader;
+    this.options = options;
+
+    this.overlay = new DefaultMap(() => []);
+    this.locales = new DefaultMap(() => new Map());
+    this.style = new DefaultMap(() => new Set());
+    this.category = new DefaultMap(() => new Map());
+
+    this.component = new Map();
+    this.contract = new Map();
+
+    this.content = new Map();
+    this.skin = new Map();
+    this.resource = new Map();
+    this.override = new Map();
+  }
+
+  /**
+   * Parse the given file.
+   *
+   * @param {string} filename           The filename to load
+   * @param {string} base               The relative directory this file is expected to be in.
+   * @returns {Promise}                  Resolved when loading completes
+   */
+  async parse(filename = "chrome.manifest", base = "") {
+    await this.parseString(await this.loader(filename), base);
+  }
+
+  /**
+   * Parse the given string.
+   *
+   * @param {string} data               The file data to load
+   * @param {string} base               The relative directory this file is expected to be in.
+   * @returns {Promise}                  Resolved when loading completes
+   */
+  async parseString(data, base = "") {
+    const lines = data.split("\n");
+    const extraManifests = [];
+    for (const line of lines) {
+      const parts = line.trim().split(/\s+/);
+      const directive = parts.shift();
+      switch (directive) {
+        case "manifest":
+          extraManifests.push(this._parseManifest(base, ...parts));
+          break;
+        case "component":
+          this._parseComponent(...parts);
+          break;
+        case "contract":
+          this._parseContract(...parts);
+          break;
+
+        case "category":
+          this._parseCategory(...parts);
+          break;
+        case "content":
+          this._parseContent(...parts);
+          break;
+        case "locale":
+          this._parseLocale(...parts);
+          break;
+        case "skin":
+          this._parseSkin(...parts);
+          break;
+        case "resource":
+          this._parseResource(...parts);
+          break;
+
+        case "overlay":
+          this._parseOverlay(...parts);
+          break;
+        case "style":
+          this._parseStyle(...parts);
+          break;
+        case "override":
+          this._parseOverride(...parts);
+          break;
+      }
+    }
+
+    await Promise.all(extraManifests);
+  }
+
+  /**
+   * Ensure the flags provided for the instruction match our options
+   *
+   * @param {string[]} flags        An array of raw flag values in the form key=value.
+   * @returns {boolean}              True, if the flags match the options provided in the constructor
+   */
+  _parseFlags(flags) {
+    if (!flags.length) {
+      return true;
+    }
+
+    const matchString = (a, sign, b) => {
+      if (sign !== "=") {
+        console.warn(
+          `Invalid sign ${sign} in ${a}${sign}${b}, dropping manifest instruction`
+        );
+        return false;
+      }
+      return a === b;
+    };
+
+    const matchVersion = (a, sign, b) => {
+      switch (sign) {
+        case "=":
+          return Services.vc.compare(a, b) === 0;
+        case ">":
+          return Services.vc.compare(a, b) > 0;
+        case "<":
+          return Services.vc.compare(a, b) < 0;
+        case ">=":
+          return Services.vc.compare(a, b) >= 0;
+        case "<=":
+          return Services.vc.compare(a, b) <= 0;
+        default:
+          console.warn(
+            `Invalid sign ${sign} in ${a}${sign}${b}, dropping manifest instruction`
+          );
+          return false;
+      }
+    };
+
+    const flagMatches = (key, typeMatch) => {
+      return (
+        !flagdata.has(key) ||
+        flagdata.get(key).some((val) => typeMatch(this.options[key], ...val))
+      );
+    };
+
+    const flagdata = new DefaultMap(() => []);
+
+    for (const flag of flags) {
+      if (!flag || typeof flag !== 'string') {
+        console.warn(`Invalid flag type: ${typeof flag}, dropping manifest instruction`);
+        continue;
+      }
+      const match = flag.match(/(\w+)(>=|<=|<|>|=)(.*)/);
+      if (match) {
+        flagdata.get(match[1]).push([match[2], match[3]]);
+      } else {
+        console.warn(`Invalid flag ${flag}, dropping manifest instruction`);
+      }
+    }
+
+    return (
+      flagMatches("application", matchString) &&
+      flagMatches("appversion", matchVersion) &&
+      flagMatches("platformversion", matchVersion) &&
+      flagMatches("os", matchString) &&
+      flagMatches("osversion", matchVersion) &&
+      flagMatches("abi", matchString)
+    );
+  }
+
+  /**
+   * Parse the manifest instruction, to load other files
+   *
+   * @param {string} base       The base directory the manifest file is in
+   * @param {string} filename   The file and path to load
+   * @param {...string} flags   The flags for this instruction
+   * @returns {Promise}          Promise resolved when the manifest is loaded
+   */
+  async _parseManifest(base, filename, ...flags) {
+    if (this._parseFlags(flags)) {
+      const dirparts = filename.split("/");
+      dirparts.pop();
+
+      try {
+        await this.parse(filename, base + "/" + dirparts.join("/"));
+      } catch (e) {
+        console.warn(`Could not read manifest '${base}/${filename}':`, e);
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Parse the component instruction, to load xpcom components
+   *
+   * @param {string} classid        The xpcom class id to load
+   * @param {string} loction        The file location of this component
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseComponent(classid, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.component.set(classid, location);
+    }
+  }
+
+  /**
+   * Parse the contract instruction, to load xpcom contract ids
+   *
+   * @param {string} contractid     The xpcom contract id to load
+   * @param {string} location       The file location of this component
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseContract(contractid, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.contract.set(contractid, location);
+    }
+  }
+
+  /**
+   * Parse the category instruction, to set up xpcom categories
+   *
+   * @param {string} category       The name of the category
+   * @param {string} entryName      The category entry name
+   * @param {string} value          The category entry value
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseCategory(category, entryName, value, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.category.get(category).set(entryName, value);
+    }
+  }
+
+  /**
+   * Parse the content instruction, to set chrome content locations
+   *
+   * @param {string} shortname      The content short name, e.g. chrome://shortname/content/
+   * @param {string} location       The location for this content registration
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseContent(shortname, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.content.set(shortname, location);
+    }
+  }
+
+  /**
+   * Parse the locale instruction, to set chrome locale locations
+   *
+   * @param {string} shortname      The locale short name, e.g. chrome://shortname/locale/
+   * @param {string} location       The location for this locale registration
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseLocale(shortname, locale, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.locales.get(shortname).set(locale, location);
+    }
+  }
+
+  /**
+   * Parse the skin instruction, to set chrome skin locations
+   *
+   * @param {string} shortname      The skin short name, e.g. chrome://shortname/skin/
+   * @param {string} location       The location for this skin registration
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseSkin(packagename, _skinname, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.skin.set(packagename, location);
+    }
+  }
+
+  /**
+   * Parse the resource instruction, to set up resource uri substitutions
+   *
+   * @param {string} packagename    The resource package name, e.g. resource://packagename/
+   * @param {string} url            The location for this content registration
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseResource(packagename, location, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.resource.set(packagename, location);
+    }
+  }
+
+  /**
+   * Parse the overlay instruction, to set up xul overlays
+   *
+   * @param {string} targetUrl      The chrome target url
+   * @param {string} overlayUrl     The url of the xul overlay
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseOverlay(targetUrl, overlayUrl, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.overlay.get(targetUrl).push(overlayUrl);
+    }
+  }
+
+  /**
+   * Parse the style instruction, to add stylesheets into chrome windows
+   *
+   * @param {string} uri            The uri of the chrome window
+   * @param {string} sheet          The uri of the css sheet
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseStyle(uri, sheet, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.style.get(uri).add(sheet);
+    }
+  }
+
+  /**
+   * Parse the override instruction, to set chrome uri overrides
+   *
+   * @param {string} uri            The uri being overridden
+   * @param {string} newuri         The replacement uri for the original location
+   * @param {...string} flags       The flags for this instruction
+   */
+  _parseOverride(uri, newuri, ...flags) {
+    if (this._parseFlags(flags)) {
+      this.override.set(uri, newuri);
+    }
+  }
+}
+
+/**
+ * A default map, which assumes a default value on get() if the key doesn't exist
+ */
+class DefaultMap extends Map {
+  /**
+   * Constructs the default map
+   *
+   * @param {Function} _default     A function that returns the default value for this map
+   * @param {*} iterable            An iterable to initialize the map with
+   */
+  constructor(_default, iterable) {
+    super(iterable);
+    this._default = _default;
+  }
+
+  /**
+   * Get the given key, creating if necessary
+   *
+   * @param {string} key            The key of the map to get
+   * @param {boolean} create        True, if the key should be created in case it doesn't exist.
+   */
+   get(key, create = true) {
+       if (this.has(key)) {
+         return super.get(key);
+       }
+       if (create) {
+         this.set(key, this._default());
+         return super.get(key);
+       }
+
+       return this._default();
+     }
+}
diff --git a/waterfox/browser/extensions/common/ExtensionSupport.sys.mjs b/waterfox/browser/extensions/common/ExtensionSupport.sys.mjs
new file mode 100644
index 0000000000000..041e5f5b21ef3
--- /dev/null
+++ b/waterfox/browser/extensions/common/ExtensionSupport.sys.mjs
@@ -0,0 +1,404 @@
+/* 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/. */
+
+/**
+ * Helper functions for use by extensions that should ease them plug
+ * into the application.
+ */
+import { AddonManager } from "resource://gre/modules/AddonManager.sys.mjs";
+import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs";
+import { fixIterator } from "resource:///modules/iteratorUtils.sys.mjs";
+
+const extensionHooks = new Map();
+const legacyExtensions = new Map();
+let openWindowList;
+
+export const ExtensionSupport = {
+  /**
+   * A Map-like object which tracks legacy extension status. The "has" method
+   * returns only active extensions for compatibility with existing code.
+   */
+  loadedLegacyExtensions: {
+    set(id, state) {
+      legacyExtensions.set(id, state);
+    },
+    get(id) {
+      return legacyExtensions.get(id);
+    },
+    has(id) {
+      if (!legacyExtensions.has(id)) {
+        return false;
+      }
+
+      const state = legacyExtensions.get(id);
+      return !["install", "enable"].includes(state.pendingOperation);
+    },
+    hasAnyState(id) {
+      return legacyExtensions.has(id);
+    },
+    _maybeDelete(id, newPendingOperation) {
+      if (!legacyExtensions.has(id)) {
+        return;
+      }
+
+      const state = legacyExtensions.get(id);
+      if (
+        state.pendingOperation === "enable" &&
+        newPendingOperation === "disable"
+      ) {
+        legacyExtensions.delete(id);
+        this.notifyObservers(state);
+      } else if (
+        state.pendingOperation === "install" &&
+        newPendingOperation === "uninstall"
+      ) {
+        legacyExtensions.delete(id);
+        this.notifyObservers(state);
+      }
+    },
+    notifyObservers(state) {
+      const wrappedState = { wrappedJSObject: state };
+      Services.obs.notifyObservers(wrappedState, "legacy-addon-status-changed");
+    },
+    // AddonListener
+    onDisabled(ev) {
+      this._maybeDelete(ev.id, "disable");
+    },
+    onUninstalled(ev) {
+      this._maybeDelete(ev.id, "uninstall");
+    },
+  },
+
+  async loadAddonPrefs(addonFile) {
+    function setPref(preferDefault, name, value) {
+      const branch = preferDefault
+        ? Services.prefs.getDefaultBranch("")
+        : Services.prefs.getBranch("");
+
+      if (typeof value === "boolean") {
+        branch.setBoolPref(name, value);
+      } else if (typeof value === "string") {
+        if (value.startsWith("chrome://") && value.endsWith(".properties")) {
+          const valueLocal = Cc[
+            "@mozilla.org/pref-localizedstring;1"
+          ].createInstance(Ci.nsIPrefLocalizedString);
+          valueLocal.data = value;
+          branch.setComplexValue(name, Ci.nsIPrefLocalizedString, valueLocal);
+        } else {
+          branch.setStringPref(name, value);
+        }
+      } else if (typeof value === "number" && Number.isInteger(value)) {
+        branch.setIntPref(name, value);
+      } else if (typeof value === "number" && Number.isFloat(value)) {
+        // Floats are set as char prefs, then retrieved using getFloatPref
+        branch.setCharPref(name, value);
+      }
+    }
+
+    async function walkExtensionPrefs(extensionRoot) {
+      const prefFile = extensionRoot.clone();
+      const foundPrefStrings = [];
+      if (!prefFile.exists()) {
+        return [];
+      }
+
+      if (prefFile.isDirectory()) {
+        prefFile.append("defaults");
+        prefFile.append("preferences");
+        if (!prefFile.exists() || !prefFile.isDirectory()) {
+          return [];
+        }
+
+        const unsortedFiles = [];
+        for (const file of fixIterator(prefFile.directoryEntries, Ci.nsIFile)) {
+          if (file.isFile() && file.leafName.toLowerCase().endsWith(".js")) {
+            unsortedFiles.push(file);
+          }
+        }
+
+        for (const file of unsortedFiles.sort((a, b) =>
+          a.path < b.path ? 1 : -1
+        )) {
+          foundPrefStrings.push(await IOUtils.readUTF8(file.path));
+        }
+      } else if (prefFile.isFile() && prefFile.leafName.endsWith("xpi")) {
+        const zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+          Ci.nsIZipReader
+        );
+        zipReader.open(prefFile);
+        const entries = zipReader.findEntries("defaults/preferences/*.js");
+        const unsortedEntries = [];
+        while (entries.hasMore()) {
+          unsortedEntries.push(entries.getNext());
+        }
+
+        for (const entryName of unsortedEntries.sort().reverse()) {
+          const stream = zipReader.getInputStream(entryName);
+          const entrySize = zipReader.getEntry(entryName).realSize;
+          if (entrySize > 0) {
+            const content = NetUtil.readInputStreamToString(stream, entrySize, {
+              charset: "utf-8",
+              replacement: "?",
+            });
+            foundPrefStrings.push(content);
+          }
+        }
+      }
+
+      return foundPrefStrings;
+    }
+
+    const sandbox = new Cu.Sandbox(null);
+    sandbox.pref = setPref.bind(undefined, true);
+    sandbox.user_pref = setPref.bind(undefined, false);
+
+    const prefDataStrings = await walkExtensionPrefs(addonFile);
+    for (const prefDataString of prefDataStrings) {
+      try {
+        Cu.evalInSandbox(prefDataString, sandbox);
+      } catch (e) {
+        console.error(
+          "Error reading default prefs of addon ",
+          addonFile.leafName,
+          ": ",
+          e
+        );
+      }
+    }
+
+    /*
+    TODO: decide whether we need to warn the user/make addon authors to migrate away from these pref files.
+    if (prefDataStrings.length > 0) {
+      Deprecated.warning(addon.defaultLocale.name + " uses defaults/preferences/*.js files to load prefs",
+                         "https://bugzilla.mozilla.org/show_bug.cgi?id=1414398");
+    }
+    */
+  },
+
+  /**
+   * Register listening for windows getting opened that will run the specified callback function
+   * when a matching window is loaded.
+   *
+   * @param aID {String}  Some identification of the caller, usually the extension ID.
+   * @param aExtensionHook {Object}  The object describing the hook the caller wants to register.
+   *        Members of the object can be (all optional, but one callback must be supplied):
+   *        chromeURLs {Array}         An array of strings of document URLs on which
+   *                                   the given callback should run. If not specified,
+   *                                   run on all windows.
+   *        onLoadWindow {function}    The callback function to run when window loads
+   *                                   the matching document.
+   *        onUnloadWindow {function}  The callback function to run when window
+   *                                   unloads the matching document.
+   *        Both callbacks receive the matching window object as argument.
+   *
+   * @returns {boolean}  True if the passed arguments were valid and the caller could be registered.
+   *                    False otherwise.
+   */
+   registerWindowListener(aID, aExtensionHook) {
+       if (!aID) {
+         console.error("No extension ID provided for the window listener");
+         return false;
+       }
+
+       if (extensionHooks.has(aID)) {
+         console.error(
+           "Window listener for extension + '",
+           aID,
+           "' already registered"
+         );
+         return false;
+       }
+
+       if (
+         !("onLoadWindow" in aExtensionHook) &&
+         !("onUnloadWindow" in aExtensionHook)
+       ) {
+         console.error(
+           "The extension + '",
+           aID,
+           "' does not provide any callbacks"
+         );
+         return false;
+       }
+
+       extensionHooks.set(aID, aExtensionHook);
+
+       // Add our global listener if there isn't one already
+       // (only when we have first caller).
+       if (extensionHooks.size === 1) {
+         Services.wm.addListener(this._windowListener);
+       }
+
+       if (openWindowList) {
+         // We already have a list of open windows, notify the caller about them.
+         for (const domWindow of openWindowList) {
+           ExtensionSupport._checkAndRunMatchingExtensions(domWindow, "load", aID);
+         }
+       } else {
+         openWindowList = new Set();
+         // Get the list of windows already open.
+         const windows = Services.wm.getEnumerator(null);
+         while (windows.hasMoreElements()) {
+           const domWindow = windows.getNext().QueryInterface(Ci.nsIDOMWindow);
+           if (domWindow.document.location.href === "about:blank") {
+             ExtensionSupport._waitForLoad(domWindow, aID);
+           } else {
+             ExtensionSupport._addToListAndNotify(domWindow, aID);
+           }
+         }
+       }
+
+       return true;
+     },
+
+  /**
+   * Unregister listening for windows for the given caller.
+   *
+   * @param aID {String}  Some identification of the caller, usually the extension ID.
+   *
+   * @returns {boolean}  True if the passed arguments were valid and the caller could be unregistered.
+   *                    False otherwise.
+   */
+  unregisterWindowListener(aID) {
+    if (!aID) {
+      console.error("No extension ID provided for the window listener");
+      return false;
+    }
+
+    const windowListener = extensionHooks.get(aID);
+    if (!windowListener) {
+      console.error(
+        "Couldn't remove window listener for extension + '",
+        aID,
+        "'"
+      );
+      return false;
+    }
+
+    extensionHooks.delete(aID);
+    // Remove our global listener if there are no callers registered anymore.
+    if (extensionHooks.size === 0) {
+      Services.wm.removeListener(this._windowListener);
+      openWindowList.clear();
+      openWindowList = undefined;
+    }
+
+    return true;
+  },
+
+  get openWindows() {
+    return openWindowList.values();
+  },
+
+  _windowListener: {
+    // nsIWindowMediatorListener functions
+    onOpenWindow(xulWindow) {
+      // A new window has opened.
+      const domWindow = xulWindow.docShell.domWindow;
+
+      // Here we pass no caller ID, so all registered callers get notified.
+      ExtensionSupport._waitForLoad(domWindow);
+    },
+
+    onCloseWindow(xulWindow) {
+      // One of the windows has closed.
+      const domWindow = xulWindow.docShell.domWindow;
+      openWindowList.delete(domWindow);
+    },
+  },
+
+  /**
+   * Set up listeners to run the callbacks on the given window.
+   *
+   * @param aWindow {nsIDOMWindow}  The window to set up.
+   * @param aID {String} Optional.  ID of the new caller that has registered right now.
+   */
+  _waitForLoad(aWindow, aID) {
+    // Wait for the load event of the window. At that point
+    // aWindow.document.location.href will not be "about:blank" any more.
+    aWindow.addEventListener(
+      "load",
+      () => {
+        ExtensionSupport._addToListAndNotify(aWindow, aID);
+      },
+      { once: true }
+    );
+  },
+
+  /**
+   * Once the window is fully loaded with the href referring to the XUL document,
+   * add it to our list, attach the "unload" listener to it and notify interested
+   * callers.
+   *
+   * @param aWindow {nsIDOMWindow}  The window to process.
+   * @param aID {String} Optional.  ID of the new caller that has registered right now.
+   */
+  _addToListAndNotify(aWindow, aID) {
+    openWindowList.add(aWindow);
+    aWindow.addEventListener(
+      "unload",
+      () => {
+        ExtensionSupport._checkAndRunMatchingExtensions(aWindow, "unload");
+      },
+      { once: true }
+    );
+    ExtensionSupport._checkAndRunMatchingExtensions(aWindow, "load", aID);
+  },
+
+  /**
+   * Check if the caller matches the given window and run its callback function.
+   *
+   * @param aWindow {nsIDOMWindow}  The window to run the callbacks on.
+   * @param aEventType {String}     Which callback to run if caller matches (load/unload).
+   * @param aID {String}            Optional ID of the caller whose callback is to be run.
+   *                                If not given, all registered callers are notified.
+   */
+  _checkAndRunMatchingExtensions(aWindow, aEventType, aID) {
+    if (aID) {
+      checkAndRunExtensionCode(extensionHooks.get(aID));
+    } else {
+      for (const extensionHook of extensionHooks.values()) {
+        checkAndRunExtensionCode(extensionHook);
+      }
+    }
+
+    /**
+     * Check if the single given caller matches the given window
+     * and run its callback function.
+     *
+     * @param aExtensionHook {Object}  The object describing the hook the caller
+     *                                 has registered.
+     */
+    function checkAndRunExtensionCode(aExtensionHook) {
+      const windowChromeURL = aWindow.document.location.href;
+      // Check if extension applies to this document URL.
+      if (
+        "chromeURLs" in aExtensionHook &&
+        !aExtensionHook.chromeURLs.some((url) => url === windowChromeURL)
+      ) {
+        return;
+      }
+
+      // Run the relevant callback.
+      switch (aEventType) {
+        case "load":
+          if ("onLoadWindow" in aExtensionHook) {
+            aExtensionHook.onLoadWindow(aWindow);
+          }
+          break;
+        case "unload":
+          if ("onUnloadWindow" in aExtensionHook) {
+            aExtensionHook.onUnloadWindow(aWindow);
+          }
+          break;
+      }
+    }
+  },
+
+  get registeredWindowListenerCount() {
+    return extensionHooks.size;
+  },
+};
+
+AddonManager.addAddonListener(ExtensionSupport.loadedLegacyExtensions);
diff --git a/waterfox/browser/extensions/common/Overlays.sys.mjs b/waterfox/browser/extensions/common/Overlays.sys.mjs
new file mode 100644
index 0000000000000..6e2d57dc66249
--- /dev/null
+++ b/waterfox/browser/extensions/common/Overlays.sys.mjs
@@ -0,0 +1,650 @@
+/* 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/. */
+
+/**
+ * Load overlays in a similar way as XUL did for legacy XUL add-ons.
+ */
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+});
+
+/**
+ * The overlays class, providing support for loading overlays like they used to work. This class
+ * should likely be called through its static method Overlays.load()
+ */
+export class Overlays {
+  /**
+   * Load overlays for the given window using the overlay provider, which can for example be a
+   * ChromeManifest object.
+   *
+   * @param {ChromeManifest} overlayProvider        The overlay provider that contains information
+   *                                                  about styles and overlays.
+   * @param {DOMWindow} window                      The window to load into
+   */
+  static load(overlayProvider, window) {
+    const instance = new Overlays(overlayProvider, window);
+
+    const urls = overlayProvider.overlay.get(instance.location, false);
+    return instance.load(urls);
+  }
+
+  /**
+   * Constructs the overlays instance. This class should be called via Overlays.load() instead.
+   *
+   * @param {ChromeManifest} overlayProvider        The overlay provider that contains information
+   *                                                  about styles and overlays.
+   * @param {DOMWindow} window                      The window to load into
+   */
+  constructor(overlayProvider, window) {
+    this.overlayProvider = overlayProvider;
+    this.window = window;
+    if (window.location.protocol === "about:") {
+      this.location = window.location.protocol + window.location.pathname;
+    } else {
+      this.location = window.location.origin + window.location.pathname;
+    }
+  }
+
+  /**
+   * A shorthand to this.window.document
+   */
+  get document() {
+    return this.window.document;
+  }
+
+  /**
+   * Loads the given urls into the window, recursively loading further overlays as provided by the
+   * overlayProvider.
+   *
+   * @param {string[]} urls                         The urls to load
+   */
+   async load(urls) {
+       const unloadedOverlays = new Set(
+         this._collectOverlays(this.document).concat(urls)
+       );
+       let forwardReferences = [];
+       this.unloadedScripts = [];
+       const unloadedSheets = [];
+       this._toolbarsToResolve = [];
+       const xulStore = Services.xulStore;
+       this.persistedIDs = new Set();
+
+       // Load css styles from the registry
+       for (const sheet of this.overlayProvider.style.get(this.location, false)) {
+         unloadedSheets.push(sheet);
+       }
+
+       if (!unloadedOverlays.size && !unloadedSheets.length) {
+         return;
+       }
+
+       for (const url of unloadedOverlays) {
+         unloadedOverlays.delete(url);
+         const doc = await this.fetchOverlay(url);
+
+         console.debug(`Applying ${url} to ${this.location}`);
+
+         // clean the document a bit
+         const emptyNodes = doc.evaluate(
+           "//text()[normalize-space(.) = '']",
+           doc,
+           null,
+           7,
+           null
+         );
+         for (let i = 0, len = emptyNodes.snapshotLength; i < len; ++i) {
+           const node = emptyNodes.snapshotItem(i);
+           node.remove();
+         }
+
+         const commentNodes = doc.evaluate("//comment()", doc, null, 7, null);
+         for (let i = 0, len = commentNodes.snapshotLength; i < len; ++i) {
+           const node = commentNodes.snapshotItem(i);
+           node.remove();
+         }
+
+         // Force a re-evaluation of inline styles to work around an issue
+         // causing inline styles to be initially ignored.
+         const styledNodes = doc.evaluate("//*[@style]", doc, null, 7, null);
+         for (let i = 0, len = styledNodes.snapshotLength; i < len; ++i) {
+           const node = styledNodes.snapshotItem(i);
+           // Re-assigning to node.style.display to itself can sometimes force a style recalculation.
+           // To satisfy linters and achieve a similar effect:
+           node.style.setProperty("display", node.style.getPropertyValue("display"));
+         }
+
+         // Load css styles from the registry
+         for (const sheet of this.overlayProvider.style.get(url, false)) {
+           unloadedSheets.push(sheet);
+         }
+
+         // Load css processing instructions from the overlay
+         const stylesheets = doc.evaluate(
+           "/processing-instruction('xml-stylesheet')",
+           doc,
+           null,
+           7,
+           null
+         );
+         for (let i = 0, len = stylesheets.snapshotLength; i < len; ++i) {
+           const node = stylesheets.snapshotItem(i);
+           const match = node.nodeValue.match(/href=["']([^"']*)["']/);
+           if (match) {
+             unloadedSheets.push(new URL(match[1], node.baseURI).href);
+           }
+         }
+
+         const t_unloadedOverlays = [];
+         // Prepare loading further nested xul overlays from the overlay
+         t_unloadedOverlays.push(...this._collectOverlays(doc));
+
+         // Prepare loading further nested xul overlays from the registry
+         for (const overlayUrl of this.overlayProvider.overlay.get(url, false)) {
+           t_unloadedOverlays.push(overlayUrl);
+         }
+
+         for (const o of t_unloadedOverlays) {
+           unloadedOverlays.add(o);
+         }
+
+         // Run through all overlay nodes on the first level (hookup nodes). Scripts will be deferred
+         // until later for simplicity (c++ code seems to process them earlier?).
+         const t_forwardReferences = [];
+         for (const node of doc.documentElement.children) {
+           if (node.localName === "script") {
+             this.unloadedScripts.push(node);
+           } else {
+             t_forwardReferences.push(node);
+           }
+         }
+         forwardReferences.unshift(...t_forwardReferences);
+       }
+
+       // We've resolved all the forward references we can, we can now go ahead and load the scripts
+       this.deferredLoad = [];
+       for (const script of this.unloadedScripts) {
+         this.deferredLoad.push(...this.loadScript(script));
+       }
+
+       const ids = xulStore.getIDsEnumerator(this.location);
+       while (ids.hasMore()) {
+         this.persistedIDs.add(ids.getNext());
+       }
+
+       // At this point, all (recursive) overlays are loaded. Unloaded scripts and sheets are ready and
+       // in order, and forward references are good to process.
+       let previous = 0;
+       while (forwardReferences.length && forwardReferences.length !== previous) {
+         previous = forwardReferences.length;
+         const unresolved = [];
+
+         for (const ref of forwardReferences) {
+           if (!this._resolveForwardReference(ref)) {
+             unresolved.push(ref);
+           }
+         }
+
+         forwardReferences = unresolved;
+       }
+
+       if (forwardReferences.length) {
+         console.warn(
+           `Could not resolve ${forwardReferences.length} references`,
+           forwardReferences
+         );
+       }
+
+       // Loading the sheets now to avoid race conditions with xbl bindings
+       for (const sheet of unloadedSheets) {
+         this.loadCSS(sheet);
+       }
+
+       this._decksToResolve = new Map();
+       for (const id of this.persistedIDs.values()) {
+         const element = this.document.getElementById(id);
+         if (element) {
+           const attrNames = xulStore.getAttributeEnumerator(this.location, id);
+           while (attrNames.hasMore()) {
+             const attrName = attrNames.getNext();
+             const attrValue = xulStore.getValue(this.location, id, attrName);
+             if (attrName === "selectedIndex" && element.localName === "deck") {
+               this._decksToResolve.set(element, attrValue);
+             } else if (
+               (element !== this.document.documentElement ||
+                 !["height", "screenX", "screenY", "sizemode", "width"].includes(
+                   attrName
+                 )) &&
+               element.getAttribute(attrName) !== attrValue.toString()
+             ) {
+               element.setAttribute(attrName, attrValue);
+             }
+           }
+         }
+       }
+
+       if (this.document.readyState === "complete") {
+         lazy.setTimeout(() => {
+           this._finish();
+
+           // Now execute load handlers since we are done loading scripts
+           const bubbles = [];
+           for (const { listener, useCapture } of this.deferredLoad) {
+             if (useCapture) {
+               this._fireEventListener(listener);
+             } else {
+               bubbles.push(listener);
+             }
+           }
+
+           for (const listener of bubbles) {
+             this._fireEventListener(listener);
+           }
+         });
+       } else {
+         this.document.defaultView.addEventListener(
+           "load",
+           this._finish.bind(this),
+           { once: true }
+         );
+       }
+     }
+
+  _finish() {
+    for (const [deck, selectedIndex] of this._decksToResolve.entries()) {
+      deck.setAttribute("selectedIndex", selectedIndex);
+    }
+
+    for (const bar of this._toolbarsToResolve) {
+      const currentSet = Services.xulStore.getValue(
+        this.location,
+        bar.id,
+        "currentset"
+      );
+      if (currentSet) {
+        bar.currentSet = currentSet;
+      } else if (bar.getAttribute("defaultset")) {
+        bar.currentSet = bar.getAttribute("defaultset");
+      }
+    }
+  }
+
+  /**
+   * Gets the overlays referenced by processing instruction on a document.
+   *
+   * @param {DOMDocument} document  The document to read instructions from
+   * @returns {string[]}             URLs of the overlays from the document
+   */
+  _collectOverlays(doc) {
+    const urls = [];
+    const instructions = doc.evaluate(
+      "/processing-instruction('xul-overlay')",
+      doc,
+      null,
+      7,
+      null
+    );
+    for (let i = 0, len = instructions.snapshotLength; i < len; ++i) {
+      const node = instructions.snapshotItem(i);
+      const match = node.nodeValue.match(/href=["']([^"']*)["']/);
+      if (match) {
+        urls.push(match[1]);
+      }
+    }
+    return urls;
+  }
+
+  /**
+   * Fires a "load" event for the given listener, using the current window
+   *
+   * @param {EventListener|Function} listener       The event listener to call
+   */
+  _fireEventListener(listener) {
+    const fakeEvent = new this.window.UIEvent("load", { view: this.window });
+    if (typeof listener === "function") {
+      listener(fakeEvent);
+    } else if (listener && typeof listener === "object") {
+      listener.handleEvent(fakeEvent);
+    } else {
+      console.error("Unknown listener type", listener);
+    }
+  }
+
+  /**
+   * Resolves forward references for the given node. If the node exists in the target document, it
+   * is merged in with the target node. If the node has no id it is inserted at documentElement
+   * level.
+   *
+   * @param {Element} node          The DOM Element to resolve in the target document.
+   * @returns {boolean}              True, if the node was merged/inserted, false otherwise
+   */
+   _resolveForwardReference(node) {
+       if (node.id) {
+         const target = this.document.getElementById(node.id);
+         // if (node.localName == "template") {
+         //   this._insertElement(this.document.documentElement, node);
+         //   return true;
+         // } else
+         if (node.localName === "toolbarpalette") {
+           console.error("toolbarpalette is unsupported type", node.id);
+           return false;
+         }
+         if (!target) {
+           if (
+             node.hasAttribute("insertafter") ||
+             node.hasAttribute("insertbefore")
+           ) {
+             this._insertElement(this.document.documentElement, node);
+             return true;
+           }
+           console.debug(
+             `The node ${node.id} could not be found, deferring to later`
+           );
+           return false;
+         }
+
+         // Delete existing element if requested
+         if (node.hasAttribute("delete")) {
+           this._deleteElement(target);
+         } else {
+           this._mergeElement(target, node);
+         }
+       } else if (node.className) {
+         const target = this.document.querySelector(
+           `${node.nodeName}[class='${node.getAttribute("class")}']`
+         );
+         if (node.hasAttribute("delete")) {
+           this._deleteElement(target);
+         }
+       } else if (node.getAttribute("data-subcategory")) {
+         // This is for removing items in about:preferences#home
+         const target = this.document.querySelector(
+           `${node.nodeName}[data-subcategory='${node.getAttribute(
+             "data-subcategory"
+           )}']`
+         );
+         if (node.hasAttribute("delete")) {
+           this._deleteElement(target);
+         }
+       } else {
+         this._insertElement(this.document.documentElement, node);
+       }
+       return true;
+     }
+
+  /**
+   * Delete the target node.
+   *
+   * @param {Element} target     The node to delete.
+   */
+  _deleteElement(target) {
+    if (target) {
+      target.remove();
+    }
+  }
+
+  /**
+   * Insert the node in the given parent, observing the insertbefore/insertafter/position attributes
+   *
+   * @param {Element} parent        The parent element to insert the node into.
+   * @param {Element} node          The node to insert.
+   */
+  _insertElement(parent, node) {
+    // These elements need their values set before they are added to
+    // the document, or bad things happen.
+    for (const element of node.querySelectorAll("menulist")) {
+      if (element.id && this.persistedIDs.has(element.id)) {
+        element.setAttribute(
+          "value",
+          Services.xulStore.getValue(this.location, element.id, "value")
+        );
+      }
+    }
+
+    if (node.localName === "toolbar") {
+      this._toolbarsToResolve.push(node);
+    } else {
+      this._toolbarsToResolve.push(...node.querySelectorAll("toolbar"));
+    }
+
+    const nodes = node.querySelectorAll("script");
+    for (const script of nodes) {
+      this.deferredLoad.push(...this.loadScript(script));
+    }
+
+    let wasInserted = false;
+    let pos = node.getAttribute("insertafter");
+    let after = true;
+
+    if (!pos) {
+      pos = node.getAttribute("insertbefore");
+      after = false;
+    }
+
+    if (pos) {
+      for (const id of pos.split(",")) {
+        const targetChild = this.document.getElementById(id);
+        if (targetChild && parent.contains(targetChild.parentNode)) {
+          targetChild.parentNode.insertBefore(
+            node,
+            after ? targetChild.nextElementSibling : targetChild
+          );
+          wasInserted = true;
+          break;
+        }
+      }
+    }
+
+    if (!wasInserted) {
+      // position is 1-based
+      const position = Number.parseInt(node.getAttribute("position"), 10);
+      if (position > 0 && position - 1 <= parent.children.length) {
+        parent.insertBefore(node, parent.children[position - 1]);
+        wasInserted = true;
+      }
+    }
+
+    if (!wasInserted) {
+      parent.appendChild(node);
+    }
+  }
+
+  /**
+   * Merge the node into the target, adhering to the removeelement attribute, merging further
+   * attributes into the target node, and merging children as appropriate for xul nodes. If a child
+   * has an id, it will be searched in the target document and recursively merged.
+   *
+   * @param {Element} target        The node to merge into
+   * @param {Element} node          The node that is being merged
+   * @param {bool}    shadow        If the target node is in the shadow DOM
+   */
+   _mergeElement(target, node, shadow = false) {
+       for (const attribute of node.attributes) {
+         if (attribute.name !== "id") {
+           if (attribute.name === "removeelement" && attribute.value === "true") {
+             target.remove();
+             return;
+           }
+
+           target.setAttributeNS(
+             attribute.namespaceURI,
+             attribute.name,
+             attribute.value
+           );
+         }
+       }
+
+       for (const childNode of node.children) {
+         if (childNode.localName === "script") {
+           this.deferredLoad.push(...this.loadScript(childNode));
+         }
+       }
+
+       let sourceNodeForChildren = node;
+       // Get the DocumentFragment
+       if (node.localName === "template") {
+         sourceNodeForChildren = node.content;
+       }
+
+       for (let i = 0, len = sourceNodeForChildren.childElementCount; i < len; i++) {
+         const child = sourceNodeForChildren.firstElementChild;
+         child.remove();
+
+         let elementInDocument = child.id
+           ? this.document.getElementById(child.id)
+           : null;
+         const parentId = elementInDocument
+           ? elementInDocument.parentNode.id
+           : null;
+
+         // Strictly to working with shadow DOM elements
+         if (target.content) {
+           elementInDocument = target.content.children.namedItem(child.id);
+         } else if (shadow && target.children.length === 1) {
+           // This condition is very specific to adding appMenu items, if we need another
+           // use case we will have to re-visit
+           elementInDocument = target.children[0];
+         }
+
+         // Need an else if nodeName is doc fragment
+         if (parentId && parentId === target.id) {
+           this._mergeElement(elementInDocument, child);
+         } else if (
+           elementInDocument &&
+           (elementInDocument.parentNode.nodeName === "#document-fragment" ||
+             shadow)
+         ) {
+           // Merging for shadow DOM elements, as getElementById does not work
+           this._mergeElement(elementInDocument, child, true);
+         } else {
+           this._insertElement(target, child);
+         }
+       }
+     }
+
+  /**
+   * Fetches the overlay from the given chrome:// or resource:// URL.
+   *
+   * @param {string} srcUrl          The URL to load
+   * @returns {Promise<XMLDocument>}  Returns a promise that is resolved with the XML document.
+   */
+  fetchOverlay(srcUrl) {
+    if (!srcUrl.startsWith("chrome://") && !srcUrl.startsWith("resource://")) {
+      throw new Error(
+        "May only load overlays from chrome:// or resource:// uris"
+      );
+    }
+
+    return new Promise((resolve, reject) => {
+      const xhr = new this.window.XMLHttpRequest();
+      xhr.overrideMimeType("application/xml");
+      xhr.open("GET", srcUrl, true);
+
+      // Elevate the request, so DTDs will work. Should not be a security issue since we
+      // only load chrome, resource and file URLs, and that is our privileged chrome package.
+      try {
+        xhr.channel.owner = Services.scriptSecurityManager.getSystemPrincipal();
+      } catch (_ex) {
+        console.error(
+          `Failed to set system principal while fetching overlay ${srcUrl}`
+        );
+        xhr.close();
+        reject("Failed to set system principal");
+      }
+
+      xhr.onload = () => resolve(xhr.responseXML);
+      xhr.onerror = () =>
+        reject(`Failed to load ${srcUrl} to ${this.location}`);
+      xhr.send(null);
+    });
+  }
+
+  /**
+   * Loads scripts described by the given script node. The node can either have a src attribute, or
+   * be an inline script with textContent.
+   *
+   * @param {Element} node                          The <script> element to load the script from
+   * @returns {object[]}                             An object with listener and useCapture,
+   *                                                  describing load handlers the script creates
+   *                                                  when first run.
+   */
+   loadScript(node) {
+       const deferredLoad = [];
+
+       const oldAddEventListener = this.window.addEventListener;
+       if (this.document.readyState === "complete") {
+         this.window.addEventListener = function (
+           type,
+           listener,
+           useCapture, // This is the original parameter
+           ...args
+         ) {
+           if (type === "load") {
+             let processedUseCapture = useCapture; // Local variable to hold the processed value
+
+             if (typeof processedUseCapture === "object" && processedUseCapture !== null) {
+               // Handle cases where useCapture might be an options object
+               processedUseCapture = processedUseCapture.capture;
+             }
+
+             if (typeof processedUseCapture === "undefined") {
+               processedUseCapture = true; // Default to capture phase if undefined
+             }
+             deferredLoad.push({ listener, useCapture: processedUseCapture });
+             return null;
+           }
+           // For non-"load" events, pass the original useCapture argument
+           return oldAddEventListener.call(
+             this,
+             type,
+             listener,
+             useCapture,
+             ...args
+           );
+         };
+       }
+
+       if (node.hasAttribute("src")) {
+         const url = new URL(node.getAttribute("src"), node.baseURI).href;
+         console.debug(`Loading script ${url} into ${this.window.location}`);
+         try {
+           Services.scriptloader.loadSubScript(url, this.window);
+         } catch (ex) {
+           console.error(ex);
+         }
+       } else if (node.textContent) {
+         console.debug(`Loading eval'd script into ${this.window.location}`);
+         try {
+           const dataURL = `data:application/javascript,${encodeURIComponent(node.textContent)}`;
+           // It would be great if we could have script errors show the right url, but for now
+           // loadSubScript will have to do.
+           Services.scriptloader.loadSubScript(dataURL, this.window);
+         } catch (ex) {
+           console.error(ex);
+         }
+       }
+
+       if (this.document.readyState === "complete") {
+         this.window.addEventListener = oldAddEventListener;
+       }
+
+       // This works because we only care about immediately executed addEventListener calls and
+       // loadSubScript is synchronous. Everyone else should be checking readyState anyway.
+       return deferredLoad;
+     }
+
+  /**
+   * Load the CSS stylesheet from the given url
+   *
+   * @param {string} url        The url to load from
+   * @returns {Element}          An HTML link element for this stylesheet
+   */
+  loadCSS(url) {
+    console.debug(`Loading ${url} into ${this.window.location}`);
+
+    const winUtils = this.window.windowUtils;
+    winUtils.loadSheetUsingURIString(url, winUtils.AUTHOR_SHEET);
+  }
+}
diff --git a/waterfox/browser/extensions/common/RDFDataSource.sys.mjs b/waterfox/browser/extensions/common/RDFDataSource.sys.mjs
new file mode 100644
index 0000000000000..41fa8972cc3f7
--- /dev/null
+++ b/waterfox/browser/extensions/common/RDFDataSource.sys.mjs
@@ -0,0 +1,1752 @@
+/* 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/. */
+
+/**
+ * This module creates a new API for accessing and modifying RDF graphs. The
+ * goal is to be able to serialise the graph in a human readable form. Also
+ * if the graph was originally loaded from an RDF/XML the serialisation should
+ * closely match the original with any new data closely following the existing
+ * layout. The output should always be compatible with Mozilla's RDF parser.
+ *
+ * This is all achieved by using a DOM Document to hold the current state of the
+ * graph in XML form. This can be initially loaded and parsed from disk or
+ * a blank document used for an empty graph. As assertions are added to the
+ * graph, appropriate DOM nodes are added to the document to represent them
+ * along with any necessary whitespace to properly layout the XML.
+ *
+ * In general the order of adding assertions to the graph will impact the form
+ * the serialisation takes. If a resource is first added as the object of an
+ * assertion then it will eventually be serialised inside the assertion's
+ * property element. If a resource is first added as the subject of an assertion
+ * then it will be serialised at the top level of the XML.
+ */
+
+const NS_XML = "http://www.w3.org/XML/1998/namespace";
+const NS_XMLNS = "http://www.w3.org/2000/xmlns/";
+const NS_RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+const NS_NC = "http://home.netscape.com/NC-rdf#";
+
+/* eslint prefer-template: 1 */
+
+function raw(strings) {
+  return strings.raw[0].replace(/\s+/, "");
+}
+
+// Copied from http://www.w3.org/TR/2000/REC-xml-20001006#CharClasses
+const XML_LETTER = raw`
+  \u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6
+  \u00F8-\u00FF\u0100-\u0131\u0134-\u013E\u0141-\u0148
+  \u014A-\u017E\u0180-\u01C3\u01CD-\u01F0\u01F4-\u01F5
+  \u01FA-\u0217\u0250-\u02A8\u02BB-\u02C1\u0386\u0388-\u038A
+  \u038C\u038E-\u03A1\u03A3-\u03CE\u03D0-\u03D6\u03DA\u03DC
+  \u03DE\u03E0\u03E2-\u03F3\u0401-\u040C\u040E-\u044F
+  \u0451-\u045C\u045E-\u0481\u0490-\u04C4\u04C7-\u04C8
+  \u04CB-\u04CC\u04D0-\u04EB\u04EE-\u04F5\u04F8-\u04F9
+  \u0531-\u0556\u0559\u0561-\u0586\u05D0-\u05EA\u05F0-\u05F2
+  \u0621-\u063A\u0641-\u064A\u0671-\u06B7\u06BA-\u06BE
+  \u06C0-\u06CE\u06D0-\u06D3\u06D5\u06E5-\u06E6\u0905-\u0939
+  \u093D\u0958-\u0961\u0985-\u098C\u098F-\u0990\u0993-\u09A8
+  \u09AA-\u09B0\u09B2\u09B6-\u09B9\u09DC-\u09DD\u09DF-\u09E1
+  \u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28
+  \u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39
+  \u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8B\u0A8D
+  \u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3
+  \u0AB5-\u0AB9\u0ABD\u0AE0\u0B05-\u0B0C\u0B0F-\u0B10
+  \u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B36-\u0B39
+  \u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B85-\u0B8A\u0B8E-\u0B90
+  \u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4
+  \u0BA8-\u0BAA\u0BAE-\u0BB5\u0BB7-\u0BB9\u0C05-\u0C0C
+  \u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39
+  \u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8
+  \u0CAA-\u0CB3\u0CB5-\u0CB9\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C
+  \u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D60-\u0D61
+  \u0E01-\u0E2E\u0E30\u0E32-\u0E33\u0E40-\u0E45\u0E81-\u0E82
+  \u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F
+  \u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EAE\u0EB0
+  \u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0F40-\u0F47\u0F49-\u0F69
+  \u10A0-\u10C5\u10D0-\u10F6\u1100\u1102-\u1103\u1105-\u1107
+  \u1109\u110B-\u110C\u110E-\u1112\u113C\u113E\u1140\u114C
+  \u114E\u1150\u1154-\u1155\u1159\u115F-\u1161\u1163\u1165
+  \u1167\u1169\u116D-\u116E\u1172-\u1173\u1175\u119E\u11A8
+  \u11AB\u11AE-\u11AF\u11B7-\u11B8\u11BA\u11BC-\u11C2\u11EB
+  \u11F0\u11F9\u1E00-\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15
+  \u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57
+  \u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC
+  \u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB
+  \u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B
+  \u212E\u2180-\u2182\u3041-\u3094\u30A1-\u30FA\u3105-\u312C
+  \uAC00-\uD7A3\u4E00-\u9FA5\u3007\u3021-\u3029
+`;
+const XML_DIGIT = raw`
+  \u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u0966-\u096F
+  \u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F
+  \u0BE7-\u0BEF\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F
+  \u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F29
+`;
+const XML_COMBINING = raw`
+  \u0300-\u0345\u0360-\u0361\u0483-\u0486\u0591-\u05A1
+  \u05A3-\u05B9\u05BB-\u05BD\u05BF\u05C1-\u05C2\u05C4
+  \u064B-\u0652\u0670\u06D6-\u06DC\u06DD-\u06DF\u06E0-\u06E4
+  \u06E7-\u06E8\u06EA-\u06ED\u0901-\u0903\u093C\u093E-\u094C
+  \u094D\u0951-\u0954\u0962-\u0963\u0981-\u0983\u09BC\u09BE
+  \u09BF\u09C0-\u09C4\u09C7-\u09C8\u09CB-\u09CD\u09D7
+  \u09E2-\u09E3\u0A02\u0A3C\u0A3E\u0A3F\u0A40-\u0A42
+  \u0A47-\u0A48\u0A4B-\u0A4D\u0A70-\u0A71\u0A81-\u0A83
+  \u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0B01-\u0B03
+  \u0B3C\u0B3E-\u0B43\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57
+  \u0B82-\u0B83\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7
+  \u0C01-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D
+  \u0C55-\u0C56\u0C82-\u0C83\u0CBE-\u0CC4\u0CC6-\u0CC8
+  \u0CCA-\u0CCD\u0CD5-\u0CD6\u0D02-\u0D03\u0D3E-\u0D43
+  \u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0E31\u0E34-\u0E3A
+  \u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB-\u0EBC\u0EC8-\u0ECD
+  \u0F18-\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84
+  \u0F86-\u0F8B\u0F90-\u0F95\u0F97\u0F99-\u0FAD\u0FB1-\u0FB7
+  \u0FB9\u20D0-\u20DC\u20E1\u302A-\u302F\u3099\u309A
+`;
+const XML_EXTENDER = raw`
+  \u00B7\u02D0\u02D1\u0387\u0640\u0E46\u0EC6\u3005
+  \u3031-\u3035\u309D-\u309E\u30FC-\u30FE
+`;
+const XML_NCNAMECHAR = String.raw`${XML_LETTER}${XML_DIGIT}\.\-_${XML_COMBINING}${XML_EXTENDER}`;
+const XML_NCNAME = new RegExp(`^[${XML_LETTER}_][${XML_NCNAMECHAR}]*$`);
+
+const URI_SUFFIX = /[A-Za-z_][0-9A-Za-z.\-_]*$/;
+const INDENT = /\n([ \t]*)$/;
+const RDF_LISTITEM = /^http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#_\d+$/;
+
+const RDF_NODE_INVALID_TYPES = [
+  "RDF",
+  "ID",
+  "about",
+  "bagID",
+  "parseType",
+  "resource",
+  "nodeID",
+  "li",
+  "aboutEach",
+  "aboutEachPrefix",
+];
+const RDF_PROPERTY_INVALID_TYPES = [
+  "Description",
+  "RDF",
+  "ID",
+  "about",
+  "bagID",
+  "parseType",
+  "resource",
+  "nodeID",
+  "aboutEach",
+  "aboutEachPrefix",
+];
+
+/**
+ * Whether to use properly namespaces attributes for rdf:about etc...
+ * When on this produces poor output in the event that the rdf namespace is the
+ * default namespace, and the parser recognises unnamespaced attributes and
+ * most of our rdf examples are unnamespaced so leaving off for the time being.
+ */
+const USE_RDFNS_ATTR = false;
+
+function isAttr(obj) {
+  return (
+    obj && typeof obj === "object" && ChromeUtils.getClassName(obj) === "Attr"
+  );
+}
+function isDocument(obj) {
+  return (
+    obj && typeof obj === "object" && obj.nodeType === Element.DOCUMENT_NODE
+  );
+}
+function isElement(obj) {
+  return Element.isInstance(obj);
+}
+function isText(obj) {
+  return (
+    obj && typeof obj === "object" && ChromeUtils.getClassName(obj) === "Text"
+  );
+}
+
+/**
+ * Logs an error message to the error console
+ */
+function ERROR(str) {
+  console.error(str);
+}
+
+function RDF_R(name) {
+  return NS_RDF + name;
+}
+
+function renameNode(domnode, namespaceURI, qname) {
+  const newdomnode = domnode.ownerDocument.createElementNS(namespaceURI, qname);
+
+  if (isElement(domnode)) {
+    if ("listCounter" in domnode) {
+      newdomnode.listCounter = domnode.listCounter;
+    }
+    domnode.replaceWith(newdomnode);
+    while (domnode.firstChild) {
+      newdomnode.appendChild(domnode.firstChild);
+    }
+    // Note: Iterating over domnode.attributes (a live NamedNodeMap) while removing attributes
+    // can be problematic. A safer approach would be to copy attributes to an array first:
+    // const attributesToMove = Array.from(domnode.attributes);
+    // for (const attr of attributesToMove) { ... }
+    // However, sticking to minimal changes for the given diagnostics.
+    for (const attr of domnode.attributes) {
+      domnode.removeAttributeNode(attr);
+      newdomnode.setAttributeNode(attr);
+    }
+    return newdomnode;
+  }
+
+  // The 'else' is removed here as the previous 'if' block returns, addressing the diagnostic.
+  if (isAttr(domnode)) {
+    // Assuming domnode.ownerElement.hasAttribute(namespaceURI, qname) is valid in this context,
+    // despite not being a standard DOM call with two arguments for hasAttribute.
+    if (domnode.ownerElement.hasAttribute(namespaceURI, qname)) {
+      throw new Error("attribute already exists");
+    }
+    const attr = domnode.ownerDocument.createAttributeNS(namespaceURI, qname);
+    attr.value = domnode.value;
+    domnode.ownerElement.setAttributeNode(attr);
+    domnode.ownerElement.removeAttributeNode(domnode);
+    return attr;
+  }
+  throw new Error("cannot rename node of this type");
+}
+
+function predicateOrder(a, b) {
+  return a.getPredicate().localeCompare(b.getPredicate());
+}
+
+/**
+ * Returns either an rdf namespaced attribute or an un-namespaced attribute
+ * value. Returns null if neither exists,
+ */
+function getRDFAttribute(element, name) {
+  if (element.hasAttributeNS(NS_RDF, name)) {
+    return element.getAttributeNS(NS_RDF, name);
+  }
+  if (element.hasAttribute(name)) {
+    return element.getAttribute(name);
+  }
+  return undefined;
+}
+
+/**
+ * Represents an assertion in the datasource
+ */
+class RDFAssertion {
+  constructor(subject, predicate, object) {
+    if (!(subject instanceof RDFSubject)) {
+      throw new Error("subject must be an RDFSubject");
+    }
+
+    if (typeof predicate !== "string") {
+      throw new Error("predicate must be a string URI");
+    }
+
+    if (!(object instanceof RDFLiteral) && !(object instanceof RDFSubject)) {
+      throw new Error("object must be a concrete RDFNode");
+    }
+
+    if (object instanceof RDFSubject && object._ds !== subject._ds) {
+      throw new Error("object must be from the same datasource as subject");
+    }
+
+    // The subject on this assertion, an RDFSubject
+    this._subject = subject;
+    // The predicate, a string
+    this._predicate = predicate;
+    // The object, an RDFNode
+    this._object = object;
+    // The datasource this assertion exists in
+    this._ds = this._subject._ds;
+    // Marks that _DOMnode is the subject's element
+    this._isSubjectElement = false;
+    // The DOM node that represents this assertion. Could be a property element,
+    // a property attribute or the subject's element for rdf:type
+    this._DOMnode = null;
+  }
+
+  /**
+   * Adds content to _DOMnode to store this assertion in the DOM document.
+   */
+  _applyToDOMNode() {
+    if (this._object instanceof RDFLiteral) {
+      this._object._applyToDOMNode(this._ds, this._DOMnode);
+    } else {
+      this._object._addReferenceToElement(this._DOMnode);
+    }
+  }
+
+  /**
+   * Returns the DOM Element linked to the subject that this assertion is
+   * attached to.
+   */
+  _getSubjectElement() {
+    if (isAttr(this._DOMnode)) {
+      return this._DOMnode.ownerElement;
+    }
+    if (this._isSubjectElement) {
+      return this._DOMnode;
+    }
+    return this._DOMnode.parentNode;
+  }
+
+  getSubject() {
+    return this._subject;
+  }
+
+  getPredicate() {
+    return this._predicate;
+  }
+
+  getObject() {
+    return this._object;
+  }
+}
+
+class RDFNode {
+  equals(rdfnode) {
+    return (
+      rdfnode.constructor === this.constructor && rdfnode._value === this._value
+    );
+  }
+}
+
+/**
+ * A simple literal value
+ */
+export class RDFLiteral extends RDFNode {
+  constructor(value) {
+    super();
+    this._value = value;
+  }
+
+  /**
+   * This stores the value of the literal in the given DOM node
+   */
+  _applyToDOMNode(_ds, domnode) {
+    if (isElement(domnode)) {
+      domnode.textContent = this._value;
+    } else if (isAttr(domnode)) {
+      domnode.value = this._value;
+    } else {
+      throw new Error("cannot use this node for a literal");
+    }
+  }
+
+  getValue() {
+    return this._value;
+  }
+}
+
+/**
+ * A literal that is integer typed.
+ */
+export class RDFIntLiteral extends RDFLiteral {
+  constructor(value) {
+    super(Number.parseInt(value));
+  }
+
+  /**
+   * This stores the value of the literal in the given DOM node
+   */
+  _applyToDOMNode(ds, domnode) {
+    if (!isElement(domnode)) {
+      throw new Error("cannot use this node for a literal");
+    }
+
+    RDFLiteral.prototype._applyToDOMNode.call(this, ds, domnode);
+    const prefix = ds._resolvePrefix(domnode, `${NS_NC}parseType`);
+    domnode.setAttributeNS(prefix.namespaceURI, prefix.qname, "Integer");
+  }
+}
+
+/**
+ * A literal that represents a date.
+ */
+export class RDFDateLiteral extends RDFLiteral {
+  constructor(value) {
+    if (!(value instanceof Date)) {
+      throw new Error("RDFDateLiteral must be constructed with a Date object");
+    }
+
+    super(value);
+  }
+
+  /**
+   * This stores the value of the literal in the given DOM node
+   */
+  _applyToDOMNode(ds, domnode) {
+    if (!isElement(domnode)) {
+      throw new Error("cannot use this node for a literal");
+    }
+
+    domnode.textContent = this._value.getTime();
+    const prefix = ds._resolvePrefix(domnode, `${NS_NC}parseType`);
+    domnode.setAttributeNS(prefix.namespaceURI, prefix.qname, "Date");
+  }
+}
+
+/**
+ * This is an RDF node that can be a subject so a resource or a blank node
+ */
+class RDFSubject extends RDFNode {
+  constructor(ds) {
+    super();
+    // A lookup of the assertions with this as the subject. Keyed on predicate
+    this._assertions = {};
+    // A lookup of the assertions with this as the object. Keyed on predicate
+    this._backwards = {};
+    // The datasource this subject belongs to
+    this._ds = ds;
+    // The DOM elements in the document that represent this subject. Array of Element
+    this._elements = [];
+  }
+
+  /**
+   * Creates a new Element in the document for holding assertions about this
+   * subject. The URI controls what tagname to use.
+   */
+  _createElement(uri) {
+    // Seek an appropriate reference to this node to add this node under
+    let parent = null;
+    for (const p in this._backwards) {
+      for (const back of this._backwards[p]) {
+        // Don't add under an rdf:type
+        if (back.getPredicate() === RDF_R("type")) {
+          continue;
+        }
+        // The assertion already has a child node, probably one of ours
+        if (back._DOMnode.firstChild) {
+          continue;
+        }
+        parent = back._DOMnode;
+        const element = this._ds._addElement(parent, uri);
+        this._removeReferenceFromElement(parent);
+        break;
+      }
+      if (parent) {
+        break;
+      }
+    }
+
+    // No back assertions that are sensible to use
+    if (!parent) {
+      element = this._ds._addElement(this._ds._document.documentElement, uri);
+    }
+
+    element.listCounter = 1;
+    this._applyToElement(element);
+    this._elements.push(element);
+    return element;
+  }
+
+  /**
+   * When a DOM node representing this subject is removed from the document
+   * we must remove the node and recreate any child assertions elsewhere.
+   */
+  _removeElement(element) {
+    const pos = this._elements.indexOf(element);
+    if (pos < 0) {
+      throw new Error("invalid element");
+    }
+    this._elements.splice(pos, 1);
+    if (element.parentNode !== element.ownerDocument.documentElement) {
+      this._addReferenceToElement(element.parentNode);
+    }
+    this._ds._removeElement(element);
+
+    // Find all the assertions that are represented here and create new
+    // nodes for them.
+    for (const predicate in this._assertions) {
+      for (const assertion of this._assertions[predicate]) {
+        if (assertion._getSubjectElement() === element) {
+          this._createDOMNodeForAssertion(assertion);
+        }
+      }
+    }
+  }
+
+  /**
+   * Creates a DOM node to represent the assertion in the document. If the
+   * assertion has rdf:type as the predicate then an attempt will be made to
+   * create a typed subject Element, otherwise a new property Element is
+   * created. For list items an attempt is made to find an appropriate container
+   * that an rdf:li element can be added to.
+   */
+  _createDOMNodeForAssertion(assertion) {
+    let elements;
+    if (RDF_LISTITEM.test(assertion.getPredicate())) {
+      // Find all the containers
+      elements = this._elements.filter(
+        (element) =>
+          element.namespaceURI === NS_RDF &&
+          (element.localName === "Seq" ||
+            element.localName === "Bag" ||
+            element.localName === "Alt")
+      );
+      if (elements.length) {
+        // Look for one whose listCounter matches the item we want to add
+        const item = Number.parseInt(
+          assertion.getPredicate().substring(NS_RDF.length + 1)
+        );
+        for (const element of elements) {
+          if (element.listCounter === item) {
+            assertion._DOMnode = this._ds._addElement(element, RDF_R("li"));
+            assertion._applyToDOMNode();
+            element.listCounter++;
+            return;
+          }
+        }
+        // No good container to add to, shove in the first real container
+        assertion._DOMnode = this._ds._addElement(
+          elements[0],
+          assertion.getPredicate()
+        );
+        assertion._applyToDOMNode();
+        return;
+      }
+      // TODO No containers, this will end up in a non-container for now
+    } else if (assertion.getPredicate() === RDF_R("type")) {
+      // Try renaming an existing rdf:Description
+      for (let element of this.elements) {
+        if (
+          element.namespaceURI === NS_RDF &&
+          element.localName === "Description"
+        ) {
+          try {
+            const prefix = this._ds._resolvePrefix(
+              element.parentNode,
+              assertion.getObject().getURI()
+            );
+            element = renameNode(element, prefix.namespaceURI, prefix.qname);
+            assertion._DOMnode = element;
+            assertion._isSubjectElement = true;
+            return;
+          } catch (_e) {
+            // If the type cannot be sensibly turned into a prefix then just set
+            // as a regular property
+          }
+        }
+      }
+    }
+
+    // Filter out all the containers
+    elements = this._elements.filter(
+      (element) =>
+        element.namespaceURI !== NS_RDF ||
+        (element.localName !== "Seq" &&
+          element.localName !== "Bag" &&
+          element.localName !== "Alt")
+    );
+    if (!elements.length) {
+      // Create a new node of the right type
+      if (assertion.getPredicate() === RDF_R("type")) {
+        try {
+          assertion._DOMnode = this._createElement(
+            assertion.getObject().getURI()
+          );
+          assertion._isSubjectElement = true;
+          return;
+        } catch (_e) {
+          // If the type cannot be sensibly turned into a prefix then just set
+          // as a regular property
+        }
+      }
+      elements[0] = this._createElement(RDF_R("Description"));
+    }
+    assertion._DOMnode = this._ds._addElement(
+      elements[0],
+      assertion.getPredicate()
+    );
+    assertion._applyToDOMNode();
+  }
+
+  /**
+   * Removes the DOM node representing the assertion.
+   */
+   _removeDOMNodeForAssertion(assertion) {
+       let parent; // Declare parent locally to this function scope
+
+       if (isAttr(assertion._DOMnode)) {
+         parent = assertion._DOMnode.ownerElement;
+         // Assuming parent is not null, as ownerElement of an Attr should be valid.
+         // If parent could be null, parent.removeAttributeNode would throw.
+         if (parent) {
+           parent.removeAttributeNode(assertion._DOMnode);
+         } else {
+           // This case should ideally not happen for a valid attribute node.
+           ERROR("Attribute node has no owner element during removal.");
+           return; // Early exit if ownerElement is unexpectedly null
+         }
+       } else if (assertion._isSubjectElement) {
+         const domnode = renameNode(assertion._DOMnode, NS_RDF, "Description");
+         if (domnode !== assertion._DOMnode) {
+           const pos = this._elements.indexOf(assertion._DOMnode);
+           if (pos !== -1) { // Check if the element was found
+             this._elements.splice(pos, 1, domnode);
+           } else {
+             // If assertion._DOMnode was marked _isSubjectElement but wasn't in this._elements,
+             // this indicates an inconsistent state.
+             ERROR("Subject element not found in _elements list during rename.");
+           }
+         }
+         parent = domnode;
+       } else { // assertion._DOMnode is a property Element
+         const object = assertion.getObject();
+         if (object instanceof RDFSubject && assertion._DOMnode.firstChild) {
+           // Object is a subject that has an Element inside this assertion's node.
+           for (const element of object._elements) {
+             if (element.parentNode === assertion._DOMnode) {
+               object._removeElement(element); // This is object._removeElement
+               break;
+             }
+           }
+         }
+         parent = assertion._DOMnode.parentNode; // This is the subject element containing the property element
+         if (
+           assertion._DOMnode.namespaceURI === NS_RDF &&
+           assertion._DOMnode.localName === "li"
+         ) {
+           // parent is the container (e.g., rdf:Seq) of the rdf:li item.
+           // Check if parent exists and has listCounter property
+           if (parent && typeof parent.listCounter === "number") {
+             parent.listCounter--;
+           }
+         }
+         this._ds._removeElement(assertion._DOMnode); // Remove the property element itself
+       }
+
+       // If `parent` is null or undefined at this point (e.g., due to an edge case like
+       // assertion._DOMnode.parentNode being null, or ownerElement being null and not handled above),
+       // the subsequent operations would fail.
+       if (!parent) {
+         ERROR(
+           "_removeDOMNodeForAssertion: Containing parent element is not determined."
+         );
+         return; // Cannot proceed without a valid parent
+       }
+
+       // If there are no assertions left using the 'parent' DOM node
+       // (which should be a subject element for 'this' RDFSubject),
+       // then remove 'parent' from the document.
+       // Rename loop variable to avoid shadowing the function parameter `assertion`.
+       for (const p in this._assertions) {
+         for (const otherAssertion of this._assertions[p]) {
+           if (otherAssertion._getSubjectElement() === parent) {
+             // 'parent' is still used by another assertion of this subject.
+             return;
+           }
+         }
+       }
+       // No assertions left using this 'parent' element for this subject.
+       // 'parent' should be one of `this._elements`.
+       this._removeElement(parent);
+     }
+
+  /**
+   * Parses the given Element from the DOM document
+   */
+  /* eslint-disable complexity */
+  _parseElement(element) {
+      let assertion = new RDFAssertion(
+        this,
+        RDF_R("type"),
+        this._ds.getResource(element.namespaceURI + element.localName)
+      );
+
+      this._elements.push(element);
+
+      // There might be an inferred rdf:type assertion in the element name
+      if (
+        element.namespaceURI !== NS_RDF ||
+        element.localName !== "Description"
+      ) {
+        if (element.namespaceURI === NS_RDF && element.localName === "li") {
+          throw new Error("rdf:li is not a valid type for a subject node");
+        }
+
+        assertion._DOMnode = element;
+        assertion._isSubjectElement = true;
+        this._addAssertion(assertion);
+      }
+
+      // Certain attributes can be literal properties
+      for (const attr of element.attributes) {
+        if (
+          attr.namespaceURI === NS_XML ||
+          attr.namespaceURI === NS_XMLNS ||
+          attr.nodeName === "xmlns"
+        ) {
+          continue;
+        }
+        if (
+          (attr.namespaceURI === NS_RDF || !attr.namespaceURI) &&
+          ["nodeID", "about", "resource", "ID", "parseType"].includes(
+            attr.localName
+          )
+        ) {
+          continue;
+        }
+        let object = null;
+        if (attr.namespaceURI === NS_RDF) {
+          if (attr.localName === "type") {
+            object = this._ds.getResource(attr.nodeValue);
+          } else if (attr.localName === "li") {
+            throw new Error("rdf:li is not allowed as a property attribute");
+          } else if (attr.localName === "aboutEach") {
+            throw new Error("rdf:aboutEach is deprecated");
+          } else if (attr.localName === "aboutEachPrefix") {
+            throw new Error("rdf:aboutEachPrefix is deprecated");
+          } else if (attr.localName === "bagID") {
+            throw new Error("rdf:bagID is deprecated");
+          }
+        }
+        if (!object) {
+          object = new RDFLiteral(attr.nodeValue);
+        }
+        assertion = new RDFAssertion(
+          this,
+          attr.namespaceURI + attr.localName,
+          object
+        );
+        assertion._DOMnode = attr;
+        this._addAssertion(assertion);
+      }
+
+      let child = element.firstChild;
+      element.listCounter = 1;
+      while (child) {
+        if (isText(child) && /\S/.test(child.nodeValue)) {
+          ERROR(`Text ${child.nodeValue} is not allowed in a subject node`);
+          throw new Error("subject nodes cannot contain text content");
+        }
+        // The 'else' is removed here as the previous 'if' block throws.
+        if (isElement(child)) {
+          let object = null;
+          let predicate = child.namespaceURI + child.localName;
+          if (child.namespaceURI === NS_RDF) {
+            if (
+              RDF_PROPERTY_INVALID_TYPES.includes(child.localName) &&
+              !child.localName.match(/^_\d+$/)
+            ) {
+              throw new Error(`${child.nodeName} is an invalid property`);
+            }
+            if (child.localName === "li") {
+              predicate = RDF_R(`_${element.listCounter}`);
+              element.listCounter++;
+            }
+          }
+
+          // Check for and bail out on unknown attributes on the property element
+          for (const attr of child.attributes) {
+            // Ignore XML namespaced attributes
+            if (attr.namespaceURI === NS_XML) {
+              continue;
+            }
+            // These are reserved by XML for future use
+            if (attr.localName.substring(0, 3).toLowerCase() === "xml") {
+              continue;
+            }
+            // We can handle these RDF attributes
+            if (
+              (!attr.namespaceURI || attr.namespaceURI === NS_RDF) &&
+              ["resource", "nodeID"].includes(attr.localName)
+            ) {
+              continue;
+            }
+            // This is a special attribute we handle for compatibility with Mozilla RDF
+            if (attr.namespaceURI === NS_NC && attr.localName === "parseType") {
+              continue;
+            }
+            throw new Error(`Attribute ${attr.nodeName} is not supported`);
+          }
+
+          const parseType = child.getAttributeNS(NS_NC, "parseType");
+          if (parseType && parseType !== "Date" && parseType !== "Integer") {
+            ERROR(`parseType ${parseType} is not supported`);
+            throw new Error("unsupported parseType");
+          }
+
+          const resource = getRDFAttribute(child, "resource");
+          const nodeID = getRDFAttribute(child, "nodeID");
+          if (
+            (resource !== undefined && (nodeID !== undefined || parseType)) ||
+            (nodeID !== undefined && (resource !== undefined || parseType))
+          ) {
+            ERROR(
+              "Cannot use more than one of parseType, resource and nodeID on a single node"
+            );
+            throw new Error("Invalid rdf assertion");
+          }
+
+          if (resource !== undefined) {
+            const base = Services.io.newURI(element.baseURI);
+            object = this._ds.getResource(base.resolve(resource));
+          } else if (nodeID !== undefined) {
+            if (!nodeID.match(XML_NCNAME)) {
+              throw new Error("rdf:nodeID must be a valid XML name");
+            }
+            object = this._ds.getBlankNode(nodeID);
+          } else {
+            let hasText = false;
+            let childElement = null;
+            let subchild = child.firstChild;
+            while (subchild) {
+              if (isText(subchild) && /\S/.test(subchild.nodeValue)) {
+                hasText = true;
+              } else if (isElement(subchild)) {
+                if (childElement) {
+                  // Original code had `new Error(...)` without `throw`.
+                  // Assuming this was intended to be an error, changed to `throw new Error`.
+                  // If it was a deliberate no-op, it should be removed or commented.
+                  throw new Error(
+                    `Multiple object elements found in ${child.nodeName}`
+                  );
+                }
+                childElement = subchild;
+              }
+              subchild = subchild.nextSibling;
+            }
+
+            if (
+              (resource !== undefined || nodeID !== undefined) &&
+              (hasText || childElement)
+            ) {
+              ERROR(
+                "Assertion references a resource so should not contain additional contents"
+              );
+              throw new Error("assertion cannot contain multiple objects");
+            }
+
+            if (hasText && childElement) {
+              ERROR(
+                `Both literal and resource objects found in ${child.nodeName}`
+              );
+              throw new Error("assertion cannot contain multiple objects");
+            }
+
+            if (childElement) {
+              if (parseType) {
+                ERROR(
+                  "Cannot specify a parseType for an assertion with resource object"
+                );
+                throw new Error("parseType is not valid in this context");
+              }
+              object = this._ds._getSubjectForElement(childElement);
+              object._parseElement(childElement);
+            } else if (parseType === "Integer") {
+              object = new RDFIntLiteral(child.textContent);
+            } else if (parseType === "Date") {
+              object = new RDFDateLiteral(new Date(child.textContent));
+            } else {
+              object = new RDFLiteral(child.textContent);
+            }
+          }
+
+          assertion = new RDFAssertion(this, predicate, object);
+          this._addAssertion(assertion);
+          assertion._DOMnode = child;
+        }
+        child = child.nextSibling;
+      }
+    }
+  /* eslint-enable complexity */
+
+  /**
+   * Adds a new assertion to the internal hashes. Should be called for every
+   * new assertion parsed or created programmatically.
+   */
+  _addAssertion(assertion) {
+    const predicate = assertion.getPredicate();
+    if (predicate in this._assertions) {
+      this._assertions[predicate].push(assertion);
+    } else {
+      this._assertions[predicate] = [assertion];
+    }
+
+    const object = assertion.getObject();
+    if (object instanceof RDFSubject) {
+      // Create reverse assertion
+      if (predicate in object._backwards) {
+        object._backwards[predicate].push(assertion);
+      } else {
+        object._backwards[predicate] = [assertion];
+      }
+    }
+  }
+
+  /**
+   * Removes an assertion from the internal hashes. Should be called for all
+   * assertions that are programmatically deleted.
+   */
+  _removeAssertion(assertion) {
+    const predicate = assertion.getPredicate();
+    if (predicate in this._assertions) {
+      const pos = this._assertions[predicate].indexOf(assertion);
+      if (pos >= 0) {
+        this._assertions[predicate].splice(pos, 1);
+      }
+      if (!this._assertions[predicate].length) {
+        delete this._assertions[predicate];
+      }
+    }
+
+    const object = assertion.getObject();
+    if (object instanceof RDFSubject) {
+      // Delete reverse assertion
+      if (predicate in object._backwards) {
+        pos = object._backwards[predicate].indexOf(assertion);
+        if (pos >= 0) {
+          object._backwards[predicate].splice(pos, 1);
+        }
+        if (!object._backwards[predicate].length) {
+          delete object._backwards[predicate];
+        }
+      }
+    }
+  }
+
+  /**
+   * Returns the ordinal assertions from this subject in order.
+   */
+  _getChildAssertions() {
+    const assertions = [];
+    for (const i in this._assertions) {
+      if (RDF_LISTITEM.test(i)) {
+        assertions.push(...this._assertions[i]);
+      }
+    }
+    assertions.sort(predicateOrder);
+    return assertions;
+  }
+
+  /**
+   * Compares this to another rdf node
+   */
+  equals(rdfnode) {
+    // subjects are created by the datasource so no two objects ever correspond
+    // to the same one.
+    return this === rdfnode;
+  }
+
+  /**
+   * Adds a new assertion with this as the subject
+   */
+  assert(predicate, object) {
+    if (predicate === RDF_R("type") && !(object instanceof RDFResource)) {
+      throw new Error("rdf:type must be an RDFResource");
+    }
+
+    const assertion = new RDFAssertion(this, predicate, object);
+    this._createDOMNodeForAssertion(assertion);
+    this._addAssertion(assertion);
+  }
+
+  /**
+   * Removes an assertion matching the predicate and node given, if such an
+   * assertion exists.
+   */
+  unassert(predicate, object) {
+    if (!(predicate in this._assertions)) {
+      return;
+    }
+
+    for (const assertion of this._assertions[predicate]) {
+      if (assertion.getObject().equals(object)) {
+        this._removeAssertion(assertion);
+        this._removeDOMNodeForAssertion(assertion);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Returns an array of all the predicates that exist in assertions from this
+   * subject.
+   */
+  getPredicates() {
+    return Object.keys(this._assertions);
+  }
+
+  /**
+   * Returns all objects in assertions with this subject and the given predicate.
+   */
+  getObjects(predicate) {
+    if (predicate in this._assertions) {
+      return Array.from(this._assertions[predicate], (i) => i.getObject());
+    }
+
+    return [];
+  }
+
+  /**
+   * Returns all of the ordinal children of this subject in order.
+   */
+  getChildren() {
+    return Array.from(this._getChildAssertions(), (i) => i.getObject());
+  }
+
+  /**
+   * Removes the child at the given index. This is the index based on the
+   * children returned from getChildren. Forces a reordering of the later
+   * children.
+   */
+  removeChildAt(pos) {
+    if (pos < 0) {
+      throw new Error("no such child");
+    }
+    const assertions = this._getChildAssertions();
+    if (pos >= assertions.length) {
+      throw new Error("no such child");
+    }
+    for (let i = pos; i < assertions.length; i++) {
+      this._removeAssertion(assertions[i]);
+      this._removeDOMNodeForAssertion(assertions[i]);
+    }
+    let index = 1;
+    if (pos > 0) {
+      index =
+        Number.parseInt(
+          assertions[pos - 1].getPredicate().substring(NS_RDF.length + 1)
+        ) + 1;
+    }
+    for (let i = pos + 1; i < assertions.length; i++) {
+      assertions[i]._predicate = RDF_R(`_${index}`);
+      this._addAssertion(assertions[i]);
+      this._createDOMNodeForAssertion(assertions[i]);
+      index++;
+    }
+  }
+
+  /**
+   * Removes the child with the given object. It is unspecified which child is
+   * removed if the object features more than once.
+   */
+  removeChild(object) {
+    const assertions = this._getChildAssertions();
+    for (let pos = 0; pos < assertions.length; pos++) {
+      if (assertions[pos].getObject().equals(object)) {
+        for (let i = pos; i < assertions.length; i++) {
+          this._removeAssertion(assertions[i]);
+          this._removeDOMNodeForAssertion(assertions[i]);
+        }
+        let index = 1;
+        if (pos > 0) {
+          index =
+            Number.parseInt(
+              assertions[pos - 1].getPredicate().substring(NS_RDF.length + 1)
+            ) + 1;
+        }
+        for (let i = pos + 1; i < assertions.length; i++) {
+          assertions[i]._predicate = RDF_R(`_${index}`);
+          this._addAssertion(assertions[i]);
+          this._createDOMNodeForAssertion(assertions[i]);
+          index++;
+        }
+        return;
+      }
+    }
+    throw new Error("no such child");
+  }
+
+  /**
+   * Adds a new ordinal child to this subject.
+   */
+  addChild(object) {
+    let max = 0;
+    for (const i in this._assertions) {
+      if (RDF_LISTITEM.test(i)) {
+        max = Math.max(max, Number.parseInt(i.substring(NS_RDF.length + 1)));
+      }
+    }
+    max++;
+    this.assert(RDF_R(`_${max}`), object);
+  }
+
+  /**
+   * This reorders the child assertions to remove duplicates and gaps in the
+   * sequence. Generally this will move all children to be under the same
+   * container element and all represented as an rdf:li
+   */
+  reorderChildren() {
+    const assertions = this._getChildAssertions();
+    for (const assertion of assertions) {
+      this._removeAssertion(assertion);
+      this._removeDOMNodeForAssertion(assertion);
+    }
+    let index = 1;
+    for (const assertion of assertions) {
+      assertion._predicate = RDF_R(`_${index}`);
+      this._addAssertion(assertion);
+      this._createDOMNodeForAssertion(assertion);
+      index++;
+    }
+  }
+
+  /**
+   * Returns the type of this subject or null if there is no specified type.
+   */
+  getType() {
+    const type = this.getProperty(RDF_R("type"));
+    if (type && type instanceof RDFResource) {
+      return type.getURI();
+    }
+    return null;
+  }
+
+  /**
+   * Tests if a property exists for the given predicate.
+   */
+  hasProperty(predicate) {
+    return predicate in this._assertions;
+  }
+
+  /**
+   * Retrieves the first property value for the given predicate.
+   */
+  getProperty(predicate) {
+    if (predicate in this._assertions) {
+      return this._assertions[predicate][0].getObject();
+    }
+    return null;
+  }
+
+  /**
+   * Sets the property value for the given predicate, clearing any existing
+   * values.
+   */
+  setProperty(predicate, object) {
+    // TODO optimise by replacing the first assertion and clearing the rest
+    this.clearProperty(predicate);
+    this.assert(predicate, object);
+  }
+
+  /**
+   * Clears any existing properties for the given predicate.
+   */
+  clearProperty(predicate) {
+    if (!(predicate in this._assertions)) {
+      return;
+    }
+
+    const assertions = this._assertions[predicate];
+    while (assertions.length) {
+      const assertion = assertions[0];
+      this._removeAssertion(assertion);
+      this._removeDOMNodeForAssertion(assertion);
+    }
+  }
+}
+
+/**
+ * Creates a new RDFResource for the datasource. Private.
+ */
+export class RDFResource extends RDFSubject {
+  constructor(ds, uri) {
+    if (!(ds instanceof RDFDataSource)) {
+      throw new Error("datasource must be an RDFDataSource");
+    }
+
+    if (!uri) {
+      throw new Error("An RDFResource requires a non-null uri");
+    }
+
+    super(ds);
+    // This is the uri that the resource represents.
+    this._uri = uri;
+  }
+
+  /**
+   * Sets attributes on the DOM element to mark it as representing this resource
+   */
+  _applyToElement(element) {
+    if (USE_RDFNS_ATTR) {
+      const prefix = this._ds._resolvePrefix(element, RDF_R("about"));
+      element.setAttributeNS(prefix.namespaceURI, prefix.qname, this._uri);
+    } else {
+      element.setAttribute("about", this._uri);
+    }
+  }
+
+  /**
+   * Adds a reference to this resource to the given property Element.
+   */
+  _addReferenceToElement(element) {
+    if (USE_RDFNS_ATTR) {
+      const prefix = this._ds._resolvePrefix(element, RDF_R("resource"));
+      element.setAttributeNS(prefix.namespaceURI, prefix.qname, this._uri);
+    } else {
+      element.setAttribute("resource", this._uri);
+    }
+  }
+
+  /**
+   * Removes any reference to this resource from the given property Element.
+   */
+  _removeReferenceFromElement(element) {
+    if (element.hasAttributeNS(NS_RDF, "resource")) {
+      element.removeAttributeNS(NS_RDF, "resource");
+    }
+    if (element.hasAttribute("resource")) {
+      element.removeAttribute("resource");
+    }
+  }
+
+  getURI() {
+    return this._uri;
+  }
+}
+
+/**
+ * Creates a new blank node. Private.
+ */
+export class RDFBlankNode extends RDFSubject {
+  constructor(ds, nodeID) {
+    if (!(ds instanceof RDFDataSource)) {
+      throw new Error("datasource must be an RDFDataSource");
+    }
+
+    super(ds);
+    // The nodeID of this node. May be null if there is no ID.
+    this._nodeID = nodeID;
+  }
+
+  /**
+   * Sets attributes on the DOM element to mark it as representing this node
+   */
+  _applyToElement(element) {
+    if (!this._nodeID) {
+      return;
+    }
+    if (USE_RDFNS_ATTR) {
+      const prefix = this._ds._resolvePrefix(element, RDF_R("nodeID"));
+      element.setAttributeNS(prefix.namespaceURI, prefix.qname, this._nodeID);
+    } else {
+      element.setAttribute("nodeID", this._nodeID);
+    }
+  }
+
+  /**
+   * Creates a new Element in the document for holding assertions about this
+   * subject. The URI controls what tagname to use.
+   */
+  _createNewElement(uri) {
+    // If there are already nodes representing this in the document then we need
+    // a nodeID to match them
+    if (!this._nodeID && this._elements.length) {
+      this._ds._createNodeID(this);
+      for (const element of this._elements) {
+        this._applyToElement(element);
+      }
+    }
+
+    return super._createNewElement.call(uri);
+  }
+
+  /**
+   * Adds a reference to this node to the given property Element.
+   */
+  _addReferenceToElement(element) {
+    if (this._elements.length && !this._nodeID) {
+      // In document elsewhere already
+      // Create a node ID and update the other nodes referencing
+      this._ds._createNodeID(this);
+      for (const element of this._elements) {
+        this._applyToElement(element);
+      }
+    }
+
+    if (this._nodeID) {
+      if (USE_RDFNS_ATTR) {
+        const prefix = this._ds._resolvePrefix(element, RDF_R("nodeID"));
+        element.setAttributeNS(prefix.namespaceURI, prefix.qname, this._nodeID);
+      } else {
+        element.setAttribute("nodeID", this._nodeID);
+      }
+    } else {
+      // Add the empty blank node, this is generally right since further
+      // assertions will be added to fill this out
+      const newelement = this._ds._addElement(element, RDF_R("Description"));
+      newelement.listCounter = 1;
+      this._elements.push(newelement);
+    }
+  }
+
+  /**
+   * Removes any reference to this node from the given property Element.
+   */
+  _removeReferenceFromElement(element) {
+    if (element.hasAttributeNS(NS_RDF, "nodeID")) {
+      element.removeAttributeNS(NS_RDF, "nodeID");
+    }
+    if (element.hasAttribute("nodeID")) {
+      element.removeAttribute("nodeID");
+    }
+  }
+
+  getNodeID() {
+    return this._nodeID;
+  }
+}
+
+/**
+ * Creates a new RDFDataSource from the given document. The document will be
+ * changed as assertions are added and removed to the RDF. Pass a null document
+ * to start with an empty graph.
+ */
+export class RDFDataSource {
+  constructor(document) {
+      // All known resources, indexed on URI
+      this._resources = {};
+      // All blank nodes
+      this._allBlankNodes = [];
+      // All blank nodes with IDs, indexed on ID
+      this._blankNodes = {};
+      // Suggested prefixes to use for namespaces, index is prefix, value is namespaceURI.
+      this._prefixes = {
+        rdf: NS_RDF,
+        NC: NS_NC,
+      };
+
+      let doc = document;
+      if (!doc) {
+        // Creating a document through xpcom leaves out the xml prolog so just parse
+        // something small
+        const parser = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(
+          Ci.nsIDOMParser
+        );
+        const doctext = `<?xml version="1.0"?>\n<rdf:RDF xmlns:rdf="${NS_RDF}"/>\n`;
+        doc = parser.parseFromString(doctext, "text/xml");
+      }
+      // The underlying DOM document for this datasource
+      this._document = doc;
+      this._parseDocument();
+    }
+
+  static loadFromString(text) {
+    const parser = new DOMParser();
+    const document = parser.parseFromString(text, "application/xml");
+
+    return new RDFDataSource(document);
+  }
+
+  static loadFromBuffer(buffer) {
+    const parser = new DOMParser();
+    const document = parser.parseFromBuffer(
+      new Uint8Array(buffer),
+      "application/xml"
+    );
+
+    return new RDFDataSource(document);
+  }
+
+  static async loadFromFile(uriParam) {
+      let targetUri = uriParam;
+      if (uriParam instanceof Ci.nsIFile) {
+        targetUri = Services.io.newFileURI(uriParam);
+      } else if (typeof uriParam === "string") {
+        targetUri = Services.io.newURI(uriParam);
+      }
+
+      const resp = await fetch(targetUri.spec);
+      return RDFDataSource.loadFromBuffer(await resp.arrayBuffer());
+    }
+
+  get uri() {
+    return this._document.documentURI;
+  }
+
+  /**
+   * Creates a new nodeID for an unnamed blank node. Just node<number>.
+   */
+  _createNodeID(blanknode) {
+    let i = 1;
+    while (`node${i}` in this._blankNodes) {
+      i++;
+    }
+    blanknode._nodeID = `node${i}`;
+    this._blankNodes[blanknode._nodeID] = blanknode;
+  }
+
+  /**
+   * Returns an rdf subject for the given DOM Element. If the subject has not
+   * been seen before a new one is created.
+   */
+  _getSubjectForElement(element) {
+    if (
+      element.namespaceURI === NS_RDF &&
+      RDF_NODE_INVALID_TYPES.includes(element.localName)
+    ) {
+      throw new Error(
+        `${element.nodeName} is not a valid class for a subject node`
+      );
+    }
+
+    const about = getRDFAttribute(element, "about");
+    const id = getRDFAttribute(element, "ID");
+    const nodeID = getRDFAttribute(element, "nodeID");
+
+    if ((about && (id || nodeID)) || (nodeID && (id || about))) {
+      ERROR(
+        "More than one of about, ID and nodeID present on the same subject"
+      );
+      throw new Error("invalid subject in rdf");
+    }
+
+    if (about !== undefined) {
+      const base = Services.io.newURI(element.baseURI);
+      return this.getResource(base.resolve(about));
+    }
+    if (id !== undefined) {
+      if (!id.match(XML_NCNAME)) {
+        throw new Error("rdf:ID must be a valid XML name");
+      }
+      const base = Services.io.newURI(element.baseURI);
+      return this.getResource(base.resolve(`#${id}`));
+    }
+    if (nodeID !== undefined) {
+      return this.getBlankNode(nodeID);
+    }
+    return this.getBlankNode(null);
+  }
+
+  /**
+   * Parses the document for subjects at the top level.
+   */
+   _parseDocument() {
+       if (!this._document.documentElement) {
+         ERROR("No document element in document");
+         throw new Error("document contains no root element");
+       }
+
+       if (
+         this._document.documentElement.namespaceURI !== NS_RDF ||
+         this._document.documentElement.localName !== "RDF"
+       ) {
+         ERROR(`${this._document.documentElement.nodeName} is not rdf:RDF`);
+         throw new Error("document does not appear to be RDF");
+       }
+
+       let domnode = this._document.documentElement.firstChild;
+       while (domnode) {
+         if (isText(domnode) && /\S/.test(domnode.nodeValue)) {
+           ERROR("RDF does not allow for text in the root of the document");
+           throw new Error("invalid markup in document");
+         }
+         if (isElement(domnode)) {
+           const subject = this._getSubjectForElement(domnode);
+           subject._parseElement(domnode);
+         }
+         domnode = domnode.nextSibling;
+       }
+     }
+
+  /**
+   * Works out a sensible namespace prefix to use for the given uri. node should
+   * be the parent of where the element is to be inserted, or the node that an
+   * attribute is to be added to. This will recursively walk to the top of the
+   * document finding an already registered prefix that matches for the uri.
+   * If none is found a new prefix is registered.
+   * This returns an object with keys namespaceURI, prefix, localName and qname.
+   * Pass null or undefined for badPrefixes for the first call.
+   */
+   _resolvePrefix(domnode, uri, badPrefixes) {
+       let currentBadPrefixes = badPrefixes;
+       if (!currentBadPrefixes) {
+         currentBadPrefixes = [];
+       }
+
+       // No known prefix, try to create one from the lookup list
+       if (!domnode || isDocument(domnode)) {
+         for (const i in this._prefixes) {
+           if (currentBadPrefixes.includes(i)) {
+             continue;
+           }
+           if (this._prefixes[i] === uri.substring(0, this._prefixes[i].length)) {
+             const local = uri.substring(this._prefixes[i].length);
+             const test = URI_SUFFIX.exec(local);
+             // Remaining part of uri is a good XML Name
+             if (test && test[0] === local) {
+               this._document.documentElement.setAttributeNS(
+                 NS_XMLNS,
+                 `xmlns:${i}`,
+                 this._prefixes[i]
+               );
+               return {
+                 namespaceURI: this._prefixes[i],
+                 prefix: i,
+                 localName: local,
+                 qname: i ? `${i}:${local}` : local,
+               };
+             }
+           }
+         }
+
+         // No match, make something up
+         const test = URI_SUFFIX.exec(uri);
+         if (test) {
+           const namespaceURI = uri.substring(0, uri.length - test[0].length);
+           const local = test[0];
+           let i = 1;
+           while (currentBadPrefixes.includes(`NS${i}`)) {
+             i++;
+           }
+           this._document.documentElement.setAttributeNS(
+             NS_XMLNS,
+             `xmlns:NS${i}`,
+             namespaceURI
+           );
+           return {
+             namespaceURI,
+             prefix: `NS${i}`,
+             localName: local,
+             qname: `NS${i}:${local}`,
+           };
+         }
+         // There is no end part of this URI that is an XML Name
+         throw new Error(`invalid node name: ${uri}`);
+       }
+
+       for (const attr of domnode.attributes) {
+         // Not a namespace declaration, ignore this attribute
+         if (attr.namespaceURI !== NS_XMLNS && attr.nodeName !== "xmlns") {
+           continue;
+         }
+
+         const prefix = attr.prefix ? attr.localName : "";
+         // Seen this prefix before, cannot use it
+         if (currentBadPrefixes.includes(prefix)) {
+           continue;
+         }
+
+         // Namespace matches the start of the uri
+         if (attr.value === uri.substring(0, attr.value.length)) {
+           const local = uri.substring(attr.value.length);
+           const test = URI_SUFFIX.exec(local);
+           // Remaining part of uri is a good XML Name
+           if (test && test[0] === local) {
+             return {
+               namespaceURI: attr.value,
+               prefix,
+               localName: local,
+               qname: prefix ? `${prefix}:${local}` : local,
+             };
+           }
+         }
+
+         currentBadPrefixes.push(prefix);
+       }
+
+       // No prefix found here, move up the document
+       return this._resolvePrefix(domnode.parentNode, uri, currentBadPrefixes);
+     }
+
+  /**
+   * Guess the indent level within the given Element. The method looks for
+   * elements that are preceded by whitespace including a newline. The
+   * whitespace following the newline is presumed to be the indentation for the
+   * element.
+   * If the indentation cannot be guessed then it recurses up the document
+   * hierarchy until it can guess the indent or until the Document is reached.
+   */
+  _guessIndent(element) {
+    // The indent at document level is 0
+    if (!element || isDocument(element)) {
+      return "";
+    }
+
+    // Check the text immediately preceding each child node. One could be
+    // a valid indent
+    let pretext = "";
+    let child = element.firstChild;
+    while (child) {
+      if (isText(child)) {
+        pretext += child.nodeValue;
+      } else if (isElement(child)) {
+        const result = INDENT.exec(pretext);
+        if (result) {
+          return result[1];
+        }
+        pretext = "";
+      }
+      child = child.nextSibling;
+    }
+
+    // pretext now contains any trailing text in the element. This can be
+    // the indent of the end tag. If so add a little to it.
+    result = INDENT.exec(pretext);
+    if (result) {
+      return `${result[1]}  `;
+    }
+
+    // Check the text immediately before this node
+    pretext = "";
+    let sibling = element.previousSibling;
+    while (sibling && isText(sibling)) {
+      pretext += sibling.nodeValue;
+      sibling = sibling.previousSibling;
+    }
+
+    // If there is a sensible indent then just add to it.
+    result = INDENT.exec(pretext);
+    if (result) {
+      return `${result[1]}  `;
+    }
+
+    // Last chance, get the indent level for the tag above and add to it
+    return `${this._guessIndent(element.parentNode)}  `;
+  }
+
+  _addElement(parent, uri) {
+      const prefix = this._resolvePrefix(parent, uri);
+      const element = this._document.createElementNS(
+        prefix.namespaceURI,
+        prefix.qname
+      );
+
+      if (parent.lastChild) {
+        // We want to insert immediately after the last child element
+        let last = parent.lastChild;
+        while (last && isText(last)) {
+          last = last.previousSibling;
+        }
+        // No child elements so insert at the start
+        if (!last) {
+          last = parent.firstChild;
+        } else {
+          last = last.nextSibling;
+        }
+
+        const indent = this._guessIndent(parent);
+        parent.insertBefore(this._document.createTextNode(`\n${indent}`), last);
+        parent.insertBefore(element, last);
+      } else {
+        // No children, must indent our element and the end tag
+        const indent = this._guessIndent(parent.parentNode);
+        parent.append(`\n${indent}  `, element, `\n${indent}`);
+      }
+      return element;
+    }
+
+  /**
+   * Removes the element from its parent. Should also remove surrounding
+   * white space as appropriate.
+   */
+   _removeElement(element) {
+       const parent = element.parentNode;
+       let sibling = element.previousSibling;
+       // Drop any text nodes immediately preceding the element
+       while (sibling && isText(sibling)) {
+         const temp = sibling;
+         sibling = sibling.previousSibling;
+         parent.removeChild(temp);
+       }
+
+       sibling = element.nextSibling;
+       // Drop the element
+       parent.removeChild(element);
+
+       // If the next node after element is now the first child then element was
+       // the first child. If there are no other child elements then remove the
+       // remaining child nodes.
+       if (parent.firstChild === sibling) {
+         while (sibling && isText(sibling)) {
+           sibling = sibling.nextSibling;
+         }
+         if (!sibling) {
+           // No other child elements
+           while (parent.lastChild) {
+             parent.removeChild(parent.lastChild);
+           }
+         }
+       }
+     }
+
+  /**
+   * Requests that a given prefix be used for the namespace where possible.
+   * This must be called before any assertions are made using the namespace
+   * and the registration will not override any existing prefix used in the
+   * document.
+   */
+  registerPrefix(prefix, namespaceURI) {
+    this._prefixes[prefix] = namespaceURI;
+  }
+
+  /**
+   * Gets a blank node. nodeID may be null and if so a new blank node is created.
+   * If a nodeID is given then the blank node with that ID is returned or created.
+   */
+  getBlankNode(nodeID) {
+    if (nodeID && nodeID in this._blankNodes) {
+      return this._blankNodes[nodeID];
+    }
+
+    if (nodeID && !nodeID.match(XML_NCNAME)) {
+      throw new Error("rdf:nodeID must be a valid XML name");
+    }
+
+    const rdfnode = new RDFBlankNode(this, nodeID);
+    this._allBlankNodes.push(rdfnode);
+    if (nodeID) {
+      this._blankNodes[nodeID] = rdfnode;
+    }
+    return rdfnode;
+  }
+
+  /**
+   * Gets all blank nodes
+   */
+  getAllBlankNodes() {
+    return this._allBlankNodes.slice();
+  }
+
+  /**
+   * Gets the resource for the URI. The resource is created if it has not been
+   * used already.
+   */
+  getResource(uri) {
+    if (uri in this._resources) {
+      return this._resources[uri];
+    }
+
+    const resource = new RDFResource(this, uri);
+    this._resources[uri] = resource;
+    return resource;
+  }
+
+  /**
+   * Gets all resources that have been used.
+   */
+  getAllResources() {
+    return Object.values(this._resources);
+  }
+
+  /**
+   * Returns all blank nodes and resources
+   */
+  getAllSubjects() {
+    return [...Object.values(this._resources), ...this._allBlankNodes];
+  }
+
+  /**
+   * Saves the RDF/XML to a string.
+   */
+  serializeToString() {
+    const serializer = new XMLSerializer();
+    return serializer.serializeToString(this._document);
+  }
+
+  /**
+   * Saves the RDF/XML to a file.
+   */
+  async saveToFile(file) {
+    return IOUtils.writeUTF8(file, this.serializeToString());
+  }
+}
diff --git a/waterfox/browser/extensions/common/RDFManifestConverter.sys.mjs b/waterfox/browser/extensions/common/RDFManifestConverter.sys.mjs
new file mode 100644
index 0000000000000..fde2bca458e77
--- /dev/null
+++ b/waterfox/browser/extensions/common/RDFManifestConverter.sys.mjs
@@ -0,0 +1,149 @@
+/* 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/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  RDFDataSource: "resource:///modules/RDFDataSource.sys.mjs",
+});
+
+const RDFURI_INSTALL_MANIFEST_ROOT = "urn:mozilla:install-manifest";
+
+function EM_R(aProperty) {
+  return `http://www.mozilla.org/2004/em-rdf#${aProperty}`;
+}
+
+function getValue(literal) {
+  return literal?.getValue();
+}
+
+function getProperty(resource, property) {
+  return getValue(resource.getProperty(EM_R(property)));
+}
+
+class Manifest {
+  constructor(ds) {
+    this.ds = ds;
+  }
+
+  static loadFromString(text) {
+    return new Manifest(lazy.RDFDataSource.loadFromString(text));
+  }
+
+  static loadFromBuffer(buffer) {
+    return new Manifest(lazy.RDFDataSource.loadFromBuffer(buffer));
+  }
+
+  static async loadFromFile(uri) {
+    return new Manifest(await lazy.RDFDataSource.loadFromFile(uri));
+  }
+}
+
+export class InstallRDF extends Manifest {
+  static loadFromString(text) {
+    return new InstallRDF(lazy.RDFDataSource.loadFromString(text));
+  }
+
+  static loadFromBuffer(buffer) {
+    return new InstallRDF(lazy.RDFDataSource.loadFromBuffer(buffer));
+  }
+
+  static async loadFromFile(uri) {
+    return new InstallRDF(await lazy.RDFDataSource.loadFromFile(uri));
+  }
+  _readProps(source, obj, props) {
+    for (const prop of props) {
+      const val = getProperty(source, prop);
+      if (val != null) {
+        obj[prop] = val;
+      }
+    }
+  }
+
+  _readArrayProp(source, obj, prop, target, decode = getValue) {
+    const result = Array.from(source.getObjects(EM_R(prop)), (target) =>
+      decode(target)
+    );
+    if (result.length) {
+      obj[target] = result;
+    }
+  }
+
+  _readArrayProps(source, obj, props, decode = getValue) {
+    for (const [prop, target] of Object.entries(props)) {
+      this._readArrayProp(source, obj, prop, target, decode);
+    }
+  }
+
+  _readLocaleStrings(source, obj) {
+    this._readProps(source, obj, [
+      "name",
+      "description",
+      "creator",
+      "homepageURL",
+    ]);
+    this._readArrayProps(source, obj, {
+      locale: "locales",
+      developer: "developers",
+      translator: "translators",
+      contributor: "contributors",
+    });
+  }
+
+  decode() {
+    const root = this.ds.getResource(RDFURI_INSTALL_MANIFEST_ROOT);
+    const result = {};
+
+    const props = [
+      "id",
+      "version",
+      "type",
+      "updateURL",
+      "optionsURL",
+      "optionsType",
+      "aboutURL",
+      "iconURL",
+      "bootstrap",
+      "unpack",
+      "strictCompatibility",
+    ];
+    this._readProps(root, result, props);
+
+    const decodeTargetApplication = (source) => {
+      const app = {};
+      this._readProps(source, app, ["id", "minVersion", "maxVersion"]);
+      return app;
+    };
+
+    const decodeLocale = (source) => {
+      const localized = {};
+      this._readLocaleStrings(source, localized);
+      return localized;
+    };
+
+    this._readLocaleStrings(root, result);
+
+    this._readArrayProps(root, result, { targetPlatform: "targetPlatforms" });
+    this._readArrayProps(
+      root,
+      result,
+      { targetApplication: "targetApplications" },
+      decodeTargetApplication
+    );
+    this._readArrayProps(
+      root,
+      result,
+      { localized: "localized" },
+      decodeLocale
+    );
+    this._readArrayProps(
+      root,
+      result,
+      { dependency: "dependencies" },
+      (source) => getProperty(source, "id")
+    );
+
+    return result;
+  }
+}
diff --git a/waterfox/browser/extensions/common/iteratorUtils.sys.mjs b/waterfox/browser/extensions/common/iteratorUtils.sys.mjs
new file mode 100644
index 0000000000000..4b2c248af6726
--- /dev/null
+++ b/waterfox/browser/extensions/common/iteratorUtils.sys.mjs
@@ -0,0 +1,128 @@
+/* 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/. */
+
+/**
+ * This file contains helper methods for dealing with XPCOM iterators (arrays
+ * and enumerators) in JS-friendly ways.
+ */
+
+const JS_HAS_SYMBOLS = typeof Symbol === "function";
+const ITERATOR_SYMBOL = JS_HAS_SYMBOLS ? Symbol.iterator : "@@iterator";
+
+/**
+ * This function will take a number of objects and convert them to an array.
+ *
+ * Currently, we support the following objects:
+ *   Anything you can for (let x of aObj) on
+ *                (e.g. toArray(fixIterator(enum))[4],
+ *                 also a NodeList from element.children)
+ *
+ * @param aObj        The object to convert
+ */
+export function toArray(aObj) {
+  // Iterable object
+  if (ITERATOR_SYMBOL in aObj) {
+    return Array.from(aObj);
+  }
+
+  // New style generator function
+  if (
+    typeof aObj === "function" &&
+    typeof aObj.constructor === "function" &&
+    aObj.constructor.name === "GeneratorFunction"
+  ) {
+    return [...aObj()];
+  }
+
+  // We got something unexpected, notify the caller loudly.
+  throw new Error(
+    `An unsupported object sent to toArray: ${"toString" in aObj ? aObj.toString() : aObj}`
+  );
+}
+
+/**
+ * Given a JS array, JS iterator, or one of a variety of XPCOM collections or
+ * iterators, return a JS iterator suitable for use in a for...of expression.
+ *
+ * Currently, we support the following types of XPCOM iterators:
+ *   nsIArray
+ *   nsISimpleEnumerator
+ *
+ * Note that old-style JS iterators are explicitly not supported in this
+ * method, as they are going away.
+ *
+ *   @param aEnum  the enumerator to convert
+ *   @param aIface (optional) an interface to QI each object to prior to
+ *                 returning
+ *
+ *   @note This returns an object that can be used in 'for...of' loops.
+ *         Do not use 'for each...in' or 'for...in'.
+ *         This does *not* return an Array object. To create such an array, use
+ *         let array = toArray(fixIterator(xpcomEnumerator));
+ */
+export function fixIterator(aEnum, aIface) {
+  // If the input is an array, nsISimpleEnumerator or something that sports Symbol.iterator,
+  // then the original input is sufficient to directly return. However, if we want
+  // to support the aIface parameter, we need to do a lazy version of
+  // Array.prototype.map.
+  if (
+    Array.isArray(aEnum) ||
+    aEnum instanceof Ci.nsISimpleEnumerator ||
+    ITERATOR_SYMBOL in aEnum
+  ) {
+    if (!aIface) {
+      return aEnum[ITERATOR_SYMBOL]();
+    }
+    return (function* () {
+      for (const o of aEnum) {
+        yield o.QueryInterface(aIface);
+      }
+    })();
+  }
+
+  const face = aIface || Ci.nsISupports;
+  // Figure out which kind of array object we have.
+  // First try nsIArray (covers nsIMutableArray too).
+  if (aEnum instanceof Ci.nsIArray) {
+    return (function* () {
+      const count = aEnum.length;
+      for (let i = 0; i < count; i++) {
+        yield aEnum.queryElementAt(i, face);
+      }
+    })();
+  }
+
+  // We got something unexpected, notify the caller loudly.
+  throw new Error(
+    `An unsupported object sent to fixIterator: ${"toString" in aEnum ? aEnum.toString() : aEnum}`
+  );
+}
+
+/**
+ * This function takes an Array object and returns an XPCOM array
+ * of the desired type. It will *not* work if you extend Array.prototype.
+ *
+ * @param aArray      the array (anything fixIterator supports) to convert to an XPCOM array
+ * @param aInterface  the type of XPCOM array to convert
+ *
+ * @note The returned array is *not* dynamically updated.  Changes made to the
+ *       JS array after a call to this function will not be reflected in the
+ *       XPCOM array.
+ */
+export function toXPCOMArray(aArray, aInterface) {
+  if (aInterface.equals(Ci.nsIMutableArray)) {
+    const mutableArray = Cc["@mozilla.org/array;1"].createInstance(
+      Ci.nsIMutableArray
+    );
+    for (const item of fixIterator(aArray)) {
+      mutableArray.appendElement(item);
+    }
+    return mutableArray;
+  }
+
+  // We got something unexpected, notify the caller loudly.
+  throw new Error(
+    `An unsupported interface requested from toXPCOMArray: ${aInterface}`
+  );
+}
diff --git a/waterfox/browser/extensions/common/moz.build b/waterfox/browser/extensions/common/moz.build
new file mode 100644
index 0000000000000..fa2c2aa0d8232
--- /dev/null
+++ b/waterfox/browser/extensions/common/moz.build
@@ -0,0 +1,20 @@
+# vim: set filetype=python:
+# 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/.
+
+EXTRA_JS_MODULES += [
+    "BootstrapLoader.sys.mjs",
+    "ChromeManifest.sys.mjs",
+    "ExtensionSupport.sys.mjs",
+    "iteratorUtils.sys.mjs",
+    "Overlays.sys.mjs",
+    "RDFDataSource.sys.mjs",
+    "RDFManifestConverter.sys.mjs",
+]
+
+LOCAL_INCLUDES += ["/netwerk/base"]
+
+FINAL_LIBRARY = "xul"
+
+XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
diff --git a/waterfox/browser/extensions/common/test/xpcshell/.eslintrc.js b/waterfox/browser/extensions/common/test/xpcshell/.eslintrc.js
new file mode 100644
index 0000000000000..9f8fc290707d6
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: "plugin:mozilla/xpcshell-test",
+
+  rules: {
+    "func-names": "off",
+  },
+};
diff --git a/waterfox/browser/extensions/common/test/xpcshell/data/BootstrapMonitor.sys.mjs b/waterfox/browser/extensions/common/test/xpcshell/data/BootstrapMonitor.sys.mjs
new file mode 100644
index 0000000000000..be80db94322b3
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/data/BootstrapMonitor.sys.mjs
@@ -0,0 +1,37 @@
+/* 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/. */
+
+function notify(event, originalMethod, data, reason) {
+  let info = {
+    event,
+    data: Object.assign({}, data, {
+      resourceURI: data.resourceURI.spec,
+    }),
+    reason,
+  };
+
+  let subject = { wrappedJSObject: { data } };
+
+  Services.obs.notifyObservers(
+    subject,
+    "bootstrapmonitor-event",
+    JSON.stringify(info)
+  );
+
+  // If the bootstrap scope already declares a method call it
+  if (originalMethod) {
+    originalMethod(data, reason);
+  }
+}
+
+// Allows a simple one-line bootstrap script:
+// Components.utils.import("resource://xpcshelldata/bootstrapmonitor.jsm").monitor(this);
+export var monitor = (
+  scope,
+  methods = ["install", "startup", "shutdown", "uninstall"]
+) => {
+  for (let event of methods) {
+    scope[event] = notify.bind(null, event, scope[event]);
+  }
+};
diff --git a/waterfox/browser/extensions/common/test/xpcshell/head_addons.js b/waterfox/browser/extensions/common/test/xpcshell/head_addons.js
new file mode 100644
index 0000000000000..b9c1e3067bc81
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/head_addons.js
@@ -0,0 +1,1683 @@
+const _PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";
+const _PREF_EM_STRICT_COMPATIBILITY = "extensions.strictCompatibility";
+const _PREF_GETADDONS_BYIDS = "extensions.getAddons.get.url";
+const _PREF_COMPAT_OVERRIDES = "extensions.getAddons.compatOverides.url";
+const PREF_XPI_SIGNATURES_REQUIRED = "xpinstall.signatures.required";
+
+const _PREF_DISABLE_SECURITY =
+  "security.turn_off_all_security_so_that_" +
+  "viruses_can_take_over_this_computer";
+
+// Maximum error in file modification times. Some file systems don't store
+// modification times exactly. As long as we are closer than this then it
+// still passes.
+const _MAX_TIME_DIFFERENCE = 3000;
+
+// Time to reset file modified time relative to Date.now() so we can test that
+// times are modified (10 hours old).
+const _MAKE_FILE_OLD_DIFFERENCE = 10 * 3600 * 1000;
+
+var { AppConstants } = ChromeUtils.importESModule(
+  "resource://gre/modules/AppConstants.sys.mjs"
+);
+var { FileUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/FileUtils.sys.mjs"
+);
+var { NetUtil } = ChromeUtils.importESModule(
+  "resource://gre/modules/NetUtil.sys.mjs"
+);
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var { XPCOMUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/XPCOMUtils.sys.mjs"
+);
+var { AddonRepository } = ChromeUtils.importESModule(
+  "resource://gre/modules/addons/AddonRepository.sys.mjs"
+);
+// Use platform IOUtils for modern file operations
+
+var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.importESModule(
+  "resource://testing-common/AddonTestUtils.sys.mjs"
+);
+
+ChromeUtils.defineESModuleGetters(this, {
+  Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
+  Extension: "resource://gre/modules/Extension.sys.mjs",
+  ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.sys.mjs",
+  ExtensionTestUtils:
+    "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
+});
+ChromeUtils.defineModuleGetter(
+  this,
+  "HttpServer",
+  "resource://testing-common/httpd.js"
+);
+ChromeUtils.defineESModuleGetters(this, {
+  MockRegistrar: "resource://testing-common/MockRegistrar.sys.mjs",
+  MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
+  PromiseTestUtils: "resource://testing-common/PromiseTestUtils.sys.mjs",
+  TestUtils: "resource://testing-common/TestUtils.sys.mjs",
+});
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "aomStartup",
+  "@mozilla.org/addons/addon-manager-startup;1",
+  "amIAddonManagerStartup"
+);
+
+const {
+  createAppInfo,
+  createHttpServer,
+  createTempWebExtensionFile,
+  getFileForAddon,
+  manuallyInstall,
+  manuallyUninstall,
+  overrideBuiltIns,
+  promiseAddonEvent,
+  promiseCompleteAllInstalls,
+  promiseCompleteInstall,
+  promiseConsoleOutput,
+  promiseFindAddonUpdates,
+  promiseInstallAllFiles,
+  promiseInstallFile,
+  promiseSetExtensionModifiedTime,
+  promiseShutdownManager,
+  promiseWebExtensionStartup,
+  promiseWriteProxyFileToDir,
+  registerDirectory,
+  setExtensionModifiedTime,
+  writeFilesToZip,
+} = AddonTestUtils;
+
+// WebExtension wrapper for ease of testing
+ExtensionTestUtils.init(this);
+
+AddonTestUtils.init(this);
+AddonTestUtils.overrideCertDB();
+
+ChromeUtils.defineLazyGetter(
+  this,
+  "BOOTSTRAP_REASONS",
+  () => AddonManagerPrivate.BOOTSTRAP_REASONS
+);
+
+function _getReasonName(reason) {
+  for (let key of Object.keys(BOOTSTRAP_REASONS)) {
+    if (BOOTSTRAP_REASONS[key] === reason) {
+      return key;
+    }
+  }
+  throw new Error("This shouldn't happen.");
+}
+
+Object.defineProperty(this, "gAppInfo", {
+  get() {
+    return AddonTestUtils.appInfo;
+  },
+});
+
+Object.defineProperty(this, "gAddonStartup", {
+  get() {
+    return AddonTestUtils.addonStartup.clone();
+  },
+});
+
+Object.defineProperty(this, "gInternalManager", {
+  get() {
+    return AddonTestUtils.addonIntegrationService.QueryInterface(
+      Ci.nsITimerCallback
+    );
+  },
+});
+
+Object.defineProperty(this, "gProfD", {
+  get() {
+    return AddonTestUtils.profileDir.clone();
+  },
+});
+
+Object.defineProperty(this, "gTmpD", {
+  get() {
+    return AddonTestUtils.tempDir.clone();
+  },
+});
+
+Object.defineProperty(this, "gUseRealCertChecks", {
+  get() {
+    return AddonTestUtils.useRealCertChecks;
+  },
+  set(val) {
+    return (AddonTestUtils.useRealCertChecks = val);
+  },
+});
+
+Object.defineProperty(this, "TEST_UNPACKED", {
+  get() {
+    return AddonTestUtils.testUnpacked;
+  },
+  set(val) {
+    return (AddonTestUtils.testUnpacked = val);
+  },
+});
+
+// We need some internal bits of AddonManager
+var AMscope = ChromeUtils.import(
+  "resource://gre/modules/AddonManager.jsm",
+  null
+);
+var { AddonManager, AddonManagerInternal, AddonManagerPrivate } = AMscope;
+
+// Wrap the startup functions to ensure the bootstrap loader is added.
+function promiseStartupManager(newVersion) {
+  const { BootstrapLoader } = ChromeUtils.importESModule(
+    "resource:///modules/BootstrapLoader.sys.mjs"
+  );
+  AddonManager.addExternalExtensionLoader(BootstrapLoader);
+  return AddonTestUtils.promiseStartupManager(newVersion);
+}
+
+async function promiseRestartManager(newVersion) {
+  await promiseShutdownManager(false);
+  await promiseStartupManager(newVersion);
+}
+
+const _promiseAddonByID = AddonManager.getAddonByID;
+const _promiseAddonsByIDs = AddonManager.getAddonsByIDs;
+
+var _gPort = null;
+var _gUrlToFileMap = {};
+
+// Map resource://xpcshell-data/ to the data directory
+var resHandler = Services.io
+  .getProtocolHandler("resource")
+  .QueryInterface(Ci.nsISubstitutingProtocolHandler);
+// Allow non-existent files because of bug 1207735
+var dataURI = NetUtil.newURI(do_get_file("data", true));
+resHandler.setSubstitution("xpcshell-data", dataURI);
+
+function isManifestRegistered(file) {
+  let manifests = Components.manager.getManifestLocations();
+  for (let i = 0; i < manifests.length; i++) {
+    let manifest = manifests.queryElementAt(i, Ci.nsIURI);
+
+    // manifest is the url to the manifest file either in an XPI or a directory.
+    // We want the location of the XPI or directory itself.
+    if (manifest instanceof Ci.nsIJARURI) {
+      manifest = manifest.JARFile.QueryInterface(Ci.nsIFileURL).file;
+    } else if (manifest instanceof Ci.nsIFileURL) {
+      manifest = manifest.file.parent;
+    } else {
+      continue;
+    }
+
+    if (manifest.equals(file)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+const _BOOTSTRAP_MONITOR_BOOTSTRAP_JS = `
+  ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
+`;
+
+// Listens to messages from bootstrap.js telling us what add-ons were started
+// and stopped etc. and performs some sanity checks that only installed add-ons
+// are started etc.
+this.BootstrapMonitor = {
+  inited: false,
+
+  // Contain the current state of add-ons in the system
+  installed: new Map(),
+  started: new Map(),
+
+  // Contain the last state of shutdown and uninstall calls for an add-on
+  stopped: new Map(),
+  uninstalled: new Map(),
+
+  startupPromises: [],
+  installPromises: [],
+
+  restartfulIds: new Set(),
+
+  init() {
+    this.inited = true;
+    Services.obs.addObserver(this, "bootstrapmonitor-event");
+  },
+
+  shutdownCheck() {
+    if (!this.inited) {
+      return;
+    }
+
+    Assert.equal(this.started.size, 0);
+  },
+
+  clear(id) {
+    this.installed.delete(id);
+    this.started.delete(id);
+    this.stopped.delete(id);
+    this.uninstalled.delete(id);
+  },
+
+  promiseAddonStartup(_id) {
+    return new Promise((resolve) => {
+      this.startupPromises.push(resolve);
+    });
+  },
+
+  promiseAddonInstall(_id) {
+    return new Promise((resolve) => {
+      this.installPromises.push(resolve);
+    });
+  },
+
+  checkMatches(cached, current) {
+    Assert.notEqual(cached, undefined);
+    Assert.equal(current.data.version, cached.data.version);
+    Assert.equal(current.data.installPath, cached.data.installPath);
+    Assert.ok(
+      Services.io
+        .newURI(current.data.resourceURI)
+        .equals(Services.io.newURI(cached.data.resourceURI)),
+      `Resource URIs match: "${current.data.resourceURI}" == "${cached.data.resourceURI}"`
+    );
+  },
+
+  checkAddonStarted(id, version = undefined) {
+    let started = this.started.get(id);
+    Assert.notEqual(started, undefined);
+    if (version !== undefined) {
+      Assert.equal(started.data.version, version);
+    }
+
+    // Chrome should be registered by now
+    // Get the install path from the resource URI, since it is not passed any longer.
+    let uri = Services.io.newURI(started.data.resourceURI);
+    let jarFile = uri.QueryInterface(Ci.nsIJARURI).JARFile;
+    let installPath = jarFile.QueryInterface(Ci.nsIFileURL).file;
+
+    let isRegistered = isManifestRegistered(installPath);
+    Assert.ok(isRegistered);
+  },
+
+  checkAddonNotStarted(id) {
+    Assert.ok(!this.started.has(id));
+  },
+
+  checkAddonInstalled(id, version = undefined) {
+    const installed = this.installed.get(id);
+    notEqual(installed, undefined);
+    if (version !== undefined) {
+      equal(installed.data.version, version);
+    }
+    return installed;
+  },
+
+  checkAddonNotInstalled(id) {
+    Assert.ok(!this.installed.has(id));
+  },
+
+  observe(subject, _topic, data) {
+    let info = JSON.parse(data);
+    let id = info.data.id;
+
+    // Get the install path from the resource URI, since it is not passed any longer.
+    let uri = Services.io.newURI(info.data.resourceURI);
+    let jarFile = uri.QueryInterface(Ci.nsIJARURI).JARFile;
+    let installPath = jarFile.QueryInterface(Ci.nsIFileURL).file;
+
+    if (subject?.wrappedJSObject) {
+      // NOTE: in some of the new tests, we need to received the real objects instead of
+      // their JSON representations, but most of the current tests expect intallPath
+      // and resourceURI to have been converted to strings.
+      info.data = Object.assign({}, subject.wrappedJSObject.data, {
+        installPath: info.data.installPath,
+        resourceURI: info.data.resourceURI,
+      });
+    }
+
+    // If this is the install event the add-ons shouldn't already be installed
+    if (info.event === "install") {
+      this.checkAddonNotInstalled(id);
+
+      this.installed.set(id, info);
+
+      for (let resolve of this.installPromises) {
+        resolve();
+      }
+      this.installPromises = [];
+    } else {
+      this.checkMatches(this.installed.get(id), info);
+    }
+
+    // If this is the shutdown event than the add-on should already be started
+    if (info.event === "shutdown") {
+      this.checkMatches(this.started.get(id), info);
+
+      this.started.delete(id);
+      this.stopped.set(id, info);
+
+      // Chrome should still be registered at this point
+      let isRegistered = isManifestRegistered(installPath);
+      Assert.ok(isRegistered);
+
+      // XPIProvider doesn't bother unregistering chrome on app shutdown but
+      // since we simulate restarts we must do so manually to keep the registry
+      // consistent.
+      if (info.reason === 2 /* APP_SHUTDOWN */) {
+        Components.manager.removeBootstrappedManifestLocation(installPath);
+      }
+    } else {
+      this.checkAddonNotStarted(id);
+    }
+
+    if (info.event === "uninstall") {
+      // We currently support registering, but not unregistering,
+      // restartful add-on manifests during xpcshell AOM "restarts".
+      if (!this.restartfulIds.has(id)) {
+        // Chrome should be unregistered at this point
+        let isRegistered = isManifestRegistered(installPath);
+        Assert.ok(!isRegistered);
+      }
+
+      this.installed.delete(id);
+      this.uninstalled.set(id, info);
+    } else if (info.event === "startup") {
+      this.started.set(id, info);
+
+      // Chrome should be registered at this point
+      let isRegistered = isManifestRegistered(installPath);
+      Assert.ok(isRegistered);
+
+      for (let resolve of this.startupPromises) {
+        resolve();
+      }
+      this.startupPromises = [];
+    }
+  },
+};
+
+AddonTestUtils.on("addon-manager-shutdown", () => {
+  BootstrapMonitor.shutdownCheck();
+  Cu.unload("resource:///modules/BootstrapLoader.jsm");
+});
+
+var _SlightlyLessDodgyBootstrapMonitor = {
+  started: new Map(),
+  stopped: new Map(),
+  installed: new Map(),
+  uninstalled: new Map(),
+
+  init() {
+    this.onEvent = this.onEvent.bind(this);
+
+    AddonTestUtils.on("addon-manager-shutdown", this.onEvent);
+    AddonTestUtils.on("bootstrap-method", this.onEvent);
+  },
+
+  shutdownCheck() {
+    equal(
+      this.started.size,
+      0,
+      "Should have no add-ons that were started but not shutdown"
+    );
+  },
+
+  onEvent(msg, data) {
+    switch (msg) {
+      case "addon-manager-shutdown":
+        this.shutdownCheck();
+        break;
+      case "bootstrap-method":
+        this.onBootstrapMethod(data.method, data.params, data.reason);
+        break;
+    }
+  },
+
+  onBootstrapMethod(method, params, reason) {
+    let { id } = params;
+
+    info(
+      `Bootstrap method ${method} for ${params.id} version ${params.version}`
+    );
+
+    if (method !== "install") {
+      this.checkInstalled(id);
+    }
+
+    switch (method) {
+      case "install":
+        this.checkNotInstalled(id);
+        this.installed.set(id, { reason, params });
+        this.uninstalled.delete(id);
+        break;
+      case "startup":
+        this.checkNotStarted(id);
+        this.started.set(id, { reason, params });
+        this.stopped.delete(id);
+        break;
+      case "shutdown":
+        this.checkMatches("shutdown", "startup", params, this.started.get(id));
+        this.checkStarted(id);
+        this.stopped.set(id, { reason, params });
+        this.started.delete(id);
+        break;
+      case "uninstall":
+        this.checkMatches(
+          "uninstall",
+          "install",
+          params,
+          this.installed.get(id)
+        );
+        this.uninstalled.set(id, { reason, params });
+        this.installed.delete(id);
+        break;
+      case "update":
+        this.checkMatches("update", "install", params, this.installed.get(id));
+        this.installed.set(id, { reason, params });
+        break;
+    }
+  },
+
+  clear(id) {
+    this.installed.delete(id);
+    this.started.delete(id);
+    this.stopped.delete(id);
+    this.uninstalled.delete(id);
+  },
+
+  checkMatches(method, lastMethod, params, { params: lastParams } = {}) {
+    ok(
+      lastParams,
+      `Expecting matching ${lastMethod} call for add-on ${params.id} ${method} call`
+    );
+
+    if (method === "update") {
+      equal(
+        params.oldVersion,
+        lastParams.version,
+        "params.version should match last call"
+      );
+    } else {
+      equal(
+        params.version,
+        lastParams.version,
+        "params.version should match last call"
+      );
+    }
+
+    if (method !== "update" && method !== "uninstall") {
+      equal(
+        params.installPath.path,
+        lastParams.installPath.path,
+        `params.installPath should match last call`
+      );
+
+      ok(
+        params.resourceURI.equals(lastParams.resourceURI),
+        `params.resourceURI should match: "${params.resourceURI.spec}" == "${lastParams.resourceURI.spec}"`
+      );
+    }
+  },
+
+  checkStarted(id, version = undefined) {
+    let started = this.started.get(id);
+    ok(started, `Should have seen startup method call for ${id}`);
+
+    if (version !== undefined) {
+      equal(started.params.version, version, "Expected version number");
+    }
+  },
+
+  checkNotStarted(id) {
+    ok(
+      !this.started.has(id),
+      `Should not have seen startup method call for ${id}`
+    );
+  },
+
+  checkInstalled(id, version = undefined) {
+    const installed = this.installed.get(id);
+    ok(installed, `Should have seen install call for ${id}`);
+
+    if (version !== undefined) {
+      equal(installed.params.version, version, "Expected version number");
+    }
+
+    return installed;
+  },
+
+  checkNotInstalled(id) {
+    ok(
+      !this.installed.has(id),
+      `Should not have seen install method call for ${id}`
+    );
+  },
+};
+
+function _isNightlyChannel() {
+  var channel = Services.prefs.getCharPref("app.update.channel", "default");
+
+  return (
+    channel !== "aurora" &&
+    channel !== "beta" &&
+    channel !== "release" &&
+    channel !== "esr"
+  );
+}
+
+async function _restartWithLocales(locales) {
+  Services.locale.requestedLocales = locales;
+  await promiseRestartManager();
+}
+
+/**
+ * Returns a map of Addon objects for installed add-ons with the given
+ * IDs. The returned map contains a key for the ID of each add-on that
+ * is found. IDs for add-ons which do not exist are not present in the
+ * map.
+ *
+ * @param {sequence<string>} ids
+ *        The list of add-on IDs to get.
+ * @returns {Promise<string, Addon>}
+ *        Map of add-ons that were found.
+ */
+async function _getAddons(ids) {
+  let addons = new Map();
+  for (let addon of await AddonManager.getAddonsByIDs(ids)) {
+    if (addon) {
+      addons.set(addon.id, addon);
+    }
+  }
+  return addons;
+}
+
+/**
+ * Checks that the given add-on has the given expected properties.
+ *
+ * @param {string} id
+ *        The id of the add-on.
+ * @param {Addon?} addon
+ *        The add-on object, or null if the add-on does not exist.
+ * @param {object?} expected
+ *        An object containing the expected values for properties of the
+ *        add-on, or null if the add-on is expected not to exist.
+ */
+function _checkAddon(id, addon, expected) {
+  info(`Checking state of addon ${id}`);
+
+  if (expected === null) {
+    ok(!addon, `Addon ${id} should not exist`);
+  } else {
+    ok(addon, `Addon ${id} should exist`);
+    for (let [key, value] of Object.entries(expected)) {
+      if (value instanceof Ci.nsIURI) {
+        equal(addon[key]?.spec, value.spec, `Expected value of addon.${key}`);
+      } else {
+        deepEqual(addon[key], value, `Expected value of addon.${key}`);
+      }
+    }
+  }
+}
+
+/**
+ * Tests that an add-on does appear in the crash report annotations, if
+ * crash reporting is enabled. The test will fail if the add-on is not in the
+ * annotation.
+ *
+ * @param  aId
+ *         The ID of the add-on
+ * @param  aVersion
+ *         The version of the add-on
+ */
+function _do_check_in_crash_annotation(aId, aVersion) {
+  if (!AppConstants.MOZ_CRASHREPORTER) {
+    return;
+  }
+
+  if (!("Add-ons" in gAppInfo.annotations)) {
+    Assert.ok(false, "Cannot find Add-ons entry in crash annotations");
+    return;
+  }
+
+  let addons = gAppInfo.annotations["Add-ons"].split(",");
+  Assert.ok(
+    addons.includes(
+      `${encodeURIComponent(aId)}:${encodeURIComponent(aVersion)}`
+    )
+  );
+}
+
+/**
+ * Tests that an add-on does not appear in the crash report annotations, if
+ * crash reporting is enabled. The test will fail if the add-on is in the
+ * annotation.
+ *
+ * @param  aId
+ *         The ID of the add-on
+ * @param  aVersion
+ *         The version of the add-on
+ */
+function _do_check_not_in_crash_annotation(aId, aVersion) {
+  if (!AppConstants.MOZ_CRASHREPORTER) {
+    return;
+  }
+
+  if (!("Add-ons" in gAppInfo.annotations)) {
+    Assert.ok(true);
+    return;
+  }
+
+  let addons = gAppInfo.annotations["Add-ons"].split(",");
+  Assert.ok(
+    !addons.includes(
+      `${encodeURIComponent(aId)}:${encodeURIComponent(aVersion)}`
+    )
+  );
+}
+
+function _do_get_file_hash(aFile, aAlgorithm) {
+  if (!aAlgorithm) {
+    aAlgorithm = "sha1";
+  }
+
+  let crypto = Cc["@mozilla.org/security/hash;1"].createInstance(
+    Ci.nsICryptoHash
+  );
+  crypto.initWithString(aAlgorithm);
+  let fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
+  fis.init(aFile, -1, -1, false);
+  crypto.updateFromStream(fis, aFile.fileSize);
+
+  // return the two-digit hexadecimal code for a byte
+  let toHexString = (charCode) => `0${charCode.toString(16)}`.slice(-2);
+
+  let binary = crypto.finish(false);
+  let hash = Array.from(binary, (c) => toHexString(c.charCodeAt(0)));
+  return `${aAlgorithm}:${hash.join("")}`;
+}
+
+/**
+ * Returns an extension uri spec
+ *
+ * @param  aProfileDir
+ *         The extension install directory
+ * @returns a uri spec pointing to the root of the extension
+ */
+function _do_get_addon_root_uri(aProfileDir, aId) {
+  let path = aProfileDir.clone();
+  path.append(aId);
+  if (!path.exists()) {
+    path.leafName += ".xpi";
+    return `jar:${Services.io.newFileURI(path).spec}!/`;
+  }
+  return Services.io.newFileURI(path).spec;
+}
+
+function _do_get_expected_addon_name(aId) {
+  if (TEST_UNPACKED) {
+    return aId;
+  }
+  return `${aId}.xpi`;
+}
+
+/**
+ * Check that an array of actual add-ons is the same as an array of
+ * expected add-ons.
+ *
+ * @param  aActualAddons
+ *         The array of actual add-ons to check.
+ * @param  aExpectedAddons
+ *         The array of expected add-ons to check against.
+ * @param  aProperties
+ *         An array of properties to check.
+ */
+function _do_check_addons(aActualAddons, aExpectedAddons, aProperties) {
+  Assert.notEqual(aActualAddons, null);
+  Assert.equal(aActualAddons.length, aExpectedAddons.length);
+  for (let i = 0; i < aActualAddons.length; i++) {
+    do_check_addon(aActualAddons[i], aExpectedAddons[i], aProperties);
+  }
+}
+
+/**
+ * Check that the actual add-on is the same as the expected add-on.
+ *
+ * @param  aActualAddon
+ *         The actual add-on to check.
+ * @param  aExpectedAddon
+ *         The expected add-on to check against.
+ * @param  aProperties
+ *         An array of properties to check.
+ */
+function do_check_addon(aActualAddon, aExpectedAddon, aProperties) {
+  Assert.notEqual(aActualAddon, null);
+
+  aProperties.forEach((aProperty) => {
+    let actualValue = aActualAddon[aProperty];
+    let expectedValue = aExpectedAddon[aProperty];
+
+    // Check that all undefined expected properties are null on actual add-on
+    if (!(aProperty in aExpectedAddon)) {
+      if (actualValue !== undefined && actualValue !== null) {
+        do_throw(
+          "Unexpected defined/non-null property for add-on " +
+            aExpectedAddon.id +
+            " (addon[" +
+            aProperty +
+            "] = " +
+            actualValue.toSource() +
+            ")"
+        );
+      }
+
+      return;
+    }
+    if (expectedValue && !actualValue) {
+      do_throw(
+        "Missing property for add-on " +
+          aExpectedAddon.id +
+          ": expected addon[" +
+          aProperty +
+          "] = " +
+          expectedValue
+      );
+      return;
+    }
+
+    switch (aProperty) {
+      case "creator":
+        do_check_author(actualValue, expectedValue);
+        break;
+
+      case "developers":
+        Assert.equal(actualValue.length, expectedValue.length);
+        for (let i = 0; i < actualValue.length; i++) {
+          do_check_author(actualValue[i], expectedValue[i]);
+        }
+        break;
+
+      case "screenshots":
+        Assert.equal(actualValue.length, expectedValue.length);
+        for (let i = 0; i < actualValue.length; i++) {
+          do_check_screenshot(actualValue[i], expectedValue[i]);
+        }
+        break;
+
+      case "sourceURI":
+        Assert.equal(actualValue.spec, expectedValue);
+        break;
+
+      case "updateDate":
+        Assert.equal(actualValue.getTime(), expectedValue.getTime());
+        break;
+
+      case "compatibilityOverrides":
+        Assert.equal(actualValue.length, expectedValue.length);
+        for (let i = 0; i < actualValue.length; i++) {
+          do_check_compatibilityoverride(actualValue[i], expectedValue[i]);
+        }
+        break;
+
+      case "icons":
+        do_check_icons(actualValue, expectedValue);
+        break;
+
+      default:
+        if (actualValue !== expectedValue) {
+          do_throw(
+            "Failed for " +
+              aProperty +
+              " for add-on " +
+              aExpectedAddon.id +
+              " (" +
+              actualValue +
+              " === " +
+              expectedValue +
+              ")"
+          );
+        }
+    }
+  });
+}
+
+/**
+ * Check that the actual author is the same as the expected author.
+ *
+ * @param  actual
+ *         The actual author to check.
+ * @param  aExpected
+ *         The expected author to check against.
+ */
+function do_check_author(actual, aExpected) {
+  Assert.equal(actual.toString(), aExpected.name);
+  Assert.equal(actual.name, aExpected.name);
+  Assert.equal(actual.url, aExpected.url);
+}
+
+/**
+ * Check that the actual screenshot is the same as the expected screenshot.
+ *
+ * @param  actual
+ *         The actual screenshot to check.
+ * @param  aExpected
+ *         The expected screenshot to check against.
+ */
+function do_check_screenshot(actual, aExpected) {
+  Assert.equal(actual.toString(), aExpected.url);
+  Assert.equal(actual.url, aExpected.url);
+  Assert.equal(actual.width, aExpected.width);
+  Assert.equal(actual.height, aExpected.height);
+  Assert.equal(actual.thumbnailURL, aExpected.thumbnailURL);
+  Assert.equal(actual.thumbnailWidth, aExpected.thumbnailWidth);
+  Assert.equal(actual.thumbnailHeight, aExpected.thumbnailHeight);
+  Assert.equal(actual.caption, aExpected.caption);
+}
+
+/**
+ * Check that the actual compatibility override is the same as the expected
+ * compatibility override.
+ *
+ * @param  aAction
+ *         The actual compatibility override to check.
+ * @param  aExpected
+ *         The expected compatibility override to check against.
+ */
+function do_check_compatibilityoverride(actual, aExpected) {
+  Assert.equal(actual.type, aExpected.type);
+  Assert.equal(actual.minVersion, aExpected.minVersion);
+  Assert.equal(actual.maxVersion, aExpected.maxVersion);
+  Assert.equal(actual.appID, aExpected.appID);
+  Assert.equal(actual.appMinVersion, aExpected.appMinVersion);
+  Assert.equal(actual.appMaxVersion, aExpected.appMaxVersion);
+}
+
+function do_check_icons(actual, aExpected) {
+  for (var size in aExpected) {
+    Assert.equal(actual[size], aExpected[size]);
+  }
+}
+
+function _isThemeInAddonsList(aDir, aId) {
+  return AddonTestUtils.addonsList.hasTheme(aDir, aId);
+}
+
+function _isExtensionInBootstrappedList(aDir, aId) {
+  return AddonTestUtils.addonsList.hasExtension(aDir, aId);
+}
+
+/**
+ * Writes an install.rdf manifest into a directory using the properties passed
+ * in a JS object. The objects should contain a property for each property to
+ * appear in the RDF. The object may contain an array of objects with id,
+ * minVersion and maxVersion in the targetApplications property to give target
+ * application compatibility.
+ *
+ * @param   aData
+ *          The object holding data about the add-on
+ * @param   aDir
+ *          The directory to add the install.rdf to
+ * @param   aId
+ *          An optional string to override the default installation aId
+ * @param   aExtraFile
+ *          An optional dummy file to create in the directory
+ * @returns  An nsIFile for the directory in which the add-on is installed.
+ */
+async function promiseWriteInstallRDFToDir(
+  aData,
+  aDir,
+  aId = aData.id,
+  aExtraFile = null
+) {
+  let files = {
+    "install.rdf": createInstallRDF(aData),
+  };
+  if (typeof aExtraFile === "object") {
+    Object.assign(files, aExtraFile);
+  } else {
+    files[aExtraFile] = "";
+  }
+
+  let dir = aDir.clone();
+  dir.append(aId);
+
+  await AddonTestUtils.promiseWriteFilesToDir(dir.path, files);
+  return dir;
+}
+
+/**
+ * Writes an install.rdf manifest into a packed extension using the properties passed
+ * in a JS object. The objects should contain a property for each property to
+ * appear in the RDF. The object may contain an array of objects with id,
+ * minVersion and maxVersion in the targetApplications property to give target
+ * application compatibility.
+ *
+ * @param   aData
+ *          The object holding data about the add-on
+ * @param   aDir
+ *          The install directory to add the extension to
+ * @param   aId
+ *          An optional string to override the default installation aId
+ * @param   aExtraFile
+ *          An optional dummy file to create in the extension
+ * @returns  A file pointing to where the extension was installed
+ */
+async function promiseWriteInstallRDFToXPI(
+  aData,
+  aDir,
+  aId = aData.id,
+  aExtraFile = null
+) {
+  let files = {
+    "install.rdf": createInstallRDF(aData),
+  };
+  if (typeof aExtraFile === "object") {
+    Object.assign(files, aExtraFile);
+  } else if (aExtraFile) {
+    files[aExtraFile] = "";
+  }
+
+  if (!aDir.exists()) {
+    aDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+  }
+
+  var file = aDir.clone();
+  file.append(`${aId}.xpi`);
+
+  AddonTestUtils.writeFilesToZip(file.path, files);
+
+  return file;
+}
+
+/**
+ * Writes an install.rdf manifest into an extension using the properties passed
+ * in a JS object. The objects should contain a property for each property to
+ * appear in the RDF. The object may contain an array of objects with id,
+ * minVersion and maxVersion in the targetApplications property to give target
+ * application compatibility.
+ *
+ * @param   aData
+ *          The object holding data about the add-on
+ * @param   aDir
+ *          The install directory to add the extension to
+ * @param   aId
+ *          An optional string to override the default installation aId
+ * @param   aExtraFile
+ *          An optional dummy file to create in the extension
+ * @returns  A file pointing to where the extension was installed
+ */
+function _promiseWriteInstallRDFForExtension(aData, aDir, aId, aExtraFile) {
+  if (TEST_UNPACKED) {
+    return promiseWriteInstallRDFToDir(aData, aDir, aId, aExtraFile);
+  }
+  return promiseWriteInstallRDFToXPI(aData, aDir, aId, aExtraFile);
+}
+
+/**
+ * Writes a manifest.json manifest into an extension using the properties passed
+ * in a JS object.
+ *
+ * @param   aManifest
+ *          The data to write
+ * @param   aDir
+ *          The install directory to add the extension to
+ * @param   aId
+ *          An optional string to override the default installation aId
+ * @returns  A file pointing to where the extension was installed
+ */
+function _promiseWriteWebManifestForExtension(
+  aData,
+  aDir,
+  aId = aData.applications.gecko.id
+) {
+  let files = {
+    "manifest.json": JSON.stringify(aData),
+  };
+  return AddonTestUtils.promiseWriteFilesToExtension(aDir.path, aId, files);
+}
+
+/**
+ * Creates an XPI file for some manifest data in the temporary directory and
+ * returns the nsIFile for it. The file will be deleted when the test completes.
+ *
+ * @param   aData
+ *          The object holding data about the add-on
+ * @returns  A file pointing to the created XPI file
+ */
+function _createTempXPIFile(aData, aExtraFile) {
+  let files = {
+    "install.rdf": aData,
+  };
+  if (typeof aExtraFile === "object") {
+    Object.assign(files, aExtraFile);
+  } else if (aExtraFile) {
+    files[aExtraFile] = "";
+  }
+
+  return AddonTestUtils.createTempXPIFile(files);
+}
+
+function _promiseInstallXPI(installRDF) {
+  return AddonTestUtils.promiseInstallXPI({ "install.rdf": installRDF });
+}
+
+var gExpectedEvents = {};
+var gExpectedInstalls = [];
+var gNext = null;
+
+function getExpectedEvent(aId) {
+  if (!(aId in gExpectedEvents)) {
+    do_throw(`Wasn't expecting events for ${aId}`);
+  }
+  if (!gExpectedEvents[aId].length) {
+    do_throw(`Too many events for ${aId}`);
+  }
+  let event = gExpectedEvents[aId].shift();
+  if (Array.isArray(event)) {
+    return event;
+  }
+  return [event, true];
+}
+
+function getExpectedInstall(aAddon) {
+  if (Array.isArray(gExpectedInstalls)) {
+    return gExpectedInstalls.shift();
+  }
+  if (!aAddon || !aAddon.id) {
+    return gExpectedInstalls.NO_ID.shift();
+  }
+  let id = aAddon.id;
+  if (!(id in gExpectedInstalls) || !Array.isArray(gExpectedInstalls[id])) {
+    do_throw(`Wasn't expecting events for ${id}`);
+  }
+  if (!gExpectedInstalls[id].length) {
+    do_throw(`Too many events for ${id}`);
+  }
+  return gExpectedInstalls[id].shift();
+}
+
+const AddonListener = {
+  onPropertyChanged(aAddon, aProperties) {
+    info(`Got onPropertyChanged event for ${aAddon.id}`);
+    let [event, properties] = getExpectedEvent(aAddon.id);
+    Assert.equal("onPropertyChanged", event);
+    Assert.equal(aProperties.length, properties.length);
+    properties.forEach((aProperty) => {
+      // Only test that the expected properties are listed, having additional
+      // properties listed is not necessary a problem
+      if (!aProperties.includes(aProperty)) {
+        do_throw(`Did not see property change for ${aProperty}`);
+      }
+    });
+    return check_test_completed(arguments);
+  },
+
+  onEnabling(aAddon, aRequiresRestart) {
+    info(`Got onEnabling event for ${aAddon.id}`);
+    let [event, expectedRestart] = getExpectedEvent(aAddon.id);
+    Assert.equal("onEnabling", event);
+    Assert.equal(aRequiresRestart, expectedRestart);
+    if (expectedRestart) {
+      Assert.ok(hasFlag(aAddon.pendingOperations, AddonManager.PENDING_ENABLE));
+    }
+    Assert.ok(!hasFlag(aAddon.permissions, AddonManager.PERM_CAN_ENABLE));
+    return check_test_completed(arguments);
+  },
+
+  onEnabled(aAddon) {
+    info(`Got onEnabled event for ${aAddon.id}`);
+    let [event] = getExpectedEvent(aAddon.id);
+    Assert.equal("onEnabled", event);
+    Assert.ok(!hasFlag(aAddon.permissions, AddonManager.PERM_CAN_ENABLE));
+    return check_test_completed(arguments);
+  },
+
+  onDisabling(aAddon, aRequiresRestart) {
+    info(`Got onDisabling event for ${aAddon.id}`);
+    let [event, expectedRestart] = getExpectedEvent(aAddon.id);
+    Assert.equal("onDisabling", event);
+    Assert.equal(aRequiresRestart, expectedRestart);
+    if (expectedRestart) {
+      Assert.ok(
+        hasFlag(aAddon.pendingOperations, AddonManager.PENDING_DISABLE)
+      );
+    }
+    Assert.ok(!hasFlag(aAddon.permissions, AddonManager.PERM_CAN_DISABLE));
+    return check_test_completed(arguments);
+  },
+
+  onDisabled(aAddon) {
+    info(`Got onDisabled event for ${aAddon.id}`);
+    let [event] = getExpectedEvent(aAddon.id);
+    Assert.equal("onDisabled", event);
+    Assert.ok(!hasFlag(aAddon.permissions, AddonManager.PERM_CAN_DISABLE));
+    return check_test_completed(arguments);
+  },
+
+  onInstalling(aAddon, aRequiresRestart) {
+    info(`Got onInstalling event for ${aAddon.id}`);
+    let [event, expectedRestart] = getExpectedEvent(aAddon.id);
+    Assert.equal("onInstalling", event);
+    Assert.equal(aRequiresRestart, expectedRestart);
+    if (expectedRestart) {
+      Assert.ok(
+        hasFlag(aAddon.pendingOperations, AddonManager.PENDING_INSTALL)
+      );
+    }
+    return check_test_completed(arguments);
+  },
+
+  onInstalled(aAddon) {
+    info(`Got onInstalled event for ${aAddon.id}`);
+    let [event] = getExpectedEvent(aAddon.id);
+    Assert.equal("onInstalled", event);
+    return check_test_completed(arguments);
+  },
+
+  onUninstalling(aAddon, aRequiresRestart) {
+    info(`Got onUninstalling event for ${aAddon.id}`);
+    let [event, expectedRestart] = getExpectedEvent(aAddon.id);
+    Assert.equal("onUninstalling", event);
+    Assert.equal(aRequiresRestart, expectedRestart);
+    if (expectedRestart) {
+      Assert.ok(
+        hasFlag(aAddon.pendingOperations, AddonManager.PENDING_UNINSTALL)
+      );
+    }
+    return check_test_completed(arguments);
+  },
+
+  onUninstalled(aAddon) {
+    info(`Got onUninstalled event for ${aAddon.id}`);
+    let [event] = getExpectedEvent(aAddon.id);
+    Assert.equal("onUninstalled", event);
+    return check_test_completed(arguments);
+  },
+
+  onOperationCancelled(aAddon) {
+    info(`Got onOperationCancelled event for ${aAddon.id}`);
+    let [event] = getExpectedEvent(aAddon.id);
+    Assert.equal("onOperationCancelled", event);
+    return check_test_completed(arguments);
+  },
+};
+
+const InstallListener = {
+  onNewInstall(install) {
+    if (
+      install.state !== AddonManager.STATE_DOWNLOADED &&
+      install.state !== AddonManager.STATE_DOWNLOAD_FAILED &&
+      install.state !== AddonManager.STATE_AVAILABLE
+    ) {
+      do_throw(`Bad install state ${install.state}`);
+    }
+    if (install.state !== AddonManager.STATE_DOWNLOAD_FAILED) {
+      Assert.equal(install.error, 0);
+    } else {
+      Assert.notEqual(install.error, 0);
+    }
+    Assert.equal("onNewInstall", getExpectedInstall());
+    return check_test_completed(arguments);
+  },
+
+  onDownloadStarted(install) {
+    Assert.equal(install.state, AddonManager.STATE_DOWNLOADING);
+    Assert.equal(install.error, 0);
+    Assert.equal("onDownloadStarted", getExpectedInstall());
+    return check_test_completed(arguments);
+  },
+
+  onDownloadEnded(install) {
+    Assert.equal(install.state, AddonManager.STATE_DOWNLOADED);
+    Assert.equal(install.error, 0);
+    Assert.equal("onDownloadEnded", getExpectedInstall());
+    return check_test_completed(arguments);
+  },
+
+  onDownloadFailed(install) {
+    Assert.equal(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
+    Assert.equal("onDownloadFailed", getExpectedInstall());
+    return check_test_completed(arguments);
+  },
+
+  onDownloadCancelled(install) {
+    Assert.equal(install.state, AddonManager.STATE_CANCELLED);
+    Assert.equal(install.error, 0);
+    Assert.equal("onDownloadCancelled", getExpectedInstall());
+    return check_test_completed(arguments);
+  },
+
+  onInstallStarted(install) {
+    Assert.equal(install.state, AddonManager.STATE_INSTALLING);
+    Assert.equal(install.error, 0);
+    Assert.equal("onInstallStarted", getExpectedInstall(install.addon));
+    return check_test_completed(arguments);
+  },
+
+  onInstallEnded(install, _newAddon) {
+    Assert.equal(install.state, AddonManager.STATE_INSTALLED);
+    Assert.equal(install.error, 0);
+    Assert.equal("onInstallEnded", getExpectedInstall(install.addon));
+    return check_test_completed(arguments);
+  },
+
+  onInstallFailed(install) {
+    Assert.equal(install.state, AddonManager.STATE_INSTALL_FAILED);
+    Assert.equal("onInstallFailed", getExpectedInstall(install.addon));
+    return check_test_completed(arguments);
+  },
+
+  onInstallCancelled(install) {
+    // If the install was cancelled by a listener returning false from
+    // onInstallStarted, then the state will revert to STATE_DOWNLOADED.
+    let possibleStates = [
+      AddonManager.STATE_CANCELLED,
+      AddonManager.STATE_DOWNLOADED,
+    ];
+    Assert.ok(possibleStates.includes(install.state));
+    Assert.equal(install.error, 0);
+    Assert.equal("onInstallCancelled", getExpectedInstall(install.addon));
+    return check_test_completed(arguments);
+  },
+
+  onExternalInstall(aAddon, _existingAddon, aRequiresRestart) {
+    Assert.equal("onExternalInstall", getExpectedInstall(aAddon));
+    Assert.ok(!aRequiresRestart);
+    return check_test_completed(arguments);
+  },
+};
+
+function hasFlag(aBits, aFlag) {
+  return (aBits & aFlag) !== 0;
+}
+
+// Just a wrapper around setting the expected events.
+function _prepare_test(aExpectedEvents, aExpectedInstalls, aNext) {
+  AddonManager.addAddonListener(AddonListener);
+  AddonManager.addInstallListener(InstallListener);
+
+  gExpectedInstalls = aExpectedInstalls;
+  gExpectedEvents = aExpectedEvents;
+  gNext = aNext;
+}
+
+function clearListeners() {
+  AddonManager.removeAddonListener(AddonListener);
+  AddonManager.removeInstallListener(InstallListener);
+}
+
+function _end_test() {
+  clearListeners();
+}
+
+// Checks if all expected events have been seen and if so calls the callback.
+function check_test_completed(aArgs) {
+  if (!gNext) {
+    return undefined;
+  }
+
+  if (Array.isArray(gExpectedInstalls) && gExpectedInstalls.length) {
+    return undefined;
+  }
+
+  for (let id in gExpectedInstalls) {
+    let installList = gExpectedInstalls[id];
+    if (installList.length) {
+      return undefined;
+    }
+  }
+
+  for (let id in gExpectedEvents) {
+    if (gExpectedEvents[id].length) {
+      return undefined;
+    }
+  }
+
+  return gNext.apply(null, aArgs);
+}
+
+// Verifies that all the expected events for all add-ons were seen.
+function _ensure_test_completed() {
+  for (let i in gExpectedEvents) {
+    if (gExpectedEvents[i].length) {
+      do_throw(
+        `Didn't see all the expected events for ${i}: Still expecting ${gExpectedEvents[i]}`
+      );
+    }
+  }
+  gExpectedEvents = {};
+  if (gExpectedInstalls) {
+    Assert.equal(gExpectedInstalls.length, 0);
+  }
+}
+
+/**
+ * A helper method to install an array of AddonInstall to completion and then
+ * call a provided callback.
+ *
+ * @param   aInstalls
+ *          The array of AddonInstalls to install
+ * @param   aCallback
+ *          The callback to call when all installs have finished
+ */
+function _completeAllInstalls(aInstalls, aCallback) {
+  promiseCompleteAllInstalls(aInstalls).then(aCallback);
+}
+
+/**
+ * A helper method to install an array of files and call a callback after the
+ * installs are completed.
+ *
+ * @param   aFiles
+ *          The array of files to install
+ * @param   aCallback
+ *          The callback to call when all installs have finished
+ * @param   aIgnoreIncompatible
+ *          Optional parameter to ignore add-ons that are incompatible in
+ *          aome way with the application
+ */
+function _installAllFiles(aFiles, aCallback, aIgnoreIncompatible) {
+  promiseInstallAllFiles(aFiles, aIgnoreIncompatible).then(aCallback);
+}
+
+const EXTENSIONS_DB = "extensions.json";
+var gExtensionsJSON = gProfD.clone();
+gExtensionsJSON.append(EXTENSIONS_DB);
+
+async function _promiseInstallWebExtension(aData) {
+  let addonFile = createTempWebExtensionFile(aData);
+
+  let { addon } = await promiseInstallFile(addonFile);
+  return addon;
+}
+
+// By default use strict compatibility.
+Services.prefs.setBoolPref("extensions.strictCompatibility", true);
+
+// Ensure signature checks are enabled by default.
+Services.prefs.setBoolPref(PREF_XPI_SIGNATURES_REQUIRED, false);
+
+Services.prefs.setBoolPref("extensions.legacy.enabled", true);
+
+// Copies blocklistFile (an nsIFile) to gProfD/blocklist.xml.
+function _copyBlocklistToProfile(blocklistFile) {
+  var dest = gProfD.clone();
+  dest.append("blocklist.xml");
+  if (dest.exists()) {
+    dest.remove(false);
+  }
+  blocklistFile.copyTo(gProfD, "blocklist.xml");
+  dest.lastModifiedTime = Date.now();
+}
+
+// Make sure that a given path does not exist.
+function _pathShouldntExist(file) {
+  if (file.exists()) {
+    do_throw(`Test cleanup: path ${file.path} exists when it should not`);
+  }
+}
+
+// Wrap a function (typically a callback) to catch and report exceptions.
+function _do_exception_wrap(func) {
+  return () => {
+    try {
+      func.apply(null, arguments);
+    } catch (e) {
+      do_report_unexpected_exception(e);
+    }
+  };
+}
+
+/**
+ * Change the schema version of the JSON extensions database.
+ */
+async function _changeXPIDBVersion(aNewVersion) {
+  let json = await loadJSON(gExtensionsJSON.path);
+  json.schemaVersion = aNewVersion;
+  await saveJSON(json, gExtensionsJSON.path);
+}
+
+/**
+ * Load a file into a string.
+ */
+async function loadFile(aFile) {
+  let buffer = await IOUtils.read(aFile);
+  return new TextDecoder().decode(buffer);
+}
+
+/**
+ * Raw load of a JSON file.
+ */
+async function loadJSON(aFile) {
+  let data = await loadFile(aFile);
+  info(`Loaded JSON file ${aFile}`);
+  return JSON.parse(data);
+}
+
+/**
+ * Raw save of a JSON blob to file.
+ */
+async function saveJSON(aData, aFile) {
+  info(`Starting to save JSON file ${aFile}`);
+  await IOUtils.writeUTF8(aFile, JSON.stringify(aData, null, 2));
+  info(`Done saving JSON file ${aFile.path}`);
+}
+
+/**
+ * Create a callback function that calls do_execute_soon on an actual callback and arguments.
+ */
+function _callback_soon(aFunction) {
+  return (...args) => {
+    executeSoon(
+      () => {
+        aFunction.apply(null, args);
+      },
+      aFunction.name ? `delayed callback ${aFunction.name}` : "delayed callback"
+    );
+  };
+}
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "pluginHost",
+  "@mozilla.org/plugin/host;1",
+  "nsIPluginHost"
+);
+
+class MockPluginTag {
+  constructor(opts, enabledState = Ci.nsIPluginTag.STATE_ENABLED) {
+    this.pluginTag = pluginHost.createFakePlugin({
+      handlerURI: "resource://fake-plugin/${Math.random()}.xhtml",
+      mimeEntries: [{ type: "application/x-fake-plugin" }],
+      fileName: `${opts.name}.so`,
+      ...opts,
+    });
+    this.pluginTag.enabledState = enabledState;
+
+    this.name = opts.name;
+    this.version = opts.version;
+  }
+  async isBlocklisted() {
+    let state = await Blocklist.getPluginBlocklistState(this.pluginTag);
+    return state === Services.blocklist.STATE_BLOCKED;
+  }
+  get disabled() {
+    return this.pluginTag.enabledState === Ci.nsIPluginTag.STATE_DISABLED;
+  }
+  set disabled(val) {
+    this.enabledState =
+      Ci.nsIPluginTag[val ? "STATE_DISABLED" : "STATE_ENABLED"];
+  }
+  get enabledState() {
+    return this.pluginTag.enabledState;
+  }
+  set enabledState(val) {
+    this.pluginTag.enabledState = val;
+  }
+}
+
+function _mockPluginHost(plugins) {
+  let PluginHost = {
+    getPluginTags(count) {
+      count.value = plugins.length;
+      return plugins.map((p) => p.pluginTag);
+    },
+
+    QueryInterface: ChromeUtils.generateQI(["nsIPluginHost"]),
+  };
+
+  MockRegistrar.register("@mozilla.org/plugin/host;1", PluginHost);
+}
+
+async function _setInitialState(addon, initialState) {
+  if (initialState.userDisabled) {
+    await addon.disable();
+  } else if (initialState.userDisabled === false) {
+    await addon.enable();
+  }
+}
+
+/**
+ * Escapes any occurrences of &, ", < or > with XML entities.
+ *
+ * @param {string} str
+ *        The string to escape.
+ * @returns {string} The escaped string.
+ */
+function escapeXML(str) {
+  let replacements = {
+    "&": "&amp;",
+    '"': "&quot;",
+    "'": "&apos;",
+    "<": "&lt;",
+    ">": "&gt;",
+  };
+  return String(str).replace(/[&"''<>]/g, (m) => replacements[m]);
+}
+
+/**
+ * A tagged template function which escapes any XML metacharacters in
+ * interpolated values.
+ *
+ * @param {Array<string>} strings
+ *        An array of literal strings extracted from the templates.
+ * @param {Array} values
+ *        An array of interpolated values extracted from the template.
+ * @returns {string}
+ *        The result of the escaped values interpolated with the literal
+ *        strings.
+ */
+function escaped(strings, ...values) {
+  let result = [];
+
+  for (let [i, string] of strings.entries()) {
+    result.push(string);
+    if (i < values.length) {
+      result.push(escapeXML(values[i]));
+    }
+  }
+
+  return result.join("");
+}
+
+function _writeProps(obj, props, indent = "  ") {
+  let items = [];
+  for (let prop of props) {
+    if (obj[prop] !== undefined) {
+      items.push(escaped`${indent}<em:${prop}>${obj[prop]}</em:${prop}>\n`);
+    }
+  }
+  return items.join("");
+}
+
+function _writeArrayProps(obj, props, indent = "  ") {
+  let items = [];
+  for (let prop of props) {
+    for (let val of obj[prop] || []) {
+      items.push(escaped`${indent}<em:${prop}>${val}</em:${prop}>\n`);
+    }
+  }
+  return items.join("");
+}
+
+function _writeLocaleStrings(data) {
+  let items = [];
+
+  items.push(
+    this._writeProps(data, ["name", "description", "creator", "homepageURL"])
+  );
+  items.push(
+    this._writeArrayProps(data, ["developer", "translator", "contributor"])
+  );
+
+  return items.join("");
+}
+
+function createInstallRDF(data) {
+  let defaults = {
+    bootstrap: true,
+    version: "1.0",
+    name: `Test Extension ${data.id}`,
+    targetApplications: [
+      {
+        id: "xpcshell@tests.mozilla.org",
+        minVersion: "1",
+        maxVersion: "64.*",
+      },
+    ],
+  };
+
+  var rdf = '<?xml version="1.0"?>\n';
+  rdf +=
+    '<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n' +
+    '     xmlns:em="http://www.mozilla.org/2004/em-rdf#">\n';
+
+  rdf += '<Description about="urn:mozilla:install-manifest">\n';
+
+  data = Object.assign({}, defaults, data);
+
+  let props = [
+    "id",
+    "version",
+    "type",
+    "internalName",
+    "updateURL",
+    "optionsURL",
+    "optionsType",
+    "aboutURL",
+    "iconURL",
+    "skinnable",
+    "bootstrap",
+    "strictCompatibility",
+  ];
+  rdf += _writeProps(data, props);
+
+  rdf += _writeLocaleStrings(data);
+
+  for (let platform of data.targetPlatforms || []) {
+    rdf += escaped`<em:targetPlatform>${platform}</em:targetPlatform>\n`;
+  }
+
+  for (let app of data.targetApplications || []) {
+    rdf += "<em:targetApplication><Description>\n";
+    rdf += _writeProps(app, ["id", "minVersion", "maxVersion"]);
+    rdf += "</Description></em:targetApplication>\n";
+  }
+
+  for (let localized of data.localized || []) {
+    rdf += "<em:localized><Description>\n";
+    rdf += _writeArrayProps(localized, ["locale"]);
+    rdf += _writeLocaleStrings(localized);
+    rdf += "</Description></em:localized>\n";
+  }
+
+  for (let dep of data.dependencies || []) {
+    rdf += escaped`<em:dependency><Description em:id="${dep}"/></em:dependency>\n`;
+  }
+
+  rdf += "</Description>\n</RDF>\n";
+  return rdf;
+}
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap.js b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap.js
new file mode 100644
index 0000000000000..b8e5943f46d77
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap.js
@@ -0,0 +1,1169 @@
+const APP_STARTUP = 1;
+const APP_SHUTDOWN = 2;
+const ADDON_ENABLE = 3;
+const ADDON_DISABLE = 4;
+const ADDON_INSTALL = 5;
+const ADDON_UNINSTALL = 6;
+const ADDON_UPGRADE = 7;
+const ADDON_DOWNGRADE = 8;
+
+const ID1 = "bootstrap1@tests.mozilla.org";
+const ID2 = "bootstrap2@tests.mozilla.org";
+
+// This verifies that bootstrappable add-ons can be used without restarts.
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+// Enable loading extensions from the user scopes
+Services.prefs.setIntPref(
+  "extensions.enabledScopes",
+  AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER
+);
+
+BootstrapMonitor.init();
+
+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+const profileDir = gProfD.clone();
+profileDir.append("extensions");
+const userExtDir = gProfD.clone();
+userExtDir.append("extensions2");
+userExtDir.append(gAppInfo.ID);
+registerDirectory("XREUSysExt", userExtDir.parent);
+
+const ADDONS = {
+  test_bootstrap1_1: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap1@tests.mozilla.org",
+
+      name: "Test Bootstrap 1",
+
+      iconURL: "chrome://foo/skin/icon.png",
+      aboutURL: "chrome://foo/content/about.xul",
+      optionsURL: "chrome://foo/content/options.xul",
+    }),
+    "bootstrap.js": BOOTSTRAP_MONITOR_BOOTSTRAP_JS,
+  },
+  test_bootstrap1_2: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap1@tests.mozilla.org",
+      version: "2.0",
+
+      name: "Test Bootstrap 1",
+    }),
+    "bootstrap.js": BOOTSTRAP_MONITOR_BOOTSTRAP_JS,
+  },
+  test_bootstrap1_3: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap1@tests.mozilla.org",
+      version: "3.0",
+
+      name: "Test Bootstrap 1",
+
+      targetApplications: [
+        {
+          id: "undefined",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    }),
+    "bootstrap.js": BOOTSTRAP_MONITOR_BOOTSTRAP_JS,
+  },
+  test_bootstrap2_1: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap2@tests.mozilla.org",
+    }),
+    "bootstrap.js": BOOTSTRAP_MONITOR_BOOTSTRAP_JS,
+  },
+};
+
+var testserver = AddonTestUtils.createHttpServer({ hosts: ["example.com"] });
+
+const XPIS = {};
+for (let [name, addon] of Object.entries(ADDONS)) {
+  XPIS[name] = AddonTestUtils.createTempXPIFile(addon);
+  testserver.registerFile(`/addons/${name}.xpi`, XPIS[name]);
+}
+
+function getStartupReason() {
+  let info = BootstrapMonitor.started.get(ID1);
+  return info ? info.reason : undefined;
+}
+
+function getShutdownReason() {
+  let info = BootstrapMonitor.stopped.get(ID1);
+  return info ? info.reason : undefined;
+}
+
+function getInstallReason() {
+  let info = BootstrapMonitor.installed.get(ID1);
+  return info ? info.reason : undefined;
+}
+
+function getUninstallReason() {
+  let info = BootstrapMonitor.uninstalled.get(ID1);
+  return info ? info.reason : undefined;
+}
+
+function getStartupOldVersion() {
+  let info = BootstrapMonitor.started.get(ID1);
+  return info ? info.data.oldVersion : undefined;
+}
+
+function getShutdownNewVersion() {
+  let info = BootstrapMonitor.stopped.get(ID1);
+  return info ? info.data.newVersion : undefined;
+}
+
+function getInstallOldVersion() {
+  let info = BootstrapMonitor.installed.get(ID1);
+  return info ? info.data.oldVersion : undefined;
+}
+
+function getUninstallNewVersion() {
+  let info = BootstrapMonitor.uninstalled.get(ID1);
+  return info ? info.data.newVersion : undefined;
+}
+
+async function checkBootstrappedPref() {
+  let XPIScope = ChromeUtils.import(
+    "resource://gre/modules/addons/XPIProvider.jsm",
+    null
+  );
+
+  let data = new Map();
+  for (let entry of XPIScope.XPIStates.enabledAddons()) {
+    data.set(entry.id, entry);
+  }
+
+  let addons = await AddonManager.getAddonsByTypes(["extension"]);
+  for (let addon of addons) {
+    if (!addon.id.endsWith("@tests.mozilla.org")) {
+      continue;
+    }
+    if (!addon.isActive) {
+      continue;
+    }
+    if (
+      addon.operationsRequiringRestart !== AddonManager.OP_NEEDS_RESTART_NONE
+    ) {
+      continue;
+    }
+
+    ok(data.has(addon.id));
+    let addonData = data.get(addon.id);
+    data.delete(addon.id);
+
+    equal(addonData.version, addon.version);
+    equal(addonData.type, addon.type);
+
+    let resourceURI = addon.getResourceURI();
+    if (resourceURI instanceof Ci.nsIJARURI) {
+      resourceURI = resourceURI.JARFile;
+    }
+    let file = resourceURI.QueryInterface(Ci.nsIFileURL).file;
+    equal(addonData.path, file.path);
+  }
+  equal(data.size, 0);
+}
+
+add_task(async function run_test() {
+  promiseStartupManager();
+
+  ok(!gExtensionsJSON.exists());
+  ok(!gAddonStartup.exists());
+});
+
+// Tests that installing doesn't require a restart
+add_task(async function test_1() {
+  prepare_test({}, ["onNewInstall"]);
+
+  let install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_1);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  equal(install.type, "extension");
+  equal(install.version, "1.0");
+  equal(install.name, "Test Bootstrap 1");
+  equal(install.state, AddonManager.STATE_DOWNLOADED);
+  notEqual(install.addon.syncGUID, null);
+  equal(
+    install.addon.operationsRequiringRestart &
+      AddonManager.OP_NEEDS_RESTART_INSTALL,
+    0
+  );
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  let addon = install.addon;
+
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    new Promise((resolve) => {
+      prepare_test(
+        {
+          [ID1]: [["onInstalling", false], "onInstalled"],
+        },
+        ["onInstallStarted", "onInstallEnded"],
+        () => {
+          // startup should not have been called yet.
+          BootstrapMonitor.checkAddonNotStarted(ID1);
+          resolve();
+        }
+      );
+      install.install();
+    }),
+  ]);
+
+  await checkBootstrappedPref();
+  let installSyncGUID = addon.syncGUID;
+
+  let installs = await AddonManager.getAllInstalls();
+  // There should be no active installs now since the install completed and
+  // doesn't require a restart.
+  equal(installs.length, 0);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  notEqual(b1.syncGUID, null);
+  equal(b1.syncGUID, installSyncGUID);
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_INSTALL);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  let dir = do_get_addon_root_uri(profileDir, ID1);
+  equal(b1.getResourceURI("bootstrap.js").spec, `${dir}bootstrap.js`);
+});
+
+// Tests that disabling doesn't require a restart
+add_task(async function test_2() {
+  let b1 = await AddonManager.getAddonByID(ID1);
+  prepare_test({
+    [ID1]: [["onDisabling", false], "onDisabled"],
+  });
+
+  equal(
+    b1.operationsRequiringRestart & AddonManager.OP_NEEDS_RESTART_DISABLE,
+    0
+  );
+  await b1.disable();
+  ensure_test_completed();
+
+  await new Promise(executeSoon);
+
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(b1.userDisabled);
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), ADDON_DISABLE);
+  equal(getShutdownNewVersion(), undefined);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  let newb1 = await AddonManager.getAddonByID(ID1);
+  notEqual(newb1, null);
+  equal(newb1.version, "1.0");
+  ok(!newb1.appDisabled);
+  ok(newb1.userDisabled);
+  ok(!newb1.isActive);
+
+  await checkBootstrappedPref();
+});
+
+// Test that restarting doesn't accidentally re-enable
+add_task(async function test_3() {
+  await promiseShutdownManager();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), ADDON_DISABLE);
+  equal(getShutdownNewVersion(), undefined);
+
+  await promiseStartupManager();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), ADDON_DISABLE);
+  equal(getShutdownNewVersion(), undefined);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  ok(gAddonStartup.exists());
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(b1.userDisabled);
+  ok(!b1.isActive);
+
+  await checkBootstrappedPref();
+});
+
+// Tests that enabling doesn't require a restart
+add_task(async function test_4() {
+  let b1 = await AddonManager.getAddonByID(ID1);
+  prepare_test({
+    [ID1]: [["onEnabling", false], "onEnabled"],
+  });
+
+  equal(
+    b1.operationsRequiringRestart & AddonManager.OP_NEEDS_RESTART_ENABLE,
+    0
+  );
+  await b1.enable();
+  ensure_test_completed();
+
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_ENABLE);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  let newb1 = await AddonManager.getAddonByID(ID1);
+  notEqual(newb1, null);
+  equal(newb1.version, "1.0");
+  ok(!newb1.appDisabled);
+  ok(!newb1.userDisabled);
+  ok(newb1.isActive);
+
+  await checkBootstrappedPref();
+});
+
+// Tests that a restart shuts down and restarts the add-on
+add_task(async function test_5() {
+  await promiseShutdownManager();
+  // By the time we've shut down, the database must have been written
+  ok(gExtensionsJSON.exists());
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), APP_SHUTDOWN);
+  equal(getShutdownNewVersion(), undefined);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+  await promiseStartupManager();
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), APP_STARTUP);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  await checkBootstrappedPref();
+});
+
+// Tests that installing an upgrade doesn't require a restart
+add_task(async function test_6() {
+  prepare_test({}, ["onNewInstall"]);
+
+  let install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_2);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  equal(install.type, "extension");
+  equal(install.version, "2.0");
+  equal(install.name, "Test Bootstrap 1");
+  equal(install.state, AddonManager.STATE_DOWNLOADED);
+
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    new Promise((resolve) => {
+      prepare_test(
+        {
+          [ID1]: [["onInstalling", false], "onInstalled"],
+        },
+        ["onInstallStarted", "onInstallEnded"],
+        resolve
+      );
+      install.install();
+    }),
+  ]);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "2.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "2.0");
+  equal(getStartupReason(), ADDON_UPGRADE);
+  equal(getInstallOldVersion(), 1);
+  equal(getStartupOldVersion(), 1);
+  equal(getShutdownReason(), ADDON_UPGRADE);
+  equal(getShutdownNewVersion(), 2);
+  equal(getUninstallNewVersion(), 2);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+  do_check_in_crash_annotation(ID1, "2.0");
+
+  await checkBootstrappedPref();
+});
+
+// Tests that uninstalling doesn't require a restart
+add_task(async function test_7() {
+  let b1 = await AddonManager.getAddonByID(ID1);
+  prepare_test({
+    [ID1]: [["onUninstalling", false], "onUninstalled"],
+  });
+
+  equal(
+    b1.operationsRequiringRestart & AddonManager.OP_NEEDS_RESTART_UNINSTALL,
+    0
+  );
+  await b1.uninstall();
+
+  await checkBootstrappedPref();
+
+  ensure_test_completed();
+  BootstrapMonitor.checkAddonNotInstalled(ID1);
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), ADDON_UNINSTALL);
+  equal(getShutdownNewVersion(), undefined);
+  do_check_not_in_crash_annotation(ID1, "2.0");
+
+  b1 = await AddonManager.getAddonByID(ID1);
+  equal(b1, null);
+
+  await promiseRestartManager();
+
+  let newb1 = await AddonManager.getAddonByID(ID1);
+  equal(newb1, null);
+
+  await checkBootstrappedPref();
+});
+
+// Test that a bootstrapped extension dropped into the profile loads properly
+// on startup and doesn't cause an EM restart
+add_task(async function test_8() {
+  await promiseShutdownManager();
+
+  await manuallyInstall(XPIS.test_bootstrap1_1, profileDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_INSTALL);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  await checkBootstrappedPref();
+});
+
+// Test that items detected as removed during startup get removed properly
+add_task(async function test_9() {
+  await promiseShutdownManager();
+
+  manuallyUninstall(profileDir, ID1);
+  BootstrapMonitor.clear(ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  equal(b1, null);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  await checkBootstrappedPref();
+});
+
+// Tests that installing a downgrade sends the right reason
+add_task(async function test_10() {
+  prepare_test({}, ["onNewInstall"]);
+
+  let install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_2);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  equal(install.type, "extension");
+  equal(install.version, "2.0");
+  equal(install.name, "Test Bootstrap 1");
+  equal(install.state, AddonManager.STATE_DOWNLOADED);
+  do_check_not_in_crash_annotation(ID1, "2.0");
+
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    new Promise((resolve) => {
+      prepare_test(
+        {
+          [ID1]: [["onInstalling", false], "onInstalled"],
+        },
+        ["onInstallStarted", "onInstallEnded"],
+        resolve
+      );
+      install.install();
+    }),
+  ]);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "2.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "2.0");
+  equal(getStartupReason(), ADDON_INSTALL);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "2.0");
+
+  prepare_test({}, ["onNewInstall"]);
+
+  install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_1);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  equal(install.type, "extension");
+  equal(install.version, "1.0");
+  equal(install.name, "Test Bootstrap 1");
+  equal(install.state, AddonManager.STATE_DOWNLOADED);
+
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    new Promise((resolve) => {
+      prepare_test(
+        {
+          [ID1]: [["onInstalling", false], "onInstalled"],
+        },
+        ["onInstallStarted", "onInstallEnded"],
+        resolve
+      );
+      install.install();
+    }),
+  ]);
+
+  b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_DOWNGRADE);
+  equal(getInstallOldVersion(), 2);
+  equal(getStartupOldVersion(), 2);
+  equal(getShutdownReason(), ADDON_DOWNGRADE);
+  equal(getShutdownNewVersion(), 1);
+  equal(getUninstallNewVersion(), 1);
+  do_check_in_crash_annotation(ID1, "1.0");
+  do_check_not_in_crash_annotation(ID1, "2.0");
+
+  await checkBootstrappedPref();
+});
+
+// Tests that uninstalling a disabled add-on still calls the uninstall method
+add_task(async function test_11() {
+  let b1 = await AddonManager.getAddonByID(ID1);
+  prepare_test({
+    [ID1]: [
+      ["onDisabling", false],
+      "onDisabled",
+      ["onUninstalling", false],
+      "onUninstalled",
+    ],
+  });
+
+  await b1.disable();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  equal(getShutdownReason(), ADDON_DISABLE);
+  equal(getShutdownNewVersion(), undefined);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  await b1.uninstall();
+
+  ensure_test_completed();
+  BootstrapMonitor.checkAddonNotInstalled(ID1);
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  do_check_not_in_crash_annotation(ID1, "1.0");
+
+  await checkBootstrappedPref();
+});
+
+// Tests that bootstrapped extensions are correctly loaded even if the app is
+// upgraded at the same time
+add_task(async function test_12() {
+  await promiseShutdownManager();
+
+  await manuallyInstall(XPIS.test_bootstrap1_1, profileDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_INSTALL);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  await b1.uninstall();
+
+  await promiseRestartManager();
+  await checkBootstrappedPref();
+});
+
+// Tests that installing a bootstrapped extension with an invalid application
+// entry doesn't call it's startup method
+add_task(async function test_13() {
+  prepare_test({}, ["onNewInstall"]);
+
+  let install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_3);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  equal(install.type, "extension");
+  equal(install.version, "3.0");
+  equal(install.name, "Test Bootstrap 1");
+  equal(install.state, AddonManager.STATE_DOWNLOADED);
+  do_check_not_in_crash_annotation(ID1, "3.0");
+
+  await new Promise((resolve) => {
+    prepare_test(
+      {
+        [ID1]: [["onInstalling", false], "onInstalled"],
+      },
+      ["onInstallStarted", "onInstallEnded"],
+      resolve
+    );
+    install.install();
+  });
+
+  let installs = await AddonManager.getAllInstalls();
+
+  // There should be no active installs now since the install completed and
+  // doesn't require a restart.
+  equal(installs.length, 0);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "3.0");
+  ok(b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "3.0"); // We call install even for disabled add-ons
+  BootstrapMonitor.checkAddonNotStarted(ID1); // Should not have called startup though
+  do_check_not_in_crash_annotation(ID1, "3.0");
+
+  await promiseRestartManager();
+
+  b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "3.0");
+  ok(b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "3.0"); // We call install even for disabled add-ons
+  BootstrapMonitor.checkAddonNotStarted(ID1); // Should not have called startup though
+  do_check_not_in_crash_annotation(ID1, "3.0");
+
+  await checkBootstrappedPref();
+  await b1.uninstall();
+});
+
+// Tests that a bootstrapped extension with an invalid target application entry
+// does not get loaded when detected during startup
+add_task(async function test_14() {
+  await promiseRestartManager();
+
+  await promiseShutdownManager();
+
+  await manuallyInstall(XPIS.test_bootstrap1_3, profileDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "3.0");
+  ok(b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "3.0"); // We call install even for disabled add-ons
+  BootstrapMonitor.checkAddonNotStarted(ID1); // Should not have called startup though
+  do_check_not_in_crash_annotation(ID1, "3.0");
+
+  await checkBootstrappedPref();
+  await b1.uninstall();
+});
+
+// Tests that upgrading a disabled bootstrapped extension still calls uninstall
+// and install but doesn't startup the new version
+add_task(async function test_15() {
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    promiseInstallFile(XPIS.test_bootstrap1_1),
+  ]);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+
+  await b1.disable();
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+
+  prepare_test({}, ["onNewInstall"]);
+
+  let install = await AddonManager.getInstallForFile(XPIS.test_bootstrap1_2);
+  ensure_test_completed();
+
+  notEqual(install, null);
+  ok(install.addon.userDisabled);
+
+  await new Promise((resolve) => {
+    prepare_test(
+      {
+        [ID1]: [["onInstalling", false], "onInstalled"],
+      },
+      ["onInstallStarted", "onInstallEnded"],
+      resolve
+    );
+    install.install();
+  });
+
+  b1 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1, null);
+  equal(b1.version, "2.0");
+  ok(!b1.appDisabled);
+  ok(b1.userDisabled);
+  ok(!b1.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+
+  await checkBootstrappedPref();
+  await promiseRestartManager();
+
+  let b1_2 = await AddonManager.getAddonByID(ID1);
+  notEqual(b1_2, null);
+  equal(b1_2.version, "2.0");
+  ok(!b1_2.appDisabled);
+  ok(b1_2.userDisabled);
+  ok(!b1_2.isActive);
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+
+  await b1_2.uninstall();
+});
+
+// Tests that bootstrapped extensions don't get loaded when in safe mode
+add_task(async function test_16() {
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    promiseInstallFile(XPIS.test_bootstrap1_1),
+  ]);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  equal(b1.iconURL, "chrome://foo/skin/icon.png");
+  equal(b1.aboutURL, "chrome://foo/content/about.xul");
+  equal(b1.optionsURL, "chrome://foo/content/options.xul");
+
+  await promiseShutdownManager();
+
+  // Should have stopped
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+
+  gAppInfo.inSafeMode = true;
+  await promiseStartupManager();
+
+  let b1_2 = await AddonManager.getAddonByID(ID1);
+  // Should still be stopped
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  ok(!b1_2.isActive);
+  equal(b1_2.iconURL, null);
+  equal(b1_2.aboutURL, null);
+  equal(b1_2.optionsURL, null);
+
+  await promiseShutdownManager();
+  gAppInfo.inSafeMode = false;
+  await promiseStartupManager();
+
+  // Should have started
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+
+  let b1_3 = await AddonManager.getAddonByID(ID1);
+  await b1_3.uninstall();
+});
+
+// Check that a bootstrapped extension in a non-profile location is loaded
+add_task(async function test_17() {
+  await promiseShutdownManager();
+
+  await manuallyInstall(XPIS.test_bootstrap1_1, userExtDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  await checkBootstrappedPref();
+});
+
+// Check that installing a new bootstrapped extension in the profile replaces
+// the existing one
+add_task(async function test_18() {
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID1),
+    promiseInstallFile(XPIS.test_bootstrap1_2),
+  ]);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "2.0");
+  notEqual(b1, null);
+  equal(b1.version, "2.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  equal(getShutdownReason(), ADDON_UPGRADE);
+  equal(getUninstallReason(), ADDON_UPGRADE);
+  equal(getInstallReason(), ADDON_UPGRADE);
+  equal(getStartupReason(), ADDON_UPGRADE);
+
+  equal(getShutdownNewVersion(), 2);
+  equal(getUninstallNewVersion(), 2);
+  equal(getInstallOldVersion(), 1);
+  equal(getStartupOldVersion(), 1);
+
+  await checkBootstrappedPref();
+});
+
+// Check that uninstalling the profile version reveals the non-profile one
+add_task(async function test_19() {
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // The revealed add-on gets activated asynchronously
+  await new Promise((resolve) => {
+    prepare_test(
+      {
+        [ID1]: [
+          ["onUninstalling", false],
+          "onUninstalled",
+          ["onInstalling", false],
+          "onInstalled",
+        ],
+      },
+      [],
+      resolve
+    );
+
+    b1.uninstall();
+  });
+
+  b1 = await AddonManager.getAddonByID(ID1);
+  // Should have reverted to the older version
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  equal(getShutdownReason(), ADDON_DOWNGRADE);
+  equal(getUninstallReason(), ADDON_DOWNGRADE);
+  equal(getInstallReason(), ADDON_DOWNGRADE);
+  equal(getStartupReason(), ADDON_DOWNGRADE);
+
+  equal(getShutdownNewVersion(), "1.0");
+  equal(getUninstallNewVersion(), "1.0");
+  equal(getInstallOldVersion(), "2.0");
+  equal(getStartupOldVersion(), "2.0");
+
+  await checkBootstrappedPref();
+});
+
+// Check that a new profile extension detected at startup replaces the non-profile
+// one
+add_task(async function test_20() {
+  await promiseShutdownManager();
+
+  await manuallyInstall(XPIS.test_bootstrap1_2, profileDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "2.0");
+  notEqual(b1, null);
+  equal(b1.version, "2.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  equal(getShutdownReason(), APP_SHUTDOWN);
+  equal(getUninstallReason(), ADDON_UPGRADE);
+  equal(getInstallReason(), ADDON_UPGRADE);
+  equal(getStartupReason(), APP_STARTUP);
+
+  equal(getShutdownNewVersion(), undefined);
+  equal(getUninstallNewVersion(), 2);
+  equal(getInstallOldVersion(), 1);
+  equal(getStartupOldVersion(), undefined);
+});
+
+// Check that a detected removal reveals the non-profile one
+add_task(async function test_21() {
+  await promiseShutdownManager();
+
+  equal(getShutdownReason(), APP_SHUTDOWN);
+  equal(getShutdownNewVersion(), undefined);
+
+  manuallyUninstall(profileDir, ID1);
+  BootstrapMonitor.clear(ID1);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  // This won't be set as the bootstrap script was gone so we couldn't
+  // uninstall it properly
+  equal(getUninstallReason(), undefined);
+  equal(getUninstallNewVersion(), undefined);
+
+  equal(getInstallReason(), ADDON_DOWNGRADE);
+  equal(getInstallOldVersion(), 2);
+
+  equal(getStartupReason(), APP_STARTUP);
+  equal(getStartupOldVersion(), undefined);
+
+  await checkBootstrappedPref();
+  await promiseShutdownManager();
+
+  manuallyUninstall(userExtDir, ID1);
+  BootstrapMonitor.clear(ID1);
+
+  await promiseStartupManager();
+});
+
+// Check that an upgrade from the filesystem is detected and applied correctly
+add_task(async function test_22() {
+  await promiseShutdownManager();
+
+  let file = await manuallyInstall(XPIS.test_bootstrap1_1, profileDir, ID1);
+  if (file.isDirectory()) {
+    file.append("install.rdf");
+  }
+
+  // Make it look old so changes are detected
+  setExtensionModifiedTime(file, file.lastModifiedTime - 5000);
+
+  await promiseStartupManager();
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+
+  await promiseShutdownManager();
+
+  equal(getShutdownReason(), APP_SHUTDOWN);
+  equal(getShutdownNewVersion(), undefined);
+
+  manuallyUninstall(profileDir, ID1);
+  BootstrapMonitor.clear(ID1);
+  await manuallyInstall(XPIS.test_bootstrap1_2, profileDir, ID1);
+
+  await promiseStartupManager();
+
+  let b1_2 = await AddonManager.getAddonByID(ID1);
+  // Should have installed and started
+  BootstrapMonitor.checkAddonInstalled(ID1, "2.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "2.0");
+  notEqual(b1_2, null);
+  equal(b1_2.version, "2.0");
+  ok(b1_2.isActive);
+  ok(!b1_2.isSystem);
+
+  // This won't be set as the bootstrap script was gone so we couldn't
+  // uninstall it properly
+  equal(getUninstallReason(), undefined);
+  equal(getUninstallNewVersion(), undefined);
+
+  equal(getInstallReason(), ADDON_UPGRADE);
+  equal(getInstallOldVersion(), 1);
+  equal(getStartupReason(), APP_STARTUP);
+  equal(getStartupOldVersion(), undefined);
+
+  await checkBootstrappedPref();
+  await b1_2.uninstall();
+});
+
+// Tests that installing from a URL doesn't require a restart
+add_task(async function test_23() {
+  prepare_test({}, ["onNewInstall"]);
+
+  let url = "http://example.com/addons/test_bootstrap1_1.xpi";
+  let install = await AddonManager.getInstallForURL(url, {});
+
+  ensure_test_completed();
+
+  notEqual(install, null);
+
+  await new Promise((resolve) => {
+    prepare_test({}, ["onDownloadStarted", "onDownloadEnded"], () => {
+      equal(install.type, "extension");
+      equal(install.version, "1.0");
+      equal(install.name, "Test Bootstrap 1");
+      equal(install.state, AddonManager.STATE_DOWNLOADED);
+      equal(
+        install.addon.operationsRequiringRestart &
+          AddonManager.OP_NEEDS_RESTART_INSTALL,
+        0
+      );
+      do_check_not_in_crash_annotation(ID1, "1.0");
+
+      prepare_test(
+        {
+          [ID1]: [["onInstalling", false], "onInstalled"],
+        },
+        ["onInstallStarted", "onInstallEnded"],
+        resolve
+      );
+    });
+    install.install();
+  });
+
+  await checkBootstrappedPref();
+
+  let installs = await AddonManager.getAllInstalls();
+
+  // There should be no active installs now since the install completed and
+  // doesn't require a restart.
+  equal(installs.length, 0);
+
+  let b1 = await AddonManager.getAddonByID(ID1);
+
+  notEqual(b1, null);
+  equal(b1.version, "1.0");
+  ok(!b1.appDisabled);
+  ok(!b1.userDisabled);
+  ok(b1.isActive);
+  ok(!b1.isSystem);
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  equal(getStartupReason(), ADDON_INSTALL);
+  equal(getStartupOldVersion(), undefined);
+  do_check_in_crash_annotation(ID1, "1.0");
+
+  let dir = do_get_addon_root_uri(profileDir, ID1);
+  equal(b1.getResourceURI("bootstrap.js").spec, `${dir}bootstrap.js`);
+
+  await promiseRestartManager();
+
+  let b1_2 = await AddonManager.getAddonByID(ID1);
+  await b1_2.uninstall();
+});
+
+// Tests that we recover from a broken preference
+add_task(async function test_24() {
+  info("starting 24");
+
+  await Promise.all([
+    BootstrapMonitor.promiseAddonStartup(ID2),
+    promiseInstallAllFiles([XPIS.test_bootstrap1_1, XPIS.test_bootstrap2_1]),
+  ]);
+
+  info("test 24 got prefs");
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  BootstrapMonitor.checkAddonInstalled(ID2, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID2, "1.0");
+
+  await promiseRestartManager();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  BootstrapMonitor.checkAddonInstalled(ID2, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID2, "1.0");
+
+  await promiseShutdownManager();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID1);
+  BootstrapMonitor.checkAddonInstalled(ID2, "1.0");
+  BootstrapMonitor.checkAddonNotStarted(ID2);
+
+  // Break the JSON.
+  let data = aomStartup.readStartupData();
+  data["app-profile"].addons[ID1].path += "foo";
+
+  await IOUtils.writeUTF8(
+    gAddonStartup.path,
+    JSON.stringify(data),
+    { compress: true }
+  );
+
+  await promiseStartupManager();
+
+  BootstrapMonitor.checkAddonInstalled(ID1, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID1, "1.0");
+  BootstrapMonitor.checkAddonInstalled(ID2, "1.0");
+  BootstrapMonitor.checkAddonStarted(ID2, "1.0");
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_const.js b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_const.js
new file mode 100644
index 0000000000000..940fadf4cb15f
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_const.js
@@ -0,0 +1,24 @@
+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+const ADDONS = {
+  test_bootstrap_const: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap@tests.mozilla.org",
+    }),
+    "bootstrap.js":
+      'var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");\n\nconst install = function() {\n  Services.obs.notifyObservers(null, "addon-install");\n};\n',
+  },
+};
+
+add_task(async () => {
+  await promiseStartupManager();
+
+  let sawInstall = false;
+  Services.obs.addObserver(() => {
+    sawInstall = true;
+  }, "addon-install");
+
+  await AddonTestUtils.promiseInstallXPI(ADDONS.test_bootstrap_const);
+
+  ok(sawInstall);
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_globals.js b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_globals.js
new file mode 100644
index 0000000000000..24dabc3c47b2d
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrap_globals.js
@@ -0,0 +1,60 @@
+// This verifies that bootstrap.js has the expected globals defined
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+const ADDONS = {
+  bootstrap_globals: {
+    "install.rdf": createInstallRDF({
+      id: "bootstrap_globals@tests.mozilla.org",
+    }),
+    "bootstrap.js": String.raw`var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+var seenGlobals = new Set();
+var scope = this;
+function checkGlobal(name, type) {
+  if (scope[name] && typeof(scope[name]) == type)
+    seenGlobals.add(name);
+}
+
+var wrapped = {};
+Services.obs.notifyObservers({ wrappedJSObject: wrapped }, "bootstrap-request-globals");
+for (let [name, type] of wrapped.expectedGlobals) {
+  checkGlobal(name, type);
+}
+
+function startup(data, reason) {
+  Services.obs.notifyObservers({ wrappedJSObject: seenGlobals }, "bootstrap-seen-globals");
+}
+
+function install(data, reason) {}
+function shutdown(data, reason) {}
+function uninstall(data, reason) {}
+`,
+  },
+};
+
+const EXPECTED_GLOBALS = [["console", "object"]];
+
+async function _run_test() {
+  do_test_pending();
+  await promiseStartupManager();
+  let sawGlobals = false;
+
+  Services.obs.addObserver((subject) => {
+    subject.wrappedJSObject.expectedGlobals = EXPECTED_GLOBALS;
+  }, "bootstrap-request-globals");
+
+  Services.obs.addObserver(({ wrappedJSObject: seenGlobals }) => {
+    for (let [name] of EXPECTED_GLOBALS) {
+      Assert.ok(seenGlobals.has(name));
+    }
+
+    sawGlobals = true;
+  }, "bootstrap-seen-globals");
+
+  await AddonTestUtils.promiseInstallXPI(ADDONS.bootstrap_globals);
+  Assert.ok(sawGlobals);
+  await promiseShutdownManager();
+  do_test_finished();
+}
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_bootstrapped_chrome_manifest.js b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrapped_chrome_manifest.js
new file mode 100644
index 0000000000000..7556066277f46
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_bootstrapped_chrome_manifest.js
@@ -0,0 +1,49 @@
+const ADDON = {
+  "install.rdf": createInstallRDF({
+    id: "bug675371@tests.mozilla.org",
+  }),
+  "chrome.manifest": `content bug675371 .`,
+  "test.js": `var active = true;`,
+};
+
+add_task(async function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+  await promiseStartupManager();
+});
+
+function checkActive(expected) {
+  let target = { active: false };
+  let load = () => {
+    Services.scriptloader.loadSubScript(
+      "chrome://bug675371/content/test.js",
+      target
+    );
+  };
+
+  if (expected) {
+    load();
+  } else {
+    Assert.throws(load, /Error opening input stream/);
+  }
+  equal(target.active, expected, "Manifest is active?");
+}
+
+add_task(async function test() {
+  let { addon } = await AddonTestUtils.promiseInstallXPI(ADDON);
+
+  Assert.ok(addon.isActive);
+
+  // Tests that chrome.manifest is registered when the addon is installed.
+  checkActive(true);
+
+  await addon.disable();
+  checkActive(false);
+
+  await addon.enable();
+  checkActive(true);
+
+  await promiseShutdownManager();
+
+  // Tests that chrome.manifest remains registered at app shutdown.
+  checkActive(true);
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_invalid_install_rdf.js b/waterfox/browser/extensions/common/test/xpcshell/test_invalid_install_rdf.js
new file mode 100644
index 0000000000000..ac5f304ace9c3
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_invalid_install_rdf.js
@@ -0,0 +1,164 @@
+
+
+// Test that side-loaded extensions with invalid install.rdf files are
+// not initialized at startup.
+
+const APP_ID = "xpcshell@tests.mozilla.org";
+
+Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_USER);
+
+createAppInfo(APP_ID, "XPCShell", "1", "1.9.2");
+
+const userAppDir = AddonTestUtils.profileDir.clone();
+userAppDir.append("app-extensions");
+userAppDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+AddonTestUtils.registerDirectory("XREUSysExt", userAppDir);
+
+const userExtensions = userAppDir.clone();
+userExtensions.append(APP_ID);
+userExtensions.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+
+XPCOMUtils.defineLazyServiceGetters(this, {
+  ChromeRegistry: [
+    "@mozilla.org/chrome/chrome-registry;1",
+    "nsIChromeRegistry",
+  ],
+});
+
+function hasChromeEntry(package) {
+  try {
+    void ChromeRegistry.convertChromeURL(
+      Services.io.newURI(`chrome://${package}/content/`)
+    );
+    return true;
+  } catch (_e) {
+    return false;
+  }
+}
+
+add_task(async () => {
+  await promiseWriteInstallRDFToXPI(
+    {
+      id: "langpack-foo@addons.mozilla.org",
+      version: "1.0",
+      type: 8,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Invalid install.rdf extension",
+    },
+    userExtensions,
+    undefined,
+    {
+      "chrome.manifest": `
+      content foo-langpack ./
+    `,
+    }
+  );
+
+  await promiseWriteInstallRDFToXPI(
+    {
+      id: "foo@addons.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Invalid install.rdf extension",
+    },
+    userExtensions,
+    undefined,
+    {
+      "chrome.manifest": `
+      content foo ./
+    `,
+    }
+  );
+
+  await promiseWriteInstallRDFToXPI(
+    {
+      id: "foo-legacy-legacy@addons.mozilla.org",
+      version: "1.0",
+      bootstrap: false,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Invalid install.rdf extension",
+    },
+    userExtensions,
+    undefined,
+    {
+      "chrome.manifest": `
+      content foo-legacy-legacy ./
+    `,
+    }
+  );
+
+  equal(
+    hasChromeEntry("foo-langpack"),
+    false,
+    "Should not have registered foo-langpack resource before AOM startup"
+  );
+  equal(
+    hasChromeEntry("foo-legacy-legacy"),
+    false,
+    "Should not have registered foo-legacy-legacy resource before AOM startup"
+  );
+  equal(
+    hasChromeEntry("foo"),
+    false,
+    "Should not have registered foo resource before AOM startup"
+  );
+
+  await promiseStartupManager();
+
+  equal(
+    hasChromeEntry("foo-langpack"),
+    false,
+    "Should not have registered chrome manifest for invalid extension"
+  );
+  equal(
+    hasChromeEntry("foo-legacy-legacy"),
+    false,
+    "Should not have registered chrome manifest for non-restartless extension"
+  );
+  equal(
+    hasChromeEntry("foo"),
+    true,
+    "Should have registered chrome manifest for valid extension"
+  );
+
+  await promiseRestartManager();
+
+  equal(
+    hasChromeEntry("foo-langpack"),
+    false,
+    "Should still not have registered chrome manifest for invalid extension after restart"
+  );
+  equal(
+    hasChromeEntry("foo-legacy-legacy"),
+    false,
+    "Should still not have registered chrome manifest for non-restartless extension"
+  );
+  equal(
+    hasChromeEntry("foo"),
+    true,
+    "Should still have registered chrome manifest for valid extension after restart"
+  );
+
+  await promiseShutdownManager();
+
+  userAppDir.remove(true);
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_manifest.js b/waterfox/browser/extensions/common/test/xpcshell/test_manifest.js
new file mode 100644
index 0000000000000..2a26f61f6ab66
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_manifest.js
@@ -0,0 +1,801 @@
+// This tests that all properties are read from the install manifests and that
+// items are correctly enabled/disabled based on them (blocklist tests are
+// elsewhere)
+
+const ADDONS = [
+  {
+    "install.rdf": {
+      id: "addon1@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      aboutURL: "chrome://test/content/about.xul",
+      iconURL: "chrome://test/skin/icon.png",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 1",
+      description: "Test Description",
+      creator: "Test Creator",
+      homepageURL: "http://www.example.com",
+      developer: ["Test Developer 1", "Test Developer 2"],
+      translator: ["Test Translator 1", "Test Translator 2"],
+      contributor: ["Test Contributor 1", "Test Contributor 2"],
+    },
+
+    expected: {
+      id: "addon1@tests.mozilla.org",
+      type: "extension",
+      version: "1.0",
+      optionsType: null,
+      aboutURL: "chrome://test/content/about.xul",
+      iconURL: "chrome://test/skin/icon.png",
+      icons: {
+        32: "chrome://test/skin/icon.png",
+        48: "chrome://test/skin/icon.png",
+      },
+      name: "Test Addon 1",
+      description: "Test Description",
+      creator: "Test Creator",
+      homepageURL: "http://www.example.com",
+      developers: ["Test Developer 1", "Test Developer 2"],
+      translators: ["Test Translator 1", "Test Translator 2"],
+      contributors: ["Test Contributor 1", "Test Contributor 2"],
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      providesUpdatesSecurely: true,
+      blocklistState: Ci.nsIBlocklistService.STATE_NOT_BLOCKED,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon2@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      updateURL: "https://www.foo.com",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 2",
+    },
+
+    expected: {
+      id: "addon2@tests.mozilla.org",
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      providesUpdatesSecurely: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon3@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      updateURL: "http://www.foo.com",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 3",
+    },
+
+    expected: {
+      id: "addon3@tests.mozilla.org",
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      providesUpdatesSecurely: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon4@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      updateURL: "http://www.foo.com",
+      updateKey: "foo",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 4",
+    },
+
+    expected: {
+      id: "addon4@tests.mozilla.org",
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      providesUpdatesSecurely: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon5@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "*",
+        },
+      ],
+      name: "Test Addon 5",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon6@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "0",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 6",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon7@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "0",
+          maxVersion: "0",
+        },
+      ],
+      name: "Test Addon 7",
+    },
+
+    expected: {
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      isCompatible: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon8@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1.1",
+          maxVersion: "*",
+        },
+      ],
+      name: "Test Addon 8",
+    },
+
+    expected: {
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      isCompatible: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon9@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9.2",
+          maxVersion: "1.9.*",
+        },
+      ],
+      name: "Test Addon 9",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon10@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9.2.1",
+          maxVersion: "1.9.*",
+        },
+      ],
+      name: "Test Addon 10",
+    },
+
+    expected: {
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      isCompatible: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon11@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9",
+          maxVersion: "1.9.2",
+        },
+      ],
+      name: "Test Addon 11",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon12@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9",
+          maxVersion: "1.9.1.*",
+        },
+      ],
+      name: "Test Addon 12",
+    },
+
+    expected: {
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      isCompatible: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon13@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9",
+          maxVersion: "1.9.*",
+        },
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "0",
+          maxVersion: "0.5",
+        },
+      ],
+      name: "Test Addon 13",
+    },
+
+    expected: {
+      isActive: false,
+      userDisabled: false,
+      appDisabled: true,
+      isCompatible: false,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon14@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "toolkit@mozilla.org",
+          minVersion: "1.9",
+          maxVersion: "1.9.1",
+        },
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 14",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon15@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      updateKey: "foo",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 15",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      providesUpdatesSecurely: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon16@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      updateKey: "foo",
+      updateURL: "https://www.foo.com",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 16",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      providesUpdatesSecurely: true,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon17@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsURL: "chrome://test/content/options.xul",
+      optionsType: "2",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 17",
+    },
+
+    // An obsolete optionsType means the add-on isn't registered.
+    expected: null,
+  },
+
+  {
+    "install.rdf": {
+      id: "addon18@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 18",
+    },
+    extraFiles: { "options.xul": "" },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      optionsURL: null,
+      optionsType: null,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon19@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "99",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 19",
+    },
+
+    expected: null,
+  },
+
+  {
+    "install.rdf": {
+      id: "addon20@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsURL: "chrome://test/content/options.xul",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 20",
+    },
+
+    // Even with a defined optionsURL optionsType is null by default.
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      optionsURL: "chrome://test/content/options.xul",
+      optionsType: null,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon21@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "3",
+      optionsURL: "chrome://test/content/options.xul",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 21",
+    },
+
+    expected: {
+      isActive: true,
+      userDisabled: false,
+      appDisabled: false,
+      isCompatible: true,
+      optionsURL: "chrome://test/content/options.xul",
+      optionsType: AddonManager.OPTIONS_TYPE_TAB,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon22@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "2",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 22",
+    },
+
+    // An obsolete optionsType means the add-on isn't registered.
+    expected: null,
+  },
+
+  {
+    "install.rdf": {
+      id: "addon23@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "2",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 23",
+    },
+    extraFiles: { "options.xul": "" },
+
+    // An obsolete optionsType means the add-on isn't registered.
+    expected: null,
+  },
+
+  {
+    "install.rdf": {
+      id: "addon24@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 24",
+    },
+    extraFiles: { "options.xul": "" },
+
+    expected: {
+      optionsType: null,
+      optionsURL: null,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon25@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "3",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 25",
+    },
+
+    expected: {
+      optionsType: null,
+      optionsURL: null,
+    },
+  },
+
+  {
+    "install.rdf": {
+      id: "addon26@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      optionsType: "4",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+      name: "Test Addon 26",
+    },
+    extraFiles: { "options.xul": "" },
+    expected: null,
+  },
+
+  // Tests compatibility based on target platforms.
+
+  // No targetPlatforms so should be compatible
+  {
+    "install.rdf": {
+      id: "tp-addon1@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      name: "Test 1",
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    },
+
+    expected: {
+      appDisabled: false,
+      isPlatformCompatible: true,
+      isActive: true,
+    },
+  },
+
+  // Matches the OS
+  {
+    "install.rdf": {
+      id: "tp-addon2@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      name: "Test 2",
+      targetPlatforms: ["XPCShell", "WINNT_x86", "XPCShell"],
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    },
+
+    expected: {
+      appDisabled: false,
+      isPlatformCompatible: true,
+      isActive: true,
+    },
+  },
+
+  // Matches the OS and ABI
+  {
+    "install.rdf": {
+      id: "tp-addon3@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      name: "Test 3",
+      targetPlatforms: ["WINNT", "XPCShell_noarch-spidermonkey"],
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    },
+
+    expected: {
+      appDisabled: false,
+      isPlatformCompatible: true,
+      isActive: true,
+    },
+  },
+
+  // Doesn't match
+  {
+    "install.rdf": {
+      id: "tp-addon4@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      name: "Test 4",
+      targetPlatforms: [
+        "WINNT_noarch-spidermonkey",
+        "Darwin",
+        "WINNT_noarch-spidermonkey",
+      ],
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    },
+
+    expected: {
+      appDisabled: true,
+      isPlatformCompatible: false,
+      isActive: false,
+    },
+  },
+
+  // Matches the OS but since a different entry specifies ABI this doesn't match.
+  {
+    "install.rdf": {
+      id: "tp-addon5@tests.mozilla.org",
+      version: "1.0",
+      bootstrap: true,
+      name: "Test 5",
+      targetPlatforms: ["XPCShell", "XPCShell_foo"],
+      targetApplications: [
+        {
+          id: "xpcshell@tests.mozilla.org",
+          minVersion: "1",
+          maxVersion: "1",
+        },
+      ],
+    },
+
+    expected: {
+      appDisabled: true,
+      isPlatformCompatible: false,
+      isActive: false,
+    },
+  },
+];
+
+const IDS = ADDONS.map((a) => a["install.rdf"].id);
+
+add_task(async function setup() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+  const profileDir = gProfD.clone();
+  profileDir.append("extensions");
+
+  for (let addon of ADDONS) {
+    await promiseWriteInstallRDFForExtension(
+      addon["install.rdf"],
+      profileDir,
+      undefined,
+      addon.extraFiles
+    );
+  }
+});
+
+add_task(async function test_values() {
+  await promiseStartupManager();
+
+  let addons = await getAddons(IDS);
+
+  for (let addon of ADDONS) {
+    let { id } = addon["install.rdf"];
+    checkAddon(id, addons.get(id), addon.expected);
+  }
+
+  await promiseShutdownManager();
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/test_manifest_locales.js b/waterfox/browser/extensions/common/test/xpcshell/test_manifest_locales.js
new file mode 100644
index 0000000000000..0cafa6d523171
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/test_manifest_locales.js
@@ -0,0 +1,134 @@
+const ID = "bug397778@tests.mozilla.org";
+
+const ADDON = createInstallRDF({
+  id: "bug397778@tests.mozilla.org",
+  version: "1.0",
+  name: "Fallback Name",
+  description: "Fallback Description",
+  bootstrap: true,
+
+  targetApplications: [
+    {
+      id: "xpcshell@tests.mozilla.org",
+      minVersion: "1",
+      maxVersion: "1",
+    },
+  ],
+
+  localized: [
+    {
+      locale: ["fr"],
+      name: "fr Name",
+      description: "fr Description",
+    },
+    {
+      locale: ["de-DE"],
+      name: "Deutsches W\u00f6rterbuch",
+    },
+    {
+      locale: ["es-ES"],
+      name: "es-ES Name",
+      description: "es-ES Description",
+    },
+    {
+      locale: ["zh-TW"],
+      name: "zh-TW Name",
+      description: "zh-TW Description",
+    },
+    {
+      locale: ["zh-CN"],
+      name: "zh-CN Name",
+      description: "zh-CN Description",
+    },
+    {
+      locale: ["en-GB"],
+      name: "en-GB Name",
+      description: "en-GB Description",
+    },
+    {
+      locale: ["en"],
+      name: "en Name",
+      description: "en Description",
+    },
+    {
+      locale: ["en-CA"],
+      name: "en-CA Name",
+      description: "en-CA Description",
+    },
+  ],
+});
+
+add_task(async function setup() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
+  Services.locale.requestedLocales = ["fr-FR"];
+
+  await promiseStartupManager();
+  await promiseInstallXPI(ADDON);
+});
+
+add_task(async function test_1() {
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.name, "fr Name");
+  Assert.equal(addon.description, "fr Description");
+
+  await addon.disable();
+  await promiseRestartManager();
+
+  let newAddon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(newAddon, null);
+  Assert.equal(newAddon.name, "fr Name");
+});
+
+add_task(async function test_2() {
+  // Change locale. The more specific de-DE is the best match
+  await restartWithLocales(["de"]);
+
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.name, "Deutsches W\u00f6rterbuch");
+  Assert.equal(addon.description, null);
+});
+
+add_task(async function test_3() {
+  // Change locale. Locale case should have no effect
+  await restartWithLocales(["DE-de"]);
+
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.name, "Deutsches W\u00f6rterbuch");
+  Assert.equal(addon.description, null);
+});
+
+add_task(async function test_4() {
+  // Change locale. es-ES should closely match
+  await restartWithLocales(["es-AR"]);
+
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.name, "es-ES Name");
+  Assert.equal(addon.description, "es-ES Description");
+});
+
+add_task(async function test_5() {
+  // Change locale. Either zh-CN or zh-TW could match
+  await restartWithLocales(["zh"]);
+
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  ok(
+    addon.name === "zh-TW Name" || addon.name === "zh-CN Name",
+    `Add-on name mismatch: ${addon.name}`
+  );
+});
+
+add_task(async function test_6() {
+  // Unknown locale should try to match against en-US as well. Of en,en-GB
+  // en should match as being less specific
+  await restartWithLocales(["nl-NL"]);
+
+  let addon = await AddonManager.getAddonByID(ID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.name, "en Name");
+  Assert.equal(addon.description, "en Description");
+});
diff --git a/waterfox/browser/extensions/common/test/xpcshell/xpcshell.ini b/waterfox/browser/extensions/common/test/xpcshell/xpcshell.ini
new file mode 100644
index 0000000000000..d46070686a21b
--- /dev/null
+++ b/waterfox/browser/extensions/common/test/xpcshell/xpcshell.ini
@@ -0,0 +1,13 @@
+[DEFAULT]
+tags = addons
+head = head_addons.js
+support-files =
+  data/**
+
+[test_bootstrap.js]
+[test_bootstrap_const.js]
+[test_bootstrap_globals.js]
+[test_bootstrapped_chrome_manifest.js]
+[test_invalid_install_rdf.js]
+[test_manifest.js]
+[test_manifest_locales.js]
diff --git a/waterfox/browser/installer/linux/debian/changelog.in b/waterfox/browser/installer/linux/debian/changelog.in
new file mode 100644
index 0000000000000..53bf99b349c07
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/changelog.in
@@ -0,0 +1,4 @@
+${PKG_NAME} (${PKG_VERSION}) UNRELEASED; urgency=low
+  * Automated repackaging for ${PKG_VERSION}
+
+ -- Alex Kontos <MrAlex94@users.noreply.github.com> ${CHANGELOG_DATE}
diff --git a/waterfox/browser/installer/linux/debian/compat b/waterfox/browser/installer/linux/debian/compat
new file mode 100644
index 0000000000000..9a037142aa3c1
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/compat
@@ -0,0 +1 @@
+10
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/control.in b/waterfox/browser/installer/linux/debian/control.in
new file mode 100644
index 0000000000000..3e650d6232598
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/control.in
@@ -0,0 +1,14 @@
+Source: ${PKG_NAME}
+Section: web
+Priority: optional
+Maintainer: BrowserWorks
+Standards-Version: 4.6.2
+Build-Depends: debhelper (>= 9)
+Homepage: https://www.waterfox.com
+
+Package: ${PKG_NAME}
+Architecture: ${ARCH_NAME}
+Depends: ${DEPENDS}
+Recommends: curl | wget, gnupg, ca-certificates
+Provides: gnome-www-browser, www-browser
+Description: ${DESCRIPTION}
diff --git a/waterfox/browser/installer/linux/debian/dirs b/waterfox/browser/installer/linux/debian/dirs
new file mode 100644
index 0000000000000..3c292ce6bc85d
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib/waterfox
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/install.in b/waterfox/browser/installer/linux/debian/install.in
new file mode 100644
index 0000000000000..881cb12506d3a
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/install.in
@@ -0,0 +1,2 @@
+waterfox/* ${PKG_INSTALL_PATH}
+debian/${PKG_NAME}.desktop usr/share/applications
diff --git a/waterfox/browser/installer/linux/debian/links.in b/waterfox/browser/installer/linux/debian/links.in
new file mode 100644
index 0000000000000..9306f8cce7052
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/links.in
@@ -0,0 +1,12 @@
+${PKG_INSTALL_PATH}/waterfox usr/bin/${PKG_NAME}
+${PKG_INSTALL_PATH}/waterfox usr/bin/waterfox
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/${PKG_NAME}.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/${PKG_NAME}.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default48.png usr/share/icons/hicolor/48x48/apps/${PKG_NAME}.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/${PKG_NAME}.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/${PKG_NAME}.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/waterfox.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/waterfox.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default48.png usr/share/icons/hicolor/48x48/apps/waterfox.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/waterfox.png
+${PKG_INSTALL_PATH}/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/waterfox.png
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/manpage.1.in b/waterfox/browser/installer/linux/debian/manpage.1.in
new file mode 100644
index 0000000000000..c199d4498be89
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/manpage.1.in
@@ -0,0 +1,90 @@
+.TH ${DISPLAY_NAME} 1 "${MANPAGE_DATE}" waterfox "Linux User's Manual"
+.SH NAME
+waterfox \- ${DISPLAY_NAME} offers safe and easy web browsing
+.SH SYNOPSIS
+.B waterfox
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.B /usr/lib/waterfox/waterfox
+[\fIOPTIONS\fR] [\fIURL\fR]
+.SH DESCRIPTION
+\fB${DISPLAY_NAME}\fR is an open-source web browser, designed for standards
+compliance, performance, privacy, and portability. It supports a wide range
+of modern web technologies and extensions.
+.SH USAGE
+If there is a \fB${DISPLAY_NAME}\fR browser already running, invoking
+\fBwaterfox\fR will arrange for it to create a new browser window; otherwise
+it will start a new instance.
+.SH OPTIONS
+A summary of commonly used options is included below. For the full list,
+run \fBwaterfox \-\-help\fR.
+.SS "X11 options"
+.TP
+.BI \-\-display= DISPLAY
+Use the specified X display.
+.TP
+.B \-\-sync
+Make X calls synchronous.
+.TP
+.B \-\-no\-xshm
+Do not use X shared memory extension.
+.SS "Browser options"
+.TP
+.B \-h, \-\-help
+Show summary of options and exit.
+.TP
+.B \-v, \-\-version
+Print ${DISPLAY_NAME} version and exit.
+.TP
+\fB\-P\fR [\fIprofile\fR]
+Start with \fIprofile\fR. When no profile is given, displays the Profile Manager.
+This may require \fB\-\-no\-remote\fR.
+.TP
+.B \-ProfileManager
+Start with Profile Manager. May require \fB\-\-no\-remote\fR.
+.TP
+.B \-\-no\-remote
+Do not connect to a running ${DISPLAY_NAME} instance. Use with options that
+would otherwise be sent to an existing process.
+.TP
+\fB\-\-new\-window\fR \fIURL\fR
+Open \fIURL\fR in a new window.
+.TP
+\fB\-\-new\-tab\fR \fIURL\fR
+Open \fIURL\fR in a new tab.
+.TP
+.B \-\-private\-window
+Open a new private browsing window.
+.TP
+\fB\-\-safe\-mode\fR
+Start ${DISPLAY_NAME} in Troubleshoot Mode (extensions disabled).
+.TP
+.B \-\-headless
+Run without a visible UI (useful for testing/automation).
+.TP
+\fB\-\-Profile\fR \fIPATH\fR
+Start with the profile located at \fIPATH\fR.
+.SH ENVIRONMENT
+.TP
+.B MOZ_GDK_DISPLAY
+When set, overrides the display passed down to GTK on X11-only builds. Normally
+set by the parent process on launch with \fB\-\-display\fR.
+.TP
+.B MOZ_ENABLE_WAYLAND
+Set to 1 to prefer Wayland backend on supported environments.
+.SH FILES
+.TP
+\fI/usr/bin/waterfox\fR
+Symbolic link to \fB/usr/lib/waterfox/waterfox\fR.
+.TP
+\fI/usr/lib/waterfox/waterfox\fR
+${DISPLAY_NAME} executable.
+.TP
+\fI/usr/lib/waterfox/waterfox\-bin\fR
+Legacy executable.
+.SH BUGS
+Report issues at \fIhttps://github.com/BrowserWorks/Waterfox/issues\fR.
+.SH AUTHORS
+.TP
+.B BrowserWorks
+.I https://www.waterfox.com
diff --git a/waterfox/browser/installer/linux/debian/manpages.in b/waterfox/browser/installer/linux/debian/manpages.in
new file mode 100644
index 0000000000000..de88540d51bad
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/manpages.in
@@ -0,0 +1 @@
+debian/${PKG_NAME}.1
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/package-prefs.js b/waterfox/browser/installer/linux/debian/package-prefs.js
new file mode 100644
index 0000000000000..49ff6c84110b5
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/package-prefs.js
@@ -0,0 +1,27 @@
+/* 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/.
+ */
+
+/*
+ * Package defaults for Waterfox (Debian repackaging).
+ * This file is installed into defaults/pref/package-prefs.js by the repackager.
+ *
+ * These preferences are intended for distribution-level defaults, not user
+ * settings. They can be overridden by user prefs in profiles.
+ */
+
+/* Improve startup performance on multi-process by enabling the forkserver. */
+pref("dom.ipc.forkserver.enable", true);
+
+/* Disable in-app updates when installed via system packages. */
+pref("app.update.enabled", false);
+pref("app.update.auto", false);
+pref("app.update.autoInstallEnabled", false);
+pref("app.update.staging.enabled", false);
+pref("app.update.background.enabled", false);
+
+/* Optional distribution identifiers to help diagnostics. */
+pref("distribution.id", "waterfox-debian");
+pref("distribution.version", "1");
+pref("distribution.about", "Waterfox packaged for Debian");
diff --git a/waterfox/browser/installer/linux/debian/postinst.in b/waterfox/browser/installer/linux/debian/postinst.in
new file mode 100644
index 0000000000000..99078d5bb9958
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/postinst.in
@@ -0,0 +1,93 @@
+#!/bin/sh -e
+# postinst script for Waterfox
+# Sets system alternatives for x-www-browser and gnome-www-browser to Waterfox.
+
+set -e
+
+case "$$1" in
+  configure|abort-upgrade|abort-remove|abort-deconfigure)
+    # Configure Waterfox apt source and keyring for self-updates
+    KEYRING="/usr/share/keyrings/waterfox-archive-keyring.gpg"
+    LIST_FILE="/etc/apt/sources.list.d/waterfox.list"
+    ARCH="$$(dpkg --print-architecture)"
+
+    # Determine codename
+    if command -v lsb_release >/dev/null 2>&1; then
+      CODENAME="$$(lsb_release -sc)"
+    elif [ -r /etc/os-release ]; then
+      . /etc/os-release
+      CODENAME="$${VERSION_CODENAME:-}"
+    fi
+    [ -n "$$CODENAME" ] || CODENAME="bookworm"
+
+    REPO_LINE="deb [arch=$${ARCH} signed-by=$${KEYRING}] https://pkg.waterfox.net/waterfox $${CODENAME} main"
+
+    # Ensure keyring directory exists
+    mkdir -p "/usr/share/keyrings" || true
+
+    # Install keyring if shipped as ASCII armor (optional)
+    # If the keyring is already installed by the package payload, this is a no-op.
+    if [ ! -s "$$KEYRING" ] && [ -r /usr/share/waterfox/waterfox.asc ]; then
+      if command -v gpg >/dev/null 2>&1; then
+        gpg --dearmor </usr/share/waterfox/waterfox.asc >"$$KEYRING" || true
+        chmod 0644 "$$KEYRING" || true
+      fi
+    fi
+
+    # Try to fetch keyring from pkg.waterfox.net if not bundled
+    if [ ! -s "$$KEYRING" ]; then
+      KEY_URL_GPG="https://pkg.waterfox.net/waterfox/waterfox-archive-keyring.gpg"
+      KEY_URL_ASC="https://pkg.waterfox.net/waterfox/waterfox.asc"
+      if command -v curl >/dev/null 2>&1; then
+        curl -fsSL "$$KEY_URL_GPG" -o "$$KEYRING" || true
+        if [ ! -s "$$KEYRING" ] && command -v gpg >/dev/null 2>&1; then
+          curl -fsSL "$$KEY_URL_ASC" | gpg --dearmor >"$$KEYRING" || true
+        fi
+      elif command -v wget >/dev/null 2>&1; then
+        wget -qO "$$KEYRING" "$$KEY_URL_GPG" || true
+        if [ ! -s "$$KEYRING" ] && command -v gpg >/dev/null 2>&1; then
+          wget -qO- "$$KEY_URL_ASC" | gpg --dearmor >"$$KEYRING" || true
+        fi
+      fi
+      chmod 0644 "$$KEYRING" || true
+    fi
+
+    mkdir -p "$$(dirname "$$LIST_FILE")"
+    if [ -f "$$LIST_FILE" ]; then
+      if ! grep -qF "$$REPO_LINE" "$$LIST_FILE"; then
+        sed -i 's|^deb .*pkg\.waterfox\.net.*$$||' "$$LIST_FILE" || true
+        echo "$$REPO_LINE" >> "$$LIST_FILE"
+      fi
+    else
+      echo "$$REPO_LINE" > "$$LIST_FILE"
+    fi
+
+    if command -v update-alternatives >/dev/null 2>&1; then
+      update-alternatives --install /usr/bin/gnome-www-browser \
+        gnome-www-browser /usr/bin/${PKG_NAME} 100 \
+        --slave /usr/share/man/man1/gnome-www-browser.1.gz \
+        gnome-www-browser.1.gz /usr/share/man/man1/${PKG_NAME}.1.gz || true
+
+      update-alternatives --install /usr/bin/x-www-browser \
+        x-www-browser /usr/bin/${PKG_NAME} 100 \
+        --slave /usr/share/man/man1/x-www-browser.1.gz \
+        x-www-browser.1.gz /usr/share/man/man1/${PKG_NAME}.1.gz || true
+    fi
+    ;;
+esac
+
+# Refresh icon cache if available
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for dir in /usr/share/icons/hicolor; do
+    if [ -d "$$dir" ]; then
+      gtk-update-icon-cache -q "$$dir" || true
+    fi
+  done
+fi
+
+# Update desktop database if available
+if [ -x /usr/bin/update-desktop-database ]; then
+  update-desktop-database -q || true
+fi
+
+exit 0
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/postrm.in b/waterfox/browser/installer/linux/debian/postrm.in
new file mode 100644
index 0000000000000..e45434c569a9b
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/postrm.in
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+# postrm script for Waterfox
+# Refreshes desktop and icon caches after removal/purge.
+
+set -e
+
+case "$$1" in
+  remove|purge|disappear)
+    # Refresh icon cache if available
+    if [ -x /usr/bin/gtk-update-icon-cache ]; then
+      if [ -d /usr/share/icons/hicolor ]; then
+        /usr/bin/gtk-update-icon-cache -q /usr/share/icons/hicolor || true
+      fi
+    fi
+
+    # Refresh desktop database if available
+    if [ -x /usr/bin/update-desktop-database ]; then
+      /usr/bin/update-desktop-database -q || true
+    fi
+
+    # If purging, remove Waterfox apt source and keyring
+    if [ "$$1" = "purge" ]; then
+      rm -f /etc/apt/sources.list.d/waterfox.list || true
+      rm -f /usr/share/keyrings/waterfox-archive-keyring.gpg || true
+    fi
+    ;;
+
+  upgrade|failed-upgrade|abort-install|abort-upgrade)
+    # Nothing to do for these actions
+    ;;
+esac
+
+exit 0
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/prerm.in b/waterfox/browser/installer/linux/debian/prerm.in
new file mode 100644
index 0000000000000..20bd15284451c
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/prerm.in
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+# prerm script for Waterfox
+# Cleans up system alternatives when removing the package.
+
+set -e
+
+case "$$1" in
+  remove|deconfigure)
+    if command -v update-alternatives >/dev/null 2>&1; then
+      # Remove Waterfox alternatives registrations if present
+      update-alternatives --remove x-www-browser /usr/bin/${PKG_NAME} || true
+      update-alternatives --remove gnome-www-browser /usr/bin/${PKG_NAME} || true
+    fi
+    ;;
+  upgrade)
+    # Nothing to do on upgrade
+    ;;
+  failed-upgrade|abort-install|abort-upgrade)
+    # Nothing to do on failed/aborted operations
+    ;;
+esac
+
+exit 0
\ No newline at end of file
diff --git a/waterfox/browser/installer/linux/debian/rules b/waterfox/browser/installer/linux/debian/rules
new file mode 100644
index 0000000000000..9f6a4920be743
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# Waterfox Debian packaging rules (debhelper, simple dh sequence)
+# This package repackages prebuilt binaries; we skip build/test stages.
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
+
+# Avoid touching .xpi files for reproducibility (they are already signed/packed)
+override_dh_strip_nondeterminism:
+	dh_strip_nondeterminism -Xxpi
+
+# Skip auto configure/build/test โ€” binaries are prebuilt
+override_dh_auto_configure override_dh_auto_build override_dh_auto_test:
+	@echo "Skipping auto-configure/build/test (prebuilt binaries)."
+
+# Do not run dh_auto_install; installation is driven by debian/install
+override_dh_auto_install:
+	@echo "Skipping dh_auto_install; using dh_install mappings."
+	:
+
+# Perform file installation via debian/install and symlinks via debian/links
+override_dh_install:
+	dh_install
diff --git a/waterfox/browser/installer/linux/debian/waterfox.desktop b/waterfox/browser/installer/linux/debian/waterfox.desktop
new file mode 100644
index 0000000000000..bc3455b390dcb
--- /dev/null
+++ b/waterfox/browser/installer/linux/debian/waterfox.desktop
@@ -0,0 +1,23 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Waterfox
+GenericName=Web Browser
+Comment=Browse the World Wide Web
+Exec=waterfox %u
+Icon=waterfox
+Terminal=false
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
+StartupNotify=true
+StartupWMClass=waterfox
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Actions=new-window;new-private-window;
+
+[Desktop Action new-window]
+Name=New Window
+Exec=waterfox --new-window %u
+
+[Desktop Action new-private-window]
+Name=New Private Window
+Exec=waterfox --private-window %u
diff --git a/waterfox/browser/locales b/waterfox/browser/locales
new file mode 160000
index 0000000000000..5889642a59bf9
--- /dev/null
+++ b/waterfox/browser/locales
@@ -0,0 +1 @@
+Subproject commit 5889642a59bf99590ff704624ee4e0b172e6b361
diff --git a/waterfox/browser/moz.build b/waterfox/browser/moz.build
new file mode 100644
index 0000000000000..cec954d97ca84
--- /dev/null
+++ b/waterfox/browser/moz.build
@@ -0,0 +1,23 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+DIRS += [
+    "components",
+    "extensions/common",
+    "locales",
+    "themes",
+    ]
+
+DIST_SUBDIR = "browser"
+export("DIST_SUBDIR")
+
+JS_PREFERENCE_PP_FILES += [
+    "app/profile/00-general.js",
+    "app/profile/01-theme.js",
+    "app/profile/02-privacy.js",
+    "app/profile/03-features.js",
+    "app/profile/04-sidebar.js",
+]
diff --git a/waterfox/browser/themes/jar.mn b/waterfox/browser/themes/jar.mn
new file mode 100644
index 0000000000000..f77fc6e4cca86
--- /dev/null
+++ b/waterfox/browser/themes/jar.mn
@@ -0,0 +1,11 @@
+# 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/.
+
+browser.jar:
+%  skin browser classic/1.0 %skin/classic/browser/
+ skin/classic/browser/userChrome.css              (lepton/leptonChrome.css)
+ skin/classic/browser/userContent.css             (lepton/leptonContent.css)
+ skin/classic/browser/lepton/                     (lepton/icons/*.svg)
+* skin/classic/browser/waterfox/general.css       (waterfox/general.css)
+ skin/classic/browser/waterfox/tree-vertical-tabs-24x24.svg (waterfox/tree-vertical-tabs-24x24.svg)
diff --git a/waterfox/browser/themes/lepton/icons/Forest-trees-sunset-art-picture_3840x2160.jpg b/waterfox/browser/themes/lepton/icons/Forest-trees-sunset-art-picture_3840x2160.jpg
new file mode 100644
index 0000000000000..674893e421990
Binary files /dev/null and b/waterfox/browser/themes/lepton/icons/Forest-trees-sunset-art-picture_3840x2160.jpg differ
diff --git a/waterfox/browser/themes/lepton/icons/add-device.svg b/waterfox/browser/themes/lepton/icons/add-device.svg
new file mode 100644
index 0000000000000..aea41fc1037c7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/add-device.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 7.25h-3a.75.75 0 0 0-.75.75v6c0 .414.336.75.75.75h3a.75.75 0 0 0 .75-.75V8a.75.75 0 0 0-.75-.75ZM11 6a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-3Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M1.255 4.63c0-.76.616-1.375 1.375-1.375h6.74c.76 0 1.375.616 1.375 1.375v.38c.084-.006.17-.01.255-.01h.995v-.37A2.625 2.625 0 0 0 9.37 2.005H2.63A2.625 2.625 0 0 0 .005 4.63v4.74a2.625 2.625 0 0 0 2.625 2.625h2.375v1.75H2.63a.625.625 0 1 0 0 1.25h5.539A2.995 2.995 0 0 1 8 14v-.255H6.255v-1.75H8v-1.25H2.63c-.76 0-1.375-.616-1.375-1.375V4.63Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/addons-logo.svg b/waterfox/browser/themes/lepton/icons/addons-logo.svg
new file mode 100644
index 0000000000000..4c643af6ec3f4
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/addons-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="581" width="598"><path fill="context-fill" d="M119.31 4.67c8.3 3.84 14.62 10.74 20.12 17.85 5.79 7.6 10.5 16.72 10.18 26.52.11 13.73-10.19 25.95-6.85 39.91 2.4 8.15 7.85 15.85 15.61 19.64 11.61 4.99 24.78.17 34.65-6.5 10.88-10.13 21.32-20.74 32.01-31.08 16.23-16.11 54.77-54.33 58.39-56.59 5.777-3.607 10.617-3.561 15.688-3.561 5.07 0 10.489 1.121 14.199 4.201 30.528 25.345 59.773 55.87 88.113 83.51 5.29 5.77 12.78 8.94 20.19 11.03 7.94 2.2 17.16 1.16 23.51-4.43 6.81-6 11.82-14.96 10.96-24.27-1.02-11.3-7.93-21.37-7.46-32.91.16-12.86 8.13-23.84 16.48-32.93C473.33 5.74 485.61.39 498 .18c16.19-.77 32.09 4.22 46.46 11.32 11.51 5.83 22.6 13.09 31.08 22.95 10.46 12.6 17.52 27.96 20.76 43.99 2.62 13.96 2.29 29.31-5.07 41.86-7.41 12.18-20.15 21.02-34.17 23.68-9.29 1.76-18.79.98-28.09-.23-4.64-.54-9.3-1.47-13.98-1.02-8.24 1.08-16.57 4.97-21.21 12.1-4.93 7.56-4.99 17.38-2.11 25.72 1.95 5.45 4.64 10.83 8.85 14.9 16.13 14.87 32.03 29.98 47.53 45.5 12.29 12.39 24.61 24.82 35.42 38.55 2.79 4.04 6.54 8.24 6.07 13.5 0 4.57-1.32 9.07-3.57 13.03-2.35 4.42-6.42 7.5-9.72 11.16-15.31 16.04-30.68 32.04-46.02 48.05-2.65 2.56-4.71 6.07-8.37 7.28-9.29 3.52-19.45 5.39-29.34 3.73-12.15-2.09-22.31-12.2-25.01-24.14-2.8-14.08 2.99-27.98 1.99-42.09-.58-9.88-5.33-19.27-12.48-26.04-7.34-7.39-17.74-11.02-27.98-11.66-14.51-.81-28.89 3.42-41.71 9.96-21.32 10.99-38.43 29.54-48.59 51.19-5.98 13.3-9.53 28.45-6.26 42.94 3.19 15.23 14.77 28.7 29.78 33.24 9.59 3.04 19.78 2.23 29.67 1.83 10.77-.65 22.3-2.64 32.48 2.04 11.06 5.85 16.38 19.39 14.36 31.45-.99 4.96-1.62 10.64-5.61 14.2-34.92 35.7-69.81 71.44-104.69 107.18-7.25 5.84-15.59 10.57-24.56 13.18-7.08 2.2-14.36-.68-20.61-3.93-4.79-2.63-9.48-5.56-13.53-9.26-35.07-35.96-70.22-71.85-105.3-107.8-2.43-2.2-3.14-5.5-4-8.51-2.71-9.88-1.58-21.32 5.02-29.46 4.71-6.5 12.68-9.67 20.52-9.93 15.25-.57 30.61 3.04 45.77.11 14.95-2.88 27.45-14.56 32.42-28.8 3.97-11.28 3.36-23.7.18-35.09-5.79-20.27-18.43-38.25-34.37-51.87-14.47-11.94-32.15-20.6-50.96-22.49-12.12-1.25-25.08 1.11-34.83 8.76-8.7 6.98-14.85 17.47-15.5 28.72-1 13.11 4.04 25.94 2.48 39.03-1.48 13.3-12.41 25.09-25.66 27.28-9.03 1.47-18.29.01-26.88-2.93-1.85-.68-3.92-1.13-5.34-2.59-18.68-19.38-37.22-38.9-55.89-58.28-6.08-5.47-9.42-13.85-8.67-22 .81-4.38 3.81-7.93 6.33-11.47 14.03-17.49 30.15-33.14 46.03-48.93 11.71-11.26 23.39-22.55 35.38-33.51 5.95-5.26 9.45-12.81 11.27-20.42 1.61-7.47.65-15.79-3.86-22.11-6.44-8.66-18.03-12.71-28.55-11.07-12.9 1.67-26.32 3.65-39.03-.18-15.93-4.74-29.9-17.55-34-33.93-3.99-15.42-1.31-31.81 4.25-46.5 3.61-9.65 8.77-18.72 15.12-26.83 8.27-9.89 19.09-17.31 30.46-23.21 11-5.74 22.9-9.9 35.21-11.64C98.1-.6 109.42-.08 119.31 4.67z" fill-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/align-distribute-top.svg b/waterfox/browser/themes/lepton/icons/align-distribute-top.svg
new file mode 100644
index 0000000000000..7347d7d86e3a3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/align-distribute-top.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M1.5 1a.5.5 0 0 0 0 1h13a.5.5 0 0 0 0-1h-13Zm0 7a.5.5 0 0 0 0 1h13a.5.5 0 0 0 0-1h-13Zm8 6a1.5 1.5 0 0 0 1.5-1.5v-1A1.5 1.5 0 0 0 9.5 10h-3A1.5 1.5 0 0 0 5 11.5v1A1.5 1.5 0 0 0 6.5 14h3Zm.5-1.5a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5v-1a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5v1ZM11.5 7A1.5 1.5 0 0 0 13 5.5v-1A1.5 1.5 0 0 0 11.5 3h-7A1.5 1.5 0 0 0 3 4.5v1A1.5 1.5 0 0 0 4.5 7h7Zm.5-1.5a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-1a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5v1Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/align-space-evenly-vertical.svg b/waterfox/browser/themes/lepton/icons/align-space-evenly-vertical.svg
new file mode 100644
index 0000000000000..9a3318a1e9fa5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/align-space-evenly-vertical.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M3.875 1.625a.75.75 0 0 0-.75.75v.75c0 .414.336.75.75.75h8.25a.75.75 0 0 0 .75-.75v-.75a.75.75 0 0 0-.75-.75zM2 2.375C2 1.339 2.84.5 3.875.5h8.25C13.161.5 14 1.34 14 2.375v.75C14 4.161 13.16 5 12.125 5h-8.25A1.875 1.875 0 0 1 2 3.125Zm1.875 4.5a.75.75 0 0 0-.75.75v.75c0 .414.336.75.75.75h8.25a.75.75 0 0 0 .75-.75v-.75a.75.75 0 0 0-.75-.75zM2 7.625c0-1.036.84-1.875 1.875-1.875h8.25c1.036 0 1.875.84 1.875 1.875v.75c0 1.036-.84 1.875-1.875 1.875h-8.25A1.875 1.875 0 0 1 2 8.375Zm1.125 5.25a.75.75 0 0 1 .75-.75h8.25a.75.75 0 0 1 .75.75v.75a.75.75 0 0 1-.75.75h-8.25a.75.75 0 0 1-.75-.75zM3.875 11C2.839 11 2 11.84 2 12.875v.75c0 1.036.84 1.875 1.875 1.875h8.25c1.036 0 1.875-.84 1.875-1.875v-.75C14 11.839 13.16 11 12.125 11Z" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/apps-list-detail.svg b/waterfox/browser/themes/lepton/icons/apps-list-detail.svg
new file mode 100644
index 0000000000000..39a1bea11efd5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/apps-list-detail.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M1.5 2A1.5 1.5 0 0 0 0 3.5v2A1.5 1.5 0 0 0 1.5 7h2A1.5 1.5 0 0 0 5 5.5v-2A1.5 1.5 0 0 0 3.5 2ZM1 3.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5ZM7.5 3a.5.5 0 0 0 0 1h8a.5.5 0 0 0 0-1Zm0 2a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1Zm-6 4A1.5 1.5 0 0 0 0 10.5v2A1.5 1.5 0 0 0 1.5 14h2A1.5 1.5 0 0 0 5 12.5v-2A1.5 1.5 0 0 0 3.5 9ZM1 10.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5Zm6.5-.5a.5.5 0 0 0 0 1h8a.5.5 0 0 0 0-1Zm0 2a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-between-down.svg b/waterfox/browser/themes/lepton/icons/arrow-between-down.svg
new file mode 100644
index 0000000000000..e0044855db14e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-between-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.927 8.174a.625.625 0 0 1 .03.883l-3.5 3.74a.625.625 0 0 1-.913 0l-3.5-3.74a.625.625 0 1 1 .912-.854l2.419 2.585V3.63a.625.625 0 0 1 1.25 0v7.157l2.419-2.584a.625.625 0 0 1 .883-.03ZM3 .005c.345 0 .625.28.625.625 0 .207.168.375.375.375h8a.375.375 0 0 0 .375-.375.625.625 0 1 1 1.25 0c0 .897-.727 1.625-1.625 1.625H4A1.625 1.625 0 0 1 2.375.63c0-.345.28-.625.625-.625ZM13 15.995a.625.625 0 0 1-.625-.625.375.375 0 0 0-.375-.375H4a.375.375 0 0 0-.375.375.625.625 0 1 1-1.25 0c0-.897.728-1.625 1.625-1.625h8c.898 0 1.625.728 1.625 1.625 0 .345-.28.625-.625.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-between-up.svg b/waterfox/browser/themes/lepton/icons/arrow-between-up.svg
new file mode 100644
index 0000000000000..24a77e9f58cad
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-between-up.svg
@@ -0,0 +1,3 @@
+<svg  width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" d="M11.927 7.826a.625.625 0 0 0 .03-.883l-3.5-3.74a.625.625 0 0 0-.913 0l-3.5 3.74a.625.625 0 1 0 .912.854l2.419-2.585v7.158a.625.625 0 0 0 1.25 0V5.213l2.419 2.584a.625.625 0 0 0 .883.03zM3 15.995c.345 0 .625-.28.625-.625 0-.207.168-.375.375-.375h8a.375.375 0 0 1 .375.375.625.625 0 1 0 1.25 0c0-.897-.727-1.625-1.625-1.625H4a1.625 1.625 0 0 0-1.625 1.625c0 .345.28.625.625.625zM13 .005a.625.625 0 0 0-.625.625.375.375 0 0 1-.375.375H4A.375.375 0 0 1 3.625.63a.625.625 0 1 0-1.25 0c0 .897.728 1.625 1.625 1.625h8c.898 0 1.625-.728 1.625-1.625A.625.625 0 0 0 13 .005z" clip-rule="evenodd"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-repeat-all.svg b/waterfox/browser/themes/lepton/icons/arrow-repeat-all.svg
new file mode 100644
index 0000000000000..ce59a8990c2c8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-repeat-all.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M9.009.692a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 0 1-.884-.884l1.433-1.433H5a.625.625 0 0 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883ZM6.991 15.308a.625.625 0 0 1-.883.008l-2.546-2.5a.625.625 0 0 1-.004-.888l2.5-2.5a.625.625 0 0 1 .884.884l-1.433 1.433H11a.625.625 0 1 1 0 1.25H5.528l1.455 1.43c.247.241.25.637.008.883Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.099 3H5a5 5 0 0 0-2.621 9.259c.027-.39.193-.76.472-1.038l.088-.088A3.75 3.75 0 0 1 5 4.25h3.116L8.1 3Zm4.962 1.867.088-.088c.279-.278.445-.647.472-1.038A5 5 0 0 1 11 13H7.901l-.017-1.25H11a3.75 3.75 0 0 0 2.061-6.883Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-sort-down-lines.svg b/waterfox/browser/themes/lepton/icons/arrow-sort-down-lines.svg
new file mode 100644
index 0000000000000..352b448e36638
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-sort-down-lines.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M9.078 10.064a.625.625 0 0 1-.012.884l-3 2.916a.625.625 0 0 1-.872 0l-3-2.916a.625.625 0 1 1 .872-.896l1.939 1.885V2.5a.625.625 0 1 1 1.25 0v9.437l1.94-1.885a.625.625 0 0 1 .883.012Z" clip-rule="evenodd"/><path d="M8 3.625C8 3.28 8.28 3 8.625 3h4.75a.625.625 0 1 1 0 1.25h-4.75A.625.625 0 0 1 8 3.625ZM8 5.625C8 5.28 8.28 5 8.625 5h2.75a.625.625 0 1 1 0 1.25h-2.75A.625.625 0 0 1 8 5.625ZM8 7.625C8 7.28 8.28 7 8.625 7h.75a.625.625 0 1 1 0 1.25h-.75A.625.625 0 0 1 8 7.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-swap.svg b/waterfox/browser/themes/lepton/icons/arrow-swap.svg
new file mode 100644
index 0000000000000..14e5667af88a7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-swap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M10.009 1.692a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H3a.625.625 0 0 1 0-1.25h8.472l-1.455-1.43a.625.625 0 0 1-.008-.883ZM5.991 14.308a.625.625 0 0 1-.883.008l-2.546-2.5a.625.625 0 0 1-.004-.888l2.5-2.5a.625.625 0 0 1 .884.884l-1.433 1.433H13a.625.625 0 1 1 0 1.25H4.528l1.455 1.43c.247.241.25.637.008.883Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/arrow-up-exclamation.svg b/waterfox/browser/themes/lepton/icons/arrow-up-exclamation.svg
new file mode 100644
index 0000000000000..e5c57bfba0073
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/arrow-up-exclamation.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M1.5 3a2 2 0 1 1 4 0c0 2.089-.745 4.925-1.183 6.405a.84.84 0 0 1-.816.595.842.842 0 0 1-.817-.597C2.246 7.915 1.5 5.065 1.5 3Zm2-3a3 3 0 0 0-3 3c0 2.227.789 5.204 1.225 6.685A1.842 1.842 0 0 0 3.5 11c.81 0 1.54-.518 1.775-1.31C5.712 8.213 6.5 5.25 6.5 3a3 3 0 0 0-3-3Zm-1 14a1 1 0 1 1 2 0 1 1 0 0 1-2 0zm1-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm9-10.293V15.5a.5.5 0 0 1-1 0V1.707L9.354 3.854a.5.5 0 0 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/auto-fit-width.svg b/waterfox/browser/themes/lepton/icons/auto-fit-width.svg
new file mode 100644
index 0000000000000..5805d5f4fb191
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/auto-fit-width.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M9.568 11.951a.625.625 0 0 1-.02-.883l1.987-2.073h-7.07l1.986 2.073a.625.625 0 0 1-.902.864l-3-3.13a.625.625 0 0 1 .019-.884l3-2.87a.625.625 0 0 1 .864.904L4.557 7.745h6.886L9.568 5.952a.625.625 0 0 1 .864-.904l3 2.87a.625.625 0 0 1 .02.884l-3 3.13a.625.625 0 0 1-.884.02Z" clip-rule="evenodd"/><path d="M0 2.625a.625.625 0 1 1 1.25 0v10.75a.625.625 0 1 1-1.25 0V2.625ZM14.75 2.625a.625.625 0 1 1 1.25 0v10.75a.625.625 0 1 1-1.25 0V2.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/blank.svg b/waterfox/browser/themes/lepton/icons/blank.svg
new file mode 100644
index 0000000000000..51f9a4c9231af
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/blank.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/blue-berror.svg b/waterfox/browser/themes/lepton/icons/blue-berror.svg
new file mode 100644
index 0000000000000..8c3c8b4c56c91
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/blue-berror.svg
@@ -0,0 +1,83 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 221.72 184.08">
+  <defs>
+    <linearGradient id="a" x1="41.64" x2="186.34" y1="42.04" y2="186.73" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ccfbff"/>
+      <stop offset="1" stop-color="#c9e4ff"/>
+    </linearGradient>
+    <linearGradient id="c" x1="70.5" x2="215.2" y1="13.17" y2="157.87" href="#a"/>
+    <linearGradient id="b" x1="58.88" x2="188.27" y1="46.79" y2="176.18" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#00c8d7"/>
+      <stop offset="1" stop-color="#0a84ff"/>
+    </linearGradient>
+    <linearGradient id="d" x1="55.56" x2="184.95" y1="50.11" y2="179.5" href="#b"/>
+    <linearGradient id="e" x1="28.59" x2="173.29" y1="55.09" y2="199.78" href="#a"/>
+    <linearGradient id="f" x1="66.82" x2="196.2" y1="38.86" y2="168.25" href="#b"/>
+    <linearGradient id="g" x1="51.82" x2="196.52" y1="31.85" y2="176.55" href="#a"/>
+    <linearGradient id="h" x1="46.04" x2="182.33" y1="46.64" y2="182.93" href="#b"/>
+    <linearGradient id="i" x1="74.81" x2="204.19" y1="30.87" y2="160.26" href="#b"/>
+    <linearGradient id="j" x1="71.48" x2="200.87" y1="34.19" y2="163.58" href="#b"/>
+    <linearGradient id="k" x1="58.65" x2="158.03" y1="76.32" y2="175.7" href="#a"/>
+    <linearGradient id="l" x1="47.95" x2="177.33" y1="57.73" y2="187.11" href="#b"/>
+    <linearGradient id="m" x1="66.54" x2="165.92" y1="68.43" y2="167.81" href="#a"/>
+    <linearGradient id="n" x1="62.64" x2="162.02" y1="72.32" y2="171.7" href="#a"/>
+    <linearGradient id="o" x1="65.19" x2="209.88" y1="18.49" y2="163.19" href="#a"/>
+    <linearGradient id="p" x1="72.88" x2="217.58" y1="10.8" y2="155.49" href="#a"/>
+    <linearGradient id="q" x1="61.64" x2="206.34" y1="22.03" y2="166.73" href="#a"/>
+    <linearGradient id="r" x1="63.95" x2="198.65" y1="31.06" y2="165.75" href="#b"/>
+    <linearGradient id="s" x1="69.39" x2="204.08" y1="25.62" y2="160.31" href="#b"/>
+    <linearGradient id="t" x1="66.77" x2="201.46" y1="28.24" y2="162.93" href="#b"/>
+    <linearGradient id="u" x1="71.02" x2="205.71" y1="23.99" y2="158.69" href="#b"/>
+    <linearGradient id="v" x1="69.27" x2="203.96" y1="25.74" y2="160.44" href="#b"/>
+    <linearGradient id="w" x1="64.3" x2="198.99" y1="30.71" y2="165.41" href="#b"/>
+    <linearGradient id="x" x1="65.73" x2="200.43" y1="29.27" y2="163.97" href="#b"/>
+  </defs>
+  <path fill="none" d="M180.15 34.4c-0.13 -0.34 -3.24 -8.16 -11.05 -7.09 -2.38 0.32 -4 1.25 -4.84 2.76a5.21 5.21 0 0 0 -0.51 1.36 6.79 6.79 0 0 1 4.85 -2.43c8.3 -1.13 11.59 7.4 11.59 7.4a6.23 6.23 0 0 1 0.72 -1.76 0.52 0.52 0 0 1 -0.25 0.11 0.51 0.51 0 0 1 -0.51 -0.35zm-9.99 93.38h0.14a0.44 0.44 0 0 1 0.13 -0.42 1.89 1.89 0 0 1 1.56 -0.62 1.23 1.23 0 0 1 0.47 0.22 1 1 0 0 0 0.32 -0.71c0 -0.83 -1.18 -1.53 -2.59 -1.54a1.39 1.39 0 0 1 0.09 0.5 1.5 1.5 0 0 1 -1.5 1.5 1.46 1.46 0 0 1 -0.66 -0.16 3.3 3.3 0 0 1 -0.43 0.19 2.93 2.93 0 0 0 2.47 1.04zm-3.48 -0.85h-0.27a3.88 3.88 0 0 1 -1.85 -0.47 17.88 17.88 0 0 1 -2.79 0.91 59.25 59.25 0 0 1 -2.77 7.83c-1.58 3.17 -4 6.33 -7.25 7.5a4.78 4.78 0 0 1 -4.52 -0.93c-0.25 1.62 -0.52 3.2 -0.79 4.72a62 62 0 0 0 3 6.08h13.58a59 59 0 0 0 3.45 -8.46 134.51 134.51 0 0 0 4 -15.34h-0.25a3.59 3.59 0 0 1 -3.54 -1.84zm-41.39 46.13a44.59 44.59 0 0 1 -0.26 -5.28c-4.57 0.43 -9.18 0.54 -12.7 0.54 -5.07 0 -10.14 -0.22 -14.61 -0.64a44.77 44.77 0 0 1 -0.27 5.46c4.48 -0.29 9.4 -0.45 14.57 -0.45 4.67 0 9.15 0.13 13.27 0.37zm30.87 -13.86c1.86 0 3.76 -1.58 5.65 -4.63h-11.24c1.79 2.7 3.72 4.63 5.59 4.63z"/>
+  <path fill="#eeeef2" d="M154 76.58h47.63a1 1 0 0 0 0 -2h-47.7a13.9 13.9 0 0 1 0.07 1.42v0.58z"/>
+  <path fill="#fff" d="M36.45 14.11a19.76 19.76 0 0 0 0.54 6h0.95a25.42 25.42 0 0 1 -1.49 -6z"/>
+  <path fill="#eeeef2" d="M157.67 69a0.5 0.5 0 0 0 0 1h33.63a0.5 0.5 0 0 0 0 -1zm-118.56 -48.13a0.51 0.51 0 0 0 0 -0.48c0 -0.06 -2.29 -5.24 -1.69 -10.21a10.4 10.4 0 0 1 1.17 -3.83c1.57 -2.83 4.6 -4.57 9 -5.17 14.41 -1.96 20.28 12.82 20.34 13a0.51 0.51 0 0 0 0.5 0.32 0.49 0.49 0 0 0 0.45 -0.4c0.12 -0.34 1.79 -8.35 10.12 -6.77s14.81 14.08 14.87 14.2a0.5 0.5 0 0 0 0.45 0.27h22a0.5 0.5 0 0 0 0.5 -0.5 0.5 0.5 0 0 0 -0.5 -0.5h-21.74c-1 -1.93 -7.15 -12.87 -15.44 -14.45 -7.14 -1.35 -9.91 3.75 -10.84 6.25 -1.82 -3.6 -8.21 -14.13 -20.82 -12.41 -4.72 0.64 -8 2.55 -9.73 5.67a13.77 13.77 0 0 0 -1.3 8.25 25.42 25.42 0 0 0 1.49 6h-24.47a0.5 0.5 0 0 0 -0.5 0.5 0.51 0.51 0 0 0 0.5 0.5h25.22a0.5 0.5 0 0 0 0.42 -0.24zm182.11 60.33h-68.31a13.196 13.196 0 0 1 -0.49 1h68.8a0.5 0.5 0 0 0 0.5 -0.5 0.5 0.5 0 0 0 -0.5 -0.5z"/>
+  <path fill="#fff" d="M13 26.2h104a1 1 0 0 0 0 -2h-24.1c-2.09 -3.88 -7.5 -12.62 -14.28 -13.91 -8.89 -1.69 -10.62 7.16 -10.62 7.16s-5.94 -15.35 -20.88 -13.31c-5.5 0.74 -8.33 3.15 -9.67 6 -0.6 5 1.67 10.15 1.69 10.21a0.5 0.5 0 0 1 -0.45 0.71h-1.45a22.73 22.73 0 0 0 1 2.95h-25.24l7.72 0.15h-7.72a1 1 0 1 0 0 2z"/>
+  <path fill="#eeeef2" d="M73.39 59.8a1 1 0 0 0 -1 -1h-39.83a1 1 0 0 0 0 2h39.83a1 1 0 0 0 1 -1zm-20.39 -4.87a0.5 0.5 0 0 0 0.5 -0.5 0.51 0.51 0 0 0 -0.5 -0.5h-11.3a0.5 0.5 0 0 0 -0.5 0.5 0.5 0.5 0 0 0 0.5 0.5zm6.33 56.77h-58.33a1 1 0 0 0 0 2h55.76a6.27 6.27 0 0 1 2.57 -2zm5.61 0h-0.74l0.39 0.16zm66.18 67.3a5.8 5.8 0 0 1 -3.66 -1.3c-1.18 -1 -1.84 -2.11 -2.17 -4.61 -4.12 -0.24 -8.6 -0.37 -13.27 -0.37 -5.17 0 -10.09 0.16 -14.57 0.45 -0.33 2.44 -1 3.58 -2.16 4.53a5.8 5.8 0 0 1 -3.66 1.3c-2.81 0 -5.08 -2 -6.84 -4.5 -6.35 1 -10.26 2.4 -10.26 3.91 0 3.15 16.78 5.7 37.49 5.7s37.49 -2.55 37.49 -5.7c0 -1.6 -4.39 -3 -11.43 -4.09 -1.77 2.56 -4.08 4.68 -6.96 4.68z"/>
+  <path fill="#fff" d="M147.18 141.77a4.78 4.78 0 0 0 4.52 0.93c3.25 -1.17 5.67 -4.33 7.25 -7.5a59.25 59.25 0 0 0 2.82 -7.81l-1.08 0.23a9 9 0 0 1 -2.51 0.55c-1.41 4.26 -4.32 11 -8.41 11a3.93 3.93 0 0 1 -1.9 -0.5l-0.23 0.11c-0.15 1.03 -0.3 2.02 -0.46 2.99z"/>
+  <path fill="#eeeef2" d="M29.08 107.44a0.5 0.5 0 0 0 0.5 0.5h38.49a0.5 0.5 0 0 0 0.5 -0.5 0.5 0.5 0 0 0 -0.5 -0.5h-38.49a0.5 0.5 0 0 0 -0.5 0.5z"/>
+  <path fill="#fff" d="M154 76.58v-0.56a13.9 13.9 0 0 0 -0.08 -1.44 12.73 12.73 0 0 0 -12.67 -11.31 12.58 12.58 0 0 0 -5.4 1.2l-1 2a16.24 16.24 0 0 1 1.27 1.1 9.76 9.76 0 0 1 11.75 15.36l-1.47 1.47c0.45 4 0.72 8.27 0.82 12.83a17.86 17.86 0 0 1 3.21 -1.66q-0.16 -5.3 -0.65 -10.07l0.46 -0.45a13.32 13.32 0 0 0 2.14 -2.84 13.196 13.196 0 0 0 0.49 -1 12.75 12.75 0 0 0 1.13 -4.63zm-80.63 44.29c-0.82 -1.14 -1.69 -2.27 -2.49 -3.19 0.84 1.19 1.75 2.57 2.56 3.7zm-11.13 -4.46a1.34 1.34 0 0 0 -0.72 -0.21h-0.1a4.16 4.16 0 0 1 0.91 0.26z"/>
+  <path fill="#fff" d="M141.43 154.62a62.66 62.66 0 0 1 -2.28 9.84c-1.22 3.46 -4.45 11.51 -8.28 11.51a2.8 2.8 0 0 1 -1.76 -0.62c-0.84 -0.68 -1.45 -1.18 -1.3 -10.93a122.38 122.38 0 0 1 -15.73 0.9 149.39 149.39 0 0 1 -17.65 -1c0.16 9.83 -0.48 10.35 -1.29 11a2.75 2.75 0 0 1 -1.76 0.63c-3.83 0 -7.06 -8.05 -8.28 -11.51a48.37 48.37 0 0 1 -1.54 -5.85c-1.94 -3.93 -3.47 -11.43 -4.55 -22.3a4.56 4.56 0 0 1 -3.01 -2.6c-1.14 -1.61 -3.87 -6.58 -5.28 -9.2l-1.94 0.49a7.76 7.76 0 0 1 -1.82 0.23 5.79 5.79 0 0 1 -4.12 -1.62l-2.56 -0.65a3.3 3.3 0 0 1 0.14 -6.42 3 3 0 0 1 0.41 -0.85 3.27 3.27 0 0 1 2.74 -1.47 3.33 3.33 0 0 1 1.83 0.55l0.94 0.63c2.54 -1.67 3.7 -1.67 4.11 -1.67a3.81 3.81 0 0 1 2.75 1.36l-0.34 -2.38a4.53 4.53 0 0 1 0 -1 4.62 4.62 0 0 1 0.1 -1.24 4.56 4.56 0 0 1 4.47 -3.54h0.17a202.19 202.19 0 0 1 0.74 -21.55l-2.9 -2.89a9.76 9.76 0 0 1 13.8 -13.8l1.75 1.75c2.26 -0.65 5 -1.44 7.74 -2.17a7.74 7.74 0 0 1 0.12 -1.07 7.1 7.1 0 0 1 0.79 -2.18c-2.43 0.64 -5.08 1.38 -7.6 2.1l-0.5 -0.5a12.76 12.76 0 0 0 -18 18l1.89 1.89c-0.41 4.63 -0.63 10.9 -0.63 18a7.55 7.55 0 0 0 -4.54 5.32 7.65 7.65 0 0 0 -0.15 0.94 8.93 8.93 0 0 0 -3.13 1l-0.35 0.16 -0.39 -0.16a6.15 6.15 0 0 0 -2.43 -0.5 6.32 6.32 0 0 0 -5 2.5c-0.07 0.1 -0.16 0.2 -0.23 0.31a0.57 0.57 0 0 0 -0.08 0.13 6.28 6.28 0 0 0 -3.25 4c-0.42 1.63 -0.53 4.06 0.33 5.51s2.38 4.08 4 4.5c1.55 1.21 5.5 1.25 7.63 0 0.63 -0.37 1.48 -0.08 2.23 -0.25 1.58 2.89 3.18 5.72 4.18 7.2a7.54 7.54 0 0 0 2.89 3.18c1.08 10 2.58 17.13 4.49 21.23a46 46 0 0 0 1.57 5.88 38.53 38.53 0 0 0 4.27 9c1.76 2.51 4 4.5 6.84 4.5a5.8 5.8 0 0 0 3.66 -1.3c1.17 -0.95 1.83 -2.09 2.16 -4.53a44.77 44.77 0 0 0 0.27 -5.46c4.47 0.42 9.54 0.64 14.61 0.64 3.52 0 8.13 -0.11 12.7 -0.54a44.59 44.59 0 0 0 0.26 5.28c0.33 2.5 1 3.65 2.17 4.61a5.8 5.8 0 0 0 3.66 1.3c2.88 0 5.19 -2.09 7 -4.68a38.86 38.86 0 0 0 4.15 -8.84 64.69 64.69 0 0 0 2.39 -10.24c0.48 -2 1 -4.4 1.45 -7 -1 -2.17 -1.76 -4.21 -2.3 -5.72 -0.86 4.65 -1.64 8.84 -2.43 12.16z"/>
+  <path fill="#fff" d="M58.93 118.47a1.27 1.27 0 0 0 -1.06 0.8 1.88 1.88 0 0 1 0.41 -0.32 3.43 3.43 0 0 0 0.65 -0.48zm85.46 -34.86l0.31 -0.31 -0.32 0.27zm-52.14 88.84a84.62 84.62 0 0 0 0.16 -9.43h-0.09c0.09 3.65 0.1 7.24 -0.07 9.43zm37.62 -9.51c0 2.2 -0.06 4.33 0 6.12 -0.08 -1.83 -0.05 -3.96 0 -6.12zm17.77 -24.13l0.23 -0.11a7.76 7.76 0 0 1 -3 -3.63 268.89 268.89 0 0 1 -0.79 5.4 76.1 76.1 0 0 0 2.29 6c0.27 -1.52 0.54 -3.1 0.79 -4.72 0.18 -0.95 0.33 -1.94 0.48 -2.94zm-4.52 -4.87c0.07 -0.69 0.15 -1.36 0.22 -2q-0.14 1.08 -0.27 2.13zm15.15 -6.03l-0.09 0.26a9 9 0 0 0 2.51 -0.55 20.79 20.79 0 0 1 -2.42 0.29zm4.39 -93.4a10.76 10.76 0 0 0 0.2 2.88h0.51a14.66 14.66 0 0 1 -0.71 -2.88z"/>
+  <path fill="#eeeef2" d="M164.52 38.16a0.51 0.51 0 0 0 0 -0.48 11.53 11.53 0 0 1 -0.81 -6.25 5.21 5.21 0 0 1 0.51 -1.36c0.84 -1.51 2.46 -2.44 4.84 -2.76 7.81 -1.07 10.92 6.75 11.05 7.09a0.51 0.51 0 0 0 0.51 0.32 0.52 0.52 0 0 0 0.25 -0.11 0.5 0.5 0 0 0 0.2 -0.29 4.39 4.39 0 0 1 5.33 -3.56c4.58 0.87 8.09 7.15 8.13 7.21a0.48 0.48 0 0 0 0.43 0.26h12.21a0.5 0.5 0 0 0 0.5 -0.5 0.5 0.5 0 0 0 -0.5 -0.5h-11.87c-0.74 -1.26 -4.12 -6.59 -8.66 -7.46a5.18 5.18 0 0 0 -6.1 3.17c-1.27 -2.35 -4.87 -7.5 -11.58 -6.59 -2.7 0.36 -4.58 1.46 -5.58 3.26a8.09 8.09 0 0 0 -0.72 4.93 14.66 14.66 0 0 0 0.71 2.88h-13.29a0.5 0.5 0 0 0 -0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h14a0.5 0.5 0 0 0 0.44 -0.26z"/>
+  <path fill="#fff" d="M149.9 42.22h57.8a1 1 0 0 0 0 -2h-13.59c-1.13 -2.1 -4.16 -7.1 -8 -7.83a4.55 4.55 0 0 0 -5 1.9 0.5 0.5 0 0 1 -0.2 0.29 6.23 6.23 0 0 0 -0.72 1.76s-3.29 -8.5 -11.59 -7.34a6.79 6.79 0 0 0 -4.85 2.46 11.53 11.53 0 0 0 0.81 6.25 0.51 0.51 0 0 1 0 0.48 0.5 0.5 0 0 1 -0.42 0.23h-1a14 14 0 0 0 0.57 1.65h-14l9 0.18h-8.81a1 1 0 0 0 0 2zm-53.24 26.05c1.09 -0.3 2.16 -0.58 3.17 -0.84 0.65 -2.25 3.25 -3.8 7 -4.48l-0.79 -13.75a2.1 2.1 0 0 1 0 -0.66v-0.28a0.76 0.76 0 0 1 0.06 -0.16v-0.06c1 -3.36 9 -3.66 16.64 -2.19a38.87 38.87 0 0 1 10.41 3.42c3.88 2 4.43 3.89 4.2 5.06a2.48 2.48 0 0 1 -0.45 1l-5.88 12.17c0.22 0.13 0.46 0.27 0.67 0.41a15.76 15.76 0 0 1 2 1.55l0.34 -0.35a9.92 9.92 0 0 1 2 -1.56 16.24 16.24 0 0 0 -1.27 -1.1l1 -2 3.71 -7.67a5.25 5.25 0 0 0 0.76 -1.88 2.56 2.56 0 0 0 0.06 -0.57c0.62 -7.59 -14.08 -10.83 -17.05 -11.41a41.83 41.83 0 0 0 -11.81 -0.75c-6.2 0.64 -8 3.37 -8.42 5.54a5.49 5.49 0 0 0 0 2l0.64 10.93c-3.42 1.07 -5.2 2.77 -6.11 4.33a7.1 7.1 0 0 0 -0.86 2.23 7.74 7.74 0 0 0 -0.02 1.07z"/>
+  <path fill="#eeeef2" d="M72.38 152.57h-66.88a1 1 0 0 0 0 2h66.88a1 1 0 0 0 0 -2zm78.19 2h11.24a32.566 32.566 0 0 0 1.12 -2h-13.58c0.4 0.7 0.81 1.37 1.22 2zm65.18 0a1 1 0 0 0 0 -2h-51.75a33.88 33.88 0 0 1 -1.1 2zm-67.95 -1a1 1 0 0 0 1 1h0.58a40.557 40.557 0 0 1 -1.09 -1.84 1 1 0 0 0 -0.49 0.84z"/>
+  <path fill="url(#a)" d="M87.76 79.65a45.87 45.87 0 0 1 14.58 -6.38 7.65 7.65 0 0 1 -2.56 -3.76c-3.25 0.84 -7 1.9 -9.88 2.73a0.47 0.47 0 0 1 -0.25 0.18c-5.3 1.52 -6.41 5.17 -6.45 5.32a0.51 0.51 0 0 1 -0.48 0.36h-0.14a0.5 0.5 0 0 1 -0.34 -0.62c0 -0.16 1 -3.51 5.47 -5.41l-2 -2a7.75 7.75 0 0 0 -11 11l3.57 3.58a202.84 202.84 0 0 0 -0.82 23.9 2.91 2.91 0 0 0 2.65 1.38 5.08 5.08 0 0 0 2.89 -1.65c-0.43 -13.72 0.78 -25.99 4.76 -28.63z"/>
+  <path fill="url(#c)" d="M138.33 82.24a76.63 76.63 0 0 1 2.48 19.86 2.32 2.32 0 0 0 0.46 -0.54 3 3 0 0 0 0.25 -0.78 2.33 2.33 0 0 0 0 -0.83 1 1 0 0 1 0.72 -1.19 1.15 1.15 0 0 1 0.26 0 1 1 0 0 1 1 0.72 3.52 3.52 0 0 1 0.1 0.86c0.39 -0.4 0.79 -0.8 1.22 -1.19l0.52 -0.43a145.32 145.32 0 0 0 -0.95 -15l0.32 -0.27 1.79 -1.8a7.75 7.75 0 1 0 -11 -11l-0.4 0.4a6.7 6.7 0 0 1 0.77 1.25 12.86 12.86 0 0 1 6 5.68 0.51 0.51 0 0 1 -0.2 0.68 0.53 0.53 0 0 1 -0.24 0.06 0.49 0.49 0 0 1 -0.44 -0.26 12.09 12.09 0 0 0 -4.72 -4.84 4.08 4.08 0 0 1 0 1.35 4.61 4.61 0 0 1 -1.91 2.79c2.12 1.37 3.52 2.97 3.97 4.48z"/>
+  <path fill="#f2f8ff" d="M101.53 100.7a7.5 7.5 0 1 0 -7.53 -7.5 7.51 7.51 0 0 0 7.53 7.5zm-1.16 -9.81l1.63 -2.66a1.38 1.38 0 0 1 1.93 -0.44 1.4 1.4 0 0 1 0.44 1.93l-1.66 2.66a1.4 1.4 0 0 1 -2.38 -1.49zm-3.05 4.43a1 1 0 0 1 1.38 0.29 3.65 3.65 0 0 0 5.88 0 1 1 0 0 1 1.68 1.09 5.64 5.64 0 0 1 -9.23 0 1 1 0 0 1 0.29 -1.38z"/>
+  <path fill="#f2f8ff" d="M85.07 115.26c1.79 1.61 0.31 3.63 -1.31 6.21 1.29 14 3.84 26.85 6.42 30 9.77 12 39.38 11 45.06 -2.26 0.58 -1.38 4.27 -18.23 5.31 -36.28l-0.09 -0.08c-1.58 -1.77 -1.57 -4.61 -0.28 -7.58 -2.81 1.59 -7.3 2.4 -13.43 2.4h-1.7a2.34 2.34 0 0 1 -0.25 0.3c-7.4 7.17 -13.45 10.81 -18 10.81a7.05 7.05 0 0 1 -2.48 -0.43 4.84 4.84 0 0 1 -1.45 -0.81 4.31 4.31 0 0 1 -1.28 -1.47 1 1 0 0 1 1.76 -0.94 3.35 3.35 0 0 0 0.75 0.84 3.93 3.93 0 0 0 0.9 0.5 2.91 2.91 0 0 0 0.89 0.14 4.2 4.2 0 0 0 1.81 -0.47c1.9 -0.92 2.72 -2.9 3.67 -5.18a20.6 20.6 0 0 1 2.87 -5.27c2.18 -2.64 4.35 -4 6.44 -4a4.42 4.42 0 0 1 2.26 0.6c0.71 -1.32 2.28 -2.36 5.08 -2.36a13.29 13.29 0 0 1 1.93 0.14 16.6 16.6 0 0 1 4.69 1.59 10 10 0 0 0 3.88 1.22 3.84 3.84 0 0 0 1.07 -0.15 3.35 3.35 0 0 0 1.22 -0.65 76.63 76.63 0 0 0 -2.48 -19.86c-0.45 -1.51 -1.85 -3.11 -4 -4.59a12 12 0 0 1 -4.9 1.94 27.09 27.09 0 0 1 -5.19 0.46 41 41 0 0 1 -7.82 -0.79c-6.19 -1.2 -11.22 -3.43 -14.12 -6a45.87 45.87 0 0 0 -14.58 6.38c-4 2.64 -5.19 14.91 -4.81 28.63 3.37 -3.25 6.65 -10.76 8.09 -14.69a1.87 1.87 0 1 1 2.38 -2.87 8.53 8.53 0 1 1 -0.35 3 1.83 1.83 0 0 1 -0.9 0.24h-0.2c-1.07 2.83 -4.79 12.13 -9 15.65 0 1.08 0.09 2.16 0.14 3.25a10.17 10.17 0 0 0 2 2.43zm21.37 8.09a2.5 2.5 0 0 1 1.4 -1.8 4.18 4.18 0 0 1 3.5 -0.2 6.75 6.75 0 0 1 2.89 2.6 1.75 1.75 0 0 1 0.45 -0.55c1.18 -0.88 4.2 -1 5.1 -1a1 1 0 0 1 0.5 0.13l0.08 0.06a6.78 6.78 0 0 1 3.38 -2.33 4.31 4.31 0 0 1 3.45 0.65 2.63 2.63 0 0 1 1.28 2 5.41 5.41 0 0 1 -1.49 3.61c0.9 1.15 2.35 3.32 2 5.07a2.48 2.48 0 0 1 -1.4 1.8h-0.07c0.08 1.66 -0.15 3.57 -1.47 4.16 -2.5 1.11 -4.44 -2.77 -4.44 -2.77a13.26 13.26 0 0 1 -2.21 1.1c-1.39 0.56 -3.88 -0.55 -3.88 -0.55s-1.94 3.05 -4.71 2.77c-1.56 -0.15 -2 -2.13 -2 -3.84a7.105 7.105 0 0 1 -0.53 -0.3 2.67 2.67 0 0 1 -1.28 -2 5.44 5.44 0 0 1 1.5 -3.62c-0.93 -1.06 -2.39 -3.24 -2.05 -4.99zm26 -32.21l1.67 -2.66a1.38 1.38 0 0 1 1.93 -0.44 1.4 1.4 0 0 1 0.44 1.93l-1.66 2.66a1.4 1.4 0 0 1 -2.38 -1.49zm-3.05 4.43a1 1 0 0 1 1.38 0.29 3.72 3.72 0 0 0 2.94 1.49 3.66 3.66 0 0 0 2.94 -1.5 1 1 0 0 1 1.68 1.1 5.64 5.64 0 0 1 -9.23 0 1 1 0 0 1 0.32 -1.38zm-14.24 -0.83c3 -3.23 10 -4.76 12.31 -4.28a1.74 1.74 0 0 1 1.43 1.08 2.86 2.86 0 0 1 -0.33 2.43c-1.17 2.11 -4.76 4.78 -6.11 5.06a1.24 1.24 0 0 1 -0.31 0c-1.51 0 -6.38 -1 -7.2 -2.5a1.52 1.52 0 0 1 0.24 -1.79z"/>
+  <path fill="url(#b)" d="M100.82 92.82a1.41 1.41 0 0 0 1.93 -0.44l1.66 -2.66a1.4 1.4 0 0 0 -0.44 -1.93 1.38 1.38 0 0 0 -1.93 0.44l-1.67 2.66a1.4 1.4 0 0 0 0.45 1.93z"/>
+  <path fill="url(#d)" d="M101.64 99.1a5.71 5.71 0 0 0 4.62 -2.4 1 1 0 0 0 -1.68 -1.09 3.65 3.65 0 0 1 -5.88 0 1 1 0 1 0 -1.7 1.09 5.68 5.68 0 0 0 4.64 2.4z"/>
+  <path fill="url(#e)" d="M143.28 119a6.57 6.57 0 0 1 1.45 -4v-0.43a5.54 5.54 0 0 1 -4.2 -1.57c-1 18 -4.73 34.9 -5.31 36.28 -5.68 13.26 -35.29 14.24 -45.06 2.26 -2.58 -3.17 -5.13 -16 -6.42 -30 1.62 -2.58 3.1 -4.6 1.31 -6.21a10.17 10.17 0 0 1 -1.94 -2.43c0 -1.09 -0.1 -2.17 -0.14 -3.25a5.29 5.29 0 0 1 -2.67 1.34 3.11 3.11 0 0 1 -0.43 0 4 4 0 0 1 -3.12 -1.77l-0.75 -0.22a3 3 0 0 0 -0.59 -0.06 2.59 2.59 0 0 0 -2.52 2 2.53 2.53 0 0 0 0 0.82 2.5 2.5 0 0 0 0 0.67l1.26 9.57a57.556 57.556 0 0 0 -0.78 -1.1l0.07 0.51c-0.81 -1.13 -1.72 -2.51 -2.56 -3.7 -1 -1.16 -1.92 -2 -2.48 -2 -0.93 0 -2.59 1 -4.08 2.09l-2 -1.33a4.16 4.16 0 0 0 -0.91 -0.26 1.27 1.27 0 0 0 -1 0.56 1.29 1.29 0 0 0 0.35 1.79l0.74 0.49 -2.18 -0.55a1.17 1.17 0 0 0 -0.32 0h-0.11a3.43 3.43 0 0 1 -0.65 0.48 1.88 1.88 0 0 0 -0.41 0.32 0.8 0.8 0 0 0 -0.08 0.16 1.29 1.29 0 0 0 0.93 1.57l3.13 0.8a3.85 3.85 0 0 0 3.06 1.41 5.53 5.53 0 0 0 1.34 -0.17l3.45 -0.87s4.91 9.19 6 10.54a2.6 2.6 0 0 0 2.44 1.74 2.36 2.36 0 0 0 0.37 0l0.31 -0.08v0.34c1.54 -2.55 0 -13 -0.69 -16.85a0.5 0.5 0 0 1 0.85 -0.44l1.78 1.78a0.5 0.5 0 0 1 0 0.71 0.51 0.51 0 0 1 -0.71 0l-0.66 -0.66c0.67 4 2.06 13.82 0.1 16.29a1.79 1.79 0 0 1 -0.45 0.43c1 9.77 2.44 18 4.48 22a46 46 0 0 0 1.52 5.8c2.29 6.53 4.93 10.17 6.39 10.17a0.75 0.75 0 0 0 0.5 -0.18 2.63 2.63 0 0 0 0.37 -1.34c0.17 -2.19 0.16 -5.78 0.07 -9.46a18.09 18.09 0 0 1 -4.91 -2.74 0.5 0.5 0 0 1 -0.08 -0.7 0.51 0.51 0 0 1 0.71 -0.08 16.67 16.67 0 0 0 4.82 2.64 141.89 141.89 0 0 0 19.22 1.21 117.14 117.14 0 0 0 16 -1c2.25 -0.5 6.8 -2 6.85 -2.06a0.5 0.5 0 0 1 0.63 0.32 0.5 0.5 0 0 1 -0.31 0.63c-0.15 0 -3.08 1 -5.42 1.7 -0.05 2.16 -0.08 4.29 -0.06 6.12 0.05 2.59 0.21 4.45 0.56 4.73a0.75 0.75 0 0 0 0.5 0.18c1.46 0 4.1 -3.64 6.39 -10.17a62.11 62.11 0 0 0 2.21 -9.58c1.06 -4.47 2.4 -11.63 3.53 -20.14s0 0 0.06 -0.05q0.13 -1 0.27 -2.13a359.26 359.26 0 0 0 0.88 -9.7 6.32 6.32 0 0 1 -0.9 -3.17z"/>
+  <path fill="url(#f)" d="M122.17 99.06a1.24 1.24 0 0 0 0.31 0c1.35 -0.28 4.94 -3 6.11 -5.06a2.86 2.86 0 0 0 0.33 -2.43 1.74 1.74 0 0 0 -1.43 -1.08c-2.32 -0.48 -9.28 1.05 -12.31 4.28a1.52 1.52 0 0 0 -0.21 1.82c0.82 1.41 5.69 2.47 7.2 2.47z"/>
+  <path fill="url(#g)" d="M144.71 128.26a0.1 0.1 0 0 1 0.07 -0.06s0.06 0 0 0c1.56 6.7 3.31 9 5 9 2.71 0 5.22 -6 6.36 -9.28a19.57 19.57 0 0 1 -4.07 -0.59 3.12 3.12 0 0 1 -1.31 1.3 1.5 1.5 0 0 1 -0.55 0.11 1.31 1.31 0 0 1 -0.61 -0.15c-0.3 -0.15 -0.94 -0.47 -1.13 -2.61a11.46 11.46 0 0 1 -3.33 -2.54c-0.14 1.56 -0.28 3.15 -0.43 4.82z"/>
+  <path fill="url(#h)" d="M146.44 84.39l1.47 -1.47a9.76 9.76 0 0 0 -11.75 -15.36 9.92 9.92 0 0 0 -2 1.56l-0.34 0.35a15.76 15.76 0 0 0 -2 -1.55c-0.21 -0.14 -0.45 -0.28 -0.67 -0.41l5.88 -12.17a2.48 2.48 0 0 0 0.45 -1c0.23 -1.17 -0.32 -3 -4.2 -5.06a38.87 38.87 0 0 0 -10.41 -3.42c-7.61 -1.47 -15.64 -1.17 -16.64 2.19v0.06a0.76 0.76 0 0 0 -0.06 0.16v0.28a2.1 2.1 0 0 0 0 0.66l0.71 13.79c-3.8 0.68 -6.4 2.23 -7 4.48 -1 0.26 -2.08 0.54 -3.17 0.84 -2.69 0.73 -5.48 1.52 -7.74 2.17l-1.75 -1.75a9.76 9.76 0 0 0 -13.8 13.8l2.9 2.89a202.19 202.19 0 0 0 -0.74 21.55h-0.17a4.56 4.56 0 0 0 -4.47 3.54 4.62 4.62 0 0 0 -0.1 1.24 4.53 4.53 0 0 0 0 1l0.34 2.38a3.81 3.81 0 0 0 -2.75 -1.36c-0.41 0 -1.57 0 -4.11 1.67l-0.94 -0.63a3.33 3.33 0 0 0 -1.83 -0.55 3.27 3.27 0 0 0 -2.74 1.47 3 3 0 0 0 -0.41 0.85 3.3 3.3 0 0 0 -0.14 6.42l2.56 0.65a5.79 5.79 0 0 0 4.12 1.62 7.76 7.76 0 0 0 1.82 -0.23l1.94 -0.49c1.41 2.62 4.14 7.59 5.28 9.2a4.56 4.56 0 0 0 3.02 2.55c1.08 10.87 2.61 18.37 4.55 22.3a48.37 48.37 0 0 0 1.54 5.85c1.22 3.46 4.45 11.51 8.28 11.51a2.75 2.75 0 0 0 1.76 -0.63c0.81 -0.65 1.45 -1.17 1.29 -11a149.39 149.39 0 0 0 17.65 1 122.38 122.38 0 0 0 15.73 -0.9c-0.15 9.75 0.46 10.25 1.3 10.93a2.8 2.8 0 0 0 1.76 0.62c3.83 0 7.06 -8.05 8.28 -11.51a62.66 62.66 0 0 0 2.28 -9.84c0.79 -3.32 1.6 -7.51 2.34 -12.08 0.54 1.51 1.33 3.55 2.3 5.72 0.66 1.48 1.41 3 2.22 4.47 0.35 0.63 0.72 1.25 1.09 1.84 2 3.18 4.36 5.63 6.78 5.63s4.81 -2.29 6.78 -5.63a33.88 33.88 0 0 0 1.1 -2c4.15 -8.25 6.75 -20.56 7.27 -23.19a2.75 2.75 0 0 0 0.59 -0.07 1.45 1.45 0 0 0 1 -0.64 1.14 1.14 0 0 0 0 -0.84 2.1 2.1 0 0 0 0.8 -1.59c0 -1.42 -1.59 -2.54 -3.62 -2.54h-0.42a2.4 2.4 0 0 0 -0.31 -0.91 6.5 6.5 0 0 0 1.35 -3.87c0 -5 -6.15 -9 -13.75 -9a21.93 21.93 0 0 0 -2.45 0.15c5.09 -4.56 7 -10.71 4.3 -13.74 -1.74 -1.95 -5 -2.12 -8.42 -0.79a17.86 17.86 0 0 0 -3.21 1.66c0 -4.56 -0.27 -8.85 -0.72 -12.83zm-16.95 -18.24a28.52 28.52 0 0 1 -11.17 -0.86 52.63 52.63 0 0 1 -9.52 -3.84l-0.54 -9.39c2.7 2 7.5 3.73 12.41 4.68a44 44 0 0 0 8.2 0.85 26 26 0 0 0 2.73 -0.13 14.94 14.94 0 0 0 2.29 -0.4zm-0.2 1l-2 4.57a22.43 22.43 0 0 1 -10.15 -0.25 23.77 23.77 0 0 1 -8.5 -4v-5a53.39 53.39 0 0 0 9.34 3.72 29.54 29.54 0 0 0 11.31 1zm-14.63 -20.15a41.36 41.36 0 0 1 7.74 0.81 36.94 36.94 0 0 1 9.85 3.19c2.69 1.42 3.25 2.52 3.18 2.91s-1 1.21 -4 1.52a36.81 36.81 0 0 1 -10.34 -0.69c-8.86 -1.72 -13.25 -5 -13 -6.14 0.09 -0.74 2.44 -1.6 6.57 -1.6zm-13 21.15c0.27 -1.41 2.23 -2.58 5.31 -3.17l0.17 2.84a1.26 1.26 0 0 0 0.12 0.48c0.56 1.08 5 4.13 10.37 5.12a30.8 30.8 0 0 0 5.62 0.58c3.47 0 4.8 -0.87 5 -1a0.93 0.93 0 0 0 0.31 -0.37l1.6 -3.31 0.47 0.28c2.6 1.69 3.94 3.47 3.67 4.89s-2.18 2.56 -5.23 3.15a33.5 33.5 0 0 1 -12.25 -0.33c-9.59 -1.87 -15.68 -6.31 -15.13 -9.16zm41.65 63.75c-0.07 0.68 -0.15 1.35 -0.22 2l-0.05 0.09s0 0.05 -0.06 0.05c-1.13 8.51 -2.47 15.67 -3.53 20.14a62.11 62.11 0 0 1 -2.21 9.58c-2.24 6.57 -4.91 10.24 -6.37 10.24a0.75 0.75 0 0 1 -0.5 -0.18c-0.35 -0.28 -0.51 -2.14 -0.56 -4.73v-6.12c2.34 -0.65 5.27 -1.65 5.42 -1.7a0.5 0.5 0 0 0 0.31 -0.63 0.5 0.5 0 0 0 -0.63 -0.32c-0.05 0 -4.6 1.56 -6.85 2.06a117.14 117.14 0 0 1 -16 1 141.89 141.89 0 0 1 -19.22 -1.21 16.67 16.67 0 0 1 -4.84 -2.7 0.51 0.51 0 0 0 -0.71 0.08 0.5 0.5 0 0 0 0.08 0.7 18.09 18.09 0 0 0 4.95 2.75h0.09a84.62 84.62 0 0 1 -0.16 9.43 2.63 2.63 0 0 1 -0.37 1.34 0.75 0.75 0 0 1 -0.5 0.18c-1.46 0 -4.1 -3.64 -6.39 -10.17a46 46 0 0 1 -1.52 -5.78c-2 -3.93 -3.51 -12.2 -4.48 -22a1.79 1.79 0 0 0 0.54 -0.46c2 -2.47 0.57 -12.3 -0.1 -16.29l0.66 0.66a0.51 0.51 0 0 0 0.71 0 0.5 0.5 0 0 0 0 -0.71l-1.8 -1.8a0.5 0.5 0 0 0 -0.85 0.44c0.73 3.9 2.23 14.3 0.69 16.85v-0.34l-0.31 0.08a2.36 2.36 0 0 1 -0.37 0 2.6 2.6 0 0 1 -2.44 -1.74c-1.1 -1.35 -6 -10.54 -6 -10.54l-3.45 0.87a5.53 5.53 0 0 1 -1.34 0.17 3.85 3.85 0 0 1 -3.06 -1.41l-3.13 -0.8a1.29 1.29 0 0 1 -0.93 -1.57 0.8 0.8 0 0 1 0.08 -0.16 1.27 1.27 0 0 1 1.06 -0.8h0.05a1.17 1.17 0 0 1 0.32 0l2.18 0.55 -0.74 -0.49a1.29 1.29 0 0 1 -0.35 -1.79 1.27 1.27 0 0 1 1 -0.56h0.1a1.34 1.34 0 0 1 0.72 0.21l0.09 0.06 2 1.33c1.49 -1.1 3.15 -2.09 4.08 -2.09 0.56 0 1.47 0.81 2.48 2 0.8 0.92 1.67 2 2.49 3.19 0.27 0.37 0.53 0.74 0.78 1.1l-1.36 -9.56a2.5 2.5 0 0 1 0 -0.67 2.53 2.53 0 0 1 0 -0.82 2.59 2.59 0 0 1 2.52 -2 3 3 0 0 1 0.69 0.09l0.82 0.19a4 4 0 0 0 3.07 1.81 3.11 3.11 0 0 0 0.43 0 5.29 5.29 0 0 0 2.68 -1.42c4.18 -3.52 7.9 -12.82 9 -15.65h0.2a1.83 1.83 0 0 0 0.9 -0.24 8.46 8.46 0 1 0 0.35 -3 1.87 1.87 0 1 0 -2.45 2.87c-1.44 3.93 -4.72 11.44 -8 14.72a5.08 5.08 0 0 1 -2.76 1.65 2.91 2.91 0 0 1 -2.65 -1.38 202.84 202.84 0 0 1 0.82 -23.9l-3.57 -3.58a7.75 7.75 0 1 1 11 -11l2 2c-4.43 1.9 -5.43 5.25 -5.47 5.41a0.5 0.5 0 0 0 0.34 0.62h0.14a0.51 0.51 0 0 0 0.48 -0.36c0 -0.15 1.15 -3.8 6.45 -5.32a0.47 0.47 0 0 0 0.25 -0.18c2.9 -0.83 6.63 -1.89 9.88 -2.73a7.65 7.65 0 0 0 2.56 3.76c2.9 2.56 7.93 4.79 14.12 6a41 41 0 0 0 7.82 0.79 27.09 27.09 0 0 0 5.19 -0.46 12 12 0 0 0 4.9 -1.94 4.61 4.61 0 0 0 1.91 -2.79 4.08 4.08 0 0 0 0 -1.35 12.09 12.09 0 0 1 4.59 4.83 0.49 0.49 0 0 0 0.44 0.26 0.53 0.53 0 0 0 0.24 -0.06 0.51 0.51 0 0 0 0.2 -0.68 12.86 12.86 0 0 0 -6 -5.68 6.7 6.7 0 0 0 -0.77 -1.25l0.4 -0.4a7.75 7.75 0 0 1 11 11l-1.79 1.8 -0.31 0.31a145.32 145.32 0 0 1 0.95 15l-0.52 0.43a27.596 27.596 0 0 0 -1.22 1.19 3.52 3.52 0 0 0 -0.1 -0.86 1 1 0 0 0 -1 -0.72 1.15 1.15 0 0 0 -0.26 0 1 1 0 0 0 -0.72 1.19 2.33 2.33 0 0 1 0 0.83 3 3 0 0 1 -0.25 0.78 2.32 2.32 0 0 1 -0.46 0.54 3.35 3.35 0 0 1 -1.22 0.65 3.84 3.84 0 0 1 -1.07 0.15 10 10 0 0 1 -3.88 -1.22 16.6 16.6 0 0 0 -4.69 -1.59 13.29 13.29 0 0 0 -1.97 -0.02c-2.8 0 -4.37 1 -5.08 2.36a4.42 4.42 0 0 0 -2.26 -0.6c-2.09 0 -4.26 1.34 -6.44 4a20.6 20.6 0 0 0 -2.87 5.27c-1 2.28 -1.77 4.26 -3.67 5.18a4.2 4.2 0 0 1 -1.81 0.47 2.91 2.91 0 0 1 -0.89 -0.14 3.93 3.93 0 0 1 -0.9 -0.5 3.35 3.35 0 0 1 -0.75 -0.84 1 1 0 0 0 -1.76 0.94 4.31 4.31 0 0 0 1.28 1.47 4.84 4.84 0 0 0 1.45 0.81 7.05 7.05 0 0 0 2.48 0.43c4.55 0 10.6 -3.64 18 -10.81a2.34 2.34 0 0 0 0.25 -0.3h1.7c6.13 0 10.62 -0.81 13.43 -2.4 -1.29 3 -1.3 5.81 0.28 7.58l0.09 0.08a5.54 5.54 0 0 0 4.2 1.57v0.43a6.57 6.57 0 0 0 -1.45 4 6.32 6.32 0 0 0 0.94 3.25c-0.22 2.92 -0.52 6.22 -0.88 9.65zm-49.31 -38.7a7.5 7.5 0 1 1 7.5 7.5 7.51 7.51 0 0 1 -7.5 -7.5zm54.46 32.8c0.19 2.14 0.83 2.46 1.13 2.61a1.31 1.31 0 0 0 0.61 0.15 1.5 1.5 0 0 0 0.55 -0.11 3.12 3.12 0 0 0 1.31 -1.3 19.57 19.57 0 0 0 4.07 0.59c-1.14 3.23 -3.65 9.28 -6.36 9.28 -1.68 0 -3.43 -2.3 -5 -9a0.1 0.1 0 0 0 -0.07 0.06c0.15 -1.67 0.29 -3.28 0.42 -4.82a11.46 11.46 0 0 0 3.34 2.54zm17.92 18.13a59 59 0 0 1 -3.45 8.46 32.566 32.566 0 0 1 -1.12 2c-1.89 3.05 -3.79 4.63 -5.65 4.63s-3.8 -1.93 -5.59 -4.63a40.66 40.66 0 0 1 -1.22 -2 62 62 0 0 1 -3 -6.08c-1 -2.27 -1.76 -4.42 -2.29 -6a268.89 268.89 0 0 0 0.79 -5.4 7.76 7.76 0 0 0 3 3.63 3.93 3.93 0 0 0 1.9 0.5c4.09 0 7 -6.77 8.41 -11l0.09 -0.26a20.79 20.79 0 0 0 2.42 -0.29l1.08 -0.23a17.88 17.88 0 0 0 2.79 -0.91 3.88 3.88 0 0 0 1.85 0.47h0.27a3.59 3.59 0 0 0 3.48 1.85h0.25a134.51 134.51 0 0 1 -4.01 15.24zm1.74 -17.57a1.46 1.46 0 0 0 0.66 0.16 1.5 1.5 0 0 0 1.5 -1.5 1.39 1.39 0 0 0 -0.09 -0.5c1.41 0 2.59 0.71 2.59 1.54a1 1 0 0 1 -0.32 0.71 1.23 1.23 0 0 0 -0.47 -0.22 1.89 1.89 0 0 0 -1.56 0.62 0.44 0.44 0 0 0 -0.13 0.42h-0.14a2.93 2.93 0 0 1 -2.47 -1 3.3 3.3 0 0 0 0.43 -0.25zm-11.21 -14.88c5.83 0 10.55 2.52 10.55 5.64s-4.72 5.68 -10.55 5.68 -10.55 -2.53 -10.55 -5.65 4.72 -5.69 10.55 -5.69z"/>
+  <path fill="#59acff" d="M144.79 128.16s0.03 0 0 0z"/>
+  <path fill="url(#i)" d="M132.92 93.07a1.41 1.41 0 0 0 1.93 -0.44l1.66 -2.63a1.4 1.4 0 0 0 -0.44 -1.93 1.38 1.38 0 0 0 -1.93 0.44l-1.67 2.66a1.4 1.4 0 0 0 0.45 1.9z"/>
+  <path fill="url(#j)" d="M129.13 97a5.64 5.64 0 0 0 9.23 0 1 1 0 0 0 -1.68 -1.1 3.66 3.66 0 0 1 -2.94 1.5 3.72 3.72 0 0 1 -2.94 -1.49 1 1 0 0 0 -1.67 1.09z"/>
+  <path fill="#d9ebff" d="M124.1 133.65a6.12 6.12 0 0 1 -2.5 -2.05 6.08 6.08 0 0 1 -4.09 1.29 5.88 5.88 0 0 1 -1.79 -0.24 1.82 1.82 0 0 1 -0.6 -0.35 6.76 6.76 0 0 1 -3.43 2.38 4.07 4.07 0 0 1 -2.92 -0.34c0.07 1.71 0.49 3.69 2 3.84 2.77 0.28 4.71 -2.77 4.71 -2.77s2.49 1.11 3.88 0.55a13.26 13.26 0 0 0 2.21 -1.1s1.94 3.88 4.44 2.77c1.32 -0.59 1.55 -2.5 1.47 -4.16a4.43 4.43 0 0 1 -1.94 0.47 4 4 0 0 1 -1.44 -0.29z"/>
+  <path fill="url(#k)" d="M110.48 129.17c-0.68 0.66 -1.6 1.92 -1.53 2.67a0.68 0.68 0 0 0 0.37 0.52 2.38 2.38 0 0 0 1.9 0.38 5.58 5.58 0 0 0 2.78 -2.27l-0.14 -1.08 -1.76 1.45a0.52 0.52 0 0 1 -0.32 0.11 0.5 0.5 0 0 1 -0.31 -0.89l2.17 -1.78 -2.59 -1.39a0.5 0.5 0 0 1 -0.21 -0.68 0.51 0.51 0 0 1 0.68 -0.2l2.06 1.11v-0.18c-0.36 -0.93 -1.48 -3.14 -3 -3.74a2 2 0 0 0 -0.75 -0.14 2.5 2.5 0 0 0 -1.11 0.28 0.5 0.5 0 0 0 -0.33 0.39c-0.18 1 1.16 3 2.13 4a1 1 0 0 1 -0.04 1.44z"/>
+  <path fill="url(#l)" d="M107 132a2.67 2.67 0 0 0 1.28 2 7.105 7.105 0 0 0 0.53 0.3 4.07 4.07 0 0 0 2.92 0.34 6.76 6.76 0 0 0 3.43 -2.38 1.82 1.82 0 0 0 0.6 0.35 5.88 5.88 0 0 0 1.79 0.24 6.08 6.08 0 0 0 4.09 -1.29 6.12 6.12 0 0 0 2.5 2.05 4 4 0 0 0 1.49 0.29 4.43 4.43 0 0 0 1.94 -0.47h0.07a2.48 2.48 0 0 0 1.4 -1.8c0.33 -1.75 -1.12 -3.92 -2 -5.07a5.41 5.41 0 0 0 1.49 -3.61 2.63 2.63 0 0 0 -1.28 -2 4.31 4.31 0 0 0 -3.45 -0.65 6.78 6.78 0 0 0 -3.38 2.33l-0.08 -0.06a1 1 0 0 0 -0.5 -0.13c-0.9 0 -3.92 0.07 -5.1 1a1.75 1.75 0 0 0 -0.45 0.55 6.75 6.75 0 0 0 -2.89 -2.6 4.18 4.18 0 0 0 -3.5 0.2 2.5 2.5 0 0 0 -1.4 1.8c-0.34 1.75 1.12 3.93 2 5.07a5.44 5.44 0 0 0 -1.5 3.54zm17.26 -9.79a2.37 2.37 0 0 1 1.89 0.39 0.65 0.65 0 0 1 0.37 0.52c0.08 0.74 -0.85 2 -1.53 2.67a1 1 0 0 0 0 1.38c1 1.08 2.3 3.12 2.12 4.06 0 0.12 -0.06 0.25 -0.33 0.38a2.16 2.16 0 0 1 -1.86 0.14 6 6 0 0 1 -2.53 -2.79v-0.33l1.15 0.92a0.51 0.51 0 0 0 0.31 0.11 0.5 0.5 0 0 0 0.32 -0.89l-1.81 -1.45v-0.42l1.39 -1.39a0.5 0.5 0 0 0 0 -0.7 0.5 0.5 0 0 0 -0.71 0l-0.87 0.87a8.16 8.16 0 0 0 -0.44 -1.45 5.28 5.28 0 0 1 2.49 -1.98zm-8.32 2.79a10.91 10.91 0 0 1 3.52 -0.51c0.89 1 1.07 4.93 0.69 5.78 -0.34 0.45 -2.64 0.91 -3.72 0.56 -0.69 -0.62 -1.04 -4.83 -0.49 -5.83zm-7.54 -1.23a0.5 0.5 0 0 1 0.33 -0.39 2.5 2.5 0 0 1 1.11 -0.28 2 2 0 0 1 0.75 0.14c1.49 0.6 2.61 2.81 3 3.74v0.18l-2.07 -1.16a0.51 0.51 0 0 0 -0.68 0.2 0.5 0.5 0 0 0 0.21 0.68l2.59 1.39 -2.17 1.78a0.5 0.5 0 0 0 0.31 0.89 0.52 0.52 0 0 0 0.32 -0.11l1.76 -1.45 0.14 1.08a5.58 5.58 0 0 1 -2.78 2.27 2.38 2.38 0 0 1 -1.9 -0.38 0.68 0.68 0 0 1 -0.37 -0.52c-0.07 -0.75 0.85 -2 1.53 -2.67a1 1 0 0 0 0 -1.39c-0.92 -1.06 -2.26 -3.09 -2.08 -4.04z"/>
+  <path fill="url(#m)" d="M122.93 124.85a0.5 0.5 0 0 1 0.71 0 0.5 0.5 0 0 1 0 0.7l-1.39 1.39v0.42l1.81 1.45a0.5 0.5 0 0 1 -0.32 0.89 0.51 0.51 0 0 1 -0.31 -0.11l-1.15 -0.92v0.33a6 6 0 0 0 2.53 2.79 2.16 2.16 0 0 0 1.86 -0.14c0.27 -0.13 0.31 -0.26 0.33 -0.38 0.18 -0.94 -1.16 -3 -2.12 -4.06a1 1 0 0 1 0 -1.38c0.68 -0.66 1.61 -1.93 1.53 -2.67a0.65 0.65 0 0 0 -0.37 -0.52 2.37 2.37 0 0 0 -1.89 -0.39 5.28 5.28 0 0 0 -2.6 2 8.16 8.16 0 0 1 0.44 1.45z"/>
+  <path fill="url(#n)" d="M120.15 130.23c0.38 -0.85 0.2 -4.83 -0.69 -5.78a10.91 10.91 0 0 0 -3.52 0.51c-0.55 1 -0.2 5.25 0.49 5.83 1.08 0.35 3.38 -0.11 3.72 -0.56z"/>
+  <path fill="url(#o)" d="M116.84 77.3a33.5 33.5 0 0 0 12.25 0.33c3 -0.59 4.95 -1.74 5.23 -3.15s-1.07 -3.2 -3.67 -4.89l-0.47 -0.28 -1.6 3.31a0.93 0.93 0 0 1 -0.31 0.37c-0.19 0.14 -1.52 1 -5 1a30.8 30.8 0 0 1 -5.62 -0.58c-5.32 -1 -9.81 -4 -10.37 -5.12a1.26 1.26 0 0 1 -0.12 -0.48l-0.16 -2.81c-3.08 0.59 -5 1.76 -5.31 3.17 -0.55 2.83 5.54 7.27 15.15 9.13z"/>
+  <path fill="url(#p)" d="M128.87 57.59a44 44 0 0 1 -8.2 -0.85c-4.91 -1 -9.71 -2.65 -12.41 -4.68l0.54 9.39a52.63 52.63 0 0 0 9.52 3.84 28.52 28.52 0 0 0 11.17 0.86l4.4 -9.09a14.94 14.94 0 0 1 -2.29 0.4 26 26 0 0 1 -2.73 0.13z"/>
+  <path fill="#fff" d="M121.05 54.78a36.81 36.81 0 0 0 10.34 0.69c3 -0.31 4 -1.13 4 -1.52s-0.49 -1.49 -3.18 -2.91a36.94 36.94 0 0 0 -9.85 -3.23 41.36 41.36 0 0 0 -7.74 -0.81c-4.13 0 -6.48 0.86 -6.63 1.64 -0.19 1.18 4.2 4.42 13.06 6.14z"/>
+  <path fill="#f2f8ff" d="M108.71 62.53v5a23.77 23.77 0 0 0 8.5 4 22.43 22.43 0 0 0 10.15 0.25l2 -4.57a29.54 29.54 0 0 1 -11.24 -0.94 53.39 53.39 0 0 1 -9.41 -3.74z"/>
+  <path fill="url(#q)" d="M156.91 123c5.83 0 10.55 -2.53 10.55 -5.65s-4.72 -5.64 -10.55 -5.64 -10.55 2.52 -10.55 5.64 4.72 5.65 10.55 5.65zm-7.78 -6.75h0.37a4.49 4.49 0 0 1 2.2 -2 0.49 0.49 0 0 1 0.57 -0.79l0.6 0.32a12.44 12.44 0 0 1 3.54 -0.57v-0.32a0.5 0.5 0 0 1 1 0v0.33a11.84 11.84 0 0 1 3.78 0.78l0.62 -0.31a0.51 0.51 0 0 1 0.67 0.23 0.5 0.5 0 0 1 -0.17 0.63 4.06 4.06 0 0 1 1.6 1.59h0.5a0.5 0.5 0 0 1 0.5 0.5 0.5 0.5 0 0 1 -0.5 0.5h-0.23v0.05a2.92 2.92 0 0 1 -1.28 2.23 0.5 0.5 0 0 1 0 0.16 0.49 0.49 0 0 1 -0.46 0.31 0.47 0.47 0 0 1 -0.17 0 10.53 10.53 0 0 1 -4.58 1.28v0.38a0.5 0.5 0 1 1 -1 0v-0.35a12.1 12.1 0 0 1 -4.52 -0.85l-0.23 0.13a0.47 0.47 0 0 1 -0.25 0.07 0.5 0.5 0 0 1 -0.43 -0.25 0.48 0.48 0 0 1 0 -0.42 3.36 3.36 0 0 1 -1.91 -2.59h-0.13a0.51 0.51 0 0 1 -0.5 -0.47 0.5 0.5 0 0 1 0.41 -0.62z"/>
+  <path fill="#f2f8ff" d="M157.48 116.86l5.11 2a0.49 0.49 0 0 1 0.31 0.49 2.92 2.92 0 0 0 1.28 -2.23v-0.05h-1.4a0.5 0.5 0 0 1 -0.5 -0.5 0.51 0.51 0 0 1 0.5 -0.5h1.13a4.06 4.06 0 0 0 -1.6 -1.59h-0.06z"/>
+  <path fill="#f2f8ff" d="M151.78 116.54a0.49 0.49 0 0 1 -0.47 0.53l-2 0.12a3.36 3.36 0 0 0 1.91 2.59 0.45 0.45 0 0 1 0.21 -0.26l1.5 -0.88a0.5 0.5 0 0 1 0.5 0.87l-1.27 0.74a12.1 12.1 0 0 0 4.52 0.85v-1.1a0.5 0.5 0 0 1 1 0v1.12a10.53 10.53 0 0 0 4.58 -1.28l-5.75 -2.25a0.5 0.5 0 0 1 -0.29 -0.65 0.49 0.49 0 0 1 0.24 -0.63l4.75 -2.32a11.84 11.84 0 0 0 -3.78 -0.78v0.8a0.5 0.5 0 1 1 -1 0v-0.81a12.44 12.44 0 0 0 -3.54 0.57l0.78 0.43a0.49 0.49 0 0 1 0.2 0.67 0.49 0.49 0 0 1 -0.44 0.26 0.53 0.53 0 0 1 -0.24 -0.06l-1.38 -0.75 -0.09 -0.08a4.49 4.49 0 0 0 -2.2 2l1.75 -0.11a0.51 0.51 0 0 1 0.51 0.41z"/>
+  <path fill="url(#r)" d="M153.59 118.82a0.5 0.5 0 0 0 -0.68 -0.18l-1.5 0.88a0.45 0.45 0 0 0 -0.21 0.26 0.48 0.48 0 0 0 0 0.42 0.5 0.5 0 0 0 0.43 0.25 0.47 0.47 0 0 0 0.25 -0.07l0.23 -0.13 1.27 -0.74a0.51 0.51 0 0 0 0.21 -0.69z"/>
+  <path fill="url(#s)" d="M156.2 116.88a0.5 0.5 0 0 0 0.29 0.65l5.75 2.25a0.47 0.47 0 0 0 0.17 0 0.49 0.49 0 0 0 0.46 -0.31 0.5 0.5 0 0 0 0 -0.16 0.49 0.49 0 0 0 -0.31 -0.49l-5.11 -2 4.77 -2.34h0.06a0.5 0.5 0 0 0 0.17 -0.63 0.51 0.51 0 0 0 -0.67 -0.23l-0.62 0.31 -4.75 2.32a0.49 0.49 0 0 0 -0.21 0.63z"/>
+  <path fill="url(#t)" d="M153.17 115a0.53 0.53 0 0 0 0.24 0.06 0.49 0.49 0 0 0 0.44 -0.26 0.49 0.49 0 0 0 -0.2 -0.67l-0.78 -0.43 -0.6 -0.32a0.49 0.49 0 0 0 -0.57 0.79l0.09 0.08z"/>
+  <path fill="url(#u)" d="M162.28 116.57a0.5 0.5 0 0 0 0.5 0.5h1.63a0.5 0.5 0 0 0 0.5 -0.5 0.5 0.5 0 0 0 -0.5 -0.5h-1.63a0.51 0.51 0 0 0 -0.5 0.5z"/>
+  <path fill="url(#v)" d="M156.91 114.45a0.5 0.5 0 0 0 0.5 -0.5v-1.13a0.5 0.5 0 0 0 -1 0v1.18a0.5 0.5 0 0 0 0.5 0.45z"/>
+  <path fill="url(#w)" d="M149.16 117.2h0.13l2 -0.12a0.49 0.49 0 0 0 0.47 -0.53 0.51 0.51 0 0 0 -0.53 -0.47l-1.75 0.11h-0.37a0.5 0.5 0 0 0 -0.47 0.53 0.51 0.51 0 0 0 0.52 0.48z"/>
+  <path fill="url(#x)" d="M157.16 119.45a0.5 0.5 0 0 0 -0.5 0.5v1.5a0.5 0.5 0 1 0 1 0v-1.45a0.5 0.5 0 0 0 -0.5 -0.55z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/book-add.svg b/waterfox/browser/themes/lepton/icons/book-add.svg
new file mode 100644
index 0000000000000..3121f768d1a57
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/book-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm.625-6.37a.625.625 0 1 0-1.25 0v1.745H8.63a.625.625 0 1 0 0 1.25h1.745v1.745a.625.625 0 1 0 1.25 0v-1.745h1.745a.625.625 0 1 0 0-1.25h-1.745V9.63Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M11 1.25H3a.75.75 0 0 0-.75.75v10.145c.232-.093.485-.145.75-.145h3c0 .432.055.85.158 1.25H3a.75.75 0 0 0 0 1.5h3.824c.317.481.715.904 1.176 1.25H3a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v5.416a4.965 4.965 0 0 0-1.25-.36V2a.75.75 0 0 0-.75-.75Zm-5.75 3.5v-.5h3.5v.5h-3.5ZM4 3.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-5a.5.5 0 0 1-.5-.5v-2Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/book.svg b/waterfox/browser/themes/lepton/icons/book.svg
new file mode 100644
index 0000000000000..66f726a6c011f
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/book.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v12c0 1.1-.9 2-2 2H4a2 2 0 0 1-2-2V2Zm10-.75H4a.75.75 0 0 0-.75.75v10.145c.232-.093.485-.145.75-.145h8c.265 0 .518.052.75.145V2a.75.75 0 0 0-.75-.75ZM3.25 14c0 .414.336.75.75.75h8a.75.75 0 0 0 0-1.5H4a.75.75 0 0 0-.75.75Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M6.25 4.25v.5h3.5v-.5h-3.5ZM5.5 3a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 .5.5h5a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-.5-.5h-5Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/bookmark-multiple.svg b/waterfox/browser/themes/lepton/icons/bookmark-multiple.svg
new file mode 100644
index 0000000000000..bf4be95482328
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmark-multiple.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M6.456 3.212c.378-.94 1.71-.94 2.088 0l1.2 2.99 3.213.217c1.012.069 1.424 1.336.646 1.986L11.13 10.47l.786 3.123c.247.983-.83 1.767-1.69 1.227L7.5 13.108 4.772 14.82c-.859.54-1.936-.244-1.689-1.227l.786-3.123-2.472-2.065c-.778-.65-.366-1.917.646-1.986l3.213-.218 1.2-2.989Zm1.044.755L6.387 6.74c-.161.4-.537.674-.968.703l-2.981.202L4.73 9.561c.331.277.475.719.37 1.138l-.73 2.897 2.53-1.588c.367-.23.831-.23 1.197 0l2.53 1.588L9.9 10.7c-.106-.42.038-.861.37-1.138l2.292-1.916-2.98-.202a1.125 1.125 0 0 1-.969-.703L7.5 3.967Z" clip-rule="evenodd"/><path d="M8.456 1.212c.378-.94 1.71-.94 2.088 0l1.2 2.99 3.213.217c1.012.069 1.424 1.336.646 1.986l-.364.304a2.528 2.528 0 0 0-.697-1.047l.02-.017-.043-.003a2.46 2.46 0 0 0-1.469-.595l-2.352-.16L9.82 2.7a2.666 2.666 0 0 0-.155-.323l-.165-.41-.041.103a2.419 2.419 0 0 0-1.039-.768l.036-.09Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/bookmarks-toolbar-alt.svg b/waterfox/browser/themes/lepton/icons/bookmarks-toolbar-alt.svg
new file mode 100644
index 0000000000000..cd58f93057ef7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarks-toolbar-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 3.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M7.583 4.294a.442.442 0 0 1 .834 0l.755 1.967a.451.451 0 0 0 .386.293l2.023.144c.404.028.568.557.257.828l-1.555 1.359a.482.482 0 0 0-.148.474l.495 2.056c.098.41-.332.737-.674.512L8.239 10.8a.432.432 0 0 0-.478 0l-1.717 1.127c-.342.225-.772-.102-.674-.512l.495-2.056a.482.482 0 0 0-.148-.474L4.162 7.526c-.31-.271-.147-.8.257-.828l2.023-.144a.451.451 0 0 0 .386-.293l.755-1.967Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/bookmarks-toolbar.svg b/waterfox/browser/themes/lepton/icons/bookmarks-toolbar.svg
new file mode 100644
index 0000000000000..2f201192fc44d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarks-toolbar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 2.25H2a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V3a.75.75 0 0 0-.75-.75ZM2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M7.536 4.155a.5.5 0 0 1 .928 0l.841 2.096a.5.5 0 0 0 .43.312l2.254.153a.5.5 0 0 1 .286.883l-1.733 1.448a.5.5 0 0 0-.164.505l.551 2.19a.5.5 0 0 1-.75.546l-1.913-1.201a.5.5 0 0 0-.532 0l-1.912 1.2a.5.5 0 0 1-.751-.545l.55-2.19a.5.5 0 0 0-.163-.505L3.725 7.599a.5.5 0 0 1 .286-.883l2.253-.153a.5.5 0 0 0 .43-.312l.842-2.096Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/bookmarksMenu-open.svg b/waterfox/browser/themes/lepton/icons/bookmarksMenu-open.svg
new file mode 100644
index 0000000000000..83be211fdc5bb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarksMenu-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.045 3.63A2.625 2.625 0 0 1 3.67 1.005h3.28c.373 0 .675.302.675.675 0 .201.164.365.365.365h4.38a2.625 2.625 0 0 1 2.625 2.625v7.7a2.625 2.625 0 0 1-2.625 2.625h-8.7a2.625 2.625 0 0 1-2.625-2.625V3.63ZM3.67 2.255c-.76 0-1.375.616-1.375 1.375v8.74c0 .76.616 1.375 1.375 1.375h8.7c.76 0 1.375-.616 1.375-1.375v-7.7c0-.76-.616-1.375-1.375-1.375H7.99c-.689 0-1.278-.432-1.51-1.04H3.67Z" clip-rule="evenodd"/><path d="M4 5.625C4 5.28 4.28 5 4.625 5h1.75a.625.625 0 1 1 0 1.25h-1.75A.625.625 0 0 1 4 5.625ZM4 8.625C4 8.28 4.28 8 4.625 8h1.75a.625.625 0 1 1 0 1.25h-1.75A.625.625 0 0 1 4 8.625ZM4 11.625c0-.345.28-.625.625-.625h1.75a.625.625 0 1 1 0 1.25h-1.75A.625.625 0 0 1 4 11.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/bookmarksMenu-open2.svg b/waterfox/browser/themes/lepton/icons/bookmarksMenu-open2.svg
new file mode 100644
index 0000000000000..cba1fdf609018
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarksMenu-open2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M15.58 8.603A.833.833 0 0 0 15 8.37V4a2 2 0 0 0-2-2H8a.5.5 0 0 1-.5-.5A.5.5 0 0 0 7 1H3a2 2 0 0 0-2 2v6.37a.804.804 0 0 0-.789.978l.448 2.074A2 2 0 0 0 2.614 14h10.71a2 2 0 0 0 1.97-1.65l.531-2.995a.835.835 0 0 0-.245-.752ZM2.083 9.995a1.255 1.255 0 0 1-.559.51l.357 1.653a.75.75 0 0 0 .733.592h10.71a.75.75 0 0 0 .738-.619l.463-2.604a1.255 1.255 0 0 1-.608-.532H8.495a.37.37 0 0 0-.37.37.63.63 0 0 1-.63.63H2.083Zm11.667-2.25V4a.75.75 0 0 0-.75-.75H8a1.75 1.75 0 0 1-1.582-1H3a.75.75 0 0 0-.75.75v5.745h4.748c.243-.587.822-1 1.497-1h5.255Z" clip-rule="evenodd"/><path d="M4 5.625C4 5.28 4.28 5 4.625 5h1.75a.625.625 0 1 1 0 1.25h-1.75A.625.625 0 0 1 4 5.625ZM4 7.625C4 7.28 4.28 7 4.625 7h1.75a.625.625 0 1 1 0 1.25h-1.75A.625.625 0 0 1 4 7.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open-alt.svg b/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open-alt.svg
new file mode 100644
index 0000000000000..7e794b27874a5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 3.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="m8.925 9.755.023.015-.028-.118a1.732 1.732 0 0 1 .54-1.709l.152-.132-.142-.01A1.7 1.7 0 0 1 8.005 6.71L8 6.696l-.005.013-1.167-.448.755-1.967a.442.442 0 0 1 .834 0l.755 1.967a.451.451 0 0 0 .386.293l2.023.144c.404.028.568.557.257.828l-1.555 1.359a.482.482 0 0 0-.148.474l.495 2.056c.098.41-.332.737-.674.512L8.239 10.8a.432.432 0 0 0-.478 0l-1.717 1.127c-.342.225-.772-.102-.674-.512l.495-2.056a.482.482 0 0 0-.148-.474L4.162 7.526c-.31-.271-.147-.8.257-.828l2.023-.144.088 1.247-.142.01.152.132c.493.43.688 1.095.54 1.709l-.028.118.023-.015a1.682 1.682 0 0 1 1.85 0ZM6.828 6.26a.451.451 0 0 1-.386.293l.088 1.247A1.7 1.7 0 0 0 7.995 6.71" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open.svg b/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open.svg
new file mode 100644
index 0000000000000..ad37fa63638f4
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bookmarksToolbar-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 2.25H2a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V3a.75.75 0 0 0-.75-.75ZM2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="m8 5.842-.377.94a1.5 1.5 0 0 1-1.291.937l-1.01.069.777.65a1.5 1.5 0 0 1 .493 1.516l-.247.983.857-.539a1.5 1.5 0 0 1 1.596 0l.857.539-.247-.983a1.5 1.5 0 0 1 .493-1.517l.778-.65-1.011-.068a1.5 1.5 0 0 1-1.29-.937L8 5.842Zm.464-1.528a.5.5 0 0 0-.928 0l-.841 2.095a.5.5 0 0 1-.43.313l-2.254.152a.5.5 0 0 0-.286.883l1.733 1.448a.5.5 0 0 1 .164.505L5.07 11.9a.5.5 0 0 0 .75.546l1.913-1.2a.5.5 0 0 1 .532 0l1.912 1.2a.5.5 0 0 0 .751-.546l-.55-2.19a.5.5 0 0 1 .163-.505l1.733-1.448a.5.5 0 0 0-.286-.883l-2.253-.152a.5.5 0 0 1-.43-.313l-.842-2.095Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/broom.svg b/waterfox/browser/themes/lepton/icons/broom.svg
new file mode 100644
index 0000000000000..7623bf2aa7da0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/broom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M6.058 9.942a.625.625 0 0 1 0-.884l7.87-7.87a.625.625 0 1 1 .884.884l-7.87 7.87a.625.625 0 0 1-.884 0Z" clip-rule="evenodd"/><path d="M3.87 6.414a2 2 0 0 1 2.828 0l2.888 2.888a2 2 0 0 1 0 2.829l-.73.73L3.14 7.143l.73-.73Z"/><path fill-rule="evenodd" d="m3.495 7.953-1.269.505 5.316 5.316.505-1.269-4.552-4.552Zm6.018 4.25L3.797 6.487l-2.386.95a1 1 0 0 0-.337 1.637l5.852 5.852a1 1 0 0 0 1.636-.337l.951-2.386Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/bug.svg b/waterfox/browser/themes/lepton/icons/bug.svg
new file mode 100644
index 0000000000000..9ebc7982cf8ed
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M5 5a3 3 0 0 1 6 0v7a3 3 0 1 1-6 0V5Z"/><path fill-rule="evenodd" d="M6.369 0c.345 0 .625.28.625.625v1.371a1.006 1.006 0 0 0 2.012 0V.626a.625.625 0 1 1 1.25 0v1.37a2.256 2.256 0 1 1-4.512 0V.626c0-.346.28-.626.625-.626ZM2.627 1c.345 0 .625.28.625.626v1.871c0 .76.616 1.376 1.376 1.376h6.745c.76 0 1.376-.616 1.376-1.376V1.626a.625.625 0 0 1 1.25 0v1.871a2.627 2.627 0 0 1-2.626 2.627H4.628A2.627 2.627 0 0 1 2 3.497V1.626c0-.345.28-.625.626-.625ZM0 8.63c0-.345.28-.625.625-.625h14.75a.625.625 0 1 1 0 1.25H.625A.625.625 0 0 1 0 8.63Zm4.628 3.498c-.76 0-1.376.616-1.376 1.375v1.872a.625.625 0 1 1-1.25 0v-1.872a2.627 2.627 0 0 1 2.626-2.626h6.745a2.627 2.627 0 0 1 2.626 2.626v1.872a.625.625 0 1 1-1.25 0v-1.872c0-.76-.616-1.375-1.376-1.375H4.628Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/calendar-agenda.svg b/waterfox/browser/themes/lepton/icons/calendar-agenda.svg
new file mode 100644
index 0000000000000..030e265636dff
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/calendar-agenda.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 2.25H3a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V3a.75.75 0 0 0-.75-.75ZM3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3Z" clip-rule="evenodd"/><path d="M4 4.625C4 4.28 4.28 4 4.625 4h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 4.625ZM4 7.995c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 7.995ZM4 11.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 11.375Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/characterEncoding.svg b/waterfox/browser/themes/lepton/icons/characterEncoding.svg
new file mode 100644
index 0000000000000..f730cbc010cbc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/characterEncoding.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 2.25H3a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V3a.75.75 0 0 0-.75-.75ZM3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3Z" clip-rule="evenodd"/><path d="M9.829 5c.453 0 .841.11 1.164.327.327.219.578.523.752.914.173.391.258.844.255 1.358v.554H8.378c.014.711.162 1.24.444 1.585.283.341.69.512 1.221.512.34 0 .642-.034.905-.1a4.5 4.5 0 0 0 .807-.296v.771c-.28.13-.554.225-.823.285-.265.06-.57.09-.914.09-.327 0-.627-.047-.9-.143a2.184 2.184 0 0 1-.714-.427 2.394 2.394 0 0 1-.511-.698 3.4 3.4 0 0 1-.516.671c-.188.19-.41.338-.67.444-.258.102-.57.153-.934.153-.34 0-.646-.062-.915-.185a1.425 1.425 0 0 1-.628-.56c-.153-.25-.23-.567-.23-.95 0-.384.094-.708.281-.972.19-.268.475-.474.853-.618.382-.148.857-.23 1.425-.248l.95-.043V7.05c0-.49-.107-.832-.321-1.03-.215-.2-.506-.3-.874-.3-.276 0-.548.043-.817.131a4.834 4.834 0 0 0-.756.312l-.266-.666a4.08 4.08 0 0 1 .884-.343c.34-.095.681-.142 1.022-.142.439 0 .798.079 1.077.237.283.159.49.416.624.771.18-.32.419-.57.715-.75.296-.18.64-.269 1.032-.269Zm-2.34 3.042-.802.037c-.657.028-1.122.146-1.395.354-.272.208-.408.502-.408.882 0 .331.092.576.276.734.187.159.436.238.745.238.307 0 .58-.063.818-.19s.426-.317.562-.57c.136-.254.204-.571.204-.951v-.534Zm2.33-2.324c-.413 0-.743.15-.991.45-.25.295-.392.726-.43 1.293h2.703a2.667 2.667 0 0 0-.133-.913 1.265 1.265 0 0 0-.424-.613c-.19-.145-.433-.217-.725-.217Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/chat-sparkle.svg b/waterfox/browser/themes/lepton/icons/chat-sparkle.svg
new file mode 100644
index 0000000000000..94ab3ef4e1733
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/chat-sparkle.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M10.246 4.663a2.068 2.068 0 0 0-.98-.694l-1.002-.326a.396.396 0 0 1 0-.746l1.002-.325a2.064 2.064 0 0 0 1.28-1.282l.008-.025.325-1.001a.396.396 0 0 1 .747 0l.326 1.001a2.062 2.062 0 0 0 1.307 1.307l1.002.325.02.005a.396.396 0 0 1 0 .746l-1.002.326a2.065 2.065 0 0 0-1.307 1.306l-.326 1.002a.396.396 0 0 1-.746 0l-.326-1.002a2.064 2.064 0 0 0-.328-.617Zm5.596 2.765-.557-.181a1.147 1.147 0 0 1-.726-.726l-.181-.556a.22.22 0 0 0-.415 0l-.18.556a1.146 1.146 0 0 1-.716.726l-.557.18a.22.22 0 0 0 0 .415l.557.181a1.147 1.147 0 0 1 .727.729l.18.556a.22.22 0 0 0 .415 0l.181-.556a1.147 1.147 0 0 1 .727-.726l.556-.181a.22.22 0 0 0 0-.414Zm-8.57-5.973c.697 0 1.37.097 2.007.28a1.28 1.28 0 0 1-.268.126l-.975.32a1.2 1.2 0 0 0-.524.369 6.182 6.182 0 0 0-5.64 9.186l.109.197-.81 2.897 2.9-.809.196.11a6.184 6.184 0 0 0 9.096-4.338.982.982 0 0 0 .244.25.938.938 0 0 0 .792.142A7.275 7.275 0 0 1 3.937 15.19l-2.783.776a.91.91 0 0 1-1.12-1.12l.777-2.78A7.273 7.273 0 0 1 7.273 1.454Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/checkmark-circle.svg b/waterfox/browser/themes/lepton/icons/checkmark-circle.svg
new file mode 100644
index 0000000000000..9d498da11594c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/checkmark-circle.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm0 1.333a6.667 6.667 0 1 0 0 13.334A6.667 6.667 0 0 0 8 1.333zM7 9.39l3.827-3.838a.667.667 0 0 1 1.021.85l-.077.092-4.299 4.31a.667.667 0 0 1-.851.078l-.092-.077L4.195 8.47a.667.667 0 0 1 .85-1.02l.093.078L7 9.389l3.828-3.837z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/close-duplicate-tabs-photon.svg b/waterfox/browser/themes/lepton/icons/close-duplicate-tabs-photon.svg
new file mode 100644
index 0000000000000..f77036b380dc0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/close-duplicate-tabs-photon.svg
@@ -0,0 +1 @@
+ <svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.439.75c-.063.079-.12.162-.171.25H14a1 1 0 0 1 1 1v5.127a1.619 1.619 0 0 1 1 1.375V2a2 2 0 0 0-2-2H5c-.632 0-1.195.293-1.561.75ZM16 8.758c-.03.372-.186.736-.471 1.021l-.529.53v.424A1.997 1.997 0 0 0 16 9v-.243ZM10.894 13H9.126l1.25-1.25h1.874l-.692.692-.053-.053-.611.611ZM14 9.894l-1.25 1.25V9.376l1.188-1.188c.02-.02.04-.038.062-.054v1.76Zm1-1.185a.625.625 0 0 0 0-.158v.158Zm-1-1.66V4a1.99 1.99 0 0 0-1.031-1.75A1.991 1.991 0 0 0 12 2H3a2 2 0 0 0-2 2v7.75H.977c-.492 0-.977 0-.977.62C0 13 .5 13 1 13h6.712l1.25-1.25H2.25V4A.75.75 0 0 1 3 3.25h9a.75.75 0 0 1 .75.75v3.962l.481-.481c.22-.22.487-.364.769-.431Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.188 8.188a.625.625 0 0 1 .884 0l2.433 2.433 2.433-2.433a.625.625 0 1 1 .884.884l-2.433 2.433 2.433 2.433a.625.625 0 1 1-.884.884l-2.433-2.433-2.433 2.433a.625.625 0 1 1-.884-.884l2.433-2.433-2.433-2.433a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/close-duplicate-tabs.svg b/waterfox/browser/themes/lepton/icons/close-duplicate-tabs.svg
new file mode 100644
index 0000000000000..a24c97110a0b7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/close-duplicate-tabs.svg
@@ -0,0 +1 @@
+ <svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path d="m12.942 12.058-.553-.553L14 9.894v-1.76a.632.632 0 0 0-.062.054L12.75 9.376v.796c0 .198-.08.39-.22.53l-.827.828a.752.752 0 0 1-.531.22h-.796L9.126 13h1.768l.611-.611.45.45c.234-.099.449-.243.631-.425l.356-.356ZM7.712 13H2a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h10a1.991 1.991 0 0 1 1.75 1.031c.16.287.25.617.25.969v3.05c-.282.067-.55.211-.769.431l-.481.48V4a.75.75 0 0 0-.75-.75H2a.75.75 0 0 0-.75.75v7c0 .414.336.75.75.75h6.962L7.712 13ZM15 10.308v.424A2 2 0 0 0 16 9v-.242c-.03.372-.186.736-.47 1.021l-.53.53Zm1-1.806V2a2 2 0 0 0-2-2H4a1.996 1.996 0 0 0-1.732 1H14a1 1 0 0 1 1 1v5.127a1.621 1.621 0 0 1 1 1.375Zm-1 .049v.158a.625.625 0 0 0 0-.158Z"/><path d="M8.188 8.188a.625.625 0 0 1 .884 0l2.433 2.433 2.433-2.433a.625.625 0 1 1 .884.884l-2.433 2.433 2.433 2.433a.625.625 0 1 1-.884.884l-2.433-2.433-2.433 2.433a.625.625 0 1 1-.884-.884l2.433-2.433-2.433-2.433a.625.625 0 0 1 0-.884Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/close-tab-photon.svg b/waterfox/browser/themes/lepton/icons/close-tab-photon.svg
new file mode 100644
index 0000000000000..31b724b124fb8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/close-tab-photon.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 3.25h8a.75.75 0 0 1 .75.75v3.962l.481-.481c.22-.22.487-.364.769-.431V4a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v7.75H.625a.625.625 0 1 0 0 1.25h7.087l1.25-1.25H3.25V4A.75.75 0 0 1 4 3.25Zm6.376 8.5L9.126 13h1.768l.611-.611.611.611h1.768l-1.25-1.25h-2.258Zm2.374-.606L14 9.894v-1.76a.632.632 0 0 0-.062.054L12.75 9.376v1.768Zm1.25.164-.197.197.197.197v-.394Zm.048.442 1.25 1.25h.077a.625.625 0 1 0 0-1.25h-1.327Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.188 8.188a.625.625 0 0 1 .884 0l2.433 2.433 2.433-2.433a.625.625 0 1 1 .884.884l-2.433 2.433 2.433 2.433a.625.625 0 1 1-.884.884l-2.433-2.433-2.433 2.433a.625.625 0 1 1-.884-.884l2.433-2.433-2.433-2.433a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/close-tab.svg b/waterfox/browser/themes/lepton/icons/close-tab.svg
new file mode 100644
index 0000000000000..20ce397566db8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/close-tab.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 3.25h10a.75.75 0 0 1 .75.75v3.132A1.63 1.63 0 0 1 15 7.127V4a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h4.712l1.25-1.25H3a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 3 3.25Zm7.376 8.5L9.126 13h1.768l.611-.611.611.611H13c.262 0 .512-.05.742-.142l-1.108-1.108h-2.258Zm3.374-1.606 1.072-1.072A.622.622 0 0 0 15 8.709v-.158a.625.625 0 0 0-1.062-.363l-.188.188v1.768Zm1.25.164-1.197 1.197.752.752c.279-.343.445-.78.445-1.257v-.692Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.188 8.188a.625.625 0 0 1 .884 0l2.433 2.433 2.433-2.433a.625.625 0 1 1 .884.884l-2.433 2.433 2.433 2.433a.625.625 0 1 1-.884.884l-2.433-2.433-2.433 2.433a.625.625 0 1 1-.884-.884l2.433-2.433-2.433-2.433a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/close-window.svg b/waterfox/browser/themes/lepton/icons/close-window.svg
new file mode 100644
index 0000000000000..3c92d8cda4c63
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/close-window.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.63 1.005A2.625 2.625 0 0 0 1.005 3.63v7.77a2.625 2.625 0 0 0 2.625 2.624h3.414c.065-.29.21-.567.437-.793l.457-.457H3.63c-.76 0-1.375-.615-1.375-1.375V6.18h11.5v.95c.4-.166.85-.166 1.25 0V3.63a2.625 2.625 0 0 0-2.625-2.625H3.63Zm11.375 7.626v-.002a.625.625 0 0 0-1.067-.441l-.183.183v1.768l1.067-1.067a.623.623 0 0 0 .183-.441Zm-1.702 3.788a1.37 1.37 0 0 1-.923.355h-.49l1.163 1.163c.432-.114.82-.335 1.134-.634l-.884-.884Zm1.471.057-.97-.971 1.201-1.202V11.4c0 .384-.082.749-.23 1.077Zm-3.048 1.548-.221-.22-.221.22h.442Zm-1.856 0 1.25-1.25H9.352l-1.164 1.164a.628.628 0 0 0-.072.086H9.87ZM2.255 3.63c0-.76.616-1.375 1.375-1.375h8.75c.76 0 1.375.616 1.375 1.375v1.298h-11.5V3.63Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.188 8.188a.625.625 0 0 1 .884 0l2.433 2.433 2.433-2.433a.625.625 0 1 1 .884.884l-2.433 2.433 2.433 2.433a.625.625 0 1 1-.884.884l-2.433-2.433-2.433 2.433a.625.625 0 1 1-.884-.884l2.433-2.433-2.433-2.433a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/code-text.svg b/waterfox/browser/themes/lepton/icons/code-text.svg
new file mode 100644
index 0000000000000..f55df3591bf18
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/code-text.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M.5 3a.5.5 0 0 0 0 1H6a.5.5 0 0 0 0-1Zm3 3a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1ZM2 9.5a.5.5 0 0 1 .5-.5h10a.5.5 0 0 1 0 1h-10a.5.5 0 0 1-.5-.5ZM.5 12a.5.5 0 0 0 0 1H9a.5.5 0 0 0 0-1Zm10-5.5A.5.5 0 0 1 11 6h3.5a.5.5 0 0 1 0 1H11a.5.5 0 0 1-.5-.5ZM8.5 3a.5.5 0 0 0 0 1h7a.5.5 0 0 0 0-1Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/code.svg b/waterfox/browser/themes/lepton/icons/code.svg
new file mode 100644
index 0000000000000..3462da785a289
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.188 5.058a.625.625 0 0 1 .884 0l2.146 2.147c.44.439.44 1.151 0 1.59l-2.146 2.147a.625.625 0 1 1-.884-.884L13.246 8l-2.058-2.058a.625.625 0 0 1 0-.884ZM9.557 3.034c.33.103.513.454.41.783l-2.74 8.74a.625.625 0 0 1-1.193-.374l2.74-8.74a.625.625 0 0 1 .783-.41ZM4.812 5.058a.625.625 0 0 1 0 .884L2.754 8l2.058 2.058a.625.625 0 1 1-.884.884L1.782 8.796a1.125 1.125 0 0 1 0-1.591l2.146-2.147a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/command-console.svg b/waterfox/browser/themes/lepton/icons/command-console.svg
new file mode 100644
index 0000000000000..6e8a445f5e8c7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/command-console.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.75a2.625 2.625 0 0 1 2.625 2.625v8.77a2.625 2.625 0 0 1-2.625 2.624H3.63A2.625 2.625 0 0 1 1.005 12.4V3.63ZM3.63 2.255c-.76 0-1.375.616-1.375 1.375v1.298h11.5V3.63c0-.76-.616-1.375-1.375-1.375H3.63Zm10.125 3.923h-11.5V12.4c0 .76.616 1.375 1.375 1.375h8.75c.76 0 1.375-.615 1.375-1.375V6.18Z" clip-rule="evenodd"/><path  fill-rule="evenodd" d="M3.546 7.2a.625.625 0 0 1 .884-.024l2.117 2.008c.468.443.468 1.189 0 1.632L4.43 12.824a.625.625 0 1 1-.86-.908L5.592 10 3.57 8.084a.625.625 0 0 1-.024-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/command-eyedropper.svg b/waterfox/browser/themes/lepton/icons/command-eyedropper.svg
new file mode 100644
index 0000000000000..708e127e0706b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/command-eyedropper.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M6.942 3.058a.625.625 0 1 0-.884.884l1.616 1.616-6.058 6.058a1.957 1.957 0 1 0 2.768 2.768l6.058-6.058 1.616 1.616a.625.625 0 1 0 .884-.884l-1.616-1.616 3.058-3.058a1.957 1.957 0 1 0-2.768-2.768L8.558 4.674 6.942 3.058ZM2.5 12.5a.707.707 0 0 0 1 1l6.116-6.116-1-1L2.5 12.5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/command-frames.svg b/waterfox/browser/themes/lepton/icons/command-frames.svg
new file mode 100644
index 0000000000000..3dcb7786ec14c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/command-frames.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.75a2.625 2.625 0 0 1 2.625 2.625v7.77a2.625 2.625 0 0 1-2.625 2.624H3.63A2.625 2.625 0 0 1 1.005 11.4V3.63ZM3.63 2.255c-.76 0-1.375.616-1.375 1.375v1.298h11.5V3.63c0-.76-.616-1.375-1.375-1.375H3.63Zm10.125 3.923h-6.5v6.596h5.125c.76 0 1.375-.615 1.375-1.375V6.18Zm-7.75 6.596V6.178h-3.75V11.4c0 .76.616 1.375 1.375 1.375h2.375Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/command-pick.svg b/waterfox/browser/themes/lepton/icons/command-pick.svg
new file mode 100644
index 0000000000000..e2855a6468900
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/command-pick.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.75a2.625 2.625 0 0 1 2.625 2.625v4.5a.625.625 0 1 1-1.25 0v-4.5c0-.76-.616-1.375-1.375-1.375H3.63c-.76 0-1.375.616-1.375 1.375v7.77c0 .759.616 1.374 1.375 1.374h4a.625.625 0 0 1 0 1.25h-4A2.625 2.625 0 0 1 1.005 11.4V3.63Z" clip-rule="evenodd"/><path d="m11.223 14.945-2.55-5.61a.5.5 0 0 1 .662-.662l5.61 2.55a.5.5 0 0 1 .017.902l-1.742.871a.5.5 0 0 0-.224.224l-.87 1.742a.5.5 0 0 1-.903-.017Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/command-responsivemode.svg b/waterfox/browser/themes/lepton/icons/command-responsivemode.svg
new file mode 100644
index 0000000000000..74f72d3155212
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/command-responsivemode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5 5.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h3a.75.75 0 0 0 .75-.75V6A.75.75 0 0 0 5 5.25ZM2 4a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5 1.25h8a.75.75 0 0 1 .75.75v12a.75.75 0 0 1-.75.75H8V16h5a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v1h1.25V2A.75.75 0 0 1 5 1.25Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/container-openin-16.svg b/waterfox/browser/themes/lepton/icons/container-openin-16.svg
new file mode 100644
index 0000000000000..82ce1d8aeb34d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/container-openin-16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M1 3a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v2a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3ZM1 11a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v2a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2v-2ZM9 11a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v2a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-2Z"/><path fill-rule="evenodd" d="M9.005 1.63c0-.345.28-.625.625-.625h4.74c.345 0 .625.28.625.625v4.74a.625.625 0 1 1-1.25 0V3.139l-3.673 3.673a.625.625 0 1 1-.884-.884l3.673-3.673H9.63a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/content-view.svg b/waterfox/browser/themes/lepton/icons/content-view.svg
new file mode 100644
index 0000000000000..dcbafe190fbc0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/content-view.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 1.25H2a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M4.25 4.25v3.5h7.5v-3.5h-7.5ZM4 3a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4ZM10.25 11.25v.5h1.5v-.5h-1.5ZM10 10a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1h-2Z" clip-rule="evenodd"/><path d="M3 10.375c0-.345.28-.625.625-.625h3.75a.625.625 0 1 1 0 1.25h-3.75A.625.625 0 0 1 3 10.375ZM3 12.375c0-.345.28-.625.625-.625h3.75a.625.625 0 1 1 0 1.25h-3.75A.625.625 0 0 1 3 12.375Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/copy-select.svg b/waterfox/browser/themes/lepton/icons/copy-select.svg
new file mode 100644
index 0000000000000..94aab6bfeca0a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/copy-select.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M3 2.25h6a.75.75 0 0 1 .75.75H11a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h1v-1.25H3a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 3 2.25Z"/><path fill-rule="evenodd" d="M9 4H7a2 2 0 0 0-2 2v2.333h1.25V6A.75.75 0 0 1 7 5.25h2V4Zm-4 6.667V13a2 2 0 0 0 2 2h2v-1.25H7a.75.75 0 0 1-.75-.75v-2.333H5ZM11 4v1.25h2a.75.75 0 0 1 .75.75v2.333H15V6a2 2 0 0 0-2-2h-2Zm4 6.667h-1.25V13a.75.75 0 0 1-.75.75h-2V15h2a2 2 0 0 0 2-2v-2.333Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/dashboard.svg b/waterfox/browser/themes/lepton/icons/dashboard.svg
new file mode 100644
index 0000000000000..95edcb1555a7b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/dashboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.63 2.245c.345 0 .625.28.625.625v8.5c0 .76.616 1.375 1.375 1.375h11a.625.625 0 1 1 0 1.25h-11a2.625 2.625 0 0 1-2.625-2.625v-8.5c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M7.37 3.245c.345 0 .625.28.625.625v7.5a.625.625 0 1 1-1.25 0v-7.5c0-.345.28-.625.625-.625Zm3 2.5c.345 0 .625.28.625.625v5a.625.625 0 1 1-1.25 0v-5c0-.345.28-.625.625-.625Zm-6 2c.345 0 .625.28.625.625v3a.625.625 0 1 1-1.25 0v-3c0-.345.28-.625.625-.625Zm9 0c.345 0 .625.28.625.625v3a.625.625 0 1 1-1.25 0v-3c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/datarestore.svg b/waterfox/browser/themes/lepton/icons/datarestore.svg
new file mode 100644
index 0000000000000..fe8d32459c375
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/datarestore.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M16 12a4 4 0 1 1-7-2.646V11.5h2.5l-.914-.914a2 2 0 1 1-.518 1.932.5.5 0 1 0-.966.258A3 3 0 1 0 9.88 9.88l-.707-.707A4 4 0 0 1 16 12Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M4 1.25h8a.75.75 0 0 1 .75.75v5.005h-.524A4.975 4.975 0 0 1 14 7.416V2a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h5a5.028 5.028 0 0 1-1.176-1.25H4a.75.75 0 0 1-.75-.75V8.255h5.437a4.98 4.98 0 0 1 3.087-1.25H3.25V2A.75.75 0 0 1 4 1.25Zm3.534 8.5h-.909a.625.625 0 1 0 0 1.25H7.1c.09-.44.237-.86.434-1.25Zm-.909-7a.625.625 0 1 0 0 1.25h2.75a.625.625 0 1 0 0-1.25h-2.75Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/datastore.svg b/waterfox/browser/themes/lepton/icons/datastore.svg
new file mode 100644
index 0000000000000..2e384ef7f9d32
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/datastore.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12 1.25H4a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h8a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H4Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M2.375 7.63c0-.345.28-.625.625-.625h10a.625.625 0 1 1 0 1.25H3a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/><path d="M6 10.375c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75A.625.625 0 0 1 6 10.375ZM6 3.375c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75A.625.625 0 0 1 6 3.375Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/developer.svg b/waterfox/browser/themes/lepton/icons/developer.svg
new file mode 100644
index 0000000000000..4a393e97119d6
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/developer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.942 7.058a.625.625 0 0 1 0 .884l-6.87 6.87a.625.625 0 1 1-.884-.884l6.87-6.87a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/><path d="M14.27 5c.403 0 .737.33.664.726a4 4 0 1 1-4.66-4.66c.397-.073.726.26.726.664 0 .403-.333.72-.72.834a2.54 2.54 0 1 0 3.156 3.156c.114-.387.43-.72.834-.72Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/device-desktop.svg b/waterfox/browser/themes/lepton/icons/device-desktop.svg
new file mode 100644
index 0000000000000..ce31984277475
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/device-desktop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 3.25H3a.75.75 0 0 0-.75.75v6c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM3 2a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H3ZM.005 13.37c0-.345.28-.625.625-.625h14.75a.625.625 0 1 1 0 1.25H.63a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/device-phone.svg b/waterfox/browser/themes/lepton/icons/device-phone.svg
new file mode 100644
index 0000000000000..dcc978f3a0ee7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/device-phone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11 1.25H5a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h6a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM5 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5Z" clip-rule="evenodd"/><path d="M7 2.625C7 2.28 7.28 2 7.625 2h.75a.625.625 0 1 1 0 1.25h-.75A.625.625 0 0 1 7 2.625Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/device-tablet.svg b/waterfox/browser/themes/lepton/icons/device-tablet.svg
new file mode 100644
index 0000000000000..e73ccf0c098df
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/device-tablet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 3.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M12.625 11c-.345 0-.625-.21-.625-.469V5.47c0-.26.28-.469.625-.469s.625.21.625.469v5.062c0 .26-.28.469-.625.469Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/device-tv.svg b/waterfox/browser/themes/lepton/icons/device-tv.svg
new file mode 100644
index 0000000000000..77ac9cef192fd
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/device-tv.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 3.25H3a.75.75 0 0 0-.75.75v6c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM3 2a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H3Z" clip-rule="evenodd"/><path d="M4 13.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 13.375Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/device-vr.svg b/waterfox/browser/themes/lepton/icons/device-vr.svg
new file mode 100644
index 0000000000000..2d2fd9703c2c0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/device-vr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 4.25H2a.75.75 0 0 0-.75.75v6c0 .414.336.75.75.75h3.443c.027 0 .05-.019.056-.046.578-2.695 4.424-2.695 5.002 0 .006.027.029.046.056.046H14a.75.75 0 0 0 .75-.75V5a.75.75 0 0 0-.75-.75ZM2 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h3.443c.617 0 1.15-.43 1.278-1.034.296-1.378 2.262-1.378 2.558 0C9.408 12.57 9.94 13 10.557 13H14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M3 6.375c0-.345.28-.625.625-.625h8.75a.625.625 0 1 1 0 1.25h-8.75A.625.625 0 0 1 3 6.375Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/dismiss-filled.svg b/waterfox/browser/themes/lepton/icons/dismiss-filled.svg
new file mode 100644
index 0000000000000..61693c453d433
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/dismiss-filled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.188 2.188a.625.625 0 0 1 .884 0l4.933 4.933 4.933-4.933a.625.625 0 1 1 .884.884L8.889 8.005l4.933 4.933a.625.625 0 1 1-.884.884L8.005 8.889l-4.933 4.933a.625.625 0 1 1-.884-.884l4.933-4.933-4.933-4.933a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/document-css.svg b/waterfox/browser/themes/lepton/icons/document-css.svg
new file mode 100644
index 0000000000000..68042b8965b92
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/document-css.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4 1a2 2 0 0 0-2 2v5.018a3.834 3.834 0 0 1 1.25.086V3A.75.75 0 0 1 4 2.25h4V6a1 1 0 0 0 1 1h3.75v1.362c.162.073.32.157.476.252l.774.47-1.158 2.596a2.955 2.955 0 0 1 .7 1.035 3.141 3.141 0 0 1 .21 1.25A1.99 1.99 0 0 0 14 13V6.828a2 2 0 0 0-.586-1.414L9.586 1.586A2 2 0 0 0 8.172 1H4Z" clip-rule="evenodd"/><path d="M12.674 13.903c0 .659-.188 1.174-.563 1.545-.37.368-.92.552-1.646.552-.645 0-1.178-.131-1.6-.394v-1.4c.215.154.465.28.75.382.29.1.543.151.762.151.242 0 .426-.06.55-.181a.654.654 0 0 0 .194-.491.799.799 0 0 0-.2-.54c-.132-.153-.376-.341-.731-.563-.473-.291-.813-.6-1.02-.928-.203-.33-.305-.72-.305-1.17 0-.573.19-1.028.569-1.363.382-.335.906-.503 1.57-.503.578 0 1.123.158 1.635.473l-.51 1.157c-.418-.234-.785-.351-1.102-.351-.199 0-.35.054-.45.163a.578.578 0 0 0-.147.4c0 .182.06.344.181.485.125.142.356.317.692.527.406.255.691.471.855.649.164.178.291.38.381.606.09.226.135.491.135.794ZM8.186 13.903c0 .659-.188 1.174-.563 1.545-.371.368-.92.552-1.646.552-.645 0-1.178-.131-1.6-.394v-1.4c.215.154.465.28.75.382.289.1.543.151.762.151.242 0 .425-.06.55-.181a.654.654 0 0 0 .194-.491.798.798 0 0 0-.2-.54c-.132-.153-.376-.341-.732-.563-.472-.291-.812-.6-1.02-.928-.202-.33-.304-.72-.304-1.17 0-.573.19-1.028.568-1.363.383-.335.907-.503 1.57-.503.579 0 1.124.158 1.635.473l-.51 1.157c-.417-.234-.785-.351-1.1-.351-.2 0-.35.054-.452.163a.578.578 0 0 0-.147.4c0 .182.061.344.182.485.125.142.356.317.691.527.407.255.692.471.856.649.164.178.29.38.38.606.09.226.136.491.136.794ZM2.385 16c-.778 0-1.37-.293-1.776-.879C.203 14.535 0 13.675 0 12.54c0-1.188.191-2.074.574-2.66C.961 9.293 1.557 9 2.361 9c.243 0 .496.036.762.11.266.072.504.177.715.314l-.445 1.255c-.325-.198-.612-.297-.862-.297-.332 0-.572.18-.72.54-.145.355-.217.89-.217 1.605 0 .7.072 1.223.217 1.57.144.343.38.515.709.515.39 0 .798-.141 1.224-.424v1.418a2.47 2.47 0 0 1-1.36.394Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/document-endnote.svg b/waterfox/browser/themes/lepton/icons/document-endnote.svg
new file mode 100644
index 0000000000000..7623de2e070de
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/document-endnote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4 1a2 2 0 0 0-2 2v4h1.25V3A.75.75 0 0 1 4 2.25h4V6a1 1 0 0 0 1 1h3.75v6a.75.75 0 0 1-.75.75H9V14c0 .35-.06.687-.17 1H12a2 2 0 0 0 2-2V6.828a2 2 0 0 0-.586-1.414L9.586 1.586A2 2 0 0 0 8.172 1H4Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M0 10a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-4Zm4 1.375c.345 0 .625.28.625.625v2a.625.625 0 1 1-1.25 0v-2c0-.345.28-.625.625-.625ZM3.995 9.75a.625.625 0 1 0 0 1.25.625.625 0 0 0 0-1.25Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/document-landscape-split-hint.svg b/waterfox/browser/themes/lepton/icons/document-landscape-split-hint.svg
new file mode 100644
index 0000000000000..c2e09fad57277
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/document-landscape-split-hint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M7 4a2 2 0 0 1 2-2h1.172a2 2 0 0 1 1.414.586l3.828 3.828A2 2 0 0 1 16 7.828V12a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2V4Zm2 8.75h5a.75.75 0 0 0 .75-.75V8H11a1 1 0 0 1-1-1V3.25H9a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M0 4.63A2.63 2.63 0 0 1 2.63 2h1.593a.63.63 0 1 1 0 1.26H2.63a1.37 1.37 0 0 0-1.37 1.37v1.688a.63.63 0 1 1-1.26 0V4.63Zm6.777-2a.63.63 0 0 1 .63-.63H9v1.26H7.407a.63.63 0 0 1-.63-.63ZM.63 9.063a.63.63 0 0 1 .63.63v1.687c0 .757.613 1.37 1.37 1.37h1.593a.63.63 0 0 1 0 1.26H2.63A2.63 2.63 0 0 1 0 11.38V9.692a.63.63 0 0 1 .63-.63Zm6.147 4.317a.63.63 0 0 1 .63-.63H9v1.26H7.407a.63.63 0 0 1-.63-.63Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/document-search.svg b/waterfox/browser/themes/lepton/icons/document-search.svg
new file mode 100644
index 0000000000000..444d267cc9b4b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/document-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M2 3a2 2 0 0 1 2-2h4.172a2 2 0 0 1 1.414.586l3.828 3.828A2 2 0 0 1 14 6.828V13a2 2 0 0 1-2 2h-1.382a1.78 1.78 0 0 0-.366-1.25H12a.75.75 0 0 0 .75-.75V7H9a1 1 0 0 1-1-1V2.25H4a.75.75 0 0 0-.75.75v2.474c-.441.09-.861.241-1.25.443V3Z"/><path fill-rule="evenodd" d="M4.2 12.15a1.95 1.95 0 1 0 0-3.9 1.95 1.95 0 0 0 0 3.9Zm0 1.25a3.2 3.2 0 1 0 0-6.4 3.2 3.2 0 0 0 0 6.4Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="m8.558 15.442-3.2-3.2.884-.884 3.2 3.2a.625.625 0 0 1-.884.884Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/drawer-arrow-download.svg b/waterfox/browser/themes/lepton/icons/drawer-arrow-download.svg
new file mode 100644
index 0000000000000..d328fdb212e7f
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/drawer-arrow-download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M15 9v5a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4.416a4.964 4.964 0 0 0-.36 1.25H3a.75.75 0 0 0-.75.75v1H7.1c.09.44.237.86.434 1.25H2.25v2.5h3.39c.765 0 1.332.476 1.606.975.071.13.174.272.302.373.11.087.245.152.452.152a.683.683 0 0 0 .452-.152c.128-.1.23-.242.302-.373.274-.5.841-.975 1.606-.975h.074c.493.162 1.02.25 1.566.25.547 0 1.073-.088 1.566-.25h.184v-.065c.451-.168.871-.4 1.25-.685ZM3 14.75a.75.75 0 0 1-.75-.75v-3h3.39a.6.6 0 0 1 .51.327c.242.441.802 1.173 1.85 1.173s1.608-.732 1.85-1.173a.6.6 0 0 1 .51-.327h3.39v3a.75.75 0 0 1-.75.75H3Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M12 9a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm1.812-3.928a.625.625 0 1 0-.884-.884l-.303.303V2.63a.625.625 0 1 0-1.25 0v1.861l-.303-.303a.625.625 0 1 0-.884.884l1.37 1.37c.244.244.64.244.884 0l1.37-1.37ZM10.005 7.5c0 .345.28.625.625.625h2.74a.625.625 0 1 0 0-1.25h-2.74a.625.625 0 0 0-.625.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/edit-active.svg b/waterfox/browser/themes/lepton/icons/edit-active.svg
new file mode 100644
index 0000000000000..2a439224c1659
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-active.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5102 0.589672C11.2931 -0.193221 12.5579 -0.193221 13.3408 0.589672L15.4108 2.65967C16.1937 3.44257 16.1937 4.70744 15.4108 5.49033L5.12083 15.7803C4.98018 15.921 4.78941 16 4.5905 16H0.750501C0.336287 16 0.000500679 15.6642 0.000500679 15.25V11.41C0.000500679 11.2111 0.0795183 11.0203 0.220171 10.8797L10.5102 0.589672ZM12.2802 1.65033C12.0831 1.45323 11.7679 1.45323 11.5708 1.65033L10.2162 3.005L12.9955 5.78434L14.3502 4.42967C14.5473 4.23257 14.5473 3.91744 14.3502 3.72033L12.2802 1.65033ZM11.9348 6.845L4.27984 14.5H1.5005V11.7207L9.1555 4.06566L11.9348 6.845Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/edit-copy.svg b/waterfox/browser/themes/lepton/icons/edit-copy.svg
new file mode 100644
index 0000000000000..e2f16cc3232cb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M4 2.25h5a.75.75 0 0 1 .75.75H11a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2v-1.25a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 4 2.25Z"/><path fill-rule="evenodd" d="M12 5.25H7a.75.75 0 0 0-.75.75v7c0 .414.336.75.75.75h5a.75.75 0 0 0 .75-.75V6a.75.75 0 0 0-.75-.75ZM7 4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H7Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/edit-cut.svg b/waterfox/browser/themes/lepton/icons/edit-cut.svg
new file mode 100644
index 0000000000000..0d80d08cc2ed5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-cut.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4.5 13.75a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm0 1.25a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5ZM11.5 13.75a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Zm0 1.25a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M4.285 1.109a.625.625 0 0 1 .866.176l5.87 8.87a.625.625 0 1 1-1.042.69l-5.87-8.87a.625.625 0 0 1 .176-.866Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M10.849 1.285a.625.625 0 1 1 1.042.69L9.25 5.967 8.5 4.834l2.349-3.549ZM7.75 5.967l-2.772 4.188a.625.625 0 1 0 1.042.69L8.5 7.099l-.75-1.132Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/edit-paste-go.svg b/waterfox/browser/themes/lepton/icons/edit-paste-go.svg
new file mode 100644
index 0000000000000..5cac56ab281cb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-paste-go.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4 2h.014a2.276 2.276 0 0 0 .22 1.25H4a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h6.127c-.165.4-.163.852.005 1.25H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm10 5.744V4a2 2 0 0 0-2-2h-.014a2.24 2.24 0 0 1-.22 1.25H12a.75.75 0 0 1 .75.75v2.453l.049.048L14 7.744ZM5.5 3.25h5A1.248 1.248 0 0 0 10.975 2h-5.95A1.256 1.256 0 0 0 5.5 3.25Z" clip-rule="evenodd"/><path d="M5 2.25C5 1.56 5.56 1 6.25 1h3.5a1.25 1.25 0 1 1 0 2.5h-3.5C5.56 3.5 5 2.94 5 2.25ZM4.25 5.625c0-.345.28-.625.625-.625h3.75a.625.625 0 1 1 0 1.25h-3.75a.625.625 0 0 1-.625-.625ZM4.25 7.625c0-.345.28-.625.625-.625h4.75a.625.625 0 1 1 0 1.25h-4.75a.625.625 0 0 1-.625-.625ZM4.25 9.625c0-.345.28-.625.625-.625h.75a.625.625 0 1 1 0 1.25h-.75a.625.625 0 0 1-.625-.625Z"/><path fill-rule="evenodd" d="M11.196 7.18a.625.625 0 0 1 .883.016l3.74 3.87a.625.625 0 0 1 0 .868l-3.74 3.87a.625.625 0 1 1-.898-.868l2.716-2.811H6.63a.625.625 0 1 1 0-1.25h7.267l-2.716-2.81a.625.625 0 0 1 .015-.884Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/edit-paste-search.svg b/waterfox/browser/themes/lepton/icons/edit-paste-search.svg
new file mode 100644
index 0000000000000..cd820176d0092
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-paste-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4 2h.014a2.276 2.276 0 0 0 .22 1.25H4a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h7.452l1.156 1.156A1.999 1.999 0 0 1 12 16H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm10 10.702V4a2 2 0 0 0-2-2h-.014a2.24 2.24 0 0 1-.22 1.25H12a.75.75 0 0 1 .75.75v3.955c.412.649.65 1.42.65 2.245 0 .563-.11 1.1-.312 1.59l.912.912ZM9.125 6a.625.625 0 0 0-.5-1h-3.75a.625.625 0 1 0 0 1.249h2.894c.424-.154.88-.241 1.356-.25ZM6.48 7H4.875a.625.625 0 1 0 0 1.25h.604a4.217 4.217 0 0 1 1-1.25ZM5.174 9h-.299a.625.625 0 1 0 0 1.25H5v-.05c0-.417.06-.82.174-1.2ZM5.5 3.25h5A1.248 1.248 0 0 0 10.975 2h-5.95A1.256 1.256 0 0 0 5.5 3.25Z" clip-rule="evenodd"/><path d="M5 2.25C5 1.56 5.56 1 6.25 1h3.5a1.25 1.25 0 1 1 0 2.5h-3.5C5.56 3.5 5 2.94 5 2.25Z"/><path fill-rule="evenodd" d="M9.2 12.15a1.95 1.95 0 1 0 0-3.9 1.95 1.95 0 0 0 0 3.9Zm0 1.25a3.2 3.2 0 1 0 0-6.4 3.2 3.2 0 0 0 0 6.4Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="m13.558 15.442-3.2-3.2.884-.884 3.2 3.2a.625.625 0 0 1-.884.884Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/edit-paste.svg b/waterfox/browser/themes/lepton/icons/edit-paste.svg
new file mode 100644
index 0000000000000..d3eb2e78c0867
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/edit-paste.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4.014 2H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2h-.014a2.24 2.24 0 0 1-.22 1.25H12a.75.75 0 0 1 .75.75v10a.75.75 0 0 1-.75.75H4a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 4 3.25h.234A2.24 2.24 0 0 1 4.014 2ZM10.5 3.25h-5A1.248 1.248 0 0 1 5.025 2h5.95a1.256 1.256 0 0 1-.475 1.25Z" clip-rule="evenodd"/><path d="M5 2.25C5 1.56 5.56 1 6.25 1h3.5a1.25 1.25 0 1 1 0 2.5h-3.5C5.56 3.5 5 2.94 5 2.25ZM4.25 5.625c0-.345.28-.625.625-.625h3.75a.625.625 0 1 1 0 1.25h-3.75a.625.625 0 0 1-.625-.625ZM4.25 7.625c0-.345.28-.625.625-.625h4.75a.625.625 0 1 1 0 1.25h-4.75a.625.625 0 0 1-.625-.625ZM4.25 9.625c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75a.625.625 0 0 1-.625-.625Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/enter-fullscreen.svg b/waterfox/browser/themes/lepton/icons/enter-fullscreen.svg
new file mode 100644
index 0000000000000..48bf632ddfd96
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/enter-fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.005 1.63c0-.345.28-.625.625-.625h5.74c.345 0 .625.28.625.625v5.74a.625.625 0 1 1-1.25 0V3.139l-3.673 3.673a.625.625 0 1 1-.884-.884l3.673-3.673H8.63a.625.625 0 0 1-.625-.625ZM7.995 14.37c0 .345-.28.625-.625.625H1.63a.625.625 0 0 1-.625-.625V8.63a.625.625 0 1 1 1.25 0v4.231l3.673-3.673a.625.625 0 0 1 .884.884l-3.673 3.673H7.37c.345 0 .625.28.625.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/eraser.svg b/waterfox/browser/themes/lepton/icons/eraser.svg
new file mode 100644
index 0000000000000..3038583398f92
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/eraser.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.197.439a1.501 1.501 0 0 1 2.121 0l4.243 4.243a1.501 1.501 0 0 1 0 2.121L7.364 15H12.5a.5.5 0 0 1 0 1H5.819a1.494 1.494 0 0 1-1.139-.437L.437 11.32a1.5 1.5 0 0 1 0-2.121l8.76-8.76Zm1.414.707a.5.5 0 0 0-.707 0L3.538 7.512l4.95 4.95 6.366-6.366a.5.5 0 0 0 0-.707l-4.243-4.243Zm-2.83 12.023-4.95-4.95-1.687 1.687a.5.5 0 0 0 0 .707l4.243 4.243a.5.5 0 0 0 .707 0l1.687-1.687Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/error-connection-failure.svg b/waterfox/browser/themes/lepton/icons/error-connection-failure.svg
new file mode 100644
index 0000000000000..f4725c67f8476
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/error-connection-failure.svg
@@ -0,0 +1,49 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
+  <defs>
+    <linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ccfbff"/>
+      <stop offset="1" stop-color="#c9e4ff"/>
+    </linearGradient>
+    <linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#00c8d7"/>
+      <stop offset="1" stop-color="#0a84ff"/>
+    </linearGradient>
+  </defs>
+  <path d="M224.245 144.067h-10.733c.136.343.274.674.41 1h10.323a.5.5 0 0 0 0-1zm2.454-11.821a.5.5 0 0 0-.5-.5h-20.26c.373.357.727.688 1.065 1h19.2a.5.5 0 0 0 .496-.5zm8.546 11.821h-3a.5.5 0 1 0 0 1h3a.5.5 0 0 0 0-1zm5 0h-1a.5.5 0 1 0 0 1h1a.5.5 0 0 0 0-1zm-3.3-6.66h-25.78a12.767 12.767 0 0 1 .862 2h24.918a1 1 0 0 0 0-2zm20.422 6.66h-8.122a.5.5 0 1 0 0 1h8.122a.5.5 0 0 0 0-1z" fill="#eaeaee"/>
+  <path d="M269.53 87.757h-24.236c-2.108-3.9-7.559-12.718-14.4-14.023-8.952-1.707-10.737 7.217-10.737 7.217s-5.949-15.468-21-13.419c-16.878 2.3-8.928 20.065-8.928 20.065h-25.408l8.181.159h-8.184a1 1 0 0 0 0 2H269.53a1 1 0 0 0 0-2z" fill="#fff"/>
+  <path d="M118.373 63.908h-13.69c-1.129-2.112-4.19-7.156-8.057-7.894-4.978-.949-5.971 4.013-5.971 4.013s-3.309-8.6-11.68-7.462c-9.386 1.278-4.965 11.158-4.965 11.158H59.88l9.471.185h-9.212a1 1 0 0 0 0 2h58.233a1 1 0 1 0 0-2z" fill="#fff"/>
+  <ellipse cx="143.566" cy="245.472" rx="55.042" ry="8.362" fill="#eaeaee"/>
+  <path d="M102.31 121.507H60.818a1 1 0 0 0 0 2h41.492a1 1 0 1 0 0-2zM70.336 117.6H82.1a.5.5 0 0 0 0-1H70.336a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+  <path d="M111.457 174.8h-78.3a1 1 0 0 0 0 2h78.3a1 1 0 1 0 0-2zm-26.742-3.793h1a.5.5 0 0 0 0-1h-1a.5.5 0 0 0 0 1zm10 0h3.1a.5.5 0 0 0 0-1h-3.1a.5.5 0 0 0 0 1zm-17 0h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0 0 1zm-20 0h12a.5.5 0 0 0 0-1h-12a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+  <path d="M206.885 62.973l.045-.1c-.058.027-.063.059-.045.1z" fill="#fff"/>
+  <path d="M77.937 214.941H39.95a1 1 0 1 1 0-2h37.987a1 1 0 1 1 0 2z" fill="#eaeaee"/>
+  <path d="M258.931 214.941h-61.813a1 1 0 0 1 0-2h61.813a1 1 0 0 1 0 2z" fill="#eaeaee"/>
+  <path d="M265.745 85.333h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-8.07a.5.5 0 0 1-.447-.277c-.007-.014-.724-1.425-1.979-3.342a.5.5 0 1 1 .837-.548c.393.6 1.444 2.293 1.888 3.167h7.772a.5.5 0 0 1 0 1zm-66.489-.712h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zM190.1 83.13a.5.5 0 0 1-.474-.339c-.1-.29-.2-.615-.31-.971a.5.5 0 1 1 .958-.287c.1.343.2.657.3.937a.5.5 0 0 1-.474.661zm30.5-5.156a.5.5 0 0 1-.467-.32 23.7 23.7 0 0 0-2.182-4.039.5.5 0 0 1 .834-.552 27.291 27.291 0 0 1 1.719 2.982 10.522 10.522 0 0 1 3.679-5.015.5.5 0 0 1 .571.82 10.181 10.181 0 0 0-3.665 5.721.5.5 0 0 1-.448.4zm18.345-2.964a.5.5 0 0 1-.339-.132q-.361-.333-.735-.651a.5.5 0 0 1 .647-.762q.39.331.765.678a.5.5 0 0 1-.339.868zm-49.923-1.725a.47.47 0 0 1-.09-.008.5.5 0 0 1-.4-.581c.792-4.351 3.544-7.229 8.18-8.556a.5.5 0 0 1 .275.962c-4.24 1.212-6.753 3.828-7.472 7.773a.5.5 0 0 1-.499.411zm45.893-1.218a.5.5 0 0 1-.237-.06 12.545 12.545 0 0 0-2.666-1.081.5.5 0 1 1 .261-.966 13.559 13.559 0 0 1 2.88 1.167.5.5 0 0 1-.238.94zM212.146 67.4a.5.5 0 0 1-.28-.086q-.4-.27-.82-.524a.5.5 0 1 1 .516-.856q.444.267.865.552a.5.5 0 0 1-.281.914zm-4.47-2.2a.5.5 0 0 1-.154-.024 16.724 16.724 0 0 0-2.832-.647.5.5 0 0 1 .137-.99 17.6 17.6 0 0 1 3 .686.5.5 0 0 1-.154.976z" fill="#eaeaee"/>
+  <path d="M72.315 62.052h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zm45.582-.184h-1.8a.5.5 0 0 1 0-1h1.8a.5.5 0 0 1 0 1zm-10.8 0h-1a.5.5 0 0 1 0-1h1a.5.5 0 0 1 0 1zm-3.491-2.881a.5.5 0 0 1-.39-.186 18.484 18.484 0 0 0-2-2.129.5.5 0 0 1 .668-.744A19.433 19.433 0 0 1 104 58.174a.5.5 0 0 1-.389.814zm-12.521-.631a.5.5 0 0 1-.466-.319 13.8 13.8 0 0 0-3.857-5.165.5.5 0 0 1 .623-.782 14.47 14.47 0 0 1 3.624 4.438A5.414 5.414 0 0 1 94.12 53.5a.5.5 0 1 1 .326.945 4.994 4.994 0 0 0-2.867 3.51.5.5 0 0 1-.49.401zm-17.637-2.037h-.051a.5.5 0 0 1-.447-.548 6.454 6.454 0 0 1 1.057-3.036.5.5 0 1 1 .824.566 5.46 5.46 0 0 0-.886 2.571.5.5 0 0 1-.497.447zm4.193-5.039a.5.5 0 0 1-.151-.977 10.27 10.27 0 0 1 1.017-.264.5.5 0 0 1 .2.979 9.033 9.033 0 0 0-.917.237.5.5 0 0 1-.148.025z" fill="#eaeaee"/>
+  <path d="M216.326 144.72c-1.079-4.2-3.73-8.616-7.88-13.117a84.471 84.471 0 0 0-8.921-9.988 5.558 5.558 0 0 0-2.261-1.3c-7.177-6.885-21.972-19.819-32.5-20.546a27.625 27.625 0 0 0-1.889-.063 47.155 47.155 0 0 0-15.147 2.913l-5.114-1.4a5 5 0 0 0-6.142 3.5l-.969 3.545a68.668 68.668 0 0 0-7.844 5.3l-2.052-.048h-.116a5 5 0 0 0-5 4.884l-.042 1.829a45.575 45.575 0 0 0-5.648 7.656 5 5 0 0 0-2.515 5.326c-1.882 5.474-2.848 13.743-2.875 24.633a100.416 100.416 0 0 1-1.646 7.791l-4.279 2.594a6.312 6.312 0 0 0-2.125 8.657l1.516 2.5q-.375.778-.761 1.518l-4.037 1.24a6.312 6.312 0 0 0-4.176 7.877l.6 1.953q-.516.587-1.038 1.143l-1.616-.127a5.926 5.926 0 0 0-.5-.02 6.334 6.334 0 0 0-6.277 5.8l-.115 1.456c-2.741 2.043-5.415 4.547-5.415 9.117 0 6.528 10.272 10.568 13.648 11.9a68.955 68.955 0 0 0 24.224 4.781q.566 0 1.127-.012c.607 2.411 1.208 4.468 1.8 6.144a54.956 54.956 0 0 0 4.745 10.264c1.748 2.839 4.22 6.1 7.845 6.1a5.673 5.673 0 0 0 3.572-1.268c1.746-1.421 2.429-3.072 2.482-10.087a86.865 86.865 0 0 0 16.862 1.533 80.987 80.987 0 0 0 14.53-1.463c-.215 6.82.472 8.55 2.275 10.017a5.672 5.672 0 0 0 3.571 1.268c5.645 0 9.953-8.9 12.573-16.361a52.867 52.867 0 0 0 1.069-3.467c1.432-3.724 4.539-13.353 4.892-27.476.161-6.428 0-12.95-.488-19.419a7.56 7.56 0 0 0 1.131-4.949c6.461-1.2 10.808-3.919 15.1-9.34 3.4-4.308 8-14.308 5.826-22.788z" fill="#fff"/>
+  <path d="M211.476 145.947c-1.092-4.252-4.261-8.341-6.9-11.168a78.846 78.846 0 0 0-8.482-9.533.649.649 0 0 0-.907.018c-10.173-10.009-23.029-19.987-30.783-20.521-4.534-.313-10.392.808-16.48 3.1l-6.645-1.817-1.521 5.561a63.823 63.823 0 0 0-10.4 7l-3.884-.09-.087 3.744a40.534 40.534 0 0 0-7.123 9.675l-1.083.338.36 1.153c-2.227 5.146-3.144 14.255-3.147 24.842a104.047 104.047 0 0 1-2.33 10.6l-6 3.638a1.452 1.452 0 0 0-.685 1.835l3.021 4.978a54.736 54.736 0 0 1-2.883 5.777l-5.979 1.836a1.305 1.305 0 0 0-.864 1.63l1.394 4.541a51.394 51.394 0 0 1-4.691 5.189l-3.93-.31a1.3 1.3 0 0 0-1.4 1.2l-.3 3.752c-3.258 2.357-5.218 3.541-5.218 6.422 0 4.144 20.8 13.416 37.9 11.39a88.878 88.878 0 0 0 2.615 9.761c2.852 8.125 6.861 14.032 8.287 12.871.675-.549.711-6.554.562-12.73.446.174 8.025 3.054 21.939 3.054a88.332 88.332 0 0 0 19.876-2.718c-.4 5.844-.626 11.816.085 12.394 1.426 1.161 5.418-4.745 8.269-12.871.357-1.018.7-2.159 1.031-3.377 1.276-3.253 4.307-12.338 4.649-26.035a191.885 191.885 0 0 0-.651-21.1 2.592 2.592 0 0 0-.475-4.743 128.961 128.961 0 0 0-.36-2.871 28.465 28.465 0 0 0 4.578-.19c6.147-.82 9.835-2.869 13.728-7.786 2.797-3.536 6.551-12.06 4.914-18.439z" fill="url(#a)"/>
+  <path d="M193.99 124.155c.033.013.067.031.1.045-9.986-9.641-22.2-18.942-29.683-19.457-4.534-.313-10.392.808-16.48 3.1l-6.645-1.817-1.521 5.561a63.823 63.823 0 0 0-10.4 7l-3.884-.09-.087 3.744a40.534 40.534 0 0 0-7.123 9.675l-1.083.338.36 1.153c-2.227 5.146-3.144 14.255-3.147 24.842a109.944 109.944 0 0 1-.921 4.824c.168-.72.327-1.43.475-2.127.061 3.039.177 6.023.332 8.836-1.014 1.2-4.408 5.548-2.546 8.155a10.876 10.876 0 0 0 3.445 2.858c.069.589.138 1.155.209 1.681 1.015 7.544 4.11 29 6.408 38.3.207-.021.417-.036.623-.061a88.878 88.878 0 0 0 2.615 9.761c2.852 8.125 6.861 14.032 8.287 12.871.675-.549.711-6.554.562-12.73.038.015.145.054.283.1V222.3a46 46 0 0 0 27.634 3.451c15.651-3.043 21.467-14.705 22.172-22.607 1.194-13.372-1.415-19.893-1.415-19.893l6.558-2.852c-.011-.135-.022-.284-.034-.417a2.592 2.592 0 0 0-.475-4.743l-11.158 4.316s-.109-1.739-2.5-4.348c-3.174-3.462-10.521-6.355-11.428-6.7a84.091 84.091 0 0 0 24.884 5.065l-.109-.839c-10.706-.609-24.216-5.348-24.216-5.348s23.783 4.316 33.476-.761c6.847-3.587 11.086-13.369 9.456-21.846-1.731-9.023-13.024-20.623-13.024-20.623z" fill="#f9f9fa"/>
+  <path d="M149.523 146.54l-5.537-1.957a1 1 0 0 0-1.219 1.406l1.99 3.81a1 1 0 0 0 1.349.423l3.547-1.853a1 1 0 0 0-.13-1.829z" fill="#fff"/>
+  <g fill="url(#b)">
+    <path d="M268.754 200.7h-.768c-17.152 0-33.29 0-42.937.322-8.333.277-16.774 1.994-16.787 4.736-.008 1.811 4.646 3.3 13.565 5.982 7.387 2.225 17.5 5.271 17.736 7.75a2.9 2.9 0 0 1-1.2 2.046c-2.984 2.772-11.281 5.909-19.089 4.588a25.1 25.1 0 0 1-12.468-6.4c-4.383-3.888-6.191-7.86-7.786-11.364-.619-1.359-1.2-2.643-1.9-3.837a22.145 22.145 0 0 0-5.357-6.126 194.068 194.068 0 0 0-.6-17.308 4.6 4.6 0 0 0-.2-6.523c.75-.036 1.463-.1 2.13-.188 6.749-.9 10.823-3.211 15.032-8.527 3.282-4.146 7.092-13.147 5.287-20.18-1.2-4.662-4.606-9.055-7.29-11.947a80.769 80.769 0 0 0-8.657-9.724 2.62 2.62 0 0 0-1.653-.713 133.306 133.306 0 0 0-15.775-13.264c-6.315-4.414-11.527-6.79-15.492-7.064a24.782 24.782 0 0 0-1.683-.056 45.119 45.119 0 0 0-15.027 3.055l-6.025-1.648a2 2 0 0 0-2.457 1.4l-1.3 4.745a65.633 65.633 0 0 0-9.391 6.332l-3.141-.073h-.047a2 2 0 0 0-2 1.953l-.069 2.965a42.572 42.572 0 0 0-6.522 8.837l-.3.093a2 2 0 0 0-1.312 2.506l.145.465c-1.993 5.12-3.01 13.443-3.023 24.766a102.594 102.594 0 0 1-2.05 9.47L105.03 171a3.309 3.309 0 0 0-1.114 4.538l2.345 3.87a56.333 56.333 0 0 1-2.1 4.209l-5.216 1.6a3.309 3.309 0 0 0-2.189 4.129l1.082 3.524a49.795 49.795 0 0 1-3.217 3.554l-3.023-.238a3.177 3.177 0 0 0-.267-.011 3.318 3.318 0 0 0-3.287 3.043l-.223 2.83c-2.965 2.13-5.3 3.833-5.3 7.5 0 2.65 3.4 5.1 6.95 6.946a89.372 89.372 0 0 0-1.57 3.365c-1.866 4.156-3.1 6.9-7.448 8.232-8.459 2.584-20.437.244-26.315-3.564-1.825-1.182-2.9-2.432-3.041-3.519-.264-2.111 5.188-4.187 9.167-5.7 3.919-1.492 6.152-2.394 6.47-3.56a1.66 1.66 0 0 0-.295-1.493C64.48 207.69 53.977 207.22 34 207.22a.5.5 0 0 0 0 1c12.5 0 29.627 0 31.645 2.642a.661.661 0 0 1 .125.623c-.2.732-3.339 1.928-5.861 2.888-5 1.9-10.165 3.871-9.8 6.761.176 1.405 1.382 2.869 3.489 4.234 4.275 2.77 11.581 4.841 18.68 4.841a29.2 29.2 0 0 0 8.471-1.16c4.784-1.462 6.161-4.531 8.068-8.778a89.007 89.007 0 0 1 1.552-3.326 54.676 54.676 0 0 0 3.9 1.709 65.842 65.842 0 0 0 23.126 4.572c1.177 0 2.336-.042 3.462-.126a80.823 80.823 0 0 0 2.292 8.265c.516 1.469 5.171 14.354 9.759 14.354a2.629 2.629 0 0 0 1.678-.595c.831-.677 1.5-1.223 1.353-11.536a76.69 76.69 0 0 0 19.885 2.308 86.392 86.392 0 0 0 17.71-2.167c-.585 10.114.149 10.711.989 11.395a2.628 2.628 0 0 0 1.677.595c4.572 0 9.226-12.885 9.742-14.354.347-.989.7-2.137 1.046-3.412 1.345-3.458 4.4-12.766 4.747-26.612.014-.552.01-1.108.019-1.662a20.857 20.857 0 0 1 4.507 5.34c.668 1.152 1.242 2.415 1.851 3.751 1.636 3.595 3.491 7.669 8.032 11.7a26.054 26.054 0 0 0 12.965 6.641 24.08 24.08 0 0 0 4.006.325c6.5 0 12.949-2.4 15.93-5.166a3.735 3.735 0 0 0 1.514-2.872c-.274-2.93-7.481-5.313-18.444-8.614-5.427-1.634-12.859-3.872-12.854-5.02.006-1.314 5.643-3.4 15.82-3.742 9.631-.321 25.785-.326 42.9-.321h.768a.5.5 0 0 0 0-1zM204.579 135c2.636 2.827 5.805 6.916 6.9 11.168 1.637 6.379-2.117 14.9-4.918 18.441-3.893 4.918-7.581 6.967-13.728 7.786-.7.093-1.432.142-2.179.172a.988.988 0 0 0-.354-.077 73.652 73.652 0 0 1-26.1-5.54 1 1 0 0 0-.826 1.821 74.46 74.46 0 0 0 25.115 5.664c.039.323.08.659.121 1.021a2.579 2.579 0 0 1 1.39 3.874.484.484 0 0 0-.243.11c-1.838 1.634-8.407 3.132-8.474 3.146a.5.5 0 0 0-.113.041l-2.2 1.1a.5.5 0 0 0-.274.5c.006.061.561 6.134-2.275 8.973a5.1 5.1 0 0 1-3.97 1.438l.82-4.449a.5.5 0 0 0-.383-.579l-2.605-.579c-.139-1-.37-4.182 1.943-5.917.976-.731 8.157-3.579 10.842-4.614a.5.5 0 0 0-.359-.933c-1 .386-9.818 3.8-11.082 4.747-3.262 2.447-2.312 7.043-2.27 7.237a.492.492 0 0 0 .107.2q-1.276-.217-2.6-.406c-.048-1.62-.626-3.782-2.151-4.88a3.922 3.922 0 0 0-3.715-.379.507.507 0 0 0-.086.039 5.413 5.413 0 0 0-2.65 4.454c0 2.46 1.4 5.3 3.473 5.614a5.187 5.187 0 0 0 .772.059 4.147 4.147 0 0 0 2.763-1 4.691 4.691 0 0 0 1.526-2.9q2.748.39 5.267.9l-.694 3.765a.5.5 0 0 0 .444.588q.446.043.87.043a6.04 6.04 0 0 0 4.449-1.735 6.78 6.78 0 0 0 .928-1.172 40.237 40.237 0 0 1 11.732 5.419q-.012 1.546-.051 3.143c-.342 13.7-3.374 22.782-4.649 26.035a48.73 48.73 0 0 1-1.031 3.377c-2.611 7.438-6.177 13.017-7.855 13.017a.639.639 0 0 1-.415-.146c-.669-.545-.51-5.868-.153-11.366a19.327 19.327 0 0 0 5.9-3.617.5.5 0 0 0-.717-.7 18.885 18.885 0 0 1-5.594 3.4 87.371 87.371 0 0 1-19.4 2.607c-11.281 0-18.4-1.892-20.923-2.7l-.26-6.109a.5.5 0 1 0-1 .043l.243 5.714c.149 6.176.113 12.181-.562 12.73a.639.639 0 0 1-.415.146c-1.681 0-5.261-5.579-7.872-13.017a88.882 88.882 0 0 1-2.615-9.761h-.005c-2.551-10.248-4.636-21.971-4.657-22.089a.5.5 0 1 0-.984.175c.021.118 2.091 11.756 4.633 22-1.324.122-2.662.2-4.013.2a63.607 63.607 0 0 1-26.1-6.059 44.608 44.608 0 0 1 6.949-9.4c9.072-9.555 18.343-13.569 25.331-15.21a6.619 6.619 0 0 0 2.526 3.172 5.232 5.232 0 0 0 2.774.9 4.77 4.77 0 0 0 3.579-1.983.5.5 0 0 0 .052-.57l-1.467-2.574q2.151-.118 4.317-.032c1.077 3.689 5.807 4.056 5.858 4.06h.033a.5.5 0 0 0 .464-.314 8.392 8.392 0 0 0 .432-1.968h2.691a.5.5 0 1 0 0-1h-2.606a18.073 18.073 0 0 0-.152-3.239h2.437a.5.5 0 0 0 0-1h-2.593a24.74 24.74 0 0 0-.512-2.243.5.5 0 0 0-.564-.359 11.053 11.053 0 0 0-3 1.03c-1.867.989-2.77 2.376-2.658 4.025a46.151 46.151 0 0 0-4.689.068l-.048-.084 2.933-.3a.5.5 0 0 0 .449-.484c.005-.2.1-4.931-2.952-6.689-1.677-.968-11.4-4.872-11.818-5.037a.5.5 0 0 0-.372.928c.1.041 10.074 4.043 11.69 4.976 2.05 1.183 2.388 4.223 2.442 5.359l-3.237.333a.5.5 0 0 0-.383.745l2.271 3.988c-1.076 1.186-2.506 2.067-4.831.615-3.425-2.138-3.069-8.563-3.019-9.262 0-.022.005-.044 0-.066v-.007a.5.5 0 0 0-.052-.266.985.985 0 0 0-.548-.63c-.037-.016-3.859-1.7-7.521-3.205-3.062-1.261-3.5-3.464-3.524-3.584a1 1 0 0 0-1.975.313c.021.138.568 3.4 4.738 5.121 3.645 1.5 7.452 3.176 7.488 3.191.056.024.2.091.35.158a17.069 17.069 0 0 0 .664 4.966c-7.122 1.693-16.53 5.791-25.719 15.47a45.518 45.518 0 0 0-7.118 9.64c-3.625-1.887-5.88-3.8-5.88-5.166 0-2.882 1.96-4.065 5.218-6.422l.3-3.752a1.306 1.306 0 0 1 1.293-1.2h.11l2.534.2a15.544 15.544 0 0 1-1.922 1.463.5.5 0 0 0 .545.839 15.693 15.693 0 0 0 2.715-2.2h.058a51.394 51.394 0 0 0 4.691-5.189l-1.394-4.541a1.305 1.305 0 0 1 .864-1.63l4.352-1.336-1.57 2.34a.5.5 0 1 0 .83.558l2.256-3.363.111-.034a59.576 59.576 0 0 0 3-6.032l-2.884-4.76a1.305 1.305 0 0 1 .439-1.792l4.593-2.784-.9 2.5a.5.5 0 0 0 .941.338l1.316-3.665.051-.031c.038-.137.069-.27.106-.406l.078-.218a.5.5 0 0 0 .027-.185 105.18 105.18 0 0 0 2.119-9.789c0-9.717.779-18.179 2.627-23.484l.683 1.709a.5.5 0 0 0 .929-.371l-1.144-2.862-.308-.986 1.083-.338a39.766 39.766 0 0 1 6.223-8.725 12.852 12.852 0 0 0 .241 1.72.5.5 0 0 0 .629.315.5.5 0 0 0 .32-.631 24.71 24.71 0 0 1-.287-2.484l.084-3.613 3.884.09a63.833 63.833 0 0 1 10.4-7l1.521-5.561 5.138 1.405-2.527 1.118a.5.5 0 1 0 .409.912l3.7-1.659a44.04 44.04 0 0 1 14.851-3.124q.8 0 1.545.052c7.754.535 20.609 10.512 30.783 20.521a.655.655 0 0 1 .465-.193.639.639 0 0 1 .442.176m0 0a78.848 78.848 0 0 1 8.484 9.535m-14.79 61.935a42.035 42.035 0 0 0-11.248-5.1 15.357 15.357 0 0 0 1.207-6.3.955.955 0 0 0 .1.016.989.989 0 0 0 .292-.044l9.149-2.784c.288 4.005.511 8.839.5 14.208z"/>
+    <path d="M193.225 139.669a1.412 1.412 0 0 0 1.41-1.41V135.1a1.41 1.41 0 0 0-2.821 0v3.162a1.412 1.412 0 0 0 1.411 1.407z"/>
+    <path d="M193.225 144.475a5.736 5.736 0 0 0 4.644-2.413 1 1 0 1 0-1.679-1.088 3.76 3.76 0 0 1-2.965 1.5 3.71 3.71 0 0 1-2.969-1.506 1 1 0 0 0-1.675 1.094 5.736 5.736 0 0 0 4.644 2.413z"/>
+    <path d="M163.852 142.719a1 1 0 0 0 1.674-1.094 5.674 5.674 0 0 0-9.286 0 1 1 0 0 0 1.674 1.095 3.679 3.679 0 0 1 5.938 0z"/>
+    <path d="M159.473 135.1v3.162c0 .036.008.07.011.106a6.569 6.569 0 0 1 2.8 0c0-.036.011-.07.011-.106V135.1a1.41 1.41 0 1 0-2.821 0z"/>
+    <path d="M160.912 130.086a5.733 5.733 0 0 0 4.643-2.412 1 1 0 0 0-1.674-1.095 3.679 3.679 0 0 1-5.937 0 1 1 0 0 0-1.674 1.094 5.733 5.733 0 0 0 4.642 2.413z"/>
+    <path d="M155.934 155.646a18.515 18.515 0 0 0-4.51-8.323c-5.144-5.145-12.507-4.867-12.817-4.857a1 1 0 0 0 .089 2 16.68 16.68 0 0 1 3.159.279 18.431 18.431 0 0 0 1.1 3.47 6.118 6.118 0 0 0-1.562.513 7.174 7.174 0 0 0-2.41 2.27.5.5 0 1 0 .84.542 6.254 6.254 0 0 1 2.014-1.917 5.319 5.319 0 0 1 1.6-.478 4.113 4.113 0 0 0 .928 1.091 6.669 6.669 0 0 0-.955 2.347 7.171 7.171 0 0 0 .372 3.29.5.5 0 0 0 .469.326.494.494 0 0 0 .174-.031.5.5 0 0 0 .295-.643 6.214 6.214 0 0 1-.326-2.76 5.734 5.734 0 0 1 .894-2.1 2.673 2.673 0 0 0 .474.054 9.686 9.686 0 0 0 4.458-1.746 16.947 16.947 0 0 1 3.75 7.1 1 1 0 0 0 1.956-.42zm-10.821-6.082c-1.027-.642-1.8-3.029-2.178-4.592a15.045 15.045 0 0 1 6.547 3.285c-1.517.943-3.507 1.843-4.37 1.307z"/>
+    <path d="M193.839 116.06a1 1 0 0 0 .71-.3l2.533-2.554a1 1 0 1 0-1.42-1.408l-2.533 2.554a1 1 0 0 0 .71 1.7z"/>
+    <path d="M199.708 117.691a1 1 0 0 0 .409-.088l3.512-1.576a1 1 0 0 0-.818-1.825l-3.512 1.576a1 1 0 0 0 .41 1.913z"/>
+    <path d="M193.882 183.558a.5.5 0 0 0 .106.988.487.487 0 0 0 .105-.011 5.176 5.176 0 0 0 3-7.9.5.5 0 0 0-.807.591 4.178 4.178 0 0 1-2.41 6.327z"/>
+    <path d="M195.435 187.387a.487.487 0 0 0 .105-.011 7.781 7.781 0 0 0 4.512-11.856.5.5 0 1 0-.807.591 6.884 6.884 0 0 1 .676 6.146 6.8 6.8 0 0 1-4.593 4.142.5.5 0 0 0 .105.989z"/>
+    <path d="M127.087 198.745a5.134 5.134 0 0 0 1.54.239 5.254 5.254 0 0 0 3.143-1.063.5.5 0 0 0-.637-.771 4.178 4.178 0 0 1-6.463-2.021.5.5 0 0 0-.962.271 5.206 5.206 0 0 0 3.379 3.345z"/>
+    <path d="M132.43 200.03a6.783 6.783 0 0 1-10.508-3.284.5.5 0 0 0-.963.27 7.773 7.773 0 0 0 12.108 3.785.5.5 0 0 0-.638-.771z"/>
+  </g>
+  <g fill="#f9f9fa">
+    <path d="M160.366 188.859a.5.5 0 0 1-.43-.754l1.345-2.283a.5.5 0 1 1 .861.508l-1.345 2.283a.5.5 0 0 1-.431.246z"/>
+    <path d="M161.086 192.527a.5.5 0 0 1-.43-.754l1.344-2.282a.5.5 0 1 1 .861.508l-1.345 2.282a.5.5 0 0 1-.43.246z"/>
+  </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/error-malformed-url.svg b/waterfox/browser/themes/lepton/icons/error-malformed-url.svg
new file mode 100644
index 0000000000000..831328d3fd66f
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/error-malformed-url.svg
@@ -0,0 +1,61 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
+  <defs>
+    <linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ccfbff"/>
+      <stop offset="1" stop-color="#c9e4ff"/>
+    </linearGradient>
+    <linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#00c8d7"/>
+      <stop offset="1" stop-color="#0a84ff"/>
+    </linearGradient>
+  </defs>
+  <path d="M73.275 165.84l63.117-26.74a1 1 0 0 0-.78-1.842L72.494 164a1 1 0 0 0 .78 1.842z" fill="#eaeaee"/>
+  <path d="M110.05 144.74l15.834-6.708a.5.5 0 1 0-.39-.921l-15.834 6.708a.5.5 0 0 0 .39.921z" fill="#eaeaee"/>
+  <path d="M59.35 176.038a.5.5 0 0 1 .265-.655l2.762-1.17a.5.5 0 1 1 .39.921l-2.762 1.17a.5.5 0 0 1-.655-.266zm10.128-4.291a.5.5 0 0 1 .265-.655l11.049-4.681a.5.5 0 1 1 .39.921l-11.049 4.681a.5.5 0 0 1-.654-.266zm19.336-8.192a.5.5 0 0 1 .265-.655l.921-.39a.5.5 0 1 1 .39.921l-.921.39a.5.5 0 0 1-.654-.266zm4.6-1.951a.5.5 0 0 1 .265-.655l2.762-1.17a.5.5 0 1 1 .39.921l-2.762 1.17a.5.5 0 0 1-.65-.27zm10.128-4.291a.5.5 0 0 1 .265-.655l11.049-4.681a.5.5 0 0 1 .39.921l-11.046 4.68a.5.5 0 0 1-.653-.265z" fill="#eaeaee"/>
+  <path d="M103.245 194.26L208.809 161a1 1 0 0 0-.6-1.908l-105.565 33.26a1 1 0 1 0 .6 1.908z" fill="#eaeaee"/>
+  <path d="M116 185l26.482-8.343a.5.5 0 1 0-.3-.954l-26.482 8.342a.5.5 0 0 0 .3.954z" fill="#eaeaee"/>
+  <path d="M84.918 204.09a.5.5 0 0 1 .327-.627l11.445-3.606a.5.5 0 0 1 .3.954l-11.445 3.606a.5.5 0 0 1-.627-.327zm19.076-6.01a.5.5 0 0 1 .327-.627l2.861-.9a.5.5 0 1 1 .3.954l-2.861.9a.5.5 0 0 1-.627-.326zm6.677-2.1a.5.5 0 0 1 .327-.627l.954-.3a.5.5 0 1 1 .3.954l-.954.3a.5.5 0 0 1-.627-.33zm9.538-3a.5.5 0 0 1 .327-.627l11.445-3.606a.5.5 0 1 1 .3.954l-11.445 3.599a.5.5 0 0 1-.628-.327zm19.076-6.01a.5.5 0 0 1 .327-.627l2.861-.9a.5.5 0 1 1 .3.954l-2.861.9a.5.5 0 0 1-.628-.334zm6.677-2.1a.5.5 0 0 1 .327-.627l.954-.3a.5.5 0 1 1 .3.954l-.954.3a.5.5 0 0 1-.628-.337zm9.538-3a.5.5 0 0 1 .327-.627l11.445-3.606a.5.5 0 1 1 .3.954l-11.445 3.606a.5.5 0 0 1-.627-.342zm19.076-6.01a.5.5 0 0 1 .327-.627l2.861-.9a.5.5 0 0 1 .3.954l-2.861.9a.5.5 0 0 1-.629-.342zm6.677-2.1a.5.5 0 0 1 .327-.627l.954-.3a.5.5 0 1 1 .3.954l-.954.3a.5.5 0 0 1-.629-.345zm9.538-3a.5.5 0 0 1 .327-.627l11.445-3.606a.5.5 0 0 1 .3.954l-11.445 3.606a.5.5 0 0 1-.629-.35zm19.076-6.01a.5.5 0 0 1 .327-.627l2.861-.9a.5.5 0 0 1 .3.954l-2.861.9a.5.5 0 0 1-.629-.349zm6.677-2.1a.5.5 0 0 1 .327-.627l.954-.3a.5.5 0 0 1 .3.954l-.954.3a.5.5 0 0 1-.63-.352zm9.538-3a.5.5 0 0 1 .327-.627l11.445-3.606a.5.5 0 1 1 .3.954l-11.445 3.606a.5.5 0 0 1-.63-.357z" fill="#eaeaee"/>
+  <path d="M50.883 109.437L73.366 97.57s-15.334-12.008-1.472-21.924C84.256 66.8 96.745 77.71 96.745 77.71s-2.589-8.73 6.13-11.4c8.6-2.633 20.994 6.885 20.994 6.885l19.577-10.334" fill="#fff"/>
+  <path d="M141.872 58.947L136.085 62a.588.588 0 0 1-.549-1.04l5.788-3.055a.588.588 0 1 1 .549 1.04zm-15.152 8l-1.04.549a.588.588 0 0 1-.549-1.04l1.04-.549a.588.588 0 0 1 .549 1.04zM72.4 94.811l-1.674.884a.588.588 0 0 1-.549-1.04l.9-.478a24.222 24.222 0 0 1-.591-.543.588.588 0 1 1 .81-.853c.7.664 1.177 1.039 1.188 1.048a.588.588 0 0 1-.088.983zm-10 5.277l-12.485 6.59a.588.588 0 1 1-.549-1.04l12.485-6.59a.588.588 0 1 1 .549 1.04zm59.158-31.3a.588.588 0 0 1-.6-.026 45.206 45.206 0 0 0-3-1.776.588.588 0 1 1 .559-1.036 46.056 46.056 0 0 1 3.086 1.824.588.588 0 0 1-.045 1.014zM68.064 90.2a.588.588 0 0 1-.751-.176q-.348-.483-.681-1a.588.588 0 0 1 .993-.631c.208.328.423.643.642.946a.588.588 0 0 1-.133.821.666.666 0 0 1-.07.04zm25.892-16.6a.587.587 0 0 1-.6-.031c-.293-.2-.617-.4-.972-.62a.588.588 0 0 1 .611-1.006c.37.225.71.444 1.016.649a.588.588 0 0 1-.052 1.008zm15.815-10.047a.586.586 0 0 1-.405.053 14.722 14.722 0 0 0-7.557-.008 8.578 8.578 0 0 0-4.693 3.166.588.588 0 0 1-.966-.673 9.747 9.747 0 0 1 5.314-3.618 15.855 15.855 0 0 1 8.163-.013.588.588 0 0 1 .144 1.093zm-21.029 7.324a.587.587 0 0 1-.486.029 21.942 21.942 0 0 0-3.291-.988.588.588 0 0 1 .246-1.151 23.255 23.255 0 0 1 3.468 1.04.588.588 0 0 1 .063 1.07zm-23.055 8.291a.589.589 0 0 1-.827-.722 14.421 14.421 0 0 1 5.452-6.558 19.345 19.345 0 0 1 5.307-2.711.588.588 0 1 1 .361 1.123A18.263 18.263 0 0 0 71 72.844a13.284 13.284 0 0 0-5.031 6.006.59.59 0 0 1-.282.318z" fill="#eaeaee"/>
+  <path d="M144.627 62.6l-92.656 48.906a1.176 1.176 0 0 1-1.1-2.081l92.656-48.907a1.176 1.176 0 1 1 1.1 2.081z" fill="#fff"/>
+  <path d="M185.779 90.824l13.771 3.409s-1.925-10.7 7.531-9.678c8.434.909 9.583 10.091 9.583 10.091s2.165-4.6 6.788-2.471c4.558 2.1 6.186 10.666 6.186 10.666l11.991 2.968" fill="#fff"/>
+  <path d="M200.337 92.789l-13.752-3.4a.59.59 0 0 1 .284-1.146l13.752 3.4a.59.59 0 0 1-.284 1.146zm42.412 10.311l-.529-.131a.59.59 0 1 1 .284-1.146l.529.131a.59.59 0 0 1-.284 1.146zm-5.113-1.266l-3.438-.851a.59.59 0 1 1 .284-1.146l3.438.851a.59.59 0 0 1-.284 1.146zm-20.166-8.627a.614.614 0 0 1-.445-.506l-.035-.222a.589.589 0 0 1 .4-.662 5.483 5.483 0 0 1 6-2.637 7.111 7.111 0 0 1 1.259.447 10.622 10.622 0 0 1 4.381 4.221.591.591 0 0 1-1 .626 9.484 9.484 0 0 0-3.872-3.774 5.935 5.935 0 0 0-1.05-.374c-3.3-.818-4.891 2.422-4.957 2.562a.592.592 0 0 1-.681.319zm-14.675-9.061a.591.591 0 0 1-.2-1.053 6.8 6.8 0 0 1 3.628-1.19.591.591 0 0 1 .07 1.179 5.632 5.632 0 0 0-3.009.97.589.589 0 0 1-.489.094zm9 .181a.6.6 0 0 1-.146-.057 9.055 9.055 0 0 0-1-.478.59.59 0 0 1-.324-.769.6.6 0 0 1 .769-.325 10.36 10.36 0 0 1 1.128.54.59.59 0 0 1-.428 1.089z" fill="#eaeaee"/>
+  <path d="M242.217 107.236l-56.755-14.049a1.181 1.181 0 1 1 .567-2.292l56.755 14.049a1.181 1.181 0 0 1-.567 2.292z" fill="#fff"/>
+  <ellipse cx="155.535" cy="245.952" rx="7.463" ry="43.55" transform="rotate(-86.464 155.535 245.951)" fill="#eaeaee"/>
+  <path d="M112.695 226.207l-64.217-18.684a1 1 0 1 0-.559 1.92l64.217 18.684a1 1 0 1 0 .559-1.92z" fill="#eaeaee"/>
+  <path d="M243.246 226.609L178.5 209.394a1 1 0 0 0-.514 1.933l64.751 17.215a1 1 0 1 0 .514-1.933z" fill="#eaeaee"/>
+  <path d="M146.467 240.275a.789.789 0 0 0 .166-.037.82.82 0 0 1-.205.045z" fill="#fff"/>
+  <g fill="#fff">
+    <path d="M179.037 101.776l-.121-.547a12.937 12.937 0 0 0-.4-1.386 12.75 12.75 0 0 0-22.367-3.36l-4.583-.2a5 5 0 0 0-4.02-2.981 5 5 0 0 0-1.409-1.736l-.987 5.022-.259 1.327 1.261-.689 2.337-1.286.866 3.905 8.492.371.509-.8a9.751 9.751 0 0 1 16.444 10.478l-1.117 1.753a166 166 0 0 1 5.9 23.121c.32-.012 11.494 70.842 11.421 75.734a61.9 61.9 0 0 1-.1 10.1c-.433 3.64-1.661 13.195-5.4 14.023a2.76 2.76 0 0 1-1.855-.234c-.957-.484-1.864-1.833-3.817-11.386a123 123 0 0 1-15.17 4.294 149.57 149.57 0 0 1-17.448 2.843c2.283 9.563 1.761 10.211 1.121 11.019a2.76 2.76 0 0 1-1.582 1c-3.739.829-8.634-6.281-10.574-9.446a46.87 46.87 0 0 1-2.769-5.378c-2.744-3.417-5.519-2.72-2.775.881a47.78 47.78 0 0 0 2.805 5.4 38.26 38.26 0 0 0 6.116 7.863c2.261 2.07 4.879 3.528 7.652 2.913a5.81 5.81 0 0 0 3.292-2.061c.926-1.229 1.334-2.436 1.126-4.9a43.46 43.46 0 0 0-.916-5.379c4.453-.567 9.452-1.439 14.4-2.536 3.437-.762 7.923-1.869 12.292-3.277A61.92 61.92 0 0 0 179 232.33c.863 2.369 1.735 4.03 3.085 4.714a5.017 5.017 0 0 0 3.538.655c2.812-.623 4.751-1.742 6.522-6.337a46.05 46.05 0 0 0 1.841-10.27 75.3 75.3 0 0 0-.13-11.375c.029-4.493-.48-7.184-.945-13.441-1.184-16.126-9.59-59.447-11.018-64.876a168.439 168.439 0 0 0-5.141-20.053l.342-.537a12.8 12.8 0 0 0 1.475-3.236c.1-.361.189-.718.262-1.082a12.68 12.68 0 0 0 .206-4.716z"/>
+    <path d="M134.237 228.656l-6.947-14.593c-1.686-6.992-20.874-79.082-21.813-86.213l-3.447-2.2a9.76 9.76 0 0 1 10.489-16.449l2.087 1.33c4.834-2.638 12.315-6.642 15.256-7.744 3.252-1.223 9.874-6.285 12.141-8.119L146 91.43c-.11-.078-.209-.158-.317-.227a5 5 0 0 0-5.729.4c-3.239 2.623-8.884 6.732-11.307 7.627-2.713 1.021-8.725 4.167-14.083 7.075l-.6-.38a12.76 12.76 0 1 0-13.679 21.468l2.254 1.436c.592 4.611 14.794 90.939 28.1 99.384z"/>
+    <path d="M186.722 176.206s10.389-4.558 15.3-2.655c3.46 1.339 7.075 4.468 9.434 12.129s2.346 13.664-1.921 16.234-9.314 1.9-10.178-.979c-.621-2.067-2.547-9.158-2.547-9.158s-1.255-.941-6.281 1.683z"/>
+    <path d="M116.553 182.33s-16.275-1.34-19.879 3.447c-2.232 2.964-4.4 7.12-3.154 15.039s3.888 13.307 8.85 13.744 9.2-2.381 8.716-5.346c-.349-2.129-1.73-9.347-1.73-9.347s.135 1.219 11.44 2.024z"/>
+  </g>
+  <path d="M205.432 180.5c-3.039-4.414-6.895-5.465-18.936.241-3.035-15.577-8.491-43.6-8.527-43.761a260.987 260.987 0 0 0-.7-3.767l-.039-.176-.958-4.325-.113-.508-.361-1.63-.307-1.386-.314-1.416q-.216-.976-.5-1.937l-.206-.927q-.369-1.342-.756-2.67a5 5 0 0 0-.285-.961q-.305-1.008-.618-2c-.065-.293-.179-.575-.275-.871-.3-.957-.6-1.833-.924-2.735l1.623-2.8a7.778 7.778 0 0 0-13.12-8.359l-.448.7a12.79 12.79 0 0 1 7.84 4.408.5.5 0 0 1-.755.659 11.81 11.81 0 0 0-7.682-4.115l-.084.131-11.187-.495-.052-.234-.059.013-.576-2.6-4.955 2.737.067-.343-.192.1 1.014-5.131c-1.3 1.047-8.6 6.812-12.5 8.282-3.064 1.15-11.506 5.715-16.035 8.2-4.027 2.582-4.287 5.938-4.3 6.074a.5.5 0 0 1-.391.455l-.137.03a.5.5 0 0 1-.474-.52c-.035-.156.269-3.778 4.383-6.615l-2.111-1.345a7.778 7.778 0 0 0-8.359 13.12l3.817 2.432.463.287c.312 3.3 1.05 7.88 2.09 13.129a244.916 244.916 0 0 0 2.3 10.359l.182.82s.136 11.739 6.835 36.611c-13.88-.9-19.023.179-20.366 4.046-1.625 4.678.566 13.9 1.116 15.346a4 4 0 0 0 4.6 2.486 4.046 4.046 0 0 0 .557-.167c2.064-.782 1.925-2.583 1.145-4.648-1.047-2.768-.811-7.074-.755-9.09 2.342-1.09 8.613-.388 16.016.208a437.29 437.29 0 0 0 5.028 15.915c3.14 9.547 6.214 11.174 9.089 14.624a46.19 46.19 0 0 0 2.75 5.383c2.74 4.412 5.31 7.181 7.025 8.174l.357.177.091.041.277.092.13.033.2.037.156-.035.137-.03a.821.821 0 0 0 .205-.045l.059-.013a.781.781 0 0 0 .214-.191c.465-.584-.541-5.4-1.791-10.532a17.821 17.821 0 0 1-5.563-1.625.5.5 0 1 1 .446-.9 17.649 17.649 0 0 0 4.866 1.482c2.018-.14 4.231-.364 6.637-.693l.185-.041 2.114-.3.989-.158 1.423-.234 1.45-.25.976-.216 1.836-.356.586-.13 2.119-.47.312-.069a115.067 115.067 0 0 0 17.231-4.884c2.187-1.13 5.312-3.021 5.347-3.049a.5.5 0 0 1 .518.858c-.136.081-2.713 1.625-4.879 2.8 1.044 5.218 2.365 11.073 3.045 11.414a.77.77 0 0 0 .476.069l.049-.011.215-.048.088-.019.205-.138.087-.07.2-.2.09-.1.216-.273.078-.109.228-.358.046-.072a15.559 15.559 0 0 0 1.319-3.293l-.019-.088.221-.807.033-.13.215-.877-.022-.1c.072-.323.143-.646.211-.989.213-1.071 1.234-3.087.359-4.558a61.5 61.5 0 0 0 .075-9.829l-.015-.068-.033-.658c.569-3.666-.534-19.041-.534-19.041l-.4-2.048c5.392-2.54 8.767-3.317 11.088-3.221.826 1.839 2.666 5.179 2.763 8.137.074 2.206.67 4.468 2.876 4.4a4 4 0 0 0 3.869-4.122c-.047-1.53-.432-9.45-3.24-13.53z" fill="url(#a)"/>
+  <g fill="#f9f9fa">
+    <path d="M120.69 115.886c-2.232 1.282-7.4 4.415-7.3 9.164s2.239 19.146 3.2 20.184 16.5-.365 17.218-1.631-1.208-31.981-1.974-32.714-8.428 3.437-11.144 4.997z"/>
+    <path d="M173.771 187.946c-.254-1.838 4.982-9.811 7.446-13.441-2.179-10.881-6.769-31.937-7.541-34.944-1.738-10.523-4.47-21.185-8.722-28.908-2.181-3.961-12.142-6.956-23.757-5.16l-4.669 36.8s-.428 3.26-2.172 3.549c-1.431.237-13.05 3.558-17.183 4.745q.248.932.505 1.867c.248 1.63 4.281 18.045 7.083 28.711 4.165 2.817 11.809 8.193 12.283 10.016.429 1.652-2.666 8.234-4.839 12.552 2.917 7.157 5.781 12.57 7.815 14.158 12.135 9.6 40.827 2.219 43.492-11.964a69.862 69.862 0 0 0 .03-7.868c-3.884-3.376-9.553-8.541-9.771-10.113z"/>
+  </g>
+  <g fill="url(#b)">
+    <path d="M124.228 131.126a1.4 1.4 0 0 0 1.064-1.67l-.679-3.066a1.4 1.4 0 1 0-2.734.606l.679 3.066a1.4 1.4 0 0 0 1.67 1.064z"/>
+    <path d="M165.962 143.534a1.4 1.4 0 0 0 1.064-1.67l-.679-3.066a1.4 1.4 0 1 0-2.734.606l.679 3.066a1.4 1.4 0 0 0 1.67 1.064z"/>
+    <path d="M125.543 137.062a5.7 5.7 0 0 0 3.981-3.341 1 1 0 1 0-1.876-.7 3.72 3.72 0 0 1-2.548 2.091 3.67 3.67 0 0 1-3.193-.819 1 1 0 0 0-1.4 1.428 5.7 5.7 0 0 0 5.036 1.341z"/>
+    <path d="M167.278 149.47a5.7 5.7 0 0 0 3.991-3.343 1 1 0 0 0-1.866-.7 3.64 3.64 0 0 1-5.741 1.272 1 1 0 0 0-1.395 1.426 5.7 5.7 0 0 0 5.011 1.345z"/>
+    <path d="M156.452 156.752a6.476 6.476 0 0 1-.522.387 6.69 6.69 0 0 1 .8 1.377 4.69 4.69 0 0 1-.525 4.333 1 1 0 0 0 1.592 1.21 6.72 6.72 0 0 0 .808-6.321 7.62 7.62 0 0 0-.365-.762 4.47 4.47 0 0 0 1.118.081 5 5 0 0 0 3.889-2.108 1 1 0 0 0-1.693-1.061 3.06 3.06 0 0 1-2.335 1.181 4.41 4.41 0 0 1-1.548-.31 6.4 6.4 0 0 1-.921 1.814 1.579 1.579 0 0 1-.298.179z"/>
+    <path d="M155.906 157.107a6.476 6.476 0 0 0 .522-.387 1.58 1.58 0 0 0 .249-.184 6.4 6.4 0 0 0 .921-1.814 14.34 14.34 0 0 0 .973-5.9 2.88 2.88 0 0 0-1.181-2.149 1.75 1.75 0 0 0-1.792-.017c-2.144 1-6.864 6.325-7.348 10.764a1.52 1.52 0 0 0 .906 1.594c1.376.615 5.074-.928 6.75-1.907z"/>
+    <path d="M205.286 200.2a5.653 5.653 0 0 0 4.378-4.134c.93-3.7-1.4-15.212-7.182-18.87-5.91-3.741-18 3.543-19.94 4.564-.488.258-.789.725-.531 1.213a1 1 0 0 0 1.35.418c14.7-7.753 16.768-5.262 18.106-4.473 4.967 2.926 7.036 13.563 6.257 16.658a3.561 3.561 0 0 1-3.3 2.686.794.794 0 0 1-.858-.791c-1.144-9.775-3.335-12.139-3.582-12.377a1 1 0 0 0-.744-.28c-.358.018-2.956-.343-13.509 4.457a.97.97 0 0 0-.37 1.365 1.049 1.049 0 0 0 1.365.369c7.878-3.365 10.1-3.936 12.094-4.148.54.877 1.925 3.726 2.759 10.845a2.777 2.777 0 0 0 2.714 2.555 4.132 4.132 0 0 0 .993-.057z"/>
+    <path d="M122.9 161.253l-16.287 3.61a1 1 0 0 1-.433-1.953l16.287-3.61a1 1 0 0 1 .433 1.953z"/>
+    <path d="M124.115 166.721l-16.287 3.61a1 1 0 1 1-.433-1.953l16.287-3.61a1 1 0 1 1 .433 1.953z"/>
+    <path d="M125.219 171.7l-16.287 3.61a.5.5 0 1 1-.216-.976l16.284-3.61a.5.5 0 0 1 .216.976z"/>
+    <path d="M177.123 139.793a1 1 0 0 1-1.06-1.514l8.964-14.069a1 1 0 0 1 1.687 1.075l-8.964 14.069a1 1 0 0 1-.627.439z"/>
+    <path d="M105.051 211.452a5.653 5.653 0 0 1-5.63-2.134c-2.28-3.056-4.647-14.652-.62-20.181 3.171-4.352 22.929-3.128 25.11-2.93a1 1 0 0 1 .9 1.087 1.024 1.024 0 0 1-1.086.9c-22.257-.643-23.329 2.139-23.329 2.139-3.462 4.61-1.284 15.225.625 17.784a3.561 3.561 0 0 0 4.076 1.213.794.794 0 0 0 .488-1.06c-2.7-9.464-1.586-12.489-1.449-12.8a1 1 0 0 1 .58-.544c.337-.121 7.4-.753 19.966.848a1 1 0 1 1-.253 1.983c-10.344-1.318-16.621-1.676-18.541-1.106-.162 1.018-.346 4.18 1.62 11.072a2.777 2.777 0 0 1-1.524 3.4 4.132 4.132 0 0 1-.933.329z"/>
+    <path d="M154.954 133.172s2.432 4.544 3.463 4.542 1.742-2.279 4.785-3.524c3.272-1.339 5.033.538 6.124-.251s1.2-5.459.718-6.368-3.7-2.42-8.672-.654-6.905 5.347-6.418 6.255z"/>
+    <path d="M131.166 148.6a6.476 6.476 0 0 0 .643.1 1.58 1.58 0 0 0 .307.046 6.4 6.4 0 0 0 1.934-.631 14.34 14.34 0 0 0 4.857-3.481 2.88 2.88 0 0 0 .685-2.355 1.75 1.75 0 0 0-1.255-1.279c-2.225-.807-9.326-.381-12.807 2.416a1.52 1.52 0 0 0-.486 1.768c.538 1.397 4.244 2.916 6.122 3.416z"/>
+    <path d="M131.973 147.394s-.186 6.672 2.354 8.45"/>
+    <path d="M134.349 156.844a1 1 0 0 1-.595-.181c-2.9-2.028-2.8-8.559-2.781-9.3a.982.982 0 0 1 1.028-.972 1 1 0 0 1 .972 1.027c-.064 2.374.4 6.536 1.929 7.6a1 1 0 0 1-.553 1.819z"/>
+    <path d="M191.146 210.564c-.657-8.673-1.389-15.793-2.2-22.113a70.69 70.69 0 0 0-1.943.918c.927 6.929 1.676 13.949 2.144 21.2l.015.068a61.494 61.494 0 0 1-.075 9.829c-.254 3.16-.151 3.467-.359 4.558-.067.343-.139.666-.211.989l.022.1-.215.877-.033.13-.221.807.019.088a15.562 15.562 0 0 1-1.319 3.293l-.046.072-.228.358-.078.109-.216.273-.09.1-.2.2-.087.07-.205.138-.088.019-.215.048-.049.011a.77.77 0 0 1-.476-.069c-.67-.343-2-6.187-3.045-11.414 2.134-1.139 4.734-2.719 4.879-2.8a.5.5 0 1 0-.518-.858s-3.162 1.909-5.347 3.049l-.156.035a113.632 113.632 0 0 1-16.147 4.695l-1.25.277-2.119.47-.586.13-1.837.356-.976.216-1.45.25-1.423.233-.989.158-2.114.3-.185.041c-2.4.326-4.649.559-6.637.693a17.65 17.65 0 0 1-4.866-1.482.5.5 0 1 0-.446.9 17.821 17.821 0 0 0 5.563 1.625c1.25 5.131 2.256 9.948 1.791 10.532a.769.769 0 0 1-.224.193l-.1.022a.784.784 0 0 1-.166.037l-.137.03-.156.035-.2-.037-.13-.033-.276-.092-.091-.041-.357-.177c-1.723-.98-4.285-3.762-7.025-8.174a46.184 46.184 0 0 1-2.75-5.383c-2.877-3.46-6.6-10.108-9.711-19.642q-1.77-5.725-3.244-10.808c-.206-.022-.41-.043-.606-.059-.655-.052-1.3-.1-1.936-.157 4.495 15.768 9.369 28.443 13.727 31.643a46.869 46.869 0 0 0 2.769 5.378c1.93 3.116 6.835 10.274 10.574 9.446a2.76 2.76 0 0 0 1.582-1c.64-.808 1.16-1.466-1.121-11.019a149.565 149.565 0 0 0 17.448-2.843 123 123 0 0 0 15.17-4.294c1.953 9.554 2.86 10.9 3.817 11.386a2.76 2.76 0 0 0 1.855.234c3.739-.829 5.571-8.783 5.4-14.023a61.9 61.9 0 0 0 .1-10.101zm-79.172-59.54l-.182-.82-2.3-10.359c-1.052-5.257-1.793-9.845-2.11-13.124l-.441-.281-3.817-2.432a7.778 7.778 0 1 1 8.359-13.12l2.111 1.345c-4.114 2.837-4.368 6.448-4.383 6.615a.5.5 0 0 0 .474.52l.137-.03a.5.5 0 0 0 .391-.455c-.032-.146.249-3.5 4.3-6.074 4.568-2.5 12.973-7.044 16.035-8.2 3.885-1.465 11.18-7.23 12.5-8.282l.2-.167-1.02 5.194-.067.343 4.955-2.737.059-.013.63 2.841 11.181.492.084-.131a11.81 11.81 0 0 1 7.682 4.115.5.5 0 1 0 .755-.659 12.79 12.79 0 0 0-7.84-4.408l.448-.7a7.778 7.778 0 1 1 13.12 8.359l-1.634 2.564c.311.894.616 1.81.924 2.735.065.293.188.573.275.871q.3.957.618 2a5 5 0 0 0 .285.961q.386 1.328.756 2.67l.206.927q.216.976.5 1.938l.314 1.416.307 1.386.361 1.63.112.508.959 4.325.039.176c2.917 16.877 6.122 32.387 8.549 48.11a99.288 99.288 0 0 1 1.969-.924c-2.147-13.977-4.762-25.188-7.888-44.349a179.865 179.865 0 0 0-6.07-24.087l1.117-1.753a9.751 9.751 0 0 0-16.447-10.479l-.509.8-8.492-.371-.859-3.91-2.337 1.286-1.261.689.259-1.327.987-5.022.076-.4-.3.24-3.993 3.241c-2.342 1.82-8.958 6.861-12.167 8.094-2.941 1.1-10.422 5.106-15.256 7.744l-2.087-1.33a9.76 9.76 0 1 0-11.04 16.1q.269.185.55.351l3.447 2.2A571.373 571.373 0 0 0 117.6 187.6q1.175.069 2.441.158c-6.999-25.479-8.067-36.735-8.067-36.735z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/error-server-not-found.svg b/waterfox/browser/themes/lepton/icons/error-server-not-found.svg
new file mode 100644
index 0000000000000..0f13286dd245c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/error-server-not-found.svg
@@ -0,0 +1,60 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
+  <defs>
+    <linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ccfbff"/>
+      <stop offset="1" stop-color="#c9e4ff"/>
+    </linearGradient>
+    <linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#00c8d7"/>
+      <stop offset="1" stop-color="#0a84ff"/>
+    </linearGradient>
+  </defs>
+  <path d="M224.245 144.067h-10.733c.136.343.274.674.41 1h10.323a.5.5 0 0 0 0-1zm2.454-11.821a.5.5 0 0 0-.5-.5h-20.26c.373.357.727.688 1.065 1h19.2a.5.5 0 0 0 .496-.5zm8.546 11.821h-3a.5.5 0 1 0 0 1h3a.5.5 0 0 0 0-1zm5 0h-1a.5.5 0 1 0 0 1h1a.5.5 0 0 0 0-1zm-3.3-6.66h-25.78a12.767 12.767 0 0 1 .862 2h24.918a1 1 0 0 0 0-2zm20.422 6.66h-8.122a.5.5 0 1 0 0 1h8.122a.5.5 0 0 0 0-1z" fill="#eaeaee"/>
+  <path d="M269.53 87.757h-24.236c-2.108-3.9-7.559-12.718-14.4-14.023-8.952-1.707-10.737 7.217-10.737 7.217s-5.949-15.468-21-13.419c-16.878 2.3-8.928 20.065-8.928 20.065h-25.408l8.181.159h-8.184a1 1 0 0 0 0 2H269.53a1 1 0 0 0 0-2z" fill="#fff"/>
+  <path d="M118.373 63.908h-13.69c-1.129-2.112-4.19-7.156-8.057-7.894-4.978-.949-5.971 4.013-5.971 4.013s-3.309-8.6-11.68-7.462c-9.386 1.278-4.965 11.158-4.965 11.158H59.88l9.471.185h-9.212a1 1 0 0 0 0 2h58.233a1 1 0 1 0 0-2z" fill="#fff"/>
+  <path d="M102.31 121.507H60.818a1 1 0 0 0 0 2h41.492a1 1 0 1 0 0-2zM70.336 117.6H82.1a.5.5 0 0 0 0-1H70.336a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+  <path d="M111.457 174.8h-78.3a1 1 0 0 0 0 2h78.3a1 1 0 1 0 0-2zm-26.742-3.793h1a.5.5 0 0 0 0-1h-1a.5.5 0 0 0 0 1zm10 0h3.1a.5.5 0 0 0 0-1h-3.1a.5.5 0 0 0 0 1zm-17 0h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0 0 1zm-20 0h12a.5.5 0 0 0 0-1h-12a.5.5 0 0 0 0 1z" fill="#eaeaee"/>
+  <path d="M206.885 62.973l.045-.1c-.058.027-.063.059-.045.1z" fill="#fff"/>
+  <path d="M77.937 214.941H39.95a1 1 0 1 1 0-2h37.987a1 1 0 1 1 0 2z" fill="#eaeaee"/>
+  <path d="M258.931 214.941h-61.813a1 1 0 0 1 0-2h61.813a1 1 0 0 1 0 2z" fill="#eaeaee"/>
+  <path d="M265.745 85.333h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-8.07a.5.5 0 0 1-.447-.277c-.007-.014-.724-1.425-1.979-3.342a.5.5 0 1 1 .837-.548c.393.6 1.444 2.293 1.888 3.167h7.772a.5.5 0 0 1 0 1zm-66.489-.712h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zM190.1 83.13a.5.5 0 0 1-.474-.339c-.1-.29-.2-.615-.31-.971a.5.5 0 1 1 .958-.287c.1.343.2.657.3.937a.5.5 0 0 1-.474.661zm30.5-5.156a.5.5 0 0 1-.467-.32 23.7 23.7 0 0 0-2.182-4.039.5.5 0 0 1 .834-.552 27.291 27.291 0 0 1 1.719 2.982 10.522 10.522 0 0 1 3.679-5.015.5.5 0 0 1 .571.82 10.181 10.181 0 0 0-3.665 5.721.5.5 0 0 1-.448.4zm18.345-2.964a.5.5 0 0 1-.339-.132q-.361-.333-.735-.651a.5.5 0 0 1 .647-.762q.39.331.765.678a.5.5 0 0 1-.339.868zm-49.923-1.725a.47.47 0 0 1-.09-.008.5.5 0 0 1-.4-.581c.792-4.351 3.544-7.229 8.18-8.556a.5.5 0 0 1 .275.962c-4.24 1.212-6.753 3.828-7.472 7.773a.5.5 0 0 1-.499.411zm45.893-1.218a.5.5 0 0 1-.237-.06 12.545 12.545 0 0 0-2.666-1.081.5.5 0 1 1 .261-.966 13.559 13.559 0 0 1 2.88 1.167.5.5 0 0 1-.238.94zM212.146 67.4a.5.5 0 0 1-.28-.086q-.4-.27-.82-.524a.5.5 0 1 1 .516-.856q.444.267.865.552a.5.5 0 0 1-.281.914zm-4.47-2.2a.5.5 0 0 1-.154-.024 16.724 16.724 0 0 0-2.832-.647.5.5 0 0 1 .137-.99 17.6 17.6 0 0 1 3 .686.5.5 0 0 1-.154.976z" fill="#eaeaee"/>
+  <path d="M72.315 62.052h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zm45.582-.184h-1.8a.5.5 0 0 1 0-1h1.8a.5.5 0 0 1 0 1zm-10.8 0h-1a.5.5 0 0 1 0-1h1a.5.5 0 0 1 0 1zm-3.491-2.881a.5.5 0 0 1-.39-.186 18.484 18.484 0 0 0-2-2.129.5.5 0 1 1 .668-.744A19.433 19.433 0 0 1 104 58.174a.5.5 0 0 1-.389.814zm-12.521-.631a.5.5 0 0 1-.466-.319 13.8 13.8 0 0 0-3.857-5.165.5.5 0 0 1 .623-.782 14.47 14.47 0 0 1 3.624 4.438A5.414 5.414 0 0 1 94.12 53.5a.5.5 0 0 1 .326.945 4.994 4.994 0 0 0-2.867 3.51.5.5 0 0 1-.49.401zm-17.637-2.037h-.051a.5.5 0 0 1-.447-.548 6.454 6.454 0 0 1 1.057-3.036.5.5 0 1 1 .824.566 5.46 5.46 0 0 0-.886 2.571.5.5 0 0 1-.497.447zm4.193-5.039a.5.5 0 0 1-.151-.977 10.27 10.27 0 0 1 1.017-.264.5.5 0 0 1 .2.979 9.033 9.033 0 0 0-.917.237.5.5 0 0 1-.148.025z" fill="#eaeaee"/>
+  <ellipse cx="143.502" cy="244.914" rx="54.673" ry="8.306" fill="#eaeaee"/>
+  <path d="M223.695 147.595a8.557 8.557 0 0 0-3.594-1.658v-.084a5 5 0 0 0-5.98-5.15 36.839 36.839 0 0 0-6.483-9.3 83.918 83.918 0 0 0-8.865-9.925 5.554 5.554 0 0 0-2.252-1.3c-7.134-6.844-21.832-19.69-32.3-20.412a27.308 27.308 0 0 0-1.879-.063A46.863 46.863 0 0 0 147.3 102.6l-5.07-1.386a5 5 0 0 0-6.142 3.5l-.959 3.508a68.223 68.223 0 0 0-7.774 5.252l-2.026-.047h-.116a5 5 0 0 0-5 4.884l-.042 1.8a45.3 45.3 0 0 0-5.6 7.593 5 5 0 0 0-2.508 5.313c-1.868 5.441-2.827 13.654-2.855 24.468-.454 2.653-1 5.24-1.63 7.721l-4.239 2.569a6.3 6.3 0 0 0-2.122 8.645l1.5 2.469q-.366.757-.741 1.478l-4 1.227a6.3 6.3 0 0 0-4.171 7.866l.59 1.923q-.5.569-1.007 1.109l-1.588-.122a5.857 5.857 0 0 0-.5-.02 6.325 6.325 0 0 0-6.268 5.8l-.113 1.431c-2.725 2.033-5.38 4.525-5.38 9.073 0 6.507 10.219 10.526 13.578 11.847a68.529 68.529 0 0 0 24.074 4.751q.549 0 1.093-.012c.6 2.385 1.2 4.42 1.778 6.08a54.622 54.622 0 0 0 4.716 10.2c1.741 2.827 4.2 6.072 7.821 6.072a5.668 5.668 0 0 0 3.569-1.267c1.74-1.416 2.422-3.057 2.477-10.005a86.376 86.376 0 0 0 16.716 1.516 80.415 80.415 0 0 0 14.4-1.446c-.21 6.755.477 8.474 2.273 9.935a5.668 5.668 0 0 0 3.568 1.267c5.627 0 9.914-8.85 12.52-16.273.379-1.079.76-2.326 1.133-3.705h-.008c1.555-5.314 12.415-46.933 15.771-59.81l9.2.076h.041q.235 0 .47-.022a13.639 13.639 0 0 0 8.795-4.994l.014.011c4.448-5.667 4.514-11.806.157-15.28z" fill="#fff"/>
+  <g fill="url(#a)">
+    <path d="M121.625 218.616c-4.1-12.832-7.76-39.924-7.746-61.081a103.51 103.51 0 0 1-2.321 10.573l-5.961 3.612a1.3 1.3 0 0 0-.437 1.779l2.865 4.729a59.209 59.209 0 0 1-2.977 5.993l-5.939 1.823a1.3 1.3 0 0 0-.858 1.619l1.385 4.511a51.054 51.054 0 0 1-4.661 5.155l-3.9-.308a1.3 1.3 0 0 0-1.394 1.19l-.294 3.726c-3.236 2.342-5.183 3.517-5.183 6.38 0 4.117 20.661 13.327 37.645 11.314-.078-.339-.149-.677-.224-1.015z"/>
+    <path d="M186.98 169.883l-12.066-1.734s10.339 13.394 7.748 33.691c-1 7.817-6.478 19.433-22.024 22.456a45.69 45.69 0 0 1-27.449-3.428v8.583s7.584 3.05 21.835 3.05a87.741 87.741 0 0 0 19.743-2.7c-.4 5.8-.622 11.737.084 12.311 1.416 1.153 5.381-4.714 8.214-12.785a48.073 48.073 0 0 0 1.019-3.337c1.268-3.235 4.283-12.279 4.623-25.878a176.857 176.857 0 0 0-1.727-30.229z"/>
+    <path d="M189.791 210.674l-4.457-18.074-8.517-31.348a1.288 1.288 0 0 0-1.554-.989l-20.588 10.535-2.94.327-15.735.134a1.287 1.287 0 0 0-1.177 1.782l6.114 14.682 4.476 18.806a1.278 1.278 0 0 0 .146.349l-1.614 14.85a1.287 1.287 0 0 0 1.3 1.426l18.745-.305q.061 0 .121-.008a1.288 1.288 0 0 0 .151-.026l24.607-10.476a1.287 1.287 0 0 0 .926-1.665z"/>
+    <path d="M139.025 177.647a1.384 1.384 0 0 0 .773-1.1 1.407 1.407 0 0 0-1.269-1.533s-1.257-.638-4.768-.72a7.635 7.635 0 0 0-5.773 2.53 75.369 75.369 0 0 1-13.532-5.021 2.5 2.5 0 0 0-2.225 4.478 76.1 76.1 0 0 0 15.616 5.619c1.4 1.485 3.989 2.07 5.679 2.241.1.031 5.754.357 7.31-3.608.474-1.206-.654-2.449-1.811-2.886z"/>
+    <path d="M212.017 152.78c2.378-2.584 6.425-3.047 8.227-1.609 2.856 2.278.577 6.3-.976 8.274-.044.09-3.736 4.39-7.671 2.758-1.2-.5-1.309-2.171-.821-3.307a1.384 1.384 0 0 1-1.327-.206 1.407 1.407 0 0 1-.223-1.978s.413-1.348 2.791-3.932z"/>
+    <path d="M210.657 147.674a12.766 12.766 0 0 0-.357-2.321c-1.084-4.224-4.233-8.285-6.851-11.094a78.307 78.307 0 0 0-8.425-9.468.648.648 0 0 0-.887.944 80.955 80.955 0 0 1 7.823 8.7c1.579 2.767 3.417 6.488 3.862 9.489a17.1 17.1 0 0 1-1.055 7.18zm-56.427 14.1a1.3 1.3 0 0 0 .514 1.758c.142.078 2.046 1.108 5.194 2.412l2.974-1.612a63.892 63.892 0 0 1-6.924-3.073 1.3 1.3 0 0 0-1.758.517z"/>
+  </g>
+  <g fill="#f9f9fa">
+    <path d="M164.107 222.841q-.06.007-.121.008l-18.745.305a1.287 1.287 0 0 1-1.3-1.426l1.614-14.85a1.28 1.28 0 0 1-.146-.349l-4.476-18.806-2.024-4.861a9.694 9.694 0 0 1-5.383 1.28c-1.69-.17-4.282-.756-5.679-2.241a70.415 70.415 0 0 1-13.1-4.449c1.326 16.092 3.99 32.149 6.873 41.164a93.749 93.749 0 0 0 2.817 10.711c2.833 8.071 6.815 13.938 8.231 12.785.67-.545.705-6.511.557-12.645l-.042-.016v-8.583a45.69 45.69 0 0 0 27.449 3.428 29.062 29.062 0 0 0 11.749-4.94l-8.127 3.46a1.29 1.29 0 0 1-.147.025z"/>
+    <path d="M218.386 185.448c-.284-.616-4.741-17.387-4.741-17.387l.274-5.519a4.792 4.792 0 0 1-2.322-.339c-1.2-.5-1.309-2.171-.821-3.307a1.384 1.384 0 0 1-1.328-.206 1.407 1.407 0 0 1-.223-1.978s.413-1.348 2.791-3.932a7.392 7.392 0 0 1 2.474-1.729l.287-5.78-10.011 5.837a17.1 17.1 0 0 0 1.055-7.18c-.445-3-2.283-6.722-3.862-9.489a80.955 80.955 0 0 0-7.823-8.7.648.648 0 0 1-.028-.915s.011-.006.015-.011c-10.105-9.943-22.875-19.853-30.577-20.384-4.5-.311-10.323.8-16.37 3.082l-6.6-1.805-1.511 5.524a63.4 63.4 0 0 0-10.33 6.958l-3.858-.09-.086 3.719a40.259 40.259 0 0 0-7.075 9.61l-1.076.336.36 1.137c-3.164 7.31-3.661 22.679-2.656 38.859.037.016.076.024.113.043a75.369 75.369 0 0 0 13.532 5.021 6.434 6.434 0 0 1 .467-.48c.065-.061.135-.118.2-.177.1-.088.2-.175.314-.259l.3-.218a7.807 7.807 0 0 1 .651-.406c.045-.025.091-.048.137-.072a7.522 7.522 0 0 1 3.707-.919c.615.014 1.137.049 1.619.092l-.56-1.346a1.287 1.287 0 0 1 1.176-1.779l15.739-.139 2.94-.327 20.588-10.535a1.287 1.287 0 0 1 1.554.989l8.517 31.348 4.457 18.078a1.287 1.287 0 0 1-.926 1.665l-24.607 10.476a1.29 1.29 0 0 1-.151.026q-.06.007-.121.008l-18.745.305a1.287 1.287 0 0 1-1.3-1.426l1.614-14.85a1.28 1.28 0 0 1-.146-.349l-4.476-18.806-2.024-4.861a7.222 7.222 0 0 1-1.957.882l1.244 2.643 4.883 18.667-1.442 20.018 22.316.754 28.2-12.809 22.4-5.773 12.27-10s-8.157-11.179-8.441-11.795zm-58.447-19.5c-3.153-1.305-5.053-2.334-5.2-2.412a1.3 1.3 0 0 1 1.244-2.273 64.081 64.081 0 0 0 6.926 3.071z"/>
+  </g>
+  <path d="M148.2 151.572a1 1 0 0 0-.969-.513l-5.848.544a1 1 0 0 0-.518 1.788l3.4 2.625a1 1 0 0 0 .611.208 1.023 1.023 0 0 0 .128-.008 1 1 0 0 0 .664-.381l2.444-3.169a1 1 0 0 0 .088-1.094z" fill="#fff"/>
+  <g fill="url(#a)">
+    <path d="M215.942 188.189a.5.5 0 0 0-.643-.294c-.657.244-6.829 2.359-9.226 3.179a.485.485 0 0 0-.129.02l-.223.082-.3-.533-4.132-16.317c3.722-1.631 9.422-4.082 10-4.2a.5.5 0 0 0 .43-.551.507.507 0 0 0-.552-.442c-.612.068-7.152 2.91-10.007 4.159l-.978-16.222a.506.506 0 0 0-.529-.469.5.5 0 0 0-.469.529l1.027 16.881a.482.482 0 0 0 .005.087v.063l4.244 16.8a.5.5 0 0 0 .048.121l.252.452-14.371 5.266a.5.5 0 1 0 .345.938l14.53-5.331 7.075 12.687a.5.5 0 1 0 .873-.487l-6.987-12.529c2.259-.773 8.727-2.988 9.423-3.247a.5.5 0 0 0 .294-.642zm-17.866-13.124a.5.5 0 0 0-.645-.29l-12.685 4.811a.5.5 0 0 0 .177.967.49.49 0 0 0 .177-.033l12.685-4.811a.5.5 0 0 0 .29-.644z"/>
+    <path d="M177.573 181.528a1.031 1.031 0 1 0 1.081.668 1.036 1.036 0 0 0-1.081-.668z"/>
+  </g>
+  <path d="M186.537 198.867a.5.5 0 0 0-.634-.312l-22.81 7.758-.215-2.424-3.513-18.32 22.327-4.386a.5.5 0 0 0-.192-.981l-22.373 4.4-4.2-13.34a.5.5 0 0 0-.954.3l4.153 13.167-15.205 1.277a.5.5 0 0 0 .042 1h.042l15.376-1.294 3.513 18.32.214 2.418c-3.146-.116-12.594-.432-13.583-.117a.5.5 0 0 0-.321.621.506.506 0 0 0 .623.333c.734-.214 8.379-.017 13.371.167l1.382 15.6a.5.5 0 0 0 .5.456h.044a.5.5 0 0 0 .454-.542l-1.386-15.624 23.041-7.837a.5.5 0 0 0 .304-.64z" fill="#f9f9fa"/>
+  <g fill="url(#b)">
+    <path d="M158.845 166.591l-3.592-1.575a1 1 0 0 1 .8-1.832l4.854 2.129z"/>
+    <path d="M151.812 151.976a11.582 11.582 0 0 0-15.092 1.077 1 1 0 0 0 1.387 1.441 10.932 10.932 0 0 1 1.693-1.238c1.011 1.259 2.852 3.273 4.438 3.474a1.779 1.779 0 0 0 .228.014c1.905 0 3.843-2.924 4.537-4.082a11.155 11.155 0 0 1 1.621.922 1 1 0 0 0 1.189-1.608zm-7.448 3.762c-1.113-.141-2.654-1.735-3.671-2.971a9.546 9.546 0 0 1 4.815-1.067 9.091 9.091 0 0 1 2.56.576c-.968 1.589-2.592 3.611-3.705 3.461z"/>
+    <path d="M195.7 141.2a5.614 5.614 0 0 0-9.187 0 1 1 0 1 0 1.679 1.088 3.7 3.7 0 0 1 2.915-1.475 3.648 3.648 0 0 1 2.918 1.48 1 1 0 0 0 1.675-1.093z"/>
+    <path d="M155.081 127.311a1 1 0 0 0 1.383-.28 3.618 3.618 0 0 1 5.838 0 1 1 0 0 0 1.675-1.093 5.614 5.614 0 0 0-9.187 0 1 1 0 0 0 .291 1.373z"/>
+    <path d="M189.934 134.871c0 .034-.01.066-.01.1v2.844a6.008 6.008 0 0 1 2.784.078v-2.922a1.378 1.378 0 0 0-.023-.227 5.846 5.846 0 0 0 2.993-2.135 1 1 0 0 0-1.678-1.094 3.617 3.617 0 0 1-5.838 0 1 1 0 0 0-1.674 1.094 5.755 5.755 0 0 0 3.446 2.262z"/>
+    <path d="M158.008 134.971v3.152a5.941 5.941 0 0 1 2.781-.038v-3.114a1.392 1.392 0 1 0-2.784 0z"/>
+    <path d="M159.4 139.021a5.674 5.674 0 0 0-4.593 2.387 1 1 0 0 0 1.674 1.094 3.618 3.618 0 0 1 5.838 0 1 1 0 0 0 1.675-1.093 5.674 5.674 0 0 0-4.594-2.388z"/>
+    <path d="M180.388 181.389a2.938 2.938 0 1 0-4.66 3.254 4.326 4.326 0 0 0 .765.557l2.4 1.8a.562.562 0 0 0 .531.077h.008a.564.564 0 0 0 .35-.418l.577-3a3.9 3.9 0 0 0 .029-2.27zm-2.344 2.132a1.031 1.031 0 1 1 .61-1.325 1.034 1.034 0 0 1-.61 1.325z"/>
+    <path d="M212.864 169.173a.64.64 0 0 0-.9-.158l-6.583 4.6-6.6 4.16-.891.437-6.69-16.391-6.419 2.481-1.271-5.447a.643.643 0 1 0-1.252.294l1.315 5.621-3.806 1.471v.01l-19.531 7.538 3.908 11.6-2.937 1.966-7.657 3.829-11.434.845a.8.8 0 0 0-.1.031l.3 1.246 11.461-.848.127-.01 7.955-3.983 2.715-1.815 8.963 26.609 13.988-4.649-.86-1.86 3.448-1.219 1.248-.441 5.962 3.956a.643.643 0 1 0 .71-1.073l-5.168-3.415.03-.01-1.152-2.5 13.594-5.606-6.957-17.044 1.032-.505 6.682-4.212 6.609-4.621a.642.642 0 0 0 .161-.887zm-9.2 26.575l-13.647 5.629.785 1.7-2.343-2.449-1.288-1.346-4.425-3.346L180.2 193l-.376-4.707a1.748 1.748 0 0 1-1.294-.042l.421 5.273 2.862 3.309 4.5 3.41 3.112 3.263.648.68-.228.081-.146.052-4.8 1.7.847 1.836-11.4 3.79-8.665-25.724 1.41-.943 5.921.554 2.9 2.118 1.361-.251-1.479-1.1a5.89 5.89 0 0 1-.9-.663 4.206 4.206 0 0 1-.783-.893l-.624-.456-6.729-.628-1.5 1-3.4-10.1 19.632-7.577v-.01l2.388-.923.438 1.874.528 4.731.565 3.225-1 2.954-2.623 1.281-.4.374a4.217 4.217 0 0 1 .218.466 3.835 3.835 0 0 1 .2.87l.634-.6 3.021-1.474 1.275-3.774-.616-3.508-.536-4.767-.5-2.123 5.41-2.091 6.246 15.3-10.983 5.386-4.378 1.031-.267 1.386 4.4-1.038.607-.143 11.1-5.432z"/>
+    <path d="M211.383 147.927l2.9-1.77.039 5.23a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5l-.046-6.113a.5.5 0 0 0-.76-.423l-3.655 2.229a.5.5 0 0 0 .521.854zm15.845 49.026l-8.383-11.723-4.7-17.252-.32-5.243a.51.51 0 0 0-.529-.469.5.5 0 0 0-.469.529l.323 5.294a.5.5 0 0 0 .017.1l4.733 17.391a.5.5 0 0 0 .076.16l8.163 11.414-11.821 9.633-22.291 5.745c-.015 0-.026.014-.04.02s-.028 0-.041.01l-28.095 12.761-21.68-.732 1.4-19.5a.506.506 0 0 0-.015-.163l-4.876-18.668a.537.537 0 0 0-.041-.1l-1.539-2.96a.5.5 0 0 0-.887.463l1.515 2.9 4.848 18.532-1.435 19.936a.5.5 0 0 0 .481.536l22.316.754h.017a.5.5 0 0 0 .207-.045l28.159-12.79 22.358-5.762a.505.505 0 0 0 .191-.1l12.27-10a.5.5 0 0 0 .088-.671zm-96.2-26.9l23.165-.486a.5.5 0 0 0 .228-.061l22.133-12 14.9-1.49h.011l7.36-.909a.5.5 0 0 0 .187-.062l8.711-4.962a.5.5 0 1 0-.5-.869l-8.624 4.913-7.249.9-15 1.5a.5.5 0 0 0-.188.058l-22.115 11.992-23.782.5a.5.5 0 0 0-.449.7l1.47 3.46a.5.5 0 0 0 .46.3.493.493 0 0 0 .2-.04.5.5 0 0 0 .265-.655z"/>
+    <path d="M221.337 150.947c-.37-.407-2.546-2.481-6.929-.472a1 1 0 0 0 .832 1.818c3.251-1.489 4.553-.074 4.594-.03.024.03.064.072.091.1.076.074 1.82 1.86-.674 5.575-2.65 3.945-5.713 3.84-5.862 3.832a1 1 0 0 0-.142 1.995c.019 0 .085.006.193.006.877 0 4.494-.285 7.471-4.717 3.289-4.902.831-7.7.426-8.107zm-9.037 2.245a.5.5 0 1 0-.567-.823c-.354.244-3.456 2.447-3.149 4.537.13.889.826 1.577 2.071 2.049v2.479a.5.5 0 0 0 1 0V158.6a.5.5 0 0 0-.347-.476c-1.069-.345-1.652-.8-1.735-1.363-.183-1.25 1.962-3.041 2.727-3.569z"/>
+    <path d="M141.324 179.661a1 1 0 0 0-1.361.384 5.382 5.382 0 0 1-3.357 2.765c-3.375.921-7.389-1.383-7.43-1.407a1.043 1.043 0 0 0-.494-.137 23.844 23.844 0 0 1-5.361-1.266 94.816 94.816 0 0 1-10.046-4.156 1 1 0 1 0-.87 1.8 94.837 94.837 0 0 0 10.318 4.263 28.613 28.613 0 0 0 5.662 1.344 14.825 14.825 0 0 0 6.505 1.775 8.516 8.516 0 0 0 2.233-.285 7.38 7.38 0 0 0 4.585-3.72 1 1 0 0 0-.384-1.36zm-13.077-2.407c1.673-1.014 6.485-3.407 8.631-2.308a2.26 2.26 0 0 1 1.111 2.027.5.5 0 0 0 .125.292l1.333 1.5a.5.5 0 1 0 .747-.664l-1.225-1.378a3.151 3.151 0 0 0-1.637-2.667c-3.076-1.572-9.338 2.182-9.6 2.343a.5.5 0 0 0 .519.855z"/>
+    <path d="M187.079 215.322a62.9 62.9 0 0 1-2.99 10.65 48.268 48.268 0 0 1-1.024 3.355c-2.593 7.389-6.135 12.929-7.8 12.929a.634.634 0 0 1-.412-.145c-.706-.575-.484-6.506-.084-12.311a87.741 87.741 0 0 1-19.743 2.7c-11.364 0-18.463-1.931-20.878-2.715l-.237-5.569a.5.5 0 0 0-1 .043l.386 9.076c.038 4.572-.1 8.349-.622 8.777a.635.635 0 0 1-.412.145c-1.67 0-5.226-5.541-7.819-12.929a88.238 88.238 0 0 1-2.593-9.678v-.018c-2.557-10.229-4.4-21.578-4.427-21.725a.5.5 0 0 0-.984.174c.025.144 1.891 11.541 4.373 21.641a43.511 43.511 0 0 1-3.955.194c-15.782 0-32.651-7.878-32.651-11.6 0-2.862 1.947-4.038 5.183-6.379l.294-3.727a1.3 1.3 0 0 1 1.284-1.194h.109l2.658.209c-.932 1-1.8 1.954-1.856 2.019a.5.5 0 0 0 .741.672c.02-.022 1.7-1.876 2.915-3.143a51.528 51.528 0 0 0 4.106-4.6l-1.385-4.51a1.3 1.3 0 0 1 .858-1.619l4.541-1.395-1.472 2.6a.5.5 0 0 0 .871.492l2-3.526a59.168 59.168 0 0 0 2.977-5.992l-2.871-4.723a1.3 1.3 0 0 1 .436-1.78l4.685-2.84-.841 2.8a.5.5 0 0 0 .335.623.506.506 0 0 0 .144.021.5.5 0 0 0 .479-.356l1.159-3.861a103.318 103.318 0 0 0 2.315-10.528c0-9.635.771-18.028 2.6-23.3l.629 1.572a.5.5 0 0 0 .929-.371l-1.036-2.59-.354-1.132 1.076-.336a39.516 39.516 0 0 1 6.206-8.693 17.58 17.58 0 0 0 .293 2.241.5.5 0 0 0 .472.34.5.5 0 0 0 .477-.656c-.081-.25-.222-1.675-.361-3.33l.075-3.231 3.858.09a63.4 63.4 0 0 1 10.33-6.958l1.511-5.524 5.175 1.415-2.448 1.1a.5.5 0 1 0 .409.912l3.465-1.619a43.83 43.83 0 0 1 14.834-3.133q.79 0 1.535.051c7.7.531 20.471 10.442 30.576 20.384a.65.65 0 0 1 .461-.192.635.635 0 0 1 .439.175 78.316 78.316 0 0 1 8.426 9.469c2.618 2.808 5.766 6.87 6.851 11.093a12.766 12.766 0 0 1 .357 2.321l1.9-1.109a14.088 14.088 0 0 0-.321-1.71c-1.189-4.633-4.577-9-7.244-11.873a80.227 80.227 0 0 0-8.6-9.651 2.616 2.616 0 0 0-1.645-.711 132.405 132.405 0 0 0-15.667-13.173c-6.275-4.386-11.455-6.747-15.4-7.019-.538-.037-1.1-.056-1.673-.056a44.826 44.826 0 0 0-14.927 3.034l-5.98-1.635a2 2 0 0 0-2.457 1.4l-1.287 4.707a65.217 65.217 0 0 0-9.321 6.285l-3.115-.072h-.047a2 2 0 0 0-2 1.953l-.068 2.94a42.293 42.293 0 0 0-6.474 8.772l-.291.091a2 2 0 0 0-1.313 2.506l.143.457c-1.979 5.088-2.989 13.356-3 24.6a102.64 102.64 0 0 1-2.034 9.4l-5.279 3.2a3.3 3.3 0 0 0-1.111 4.526l2.326 3.838a57.63 57.63 0 0 1-2.077 4.169l-5.176 1.59a3.3 3.3 0 0 0-2.183 4.118l1.073 3.494a49.486 49.486 0 0 1-3.185 3.519l-3-.236a3.17 3.17 0 0 0-.266-.011 3.31 3.31 0 0 0-3.278 3.035l-.221 2.8c-2.946 2.116-5.262 3.81-5.262 7.461 0 3.883 7.315 7.34 11.675 9.055a65.414 65.414 0 0 0 22.976 4.543 46.33 46.33 0 0 0 3.429-.125 80.231 80.231 0 0 0 2.274 8.2c.513 1.46 5.14 14.267 9.706 14.267a2.624 2.624 0 0 0 1.675-.594c.828-.674 1.5-1.218 1.349-11.451a76.223 76.223 0 0 0 19.738 2.288 85.8 85.8 0 0 0 17.577-2.149c-.579 10.036.152 10.631.988 11.312a2.623 2.623 0 0 0 1.674.594c4.55 0 9.177-12.807 9.689-14.267.345-.983.694-2.123 1.039-3.39a67.385 67.385 0 0 0 3.306-12.285z"/>
+  </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/error-session-restore.svg b/waterfox/browser/themes/lepton/icons/error-session-restore.svg
new file mode 100644
index 0000000000000..2cbe12f471c84
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/error-session-restore.svg
@@ -0,0 +1,68 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
+  <defs>
+    <linearGradient id="a" x1="-300.021" y1="-272.736" x2="547.138" y2="574.423" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ccfbff"/>
+      <stop offset="1" stop-color="#c9e4ff"/>
+    </linearGradient>
+    <linearGradient id="b" x1="-18.672" y1="23.78" x2="279.805" y2="322.256" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#00c8d7"/>
+      <stop offset="1" stop-color="#0a84ff"/>
+    </linearGradient>
+  </defs>
+  <ellipse cx="147.98" cy="227.18" rx="37.772" ry="5.739" fill="#eaeaee"/>
+  <path d="M166.909 241.114c-3.981-6.089-4.649-6.1-5.174-6.1-.694-.012-20.082-1.128-30.409-1.727l-5.48-2.529a1 1 0 0 0-.736-.04c-.521.174-8.625 2.562-11.7 3.468a1 1 0 0 0 .217 1.957l13.172.854-6.831 3.564a1 1 0 0 0 .458 1.887l45.649.217a1 1 0 0 0 .837-1.547z" fill="#eaeaee"/>
+  <path d="M147.941 251.71l-6.3-4.348a.934.934 0 0 0-.6-.176l-36.954 1.3a1 1 0 0 0-.649.27l-3.478 3.261a1 1 0 0 0 .684 1.729l46.736-.217a1 1 0 0 0 .563-1.823z" fill="#eaeaee"/>
+  <path d="M196.264 252.187l-11.3-9.13a1 1 0 0 0-.718-.218l-26.5 2.39-4.328.216a1 1 0 0 0-.648 1.715l8.7 8.479a1 1 0 0 0 .7.284h.059l33.476-1.957a1 1 0 0 0 .57-1.776z" fill="#eaeaee"/>
+  <path d="M223.976 231.634a1.006 1.006 0 0 0-.71-.319c-11.112-.254-28.009-.689-29.167-.85a1 1 0 0 0-.893 1.7l5 4.782a1 1 0 0 0 .691.277h.051c9.877-.507 24.978-1.217 26.009-1.114a1.108 1.108 0 0 0 1.258-.485c.354-.598.434-1.111-2.239-3.991z" fill="#eaeaee"/>
+  <path d="M157.336 56.28H133.1c-2.108-3.9-7.559-12.719-14.4-14.023-8.952-1.707-10.737 7.217-10.737 7.217s-5.949-15.469-21-13.419c-16.878 2.3-8.928 20.065-8.928 20.065H52.627l8.187.159h-8.191a1 1 0 0 0 0 2h104.713a1 1 0 0 0 0-2z" fill="#fff"/>
+  <path d="M255.293 70.249H241.6c-1.129-2.113-4.19-7.156-8.057-7.894-4.978-.949-5.971 4.013-5.971 4.013s-3.309-8.6-11.68-7.462c-9.386 1.278-4.965 11.158-4.965 11.158H196.8l9.462.184h-9.2a1 1 0 0 0 0 2h58.233a1 1 0 0 0 0-2z" fill="#fff"/>
+  <path d="M241.739 47.853l.045-.1c-.058.025-.063.06-.045.1z" fill="#fff"/>
+  <path d="M153.55 53.855h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-8.07a.5.5 0 0 1-.452-.285 38.288 38.288 0 0 0-1.976-3.334.5.5 0 0 1 .837-.549c.393.6 1.445 2.295 1.889 3.168h7.771a.5.5 0 0 1 0 1zm-66.488-.712h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 1 0 1zm-11 0h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zm12.838-1.49a.5.5 0 0 1-.473-.339c-.1-.29-.2-.616-.311-.972a.5.5 0 1 1 .958-.287c.1.344.2.656.3.937a.5.5 0 0 1-.312.635.515.515 0 0 1-.162.026zm30.5-5.153a.506.506 0 0 1-.468-.32 23.563 23.563 0 0 0-2.181-4.037.5.5 0 0 1 .834-.553 27.46 27.46 0 0 1 1.718 2.983 10.516 10.516 0 0 1 3.679-5.017.5.5 0 1 1 .571.82 10.183 10.183 0 0 0-3.663 5.724.5.5 0 0 1-.4.394.492.492 0 0 1-.09.006zm18.343-2.966a.5.5 0 0 1-.339-.133q-.361-.333-.734-.65a.5.5 0 1 1 .646-.762q.39.33.766.678a.5.5 0 0 1-.339.867zM76.821 41.81a.563.563 0 0 1-.09-.008.5.5 0 0 1-.4-.582c.792-4.351 3.544-7.229 8.181-8.555a.5.5 0 1 1 .275.961c-4.24 1.213-6.754 3.828-7.473 7.773a.5.5 0 0 1-.493.411zm45.892-1.221a.5.5 0 0 1-.236-.06 12.614 12.614 0 0 0-2.667-1.082.5.5 0 0 1 .262-.965 13.589 13.589 0 0 1 2.879 1.166.5.5 0 0 1-.237.94zm-22.76-4.664a.5.5 0 0 1-.28-.086q-.4-.271-.82-.525a.5.5 0 1 1 .517-.855q.444.267.865.553a.5.5 0 0 1-.281.914zm-4.47-2.2a.5.5 0 0 1-.154-.024 16.412 16.412 0 0 0-2.832-.647.5.5 0 0 1 .137-.99 17.452 17.452 0 0 1 3 .687.5.5 0 0 1-.154.976z" fill="#eaeaee"/>
+  <path d="M182.316 98.659a18.015 18.015 0 0 1-9.94-2.7 21.661 21.661 0 0 0-21.783 0 19.662 19.662 0 0 1-19.879 0 21.655 21.655 0 0 0-21.78 0 19.65 19.65 0 0 1-19.873 0 19.92 19.92 0 0 0-10.886-2.937 19.931 19.931 0 0 0-10.889 2.938 18.005 18.005 0 0 1-9.937 2.7 18 18 0 0 1-9.936-2.7 19.926 19.926 0 0 0-10.888-2.937 1 1 0 0 0 0 2 18 18 0 0 1 9.936 2.7 19.926 19.926 0 0 0 10.888 2.938 19.932 19.932 0 0 0 10.89-2.938 18 18 0 0 1 9.937-2.7 18 18 0 0 1 9.934 2.7 21.649 21.649 0 0 0 21.777 0 19.657 19.657 0 0 1 19.876 0 21.659 21.659 0 0 0 21.782 0 19.666 19.666 0 0 1 19.881 0 19.937 19.937 0 0 0 10.892 2.938 1 1 0 0 0 0-2zm66.143-10.24a.5.5 0 0 0-.7-.084 19.457 19.457 0 0 1-9.2 3.162 11.427 11.427 0 0 1-3.738-.029c2-.62 3.759-1.488 4.548-2.628.953-1.376.377-2.177.086-2.457-.88-.849-2.82-.664-4.236.4-1.065.8-2.892 2.666-2.477 4.2a29.546 29.546 0 0 1-4.815.685.5.5 0 0 0 .024 1h.025a30.5 30.5 0 0 0 5.355-.79c.88.715 2.643.915 5.337.616 6.261-.7 9.574-3.263 9.712-3.371a.5.5 0 0 0 .079-.704zm-12.646-.839a3.515 3.515 0 0 1 2.052-.735 1.318 1.318 0 0 1 .891.259c.31.3 0 .859-.215 1.168-.734 1.06-2.664 1.894-4.832 2.472-.233-.777.881-2.244 2.104-3.164zm-103.279 3.449a17.836 17.836 0 0 0 2.88 1.09.5.5 0 0 0 .27-.963 16.942 16.942 0 0 1-2.722-1.031.5.5 0 1 0-.428.9zm-18.885-2.8a.483.483 0 0 0 .168-.029 18.775 18.775 0 0 1 6.459-1 20.224 20.224 0 0 1 5.081.581.5.5 0 1 0 .249-.969 21.191 21.191 0 0 0-5.33-.612 19.728 19.728 0 0 0-6.795 1.062.5.5 0 0 0 .168.971zm35.6 2.948a.5.5 0 0 0 .208-.046c.81-.373 1.565-.782 2.3-1.178a18.324 18.324 0 0 1 8.719-2.718.5.5 0 0 0-.057-1 19.381 19.381 0 0 0-9.139 2.837c-.716.388-1.458.789-2.237 1.148a.5.5 0 0 0 .209.954zm18.929-3.052a19.413 19.413 0 0 1 2.681 1.165.5.5 0 0 0 .457-.891 20.737 20.737 0 0 0-2.815-1.222.5.5 0 0 0-.323.947zm-28.717 4.656c.328.02.666.034 1.017.043h.013a.5.5 0 0 0 .013-1 26.883 26.883 0 0 1-.981-.041.5.5 0 0 0-.061 1zm-34.925-.516a.516.516 0 0 0 .121-.015c.345-.086.674-.18.992-.28a.5.5 0 1 0-.3-.953q-.448.142-.932.263a.5.5 0 0 0 .12.985zm69.891-1.124c.3.141.619.276.944.4a.486.486 0 0 0 .184.035.5.5 0 0 0 .184-.965c-.308-.122-.6-.25-.893-.383a.5.5 0 0 0-.418.908zm31.973-4.795a24.722 24.722 0 0 0-2.812-.152h-.246a.5.5 0 0 0 .006 1h.239a23.378 23.378 0 0 1 2.7.146h.058a.5.5 0 0 0 .057-1zm4.957 1.286a18.905 18.905 0 0 0-.957-.373.5.5 0 1 0-.337.941c.313.112.614.231.906.354a.5.5 0 0 0 .388-.922zm13.064 4.2a20.357 20.357 0 0 1-4.951-.548.5.5 0 0 0-.241.971 21.357 21.357 0 0 0 5.192.577.5.5 0 1 0 0-1zM78.626 87.193A18.422 18.422 0 0 1 88.8 89.95l.942.506a.5.5 0 0 0 .468-.885l-.934-.5a19.489 19.489 0 0 0-10.649-2.878.5.5 0 0 0 0 1zm116.741.636c-.863.392-1.662.824-2.435 1.242a18.337 18.337 0 0 1-8.572 2.708.5.5 0 0 0 .031 1h.032a19.407 19.407 0 0 0 8.985-2.827c.758-.409 1.542-.833 2.373-1.211a.5.5 0 1 0-.413-.91zm-97.823 4.933c.6.044 1.243.066 1.905.066q.6 0 1.148-.022a.5.5 0 0 0 .479-.521.493.493 0 0 0-.52-.479 26.789 26.789 0 0 1-2.94-.042.493.493 0 0 0-.535.462.5.5 0 0 0 .463.536z" fill="#eaeaee"/>
+  <path d="M93.5 151.647a18.413 18.413 0 0 1 10.172 2.757c.313.17.627.34.945.507a.5.5 0 1 0 .465-.885c-.314-.165-.624-.333-.934-.5a19.486 19.486 0 0 0-10.648-2.879.5.5 0 0 0 0 1zm18.919 5.567c.518.038 1.067.056 1.631.062v-1a24.239 24.239 0 0 1-1.56-.06.5.5 0 0 0-.073 1zm84.386 7.1a17.993 17.993 0 0 1-9.934-2.7 24.348 24.348 0 0 0-4.74-2.115q-.039 1.039-.087 2.073a24.339 24.339 0 0 1 3.875 1.8 19.91 19.91 0 0 0 10.886 2.938 1 1 0 1 0 0-2zm-83.284 0a18 18 0 0 1-9.935-2.7 19.924 19.924 0 0 0-10.887-2.937 19.92 19.92 0 0 0-10.886 2.938 18 18 0 0 1-9.935 2.7 18 18 0 0 1-9.934-2.7 19.92 19.92 0 0 0-10.886-2.937 1 1 0 0 0 0 2 18 18 0 0 1 9.934 2.7 19.92 19.92 0 0 0 10.886 2.938 19.922 19.922 0 0 0 10.887-2.937 19.644 19.644 0 0 1 19.869 0 19.923 19.923 0 0 0 10.887 2.938c.222 0 .432-.006.645-.011q-.027-1-.047-2c-.202.002-.397.007-.603.007z" fill="#eaeaee"/>
+  <path d="M209.235 68.394h-12a.5.5 0 0 1 0-1h12a.5.5 0 0 1 0 1zm45.582-.184h-1.8a.5.5 0 0 1 0-1h1.8a.5.5 0 0 1 0 1zm-10.8 0h-1a.5.5 0 0 1 0-1h1a.5.5 0 0 1 0 1zm-3.491-2.881a.5.5 0 0 1-.39-.187 18.3 18.3 0 0 0-2-2.129.5.5 0 1 1 .668-.744 19.181 19.181 0 0 1 2.109 2.246.5.5 0 0 1-.389.813zm-12.517-.629a.5.5 0 0 1-.466-.32 13.846 13.846 0 0 0-3.855-5.164.5.5 0 1 1 .623-.781 14.475 14.475 0 0 1 3.623 4.438 5.416 5.416 0 0 1 3.107-3.029.5.5 0 0 1 .326.945 5 5 0 0 0-2.867 3.51.5.5 0 0 1-.447.4zm-17.64-2.036h-.051a.5.5 0 0 1-.447-.548 6.448 6.448 0 0 1 1.057-3.035.5.5 0 1 1 .824.566 5.457 5.457 0 0 0-.886 2.57.5.5 0 0 1-.497.444zm4.193-5.039a.5.5 0 0 1-.151-.977 10.123 10.123 0 0 1 1.018-.264.5.5 0 0 1 .2.98 8.89 8.89 0 0 0-.916.236.512.512 0 0 1-.151.022z" fill="#eaeaee"/>
+  <path d="M104.646 204.6H40.958a1 1 0 0 1 0-2h63.688a1 1 0 1 1 0 2z" fill="#eaeaee"/>
+  <path d="M209.627 204.6h-21.586a1 1 0 0 1 0-2h21.587a1 1 0 0 1 0 2z" fill="#eaeaee"/>
+  <path d="M264.9 204.6h-22.368a1 1 0 0 1 0-2H264.9a1 1 0 0 1 0 2z" fill="#eaeaee"/>
+  <path d="M212.21 123.577a.479.479 0 0 0 .167-.029 18.777 18.777 0 0 1 6.456-1 .5.5 0 0 0 0-1 19.725 19.725 0 0 0-6.791 1.06.5.5 0 0 0 .167.971zm-9.118 4.039a.516.516 0 0 0 .121-.015c.345-.086.674-.18.992-.28a.5.5 0 1 0-.3-.953q-.448.142-.932.263a.5.5 0 0 0 .12.985zm19.345-4.964h.025a30.515 30.515 0 0 0 5.356-.79c.881.714 2.644.916 5.336.616 6.261-.7 9.575-3.264 9.712-3.372a.5.5 0 0 0-.619-.785 19.464 19.464 0 0 1-9.2 3.163 11.451 11.451 0 0 1-3.737-.029c2-.621 3.758-1.488 4.548-2.629.952-1.375.377-2.176.086-2.457-.88-.846-2.82-.664-4.236.4-1.065.8-2.892 2.667-2.476 4.2a29.559 29.559 0 0 1-4.815.685.5.5 0 0 0 .024 1zm7.867-5.087a3.514 3.514 0 0 1 2.051-.735 1.319 1.319 0 0 1 .892.259c.31.3 0 .859-.214 1.168-.734 1.06-2.664 1.894-4.832 2.473-.234-.777.881-2.248 2.099-3.165zm-34.2 10.55c.6.044 1.242.066 1.9.066q.6 0 1.15-.022a.5.5 0 0 0 .479-.521.5.5 0 0 0-.52-.479 26.784 26.784 0 0 1-2.94-.042.494.494 0 0 0-.535.462.5.5 0 0 0 .468.536zm65.04.63a19.926 19.926 0 0 0-10.888 2.938 19.646 19.646 0 0 1-19.87 0 21.646 21.646 0 0 0-21.775 0 19.648 19.648 0 0 1-19.871 0 27.517 27.517 0 0 0-3.86-1.825 8.043 8.043 0 0 1-1.24 1.6l-.067.067a23.017 23.017 0 0 1 4.215 1.913 21.646 21.646 0 0 0 21.775 0 19.648 19.648 0 0 1 19.871 0 21.644 21.644 0 0 0 21.774 0 18 18 0 0 1 9.936-2.7 1 1 0 0 0 0-2zm-15.1 13.382q-.448.142-.932.263a.5.5 0 0 0 .12.985.516.516 0 0 0 .121-.015c.345-.086.674-.18.992-.28a.5.5 0 1 0-.3-.953zM187.36 125.3c.313.17.626.34.944.507a.5.5 0 0 0 .466-.885c-.313-.165-.624-.333-.936-.5a30.785 30.785 0 0 0-3.129-1.539 7.669 7.669 0 0 1 .688 1.4c.675.317 1.317.669 1.967 1.017zm53.9 17.615a26.531 26.531 0 0 1-2.94-.042.5.5 0 0 0-.073 1c.6.044 1.241.066 1.9.066q.6 0 1.152-.022a.5.5 0 0 0 .479-.521.517.517 0 0 0-.52-.477zm19.709-5.611a19.715 19.715 0 0 0-6.786 1.058.5.5 0 0 0 .167.971.479.479 0 0 0 .167-.029 18.767 18.767 0 0 1 6.451-1 .5.5 0 0 0 0-1zm-30.059 3.378c-.314-.165-.624-.333-.934-.5a19.5 19.5 0 0 0-10.648-2.877.5.5 0 0 0 0 1 18.429 18.429 0 0 1 10.172 2.756c.313.17.627.34.945.507a.5.5 0 1 0 .465-.885z" fill="#eaeaee"/>
+  <path d="M186.068 174.772c1.01-10.949 1.759-25.609.451-38.9l.514-.514c5.006-5.033 4.911-12.421-.216-17.577a12.97 12.97 0 0 0-17.732-.631l-4.1-1.107s.429-2.85-.321-3.725a2.606 2.606 0 0 0-1.935-.82s.81-4.055-1.065-5.555c-2.071-1.656-7.945 3-7.945 3-3.551 1.84-9.684 4.594-12.2 4.956-2.875.413-9.386 2.182-15.237 3.867l-.414-.417a12.97 12.97 0 0 0-18.4 0 13.094 13.094 0 0 0 0 18.425l1.835 1.845a281.627 281.627 0 0 0-.386 35.906 21.818 21.818 0 0 0-5.216 17.689c.914 6.436 4.8 9.96 8.711 12.237a45.905 45.905 0 0 0 2.483 7.891 48.514 48.514 0 0 0 1.584 5.944c2.971 8.511 6.707 12.826 11.1 12.826a6.214 6.214 0 0 0 3.926-1.4c1.7-1.391 2.456-3.106 2.576-9.037 4.45.407 9.479.63 14.506.63 3.466 0 7.989-.107 12.491-.521-.062 5.242.283 7.251 2.332 8.929a6.041 6.041 0 0 0 3.818 1.358c5.994 0 9.9-8.623 11.693-13.763a54.51 54.51 0 0 0 2.272-9.4 22.5 22.5 0 0 0 .282-1.662c5.6-3.181 9.206-8.133 10.03-13.929a18.73 18.73 0 0 0-5.437-16.545z" fill="#fff"/>
+  <path d="M180.923 176.649c1.356-13.432 2.047-29.548.435-42.9l2.282-2.282c3.039-3.056 2.813-7.153-.227-10.209a7.753 7.753 0 0 0-11.006 0l-1.5 1.506-10.849-2.927V116.9l-5.485.652 1.837-4.185s-9.323 4.837-13.862 5.489c-3.256.468-12.518 3.116-17.495 4.577l-2.6-2.612a7.753 7.753 0 0 0-11.006 0 7.856 7.856 0 0 0 0 11.067l3.588 3.608c-1 8.19-1.392 24.339-.5 39.878a16.356 16.356 0 0 0-5.384 14.9c.691 4.861 3.718 7.353 8.133 9.5a43.736 43.736 0 0 0 2.876 9.68 46.786 46.786 0 0 0 1.529 5.906c2.594 7.432 5.5 10.17 6.8 9.108.621-.509.764-5.158.623-10.882 10.036 1.55 27.191 1.879 37.611.037-.141 5.711-.339 10.337.281 10.845 1.3 1.062 4.686-2.654 7.28-10.086a49.724 49.724 0 0 0 2.075-8.686c.24-1.009.389-2.865.65-4.129 4.971-2.094 8.871-5.932 9.619-11.195 1.06-7.448-2.858-11.281-5.705-13.723z" fill="url(#a)"/>
+  <g fill="#f9f9fa">
+    <path d="M157.681 202.625c-7.81-1.785-7.984-6.013-7.316-8.5l-5.042-.149c.345 2.51-.575 6.011-7.5 7.594a37.408 37.408 0 0 1-10.215.863c9.456 9.453 32.143 9.571 41.307.752a33.732 33.732 0 0 1-11.234-.56z"/>
+    <path d="M174.91 164.318a9.715 9.715 0 0 0 2.452-3.815c.485-10.321.055-20.871-2.338-29.052-2.232-7.632-28.394-17.552-50.949-2.609-4.418 2.927-5.452 17.609-4.682 33.059a13.622 13.622 0 0 0 1.968 2.818c2.466 2.659.879 4.441-1.338 6.078a179.491 179.491 0 0 0 2.655 18.852 16.685 16.685 0 0 0 4.478 1.311l-.076-24.062 17.388.691 2.177-5.053h6.114l2.011 5.434 15.319.637-.706 23.843a20.118 20.118 0 0 0 4.39-1.865c.9-4.84 1.941-11.371 2.7-18.563-2.273-2.035-4.473-5.278-1.563-7.704z"/>
+  </g>
+  <g fill="url(#b)">
+    <path d="M128.086 142.316a1.412 1.412 0 0 0 1.411-1.41v-3.162a1.41 1.41 0 1 0-2.821 0v3.162a1.412 1.412 0 0 0 1.41 1.41z"/>
+    <path d="M163.123 142.316a1.412 1.412 0 0 0 1.411-1.41v-3.162a1.41 1.41 0 1 0-2.821 0v3.162a1.412 1.412 0 0 0 1.41 1.41z"/>
+    <path d="M167.475 144.641a1 1 0 0 0-1.383.28 3.677 3.677 0 0 1-5.937 0 1 1 0 0 0-1.675 1.093 5.674 5.674 0 0 0 9.287 0 1 1 0 0 0-.292-1.373z"/>
+    <path d="M132.434 144.633a1 1 0 0 0-1.383.295 3.758 3.758 0 0 1-2.965 1.5 3.709 3.709 0 0 1-2.968-1.506 1 1 0 0 0-1.675 1.093 5.674 5.674 0 0 0 9.287 0 1 1 0 0 0-.296-1.382z"/>
+    <path d="M156.383 149.1a3.079 3.079 0 0 1-2.589-.454 5.065 5.065 0 0 1-1.237-1.437 14.022 14.022 0 0 0 4.227-4.094 2.611 2.611 0 0 0 .316-2.192 1.475 1.475 0 0 0-1.215-.9c-2.294-.468-9.138 1.038-12.121 4.226a1.236 1.236 0 0 0-.175 1.476c.667 1.18 4.491 2.1 6.339 2.316a7.2 7.2 0 0 1-.174 1.908 4.738 4.738 0 0 1-3.063 3.2 1 1 0 0 0 .563 1.919 6.765 6.765 0 0 0 4.441-4.631 7.768 7.768 0 0 0 .161-.853 4.526 4.526 0 0 0 .864.75 5.069 5.069 0 0 0 4.408.626 1 1 0 0 0-.743-1.857z"/>
+    <path stroke="#59acff" stroke-linecap="round" stroke-linejoin="round" d="M116.035 173.443l-4.139 3.327"/>
+    <path d="M125.989 190.92h-.029c-4.94-.28-6.414-3.149-6.474-3.271a.5.5 0 0 1 .9-.445c.055.105 1.317 2.473 5.636 2.719a.5.5 0 0 1-.028 1z"/>
+    <path d="M169.551 192.631a4.541 4.541 0 0 1-.563-.035.5.5 0 1 1 .124-.992c3.16.386 6.822-3.654 6.858-3.7a.5.5 0 0 1 .746.666c-.154.178-3.658 4.061-7.165 4.061z"/>
+    <path d="M183.016 175.823c1.106-11.346 2.011-27.289.441-41.342l1.6-1.6c3.752-3.772 3.659-9.13-.223-13.034a9.753 9.753 0 0 0-13.842 0l-.68.683-8.249-2.225v-1.4a2 2 0 0 0-2.236-1.986l-2.011.239.431-.982a2 2 0 0 0-2.752-2.579c-2.511 1.3-9.781 4.79-13.226 5.284-3.123.449-11.319 2.756-16.631 4.3l-1.759-1.769a9.752 9.752 0 0 0-13.842 0 9.869 9.869 0 0 0 0 13.888l2.909 2.925c-.839 7.717-1.311 22.481-.456 38.32a18.247 18.247 0 0 0-5.315 16.012c.785 5.528 4.3 8.4 7.952 10.359a.973.973 0 0 0 .379.315l.044.018a44.416 44.416 0 0 0 2.707 8.865 47.481 47.481 0 0 0 1.548 5.908c1.391 3.985 4.288 10.669 8.067 10.669a2.948 2.948 0 0 0 1.888-.672c.741-.607 1.506-1.232 1.4-10.127a149.239 149.239 0 0 0 17.72.992 122.747 122.747 0 0 0 15.786-.912c-.187 7.245-.156 9.04 1.075 10.048a2.777 2.777 0 0 0 1.78.631c3.395 0 6.7-6 8.655-11.606a51.053 51.053 0 0 0 2.149-8.956c.138-.606.239-1.364.346-2.163.043-.324.087-.653.133-.968a21.447 21.447 0 0 0 2.278-1.27c.384-.2.763-.42 1.127-.66a.978.978 0 0 0 .307-.341 15.378 15.378 0 0 0 6.094-10.03 15.622 15.622 0 0 0-5.594-14.834zm3.615 14.554a13.725 13.725 0 0 1-6.578 9.6c-4.748 2.479-11.193 2.162-11.262 2.162a1 1 0 0 0-.111 2c.065 0 .426.022 1 .022a30.255 30.255 0 0 0 7.052-.837c-.121.893-.231 1.788-.373 2.385a49.721 49.721 0 0 1-2.075 8.686c-2.3 6.6-5.231 10.265-6.767 10.265a.788.788 0 0 1-.513-.178c-.588-.481-.44-4.669-.3-9.971a92.144 92.144 0 0 0 3.713-.719.5.5 0 1 0-.213-.977 95.1 95.1 0 0 1-10.957 1.71c-3.286.248-6.816.369-10.368.369-3.15 0-6.3-.1-9.3-.267a93.424 93.424 0 0 1-15-2.351.5.5 0 0 0-.265.965c.06.016 1.8.483 4.818 1.03.114 5.411-.04 9.722-.637 10.211a.956.956 0 0 1-.621.22c-1.47 0-3.942-2.918-6.179-9.328a46.793 46.793 0 0 1-1.529-5.906 37.051 37.051 0 0 1-2.391-7.444 43.727 43.727 0 0 0 9.71 1.22h.005a1 1 0 0 0 .005-2c-.065 0-6.126-.055-10.213-1.46-4.41-2.147-7.435-4.639-8.125-9.5a16.356 16.356 0 0 1 5.384-14.9c-.888-15.538-.5-31.687.5-39.878l-3.588-3.608a7.856 7.856 0 0 1 0-11.067 7.752 7.752 0 0 1 11.006 0l1.839 1.849c-6.694 2.774-7.5 6.758-7.537 6.949a.5.5 0 0 0 .983.183c.008-.043.855-3.866 7.552-6.438 5.027-1.473 14.049-4.046 17.255-4.507 4.54-.652 13.862-5.489 13.862-5.489l-1.837 4.185 5.485-.652v2.935l10.7 2.888c5.988 2.057 5.959 4.674 5.957 4.737a.5.5 0 0 0 .448.538h.05a.5.5 0 0 0 .5-.45c.014-.139.235-3.223-6.035-5.565l.726-.73a7.753 7.753 0 0 1 11.006 0c3.039 3.056 3.266 7.154.227 10.209l-2.282 2.282c1.562 12.943.959 28.472-.314 41.645l-3.794-3.566a.5.5 0 1 0-.685.729l4.357 4.1.01.009 1.883 1.77c.011.01.025.014.037.024a13.352 13.352 0 0 1 3.779 11.911z"/>
+    <path d="M168.257 240.857h-.01l-48.258-.979a.5.5 0 0 1-.263-.919l8.478-5.543a.449.449 0 0 1 .3-.08c28.881 1.809 32.47.4 32.853.169a.5.5 0 0 1 .729-.023L168.61 240a.5.5 0 0 1-.354.854z"/>
+    <path d="M147.391 237.905c-4.526 0-12.919-.456-20.082-3.389-9.543-3.907-13.037-8.2-13.719-9.141a.5.5 0 0 1 0-.9l12.716-6.2a.493.493 0 0 1 .449.006.5.5 0 0 1 .263.363c.011.068 1.141 6.818 5.027 9.79 5.259 4.022 11.862 1.9 11.929 1.88a.5.5 0 0 1 .511.121L151 236.96a.5.5 0 0 1-.315.853c-.038.002-1.285.092-3.294.092z"/>
+    <path d="M164.795 253.513c-2.23 0-3.545-.125-3.574-.127a.5.5 0 0 1-.373-.229l-8.561-13.457a.5.5 0 0 1 .4-.769c.109 0 11.008-.447 18.976-4.033 7.87-3.541 10.335-8.282 10.359-8.33a.5.5 0 0 1 .382-.271.5.5 0 0 1 .438.163l13.047 14.678a.5.5 0 0 1 .006.657 36.427 36.427 0 0 1-19.868 10.769 69.143 69.143 0 0 1-11.232.949z"/>
+    <path d="M148.408 251.333l-48.267-.189a.5.5 0 0 1-.343-.862l6.677-6.361a.5.5 0 0 1 .728.041c.378.239 3.928 1.74 32.847.626a.542.542 0 0 1 .3.088l8.341 5.746a.5.5 0 0 1-.284.912z"/>
+    <path d="M226.286 234.554h-.027c-.12-.006-12.14-.7-21.877-4.159-9.865-3.507-14.313-8.4-15.115-9.353a.5.5 0 0 1-.045-.909l9.663-5a.5.5 0 0 1 .635.151c.042.058 4.181 5.759 8.169 8.808 5.376 4.112 15.307 5.541 15.406 5.555a.505.505 0 0 1 .315.175l3.26 3.913a.5.5 0 0 1-.384.82z"/>
+    <path d="M209.79 213.262a.5.5 0 0 1-.408-.788l5.322-7.532a.5.5 0 0 1 .277-.194 24.254 24.254 0 0 0 10.284-6.463 23.325 23.325 0 0 0 4.677-8.068.5.5 0 0 1 .619-.339l13.582 3.951a.5.5 0 0 1 .148.89c-.513 1.044-3.23 5.865-11.973 11.332-9.476 5.926-22.353 7.2-22.482 7.21z"/>
+    <path d="M144.443 167.645l-.217 8.151 1.304-.543.87 1.087 1.087-.979.978 1.196.978-1.196 1.087 1.305.869-1.196.979 1.304.978-1.521 1.413.652v-7.934l-10.326-.326z"/>
+    <path d="M165.622 173.79l-2.857-2.5a.5.5 0 0 0-.65-.007l-2.643 2.214a.5.5 0 0 0 .239.876l1.283.214-.058 1.921a.5.5 0 0 0 .457.513l1.643.144h.043a.5.5 0 0 0 .5-.5v-1.832l1.762-.17a.5.5 0 0 0 .281-.874z"/>
+    <path d="M169.732 172.623a.524.524 0 0 0-.519.481l-.8 21.024-40.759-1.183-.159-15.1a.5.5 0 0 0-.5-.5h-.005a.5.5 0 0 0-.495.5l.164 15.582c0 .015.007.027.009.041a.5.5 0 0 0 .289.569l13.975 6.062a22.293 22.293 0 0 1-6.079 1.544.5.5 0 0 0 .05 1h.051c.194-.02 4.631-.49 7.136-2.035l2.022.877a.5.5 0 0 0 .7-.433l.35-6.6 6.365.185a14.875 14.875 0 0 1-2.8 4.539 24.216 24.216 0 0 1-10.479 6.371.5.5 0 0 0-.342.292l-3.56 8.508a.5.5 0 0 0 .461.693.492.492 0 0 0 .154-.024 64.014 64.014 0 0 0 17.133-9.089l1.849 4.061a.5.5 0 0 0 .374.286.46.46 0 0 0 .082.007.5.5 0 0 0 .364-.157l14.088-14.968s0-.012.009-.017h.044a.5.5 0 0 0 .5-.481l.815-21.52a.5.5 0 0 0-.487-.515z"/>
+    <path d="M170.579 168.566a.439.439 0 0 0-.054-.187.471.471 0 0 0-.049-.078.485.485 0 0 0-.074-.073c-.014-.012-.022-.028-.038-.038l-8.958-5.92a.5.5 0 0 0-.261-.083l-25.205-.746c-.011 0-.021.005-.032.006a.488.488 0 0 0-.115.021 17.081 17.081 0 0 0-.113.036l-8.846 4.957c-.01.006-.013.018-.022.024a.494.494 0 0 0-.189.208.5.5 0 0 0-.042.2l-.08 7.691a.5.5 0 0 0 .495.5H127a.5.5 0 0 0 .5-.5l.075-7.174 14.4.657H142a.5.5 0 0 0 .022-1l-13.17-.6 7.2-4.033 24.924.737 7.375 4.874-11.173-.325a.514.514 0 0 0-.515.485.5.5 0 0 0 .485.515l12.929.376h.015a.49.49 0 0 0 .214-.053.481.481 0 0 0 .05-.033.488.488 0 0 0 .124-.113c.008-.01.021-.015.029-.026s.008-.024.014-.035a.621.621 0 0 0 .06-.187c0-.013.008-.024.009-.038a.475.475 0 0 0-.013-.045z"/>
+    <path d="M169.876 169.851a.5.5 0 0 0-.5.5v.815a.5.5 0 1 0 1 0v-.815a.5.5 0 0 0-.5-.5z"/>
+  </g>
+  <g fill="#fff">
+    <path d="M161.635 234.443c-1.483.6-5.74.859-12.372.777l1.737 1.74a.5.5 0 0 1-.315.853c-.04 0-1.287.093-3.3.093-4.39 0-12.412-.436-19.426-3.137l-6.338 4.144 45.4.92z"/>
+    <path d="M114.627 225.078c1.019 1.253 4.62 5.057 13.061 8.513 8.37 3.426 18.489 3.393 21.81 3.279l-5.512-5.512c-1.421.4-7.462 1.769-12.552-2.125-3.5-2.678-4.888-7.92-5.281-9.77z"/>
+    <path d="M190.3 220.7c1.248 1.357 5.686 5.649 14.414 8.753 7.842 2.788 17.2 3.754 20.433 4.018l-2.385-2.862c-1.471-.224-10.457-1.726-15.683-5.722a49.522 49.522 0 0 1-8.117-8.669z"/>
+    <path d="M215.419 205.661l-4.57 6.469c3.292-.446 13.271-2.132 20.939-6.928 7.762-4.854 10.646-9.2 11.432-10.6l-12.474-3.629a24.19 24.19 0 0 1-4.746 7.985 24.936 24.936 0 0 1-10.581 6.703z"/>
+    <path d="M152.6 194.682a14.244 14.244 0 0 1-3.155 5.187 25.007 25.007 0 0 1-10.718 6.586L135.7 213.7c3.117-1.151 12.491-4.964 18.936-11.311a40.684 40.684 0 0 0 6.307-7.457z"/>
+    <path d="M101.386 250.148l45.406.178-6.872-4.733c-18.61.709-30.359.451-33.017-.7z"/>
+    <path d="M182.553 227.638c-.948 1.463-3.872 5.2-10.477 8.174a38.538 38.538 0 0 1-5.678 1.98L168.61 240a.5.5 0 0 1-.354.854h-.01l-14.223-.288 7.535 11.841a63.477 63.477 0 0 0 14.307-.831 35.459 35.459 0 0 0 18.979-10.112z"/>
+  </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/error-tab-crashed.svg b/waterfox/browser/themes/lepton/icons/error-tab-crashed.svg
new file mode 100644
index 0000000000000..9c7ac2dd204c2
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/error-tab-crashed.svg
@@ -0,0 +1,64 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" width="300" height="300" viewBox="0 0 300 300">
+  <defs>
+    <rect id="illustration-usage-1-a" width="16" height="16" rx="2"/>
+    <rect id="illustration-usage-1-b" width="16" height="16" rx="2"/>
+    <rect id="illustration-usage-1-c" width="16" height="16" rx="2"/>
+    <rect id="illustration-usage-1-d" width="150" height="30" x="406" y="385"/>
+    <rect id="illustration-usage-1-e" width="150" height="30" x="564" y="385"/>
+  </defs>
+  <path fill="#EAEAEE" d="M59.8388643,181.070107 C59.8388643,181.070107 40.4816406,187.552765 42.0955938,189.749578 C43.7086184,191.945453 92.6045291,195.022302 116.407089,193.265977 C118.818732,193.087908 137.59835,201.695214 142.733656,200.954821 C148.067688,200.186311 153.653378,195.567757 157.755122,190.737394 C158.735752,189.583692 190.631293,183.380321 192.781993,181.183509 C194.933621,178.986696 180.669914,176.894851 171.525727,176.345648 C170.594315,176.289416 167.902226,172.913597 165.250997,173.001695 C163.721548,173.052304 159.52137,183.660546 157.527608,183.750518 C155.650854,183.836741 156.005589,173.401882 153.784314,173.517158 C122.376301,175.149772 59.8388643,181.070107 59.8388643,181.070107"/>
+  <path fill="#FFF" d="M106.156703,129.386294 L106.165983,129.47668 C106.155775,129.481339 106.145567,129.484134 106.136287,129.488793 C106.142783,129.454316 106.149279,129.419839 106.156703,129.386294 M195.616184,170.444461 C195.123424,169.132479 194.217712,168.050652 193.039173,167.351797 C192.132533,166.483354 191.095047,166.034224 190.381428,165.724864 C190.102105,165.604661 189.871037,165.50589 189.627905,165.383823 C189.113802,165.128508 188.568148,164.955192 188.012286,164.869466 C187.509318,164.028977 186.75858,163.345963 185.853796,162.935969 L183.110676,161.710644 C182.871256,161.604418 182.6207,161.515896 182.368289,161.449738 L179.871085,160.794679 C179.22892,160.609249 178.470758,160.407979 177.731155,160.226277 C177.357177,160.127505 176.895969,160.069734 176.441257,160.069734 C176.113679,160.069734 175.783317,160.099551 175.460379,160.159187 L172.600333,160.678203 C171.74566,159.563763 170.476178,158.803409 169.046155,158.600275 C167.945567,158.446528 166.806003,158.30862 165.675719,158.187485 C169.519427,155.08364 170.682191,150.66222 170.744366,148.481794 C170.872427,145.197178 168.281497,142.382192 164.967667,142.234035 C164.907348,142.23124 164.751447,142.227513 164.692056,142.227513 C163.442062,142.227513 162.260739,142.612348 161.278004,143.292567 C160.784317,143.07732 160.238663,142.953389 159.660529,142.936617 C159.638257,142.936617 159.579794,142.935685 159.557523,142.935685 C159.506483,142.935685 159.455444,142.936617 159.403477,142.938481 C157.09651,143.037252 155.28787,144.989386 155.350045,147.301196 C155.348189,147.464262 155.317565,147.825803 155.219199,148.20598 L151.118439,149.286875 C151.091528,149.261716 151.070184,149.242148 151.057192,149.229103 C150.584849,148.78929 150.048474,148.438931 149.471268,148.191071 C145.550537,143.529246 140.923611,138.947556 136.336587,135.18865 C133.321568,128.635259 128.300249,124.455177 127.723043,123.989274 C126.750516,123.208421 125.541353,122.781654 124.309919,122.781654 C123.733641,122.781654 123.163859,122.872971 122.616349,123.053741 C121.141783,123.541075 119.966956,124.614516 119.346134,126.003839 C116.111183,124.088046 113.486846,123.238238 113.140708,123.130149 C112.626605,122.967083 112.078166,122.88322 111.522304,122.88322 C110.274166,122.88322 109.052012,123.320237 108.082269,124.113204 C107.563526,124.537176 107.135725,125.044078 106.810003,125.606889 C107.050351,123.836458 106.993744,123.184194 106.952913,122.700586 C106.656886,119.246382 104.029764,116.29442 101.87777,114.427081 C101.467601,114.071131 101.008249,113.790658 100.514562,113.592183 C100.17956,113.165416 99.7721751,112.797352 99.3063273,112.501038 C97.2935307,111.220737 95.4217877,110.538655 93.7365694,110.470633 C92.8596248,107.967802 92.0912543,107.055564 90.9906657,106.289619 C89.7434557,105.422108 88.2364102,105 86.3869388,105 C82.7418189,105 73.250402,107.619307 71.4139224,112.700445 C70.9731301,113.919247 70.755054,115.254525 71.8695623,119.378698 C71.547552,119.326517 71.2320376,119.307881 70.9090993,119.307881 C70.3365333,119.307881 69.7778872,119.399198 69.2442966,119.5809 C67.2055165,120.274164 65.6455759,121.976573 64.4735326,124.785968 C63.4397588,127.26364 61.9299293,132.874976 63.6160757,136.373907 C64.2860799,137.764162 64.9792837,139.200075 79.6005942,147.510853 C79.2646641,148.127708 78.9500777,148.774381 78.6577628,149.447145 L76.2663489,149.447145 L72.2036365,148.375568 C72.0449513,147.951597 71.9790644,147.475444 71.9707126,147.22572 C71.9948401,144.912977 70.1555765,142.994389 67.8430412,142.936617 C67.8226256,142.935685 67.7725145,142.935685 67.7520988,142.935685 C67.0542551,142.935685 66.3990987,143.098751 65.8209648,143.390406 C64.8159585,142.658939 63.5854522,142.223785 62.2751393,142.223785 L62.1145981,142.226581 C60.4581472,142.28808 58.9538857,142.977616 57.8542251,144.168464 C56.7545645,145.360244 56.1829265,146.910769 56.2469574,148.533044 C56.3471796,152.100929 59.3454948,161.353762 71.7582043,161.591373 C70.812589,161.808483 69.8660456,162.045162 68.9195023,162.299545 C67.5980535,162.657359 66.4807612,163.493189 65.7587899,164.609492 L63.6105077,164.423131 C63.48523,164.411949 63.2745777,164.403563 63.1474439,164.403563 C62.4876475,164.403563 61.8417709,164.520971 61.2293017,164.752059 C58.9891491,165.596275 56.8974739,166.521558 55.0099552,167.499954 C53.5947801,168.24074 52.5860618,169.55645 52.2176523,171.072499 L51.3796831,171.168475 C50.0693702,171.204815 48.2069069,171.279359 46.6181989,172.233529 C46.3156762,172.308073 46.0187215,172.404981 45.7301185,172.525184 C42.6436449,173.820394 41.1811426,177.385484 42.4664,180.475353 C43.6662829,183.371406 46.7564685,185.172587 52.7976421,186.495751 C55.0415066,186.987745 57.8468012,187.408921 61.1374313,187.747167 C67.9005762,188.671518 76.605991,189.349873 87.7492188,189.821367 C92.2610753,190.012387 96.8685142,190.109295 101.443474,190.109295 C104.250624,190.109295 107.071695,190.072023 109.828734,190.000273 C114.493708,189.938774 118.531365,189.784094 121.269845,189.562325 C124.343327,190.676765 127.286891,191.567571 130.026298,192.212381 C132.436272,192.777987 134.783143,193.158164 137.015871,193.347321 C140.25639,196.426008 142.004712,196.903092 143.056117,196.984159 C143.166547,196.992546 143.353072,197 143.46443,197 C146.721653,197 150.534737,193.63059 152.52619,190.930216 C154.657769,189.936911 156.523944,188.624928 158.092236,187.017563 C161.020953,186.331753 166.074752,185.137178 171.30394,183.845695 C176.15451,182.942775 180.941978,181.790131 185.535497,180.420376 C189.467364,179.246301 191.97756,178.299586 192.08335,178.259518 C195.197663,177.082647 196.783587,173.577193 195.616184,170.444461"/>
+  <path stroke="#EAEAEE" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M123 80L196 80M34 55L72 55"/>
+  <path stroke="#EAEAEE" stroke-dasharray="12 8 3 4 1 9" stroke-linecap="round" stroke-linejoin="round" d="M42,50 L53,50"/>
+  <path stroke="#EAEAEE" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3,114 L67,114"/>
+  <path stroke="#EAEAEE" stroke-dasharray="12 8 3 4 1 9" stroke-linecap="round" stroke-linejoin="round" d="M26 109L57 109M154 74L190 74"/>
+  <path fill="#FFF" d="M169.009232,0.096 L169.054232,0 C168.996232,0.021 168.991232,0.055 169.009232,0.096"/>
+  <path stroke="#EAEAEE" stroke-dasharray="12 8 3 4 1 9" stroke-linecap="round" stroke-linejoin="round" d="M100,86 L210,86"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M165,149 C165,149 164.716894,156 154.817665,156 L137,156"/>
+  <path stroke="#FFD700" stroke-linecap="round" stroke-linejoin="round" d="M158.997865,148 C158.997865,148 159.144841,151.020034 157,153"/>
+  <path fill="#F9F9FA" d="M101.989051,123.117928 C101.855464,121.59559 100.334262,119.693126 98.5176631,118.156982 L97.1827308,120.166211 L96.4893939,116.676061 C94.8825833,115.681111 93.3425663,115.144518 92.5325757,115.536608 C91.8477055,115.869792 91.6501469,119.221883 91.7000069,123.603899 C90.2681768,116.825166 88.8071833,111.053348 87.8720722,110.420114 C85.4853751,108.802974 76.233984,112.221334 75.4061191,114.450538 C74.855777,115.93422 78.1107915,124.967008 81.5144455,133.557085 C76.3544007,128.562084 71.1407329,123.847804 70.1576433,124.173625 C68.1086775,124.852879 66.274204,132.091811 67.2873978,134.140618 C68.0447061,135.668479 80.3751904,142.480346 86.5917037,145.842561 C87.6481723,148.283457 88.3781987,149.874826 88.5004969,150 L95.1949141,147.405397 L96.4677565,147.885845 C96.4677565,147.885845 102.285389,126.481984 101.989051,123.117928"/>
+  <path fill="#F9F9FA" d="M186.825264,170.467863 L180.233223,171.248873 L182.936914,168.034893 C181.22893,167.26765 178.982801,166.498571 176.06978,165.793734 L164.976217,167.777922 L167.910542,164.290451 C163.054272,163.617736 156.411287,163.185473 152.758201,163.073507 C155.005257,168.368039 156.644699,172.950392 155.815716,175.294339 C155.214587,176.998611 156.035234,178.919473 154.423579,180.635676 C155.508204,178.634969 155.887036,176.64344 156.100071,175.307188 C157.592242,165.958013 144.123803,149.093338 131.484349,139.212783 C129.020553,133.044548 123.922535,129 123.922535,129 L122.587825,133.874199 C121.423543,133.415322 120.122177,133.168445 118.726335,133.097778 C114.907453,130.278433 111.130251,129.099118 111.130251,129.099118 L111.649871,133.973317 C93.6613871,138.00777 85.973605,147.476253 83.4857276,154.900895 C83.1337568,155.950807 83.0096408,156.941065 83.1550603,157.842301 C83.3403081,158.98766 84.2711781,160.454233 85.7661275,162.113535 C90.0592444,162.30351 94.6830285,163.0111 99.5735693,164.539163 C107.403066,166.985899 112.499232,170.256779 115.560451,173.222965 C112.97254,171.689396 109.785352,170.151237 105.931272,168.738812 C91.4680536,163.437856 78.1394772,165.630374 69.9218866,167.810043 L73.1868783,170.962533 L62.7342735,170.068639 C60.5659484,170.875346 58.698651,171.704997 57.0999628,172.523635 L61.9571591,175.537544 L51.3248639,176.737051 C46.8844751,176.853606 50.2096724,177.536416 49.994785,177.917284 C49.6113221,178.597341 49.8447343,179.376515 50.6588982,179.7427 C61.3625138,184.563669 109.375955,185.304298 121.60879,184.014851 C124.759855,185.188661 127.884058,186.16607 130.881367,186.860811 C143.712553,189.832503 150.103601,186.50564 153.244477,182.444572 C163.399759,179.817038 188.121073,172.814564 188.8704,171.96564 C189.389093,171.379194 188.278533,171.182795 186.825264,170.467863"/>
+  <path stroke="#F9F9FA" stroke-linecap="round" stroke-linejoin="round" d="M186.825264,170.467863 L180.233223,171.248873 L182.936914,168.034893 C181.22893,167.26765 178.982801,166.498571 176.06978,165.793734 L164.976217,167.777922 L167.910542,164.290451 C163.054272,163.617736 156.411287,163.185473 152.758201,163.073507 C155.005257,168.368039 156.644699,172.950392 155.815716,175.294339 C155.214587,176.998611 156.035234,178.919473 154.423579,180.635676 C155.508204,178.634969 155.887036,176.64344 156.100071,175.307188 C157.592242,165.958013 144.123803,149.093338 131.484349,139.212783 C129.020553,133.044548 123.922535,129 123.922535,129 L122.587825,133.874199 C121.423543,133.415322 120.122177,133.168445 118.726335,133.097778 C114.907453,130.278433 111.130251,129.099118 111.130251,129.099118 L111.649871,133.973317 C93.6613871,138.00777 85.973605,147.476253 83.4857276,154.900895 C83.1337568,155.950807 83.0096408,156.941065 83.1550603,157.842301 C83.3403081,158.98766 84.2711781,160.454233 85.7661275,162.113535 C90.0592444,162.30351 94.6830285,163.0111 99.5735693,164.539163 C107.403066,166.985899 112.499232,170.256779 115.560451,173.222965 C112.97254,171.689396 109.785352,170.151237 105.931272,168.738812 C91.4680536,163.437856 78.1394772,165.630374 69.9218866,167.810043 L73.1868783,170.962533 L62.7342735,170.068639 C60.5659484,170.875346 58.698651,171.704997 57.0999628,172.523635 L61.9571591,175.537544 L51.3248639,176.737051 C46.8844751,176.853606 50.2096724,177.536416 49.994785,177.917284 C49.6113221,178.597341 49.8447343,179.376515 50.6588982,179.7427 C61.3625138,184.563669 109.375955,185.304298 121.60879,184.014851 C124.759855,185.188661 127.884058,186.16607 130.881367,186.860811 C143.712553,189.832503 150.103601,186.50564 153.244477,182.444572 C163.399759,179.817038 188.121073,172.814564 188.8704,171.96564 C189.389093,171.379194 188.278533,171.182795 186.825264,170.467863 Z"/>
+  <path fill="#D9ECFF" d="M137.10333,186.101824 C136.121518,187.30877 142.438095,192.932084 143.295262,192.998378 C144.571426,193.09782 150.426819,188.604433 149.975224,184.950449 C149.732648,182.991843 140.98743,181.333511 137.10333,186.101824"/>
+  <path fill="#59ACFF" d="M131.499491 172C132.326845 172 133 172.634799 133 173.415009L133 176.585994C133 177.366204 132.326845 178 131.499491 178 130.6732 178 130.000045 177.366204 130.000045 176.585994L130.000045 173.415009C129.993664 172.634799 130.66682 172 131.499491 172M151.499468 172C152.326834 172 153 172.634799 153 173.415009L153 176.585994C153 177.366204 152.326834 178 151.499468 178 150.673166 178 150 177.366204 150 176.585994L150 173.415009C150 172.634799 150.666785 172 151.499468 172"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M62,149 C62,149 62.2831056,156 72.1823346,156 L90,156"/>
+  <path stroke="#FFD700" stroke-linecap="round" stroke-linejoin="round" d="M67.0005792,148 C67.0005792,148 66.9098355,151.019506 69,153"/>
+  <path fill="#59ACFF" d="M163.942231 116.737967C163.803341 116.33323 163.432332 116.038222 162.987122 115.977062L160.619327 115.651474 159.561478 113.623294C159.361704 113.241043 158.949789 113 158.499823 113 158.049856 113 157.637942 113.241043 157.439119 113.623294L156.380318 115.651474 154.012523 115.977062C153.567313 116.038222 153.197256 116.33323 153.058366 116.737967 152.918524 117.142703 153.034583 117.587014 153.357075 117.88472L155.070373 119.463193 154.666069 121.692841C154.589965 122.111968 154.771664 122.536492 155.136013 122.786529 155.501313 123.036566 155.984576 123.069845 156.382221 122.871074L158.499823 121.818759 160.617425 122.871074C160.790562 122.957418 160.979871 122.99969 161.16823 122.99969 161.413666 122.99969 161.6572 122.927737 161.862681 122.786529 162.227031 122.536492 162.409681 122.111968 162.334528 121.692841L161.930224 119.463193 163.64257 117.88472C163.965062 117.587014 164.081121 117.142703 163.942231 116.737967M150.942231 130.738646C150.803341 130.333933 150.432332 130.038043 149.987122 129.976886L147.619327 129.652217 146.561478 127.623257C146.361704 127.241928 145.949789 127 145.499823 127 145.049856 127 144.637942 127.241928 144.439119 127.623257L143.380318 129.652217 141.012523 129.976886C140.567313 130.038043 140.197256 130.333933 140.058366 130.738646 139.918524 131.143358 140.034583 131.587643 140.357075 131.884432L142.070373 133.463711 141.666069 135.692328C141.589965 136.11233 141.771664 136.535929 142.136013 136.786851 142.501313 137.035974 142.984576 137.069251 143.382221 136.871391L145.499823 135.819138 147.617425 136.871391C147.790562 136.95773 147.979871 137 148.167278 137 148.412715 137 148.6572 136.928051 148.862681 136.786851 149.227031 136.535929 149.409681 136.11233 149.334528 135.692328L148.929273 133.463711 150.64257 131.884432C150.965062 131.587643 151.081121 131.143358 150.942231 130.738646M143.942231 105.737967C143.803341 105.33323 143.432332 105.038222 142.987122 104.977062L140.619327 104.651474 139.561478 102.623294C139.361704 102.241043 138.949789 102 138.499823 102 138.049856 102 137.638893 102.241043 137.439119 102.623294L136.380318 104.651474 134.012523 104.977062C133.567313 105.038222 133.197256 105.33323 133.058366 105.737967 132.918524 106.142703 133.034583 106.587913 133.357075 106.88472L135.070373 108.463193 134.666069 110.692841C134.589965 111.111968 134.771664 111.536492 135.136013 111.786529 135.501313 112.036566 135.984576 112.069845 136.382221 111.871074L138.499823 110.819658 140.617425 111.871074C140.790562 111.957418 140.979871 111.99969 141.16823 111.99969 141.413666 111.99969 141.658151 111.927737 141.862681 111.786529 142.227031 111.536492 142.410632 111.111968 142.334528 110.692841L141.930224 108.463193 143.64257 106.88472C143.965062 106.587913 144.081121 106.142703 143.942231 105.737967"/>
+  <path fill="#F9F9FA" d="M89.100356,93.3909442 C93.9890701,95.1542944 97,94.9963547 97,94.9963547 C97,94.9963547 95.8363832,89.4916917 91.7580111,83.9340724 L89.6869256,83.5708111 L88.7394634,80.425024 C85.3076509,77.038611 80.5446303,74.0981454 74,73 C74,73 74.0409456,75.0810878 74.6522729,77.8664008 L78.1993045,80.2382835 L75.8196986,81.7582208 C77.0661588,84.9885522 79.1610499,88.3554549 82.7223648,90.4049548 C83.170862,90.6632327 83.6079324,90.8992131 84.0421462,91.1296193 L88.1348017,90.8406825 L89.100356,93.3909442 Z"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M82,80 C82,80 94.3351693,96.2658492 106,99"/>
+  <path fill="#F9F9FA" d="M129.835352,61.2576737 C124.978209,58.5687469 123,55.9957221 123,55.9957221 C123,55.9957221 128.294342,52.8885821 135.674078,52.122663 L136.939605,54.2890649 L140.642166,52 C145.800177,52.3052086 151.526077,54.0244219 157,58.555225 C157,58.555225 155.277529,60.0551903 152.580997,61.6082773 L147.976771,60.2725066 L148.597312,63.5235582 C145.095017,64.8854069 140.888502,65.6561553 136.728057,64.2614677 C136.203418,64.085683 135.706045,63.9031373 135.215254,63.7196258 L132.034511,60.2725066 L129.835352,61.2576737 Z"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M148,57.7948848 C148,57.7948848 123.512512,59.8422909 112,51"/>
+  <path fill="#FFF" d="M110,25.0970927 L133.556826,25.0970927 C133.556826,25.0970927 126.186047,8.34339904 141.834351,6.176461 C155.79062,4.24337877 161.306189,18.8301344 161.306189,18.8301344 C161.306189,18.8301344 162.961137,10.4150974 171.260913,12.024742 C179.444796,13.6117553 185.486981,27 185.486981,27 L206,27"/>
+  <path stroke="#EAEAEE" stroke-dasharray="12 8 3 4 1 9" stroke-linecap="round" stroke-linejoin="round" d="M111,22.3216663 L134.556826,22.3216663 C134.556826,22.3216663 127.186047,5.37000235 142.834351,3.17853611 C156.79062,1.22272166 162.306189,15.9810113 162.306189,15.9810113 C162.306189,15.9810113 163.961137,7.46701706 172.260913,9.09559036 C180.444796,10.7012663 186.486981,23 186.486981,23 L207,23"/>
+  <path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M110,26 L207,26"/>
+  <path fill="#FFF" d="M0,84.9127966 L13.0056268,84.9127966 C13.0056268,84.9127966 8.9364211,75.3392056 17.5755444,74.1008402 C25.2804349,72.9961951 28.3252058,81.3314209 28.3252058,81.3314209 C28.3252058,81.3314209 29.2391893,76.5223386 33.8210726,77.4428762 C38.3394464,78.349848 41.6750721,86 41.6750721,86 L53,86"/>
+  <path stroke="#EAEAEE" stroke-dasharray="12 8 3 4 1 9" stroke-linecap="round" stroke-linejoin="round" d="M0,82 L13.0056268,82 C13.0056268,82 8.9364211,72.3499071 17.5755444,71.101646 C25.2804349,69.9881738 28.3252058,78.3900057 28.3252058,78.3900057 C28.3252058,78.3900057 29.2391893,73.5424945 33.8210726,74.470388 C38.3394464,75.3846073 41.6750721,81.8202817 41.6750721,81.8202817 L53,81.8202817"/>
+  <path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M0,85 L54,85"/>
+  <path fill="#D9ECFF" d="M121.548341,185.207466 C121.548341,185.207466 145.818708,194.929536 155.084935,183.241938 C164.352088,171.555257 148.744154,156.346049 146.680876,154.151009 C144.835224,152.186398 164.194657,169.816485 151.511242,182.28901 C145.053776,188.640945 127.858562,186.485382 121.014,182.493733 C120.897316,182.425798 121.548341,185.207466 121.548341,185.207466"/>
+  <path stroke="#D9EBFF" d="M121.548341,185.207466 C121.548341,185.207466 145.818708,194.929536 155.084935,183.241938 C164.352088,171.555257 148.744154,156.346049 146.680876,154.151009 C144.835224,152.186398 164.194657,169.816485 151.511242,182.28901 C145.053776,188.640945 127.858562,186.485382 121.014,182.493733 C120.897316,182.425798 121.548341,185.207466 121.548341,185.207466 Z"/>
+  <path fill="#D9ECFF" d="M157.71945,177.309684 C184.54887,176.334827 188.904966,172 188.904966,172 C188.904966,172 189.51305,173.49971 187.652865,174.355904 C183.346522,176.340304 154,183 154,183 C154,183 157.541631,177.316073 157.71945,177.309684"/>
+  <path stroke="#D9EBFF" d="M157.71945,177.309684 C184.54887,176.334827 188.904966,172 188.904966,172 C188.904966,172 189.51305,173.49971 187.652865,174.355904 C183.346522,176.340304 154,183 154,183 C154,183 157.541631,177.316073 157.71945,177.309684 Z"/>
+  <path fill="#D9ECFF" d="M49.7130601,178.555043 C49.7130601,178.555043 49.1341777,178.334846 51.5497382,178.936471 C54.4478551,179.656024 65.9708567,181.03893 76.5417125,181.263733 C87.1116421,181.489457 120.860023,180.137876 120.860023,180.137876 C120.860023,180.137876 121.917757,180.888755 121.99278,182.315884 C122.06873,183.742093 121.520412,184.287516 121.520412,184.287516 C121.520412,184.287516 107.11967,185.545123 87.4135872,184.718696 C67.7075039,183.892269 60.6108687,182.616236 57.0625511,182.09016 C53.5133073,181.565006 48.3839461,180.350702 48.0523623,178.885798 C47.6485339,177.108565 49.7130601,178.555043 49.7130601,178.555043"/>
+  <path stroke="#D9EBFF" d="M49.7130601,178.555043 C49.7130601,178.555043 49.1341777,178.334846 51.5497382,178.936471 C54.4478551,179.656024 65.9708567,181.03893 76.5417125,181.263733 C87.1116421,181.489457 120.860023,180.137876 120.860023,180.137876 C120.860023,180.137876 121.917757,180.888755 121.99278,182.315884 C122.06873,183.742093 121.520412,184.287516 121.520412,184.287516 C121.520412,184.287516 107.11967,185.545123 87.4135872,184.718696 C67.7075039,183.892269 60.6108687,182.616236 57.0625511,182.09016 C53.5133073,181.565006 48.3839461,180.350702 48.0523623,178.885798 C47.6485339,177.108565 49.7130601,178.555043 49.7130601,178.555043 Z"/>
+  <path fill="#D9ECFF" d="M86.4481068,146.383687 L83,137.143401 C83,137.143401 85.921517,142.105548 87.8698076,142.881835 C89.8171793,143.65717 92.8140547,140.089676 93.2634481,137.918736 C93.7119226,135.746846 92.4391006,129 92.4391006,129 C92.4391006,129 94.162235,136.367114 95.3606176,137.298468 C96.5590001,138.22887 98,137.87117 98,137.87117 L87.1198995,148 L86.4481068,146.383687 Z"/>
+  <path fill="#D9ECFF" d="M92.3656178,144.001565 C92.3656178,144.001565 87.504393,149.219347 86.380247,152.85721 C83.9964334,160.578964 95,166 95,166 L86.6093661,164.843525 C86.6093661,164.843525 79.9853867,158.84378 82.6187939,152.570208 C86.3539227,143.672219 92.3656178,144.001565 92.3656178,144.001565"/>
+  <path fill="#D9ECFF" d="M87,163.044106 C87,163.044106 92.0203186,162.450961 101.754551,165.615007 C110.881632,168.58164 116,174 116,174 C116,174 104.021944,168.14224 97.25842,166.757629 C90.494896,165.373018 87.2140117,164.89359 87.2140117,164.89359 L87,163.044106 Z"/>
+  <path fill="#D7B600" d="M87,145 L83,137"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" d="M95,139 L93,128"/>
+  <path fill="#F9F9FA" d="M81.3690641,21.2774689 C83.8125377,16.2514858 84,13 84,13 C84,13 78.0362991,13.5556701 71.6708933,17.2371044 L71.8343456,19.7409787 L67.5993607,20.0356086 C63.610016,23.294772 59.9346475,28.0376418 58,34.9254556 C58,34.9254556 60.2089149,35.1423493 63.2286272,34.8362029 L66.2104777,31.0597577 L67.4876221,34.0732362 C71.0540224,33.1394417 74.8651394,31.3140799 77.4554431,27.7487701 C77.7814243,27.2986677 78.0833955,26.8600818 78.3789025,26.4234154 L79.0576452,21.7573222 L81.3690641,21.2774689 Z"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M64,28 C64,28 85.2332255,15.4421769 90,2"/>
+  <path stroke="#59ACFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M155 170C155 170 153.832413 168 151.49908 168 149.165747 168 148 170 148 170M134 170C134 170 132.832413 168 130.49908 168 128.165747 168 127 170 127 170"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M105,168 C105,168 109.567901,169.976043 113.748338,172.693607 C115.031339,173.52807 117,175 117,175"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M47 178C47 178 47.5107022 179.199632 53.1218551 180.399264 58.7348855 181.599816 67 182 67 182M160 179C160 179 170.448604 178.151101 183.689721 174.121271 187.517766 172.956231 190 172 190 172"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M111 182L122 181M88 147C93.6281456 139.812382 100 137 100 137"/>
+  <path stroke="#D9EBFF" stroke-linecap="round" stroke-linejoin="round" d="M147,154 C147,154 154.895246,161.354648 157,172"/>
+  <path stroke="#EAEAEE" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 156L56 156M170 156L202 156"/>
+  <path fill="#D9ECFF" d="M157.077123,154 C156.788579,154 156.517834,153.889937 156.315478,153.690907 C155.894841,153.279088 155.894841,152.609539 156.315478,152.198637 C157.917462,150.62749 157.843452,148.124476 157.841579,148.099712 C157.820032,147.516378 158.282827,147.024764 158.873968,147 C159.52132,147.016509 159.970063,147.430162 159.996294,148.005241 C160.003789,148.144654 160.136819,151.441955 157.838768,153.690907 C157.636412,153.889937 157.365668,154 157.077123,154"/>
+  <path fill="#59ACFF" d="M159.405067,146 C159.390836,146 159.378502,146 159.364271,146 C158.504703,146.036145 157.832987,146.749768 157.866193,147.590361 C157.867142,147.609824 157.921221,149.958295 156.458247,151.388323 C155.847251,151.985171 155.847251,152.955514 156.458247,153.551437 C156.753308,153.840593 157.146091,154 157.565439,154 C157.983838,154 158.376621,153.840593 158.672632,153.551437 C161.163103,151.118628 161.003713,147.601483 160.995174,147.452271 C160.956275,146.637627 160.298791,146.024096 159.431633,146 L159.405067,146 Z M159.405067,146.926784 C159.785517,146.936979 160.032192,147.170528 160.048321,147.50139 C160.054962,147.634847 160.172607,150.775718 158.001865,152.897127 C157.881373,153.014829 157.723881,153.073216 157.565439,153.073216 C157.406998,153.073216 157.249505,153.014829 157.129014,152.897127 C156.888031,152.660797 156.888031,152.278962 157.129014,152.043559 C158.907922,150.305839 158.814944,147.58202 158.813996,147.554217 C158.800713,147.222428 159.065415,146.940686 159.405067,146.926784 L159.405067,146.926784 Z"/>
+  <path fill="#D9ECFF" d="M68.9200762,154 C68.6307815,154 68.359333,153.88755 68.1555117,153.683266 C65.9914374,151.523293 65.9933159,148.399063 66.00083,148.049531 C66.0186761,147.45917 66.4939459,147 67.0819279,147 C67.7046629,147.014993 68.1771149,147.51071 68.1620866,148.104819 C68.1611473,148.129183 68.1339085,150.609639 69.6837014,152.158635 C70.1054329,152.579384 70.1054329,153.263454 69.6837014,153.684203 C69.4808194,153.88755 69.2093708,154 68.9200762,154"/>
+  <path fill="#59ACFF" d="M67.5874938,146 L67.570379,146 C66.7155885,146 66.0262414,146.663991 66.0015199,147.512161 C65.9910609,147.885242 65.9710936,151.207084 68.3215297,153.542857 C68.6181867,153.837544 69.0127785,154 69.4311409,154 C69.8504542,154 70.245046,153.837544 70.5407522,153.542857 C71.1530826,152.934593 71.1530826,151.945691 70.5407522,151.337426 C69.1221232,149.926328 69.1392381,147.61889 69.1401889,147.595277 C69.161107,146.737662 68.4755631,146.020779 67.6103136,146 L67.5874938,146 Z M67.5874938,146.94451 C67.9278887,146.953011 68.1979226,147.235419 68.1893652,147.574498 C68.1884144,147.600945 68.1437257,150.289965 69.8685198,152.005195 C70.110029,152.246045 70.110029,152.634238 69.8685198,152.875089 C69.7477652,152.995041 69.5889777,153.05549 69.4311409,153.05549 C69.2723534,153.05549 69.1145167,152.995041 68.993762,152.875089 C66.8848351,150.778276 66.9475895,147.671783 66.9513928,147.539551 C66.9618519,147.207084 67.2375907,146.94451 67.570379,146.94451 L67.5874938,146.94451 L67.5874938,146.94451 Z"/>
+  <path fill="#59ACFF" d="M85.3929393,108 C81.5954632,108 74.2964786,110.772931 73.2295112,113.725693 C72.9567387,114.47949 72.4882008,115.775575 76.3933014,126.680946 C71.5956594,122.307244 70.684562,122.306312 69.9172733,122.306312 C69.6741903,122.306312 69.4366741,122.345446 69.2140026,122.421851 C68.0319883,122.823441 67.0587285,123.976034 66.2376276,125.944853 C65.2124111,128.402847 64.2484292,132.857613 65.313541,135.068691 C65.6800211,135.829942 66.3498911,137.218271 82.8479902,146.466966 C81.7995787,147.798457 80.8986872,149.391774 80.1573768,151.228282 C79.9996512,151.622419 79.8679039,152.028668 79.7649183,152.446099 L71.2570132,152.446099 C64.8375808,152.446099 64.3903823,148.581139 64.3606928,148.141347 C64.2901801,146.541507 62.9105449,145.22306 61.2859711,145.22306 C61.2692708,145.22306 61.2228809,145.22306 61.2071083,145.223992 C60.3683792,145.25474 59.612224,145.604152 59.0555454,146.207003 C58.4988668,146.810787 58.2093939,147.595333 58.240939,148.417149 C58.3170184,151.232941 60.8053719,158.59854 71.2570132,158.59854 L80.1276872,158.59854 C80.637976,160.179744 81.3922755,161.643546 82.1660588,162.88652 C77.7720088,163.196797 73.2582729,163.96923 68.7009305,165.1945 C67.8436454,165.427442 67.1756311,166.104834 66.955743,166.964853 C66.8833748,167.240655 66.8611076,167.523912 66.887086,167.801577 L62.3649999,167.409305 C62.3121154,167.404646 62.212841,167.400919 62.1590288,167.400919 C61.8593501,167.400919 61.566166,167.453098 61.2896823,167.557455 C59.1594587,168.361568 57.1758272,169.238358 55.3926,170.162669 C54.6086109,170.573577 54.1020334,171.373031 54.0639936,172.252617 C54.0445099,172.780927 54.1911019,173.292466 54.470369,173.71735 L50.6033081,174.16087 C49.2839798,174.196277 47.7531135,174.253115 46.8132544,175.070272 C46.4959476,175.09543 46.1851354,175.169971 45.8873123,175.293896 C44.3239732,175.949858 43.5854462,177.754686 44.2367602,179.319119 C45.0068323,181.180784 47.5397201,182.490845 52.4468422,183.566101 C54.5928383,184.036642 57.3029355,184.44196 60.5029098,184.769941 C67.1774866,185.684002 75.8069333,186.355804 86.8811269,186.825413 C91.3503285,187.014562 95.9150933,187.110533 100.447385,187.110533 C103.227067,187.110533 106.021594,187.074194 108.75303,187.002449 C113.803961,186.936293 118.013379,186.764849 120.67152,186.517931 C123.858505,187.699408 126.895187,188.632105 129.704559,189.292726 C132.361771,189.916076 134.918782,190.299031 137.318067,190.433205 C138.413796,191.532688 140.912355,193.88912 142.278073,193.993478 C142.324463,193.997205 142.412604,194 142.459922,194 C144.33964,194 147.837437,191.246636 149.55108,188.523088 C151.931809,187.53635 153.934924,186.120068 155.517747,184.30499 C158.184237,183.683503 163.823392,182.356671 169.663879,180.913368 C174.440181,180.02726 179.152466,178.894234 183.672696,177.545971 C187.494295,176.405491 189.913992,175.492362 190.016049,175.454159 C191.593306,174.85783 192.396778,173.081887 191.805771,171.495092 C191.508876,170.705887 190.925291,170.098377 190.19697,169.773191 C189.656992,169.115365 188.863725,168.771544 188.185505,168.477107 C187.885826,168.347591 187.590786,168.220872 187.279046,168.064335 C186.93205,167.89289 186.55722,167.804373 186.187028,167.804373 C186.086826,167.804373 185.98848,167.809963 185.889205,167.823008 L184.79162,167.936683 C184.825021,167.662745 184.799971,167.347808 184.666368,166.997465 C184.553176,166.432815 184.18113,165.928731 183.619812,165.671564 C183.613317,165.668769 183.605895,165.665041 183.5994,165.662246 L183.597545,165.661314 L180.884664,164.450021 C180.792812,164.409023 180.698177,164.375479 180.59983,164.350322 L178.104054,163.69436 C177.43604,163.502416 176.718852,163.311404 176.011871,163.139028 C175.842084,163.093371 175.63704,163.067282 175.430141,163.067282 C175.282622,163.067282 175.134174,163.081259 174.987582,163.10828 L169.733463,164.060543 C169.739958,163.745607 169.686146,163.426943 169.569243,163.123188 C169.251009,162.292054 168.502276,161.693861 167.619012,161.569005 C163.581237,161.002492 158.539584,160.616741 154.800559,160.423866 C154.458202,159.810765 154.097288,159.201391 153.718747,158.59854 L153.73452,158.59854 C164.175027,158.59854 166.670803,151.234805 166.749666,148.397582 C166.81554,146.734382 165.503634,145.305055 163.826175,145.229582 C163.788136,145.227719 163.735251,145.226787 163.683294,145.226787 C162.055009,145.226787 160.714342,146.509827 160.629912,148.147869 C160.60115,148.580208 160.153952,152.446099 153.73452,152.446099 L149.018524,152.446099 C148.461845,151.847906 148.092582,151.494767 148.007224,151.414635 C147.646311,151.077336 147.204679,150.861167 146.73243,150.783831 C142.640842,145.822185 137.772688,140.992849 132.898038,137.067325 C130.219486,130.788164 125.403288,126.772259 124.850321,126.325944 C124.411473,125.973737 123.865927,125.780862 123.309249,125.780862 C123.049465,125.780862 122.792465,125.82186 122.544744,125.903855 C121.751476,126.165681 121.152119,126.802076 120.935942,127.60712 L120.246589,130.160155 C119.840213,130.088409 119.421776,130.032503 118.994989,129.992438 C115.06391,127.200871 111.414882,126.044551 111.256229,125.994236 C111.024279,125.920627 110.774702,125.882424 110.524196,125.882424 C109.960095,125.882424 109.408056,126.079958 108.969207,126.439619 C108.325316,126.965135 107.991308,127.777633 108.078521,128.610631 L108.382839,131.50935 C105.991904,132.292964 103.505406,133.35238 100.955818,134.675486 C103.165832,125.10906 103.033157,123.564194 102.981201,122.959479 C102.760385,120.379423 100.347183,117.927951 98.9295081,116.69709 C98.5899341,116.402652 98.1585082,116.243321 97.7159487,116.243321 C97.6584252,116.243321 97.5990462,116.246116 97.5415227,116.251706 C97.4431761,115.749485 97.1434975,115.309693 96.7129993,115.035754 C95.0745085,113.993109 93.6447723,113.464799 92.462758,113.464799 C91.9255631,113.464799 91.4347581,113.573815 91.0024043,113.789053 C90.8929242,113.844027 90.7880831,113.904592 90.6888087,113.973542 C89.4826717,109.582136 88.8443468,109.136753 88.2969462,108.756593 C87.5649138,108.247849 86.6148489,108 85.3929393,108 M182.843245,167.363648 C182.845101,167.36458 182.846029,167.36458 182.846956,167.365512 L182.843245,167.363648 M85.3929393,109.863529 C86.169506,109.863529 86.8152532,109.993044 87.2401846,110.288414 C88.1605599,110.928536 89.5986464,116.76045 91.0079711,123.609851 C90.9578701,119.182106 91.1527076,115.795142 91.8272165,115.458775 C92.0053537,115.370257 92.2187472,115.328328 92.462758,115.328328 C93.3042705,115.328328 94.4937072,115.829617 95.7211836,116.610436 L96.4021871,120.136233 L97.7159487,118.10685 C99.5038149,119.659169 101.000353,121.581399 101.133028,123.119743 C101.27127,124.741945 100.040082,130.517021 98.714259,136.110403 C98.7652879,136.104813 98.8163168,136.101086 98.8664178,136.101086 C99.3275333,136.101086 99.7635982,136.355457 99.9612192,136.807363 C100.028021,136.958309 100.061421,137.116709 100.064205,137.273245 C103.464583,135.366855 107.008771,133.801491 110.389666,132.843637 L109.923911,128.416824 C109.902572,128.212767 109.984218,128.012438 110.141944,127.882923 C110.252351,127.793473 110.385954,127.745953 110.523268,127.745953 C110.584503,127.745953 110.645738,127.755271 110.705117,127.773906 C110.860987,127.822358 114.528571,129.002904 118.331614,131.808447 C119.503423,131.882056 120.588946,132.080522 121.564989,132.399185 L122.726592,128.09257 C122.780404,127.895036 122.928852,127.738499 123.121834,127.675139 C123.183068,127.65464 123.247086,127.644391 123.309249,127.644391 C123.445635,127.644391 123.57831,127.690979 123.686862,127.777633 C123.897473,127.948146 128.856551,131.98455 131.369028,138.225509 C136.518305,142.323409 141.675005,147.457431 145.94473,152.759171 C146.058849,152.664131 146.198019,152.61568 146.337188,152.61568 C146.480069,152.61568 146.62295,152.666927 146.737997,152.77408 C146.820571,152.852348 147.380961,153.386249 148.199278,154.309628 L153.73452,154.309628 C162.072638,154.309628 162.469735,148.49169 162.482724,148.243841 C162.516125,147.59906 163.062598,147.090316 163.683294,147.090316 C163.702778,147.090316 163.72319,147.090316 163.743601,147.091248 C164.406049,147.121064 164.921904,147.679191 164.894998,148.344471 C164.893143,148.429262 164.450583,156.735011 153.73452,156.735011 L150.178271,156.735011 C151.296267,158.217448 152.534877,160.067 153.66679,162.235216 C157.249945,162.39548 162.912295,162.790548 167.359229,163.413898 C167.575406,163.444647 167.75911,163.590934 167.837973,163.796854 C167.917763,164.001842 167.878796,164.233851 167.738698,164.403432 L165.870114,166.655507 L175.322517,164.94106 C175.358701,164.934538 175.394885,164.930811 175.430141,164.930811 C175.478387,164.930811 175.525705,164.936402 175.572095,164.949446 C176.288354,165.124618 176.973997,165.308176 177.634589,165.497324 L180.130365,166.153286 L182.843245,167.363648 C182.827473,167.357126 182.814484,167.353399 182.806133,167.353399 C182.716137,167.353399 183.028805,167.71865 182.926747,167.71865 C182.916541,167.71865 182.902624,167.714923 182.881285,167.706538 C182.911902,167.880777 182.871079,168.059676 182.75696,168.197577 L180.584058,170.246528 L186.108165,169.673492 C186.134144,169.669765 186.160122,169.667902 186.1861,169.667902 C186.277025,169.667902 186.367021,169.690264 186.449595,169.731262 C186.810508,169.912956 187.149154,170.058311 187.445122,170.185963 C188.269006,170.542829 188.812696,170.777633 188.937021,171.329238 C188.938876,171.341351 188.938876,171.357191 188.94166,171.369304 C189.428753,171.372099 189.88523,171.66281 190.068006,172.148259 C190.300883,172.774405 189.984504,173.475092 189.361952,173.709896 C189.260822,173.748099 186.865248,174.649115 183.143852,175.759778 C177.928701,177.314893 173.144048,178.373378 169.273276,179.090836 C163.009713,180.639429 156.970678,182.054779 154.494386,182.629678 C152.823422,184.72708 150.673715,186.130317 148.273502,187.024811 C146.866961,189.703634 143.454521,192.136471 142.459922,192.136471 C142.445077,192.136471 142.432088,192.136471 142.418171,192.135539 C141.944994,192.0992 139.749824,190.328848 138.132673,188.605084 C135.784417,188.52402 133.142977,188.18579 130.127634,187.477648 C127.276512,186.80771 124.178595,185.846129 120.918314,184.62179 C118.336253,184.887343 114.007149,185.069037 108.704785,185.139851 C106.241482,185.204143 103.471078,185.247004 100.447385,185.247004 C96.366003,185.247004 91.8253609,185.168736 86.9581341,184.962816 C72.8667423,184.366487 65.2281836,183.537216 60.7218701,182.919457 C58.1973325,182.660426 55.2886866,182.28213 52.8430118,181.745433 C47.7605359,180.631975 46.2881209,179.421613 45.948547,178.60166 C45.691547,177.982968 45.9819477,177.273895 46.5989332,177.015797 C46.7455252,176.9543 46.897684,176.925416 47.0461317,176.925416 C47.3550883,176.925416 47.6529114,177.048408 47.879294,177.261782 C47.8273374,177.136926 47.801359,176.999025 47.8403265,176.833171 C47.9832074,176.247091 48.5779257,176.079373 50.7341276,176.021604 L59.5918125,175.006912 L56.2007118,172.87224 C56.0170078,172.755769 55.9103111,172.550781 55.9177335,172.332748 C55.9270115,172.114715 56.0522642,171.919045 56.2443183,171.818414 C57.9598163,170.929511 59.8757186,170.081605 61.9419241,169.30265 C62.0115089,169.276561 62.0857327,169.264448 62.1590288,169.264448 C62.1748013,169.264448 62.1896461,169.264448 62.2054187,169.26538 L70.9684681,170.026631 L68.9152518,168.015883 C68.7603096,167.863074 68.6981471,167.63945 68.7528872,167.428872 C68.8076272,167.216429 68.9709196,167.051507 69.1806019,166.994669 C74.8429514,165.473098 80.3577811,164.675508 85.6991126,164.600966 C84.5300874,163.202388 82.2504884,160.13036 81.550929,156.735011 L71.2570132,156.735011 C60.5409495,156.735011 60.0974622,148.429262 60.0956066,148.344471 C60.0696283,147.675464 60.5901228,147.111747 61.2553538,147.086589 C61.2655596,147.086589 61.2757653,147.086589 61.2859711,147.086589 C61.8973898,147.086589 62.4800468,147.58881 62.5088085,148.243841 C62.5217977,148.498212 62.9235341,154.309628 71.2570132,154.309628 L81.3542358,154.309628 C81.3996979,153.509242 81.5620625,152.709788 81.8775138,151.928037 C83.0289107,149.074043 84.44473,147.217968 85.8327154,146.000152 C79.6712108,142.575917 67.7221039,135.789876 66.9835769,134.257124 C65.9861944,132.187675 67.7916887,124.872392 69.808721,124.186613 C69.8402661,124.175432 69.8764502,124.169841 69.9163455,124.169841 C71.1122768,124.170773 76.0722834,128.786734 80.9849723,133.667317 C77.6346948,124.98793 74.431937,115.860365 74.9737709,114.361156 C75.6399297,112.515331 81.8710192,109.863529 85.3929393,109.863529"/>
+  <path stroke="#59ACFF" stroke-linecap="round" stroke-linejoin="round" d="M92 143C92 143 97.7392935 137.928987 107 134M108 171C108 171 95.6636386 163.987883 82 165.124658M157.802009 172C157.802009 172 159.110464 178.754089 155 183M148 153C148 153 152.441818 159.234667 153 160M79 158L89 158M123 181C123 181 121.846414 184.368097 120 185M141 183C141 183 133.984714 185.476999 138.535099 190M149.652 185C149.652 185 149.87 186.65514 149 188"/>
+  <path fill="#59ACFF" d="M73.9403546 72C73.7175355 72 73.4994173 72.0802522 73.3283073 72.2312028 73.1148899 72.4165472 72.9945488 72.6888316 73.0001898 72.9744913 73.0020701 73.0652527 73.0500185 75.2397057 73.6658265 78.1603134 73.7165954 78.3991593 73.8547996 78.6093437 74.0531744 78.7478743L76.3970052 80.3806248 75.2217992 81.163084C74.8532546 81.4086176 74.7018881 81.8805771 74.8570153 82.2990351 76.4552954 86.607815 78.883741 89.7624916 82.0746603 91.676125 82.5278197 91.9474539 82.968757 92.1958536 83.4049935 92.4385211 83.5431977 92.5149518 83.6983249 92.5550779 83.8553324 92.5550779 83.8769562 92.5550779 83.9004603 92.5541225 83.9230243 92.5522117L87.2596691 92.3066781 87.9676132 94.2547053C88.0625698 94.5174358 88.2656454 94.7237986 88.5241907 94.8202923 91.1528915 95.808159 93.2579204 96.2256616 94.6277405 96.4014522 98.4325874 99.2771568 102.032478 101.140155 105.330576 101.939811 105.495105 101.979937 105.664335 102 105.833565 102 106.840481 102 107.706373 101.304481 107.939534 100.309926 108.074917 99.7376517 107.980901 99.1462692 107.678168 98.6456482 107.375435 98.1440718 106.897831 97.7934461 106.334672 97.6568262 103.46811 96.9622623 100.240524 95.225375 96.73559 92.4929779 95.9590139 90.2325404 94.5656896 86.9479316 92.2378416 83.6432598 92.0958768 83.4407184 91.880579 83.3031432 91.6398968 83.2591956L90.1675988 82.9897774 89.3947833 80.321391C89.3524759 80.169485 89.2716217 80.0319098 89.1616225 79.9191745 85.0596835 75.7030668 79.9921953 73.0432789 74.1001826 72.0143308 74.0465932 72.0047769 73.993944 72 73.9403546 72M73.9403546 72.9553836C80.4021072 74.084647 85.1048114 77.108436 88.4931653 80.5908092L89.4295694 83.825738 91.4725475 84.199293C93.8417628 87.5603325 95.2087624 90.891755 95.9373901 93.0748065 99.1734373 95.6266361 102.691534 97.7561861 106.117494 98.5864144 106.77561 98.7459635 107.182701 99.4175982 107.024753 100.088277 106.89125 100.660552 106.388262 101.044616 105.833565 101.044616 105.738608 101.044616 105.644591 101.034107 105.547755 101.010223 101.943163 100.137002 98.316007 98.0246489 94.9887638 95.4833286 93.643388 95.3295118 91.5355385 94.9330276 88.8494878 93.9241425L87.8971008 91.30257 83.8553324 91.5996943C83.4275574 91.3627591 82.9960218 91.1191363 82.552264 90.8535397 79.0369879 88.7450081 76.9686254 85.2836534 75.7370095 81.96274L78.0864813 80.3987771 74.5853076 77.9596828C73.9807817 75.0963982 73.9403546 72.9553836 73.9403546 72.9553836M112.124206 49L112.124206 49C111.438081 49 110.790689 49.3423644 110.393216 49.9173853 110.065831 50.3883727 109.9358 50.9662309 110.029865 51.540306 110.123009 52.1143811 110.429183 52.6165786 110.892133 52.9542142 113.962173 55.1984979 118.122267 56.9424757 123.25806 58.140751 124.368402 59.1858136 126.223891 60.6895688 128.996057 62.2216968 129.131622 62.2973574 129.281943 62.3351878 129.434107 62.3351878 129.558606 62.3351878 129.684027 62.3087065 129.80207 62.2557441L131.36614 61.5558832 134.041474 64.4499026C134.139228 64.5567733 134.26096 64.6381085 134.394681 64.6882337 134.885297 64.8717107 135.383291 65.054242 135.908029 65.2292072 137.434288 65.7408623 139.059224 66 140.734881 66 143.087442 66 145.586634 65.492128 148.162369 64.4924618 148.582897 64.3288456 148.828205 63.8786648 148.741518 63.4256467L148.420588 61.7526008 151.493395 62.6425591C151.575472 62.6662031 151.660315 62.6775522 151.744237 62.6775522 151.901013 62.6775522 152.056866 62.6368846 152.195198 62.5564951 154.885287 61.0101808 156.602444 59.5272323 156.674377 59.4648122 156.883719 59.2822809 157.003606 59.0136857 156.999917 58.7318498 156.997151 58.4490682 156.870808 58.1833102 156.656855 58.0064534 151.771903 53.970904 146.197137 51.7408067 140.086567 51.3795271 140.069045 51.3785814 140.050601 51.3776356 140.034001 51.3776356 139.866159 51.3776356 139.701083 51.4239777 139.55814 51.5138248L136.71773 53.2663143 135.950451 51.9573853C135.782608 51.6708206 135.481967 51.4986926 135.160116 51.4986926 135.129683 51.4986926 135.098328 51.4996384 135.067895 51.5024757 130.881979 51.9365786 127.362821 53.1168846 125.072049 54.0739917 120.08381 53.0109597 116.143202 51.4410014 113.359047 49.4047844 112.993851 49.1390264 112.56779 49 112.124206 49M112.124206 49.945758C112.366748 49.945758 112.610212 50.0204729 112.824165 50.1746314 116.110003 52.5778025 120.548604 54.1004729 125.163348 55.0585257 127.363744 54.1174965 130.90319 52.8851739 135.160116 52.4444506L136.401412 54.5648401 140.034001 52.3233936C145.093251 52.6231989 150.709516 54.3066481 156.077706 58.7431989 156.077706 58.7431989 154.388216 60.2119611 151.744237 61.7317942L147.227247 60.4247566 147.836829 63.608178C145.680699 64.4451739 143.25344 65.054242 140.734881 65.054242 139.2409 65.054242 137.71464 64.8395549 136.194837 64.3297914 135.680243 64.1576634 135.192393 63.9798609 134.710077 63.7992211L131.590237 60.4247566 129.434107 61.3894298C126.549431 59.7948818 124.713309 58.250459 123.70441 57.273491 119.156988 56.2350487 114.78663 54.6395549 111.427015 52.1843672 110.885677 51.7890403 110.760256 51.0182476 111.145741 50.4640334 111.379982 50.125452 111.748867 49.945758 112.124206 49.945758M89.8665635 0C88.967473 0 88.1608816.562247916 87.8593348 1.39967733 86.7058721 4.59214843 84.3425222 8.06985749 80.8312595 11.7395536 78.4114852 12.278946 74.8548981 13.3376176 71.1678873 15.365367 70.8543156 15.5372412 70.6702426 15.8727615 70.6942923 16.2265663L70.7960412 17.6984673 67.4781015 17.9178812C67.2921785 17.9306803 67.1145804 17.9983329 66.9684319 18.1116967 62.1409082 21.8618446 58.7998438 26.7895133 57.0368125 32.7584835 56.9600383 33.0199516 57.0044379 33.3024469 57.1598362 33.5273461 57.3143096 33.7531595 57.5622069 33.8994353 57.837854 33.9241194 57.8702286 33.9277763 58.6555453 34 59.9237068 34 61.0281451 34 62.1483082 33.9460608 63.2527464 33.8390965 63.4960188 33.8153267 63.7207914 33.6964775 63.8771148 33.5090616L65.9093182 31.0625975 66.580861 32.5710675C66.7307094 32.9084162 67.0683309 33.1168594 67.427227 33.1168594 67.5012262 33.1168594 67.5770754 33.1077171 67.6529246 33.0885184 72.2723255 31.9393385 75.803938 29.7991396 78.149713 26.7282603 78.4836345 26.2921753 78.7916562 25.8652326 79.093203 25.4419468 79.1755271 25.3258403 79.2301015 25.1923635 79.2504513 25.0524872L79.8341201 21.2410863 81.5129773 20.9101371C81.7923243 20.8552837 82.0291218 20.6760957 82.1576954 20.4255983 83.5794053 17.6445281 84.265748 15.4037645 84.5968945 13.9474052 88.1507067 10.0930358 90.5982307 6.34745899 91.8747171 2.81489648 92.0661901 2.28556063 92.0375154 1.71417048 91.793318 1.20494757 91.5491206.696638881 91.1190001.312664695 90.5834308.123420274 90.3531083.0411400914 90.1116858 0 89.8665635 0M89.8665635.914224254C90.001612.914224254 90.1385106.936165636 90.2726341.984619521 90.8997775 1.20586179 91.227224 1.88787308 91.0033764 2.50771713 89.6112662 6.36117236 86.9102949 10.110406 83.7459035 13.5122345 83.4582316 14.8625437 82.8070385 17.1270772 81.3316792 20.0132831L79.0173538 20.4703953 78.336561 24.9153536C78.0414892 25.3313256 77.7390174 25.7500403 77.4115709 26.1778973 74.8169735 29.5742404 71.000464 31.3130949 67.427227 32.2026351L66.1479656 29.331971 63.1620974 32.9294434C61.9096607 33.050121 60.7978225 33.0857757 59.9237068 33.0857757 58.685145 33.0857757 57.9248031 33.0144663 57.9248031 33.0144663 59.8617325 26.4530788 63.5431933 21.9349825 67.5391508 18.830277L71.7811557 18.5505243 71.6174325 16.164399C75.3682676 14.1009949 78.9701793 13.0734068 81.3076295 12.5724119 84.5682198 9.19709599 87.370015 5.47437483 88.7306755 1.70594246 88.9064237 1.21866093 89.3716937.914224254 89.8665635.914224254"/>
+  <path stroke="#59ACFF" stroke-linecap="round" stroke-linejoin="round" d="M85 85C85 85 91.9263077 93.1483217 96 96M122 57C122 57 130.16317 59 142 59M73 25C73 25 77.6783626 22.2915469 85 15"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/exit-fullscreen.svg b/waterfox/browser/themes/lepton/icons/exit-fullscreen.svg
new file mode 100644
index 0000000000000..5a26852d6a4a3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/exit-fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14.995 7.37c0 .345-.28.625-.625.625H8.63a.625.625 0 0 1-.625-.625V1.63a.625.625 0 1 1 1.25 0v4.231l3.673-3.673a.625.625 0 1 1 .884.884l-3.673 3.673h4.231c.345 0 .625.28.625.625ZM1.005 8.63c0-.345.28-.625.625-.625h5.74c.345 0 .625.28.625.625v5.74a.625.625 0 1 1-1.25 0v-4.231l-3.673 3.673a.625.625 0 1 1-.884-.884l3.673-3.673H1.63a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/eye-hide.svg b/waterfox/browser/themes/lepton/icons/eye-hide.svg
new file mode 100644
index 0000000000000..767a43ebcef38
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/eye-hide.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14.812 1.188a.625.625 0 0 1 0 .884l-12.74 12.74a.625.625 0 1 1-.884-.884l12.74-12.74a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M13.02 3.566A8.668 8.668 0 0 0 8 2C3 2 0 6 0 8c0 1.333 1.332 3.553 3.7 4.886l.923-.923a7.408 7.408 0 0 1-1.657-1.138 6.484 6.484 0 0 1-1.323-1.644c-.3-.547-.393-.962-.393-1.181 0-.219.094-.634.393-1.18a6.484 6.484 0 0 1 1.323-1.645A7.409 7.409 0 0 1 8 3.25c1.646 0 3.033.502 4.12 1.216l.9-.9ZM14.515 4.9l-.885.886c.302.349.545.702.727 1.034.3.547.393.962.393 1.181 0 .219-.094.634-.393 1.18a6.486 6.486 0 0 1-1.323 1.645A7.41 7.41 0 0 1 8 12.75c-.43 0-.843-.034-1.238-.098L5.71 13.705A8.883 8.883 0 0 0 8 14c5 0 8-4 8-6 0-.832-.519-2.01-1.485-3.101Zm-6.068 6.068a3.002 3.002 0 0 0 2.52-2.52l-2.52 2.52Zm1.947-4.775a3 3 0 1 0-4.202 4.202l.898-.899A1.749 1.749 0 0 1 8 6.25c.633 0 1.188.336 1.495.84l.899-.898Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/eye-show.svg b/waterfox/browser/themes/lepton/icons/eye-show.svg
new file mode 100644
index 0000000000000..82e364ff5878a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/eye-show.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.643 6.82c-.3.546-.393.961-.393 1.18 0 .219.094.634.393 1.18.29.53.733 1.109 1.323 1.645A7.409 7.409 0 0 0 8 12.75a7.41 7.41 0 0 0 5.034-1.925 6.486 6.486 0 0 0 1.323-1.644c.3-.547.393-.962.393-1.181 0-.219-.094-.634-.393-1.18a6.487 6.487 0 0 0-1.323-1.645A7.409 7.409 0 0 0 8 3.25c-2.15 0-3.859.856-5.034 1.925a6.484 6.484 0 0 0-1.323 1.644ZM0 8c0-2 3-6 8-6s8 4 8 6-3 6-8 6-8-4-8-6Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8 9.75a1.75 1.75 0 1 0 0-3.5 1.75 1.75 0 0 0 0 3.5ZM8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/eye-tracking-off.svg b/waterfox/browser/themes/lepton/icons/eye-tracking-off.svg
new file mode 100644
index 0000000000000..86089ddaa1e4e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/eye-tracking-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14.812 1.188a.625.625 0 0 1 0 .884l-12.74 12.74a.625.625 0 1 1-.884-.884l12.74-12.74a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M12.659 3.927C11.44 2.832 9.824 2 8 2 4 2 1 6 1 8c0 1.24 1.155 3.252 2.987 4.6l.921-.922a17.566 17.566 0 0 1-.63-.566c-.102-.094-.205-.19-.312-.287a6.484 6.484 0 0 1-1.323-1.644c-.3-.547-.393-.962-.393-1.181 0-.219.094-.634.393-1.18a6.484 6.484 0 0 1 1.323-1.645l.311-.287C5.283 3.958 6.047 3.25 8 3.25c1.945 0 2.71.701 3.71 1.626l.949-.95Zm1.328 1.5-.921.921c.11.16.207.318.29.471.3.547.394.962.394 1.181 0 .219-.094.634-.393 1.18a6.486 6.486 0 0 1-1.323 1.645l-.311.287c-1.006.93-1.77 1.638-3.723 1.638-.469 0-.869-.04-1.22-.115l-.964.963A6.245 6.245 0 0 0 8 14c4 0 7-4 7-6 0-.699-.366-1.642-1.013-2.573Zm-5.54 5.54a3.002 3.002 0 0 0 2.52-2.52l-2.52 2.52Zm1.947-4.775a3 3 0 1 0-4.202 4.202l.898-.899A1.749 1.749 0 0 1 8 6.25c.633 0 1.188.336 1.495.84l.899-.898ZM5 0H2a2 2 0 0 0-2 2v3h1.25V2A.75.75 0 0 1 2 1.25h3V0ZM0 11v3a2 2 0 0 0 2 2h3v-1.25H2a.75.75 0 0 1-.75-.75v-3H0ZM11 0v1.25h3a.75.75 0 0 1 .75.75v3H16V2a2 2 0 0 0-2-2h-3Zm5 11h-1.25v3a.75.75 0 0 1-.75.75h-3V16h3a2 2 0 0 0 2-2v-3Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/filter-dismiss.svg b/waterfox/browser/themes/lepton/icons/filter-dismiss.svg
new file mode 100644
index 0000000000000..bb9ce9b77d710
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/filter-dismiss.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M15.94 6.144a4.537 4.537 0 1 1-9.074 0 4.537 4.537 0 0 1 9.074 0zm-5.895-1.942a.413.413 0 0 0-.584.584l1.359 1.358-1.36 1.358a.413.413 0 0 0 .584.583l1.358-1.358 1.358 1.358a.413.413 0 0 0 .583-.583l-1.358-1.358 1.358-1.358a.413.413 0 0 0-.583-.584l-1.358 1.359zm-2.069 6.067A5.392 5.392 0 0 1 6.884 9.03h-3.73a.619.619 0 0 0 0 1.238zM6.04 6.144c0-.426.05-.84.144-1.238H.68a.619.619 0 0 0 0 1.238zm2.063 7.012a.619.619 0 0 1 0 1.237H5.628a.619.619 0 0 1 0-1.237z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/filter-reload.svg b/waterfox/browser/themes/lepton/icons/filter-reload.svg
new file mode 100644
index 0000000000000..71b4c68828d17
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/filter-reload.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.985 1.627a4.537 4.537 0 0 0-4.12 4.518 4.537 4.537 0 1 0 9.075 0 4.537 4.537 0 0 0-4.955-4.518zm.377 1.76a2.727 2.727 0 0 1 1.84.71l.572-.572a.196.196 0 0 1 .334.14V5.23l-.117.118h-1.567a.196.196 0 0 1-.138-.336l.568-.569a2.24 2.24 0 0 0-1.492-.566 2.258 2.258 0 0 0-2.256 2.256 2.258 2.258 0 0 0 2.256 2.256 2.247 2.247 0 0 0 2.246-2.037.25.25 0 0 1 .268-.221.246.246 0 0 1 .22.267 2.735 2.735 0 0 1-2.734 2.48 2.75 2.75 0 0 1-2.746-2.745 2.75 2.75 0 0 1 2.746-2.746zM.68 4.907a.62.62 0 0 0 0 1.238h5.36c0-.426.05-.84.144-1.239H.68zm2.475 4.122a.62.62 0 0 0 0 1.239l4.82.002a5.392 5.392 0 0 1-1.092-1.24H3.155zm2.472 4.127a.619.619 0 0 0 0 1.237h2.475a.619.619 0 0 0 0-1.237H5.627z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/find-again.svg b/waterfox/browser/themes/lepton/icons/find-again.svg
new file mode 100644
index 0000000000000..8f1b2b7bc7ffa
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/find-again.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.558 9.558a.625.625 0 0 1 .884 0l4.37 4.37a.625.625 0 1 1-.884.884l-4.37-4.37a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M6.5 2.25a4.25 4.25 0 1 0 3.005 7.255.625.625 0 0 1 .884.884 5.5 5.5 0 1 1 1.424-5.313.625.625 0 0 1-1.208.324A4.25 4.25 0 0 0 6.5 2.25Z" clip-rule="evenodd"/><path d="M12.5 6H9.207a.5.5 0 0 1-.353-.854l3.292-3.292a.5.5 0 0 1 .854.353V5.5a.5.5 0 0 1-.5.5Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/firefox-view.svg b/waterfox/browser/themes/lepton/icons/firefox-view.svg
new file mode 100644
index 0000000000000..a3da0d09e25b2
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/firefox-view.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><g clip-path="url(#a)"><path d="M6 8.625C6 8.28 6.28 8 6.625 8h2.75a.625.625 0 1 1 0 1.25h-2.75A.625.625 0 0 1 6 8.625"/><path fill-rule="evenodd" d="M14 5.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V6a.75.75 0 0 0-.75-.75M2 4a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zM2.375 2.74c0-1.102.893-1.995 1.995-1.995h7.26c1.102 0 1.995.893 1.995 1.995h-1.25a.745.745 0 0 0-.745-.745H4.37a.745.745 0 0 0-.745.745z" clip-rule="evenodd"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/flame.svg b/waterfox/browser/themes/lepton/icons/flame.svg
new file mode 100644
index 0000000000000..dd1062cf73ccb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/flame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><g clip-path="url(#a)"><path fill-rule="evenodd" d="M5.489.065a.625.625 0 0 0-.862.757C5.034 2.08 5.07 3 4.93 3.728c-.139.73-.463 1.325-.874 1.927-.126.186-.264.374-.406.569-.758 1.037-1.646 2.253-1.646 4.126 0 1.669.629 3.095 1.711 4.102 1.079 1.002 2.571 1.553 4.25 1.553 1.758 0 3.185-.857 4.189-1.955.995-1.09 1.62-2.465 1.765-3.623l.002-.015c.13-1.305.104-2.106-.058-2.853-.1-.461-.259-.916-.44-1.436a37.137 37.137 0 0 1-.291-.854.625.625 0 0 0-1.066-.218l-.232.268c-.404.468-.754.874-1.258 1.28-.106-1.233-.405-2.329-1.03-3.315C8.738 2.002 7.428.983 5.49.065M10 13.26c0 .22-.02.43-.06.64l-.11.397c.529-.272.999-.65 1.402-1.09.835-.915 1.336-2.051 1.447-2.927.123-1.233.087-1.889-.036-2.456-.081-.375-.195-.703-.347-1.136a8.216 8.216 0 0 1-1.98 1.6.625.625 0 0 1-.944-.537c0-1.593-.245-2.794-.88-3.799-.482-.76-1.216-1.453-2.33-2.118.13.797.117 1.495-.003 2.127-.185.974-.616 1.734-1.07 2.398-.16.236-.32.458-.475.672-.74 1.025-1.359 1.884-1.359 3.319 0 1.34.498 2.43 1.312 3.186.446.414.997.738 1.633.948l-.09-.304c-.07-.3-.11-.6-.11-.92 0-1.42.7-2.7 1.79-3.21.13-.06.29-.06.42 0 1.09.51 1.79 1.79 1.79 3.21" clip-rule="evenodd"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/fluid.svg b/waterfox/browser/themes/lepton/icons/fluid.svg
new file mode 100644
index 0000000000000..6686e4f184cd9
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/fluid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11 3.25H7V2h4a2 2 0 0 1 2 2v3h-1.25V4a.75.75 0 0 0-.75-.75ZM2 7v4a2 2 0 0 0 2 2h3v-1.25H4a.75.75 0 0 1-.75-.75V7H2ZM4 1.25H2a.75.75 0 0 0-.75.75v2c0 .414.336.75.75.75h2A.75.75 0 0 0 4.75 4V2A.75.75 0 0 0 4 1.25ZM2 0a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2ZM14 9.25h-4a.75.75 0 0 0-.75.75v4c0 .414.336.75.75.75h4a.75.75 0 0 0 .75-.75v-4a.75.75 0 0 0-.75-.75ZM10 8a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2h-4Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/folder-globe.svg b/waterfox/browser/themes/lepton/icons/folder-globe.svg
new file mode 100644
index 0000000000000..5325f8a1c3e0a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/folder-globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12.732 11.625c-.072 1.239-.352 2.305-.729 3.059-.476.953-.903 1.066-1.003 1.066-.1 0-.527-.114-1.003-1.066-.377-.754-.657-1.82-.73-3.059h3.465Zm1.252 0c-.083 1.604-.482 3.02-1.07 3.996a5.005 5.005 0 0 0 3.047-3.996h-1.977Zm-4.898 3.996a5.005 5.005 0 0 1-3.047-3.996h1.977c.083 1.604.482 3.02 1.07 3.996Zm.182-5.246c.072-1.239.352-2.305.729-3.059.476-.953.903-1.066 1.003-1.066.1 0 .527.113 1.003 1.066.377.754.657 1.82.73 3.059H9.267Zm-1.252 0H6.04a5.005 5.005 0 0 1 3.047-3.996c-.588.976-.987 2.392-1.07 3.996Zm4.898-3.996a5.005 5.005 0 0 1 3.047 3.996h-1.977c-.083-1.604-.482-3.02-1.07-3.996Z" clip-rule="evenodd"/><path d="M7.086 1.586A2 2 0 0 0 5.672 1H3a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h2.803c-.226-.39-.41-.81-.544-1.25H3a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 3 2.25h2.672a.75.75 0 0 1 .53.22l.828.828c.196.196.311.364.405.502.2.292.308.45.893.45H13a.75.75 0 0 1 .75.75v.666c.453.234.873.525 1.25.862V5a2 2 0 0 0-2-2H8.328c-.281 0-.275-.06-.263-.171.01-.099.025-.239-.15-.415l-.83-.828Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/folder-open.svg b/waterfox/browser/themes/lepton/icons/folder-open.svg
new file mode 100644
index 0000000000000..177409b50dad5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/folder-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M15.582 7.597A.856.856 0 0 0 15 7.37V5a2 2 0 0 0-2-2H9.328a2 2 0 0 1-1.414-.586l-.828-.828A2 2 0 0 0 5.672 1H3a2 2 0 0 0-2 2v6.37a.804.804 0 0 0-.789.978l.448 2.074A2 2 0 0 0 2.614 14H13.28a2 2 0 0 0 1.978-1.702l.594-3.94a.858.858 0 0 0-.269-.761Zm-13.5 2.398a1.255 1.255 0 0 1-.558.51l.357 1.653a.75.75 0 0 0 .733.592H13.28a.75.75 0 0 0 .742-.638l.538-3.572a1.254 1.254 0 0 1-.642-.545H9.328c-.364 0-.714.145-.972.403l-.828.828a2.625 2.625 0 0 1-1.856.769h-3.59Zm11.668-3.25V5a.75.75 0 0 0-.75-.75H9.328a3.25 3.25 0 0 1-2.298-.952l-.828-.828a.75.75 0 0 0-.53-.22H3a.75.75 0 0 0-.75.75v5.745h3.422c.364 0 .714-.145.972-.403l.828-.828a2.625 2.625 0 0 1 1.856-.769h4.422Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/folder.svg b/waterfox/browser/themes/lepton/icons/folder.svg
new file mode 100644
index 0000000000000..8b82f6251533c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/folder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M7.086 1.586A2 2 0 0 0 5.672 1H3a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H9.328a2 2 0 0 1-1.414-.586l-.828-.828ZM2.25 12c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V5a.75.75 0 0 0-.75-.75H9.328c-.53 0-1.037.21-1.412.586l-.83.828a2 2 0 0 1-1.414.586H2.25V12Zm4.78-8.702-.828-.828a.75.75 0 0 0-.53-.22H3a.75.75 0 0 0-.75.75v2h3.422a.75.75 0 0 0 .53-.22l.83-.828c.119-.12.246-.228.38-.327a3.25 3.25 0 0 1-.382-.327Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/forget.svg b/waterfox/browser/themes/lepton/icons/forget.svg
new file mode 100644
index 0000000000000..a18d6d4d783c8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/forget.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M9.624 2.625a6.25 6.25 0 0 0-7.716 3.099l-1.12-.557a7.5 7.5 0 1 1-.783 3.338.625.625 0 1 1 1.25 0 6.25 6.25 0 1 0 8.369-5.88Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M.63 1.375c.345 0 .625.28.625.625v3.375H4.63a.625.625 0 1 1 0 1.25h-4A.625.625 0 0 1 .005 6V2c0-.345.28-.625.625-.625ZM7.625 4A.625.625 0 0 0 7 4.625V7.79L4.278 9.605a.625.625 0 0 0 .694 1.04l3-2a.625.625 0 0 0 .278-.52v-3.5A.625.625 0 0 0 7.625 4Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/highlight.svg b/waterfox/browser/themes/lepton/icons/highlight.svg
new file mode 100644
index 0000000000000..63628f4e0216d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/highlight.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.63.005c.345 0 .625.28.625.625v3c0 .76.616 1.375 1.375 1.375h8.74c.76 0 1.375-.616 1.375-1.375v-3a.625.625 0 1 1 1.25 0v3a2.625 2.625 0 0 1-2.625 2.625H3.63A2.625 2.625 0 0 1 1.005 3.63v-3c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M11.75 6.25h-7.5V8c0 .414.336.75.75.75h6a.75.75 0 0 0 .75-.75V6.25ZM3 5v3a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V5H3Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M9.75 10.25h-3.5v3.727l3.5-1.75V10.25ZM5 9v5.382a1 1 0 0 0 1.447.894l4-2a1 1 0 0 0 .553-.894V9H5Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/history-reverse.svg b/waterfox/browser/themes/lepton/icons/history-reverse.svg
new file mode 100644
index 0000000000000..7c0bf9670a863
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/history-reverse.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7.625 1.75c3.446 0 6.25 2.804 6.25 6.25s-2.804 6.25-6.25 6.25-6.25-2.804-6.25-6.25 2.804-6.25 6.25-6.25m0-1.25a7.5 7.5 0 1 0 0 15 7.5 7.5 0 0 0 0-15z"/>
+  <path d="M4.661 10.424c.11 0 .217-.029.312-.084l3-1.732.312-.542V4.625A.628.628 0 007.66 4a.628.628 0 00-.625.625v3.081L4.347 9.258a.627.627 0 00.314 1.166z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/horizon-night.svg b/waterfox/browser/themes/lepton/icons/horizon-night.svg
new file mode 100644
index 0000000000000..64593447c720e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/horizon-night.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.4 -->
+<svg width="3840" height="2160" viewBox="0 0 3840 2160" xmlns="http://www.w3.org/2000/svg">
+    <g id="Night">
+        <g id="night-sky">
+            <linearGradient id="linearGradient1" x1="1919" y1="0" x2="1919" y2="1260.659341" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#13387a" stop-opacity="1"/>
+                <stop offset="0.526407" stop-color="#1261b3" stop-opacity="1"/>
+                <stop offset="1" stop-color="#526acc" stop-opacity="1"/>
+            </linearGradient>
+            <path id="Path" fill="url(#linearGradient1)" fill-rule="evenodd" stroke="none" d="M -1 0 L 3839 0 L 3839 1260.659424 L -1 1260.659424 Z"/>
+            <path id="path1" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 1185.760254 381.483643 C 1200.263916 380.681885 1214.829346 380.196655 1229.273193 378.628174 C 1229.686401 378.584351 1229.70752 377.970703 1229.273193 377.968872 C 1214.765991 377.901978 1200.248169 378.930664 1185.760254 379.63562 C 1171.26709 380.338989 1156.671875 380.782104 1142.247314 382.413696 C 1141.742676 382.471802 1141.712769 383.218994 1142.247314 383.224243 C 1156.745728 383.35791 1171.290039 382.283691 1185.760254 381.483643 Z"/>
+            <linearGradient id="linearGradient2" x1="1240.893978" y1="377.078505" x2="1396.018263" y2="517.322076" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path2" fill="url(#linearGradient2)" fill-rule="evenodd" stroke="none" d="M 1316.929199 448.340088 C 1342.67334 471.641968 1368.624878 494.824463 1395.179688 517.201538 C 1395.649048 517.595459 1396.32959 516.932495 1395.860229 516.521118 C 1369.732666 493.609497 1343.497925 470.85083 1317.665894 447.603394 C 1291.83374 424.357666 1266.736572 400.303101 1240.894043 377.078491 C 1265.213989 401.834595 1291.207764 425.055542 1316.929199 448.340088 Z"/>
+            <linearGradient id="linearGradient3" x1="1220.512527" y1="416.6177" x2="1231.899223" y2="386.214141" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path3" fill="url(#linearGradient3)" fill-rule="evenodd" stroke="none" d="M 1231.887939 386.446045 C 1231.967041 386.2052 1231.608398 386.12085 1231.516968 386.344116 C 1227.487061 396.25708 1223.553833 406.106689 1220.519165 416.390747 C 1220.4646 416.578857 1220.76355 416.715942 1220.846191 416.527832 C 1225.176758 406.706299 1228.55603 396.631592 1231.887939 386.446045 Z"/>
+            <linearGradient id="linearGradient4" x1="1497.422623" y1="441.182228" x2="1421.791896" y2="506.225962" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path4" fill="url(#linearGradient4)" fill-rule="evenodd" stroke="none" d="M 1453.622925 477.877808 C 1468.234009 465.891846 1483.108643 454.15564 1497.334595 441.708984 C 1497.587769 441.487427 1497.241455 441.025024 1496.968872 441.236084 C 1482.405273 452.421997 1468.388672 464.346313 1454.187378 475.98584 C 1439.555298 487.977173 1424.800171 499.769653 1410.591675 512.269043 C 1410.477539 512.370972 1410.633911 512.580322 1410.758789 512.485352 C 1425.366211 501.329224 1439.416382 489.533203 1453.622925 477.877808 Z"/>
+            <linearGradient id="linearGradient5" x1="1415.409684" y1="514.496909" x2="1307.586882" y2="599.023008" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path5" fill="url(#linearGradient5)" fill-rule="evenodd" stroke="none" d="M 1346.075073 568.354858 C 1329.616089 580.931519 1312.82312 593.042236 1295.980957 605.098511 C 1295.187988 605.666382 1295.929932 606.988647 1296.758057 606.427856 C 1314.117188 594.649292 1331.012207 582.174683 1347.64856 569.399292 C 1363.852539 556.954468 1380.255127 544.42688 1395.333862 530.622925 C 1395.74353 530.246704 1395.182739 529.483643 1394.725586 529.835327 C 1378.326416 542.436523 1362.512817 555.790527 1346.075073 568.354858 Z"/>
+            <linearGradient id="linearGradient6" x1="1239.440932" y1="362.920768" x2="1252.892068" y2="304.532967" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path6" fill="url(#linearGradient6)" fill-rule="evenodd" stroke="none" d="M 1252.88501 299.633911 C 1252.986938 298.912964 1251.953247 298.57373 1251.759644 299.322754 C 1246.354858 320.096313 1243.241089 341.541626 1239.445068 362.645874 C 1239.395752 362.920044 1239.807251 363.041382 1239.868652 362.761841 C 1244.491211 341.838745 1249.864258 320.868164 1252.88501 299.633911 Z"/>
+            <linearGradient id="linearGradient7" x1="1510.160958" y1="452.649909" x2="1558.804258" y2="507.62706" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path7" fill="url(#linearGradient7)" fill-rule="evenodd" stroke="none" d="M 1566.444702 517.879639 C 1566.820923 518.338623 1567.64209 517.714355 1567.274536 517.239746 C 1549.759033 494.540771 1530.571289 472.968994 1510.323364 452.678833 C 1510.235474 452.590942 1510.103638 452.722778 1510.18811 452.814209 C 1529.641235 473.930664 1548.264526 495.664429 1566.444702 517.879639 Z"/>
+            <path id="path8" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2068.089355 240.73938 C 2068.606201 240.456299 2068.152344 239.744141 2067.638916 239.967407 C 2052.131348 246.720947 2036.634399 254.430786 2021.938965 262.794678 C 2021.852905 262.843872 2021.912476 262.998779 2022.007324 262.958252 C 2037.631348 256.435181 2053.246338 248.890625 2068.089355 240.73938 Z"/>
+            <linearGradient id="linearGradient8" x1="1928.555288" y1="262.744599" x2="1792.406756" y2="262.744599" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path9" fill="url(#linearGradient8)" fill-rule="evenodd" stroke="none" d="M 1898.176514 266.334106 C 1933.306152 266.78418 1968.553589 267.513794 2003.671021 266.286499 C 2004.368896 266.261963 2004.372559 265.217651 2003.671021 265.201782 C 1968.523682 264.370117 1933.33252 264.883423 1898.176514 264.470337 C 1863.059082 264.058838 1827.816895 262.30603 1792.704712 262.847534 C 1792.302124 262.854614 1792.312744 263.436401 1792.704712 263.466431 C 1827.686768 266.116089 1863.108276 265.885742 1898.176514 266.334106 Z"/>
+            <path id="path10" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2200.556152 239.393677 C 2239.499512 241.081543 2278.414551 243.384644 2317.287354 246.278809 C 2339.332275 247.921143 2361.354248 249.835815 2383.379639 251.715332 C 2384.679199 251.82605 2384.657959 249.823608 2383.379639 249.696899 C 2305.83252 242.006348 2227.856201 237.67041 2149.974854 235.358398 C 2127.894775 234.702515 2105.755127 233.883301 2083.666504 234.523315 C 2082.964844 234.542603 2082.970215 235.571167 2083.666504 235.608032 C 2122.579834 237.687988 2161.616211 237.703857 2200.556152 239.393677 Z M 2448.395996 296.348267 C 2458.560547 307.841919 2468.860352 319.215942 2479.291992 330.470459 C 2500.329102 353.164185 2521.825684 375.525391 2544.090088 397.02356 C 2544.74585 397.654785 2545.737549 396.666626 2545.090576 396.023071 C 2523.327148 374.373779 2501.762207 352.573364 2480.82666 330.118896 C 2470.553467 319.101807 2460.408447 307.966797 2450.389893 296.715698 C 2440.070801 285.127319 2430.403809 272.526001 2419.395508 261.60022 C 2419.230225 261.436768 2418.91748 261.656494 2419.061523 261.858643 C 2427.711914 274.055664 2438.49707 285.157104 2448.395996 296.348267 Z M 2358.047363 550.599609 C 2373.407227 539.315063 2388.709229 527.949829 2403.953125 516.507202 C 2434.282959 493.743286 2464.38916 470.68042 2494.247803 447.299316 C 2511.262207 433.975342 2528.334717 420.681396 2545.036133 406.963501 C 2546.001465 406.170532 2544.631836 404.855347 2543.675293 405.60437 C 2483.246338 452.932739 2423.00708 500.363159 2361.197998 545.89978 C 2344.223877 558.406128 2326.778564 570.416748 2310.312744 583.587769 C 2309.927734 583.895386 2310.427002 584.53186 2310.83667 584.268066 C 2327.067139 573.817139 2342.495605 562.024536 2358.047363 550.599609 Z M 2132.665039 333.63269 C 2132.853271 333.954468 2133.338623 333.669678 2133.164551 333.34082 C 2117.540771 303.886719 2100.647461 275.162231 2084.322266 246.096924 C 2084.269287 246.003662 2084.128662 246.086182 2084.179932 246.179565 C 2100.306396 275.359253 2115.840332 304.845093 2132.665039 333.63269 Z"/>
+            <path id="path11" fill="#ffffff" fill-rule="evenodd" stroke="none" opacity="0.1" d="M 1978.886475 211.406738 C 1978.592896 211.088379 1978.1604 211.54895 1978.418823 211.87439 C 1989.346191 225.544678 2000.758911 238.840332 2011.454224 252.697021 C 2011.528076 252.793823 2011.693359 252.702393 2011.619507 252.600464 C 2001.272339 238.448242 1990.735229 224.364868 1978.886475 211.406738 Z"/>
+            <path id="path12" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2450.479736 202.144775 C 2450.722168 201.9198 2450.366943 201.578857 2450.119141 201.786133 C 2438.88916 211.231567 2428.028564 221.067139 2417.175049 230.941406 C 2417.009766 231.090698 2417.250488 231.326416 2417.41748 231.183838 C 2428.577148 221.650879 2439.697998 212.107056 2450.479736 202.144775 Z"/>
+            <linearGradient id="linearGradient9" x1="2559.408654" y1="413.200549" x2="2578.462569" y2="434.733001" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path13" fill="url(#linearGradient9)" fill-rule="evenodd" stroke="none" d="M 2583.604004 442.525513 C 2584.358154 443.33252 2585.531006 442.136963 2584.80835 441.321167 C 2574.810791 430.020874 2564.883789 418.089478 2553.828125 407.810791 C 2553.450195 407.459229 2552.727539 407.940918 2553.073975 408.392822 C 2562.302734 420.408691 2573.262207 431.464355 2583.604004 442.525513 Z"/>
+            <path id="path14" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2251.628174 486.878174 C 2251.358887 486.45459 2250.697998 486.83606 2250.952881 487.273804 C 2267.874268 516.39209 2285.020508 545.401367 2302.293457 574.310425 C 2302.365479 574.431641 2302.552002 574.324341 2302.483398 574.199585 C 2286.212646 544.740356 2269.716797 515.272095 2251.628174 486.878174 Z M 2335.022461 332.029053 C 2334.479248 332.853638 2335.766113 333.565796 2336.327148 332.792114 C 2351.790771 311.459351 2368.527588 291.682739 2387.244141 273.126099 C 2387.467285 272.90625 2387.13501 272.584595 2386.904785 272.786743 C 2367.259766 290.019287 2349.434814 310.210938 2335.022461 332.029053 Z M 2171.188721 169.87085 C 2171.623291 169.575195 2171.222168 168.86853 2170.773926 169.158691 C 2141.263428 188.230225 2112.099609 207.762451 2083.187012 227.699219 C 2083.021729 227.813599 2083.174805 228.08252 2083.347168 227.971802 C 2112.906738 209.031982 2142.195313 189.698486 2171.188721 169.87085 Z"/>
+            <g id="Group">
+                <path id="path15" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2080.758301 236.483521 C 2080.758301 237.939941 2079.577393 239.12085 2078.12085 239.12085 C 2076.664307 239.12085 2075.483398 237.939941 2075.483398 236.483521 C 2075.483398 235.0271 2076.664307 233.846191 2078.12085 233.846191 C 2079.577393 233.846191 2080.758301 235.0271 2080.758301 236.483521 Z"/>
+                <path id="path16" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2022.736206 264.615356 C 2022.736206 266.071899 2021.55542 267.252808 2020.098877 267.252808 C 2018.642456 267.252808 2017.461548 266.071899 2017.461548 264.615356 C 2017.461548 263.158936 2018.642456 261.978027 2020.098877 261.978027 C 2021.55542 261.978027 2022.736206 263.158936 2022.736206 264.615356 Z"/>
+                <path id="path17" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2551.087891 404.39563 C 2552.544434 404.39563 2553.725342 403.214844 2553.725342 401.758301 C 2553.725342 400.301636 2552.544434 399.12085 2551.087891 399.12085 C 2549.631348 399.12085 2548.450439 400.301636 2548.450439 401.758301 C 2548.450439 403.214844 2549.631348 404.39563 2551.087891 404.39563 Z"/>
+                <path id="path18" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1220.978027 421.098877 C 1220.978027 422.555542 1219.797241 423.736206 1218.340698 423.736206 C 1216.884033 423.736206 1215.703247 422.555542 1215.703247 421.098877 C 1215.703247 419.642334 1216.884033 418.461548 1218.340698 418.461548 C 1219.797241 418.461548 1220.978027 419.642334 1220.978027 421.098877 Z"/>
+                <path id="path19" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1080.318726 563.516479 C 1080.318726 564.973022 1079.137939 566.153809 1077.681274 566.153809 C 1076.224731 566.153809 1075.043945 564.973022 1075.043945 563.516479 C 1075.043945 562.059937 1076.224731 560.87915 1077.681274 560.87915 C 1079.137939 560.87915 1080.318726 562.059937 1080.318726 563.516479 Z"/>
+                <path id="path20" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 1240.318726 375.384644 C 1240.318726 376.841187 1239.137939 378.021973 1237.681274 378.021973 C 1236.224731 378.021973 1235.043945 376.841187 1235.043945 375.384644 C 1235.043945 373.927979 1236.224731 372.747192 1237.681274 372.747192 C 1239.137939 372.747192 1240.318726 373.927979 1240.318726 375.384644 Z"/>
+                <path id="path21" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2937.021973 269.890137 C 2937.021973 271.346558 2935.841064 272.527466 2934.384521 272.527466 C 2932.928223 272.527466 2931.747314 271.346558 2931.747314 269.890137 C 2931.747314 268.433594 2932.928223 267.252808 2934.384521 267.252808 C 2935.841064 267.252808 2937.021973 268.433594 2937.021973 269.890137 Z"/>
+                <path id="path22" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2559 602.197754 C 2559 603.654419 2557.819092 604.835205 2556.362549 604.835205 C 2554.90625 604.835205 2553.725342 603.654419 2553.725342 602.197754 C 2553.725342 600.741211 2554.90625 599.560425 2556.362549 599.560425 C 2557.819092 599.560425 2559 600.741211 2559 602.197754 Z"/>
+                <path id="path23" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2602.956055 563.516479 C 2602.956055 564.973022 2601.775146 566.153809 2600.318604 566.153809 C 2598.862305 566.153809 2597.681396 564.973022 2597.681396 563.516479 C 2597.681396 562.059937 2598.862305 560.87915 2600.318604 560.87915 C 2601.775146 560.87915 2602.956055 562.059937 2602.956055 563.516479 Z"/>
+                <path id="path24" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2689.109863 640.87915 C 2689.109863 642.335693 2687.928955 643.516479 2686.472412 643.516479 C 2685.016113 643.516479 2683.835205 642.335693 2683.835205 640.87915 C 2683.835205 639.422485 2685.016113 638.241699 2686.472412 638.241699 C 2687.928955 638.241699 2689.109863 639.422485 2689.109863 640.87915 Z"/>
+                <path id="path25" fill="#ffffff" fill-opacity="0.05" fill-rule="evenodd" stroke="none" d="M 2432.406494 247.912109 C 2432.406494 263.448853 2419.811523 276.043945 2404.274658 276.043945 C 2388.738037 276.043945 2376.142822 263.448853 2376.142822 247.912109 C 2376.142822 232.375244 2388.738037 219.780273 2404.274658 219.780273 C 2419.811523 219.780273 2432.406494 232.375244 2432.406494 247.912109 Z"/>
+                <path id="path26" fill="#ffffff" fill-opacity="0.15" fill-rule="evenodd" stroke="none" d="M 2423.615479 248.79126 C 2423.615479 258.987183 2415.350098 267.252808 2405.153809 267.252808 C 2394.957764 267.252808 2386.692383 258.987183 2386.692383 248.79126 C 2386.692383 238.595215 2394.957764 230.329712 2405.153809 230.329712 C 2415.350098 230.329712 2423.615479 238.595215 2423.615479 248.79126 Z"/>
+                <path id="path27" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2409.549561 248.79126 C 2409.549561 251.218872 2407.581543 253.186768 2405.153809 253.186768 C 2402.726074 253.186768 2400.758301 251.218872 2400.758301 248.79126 C 2400.758301 246.363525 2402.726074 244.39563 2405.153809 244.39563 C 2407.581543 244.39563 2409.549561 246.363525 2409.549561 248.79126 Z"/>
+                <path id="path28" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 883.39563 561.758301 C 883.39563 564.185913 881.427612 566.153809 879 566.153809 C 876.572388 566.153809 874.60437 564.185913 874.60437 561.758301 C 874.60437 559.330566 876.572388 557.362671 879 557.362671 C 881.427612 557.362671 883.39563 559.330566 883.39563 561.758301 Z"/>
+                <path id="path29" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2808.67041 544.175781 C 2808.67041 546.603516 2806.702393 548.571411 2804.274658 548.571411 C 2801.847168 548.571411 2799.87915 546.603516 2799.87915 544.175781 C 2799.87915 541.748169 2801.847168 539.780273 2804.274658 539.780273 C 2806.702393 539.780273 2808.67041 541.748169 2808.67041 544.175781 Z"/>
+                <path id="path30" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2949.32959 421.098877 C 2949.32959 423.526611 2947.361816 425.494507 2944.934082 425.494507 C 2942.506348 425.494507 2940.538574 423.526611 2940.538574 421.098877 C 2940.538574 418.671265 2942.506348 416.703247 2944.934082 416.703247 C 2947.361816 416.703247 2949.32959 418.671265 2949.32959 421.098877 Z"/>
+                <path id="path31" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2697.901123 329.670288 C 2697.901123 332.098022 2695.933105 334.065918 2693.505615 334.065918 C 2691.077881 334.065918 2689.109863 332.098022 2689.109863 329.670288 C 2689.109863 327.242676 2691.077881 325.27478 2693.505615 325.27478 C 2695.933105 325.27478 2697.901123 327.242676 2697.901123 329.670288 Z"/>
+                <path id="path32" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 948.450562 354.285767 C 948.450562 356.713379 946.482544 358.681274 944.054932 358.681274 C 941.627319 358.681274 939.659363 356.713379 939.659363 354.285767 C 939.659363 351.858032 941.627319 349.890137 944.054932 349.890137 C 946.482544 349.890137 948.450562 351.858032 948.450562 354.285767 Z"/>
+                <path id="path33" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 1145.373657 382.417603 C 1145.373657 384.845215 1143.40564 386.813232 1140.978027 386.813232 C 1138.550293 386.813232 1136.582397 384.845215 1136.582397 382.417603 C 1136.582397 379.989868 1138.550293 378.021973 1140.978027 378.021973 C 1143.40564 378.021973 1145.373657 379.989868 1145.373657 382.417603 Z"/>
+                <path id="path34" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1403.835205 770.989014 C 1403.835205 773.416626 1401.867188 775.384644 1399.439575 775.384644 C 1397.011841 775.384644 1395.043945 773.416626 1395.043945 770.989014 C 1395.043945 768.561401 1397.011841 766.593384 1399.439575 766.593384 C 1401.867188 766.593384 1403.835205 768.561401 1403.835205 770.989014 Z"/>
+            </g>
+        </g>
+        <g id="mountains-pathway">
+            <path id="path35" fill="#4961b4" fill-rule="evenodd" stroke="none" d="M 270.492157 706 L 237.915115 767.303345 L 175.453323 807.775146 L 84.792488 841.87085 L -1 896.915161 L -1 1753.86377 L 3839 1753.86377 L 3839 899.321167 L 3678.332031 863.528931 L 3572.50415 772.416748 L 3393.599365 759.406372 L 3250.393311 798.461548 L 3087.573242 782.209839 L 2970.32959 808.276245 L 2918.222656 782.311768 L 2800.950928 805.223877 L 2739.05957 815.257813 L 2706.482666 832.071289 L 2681.351318 881.72876 L 2647.845703 881.72876 L 2614.724121 896.917236 L 2581.248779 905.831665 L 2554.661621 905.59314 L 2548.15332 925.35498 L 2523.06958 931.87207 L 2504.325195 954.658325 L 2455.550781 977.453125 L 2387.181396 980.742065 L 2361.141113 1003.588989 L 2302.512695 1010.231934 L 2243.87793 1036.536987 L 2195.014404 1056.372681 L 2155.740234 1037.932007 L 2064.708252 1037.932007 L 1963.716553 1034.794922 L 1921.170532 1057.457397 L 1768.251953 1057.457397 L 1673.568848 1024.915039 L 1628.167969 1024.915039 L 1582.560791 1005.506836 L 1432.482056 992.372681 L 1396.867798 992.372681 L 1373.840698 970.677856 L 1334.969971 970.677856 L 1318.683594 937.170044 L 1250.268799 919.931274 L 1204.42749 888.237183 L 1165.567505 888.237183 L 1152.301025 866.542236 L 1126.475464 866.542236 L 1064.762085 820.501343 L 911.83252 761.441284 L 759.085266 708.169434 L 709.482056 708.169434 L 686.678528 729.150635 L 648.41095 708.169434 L 566.139465 708.169434 L 405.423645 724.9375"/>
+            <path id="path36" fill="#485aaf" fill-rule="evenodd" stroke="none" d="M 270.338165 909.932129 L 200.875412 937.38916 L 146.607773 968.508301 L 74.975563 959.830322 L -1 977.186279 L -1 1753.86377 L 3838.997803 1753.86377 L 3838.997803 1074.813354 L 3779.40625 1074.813354 L 3763.126465 1083.604126 L 3737.07959 1095.651245 L 3671.851807 1089.999756 L 3645.91333 1089.999756 L 3613.353516 1095.536377 L 3590.563232 1104.329224 L 3551.492676 1110.837646 L 3522.189209 1101.074951 L 3492.885986 1094.570923 L 3460.326416 1088.066772 L 3431.025146 1104.346558 L 3339.858887 1117.378784 L 3251.948975 1075.108398 L 3128.2229 1114.22644 L 2994.729736 1094.837769 L 2890.540039 1039.789185 L 2766.816162 1085.88855 L 2682.006348 1083.491333 L 2587.73999 1083.491333 L 2545.415527 1062.998291 L 2460.761963 1097.822998 L 2402.155273 1101.077271 L 2356.572021 1084.8125 L 2284.942139 1091.32959 L 2170.985352 1088.090576 L 2122.145508 1110.904907 L 2070.051758 1137.004028 L 2021.21228 1124.123657 L 1965.861938 1130.90332 L 1913.768311 1118.430908 L 1859.303223 1107.355713 L 1786.788086 1107.355713 L 1767.251831 1089.706909 L 1718.412231 1065.55188 L 1669.574829 1056.060303 L 1610.968262 1046.839966 L 1585.793457 1018.406616 L 1448.17395 1018.406616 L 1426.329346 1037.910278 L 1358.901611 1063.924683 L 1317.935181 1069.074951 L 1298.398926 1072.873901 L 1279.721802 1083.491333 L 1243.048706 1083.491333 L 1213.747437 1066.521484 L 1180.393799 1056.520142 L 1161.651489 1063.111206 L 1136.4552 1070.474365 L 1109.557739 1070.474365 L 1083.77771 1060.830933 L 1054.20752 1043.045532 L 1018.391357 1030.570923 L 988.845215 1035.762573 L 959.786926 1035.762573 L 936.994324 1024.496338 L 907.690979 996.961182 L 875.131287 993.724243 L 849.084412 1010.028076 L 813.270447 1026.366455 L 793.734192 1013.486206 L 754.663818 1003.994629 L 722.104126 991.520142 L 702.31189 972.84729 L 676.520996 972.84729 L 621.170776 978.659424 L 598.378113 964.945923 L 565.820618 958.979858 L 539.506836 951.152466 L 513.726746 951.152466 L 461.359589 965.913696 L 441.552185 951.388916 L 414.962891 922.10083"/>
+            <path id="path37" fill="#4351a0" fill-rule="evenodd" stroke="none" d="M 2945.38916 816.644043 L 2899.780029 836.169434 L 2883.491455 829.660889 L 2847.653564 819.902588 L 2824.850098 823.16333 L 2811.820313 826.428467 L 2795.531494 836.214966 L 2779.240723 855.785889 L 2766.212891 881.913208 L 2749.922363 908.133667 L 2733.633789 941.05127 L 2723.862305 967.84021 L 2714.08667 992.129761 L 2697.79834 992.129761 L 2681.509521 974.348633 L 2665.221191 956.567383 L 2648.932617 950.05896 L 2632.641846 946.806885 L 2622.870605 940.298462 L 2609.838379 937.044189 L 2600.067139 940.298462 L 2587.034912 950.05896 L 2567.487793 972.836426 L 2551.199219 985.855469 L 2534.912842 992.361816 L 2518.622314 1002.124512 L 2505.590088 1015.143677 L 2492.560059 1031.414795 L 2476.271729 1047.690308 L 2450.209473 1070.47644 L 2433.921143 1073.748047 L 2407.858887 1083.545654 L 2375.281738 1103.135986 L 2362.251953 1100.018433 L 2303.610596 1126.321411 L 2267.774902 1169.166748 L 2255.649658 1170.027954 L 2231.939209 1170.027954 L 2205.877197 1175.564453 L 2153.755127 1181.098877 L 2127.692871 1168.082031 L 2091.857422 1161.573486 L 2039.731079 1168.082031 L 1997.380493 1158.321411 L 1961.547119 1116.016357 L 1906.164185 1093.23877 L 1886.617065 1063.952881 L 1827.977905 1047.681763 L 1785.627319 1057.442261 L 1749.793945 1067.204956 L 1726.988159 1086.730347 L 1713.956055 1109.51001 L 1671.605347 1119.272705 L 1619.483521 1112.762085 L 1593.419189 1106.253662 L 1577.132813 1119.272705 L 1554.327148 1109.51001 L 1531.523682 1103.001465 L 1518.491455 1096.493042 L 1498.944336 1109.51001 L 1485.912354 1103.001465 L 1463.108643 1089.984619 L 1450.080933 1099.747314 L 1417.501709 1073.713379 L 1388.18335 1050.936035 L 1365.377563 1028.156372 L 1345.830444 1002.124512 L 1300.223511 972.836426 L 1277.4198 969.584351 L 1248.097046 985.855469 L 1195.975098 969.584351 L 1169.912964 950.05896 L 1143.848633 969.584351 L 1127.562378 959.821655 L 1114.530273 966.330078 L 1101.498047 972.838623 L 1068.923218 989.109741 L 1033.085327 998.874756 L 1010.28186 979.355835 L 987.478394 963.093384 L 941.869202 943.585327 L 906.033508 940.365723 L 886.486389 959.956177 L 850.653015 979.616089 L 808.302368 970.124634 L 772.466736 947.889404 L 707.054382 935.723022 L 603.064209 935.723022 L 573.74353 910.355103 L 521.623718 933.794312 L 485.79245 914.277588 L 459.739014 898.017212 L 430.435669 893.159668 L 414.181854 901.34082 L 362.127106 893.296387 L 310.139587 885.345215 L 271.320953 901.985229 L 218.365875 968.265381 L 144.520737 988.020752 L 55.471832 1013.824585 L -1 988.020752 L -1 1753.86377 L 3838.997803 1753.86377 L 3838.997803 901.247681 L 3801.040527 891.500122 L 3779.373779 875.246338 L 3766.34375 862.259766 L 3723.990967 868.82666 L 3701.1875 881.96521 L 3600.197754 885.460205 L 3570.876953 876.181274 L 3551.332275 870.638306 L 3535.041504 870.638306 L 3512.238037 881.485718 L 3486.173584 881.485718 L 3463.370117 857.200439 L 3447.083984 842.675781 L 3424.278076 839.419312 L 3407.989746 849.182007 L 3378.668945 878.470093 L 3336.318359 868.707397 L 3271.161865 852.438477 L 3222.296387 907.758179 L 3091.988281 881.724365 L 3056.150391 871.96167 L 3023.575439 839.421509"/>
+        </g>
+        <g id="treeline-pathway">
+            <g id="g1">
+                <path id="path38" fill="#3d4797" fill-rule="evenodd" stroke="none" d="M 1173.333374 1050.470093 C 1171.358032 1044.234009 1167.826172 1037.966309 1164.578735 1031.663086 C 1161.315552 1035.325317 1158.536255 1039.0448 1155.259155 1042.81958 C 1150.700195 1036.84436 1146.384155 1030.845459 1141.819336 1024.820679 C 1138.520508 1029.328369 1135.34021 1033.895142 1132.031616 1038.519409 C 1128.744751 1034.256714 1125.51709 1029.984131 1122.226196 1025.699707 C 1118.915527 1028.303101 1115.630615 1030.946045 1112.310059 1033.630493 C 1109.019165 1027.987061 1105.740234 1022.325806 1102.443481 1016.646851 C 1098.463135 1020.593506 1094.48291 1024.60144 1090.490845 1028.668579 C 1087.839966 1024.569824 1085.193115 1020.461182 1082.540283 1016.346558 C 1079.855835 1019.307617 1077.171387 1022.296265 1074.48291 1025.310547 C 1071.816284 1022.637939 1069.151611 1019.961426 1066.484985 1017.286865 C 1063.1427 1018.768311 1059.800415 1020.279419 1056.454346 1021.814209 C 1053.129883 1018.319946 1049.801392 1014.825562 1046.473022 1011.331299 C 1043.119019 1013.614746 1039.762939 1015.92981 1036.404907 1018.272461 C 1033.070679 1015.534668 1029.7323 1012.79895 1026.394043 1010.071045 C 1023.034119 1011.716431 1019.674133 1013.389526 1016.312073 1015.086304 C 1013.637512 1010.286377 1010.962952 1005.482422 1008.286438 1000.674438 C 1004.250793 1004.490723 1000.215332 1008.352539 996.177795 1012.253662 C 992.187622 1004.338745 988.193604 996.411865 984.195618 988.474976 C 980.803894 995.46167 977.4104 1002.48584 974.018738 1009.551514 C 969.351135 1003.070557 964.67749 996.593506 960.001953 990.122437 C 955.948608 995.678955 951.893311 1001.276855 947.839966 1006.914429 C 943.820313 1001.304688 939.800476 995.702637 935.774841 990.106567 C 931.721497 995.03894 927.668213 1000.004883 923.61676 1005.006348 C 920.258728 997.237427 916.898743 989.470459 913.532837 981.705688 C 910.804871 989.085327 908.077026 996.484863 905.349121 1003.904053 C 903.310669 1000.016602 901.270142 996.131226 899.229614 992.247803 C 897.843018 995.963379 896.454346 999.684814 895.065735 1003.410278 C 891.699707 994.934204 888.327881 986.464111 884.954041 977.999878 C 881.5625 986.211304 878.172852 994.446411 874.785156 1002.703125 C 871.411316 997.304565 868.035522 991.917969 864.657715 986.543091 C 861.274109 991.79541 857.890381 997.065674 854.51062 1002.35144 C 851.130859 994.72876 847.75116 987.11792 844.367432 979.524902 C 840.98175 987.119873 837.599976 994.72876 834.218262 1002.35144 C 830.834534 998.584595 827.450806 994.833496 824.065125 991.10022 C 820.685425 994.956055 817.305664 998.825562 813.927979 1002.707031 C 810.540222 995.210815 807.148682 987.734253 803.757019 980.281372 C 800.383179 987.985107 797.013306 995.69873 793.645447 1003.418213 C 790.925415 999.750122 788.205444 996.097778 785.483459 992.457275 C 782.775391 996.382202 780.071106 1000.311035 777.36499 1004.243896 C 774.646851 1000.623047 771.92688 997.018311 769.204956 993.427002 C 765.837036 997.425171 762.47113 1001.43103 759.105164 1005.442871 C 755.043945 997.458618 750.982727 989.517944 746.919495 981.620605 C 742.23999 990.304077 737.566406 998.989624 732.89679 1007.671021 C 729.503235 1000.514526 726.111572 993.393555 722.718018 986.307983 C 719.375793 994.146118 716.035583 1001.976196 712.699219 1009.796509 C 709.317566 1005.719482 705.937805 1001.670044 702.558044 997.652344 C 699.213806 1002.527222 695.871582 1007.404419 692.531372 1012.277466 C 689.145691 1005.334229 685.759949 998.434448 682.376282 991.580078 C 679.711609 999.341187 677.046936 1007.086426 674.386169 1014.815674 C 671.020264 1011.647339 667.654297 1008.506592 664.290344 1005.399414 C 660.956055 1009.591064 657.625671 1013.782715 654.297302 1017.970337 C 651.593079 1014.055298 648.890869 1010.167847 646.190613 1006.307983 C 642.870117 1011.250244 639.549622 1016.186646 636.23114 1021.11499 C 632.205383 1013.922852 628.181702 1006.803833 624.16394 999.757935 C 620.211365 1008.449341 616.260742 1017.111084 612.31012 1025.737183 C 608.944214 1016.471069 605.582214 1007.281982 602.224182 998.1698 C 598.94519 1008.822632 595.666199 1019.430054 592.387146 1029.986084 C 589.052856 1025.113037 585.722473 1020.29126 582.396057 1015.52478 C 579.109131 1021.903076 575.822266 1028.259644 572.535339 1034.588501 C 569.216736 1030.545044 565.902222 1026.549072 562.593567 1022.60437 C 559.310608 1028.27356 556.029602 1033.922852 552.746643 1039.546631 C 549.436035 1032.228027 546.131348 1024.986694 542.832581 1017.828125 C 539.567444 1026.890869 536.300293 1035.902222 533.033081 1044.858276 C 529.775818 1039.734253 525.538757 1034.673584 522.295288 1029.681885 C 519.061707 1036.650757 515.555542 1043.5802 511.60495 1050.470093 L 511.60495 1396.765625 L 1173.333374 1396.765625 L 1173.333374 1050.470093 Z M 2633.086426 1130.098877 L 2623.465576 1118.57666 L 2615.458984 1128.209839 L 2610.504639 1118.57666 L 2601.185059 1127.757935 C 2601.185059 1127.757935 2594.285645 1117.759033 2589.720459 1111.734253 C 2586.421631 1116.241943 2581.266113 1120.808716 2577.95752 1125.432983 C 2574.670654 1121.170288 2571.442871 1116.897705 2568.1521 1112.613281 C 2564.841553 1115.216675 2561.556396 1117.859619 2558.236084 1120.544067 C 2554.945313 1114.900635 2551.66626 1109.23938 2548.369385 1103.560425 C 2544.38916 1107.50708 2540.408936 1111.515015 2536.416748 1115.582153 C 2533.765869 1111.483398 2531.119141 1107.374756 2528.466309 1103.260132 C 2525.781738 1106.221191 2523.097168 1109.209839 2520.408936 1112.224121 C 2517.742432 1109.551514 2515.077637 1106.875 2512.410889 1104.200439 C 2509.068604 1105.681885 2505.726563 1107.192993 2502.380127 1108.727783 C 2499.055664 1105.233521 2495.727539 1101.739136 2492.398926 1098.244873 C 2489.044922 1100.52832 2485.688965 1102.843384 2482.331055 1105.186035 C 2478.996338 1102.448242 2475.658203 1099.712524 2472.320068 1096.984619 C 2468.959961 1098.630005 2465.599854 1100.303101 2462.238037 1101.999878 C 2459.563477 1097.199951 2456.888916 1092.395996 2454.212158 1087.588013 C 2450.176758 1091.404297 2446.141357 1095.266113 2442.103516 1099.167236 C 2438.11377 1091.252319 2434.119385 1083.325439 2430.121582 1075.38855 C 2426.729736 1082.375244 2423.336182 1089.399414 2419.944824 1096.465088 C 2415.2771 1089.984131 2410.603516 1083.50708 2405.927734 1077.036011 C 2401.874512 1082.592529 2397.819336 1088.19043 2393.765869 1093.828003 C 2389.746094 1088.218262 2385.726563 1082.616211 2381.700684 1077.020142 C 2377.647217 1081.952515 2373.593994 1086.918457 2369.542725 1091.919922 C 2366.18457 1084.151001 2362.824707 1076.384033 2359.45874 1068.619263 C 2356.730713 1075.998901 2354.00293 1083.398438 2351.275146 1090.817627 C 2349.236572 1086.930298 2347.196045 1083.0448 2345.155518 1079.161377 C 2343.768799 1082.876953 2342.380127 1086.598511 2340.991455 1090.323853 C 2337.625732 1081.847778 2334.253662 1073.377686 2330.880127 1064.913452 C 2327.488525 1073.124878 2324.098633 1081.359985 2320.711182 1089.616699 C 2317.337158 1084.21814 2313.961426 1078.831543 2310.58374 1073.456665 C 2307.199951 1078.708984 2303.816406 1083.979248 2300.436523 1089.265015 C 2297.056885 1081.642334 2293.677002 1074.031494 2290.293457 1066.438477 C 2286.907471 1074.033447 2283.525879 1081.642334 2280.144287 1089.265015 C 2276.760498 1085.498169 2273.376709 1081.74707 2269.990967 1078.013794 C 2266.611328 1081.869629 2263.231689 1085.739136 2259.85376 1089.620605 C 2256.466309 1082.12439 2253.074707 1074.647827 2249.682861 1067.194946 C 2246.309082 1074.898682 2242.939453 1082.612305 2239.571289 1090.331787 C 2236.851318 1086.663696 2234.131348 1083.011353 2231.409424 1079.37085 C 2228.701172 1083.295776 2225.99707 1087.224609 2223.291016 1091.157471 C 2220.572998 1087.536621 2217.852783 1083.931885 2215.130859 1080.340576 C 2211.762939 1084.338745 2208.396973 1088.344604 2205.031006 1092.356445 C 2200.969727 1084.372192 2196.908691 1076.431519 2192.845459 1068.53418 C 2188.166016 1077.217651 2183.492188 1085.903198 2178.822754 1094.584595 C 2175.429199 1087.428101 2172.037598 1080.307129 2168.643799 1073.221558 C 2165.301758 1081.059692 2161.96167 1088.889771 2158.625 1096.710083 C 2155.243652 1092.633057 2151.86377 1088.583618 2148.484131 1084.565918 C 2145.139893 1089.440796 2141.797607 1094.317993 2138.457275 1099.19104 C 2135.071533 1092.247803 2131.686035 1085.348145 2128.302246 1078.493652 C 2125.637451 1086.254761 2122.9729 1094 2120.312012 1101.729248 C 2116.946045 1098.560913 2113.580322 1095.420166 2110.216309 1092.312988 C 2106.88208 1096.504639 2103.551514 1100.696289 2100.223389 1104.883911 C 2097.519043 1100.968872 2094.81665 1097.081421 2092.116699 1093.221558 C 2088.796143 1098.163818 2085.475586 1103.10022 2082.157227 1108.028564 C 2078.131348 1100.836548 2074.107666 1093.717529 2070.089844 1086.671509 C 2066.137451 1095.362915 2062.186768 1104.024658 2058.236084 1112.650757 C 2054.870117 1103.384644 2051.508301 1094.195557 2048.150146 1085.083374 C 2044.870972 1095.736206 2041.592163 1106.343628 2038.31311 1116.899658 C 2034.97876 1112.026611 2031.648315 1107.204834 2028.322021 1102.438354 C 2025.034912 1108.81665 2021.748169 1115.173218 2018.461182 1121.502075 C 2015.1427 1117.458618 2011.828247 1113.462646 2008.519531 1109.517944 C 2005.236572 1115.187134 2001.955566 1120.836548 1998.672607 1126.460205 C 1995.361938 1119.141602 1992.057251 1111.900269 1988.758423 1104.741699 C 1985.493286 1113.804443 1982.226074 1122.815796 1978.959106 1131.771851 C 1975.70166 1126.647827 1971.4646 1121.587158 1968.221191 1116.595459 C 1964.987671 1123.564331 1961.481445 1130.493774 1957.530884 1137.383667 L 1947.160522 1126.460205 L 1941.251953 1143.229736 L 1936.296265 1137.383667 L 1929.876587 1149.852051 L 1929.876587 1456.02478 L 2633.086426 1456.02478 L 2633.086426 1130.098877 Z"/>
+            </g>
+            <path id="path39" fill="#3a4088" fill-rule="evenodd" stroke="none" d="M 472.667633 997.755127 L 448.045441 1031.397705 L 420.00592 1002.078369 L 397.279968 1035.673462 L 369.189148 1006.352295 L 346.342712 1039.94751 L 318.024689 1011.612671 L 290.368378 1043.333374 L 266.666656 1014.515259 L 254.81282 1043.333374 L 223.209869 1004.59021 L 209.382721 1043.333374 L 185.677017 1004.59021 L 163.948624 1043.333374 L 138.271606 1004.59021 L 122.469139 1054.021973 L 94.812828 1016.488403 L 71.111115 1060.468262 L 71.111115 1633.802612 L 3567.407471 1633.802612 L 3567.407471 1014.515259 L 3555.081543 1048.694458 L 3541.678955 1017.830078 L 3531.450928 1050.010498 L 3517.696777 1019.144287 L 3507.286865 1051.324707 L 3493.119873 1020.478149 L 3481.244385 1053.258423 L 3463.897217 1023.13208 L 3452.280518 1055.88855 L 3434.93335 1025.764282 L 3423.314453 1058.518921 L 3408.124512 1028.345215 L 3390.087891 1057.011353 L 3365.445801 1023.317505 L 3345.311523 1051.750854 L 3336.478027 1018.057129 L 3316.341553 1046.488525 L 3304.553223 1012.542114 L 3282.935303 1046.954102 L 3255.300781 1018.587891 L 3235.521973 1052.871582 L 3192.094971 1024.507446 L 3182.192627 1058.791138 L 3162.787109 1030.722778 L 3137.661377 1078.722046 L 3124.230957 1054.029907 L 3105.195068 1078.704346 L 3098.236084 1045.030273 L 3083.45874 1068.175537 L 3070.587646 1034.509277 L 3053.838867 1057.656494 L 3044.568848 1030.515625 L 3029.746094 1054.625854 L 3013.686768 1023.737793 L 3000.112549 1055.939941 L 2984.057129 1025.052002 L 2974.4375 1057.255981 L 2954.785156 1026.516113 L 2931.219971 1063.526733 L 2909.732422 1038.518799 L 2887.105225 1075.367798 L 2859.699707 1050.355835 L 2837.07251 1087.202759 L 2809.098145 1056.401733 L 2787.000488 1099.381226 L 2763.584961 1075.673584 L 2742.220215 1112.536255 L 2718.814941 1088.828613 L 2697.449951 1125.691284 L 2674.23999 1101.924561 L 2654.925537 1137.636841 L 2632.946045 1114.369385 L 2615.415283 1148.161865 L 2593.442139 1124.894165 L 2575.913086 1158.684692 L 2559.842041 1133.449829 L 2541.763916 1167.869873 L 2526.856201 1141.360352 L 2512.788086 1175.762451 L 2491.962646 1141.358276 L 2483.820068 1183.655151 L 2462.283447 1166.717529 L 2451.375977 1189.710815 L 2432.551025 1171.800293 L 2420.426514 1193.002075 L 2403.583252 1171.143188 L 2389.481689 1196.287354 L 2373.311523 1176.344482 L 2354.429688 1194.114868 L 2347.759033 1159.989014 L 2326.103516 1187.204834 L 2319.456787 1153.084961 L 2297.807373 1180.304688 L 2289.278076 1145.843384 L 2272.58667 1177.301514 L 2257.761963 1145.730957 L 2242.951172 1177.301514 L 2228.13623 1145.730957 L 2213.325439 1177.301514 L 2199.593018 1145.768311 L 2178.773438 1174.959473 L 2164.906738 1151.277344 L 2143.211914 1170.5177 L 2129.351074 1148.810913 L 2121.487549 1166.080078 L 2107.328369 1132.834229 L 2090.702148 1158.244629 L 2076.183594 1124.576538 L 2061.064453 1149.195801 L 2046.562012 1115.537476 L 2031.447021 1140.156616 L 2024.742676 1119.09314 L 2019.435059 1140.383545 L 2004.237061 1122.970337 L 1994.405884 1149.266846 L 1981.20105 1131.847656 L 1969.398682 1158.14209 L 1954.696167 1116.389893 L 1939.743164 1163.48938 L 1927.88147 1139.813232 L 1916.029663 1163.48938 L 1904.187622 1137.840088 L 1892.337769 1163.48938 L 1880.493774 1120.081665 L 1866.000977 1163.48938 L 1849.532959 1129.945557 L 1837.0271 1163.48938 L 1822.540283 1122.05481 L 1808.057251 1163.48938 L 1789.615845 1132.041016 L 1779.039917 1159.744385 L 1766.615356 1116.666138 L 1751.377808 1149.712646 L 1738.968994 1116.504272 L 1725.708618 1143.631348 L 1716.651855 1103.801025 L 1710.283447 1143.824707 L 1694.129395 1102.015381 L 1683.275146 1149.580444 L 1671.093384 1127.500732 L 1656.294312 1155.334229 L 1639.65625 1111.202393 L 1622.915527 1154.981079 L 1611.620728 1129.073364 L 1597.226685 1148.72998 L 1583.976318 1120.855225 L 1571.561523 1142.487061 L 1550.281494 1088.595825 L 1533.48938 1139.813232 L 1516.361572 1108.240601 L 1499.247437 1139.813232 L 1482.125366 1108.240601 L 1465.011353 1139.813232 L 1441.927979 1108.361084 L 1426.838501 1134.450195 L 1409.672974 1098.548462 L 1387.324463 1130.340088 L 1364.243042 1088.518921 L 1343.873535 1120.310547 L 1322.340698 1078.899658 L 1299.770752 1098.430054 L 1276.985718 1059.398926 L 1254.990601 1082.354736 L 1234.190674 1041.35437 L 1208.246948 1068.25647 L 1185.039063 1012.279663 L 1166.878052 1057.593506 L 1141.232666 1030.578857 L 1123.41333 1065.937988 L 1095.806396 1038.921387 L 1077.987183 1074.284424 L 1053.378784 1043.191284 L 1033.734375 1078.643188 L 1017.232605 1032.338867 L 1005.044983 1056.458862 L 992.904724 1047.074463 L 969.862671 1078.643188 L 954.718018 1033.262329 L 935.628601 1078.643188 L 916.543213 1047.074463 L 897.439941 1078.643188 L 878.334778 1047.074463 L 859.245422 1078.643188 L 840.148193 1047.074463 L 821.058777 1078.643188 L 803.48645 1047.145508 L 777.122009 1074.448242 L 760.624207 1039.424438 L 732.999512 1066.555542 L 716.51355 1031.53186 L 688.888916 1058.662842 L 671.968384 1023.568115 L 634.664734 1050.559082 L 605.809387 1014.974976 L 568.811829 1042.007446 L 539.962463 1006.425293 L 502.974854 1033.457642"/>
+            <path id="path40" fill="#353974" fill-rule="evenodd" stroke="none" d="M 2000.341675 1203.18335 L 2017.939819 1257.778809 L 2030.431641 1221.646484 L 2052.173828 1260.411987 L 2068.618408 1230.20752 L 2090.368408 1263.046997 L 2103.030273 1230.87915 L 2123.966553 1265.982422 L 2138.727783 1236.15918 L 2159.518066 1269.275146 L 2176.256836 1223.647461 L 2195.077637 1272.567993 L 2211.103271 1242.695435 L 2232.088867 1274.282471 L 2247.887451 1242.675659 L 2267.642578 1274.282471 L 2281.465576 1232.801025 L 2303.201904 1274.282471 L 2316.523438 1252.560059 L 2334.73584 1273.245605 L 2344.756348 1244.702393 L 2359.743164 1271.272217 L 2375.691895 1226.926514 L 2402.552002 1269.294922 L 2419.342285 1230.831665 L 2439.166504 1268.356689 L 2460.562988 1238.727051 L 2489.868652 1268.356689 L 2507.320557 1224.897949 L 2538.5896 1268.356689 L 2560 1238.740845 L 2560 1667.382813 L 1280 1667.382813 L 1280 1274.296387 L 1301.631592 1301.606934 L 1321.641479 1268.370483 L 1341.870605 1300.949219 L 1359.255249 1269.016479 L 1377.147705 1300.289551 L 1399.921021 1258.488037 L 1425.104126 1298.286621 L 1448.910645 1237.437256 L 1470.550171 1294.995605 L 1488.420776 1257.850098 L 1514.012817 1291.702881 L 1528.460327 1254.711304 L 1542.881958 1282.711182 L 1559.326416 1241.164551 L 1579.087402 1274.812012 L 1597.505127 1235.242676 L 1621.228638 1260.984863 L 1640.029663 1203.238525 L 1665.576294 1251.07666 L 1680.574829 1222.422852 L 1702.445435 1256.344727 L 1725.347046 1227.689087 L 1739.320557 1261.610962 L 1761.321533 1232.856445 L 1787.915039 1265.705811 L 1816.023804 1221.622803 L 1845.187134 1268.338867 L 1865.396606 1238.083008 L 1892.598633 1270.973877 L 1913.590088 1240.708252 L 1927.162476 1269.407593 L 1941.46167 1235.702759 L 1959.411377 1264.143311 L 1971.739258 1230.436768 L 1985.76001 1258.873291 L 2000.341675 1203.18335 Z M 720.341736 1236.763672 L 737.939758 1291.359131 L 750.431641 1255.226807 L 772.173828 1293.992188 L 788.618225 1263.787842 L 810.368469 1296.627197 L 823.03009 1264.459473 L 843.966431 1299.562622 L 858.727966 1269.73938 L 879.518005 1302.855469 L 896.256775 1257.227783 L 915.077515 1306.148193 L 931.103149 1276.275635 L 952.088867 1307.862793 L 967.88739 1276.255859 L 987.642517 1307.862793 L 1001.465698 1266.381348 L 1023.201904 1307.862793 L 1036.523438 1286.140381 L 1054.73584 1306.825806 L 1064.756592 1278.282593 L 1079.743164 1304.852539 L 1095.691772 1260.506836 L 1122.552124 1302.875244 L 1139.342163 1264.411865 L 1159.166382 1301.93689 L 1180.562866 1272.307251 L 1209.86853 1301.93689 L 1227.320435 1258.478149 L 1258.5896 1301.93689 L 1280 1272.321045 L 1280 1667.382813 L -0 1667.382813 L -0 1307.876709 L 21.631613 1335.187256 L 41.641468 1301.950684 L 61.870628 1334.529541 L 79.25531 1302.59668 L 97.147652 1333.869751 L 119.920998 1292.068359 L 145.104202 1331.866821 L 168.910614 1271.017456 L 190.550125 1328.575928 L 208.420746 1291.430176 L 234.012833 1325.283081 L 248.460251 1288.291504 L 262.881989 1316.291504 L 279.326416 1274.744873 L 299.087402 1308.392212 L 317.505188 1268.822754 L 341.228668 1294.564941 L 360.029663 1236.818848 L 385.576294 1284.656982 L 400.574799 1256.003174 L 422.445435 1289.925049 L 445.347168 1261.269287 L 459.320496 1295.191162 L 481.321503 1266.436646 L 507.915039 1299.286133 L 536.023682 1255.203125 L 565.187195 1301.919189 L 585.396545 1271.66333 L 612.598511 1304.554199 L 633.590149 1274.288452 L 647.162476 1302.987793 L 661.461731 1269.282959 L 679.411377 1297.723633 L 691.739258 1264.016968 L 705.759949 1292.453491 L 720.341736 1236.763672 Z M 3280.341797 1169.603149 L 3297.939697 1224.198608 L 3310.431641 1188.066284 L 3332.173828 1226.831787 L 3348.618408 1196.627197 L 3370.368408 1229.466797 L 3383.030273 1197.29895 L 3403.966553 1232.4021 L 3418.727783 1202.578857 L 3439.518066 1235.694946 L 3456.256836 1190.067383 L 3475.077637 1238.987793 L 3491.103271 1209.115234 L 3512.088867 1240.702393 L 3527.887451 1209.095459 L 3547.642578 1240.702393 L 3561.465576 1199.220825 L 3583.201904 1240.702393 L 3596.523438 1218.979736 L 3614.73584 1239.665283 L 3624.756348 1211.12207 L 3639.743164 1237.691895 L 3655.691895 1193.346191 L 3682.552002 1235.714722 L 3699.342285 1197.251465 L 3719.166504 1234.776367 L 3740.562988 1205.146729 L 3769.868652 1234.776367 L 3787.320557 1191.317627 L 3818.589355 1234.776367 L 3840 1205.160645 L 3840 1667.382813 L 2560 1667.382813 L 2560 1240.716187 L 2581.631592 1268.026733 L 2601.641602 1234.790283 L 2621.870605 1267.368896 L 2639.255371 1235.436279 L 2657.147705 1266.709229 L 2679.920898 1224.907715 L 2705.104248 1264.706299 L 2728.910645 1203.856934 L 2750.550049 1261.415405 L 2768.420654 1224.269775 L 2794.012939 1258.122559 L 2808.460205 1221.131104 L 2822.881836 1249.130981 L 2839.326416 1207.584229 L 2859.087402 1241.231689 L 2877.505371 1201.662354 L 2901.228516 1227.404541 L 2920.029541 1169.658325 L 2945.576172 1217.496338 L 2960.574951 1188.842529 L 2982.445557 1222.764526 L 3005.347168 1194.108887 L 3019.320557 1228.030762 L 3041.321289 1199.276123 L 3067.915039 1232.125488 L 3096.023926 1188.04248 L 3125.187012 1234.758667 L 3145.396729 1204.502808 L 3172.598633 1237.393677 L 3193.590088 1207.12793 L 3207.162354 1235.827393 L 3221.46167 1202.122559 L 3239.411377 1230.562988 L 3251.739258 1196.856445 L 3265.76001 1225.292969 L 3280.341797 1169.603149 Z"/>
+        </g>
+        <g id="night-foreground-fox">
+            <path id="path41" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 344.433594 693.401489 L 319.243958 723.258179 L 289.549316 769.030273 L 275.285828 806.090088 L 294.404816 809.594849 L 273.984344 839.155518 L 253.165878 894.340942 L 270.340546 898.085083 L 237.82634 945.077637 L 214.832855 992.477051 L 236.00531 995.733398 L 199.244965 1047.127075 L 157.394928 1128.571167 L 203.159988 1133.213501 L 175.097946 1184.404663 L 157.150131 1237.429199 L 190.460388 1242.450195 L 166.401413 1286.337891 L 147.638199 1341.773438 L 174.731628 1345.855713 L 147.569519 1397.564575 L 127.038116 1462.165039 L 268.417389 1481.64502 L 330.582184 1467.337646 L 330.582184 1564.778076 L 372.115234 1564.778076 L 374.920746 1469.13208 L 444.679596 1479.857544 L 633.912659 1451.799072 L 592.601501 1403.876587 L 555.763672 1342.166016 L 584.364624 1338.293335 L 549.585632 1296.562988 L 518.193237 1241.779175 L 574.886169 1234.100586 L 541.618164 1194.186035 L 502.187958 1125.378174 L 499.623749 1121.422607 L 544.837524 1114.15271 L 500.301758 1036.461548 L 466.869995 998.40332 L 482.244781 996.978638 L 452.518433 936.925415 L 418.940491 901.653198 L 434.484344 899.798706 L 426.992462 871.78772 L 404.876038 834.969238 L 393.044647 812.974365 L 418.491394 810.743042 L 381.215057 741.192017"/>
+            <path id="path42" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 592.7547 637.044922 L 567.565063 666.901611 L 537.870483 712.673706 L 523.606995 749.733521 L 542.725952 753.238281 L 522.305481 782.79895 L 501.48703 837.984375 L 518.661682 841.728516 L 486.147461 888.721069 L 463.153992 936.120483 L 484.326447 939.376831 L 447.566101 990.770508 L 405.716064 1072.2146 L 451.48114 1076.856934 L 423.419067 1128.048096 L 405.471283 1181.07251 L 438.781555 1186.093506 L 414.722565 1229.981323 L 395.959351 1285.416748 L 423.052765 1289.499146 L 395.890656 1341.208008 L 375.359253 1405.808594 L 516.738525 1425.288452 L 578.903381 1410.980957 L 578.903381 1508.421509 L 620.43634 1508.421509 L 623.241882 1412.775635 L 693.000732 1423.500977 L 882.233765 1395.442383 L 840.922668 1347.52002 L 804.084839 1285.80957 L 832.685791 1281.936768 L 797.906738 1240.206543 L 766.514343 1185.422607 L 823.207336 1177.744141 L 789.939331 1137.82959 L 750.509094 1069.021606 L 747.944885 1065.06604 L 793.158691 1057.796143 L 748.622925 980.10498 L 715.191162 942.046753 L 730.565918 940.62207 L 700.8396 880.568726 L 667.261658 845.296631 L 682.805481 843.442139 L 675.313599 815.431152 L 653.197144 778.612671 L 641.365784 756.617798 L 666.812561 754.386475 L 629.536194 684.835449"/>
+            <path id="path43" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 981.967346 637.044922 L 956.777649 666.901611 L 927.083069 712.673706 L 912.819519 749.733521 L 931.938477 753.238281 L 911.518066 782.79895 L 890.699585 837.984375 L 907.874207 841.728516 L 875.360046 888.721069 L 852.366577 936.120483 L 873.539063 939.376831 L 836.778687 990.770508 L 794.92865 1072.2146 L 840.693665 1076.856934 L 812.631653 1128.048096 L 794.683838 1181.07251 L 827.99408 1186.093506 L 803.93512 1229.981323 L 785.171875 1285.416748 L 812.26532 1289.499146 L 785.10321 1341.208008 L 764.571838 1405.808594 L 905.951111 1425.288452 L 968.115906 1410.980957 L 968.115906 1508.421509 L 1009.648926 1508.421509 L 1012.454468 1412.775635 L 1082.213257 1423.500977 L 1271.446411 1395.442383 L 1230.135254 1347.52002 L 1193.297363 1285.80957 L 1221.898315 1281.936768 L 1187.119263 1240.206543 L 1155.726929 1185.422607 L 1212.4198 1177.744141 L 1179.151978 1137.82959 L 1139.72168 1069.021606 L 1137.157471 1065.06604 L 1182.371338 1057.796143 L 1137.835449 980.10498 L 1104.403809 942.046753 L 1119.778442 940.62207 L 1090.052124 880.568726 L 1056.474243 845.296631 L 1072.018066 843.442139 L 1064.526245 815.431152 L 1042.409668 778.612671 L 1030.578369 756.617798 L 1056.025146 754.386475 L 1018.748718 684.835449 M 242.287308 818.442627 L 217.097672 848.299316 L 187.403046 894.071411 L 173.139557 931.131226 L 192.258514 934.635864 L 171.838074 964.196655 L 151.019608 1019.38208 L 168.19426 1023.126221 L 135.680038 1070.118774 L 112.686562 1117.518188 L 133.859024 1120.774536 L 97.098686 1172.168213 L 55.24865 1253.612305 L 101.01371 1258.254639 L 72.95166 1309.445801 L 55.003853 1362.470215 L 88.31411 1367.491211 L 64.255135 1411.379028 L 45.49192 1466.814453 L 72.585342 1470.896851 L 45.423233 1522.605713 L 24.891832 1587.206299 L 166.271103 1606.686157 L 228.435913 1592.378662 L 228.435913 1689.819214 L 269.968964 1689.819214 L 272.774445 1594.17334 L 342.533325 1604.898682 L 531.766357 1576.840088 L 490.4552 1528.917725 L 453.617401 1467.207275 L 482.218384 1463.334473 L 447.439331 1421.604248 L 416.046936 1366.820313 L 472.739899 1359.141846 L 439.471924 1319.227295 L 400.041656 1250.419434 L 397.477448 1246.463867 L 442.691284 1239.193848 L 398.155487 1161.502686 L 364.723694 1123.444458 L 380.098511 1122.019775 L 350.372162 1061.966553 L 316.79422 1026.694336 L 332.338074 1024.839844 L 324.846161 996.828857 L 302.729736 960.010376 L 290.898376 938.015503 L 316.345123 935.78418 L 279.068787 866.233154"/>
+            <path id="path44" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 101.395874 630.000366 L 76.206253 659.857056 L 46.51162 705.62915 L 32.248127 742.688843 L 51.367092 746.193604 L 30.94664 775.754395 L 10.128172 830.939819 L 27.302835 834.68396 L -5.211387 881.676514 L -28.204868 929.075928 L -7.032403 932.332275 L -43.79274 983.725952 L -85.642784 1065.170044 L -39.87772 1069.812378 L -67.939774 1121.00354 L -85.887581 1174.027954 L -52.577324 1179.049072 L -76.636292 1222.936768 L -95.399506 1278.372314 L -68.306091 1282.45459 L -95.468193 1334.16333 L -115.999603 1398.763916 L 25.379665 1418.243896 L 87.544487 1403.936523 L 87.544487 1501.376953 L 129.077515 1501.376953 L 131.883026 1405.730957 L 201.641876 1416.456421 L 390.874908 1388.397949 L 349.563782 1340.475342 L 312.725983 1278.764893 L 341.326935 1274.892212 L 306.547882 1233.161865 L 275.155518 1178.378052 L 331.84848 1170.699463 L 298.580475 1130.784912 L 259.150269 1061.977051 L 256.586029 1058.021484 L 301.799866 1050.751465 L 257.264069 973.060425 L 223.832291 935.002197 L 239.207062 933.577515 L 209.480743 873.52417 L 175.902786 838.252075 L 191.44664 836.397583 L 183.954727 808.386597 L 161.838303 771.568115 L 150.006943 749.573242 L 175.45369 747.341919 L 138.177353 677.790771"/>
+            <g id="g2">
+                <path id="path45" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3232.917725 730.385498 L 3258.107422 760.242188 L 3287.802002 806.014282 L 3302.065674 843.073975 L 3282.946533 846.578857 L 3303.367188 876.139526 L 3324.185547 931.324829 L 3307.010742 935.069092 L 3339.525146 982.061646 L 3362.518555 1029.46106 L 3341.345947 1032.717407 L 3378.106445 1084.111084 L 3419.956299 1165.555176 L 3374.191406 1170.19751 L 3402.253418 1221.388672 L 3420.201172 1274.413086 L 3386.890869 1279.434082 L 3410.949951 1323.321899 L 3429.713135 1378.757324 L 3402.619629 1382.839722 L 3429.781738 1434.548584 L 3450.313232 1499.14917 L 3308.934082 1518.629028 L 3246.769043 1504.321533 L 3246.769043 1601.762085 L 3205.236084 1601.762085 L 3202.430664 1506.116211 L 3132.671631 1516.841553 L 2943.438721 1488.782959 L 2984.75 1440.860596 L 3021.587646 1379.150024 L 2992.986816 1375.277344 L 3027.765869 1333.547119 L 3059.158203 1278.763184 L 3002.465088 1271.084717 L 3035.733154 1231.170166 L 3075.163574 1162.362305 L 3077.727539 1158.406616 L 3032.513672 1151.136719 L 3077.049561 1073.445557 L 3110.481445 1035.387329 L 3095.106689 1033.962646 L 3124.833008 973.909424 L 3158.410889 938.637207 L 3142.866943 936.782715 L 3150.359131 908.771729 L 3172.475342 871.953247 L 3184.306885 849.958374 L 3158.859863 847.727051 L 3196.13623 778.176025"/>
+                <path id="path46" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3014.536133 633.522705 L 3039.725586 663.379272 L 3069.42041 709.151367 L 3083.683838 746.211182 L 3064.564697 749.715942 L 3084.985352 779.276733 L 3105.803711 834.462158 L 3088.62915 838.206299 L 3121.143311 885.198853 L 3144.136719 932.598267 L 3122.964355 935.854614 L 3159.724854 987.248291 L 3201.574707 1068.692261 L 3155.809814 1073.334595 L 3183.871582 1124.525757 L 3201.81958 1177.550293 L 3168.509277 1182.571289 L 3192.568115 1226.458984 L 3211.331543 1281.894531 L 3184.238037 1285.976807 L 3211.400146 1337.685669 L 3231.931641 1402.286255 L 3090.55249 1421.766113 L 3028.387451 1407.45874 L 3028.387451 1504.89917 L 2986.854248 1504.89917 L 2984.049072 1409.253296 L 2914.290039 1419.97876 L 2725.056885 1391.920166 L 2766.368164 1343.997681 L 2803.206055 1282.287109 L 2774.60498 1278.414551 L 2809.384277 1236.684204 L 2840.776367 1181.900391 L 2784.083496 1174.221802 L 2817.351563 1134.307251 L 2856.781738 1065.49939 L 2859.345947 1061.543823 L 2814.13208 1054.273804 L 2858.667725 976.582764 L 2892.099609 938.524414 L 2876.724854 937.099731 L 2906.451172 877.046387 L 2940.029053 841.774414 L 2924.485352 839.919922 L 2931.977295 811.908936 L 2954.09375 775.090454 L 2965.925049 753.095459 L 2940.478271 750.864136 L 2977.754639 681.31311"/>
+                <path id="path47" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 2787.651367 837.815063 L 2806.47998 860.132202 L 2828.676025 894.345703 L 2839.337402 922.046997 L 2825.046631 924.666504 L 2840.310303 946.762451 L 2855.871582 988.012207 L 2843.033936 990.810913 L 2867.337402 1025.936646 L 2884.524414 1061.366577 L 2868.69873 1063.800537 L 2896.176025 1102.216064 L 2927.458008 1163.093384 L 2893.249756 1166.563477 L 2914.225342 1204.827637 L 2927.640869 1244.461914 L 2902.742432 1248.215088 L 2920.72583 1281.02002 L 2934.750732 1322.456543 L 2914.499268 1325.508057 L 2934.802246 1364.15918 L 2950.148926 1412.446533 L 2844.471436 1427.007324 L 2798.004883 1416.312744 L 2798.004883 1489.146973 L 2766.959961 1489.146973 L 2764.862793 1417.654053 L 2712.719971 1425.671021 L 2571.272949 1404.697998 L 2602.151855 1368.877197 L 2629.6875 1322.750244 L 2608.308838 1319.855469 L 2634.305176 1288.663086 L 2657.770264 1247.713501 L 2615.393799 1241.973877 L 2640.260742 1212.138916 L 2669.733887 1160.706787 L 2671.650635 1157.75 L 2637.854492 1152.315918 L 2671.143799 1094.243774 L 2696.133057 1065.796265 L 2684.640869 1064.731201 L 2706.860596 1019.842896 L 2731.959229 993.477905 L 2720.340576 992.091675 L 2725.940674 971.154297 L 2742.472168 943.633423 L 2751.315674 927.192749 L 2732.294922 925.524902 L 2760.157959 873.537231 M 3414.13916 869.515625 L 3431.186768 889.72168 L 3451.283203 920.69873 L 3460.936279 945.779541 L 3447.99707 948.151367 L 3461.817139 968.157227 L 3475.90625 1005.504883 L 3464.282959 1008.038818 L 3486.287598 1039.841919 L 3501.848877 1071.920288 L 3487.52002 1074.124023 L 3512.398193 1108.90564 L 3540.720947 1164.024414 L 3509.748779 1167.166138 L 3528.73999 1201.810669 L 3540.886719 1237.695923 L 3518.343262 1241.093994 L 3534.625732 1270.795654 L 3547.323975 1308.312622 L 3528.988281 1311.075439 L 3547.370605 1346.070313 L 3561.265625 1389.789917 L 3465.584717 1402.973389 L 3423.513428 1393.290527 L 3423.513428 1459.235107 L 3395.405273 1459.235107 L 3393.506592 1394.505005 L 3346.296143 1401.763672 L 3218.229248 1382.774414 L 3246.187256 1350.342041 L 3271.11792 1308.578491 L 3251.761719 1305.95752 L 3275.299072 1277.71582 L 3296.544434 1240.639893 L 3258.17627 1235.443115 L 3280.691162 1208.43042 L 3307.376221 1161.863525 L 3309.111572 1159.186523 L 3278.512207 1154.266357 L 3308.652588 1101.687622 L 3331.278076 1075.93103 L 3320.873291 1074.966675 L 3340.990967 1034.324707 L 3363.715576 1010.453491 L 3353.196045 1009.198608 L 3358.266113 990.241577 L 3373.233887 965.324097 L 3381.240967 950.438599 L 3364.019287 948.928467 L 3389.246582 901.858643"/>
+                <path id="path48" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3621.302002 670.506592 L 3597.130127 699.156982 L 3568.635498 743.079712 L 3554.947998 778.642212 L 3573.294678 782.005127 L 3553.699219 810.371582 L 3533.721924 863.327271 L 3550.202637 866.920166 L 3519.002197 912.01416 L 3496.9375 957.498291 L 3517.254883 960.623169 L 3481.979736 1009.940308 L 3441.820313 1088.093628 L 3485.736572 1092.548462 L 3458.808105 1141.671265 L 3441.585693 1192.553467 L 3473.550049 1197.371582 L 3450.463135 1239.485962 L 3432.458008 1292.681641 L 3458.456787 1296.599121 L 3432.39209 1346.21875 L 3412.690186 1408.208984 L 3548.357422 1426.901855 L 3608.010254 1413.172607 L 3608.010254 1506.676025 L 3647.865234 1506.676025 L 3650.557373 1414.894653 L 3717.497803 1425.186768 L 3899.084961 1398.261719 L 3859.443115 1352.275635 L 3824.09375 1293.058594 L 3851.539063 1289.342285 L 3818.165039 1249.298096 L 3788.041016 1196.727539 L 3842.443359 1189.359375 L 3810.519775 1151.057373 L 3772.682617 1085.029785 L 3770.221924 1081.234009 L 3813.609131 1074.257813 L 3770.872559 999.705688 L 3738.791504 963.185181 L 3753.545166 961.817993 L 3725.02002 904.19104 L 3692.798828 870.344116 L 3707.714355 868.564453 L 3700.525146 841.685303 L 3679.30249 806.354492 L 3667.948975 785.248291 L 3692.367432 783.107056 L 3656.597412 716.366089"/>
+                <path id="path49" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3796.33374 848.381958 L 3814.602783 870.035645 L 3836.138916 903.231812 L 3846.483398 930.109619 L 3832.617432 932.651367 L 3847.427246 954.090332 L 3862.525879 994.11377 L 3850.069824 996.829224 L 3873.650879 1030.910767 L 3890.327148 1065.287231 L 3874.97168 1067.648926 L 3901.63208 1104.922241 L 3931.983887 1163.989746 L 3898.792725 1167.356689 L 3919.144775 1204.483154 L 3932.161621 1242.939331 L 3908.00293 1246.580811 L 3925.451904 1278.410522 L 3939.059814 1318.615234 L 3919.4104 1321.575928 L 3939.109863 1359.077881 L 3954.000488 1405.929688 L 3851.4646 1420.057495 L 3806.379639 1409.68103 L 3806.379639 1480.349976 L 3776.257324 1480.349976 L 3774.2229 1410.982544 L 3723.629883 1418.76123 L 3586.388184 1398.411621 L 3616.349121 1363.655762 L 3643.065918 1318.900024 L 3622.323242 1316.091309 L 3647.546631 1285.826416 L 3670.313965 1246.094238 L 3629.19751 1240.525391 L 3653.324951 1211.577148 L 3681.921875 1161.674072 L 3683.781494 1158.805298 L 3650.990234 1153.532715 L 3683.290039 1097.187134 L 3707.536377 1069.585205 L 3696.385986 1068.55188 L 3717.944824 1024.998169 L 3742.297363 999.416992 L 3731.02417 998.072021 L 3736.45752 977.756958 L 3752.497803 951.054321 L 3761.078369 935.102417 L 3742.623291 933.484009 L 3769.657959 883.042114"/>
+            </g>
+            <g id="g3">
+                <path id="path50" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3122.550293 1406.663696 C 3113.739502 1412.225464 3050.30249 1417.230591 3050.30249 1417.230591 L 2898.758789 1422.513916 L 2810.651611 1431.319702 L 2731.355469 1441.886597 L 2639.724365 1445.408936 L 2563.952393 1445.408936 L 2500.515381 1452.453369 L 2463.510498 1454.2146 L 2422.981201 1473.587158 L 2371.87915 1485.915161 L 2289.058594 1510.571167 L 2269.675293 1508.810059 L 2239.718994 1522.89917 L 2215.049072 1528.182617 L 2199.189697 1533.466064 L 2186.854736 1538.749512 L 2158.660645 1536.988281 L 2142.80127 1544.032837 L 2125.179932 1540.510498 L 2112.844971 1549.316284 L 2095.223633 1549.316284 L 2068.791504 1559.883057 L 2051.169922 1572.211182 L 2035.310913 1579.255737 L 2033.548706 1589.82251 L 2014.165161 1595.105957 L 1993.019409 1595.105957 L 1977.160278 1609.195068 L 1962.925659 1609.195068 L 1945.524658 1618.046631 L 1897.046387 1618.000854 L 1876.718384 1612.717407 L 1867.907715 1618.000854 L 1857.334839 1607.434082 L 1843.237793 1598.628296 L 1830.902832 1593.344849 L 1816.805664 1593.344849 L 1807.994995 1598.628296 L 1795.660034 1603.911743 L 1785.087158 1595.105957 L 1769.228027 1589.82251 L 1756.892944 1582.778076 L 1751.606567 1570.449951 L 1733.985229 1565.166504 L 1705.790894 1558.12207 L 1695.21814 1551.077393 L 1674.07251 1549.316284 L 1661.737549 1552.838623 L 1654.688965 1563.405518 L 1630.019043 1572.211182 L 1615.921875 1556.36084 L 1607.111206 1547.555176 L 1596.53833 1545.793945 L 1580.679199 1544.032837 L 1563.057739 1531.704834 L 1547.198486 1528.182617 L 1531.339233 1544.032837 L 1494.334351 1510.571167 L 1480.237305 1510.571167 L 1427.373047 1489.4375 L 1370.984741 1468.303711 L 1346.314697 1447.169922 L 1201.819336 1447.169922 L 1073.183228 1431.319702 C 1073.183228 1431.319702 870.537415 1420.75293 851.15387 1415.469482 C 831.770325 1410.186035 801.813965 1376.724365 801.813965 1376.724365 L 674.940002 1364.39624 L 563.925232 1376.724365 L 475.81839 1382.00769 L 343.65799 1406.663696 L -6.809445 1406.663696 L -6.809445 2172.760742 L 3839.526611 2172.760742 L 3839.526611 1406.663696 L 3122.550293 1406.663696 Z"/>
+            </g>
+            <g id="g4">
+                <path id="path51" fill="#2d253a" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2587.23999 1520.121094 C 2569.977783 1515.739258 2555.590332 1513.615723 2543.388916 1512.593506 C 2529.371582 1511.419189 2517.446289 1511.629639 2513.70752 1515.219482 C 2509.558838 1518.980713 2514.773438 1526.346924 2506.113525 1528.266357 C 2500.52832 1529.462158 2489.683594 1528.387939 2483.762451 1529.358887 C 2464.621582 1522.249756 2451.349854 1512.106689 2433.307617 1504.731201 C 2425.855957 1501.682617 2418.694336 1496.091064 2411.481201 1494.344727 C 2416.582764 1497.364258 2425.458008 1504.215942 2432.609863 1507.118164 C 2444.919678 1512.112305 2449.425293 1516.736206 2459.676025 1522.114136 C 2460.893311 1522.752319 2464.083984 1524.891479 2465.292725 1525.532593 C 2468.534668 1528.062988 2475.590576 1533.256836 2473.332275 1534.714111 C 2472.885254 1534.961914 2467.26709 1533.291992 2462.818359 1532.044556 C 2460.497803 1531.22522 2458.160889 1530.415527 2455.751221 1529.619507 C 2445.94751 1526.385864 2435.585449 1523.040283 2426.134521 1519.495605 C 2414.73877 1515.221191 2388.623779 1505.881958 2377.694824 1501.52417 C 2375.243408 1501.329834 2375.829834 1502.616943 2378.03833 1503.969238 C 2380.249268 1505.324951 2398.75708 1513.458496 2401.953125 1514.762939 C 2428.445557 1525.5625 2455.531494 1534.750977 2483.657227 1545.81897 C 2510.058838 1556.782471 2539.084717 1568.598877 2567.811035 1579.308594 C 2555.05542 1576.230225 2541.889648 1572.576172 2528.829102 1568.477051 C 2517.629395 1564.966431 2499.330566 1558.498291 2488.395752 1555.441406 C 2485.430176 1554.613159 2484.692383 1555.348267 2488.45752 1557.070557 C 2522.383789 1569.742065 2558.849365 1581.384399 2594.744873 1590.997559 C 2598.493408 1592.005615 2602.391602 1593.017456 2605.520264 1593.47583 C 2633.482666 1603.711426 2660.986572 1612.951416 2686.956055 1621.279541 C 2698.728516 1625.059814 2711.608398 1628.997559 2719.641602 1629.894287 C 2727.734131 1630.304199 2699.751709 1620.405884 2688.195313 1616.052734 C 2689.210205 1613.936035 2690.186035 1611.805176 2691.124268 1609.660156 C 2702.221191 1612.681885 2713.070068 1615.428955 2723.511475 1617.859863 C 2728.286377 1618.972656 2733.73999 1619.913452 2732.063965 1618.276245 C 2730.631348 1616.876953 2725.082275 1614.738403 2720.510742 1613.084961 C 2685.731445 1600.506714 2651.595459 1588.167114 2618.102539 1576.238525 C 2615.79541 1574.75415 2612.521729 1573.161865 2609.32251 1571.64624 C 2597.244629 1565.911621 2584.763672 1560.293945 2572.050537 1554.860107 C 2583.61377 1557.058838 2594.727783 1558.94873 2602.685791 1559.12146 C 2614.592773 1559.363525 2617.689697 1555.317993 2610.797607 1548.507568 C 2605.537354 1543.335327 2594.968018 1536.590088 2595.227539 1533.133667 C 2595.469482 1527.858643 2619.965332 1532.840332 2643.183594 1539.627319 C 2625.488525 1531.569824 2604.661377 1524.560669 2587.23999 1520.121094"/>
+                <path id="path52" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 2509.227783 1378.316406 C 2499.627686 1377.768677 2491.824219 1370.643066 2483.032471 1366.703369 C 2471.426514 1361.502686 2457.430664 1362.094482 2446.332031 1368.256836 C 2438.942139 1372.358398 2433.081055 1378.566406 2427.614502 1385.116211 C 2425.469727 1376.997314 2422.600586 1369.005127 2419.020264 1361.240356 C 2418.076416 1359.195557 2417.001953 1357.092896 2415.265381 1355.499023 C 2416.080811 1335.617432 2416.413574 1315.702393 2416.741211 1295.808594 C 2416.7854 1293.221436 2416.47876 1290.054932 2414.111816 1288.996582 C 2411.339844 1287.756592 2408.500977 1290.521606 2406.794434 1293.03125 C 2403.057129 1298.536621 2399.774414 1304.34668 2396.991943 1310.385498 C 2390.26416 1310.123047 2383.53833 1309.859009 2376.811035 1309.594727 C 2376.449707 1302.935913 2377.316406 1287.205322 2370.435547 1290.89502 C 2364.925049 1294.720215 2362.857422 1301.75769 2361.455566 1308.295166 C 2358.33667 1322.856201 2356.16333 1338.664185 2356.237305 1355.329834 C 2354.389648 1356.939575 2353.278564 1359.121704 2352.30127 1361.240356 C 2342.859619 1381.710083 2338.343994 1403.750732 2339.117188 1425.574829 C 2340.055908 1428.176147 2342.775146 1428.158447 2343.463623 1426.349731 C 2345.990967 1419.712036 2346.561523 1408.109619 2348.123535 1401.272949 C 2349.936035 1393.361816 2353.049561 1385.647949 2357.318604 1378.418457 C 2357.922852 1396.359253 2361.221191 1415.272217 2364.805176 1432.915283 C 2366.974854 1451.840576 2369.560303 1470.712891 2372.614014 1489.509644 C 2372.987549 1491.806152 2373.417236 1494.213623 2374.898193 1496.01709 C 2376.379395 1497.822266 2379.280029 1498.71875 2381.175049 1497.302734 C 2380.176514 1489.467407 2379.519531 1481.588135 2379.211182 1473.691162 C 2378.956055 1467.195923 2380.132568 1460.360962 2381.065918 1453.915283 C 2381.294922 1452.337158 2381.410889 1450.792725 2381.481445 1449.256958 C 2382.50293 1446.453247 2383.53125 1442.883301 2384.640869 1442.754761 C 2390.813721 1442.171875 2395.510742 1448.69519 2399.152588 1451.38269 C 2399.693359 1452.268555 2400.237793 1453.152588 2400.760742 1454.041992 C 2405.18457 1461.577881 2408.18042 1469.978516 2409.532959 1478.631104 C 2410.32373 1483.697998 2410.684814 1489.176758 2413.817871 1493.208008 C 2416.214844 1488.493408 2415.478516 1482.773193 2414.585693 1477.491577 C 2412.449463 1464.841309 2409.751465 1452.152222 2409.418457 1439.385742 C 2417.887939 1436.604858 2425.687744 1430.483154 2434.433838 1427.897827 C 2448.168945 1423.838379 2462.939697 1428.818848 2477.203125 1427.524414 C 2490.601807 1426.311035 2502.94043 1419.587036 2513.598877 1411.35376 C 2522.873047 1404.189209 2531.335449 1395.594971 2536.523682 1385.049194 C 2541.713867 1374.50354 2543.326904 1361.791504 2539.005127 1350.8302 C 2534.435059 1364.686768 2523.729004 1379.144165 2509.227783 1378.316406 Z M 2414.073242 1378.536499 C 2416.869873 1383.289795 2419.155762 1388.254517 2420.909912 1393.344238 C 2418.134521 1396.729126 2415.244385 1400.085938 2412.125488 1403.150269 C 2412.912598 1394.95752 2413.550049 1386.750488 2414.073242 1378.536499 Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/horizon-sunrise.svg b/waterfox/browser/themes/lepton/icons/horizon-sunrise.svg
new file mode 100644
index 0000000000000..ee377185ce5d0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/horizon-sunrise.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.4 -->
+<svg width="3840" height="2160" viewBox="0 0 3840 2160" xmlns="http://www.w3.org/2000/svg">
+    <g id="Day">
+        <g id="sky">
+            <linearGradient id="linearGradient1" x1="1919" y1="0" x2="1919" y2="1380.003225" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#1e4488" stop-opacity="1"/>
+                <stop offset="0.396963" stop-color="#10659c" stop-opacity="1"/>
+                <stop offset="0.680644" stop-color="#7babbf" stop-opacity="1"/>
+                <stop offset="0.848752" stop-color="#e9c39f" stop-opacity="1"/>
+                <stop offset="1" stop-color="#ff9a4a" stop-opacity="1"/>
+            </linearGradient>
+            <path id="Path" fill="url(#linearGradient1)" fill-rule="evenodd" stroke="none" d="M -1 0 L 3839 0 L 3839 1260.659424 L -1 1260.659424 Z"/>
+            <path id="path1" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 1187.849243 383.241821 C 1202.311768 382.440063 1216.835449 381.954834 1231.238281 380.386475 C 1231.650269 380.342529 1231.671265 379.728882 1231.238281 379.727051 C 1216.772339 379.660278 1202.295898 380.688843 1187.849243 381.393921 C 1173.397339 382.09729 1158.84375 382.540405 1144.460327 384.171997 C 1143.957031 384.22998 1143.927246 384.977295 1144.460327 384.982544 C 1158.91748 385.116089 1173.420166 384.04187 1187.849243 383.241821 Z"/>
+            <linearGradient id="linearGradient2" x1="1242.827206" y1="378.836747" x2="1397.509542" y2="519.080317" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path2" fill="url(#linearGradient2)" fill-rule="evenodd" stroke="none" d="M 1318.645752 450.098267 C 1344.316528 473.400269 1370.194336 496.582642 1396.67334 518.959839 C 1397.141479 519.353638 1397.819946 518.690796 1397.351807 518.279297 C 1371.298828 495.367798 1345.138794 472.609009 1319.380371 449.361572 C 1293.621826 426.115845 1268.596191 402.061279 1242.827148 378.83667 C 1267.077881 403.592773 1292.997681 426.813843 1318.645752 450.098267 Z"/>
+            <linearGradient id="linearGradient3" x1="1222.503822" y1="418.375942" x2="1233.858078" y2="387.972383" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path3" fill="url(#linearGradient3)" fill-rule="evenodd" stroke="none" d="M 1233.846802 388.204346 C 1233.925781 387.963379 1233.568115 387.879028 1233.476807 388.102417 C 1229.458496 398.015381 1225.536499 407.86499 1222.510376 418.148926 C 1222.456055 418.337036 1222.754028 418.474243 1222.836548 418.286133 C 1227.154785 408.4646 1230.524414 398.389893 1233.846802 388.204346 Z"/>
+            <linearGradient id="linearGradient4" x1="1498.625001" y1="442.94047" x2="1423.209745" y2="507.984203" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path4" fill="url(#linearGradient4)" fill-rule="evenodd" stroke="none" d="M 1454.950195 479.635986 C 1469.519531 467.650146 1484.351807 455.91394 1498.537231 443.467285 C 1498.789673 443.245728 1498.444336 442.783325 1498.172607 442.994263 C 1483.650513 454.180176 1469.673706 466.104614 1455.512939 477.744141 C 1440.922485 489.735352 1426.209351 501.527954 1412.041504 514.027344 C 1411.92749 514.129272 1412.083618 514.338501 1412.208008 514.24353 C 1426.773926 503.087402 1440.784058 491.291382 1454.950195 479.635986 Z"/>
+            <linearGradient id="linearGradient5" x1="1416.845717" y1="516.255151" x2="1309.330102" y2="600.78125" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path5" fill="url(#linearGradient5)" fill-rule="evenodd" stroke="none" d="M 1347.708618 570.113159 C 1331.296509 582.689697 1314.551392 594.800537 1297.757202 606.856812 C 1296.966553 607.424683 1297.706299 608.746948 1298.532104 608.186035 C 1315.841797 596.407593 1332.688599 583.932861 1349.27771 571.157471 C 1365.435425 558.712646 1381.791382 546.185181 1396.827148 532.381226 C 1397.235596 532.005005 1396.67627 531.241821 1396.220581 531.593506 C 1379.868042 544.194824 1364.099487 557.548706 1347.708618 570.113159 Z"/>
+            <linearGradient id="linearGradient6" x1="1241.3783" y1="364.67901" x2="1254.791114" y2="306.291209" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path6" fill="url(#linearGradient6)" fill-rule="evenodd" stroke="none" d="M 1254.784058 301.392212 C 1254.885742 300.671265 1253.854858 300.331909 1253.661987 301.080933 C 1248.272583 321.854614 1245.167603 343.299927 1241.382324 364.404053 C 1241.333252 364.678223 1241.74353 364.799683 1241.804932 364.520142 C 1246.414185 343.596924 1251.772095 322.626465 1254.784058 301.392212 Z"/>
+            <linearGradient id="linearGradient7" x1="1511.327044" y1="454.408151" x2="1559.831759" y2="509.385302" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path7" fill="url(#linearGradient7)" fill-rule="evenodd" stroke="none" d="M 1567.450439 519.637939 C 1567.825684 520.096924 1568.644409 519.472656 1568.277954 518.998047 C 1550.812378 496.299072 1531.679321 474.727173 1511.489014 454.437134 C 1511.401367 454.349243 1511.269897 454.481079 1511.354004 454.57251 C 1530.751831 475.688965 1549.322021 497.422607 1567.450439 519.637939 Z"/>
+            <path id="path8" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2067.665771 242.497681 C 2068.181152 242.2146 2067.729004 241.502441 2067.216797 241.725586 C 2051.753418 248.479126 2036.300415 256.189087 2021.646973 264.552979 C 2021.560913 264.602051 2021.620605 264.75708 2021.715332 264.716431 C 2037.294556 258.193481 2052.86499 250.648804 2067.665771 242.497681 Z"/>
+            <linearGradient id="linearGradient8" x1="1928.529368" y1="264.50284" x2="1792.768723" y2="264.50284" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path9" fill="url(#linearGradient8)" fill-rule="evenodd" stroke="none" d="M 1898.236938 268.092407 C 1933.266602 268.54248 1968.413574 269.271973 2003.43103 268.044678 C 2004.127075 268.020264 2004.130493 266.97583 2003.43103 266.959961 C 1968.383789 266.128296 1933.292969 266.641724 1898.236938 266.228516 C 1863.219727 265.817139 1828.078003 264.064209 1793.065918 264.605713 C 1792.664307 264.612793 1792.674927 265.194702 1793.065918 265.224731 C 1827.948242 267.874268 1863.268921 267.644043 1898.236938 268.092407 Z"/>
+            <path id="path10" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2199.755371 241.151855 C 2238.587402 242.839722 2277.391846 245.142944 2316.154053 248.036987 C 2338.13623 249.679321 2360.095215 251.593994 2382.058105 253.473511 C 2383.35376 253.584351 2383.332764 251.581787 2382.058105 251.4552 C 2304.731689 243.764648 2226.977539 239.428711 2149.318359 237.116699 C 2127.30127 236.460815 2105.224365 235.641479 2083.198486 236.281494 C 2082.499023 236.300903 2082.50415 237.329346 2083.198486 237.366333 C 2122.001221 239.446289 2160.92627 239.462158 2199.755371 241.151855 Z M 2446.88916 298.106567 C 2457.024658 309.600098 2467.294922 320.974243 2477.697021 332.22876 C 2498.674316 354.922363 2520.109375 377.283691 2542.310547 398.781738 C 2542.964355 399.412964 2543.953125 398.424805 2543.308105 397.78125 C 2521.606689 376.13208 2500.103271 354.331665 2479.227539 331.877197 C 2468.983154 320.859985 2458.867188 309.725098 2448.877197 298.473999 C 2438.587402 286.885498 2428.948242 274.28418 2417.971191 263.358521 C 2417.806396 263.194946 2417.494385 263.414795 2417.638184 263.616943 C 2426.26416 275.813843 2437.018311 286.915405 2446.88916 298.106567 Z M 2356.797607 552.357788 C 2372.11377 541.073364 2387.372314 529.70813 2402.572754 518.265503 C 2432.816162 495.501587 2462.83667 472.438599 2492.610107 449.057617 C 2509.576172 435.733643 2526.600098 422.439575 2543.253906 408.721802 C 2544.216553 407.928833 2542.850586 406.613525 2541.896729 407.362671 C 2481.640137 454.690918 2421.57251 502.121338 2359.939453 547.657959 C 2343.013672 560.164429 2325.618164 572.174927 2309.199219 585.345947 C 2308.815186 585.653687 2309.313232 586.290161 2309.72168 586.026367 C 2325.905762 575.575439 2341.290283 563.782837 2356.797607 552.357788 Z M 2132.057617 335.390991 C 2132.245117 335.712646 2132.729248 335.427856 2132.555664 335.098999 C 2116.976318 305.64502 2100.131348 276.920532 2083.852539 247.855225 C 2083.800049 247.761841 2083.659668 247.844482 2083.710449 247.937866 C 2099.791016 277.117554 2115.281006 306.603271 2132.057617 335.390991 Z"/>
+            <path id="path11" fill="#ffffff" fill-rule="evenodd" stroke="none" opacity="0.1" d="M 1978.717163 213.164917 C 1978.424316 212.84668 1977.99292 213.307251 1978.250732 213.632568 C 1989.146973 227.302979 2000.527344 240.598633 2011.192261 254.455322 C 2011.265869 254.552124 2011.430664 254.460693 2011.357056 254.358643 C 2001.039185 240.206421 1990.532227 226.123169 1978.717163 213.164917 Z"/>
+            <path id="path12" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2448.966797 203.903076 C 2449.20874 203.678101 2448.854492 203.337036 2448.607178 203.544434 C 2437.409424 212.989746 2426.57959 222.825317 2415.756836 232.699585 C 2415.592041 232.848999 2415.832275 233.084595 2415.998779 232.942139 C 2427.126709 223.40918 2438.216064 213.865234 2448.966797 203.903076 Z"/>
+            <linearGradient id="linearGradient9" x1="2557.58543" y1="414.958791" x2="2576.585061" y2="436.491243" gradientUnits="userSpaceOnUse">
+                <stop offset="1e-05" stop-color="#ffffff" stop-opacity="0.1"/>
+                <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+            </linearGradient>
+            <path id="path13" fill="url(#linearGradient9)" fill-rule="evenodd" stroke="none" d="M 2581.711914 444.283813 C 2582.463867 445.09082 2583.633301 443.895142 2582.912598 443.079346 C 2572.943848 431.779175 2563.045166 419.847778 2552.020752 409.56897 C 2551.643799 409.217407 2550.92334 409.699219 2551.268555 410.151123 C 2560.471191 422.16687 2571.399414 433.222656 2581.711914 444.283813 Z"/>
+            <path id="path14" fill="#ffffff" fill-opacity="0.1" fill-rule="evenodd" stroke="none" d="M 2250.681641 488.636475 C 2250.413574 488.212769 2249.75415 488.594238 2250.008545 489.031982 C 2266.881592 518.150269 2283.979248 547.159546 2301.202637 576.068604 C 2301.274658 576.189941 2301.460449 576.082642 2301.392334 575.957764 C 2285.167725 546.498535 2268.718994 517.030396 2250.681641 488.636475 Z M 2333.838623 333.787231 C 2333.296875 334.611816 2334.580078 335.323975 2335.139404 334.550293 C 2350.559082 313.217651 2367.248291 293.440918 2385.911377 274.884277 C 2386.134033 274.664551 2385.802734 274.342773 2385.572998 274.545044 C 2365.984131 291.777588 2348.209717 311.969238 2333.838623 333.787231 Z M 2170.47168 171.629028 C 2170.904541 171.333496 2170.504883 170.626709 2170.057861 170.91687 C 2140.631592 189.988403 2111.550781 209.520752 2082.720703 229.457397 C 2082.555664 229.571777 2082.708252 229.840698 2082.880127 229.72998 C 2112.355469 210.790283 2141.560791 191.456665 2170.47168 171.629028 Z"/>
+            <g id="Group">
+                <path id="path15" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2080.296875 238.241699 C 2080.296875 239.698242 2079.119385 240.87915 2077.666992 240.87915 C 2076.2146 240.87915 2075.037109 239.698242 2075.037109 238.241699 C 2075.037109 236.785278 2076.2146 235.60437 2077.666992 235.60437 C 2079.119385 235.60437 2080.296875 236.785278 2080.296875 238.241699 Z"/>
+                <path id="path16" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2022.440063 266.373657 C 2022.440063 267.830078 2021.262817 269.010986 2019.810181 269.010986 C 2018.357788 269.010986 2017.18042 267.830078 2017.18042 266.373657 C 2017.18042 264.917114 2018.357788 263.736206 2019.810181 263.736206 C 2021.262817 263.736206 2022.440063 264.917114 2022.440063 266.373657 Z"/>
+                <path id="path17" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2549.286621 406.153809 C 2550.739014 406.153809 2551.91626 404.973022 2551.91626 403.516479 C 2551.91626 402.059937 2550.739014 400.87915 2549.286621 400.87915 C 2547.834229 400.87915 2546.656738 402.059937 2546.656738 403.516479 C 2546.656738 404.973022 2547.834229 406.153809 2549.286621 406.153809 Z"/>
+                <path id="path18" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1222.966187 422.857178 C 1222.966187 424.313721 1221.788696 425.494507 1220.336304 425.494507 C 1218.883911 425.494507 1217.706421 424.313721 1217.706421 422.857178 C 1217.706421 421.400513 1218.883911 420.219727 1220.336304 420.219727 C 1221.788696 420.219727 1222.966187 421.400513 1222.966187 422.857178 Z"/>
+                <path id="path19" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1082.70752 565.27478 C 1082.70752 566.731323 1081.530151 567.912109 1080.077637 567.912109 C 1078.625244 567.912109 1077.447754 566.731323 1077.447754 565.27478 C 1077.447754 563.818115 1078.625244 562.637329 1080.077637 562.637329 C 1081.530151 562.637329 1082.70752 563.818115 1082.70752 565.27478 Z"/>
+                <path id="path20" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 1242.251709 377.142822 C 1242.251709 378.599487 1241.074341 379.780273 1239.621948 379.780273 C 1238.169434 379.780273 1236.992065 378.599487 1236.992065 377.142822 C 1236.992065 375.686279 1238.169434 374.505493 1239.621948 374.505493 C 1241.074341 374.505493 1242.251709 375.686279 1242.251709 377.142822 Z"/>
+                <path id="path21" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2934.121094 271.648315 C 2934.121094 273.104858 2932.943604 274.285767 2931.491211 274.285767 C 2930.038818 274.285767 2928.861328 273.104858 2928.861328 271.648315 C 2928.861328 270.191895 2930.038818 269.010986 2931.491211 269.010986 C 2932.943604 269.010986 2934.121094 270.191895 2934.121094 271.648315 Z"/>
+                <path id="path22" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2557.176025 603.956055 C 2557.176025 605.412598 2555.998535 606.593384 2554.546143 606.593384 C 2553.09375 606.593384 2551.91626 605.412598 2551.91626 603.956055 C 2551.91626 602.499512 2553.09375 601.318726 2554.546143 601.318726 C 2555.998535 601.318726 2557.176025 602.499512 2557.176025 603.956055 Z"/>
+                <path id="path23" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2601.006836 565.27478 C 2601.006836 566.731323 2599.82959 567.912109 2598.376953 567.912109 C 2596.924561 567.912109 2595.747314 566.731323 2595.747314 565.27478 C 2595.747314 563.818115 2596.924561 562.637329 2598.376953 562.637329 C 2599.82959 562.637329 2601.006836 563.818115 2601.006836 565.27478 Z"/>
+                <path id="path24" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2686.915283 642.637329 C 2686.915283 644.093994 2685.737793 645.27478 2684.2854 645.27478 C 2682.833008 645.27478 2681.655518 644.093994 2681.655518 642.637329 C 2681.655518 641.180786 2682.833008 640 2684.2854 640 C 2685.737793 640 2686.915283 641.180786 2686.915283 642.637329 Z"/>
+                <path id="path25" fill="#ffffff" fill-opacity="0.05" fill-rule="evenodd" stroke="none" d="M 2430.943359 249.670288 C 2430.943359 265.207153 2418.384277 277.802246 2402.891602 277.802246 C 2387.39917 277.802246 2374.839844 265.207153 2374.839844 249.670288 C 2374.839844 234.133545 2387.39917 221.538452 2402.891602 221.538452 C 2418.384277 221.538452 2430.943359 234.133545 2430.943359 249.670288 Z"/>
+                <path id="path26" fill="#ffffff" fill-opacity="0.15" fill-rule="evenodd" stroke="none" d="M 2422.177246 250.549438 C 2422.177246 260.745361 2413.935303 269.010986 2403.768311 269.010986 C 2393.601318 269.010986 2385.359131 260.745361 2385.359131 250.549438 C 2385.359131 240.353516 2393.601318 232.087891 2403.768311 232.087891 C 2413.935303 232.087891 2422.177246 240.353516 2422.177246 250.549438 Z"/>
+                <path id="path27" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2408.151367 250.549438 C 2408.151367 252.977173 2406.188965 254.945068 2403.768311 254.945068 C 2401.347656 254.945068 2399.38501 252.977173 2399.38501 250.549438 C 2399.38501 248.121826 2401.347656 246.153809 2403.768311 246.153809 C 2406.188965 246.153809 2408.151367 248.121826 2408.151367 250.549438 Z"/>
+                <path id="path28" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 886.34552 563.516479 C 886.34552 565.944214 884.383118 567.912109 881.962402 567.912109 C 879.541748 567.912109 877.579346 565.944214 877.579346 563.516479 C 877.579346 561.088867 879.541748 559.12085 881.962402 559.12085 C 884.383118 559.12085 886.34552 561.088867 886.34552 563.516479 Z"/>
+                <path id="path29" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2806.13501 545.934082 C 2806.13501 548.361694 2804.172852 550.329712 2801.751953 550.329712 C 2799.331299 550.329712 2797.369141 548.361694 2797.369141 545.934082 C 2797.369141 543.506348 2799.331299 541.538452 2801.751953 541.538452 C 2804.172852 541.538452 2806.13501 543.506348 2806.13501 545.934082 Z"/>
+                <path id="path30" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 2946.393799 422.857178 C 2946.393799 425.28479 2944.431396 427.252808 2942.010498 427.252808 C 2939.590088 427.252808 2937.627686 425.28479 2937.627686 422.857178 C 2937.627686 420.429443 2939.590088 418.461548 2942.010498 418.461548 C 2944.431396 418.461548 2946.393799 420.429443 2946.393799 422.857178 Z"/>
+                <path id="path31" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 2695.681396 331.428589 C 2695.681396 333.856201 2693.718994 335.824219 2691.298584 335.824219 C 2688.877686 335.824219 2686.915283 333.856201 2686.915283 331.428589 C 2686.915283 329.000854 2688.877686 327.032959 2691.298584 327.032959 C 2693.718994 327.032959 2695.681396 329.000854 2695.681396 331.428589 Z"/>
+                <path id="path32" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 951.215088 356.043945 C 951.215088 358.47168 949.252747 360.439575 946.832031 360.439575 C 944.411316 360.439575 942.448914 358.47168 942.448914 356.043945 C 942.448914 353.616333 944.411316 351.648315 946.832031 351.648315 C 949.252747 351.648315 951.215088 353.616333 951.215088 356.043945 Z"/>
+                <path id="path33" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 1147.577148 384.175781 C 1147.577148 386.603516 1145.614746 388.571411 1143.194092 388.571411 C 1140.773315 388.571411 1138.811035 386.603516 1138.811035 384.175781 C 1138.811035 381.748169 1140.773315 379.780273 1143.194092 379.780273 C 1145.614746 379.780273 1147.577148 381.748169 1147.577148 384.175781 Z"/>
+                <path id="path34" fill="#ffffff" fill-opacity="0.3" fill-rule="evenodd" stroke="none" d="M 1405.302368 772.747192 C 1405.302368 775.174927 1403.339966 777.142822 1400.919189 777.142822 C 1398.498535 777.142822 1396.536133 775.174927 1396.536133 772.747192 C 1396.536133 770.31958 1398.498535 768.351685 1400.919189 768.351685 C 1403.339966 768.351685 1405.302368 770.31958 1405.302368 772.747192 Z"/>
+            </g>
+        </g>
+        <g id="Group-copy">
+            <path id="path35" fill="#ffeddd" fill-opacity="0.08" fill-rule="evenodd" stroke="none" d="M 2056.72998 1161.859985 C 2042.844971 1185.862061 2023.089966 1206.944092 1999.088013 1220.830078 C 1975.823975 1234.290039 1948.014038 1239.533936 1919.203003 1239.533936 C 1890.393066 1239.533936 1863.348022 1232.967041 1840.083008 1219.50708 C 1816.083008 1205.621094 1796.709961 1185.197021 1782.822998 1161.197021 C 1769.363037 1137.932007 1758 1111.272949 1758 1082.462036 C 1758 1053.651978 1766.645996 1025.420044 1780.105957 1002.155029 C 1793.993042 978.155029 1817.160034 961.166992 1841.161987 947.280029 C 1864.426025 933.820068 1890.391968 922 1919.202026 922 C 1948.011963 922 1975.712036 930.829956 1998.974976 944.290039 C 2022.974976 958.175049 2042.593018 979.207031 2056.47998 1003.208008 C 2069.939941 1026.473022 2080.01001 1053.651001 2080.01001 1082.462036 C 2080.01001 1111.271973 2070.189941 1138.596924 2056.72998 1161.862061 Z"/>
+            <path id="path36" fill="#ffeddd" fill-opacity="0.22" fill-rule="evenodd" stroke="none" d="M 2037.469971 1150.73999 C 2025.363037 1171.666016 2009.911987 1191.223999 1988.984985 1203.332031 C 1968.70105 1215.067017 1944.322021 1219.723999 1919.202026 1219.723999 C 1894.082031 1219.723999 1869.577026 1215.286011 1849.291992 1203.550049 C 1828.366943 1191.442017 1809.567993 1173.676025 1797.462036 1152.75 C 1785.724976 1132.464966 1780.375977 1107.582031 1780.375977 1082.462036 C 1780.375977 1057.342041 1788.885986 1034.287964 1800.623047 1014.004028 C 1812.72998 993.077026 1829.093018 974.737061 1850.02002 962.630005 C 1870.302979 950.893066 1894.083008 943.959961 1919.202026 943.959961 C 1944.322021 943.959961 1967.76001 951.483032 1988.043945 963.219971 C 2008.970947 975.32605 2028.115967 991.665039 2040.223999 1012.592041 C 2051.958984 1032.875977 2057.523926 1057.342041 2057.523926 1082.462036 C 2057.523926 1107.582031 2049.206055 1130.454956 2037.469971 1150.739014 Z"/>
+            <path id="path37" fill="#ffeddd" fill-opacity="0.4" fill-rule="evenodd" stroke="none" d="M 2025.570068 1143.869995 C 2014.625977 1162.786987 2000.792969 1180.072998 1981.875977 1191.018066 C 1963.539063 1201.62793 1941.911011 1205.264038 1919.203003 1205.264038 C 1896.494995 1205.264038 1873.98999 1203.140991 1855.652954 1192.531982 C 1836.737061 1181.587036 1822.763062 1163.374023 1811.81897 1144.457031 C 1801.208984 1126.119995 1796.54895 1105.170044 1796.54895 1082.462036 C 1796.54895 1059.754028 1802.761963 1039.702026 1813.370972 1021.365967 C 1824.31604 1002.448975 1838.110962 985.712036 1857.026978 974.765991 C 1875.363037 964.157959 1896.494019 955.572998 1919.202026 955.572998 C 1941.910034 955.572998 1962.692017 964.756958 1981.030029 975.365967 C 1999.947998 986.311035 2017.280029 1000.602051 2028.224976 1019.519043 C 2038.834961 1037.85498 2044.084961 1059.753052 2044.084961 1082.46106 C 2044.084961 1105.169067 2036.180054 1125.531006 2025.571045 1143.86792 Z"/>
+            <path id="path38" fill="#ffeddd" fill-opacity="0.85" fill-rule="evenodd" stroke="none" d="M 2006.036011 1144.320068 C 1989.966064 1166.87793 1966.697998 1184.816895 1937.225952 1189.766968 C 1907.755981 1194.717041 1879.901001 1185.366943 1857.343994 1169.296997 C 1834.786987 1153.227051 1815.349976 1130.207031 1810.400024 1100.736938 C 1805.449951 1071.266968 1815.469971 1042.571045 1831.540039 1020.012939 C 1847.609985 997.455933 1872.093018 982.400024 1901.563965 977.449951 C 1931.036011 972.5 1958.19104 980 1980.748047 996.069946 C 2003.305054 1012.137939 2021.175049 1035.031982 2026.125 1064.503052 C 2031.075073 1093.973022 2022.10498 1121.762939 2006.035034 1144.320068 Z"/>
+            <path id="path39" fill="#ffeddd" fill-rule="evenodd" stroke="none" d="M 1991.852051 1155.109985 C 1973.565063 1173.397949 1947.108032 1185.030029 1919.202026 1185.030029 C 1891.297974 1185.030029 1865.563965 1172.675049 1847.276978 1154.387939 C 1828.98999 1136.101074 1819.597046 1110.368042 1819.597046 1082.462036 C 1819.597046 1054.557007 1828.583008 1028.416016 1846.869995 1010.129028 C 1865.156982 991.840942 1891.297974 981.958984 1919.203003 981.958984 C 1947.108032 981.958984 1973.583008 991.505981 1991.870972 1009.792969 C 2010.159058 1028.079956 2019.598999 1054.55603 2019.598999 1082.460938 C 2019.598999 1110.365967 2010.139038 1136.822998 1991.853027 1155.110962 Z"/>
+            <path id="path40" fill="#ffffff" fill-rule="evenodd" stroke="none" d="M 1989.703003 1152.981934 C 1971.959961 1170.724976 1946.290039 1182.011963 1919.213013 1182.011963 C 1892.139038 1182.011963 1867.170044 1170.023926 1849.427002 1152.280029 C 1831.68396 1134.536987 1822.571045 1109.567993 1822.571045 1082.493042 C 1822.571045 1055.417969 1831.291016 1030.052979 1849.032959 1012.311035 C 1866.776978 994.56897 1892.140015 984.980957 1919.214966 984.980957 C 1946.291016 984.980957 1971.979004 994.244019 1989.723022 1011.986938 C 2007.466064 1029.72998 2016.625 1055.418945 2016.625 1082.494019 C 2016.625 1109.56897 2007.447021 1135.23999 1989.704956 1152.984009 Z"/>
+        </g>
+        <g id="mountains-pathwayall">
+            <path id="path41" fill="#b0708f" fill-rule="evenodd" stroke="none" d="M 270.492157 706 L 237.915115 767.303345 L 175.453323 807.775146 L 84.792488 841.87085 L -1 896.915161 L -1 1753.86377 L 3839 1753.86377 L 3839 899.321167 L 3678.332031 863.528931 L 3572.50415 772.416748 L 3393.599365 759.406372 L 3250.393311 798.461548 L 3087.573242 782.209839 L 2970.32959 808.276245 L 2918.222656 782.311768 L 2800.950928 805.223877 L 2739.05957 815.257813 L 2706.482666 832.071289 L 2681.351318 881.72876 L 2647.845703 881.72876 L 2614.724121 896.917236 L 2581.248779 905.831665 L 2554.661621 905.59314 L 2548.15332 925.35498 L 2523.06958 931.87207 L 2504.325195 954.658325 L 2455.550781 977.453125 L 2387.181396 980.742065 L 2361.141113 1003.588989 L 2302.512695 1010.231934 L 2243.87793 1036.536987 L 2195.014404 1056.372681 L 2155.740234 1037.932007 L 2064.708252 1037.932007 L 1963.716553 1034.794922 L 1921.170532 1057.457397 L 1768.251953 1057.457397 L 1673.568848 1024.915039 L 1628.167969 1024.915039 L 1582.560791 1005.506836 L 1432.482056 992.372681 L 1396.867798 992.372681 L 1373.840698 970.677856 L 1334.969971 970.677856 L 1318.683594 937.170044 L 1250.268799 919.931274 L 1204.42749 888.237183 L 1165.567505 888.237183 L 1152.301025 866.542236 L 1126.475464 866.542236 L 1064.762085 820.501343 L 911.83252 761.441284 L 759.085266 708.169434 L 709.482056 708.169434 L 686.678528 729.150635 L 648.41095 708.169434 L 566.139465 708.169434 L 405.423645 724.9375"/>
+            <path id="path42" fill="#9e6280" fill-rule="evenodd" stroke="none" d="M 270.338165 909.932129 L 200.875412 937.38916 L 146.607773 968.508301 L 74.975563 959.830322 L -1 977.186279 L -1 1753.86377 L 3838.997803 1753.86377 L 3838.997803 1074.813354 L 3779.40625 1074.813354 L 3763.126465 1083.604126 L 3737.07959 1095.651245 L 3671.851807 1089.999756 L 3645.91333 1089.999756 L 3613.353516 1095.536377 L 3590.563232 1104.329224 L 3551.492676 1110.837646 L 3522.189209 1101.074951 L 3492.885986 1094.570923 L 3460.326416 1088.066772 L 3431.025146 1104.346558 L 3339.858887 1117.378784 L 3251.948975 1075.108398 L 3128.2229 1114.22644 L 2994.729736 1094.837769 L 2890.540039 1039.789185 L 2766.816162 1085.88855 L 2682.006348 1083.491333 L 2587.73999 1083.491333 L 2545.415527 1062.998291 L 2460.761963 1097.822998 L 2402.155273 1101.077271 L 2356.572021 1084.8125 L 2284.942139 1091.32959 L 2170.985352 1088.090576 L 2122.145508 1110.904907 L 2070.051758 1137.004028 L 2021.21228 1124.123657 L 1965.861938 1130.90332 L 1913.768311 1118.430908 L 1859.303223 1107.355713 L 1786.788086 1107.355713 L 1767.251831 1089.706909 L 1718.412231 1065.55188 L 1669.574829 1056.060303 L 1610.968262 1046.839966 L 1585.793457 1018.406616 L 1448.17395 1018.406616 L 1426.329346 1037.910278 L 1358.901611 1063.924683 L 1317.935181 1069.074951 L 1298.398926 1072.873901 L 1279.721802 1083.491333 L 1243.048706 1083.491333 L 1213.747437 1066.521484 L 1180.393799 1056.520142 L 1161.651489 1063.111206 L 1136.4552 1070.474365 L 1109.557739 1070.474365 L 1083.77771 1060.830933 L 1054.20752 1043.045532 L 1018.391357 1030.570923 L 988.845215 1035.762573 L 959.786926 1035.762573 L 936.994324 1024.496338 L 907.690979 996.961182 L 875.131287 993.724243 L 849.084412 1010.028076 L 813.270447 1026.366455 L 793.734192 1013.486206 L 754.663818 1003.994629 L 722.104126 991.520142 L 702.31189 972.84729 L 676.520996 972.84729 L 621.170776 978.659424 L 598.378113 964.945923 L 565.820618 958.979858 L 539.506836 951.152466 L 513.726746 951.152466 L 461.359589 965.913696 L 441.552185 951.388916 L 414.962891 922.10083"/>
+            <path id="path43" fill="#81476d" fill-rule="evenodd" stroke="none" d="M 2945.38916 816.644043 L 2899.780029 836.169434 L 2883.491455 829.660889 L 2847.653564 819.902588 L 2824.850098 823.16333 L 2811.820313 826.428467 L 2795.531494 836.214966 L 2779.240723 855.785889 L 2766.212891 881.913208 L 2749.922363 908.133667 L 2733.633789 941.05127 L 2723.862305 967.84021 L 2714.08667 992.129761 L 2697.79834 992.129761 L 2681.509521 974.348633 L 2665.221191 956.567383 L 2648.932617 950.05896 L 2632.641846 946.806885 L 2622.870605 940.298462 L 2609.838379 937.044189 L 2600.067139 940.298462 L 2587.034912 950.05896 L 2567.487793 972.836426 L 2551.199219 985.855469 L 2534.912842 992.361816 L 2518.622314 1002.124512 L 2505.590088 1015.143677 L 2492.560059 1031.414795 L 2476.271729 1047.690308 L 2450.209473 1070.47644 L 2433.921143 1073.748047 L 2407.858887 1083.545654 L 2375.281738 1103.135986 L 2362.251953 1100.018433 L 2303.610596 1126.321411 L 2267.774902 1169.166748 L 2255.649658 1170.027954 L 2231.939209 1170.027954 L 2205.877197 1175.564453 L 2153.755127 1181.098877 L 2127.692871 1168.082031 L 2091.857422 1161.573486 L 2039.731079 1168.082031 L 1997.380493 1158.321411 L 1961.547119 1116.016357 L 1906.164185 1093.23877 L 1886.617065 1063.952881 L 1827.977905 1047.681763 L 1785.627319 1057.442261 L 1749.793945 1067.204956 L 1726.988159 1086.730347 L 1713.956055 1109.51001 L 1671.605347 1119.272705 L 1619.483521 1112.762085 L 1593.419189 1106.253662 L 1577.132813 1119.272705 L 1554.327148 1109.51001 L 1531.523682 1103.001465 L 1518.491455 1096.493042 L 1498.944336 1109.51001 L 1485.912354 1103.001465 L 1463.108643 1089.984619 L 1450.080933 1099.747314 L 1417.501709 1073.713379 L 1388.18335 1050.936035 L 1365.377563 1028.156372 L 1345.830444 1002.124512 L 1300.223511 972.836426 L 1277.4198 969.584351 L 1248.097046 985.855469 L 1195.975098 969.584351 L 1169.912964 950.05896 L 1143.848633 969.584351 L 1127.562378 959.821655 L 1114.530273 966.330078 L 1101.498047 972.838623 L 1068.923218 989.109741 L 1033.085327 998.874756 L 1010.28186 979.355835 L 987.478394 963.093384 L 941.869202 943.585327 L 906.033508 940.365723 L 886.486389 959.956177 L 850.653015 979.616089 L 808.302368 970.124634 L 772.466736 947.889404 L 707.054382 935.723022 L 603.064209 935.723022 L 573.74353 910.355103 L 521.623718 933.794312 L 485.79245 914.277588 L 459.739014 898.017212 L 430.435669 893.159668 L 414.181854 901.34082 L 362.127106 893.296387 L 310.139587 885.345215 L 271.320953 901.985229 L 218.365875 968.265381 L 144.520737 988.020752 L 55.471832 1013.824585 L -1 988.020752 L -1 1753.86377 L 3838.997803 1753.86377 L 3838.997803 901.247681 L 3801.040527 891.500122 L 3779.373779 875.246338 L 3766.34375 862.259766 L 3723.990967 868.82666 L 3701.1875 881.96521 L 3600.197754 885.460205 L 3570.876953 876.181274 L 3551.332275 870.638306 L 3535.041504 870.638306 L 3512.238037 881.485718 L 3486.173584 881.485718 L 3463.370117 857.200439 L 3447.083984 842.675781 L 3424.278076 839.419312 L 3407.989746 849.182007 L 3378.668945 878.470093 L 3336.318359 868.707397 L 3271.161865 852.438477 L 3222.296387 907.758179 L 3091.988281 881.724365 L 3056.150391 871.96167 L 3023.575439 839.421509"/>
+            <g id="g1">
+                <path id="path44" fill="#edba8c" fill-rule="evenodd" stroke="none" d="M 1975.664673 1216.024902 L 1966.175293 1221.162109 L 1964.125244 1221.062378 L 1965.157837 1219.290039 L 1974.634277 1214.126587 L 1976.690918 1214.23938 M 2032.405396 1170.577148 L 2024.875 1174.035522 L 2017.184326 1177.022705 L 2009.345825 1179.578613 L 2000.993286 1190.222046 L 1990.615967 1200.182129 L 1998.151123 1188.106689 L 2006.455933 1175.627808 L 2015.431396 1171.924561 L 2023.330444 1169.546753 L 2033.115723 1166.607422 L 2039.542358 1168.034912 M 1751.514282 1104.892578 L 1770.206665 1103.63208 L 1788.90332 1102.480103 L 1812.991211 1115.481812 L 1830.35791 1119.974731 L 1848.271362 1124.795288 L 1881.540527 1148.519531 L 1899.660278 1144.826294 L 1918.751587 1141.483154 L 1929.262695 1143.596191 L 1938.884521 1145.561768 L 1958.36438 1149.108887 L 1994.991211 1157.287842 L 1957.930298 1151.866211 L 1938.302979 1149.239014 L 1928.466675 1147.579346 L 1918.725586 1145.804688 L 1900.558228 1149.614258 L 1881.540527 1153.356689 L 1879.592285 1152.95105 L 1846.034546 1129.568237 L 1828.984497 1125.014526 L 1810.554688 1119.744751 L 1787.944336 1106.437134 L 1770.360596 1107.189941 L 1751.63147 1107.556641 L 1715.091919 1109.572876 M 1921.164185 1057.457153 L 1933.621338 1058.162231 L 1946.054565 1059.069214 L 1970.858521 1061.407959 L 1995.592896 1064.32373 L 2020.034424 1068.131104 L 2033.274536 1068.619263 L 2046.515015 1068.825439 L 2059.755371 1068.762329 L 2072.99585 1068.441406 L 2099.296631 1083.78186 L 2100.012695 1086.71936 L 2086.897949 1100.298096 L 2074.056885 1113.354126 L 2071.800537 1114.143799 L 2048.901367 1110.922241 L 2027.069824 1107.240479 L 2011.473511 1110.165039 L 1995.85083 1112.974487 L 1980.200195 1115.649414 L 1964.582886 1118.297852 L 1979.738037 1113.453979 L 1995.13501 1109.583618 L 2010.562134 1105.847656 L 2026.013428 1102.226929 L 2049.73877 1105.185913 L 2072.501221 1108.622559 L 2083.333496 1096.69458 L 2094.789795 1085.609131 L 2072.342773 1070.686768 L 2059.755371 1070.554443 L 2046.515015 1070.491455 L 2033.274536 1070.478516 L 2019.852173 1070.953613 L 1995.024292 1068.916504 L 1970.307495 1065.963745 L 1945.659668 1062.342896 L 1933.367554 1060.268921"/>
+            </g>
+        </g>
+        <g id="treeline-pathwayall">
+            <g id="g2">
+                <path id="path45" fill="#683d66" fill-rule="evenodd" stroke="none" d="M 1172.333374 1050.470093 C 1170.358032 1044.234009 1166.826172 1037.966309 1163.578735 1031.663086 C 1160.315552 1035.325317 1157.536255 1039.0448 1154.259155 1042.81958 C 1149.700195 1036.84436 1145.384155 1030.845459 1140.819336 1024.820679 C 1137.520508 1029.328369 1134.34021 1033.895142 1131.031616 1038.519409 C 1127.744751 1034.256714 1124.51709 1029.984131 1121.226196 1025.699707 C 1117.915527 1028.303101 1114.630615 1030.946045 1111.310059 1033.630493 C 1108.019165 1027.987061 1104.740234 1022.325806 1101.443481 1016.646851 C 1097.463135 1020.593506 1093.48291 1024.60144 1089.490845 1028.668579 C 1086.839966 1024.569824 1084.193115 1020.461182 1081.540283 1016.346558 C 1078.855835 1019.307617 1076.171387 1022.296265 1073.48291 1025.310547 C 1070.816284 1022.637939 1068.151611 1019.961426 1065.484985 1017.286865 C 1062.1427 1018.768311 1058.800415 1020.279419 1055.454346 1021.814209 C 1052.129883 1018.319946 1048.801392 1014.825562 1045.473022 1011.331299 C 1042.119019 1013.614746 1038.762939 1015.92981 1035.404907 1018.272461 C 1032.070679 1015.534668 1028.7323 1012.79895 1025.394043 1010.071045 C 1022.034119 1011.716431 1018.674133 1013.389526 1015.312073 1015.086304 C 1012.637512 1010.286377 1009.962952 1005.482422 1007.286438 1000.674438 C 1003.250793 1004.490723 999.215332 1008.352539 995.177795 1012.253662 C 991.187622 1004.338745 987.193604 996.411865 983.195618 988.474976 C 979.803894 995.46167 976.4104 1002.48584 973.018738 1009.551514 C 968.351135 1003.070557 963.67749 996.593506 959.001953 990.122437 C 954.948608 995.678955 950.893311 1001.276855 946.839966 1006.914429 C 942.820313 1001.304688 938.800476 995.702637 934.774841 990.106567 C 930.721497 995.03894 926.668213 1000.004883 922.61676 1005.006348 C 919.258728 997.237427 915.898743 989.470459 912.532837 981.705688 C 909.804871 989.085327 907.077026 996.484863 904.349121 1003.904053 C 902.310669 1000.016602 900.270142 996.131226 898.229614 992.247803 C 896.843018 995.963379 895.454346 999.684814 894.065735 1003.410278 C 890.699707 994.934204 887.327881 986.464111 883.954041 977.999878 C 880.5625 986.211304 877.172852 994.446411 873.785156 1002.703125 C 870.411316 997.304565 867.035522 991.917969 863.657715 986.543091 C 860.274109 991.79541 856.890381 997.065674 853.51062 1002.35144 C 850.130859 994.72876 846.75116 987.11792 843.367432 979.524902 C 839.98175 987.119873 836.599976 994.72876 833.218262 1002.35144 C 829.834534 998.584595 826.450806 994.833496 823.065125 991.10022 C 819.685425 994.956055 816.305664 998.825562 812.927979 1002.707031 C 809.540222 995.210815 806.148682 987.734253 802.757019 980.281372 C 799.383179 987.985107 796.013306 995.69873 792.645447 1003.418213 C 789.925415 999.750122 787.205444 996.097778 784.483459 992.457275 C 781.775391 996.382202 779.071106 1000.311035 776.36499 1004.243896 C 773.646851 1000.623047 770.92688 997.018311 768.204956 993.427002 C 764.837036 997.425171 761.47113 1001.43103 758.105164 1005.442871 C 754.043945 997.458618 749.982727 989.517944 745.919495 981.620605 C 741.23999 990.304077 736.566406 998.989624 731.89679 1007.671021 C 728.503235 1000.514526 725.111572 993.393555 721.718018 986.307983 C 718.375793 994.146118 715.035583 1001.976196 711.699219 1009.796509 C 708.317566 1005.719482 704.937805 1001.670044 701.558044 997.652344 C 698.213806 1002.527222 694.871582 1007.404419 691.531372 1012.277466 C 688.145691 1005.334229 684.759949 998.434448 681.376282 991.580078 C 678.711609 999.341187 676.046936 1007.086426 673.386169 1014.815674 C 670.020264 1011.647339 666.654297 1008.506592 663.290344 1005.399414 C 659.956055 1009.591064 656.625671 1013.782715 653.297302 1017.970337 C 650.593079 1014.055298 647.890869 1010.167847 645.190613 1006.307983 C 641.870117 1011.250244 638.549622 1016.186646 635.23114 1021.11499 C 631.205383 1013.922852 627.181702 1006.803833 623.16394 999.757935 C 619.211365 1008.449341 615.260742 1017.111084 611.31012 1025.737183 C 607.944214 1016.471069 604.582214 1007.281982 601.224182 998.1698 C 597.94519 1008.822632 594.666199 1019.430054 591.387146 1029.986084 C 588.052856 1025.113037 584.722473 1020.29126 581.396057 1015.52478 C 578.109131 1021.903076 574.822266 1028.259644 571.535339 1034.588501 C 568.216736 1030.545044 564.902222 1026.549072 561.593567 1022.60437 C 558.310608 1028.27356 555.029602 1033.922852 551.746643 1039.546631 C 548.436035 1032.228027 545.131348 1024.986694 541.832581 1017.828125 C 538.567444 1026.890869 535.300293 1035.902222 532.033081 1044.858276 C 528.775818 1039.734253 524.538757 1034.673584 521.295288 1029.681885 C 518.061707 1036.650757 514.555542 1043.5802 510.60495 1050.470093 L 510.60495 1396.765625 L 1172.333374 1396.765625 L 1172.333374 1050.470093 Z M 2632.086426 1130.098877 L 2622.465576 1118.57666 L 2614.458984 1128.209839 L 2609.504639 1118.57666 L 2600.185059 1127.757935 C 2600.185059 1127.757935 2593.285645 1117.759033 2588.720459 1111.734253 C 2585.421631 1116.241943 2580.266113 1120.808716 2576.95752 1125.432983 C 2573.670654 1121.170288 2570.442871 1116.897705 2567.1521 1112.613281 C 2563.841553 1115.216675 2560.556396 1117.859619 2557.236084 1120.544067 C 2553.945313 1114.900635 2550.66626 1109.23938 2547.369385 1103.560425 C 2543.38916 1107.50708 2539.408936 1111.515015 2535.416748 1115.582153 C 2532.765869 1111.483398 2530.119141 1107.374756 2527.466309 1103.260132 C 2524.781738 1106.221191 2522.097168 1109.209839 2519.408936 1112.224121 C 2516.742432 1109.551514 2514.077637 1106.875 2511.410889 1104.200439 C 2508.068604 1105.681885 2504.726563 1107.192993 2501.380127 1108.727783 C 2498.055664 1105.233521 2494.727539 1101.739136 2491.398926 1098.244873 C 2488.044922 1100.52832 2484.688965 1102.843384 2481.331055 1105.186035 C 2477.996338 1102.448242 2474.658203 1099.712524 2471.320068 1096.984619 C 2467.959961 1098.630005 2464.599854 1100.303101 2461.238037 1101.999878 C 2458.563477 1097.199951 2455.888916 1092.395996 2453.212158 1087.588013 C 2449.176758 1091.404297 2445.141357 1095.266113 2441.103516 1099.167236 C 2437.11377 1091.252319 2433.119385 1083.325439 2429.121582 1075.38855 C 2425.729736 1082.375244 2422.336182 1089.399414 2418.944824 1096.465088 C 2414.2771 1089.984131 2409.603516 1083.50708 2404.927734 1077.036011 C 2400.874512 1082.592529 2396.819336 1088.19043 2392.765869 1093.828003 C 2388.746094 1088.218262 2384.726563 1082.616211 2380.700684 1077.020142 C 2376.647217 1081.952515 2372.593994 1086.918457 2368.542725 1091.919922 C 2365.18457 1084.151001 2361.824707 1076.384033 2358.45874 1068.619263 C 2355.730713 1075.998901 2353.00293 1083.398438 2350.275146 1090.817627 C 2348.236572 1086.930298 2346.196045 1083.0448 2344.155518 1079.161377 C 2342.768799 1082.876953 2341.380127 1086.598511 2339.991455 1090.323853 C 2336.625732 1081.847778 2333.253662 1073.377686 2329.880127 1064.913452 C 2326.488525 1073.124878 2323.098633 1081.359985 2319.711182 1089.616699 C 2316.337158 1084.21814 2312.961426 1078.831543 2309.58374 1073.456665 C 2306.199951 1078.708984 2302.816406 1083.979248 2299.436523 1089.265015 C 2296.056885 1081.642334 2292.677002 1074.031494 2289.293457 1066.438477 C 2285.907471 1074.033447 2282.525879 1081.642334 2279.144287 1089.265015 C 2275.760498 1085.498169 2272.376709 1081.74707 2268.990967 1078.013794 C 2265.611328 1081.869629 2262.231689 1085.739136 2258.85376 1089.620605 C 2255.466309 1082.12439 2252.074707 1074.647827 2248.682861 1067.194946 C 2245.309082 1074.898682 2241.939453 1082.612305 2238.571289 1090.331787 C 2235.851318 1086.663696 2233.131348 1083.011353 2230.409424 1079.37085 C 2227.701172 1083.295776 2224.99707 1087.224609 2222.291016 1091.157471 C 2219.572998 1087.536621 2216.852783 1083.931885 2214.130859 1080.340576 C 2210.762939 1084.338745 2207.396973 1088.344604 2204.031006 1092.356445 C 2199.969727 1084.372192 2195.908691 1076.431519 2191.845459 1068.53418 C 2187.166016 1077.217651 2182.492188 1085.903198 2177.822754 1094.584595 C 2174.429199 1087.428101 2171.037598 1080.307129 2167.643799 1073.221558 C 2164.301758 1081.059692 2160.96167 1088.889771 2157.625 1096.710083 C 2154.243652 1092.633057 2150.86377 1088.583618 2147.484131 1084.565918 C 2144.139893 1089.440796 2140.797607 1094.317993 2137.457275 1099.19104 C 2134.071533 1092.247803 2130.686035 1085.348145 2127.302246 1078.493652 C 2124.637451 1086.254761 2121.9729 1094 2119.312012 1101.729248 C 2115.946045 1098.560913 2112.580322 1095.420166 2109.216309 1092.312988 C 2105.88208 1096.504639 2102.551514 1100.696289 2099.223389 1104.883911 C 2096.519043 1100.968872 2093.81665 1097.081421 2091.116699 1093.221558 C 2087.796143 1098.163818 2084.475586 1103.10022 2081.157227 1108.028564 C 2077.131348 1100.836548 2073.107666 1093.717529 2069.089844 1086.671509 C 2065.137451 1095.362915 2061.186768 1104.024658 2057.236084 1112.650757 C 2053.870117 1103.384644 2050.508301 1094.195557 2047.150024 1085.083374 C 2043.870972 1095.736206 2040.592163 1106.343628 2037.31311 1116.899658 C 2033.97876 1112.026611 2030.648315 1107.204834 2027.322021 1102.438354 C 2024.034912 1108.81665 2020.748169 1115.173218 2017.461182 1121.502075 C 2014.1427 1117.458618 2010.828247 1113.462646 2007.519531 1109.517944 C 2004.236572 1115.187134 2000.955566 1120.836548 1997.672607 1126.460205 C 1994.361938 1119.141602 1991.057251 1111.900269 1987.758423 1104.741699 C 1984.493286 1113.804443 1981.226074 1122.815796 1977.959106 1131.771851 C 1974.70166 1126.647827 1970.4646 1121.587158 1967.221191 1116.595459 C 1963.987671 1123.564331 1960.481445 1130.493774 1956.530884 1137.383667 L 1946.160522 1126.460205 L 1940.251953 1143.229736 L 1935.296265 1137.383667 L 1928.876587 1149.852051 L 1928.876587 1456.02478 L 2632.086426 1456.02478 L 2632.086426 1130.098877 Z"/>
+            </g>
+            <path id="path46" fill="#593656" fill-rule="evenodd" stroke="none" d="M 471.667633 997.755127 L 447.045441 1031.397705 L 419.00592 1002.078369 L 396.279968 1035.673462 L 368.189148 1006.352295 L 345.342712 1039.94751 L 317.024689 1011.612671 L 289.368378 1043.333374 L 265.666656 1014.515259 L 253.81282 1043.333374 L 222.209869 1004.59021 L 208.382721 1043.333374 L 184.677017 1004.59021 L 162.948624 1043.333374 L 137.271606 1004.59021 L 121.469139 1054.021973 L 93.812828 1016.488403 L 70.111115 1060.468262 L 70.111115 1633.802612 L 3566.407471 1633.802612 L 3566.407471 1014.515259 L 3554.081543 1048.694458 L 3540.678955 1017.830078 L 3530.450928 1050.010498 L 3516.696777 1019.144287 L 3506.286865 1051.324707 L 3492.119873 1020.478149 L 3480.244385 1053.258423 L 3462.897217 1023.13208 L 3451.280518 1055.88855 L 3433.93335 1025.764282 L 3422.314453 1058.518921 L 3407.124512 1028.345215 L 3389.087891 1057.011353 L 3364.445801 1023.317505 L 3344.311523 1051.750854 L 3335.478027 1018.057129 L 3315.341553 1046.488525 L 3303.553223 1012.542114 L 3281.935303 1046.954102 L 3254.300781 1018.587891 L 3234.521973 1052.871582 L 3191.094971 1024.507446 L 3181.192627 1058.791138 L 3161.787109 1030.722778 L 3136.661377 1078.722046 L 3123.230957 1054.029907 L 3104.195068 1078.704346 L 3097.236084 1045.030273 L 3082.45874 1068.175537 L 3069.587646 1034.509277 L 3052.838867 1057.656494 L 3043.568848 1030.515625 L 3028.746094 1054.625854 L 3012.686768 1023.737793 L 2999.112549 1055.939941 L 2983.057129 1025.052002 L 2973.4375 1057.255981 L 2953.785156 1026.516113 L 2930.219971 1063.526733 L 2908.732422 1038.518799 L 2886.105225 1075.367798 L 2858.699707 1050.355835 L 2836.07251 1087.202759 L 2808.098145 1056.401733 L 2786.000488 1099.381226 L 2762.584961 1075.673584 L 2741.220215 1112.536255 L 2717.814941 1088.828613 L 2696.449951 1125.691284 L 2673.23999 1101.924561 L 2653.925537 1137.636841 L 2631.946045 1114.369385 L 2614.415283 1148.161865 L 2592.442139 1124.894165 L 2574.913086 1158.684692 L 2558.842041 1133.449829 L 2540.763916 1167.869873 L 2525.856201 1141.360352 L 2511.788086 1175.762451 L 2490.962646 1141.358276 L 2482.820068 1183.655151 L 2461.283447 1166.717529 L 2450.375977 1189.710815 L 2431.551025 1171.800293 L 2419.426514 1193.002075 L 2402.583252 1171.143188 L 2388.481689 1196.287354 L 2372.311523 1176.344482 L 2353.429688 1194.114868 L 2346.759033 1159.989014 L 2325.103516 1187.204834 L 2318.456787 1153.084961 L 2296.807373 1180.304688 L 2288.278076 1145.843384 L 2271.58667 1177.301514 L 2256.761963 1145.730957 L 2241.951172 1177.301514 L 2227.13623 1145.730957 L 2212.325439 1177.301514 L 2198.593018 1145.768311 L 2177.773438 1174.959473 L 2163.906738 1151.277344 L 2142.211914 1170.5177 L 2128.351074 1148.810913 L 2120.487549 1166.080078 L 2106.328369 1132.834229 L 2089.702148 1158.244629 L 2075.183594 1124.576538 L 2060.064453 1149.195801 L 2045.562012 1115.537476 L 2030.447021 1140.156616 L 2023.742676 1119.09314 L 2018.435059 1140.383545 L 2003.237061 1122.970337 L 1993.405884 1149.266846 L 1980.20105 1131.847656 L 1968.398682 1158.14209 L 1953.696167 1116.389893 L 1938.743164 1163.48938 L 1926.88147 1139.813232 L 1915.029663 1163.48938 L 1903.187622 1137.840088 L 1891.337769 1163.48938 L 1879.493774 1120.081665 L 1865.000977 1163.48938 L 1848.532959 1129.945557 L 1836.0271 1163.48938 L 1821.540283 1122.05481 L 1807.057251 1163.48938 L 1788.615845 1132.041016 L 1778.039917 1159.744385 L 1765.615356 1116.666138 L 1750.377808 1149.712646 L 1737.968994 1116.504272 L 1724.708618 1143.631348 L 1715.651855 1103.801025 L 1709.283447 1143.824707 L 1693.129395 1102.015381 L 1682.275146 1149.580444 L 1670.093384 1127.500732 L 1655.294312 1155.334229 L 1638.65625 1111.202393 L 1621.915527 1154.981079 L 1610.620728 1129.073364 L 1596.226685 1148.72998 L 1582.976318 1120.855225 L 1570.561523 1142.487061 L 1549.281494 1088.595825 L 1532.48938 1139.813232 L 1515.361572 1108.240601 L 1498.247437 1139.813232 L 1481.125366 1108.240601 L 1464.011353 1139.813232 L 1440.927979 1108.361084 L 1425.838501 1134.450195 L 1408.672974 1098.548462 L 1386.324463 1130.340088 L 1363.243042 1088.518921 L 1342.873535 1120.310547 L 1321.340698 1078.899658 L 1298.770752 1098.430054 L 1275.985718 1059.398926 L 1253.990601 1082.354736 L 1233.190674 1041.35437 L 1207.246948 1068.25647 L 1184.039063 1012.279663 L 1165.878052 1057.593506 L 1140.232666 1030.578857 L 1122.41333 1065.937988 L 1094.806396 1038.921387 L 1076.987183 1074.284424 L 1052.378784 1043.191284 L 1032.734375 1078.643188 L 1016.232605 1032.338867 L 1004.044983 1056.458862 L 991.904724 1047.074463 L 968.862671 1078.643188 L 953.718018 1033.262329 L 934.628601 1078.643188 L 915.543213 1047.074463 L 896.439941 1078.643188 L 877.334778 1047.074463 L 858.245422 1078.643188 L 839.148193 1047.074463 L 820.058777 1078.643188 L 802.48645 1047.145508 L 776.122009 1074.448242 L 759.624207 1039.424438 L 731.999512 1066.555542 L 715.51355 1031.53186 L 687.888916 1058.662842 L 670.968384 1023.568115 L 633.664734 1050.559082 L 604.809387 1014.974976 L 567.811829 1042.007446 L 538.962463 1006.425293 L 501.974854 1033.457642"/>
+            <path id="path47" fill="#482b47" fill-rule="evenodd" stroke="none" d="M 1999.341675 1203.18335 L 2016.939819 1257.778809 L 2029.431641 1221.646484 L 2051.173828 1260.411987 L 2067.618408 1230.20752 L 2089.368408 1263.046997 L 2102.030273 1230.87915 L 2122.966553 1265.982422 L 2137.727783 1236.15918 L 2158.518066 1269.275146 L 2175.256836 1223.647461 L 2194.077637 1272.567993 L 2210.103271 1242.695435 L 2231.088867 1274.282471 L 2246.887451 1242.675659 L 2266.642578 1274.282471 L 2280.465576 1232.801025 L 2302.201904 1274.282471 L 2315.523438 1252.560059 L 2333.73584 1273.245605 L 2343.756348 1244.702393 L 2358.743164 1271.272217 L 2374.691895 1226.926514 L 2401.552002 1269.294922 L 2418.342285 1230.831665 L 2438.166504 1268.356689 L 2459.562988 1238.727051 L 2488.868652 1268.356689 L 2506.320557 1224.897949 L 2537.5896 1268.356689 L 2559 1238.740845 L 2559 1667.382813 L 1279 1667.382813 L 1279 1274.296387 L 1300.631592 1301.606934 L 1320.641479 1268.370483 L 1340.870605 1300.949219 L 1358.255249 1269.016479 L 1376.147705 1300.289551 L 1398.921021 1258.488037 L 1424.104126 1298.286621 L 1447.910645 1237.437256 L 1469.550171 1294.995605 L 1487.420776 1257.850098 L 1513.012817 1291.702881 L 1527.460327 1254.711304 L 1541.881958 1282.711182 L 1558.326416 1241.164551 L 1578.087402 1274.812012 L 1596.505127 1235.242676 L 1620.228638 1260.984863 L 1639.029663 1203.238525 L 1664.576294 1251.07666 L 1679.574829 1222.422852 L 1701.445435 1256.344727 L 1724.347046 1227.689087 L 1738.320557 1261.610962 L 1760.321533 1232.856445 L 1786.915039 1265.705811 L 1815.023804 1221.622803 L 1844.187134 1268.338867 L 1864.396606 1238.083008 L 1891.598633 1270.973877 L 1912.590088 1240.708252 L 1926.162476 1269.407593 L 1940.46167 1235.702759 L 1958.411377 1264.143311 L 1970.739258 1230.436768 L 1984.76001 1258.873291 L 1999.341675 1203.18335 Z M 719.341736 1236.763672 L 736.939758 1291.359131 L 749.431641 1255.226807 L 771.173828 1293.992188 L 787.618225 1263.787842 L 809.368469 1296.627197 L 822.03009 1264.459473 L 842.966431 1299.562622 L 857.727966 1269.73938 L 878.518005 1302.855469 L 895.256775 1257.227783 L 914.077515 1306.148193 L 930.103149 1276.275635 L 951.088867 1307.862793 L 966.88739 1276.255859 L 986.642517 1307.862793 L 1000.465698 1266.381348 L 1022.201904 1307.862793 L 1035.523438 1286.140381 L 1053.73584 1306.825806 L 1063.756592 1278.282593 L 1078.743164 1304.852539 L 1094.691772 1260.506836 L 1121.552124 1302.875244 L 1138.342163 1264.411865 L 1158.166382 1301.93689 L 1179.562866 1272.307251 L 1208.86853 1301.93689 L 1226.320435 1258.478149 L 1257.5896 1301.93689 L 1279 1272.321045 L 1279 1667.382813 L -1 1667.382813 L -1 1307.876709 L 20.631613 1335.187256 L 40.641468 1301.950684 L 60.870628 1334.529541 L 78.25531 1302.59668 L 96.147652 1333.869751 L 118.920998 1292.068359 L 144.104202 1331.866821 L 167.910614 1271.017456 L 189.550125 1328.575928 L 207.420746 1291.430176 L 233.012833 1325.283081 L 247.460251 1288.291504 L 261.881989 1316.291504 L 278.326416 1274.744873 L 298.087402 1308.392212 L 316.505188 1268.822754 L 340.228668 1294.564941 L 359.029663 1236.818848 L 384.576294 1284.656982 L 399.574799 1256.003174 L 421.445435 1289.925049 L 444.347168 1261.269287 L 458.320496 1295.191162 L 480.321503 1266.436646 L 506.915039 1299.286133 L 535.023682 1255.203125 L 564.187195 1301.919189 L 584.396545 1271.66333 L 611.598511 1304.554199 L 632.590149 1274.288452 L 646.162476 1302.987793 L 660.461731 1269.282959 L 678.411377 1297.723633 L 690.739258 1264.016968 L 704.759949 1292.453491 L 719.341736 1236.763672 Z M 3279.341797 1169.603149 L 3296.939697 1224.198608 L 3309.431641 1188.066284 L 3331.173828 1226.831787 L 3347.618408 1196.627197 L 3369.368408 1229.466797 L 3382.030273 1197.29895 L 3402.966553 1232.4021 L 3417.727783 1202.578857 L 3438.518066 1235.694946 L 3455.256836 1190.067383 L 3474.077637 1238.987793 L 3490.103271 1209.115234 L 3511.088867 1240.702393 L 3526.887451 1209.095459 L 3546.642578 1240.702393 L 3560.465576 1199.220825 L 3582.201904 1240.702393 L 3595.523438 1218.979736 L 3613.73584 1239.665283 L 3623.756348 1211.12207 L 3638.743164 1237.691895 L 3654.691895 1193.346191 L 3681.552002 1235.714722 L 3698.342285 1197.251465 L 3718.166504 1234.776367 L 3739.562988 1205.146729 L 3768.868652 1234.776367 L 3786.320557 1191.317627 L 3817.589355 1234.776367 L 3839 1205.160645 L 3839 1667.382813 L 2559 1667.382813 L 2559 1240.716187 L 2580.631592 1268.026733 L 2600.641602 1234.790283 L 2620.870605 1267.368896 L 2638.255371 1235.436279 L 2656.147705 1266.709229 L 2678.920898 1224.907715 L 2704.104248 1264.706299 L 2727.910645 1203.856934 L 2749.550049 1261.415405 L 2767.420654 1224.269775 L 2793.012939 1258.122559 L 2807.460205 1221.131104 L 2821.881836 1249.130981 L 2838.326416 1207.584229 L 2858.087402 1241.231689 L 2876.505371 1201.662354 L 2900.228516 1227.404541 L 2919.029541 1169.658325 L 2944.576172 1217.496338 L 2959.574951 1188.842529 L 2981.445557 1222.764526 L 3004.347168 1194.108887 L 3018.320557 1228.030762 L 3040.321289 1199.276123 L 3066.915039 1232.125488 L 3095.023926 1188.04248 L 3124.187012 1234.758667 L 3144.396729 1204.502808 L 3171.598633 1237.393677 L 3192.590088 1207.12793 L 3206.162354 1235.827393 L 3220.46167 1202.122559 L 3238.411377 1230.562988 L 3250.739258 1196.856445 L 3264.76001 1225.292969 L 3279.341797 1169.603149 Z"/>
+            <g id="g3">
+                <path id="path48" fill="#edba8c" fill-rule="evenodd" stroke="none" opacity="0.5" d="M 1911.019409 1385.42749 L 1899.447998 1382.78833 L 1888.281738 1379.997314 L 1865.932861 1374.203857 L 1864.891968 1373.615112 L 1859.625732 1368.485352 L 1855.112305 1363.732666 L 1845.486572 1358.778564 L 1838.401001 1355.021606 L 1826.276733 1348.959351 L 1816.283936 1343.528198 L 1827.12793 1346.960205 L 1839.898438 1351.505493 L 1847.418457 1354.841797 L 1857.834106 1359.84729 L 1863.102295 1364.981079 L 1868.247925 1370.184082 L 1889.409424 1375.815674 L 1900.504883 1379.135986 L 1911.414429 1382.964355 L 1943.416504 1389.385132"/>
+                <path id="path49" fill="#edba8c" fill-rule="evenodd" stroke="none" d="M 1600.605225 1270.305908 L 1601.893066 1284.664307 L 1614.811523 1291.269775 L 1629.770508 1290.780029 L 1675.90979 1299.941406 L 1690.732544 1307.184814 L 1704.421509 1314.25061 L 1718.748413 1314.106445 L 1733.326172 1313.852783 L 1743.459473 1320.893555 L 1753.468262 1322.823364 L 1765.602661 1327.177002 L 1779.670776 1330.173584 L 1793.960205 1333.300415 L 1816.289063 1343.482422 L 1793.413086 1335.141357 L 1779.157227 1332.889648 L 1764.727539 1330.509399 L 1752.488647 1326.608154 L 1741.90686 1324.842285 L 1731.840698 1318.541016 L 1718.748413 1319.044678 L 1704.421509 1319.096069 L 1688.557739 1311.59375 L 1673.808105 1304.257446 L 1629.361694 1294.574585 L 1614.035156 1294.293945 L 1600.678223 1286.896484 L 1600.018555 1285.904785 L 1599.005127 1270.458008 L 1599.512695 1269.632324 L 1618.758301 1262.494629"/>
+                <path id="path50" fill="#edba8c" fill-rule="evenodd" stroke="none" opacity="0.5" d="M 1820.296021 1210.249268 L 1799.223511 1210.507935 L 1788.60022 1210.346069 L 1778.081665 1209.818604 L 1757.060547 1208.505127 L 1748.339478 1211.244629 L 1738.729614 1213.998413 L 1729.103882 1216.70459 L 1719.452637 1219.317871 L 1712.32959 1222.69165 L 1704.884644 1226.134644 L 1689.858398 1232.759766 L 1703.922729 1224.281738 L 1711.021973 1220.171143 L 1718.148804 1216.115845 L 1727.928589 1212.817139 L 1737.437744 1209.731689 L 1746.962769 1206.693726 L 1757.325195 1203.639893 L 1778.391724 1205.071899 L 1788.890503 1205.91333 L 1799.312256 1206.501953 L 1820.353149 1207.708984 L 1839.981812 1209.565674 M 1851.278687 1204.981079 L 1856.307861 1203.011719 L 1859.895996 1201.337769 L 1861.958374 1190.699951 L 1857.419922 1186.912842 L 1851.875244 1181.984497 L 1847.932495 1179.942017 L 1843.626221 1177.569702 L 1834.203247 1176.776855 L 1834.203247 1175.777832 L 1844.070923 1175.452148 L 1849.173096 1177.141113 L 1853.787354 1178.820068 L 1860.25647 1183.331665 L 1866.170654 1187.793945 L 1867.06543 1190.158325 L 1864.096436 1203.843262 L 1862.628906 1205.340576 L 1857.386353 1206.596924 L 1852.104492 1207.726685 L 1841.382324 1209.453125"/>
+                <path id="path51" fill="#edba8c" fill-rule="evenodd" stroke="none" d="M 1831.940063 1163.841431 L 1826.456543 1164.110107 L 1822.282715 1167.325928 L 1822.920776 1173.605469 L 1828.830933 1175.063232 L 1834.091431 1175.679443 L 1834.091431 1176.769897 L 1828.672852 1177.032593 L 1821.02063 1174.435059 L 1820.265869 1167.005981 L 1825.328125 1162.659424 L 1835.632202 1162.186279 L 1836.052979 1163.841431"/>
+            </g>
+        </g>
+        <g id="foreground-fox">
+            <path id="path52" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 345.433197 693.859741 L 320.243561 723.716431 L 290.54892 769.488525 L 276.285431 806.54834 L 295.404419 810.053101 L 274.983948 839.61377 L 254.165482 894.799194 L 271.340149 898.543335 L 238.825943 945.535889 L 215.832458 992.935303 L 237.004913 996.19165 L 200.244568 1047.585327 L 158.394531 1129.029419 L 204.159592 1133.671753 L 176.097549 1184.862915 L 158.149734 1237.887451 L 191.459991 1242.908447 L 167.401016 1286.796143 L 148.637802 1342.231689 L 175.731232 1346.313965 L 148.569122 1398.022827 L 128.03772 1462.623291 L 269.416992 1482.103271 L 331.581787 1467.795898 L 331.581787 1565.236328 L 373.114838 1565.236328 L 375.920349 1469.590332 L 445.679199 1480.315796 L 634.912231 1452.257324 L 593.601074 1404.334839 L 556.763306 1342.624268 L 585.364258 1338.751587 L 550.585205 1297.02124 L 519.19281 1242.237427 L 575.885803 1234.558838 L 542.617798 1194.644287 L 503.187561 1125.836426 L 500.623352 1121.880859 L 545.837158 1114.610962 L 501.301361 1036.9198 L 467.869598 998.861572 L 483.244385 997.43689 L 453.518036 937.383667 L 419.940094 902.11145 L 435.483948 900.256958 L 427.992065 872.245972 L 405.875641 835.42749 L 394.04425 813.432617 L 419.490997 811.201294 L 382.214661 741.650269"/>
+            <path id="path53" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 588.652649 1408.412842 L 615.381531 1441.080322 L 611.713074 1450.322876 L 581.206543 1459.972046 L 601.033508 1456.995728 L 634.912598 1452.256592 L 593.601501 1404.333984 L 564.024841 1354.787842 M 549.260132 1343.640503 L 585.478027 1338.674072 L 550.642639 1296.982666 L 523.552734 1249.385986 L 546.805115 1298.50415 L 571.098267 1330.042725 L 567.575989 1336.287842 M 512.236328 1243.179688 L 575.884033 1234.558838 L 542.617798 1194.644287 L 505.89444 1130.558105 L 539.609802 1201.229248 L 557.464233 1223.493652 L 554.054688 1231.820313 M 487.744293 1123.951294 L 545.83905 1114.610229 L 501.301575 1036.919189 L 478.633881 1011.11499 L 497.663025 1042.852539 L 528.667908 1102.255859 L 524.21051 1110.957642 M 446.736084 1002.385132 L 483.244568 997.437988 L 453.518219 937.383179 L 429.5755 912.232178 L 448.553558 941.136108 L 469.204712 987.616089 L 466.216064 994.953003 M 427.992767 872.24707 L 399.138184 822.255249 L 423.012238 873.420044 L 427.270691 890.717896 L 423.994965 896.943481 L 403.778778 902.727173 L 419.940796 902.112549 L 435.48465 900.256226 M 345.433197 693.859741 L 379.622253 745.554688 L 406.145081 800.023193 L 402.693237 808.228516 L 380.363708 815.39978 L 419.490997 811.201294 L 382.214661 741.650269"/>
+            <g id="g4">
+                <path id="path54" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 593.754333 637.503174 L 568.564697 667.359863 L 538.870056 713.131958 L 524.606567 750.191772 L 543.725525 753.696533 L 523.305054 783.257202 L 502.486633 838.442627 L 519.661255 842.186768 L 487.147064 889.179321 L 464.153595 936.578735 L 485.32605 939.835083 L 448.565704 991.22876 L 406.715668 1072.672852 L 452.480743 1077.315186 L 424.418671 1128.506348 L 406.470886 1181.530762 L 439.781158 1186.551758 L 415.722168 1230.439575 L 396.958954 1285.875 L 424.052368 1289.957397 L 396.890259 1341.66626 L 376.358856 1406.266846 L 517.738159 1425.746704 L 579.902954 1411.439209 L 579.902954 1508.879761 L 621.435974 1508.879761 L 624.241455 1413.233887 L 694.000305 1423.959229 L 883.233398 1395.900635 L 841.922241 1347.978271 L 805.084412 1286.267822 L 833.685364 1282.39502 L 798.906372 1240.664795 L 767.513977 1185.880859 L 824.206909 1178.202393 L 790.938904 1138.287842 L 751.508728 1069.479858 L 748.944458 1065.524292 L 794.158264 1058.254395 L 749.622498 980.563232 L 716.190735 942.505005 L 731.565552 941.080322 L 701.839233 881.026978 L 668.26123 845.754883 L 683.805054 843.900391 L 676.313171 815.889404 L 654.196777 779.070923 L 642.365356 757.07605 L 667.812134 754.844727 L 630.535828 685.293701"/>
+                <path id="path55" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 836.973816 1352.056274 L 863.702698 1384.723633 L 860.03418 1393.966309 L 829.52771 1403.615479 L 849.354675 1400.63916 L 883.233765 1395.899902 L 841.922607 1347.977539 L 812.346008 1298.431274 M 797.581238 1287.283936 L 833.799133 1282.317505 L 798.963745 1240.625977 L 771.873901 1193.029297 L 795.126221 1242.147583 L 819.419434 1273.686157 L 815.897095 1279.931152 M 760.557495 1186.822998 L 824.205139 1178.202393 L 790.938904 1138.287842 L 754.215576 1074.201416 L 787.930908 1144.872559 L 805.7854 1167.136963 L 802.375793 1175.463745 M 736.06543 1067.594727 L 794.160217 1058.253662 L 749.622681 980.562622 L 726.955017 954.758423 L 745.984192 986.495972 L 776.989075 1045.899292 L 772.531677 1054.601074 M 695.05719 946.028564 L 731.565674 941.081421 L 701.839355 881.026489 L 677.896606 855.87561 L 696.874695 884.779541 L 717.525879 931.259521 L 714.53717 938.596436 M 676.313843 815.890503 L 647.459351 765.898682 L 671.333435 817.063477 L 675.591858 834.361328 L 672.316101 840.586914 L 652.099915 846.370605 L 668.261963 845.755981 L 683.805847 843.899658 M 593.754333 637.503174 L 627.943359 689.19812 L 654.466187 743.666626 L 651.014343 751.871948 L 628.684875 759.043213 L 667.812134 754.844727 L 630.535828 685.293701"/>
+            </g>
+            <g id="g5">
+                <path id="path56" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 982.96698 637.503174 L 957.777283 667.359863 L 928.082642 713.131958 L 913.819153 750.191772 L 932.93811 753.696533 L 912.517639 783.257202 L 891.699219 838.442627 L 908.87384 842.186768 L 876.35968 889.179321 L 853.366211 936.578735 L 874.538635 939.835083 L 837.778259 991.22876 L 795.928223 1072.672852 L 841.693298 1077.315186 L 813.631226 1128.506348 L 795.683411 1181.530762 L 828.993713 1186.551758 L 804.934753 1230.439575 L 786.171509 1285.875 L 813.264954 1289.957397 L 786.102783 1341.66626 L 765.571411 1406.266846 L 906.950684 1425.746704 L 969.11554 1411.439209 L 969.11554 1508.879761 L 1010.648499 1508.879761 L 1013.454041 1413.233887 L 1083.212891 1423.959229 L 1272.446045 1395.900635 L 1231.134766 1347.978271 L 1194.296997 1286.267822 L 1222.897949 1282.39502 L 1188.118896 1240.664795 L 1156.726563 1185.880859 L 1213.419434 1178.202393 L 1180.151489 1138.287842 L 1140.721191 1069.479858 L 1138.156982 1065.524292 L 1183.37085 1058.254395 L 1138.835083 980.563232 L 1105.40332 942.505005 L 1120.778076 941.080322 L 1091.051758 881.026978 L 1057.473755 845.754883 L 1073.0177 843.900391 L 1065.525757 815.889404 L 1043.409302 779.070923 L 1031.578003 757.07605 L 1057.024658 754.844727 L 1019.748352 685.293701"/>
+                <path id="path57" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 1226.186279 1352.056274 L 1252.915161 1384.723633 L 1249.246704 1393.966309 L 1218.740234 1403.615479 L 1238.567261 1400.63916 L 1272.446289 1395.899902 L 1231.135132 1347.977539 L 1201.558472 1298.431274 M 1186.793823 1287.283936 L 1223.011841 1282.317505 L 1188.17627 1240.625977 L 1161.086426 1193.029297 L 1184.338745 1242.147583 L 1208.631958 1273.686157 L 1205.109741 1279.931152 M 1149.77002 1186.822998 L 1213.417725 1178.202393 L 1180.151489 1138.287842 L 1143.428223 1074.201416 L 1177.143433 1144.872559 L 1194.997925 1167.136963 L 1191.588379 1175.463745 M 1125.278076 1067.594727 L 1183.372803 1058.253662 L 1138.835327 980.562622 L 1116.167603 954.758423 L 1135.196655 986.495972 L 1166.20166 1045.899292 L 1161.744263 1054.601074 M 1084.269775 946.028564 L 1120.77832 941.081421 L 1091.05188 881.026489 L 1067.109253 855.87561 L 1086.08728 884.779541 L 1106.738403 931.259521 L 1103.749878 938.596436 M 1065.526489 815.890503 L 1036.671875 765.898682 L 1060.545898 817.063477 L 1064.804443 834.361328 L 1061.528687 840.586914 L 1041.3125 846.370605 L 1057.474609 845.755981 L 1073.018433 843.899658 M 982.96698 637.503174 L 1017.155945 689.19812 L 1043.678711 743.666626 L 1040.227051 751.871948 L 1017.897461 759.043213 L 1057.024658 754.844727 L 1019.748352 685.293701"/>
+            </g>
+            <g id="g6">
+                <path id="path58" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 243.286911 818.900879 L 218.097275 848.757568 L 188.402649 894.529663 L 174.13916 931.589478 L 193.258118 935.094116 L 172.837677 964.654907 L 152.019211 1019.84021 L 169.193863 1023.584473 L 136.679642 1070.577026 L 113.686165 1117.97644 L 134.858627 1121.232788 L 98.098289 1172.626465 L 56.248253 1254.070557 L 102.013313 1258.712891 L 73.951263 1309.904053 L 56.003456 1362.928467 L 89.313713 1367.949463 L 65.254738 1411.83728 L 46.491524 1467.272705 L 73.584946 1471.355103 L 46.422836 1523.063965 L 25.891436 1587.664551 L 167.270706 1607.144409 L 229.435516 1592.836914 L 229.435516 1690.277466 L 270.968567 1690.277466 L 273.774048 1594.631592 L 343.532928 1605.356934 L 532.76593 1577.29834 L 491.454803 1529.375977 L 454.617004 1467.665527 L 483.217987 1463.792725 L 448.438934 1422.0625 L 417.046539 1367.278564 L 473.739502 1359.600098 L 440.471527 1319.685547 L 401.04126 1250.877686 L 398.477051 1246.922119 L 443.690887 1239.6521 L 399.15509 1161.960938 L 365.723297 1123.90271 L 381.098114 1122.478027 L 351.371765 1062.424805 L 317.793823 1027.152588 L 333.337677 1025.298096 L 325.845764 997.287109 L 303.72934 960.468628 L 291.89798 938.473755 L 317.344727 936.242432 L 280.06839 866.691406"/>
+            </g>
+            <g id="g7">
+                <path id="path59" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 102.395477 630.458618 L 77.205856 660.315308 L 47.511223 706.087402 L 33.24773 743.147095 L 52.366695 746.651855 L 31.946243 776.212646 L 11.127775 831.398071 L 28.302439 835.142212 L -4.211784 882.134766 L -27.205265 929.53418 L -6.0328 932.790527 L -42.793137 984.184204 L -84.643181 1065.628296 L -38.878117 1070.27063 L -66.94017 1121.461792 L -84.887978 1174.486206 L -51.577721 1179.507324 L -75.636688 1223.39502 L -94.399902 1278.830566 L -67.306488 1282.912842 L -94.46859 1334.621582 L -115 1399.222168 L 26.379269 1418.702148 L 88.54409 1404.394775 L 88.54409 1501.835205 L 130.077118 1501.835205 L 132.882629 1406.189209 L 202.641479 1416.914673 L 391.874512 1388.856201 L 350.563385 1340.933594 L 313.725586 1279.223145 L 342.326538 1275.350464 L 307.547485 1233.620117 L 276.155121 1178.836304 L 332.848083 1171.157715 L 299.580078 1131.243164 L 260.149872 1062.435303 L 257.585632 1058.479736 L 302.799469 1051.209717 L 258.263672 973.518677 L 224.831894 935.460449 L 240.206665 934.035767 L 210.480347 873.982422 L 176.90239 838.710327 L 192.446243 836.855835 L 184.95433 808.844849 L 162.837906 772.026367 L 151.006546 750.031494 L 176.453293 747.800171 L 139.176956 678.249023"/>
+            </g>
+            <g id="g8">
+                <path id="path60" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3233.917236 730.84375 L 3259.106934 760.700439 L 3288.801758 806.472534 L 3303.065186 843.532227 L 3283.946045 847.037109 L 3304.366699 876.597778 L 3325.185059 931.783081 L 3308.010498 935.527344 L 3340.524658 982.519897 L 3363.518066 1029.919312 L 3342.345703 1033.175659 L 3379.105957 1084.569336 L 3420.956055 1166.013428 L 3375.190918 1170.655762 L 3403.25293 1221.846924 L 3421.200928 1274.871338 L 3387.890625 1279.892334 L 3411.949463 1323.780151 L 3430.712891 1379.215576 L 3403.619385 1383.297974 L 3430.781494 1435.006836 L 3451.312988 1499.607422 L 3309.933594 1519.08728 L 3247.768799 1504.779785 L 3247.768799 1602.220337 L 3206.235596 1602.220337 L 3203.43042 1506.574463 L 3133.671387 1517.299805 L 2944.438232 1489.241211 L 2985.749512 1441.318848 L 3022.587402 1379.608276 L 2993.986328 1375.735596 L 3028.765381 1334.005371 L 3060.157715 1279.221436 L 3003.464844 1271.542969 L 3036.732666 1231.628418 L 3076.163086 1162.820557 L 3078.727051 1158.864868 L 3033.513428 1151.594971 L 3078.049072 1073.903809 L 3111.480957 1035.845581 L 3096.106201 1034.420898 L 3125.83252 974.367676 L 3159.4104 939.095459 L 3143.866699 937.240967 L 3151.358643 909.22998 L 3173.475098 872.411499 L 3185.306396 850.416626 L 3159.859375 848.185303 L 3197.135742 778.634155"/>
+                <path id="path61" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 2990.697998 1445.396851 L 2963.968994 1478.064209 L 2967.637695 1487.306885 L 2998.144043 1496.956055 L 2978.317139 1493.979736 L 2944.437988 1489.240479 L 2985.749023 1441.318115 L 3015.325928 1391.771851 M 3030.090332 1380.624512 L 2993.872559 1375.658081 L 3028.707764 1333.966553 L 3055.797852 1286.369873 L 3032.545654 1335.488159 L 3008.252197 1367.026733 L 3011.774414 1373.271729 M 3067.114258 1280.163574 L 3003.466553 1271.542969 L 3036.732666 1231.628418 L 3073.456299 1167.541992 L 3039.740723 1238.213135 L 3021.886475 1260.477539 L 3025.295898 1268.804321 M 3091.606445 1160.935303 L 3033.511475 1151.594238 L 3078.049072 1073.903198 L 3100.716797 1048.098999 L 3081.6875 1079.836548 L 3050.682617 1139.239746 L 3055.140137 1147.94165 M 3132.614502 1039.369141 L 3096.105957 1034.421997 L 3125.832275 974.367065 L 3149.775146 949.216187 L 3130.796875 978.120117 L 3110.145996 1024.600098 L 3113.134521 1031.937012 M 3151.357666 909.231079 L 3180.212402 859.239258 L 3156.338379 910.404053 L 3152.079834 927.701904 L 3155.355469 933.927612 L 3175.571777 939.711182 L 3159.409668 939.096558 L 3143.865967 937.240234 M 3233.917236 730.84375 L 3199.728271 782.538574 L 3173.205322 837.007202 L 3176.657471 845.212524 L 3198.986816 852.383789 L 3159.859375 848.185303 L 3197.135742 778.634155"/>
+                <g id="g9">
+                    <path id="path62" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3015.535645 633.980957 L 3040.725098 663.837524 L 3070.419922 709.609619 L 3084.683594 746.669434 L 3065.564453 750.174194 L 3085.985107 779.734985 L 3106.803223 834.92041 L 3089.628662 838.664551 L 3122.143066 885.657104 L 3145.136475 933.056519 L 3123.963867 936.312866 L 3160.724365 987.706543 L 3202.574219 1069.150513 L 3156.809326 1073.792847 L 3184.871338 1124.984009 L 3202.819092 1178.008545 L 3169.508789 1183.029541 L 3193.567871 1226.917236 L 3212.331055 1282.352783 L 3185.237549 1286.435059 L 3212.399658 1338.143921 L 3232.931152 1402.744507 L 3091.552002 1422.224365 L 3029.386963 1407.916992 L 3029.386963 1505.357422 L 2987.854004 1505.357422 L 2985.048584 1409.711548 L 2915.289551 1420.437012 L 2726.056641 1392.378418 L 2767.367676 1344.455933 L 2804.205566 1282.745361 L 2775.604736 1278.872803 L 2810.383789 1237.142456 L 2841.776123 1182.358643 L 2785.083008 1174.680054 L 2818.351074 1134.765503 L 2857.78125 1065.957642 L 2860.345459 1062.002075 L 2815.131592 1054.732056 L 2859.66748 977.041016 L 2893.099121 938.982666 L 2877.724365 937.557983 L 2907.450928 877.504639 L 2941.028564 842.232544 L 2925.484863 840.378174 L 2932.976807 812.367188 L 2955.093262 775.548706 L 2966.924805 753.553711 L 2941.477783 751.322388 L 2978.75415 681.771362"/>
+                    <path id="path63" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 2772.316162 1348.533936 L 2745.587402 1381.201416 L 2749.255859 1390.44397 L 2779.762451 1400.093262 L 2759.935303 1397.116943 L 2726.056396 1392.377686 L 2767.367432 1344.4552 L 2796.944092 1294.908936 M 2811.70874 1283.761719 L 2775.490967 1278.795166 L 2810.326172 1237.10376 L 2837.41626 1189.50708 L 2814.163818 1238.625244 L 2789.870605 1270.163818 L 2793.392822 1276.408936 M 2848.732422 1183.300781 L 2785.084717 1174.680054 L 2818.351074 1134.765503 L 2855.074463 1070.679199 L 2821.359131 1141.350342 L 2803.504639 1163.614746 L 2806.914063 1171.941406 M 2873.224609 1064.072388 L 2815.129639 1054.731445 L 2859.66748 977.040283 L 2882.334961 951.236084 L 2863.305664 982.973633 L 2832.300781 1042.376953 L 2836.758301 1051.078735 M 2914.232666 942.506226 L 2877.724365 937.559204 L 2907.450684 877.504272 L 2931.393311 852.353394 L 2912.415283 881.257202 L 2891.76416 927.737305 L 2894.75293 935.074219 M 2932.976074 812.368164 L 2961.830566 762.376465 L 2937.956543 813.541138 L 2933.698242 830.838989 L 2936.973877 837.064575 L 2957.189941 842.848267 L 2941.028076 842.233643 L 2925.484375 840.377441 M 3015.535645 633.980957 L 2981.34668 685.675781 L 2954.82373 740.144409 L 2958.275635 748.349609 L 2980.605225 755.520874 L 2941.477783 751.322388 L 2978.75415 681.771362"/>
+                </g>
+                <g id="g10">
+                    <path id="path64" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 2788.650879 838.273315 L 2807.479492 860.590454 L 2829.675537 894.803955 L 2840.336914 922.505249 L 2826.046143 925.124756 L 2841.310059 947.220703 L 2856.871094 988.470459 L 2844.033691 991.269043 L 2868.336914 1026.394897 L 2885.52417 1061.824829 L 2869.698242 1064.258789 L 2897.175781 1102.674316 L 2928.45752 1163.551636 L 2894.249268 1167.021729 L 2915.224854 1205.285767 L 2928.640381 1244.920166 L 2903.741943 1248.67334 L 2921.725342 1281.478271 L 2935.750488 1322.914795 L 2915.498779 1325.966309 L 2935.801758 1364.617432 L 2951.148682 1412.904785 L 2845.470947 1427.465576 L 2799.004395 1416.770996 L 2799.004395 1489.605225 L 2767.959717 1489.605225 L 2765.862549 1418.112305 L 2713.719482 1426.129272 L 2572.272705 1405.15625 L 2603.151611 1369.335449 L 2630.687012 1323.208496 L 2609.30835 1320.313721 L 2635.304932 1289.121338 L 2658.769775 1248.171753 L 2616.393311 1242.432129 L 2641.260254 1212.597168 L 2670.733398 1161.165039 L 2672.650146 1158.208252 L 2638.854004 1152.77417 L 2672.143311 1094.702026 L 2697.132813 1066.254517 L 2685.640381 1065.189453 L 2707.860107 1020.301147 L 2732.95874 993.936157 L 2721.340332 992.549927 L 2726.940186 971.612549 L 2743.47168 944.091675 L 2752.315186 927.651001 L 2733.294434 925.983154 L 2761.157471 873.995483"/>
+                    <path id="path65" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 2606.850586 1372.383667 L 2586.871338 1396.801758 L 2589.613281 1403.710205 L 2612.41626 1410.922974 L 2597.596191 1408.698242 L 2572.272461 1405.155762 L 2603.151367 1369.334961 L 2625.259033 1332.300293 M 2636.295166 1323.968018 L 2609.223389 1320.255737 L 2635.261963 1289.092407 L 2655.510986 1253.515015 L 2638.130371 1290.229736 L 2619.971924 1313.803955 L 2622.604736 1318.471924 M 2663.969727 1248.875977 L 2616.394775 1242.432129 L 2641.260254 1212.597168 L 2668.709961 1164.694336 L 2643.508789 1217.519287 L 2630.163086 1234.161255 L 2632.711426 1240.385254 M 2682.276855 1159.755859 L 2638.852539 1152.773682 L 2672.143066 1094.701538 L 2689.08667 1075.413574 L 2674.862793 1099.136475 L 2651.6875 1143.539063 L 2655.019287 1150.043457 M 2712.929443 1068.888184 L 2685.640381 1065.19043 L 2707.859863 1020.300903 L 2725.756592 1001.501221 L 2711.571045 1023.106079 L 2696.134766 1057.848755 L 2698.368652 1063.333008 M 2726.939697 971.613281 L 2748.507813 934.245605 L 2730.662354 972.48999 L 2727.479248 985.4198 L 2729.927979 990.073242 L 2745.039063 994.396362 L 2732.958252 993.93689 L 2721.3396 992.549438 M 2788.650879 838.273315 L 2763.095459 876.91394 L 2743.270264 917.62793 L 2745.850586 923.760986 L 2762.54126 929.12146 L 2733.294434 925.983154 L 2761.157471 873.995483"/>
+                </g>
+                <g id="g11">
+                    <path id="path66" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3415.138672 869.973877 L 3432.186279 890.179932 L 3452.282715 921.156982 L 3461.935791 946.237793 L 3448.996582 948.609619 L 3462.81665 968.615479 L 3476.905762 1005.963135 L 3465.282471 1008.49707 L 3487.287109 1040.300171 L 3502.848389 1072.37854 L 3488.519531 1074.582275 L 3513.397705 1109.363892 L 3541.720459 1164.482666 L 3510.748291 1167.62439 L 3529.739746 1202.268921 L 3541.88623 1238.154175 L 3519.342773 1241.552246 L 3535.625244 1271.253906 L 3548.32373 1308.770874 L 3529.987793 1311.533691 L 3548.370117 1346.528564 L 3562.265137 1390.248169 L 3466.584229 1403.431641 L 3424.513184 1393.748779 L 3424.513184 1459.693359 L 3396.405029 1459.693359 L 3394.506104 1394.963257 L 3347.295654 1402.221924 L 3219.22876 1383.232666 L 3247.186768 1350.800293 L 3272.117432 1309.036743 L 3252.76123 1306.415771 L 3276.298828 1278.174072 L 3297.543945 1241.098145 L 3259.176025 1235.901367 L 3281.690674 1208.888672 L 3308.375732 1162.321777 L 3310.111328 1159.644775 L 3279.511963 1154.724609 L 3309.652344 1102.145874 L 3332.277832 1076.389282 L 3321.872803 1075.424927 L 3341.990479 1034.782837 L 3364.715088 1010.911743 L 3354.195557 1009.65686 L 3359.265625 990.699829 L 3374.233398 965.782349 L 3382.240479 950.896851 L 3365.018799 949.386719 L 3390.246338 902.316895"/>
+                </g>
+                <g id="g12">
+                    <path id="path67" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3622.301514 670.964844 L 3598.129639 699.615234 L 3569.63501 743.537964 L 3555.947754 779.100464 L 3574.294434 782.463379 L 3554.69873 810.829834 L 3534.721436 863.785522 L 3551.202393 867.378418 L 3520.001709 912.472412 L 3497.937256 957.956543 L 3518.254395 961.081421 L 3482.979248 1010.39856 L 3442.820068 1088.55188 L 3486.736084 1093.006714 L 3459.807861 1142.129517 L 3442.585205 1193.011719 L 3474.549561 1197.829834 L 3451.462891 1239.944214 L 3433.45752 1293.139893 L 3459.456299 1297.057373 L 3433.391602 1346.677002 L 3413.689697 1408.667236 L 3549.356934 1427.360107 L 3609.009766 1413.630859 L 3609.009766 1507.134277 L 3648.86499 1507.134277 L 3651.556885 1415.352905 L 3718.497314 1425.644897 L 3900.084717 1398.719971 L 3860.442627 1352.733887 L 3825.093262 1293.516724 L 3852.538574 1289.800415 L 3819.164551 1249.756348 L 3789.040771 1197.185791 L 3843.443115 1189.817627 L 3811.519287 1151.515625 L 3773.682373 1085.488037 L 3771.22168 1081.692261 L 3814.608643 1074.716064 L 3771.87207 1000.16394 L 3739.791016 963.643433 L 3754.544922 962.276245 L 3726.019531 904.649292 L 3693.79834 870.802368 L 3708.713867 869.022705 L 3701.524902 842.143555 L 3680.302246 806.812744 L 3668.94873 785.706543 L 3693.367188 783.565308 L 3657.597168 716.824341"/>
+                </g>
+                <g id="g13">
+                    <path id="path68" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3797.333496 848.84021 L 3815.602295 870.493896 L 3837.138428 903.690063 L 3847.48291 930.567871 L 3833.616943 933.109619 L 3848.426758 954.548584 L 3863.525391 994.572021 L 3851.069336 997.287476 L 3874.650391 1031.369019 L 3891.32666 1065.745483 L 3875.971191 1068.107178 L 3902.631836 1105.380493 L 3932.983643 1164.447998 L 3899.792236 1167.814941 L 3920.144287 1204.941406 L 3933.161133 1243.397583 L 3909.002686 1247.039063 L 3926.451416 1278.868774 L 3940.05957 1319.073486 L 3920.410156 1322.03418 L 3940.109375 1359.536133 L 3955 1406.387939 L 3852.464111 1420.515747 L 3807.37915 1410.139282 L 3807.37915 1480.808228 L 3777.25708 1480.808228 L 3775.222412 1411.440796 L 3724.629639 1419.219482 L 3587.387939 1398.869873 L 3617.348877 1364.114014 L 3644.065674 1319.358276 L 3623.322754 1316.549561 L 3648.546387 1286.284668 L 3671.313721 1246.55249 L 3630.197021 1240.983521 L 3654.324707 1212.0354 L 3682.921387 1162.132324 L 3684.781006 1159.26355 L 3651.98999 1153.990967 L 3684.289551 1097.645386 L 3708.535889 1070.043457 L 3697.385498 1069.010132 L 3718.94458 1025.456421 L 3743.296875 999.875244 L 3732.023682 998.530273 L 3737.457031 978.21521 L 3753.497559 951.512573 L 3762.077881 935.560669 L 3743.622803 933.942261 L 3770.657471 883.500366"/>
+                </g>
+            </g>
+            <g id="g14">
+                <path id="path69" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 3123.549805 1407.121948 C 3114.739258 1412.683716 3051.302246 1417.688843 3051.302246 1417.688843 L 2899.758301 1422.972168 L 2811.651367 1431.777954 L 2732.355225 1442.344849 L 2640.723877 1445.867188 L 2564.951904 1445.867188 L 2501.514893 1452.911621 L 2464.51001 1454.672852 L 2423.980713 1474.04541 L 2372.878906 1486.373413 L 2290.05835 1511.029419 L 2270.675049 1509.268311 L 2240.718506 1523.357422 L 2216.048584 1528.640869 L 2200.189209 1533.924316 L 2187.854492 1539.207764 L 2159.660156 1537.446533 L 2143.800781 1544.491089 L 2126.179443 1540.96875 L 2113.844482 1549.774536 L 2096.223145 1549.774536 L 2069.79126 1560.341309 L 2052.169678 1572.669434 L 2036.310547 1579.713989 L 2034.54834 1590.280762 L 2015.164795 1595.564209 L 1994.019043 1595.564209 L 1978.159912 1609.65332 L 1963.925293 1609.65332 L 1946.524292 1618.504883 L 1898.046021 1618.459106 L 1877.718018 1613.175659 L 1868.907227 1618.459106 L 1858.334473 1607.892334 L 1844.237427 1599.086548 L 1831.902466 1593.803101 L 1817.805298 1593.803101 L 1808.994629 1599.086548 L 1796.659668 1604.369995 L 1786.086792 1595.564209 L 1770.227539 1590.280762 L 1757.892578 1583.236328 L 1752.606201 1570.908203 L 1734.984863 1565.624756 L 1706.790527 1558.580322 L 1696.217773 1551.535645 L 1675.072144 1549.774536 L 1662.737183 1553.296875 L 1655.688599 1563.86377 L 1631.018677 1572.669434 L 1616.921509 1556.819092 L 1608.11084 1548.013428 L 1597.537964 1546.252197 L 1581.678833 1544.491089 L 1564.057373 1532.163086 L 1548.19812 1528.640869 L 1532.338867 1544.491089 L 1495.333984 1511.029419 L 1481.236938 1511.029419 L 1428.372681 1489.895752 L 1371.984375 1468.761963 L 1347.314331 1447.628174 L 1202.81897 1447.628174 L 1074.182861 1431.777954 C 1074.182861 1431.777954 871.536987 1421.211182 852.153442 1415.927734 C 832.769897 1410.644287 802.813538 1377.182617 802.813538 1377.182617 L 675.939575 1364.854492 L 564.924866 1377.182617 L 476.817993 1382.465942 L 344.657593 1407.121948 L -5.809842 1407.121948 L -5.809842 2171.458008 L 3840.526123 2171.458008 L 3840.526123 1407.121948 L 3123.549805 1407.121948 Z"/>
+                <path id="path70" fill="#2f263c" fill-rule="evenodd" stroke="none" d="M 3178.942871 1639.865234 L 3209.494385 1639.865234 L 3220.60376 1644.004639 L 3220.60376 1736.455688 L 3210.883057 1736.455688 L 3185.95874 1735.765869 L 3170.61084 1644.004639"/>
+                <path id="path71" fill="#30283e" fill-rule="evenodd" stroke="none" d="M 3109.508301 1632.779541 L 3140.05957 1635.039673 L 3161.699463 1660.963135 L 3170.61084 1726.106567 L 3152.789795 1735.765625 L 3129.876221 1726.106567 L 3109.508301 1651.741455"/>
+                <path id="path72" fill="#322941" fill-rule="evenodd" stroke="none" d="M 3065.979248 1632.779541 L 3093.708984 1635.328003 L 3121.277344 1725.416626 L 3089.587158 1722.503662 L 3074.499023 1712.908203 L 3058.720703 1639.228882"/>
+                <path id="path73" fill="#332b43" fill-rule="evenodd" stroke="none" d="M 3013.799316 1617.764648 L 3042.775635 1621.037598 L 3062.04248 1717.416992 L 3051.803711 1719.270142 L 3015.237793 1715.140137 L 3006.125488 1703.167114 L 3008.708496 1625.615967"/>
+                <path id="path74" fill="#352c45" fill-rule="evenodd" stroke="none" d="M 2964.445068 1607.42981 L 2998.725098 1615.118408 L 2992.575928 1714.497559 L 2956.051758 1712.085571 L 2944.454834 1699.444702 L 2956.587891 1618.20105"/>
+                <path id="path75" fill="#372d47" fill-rule="evenodd" stroke="none" d="M 2906.740234 1600.679199 L 2887.405273 1696.641724 L 2901.41333 1708.857788 L 2928.447021 1706.666504 L 2944.203125 1629.998535 L 2941.800781 1600.403076 L 2913.483643 1594.62561"/>
+                <path id="path76" fill="#382f49" fill-rule="evenodd" stroke="none" d="M 2867.276611 1593.187744 L 2822.139648 1679.316162 L 2825.019775 1691.181641 L 2837.393311 1694.783081 L 2862.591064 1697.887817 L 2873.311768 1686.869629 L 2895.368408 1601.040649 L 2891.532959 1591.145508 L 2876.050293 1587.432373"/>
+                <path id="path77" fill="#3a304c" fill-rule="evenodd" stroke="none" d="M 2828.342041 1582.11377 L 2735.876953 1660.739746 L 2735.432617 1670.38916 L 2792.120605 1677.103516 L 2809.337646 1665.453369 L 2855.796387 1593.786011 L 2859.464111 1582.11377 L 2841.037354 1576.390015"/>
+                <path id="path78" fill="#3b324e" fill-rule="evenodd" stroke="none" d="M 2654.015869 1644.004639 L 2777.610107 1563.972656 L 2797.051514 1568.112183 L 2816.493408 1575.011475 L 2699.843018 1660.56311 L 2662.348145 1653.663818"/>
+                <path id="path79" fill="#3d3350" fill-rule="evenodd" stroke="none" d="M 2595.690674 1612.267944 L 2717.895996 1543.274658 L 2737.337891 1544.654541 L 2754.001953 1552.933716 L 2745.669922 1572.251709 L 2624.853516 1639.865234 L 2597.07959 1631.585938 M 2528.998779 1598.360596 L 2662.403809 1528.157104 L 2684.620361 1530.944458 L 2699.87915 1543.384033 L 2566.4729 1614.967163 L 2537.311523 1613.550049 M 2478.744873 1574.576172 L 2582.49707 1519.864502 L 2611.265137 1512.581665 L 2644.165039 1527.164063 L 2509.298828 1596.21521 L 2489.552979 1591.889404 M 2410.994385 1554.313599 L 2558.196045 1496.359253 L 2576.249023 1497.739136 L 2585.969727 1510.157837 L 2451.266602 1576.391357 L 2427.658447 1572.251709 M 2385.997803 1546.034424 L 2531.810791 1497.739136 L 2530.422119 1488.080078 L 2504.036865 1481.180786 L 2348.50293 1530.855957 L 2348.50293 1540.514893 M 2442.933838 1468.761475 L 2427.658203 1472.902466 L 2320.681396 1503.084229 L 2315.173828 1504.637939 L 2301.286865 1510.158691 L 2302.675537 1523.957397 L 2327.672119 1528.095703 L 2477.651123 1479.800293 L 2473.485107 1471.522583"/>
+                <g id="g15">
+                    <path id="path80" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 2533.022217 1605.712524 L 2528.999268 1598.360596 L 2662.404297 1528.157227 L 2675.984375 1529.861328 L 2662.298828 1529.270752 L 2530.973877 1598.702881 M 2485.568115 1585.506104 L 2478.745361 1574.576172 L 2582.497803 1519.864502 L 2611.264648 1512.581665 L 2620.327148 1516.598389 L 2610.271729 1515.447632 L 2582.96167 1523.006592 L 2482.743408 1575.012207 M 2421.466553 1565.586548 L 2410.994629 1554.312988 L 2558.196289 1496.358643 L 2573.002441 1497.491577 L 2558.568604 1499.08667 L 2416.765869 1554.398682 M 2348.50293 1540.514893 L 2348.50293 1530.855957 L 2504.036865 1481.180786 L 2520.644287 1485.523193 L 2503.77002 1483.642456 L 2351.87207 1532.361328 M 2442.933838 1468.761475 L 2315.173828 1504.637939 L 2301.286865 1510.158691 L 2302.70459 1523.006592 L 2304.233643 1512.065674 L 2315.857178 1505.824463 L 2352.863037 1496.707886 L 2377.023438 1489.110229 L 2419.535645 1477.72644 L 2440.156494 1471.257568 L 2461.167236 1470.408936"/>
+                </g>
+            </g>
+            <g id="g16">
+                <path id="path81" fill="#2d253a" fill-rule="evenodd" stroke="none" d="M 2588.239746 1520.579346 C 2570.977295 1516.19751 2556.590088 1514.073975 2544.388428 1513.051758 C 2530.371094 1511.877441 2518.446045 1512.087891 2514.707275 1515.677734 C 2510.55835 1519.438965 2515.773193 1526.805054 2507.113037 1528.724609 C 2501.527832 1529.92041 2490.68335 1528.846191 2484.762207 1529.817139 C 2465.621094 1522.708008 2452.349365 1512.564941 2434.307129 1505.189453 C 2426.855469 1502.140869 2419.694092 1496.549316 2412.480713 1494.802979 C 2417.582275 1497.82251 2426.45752 1504.674194 2433.609375 1507.576416 C 2445.919189 1512.570557 2450.424805 1517.194458 2460.675781 1522.572388 C 2461.892822 1523.210571 2465.08374 1525.349731 2466.292236 1525.990845 C 2469.53418 1528.52124 2476.590332 1533.715088 2474.331787 1535.172363 C 2473.884766 1535.420166 2468.266846 1533.750244 2463.817871 1532.502808 C 2461.497314 1531.683472 2459.1604 1530.873779 2456.750977 1530.077759 C 2446.947021 1526.844116 2436.584961 1523.498535 2427.134277 1519.953857 C 2415.738281 1515.679443 2389.623535 1506.34021 2378.694336 1501.982422 C 2376.24292 1501.788086 2376.829346 1503.075195 2379.037842 1504.42749 C 2381.248779 1505.783203 2399.756836 1513.916748 2402.952637 1515.221191 C 2429.445313 1526.020752 2456.53125 1535.209229 2484.656738 1546.277222 C 2511.058594 1557.240723 2540.084229 1569.057129 2568.810547 1579.766846 C 2556.054932 1576.688477 2542.889404 1573.034302 2529.828613 1568.935303 C 2518.628906 1565.424683 2500.330078 1558.956543 2489.395264 1555.899658 C 2486.429688 1555.071411 2485.691895 1555.806519 2489.457275 1557.528809 C 2523.383545 1570.200317 2559.848877 1581.842651 2595.744385 1591.455811 C 2599.49292 1592.463867 2603.391113 1593.475708 2606.519775 1593.934082 C 2634.482422 1604.169678 2661.986084 1613.409668 2687.955566 1621.737793 C 2699.728271 1625.518066 2712.608154 1629.455811 2720.641113 1630.352539 C 2728.733887 1630.762451 2700.751221 1620.864136 2689.194824 1616.510986 C 2690.209961 1614.394287 2691.185547 1612.263428 2692.123779 1610.118408 C 2703.220947 1613.140137 2714.06958 1615.887207 2724.510986 1618.318115 C 2729.286133 1619.430908 2734.739502 1620.371704 2733.063477 1618.734497 C 2731.630859 1617.335205 2726.082031 1615.196655 2721.510254 1613.543213 C 2686.730957 1600.964966 2652.594971 1588.625366 2619.102295 1576.696777 C 2616.794922 1575.212402 2613.52124 1573.620117 2610.322021 1572.104492 C 2598.244385 1566.369873 2585.763184 1560.752197 2573.050293 1555.318359 C 2584.613281 1557.51709 2595.727539 1559.406982 2603.685303 1559.579712 C 2615.592285 1559.821777 2618.689209 1555.776245 2611.797363 1548.96582 C 2606.537109 1543.793579 2595.967529 1537.04834 2596.227051 1533.591919 C 2596.469238 1528.316895 2620.965088 1533.298584 2644.183105 1540.085571 C 2626.488281 1532.028076 2605.661133 1525.018921 2588.239746 1520.579346 M 2510.227295 1378.774658 C 2500.627197 1378.226929 2492.82373 1371.101318 2484.031982 1367.161621 C 2472.42627 1361.960938 2458.43042 1362.552734 2447.331543 1368.714966 C 2439.941895 1372.81665 2434.080811 1379.024658 2428.614258 1385.574463 C 2426.469238 1377.455566 2423.600342 1369.463379 2420.019775 1361.698608 C 2419.075928 1359.653809 2418.001465 1357.551147 2416.265137 1355.957275 C 2417.080566 1336.075684 2417.41333 1316.160645 2417.740967 1296.266846 C 2417.784912 1293.679688 2417.478516 1290.513184 2415.111572 1289.454834 C 2412.339355 1288.214844 2409.500732 1290.979858 2407.794189 1293.489502 C 2404.056885 1298.994873 2400.773926 1304.804932 2397.991455 1310.84375 C 2391.263916 1310.581299 2384.538086 1310.317261 2377.810547 1310.052979 C 2377.449463 1303.394165 2378.315918 1287.663574 2371.435303 1291.353271 C 2365.924561 1295.178467 2363.857178 1302.215942 2362.455078 1308.753418 C 2359.336182 1323.314453 2357.162842 1339.122437 2357.236816 1355.788086 C 2355.389404 1357.397827 2354.278076 1359.579834 2353.300781 1361.698608 C 2343.859131 1382.168335 2339.34375 1404.208984 2340.116699 1426.033081 C 2341.05542 1428.634399 2343.774658 1428.616699 2344.463135 1426.807983 C 2346.990479 1420.170288 2347.561035 1408.567871 2349.123291 1401.731201 C 2350.935547 1393.820068 2354.049072 1386.106201 2358.318359 1378.876709 C 2358.922363 1396.817505 2362.220947 1415.730469 2365.804932 1433.373535 C 2367.974365 1452.298828 2370.559814 1471.171143 2373.61377 1489.967896 C 2373.987061 1492.264404 2374.416748 1494.671875 2375.897949 1496.475342 C 2377.37915 1498.280518 2380.279785 1499.177002 2382.174805 1497.760986 C 2381.176025 1489.925659 2380.519043 1482.046387 2380.210938 1474.149414 C 2379.955566 1467.654175 2381.13208 1460.819214 2382.06543 1454.373535 C 2382.294434 1452.79541 2382.410645 1451.250977 2382.481201 1449.71521 C 2383.502441 1446.911499 2384.531006 1443.341553 2385.640381 1443.213013 C 2391.813232 1442.630127 2396.510254 1449.153442 2400.152344 1451.840942 C 2400.692871 1452.726807 2401.237305 1453.61084 2401.760254 1454.500244 C 2406.184326 1462.036133 2409.180176 1470.436768 2410.532471 1479.089355 C 2411.323242 1484.15625 2411.684326 1489.63501 2414.817383 1493.66626 C 2417.214355 1488.95166 2416.478027 1483.231445 2415.585205 1477.949829 C 2413.448975 1465.299561 2410.750977 1452.610474 2410.418213 1439.843994 C 2418.887451 1437.06311 2426.6875 1430.941406 2435.43335 1428.356079 C 2449.168457 1424.296631 2463.939209 1429.2771 2478.202881 1427.982666 C 2491.601318 1426.769287 2503.939941 1420.045166 2514.598389 1411.812012 C 2523.872559 1404.647461 2532.334961 1396.053223 2537.523438 1385.507446 C 2542.713379 1374.961792 2544.326416 1362.249756 2540.004639 1351.288452 C 2535.43457 1365.14502 2524.728516 1379.602417 2510.227295 1378.774658 Z M 2415.072754 1378.994751 C 2417.869385 1383.748047 2420.155518 1388.712646 2421.909424 1393.80249 C 2419.134033 1397.187378 2416.243896 1400.544189 2413.125 1403.608521 C 2413.912354 1395.415771 2414.549805 1387.20874 2415.072754 1378.994751 Z"/>
+                <path id="path82" fill="#f8c083" fill-rule="evenodd" stroke="none" d="M 2411.316162 1293.467285 C 2407.578857 1298.972656 2404.296143 1304.782715 2401.513672 1310.821533 C 2400.361816 1310.775879 2399.209961 1310.731689 2398.056396 1310.686035 C 2400.82666 1304.696289 2404.084717 1298.93042 2407.793945 1293.467285 C 2409.500488 1290.956055 2412.339355 1288.190918 2415.111572 1289.430786 C 2415.21167 1289.476563 2415.285889 1289.545288 2415.37915 1289.596313 C 2413.788574 1290.362427 2412.344727 1291.952759 2411.316162 1293.467285 Z M 2405.283691 1454.47876 C 2409.705811 1462.014648 2412.703369 1470.415283 2414.054199 1479.066162 C 2414.598389 1482.549561 2414.959473 1486.219727 2416.137695 1489.488525 C 2415.892822 1490.929077 2415.486084 1492.327393 2414.81665 1493.643066 C 2411.683594 1489.613525 2411.324219 1484.134644 2410.531982 1479.066162 C 2409.181152 1470.415283 2406.183594 1462.014648 2401.761475 1454.47876 C 2401.238281 1453.587646 2400.692383 1452.703491 2400.151611 1451.819458 C 2397.134766 1449.589844 2393.388916 1444.741333 2388.681396 1443.473389 C 2388.839844 1443.320068 2389 1443.209229 2389.163818 1443.189819 C 2395.334961 1442.606934 2400.033691 1449.130127 2403.673828 1451.819458 C 2404.2146 1452.703491 2404.760742 1453.587646 2405.283691 1454.47876 Z M 2356.82373 1361.675293 C 2347.382324 1382.146851 2342.864746 1404.185791 2343.639893 1426.009888 C 2343.801758 1426.458984 2344.029053 1426.804199 2344.279053 1427.101807 C 2343.398438 1428.563477 2340.992676 1428.438477 2340.117676 1426.009888 C 2339.342529 1404.185791 2343.860107 1382.146851 2353.301514 1361.675293 C 2354.279053 1359.55835 2355.390137 1357.374634 2357.237549 1355.764893 C 2357.163574 1339.099243 2359.336914 1323.29126 2362.455811 1308.72998 C 2363.855957 1302.192749 2365.925293 1295.156982 2371.434082 1291.331787 C 2372.922363 1290.533936 2374.047852 1290.646606 2374.901855 1291.377563 C 2369.437012 1295.209717 2367.374756 1302.215576 2365.978027 1308.72998 C 2362.859131 1323.29126 2360.685791 1339.099243 2360.759766 1355.764893 C 2358.912598 1357.374634 2357.80127 1359.55835 2356.82373 1361.675293 Z M 2377.135986 1489.946045 C 2377.509277 1492.242554 2377.939209 1494.650024 2379.420166 1496.453369 C 2379.990723 1497.147461 2380.772949 1497.703857 2381.626953 1498.049072 C 2379.754883 1498.963135 2377.243408 1498.093018 2375.897949 1496.453369 C 2374.416748 1494.650024 2373.987061 1492.242554 2373.61377 1489.946045 C 2370.559814 1471.149414 2367.974365 1452.275146 2365.806641 1433.351807 C 2362.618896 1417.661743 2359.667236 1400.973145 2358.626221 1384.853271 L 2358.556152 1383.925293 L 2358.485596 1382.673096 L 2358.411621 1381.204346 L 2358.320068 1378.876099 C 2360.075684 1376.591797 2361.229248 1376.535522 2361.229248 1376.535522 L 2361.842285 1378.853149 C 2362.442627 1396.795654 2365.743164 1415.708618 2369.328857 1433.351807 C 2371.496826 1452.275146 2374.082031 1471.149414 2377.135986 1489.946045 Z M 2415.072998 1378.994385 L 2415.271973 1378.971436 C 2419.077881 1382.935791 2423.677979 1388.689453 2425.431885 1393.781006 C 2422.656494 1397.165894 2417.517334 1400.512085 2413.304688 1403.586914 L 2413.125244 1403.608154 L 2417.003174 1399.508301 C 2418.688477 1397.637939 2420.321045 1395.718262 2421.909668 1393.781006 C 2420.861816 1390.739502 2419.602783 1387.752441 2418.179688 1384.822021 L 2415.072998 1378.994385 Z M 2541.559082 1356.388672 C 2536.258057 1368.456055 2526.464111 1379.477295 2513.750488 1378.751709 C 2513.556885 1378.741211 2513.366455 1378.711182 2513.174561 1378.693604 C 2526.175537 1377.569946 2535.750732 1364.166016 2540.005615 1351.265625 C 2540.664307 1352.936768 2541.167969 1354.6521 2541.559082 1356.388672 Z M 2431.252441 1382.478271 C 2435.981201 1377.094482 2441.113037 1372.143799 2447.331543 1368.692139 C 2453.872559 1365.060547 2461.419189 1363.380493 2468.889648 1363.66394 C 2462.595459 1363.949341 2456.366211 1365.631104 2450.854004 1368.692139 C 2447.194336 1370.722656 2443.909668 1373.270996 2440.863037 1376.120605 C 2437.756348 1379.026367 2434.89624 1382.24585 2432.136475 1385.553223 L 2428.614258 1385.574463 L 2431.252441 1382.478271 Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/identity-icons-brand.svg b/waterfox/browser/themes/lepton/icons/identity-icons-brand.svg
new file mode 100644
index 0000000000000..c1801e0c10f6f
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/identity-icons-brand.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15.85 7.36l-0.62-2.75-1.42-2.13-2.87-1.93L7.46 0 5 0.55 4.21 1.1l-2 1.49-0.43 0.53-0.96 1.43-0.75 2L0 9l0.45 1.6 0.8 1.69 0.81 1.14 2.66 1.79 0.68 0.27L9.15 16l3.54-1.44 1.87-1.88 0.94-2.18 0.5-2.11zM5.54 14.3l-0.66-0.44 0.68 0.15zM7.35 1.18v0.55H5.7zm4.89 2.13l0.31 1.52-1.35-1.46zm0-0.59l0.33 0.23h-0.1zM14 5.12l-1 0.1-0.32-1.52zM12.79 3.3H13l0.4 0.69zm1.39 2.16l-0.33 3-0.77-2.87zm-1.43 0.26l0.86 3.19L11.22 7zm-3.08 7.69L8.4 12.68l2-1.19zm0.21 0.42l1.28-0.11-1.55 0.75zM3.55 5.66L4.65 8h-1.9zM3.39 5l-1.2 0.05 1.5-1.21zm4.09 4.81l1.21-2.06 1.67 3zm2.84 1.32l-2.17 1.29-0.66-2.23zM7.17 9.65L5.34 8.31l3-0.65zm2.44-5.57L8.12 2.34l2.37 0.94zm0 0.73l1 2L9 7.17zm-1 2.26L6.16 4.69l3.19-0.16zM8.34 7.3L5.16 8l0.69-3.11zm-2.64-3L4.36 3.42 7 2.3zM4.87 7.67L3.78 5.3l1.73-0.51zM4.73 8.4l-0.35 3.06-1.59-3.09zm0.34 0.15l1.86 1.37-2.22 1.74zm2.05 1.66l0.67 2.25L4.9 12zM8 12.89l1.11 0.63-2.6 0.13zm1-5.36l1.78-0.34-0.16 3.27zm1-2.9l2.54 0.84L11 6.69zm1.15 2.7l2.5 2-2.67 1.43zM11 3l-0.14-1.14L12 3zm1.29 2L9.94 4.26l0.87-0.79zm-4.1-3l2.25-0.36L10.6 3zM7.7 1.7V1.14l1.76 0.28zm1.53 2.48L6.09 4.34 7.54 2.2zm-2.59-2.1l-2.32 1 0.42-1zM5.33 4.47L3.78 4.93 4.1 3.67zM3.86 3.23L3.1 3.38 4.18 2.5zM3.32 3.7L2.18 4.62l0.38-0.77zM3.19 5.38L1.7 7.56l0.13-2.12zm-0.93 5.15l-0.74-0.35L1.6 9zM1.75 8.37h0.58l0.06 1.54zM2.43 11l0.08 1-0.75-1.33zM2.38 8H1.82l1.12-1.63zM4 11.57l-1.27-0.79L2.71 9zm-1-0.19l1.21 0.75L3.94 13zM3.54 13l-0.62-0.34-0.08-1zm1-0.59l0.81 1.16-1.13-0.26zm0.34-0.14l2.63 0.47-1.7 0.87zm1 1.8l1.65 0.45-1.67-0.1zM6.85 14l2.64-0.14-0.33 0.77zm3.67-0.57l2.05-1.19L12 13.3zm-0.42-0.16l0.75-2 1.72 0.52zM11.2 11l2.39-1.28-0.68 1.79zm1.89 1l0.37 0.17-0.8 0.63zm0.23-0.29l0.79-0.76-0.41 0.94zm0.14-0.62L14 9.72l0.4 0.48zm0.67-1.73l0.52-1-0.16 1.43zm0.07-0.9l0.25-2.21 0.29 1.16zM1.13 8.36V7.73l0.14 0.43zm0.13 0.4v0.52l-0.1-0.34zm-0.07-2l0.24-0.52-0.07 1z" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/image-add.svg b/waterfox/browser/themes/lepton/icons/image-add.svg
new file mode 100644
index 0000000000000..05d06edce6f3e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/image-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.875 3.63c0-.345.28-.625.625-.625h3.87a2.625 2.625 0 0 1 2.625 2.625v7.74a2.625 2.625 0 0 1-2.625 2.625H5.63a2.625 2.625 0 0 1-2.625-2.625V9.5a.625.625 0 1 1 1.25 0v3.87c0 .76.616 1.375 1.375 1.375h7.74c.76 0 1.375-.616 1.375-1.375V5.63c0-.76-.616-1.375-1.375-1.375H9.5a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/><path d="M12.877 13.5H6.123a.5.5 0 0 1-.372-.835l3.377-3.752a.5.5 0 0 1 .744 0l3.377 3.752a.5.5 0 0 1-.372.835ZM13 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/><path fill-rule="evenodd" d="M4 8a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm.625-6.37a.625.625 0 0 0-1.25 0v1.745H1.63a.625.625 0 1 0 0 1.25h1.745V6.37a.625.625 0 1 0 1.25 0V4.625H6.37a.625.625 0 1 0 0-1.25H4.625V1.63Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/image-alt-text.svg b/waterfox/browser/themes/lepton/icons/image-alt-text.svg
new file mode 100644
index 0000000000000..ffca1ffeda7a8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/image-alt-text.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.875 3.63c0-.345.28-.625.625-.625h3.87a2.625 2.625 0 0 1 2.625 2.625v7.74a2.625 2.625 0 0 1-2.625 2.625H5.63a2.625 2.625 0 0 1-2.625-2.625V9.5a.625.625 0 1 1 1.25 0v3.87c0 .76.616 1.375 1.375 1.375h7.74c.76 0 1.375-.616 1.375-1.375V5.63c0-.76-.616-1.375-1.375-1.375H9.5a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/><path d="M12.877 13.5H6.123a.5.5 0 0 1-.372-.835l3.377-3.752a.5.5 0 0 1 .744 0l3.377 3.752a.5.5 0 0 1-.372.835ZM13 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/><path fill-rule="evenodd" d="M2 0a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Zm.13 2.005a.625.625 0 0 0 0 1.25h3.74a.625.625 0 1 0 0-1.25H2.13Zm0 2.74a.625.625 0 1 0 0 1.25h3.74a.625.625 0 1 0 0-1.25H2.13Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/image-arrow-counterclockwise.svg b/waterfox/browser/themes/lepton/icons/image-arrow-counterclockwise.svg
new file mode 100644
index 0000000000000..52c5e74a82d74
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/image-arrow-counterclockwise.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.875 3.63c0-.345.28-.625.625-.625h3.87a2.625 2.625 0 0 1 2.625 2.625v7.74a2.625 2.625 0 0 1-2.625 2.625H5.63a2.625 2.625 0 0 1-2.625-2.625V9.5a.625.625 0 1 1 1.25 0v3.87c0 .76.616 1.375 1.375 1.375h7.74c.76 0 1.375-.616 1.375-1.375V5.63c0-.76-.616-1.375-1.375-1.375H9.5a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/><path d="M12.877 13.5H6.123a.5.5 0 0 1-.372-.835l3.377-3.752a.5.5 0 0 1 .744 0l3.377 3.752a.5.5 0 0 1-.372.835ZM13 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/><path fill-rule="evenodd" d="M8 4a4 4 0 1 1-7-2.646V3.5h2.5l-.914-.914a2 2 0 1 1-.518 1.932.5.5 0 0 0-.966.258A3 3 0 1 0 1.88 1.88l-.707-.707A4 4 0 0 1 8 4Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/image-copy.svg b/waterfox/browser/themes/lepton/icons/image-copy.svg
new file mode 100644
index 0000000000000..5bfcbd781fdc8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/image-copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5.63 1.255c-.76 0-1.375.616-1.375 1.375v7.74c0 .76.616 1.375 1.375 1.375h7.74c.76 0 1.375-.616 1.375-1.375V2.63c0-.76-.616-1.375-1.375-1.375H5.63ZM3.005 2.63A2.625 2.625 0 0 1 5.63.005h7.74a2.625 2.625 0 0 1 2.625 2.625v7.74a2.625 2.625 0 0 1-2.625 2.625H5.63a2.625 2.625 0 0 1-2.625-2.625V2.63Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M1.63 2.005c.345 0 .625.28.625.625v9.74c0 .76.616 1.375 1.375 1.375h9.74a.625.625 0 1 1 0 1.25H3.63a2.625 2.625 0 0 1-2.625-2.625V2.63c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path d="M12.877 10.5H6.123a.5.5 0 0 1-.372-.834l3.377-3.753a.5.5 0 0 1 .744 0l3.377 3.753a.5.5 0 0 1-.372.834ZM13 4a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/image.svg b/waterfox/browser/themes/lepton/icons/image.svg
new file mode 100644
index 0000000000000..91f1190d87cc4
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/image.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 1.25H2a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M12.793 13.5H3.207a.5.5 0 0 1-.353-.854l4.792-4.792a.5.5 0 0 1 .708 0l4.793 4.792a.5.5 0 0 1-.354.854ZM12.5 5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/import-export.svg b/waterfox/browser/themes/lepton/icons/import-export.svg
new file mode 100644
index 0000000000000..4decdd2620297
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/import-export.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M4.197 3.623a.624.624 0 0 1 1.247 0l.005 6.709 2.051 0a.5.5 0 0 1 .353.852L5.037 14l-.423 0-2.816-2.816a.5.5 0 0 1 .353-.852l2.051 0-.005-6.709z"/>
+  <path d="M11.812 12.377a.624.624 0 0 1-1.25 0l-.005-6.709-2.056 0a.5.5 0 0 1-.354-.852L10.97 2l.424 0 2.823 2.816a.499.499 0 0 1-.354.852l-2.056 0 .005 6.708z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/import.svg b/waterfox/browser/themes/lepton/icons/import.svg
new file mode 100644
index 0000000000000..17469705fb20e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/import.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2.25h10a.75.75 0 0 1 .75.75v10a.75.75 0 0 1-.75.75H4a.75.75 0 0 1-.75-.75v-2H2v2a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v4.89h1.25V3A.75.75 0 0 1 4 2.25" clip-rule="evenodd"/><path fill-rule="evenodd" d="M.63 5.375c.345 0 .625.28.625.625v2.875h6.736L6.558 7.442a.625.625 0 1 1 .884-.884l2.5 2.5a.625.625 0 0 1 0 .884l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H.63A.625.625 0 0 1 .005 9.5V6c0-.345.28-.625.625-.625" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/ion.svg b/waterfox/browser/themes/lepton/icons/ion.svg
new file mode 100644
index 0000000000000..bc819d262cf09
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/ion.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M3.757 14.326c2.344 2.232 6.142 2.232 8.486 0 2.343-2.231 2.343-5.85 0-8.08A5.986 5.986 0 0 0 11 5.335c-.354-.195-.601-.553-.601-.957V1a1 1 0 0 0-1-1H6.6a1 1 0 0 0-1 1v3.38c0 .403-.247.761-.601.956a5.984 5.984 0 0 0-1.242.91c-2.343 2.23-2.343 5.849 0 8.08Zm7.624-7.176c-.3-.286-.631-.525-.983-.719-.684-.377-1.248-1.118-1.248-2.052V1.25h-2.3v3.13c0 .933-.564 1.674-1.248 2.051a4.734 4.734 0 0 0-.983.72 4.349 4.349 0 0 0-1.323 2.514l.394-.19a4.445 4.445 0 0 1 4.7.537 3.195 3.195 0 0 0 3.38.386l.96-.461.005-.003a4.333 4.333 0 0 0-1.354-2.784Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/key-multiple.svg b/waterfox/browser/themes/lepton/icons/key-multiple.svg
new file mode 100644
index 0000000000000..358ff1ebd4fc8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/key-multiple.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M7.25 4a2.75 2.75 0 1 0 5.5 0 2.75 2.75 0 0 0-5.5 0ZM6 4a4 4 0 1 0 8 0 4 4 0 0 0-8 0Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M13.995 13.63c0 .345-.28.625-.625.625h-2.365v1.115a.625.625 0 1 1-1.25 0V7h1.25v6.005h2.365c.345 0 .625.28.625.625ZM8.152 7.264l.435-.435-.884-.884-.525.525c.277.316.606.585.974.794Zm-.908.908a5.026 5.026 0 0 1-.951-.817l-3.278 3.278-1.23 1.23a.625.625 0 0 0 .883.884l.788-.787 2.101 2.11a.625.625 0 0 0 .886-.881L4.34 11.076l2.904-2.904Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/link-no-tracking.svg b/waterfox/browser/themes/lepton/icons/link-no-tracking.svg
new file mode 100644
index 0000000000000..ae243ffe876b3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/link-no-tracking.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M10.154 3.381a.625.625 0 0 1-.884 0L7.945 2.055A2.75 2.75 0 0 0 3.438 5h-.71c-.2 0-.397.016-.59.046a4 4 0 0 1 6.69-3.875l1.326 1.326a.625.625 0 0 1 0 .884ZM10.954 13.859a4 4 0 0 0 3.87-6.69L13.5 5.84a.625.625 0 0 0-.884.884l1.326 1.326A2.75 2.75 0 0 1 11 12.56v.711c0 .2-.016.396-.046.588ZM11 9.217a.625.625 0 0 0 .118-.976l-.17-.17.026.214c.017.146.026.294.026.444v.488ZM7.936 5.06l-.177-.178A.625.625 0 0 0 6.783 5h.488c.227 0 .45.02.665.06ZM2.729 7.3c-.79 0-1.43.64-1.43 1.429v4.542c0 .554.315 1.034.775 1.271l-.942.942A2.725 2.725 0 0 1 0 13.271V8.73A2.729 2.729 0 0 1 2.729 6H7.27c.911 0 1.718.446 2.213 1.132l-.942.942a1.43 1.43 0 0 0-1.27-.775H2.728Z"/><path d="M7.945 8.671 6.67 9.945A1 1 0 1 1 7.945 8.67ZM5.46 11.156l-2.838 2.838a.5.5 0 0 1-.264-.824l2.085-2.317a.5.5 0 0 1 .744 0l.273.303ZM4.38 14.005l1.917-1.918.975 1.083a.5.5 0 0 1-.371.835H4.379Z"/><path d="M3.683 14.7h3.588c.79 0 1.43-.64 1.43-1.429V9.683l1.28-1.28c.012.107.019.216.019.326v4.542A2.729 2.729 0 0 1 7.271 16H2.73c-.11 0-.22-.007-.326-.02l1.28-1.28Z"/><path fill-rule="evenodd" d="M9.812 6.188a.625.625 0 0 1 0 .884l-8.74 8.74a.625.625 0 1 1-.884-.884l8.74-8.74a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/link-square.svg b/waterfox/browser/themes/lepton/icons/link-square.svg
new file mode 100644
index 0000000000000..7c04e1140d834
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/link-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12 6.25h1a.75.75 0 0 1 .75.75v6a.75.75 0 0 1-.75.75H7a.75.75 0 0 1-.75-.75V7A.75.75 0 0 1 7 6.25h1.5V5H7a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-1v1.25Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3 2.25h6a.75.75 0 0 1 .75.75v6a.75.75 0 0 1-.75.75H7.5V11H9a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h1V9.75H3A.75.75 0 0 1 2.25 9V3A.75.75 0 0 1 3 2.25Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/link.svg b/waterfox/browser/themes/lepton/icons/link.svg
new file mode 100644
index 0000000000000..00be227637477
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M5.875 6.766a.625.625 0 1 1 .884-.884l3.359 3.359a.625.625 0 1 1-.884.884L5.875 6.766Z"/><path d="M11.615 6.842a.625.625 0 0 0 0 .884l1.326 1.326a2.75 2.75 0 1 1-3.89 3.889l-1.325-1.326a.625.625 0 1 0-.884.884l1.326 1.326a4 4 0 1 0 5.657-5.657l-1.326-1.326a.625.625 0 0 0-.884 0ZM8.27 4.381a.625.625 0 0 0 .884-.884L7.828 2.172a4 4 0 0 0-5.656 5.656l1.325 1.326a.625.625 0 0 0 .884-.884L3.055 6.945a2.75 2.75 0 1 1 3.89-3.89L8.27 4.381Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/lock-closed.svg b/waterfox/browser/themes/lepton/icons/lock-closed.svg
new file mode 100644
index 0000000000000..3a9bcf11b6fc0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/lock-closed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12 8.25H4a.75.75 0 0 0-.75.75v5c0 .414.336.75.75.75h8a.75.75 0 0 0 .75-.75V9a.75.75 0 0 0-.75-.75ZM4 7a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2H4Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.5 1.25h-1A2.25 2.25 0 0 0 5.25 3.5V7h5.5V3.5A2.25 2.25 0 0 0 8.5 1.25ZM7.5 0A3.5 3.5 0 0 0 4 3.5v4.75h8V3.5A3.5 3.5 0 0 0 8.5 0h-1Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/mail-inbox-all.svg b/waterfox/browser/themes/lepton/icons/mail-inbox-all.svg
new file mode 100644
index 0000000000000..6d88c4e6664f3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/mail-inbox-all.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.25 10.255V14c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75v-3.745h-3.534c-.46 0-.868.292-1.016.727-.716 2.1-3.684 2.1-4.4 0a1.074 1.074 0 0 0-1.016-.727H1.25Zm13.5-1.25h-3.534c-.995 0-1.879.633-2.2 1.574-.33.97-1.702.97-2.032 0a2.324 2.324 0 0 0-2.2-1.574H1.25V2A.75.75 0 0 1 2 1.25h12a.75.75 0 0 1 .75.75v7.005ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M3 3.625C3 3.28 3.28 3 3.625 3h8.75a.625.625 0 1 1 0 1.25h-8.75A.625.625 0 0 1 3 3.625ZM3 6.625C3 6.28 3.28 6 3.625 6h8.75a.625.625 0 1 1 0 1.25h-8.75A.625.625 0 0 1 3 6.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/mail-inbox.svg b/waterfox/browser/themes/lepton/icons/mail-inbox.svg
new file mode 100644
index 0000000000000..afa3be580db1b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/mail-inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.25 10.255V14c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75v-3.745h-3.534c-.46 0-.868.292-1.016.727-.716 2.1-3.684 2.1-4.4 0a1.074 1.074 0 0 0-1.016-.727H1.25Zm13.5-1.25h-3.534c-.995 0-1.879.633-2.2 1.574-.33.97-1.702.97-2.032 0a2.324 2.324 0 0 0-2.2-1.574H1.25V2A.75.75 0 0 1 2 1.25h12a.75.75 0 0 1 .75.75v7.005ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/mail.svg b/waterfox/browser/themes/lepton/icons/mail.svg
new file mode 100644
index 0000000000000..afb55cdee8340
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 3.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M.513 2.978a.625.625 0 0 1 .879-.095l5.746 4.622c.503.405 1.22.405 1.724 0l5.746-4.622a.625.625 0 1 1 .784.974L9.645 8.479c-.96.773-2.33.773-3.29 0L.608 3.857a.625.625 0 0 1-.095-.879Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/menu-check.svg b/waterfox/browser/themes/lepton/icons/menu-check.svg
new file mode 100644
index 0000000000000..3b34bd994d6a0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/menu-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M12.827 4.552a.667.667 0 0 1 1.021.85l-.077.092-6.299 6.31a.667.667 0 0 1-.851.078l-.092-.077L3.195 8.47a.667.667 0 0 1 .85-1.02l.093.078L7 10.389l5.827-5.837Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/merge.svg b/waterfox/browser/themes/lepton/icons/merge.svg
new file mode 100644
index 0000000000000..e6060cd342f9e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/merge.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#212121" d="M0 3.789c0-.349.283-.632.632-.632h2.743c.838 0 1.64.333 2.233.925l2.484 2.485a2.74 2.74 0 0 0 1.936.801h3.816l-3.132-3.132a.632.632 0 1 1 .894-.894l4.21 4.211a.632.632 0 0 1 0 .894l-4.21 4.21a.631.631 0 1 1-.894-.893l3.132-3.132h-3.765a2.74 2.74 0 0 0-1.985.852L5.837 11.86a3.158 3.158 0 0 1-2.29.983H.632a.632.632 0 0 1 0-1.264h2.915c.52 0 1.016-.213 1.374-.59l2.257-2.376c.217-.228.458-.428.718-.597a4.004 4.004 0 0 1-.697-.556L4.715 4.976a1.895 1.895 0 0 0-1.34-.555H.632A.632.632 0 0 1 0 3.789Z" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/movetowindow-16.svg b/waterfox/browser/themes/lepton/icons/movetowindow-16.svg
new file mode 100644
index 0000000000000..c2fe2f8524358
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/movetowindow-16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.379 9.682a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H7.37a.625.625 0 1 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3.63 1.005A2.625 2.625 0 0 0 1.005 3.63v7.77a2.625 2.625 0 0 0 2.625 2.624h2.922a1.625 1.625 0 0 1-.8-1.25H3.63c-.76 0-1.375-.615-1.375-1.375V6.18h11.5v3.56l1.25 1.227V3.63a2.625 2.625 0 0 0-2.625-2.625H3.63Zm11.237 11.236a.614.614 0 0 0-.06-.067l-1.052-1.034v.26c0 .759-.616 1.374-1.375 1.374H6.764c.069.27.314.471.606.471h5.491l-.78.78h.299a2.626 2.626 0 0 0 2.487-1.784ZM2.255 3.63c0-.76.616-1.375 1.375-1.375h8.75c.76 0 1.375.616 1.375 1.375v1.298h-11.5V3.63Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-forward-photon.svg b/waterfox/browser/themes/lepton/icons/new-tab-forward-photon.svg
new file mode 100644
index 0000000000000..7398fc9067a92
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-forward-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.379 9.682a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H7.37a.625.625 0 1 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5.997 11.75H3.251V4.627c0-.76.617-1.377 1.377-1.377h6.745c.76 0 1.377.616 1.377 1.377v4.157c.075.052.146.11.213.177L14 9.979V4.627A2.627 2.627 0 0 0 11.373 2H4.628a2.627 2.627 0 0 0-2.627 2.627v7.122H.625a.625.625 0 0 0 0 1.251H5.79a1.629 1.629 0 0 1 .207-1.25Zm6.595 0 .25.245H7.37A.625.625 0 0 0 6.874 13H14v-1.62l-1.25-1.227v1.597h-.158Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-forward.svg b/waterfox/browser/themes/lepton/icons/new-tab-forward.svg
new file mode 100644
index 0000000000000..492f2d745bc04
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-forward.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.379 9.682a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H7.37a.625.625 0 1 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3 3.25h10a.75.75 0 0 1 .75.75v5.733L15 10.961V4a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h2.79a1.629 1.629 0 0 1 .207-1.25H3a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 3 3.25Zm9.592 8.5.25.245H7.37A.625.625 0 0 0 6.874 13H13c.714 0 1.34-.374 1.695-.937l-.955-.938a.75.75 0 0 1-.74.625h-.408Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-multiple-photon.svg b/waterfox/browser/themes/lepton/icons/new-tab-multiple-photon.svg
new file mode 100644
index 0000000000000..1830e7e0dddb4
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-multiple-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.625 7.5c.345 0 .625.28.625.625V11h2.875a.625.625 0 1 1 0 1.25H12.25v2.875a.625.625 0 1 1-1.25 0V12.25H8.125a.625.625 0 1 1 0-1.25H11V8.125c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3.439.75c-.063.079-.12.162-.171.25H14a1 1 0 0 1 1 1v8h.125c.193 0 .377.034.549.095A1.99 1.99 0 0 0 16 9V2a2 2 0 0 0-2-2H5c-.632 0-1.195.293-1.561.75ZM12.25 13H11v-.75H8.125a.625.625 0 0 1-.612-.5h5.237V11H14v.75h.023c.458 0 .91 0 .97.5H12.25V13ZM14 10V4a1.99 1.99 0 0 0-1.031-1.75A1.991 1.991 0 0 0 12 2H3a2 2 0 0 0-2 2v7.75H.977c-.492 0-.977 0-.977.62C0 13 .5 13 1 13h6.259a1.624 1.624 0 0 1-.754-1.25H2.25V4A.75.75 0 0 1 3 3.25h9a.75.75 0 0 1 .75.75v2.952c.308.296.5.712.5 1.173V10H14Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-multiple.svg b/waterfox/browser/themes/lepton/icons/new-tab-multiple.svg
new file mode 100644
index 0000000000000..0a2369970cbf5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-multiple.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.625 7.5c.345 0 .625.28.625.625V11h2.875a.625.625 0 1 1 0 1.25H12.25v2.875a.625.625 0 1 1-1.25 0V12.25H8.125a.625.625 0 1 1 0-1.25H11V8.125c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M14 11a1.99 1.99 0 0 1-.439 1.25H12.25v.735c-.082.01-.165.015-.25.015h-1v-.75H8.125a.625.625 0 0 1-.612-.5H12a.75.75 0 0 0 .75-.75H14Zm0-1V4a1.99 1.99 0 0 0-1.031-1.75A1.991 1.991 0 0 0 12 2H2a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5.259a1.624 1.624 0 0 1-.754-1.25H2a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 2 3.25h10a.75.75 0 0 1 .75.75v2.952c.308.296.5.712.5 1.173V10H14Zm1.674.095a1.623 1.623 0 0 0-.549-.095H15V2a1 1 0 0 0-1-1H2.268A2.005 2.005 0 0 1 4 0h10a2 2 0 0 1 2 2v7c0 .404-.12.78-.326 1.095Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-photon.svg b/waterfox/browser/themes/lepton/icons/new-tab-photon.svg
new file mode 100644
index 0000000000000..ecf739824d232
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.625 7.5c.345 0 .625.28.625.625V11h2.875a.625.625 0 1 1 0 1.25H12.25v2.875a.625.625 0 1 1-1.25 0V12.25H8.125a.625.625 0 1 1 0-1.25H11V8.125c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M2.005 4.63A2.625 2.625 0 0 1 4.63 2.005h6.74a2.625 2.625 0 0 1 2.625 2.625V10h-.745V8.125a1.625 1.625 0 1 0-3.25 0V10H8.125a1.625 1.625 0 0 0-.874 2.995H.63a.625.625 0 1 1 0-1.25h1.375V4.63Zm10.245 8.365H11v-.745H8.125a.625.625 0 1 1 0-1.25H11V8.125a.625.625 0 1 1 1.25 0V11h1.745v1.25H12.25v.745Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-skip-forward-photon.svg b/waterfox/browser/themes/lepton/icons/new-tab-skip-forward-photon.svg
new file mode 100644
index 0000000000000..a2383b1528e12
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-skip-forward-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.421 4.46c-.118.119-.234.237-.35.352a.625.625 0 1 1-.883-.884c.113-.113.23-.231.35-.354C1.99 2.092 4.034.005 8 .005c2.186 0 4.155 1.016 5.542 1.982.463.322.868.644 1.203.93V.63a.625.625 0 1 1 1.25 0v4.365H11.63a.625.625 0 1 1 0-1.25h2.157c-.277-.231-.6-.482-.96-.732C11.53 2.109 9.815 1.255 8 1.255c-3.427 0-5.137 1.738-6.579 3.204ZM13.75 7.031c.16.287.25.617.25.969v5.75h.023c.492 0 .977 0 .977.62 0 .63-.5.63-1 .63H2c-.5 0-1 0-1-.63 0-.62.485-.62.977-.62H2V8a2 2 0 0 1 2-2h8a1.991 1.991 0 0 1 1.75 1.031ZM12 7.25H4a.75.75 0 0 0-.75.75v5.75h9.5V8a.75.75 0 0 0-.75-.75Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/new-tab-skip-forward.svg b/waterfox/browser/themes/lepton/icons/new-tab-skip-forward.svg
new file mode 100644
index 0000000000000..1419c752ecd36
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab-skip-forward.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 7.25H3a.75.75 0 0 0-.75.75v5c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V8a.75.75 0 0 0-.75-.75ZM3 6a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2H3ZM1.421 4.46c-.118.119-.234.237-.35.352a.625.625 0 1 1-.883-.884c.113-.113.23-.231.35-.354C1.99 2.092 4.034.005 8 .005c2.186 0 4.155 1.016 5.542 1.982.463.322.868.644 1.203.93V.63a.625.625 0 1 1 1.25 0v4.365H11.63a.625.625 0 1 1 0-1.25h2.157c-.277-.231-.6-.482-.96-.732C11.53 2.109 9.815 1.255 8 1.255c-3.427 0-5.137 1.738-6.579 3.204Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/new-tab.svg b/waterfox/browser/themes/lepton/icons/new-tab.svg
new file mode 100644
index 0000000000000..04d67a16f2d15
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/new-tab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.625 7.5c.345 0 .625.28.625.625V11h2.875a.625.625 0 1 1 0 1.25H12.25v2.875a.625.625 0 1 1-1.25 0V12.25H8.125a.625.625 0 1 1 0-1.25H11V8.125c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3 2a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h4.259a1.624 1.624 0 0 1 .866-3H10V8.125a1.625 1.625 0 1 1 3.25 0V10H15V4a2 2 0 0 0-2-2H3Zm12 9h-2.75V8.125a.625.625 0 1 0-1.25 0V11H8.125a.625.625 0 1 0 0 1.25H11V13h1.25v-.75h2.311c.275-.342.439-.777.439-1.25Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/no-search-results.svg b/waterfox/browser/themes/lepton/icons/no-search-results.svg
new file mode 100644
index 0000000000000..fcb214edbafa6
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/no-search-results.svg
@@ -0,0 +1,36 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380 293"><script xmlns=""/>
+  <path fill="#FFFFFF" d="M2.72 39.24h40.9s-12.8-28.6 14.37-32.3c24.22-3.3 33.8 21.6 33.8 21.6s2.87-14.36 17.29-11.61c14.2 2.7 24.7 25.56 24.7 25.56h35.6"/>
+  <path fill="#E1E1E6" d="M170.09 35.84h-35.62c-.4 0-.75-.22-.93-.57-.1-.2-10.43-20.33-23.96-22.9-13.2-2.53-15.95 10.24-16.06 10.79-.1.45-.48.8-.94.83-.47.05-.9-.23-1.07-.66a41.04 41.04 0 0 0-7.65-11.75c-6.94-7.41-15.36-10.5-25.04-9.2-7.04.97-11.89 3.74-14.4 8.26-5.06 9.1.8 22.45.85 22.58a1.06 1.06 0 0 1-.96 1.48H3.41a1.05 1.05 0 0 1 0-2.1h39.35C41.3 28.68 38 17.86 42.58 9.63 45.43 4.5 50.8 1.36 58.54.3c20.08-2.73 30.5 13.43 33.77 19.78 1.72-4.25 6.43-11.93 17.66-9.79 13.37 2.55 23.28 19.96 25.14 23.44h34.98a1.05 1.05 0 0 1 0 2.1"/>
+  <path fill="#FFFFFF" d="M171.26 43.2H2.71a2.1 2.1 0 1 1 0-4.2h168.55a2.1 2.1 0 0 1 0 4.2"/>
+  <path fill="#E1E1E6" d="M338.53 124.92H211.12a2.1 2.1 0 1 1 0-4.2h127.41a2.1 2.1 0 0 1 0 4.2M121.81 99.33H55.02a2.1 2.1 0 1 1 0-4.2h66.8a2.1 2.1 0 0 1 0 4.2m-32.54-9.76H70.34a1.05 1.05 0 0 1 0-2.1h18.94a1.05 1.05 0 0 1 0 2.1m47.26 95.55H2.1a2.1 2.1 0 1 1 0-4.2h134.44a2.1 2.1 0 0 1 0 4.2m-21.96-9.57H50.03a1.05 1.05 0 0 1 0-2.1h64.55a1.05 1.05 0 0 1 0 2.1m206.66-61.59h-56.42a1.05 1.05 0 0 1 0-2.1h56.42a1.05 1.05 0 0 1 0 2.1m50.17 19.83H179.66a1.05 1.05 0 0 1 0-2.1H371.4a1.05 1.05 0 0 1 0 2.1"/>
+  <path fill="#FFFFFF" d="M283.11 65.18h22.75s-7.12-15.9 7.99-17.96c13.48-1.84 18.8 12.01 18.8 12.01s1.6-7.99 9.61-6.46c7.9 1.5 13.74 14.21 13.74 14.21h19.8"/>
+  <path fill="#E1E1E6" d="M306.56 62.73h-22.74a1.05 1.05 0 1 1 0-2.1h21.21c-.88-2.61-2.26-8.18.16-12.53 1.66-2.99 4.76-4.81 9.22-5.42 10.6-1.44 16.48 6.34 18.78 10.37 1.42-2.86 4.5-5.84 9.97-4.8 7.32 1.39 12.8 9.82 14.14 12.09h19.2a1.05 1.05 0 0 1 0 2.1h-19.8c-.39 0-.74-.2-.92-.55-.06-.1-5.7-10.19-13.01-11.58-6.93-1.33-8.33 5.35-8.4 5.63a1.05 1.05 0 0 1-2 .17c-.2-.53-5.2-13.06-17.68-11.35-3.77.52-6.35 1.98-7.67 4.36-2.7 4.86.46 12.06.5 12.14.14.32.11.7-.08 1-.2.3-.53.47-.88.47"/>
+  <path fill="#FFFFFF" d="M377.27 69.19h-93.74a2.1 2.1 0 1 1 0-4.2h93.74a2.1 2.1 0 1 1 0 4.2"/>
+  <path fill="#E1E1E6" d="M117.87 251.41H9.4a2.1 2.1 0 1 1 0-4.2h108.47a2.1 2.1 0 0 1 0 4.2m242.44 0H241.8a2.1 2.1 0 1 1 0-4.2h118.5a2.1 2.1 0 0 1 0 4.2m-232.88-32.15a4.2 4.2 0 0 1-4.16-3.62l-4.55-32.19a4.2 4.2 0 0 1 8.32-1.17l4.55 32.19a4.2 4.2 0 0 1-4.16 4.79"/>
+  <path fill="#E1E1E6" d="M125.24 205.61c-.47-.94-10.5-16.8-13.65-16.8-3.15 0-11.55 7-11.55 8.05 0 1.05 2.45 5.25 8.05 3.85l5.6-1.4s8.05 15.05 9.8 17.15c1.75 2.1 8.4 2.45 1.75-10.85"/>
+  <path fill="#0A84FF" d="M105.66 197.3c-.4 0-.8-.11-1.17-.35l-5.24-3.5a2.1 2.1 0 0 1 2.33-3.5l5.25 3.5a2.1 2.1 0 0 1-1.17 3.85"/>
+  <path fill="#5CE6E6" d="M122.9 182l5.64 1.3"/>
+  <path fill="#E1E1E6" d="M128.54 187.5c-.32 0-.64-.03-.96-.1l-5.64-1.32a4.2 4.2 0 0 1 1.9-8.18l5.65 1.31a4.2 4.2 0 0 1-.95 8.3m106.4 31.75a4.2 4.2 0 0 1-4.17-4.7l3.7-30.92a4.2 4.2 0 1 1 8.33 1l-3.7 30.91a4.2 4.2 0 0 1-4.16 3.7"/>
+  <path fill="#E1E1E6" d="M236.5 205.61c.48-.94 10.5-16.8 13.65-16.8 3.15 0 11.55 7 11.55 8.05 0 1.05-2.45 5.25-8.05 3.85l-5.6-1.4s-8.04 15.05-9.8 17.15c-1.74 2.1-8.4 2.45-1.74-10.85"/>
+  <path fill="#E1E1E6" d="M257.07 198.18a2.1 2.1 0 0 1-.35-4.17l6.12-1.05a2.1 2.1 0 1 1 .7 4.14l-6.11 1.04c-.12.03-.24.04-.36.04"/>
+  <path fill="#E1E1E6" d="M253.75 196.08a2.1 2.1 0 0 1-.73-4.07l6.65-2.45a2.1 2.1 0 0 1 1.45 3.94l-6.64 2.45a2.1 2.1 0 0 1-.73.13m-21.1-6.57a4.2 4.2 0 0 1-.96-8.29l5.64-1.31a4.2 4.2 0 0 1 1.9 8.18l-5.63 1.31c-.32.07-.64.1-.96.1m-82.18-33.66c-3.22 0-6.44-1.23-8.9-3.7l-19.6-19.58a12.6 12.6 0 1 1 17.82-17.82l19.6 19.6a12.6 12.6 0 0 1-8.92 21.5m59.48.7a12.6 12.6 0 0 1-8.9-21.5l19.58-19.6a12.6 12.6 0 0 1 17.82 17.81l-19.6 19.6a12.56 12.56 0 0 1-8.9 3.69"/>
+  <path fill="#EDEDF2" d="M121.36 283.07c0-5.1 27.22-9.24 60.8-9.24s60.8 4.13 60.8 9.24c0 5.1-27.22 9.23-60.8 9.23s-60.8-4.13-60.8-9.23"/>
+  <path fill="#E1E1E6" d="M130.06 129.95c-6.4 4.08-4.99 121.7 8.65 130.86 9.37 6.3 75.64 8.4 85.73-1.4 2.97-2.88 17.29-74.88 10.08-125.96-1.88-13.34-81.4-18.2-104.46-3.5"/>
+  <path fill="#E1E1E6" d="M132.23 229.32s2.1 25.64 6.3 37.6c4.2 11.96 9.1 17.95 11.2 16.24 2.1-1.71 0-39.31 0-39.31l-17.5-14.53zm97.51 0s-2.1 25.64-6.3 37.6c-4.2 11.96-9.1 17.95-11.2 16.24-2.1-1.71 0-39.31 0-39.31l17.5-14.53zM138.71 120.5s26.24-7.87 33.59-8.92c7.35-1.05 23.1-8.92 23.1-8.92l-3.68 8.4 8.92-2.63v4.72l21.52 5.78-4.72 6.3h-69.81l-8.92-4.73z"/>
+  <path fill="#F5F5F7" d="M142.82 129.42c-15.06 9.98-5.7 104.71 3.93 116.52 15.84 19.42 63.87 17.85 73.07-3.67 1.52-3.57 15.91-71.38 5-108.65-3.58-12.28-45.7-28.25-82-4.2"/>
+  <path fill="#7A7B7E" d="M149.28 141.48a2.27 2.27 0 0 1 2.27 2.27v5.1a2.27 2.27 0 0 1-4.55 0v-5.1a2.26 2.26 0 0 1 2.28-2.27m56.4 0a2.27 2.27 0 0 1 2.26 2.27v5.1a2.27 2.27 0 0 1-4.54 0v-5.1a2.27 2.27 0 0 1 2.27-2.27"/>
+  <path fill="#C8C8CC" d="M149.27 161.44a9.75 9.75 0 0 1-7.88-4.1 2.1 2.1 0 0 1 3.51-2.3 5.5 5.5 0 0 0 4.37 2.2 5.52 5.52 0 0 0 4.37-2.2 2.1 2.1 0 0 1 3.52 2.28c-.1.18-2.72 4.12-7.89 4.12m56.4 0a9.75 9.75 0 0 1-7.88-4.1 2.1 2.1 0 0 1 3.51-2.3 5.5 5.5 0 0 0 4.37 2.2 5.52 5.52 0 0 0 4.37-2.2 2.1 2.1 0 0 1 3.52 2.28c-.11.18-2.72 4.12-7.89 4.12m-26 10.75a2.1 2.1 0 0 1-.6-4.11c.18-.05 3.7-1.18 4.6-4.8.7-2.76-.1-6.02-.11-6.05a2.1 2.1 0 0 1 3.95-1.37c.75 1.66 2.3 4.32 3.41 5.03 2 1.28 3.68.7 3.76.68a2.12 2.12 0 0 1 2.69 1.23c.4 1.07-.1 2.26-1.17 2.68a8.71 8.71 0 0 1-8.34-1.66l-.11.48c-1.5 6-7.24 7.74-7.49 7.8-.2.07-.39.1-.58.1"/>
+  <path fill="#7A7B7E" d="M175.69 155.33c-1.31 1.4 8.6 3.75 9.86 3.48 1.9-.4 10-6.46 8.92-9.38-.58-1.57-13.61.37-18.78 5.9"/>
+  <path fill="#7A7B7E" d="M178.95 155.28a31 31 0 0 0 6.23 1.45c1.54-.54 5.53-3.76 6.85-5.73-2.86.13-9.1 1.46-13.08 4.28m6.54 5.62c-2.45 0-10.34-1.68-11.69-4.05a2.47 2.47 0 0 1 .35-2.95c4.91-5.25 16.2-7.72 19.97-6.95 1.5.3 2.08 1.12 2.32 1.76.43 1.18.25 2.5-.54 3.93-1.9 3.43-7.72 7.75-9.9 8.22-.13.03-.3.04-.51.04"/>
+  <path fill="#E1E1E6" d="M231.08 178.78s-1.05 8.4-6.3 13.12c-5.24 4.72 6.83 11.54 6.3 22.04-.52 10.5 0-35.16 0-35.16m-98.93-4.73s1.05 8.4 6.3 13.12c5.25 4.73-6.82 11.55-6.3 22.05.52 10.5 0-35.17 0-35.17"/>
+  <path fill="#C8C8CC" d="M195.5 105.2h.01-.01zm0-4.2c-.32 0-.64.07-.94.21-.15.08-15.5 7.73-22.42 8.72-5.1.73-18.85 4.6-27.37 7.07l-3.32-3.32a14.57 14.57 0 0 0-10.37-4.3 14.7 14.7 0 0 0-10.38 25.05l5.08 5.09c-.96 8.47-1.4 21.64-1.24 36.66a6.26 6.26 0 0 0-7.69 6.47c-.05.51-.04.97.02 1.42l1.05 7.45c-3.8-4.5-5.22-4.5-6.1-4.5-1.59 0-3.83 1-6.66 2.94l-2.17-1.44a4.2 4.2 0 0 0-6.49 2.96 4.19 4.19 0 0 0-.9 8.26l4.46 1.14a8.3 8.3 0 0 0 6.1 2.5c.86 0 1.77-.1 2.68-.34l4-1c2.04 3.78 7.16 13.17 8.98 15.68a6.29 6.29 0 0 0 5.02 3.85c1.27 12.93 3.54 29.01 7.42 36.75a75.23 75.23 0 0 0 2.49 9.5c1.47 4.2 6.72 17.9 12.35 17.9.78 0 1.52-.26 2.13-.76.97-.79 1.97-1.6 1.65-18.26 8.4 1.12 19.07 1.75 29.79 1.75 7.3 0 17.6-.3 26.69-1.65-.32 16.56.68 17.37 1.64 18.16.61.5 1.35.76 2.13.76 5.64 0 10.88-13.7 12.36-17.9 1.3-3.72 2.53-9.04 3.65-15.82 1.89-7.91 3.84-18.87 5.43-30.39l.42.01a6.29 6.29 0 0 0 6.23-5.46 355.82 355.82 0 0 0 7.94-14.12l4 1c.92.23 1.82.35 2.68.35a8.38 8.38 0 0 0 7.1-3.76l.97-.17a4.17 4.17 0 0 0 3.43-4.84 4.18 4.18 0 0 0-2.76-3.26 4.21 4.21 0 0 0-5.62-3.46l-3.38 1.24c-3.38-2.11-4.88-2.11-5.4-2.11-.86 0-2.27 0-6 4.37l.74-6.2a6.3 6.3 0 0 0-4.2-6.69c-.74-.3-1.5-.46-2.28-.48.53-14.85.12-28.34-1.25-40.13l2.77-2.77a14.58 14.58 0 0 0 4.3-10.38c0-3.92-1.52-7.6-4.3-10.38a14.58 14.58 0 0 0-10.37-4.3c-3.92 0-7.61 1.53-10.38 4.3l-1.56 1.57-14.81-3.97v-3.11a2.1 2.1 0 0 0-2.7-2.02l-4.58 1.35 1.86-4.26a2.1 2.1 0 0 0-1.92-2.94zm0 2.1l-3.67 8.38 8.91-2.62v4.71l17.53 4.7 2.42-2.41a12.54 12.54 0 0 1 17.79 0 12.58 12.58 0 0 1 0 17.79l-3.49 3.49c1.66 13.68 1.88 28.68 1.25 43.36l1.14-.27a4.12 4.12 0 0 1 2.6.25 4.2 4.2 0 0 1 2.86 4.48l-1.66 13.86c3.2-4.58 7.21-9.7 9-9.7 1.2 0 3.17 1.03 5.15 2.35l4.35-1.6a2.1 2.1 0 0 1 2.7 1.24c.32.88 0 1.8-.7 2.35l1.17-.2.36-.03a2.1 2.1 0 0 1 .35 4.16l-2 .35a6.07 6.07 0 0 1-5.72 3.55 9 9 0 0 1-2.17-.28l-5.59-1.4s-6.2 11.6-8.9 15.83l-.04.39a4.2 4.2 0 0 1-6.32 3.08c-1.83 13.82-4 25.42-5.74 32.68-.94 5.73-2.13 11.43-3.57 15.53-3.72 10.6-8 16.5-10.38 16.5-.3 0-.57-.1-.8-.29-1-.81-1.05-9.82-.82-19-7.97 1.4-18.37 2.02-28.84 2.02-11.66 0-23.4-.77-31.95-2.08.23 9.2.2 18.24-.81 19.06-.24.2-.51.29-.81.29-2.38 0-6.65-5.9-10.37-16.5a74.98 74.98 0 0 1-2.47-9.5c-3.48-6.7-5.95-21.27-7.52-38.26-.17.04-.33.1-.5.12a4.2 4.2 0 0 1-4.55-2.79c-1.8-2.19-9.77-17.08-9.77-17.08l-5.59 1.4c-.78.2-1.5.28-2.17.28a6.24 6.24 0 0 1-4.96-2.29l-5.07-1.3a2.1 2.1 0 1 1 1.04-4.05l3.52.9-1.19-.8a2.1 2.1 0 0 1 2.33-3.49l3.37 2.26c2.42-1.79 5.12-3.4 6.63-3.4 1.84 0 6.05 5.46 9.31 10.16l-2.2-15.5a4.08 4.08 0 0 1 .02-1.09c-.05-.43-.04-.88.07-1.33a4.2 4.2 0 0 1 5.03-3.13l2.6.6c-.24-16.38.23-31.22 1.32-40.08l-5.8-5.8a12.58 12.58 0 0 1 17.79-17.79l4.2 4.2c8.04-2.35 23-6.6 28.27-7.36 7.34-1.05 23.06-8.9 23.06-8.9zM52.65 141.37a25.41 25.41 0 0 1 38.25 33.29l3.91 3.91-4.96 4.96-3.91-3.9a25.42 25.42 0 0 1-33.29-38.26"/>
+  <path fill="#F5F5F7" d="M70.62 138.63a20.72 20.72 0 1 1 0 41.45 20.72 20.72 0 0 1 0-41.45"/>
+  <path fill="#C8C8CC" d="M71.95 141.08a20.72 20.72 0 0 0-18.74 29.58 20.72 20.72 0 0 1 36.2-20.02 20.7 20.7 0 0 0-17.46-9.56"/>
+  <path fill="#7A7B7E" d="M115.81 204.54c2.38-2.38 3.3-5.36 2.03-6.63L95.7 177.6c-1.27-1.27-3.34-1.26-5.72 1.12s-2.39 4.46-1.12 5.72l20.31 22.13c1.27 1.26 4.25.35 6.63-2.03"/>
+  <polygon fill="#626366" points="113.396 193.835 105.106 202.128 95.104 191.234 102.502 183.834"/>
+  <path fill="#E1E1E6" d="M101.75 189.01s-9.1 2.1-8.75 4.9c.35 2.8 5.39 11.38 8.75 9.8 3.36-1.58 8.75-13.3 0-14.7"/>
+  <path fill="#C8C8CC" d="M134.37 128.24c-.1 0-.2-.02-.3-.05a1.04 1.04 0 0 1-.71-1.29c.08-.29 2.1-7.15 11.74-9.9.55-.16 1.14.16 1.3.71.16.56-.17 1.14-.73 1.3-8.45 2.42-10.22 8.22-10.3 8.47-.13.45-.55.76-1 .76m95.52-.26c-.37 0-.73-.2-.92-.55-4.4-8.07-11.78-9.43-11.85-9.44a1.05 1.05 0 0 1 .35-2.07c.34.05 8.43 1.5 13.34 10.5a1.04 1.04 0 0 1-.92 1.56m-76.1 139.08h-.1c-5.5-.55-11.09-5.03-11.32-5.22a1.05 1.05 0 1 1 1.32-1.63c.05.04 5.33 4.27 10.2 4.76a1.05 1.05 0 0 1-.1 2.1m56.42-.27a1.05 1.05 0 0 1-.22-2.07c3.53-.76 9.45-3.33 9.5-3.35a1.05 1.05 0 0 1 .85 1.92c-.25.11-6.18 2.68-9.91 3.48a.99.99 0 0 1-.22.02m23.35-45.4c-.85 0-1.58-.37-2.12-1.07-2.52-3.29-.2-14.94 1.29-21.2l-1.08 1a1.05 1.05 0 0 1-1.42-1.54l3.67-3.41a1.05 1.05 0 0 1 1.73 1.04c-2.01 7.48-4.47 20.29-2.53 22.83.16.2.3.25.46.25a1.05 1.05 0 0 1 0 2.1m-105.5.26a1.05 1.05 0 0 1-.04-2.1c.16 0 .36-.05.6-.36 2.4-3.08.3-18.67-1.58-27.76a1.05 1.05 0 0 1 1.77-.96l2.89 2.88c.4.42.4 1.08 0 1.5-.41.4-1.08.4-1.49 0l-.46-.47c1.27 7.02 3.58 22.18.52 26.1a2.84 2.84 0 0 1-2.16 1.17h-.04M100.6 205.1c-.79 0-1.73-.23-2.77-.92-3.5-2.34-6.98-6.52-6.35-10.18.26-1.48 1.3-3.43 4.84-4.31a1.05 1.05 0 0 1 .5 2.03c-1.95.5-3.05 1.38-3.27 2.64-.4 2.27 1.95 5.74 5.44 8.07.86.57 1.62.7 2.34.43 2.25-.88 3.8-5.46 4.2-7.15.13-.56.7-.9 1.26-.78.57.14.91.7.78 1.27-.17.73-1.8 7.17-5.48 8.61-.4.16-.9.29-1.49.29"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/notebook-subsection.svg b/waterfox/browser/themes/lepton/icons/notebook-subsection.svg
new file mode 100644
index 0000000000000..d85c15acdb0cb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/notebook-subsection.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M12.5 3A3.5 3.5 0 0 1 16 6.5V9c0 .818-.393 1.544-1 2V6.5A2.5 2.5 0 0 0 12.5 4H3c.456-.607 1.182-1 2-1h7.5Z"/>
+  <path d="M15.995 12.432 16 12.5c0 .253-.226.462-.519.495L15.4 13H.6c-.331 0-.6-.224-.6-.5 0-.253.226-.462.519-.495L.6 12H1V7a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v5h1.4c.304 0 .555.188.595.432ZM13 7a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v5h11V7Z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/organization-horizontal.svg b/waterfox/browser/themes/lepton/icons/organization-horizontal.svg
new file mode 100644
index 0000000000000..73a2630c1e608
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/organization-horizontal.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M0 8a3 3 0 0 0 5.96.5H7.5v3A1.5 1.5 0 0 0 9 13h1.04a3.001 3.001 0 1 0 0-1H9a.5.5 0 0 1-.5-.5v-7A.5.5 0 0 1 9 4h1.04a3.001 3.001 0 1 0 0-1H9a1.5 1.5 0 0 0-1.5 1.5v3H5.96A3.001 3.001 0 0 0 0 8zm3 2.001a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm10 4.5a2 2 0 1 1 0-4.002 2 2 0 0 1 0 4.002zM11 3.5a2 2 0 1 1 4 0 2 2 0 0 1-4 0z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/panelarrow-vertical-reverse.svg b/waterfox/browser/themes/lepton/icons/panelarrow-vertical-reverse.svg
new file mode 100644
index 0000000000000..d274759b40f64
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/panelarrow-vertical-reverse.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path fill="context-stroke" d="m0 0 10 10L20 0Z"/>
+  <path fill="context-fill" d="m1 0 9 9 9-9z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/panelarrow-vertical.svg b/waterfox/browser/themes/lepton/icons/panelarrow-vertical.svg
new file mode 100644
index 0000000000000..55d016c2617eb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/panelarrow-vertical.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path fill="context-stroke" d="M 0,10 L 10,0 20,10 z"/>
+  <path fill="context-fill" d="M 1,10 L 10,1 19,10 z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/password-hide.svg b/waterfox/browser/themes/lepton/icons/password-hide.svg
new file mode 100644
index 0000000000000..767a43ebcef38
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/password-hide.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14.812 1.188a.625.625 0 0 1 0 .884l-12.74 12.74a.625.625 0 1 1-.884-.884l12.74-12.74a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M13.02 3.566A8.668 8.668 0 0 0 8 2C3 2 0 6 0 8c0 1.333 1.332 3.553 3.7 4.886l.923-.923a7.408 7.408 0 0 1-1.657-1.138 6.484 6.484 0 0 1-1.323-1.644c-.3-.547-.393-.962-.393-1.181 0-.219.094-.634.393-1.18a6.484 6.484 0 0 1 1.323-1.645A7.409 7.409 0 0 1 8 3.25c1.646 0 3.033.502 4.12 1.216l.9-.9ZM14.515 4.9l-.885.886c.302.349.545.702.727 1.034.3.547.393.962.393 1.181 0 .219-.094.634-.393 1.18a6.486 6.486 0 0 1-1.323 1.645A7.41 7.41 0 0 1 8 12.75c-.43 0-.843-.034-1.238-.098L5.71 13.705A8.883 8.883 0 0 0 8 14c5 0 8-4 8-6 0-.832-.519-2.01-1.485-3.101Zm-6.068 6.068a3.002 3.002 0 0 0 2.52-2.52l-2.52 2.52Zm1.947-4.775a3 3 0 1 0-4.202 4.202l.898-.899A1.749 1.749 0 0 1 8 6.25c.633 0 1.188.336 1.495.84l.899-.898Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/password.svg b/waterfox/browser/themes/lepton/icons/password.svg
new file mode 100644
index 0000000000000..91f2b6ff07e65
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/password.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 3.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M5.5 8.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM9.5 8.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM10.5 9.375c0-.345.28-.625.625-.625h1.75a.625.625 0 1 1 0 1.25h-1.75a.625.625 0 0 1-.625-.625Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/paste-text.svg b/waterfox/browser/themes/lepton/icons/paste-text.svg
new file mode 100644
index 0000000000000..eee72420d9d91
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/paste-text.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8.25H10C9.58579 8.25 9.25 8.58579 9.25 9V14C9.25 14.4142 9.58579 14.75 10 14.75H13C13.4142 14.75 13.75 14.4142 13.75 14V9C13.75 8.58579 13.4142 8.25 13 8.25ZM10 7C8.89543 7 8 7.89543 8 9V14C8 15.1046 8.89543 16 10 16H13C14.1046 16 15 15.1046 15 14V9C15 7.89543 14.1046 7 13 7H10Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.49988 2.25C5.19634 2.02194 5 1.6589 5 1.25C5 1.16438 5.00861 1.08078 5.025 1L5.0254 0.998081C5.14195 0.428477 5.64594 0 6.25 0H9.75C10.3541 0 10.858 0.428477 10.9746 0.998081L10.975 1C10.9914 1.08078 11 1.16438 11 1.25C11 1.63833 10.8229 1.98529 10.5451 2.21456L10.5425 2.21669C10.3268 2.39373 10.0508 2.5 9.75 2.5H6.25C5.99112 2.5 5.75061 2.4213 5.55111 2.28652C5.53372 2.27477 5.51663 2.26259 5.49988 2.25ZM4.01373 1H4C2.89543 1 2 1.89543 2 3V14C2 15.1046 2.89543 16 4 16H7.51091C7.27284 15.6282 7.10842 15.2046 7.03822 14.75H4C3.58579 14.75 3.25 14.4142 3.25 14V3C3.25 2.58579 3.58579 2.25 4 2.25H4.23388C4.08418 1.94876 4 1.60921 4 1.25C4 1.1655 4.00466 1.08208 4.01373 1ZM9.8138 6.02902C8.95268 6.14453 8.19837 6.59727 7.68808 7.25H4.875C4.52982 7.25 4.25 6.97018 4.25 6.625C4.25 6.27982 4.52982 6 4.875 6H9.625C9.6908 6 9.75423 6.01017 9.8138 6.02902ZM12.75 6H13.25C13.5081 6 13.7592 6.03009 14 6.08697V3C14 1.89543 13.1046 1 12 1H11.9863C11.9953 1.08208 12 1.1655 12 1.25C12 1.60921 11.9158 1.94876 11.7661 2.25H12C12.4142 2.25 12.75 2.58579 12.75 3V6ZM4.25 4.625C4.25 4.27982 4.52982 4 4.875 4H8.625C8.97018 4 9.25 4.27982 9.25 4.625C9.25 4.97018 8.97018 5.25 8.625 5.25H4.875C4.52982 5.25 4.25 4.97018 4.25 4.625ZM4.25 8.625C4.25 8.27982 4.52982 8 4.875 8H5.625C5.97018 8 6.25 8.27982 6.25 8.625C6.25 8.97018 5.97018 9.25 5.625 9.25H4.875C4.52982 9.25 4.25 8.97018 4.25 8.625Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/paste-url.svg b/waterfox/browser/themes/lepton/icons/paste-url.svg
new file mode 100644
index 0000000000000..17f72323f97f8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/paste-url.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.49988 2.25C5.19634 2.02194 5 1.6589 5 1.25C5 1.16438 5.00861 1.08078 5.025 1L5.0254 0.998081C5.14195 0.428477 5.64594 0 6.25 0H9.75C10.3541 0 10.858 0.428477 10.9746 0.998081L10.975 1C10.9914 1.08078 11 1.16438 11 1.25C11 1.63833 10.8229 1.98529 10.5451 2.21456L10.5425 2.21669C10.3268 2.39373 10.0508 2.5 9.75 2.5H6.25C5.99112 2.5 5.75061 2.4213 5.55111 2.28652C5.53372 2.27477 5.51663 2.26259 5.49988 2.25ZM4.01373 1H4C2.89543 1 2 1.89543 2 3V14C2 15.1046 2.89543 16 4 16H6.99951C6.53949 15.6544 6.14103 15.2312 5.82351 14.75H4C3.58579 14.75 3.25 14.4142 3.25 14V3C3.25 2.58579 3.58579 2.25 4 2.25H4.23388C4.08418 1.94876 4 1.60921 4 1.25C4 1.1655 4.00466 1.08208 4.01373 1ZM6.24585 8.69743C6.10395 8.8586 5.97227 9.02899 5.85182 9.20757C5.7815 9.23497 5.70501 9.25 5.625 9.25H4.875C4.52982 9.25 4.25 8.97018 4.25 8.625C4.25 8.27982 4.52982 8 4.875 8H5.625C5.97018 8 6.25 8.27982 6.25 8.625C6.25 8.6495 6.24859 8.67367 6.24585 8.69743ZM10.1239 7.00151C10.0827 7.0005 10.0414 7 10 7C9.4532 7 8.9269 7.08777 8.43442 7.25H4.875C4.52982 7.25 4.25 6.97018 4.25 6.625C4.25 6.27982 4.52982 6 4.875 6H9.625C9.97018 6 10.25 6.27982 10.25 6.625C10.25 6.76638 10.2031 6.89679 10.1239 7.00151ZM12.75 7.82351C13.2312 8.14103 13.6544 8.53949 14 8.99951V3C14 1.89543 13.1046 1 12 1H11.9863C11.9953 1.08208 12 1.1655 12 1.25C12 1.60921 11.9158 1.94876 11.7661 2.25H12C12.4142 2.25 12.75 2.58579 12.75 3V7.82351ZM4.25 4.625C4.25 4.27982 4.52982 4 4.875 4H8.625C8.97018 4 9.25 4.27982 9.25 4.625C9.25 4.97018 8.97018 5.25 8.625 5.25H4.875C4.52982 5.25 4.25 4.97018 4.25 4.625Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 16C12.2091 16 14 14.2091 14 12C14 9.79086 12.2091 8 10 8C7.79086 8 6 9.79086 6 12C6 14.2091 7.79086 16 10 16ZM10.8095 9.54526C10.5583 9.30846 10.1628 9.32009 9.92596 9.57124C9.68916 9.82239 9.7008 10.2179 9.95194 10.4547L10.928 11.375H7.50191C7.15674 11.375 6.87691 11.6548 6.87691 12C6.87691 12.3452 7.15674 12.625 7.50191 12.625H10.9484L9.98575 13.5491C9.73674 13.7882 9.72867 14.1838 9.96771 14.4328C10.2068 14.6818 10.6024 14.6899 10.8514 14.4509L12.9347 12.4509C13.0582 12.3323 13.1277 12.1683 13.1269 11.9972C13.1261 11.826 13.0552 11.6627 12.9307 11.5453L10.8095 9.54526Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/paste.svg b/waterfox/browser/themes/lepton/icons/paste.svg
new file mode 100644
index 0000000000000..8678b77b647bb
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/paste.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <style>
+    #url:not(:target),#url:target+#text{display:none}
+  </style>
+  <g style="fill:context-fill;fill-opacity:context-fill-opacity">
+    <path id="url" d="M5.5 0a1.5 1.5 0 0 0-1.414 1H2.5A1.5 1.5 0 0 0 1 2.5v12A1.5 1.5 0 0 0 2.5 16h5.844a5.536 5.536 0 0 1-1.086-1H2.5a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h1.586A1.5 1.5 0 0 0 5.5 3h3a1.5 1.5 0 0 0 1.414-1H11.5a.5.5 0 0 1 .5.5v3.525c.344.031.677.096 1 .188V2.5A1.5 1.5 0 0 0 11.5 1H9.914A1.5 1.5 0 0 0 8.5 0h-3zm0 1h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm6 6a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9zm0 2c.128 0 .256.049.354.146l2 2a.502.502 0 0 1 .146.35v.008a.495.495 0 0 1-.145.348l-.001.002-2 2a.5.5 0 0 1-.708-.708L12.293 12H9.5a.5.5 0 0 1 0-1h2.793l-1.147-1.146A.5.5 0 0 1 11.5 9z"/>
+    <path id="text" d="M5.5 0a1.5 1.5 0 0 0-1.414 1H2.5A1.5 1.5 0 0 0 1 2.5v12A1.5 1.5 0 0 0 2.5 16h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h1.586A1.5 1.5 0 0 0 5.5 3h3a1.5 1.5 0 0 0 1.414-1H11.5a.5.5 0 0 1 .5.5v1a.5.5 0 0 0 1 0v-1A1.5 1.5 0 0 0 11.5 1H9.914A1.5 1.5 0 0 0 8.5 0h-3zm0 1h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm3 4A1.5 1.5 0 0 0 7 6.5v8A1.5 1.5 0 0 0 8.5 16h5a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 13.5 5h-5zm0 1h5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5z"/>
+  </g>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/performance.svg b/waterfox/browser/themes/lepton/icons/performance.svg
new file mode 100644
index 0000000000000..775c078825f85
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/performance.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M14.308 12.642c.343.198.784.082.95-.277a8 8 0 1 0-14.516 0c.166.358.607.475.95.277.342-.198.456-.634.296-.996a6.568 6.568 0 1 1 12.024 0c-.16.362-.046.798.296.996Z"/><path d="M10 13a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z"/><path fill-rule="evenodd" d="M11.702 7.1c.293.184.38.57.197.862l-3.37 5.37-1.058-.664 3.37-5.37a.625.625 0 0 1 .861-.197Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/pin-tab.svg b/waterfox/browser/themes/lepton/icons/pin-tab.svg
new file mode 100644
index 0000000000000..2a30c3f9b68bc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pin-tab.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" viewBox="0 0 16 16" fill="none" fill-opacity="context-fill-opacity" style="enable-background:new 0 0 16 16">
+  <path stroke="context-stroke" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.5" d="m2.131 6.044 3.735 3.735.143 2.83c.044.866 1.093 1.269 1.706.656l5.55-5.55c.613-.613.209-1.662-.656-1.706l-2.83-.143-3.735-3.735M.53 7.644 7.644.53m7.825 14.94-4.979-4.98"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/play-fill.svg b/waterfox/browser/themes/lepton/icons/play-fill.svg
new file mode 100644
index 0000000000000..59192b0484275
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/play-fill.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2.992 13.303V2.698A1.447 1.447 0 0 1 5.157 1.44l9.28 5.303a1.447 1.447 0 0 1 0 2.512l-9.28 5.303a1.447 1.447 0 0 1-2.165-1.256Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/play.svg b/waterfox/browser/themes/lepton/icons/play.svg
new file mode 100644
index 0000000000000..d5b67903f0e81
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/play.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.25 3.333v9.334a.75.75 0 0 0 1.103.661l8.75-4.666a.75.75 0 0 0 0-1.324l-8.75-4.666a.75.75 0 0 0-1.103.661Zm-1.25 0v9.334c0 1.51 1.609 2.475 2.941 1.764l8.75-4.666c1.412-.753 1.412-2.777 0-3.53L3.941 1.57C2.61.859 1 1.823 1 3.333Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/plug-disconnected.svg b/waterfox/browser/themes/lepton/icons/plug-disconnected.svg
new file mode 100644
index 0000000000000..c3ab1f4a4960a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/plug-disconnected.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="m12.499 9.154 1.326-1.326a4 4 0 0 0-5.657-5.656L6.842 3.497a.625.625 0 0 0 0 .884l4.773 4.773c.244.244.64.244.884 0ZM9.052 3.055a2.75 2.75 0 0 1 3.889 3.89l-.878.878-3.89-3.89.879-.878ZM3.497 6.842 2.172 8.168a4 4 0 0 0 5.656 5.657l1.326-1.326a.625.625 0 0 0 0-.884L4.381 6.842a.625.625 0 0 0-.884 0Zm3.448 6.099a2.75 2.75 0 0 1-3.89-3.89l.876-.875 3.889 3.89-.875.875Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M15.812.188a.625.625 0 0 1 0 .884l-2 2a.625.625 0 1 1-.884-.884l2-2a.625.625 0 0 1 .884 0Zm-8.37 6.37a.625.625 0 0 1 0 .884l-1.5 1.5a.625.625 0 0 1-.884-.884l1.5-1.5a.625.625 0 0 1 .884 0Zm2 2a.625.625 0 0 1 0 .884l-1.5 1.5a.625.625 0 1 1-.884-.884l1.5-1.5a.625.625 0 0 1 .884 0Zm-6.5 4.5a.625.625 0 0 1 0 .884l-1.87 1.87a.625.625 0 0 1-.884-.884l1.87-1.87a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/pocket-outline.svg b/waterfox/browser/themes/lepton/icons/pocket-outline.svg
new file mode 100644
index 0000000000000..80b3b7d20fee3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pocket-outline.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m13 3.25.75.75 0 3.498c0 .801-.148 1.527-.466 2.248-.28.68-.68 1.285-1.222 1.85-.5.521-1.102.929-1.789 1.212a5.899 5.899 0 0 1-2.248.466 5.424 5.424 0 0 1-2.248-.466 5.836 5.836 0 0 1-1.832-1.204 5.967 5.967 0 0 1-1.23-1.832 5.92 5.92 0 0 1-.465-2.248L2.25 4 3 3.25l10 0M13 2 3 2a2 2 0 0 0-2 2l0 3.524c0 .942.204 1.858.56 2.724.382.865.865 1.604 1.502 2.24a7.14 7.14 0 0 0 2.24 1.476c.865.382 1.756.56 2.724.56a7.15 7.15 0 0 0 2.724-.56 6.433 6.433 0 0 0 2.215-1.502 7.14 7.14 0 0 0 1.476-2.24A6.623 6.623 0 0 0 15 7.498L15 4a2 2 0 0 0-2-2z"/>
+  <path d="M7.66 10 4.182 6.523a.626.626 0 0 1 .885-.885L8 8.572l2.933-2.934a.626.626 0 0 1 .885.885L8.34 10l-.68 0z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/private-favicon.svg b/waterfox/browser/themes/lepton/icons/private-favicon.svg
new file mode 100644
index 0000000000000..48e4a3bc88110
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/private-favicon.svg
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <circle cx="8" cy="8" r="7.5"/>
+  <path filter="invert(100%) brightness(1.3)" d="M13.948 5.886c-1.143-1.501-3.388-1.693-4.785-.409l-.782.718-.765 0-.782-.718c-1.398-1.284-3.642-1.092-4.786.409-.148.585.081 2.745.21 3.085.26 1.372 1.382 2.404 2.726 2.404.671 0 1.279-.268 1.76-.697l.293-.251a1.451 1.451 0 0 1 1.883-.016l.44.364 0-.002a2.622 2.622 0 0 0 1.652.601c1.344 0 2.466-1.032 2.726-2.404.13-.339.367-2.49.21-3.084z"/>
+  <path d="M5.3 6.843c-.558 0-1.054.233-1.374.594a.519.519 0 0 0 0 .678c.32.362.816.594 1.374.594s1.054-.233 1.374-.594a.519.519 0 0 0 0-.678A1.828 1.828 0 0 0 5.3 6.843z"/>
+  <path d="M10.7 6.843c-.558 0-1.054.233-1.374.594a.519.519 0 0 0 0 .678c.32.362.816.594 1.374.594s1.054-.233 1.374-.594a.519.519 0 0 0 0-.678 1.828 1.828 0 0 0-1.374-.594z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/profiler-stopwatch.svg b/waterfox/browser/themes/lepton/icons/profiler-stopwatch.svg
new file mode 100644
index 0000000000000..70de0767a3d5b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/profiler-stopwatch.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 14.75a5.75 5.75 0 1 0 0-11.5 5.75 5.75 0 0 0 0 11.5M8 16A7 7 0 1 0 8 2a7 7 0 0 0 0 14" clip-rule="evenodd"/><path d="M9 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/><path fill-rule="evenodd" d="M11.442 5.558a.625.625 0 0 1 0 .884l-3 3a.625.625 0 1 1-.884-.884l3-3a.625.625 0 0 1 .884 0" clip-rule="evenodd"/><path d="M5 .625C5 .28 5.28 0 5.625 0h4.75a.625.625 0 1 1 0 1.25h-4.75A.625.625 0 0 1 5 .625"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/pulse-square.svg b/waterfox/browser/themes/lepton/icons/pulse-square.svg
new file mode 100644
index 0000000000000..2d65f1cd22fcd
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pulse-square.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13.999 0a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2Zm0 1.333H2A.667.667 0 0 0 1.335 2v12c0 .368.298.667.666.667H14a.667.667 0 0 0 .666-.667V2A.667.667 0 0 0 14 1.333zM4.672 7.555l1.384-3.156a.667.667 0 0 1 1.185-.072l.044.092 2.116 5.285.892-1.78a.667.667 0 0 1 .503-.362l.093-.007h1.778a.667.667 0 0 1 .09 1.327l-.09.006H11.3l-1.37 2.738a.667.667 0 0 1-1.172.039l-.043-.09L6.638 6.39l-.92 2.1a.667.667 0 0 1-.512.39l-.098.008H3.334a.667.667 0 0 1-.09-1.327l.09-.006h1.338l1.384-3.156z" style="stroke-width:.888775"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/pwa-install.svg b/waterfox/browser/themes/lepton/icons/pwa-install.svg
new file mode 100644
index 0000000000000..37d05c18fa094
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pwa-install.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path  fill-rule="evenodd" d="M3.63 2.255c-.76 0-1.375.616-1.375 1.375v5.74c0 .76.616 1.375 1.375 1.375h8.74c.76 0 1.375-.616 1.375-1.375V9a.625.625 0 1 1 1.25 0v.37a2.625 2.625 0 0 1-2.625 2.625H8.625V14a.625.625 0 1 1-1.25 0v-2.005H3.63A2.625 2.625 0 0 1 1.005 9.37V3.63A2.625 2.625 0 0 1 3.63 1.005H8a.625.625 0 1 1 0 1.25H3.63Z" clip-rule="evenodd"/><path  d="M4 14.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 14.375Z"/><path  fill-rule="evenodd" d="M14.313 4.689a.625.625 0 0 1-.002.884l-2.25 2.24a.625.625 0 0 1-.859.022l-2.49-2.24a.625.625 0 0 1 .836-.93l1.447 1.302V1.63a.625.625 0 1 1 1.25 0v4.236l1.184-1.179a.625.625 0 0 1 .884.002Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/pwa-launch.svg b/waterfox/browser/themes/lepton/icons/pwa-launch.svg
new file mode 100644
index 0000000000000..e7662e13fba1b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pwa-launch.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path  fill-rule="evenodd" d="M3.63 2.255c-.76 0-1.375.616-1.375 1.375v5.74c0 .76.616 1.375 1.375 1.375h8.74c.76 0 1.375-.616 1.375-1.375V9a.625.625 0 1 1 1.25 0v.37a2.625 2.625 0 0 1-2.625 2.625H8.625V14a.625.625 0 1 1-1.25 0v-2.005H3.63A2.625 2.625 0 0 1 1.005 9.37V3.63A2.625 2.625 0 0 1 3.63 1.005H7a.625.625 0 1 1 0 1.25H3.63Z" clip-rule="evenodd"/><path  d="M4 14.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 14.375Z"/><path  fill-rule="evenodd" d="M9.005 1.63c0-.345.28-.625.625-.625h4.74c.345 0 .625.28.625.625v4.74a.625.625 0 1 1-1.25 0V3.139l-3.673 3.673a.625.625 0 1 1-.884-.884l3.673-3.673H9.63a.625.625 0 0 1-.625-.625Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/pwa-manage.svg b/waterfox/browser/themes/lepton/icons/pwa-manage.svg
new file mode 100644
index 0000000000000..5bed6199042aa
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pwa-manage.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path  fill-rule="evenodd" d="M3.63 2.255c-.76 0-1.375.616-1.375 1.375v5.74c0 .76.616 1.375 1.375 1.375h8.74c.76 0 1.375-.616 1.375-1.375V3.63c0-.76-.616-1.375-1.375-1.375H3.63ZM1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.74a2.625 2.625 0 0 1 2.625 2.625v5.74a2.625 2.625 0 0 1-2.625 2.625H8.625V14a.625.625 0 1 1-1.25 0v-2.005H3.63A2.625 2.625 0 0 1 1.005 9.37V3.63Z" clip-rule="evenodd"/><path  d="M4 14.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 14.375ZM7 5a1 1 0 0 1 2 0 1 1 0 0 1-2 0ZM10 5a1 1 0 1 1 2 0 1 1 0 1 1-2 0ZM4 8a1 1 0 0 1 2 0 1 1 0 0 1-2 0ZM7 8a1 1 0 0 1 2 0 1 1 0 0 1-2 0ZM10 8a1 1 0 1 1 2 0 1 1 0 1 1-2 0Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/pwa-remove.svg b/waterfox/browser/themes/lepton/icons/pwa-remove.svg
new file mode 100644
index 0000000000000..3362b74eacd63
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/pwa-remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path  fill-rule="evenodd" d="M3.63 2.255c-.76 0-1.375.616-1.375 1.375v5.74c0 .76.616 1.375 1.375 1.375h8.74c.76 0 1.375-.616 1.375-1.375V9a.625.625 0 1 1 1.25 0v.37a2.625 2.625 0 0 1-2.625 2.625H8.625V14a.625.625 0 1 1-1.25 0v-2.005H3.63A2.625 2.625 0 0 1 1.005 9.37V3.63A2.625 2.625 0 0 1 3.63 1.005H7a.625.625 0 1 1 0 1.25H3.63Z" clip-rule="evenodd"/><path  d="M4 14.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 4 14.375Z"/><path  fill-rule="evenodd" d="M9.188 1.188a.625.625 0 0 1 .884 0l1.933 1.933 1.933-1.933a.625.625 0 1 1 .884.884l-1.933 1.933 1.933 1.933a.625.625 0 1 1-.884.884l-1.933-1.933-1.933 1.933a.625.625 0 1 1-.884-.884l1.933-1.933-1.933-1.933a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/quit.svg b/waterfox/browser/themes/lepton/icons/quit.svg
new file mode 100644
index 0000000000000..fcef680fe6318
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/quit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M5.561 3.112c-.132-.32-.5-.474-.807-.314a7 7 0 1 0 6.492 0c-.306-.16-.675-.006-.807.314s.021.683.325.85a5.747 5.747 0 1 1-5.528 0c.303-.167.457-.53.325-.85Z"/><path fill-rule="evenodd" d="M8 1.375c.345 0 .625.28.625.625v6a.625.625 0 1 1-1.25 0V2c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/radio.svg b/waterfox/browser/themes/lepton/icons/radio.svg
new file mode 100644
index 0000000000000..21ec9fd44a4a1
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/radio.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <circle cx="8" cy="8" r="4"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/redo.svg b/waterfox/browser/themes/lepton/icons/redo.svg
new file mode 100644
index 0000000000000..b0d1f360c4663
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/redo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M10.861 6.74a5.75 5.75 0 0 0-9.584 3.702.625.625 0 1 1-1.244-.121 7 7 0 0 1 13.712-1.193V4.625a.625.625 0 1 1 1.25 0v5.752c0 .345-.28.625-.625.625H8.63a.625.625 0 0 1 0-1.25h3.983a5.75 5.75 0 0 0-1.752-3.013Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/refresh-cw.svg b/waterfox/browser/themes/lepton/icons/refresh-cw.svg
new file mode 100644
index 0000000000000..15497e5955dd5
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/refresh-cw.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.37 2.042c.345 0 .625.28.625.625V6.37c0 .345-.28.625-.625.625h-3.245a.625.625 0 1 1 0-1.25h2.62V2.667c0-.345.28-.625.625-.625M1.005 9.63c0-.345.28-.625.625-.625h3.245a.625.625 0 1 1 0 1.25h-2.62v3.078a.625.625 0 1 1-1.25 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M7.997 2.627c-2.088 0-3.995 1.414-4.71 3.57a.625.625 0 0 1-1.186-.394c.87-2.626 3.228-4.426 5.896-4.426 1.67 0 3.265.71 4.434 1.955l.005.005 2.395 2.61a.625.625 0 1 1-.921.846l-2.393-2.608c-.941-1.002-2.21-1.558-3.52-1.558m-6.79 6.542a.625.625 0 0 1 .884.038l2.392 2.608c.941 1.002 2.21 1.558 3.52 1.558 2.088 0 3.995-1.414 4.71-3.57a.625.625 0 1 1 1.186.394c-.87 2.626-3.228 4.426-5.896 4.426-1.67 0-3.265-.71-4.434-1.955l-.005-.005-2.395-2.61a.625.625 0 0 1 .038-.884" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/relay-logo.svg b/waterfox/browser/themes/lepton/icons/relay-logo.svg
new file mode 100644
index 0000000000000..b3ee0aae1a5fc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/relay-logo.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="22" height="22" viewBox="0 0 22 22" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+	<path d="M20.054,4.777l-8.112-4.542c-0.579-0.313-1.277-0.313-1.856,0l-8.14,4.542C1.347,5.115,0.977,5.748,0.975,6.434v9.112c-0.005,0.689,0.368,1.324,0.971,1.655l8.112,4.542c0.283,0.17,0.61,0.26,0.942,0.257c0.331-0.001,0.657-0.089,0.943-0.257l8.112-4.542c0.598-0.337,0.969-0.969,0.971-1.655V6.434C21.022,5.748,20.652,5.115,20.054,4.777z M6.421,14.289c-0.054,0.194-0.183,0.357-0.359,0.455l-0.485,0.285c-0.115,0.055-0.243,0.085-0.371,0.087c-0.275-0.004-0.528-0.158-0.657-0.4c-0.1-0.173-0.126-0.381-0.073-0.573c0.054-0.194,0.183-0.357,0.359-0.454l0.481-0.283c0.371-0.228,0.826-0.087,1.033,0.312C6.449,13.889,6.475,14.095,6.421,14.289z M6.348,8.205c-0.131,0.242-0.382,0.396-0.657,0.4C5.562,8.603,5.435,8.574,5.32,8.519L4.834,8.233C4.649,8.141,4.508,7.978,4.447,7.78C4.385,7.582,4.408,7.367,4.51,7.186c0.102-0.18,0.274-0.312,0.474-0.362C5.185,6.773,5.398,6.809,5.573,6.92l0.485,0.285C6.431,7.404,6.572,7.861,6.348,8.205z M9.416,12.576c-0.054,0.193-0.183,0.357-0.357,0.454l-1.001,0.572c-0.115,0.055-0.242,0.084-0.37,0.085c-0.276-0.004-0.527-0.157-0.657-0.4c-0.1-0.173-0.126-0.381-0.073-0.573c0.054-0.192,0.183-0.356,0.359-0.454l1-0.572c0.177-0.095,0.386-0.115,0.579-0.056c0.192,0.059,0.355,0.193,0.448,0.371C9.442,12.176,9.468,12.382,9.416,12.576z M9.343,9.918c-0.131,0.243-0.381,0.396-0.656,0.4c-0.128-0.001-0.256-0.03-0.371-0.085l-1-0.572C6.952,9.442,6.827,8.976,7.03,8.605c0.098-0.176,0.261-0.304,0.454-0.357c0.194-0.054,0.4-0.028,0.573,0.073l1,0.571c0.176,0.098,0.304,0.261,0.357,0.455C9.469,9.537,9.443,9.745,9.343,9.918z M12.342,11.604c-0.081,0.164-0.225,0.287-0.4,0.342v5.793c0,0.426-0.345,0.771-0.771,0.771s-0.771-0.345-0.771-0.771v-5.767c-0.173-0.055-0.318-0.179-0.4-0.342c-0.107-0.203-0.118-0.445-0.028-0.657c-0.091-0.212-0.08-0.454,0.029-0.657c0.081-0.164,0.225-0.287,0.4-0.342V4.206c0-0.426,0.345-0.771,0.771-0.771s0.771,0.345,0.771,0.771v5.741c0.175,0.055,0.319,0.179,0.4,0.344c0.109,0.203,0.12,0.444,0.029,0.656C12.461,11.158,12.45,11.4,12.342,11.604z M15.313,13.26c-0.131,0.242-0.382,0.395-0.657,0.4c-0.128-0.001-0.256-0.03-0.371-0.085l-1-0.572c-0.349-0.212-0.467-0.661-0.267-1.017s0.648-0.487,1.009-0.297l1,0.572C15.398,12.46,15.513,12.946,15.313,13.26z M15.385,9.207c-0.054,0.194-0.183,0.357-0.359,0.455l-1,0.571c-0.115,0.055-0.242,0.085-0.371,0.085c-0.275-0.004-0.527-0.157-0.657-0.4c-0.099-0.173-0.125-0.379-0.071-0.573c0.054-0.194,0.183-0.357,0.359-0.455l1-0.571c0.179-0.095,0.386-0.115,0.58-0.056c0.192,0.059,0.355,0.192,0.45,0.371C15.414,8.807,15.44,9.014,15.385,9.207z M17.798,14.657c-0.131,0.242-0.382,0.396-0.657,0.4c-0.128-0.001-0.256-0.03-0.371-0.085l-0.487-0.286c-0.344-0.213-0.459-0.66-0.258-1.013c0.199-0.352,0.642-0.484,1.002-0.298l0.485,0.285C17.883,13.887,17.997,14.345,17.798,14.657z M17.868,7.806c-0.054,0.192-0.181,0.356-0.356,0.455l-0.485,0.286c-0.115,0.055-0.242,0.084-0.371,0.085c-0.271,0.01-0.525-0.135-0.657-0.371c-0.1-0.173-0.126-0.381-0.073-0.573s0.183-0.356,0.358-0.454l0.487-0.286c0.175-0.099,0.379-0.124,0.573-0.07c0.192,0.054,0.356,0.181,0.455,0.356C17.895,7.407,17.922,7.613,17.868,7.806z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/reload-auto.svg b/waterfox/browser/themes/lepton/icons/reload-auto.svg
new file mode 100644
index 0000000000000..c55fc247f2649
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/reload-auto.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.366 0a.475.475 0 0 0-.474.48v1.967l-.016.105v.09c-3.62.074-6.543 3.04-6.543 6.677a6.689 6.689 0 0 0 6.68 6.68 6.652 6.652 0 0 0 6.652-6.033.599.599 0 0 0-.538-.651.604.604 0 0 0-.65.536 5.466 5.466 0 0 1-5.464 4.955 5.493 5.493 0 0 1-5.487-5.487A5.49 5.49 0 0 1 7.89 3.835v1.762c0 .426.515.64.815.339L11.4 3.242v-.405L8.707.14a.469.469 0 0 0-.34-.14Z"/>
+  <path d="m7.554 11.454-2.29-2.29c-.552-.581.29-1.424.87-.872l1.767 1.766 3.405-3.407a.617.617 0 0 1 .872.872L8.25 11.45z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/reload.svg b/waterfox/browser/themes/lepton/icons/reload.svg
new file mode 100644
index 0000000000000..7e499e6d5ff84
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/reload.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.707 6 14.7 6l.3-.3 0-3.993a.5.5 0 0 0-.854-.354l-1.459 1.459A6.95 6.95 0 0 0 8 1C4.141 1 1 4.141 1 8s3.141 7 7 7a6.97 6.97 0 0 0 6.968-6.322.626.626 0 0 0-.562-.682.635.635 0 0 0-.682.562A5.726 5.726 0 0 1 8 13.75c-3.171 0-5.75-2.579-5.75-5.75S4.829 2.25 8 2.25a5.71 5.71 0 0 1 3.805 1.445l-1.451 1.451a.5.5 0 0 0 .353.854z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/resize-image.svg b/waterfox/browser/themes/lepton/icons/resize-image.svg
new file mode 100644
index 0000000000000..22fcd4deb46f0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/resize-image.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.63 1.255c-.76 0-1.375.616-1.375 1.375v2.685a.625.625 0 0 1-1.25 0V2.63A2.625 2.625 0 0 1 2.63.005h2.685a.625.625 0 1 1 0 1.25H2.63ZM10.06.63c0-.345.28-.625.625-.625h2.685a2.625 2.625 0 0 1 2.625 2.625v2.685a.625.625 0 1 1-1.25 0V2.63c0-.76-.616-1.375-1.375-1.375h-2.685A.625.625 0 0 1 10.06.63Zm5.31 9.43c.345 0 .625.28.625.625v2.685a2.625 2.625 0 0 1-2.625 2.625h-2.685a.625.625 0 1 1 0-1.25h2.685c.76 0 1.375-.616 1.375-1.375v-2.685c0-.345.28-.625.625-.625ZM2.729 7.3c-.79 0-1.43.64-1.43 1.429v4.542c0 .79.64 1.43 1.43 1.43H7.27c.79 0 1.43-.64 1.43-1.43V8.73c0-.79-.64-1.43-1.43-1.43H2.73ZM0 8.728A2.729 2.729 0 0 1 2.729 6H7.27A2.729 2.729 0 0 1 10 8.729v4.542A2.729 2.729 0 0 1 7.271 16H2.73A2.729 2.729 0 0 1 0 13.271V8.73Z" clip-rule="evenodd"/><path d="M6.9 14.005H2.73a.5.5 0 0 1-.372-.835l2.085-2.317a.5.5 0 0 1 .744 0l2.085 2.317a.5.5 0 0 1-.371.835ZM8 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/resize.svg b/waterfox/browser/themes/lepton/icons/resize.svg
new file mode 100644
index 0000000000000..06f61aef41a87
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/resize.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.63 1.255c-.76 0-1.375.616-1.375 1.375v2.685a.625.625 0 0 1-1.25 0V2.63A2.625 2.625 0 0 1 2.63.005h2.685a.625.625 0 1 1 0 1.25H2.63ZM10.06.63c0-.345.28-.625.625-.625h2.685a2.625 2.625 0 0 1 2.625 2.625v2.685a.625.625 0 1 1-1.25 0V2.63c0-.76-.616-1.375-1.375-1.375h-2.685A.625.625 0 0 1 10.06.63Zm5.31 9.43c.345 0 .625.28.625.625v2.685a2.625 2.625 0 0 1-2.625 2.625h-2.685a.625.625 0 1 1 0-1.25h2.685c.76 0 1.375-.616 1.375-1.375v-2.685c0-.345.28-.625.625-.625Zm-14.74 0c.345 0 .625.28.625.625v2.685c0 .76.616 1.375 1.375 1.375h2.685a.625.625 0 1 1 0 1.25H2.63A2.625 2.625 0 0 1 .005 13.37v-2.685c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/restore-session.svg b/waterfox/browser/themes/lepton/icons/restore-session.svg
new file mode 100644
index 0000000000000..33dd8101dcef9
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/restore-session.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.75a2.625 2.625 0 0 1 2.625 2.625v7.77a2.625 2.625 0 0 1-2.625 2.624h-1.923a.625.625 0 1 1 0-1.25h1.923c.76 0 1.375-.615 1.375-1.375V6.18h-11.5v5.22c0 .76.616 1.375 1.375 1.375h2.866l-.894-.894a.625.625 0 0 1 .883-.884l2.404 2.403-2.404 2.404a.625.625 0 1 1-.883-.884l.894-.895H3.63A2.625 2.625 0 0 1 1.005 11.4V3.63Zm1.25 1.298h11.5V3.63c0-.76-.616-1.375-1.375-1.375H3.63c-.76 0-1.375.616-1.375 1.375v1.298Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/screenshot-1.svg b/waterfox/browser/themes/lepton/icons/screenshot-1.svg
new file mode 100644
index 0000000000000..5221408a7b570
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/screenshot-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.497 12.97a2.5 2.5 0 0 0 2.497 2.503 2.5 2.5 0 0 0 2.497-2.504 2.5 2.5 0 0 0-2.497-2.504 2.5 2.5 0 0 0-2.497 2.505ZM0 12.97a5.001 5.001 0 0 0 4.994 5.007 5.001 5.001 0 0 0 4.994-5.008 5.001 5.001 0 0 0-4.994-5.008A5.001 5.001 0 0 0 0 12.97ZM2.497 26.992a2.5 2.5 0 0 0 2.497 2.504 2.5 2.5 0 0 0 2.497-2.504 2.5 2.5 0 0 0-2.497-2.504 2.5 2.5 0 0 0-2.497 2.504Zm-2.497 0A5.001 5.001 0 0 0 4.994 32a5.001 5.001 0 0 0 4.994-5.008 5.001 5.001 0 0 0-4.994-5.008A5.001 5.001 0 0 0 0 26.992Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M27.75 12.539c.38.577.223 1.353-.352 1.735L9.678 26.033a1.246 1.246 0 0 1-1.73-.353 1.254 1.254 0 0 1 .353-1.735l17.72-11.76a1.247 1.247 0 0 1 1.73.354Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M27.398 25.688c.575.381.733 1.158.352 1.735a1.246 1.246 0 0 1-1.73.353l-7.974-5.292 2.262-1.502 7.09 4.706Zm-9.352-6.207-8.367-5.552a1.246 1.246 0 0 0-1.73.353 1.254 1.254 0 0 0 .352 1.735l7.482 4.965 2.263-1.501Z" clip-rule="evenodd"/><path d="M20.018 4.504h-3.994V2h3.994v2.504ZM22.015 4.504h3.994V2h-3.994v2.504ZM29.504 6.006a1.5 1.5 0 0 0-1.498-1.502V2A4 4 0 0 1 32 6.006h-2.496ZM29.504 8.01v4.006H32V8.01h-2.496ZM29.504 18.026v-4.007H32v4.007h-2.496ZM14.027 2v2.504h-3.994V2h3.994ZM8.036 2a3.995 3.995 0 0 0-3.704 2.504h3.704V2ZM29.504 23.745A4.008 4.008 0 0 0 32 20.029h-2.496v3.716Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/screenshot.svg b/waterfox/browser/themes/lepton/icons/screenshot.svg
new file mode 100644
index 0000000000000..bc3b7407282ac
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/screenshot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 1.25H2a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3.005 4.005a1 1 0 0 1 1-1h1.813a.625.625 0 1 1 0 1.25H4.255v1.563a.625.625 0 1 1-1.25 0V4.005Zm6.563-.375c0-.345.28-.625.625-.625h1.812a1 1 0 0 1 1 1v1.813a.625.625 0 1 1-1.25 0V4.255h-1.563a.625.625 0 0 1-.624-.625ZM3.63 9.568c.345 0 .625.28.625.625v1.562h1.563a.625.625 0 1 1 0 1.25H4.005a1 1 0 0 1-1-1v-1.813c0-.345.28-.624.625-.624Zm8.75 0c.345 0 .625.28.625.625v1.812a1 1 0 0 1-1 1h-1.813a.625.625 0 1 1 0-1.25h1.563v-1.563c0-.345.28-.624.625-.624Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/select-all-on.svg b/waterfox/browser/themes/lepton/icons/select-all-on.svg
new file mode 100644
index 0000000000000..72bd1345df94e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/select-all-on.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M9.827 4.552a.667.667 0 0 1 1.021.85l-.077.092-4.299 4.31a.667.667 0 0 1-.851.078l-.092-.077L3.195 7.47a.667.667 0 0 1 .85-1.02l.093.078L6 8.389l3.827-3.837Z"/><path fill-rule="evenodd" d="M12 1.25H2a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M2.268 15A2 2 0 0 0 4 16h10a2 2 0 0 0 2-2V4a2 2 0 0 0-1-1.732V14a1 1 0 0 1-1 1H2.268Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/send-to-device.svg b/waterfox/browser/themes/lepton/icons/send-to-device.svg
new file mode 100644
index 0000000000000..2adc9082cb739
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/send-to-device.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4.639 4.682a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H.63a.625.625 0 0 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5 1.25h6a.75.75 0 0 1 .75.75v12a.75.75 0 0 1-.75.75H5a.75.75 0 0 1-.75-.75v-2.514a1.63 1.63 0 0 1-.49-2.241H3V14a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v3.995h.715a1.626 1.626 0 0 1 .535-2.27V2A.75.75 0 0 1 5 1.25Zm-.75 5.745H3v1.25h1.25v-1.25Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/send.svg b/waterfox/browser/themes/lepton/icons/send.svg
new file mode 100644
index 0000000000000..3e2a9e23c036e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/send.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="m14.998 3.34-4.066 9.979a1 1 0 0 1-1.425.489L6.62 12.145a1 1 0 0 1-.213-1.568L12.5 4.38l-7.508 6.235a1 1 0 0 1-1.069.133L1.85 9.761a1 1 0 0 1-.017-1.797l11.792-5.896c.825-.413 1.721.417 1.373 1.271ZM7.285 13.451l-1.028-.617a.5.5 0 0 0-.757.43v1.233a.5.5 0 0 0 .757.429l1.028-.617a.5.5 0 0 0 0-.858Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/share.svg b/waterfox/browser/themes/lepton/icons/share.svg
new file mode 100644
index 0000000000000..9793379648256
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/share.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.25 10.375a.625.625 0 0 1-1.25 0l0-8.323-3.308 3.309a.626.626 0 0 1-.885-.885L7.285 0l.681 0 4.477 4.476a.626.626 0 0 1-.885.885L8.25 2.052l0 8.323z"/>
+  <path d="M12.25 15a2 2 0 0 0 2-2l0-1.375a.625.625 0 0 0-1.25 0l0 1.525-.6.6-9.55 0-.6-.6 0-1.525a.625.625 0 0 0-1.25 0L1 13a2 2 0 0 0 2 2l9.25 0z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/shield-task.svg b/waterfox/browser/themes/lepton/icons/shield-task.svg
new file mode 100644
index 0000000000000..07119ea3821bc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/shield-task.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.008 3.424a1.956 1.956 0 0 0-.999 1.734c.075 3.465.741 9.753 6.705 10.796.186.033.386.033.572 0 5.964-1.043 6.63-7.33 6.705-10.796a1.956 1.956 0 0 0-.999-1.734l-5-2.857a2 2 0 0 0-1.984 0l-5 2.857Zm5.62-1.772-5 2.857a.706.706 0 0 0-.369.622c.037 1.697.22 3.934 1.042 5.838.794 1.842 2.152 3.321 4.628 3.754a.431.431 0 0 0 .142 0c2.476-.433 3.834-1.912 4.628-3.754.822-1.904 1.005-4.141 1.042-5.838a.706.706 0 0 0-.369-.622l-5-2.857a.75.75 0 0 0-.744 0Z" clip-rule="evenodd"/><path d="M10.824 5.696a.667.667 0 0 1 1.021.85l-.077.092-4.299 4.31a.667.667 0 0 1-.85.077l-.093-.077-2.334-2.334a.667.667 0 0 1 .85-1.02l.093.078 1.862 1.86 3.827-3.836Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/sign-out.svg b/waterfox/browser/themes/lepton/icons/sign-out.svg
new file mode 100644
index 0000000000000..d810081c77ef3
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/sign-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M3.005 4.63A2.625 2.625 0 0 1 5.63 2.005h3.74a.625.625 0 1 1 0 1.25H5.63c-.76 0-1.375.616-1.375 1.375v6.74c0 .76.616 1.375 1.375 1.375h3.74a.625.625 0 1 1 0 1.25H5.63a2.625 2.625 0 0 1-2.625-2.625V4.63Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M10.009 5.062a.625.625 0 0 1 .883-.008l2.546 2.5a.625.625 0 0 1 .004.888l-2.5 2.5a.625.625 0 1 1-.884-.884l1.433-1.433H6a.625.625 0 1 1 0-1.25h5.472l-1.455-1.43a.625.625 0 0 1-.008-.883Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/sort.svg b/waterfox/browser/themes/lepton/icons/sort.svg
new file mode 100644
index 0000000000000..e8c10f5092831
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/sort.svg
@@ -0,0 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m2.951 7-.75 0-.25.25 0 .75.25.25.75 0 .25-.25 0-.75-.25-.25z"/>
+  <path d="m2.951 10-.75 0-.25.25 0 .75.25.25.75 0 .25-.25 0-.75-.25-.25z"/>
+  <path d="m2.951 4-.75 0-.25.25 0 .75.25.25.75 0 .25-.25 0-.75-.25-.25z"/>
+  <path d="m13.227 5.25-7.748 0a.626.626 0 1 1 0-1.25l7.748 0a.626.626 0 1 1 0 1.25z"/>
+  <path d="m11.228 8.25-5.75 0a.625.625 0 0 1 0-1.25l5.75 0a.625.625 0 0 1 0 1.25z"/>
+  <path d="m9.228 11.25-3.75 0a.625.625 0 0 1 0-1.25l3.75 0a.625.625 0 0 1 0 1.25z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/star-line-horizontal.svg b/waterfox/browser/themes/lepton/icons/star-line-horizontal.svg
new file mode 100644
index 0000000000000..d41cbd13ace90
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/star-line-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M8 4.625C8 4.28 8.28 4 8.625 4h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 8 4.625ZM8 7.995c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 8 7.995ZM8 11.375c0-.345.28-.625.625-.625h6.75a.625.625 0 1 1 0 1.25h-6.75A.625.625 0 0 1 8 11.375Z"/><path d="M7.17 5.349A1.625 1.625 0 0 1 8.625 3h.58l-.277-.69c-.336-.836-1.52-.836-1.856 0l-.907 2.26a1 1 0 0 1-.86.625l-2.429.164c-.9.061-1.265 1.188-.573 1.765L4.17 8.685a1 1 0 0 1 .33 1.012l-.595 2.36c-.22.874.738 1.57 1.502 1.091l1.742-1.093a1.62 1.62 0 0 1 .048-1.456 2.251 2.251 0 0 0-.393.196l-1.535.963.442-1.756a2.25 2.25 0 0 0-.739-2.276l-1.39-1.162 1.807-.122a2.25 2.25 0 0 0 1.78-1.093ZM10.357 13l.236.148A.992.992 0 0 0 11.841 13h-1.484Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/synced-tabs.svg b/waterfox/browser/themes/lepton/icons/synced-tabs.svg
new file mode 100644
index 0000000000000..af172fdcf8670
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/synced-tabs.svg
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M13.75 7V6L13.75 5.99215L13.0079 5.25004L13 5.25H12V4H13C14.1046 4 15 4.89543 15 6V7H13.75Z"/>
+  <path d="M4.25 10V11L4.25004 11.0079L4.99215 11.75L5 11.75H6V13H5C3.89543 13 3 12.1046 3 11V10H4.25Z"/>
+  <path d="M13 11.75H12V13H13C14.1046 13 15 12.1046 15 11V10H13.75V11L13.75 11.0079L13.0079 11.75L13 11.75Z"/>
+  <path fill-rule="evenodd" d="M1 3C1 1.89543 1.89543 1 3 1H9C10.1046 1 11 1.89543 11 3V6C11 7.10457 10.1046 8 9 8H3C1.89543 8 1 7.10457 1 6V3ZM7 2.25H3C2.58579 2.25 2.25 2.58579 2.25 3V6C2.25 6.41421 2.58579 6.75 3 6.75H7V2.25ZM9 3C9.41421 3 9.75 3.33579 9.75 3.75V5.25C9.75 5.66421 9.41421 6 9 6C8.58579 6 8.25 5.66421 8.25 5.25V3.75C8.25 3.33579 8.58579 3 9 3Z"/>
+  <path fill-rule="evenodd" d="M3 11V9H4.25V11C4.25 11.4142 4.58579 11.75 5 11.75H13C13.4142 11.75 13.75 11.4142 13.75 11V6C13.75 5.58579 13.4142 5.25 13 5.25H12V4H13C14.1046 4 15 4.89543 15 6V11C15 12.1046 14.1046 13 13 13H14.5C15.3284 13 16 13.6716 16 14.5C16 15.3284 15.3284 16 14.5 16H3.5C2.67157 16 2 15.3284 2 14.5C2 13.6716 2.67157 13 3.5 13H5C3.89543 13 3 12.1046 3 11ZM7.5 13.75C7.5 13.3358 7.83579 13 8.25 13H9.75C10.1642 13 10.5 13.3358 10.5 13.75C10.5 14.1642 10.1642 14.5 9.75 14.5H8.25C7.83579 14.5 7.5 14.1642 7.5 13.75Z"/>
+  <path d="M4 2.25H3L2.99215 2.25004L2.25004 2.99215L2.25 3V4H1V3C1 1.89543 1.89543 1 3 1H4V2.25Z"/>
+  <path d="M2.25 5V6L2.25004 6.00785L2.99215 6.74996L3 6.75H4V8H3C1.89543 8 1 7.10457 1 6L1 5H2.25Z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-audio-blocked-circle-12.svg b/waterfox/browser/themes/lepton/icons/tab-audio-blocked-circle-12.svg
new file mode 100644
index 0000000000000..572ebf2c0148d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-audio-blocked-circle-12.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="12" height="12" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#a)">
+    <path d="M4.998 3.567a.5.5 0 0 0-.748.434v3.998a.5.5 0 0 0 .748.434l3.5-1.999a.5.5 0 0 0 0-.868l-3.5-1.999z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 6a6 6 0 1 1 12 0A6 6 0 0 1 0 6zm10.75 0A4.756 4.756 0 0 0 6 1.25 4.756 4.756 0 0 0 1.25 6 4.756 4.756 0 0 0 6 10.75 4.756 4.756 0 0 0 10.75 6z"/>
+  </g>
+  <defs>
+    <clipPath id="a">
+      <path d="M0 0h12v12H0z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-audio-muted-small.svg b/waterfox/browser/themes/lepton/icons/tab-audio-muted-small.svg
new file mode 100644
index 0000000000000..b36c2449e59ec
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-audio-muted-small.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" width="12" height="12" fill-opacity="context-fill-opacity">
+  <path fill="context-fill" d="M6.8 5.5 4.5 3.3l.9-1.1c.4-.5 1.3-.2 1.3.5v2.8zm2 .5c0-1-.5-1.9-1.3-2.4v2.7l1 1c.2-.4.3-.9.3-1.3zM7.7 2.6c1.3.7 2 2 2 3.4 0 .7-.2 1.4-.5 2l.5.5c.5-.8.8-1.6.8-2.5 0-1.7-.9-3.3-2.4-4.1-.2-.1-.4 0-.5.2-.1.2-.1.4.1.5zm-5.1-.1c-.1-.1-.4-.1-.5 0-.1.1-.1.4 0 .5l1.1 1.1h-1c-.4 0-.8.3-.8.8v2.2c0 .4.3.8.8.8h1.5l1.7 2c.4.5 1.3.2 1.3-.5V7.7l1.4 1.4c-.1.1-.2.2-.4.3-.2.1-.2.3-.1.5.1.2.3.2.5.2.2-.1.4-.3.6-.5l.4.4c.1.1.4.1.5 0 .1-.1.1-.4 0-.5l-7-7z"/>
+</svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-audio-playing-small.svg b/waterfox/browser/themes/lepton/icons/tab-audio-playing-small.svg
new file mode 100644
index 0000000000000..7f95de3b5a052
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-audio-playing-small.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12" width="12" height="12" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path fill="context-fill" d="M6.7 2.6v6.8c0 .7-.9 1-1.3.5l-1.7-2H2.2c-.4 0-.7-.3-.7-.8V4.9c0-.4.3-.8.7-.8h1.5l1.7-2c.5-.5 1.3-.2 1.3.5zM8.8 6c0-1-.5-1.9-1.3-2.4v4.7C8.3 7.9 8.8 7 8.8 6zm-.7-4.1c-.2-.1-.4 0-.5.2-.1.2 0 .4.2.5 1.3.7 2 2 2 3.4 0 1.4-.8 2.8-2 3.4-.2.1-.3.2-.3.4 0 .2.2.4.4.4.1 0 .1 0 .2 0 1.5-.8 2.5-2.4 2.5-4.1-.1-1.8-1-3.4-2.5-4.2z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis-clipped.svg
new file mode 100644
index 0000000000000..6467247b14b22
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47.7, 100" d="M30 0h-1.5C20.286.018 16.736 3.745 15 7.967l.045.105c.18.447.342.9.486 1.36.21.675.392 1.358.547 2.047.101.45.19.899.272 1.337.081.44.154.87.222 1.29.137.837.253 1.625.377 2.335.178 1.01.397 2.01.656 3.002.182.676.393 1.345.631 2.004a17.87 17.87 0 0 0 1.05 2.348c.29.525.612 1.03.966 1.514.344.463.722.9 1.13 1.306a10.525 10.525 0 0 0 1.79 1.414c.674.422 1.392.77 2.14 1.041a15.082 15.082 0 0 0 2.523.673c.47.083.942.148 1.417.195.245.024.494.045.748.062V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis.svg
new file mode 100644
index 0000000000000..955e3903076f1
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-australis.svg
@@ -0,0 +1,9 @@
+<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="46.5, 100" d="M28.5 0C14.55.03 14.046 10.757 13.05 16.442 11.56 24.942 8.125 29.452 0 30h30V0m0 0h-1.5"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" x="-2.2" transform="scale(0.036, 0.0333)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome-clipped.svg
new file mode 100644
index 0000000000000..24ae50b3ea4be
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="36" viewBox="0 0 18 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47 100" d="M18 0a9 9 0 0 0-7.571 4.135 9 9 0 0 0-.617 1.127 9 9 0 0 0-.72 2.457A9 9 0 0 0 9 9v18a9 9 0 0 0 4.135 7.571 9 9 0 0 0 1.127.617 9 9 0 0 0 2.457.72A9 9 0 0 0 18 36V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome.svg
new file mode 100644
index 0000000000000..fda2f96fe6453
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chrome.svg
@@ -0,0 +1,9 @@
+<svg width="18" height="36" viewBox="0 0 18 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47 100" d="M18 0a9 9 0 0 0-7.571 4.135 9 9 0 0 0-.617 1.127 9 9 0 0 0-.72 2.457A9 9 0 0 0 9 9v18a9 9 0 0 1-4.135 7.571 9 9 0 0 1-1.127.617 9 9 0 0 1-2.457.72A9 9 0 0 1 0 36h18V0"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" x="-2.5" transform="scale(0.065, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy-clipped.svg
new file mode 100644
index 0000000000000..da5e1b84e2078
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59 100" d="M36 0h-9l-9 18 9 18h9V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy.svg
new file mode 100644
index 0000000000000..5b71bd8566e3d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-chromeLegacy.svg
@@ -0,0 +1,9 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59 100" d="M0 36h9L27 0h9v36z"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" x="-2.5" transform="scale(0.0299, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge-clipped.svg
new file mode 100644
index 0000000000000..e92817eef1c0d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="32" viewBox="0 0 16 32" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="44.5, 100" d="M16 0h-4a4 4 0 0 0-3.365 1.838 4 4 0 0 0-.473 1.035A4 4 0 0 0 8 4v24a4 4 0 0 0 1.838 3.365 4 4 0 0 0 1.035.473A4 4 0 0 0 12 32h4V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge.svg
new file mode 100644
index 0000000000000..d24d02c86b40e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-edge.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="32" viewBox="0 0 16 32" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="37, 100" d="M12 0a4 4 0 0 0-3.365 1.838A4 4 0 0 0 8 4v24a4 4 0 0 1-1.38 3.023A4 4 0 0 1 4 32h12V0m0 0h-4"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" x="-2.5" transform="scale(0.075, 0.0333)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave-clipped.svg
new file mode 100644
index 0000000000000..5d708659b55f8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="60, 100" d="M36 0c-6 0-12 0-15 6-1.5 3-2.25 7.5-3 12 .188 1.125.375 2.25.574 3.352.1.55.202 1.096.309 1.632.107.536.219 1.063.336 1.578.117.516.24 1.021.37 1.51.131.49.268.963.415 1.42.146.457.301.898.467 1.317a14.336 14.336 0 0 0 .818 1.736 9.98 9.98 0 0 0 1.695 2.236 9.134 9.134 0 0 0 2.498 1.754c.302.147.61.278.926.397.316.118.639.224.967.318.328.094.66.176 1 .248.34.072.685.133 1.033.186.71.102 1.423.176 2.139.222.363.024.73.042 1.098.055.368.013.739.021 1.11.027C34.5 36 35.25 36 36 36V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave.svg
new file mode 100644
index 0000000000000..32e0c1bf8fa81
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left-wave.svg
@@ -0,0 +1,9 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59.75 100" d="M 0,36 C 6,36 12.001,36 15.0005,30.0005 18,24.001 18,12.001 21.0005,6.0005 24.001,0 30,0 36,0 c 0,0 0,36 0,36 0,0 -36,0 -36,0 z"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" x="-2.5" transform="scale(0.0299, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left.svg
new file mode 100644
index 0000000000000..a502cdb64621e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-left.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg stroke-width="1.2" width="16" height="16" preserveAspectRatio="xMidYMid meet" viewBox="0 0 17 16" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <path d="M0 17 L0 16 A16 16 0 0 0 16 0 L 18 0 L 18 17 Z" fill="context-fill"></path>
+  <path d="M0 16 A16 16 0 0 0 16 0" stroke="context-stroke" stroke-width="0.5" fill="transparent"></path>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis-cilpped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis-cilpped.svg
new file mode 100644
index 0000000000000..409e3bd347e44
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis-cilpped.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47, 100" d="M0 0h1.5m0 0C9.714.018 13.264 3.745 15 7.967l-.045.105c-.18.447-.342.9-.486 1.36a26.38 26.38 0 0 0-.547 2.047c-.101.45-.19.899-.272 1.337-.08.44-.154.87-.222 1.29-.137.837-.253 1.625-.377 2.335a38.38 38.38 0 0 1-.305 1.547c-.109.5-.225.986-.351 1.455a25.149 25.149 0 0 1-.631 2.004 17.918 17.918 0 0 1-1.05 2.348 14.16 14.16 0 0 1-.966 1.514c-.344.463-.722.9-1.13 1.306a10.525 10.525 0 0 1-1.79 1.414c-.674.422-1.392.77-2.14 1.041a13.21 13.21 0 0 1-1.213.383c-.432.116-.87.212-1.31.29-.47.083-.942.148-1.417.195-.245.024-.494.045-.748.062V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis.svg
new file mode 100644
index 0000000000000..aef6e0e481c6a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-australis.svg
@@ -0,0 +1,9 @@
+<svg width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="46.5, 100" d="M0 0h1.5m0 0c13.95.03 14.454 10.757 15.45 16.442C18.44 24.942 21.875 29.452 30 30H0V0"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" transform="scale(0.036, 0.0333)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome-clipped.svg
new file mode 100644
index 0000000000000..96baab91316f7
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="36" viewBox="0 0 18 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47 100" d="M0 0a9 9 0 0 1 7.571 4.135 9 9 0 0 1 .617 1.127 9 9 0 0 1 .72 2.457A9 9 0 0 1 9 9v18a9 9 0 0 1-4.135 7.571 9 9 0 0 1-1.127.617 9 9 0 0 1-2.457.72A9 9 0 0 1 0 36V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome.svg
new file mode 100644
index 0000000000000..ace5206218ddc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chrome.svg
@@ -0,0 +1,9 @@
+<svg width="18" height="36" viewBox="0 0 18 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="47 100" fill="context-fill" d="M0 0a9 9 0 0 1 9 9v18a9 9 0 0 0 9 9H0V0"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" transform="scale(0.065, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy-clipped.svg
new file mode 100644
index 0000000000000..1e4b0492201b0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59 100" d="M0 0h9l9 18-9 18H0V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy.svg
new file mode 100644
index 0000000000000..9749ab7e4661e
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-chromeLegacy.svg
@@ -0,0 +1,9 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59 100" fill="context-fill" d="M36 36h-9L9 0H0v36z"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" transform="scale(0.0299, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge-clipped.svg
new file mode 100644
index 0000000000000..20bde7cb81864
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="32" viewBox="0 0 16 32" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="44.5, 100" d="M0 0h4a4 4 0 0 1 3.365 1.838 4 4 0 0 1 .473 1.035A4 4 0 0 1 8 4v24a4 4 0 0 1-1.838 3.365 4 4 0 0 1-1.035.473A4 4 0 0 1 4 32H0V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge.svg
new file mode 100644
index 0000000000000..a9de51f0bd242
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-edge.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="32" viewBox="0 0 16 32" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="37, 100" d="M4 0a4 4 0 0 1 3.365 1.838A4 4 0 0 1 8 4v24a4 4 0 0 0 1.838 3.365A4 4 0 0 0 12 32H0V0m0 0h4"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" transform="scale(0.075, 0.0333)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave-clipped.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave-clipped.svg
new file mode 100644
index 0000000000000..6bbb9acc5e904
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave-clipped.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="60, 100" d="M0 0c6 0 12 0 15 6 1.5 3 2.25 7.5 3 12-.188 1.125-.375 2.25-.574 3.352-.1.55-.202 1.096-.309 1.632a60.698 60.698 0 0 1-.336 1.578c-.117.516-.24 1.021-.37 1.51-.131.49-.268.963-.415 1.42a21.2 21.2 0 0 1-.467 1.317 14.336 14.336 0 0 1-.818 1.736 9.98 9.98 0 0 1-1.695 2.236 9.134 9.134 0 0 1-2.498 1.754c-.302.147-.61.278-.926.397-.316.118-.639.224-.967.318-.33.094-.664.177-1 .248-.34.072-.685.133-1.033.186a27.096 27.096 0 0 1-2.139.222c-.363.024-.73.042-1.098.055-.368.013-.739.021-1.11.027C1.5 36 .75 36 0 36V0"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave.svg
new file mode 100644
index 0000000000000..343b26d2c3779
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right-wave.svg
@@ -0,0 +1,9 @@
+<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="tabCorner" fill="context-fill" stroke="context-stroke" stroke-opacity="context-stroke-opacity" stroke-width="1.5" stroke-dasharray="59.75 100" d="M 36,36 C 30,36 23.999,36 20.9995,30.0005 18,24.001 18,12.001 14.9995,6.0005 11.999,0 6,0 0,0 c 0,0 0,36 0,36 0,0 36,0 36,0 z"/>
+  </defs>
+  <clipPath id="svgClipPath" clipPathUnits="objectBoundingBox">
+    <use href="#tabCorner" transform="scale(0.0299, 0.0277)" />
+  </clipPath>
+  <use href="#tabCorner" />
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right.svg b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right.svg
new file mode 100644
index 0000000000000..72f14fc163b9d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-bottom-corner-right.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg transform="scale(-1,1)" stroke-width="1.2" width="16" height="16" preserveAspectRatio="xMidYMid meet" viewBox="0 0 17 16" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <path d="M0 17 L0 16 A16 16 0 0 0 16 0 L 18 0 L 18 17 Z" fill="context-fill"></path>
+  <path d="M0 16 A16 16 0 0 0 16 0" stroke="context-stroke" stroke-width="0.5" fill="transparent"></path>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-copy-photon.svg b/waterfox/browser/themes/lepton/icons/tab-copy-photon.svg
new file mode 100644
index 0000000000000..dc5ca7d3d18a8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-copy-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 13V4a1.99 1.99 0 0 0-1.031-1.75A1.991 1.991 0 0 0 12 2H3a2 2 0 0 0-2 2v9h13ZM3.439.75c-.063.079-.12.162-.171.25H14a1 1 0 0 1 1 1v8.733A1.997 1.997 0 0 0 16 9V2a2 2 0 0 0-2-2H5c-.632 0-1.195.293-1.561.75ZM12 3.25H3a.75.75 0 0 0-.75.75v7.75h10.5V4a.75.75 0 0 0-.75-.75Z" clip-rule="evenodd"/><path d="M1 11.75c-.5 0-1-.01-1 .62S.5 13 1 13v-1.25ZM14 13c.5 0 1 0 1-.63 0-.62-.485-.62-.977-.62H14V13Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-copy.svg b/waterfox/browser/themes/lepton/icons/tab-copy.svg
new file mode 100644
index 0000000000000..56f6ca84ccd88
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13.75 11.969c.16-.287.25-.617.25-.969V4a1.99 1.99 0 0 0-1.031-1.75A1.991 1.991 0 0 0 12 2H2a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h10a2 2 0 0 0 1.75-1.031ZM2.439.75c-.063.079-.12.162-.171.25H14a1 1 0 0 1 1 1v8.732A1.996 1.996 0 0 0 16 9V2a2 2 0 0 0-2-2H4c-.632 0-1.195.293-1.561.75ZM12 3.25H2a.75.75 0 0 0-.75.75v7c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-desktop-multiple-bottom.svg b/waterfox/browser/themes/lepton/icons/tab-desktop-multiple-bottom.svg
new file mode 100644
index 0000000000000..3f4dedeb60713
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-desktop-multiple-bottom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.268 2A2.004 2.004 0 0 1 4 1h10a2 2 0 0 1 2 2v8a1.996 1.996 0 0 1-1 1.732V3a1 1 0 0 0-1-1H2.268Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M14 13a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h10a1.991 1.991 0 0 1 1.75 1.031c.16.287.25.617.25.969v8Zm-2-8.75H2a.75.75 0 0 0-.75.75v2h11.5V5a.75.75 0 0 0-.75-.75ZM1.25 13c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V8.25H1.25V13Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab-desktop-multiple.svg b/waterfox/browser/themes/lepton/icons/tab-desktop-multiple.svg
new file mode 100644
index 0000000000000..17381f75c19d0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-desktop-multiple.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13.75 2.031c.16.287.25.617.25.969v8a1.99 1.99 0 0 1-1.031 1.75A1.99 1.99 0 0 1 12 13H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10a2 2 0 0 1 1.75 1.031ZM2.439 14.25a2.004 2.004 0 0 1-.171-.25H14a1 1 0 0 0 1-1V3.268A2.002 2.002 0 0 1 16 5v8a2 2 0 0 1-2 2H4a1.996 1.996 0 0 1-1.561-.75ZM12 11.75H2a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 2 2.25h10a.75.75 0 0 1 .75.75v8a.75.75 0 0 1-.75.75Z" clip-rule="evenodd"/><path d="M2.5 3.625c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75a.625.625 0 0 1-.625-.625ZM7.5 3.625c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75a.625.625 0 0 1-.625-.625Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-multiple.svg b/waterfox/browser/themes/lepton/icons/tab-multiple.svg
new file mode 100644
index 0000000000000..17381f75c19d0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-multiple.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13.75 2.031c.16.287.25.617.25.969v8a1.99 1.99 0 0 1-1.031 1.75A1.99 1.99 0 0 1 12 13H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10a2 2 0 0 1 1.75 1.031ZM2.439 14.25a2.004 2.004 0 0 1-.171-.25H14a1 1 0 0 0 1-1V3.268A2.002 2.002 0 0 1 16 5v8a2 2 0 0 1-2 2H4a1.996 1.996 0 0 1-1.561-.75ZM12 11.75H2a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 2 2.25h10a.75.75 0 0 1 .75.75v8a.75.75 0 0 1-.75.75Z" clip-rule="evenodd"/><path d="M2.5 3.625c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75a.625.625 0 0 1-.625-.625ZM7.5 3.625c0-.345.28-.625.625-.625h2.75a.625.625 0 1 1 0 1.25h-2.75a.625.625 0 0 1-.625-.625Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-photon.svg b/waterfox/browser/themes/lepton/icons/tab-photon.svg
new file mode 100644
index 0000000000000..c919959808c2d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M4.628 2a2.627 2.627 0 0 0-2.627 2.627v7.122H.625a.625.625 0 1 0 0 1.251h14.75a.626.626 0 0 0 0-1.251h-1.376V4.627A2.626 2.626 0 0 0 11.373 2z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-unload-photon.svg b/waterfox/browser/themes/lepton/icons/tab-unload-photon.svg
new file mode 100644
index 0000000000000..cc231b5b4aa4b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-unload-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M3 3.25h10a.75.75 0 0 1 .75.75v4.402c.478.233.902.558 1.25.952V4a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5.126a4.007 4.007 0 0 1-.118-1.25H3a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 3 3.25Z" clip-rule="evenodd"/><path d="M11.692 10.017c.443-.057.893.03 1.28.251.386.22.688.56.86.967.17.406.2.857.084 1.283-.115.425-.37.8-.724 1.069a2.048 2.048 0 0 1-2.47 0 1.999 1.999 0 0 1-.725-1.07.508.508 0 0 0-.98.26 2.998 2.998 0 0 0 1.087 1.603 3.072 3.072 0 0 0 3.705 0 2.998 2.998 0 0 0 1.087-1.604 2.96 2.96 0 0 0-.128-1.924 3.014 3.014 0 0 0-1.29-1.45 3.08 3.08 0 0 0-3.636.44L9 9v2.5h2.5l-.945-.945a2.04 2.04 0 0 1 1.137-.538Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tab-unload.svg b/waterfox/browser/themes/lepton/icons/tab-unload.svg
new file mode 100644
index 0000000000000..eab65e246b149
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab-unload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M3 3.25h10a.75.75 0 0 1 .75.75v4.402c.478.233.902.558 1.25.952V4a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5.126a4.007 4.007 0 0 1-.118-1.25H3a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 3 3.25Z" clip-rule="evenodd"/><path d="M11.692 10.017c.443-.057.893.03 1.28.251.386.22.688.56.86.967.17.406.2.857.084 1.283-.115.425-.37.8-.724 1.069a2.048 2.048 0 0 1-2.47 0 1.999 1.999 0 0 1-.725-1.07.508.508 0 0 0-.98.26 2.998 2.998 0 0 0 1.087 1.603 3.072 3.072 0 0 0 3.705 0 2.998 2.998 0 0 0 1.087-1.604 2.96 2.96 0 0 0-.128-1.924 3.014 3.014 0 0 0-1.29-1.45 3.08 3.08 0 0 0-3.636.44L9 9v2.5h2.5l-.945-.945a2.04 2.04 0 0 1 1.137-.538Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tab.svg b/waterfox/browser/themes/lepton/icons/tab.svg
new file mode 100644
index 0000000000000..3839ca04efb8f
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M13 3.25H3a.75.75 0 0 0-.75.75v7c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V4a.75.75 0 0 0-.75-.75ZM3 2a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H3Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tag-open.svg b/waterfox/browser/themes/lepton/icons/tag-open.svg
new file mode 100644
index 0000000000000..8d22a0cdc11dd
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tag-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.25 2v4.672c0 .198.079.39.22.53l7 7a.75.75 0 0 0 1.06 0l4.672-4.672a.75.75 0 0 0 0-1.06l-7-7a.75.75 0 0 0-.53-.22H2a.75.75 0 0 0-.75.75ZM0 2v4.672a2 2 0 0 0 .586 1.414l7 7a2 2 0 0 0 2.828 0l4.672-4.672a2 2 0 0 0 0-2.828l-7-7A2 2 0 0 0 6.672 0H2a2 2 0 0 0-2 2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M4 4.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5ZM4 6a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tag.svg b/waterfox/browser/themes/lepton/icons/tag.svg
new file mode 100644
index 0000000000000..930cc3a3c5961
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.25 2v4.672c0 .198.079.39.22.53l7 7a.75.75 0 0 0 1.06 0l4.672-4.672a.75.75 0 0 0 0-1.06l-7-7a.75.75 0 0 0-.53-.22H2a.75.75 0 0 0-.75.75ZM0 2v4.672a2 2 0 0 0 .586 1.414l7 7a2 2 0 0 0 2.828 0l4.672-4.672a2 2 0 0 0 0-2.828l-7-7A2 2 0 0 0 6.672 0H2a2 2 0 0 0-2 2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M4 4.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5ZM4 6a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z" clip-rule="evenodd"/><path d="M9.685 11.684a.625.625 0 0 1-.884 0L5.44 8.326a.625.625 0 1 1 .884-.884l3.36 3.359a.625.625 0 0 1 0 .883ZM11.685 9.685a.625.625 0 0 1-.884 0l-3.36-3.36a.625.625 0 1 1 .884-.884l3.36 3.36a.625.625 0 0 1 0 .884Z"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/tetris-app.svg b/waterfox/browser/themes/lepton/icons/tetris-app.svg
new file mode 100644
index 0000000000000..ab0ef1bbc3dce
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tetris-app.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M5.25 0C4.56 0 4 .56 4 1.25v2.5a.25.25 0 0 1-.25.25h-2.5C.56 4 0 4.56 0 5.25v2.5C0 8.44.56 9 1.25 9h6.5C8.44 9 9 8.44 9 7.75v-2.5A.25.25 0 0 1 9.25 5h2.5C12.44 5 13 4.44 13 3.75v-2.5C13 .56 12.44 0 11.75 0Zm6.5 4H9V1h2.75a.25.25 0 0 1 .25.25v2.5a.25.25 0 0 1-.25.25ZM8.025 5c-.016.08-.025.164-.025.25v2.5a.25.25 0 0 1-.25.25H5V5ZM4 5v3H1.25A.25.25 0 0 1 1 7.75v-2.5A.25.25 0 0 1 1.25 5Zm.975-1c.016-.08.025-.164.025-.25v-2.5A.25.25 0 0 1 5.25 1H8v3Zm7.275 3C11.56 7 11 7.56 11 8.25v2.5a.25.25 0 0 1-.25.25h-6.5C3.56 11 3 11.56 3 12.25v2.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-6.5C16 7.56 15.44 7 14.75 7Zm-.275 4c.016-.08.025-.164.025-.25v-2.5a.25.25 0 0 1 .25-.25h2.5a.25.25 0 0 1 .25.25V11ZM12 12h3v2.75a.25.25 0 0 1-.25.25H12Zm-1 0v3H8v-3zm-4 0v3H4.25a.25.25 0 0 1-.25-.25v-2.5a.25.25 0 0 1 .25-.25Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/text-direction-horizontal-ltr.svg b/waterfox/browser/themes/lepton/icons/text-direction-horizontal-ltr.svg
new file mode 100644
index 0000000000000..de255bbea6acc
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/text-direction-horizontal-ltr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M11.168 1.699a.625.625 0 0 1 .883-.04l2.74 2.5a.625.625 0 0 1 0 .923l-2.74 2.5a.625.625 0 0 1-.842-.924l1.549-1.413H9.37a.625.625 0 1 1 0-1.25h3.388l-1.55-1.413a.625.625 0 0 1-.04-.883Zm.001 7.999a.625.625 0 0 1 .883-.039l2.74 2.51a.626.626 0 0 1-.002.923l-2.74 2.49a.625.625 0 1 1-.84-.925l1.543-1.402H1.63a.625.625 0 1 1 0-1.25h11.133l-1.555-1.424a.625.625 0 0 1-.039-.883Z" clip-rule="evenodd"/><path d="m7.434 10-.838-2.379H3.32L2.482 10H1l3.188-8.602h1.558L8.928 10H7.434ZM6.232 6.414 5.418 4.07a103.236 103.236 0 0 1-.31-.996c-.06-.195-.108-.36-.147-.492-.04.16-.088.34-.147.54-.054.194-.109.378-.164.55l-.117.398-.82 2.344h2.52Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/text-number-format.svg b/waterfox/browser/themes/lepton/icons/text-number-format.svg
new file mode 100644
index 0000000000000..74a33b9602d66
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/text-number-format.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M14.46 10.57c0 .258-.046.495-.137.713-.09.218-.228.41-.41.576-.179.163-.4.293-.664.391v.03c.446.094.781.286 1.006.575.228.29.342.668.342 1.133 0 .43-.091.803-.274 1.118-.179.316-.438.56-.776.733-.339.172-.744.259-1.216.259-.31 0-.59-.025-.845-.074a3.361 3.361 0 0 1-.805-.263V14.5c.244.143.49.252.737.327.247.075.485.112.713.112.364 0 .631-.088.8-.263.173-.18.26-.428.26-.747 0-.238-.048-.432-.142-.581a.797.797 0 0 0-.43-.337c-.195-.075-.45-.113-.762-.113h-.356v-1.127h.366c.277 0 .51-.041.698-.123a.917.917 0 0 0 .425-.36c.098-.16.147-.35.147-.567 0-.26-.069-.46-.205-.596-.134-.137-.33-.205-.591-.205-.13 0-.257.018-.381.054-.124.035-.247.09-.371.16s-.25.157-.381.264l-.527-.981c.293-.24.589-.41.888-.508a3.25 3.25 0 0 1 1.03-.151c.573 0 1.026.156 1.358.469.335.309.503.756.503 1.342ZM9.831 16H5.939v-.972l1.373-1.909c.292-.407.515-.744.668-1.01a2.99 2.99 0 0 0 .308-.713c.055-.209.083-.42.083-.635 0-.25-.06-.45-.18-.596-.118-.15-.294-.225-.528-.225-.185 0-.361.05-.527.147-.166.098-.352.272-.557.522l-.66-.888c.2-.235.395-.422.587-.562.195-.143.4-.246.615-.307.215-.062.448-.093.698-.093.378 0 .71.081.996.244.287.16.51.382.67.669.159.286.239.622.239 1.006 0 .315-.038.617-.113.903a3.65 3.65 0 0 1-.38.889 8.73 8.73 0 0 1-.738 1.05l-.952 1.25v.048h2.29V16ZM4.533 16H3.195v-4.61l.01-.43.02-.419a5.612 5.612 0 0 1-.38.469l-.621.64-.801-.792 1.919-1.997h1.191V16ZM13.942 1.94a.855.855 0 0 0-.546.186c-.157.124-.287.3-.391.527-.101.225-.178.49-.23.796a6.37 6.37 0 0 0-.073 1.001c0 .53.05.98.152 1.348.1.364.248.641.444.83a.987.987 0 0 0 .713.283c.221 0 .431-.037.63-.112.198-.075.395-.165.59-.269v1.221c-.205.114-.426.2-.664.259a3.114 3.114 0 0 1-.757.088c-.537 0-.994-.142-1.372-.425-.374-.287-.66-.702-.859-1.245-.199-.547-.298-1.21-.298-1.988 0-.533.056-1.023.166-1.47.114-.449.28-.838.498-1.166.218-.332.485-.59.801-.772A2.165 2.165 0 0 1 13.84.76c.286 0 .563.036.83.107.267.072.524.182.771.332l-.39 1.133a2.559 2.559 0 0 0-.532-.283 1.537 1.537 0 0 0-.577-.108ZM6.218.861h1.88c.735 0 1.285.145 1.65.435.368.286.552.727.552 1.323 0 .28-.04.53-.117.752a1.391 1.391 0 0 1-.328.542 1.147 1.147 0 0 1-.517.298v.049c.254.068.46.176.62.322.163.147.282.332.357.557.074.224.112.488.112.79 0 .424-.085.79-.254 1.1-.166.309-.407.548-.723.717-.316.17-.693.254-1.133.254h-2.1V.861ZM7.59 3.752h.508c.276 0 .481-.08.615-.24.137-.159.205-.393.205-.702 0-.27-.07-.476-.21-.616-.14-.143-.35-.215-.63-.215H7.59v1.773Zm0 1.089v2.007h.62c.273 0 .478-.085.615-.254.137-.17.205-.427.205-.772 0-.211-.034-.389-.102-.532a.724.724 0 0 0-.298-.332.889.889 0 0 0-.474-.117H7.59ZM4.113 8l-.37-1.719H2.154L1.785 8H.314L2.042.861h1.772L5.573 8h-1.46Zm-.58-2.91L3.145 3.2l-.078-.459c-.022-.15-.045-.293-.068-.43l-.054-.39c-.01.114-.024.24-.044.376a14.36 14.36 0 0 1-.156.884l-.38 1.909h1.166Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/text-proofing-tools.svg b/waterfox/browser/themes/lepton/icons/text-proofing-tools.svg
new file mode 100644
index 0000000000000..a1a433e01fb31
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/text-proofing-tools.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M13.942 1.94a.855.855 0 0 0-.546.186c-.157.124-.287.3-.391.527-.101.225-.178.49-.23.796a6.37 6.37 0 0 0-.073 1.001c0 .53.05.98.152 1.348.1.364.248.641.444.83a.987.987 0 0 0 .713.283c.221 0 .431-.037.63-.112.198-.075.395-.165.59-.269v1.221c-.205.114-.426.2-.664.259a3.114 3.114 0 0 1-.757.088c-.537 0-.994-.142-1.372-.425-.374-.287-.66-.702-.859-1.245-.199-.547-.298-1.21-.298-1.988 0-.533.056-1.023.166-1.47.114-.449.28-.838.498-1.166.218-.332.485-.59.801-.772A2.165 2.165 0 0 1 13.84.76c.286 0 .563.036.83.107.267.072.524.182.771.332l-.39 1.133a2.559 2.559 0 0 0-.532-.283 1.537 1.537 0 0 0-.577-.108ZM6.218.861h1.88c.735 0 1.285.145 1.65.435.368.286.552.727.552 1.323 0 .28-.04.53-.117.752a1.391 1.391 0 0 1-.328.542 1.147 1.147 0 0 1-.517.298v.049c.254.068.46.176.62.322.163.147.282.332.357.557.074.224.112.488.112.79 0 .424-.085.79-.254 1.1-.166.309-.407.548-.723.717-.316.17-.693.254-1.133.254h-2.1V.861ZM7.59 3.752h.508c.276 0 .481-.08.615-.24.137-.159.205-.393.205-.702 0-.27-.07-.476-.21-.616-.14-.143-.35-.215-.63-.215H7.59v1.773Zm0 1.089v2.007h.62c.273 0 .478-.085.615-.254.137-.17.205-.427.205-.772 0-.211-.034-.389-.102-.532a.724.724 0 0 0-.298-.332.889.889 0 0 0-.474-.117H7.59ZM4.113 8l-.37-1.719H2.154L1.785 8H.314L2.042.861h1.772L5.573 8h-1.46Zm-.58-2.91L3.145 3.2l-.078-.459c-.022-.15-.045-.293-.068-.43l-.054-.39c-.01.114-.024.24-.044.376a14.36 14.36 0 0 1-.156.884l-.38 1.909h1.166ZM10.827 9.552a.667.667 0 0 1 1.021.85l-.077.092-4.299 4.31a.667.667 0 0 1-.851.078l-.092-.077-2.334-2.335a.667.667 0 0 1 .85-1.02l.093.078L7 13.389l3.827-3.837Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/text-sort-ascending.svg b/waterfox/browser/themes/lepton/icons/text-sort-ascending.svg
new file mode 100644
index 0000000000000..013c393f0f9b0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/text-sort-ascending.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="m6.167 8-.371-1.719H4.209L3.838 8h-1.47L4.097.861h1.772L7.627 8h-1.46Zm-.581-2.91L5.2 3.2a66.74 66.74 0 0 0-.078-.459c-.023-.15-.045-.293-.068-.43L5 1.922c-.01.114-.024.24-.044.376a14.391 14.391 0 0 1-.156.884L4.419 5.09h1.167ZM6.929 16H3.086v-.981l2.31-4.98H3.125V8.86h3.74v.977l-2.31 4.97H6.93V16Z"/><path fill-rule="evenodd" d="M14.813 11.189a.625.625 0 0 1-.002.884l-2.75 2.74a.625.625 0 0 1-.863.018l-2.99-2.74a.625.625 0 0 1 .844-.922l1.943 1.78V1.63a.625.625 0 1 1 1.25 0v11.235l1.684-1.678a.625.625 0 0 1 .884.002Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/time-picker.svg b/waterfox/browser/themes/lepton/icons/time-picker.svg
new file mode 100644
index 0000000000000..3f9001c1e17ca
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/time-picker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M3.192 7.993c0 .39-.029.739-.087 1.045a2.35 2.35 0 0 1-.275.78c-.125.215-.29.378-.493.49a1.521 1.521 0 0 1-.744.169c-.366 0-.667-.098-.903-.295C.455 9.984.281 9.7.17 9.33.056 8.957 0 8.511 0 7.993c0-.522.051-.969.153-1.339.104-.372.273-.658.506-.856.233-.199.545-.298.934-.298.365 0 .664.1.9.298.237.196.413.48.528.853.114.37.171.818.171 1.342Zm-2.233 0c0 .369.019.676.056.923.04.245.105.429.197.552a.448.448 0 0 0 .381.185c.16 0 .286-.06.378-.181.094-.124.16-.308.2-.553.04-.247.06-.555.06-.926 0-.368-.02-.675-.06-.922-.04-.247-.106-.432-.2-.556a.442.442 0 0 0-.378-.188.445.445 0 0 0-.381.188c-.092.124-.157.309-.197.556a6.307 6.307 0 0 0-.056.922ZM6.854 7.993c0 .39-.03.739-.088 1.045a2.35 2.35 0 0 1-.275.78c-.125.215-.29.378-.493.49a1.521 1.521 0 0 1-.744.169c-.366 0-.667-.098-.903-.295-.235-.198-.409-.482-.521-.853-.113-.372-.169-.818-.169-1.336 0-.522.051-.969.153-1.339.104-.372.273-.658.506-.856.233-.199.545-.298.934-.298.365 0 .665.1.9.298.237.196.413.48.528.853.114.37.172.818.172 1.342Zm-2.234 0c0 .369.019.676.056.923.04.245.105.429.197.552a.448.448 0 0 0 .381.185c.16 0 .287-.06.378-.181.094-.124.16-.308.2-.553.04-.247.06-.555.06-.926 0-.368-.02-.675-.06-.922-.04-.247-.106-.432-.2-.556a.442.442 0 0 0-.378-.188.445.445 0 0 0-.38.188c-.093.124-.158.309-.198.556a6.307 6.307 0 0 0-.056.922ZM7.456 9.938c0-.207.054-.353.16-.437a.62.62 0 0 1 .39-.125c.148 0 .275.042.381.125.109.084.163.23.163.437 0 .198-.054.341-.163.43a.577.577 0 0 1-.38.132.599.599 0 0 1-.391-.132c-.106-.088-.16-.232-.16-.43Zm0-2.732c0-.207.054-.352.16-.436a.62.62 0 0 1 .39-.126c.148 0 .275.042.381.126.109.084.163.23.163.436 0 .201-.054.345-.163.434a.587.587 0 0 1-.38.129.609.609 0 0 1-.391-.13c-.106-.088-.16-.232-.16-.433ZM12.339 7.993c0 .39-.03.739-.088 1.045a2.352 2.352 0 0 1-.274.78c-.125.215-.29.378-.494.49a1.521 1.521 0 0 1-.743.169c-.367 0-.668-.098-.903-.295-.236-.198-.41-.482-.522-.853-.112-.372-.169-.818-.169-1.336 0-.522.051-.969.153-1.339.105-.372.273-.658.507-.856.233-.199.544-.298.934-.298.364 0 .664.1.9.298.237.196.413.48.527.853.115.37.172.818.172 1.342Zm-2.234 0c0 .369.02.676.057.923.04.245.105.429.196.552a.448.448 0 0 0 .382.185c.16 0 .286-.06.377-.181.094-.124.16-.308.2-.553.04-.247.06-.555.06-.926 0-.368-.02-.675-.06-.922-.04-.247-.106-.432-.2-.556a.442.442 0 0 0-.377-.188.445.445 0 0 0-.382.188c-.091.124-.157.309-.196.556a6.304 6.304 0 0 0-.057.922ZM16 7.993c0 .39-.03.739-.088 1.045a2.348 2.348 0 0 1-.274.78c-.125.215-.29.378-.494.49a1.521 1.521 0 0 1-.743.169c-.367 0-.668-.098-.903-.295-.236-.198-.41-.482-.522-.853-.112-.372-.169-.818-.169-1.336 0-.522.051-.969.154-1.339.104-.372.272-.658.506-.856.233-.199.544-.298.934-.298.364 0 .664.1.9.298.237.196.413.48.527.853.115.37.172.818.172 1.342Zm-2.233 0c0 .369.018.676.056.923.04.245.105.429.197.552a.448.448 0 0 0 .38.185c.161 0 .287-.06.379-.181.093-.124.16-.308.2-.553.04-.247.059-.555.059-.926 0-.368-.02-.675-.06-.922-.039-.247-.106-.432-.2-.556a.442.442 0 0 0-.377-.188.445.445 0 0 0-.381.188c-.092.124-.158.309-.197.556a6.306 6.306 0 0 0-.056.922Z"/><path fill-rule="evenodd" d="M7.605.146a.625.625 0 0 1 .79 0l3.37 2.75a.625.625 0 1 1-.79.968L8 1.437 5.025 3.864a.625.625 0 0 1-.79-.968l3.37-2.75Zm4.25 12.089a.625.625 0 0 1-.09.88l-3.37 2.75a.625.625 0 0 1-.79 0l-3.37-2.75a.625.625 0 0 1 .79-.97L8 14.574l2.975-2.427a.625.625 0 0 1 .88.089Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/timer10.svg b/waterfox/browser/themes/lepton/icons/timer10.svg
new file mode 100644
index 0000000000000..b31c0f9b81d65
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/timer10.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5.125 0a.625.625 0 1 0 0 1.25h3.75a.625.625 0 1 0 0-1.25h-3.75ZM1.25 9a5.75 5.75 0 0 1 11.265-1.63 2.662 2.662 0 0 1 1.197-.363 7 7 0 1 0-5.844 8.94v-1.262A5.75 5.75 0 0 1 1.25 9Zm6.375-.853-.865.93a.625.625 0 0 1-.385-.577V4.75a.625.625 0 1 1 1.25 0v3.397Zm4.817-5.705a.625.625 0 0 1 .884 0l.53.53a.625.625 0 0 1-.884.884l-.53-.53a.625.625 0 0 1 0-.884Z" clip-rule="evenodd"/><path d="M10.278 15.893h-1.41v-5.025l.01-.468.02-.457a6.091 6.091 0 0 1-.401.511l-.653.697L7 10.289l2.022-2.177h1.256v7.781ZM16 12.003c0 .589-.034 1.128-.103 1.618a4.693 4.693 0 0 1-.334 1.267c-.158.354-.37.63-.639.825-.267.191-.601.287-1.003.287-.453 0-.833-.137-1.142-.41-.306-.273-.537-.702-.695-1.288-.158-.589-.237-1.355-.237-2.3 0-.911.076-1.662.227-2.25.15-.593.379-1.033.684-1.32.309-.288.697-.432 1.163-.432.463 0 .847.149 1.153.447.309.298.54.744.694 1.336.155.593.232 1.333.232 2.22Zm-2.732 0c0 .617.018 1.126.056 1.527.041.398.108.694.2.89.097.19.229.287.397.287.172 0 .304-.096.396-.288.096-.195.163-.491.201-.889.038-.4.057-.91.057-1.527 0-.6-.02-1.1-.057-1.501-.038-.401-.105-.701-.2-.9-.093-.202-.225-.303-.397-.303-.165 0-.295.1-.391.298-.096.199-.165.498-.206.9-.038.4-.056.902-.056 1.506Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/tool-accessibility.svg b/waterfox/browser/themes/lepton/icons/tool-accessibility.svg
new file mode 100644
index 0000000000000..5cd3ecd40c304
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/tool-accessibility.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><g fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M8 2.95a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm2-.75a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z"/><path d="M.657 4.552a1.416 1.416 0 0 1 1.79-.895L5.89 4.804c.14.047.287.07.435.07h3.35c.148 0 .295-.023.435-.07l3.442-1.147a1.416 1.416 0 1 1 .896 2.686L11.38 7.365a.375.375 0 0 0-.256.356v2.598c0 .045.008.09.024.131l1.148 3.063a1.415 1.415 0 0 1-2.65.994l-.989-2.639a.375.375 0 0 0-.351-.243h-.614a.375.375 0 0 0-.351.243l-.99 2.639a1.415 1.415 0 0 1-2.65-.994l1.15-3.063a.375.375 0 0 0 .023-.131V7.72a.375.375 0 0 0-.256-.356L1.552 6.343a1.416 1.416 0 0 1-.895-1.79Zm1.395.29a.166.166 0 0 0-.104.315l3.066 1.022a1.625 1.625 0 0 1 1.111 1.542v2.598c0 .194-.035.388-.103.57l-1.149 3.063a.165.165 0 0 0 .31.116l.988-2.639a1.625 1.625 0 0 1 1.522-1.054h.614c.677 0 1.284.42 1.522 1.054l.989 2.639a.165.165 0 1 0 .309-.116l-1.149-3.063a1.625 1.625 0 0 1-.103-.57V7.72c0-.7.448-1.32 1.111-1.542l3.066-1.022a.166.166 0 0 0-.104-.314L10.505 5.99c-.267.09-.547.135-.83.135h-3.35c-.283 0-.563-.046-.83-.135L2.051 4.843Z"/></g><defs><clipPath id="a"><path d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/toolbar.svg b/waterfox/browser/themes/lepton/icons/toolbar.svg
new file mode 100644
index 0000000000000..0d66c2ad0b24b
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/toolbar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1.005 3.63A2.625 2.625 0 0 1 3.63 1.005h8.75a2.625 2.625 0 0 1 2.625 2.625v7.77a2.625 2.625 0 0 1-2.625 2.624H3.63A2.625 2.625 0 0 1 1.005 11.4V3.63ZM3.63 2.255c-.76 0-1.375.616-1.375 1.375v1.115h11.5V3.63c0-.76-.616-1.375-1.375-1.375H3.63Zm10.125 3.74h-11.5v1.01h11.5v-1.01Zm0 2.26h-11.5v3.144c0 .76.616 1.375 1.375 1.375h8.75c.76 0 1.375-.615 1.375-1.375V8.255Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/toolbarButton-download.svg b/waterfox/browser/themes/lepton/icons/toolbarButton-download.svg
new file mode 100644
index 0000000000000..bc63a41160690
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/toolbarButton-download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M10.63.505c.345 0 .625.28.625.625v6.875h1.884l-2.509 2.509-2.509-2.509h1.884V1.13c0-.345.28-.625.625-.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M12.255 4.25H13a.75.75 0 0 1 .75.75v7a.75.75 0 0 1-.75.75H3a.75.75 0 0 1-.75-.75V3A.75.75 0 0 1 3 2.25h2.672a.75.75 0 0 1 .53.22l.828.828a3.25 3.25 0 0 0 1.975.936v-1.26a2 2 0 0 1-1.09-.56l-.83-.828A2 2 0 0 0 5.673 1H3a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2h-.745v1.25ZM10.005 3h1.25v1.25h-1.25V3Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/toolbarButton-editorHighlight.svg b/waterfox/browser/themes/lepton/icons/toolbarButton-editorHighlight.svg
new file mode 100644
index 0000000000000..0e46ba0535d80
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/toolbarButton-editorHighlight.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path fill-rule="evenodd" d="M7.11 11.66a.75.75 0 0 0 1.06 0l6.75-6.75c.35-.34.54-.8.54-1.29s-.19-.95-.54-1.29L13.13.54c-.34-.35-.8-.54-1.29-.54s-.95.2-1.29.54L3.8 7.29c-.29.29-.29.77 0 1.06l.59.59-2.98 2.99h4.24l.864-.865.595.595Zm.53-1.59L5.39 7.82v-.01l2.475-2.476L10.12 7.59l-2.48 2.48Zm3.54-3.541 2.68-2.679a.32.32 0 0 0 0-.46L12.07 1.6a.343.343 0 0 0-.23-.1s-.15.01-.23.09L8.924 4.274l2.255 2.255Z" clip-rule="evenodd"/>
+  <path d="M.41 14h15v2h-15v-2Z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/toolbarButton-upload.svg b/waterfox/browser/themes/lepton/icons/toolbarButton-upload.svg
new file mode 100644
index 0000000000000..88d3f784fd028
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/toolbarButton-upload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M10.63 10.514a.625.625 0 0 1-.625-.625V5.014H8.121l2.509-2.509 2.509 2.509h-1.884v4.875c0 .345-.28.625-.625.625Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M10.236 3h.788c.114.049.22.12.313.212l.86.86a.557.557 0 0 1 .12.178H9.329c-.126 0-.252-.007-.376-.022a.562.562 0 0 1 .111-.156l.86-.86A.997.997 0 0 1 10.236 3Z" clip-rule="evenodd"/><path d="M5.672 1a2 2 0 0 1 1.414.586l.828.828a2 2 0 0 0 .88.513l-.96.96a3.25 3.25 0 0 1-.804-.589l-.828-.828a.75.75 0 0 0-.53-.22H3a.75.75 0 0 0-.75.75v9c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75l.04-7.75L12.54 3H13a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h2.672Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/toolbox.svg b/waterfox/browser/themes/lepton/icons/toolbox.svg
new file mode 100644
index 0000000000000..5e29c6c9c8792
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/toolbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M1 6a2 2 0 0 1 2-2h1V3a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v1h1a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V6Zm3-.75H3a.75.75 0 0 0-.75.75v2H4v-.375a.625.625 0 1 1 1.25 0V8h5.5v-.375a.625.625 0 1 1 1.25 0V8h1.75V6a.75.75 0 0 0-.75-.75H4ZM2.25 13c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V9.25H12v1.125a.625.625 0 1 1-1.25 0V9.25h-5.5v1.125a.625.625 0 1 1-1.25 0V9.25H2.25V13ZM10 2.25H6a.75.75 0 0 0-.75.75v1h5.5V3a.75.75 0 0 0-.75-.75Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/translations.svg b/waterfox/browser/themes/lepton/icons/translations.svg
new file mode 100644
index 0000000000000..155c55fe0bf49
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/translations.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M4.99 7.695c-.708-.87-1.27-1.9-1.814-3.195H1.835l.082.225.004.011c.613 1.501 1.27 2.746 2.153 3.813-.826.666-1.816 1.222-3.074 1.77v1.35l.233-.09.011-.004c1.476-.626 2.674-1.28 3.689-2.113 1.038.971 2.331 1.763 4.033 2.496l-1.283 2.78-.118.262h1.373l1.267-2.745h4.09L15.562 15h1.373l-.114-.255-1.556-3.37-1.984-4.595-.003-.006c-.396-.89-1.66-.89-2.056 0l-1.746 4.043c-1.583-.68-2.73-1.387-3.627-2.21.066-.07.13-.14.195-.212C7.2 7.094 8.07 5.428 8.935 3.125H10v-1.25H5.625V0h-1.25v1.875H0v1.25h7.597c-.782 2-1.545 3.379-2.488 4.439a8.65 8.65 0 0 1-.119.131m7.26-.149-1.494 3.459h2.988z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/undo.svg b/waterfox/browser/themes/lepton/icons/undo.svg
new file mode 100644
index 0000000000000..31263da0b612a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/undo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5.143 6.737a5.774 5.774 0 0 1 7.744.003 5.738 5.738 0 0 1 1.863 3.696.626.626 0 0 0 1.247-.121 6.986 6.986 0 0 0-2.268-4.5 7.03 7.03 0 0 0-9.427-.003 6.99 6.99 0 0 0-2.05 3.311V4.624a.625.625 0 0 0-1.252 0v5.747c0 .345.28.625.626.625H7.38a.625.625 0 1 0 0-1.25H3.388a5.74 5.74 0 0 1 1.755-3.01Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/unpin-tab.svg b/waterfox/browser/themes/lepton/icons/unpin-tab.svg
new file mode 100644
index 0000000000000..f738efdae779d
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/unpin-tab.svg
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7.253 1 1 7.253l.867.867L8.12 1.867 7.253 1Zm3.367 8.754-.866.867L14.133 15l.866-.867-4.379-4.379Z"/>
+  <path d="m8.236 5.663.866-.867-2.388-2.389a.613.613 0 1 0-.867.867l2.389 2.389Zm-3.439 3.44.867-.867-2.39-2.389a.613.613 0 1 0-.867.867l2.39 2.389Zm7.311-3.536-2.242-.05-.887.888.325.325 2.777.062a.253.253 0 0 1 .242.167c.024.061.05.18-.06.287l-5.016 5.017a.253.253 0 0 1-.288.059.253.253 0 0 1-.166-.242L6.73 9.304l-.325-.326-.888.888.05 2.242c.014.607.371 1.124.936 1.35a1.475 1.475 0 0 0 1.61-.329l5.017-5.016c.43-.43.555-1.047.33-1.61a1.471 1.471 0 0 0-1.353-.936Z"/>
+  <path stroke="context-stroke" stroke-miterlimit="10" stroke-width="1.5" d="M1.513 14.742 14.297 1.958"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/update-circle.svg b/waterfox/browser/themes/lepton/icons/update-circle.svg
new file mode 100644
index 0000000000000..5a216bd2d8c99
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/update-circle.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.562 4.39a.625.625 0 0 1 .876 0l2.887 2.84a.625.625 0 0 1-.877.891L8 5.711l-2.448 2.41a.625.625 0 1 1-.877-.891z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8 4.21c.345 0 .625.28.625.625v6.535a.625.625 0 1 1-1.25 0V4.835c0-.345.28-.625.625-.625" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8 13.75a5.75 5.75 0 1 0 0-11.5 5.75 5.75 0 0 0 0 11.5M15 8A7 7 0 1 1 1 8a7 7 0 0 1 14 0" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/waterfox/browser/themes/lepton/icons/vertical-line.svg b/waterfox/browser/themes/lepton/icons/vertical-line.svg
new file mode 100644
index 0000000000000..c8d4ad41ab7d1
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/vertical-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M6.275 0h2.158v16H6.275z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/video-clip.svg b/waterfox/browser/themes/lepton/icons/video-clip.svg
new file mode 100644
index 0000000000000..557ca62d390f6
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/video-clip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 2.25H2a.75.75 0 0 0-.75.75v10c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V3a.75.75 0 0 0-.75-.75ZM2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path d="M5.5 10.132V5.869a1 1 0 0 1 1.555-.833l3.197 2.132a1 1 0 0 1 0 1.664l-3.197 2.131a1 1 0 0 1-1.555-.831Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/video-snapshot.svg b/waterfox/browser/themes/lepton/icons/video-snapshot.svg
new file mode 100644
index 0000000000000..51e3d1c81eada
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/video-snapshot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M14 1.25H2a.75.75 0 0 0-.75.75v12c0 .414.336.75.75.75h12a.75.75 0 0 0 .75-.75V2a.75.75 0 0 0-.75-.75ZM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3.63 3.255a.375.375 0 0 0-.375.375v2.188a.625.625 0 1 1-1.25 0V3.63c0-.897.728-1.625 1.625-1.625h2.188a.625.625 0 0 1 0 1.25H3.63Zm5.938-.625c0-.345.28-.625.625-.625h2.187c.897 0 1.625.728 1.625 1.625v2.188a.625.625 0 1 1-1.25 0V3.63a.375.375 0 0 0-.375-.375h-2.188a.625.625 0 0 1-.624-.625ZM2.63 9.568c.345 0 .625.28.625.625v2.187c0 .207.168.375.375.375h2.188a.625.625 0 1 1 0 1.25H3.63a1.625 1.625 0 0 1-1.625-1.625v-2.188c0-.345.28-.624.625-.624Zm10.75 0c.345 0 .625.28.625.625v2.187c0 .897-.728 1.625-1.625 1.625h-2.188a.625.625 0 1 1 0-1.25h2.188a.375.375 0 0 0 .375-.375v-2.188c0-.345.28-.624.625-.624Z" clip-rule="evenodd"/><path d="M5.5 10.132V5.869a1 1 0 0 1 1.555-.833l3.197 2.132a1 1 0 0 1 0 1.664l-3.197 2.131a1 1 0 0 1-1.555-.831Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/video.svg b/waterfox/browser/themes/lepton/icons/video.svg
new file mode 100644
index 0000000000000..bd1356066348a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/video.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12 11.5v.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v.5l2.629-1.451A1 1 0 0 1 16 3.977v8.046a1 1 0 0 1-1.371.928L12 11.5ZM2 3.25h8a.75.75 0 0 1 .75.75v8a.75.75 0 0 1-.75.75H2a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 2 3.25Zm10 6.904 2.75 1.5V4.346L12 5.846v4.308Z" clip-rule="evenodd"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/weather-snowflake.svg b/waterfox/browser/themes/lepton/icons/weather-snowflake.svg
new file mode 100644
index 0000000000000..fe7c53fb7a27c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/weather-snowflake.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8 0c.312 0 .57.232.61.532l.005.083v2.746l1.782-1.565a.615.615 0 0 1 .813.924L8.615 5l-.001 2.384H11l2.28-2.594a.615.615 0 0 1 .796-.11l.073.055a.615.615 0 0 1 .11.795l-.054.073-1.566 1.78h2.745c.311 0 .569.232.61.532L16 8a.616.616 0 0 1-.532.61l-.083.005h-2.747l1.566 1.783a.615.615 0 0 1 .008.804l-.064.065a.615.615 0 0 1-.804.007l-.065-.063L11 8.615l-2.386-.001V11l2.597 2.28a.616.616 0 0 1 .11.796l-.054.073a.616.616 0 0 1-.796.111l-.073-.055-1.783-1.567-.001 2.747a.616.616 0 0 1-.532.61L7.997 16a.616.616 0 0 1-.61-.532l-.005-.083V12.64l-1.779 1.564a.615.615 0 0 1-.813-.924L7.382 11V8.615H5.18l-2.459 2.8a.615.615 0 0 1-.925-.813l1.746-1.987H.615a.616.616 0 0 1-.61-.531L0 8c0-.311.231-.569.532-.61l.083-.005H3.18L1.795 5.807a.615.615 0 0 1 .925-.811l2.096 2.388h2.567V4.998L4.79 2.718a.616.616 0 0 1-.11-.796l.055-.072a.616.616 0 0 1 .795-.111l.073.055 1.78 1.565.002-2.744c0-.283.191-.521.451-.593l.08-.016z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/welcome-back.svg b/waterfox/browser/themes/lepton/icons/welcome-back.svg
new file mode 100644
index 0000000000000..70f9731494dd8
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/welcome-back.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="0" y1="30" x2="60" y2="30">
+      <stop offset="0" style="stop-color: #fd6b0c"/>
+      <stop offset="1" style="stop-color: #e65206"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient)" d="M45.844,41.272c0.018-0.08,0.039-0.156,0.055-0.239c0.097-0.35,0.164-0.735,0.215-1.136 c0.375-0.835,0.747-2.172,0.5-3.936c-0.021-0.326-0.073-0.669-0.14-1.018c4.957-3.957,24.499-20.957,5.137-29.039 c0,0,4.23,6.9-2.898,13.92c-4.332,4.266-5.37,8.436-5.058,11.538c0,0,0.036,0.21,0.096,0.564c-1.62-2.178-5.652-4.53-14.256-2.022 c-8.736,2.544-7.476,4.518-9.234,3.606c0,0-0.93-2.166-3.564-4.452c0,0,0.726-4.416-0.42-5.472 c-1.146-1.062-2.628,2.244-5.346,3.432c-2.712,1.188-6.234,2.928-6.57,6.024l-3.39,2.328c0,0-1.446,0.684-0.81,1.32 c0.636,0.636,1.698,1.44,3.012,1.314c1.314-0.126,2.928-0.51,4.158-0.168c1.23,0.336,2.202,2.67,4.872,6.102 c0,0,2.142,4.542,6.936,5.412c0.036,0.024,0.072,0.054,0.108,0.078c1.404,1.026,4.584,3.336,5.148,3.834 c0.744,0.636,7.422,1.158,9.486,0.474c0,0-0.6-3.408-5.04-1.944c0,0-2.082,0.078-4.59-2.892c0.228-0.072,0.456-0.156,0.69-0.252 c1.056-0.402,2.184-0.966,3.39-1.728c0,0,1.542-0.774,3.846-1.356c0,0,2.497-0.555,4.376,0.455c2.542,1.829,6.483,2.442,12.58-0.566 c0,0,5.357,5.102,7.575,8.644c0,0,4.916-1.89-5.065-11.76C51.643,42.336,47.455,42.801,45.844,41.272z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/whatsnew.svg b/waterfox/browser/themes/lepton/icons/whatsnew.svg
new file mode 100644
index 0000000000000..77080445f62e0
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/whatsnew.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M12.75 10v3a.75.75 0 0 1-.75.75H4a.75.75 0 0 1-.75-.75v-3H2v3a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-3h-1.25ZM13 5.25H3a.75.75 0 0 0-.75.75v1c0 .414.336.75.75.75h10a.75.75 0 0 0 .75-.75V6a.75.75 0 0 0-.75-.75ZM3 4a2 2 0 0 0-2 2v1a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H3Z" clip-rule="evenodd"/><path d="M7 5.25v2.5h2v-2.5H7ZM7 10v3.75h2V10H7ZM8 3.75 6.25 2A1.06 1.06 0 0 1 7.75.5L8 .75 8.25.5A1.06 1.06 0 0 1 9.75 2L8 3.75Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/window-dev-tools.svg b/waterfox/browser/themes/lepton/icons/window-dev-tools.svg
new file mode 100644
index 0000000000000..5d81171878588
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/window-dev-tools.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M2.63.005A2.625 2.625 0 0 0 .005 2.63v7.77a2.625 2.625 0 0 0 2.625 2.624H6.7a1.64 1.64 0 0 1 .15-.173l1.078-1.077H2.63c-.76 0-1.375-.615-1.375-1.375V5.18h11.143A3.5 3.5 0 0 1 13.5 5c.176 0 .346.028.505.08V2.63A2.625 2.625 0 0 0 11.38.005H2.63ZM1.255 2.63c0-.76.616-1.375 1.375-1.375h8.75c.76 0 1.375.616 1.375 1.375v1.298h-11.5V2.63Z" clip-rule="evenodd"/><path d="M12.806 7.46a1.25 1.25 0 0 1 .694-.21.625.625 0 1 0 0-1.25 2.5 2.5 0 0 0-2.154 3.77l-3.788 3.788a.625.625 0 1 0 .884.884l3.788-3.788A2.5 2.5 0 0 0 16 8.5a.625.625 0 1 0-1.25 0 1.25 1.25 0 1 1-1.944-1.04Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/icons/window.svg b/waterfox/browser/themes/lepton/icons/window.svg
new file mode 100644
index 0000000000000..1c3e1b24d4383
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/window.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M13 1 3 1a2 2 0 0 0-2 2l0 9a2 2 0 0 0 2 2l10 0a2 2 0 0 0 2-2l0-9a2 2 0 0 0-2-2zM2.85 2.25l10.3 0 .6.6 0 2.15-11.5 0 0-2.15.6-.6zm10.3 10.5-10.3 0-.6-.6 0-5.9 11.5 0 0 5.9-.6.6z"/>
+</svg>
diff --git a/waterfox/browser/themes/lepton/icons/wrench-filled.svg b/waterfox/browser/themes/lepton/icons/wrench-filled.svg
new file mode 100644
index 0000000000000..4a393e97119d6
--- /dev/null
+++ b/waterfox/browser/themes/lepton/icons/wrench-filled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M8.942 7.058a.625.625 0 0 1 0 .884l-6.87 6.87a.625.625 0 1 1-.884-.884l6.87-6.87a.625.625 0 0 1 .884 0Z" clip-rule="evenodd"/><path d="M14.27 5c.403 0 .737.33.664.726a4 4 0 1 1-4.66-4.66c.397-.073.726.26.726.664 0 .403-.333.72-.72.834a2.54 2.54 0 1 0 3.156 3.156c.114-.387.43-.72.834-.72Z"/></svg>
diff --git a/waterfox/browser/themes/lepton/leptonChrome.css b/waterfox/browser/themes/lepton/leptonChrome.css
new file mode 100644
index 0000000000000..7873d77bdc5b2
--- /dev/null
+++ b/waterfox/browser/themes/lepton/leptonChrome.css
@@ -0,0 +1,30678 @@
+@charset "UTF-8";
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+/** Default Theme - Contrast **************************************************/
+@media -moz-pref("userChrome.theme.built_in_contrast") {
+  /*= Lightmode - Color darker =================================================*/
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] {
+    --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */
+  }
+  @media (-moz-platform: windows) {
+    :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
+    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+      background-color: var(--lwt-accent-color) !important;
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
+    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+      background-color: var(--lwt-accent-color) !important;
+    }
+  }
+  /*= Darkmode - Color lighter =================================================*/
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
+    --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; /* Original: rgba(43, 42, 51, 1) */
+  }
+}
+/** Compatibility Fixes *******************************************************/
+/*= Theme - Compatibility ====================================================*/
+@media -moz-pref("userChrome.compatibility.theme") {
+  /*= Hotfix #98 ===============================================================*/
+  /* Hidden Tab Panel Padding */
+  #allTabsMenu-hiddenTabsView .all-tabs-item {
+    margin-inline: 8px;
+    border-radius: 4px;
+  }
+  /*= Remote Tabs Panel's Bottom Padding =======================================*/
+  #PanelUI-remotetabs #PanelUI-remotetabs-main {
+    margin-bottom: 6px;
+  }
+  /*= Identity Popup Icon Crop =================================================*/
+  .identity-popup-security-connection.identity-button {
+    padding-block: 1px !important;
+  }
+  /*= Zoom in button's plus icon horizontal rate ===============================*/
+  #customization-palette-container #zoom-in-button > .toolbarbutton-icon,
+  #customization-panel-container #zoom-in-button > .toolbarbutton-icon,
+  #widget-overflow-mainView #zoom-in-button > .toolbarbutton-icon {
+    padding-inline-start: 0px !important;
+  }
+  /*= Subview button, Menu's right padding #597 ================================*/
+  .subviewbutton.toolbaritem-combined-buttons:not([shortcut]),
+  .subviewbutton.subviewbutton-nav:not([shortcut]),
+  menu.subviewbutton {
+    padding-inline-end: 0 !important;
+  }
+  #allTabsMenu-allTabsView .subviewbutton.subviewbutton-nav:not([shortcut]) {
+    padding-inline-end: var(--arrowpanel-menuitem-padding-inline) !important;
+  }
+  /*= First visible tab margin at maximized #332 ===============================*/
+  :root:is([tabsintitlebar="true"], [customtitlebar="true"])[sizemode="maximized"] #TabsToolbar {
+    margin-left: -1px;
+  }
+  /*= Disabled menu background color ===========================================*/
+  menuitem[disabled="true"],
+  menu[disabled="true"] {
+    background-color: transparent !important;
+  }
+  /*= Remove Tab Border ========================================================*/
+  @media -moz-pref("userChrome.tab.connect_to_window") {
+    /* TARGET: original, photon */
+    #TabsToolbar:not([brighttext])
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      /* Nightly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
+      border: unset !important;
+    }
+    :root:is(:-moz-lwtheme, [lwtheme])
+      #TabsToolbar[brighttext]
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      /* Nightly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
+      border: unset !important;
+    }
+    :root:is(:-moz-lwtheme, [lwtheme]) #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon,
+    :root:is(:-moz-lwtheme, [lwtheme]) .tab-background[selected] {
+      outline-color: transparent !important;
+    }
+    .keyboard-focused-tab > .tab-stack > .tab-background,
+    .tabbrowser-tab:focus:not([aria-activedescendant]) > .tab-stack > .tab-background {
+      outline: var(--focus-outline) !important;
+    }
+  }
+  /*= Tab Separator Color ======================================================*/
+  #TabsToolbar,
+  #nav-bar {
+    --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent); /* 60% at v105 */
+  }
+  /*= Light Weight Theme =======================================================*/
+  /* Header Image */
+  :root[lwtheme-image] > body {
+    background-image: var(--lwt-header-image) !important; /* Original: var(--lwt-header-image) */
+    background-repeat: no-repeat !important;
+    background-position: right top !important;
+    background-color: var(--lwt-accent-color, Window) !important;
+  }
+  :root[lwtheme-image] > body:-moz-window-inactive {
+    background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
+  }
+  @media (min-width: 2500px) {
+    :root[lwtheme-image] > body {
+      background-size: contain;
+    }
+    @media -moz-pref("userChrome.compatibility.covered_header_image") {
+      :root[lwtheme-image] > body {
+        background-size: cover;
+      }
+    }
+  }
+  :root[lwtheme-image] > body :root:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox {
+    background-image: var(--lwt-header-image), var(--lwt-additional-images) !important;
+    background-repeat: var(--lwt-background-tiling) !important;
+    background-position: var(--lwt-background-alignment) !important;
+    background-color: unset !important; /* Original:  var(--lwt-accent-color) */
+  }
+  /* Navbar Border */
+  :root:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox {
+    --tabs-border-color: rgba(0, 0, 0, 0.4); /* Legacy: v96, (0, 0, 0, 0.3) -> (0, 0, 0, 0.4)  */
+    --lwt-tabs-border-color: rgba(0, 0, 0, 0.4);
+  }
+  #main-window {
+    background-color: WindowFrame !important;
+  }
+  :root[lwtheme][lwtheme-image] #customization-container {
+    background-image: none !important;
+  }
+  #customization-container {
+    background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */
+  }
+  :root:not([lwtheme]) #customization-container {
+    background-color: var(--toolbar-non-lwt-bgcolor) !important;
+  }
+  /*= Findbar Border Color =====================================================*/
+  html|input.findbar-textbox {
+    border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */
+  }
+  /*= Drop Indicator Color #473 ================================================*/
+  treechildren::-moz-tree-cell-text(primary, dropOn),
+  treechildren::-moz-tree-drop-feedback,
+  vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] {
+    background-color: var(
+      --button-primary-bgcolor,
+      var(--focus-outline-color)
+    ) !important; /* Original: SelectedItem or AccentColor*/
+  }
+  #bookmarksPanel[lwt-sidebar="true"] {
+    --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important;
+  }
+  /*= Firefox View Border #498 =================================================*/
+  :root:not([privatebrowsingmode="temporary"])[firefoxviewhidden] #firefox-view-button + #tabbrowser-tabs {
+    border-inline-start: none !important;
+    padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important;
+    margin-inline-start: 0 !important;
+  }
+  @media -moz-pref("userChrome.tab.static_separator") {
+    #tabbrowser-tabs {
+      border-inline-start: none !important;
+      padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important;
+      margin-inline-start: 0 !important;
+    }
+  }
+  /*= Menubar rounding #814 ====================================================*/
+  #main-menubar {
+    --panel-border-radius: var(--arrowpanel-border-radius);
+  }
+  /*= Infobar Align #858 =======================================================*/
+  .container.infobar {
+    align-items: center !important;
+  }
+  /*= Inactive transparent #882 ================================================*/
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+    color: color-mix(in srgb, currentColor calc(var(--inactive-titlebar-opacity, 0.75) * 100%), transparent) !important;
+    --inactive-toolbarbutton-icon-fill-opacity: calc(
+      var(--toolbarbutton-icon-fill-opacity, 1) * var(--inactive-titlebar-opacity, 0.75)
+    );
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .toolbarbutton-icon,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .toolbarbutton-icon,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .toolbarbutton-icon {
+    fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1);
+  }
+  /*= Tabpreviw transparent #890 ===============================================*/
+  #tab-preview-panel {
+    --panel-background: var(
+      --arrowpanel-background
+    ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */
+    --panel-color: var(
+      --arrowpanel-color
+    ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */
+  }
+  /*= Design token =============================================================*/
+  :root,
+  :host {
+    --button-color: var(--button-text-color);
+    --button-bgcolor: var(--button-background-color);
+    --button-hover-bgcolor: var(--button-background-color-hover);
+    --button-active-bgcolor: var(--button-background-color-active);
+    --button-primary-color: var(--button-text-color-primary);
+    --button-primary-bgcolor: var(--button-background-color-primary);
+    --button-primary-hover-bgcolor: var(--button-background-color-primary-hover);
+    --button-primary-active-bgcolor: var(--button-background-color-primary-active);
+  }
+}
+/*= OS - Compatibility =======================================================*/
+@media -moz-pref("userChrome.compatibility.os") {
+  /*= Windows 10 - Top border of accent color at ESR #358 ======================*/
+  @media (-moz-platform: windows) {
+    :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+      border-top: 0.5px solid rgb(47, 47, 47) !important;
+    }
+    :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]):-moz-window-inactive #navigator-toolbox {
+      border-top-color: rgb(57, 57, 57) !important;
+    }
+  }
+  @media (-moz-platform: windows) and (-moz-windows-accent-color-in-titlebar) {
+    :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+      border-top-color: ActiveBorder !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+        border-top-color: -moz-accent-color !important;
+      }
+    }
+  }
+  /*= Windows 7, 8 - Tab Bar Background *****************************************/
+  /*= Windows 7, 8 - Menu Bar ==================================================*/
+  /*= Windows - Native Menu ====================================================*/
+  @media (-moz-gtk-csd-available) {
+    /*= Linux - Global Menubar Active Color ====================================*/
+    #main-menubar > menu[open="true"],
+    #main-menubar > menu[_moz-menuactive="true"] {
+      color: inherit !important; /* Original: -moz-menubarhovertext */
+      background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
+    }
+  }
+  /*= Linux - Light System Default Theme's Selected Tab ========================*/
+  @media (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
+    /* Because of
+      #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected], [multiselected]) > .tab-stack > .tab-background {
+        border: 1px solid var(--tab-line-color, rgba(128,128,142,0.9));
+        box-shadow: 0 0 4px rgba(128,128,142,0.5);
+      }
+     */
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      box-shadow: 0 0 4px rgba(128, 128, 142, 0.5) !important;
+    }
+    #TabsToolbar:not([brighttext])
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      box-shadow: 0 0 1px var(--tab-line-color, rgba(128, 128, 142, 0.9)), 0 0 4px rgba(128, 128, 142, 0.5) !important;
+    }
+  }
+  /*= Titlebar Container Size at maximized #384 ================================*/
+  @media (-moz-platform: windows) {
+    @media not -moz-pref("userChrome.compatibility.os.windows_maximized") {
+      :root:is([tabsintitlebar], [customtitlebar]) #titlebar {
+        /* -moz-default-appearance: -moz-window-titlebar */
+        appearance: none !important;
+      }
+    }
+    @media -moz-pref("userChrome.compatibility.os.windows_maximized") {
+      :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #titlebar {
+        appearance: none !important;
+        padding-top: 8px;
+      }
+    }
+  }
+  /*= Windows - Classic Theme #734 =============================================*/
+  /*= MacOS Fullscreen clipping #1045 ==========================================*/
+  :root[sizemode="fullscreen"][macOSNativeFullscreen]:not([inDOMFullscreen="true"]) #TabsToolbar {
+    min-height: var(--tab-min-height, fit-content) !important;
+  }
+}
+/*= Others - Compatibility ===================================================*/
+@media -moz-pref("userChrome.compatibility.panel_cutoff") {
+  #appMenu-popup panelview {
+    width: 24.5em !important; /* can modify panel width, Original: 22.5em */
+  }
+}
+@media -moz-pref("userChrome.compatibility.navbar_top_border") {
+  #nav-bar {
+    box-shadow: none !important;
+  }
+}
+/** Theme *********************************************************************/
+/*= System Default Theme =====================================================*/
+@media -moz-pref("userChrome.theme.system_default") {
+  /*= Common - URL Bar focus color =============================================*/
+  @media (-moz-windows-accent-color-in-titlebar), (-moz-gtk-csd-available) {
+    /* URL Bar */
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+      --focus-outline-color: AccentColor !important;
+    }
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #urlbar[open]
+      > #urlbar-background,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      #urlbar[open]
+      > #urlbar-background {
+      border-color: color-mix(
+        in srgb,
+        AccentColor 50%,
+        transparent
+      ) !important; /* Like: --toolbar-field-focus-border-color */
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+        --focus-outline-color: -moz-accent-color !important;
+      }
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        #urlbar[open]
+        > #urlbar-background,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        #urlbar[open]
+        > #urlbar-background {
+        border-color: color-mix(
+          in srgb,
+          -moz-accent-color 50%,
+          transparent
+        ) !important; /* Like: --toolbar-field-focus-border-color */
+      }
+    }
+  }
+  /*= Windows7 - Aero Based Theme ==============================================*/ /*= Windows10 - UWP like color ===============================================*/
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+      --win-text-color: rgba(0, 0, 0);
+      --win-bgcolor: rgb(204, 204, 204);
+      --win-disabled-color: rgb(145, 145, 145);
+      --win-disabled-bgcolor: transparent;
+      --win-hover-bgcolor: rgb(218, 218, 218); /* also button-bgcolor */
+      --win-hover-active-bgcolor: #c2c2c2; /* also button-hover-bgcolor */
+      --win-button-hover-bgcolor: rgba(218, 218, 218, 0.66);
+      --win-button-active-bgcolor: #aaaaaa;
+      --win-field-bgcolor: #ffffff;
+      --win-component-bgcolor: #f2f2f2;
+      --win-border-color: #8a8a8a;
+      --win-tab-separator-color: #a3a3a3;
+      --win-sidebar-bgcolor: #e6e6e6;
+      --win-sidebar-hover-bgcolor: #cfcfcf;
+      --win-sidebar-button-hover-bgcolor: #b8b8b8;
+      --win-sidebar-button-hover-active-bgcolor: #a3a3a3;
+      --win-button-border: #747474;
+      --win-shortcut-text-color: #757575;
+      --win-error-color: #b31616;
+      --win-red-border-color: #ff4343;
+      --win-accent-foreground-color: AccentColorText;
+      --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, AccentColor);
+      --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, AccentColor);
+      --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, AccentColor);
+      --win-accent-active-color: AccentColor;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+        --win-accent-foreground-color: -moz-accent-color-foreground;
+        --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color);
+        --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color);
+        --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color);
+        --win-accent-active-color: -moz-accent-color;
+      }
+    }
+    @media -moz-pref("userChrome.compatibility.os.win11") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+        --win-text-color: #1a1a1a;
+        --win-bgcolor: #e8e8e8;
+        --win-hover-bgcolor: #eaeaea; /* also button-bgcolor */
+        --win-disabled-color: #9f9f9f;
+        --win-hover-active-bgcolor: #d9d9d9; /* also button-active-color */
+        --win-button-hover-bgcolor: #d9d9d9;
+        --win-button-active-bgcolor: rgba(46, 46, 46, 0.66);
+        --win-component-bgcolor: #f8f8f8;
+        --win-border-color: #e9e9e9;
+        --win-tab-separator-color: #dadada;
+        --win-sidebar-bgcolor: #ffffff;
+        --win-button-border: var(--win-border-color);
+        --win11-chrome-separator-color: #d6d6d6;
+        --win11-tab-border-color: #dadada;
+      }
+    }
+    /*- Separator --------------------------------------------------------------*/
+    /*- Proton Tab Selected ----------------------------------------------------*/
+    /*- Menu -------------------------------------------------------------------*/
+    /*- Toolbar ----------------------------------------------------------------*/
+    /*- Sidebar ----------------------------------------------------------------*/
+    /*- Panel ------------------------------------------------------------------*/
+    /*- Others -----------------------------------------------------------------*/
+    /* For overwrite */
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      --win-text-color: #ffffff;
+      --win-bgcolor: #2b2b2b;
+      --win-disabled-color: #747474;
+      --win-disabled-bgcolor: transparent;
+      --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */
+      --win-hover-active-bgcolor: #454545; /* also button-active-color */
+      --win-button-hover-bgcolor: rgba(46, 46, 46, 0.66);
+      --win-button-active-bgcolor: #515151;
+      --win-field-bgcolor: #373737;
+      --win-component-bgcolor: #171717;
+      --win-border-color: #5b5b5b;
+      --win-tab-separator-color: #555555;
+      --win-sidebar-bgcolor: #1f1f1f;
+      --win-sidebar-hover-bgcolor: #353535;
+      --win-sidebar-button-hover-bgcolor: #353535;
+      --win-sidebar-button-hover-active-bgcolor: #4c4c4c;
+      --win-button-border: #8f8f8f;
+      --win-shortcut-text-color: #adadad;
+      --win-error-color: #ffb900;
+      --win-red-border-color: #ff4343;
+      --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, AccentColor);
+      --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, AccentColor);
+      --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, AccentColor);
+      --win-accent-active-color: AccentColor;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, -moz-accent-color);
+        --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, -moz-accent-color);
+        --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, -moz-accent-color);
+        --win-accent-active-color: -moz-accent-color;
+      }
+    }
+    @media -moz-pref("userChrome.compatibility.os.win11") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --win-bgcolor: #202020;
+        --win-hover-bgcolor: #383838; /* also button-bgcolor */
+        --win-disabled-color: #797979;
+        --win-hover-active-bgcolor: #454545; /* also button-active-color */
+        --win-button-hover-bgcolor: #454545;
+        --win-button-active-bgcolor: rgba(46, 46, 46, 0.66);
+        --win-field-bgcolor: #232323;
+        --win-component-bgcolor: #2c2c2c;
+        --win-border-color: #3d3d3d;
+        --win-tab-separator-color: #323232;
+        --win-sidebar-bgcolor: var(--win-component-bgcolor);
+        --win-button-border: var(--win-border-color);
+        --win11-chrome-separator-color: #3a3a3a;
+        --win11-tab-border-color: #1d1d1d;
+      }
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      /* Text, Icon Color */
+      --menu-color: var(--win-text-color) !important;
+      --lwt-text-color: var(--win-text-color) !important;
+      --button-color: var(--win-text-color) !important;
+      --input-color: var(--win-text-color) !important;
+      --toolbar-color: var(--win-text-color) !important;
+      --toolbar-non-lwt-textcolor: var(--win-text-color) !important;
+      --toolbarbutton-icon-fill: var(--win-text-color) !important;
+      --toolbar-field-focus-color: var(--win-text-color) !important;
+      --urlbar-popup-action-color: var(--win-text-color) !important;
+      --toolbar-field-color: var(--win-text-color) !important;
+      --autocomplete-popup-highlight-color: var(--win-text-color) !important;
+      --tab-icon-overlay-fill: var(--win-text-color) !important;
+      --panel-banner-item-color: var(--win-text-color) !important;
+      --arrowpanel-color: var(--win-text-color) !important;
+      --autocomplete-popup-color: var(--win-text-color) !important;
+      /* Text Disabled Color */
+      --menu-disabled-color: var(--win-disabled-color) !important;
+      --checkbox-unchecked-active-bgcolor: var(--win-disabled-color) !important;
+      --panel-disabled-color: var(--win-disabled-color) !important;
+      --download-progress-paused-color: var(--win-disabled-color) !important;
+      /* Text Shortcut Color */
+      --panel-shortcut-color: var(--win-shortcut-text-color) !important;
+      --panel-description-color: var(--win-shortcut-text-color) !important;
+      /* Title Background */
+      --lwt-accent-color: var(--win-bgcolor) !important;
+      --toolbar-field-border-color: var(--win-bgcolor) !important;
+      --chrome-content-separator-color: var(--win-bgcolor) !important;
+      /* Component Background Color */
+      --menu-background-color: var(--win-component-bgcolor) !important;
+      --toolbar-bgcolor: var(--win-component-bgcolor) !important;
+      --toolbar-non-lwt-bgcolor: var(--win-component-bgcolor) !important;
+      --arrowpanel-background: var(--win-component-bgcolor) !important;
+      --autocomplete-popup-background: var(--win-component-bgcolor) !important;
+      /* Border Color */
+      /* Separator */
+      --toolbarseparator-color: var(--win-tab-separator-color) !important;
+      /* Field Background Color */
+      --input-bgcolor: var(--win-field-bgcolor) !important;
+      --toolbar-field-background-color: var(--win-field-bgcolor) !important;
+      --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important;
+      --tab-icon-overlay-stroke: var(--win-field-bgcolor) !important;
+      /* Hover Background Color, Button Color  */
+      --menuitem-hover-background-color: var(--win-hover-bgcolor) !important;
+      --toolbarbutton-hover-background: var(--win-hover-bgcolor) !important;
+      --button-bgcolor: var(--win-hover-bgcolor) !important;
+      --panel-banner-item-background-color: var(--win-hover-bgcolor) !important;
+      /* Hover Active, Button Hover Color */
+      --checkbox-unchecked-bgcolor: var(--win-hover-active-bgcolor) !important;
+      --urlbar-box-bgcolor: var(--win-hover-active-bgcolor) !important;
+      --urlbar-box-focus-bgcolor: var(--win-hover-active-bgcolor) !important;
+      --toolbarbutton-active-background: var(--win-hover-active-bgcolor) !important;
+      --urlbar-box-active-bgcolor: var(--win-hover-active-bgcolor) !important;
+      --autocomplete-popup-highlight-background: var(--win-hover-active-bgcolor) !important;
+      --panel-banner-item-hover-bgcolor: var(--win-hover-active-bgcolor) !important;
+      /* Button Hover Active Color */
+      --button-active-bgcolor: var(--win-button-active-bgcolor) !important;
+      --panel-banner-item-active-bgcolor: var(--win-button-active-bgcolor) !important;
+      /* Disabled Background Color */
+      --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important;
+      /* Button Hover Color */
+      --button-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+      --checkbox-unchecked-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+      --urlbar-box-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+      --autocomplete-popup-hover-background: var(--win-button-hover-bgcolor) !important;
+      /* Button Border Color */
+      --checkbox-border-color: var(--win-button-border) !important;
+      --input-border-color: var(--win-button-border) !important;
+      --autocomplete-popup-separator-color: var(--win-button-border) !important;
+      /* Accent Foreground Color */
+      --button-primary-color: var(--win-accent-foreground-color) !important;
+      --checkbox-checked-color: var(--win-accent-foreground-color) !important;
+      /* Accent Color */
+      --button-primary-bgcolor: var(--win-accent-color) !important;
+      --focus-outline-color: var(--win-accent-color) !important;
+      --checkbox-checked-bgcolor: var(--win-accent-color) !important;
+      /* Accent Content Color */
+      --toolbarbutton-icon-fill-attention: var(--win-accent-content-color) !important;
+      --urlbar-popup-url-color: var(--win-accent-content-color) !important;
+      --download-progress-fill-color: var(--win-accent-content-color) !important;
+      /* Accent Hover Color */
+      --button-primary-hover-bgcolor: var(--win-accent-hover-color) !important;
+      --checkbox-checked-hover-bgcolor: var(--win-accent-hover-color) !important;
+      /* Accent Hover Active Color */
+      --button-primary-active-bgcolor: var(--win-accent-active-color) !important;
+      --checkbox-checked-active-bgcolor: var(--win-accent-active-color) !important;
+      /* Error Color */
+      --error-text-color: var(--win-error-color) !important;
+      --input-error-border-color: var(--win-error-color) !important;
+      /* Others */
+      --tab-line-color: AccentColor !important;
+      --tab-selected-bgcolor: unset !important;
+      --tabs-border-color: transparent !important;
+      --checkbox-checked-border-color: transparent !important;
+      /* Other Defaults */
+      --arrowpanel-dimmed: color-mix(in srgb, currentColor 12%, transparent) !important;
+      --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 20%, transparent) !important;
+      --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 27%, transparent) !important;
+      --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important;
+      --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --tab-line-color: Highlight !important;
+      }
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #navigator-toolbox {
+      background: var(--lwt-accent-color) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(#main-window):is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+      --arrowpanel-border-color: var(--win-bgcolor) !important;
+      --panel-separator-color: var(--win-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+    :root:is(#main-window):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      --arrowpanel-border-color: var(--win-border-color) !important;
+      --panel-separator-color: var(--win-border-color) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    @media -moz-pref("userChrome.theme.system_default") {
+      @media (-moz-platform: windows) and (-moz-windows-accent-color-in-titlebar) {
+        :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(
+            :not([lwtheme]),
+            :not(:-moz-lwtheme)
+          ),
+        :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+          --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* As default */
+        }
+      }
+    }
+  }
+  @media (-moz-platform: windows) {
+    @media -moz-pref("userChrome.compatibility.os.win11") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --chrome-content-separator-color: var(--win11-chrome-separator-color) !important;
+      }
+      #nav-bar {
+        --lwt-tabs-border-color: var(--win11-tab-border-color) !important;
+      }
+    }
+  }
+  @media (-moz-platform: windows) {
+    @media not -moz-pref("userChrome.tab.color_like_toolbar") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --win-proton-tab-selected-bgcolor: color-mix(in srgb, var(--win-bgcolor) 5%, var(--win-component-bgcolor));
+      }
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+        --tab-selected-color: var(--win-proton-tab-selected-bgcolor) !important;
+      }
+      :root[lwt-default-theme-in-dark-mode] {
+        --lwt-selected-tab-background-color: var(--win-proton-tab-selected-bgcolor) !important;
+      }
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) html#main-window menupopup {
+      --menu-color: var(--win-text-color) !important;
+      --menu-background-color: var(--win-component-bgcolor) !important;
+      --menu-border-color: var(--win-bgcolor) !important;
+      --menuitem-hover-background-color: var(--win-hover-bgcolor) !important;
+      --menu-disabled-color: var(--win-disabled-color) !important;
+      --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+    :root[lwt-default-theme-in-dark-mode] #titlebar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+    :root[lwt-default-theme-in-dark-mode] #toolbar-menubar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar,
+    :root[lwt-default-theme-in-dark-mode] #TabsToolbar {
+      --button-hover-bgcolor: var(--win-sidebar-button-hover-bgcolor);
+      --button-active-bgcolor: var(--win-sidebar-button-hover-active-bgcolor);
+      --toolbarbutton-hover-background: var(--win-sidebar-button-hover-bgcolor);
+      --toolbarbutton-active-background: var(--win-sidebar-button-hover-active-bgcolor);
+    }
+  }
+  @media (-moz-platform: windows) {
+    #sidebar-box:not([lwt-sidebar]) {
+      appearance: none !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #sidebar-box,
+    :root[lwt-default-theme-in-dark-mode] #sidebar-box {
+      --sidebar-background-color: var(--win-sidebar-bgcolor) !important;
+      --sidebar-text-color: var(--win-text-color) !important;
+      --sidebar-border-color: var(--win-border-color) !important;
+    }
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+    .sidebar-panel[style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+    html[lwt-sidebar][style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+    body[lwt-sidebar][style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] {
+      /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */
+      --lwt-sidebar-background-color: var(--win-sidebar-bgcolor) !important;
+      --lwt-sidebar-text-color: var(--win-text-color) !important;
+      --panel-separator-color: var(--win-border-color) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .subviewbutton,
+    :root[lwt-default-theme-in-dark-mode] .subviewbutton {
+      --button-hover-bgcolor: var(--win-hover-active-bgcolor) !important;
+      --button-active-bgcolor: var(--win-button-active-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      toolbarbutton.subviewbutton:not(
+        [disabled],
+        [open],
+        :active,
+        #appMenu-fxa-label2,
+        #appMenu-zoomReduce-button2,
+        #appMenu-zoomReset-button2,
+        #appMenu-zoomEnlarge-button2,
+        #appMenu-fullscreen-button2,
+        .unified-extensions-item-menu-button
+      ):is(:hover),
+    :root[lwt-default-theme-in-dark-mode]
+      toolbarbutton.subviewbutton:not(
+        [disabled],
+        [open],
+        :active,
+        #appMenu-fxa-label2,
+        #appMenu-zoomReduce-button2,
+        #appMenu-zoomReset-button2,
+        #appMenu-zoomEnlarge-button2,
+        #appMenu-fullscreen-button2,
+        .unified-extensions-item-menu-button
+      ):is(:hover) {
+      background-color: var(--win-hover-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      toolbarbutton.subviewbutton:not(
+        [disabled],
+        #appMenu-fxa-label2,
+        #appMenu-zoomReduce-button2,
+        #appMenu-zoomReset-button2,
+        #appMenu-zoomEnlarge-button2,
+        #appMenu-fullscreen-button2
+      ):is([open], :hover:active),
+    :root[lwt-default-theme-in-dark-mode]
+      toolbarbutton.subviewbutton:not(
+        [disabled],
+        #appMenu-fxa-label2,
+        #appMenu-zoomReduce-button2,
+        #appMenu-zoomReset-button2,
+        #appMenu-zoomEnlarge-button2,
+        #appMenu-fullscreen-button2
+      ):is([open], :hover:active) {
+      background-color: var(--win-hover-active-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+      /* Light Theme */
+      --lwt-accent-color: var(--win-bgcolor) !important;
+    }
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+    :root[lwt-default-theme-in-dark-mode][lwthemetextcolor="bright"] {
+      --toolbar-bgcolor: var(--win-component-bgcolor) !important; /* Original: rgba(43, 42, 51, 1) */
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([movingtab])
+      > #pinned-tabs-container
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]),
+    :root[lwtheme-mozlightdark]
+      #tabbrowser-tabs:not([movingtab])
+      > #pinned-tabs-container
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]),
+    :root:is(
+        [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+        [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+      )
+      #tabbrowser-tabs:not([movingtab])
+      > #pinned-tabs-container
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]),
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([movingtab])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]),
+    :root[lwtheme-mozlightdark]
+      #tabbrowser-tabs:not([movingtab])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]),
+    :root:is(
+        [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+        [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+      )
+      #tabbrowser-tabs:not([movingtab])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[multiselected]:not([selected]) {
+      background-image: linear-gradient(
+          color-mix(in srgb, currentColor 11%, transparent),
+          color-mix(in srgb, currentColor 11%, transparent)
+        ),
+        linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important;
+    }
+  }
+  /*= Windows10 - Titlebar accent color ========================================*/
+  @media (-moz-windows-accent-color-in-titlebar) {
+    /* Tab Bar */
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      .titlebar-color,
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      .browser-titlebar,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      .titlebar-color,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      .browser-titlebar {
+      color: AccentColorText !important;
+      background-color: AccentColor !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        .titlebar-color,
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        .browser-titlebar,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        .titlebar-color,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        .browser-titlebar {
+        color: -moz-accent-color-foreground !important;
+        background-color: -moz-accent-color !important;
+      }
+    }
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      .toolbar-items,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      .toolbar-items {
+      --toolbarbutton-icon-fill: currentColor;
+      --toolbarbutton-hover-background: color-mix(in srgb, AccentColorText 10%, transparent);
+      --toolbarbutton-active-background: color-mix(in srgb, AccentColorText 15%, transparent);
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        .toolbar-items,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        .toolbar-items {
+        --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent);
+        --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent);
+      }
+    }
+  }
+  /*= GTK - URL View url accent color ==========================================*/
+  @media (-moz-gtk-csd-available) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+      --toolbar-field-background-color: Field !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-border-color: ThreeDShadow !important;
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .urlbarView-url {
+      --urlbar-popup-url-color: AccentColor;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .urlbarView-url {
+        --urlbar-popup-url-color: -moz-accent-color;
+      }
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #urlbar-background,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #searchbar {
+      background-color: var(--toolbar-field-background-color) !important;
+    }
+  }
+  /*= Mac - Default like color =================================================*/
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      /* Colors */
+      --mac-text-color: -moz-dialogtext;
+      --mac-disabled-color: GrayText;
+      --mac-bgcolor: Window;
+      --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field);
+      --mac-field-bgcolor: Window;
+      --mac-panel-bgcolor: Menu;
+      --mac-sidebar-bgcolor: Window;
+      --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor));
+      --mac-hover-bgcolor: Window;
+      --mac-disabled-bgcolor: transparent;
+      --mac-primary-button-color: AccentColorText; /* or -moz-mac-menutextselect */
+      --mac-accent-color: AccentColor; /* or LinkText */
+      --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, AccentColor);
+      --mac-accent-hover-color: color-mix(
+        in srgb,
+        rgb(0, 0, 0) 10%,
+        AccentColor
+      ); /* or -moz-mac-menuselect, Highlight */
+      --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, AccentColor); /* or ActiveBorder */
+      /* Text, Icon Color */
+      --menu-color: var(--mac-text-color) !important;
+      --lwt-text-color: var(--mac-text-color) !important;
+      --button-color: var(--mac-text-color) !important;
+      --input-color: var(--mac-text-color) !important;
+      --toolbar-color: var(--mac-text-color) !important;
+      --toolbar-non-lwt-textcolor: var(--mac-text-color) !important;
+      --toolbarbutton-icon-fill: var(--mac-text-color) !important;
+      --toolbar-field-focus-color: var(--mac-text-color) !important;
+      --urlbar-popup-action-color: var(--mac-text-color) !important;
+      --toolbar-field-color: var(--mac-text-color) !important;
+      --autocomplete-popup-highlight-color: var(--mac-text-color) !important;
+      --tab-icon-overlay-fill: var(--mac-text-color) !important;
+      --panel-banner-item-color: var(--mac-text-color) !important;
+      --arrowpanel-color: var(--mac-text-color) !important;
+      --autocomplete-popup-color: var(--mac-text-color) !important;
+      --panel-shortcut-color: var(--mac-text-color) !important;
+      --panel-description-color: var(--mac-text-color) !important;
+      /* Text Disabled Color */
+      --menu-disabled-color: var(--mac-disabled-color) !important;
+      --button-active-bgcolor: var(--mac-disabled-color) !important;
+      --checkbox-unchecked-active-bgcolor: var(--mac-disabled-color) !important;
+      --panel-disabled-color: var(--mac-disabled-color) !important;
+      --download-progress-paused-color: var(--mac-disabled-color) !important;
+      /* Background Color */
+      --lwt-accent-color: var(--mac-bgcolor) !important;
+      --menu-background-color: var(--mac-bgcolor) !important;
+      --autocomplete-popup-background: var(--mac-bgcolor) !important;
+      /* Selected Background Color */
+      --toolbar-bgcolor: var(--mac-selected-bgcolor) !important;
+      --toolbar-non-lwt-bgcolor: var(--mac-selected-bgcolor) !important;
+      /* Field Background Color */
+      --input-bgcolor: var(--mac-field-bgcolor) !important;
+      --toolbar-field-background-color: var(--mac-field-bgcolor) !important;
+      --tab-icon-overlay-stroke: var(--mac-field-bgcolor) !important;
+      /* Panel Background Color */
+      --arrowpanel-background: var(--mac-panel-bgcolor) !important;
+      /* Hover Background Color  */
+      --menuitem-hover-background-color: var(--mac-hover-bgcolor) !important;
+      --toolbarbutton-hover-background: var(--mac-hover-bgcolor) !important;
+      --panel-banner-item-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+      --button-bgcolor: var(--mac-hover-bgcolor) !important;
+      --checkbox-unchecked-bgcolor: var(--mac-hover-bgcolor) !important;
+      --panel-banner-item-background-color: var(--mac-hover-bgcolor) !important;
+      --urlbar-box-bgcolor: var(--mac-hover-bgcolor) !important;
+      --urlbar-box-focus-bgcolor: var(--mac-hover-bgcolor) !important;
+      --panel-banner-item-active-bgcolor: var(--mac-hover-bgcolor) !important;
+      --toolbarbutton-active-background: var(--mac-hover-bgcolor) !important;
+      --urlbar-box-active-bgcolor: var(--mac-hover-bgcolor) !important;
+      --autocomplete-popup-highlight-background: var(--mac-hover-bgcolor) !important;
+      --button-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+      --checkbox-unchecked-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+      --urlbar-box-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+      --autocomplete-popup-hover-background: var(--mac-hover-bgcolor) !important;
+      /* Disabled Background Color */
+      --menuitem-disabled-hover-background-color: var(--mac-disabled-bgcolor) !important;
+      /* Border Color */
+      /*
+        --menu-border-color: var(--mac-bgcolor) !important;
+        --toolbar-field-border-color: var(--mac-bgcolor) !important;
+        --arrowpanel-border-color: var(--mac-bgcolor) !important;
+        --chrome-content-separator-color: var(--mac-bgcolor) !important;
+        --toolbarseparator-color: var(--mac-bgcolor) !important;
+        --panel-separator-color: var(--mac-bgcolor) !important;
+       */
+      /* Button Border Color */
+      /*
+        --tab-line-color: var(---mac-bgcolor) !important;
+        --checkbox-border-color: var(--mac-bgcolor) !important;
+        --input-border-color: var(--mac-bgcolor) !important;
+        --autocomplete-popup-separator-color: var(--mac-bgcolor) !important;
+       */
+      /* Accent Color Foreground */
+      --button-primary-color: var(--mac-primary-button-color) !important;
+      --checkbox-checked-color: var(--mac-primary-button-color) !important;
+      /* Accent Color */
+      --button-primary-bgcolor: var(--mac-accent-color) !important;
+      --focus-outline-color: var(--mac-accent-color) !important;
+      --checkbox-checked-bgcolor: var(--mac-accent-color) !important;
+      /* Accent Content Color */
+      --toolbarbutton-icon-fill-attention: var(--mac-accent-content-color) !important;
+      --urlbar-popup-url-color: var(--mac-accent-content-color) !important;
+      --download-progress-fill-color: var(--mac-accent-content-color) !important;
+      /* Accent Hover Color */
+      --button-primary-hover-bgcolor: var(--mac-accent-hover-color) !important;
+      --checkbox-checked-hover-bgcolor: var(--mac-accent-hover-color) !important;
+      /* Accent Hover Active Color */
+      --button-primary-active-bgcolor: var(--mac-accent-active-color) !important;
+      --checkbox-checked-active-bgcolor: var(--mac-accent-active-color) !important;
+      /* Error Color */
+      /*
+        --error-text-color: var(--win-error-color) !important;
+        --input-error-border-color: var(--win-error-color) !important;
+       */
+      /* Others */
+      --tab-selected-bgcolor: unset !important;
+      --tabs-border-color: transparent !important;
+      --checkbox-checked-border-color: transparent !important;
+      /* Other Defaults */
+      --arrowpanel-dimmed: color-mix(in srgb, currentColor 12%, transparent) !important;
+      --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 20%, transparent) !important;
+      --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 27%, transparent) !important;
+      --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important;
+      --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --mac-primary-button-color: -moz-accent-color-foreground; /* or -moz-mac-menutextselect */
+        --mac-accent-color: -moz-accent-color; /* or LinkText */
+        --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color);
+        --mac-accent-hover-color: color-mix(
+          in srgb,
+          rgb(0, 0, 0) 10%,
+          -moz-accent-color
+        ); /* or -moz-mac-menuselect, Highlight */
+        --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); /* or ActiveBorder */
+      }
+    }
+    @media (prefers-color-scheme: dark) {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --mac-field-bgcolor: Field;
+        --mac-panel-bgcolor: -moz-CellHighlight;
+        --mac-hover-bgcolor: ButtonFace;
+        --toolbar-field-focus-background-color: var(--mac-bgcolor) !important;
+        --toolbar-field-background-color: var(--mac-sidebar-bgcolor) !important;
+      }
+    }
+    /*- Proton Tab Selected ----------------------------------------------------*/
+    @media not -moz-pref("userChrome.tab.color_like_toolbar") {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+      :root[lwt-default-theme-in-dark-mode] {
+        --mac-proton-tab-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 20%, -moz-dialog);
+      }
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+        --tab-selected-color: var(--mac-proton-tab-selected-bgcolor) !important;
+      }
+      :root[lwt-default-theme-in-dark-mode] {
+        --lwt-selected-tab-background-color: var(--mac-proton-tab-selected-bgcolor) !important;
+      }
+    }
+    /*- Toolbar ----------------------------------------------------------------*/
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #navigator-toolbox,
+    :root[lwt-default-theme-in-dark-mode] #navigator-toolbox {
+      background-color: var(--mac-bgcolor) !important;
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar {
+      --mac-hover-bgcolor: ButtonFace;
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+    :root[lwt-default-theme-in-dark-mode] #titlebar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+    :root[lwt-default-theme-in-dark-mode] #toolbar-menubar,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar,
+    :root[lwt-default-theme-in-dark-mode] #TabsToolbar {
+      --button-hover-bgcolor: var(--mac-hover-bgcolor);
+      --button-active-bgcolor: var(--mac-hover-bgcolor);
+      --toolbarbutton-hover-background: var(--mac-hover-bgcolor);
+      --toolbarbutton-active-background: var(--mac-hover-bgcolor);
+      /* Prevent transparent tabbar at fullscreen hover #312 */
+      background: var(--mac-bgcolor);
+    }
+    :root[lwt-default-theme-in-dark-mode] #urlbar {
+      --autocomplete-popup-highlight-background: var(--mac-hover-bgcolor) !important;
+      --autocomplete-popup-hover-background: var(--mac-hover-bgcolor) !important;
+    }
+    /*- Sidebar ----------------------------------------------------------------*/
+    #sidebar-box:not([lwt-sidebar]) {
+      appearance: none !important;
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #sidebar-box,
+    :root[lwt-default-theme-in-dark-mode] #sidebar-box {
+      --sidebar-background-color: var(--mac-sidebar-bgcolor) !important;
+      --sidebar-text-color: var(--mac-text-color) !important;
+      /* --sidebar-border-color: var(--win-sidebar-border-color) !important; */
+    }
+    @media (prefers-color-scheme: dark) {
+      .sidebar-panel[style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+      body[lwt-sidebar][style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+      .sidebar-panel[style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+      body[lwt-sidebar][style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] {
+        /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */
+        --lwt-sidebar-background-color: transparent !important;
+        --lwt-sidebar-text-color: var(--mac-text-color) !important;
+      }
+    }
+    :root[lwt-default-theme-in-dark-mode] #sidebarMenu-popup {
+      --button-hover-bgcolor: var(--mac-sidebar-hover-bgcolor);
+      --button-active-bgcolor: var(--mac-sidebar-hover-bgcolor);
+    }
+    /*- Others -----------------------------------------------------------------*/
+    /* For Overwrite */
+    @media (prefers-color-scheme: dark) {
+      :root[lwt-default-theme-in-dark-mode][lwthemetextcolor="bright"] {
+        --toolbar-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+      }
+    }
+    /* Hard Coded */
+    @media -moz-pref("userChrome.tab.color_like_toolbar") {
+      :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode]
+        #tabbrowser-tabs:not([movingtab])
+        > #pinned-tabs-container
+        > .tabbrowser-tab
+        > .tab-stack
+        > .tab-background[selected],
+      :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][lwt-default-theme-in-dark-mode]
+        #tabbrowser-tabs:not([movingtab])
+        > #pinned-tabs-container
+        > .tabbrowser-tab
+        > .tab-stack
+        > .tab-background[selected],
+      :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode]
+        #tabbrowser-tabs:not([movingtab])
+        > #tabbrowser-arrowscrollbox
+        > .tabbrowser-tab
+        > .tab-stack
+        > .tab-background[selected],
+      :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][lwt-default-theme-in-dark-mode]
+        #tabbrowser-tabs:not([movingtab])
+        > #tabbrowser-arrowscrollbox
+        > .tabbrowser-tab
+        > .tab-stack
+        > .tab-background[selected] {
+        background: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+      }
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)):not([customizing="true"]) tab[visuallyselected] > stack::before,
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)):not([customizing="true"]) tab[visuallyselected] > stack::after,
+    :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::before,
+    :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::after {
+      fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+    }
+  }
+}
+/*= None Native Menu =========================================================*/
+@media -moz-pref("userChrome.theme.non_native_menu") {
+  @media (-moz-gtk-csd-available) {
+    :root {
+      /* Override some menu color variables for light browser themes. */
+      --menu-icon-opacity: 0.7;
+      --nested-margin: -10px;
+      --windows-panel-box-shadow: 0 0 4px hsla(0, 0%, 0%, 0.2);
+      --menu-checkbox-padding: 12px;
+    }
+    /* For Windows 10, prevent using native OS drawing of certain menu elements,
+       especially background colors and shadows. */
+    /* Menu item text also needs native drawing disabled. */
+    /* For Windows 10, checkbox, radio and iconified menuitems need the default
+       appearance disabled so they pick up our custom styles instead. */
+    /* We need to do something to override the default style for selected
+       checkboxes and radio buttons because the native drawing we use on other
+       Windows versions looks pretty bad with the Win10 styles, so for now we'll
+       insert a generic checkmark icon for both types. */
+    /* :not([hidden]) to avoid the display: flex unhiding the item. */
+    /* override styles from shared/contextmenu.inc.css */
+    /* If the menu is wider than the icons strictly need, the <menuitem> elements
+     * will stretch to pick up the extra space. In that case, the outer icons
+     * should align to the start/end of their containing <menuitem>: */
+    /* Other menu separators don't extend all the way to the menu edges, but the
+       one below the navigation buttons in the content context menu should. */
+  }
+  @media (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+    :root {
+      /* Override the menu color variables for dark browser themes. */
+      --menu-icon-opacity: 1;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menu,
+    menuitem,
+    menucaption {
+      appearance: none !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menu,
+    menuitem {
+      border-radius: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menu > .menu-text,
+    menuitem > .menu-text,
+    menu > .menu-iconic-text,
+    menuitem > .menu-iconic-text {
+      appearance: none !important;
+      margin-inline-start: 0 !important; /* need !important to override the other !important below... */
+      padding-inline-end: 0;
+    }
+    menu > .menu-text::before,
+    menuitem > .menu-text::before,
+    menu > .menu-iconic-text::before,
+    menuitem > .menu-iconic-text::before {
+      box-sizing: border-box !important;
+      height: calc(2px + 1.2em) !important;
+      padding: 1px 0 !important;
+    }
+    menu > .menu-text[value*="โ€ฆ"]::before,
+    menuitem > .menu-text[value*="โ€ฆ"]::before,
+    menu > .menu-iconic-text[value*="โ€ฆ"]::before,
+    menuitem > .menu-iconic-text[value*="โ€ฆ"]::before {
+      padding: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menu[_moz-menuactive="true"]:not([disabled="true"]),
+    menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+      background-color: var(--menuitem-hover-background-color) !important;
+      color: var(--menu-color) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menu:where([_moz-menuactive="true"][disabled="true"]),
+    menuitem:where([_moz-menuactive="true"][disabled="true"]) {
+      background-color: transparent !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-text {
+      padding-inline-start: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-right {
+      appearance: none !important;
+      width: unset !important;
+      list-style-image: url("chrome://global/skin/icons/arrow-right.svg") !important;
+      -moz-context-properties: fill, fill-opacity !important;
+      fill: currentColor !important;
+      fill-opacity: var(--menu-icon-opacity) !important;
+      margin-inline-end: 1px !important;
+      padding-top: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-right > image {
+      /* Do not make this smaller than the size of the svg, but upscale for
+       * people with large fonts. */
+      width: max(1em, 16px) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-right:-moz-locale-dir(rtl) {
+      list-style-image: url("chrome://global/skin/icons/arrow-left.svg") !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menulist > menupopup > menuitem {
+      padding-inline-end: 1px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup[needsgutter] menu:not([icon], .menu-iconic),
+    menupopup[needsgutter] menuitem:not([type="checkbox"], [type="radio"], [icon], .menuitem-iconic) {
+      padding-inline-start: 36px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-iconic-left,
+    menuitem[type="checkbox"],
+    menuitem[type="radio"] {
+      appearance: none !important; /* to override more specific selectors above. */
+      width: unset !important;
+    }
+    .menu-iconic-left .menu-iconic-icon,
+    .menu-iconic-left .menu-icon,
+    menuitem[type="checkbox"] .menu-iconic-icon,
+    menuitem[type="checkbox"] .menu-icon,
+    menuitem[type="radio"] .menu-iconic-icon,
+    menuitem[type="radio"] .menu-icon {
+      appearance: none !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menu-iconic > .menu-iconic-left,
+    .menuitem-iconic > .menu-iconic-left {
+      padding-inline-end: 0 !important;
+      margin-inline-end: 8px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menuitem[type="checkbox"],
+    menuitem[type="radio"] {
+      --menu-background-padding-default: var(--menu-checkbox-padding);
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menuitem[checked="true"] {
+      padding-inline-start: var(--menu-checkbox-padding) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item .menu-iconic-left {
+      padding-inline-end: 0 !important;
+      margin-inline-end: 6px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menuitem[checked="true"] > .menu-iconic-left,
+    menuitem[checked="true"] > .menu-icon {
+      -moz-context-properties: fill, fill-opacity !important;
+      fill: currentColor !important;
+      fill-opacity: var(--menu-icon-opacity) !important;
+      list-style-image: url("chrome://browser/skin/lepton/menu-check.svg") !important;
+      width: 16px !important;
+      margin-inline-end: 8px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon {
+      display: initial !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menuseparator {
+      appearance: none !important;
+      border-top: 1px solid var(--menu-border-color) !important;
+      border-bottom: none !important;
+      padding: 0 !important;
+      /* The side margins should align with the start of the menu item text. */
+      margin: 2px 1em !important;
+    }
+    menuseparator::before {
+      display: none !important; /* Original: block */
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup {
+      /* Disable the default appearance so we can override the native styling. */
+      appearance: none !important;
+      /* Prevent any background or border around the outside of the shadow. */
+      background-color: transparent !important;
+      border: none !important;
+      /* To account for the box-shadow below */
+      margin: -4px !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup:not([placespopup="true"]) > menuitem,
+    menupopup:not([placespopup="true"]) > menu {
+      padding-block: var(--menu-padding, 0.5em) !important;
+      padding-inline-start: 1em !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    .menupopup-arrowscrollbox[part*="content"] {
+      box-shadow: var(--windows-panel-box-shadow) !important;
+      margin: 4px !important;
+      padding: 4px 0 !important;
+      color: var(--menu-color) !important;
+      background: var(--menu-background-color) !important;
+      border-radius: 4px !important;
+      border: 1px solid var(--menu-border-color) !important;
+      min-width: 0 !important;
+      min-height: 0 !important;
+    }
+    @media -moz-pref("userChrome.rounding.square_menupopup") {
+      .menupopup-arrowscrollbox[part*="content"] {
+        border-radius: 0px !important;
+      }
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup > menu > menupopup {
+      /* align submenus */
+      margin-inline-start: var(--nested-margin) !important;
+      margin-top: var(--nested-margin) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #mainPopupSet {
+      --menu-background-padding-default: calc(
+        var(--context-menu-background-padding) + var(--context-menu-text-padding-default)
+      );
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation:not([hidden]) {
+      /* The Windows 10 version of the navigation area needs the scrollbox's
+         background color, not the builtin "menu" color. */
+      background-color: inherit !important;
+      /* Match the inner top padding of the menupopup to center the icons visually. */
+      padding-bottom: 4px !important;
+      /* Use modern flex box so we can use percentage widths to redistribute
+       * spacing manually. */
+      display: flex !important;
+      flex-direction: row !important;
+      /* We want the first and last icons to align with the text items which
+       * have 1em inline padding, and for icons to be centered within their
+       * hover state, so each icon of 16px needs 1em padding on both sides:
+       */
+      --menuitem-min-width: calc(2em + 16px) !important;
+      /* The total width of the container should then be at least 4 times that: */
+      min-width: calc(4 * var(--menuitem-min-width)) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic {
+      flex: 1 0 auto !important;
+      padding: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic[_moz-menuactive="true"] {
+      /* We only show hover state on the icons. This ensures there is no
+       * dead space between icons, but the visible hover state is only
+       * around the icons, and all the icons' hover states match each other.
+       */
+      background-color: transparent !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic > .menu-iconic-left,
+    #context-navigation > .menuitem-iconic > .menu-icon {
+      margin: 0 !important;
+      padding: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
+    #context-navigation > .menuitem-iconic > .menu-icon {
+      width: var(--menuitem-min-width) !important;
+      height: 32px !important;
+      padding: 8px 1em !important;
+      margin: 0 !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
+    #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
+      background-color: var(--menuitem-hover-background-color) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation
+      > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+      > .menu-iconic-left
+      > .menu-iconic-icon,
+    #context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
+      background-color: transparent !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic:first-child {
+      justify-content: flex-start !important;
+      -moz-box-pack: start !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic:last-child {
+      justify-content: flex-end !important;
+      -moz-box-pack: end !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-navigation > .menuitem-iconic:last-child,
+    #context-navigation > .menuitem-iconic:first-child {
+      flex-grow: 0 !important;
+      /* The first and last items start off as 16px + 2em, like the other ones.
+       * 100% is the width of the parent, which will be at least 4 * the width of
+       * an individual item (16px + 2em)
+       * So 100% - 4 item widths gets us the remaining available space if
+       * #context-navigation is wider than that.
+       * Then divide by 6 to get the 1/6 of that extra space, and add this space
+       * to the width of the first/last items.
+       * This ensures that the 3 visual gaps between the 4 icons are all the same
+       * size, with each 1/3 of the available space evenly distributed between
+       * the 2 items on either side of the gap.
+       */
+      width: calc(var(--menuitem-min-width) + (100% - 4 * var(--menuitem-min-width)) / 6) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #context-sep-navigation {
+      margin-top: 0 !important;
+      margin-inline: 0 !important;
+    }
+  }
+}
+/*= Fully Theme Mode =========================================================*/
+@media -moz-pref("userChrome.theme.proton_color") {
+  /*= Default Colors - Hard Coded ==============================================*/
+  /* Based on chrome://global/skin/in-content/common.css */
+  :host,
+  :root {
+    --in-content-page-color: rgb(21, 20, 26);
+    --in-content-page-background: #fff;
+    --in-content-text-color: var(--in-content-page-color);
+    --in-content-deemphasized-text: rgb(91, 91, 102);
+    --in-content-box-background: #fff;
+    --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */
+    --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent);
+    --in-content-box-info-background: #f0f0f4;
+    --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent);
+    --in-content-item-hover-text: var(--in-content-page-color);
+    --in-content-item-selected: var(--in-content-primary-button-background);
+    --in-content-item-selected-text: var(--in-content-primary-button-text-color);
+    --in-content-icon-color: rgb(91, 91, 102);
+    --in-content-accent-color: #0a84ff;
+    --in-content-accent-color-active: #0060df;
+    --in-content-border-hover: var(--grey-90-a50);
+    --in-content-border-invalid: var(--red-50);
+    --in-content-border-color: #d7d7db;
+    --in-content-error-text-color: #c50042;
+    --in-content-link-color: var(--blue-60);
+    --in-content-link-color-hover: var(--blue-70);
+    --in-content-link-color-active: var(--blue-80);
+    --in-content-link-color-visited: var(--blue-60);
+    /* button background states are also used for checkboxes and radio buttons */
+    --in-content-button-text-color: var(--in-content-text-color);
+    --in-content-button-text-color-hover: var(--in-content-text-color);
+    --in-content-button-background: rgba(207, 207, 216, 0.33);
+    --in-content-button-background-hover: rgba(207, 207, 216, 0.66);
+    --in-content-button-background-active: rgb(207, 207, 216);
+    --in-content-primary-button-text-color: rgb(251, 251, 254);
+    --in-content-primary-button-text-color-hover: var(--in-content-primary-button-text-color);
+    --in-content-primary-button-background: #0061e0;
+    --in-content-primary-button-background-hover: #0250bb;
+    --in-content-primary-button-background-active: #053e94;
+    --in-content-danger-button-background: #e22850;
+    --in-content-danger-button-background-hover: #c50042;
+    --in-content-danger-button-background-active: #810220;
+    --in-content-focus-outline-color: var(--in-content-primary-button-background);
+    /* Note: 1px smaller than we want because we have a 1px transparent border. */
+    /* Once proton ships, these can probably stop being variables. */
+    --in-content-button-border-radius: 4px;
+    --in-content-button-horizontal-padding: 15px;
+    --in-content-button-vertical-padding: 7px;
+    --in-content-table-background: #f8f8fa;
+    --in-content-table-border-color: var(--in-content-box-border-color); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */
+    --in-content-table-border-dark-color: var(--in-content-table-border-color);
+    --in-content-table-header-background: var(
+      --in-content-primary-button-background
+    ); /* Legacy: #0a84ff; rgb(5, 64, 150); */
+    --in-content-table-header-color: var(
+      --in-content-primary-button-text-color
+    ); /* Legacy: #ffffff; var(--in-content-page-color); */
+    --in-content-sidebar-width: 240px;
+    --dialog-warning-text-color: var(--red-60);
+    --checkbox-border-color: var(--in-content-box-border-color);
+    --checkbox-unchecked-bgcolor: var(--in-content-button-background);
+    --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover);
+    --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active);
+    --checkbox-checked-bgcolor: var(--in-content-primary-button-background);
+    --checkbox-checked-color: var(--in-content-primary-button-text-color);
+    --checkbox-checked-border-color: transparent;
+    --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover);
+    --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active);
+    --blue-40: #45a1ff;
+    --blue-50: #0a84ff;
+    --blue-60: #0060df;
+    --blue-70: #003eaa;
+    --blue-80: #002275;
+    --grey-30: #d7d7db;
+    --grey-60: #4a4a4f;
+    --grey-90-a10: rgba(12, 12, 13, 0.1);
+    --grey-90-a20: rgba(12, 12, 13, 0.2);
+    --grey-90-a30: rgba(12, 12, 13, 0.3);
+    --grey-90-a50: rgba(12, 12, 13, 0.5);
+    --grey-90-a60: rgba(12, 12, 13, 0.6);
+    --green-50: #30e60b;
+    --green-60: #12bc00;
+    --green-70: #058b00;
+    --green-80: #006504;
+    --green-90: #003706;
+    --orange-50: #ff9400;
+    --red-40: #ff4f5e;
+    --red-50: #ff0039;
+    --red-60: #d70022;
+    --red-70: #a4000f;
+    --red-80: #5a0002;
+    --red-90: #3e0200;
+    --yellow-50: #ffe900;
+    --yellow-60: #d7b600;
+    --yellow-60-a30: rgba(215, 182, 0, 0.3);
+    --yellow-70: #a47f00;
+    --yellow-80: #715100;
+    --yellow-90: #3e2800;
+    --shadow-10: 0 1px 4px var(--grey-90-a10);
+    --shadow-30: 0 4px 16px var(--grey-90-a10);
+    --card-padding: 16px;
+    --card-shadow: var(--shadow-10);
+    --card-outline-color: var(--grey-30);
+    --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+    --uc-warning-icon-bgcolor: #ffa436;
+  }
+  @media (prefers-color-scheme: dark) {
+    :host,
+    :root {
+      /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
+      --in-content-page-background: rgb(28, 27, 34);
+      --in-content-page-color: rgb(251, 251, 254);
+      --in-content-deemphasized-text: rgb(191, 191, 201);
+      --in-content-box-background: rgb(35, 34, 43);
+      --in-content-box-background-odd: rgba(249, 249, 250, 0.05);
+      --in-content-box-info-background: rgba(249, 249, 250, 0.15);
+      --in-content-border-color: rgba(249, 249, 250, 0.2);
+      --in-content-border-hover: rgba(249, 249, 250, 0.3);
+      --in-content-border-invalid: rgb(255, 132, 139);
+      --in-content-error-text-color: #ff9aa2;
+      --in-content-button-background: rgb(43, 42, 51);
+      --in-content-button-background-hover: rgb(82, 82, 94);
+      --in-content-button-background-active: rgb(91, 91, 102);
+      --in-content-icon-color: rgb(251, 251, 254);
+      --in-content-primary-button-text-color: rgb(43, 42, 51);
+      --in-content-primary-button-background: rgb(0, 221, 255);
+      --in-content-primary-button-background-hover: rgb(128, 235, 255);
+      --in-content-primary-button-background-active: rgb(170, 242, 255);
+      --in-content-danger-button-background: #ff848b;
+      --in-content-danger-button-background-hover: #ffbdc5;
+      --in-content-danger-button-background-active: #ffdfe7;
+      --in-content-table-background: rgb(35, 34, 43);
+      --in-content-table-border-dark-color: var(--in-content-box-border-color);
+      --in-content-accent-color: var(--in-content-primary-button-background);
+      --in-content-accent-color-active: var(--in-content-primary-button-background-hover);
+      --in-content-link-color: var(--in-content-primary-button-background);
+      --in-content-link-color-hover: var(--in-content-primary-button-background-hover);
+      --in-content-link-color-active: var(--in-content-primary-button-background-active);
+      --in-content-link-color-visited: var(--in-content-link-color);
+      --card-outline-color: var(--grey-60);
+      --dialog-warning-text-color: var(--red-40);
+      --uc-warning-icon-bgcolor: #ffbd4f;
+    }
+  }
+  @media (prefers-contrast) {
+    :host,
+    :root {
+      --uc-warning-icon-bgcolor: var(--in-content-page-color);
+    }
+  }
+  /*= Menu color #477 ==========================================================*/
+  @media (-moz-platform: windows) {
+    :root {
+      /* Override some menu color variables for light browser themes. */
+      --menuitem-hover-background-color: #e0e0e6;
+      --menu-background-color: #f9f9fb;
+      --menu-color: #15141a;
+      --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+      --menu-disabled-color: rgba(21, 20, 26, 0.4);
+      --menu-border-color: #cfcfd8;
+      --menu-icon-opacity: 0.7;
+      /* Declare menu colors for dark themes, but don't override anything yet. */
+      --dark-menuitem-hover-background-color: #52525e;
+      --dark-menu-background-color: #2b2a33;
+      --dark-menu-color: #fbfbfe;
+      --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+      --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+      --dark-menu-border-color: #5b5b66;
+      --dark-menu-icon-opacity: 1;
+    }
+    /* Override the menu color variables for dark browser themes. */
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+    :root {
+      --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+      --menu-background-color: var(--dark-menu-background-color);
+      --menu-color: var(--dark-menu-color);
+      --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+      --menu-disabled-color: var(--dark-menu-disabled-color);
+      --menu-border-color: var(--dark-menu-border-color);
+      --menu-icon-opacity: var(--dark-menu-icon-opacity);
+    }
+  }
+  @media -moz-pref("userChrome.theme.non_native_menu") {
+    @media (-moz-gtk-csd-available) {
+      :root {
+        /* Override some menu color variables for light browser themes. */
+        --menuitem-hover-background-color: #e0e0e6;
+        --menu-background-color: #f9f9fb;
+        --menu-color: #15141a;
+        --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+        --menu-disabled-color: rgba(21, 20, 26, 0.4);
+        --menu-border-color: #cfcfd8;
+        --menu-icon-opacity: 0.7;
+        /* Declare menu colors for dark themes, but don't override anything yet. */
+        --dark-menuitem-hover-background-color: #52525e;
+        --dark-menu-background-color: #2b2a33;
+        --dark-menu-color: #fbfbfe;
+        --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+        --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+        --dark-menu-border-color: #5b5b66;
+        --dark-menu-icon-opacity: 1;
+      }
+      /* Override the menu color variables for dark browser themes. */
+    }
+    @media (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+      :root {
+        --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+        --menu-background-color: var(--dark-menu-background-color);
+        --menu-color: var(--dark-menu-color);
+        --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+        --menu-disabled-color: var(--dark-menu-disabled-color);
+        --menu-border-color: var(--dark-menu-border-color);
+        --menu-icon-opacity: var(--dark-menu-icon-opacity);
+      }
+    }
+  }
+  @media -moz-pref("userChrome.theme.proton_color.dark_blue_accent") {
+    @media (prefers-color-scheme: dark) {
+      :host,
+      :root {
+        /* Color Memo
+         Just refer - Photon's dark color
+         --button-primary-bgcolor: #0060DF;
+         --button-primary-hover-bgcolor: #003EAA;
+         --button-primary-active-bgcolor: #002275;
+         --lwt-brighttext-url-color: #74c0ff;
+         --lwt-toolbarbutton-icon-fill-attention: #45a1ff;
+
+         Just refer - Proton's light color
+         --in-content-accent-color: #0a84ff;
+         --in-content-accent-color-active: #0060df;
+         --in-content-primary-button-background: #0061e0;
+         --in-content-primary-button-background-hover: #0250bb;
+         --in-content-primary-button-background-active: #053e94;
+
+         --blue-40: #45a1ff; rgb(69, 161, 255)
+         --blue-50: #0a84ff; rgb(10, 132, 255)
+         --blue-60: #0060df; rgb(0, 96, 223)
+         --blue-70: #003eaa; rgb(0, 62, 170)
+         --blue-80: #002275; rgb(0, 34, 117)
+
+         Relation
+         lighten(#0060df,   29%): #74b0ff;
+         lighten(#0060df, 19.8%): #4595ff
+         lighten(#0060df,  8.3%): #0a74ff
+         #0060df
+         darken(#0060df, 15.5%):  #003e90;
+         darken(#0060df, 28.1%):  #002250;
+        */
+        --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/
+        --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */
+      }
+      :host,
+      :root,
+      dialog {
+        --in-content-primary-button-text-color: var(--in-content-page-color) !important;
+        --in-content-primary-button-background: var(--blue-60) !important;
+        --in-content-primary-button-background-hover: var(--blue-50) !important;
+        --in-content-primary-button-background-active: var(--blue-40) !important;
+        --in-content-focus-outline-color: var(--blue-40) !important;
+        --in-content-accent-color: var(--blue-40) !important;
+        --in-content-accent-color-active: var(--blue-30) !important;
+        --in-content-table-background: rgb(35, 34, 43) !important;
+        --in-content-table-border-color: rgba(249, 249, 250, 0.2) !important;
+        --in-content-table-header-background: rgb(5, 64, 150) !important;
+        --in-content-table-header-color: var(--in-content-page-color) !important;
+        --in-content-link-color: var(--blue-40) !important;
+        --in-content-link-color-hover: var(--blue-30) !important;
+        --in-content-link-color-active: var(--blue-20) !important;
+        --in-content-link-color-visited: var(--blue-40) !important;
+      }
+      :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+      :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
+        --button-primary-color: var(--in-content-page-color) !important;
+        --button-primary-bgcolor: var(--blue-60) !important;
+        --button-primary-hover-bgcolor: var(--blue-50) !important;
+        --button-primary-active-bgcolor: var(--blue-40) !important;
+        --focus-outline-color: var(--blue-40) !important;
+        --lwt-toolbarbutton-icon-fill-attention: var(--blue-40) !important;
+        --download-progress-fill-color: var(--blue-40) !important;
+        --panel-banner-item-info-icon-bgcolor: var(--blue-30) !important;
+        --lwt-brighttext-url-color: var(--blue-30) !important; /* Original: as primary bgcolor */
+      }
+      @media -moz-pref("userChrome.decoration.download_panel") {
+        :root[lwtheme-mozlightdark][lwthemetextcolor="bright"] #downloadsListBox,
+        :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] #downloadsListBox {
+          --button-primary-bgcolor: var(--blue-30);
+          --button-primary-hover-bgcolor: var(--blue-20);
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.theme.private") {
+  :root[privatebrowsingmode="temporary"],
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"],
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"],
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"] {
+    --lwt-additional-images: none !important;
+    --lwt-header-image: none !important;
+    --lwt-tab-text: rgba(232, 224, 255) !important;
+    --lwt-text-color: var(--lwt-tab-text) !important;
+    --toolbar-color: var(--lwt-tab-text) !important;
+    --toolbar-non-lwt-textcolor: var(--lwt-tab-text) !important;
+    --arrowpanel-color: var(--lwt-tab-text) !important;
+    --focus-outline-color: rgb(172, 112, 255) !important;
+    --toolbar-bgcolor: #322560 !important;
+    --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor) !important;
+    --lwt-accent-color: #19162f !important;
+    --in-content-page-background: var(--lwt-accent-color) !important;
+    --toolbar-field-background-color: #0b0724 !important;
+    --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
+    --toolbarbutton-hover-background: rgba(255, 255, 255, 0.05) !important;
+    --toolbarbutton-active-background: #4d4175 !important;
+    --arrowpanel-background: #1d1935 !important;
+    --arrowpanel-border-color: #322560 !important;
+    --chrome-content-separator-color: none !important;
+    --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important;
+    --autocomplete-popup-hover-background: #1d1935 !important;
+    --autocomplete-popup-highlight-background: rgba(65, 48, 117, 0.5) !important;
+    --button-bgcolor: color-mix(in srgb, currentColor 13%, transparent) !important;
+    --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent) !important;
+    --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent) !important;
+    --urlbar-box-bgcolor: color-mix(in srgb, currentColor 16%, transparent) !important;
+  }
+  :root[privatebrowsingmode="temporary"]:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"]:is(:-moz-lwtheme, [lwtheme])
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox {
+    --lwt-tabs-border-color: var(--focus-outline-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[privatebrowsingmode="temporary"][lwtheme-image]:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox {
+    background-color: var(--lwt-accent-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    #TabsToolbar,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    #TabsToolbar {
+    --lwt-tab-line-color: var(--focus-outline-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] notification-message[message-bar-type="infobar"],
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"] {
+    --message-bar-text-color: var(--lwt-tab-text) !important;
+    --in-content-page-color: var(--lwt-tab-text) !important;
+  }
+  :root[privatebrowsingmode="temporary"] menupopup,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] menupopup,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    menupopup,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] menupopup,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    menupopup {
+    --menuitem-hover-background-color: #413d54 !important;
+    --menu-background-color: #1d1935 !important;
+    --menu-color: #eeeeee !important;
+    --menuitem-disabled-hover-background-color: #ffffff00 !important;
+    --menu-disabled-color: #ffffff50 !important;
+    --menu-border-color: #322560 !important;
+  }
+}
+@media -moz-pref("userChrome.theme.fully_color") {
+  /*== Menu Color ==============================================================*/
+  html#main-window menupopup:not(.in-menulist) {
+    /* is same as toolbar color https://github.com/mozilla/gecko-dev/blob/master/toolkit/themes/windows/global/global.css#L17-L67 */
+    --menu-color: var(--arrowpanel-color, var(--in-content-page-color)) !important;
+    --menu-background-color: var(--arrowpanel-background, var(--in-content-button-background)) !important;
+    --menu-border-color: var(
+      --panel-separator-color,
+      var(--toolbarbutton-active-background, var(--button-active-bgcolor, var(--card-outline-color)))
+    ) !important;
+    --menuitem-hover-background-color: var(
+      --toolbarbutton-hover-background,
+      var(--button-hover-bgcolor, var(--in-content-button-background-hover))
+    ) !important;
+    --menu-disabled-color: color-mix(in srgb, var(--menu-color) 40%, transparent) !important;
+    --menuitem-disabled-hover-background-color: color-mix(
+      in srgb,
+      var(--menuitem-hover-background-color) 40%,
+      transparent
+    ) !important;
+  }
+  @media (-moz-platform: windows) {
+    html#main-window menupopup:not(.in-menulist) {
+      /* Above FF v105 #466 */
+      --panel-color: var(--menu-color) !important;
+      --panel-background: var(--menu-background-color) !important;
+      --panel-border-color: var(--menu-border-color) !important;
+    }
+    html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+    html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
+    html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
+      border-color: var(--menu-border-color) !important;
+    }
+    html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
+    html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
+    html#main-window menupopup:not(.in-menulist) menuitem[disabled="true"],
+    html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"][disabled="true"] {
+      color: var(--menu-disabled-color) !important;
+    }
+    html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"]:not([disabled="true"]),
+    html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+      background-color: var(--menuitem-hover-background-color) !important;
+      color: var(--menu-color) !important;
+    }
+    html#main-window
+      menupopup
+      #context-navigation
+      > .menuitem-iconic[_moz-menuactive="true"]
+      > .menu-iconic-left
+      > .menu-iconic-icon {
+      background-color: var(--menuitem-hover-background-color) !important;
+    }
+    html#main-window
+      menupopup
+      #context-navigation
+      > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+      > .menu-iconic-left
+      > .menu-iconic-icon {
+      background-color: transparent !important;
+    }
+  }
+  @media (-moz-platform: windows) and (prefers-color-scheme: light) {
+    :root[style*="background-noodles-right"] menupopup {
+      --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099) !important;
+    }
+  }
+  @media -moz-pref("userChrome.theme.non_native_menu") {
+    @media (-moz-gtk-csd-available) {
+      html#main-window menupopup:not(.in-menulist) {
+        /* Above FF v105 #466 */
+        --panel-color: var(--menu-color) !important;
+        --panel-background: var(--menu-background-color) !important;
+        --panel-border-color: var(--menu-border-color) !important;
+      }
+      html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+      html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
+      html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
+        border-color: var(--menu-border-color) !important;
+      }
+      html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
+      html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
+      html#main-window menupopup:not(.in-menulist) menuitem[disabled="true"],
+      html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"][disabled="true"] {
+        color: var(--menu-disabled-color) !important;
+      }
+      html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"]:not([disabled="true"]),
+      html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+        background-color: var(--menuitem-hover-background-color) !important;
+        color: var(--menu-color) !important;
+      }
+      html#main-window
+        menupopup
+        #context-navigation
+        > .menuitem-iconic[_moz-menuactive="true"]
+        > .menu-iconic-left
+        > .menu-iconic-icon {
+        background-color: var(--menuitem-hover-background-color) !important;
+      }
+      html#main-window
+        menupopup
+        #context-navigation
+        > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+        > .menu-iconic-left
+        > .menu-iconic-icon {
+        background-color: transparent !important;
+      }
+    }
+    @media (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
+      :root[style*="background-noodles-right"] menupopup {
+        --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099) !important;
+      }
+    }
+  }
+  @media not all and (-moz-gtk-csd-available) {
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menupopup {
+      --panel-color: var(--lwt-sidebar-text-color, var(--menu-color)) !important;
+      --panel-background: var(--lwt-sidebar-background-color, var(--menu-background-color)) !important;
+    }
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menu[_moz-menuactive="true"]:not([disabled="true"]),
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"]
+      menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+      --menuitem-hover-background-color: color-mix(
+        in srgb,
+        currentColor 17%,
+        transparent
+      ); /* Looks like toolbar button */
+      /* or var(--lwt-sidebar-highlight-background-color)
+           If this value is used, unset is required in the default theme.
+        */
+      background-color: var(--menuitem-hover-background-color) !important;
+    }
+    /* Fallback background - Set to Legacy. It will be removed Next update
+    menupopup:not(.cui-widget-panel.cui-widget-panelview, [placespopup="true"]) {
+      background-color: var(--lwt-accent-color, var(--in-content-page-background)) !important;
+    }
+    */
+  }
+  /* Default theme color preservation */
+  :root[lwtheme-mozlightdark] menupopup:not(#BMB_bookmarksPopup, [placespopup="true"]),
+  :root[lwtheme-mozlightdark] menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    menupopup:not(#BMB_bookmarksPopup, [placespopup="true"]),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) {
+    --menu-color: var(--toolbar-color, var(--in-content-page-color)) !important;
+    --arrowpanel-background: var(
+      --toolbar-bgcolor,
+      var(--in-content-button-background)
+    ) !important; /* --menu-background-color */
+  }
+  @media not all and (-moz-gtk-csd-available) {
+    window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(249, 249, 251, 1);"] menupopup,
+    window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] menupopup {
+      /* Default Dark Mode */
+      --panel-color: var(--menu-color) !important;
+      --panel-background: var(--menu-background-color, -moz-menuhover) !important;
+    }
+  }
+  /*== Info Bar Color ==========================================================*/
+  .container.infobar {
+    background-color: var(--urlbar-box-bgcolor) !important;
+  }
+  .notification-button {
+    background-color: var(--button-bgcolor) !important;
+  }
+  .notification-button:hover {
+    background-color: var(--button-hover-bgcolor) !important;
+  }
+  .notification-button:hover:active {
+    background-color: var(--button-active-bgcolor) !important;
+  }
+  .notification-button.primary {
+    background-color: var(--button-primary-bgcolor) !important;
+  }
+  .notification-button.primary:hover {
+    background-color: var(--button-primary-hover-bgcolor) !important;
+  }
+  .notification-button.primary:hover:active {
+    background-color: var(--button-primary-active-bgcolor) !important;
+  }
+  html|button.ghost-button:not(.semi-transparent):enabled:hover {
+    background-color: var(--button-hover-bgcolor) !important;
+  }
+  html|button.ghost-button:not(.semi-transparent):enabled:hover:active {
+    background-color: var(--in-content-button-background-active) !important;
+  }
+  /*== Bookmark Popup Color ====================================================*/
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector {
+    appearance: none !important;
+    border: 0.5px solid var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-image,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(hover),
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(selected),
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector > richlistitem {
+    color: var(--lwt-text-color, fieldtext) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(selected) {
+    font-weight: 600 !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector {
+    background-color: color-mix(in srgb, var(--arrowpanel-background) 35%, var(--in-content-box-background)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-row(hover),
+  #editBMPanel_tagsSelector > richlistitem:hover {
+    background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 17%, transparent)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-row(selected),
+  #editBMPanel_tagsSelector > richlistitem[selected="true"] {
+    background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important;
+  }
+  #editBookmarkPanel #editBMPanel_namePicker,
+  #editBookmarkPanel #editBMPanel_tagsField {
+    --input-bgcolor: var(--arrowpanel-background, Field);
+    --input-color: var(--arrowpanel-color, FieldText);
+  }
+  /*== Sidebar - Field Color ===================================================*/
+  html[lwt-sidebar]:not(#main-window) body {
+    background-color: var(--lwt-sidebar-background-color, Field) !important;
+    color: var(--lwt-sidebar-text-color, FieldText) !important;
+  }
+  .sidebar-panel #search-box,
+  xul|search-textbox.tabsFilter {
+    --input-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
+    appearance: none !important;
+    padding: 5px 8px !important;
+    border: 1px solid var(--input-bgcolor) !important;
+    background-color: var(--lwt-sidebar-background-color, Field) !important;
+    color: var(--lwt-sidebar-text-color, FieldText) !important;
+  }
+  .sidebar-panel:not([lwt-sidebar]) #search-box {
+    --input-bgcolor: ThreeDShadow;
+  }
+  .sidebar-panel #search-box[focused="true"],
+  xul|search-textbox.tabsFilter[focused="true"] {
+    outline: 1px solid var(--input-bgcolor);
+  }
+  .sidebar-panel[lwt-sidebar] #search-box[focused="true"],
+  body[lwt-sidebar] xul|search-textbox.tabsFilter[focused="true"] {
+    --input-bgcolor: var(--lwt-sidebar-highlight-background-color, Highlight) !important;
+  }
+  .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"],
+  body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] {
+    border-color: AccentColor !important; /* Hard Coded */
+    outline-color: AccentColor !important;
+  }
+  @media -moz-pref("userChrome.compatibility.accent_color") {
+    .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"],
+    body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] {
+      border-color: -moz-accent-color !important; /* Hard Coded */
+      outline-color: -moz-accent-color !important;
+    }
+  }
+  /*= PopupAutoComplete ========================================================*/
+  #PopupAutoComplete {
+    --panel-bgcolor: var(--arrowpanel-background, var(--in-content-button-background));
+    /* overwrite */
+    --panel-border-radius: 4px !important; /* Original: 0 */
+    --panel-border-color: var(
+      --arrowpanel-border-color,
+      var(--menu-border-color)
+    ) !important; /* Original: ThreeDShadow */
+    appearance: none !important;
+    background: transparent !important;
+    border: none !important;
+    clip-path: inset(0 round var(--panel-border-radius));
+  }
+  #PopupAutoComplete > richlistbox {
+    border-radius: var(--panel-border-radius) !important;
+    background-color: var(--panel-bgcolor) !important; /* Original: Field */
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FiledText */
+  }
+  .autocomplete-richlistitem:hover {
+    background-color: var(--arrowpanel-dimmed) !important;
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon {
+    fill: GrayText !important;
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] {
+    --panel-border-color: var(--panel-bgcolor);
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FieldText */
+    background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; /* Original: hsla(0,0%,80%,.35) */
+    border-color: var(--panel-border-color) !important; /* Original: rgba(38,38,38,.15) */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"]:hover,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"][selected] {
+    background-color: var(
+      --arrowpanel-dimmed-further,
+      hsla(0deg, 0%, 80%, 0.5)
+    ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] {
+    background-color: var(--panel-bgcolor) !important; /* Original: var(--arrowpanel-dimmed) */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"]:hover {
+    background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important;
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title {
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: var(--grey-60) */
+  }
+  /* New Folder Button */
+  #editBMPanel_newFolderButton {
+    appearance: none;
+    border: 0;
+    border-radius: 4px;
+    background-color: var(--button-bgcolor);
+    color: var(--button-color, inherit);
+    font-weight: 600;
+    min-width: 0;
+    padding: 8px 16px;
+    /* This button is deeper in the visual hierarchy than others (notably the
+       buttons at the bottom of the panel), so it should be slightly smaller. */
+    font-size: 90%;
+    /* This button needs to align with the tree above it. */
+    margin-inline-start: 4px;
+  }
+  #editBMPanel_newFolderButton:hover {
+    background-color: var(--button-hover-bgcolor);
+  }
+  #editBMPanel_newFolderButton:hover:active {
+    background-color: var(--button-active-bgcolor);
+  }
+}
+/*= Fully Dark Mode ==========================================================*/
+@media -moz-pref("userChrome.theme.fully_dark") {
+  /*= Remove White Flash =======================================================*/
+  #tabbrowser-tabbox,
+  #tabbrowser-tabpanels,
+  browser[type="content-primary"],
+  browser[type="content"] > html {
+    background: var(--in-content-page-background) !important;
+  }
+  /*= Notification =============================================================*/
+  @-moz-document url("chrome://global/content/alerts/alert.xhtml")
+  {
+    /* Color */
+    :root {
+      --menu-color: #15141a;
+      --menu-background-color: #f9f9fb;
+      --menu-border-color: #cfcfd8;
+      --menuitem-hover-background-color: #e0e0e6;
+    }
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --menu-border-color: rgba(107, 107, 107, 0.3);
+        --menu-color: #fbfbfe;
+        --menu-background-color: #2b2a33;
+        --menuitem-hover-background-color: #52525e;
+      }
+      #alertSourceLabel {
+        color: rgb(5, 209, 241) !important;
+      }
+    }
+    /* line below removes background from the notification "window" on linux */
+    #alertNotification {
+      background: transparent !important;
+    }
+    #alertBox {
+      color: var(--menu-color) !important;
+      background-color: var(--menu-background-color) !important;
+      border-color: var(--menu-border-color) !important;
+      border-radius: 6px !important;
+      -moz-window-shadow: cliprounded !important;
+    }
+    #alertSettings {
+      fill: currentColor !important;
+      color: inherit !important;
+      border-radius: 0 !important;
+      margin-inline: 0 !important;
+      margin-bottom: -4px !important;
+    }
+    .close-icon,
+    #alertSettings {
+      background: transparent !important;
+    }
+    .close-icon:hover > .toolbarbutton-icon,
+    #alertSettings:is(:hover, [open]) > .button-box > .box-inherit {
+      background-color: var(--menuitem-hover-background-color, #e0e0e6) !important;
+    }
+    /* Shape */
+    .close-icon > .toolbarbutton-icon,
+    #alertSettings > .button-box > .box-inherit {
+      border-radius: 4px !important;
+      padding: 2px !important;
+      margin: 2px 2px -2px 0 !important;
+    }
+    #alertSettings > .button-box > .box-inherit {
+      margin: -4px 4px 3px 0 !important;
+    }
+    #alertSettings > .button-box > .box-inherit > .button-icon {
+      padding: 1px;
+    }
+  }
+}
+/*= Transparent ==============================================================*/
+@media -moz-pref("userChrome.theme.transparent.frame") {
+  @media (-moz-platform: windows), (-moz-gtk-csd-available) {
+    #main-window,
+    #navigator-toolbox-background {
+      background-color: transparent !important;
+      appearance: auto !important;
+      -moz-default-appearance: -moz-win-borderless-glass !important;
+    }
+    #navigator-toolbox {
+      background-color: transparent !important;
+      background-image: none !important;
+    }
+    #nav-bar,
+    #PersonalToolbar {
+      background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-additional-images);
+      background-repeat: repeat-x, var(--lwt-background-tiling);
+      background-position: 0 0, var(--lwt-background-alignment);
+      background-attachment: scroll, fixed !important;
+      background-size: auto 100%, auto auto;
+    }
+    #appcontent {
+      appearance: auto !important;
+      -moz-default-appearance: -moz-win-exclude-glass !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+      --lwt-accent-color: Window !important;
+      --lwt-text-color: WindowText !important;
+    }
+    :root[style*="--focus-outline-color: rgb(172, 112, 255); --panel-separator-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%);"] {
+      --lwt-accent-color: rgb(45, 36, 91) !important;
+    }
+    #titlebar,
+    #toolbar-menubar,
+    #TabsToolbar {
+      --uc-frame-element-background: color-mix(in srgb, var(--lwt-accent-color, Window) 60%, transparent);
+      --toolbarbutton-hover-background: color-mix(in srgb, var(--lwt-accent-color, Window) 85%, transparent);
+    }
+  }
+  @media (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+    #titlebar,
+    #toolbar-menubar,
+    #TabsToolbar {
+      --toolbarbutton-hover-background: color-mix(
+        in srgb,
+        var(--lwt-accent-color, Window) 40%,
+        rgba(255, 255, 255, 0.25)
+      );
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #main-menubar {
+      border-radius: 4px;
+    }
+    #main-menubar:not(:-moz-window-inactive) {
+      background-color: var(--uc-frame-element-background) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-available) {
+    .titlebar-buttonbox-container:not(:-moz-window-inactive) {
+      background-color: var(--uc-frame-element-background) !important;
+      border-radius: 4px;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #TabsToolbar {
+      --toolbarseparator-color: transparent;
+    }
+    #TabsToolbar .tabbrowser-tab > .tab-stack > .tab-background:not([selected], [multiselected]) {
+      background-color: var(--uc-frame-element-background);
+    }
+    #TabsToolbar #firefox-view-button:hover:not([open]) > .toolbarbutton-icon,
+    #TabsToolbar .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected], [multiselected]) {
+      background-color: var(
+        --toolbarbutton-hover-background
+      ) !important; /* Original: color-mix(in srgb, currentColor 11%, transparent) */
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #scrollbutton-up,
+    #scrollbutton-down,
+    #alltabs-button > .toolbarbutton-badge-stack,
+    #TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon {
+      background-color: var(--uc-frame-element-background);
+    }
+  }
+  @media (-moz-platform: windows) {
+    :root,
+    #navigator-toolbox {
+      --lwt-accent-color: transparent !important;
+      --lwt-text-color: WindowText !important;
+    }
+    #titlebar .toolbarbutton-1,
+    #toolbar-menubar .toolbarbutton-1,
+    #TabsToolbar .toolbarbutton-1 {
+      --toolbarbutton-icon-fill: var(--lwt-text-color) !important;
+    }
+    :root:not([sizemode="fullscreen"]) .titlebar-buttonbox-container .titlebar-button:not(.titlebar-close:hover) {
+      list-style-image: none !important;
+    }
+    :root:not([sizemode="fullscreen"])
+      #toolbar-menubar[autohide="true"][inactive="true"]
+      + #TabsToolbar
+      .titlebar-button:is(.titlebar-close:hover)
+      .toolbarbutton-icon {
+      transform: translateY(-7px) !important;
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    :root:not(:-moz-window-inactive) #navigator-toolbox {
+      background-color: transparent !important;
+    }
+    #TabsToolbar,
+    #titlebar,
+    #nav-bar,
+    #PersonalToolbar,
+    #tabbrowser-tabs {
+      -moz-appearance: -moz-mac-source-list !important;
+      background-color: transparent !important;
+    }
+    /* De-emphasize tab icons and names when window is unfocused */
+    :root:-moz-window-inactive .tab-content,
+    :root:-moz-window-inactive #urlbar {
+      opacity: 0.6;
+    }
+    :root:-moz-window-inactive #urlbar-background {
+      background-color: transparent !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.theme.transparent.menu") {
+  .menupopup-arrowscrollbox[part*="content"] {
+    background: color-mix(in srgb, var(--menu-background-color, Menu) 90%, transparent) !important;
+  }
+  @media not -moz-pref("userChrome.theme.non_native_menu") {
+    @media (-moz-gtk-csd-available) {
+      html#main-window #mainPopupSet menupopup:not(.in-menulist) {
+        --menu-background-color: Menu !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.theme.transparent.panel") {
+  panel[type="arrow"] {
+    --panel-background: transparent !important;
+  }
+  panelview {
+    background: color-mix(in srgb, var(--arrowpanel-background) 90%, transparent) !important;
+  }
+}
+/*= Proton Theme Mode ========================================================*/
+@media -moz-pref("userChrome.theme.proton_chrome") {
+  /*= Proton Commons ===========================================================*/
+  @-moz-document url("chrome://global/content/commonDialog.xhtml"), url("chrome://pippki/content/editcacert.xhtml"), url("chrome://pippki/content/deletecert.xhtml"), url("chrome://pippki/content/exceptionDialog.xhtml"), url("chrome://mozapps/content/downloads/unknownContentType.xhtml"), url("chrome://global/content/appPicker.xhtml"), url("chrome://browser/content/pageinfo/pageInfo.xhtml")
+  {
+    /*- Overwrite --------------------------------------------------------------*/
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --in-content-page-background: #42414d;
+      }
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      --checkbox-unchecked-bgcolor: var(--in-content-button-background) !important;
+      --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover) !important;
+      --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active) !important;
+      --checkbox-checked-bgcolor: var(--in-content-primary-button-background) !important;
+      --checkbox-checked-color: var(--in-content-primary-button-text-color) !important;
+      --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover) !important;
+      --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active) !important;
+    }
+    /*- Dialog -----------------------------------------------------------------*/
+    #commonDialog,
+    #editCaCert,
+    #deleteCertificate,
+    #exceptiondialog,
+    #unknownContentType,
+    #app-picker,
+    #topBar,
+    #mainDeck {
+      -moz-appearance: none !important; /* For Mac */
+      color: var(--in-content-page-color) !important;
+      background-color: var(--in-content-page-background) !important;
+      /* border-radius: 0 0 8px 8px !important; */
+    }
+    /*- Button -----------------------------------------------------------------*/
+    button {
+      -moz-appearance: none !important;
+      color: var(--in-content-button-text-color) !important;
+      background-color: var(--in-content-button-background) !important;
+      font: inherit;
+      font-size: 1em !important;
+      font-weight: 600 !important;
+      min-height: 32px !important;
+      border: 1px solid transparent !important; /* shows up in high-contrast mode */
+      border-radius: var(--in-content-button-border-radius) !important;
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      min-height: 32px !important;
+      /* Use the same margin of other elements for the alignment */
+      margin-inline: 4px !important;
+      min-width: 6.3em !important;
+    }
+    button.medium {
+      /* Medium and small buttons get sized to 7/14 and 6/12px padding (when adding
+       * the 1px border): */
+      padding: 6px 13px !important;
+      min-height: 28px !important;
+      font-size: 0.95em !important;
+    }
+    button.small {
+      padding: 5px 11px !important;
+      min-height: 24px !important;
+      font-size: 0.9em !important;
+    }
+    /* Remove margin added by button.css */
+    xul|button > .button-box > .button-text {
+      margin: 0 !important;
+    }
+    button:not([disabled="true"]):hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    xul|button:not([disabled="true"]):hover:active,
+    xul|button[open],
+    xul|button[open]:hover,
+    xul|menulist[open="true"]:not([disabled="true"]) {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    xul|button[default] {
+      background-color: var(--in-content-primary-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    xul|button[default]:not([disabled="true"]):hover {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    xul|button[default]:not([disabled="true"]):hover:active {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    xul|button[disabled="true"],
+    xul|menulist[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    xul|button:not([disabled="true"]):hover,
+    xul|menulist:not([disabled="true"]):hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    @media (prefers-contrast) {
+      xul|button[default]:not([disabled="true"]):hover {
+        border-color: currentColor !important;
+      }
+      button:focus {
+        color: var(--in-content-button-text-color) !important;
+      }
+      xul|button[default]:focus,
+      button.primary:focus {
+        color: var(--in-content-primary-button-text-color) !important;
+      }
+    }
+    button:-moz-focusring,
+    xul|menulist:-moz-focusring,
+    xul|checkbox:-moz-focusring > .checkbox-check,
+    xul|radio[focused="true"]:-moz-focusring {
+      box-shadow: none !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 2px !important;
+    }
+    /*- Radio Button -----------------------------------------------------------*/
+    xul|radio {
+      /* margin-inline-start: 0 !important; */
+      appearance: none !important;
+    }
+    xul|*.radio-check {
+      appearance: none !important;
+      width: 16px !important;
+      height: 16px !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 100% !important;
+      padding: 0 !important;
+      margin-inline: 0 6px !important;
+      margin-block: 2px !important; /* extend the vertical clicktarget */
+      background-color: var(--in-content-button-background) !important;
+      background-position: center !important;
+      flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+    }
+    xul|*.radio-check[selected] {
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--in-content-primary-button-text-color) !important;
+      background-color: var(--in-content-primary-button-background) !important;
+      background-image: url("chrome://browser/skin/lepton/radio.svg") !important;
+      border-color: transparent !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+    }
+    xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+    }
+    xul|radio:not([disabled="true"]):hover:active > xul|*.radio-check {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    xul|radio:not([disabled="true"])[selected]:hover > xul|*.radio-check {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+    }
+    xul|radio:not([disabled="true"])[selected]:hover:active > xul|*.radio-check {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    xul|*.radio-label-box {
+      margin-inline: 0 8px !important;
+      padding-inline-start: 0 !important;
+    }
+    /* Disabled checkboxes, radios and labels */
+    xul|checkbox[disabled="true"],
+    xul|radio[disabled="true"],
+    xul|label[disabled="true"] {
+      color: inherit !important;
+      opacity: 0.5 !important;
+    }
+    /*- Check Box --------------------------------------------------------------*/
+    /* From checkbox.css */
+    checkbox {
+      appearance: none !important;
+      align-items: center !important;
+      -moz-box-align: center !important;
+      margin: 4px 2px !important;
+    }
+    .checkbox-check {
+      appearance: none !important;
+      width: 16px !important;
+      height: 16px !important;
+      border: 1px solid currentColor !important;
+      border-radius: 2px !important;
+      color: var(--checkbox-border-color, ThreeDDarkShadow) !important;
+      background-color: var(--checkbox-unchecked-bgcolor, Field) !important;
+      margin-inline-end: 6px !important; /* or 2px */
+      margin-block: 2px !important; /* From common.css */
+    }
+    .checkbox-check[checked] {
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      border-color: var(--checkbox-checked-border-color, transparent) !important;
+      background-image: url("chrome://global/skin/icons/check.svg") !important;
+      background-position: center !important;
+      background-repeat: no-repeat !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+      color: var(--checkbox-checked-color, AccentColorText) !important;
+      background-color: var(--checkbox-checked-bgcolor, AccentColor) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      .checkbox-check[checked] {
+        color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+        background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover > .checkbox-check {
+      background-color: var(--checkbox-unchecked-hover-bgcolor, color-mix(in srgb, AccentColor 4%, Field)) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover > .checkbox-check {
+        background-color: var(
+          --checkbox-unchecked-hover-bgcolor,
+          color-mix(in srgb, -moz-accent-color 4%, Field)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover:active > .checkbox-check {
+      background-color: var(--checkbox-unchecked-active-bgcolor, color-mix(in srgb, AccentColor 8%, Field)) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check {
+        background-color: var(
+          --checkbox-unchecked-active-bgcolor,
+          color-mix(in srgb, -moz-accent-color 8%, Field)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover > .checkbox-check[checked] {
+      background-color: var(
+        --checkbox-checked-hover-bgcolor,
+        color-mix(in srgb, currentColor 12.5%, AccentColor)
+      ) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover > .checkbox-check[checked] {
+        background-color: var(
+          --checkbox-checked-hover-bgcolor,
+          color-mix(in srgb, currentColor 12.5%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] {
+      background-color: var(
+        --checkbox-checked-active-bgcolor,
+        color-mix(in srgb, currentColor 25%, AccentColor)
+      ) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] {
+        background-color: var(
+          --checkbox-checked-active-bgcolor,
+          color-mix(in srgb, currentColor 25%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    checkbox:-moz-focusring > .checkbox-check {
+      outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+      outline-offset: var(--focus-outline-offset, 2px) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      checkbox:-moz-focusring > .checkbox-check {
+        outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+      }
+    }
+    @media (prefers-contrast) {
+      checkbox:not([disabled="true"]):hover > .checkbox-check {
+        /* color will set the border-color on the check due to how HCM works for in-content pages. */
+        color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important;
+      }
+      @media -moz-pref("userChrome.compatibility.accent_color") {
+        checkbox:not([disabled="true"]):hover > .checkbox-check {
+          /* color will set the border-color on the check due to how HCM works for in-content pages. */
+          color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important;
+        }
+      }
+      .checkbox-check[checked] {
+        color: var(--checkbox-checked-border-color, currentColor) !important;
+        fill: var(--checkbox-checked-color, AccentColorText) !important;
+      }
+      @media -moz-pref("userChrome.compatibility.accent_color") {
+        .checkbox-check[checked] {
+          fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+        }
+      }
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked],
+      checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] {
+        color: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+        fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+      }
+      @media -moz-pref("userChrome.compatibility.accent_color") {
+        checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked],
+        checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] {
+          color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+          fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+        }
+      }
+    }
+    .checkbox-icon[src] {
+      margin-inline-end: 2px !important;
+    }
+    .checkbox-label {
+      margin: 1px 0 !important;
+    }
+    checkbox[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    /* From common.css */
+    xul|richlistitem > xul|*.checkbox-check {
+      margin: 3px 6px !important;
+    }
+    /*- Menulist ---------------------------------------------------------------*/
+    /* From mulist.css */
+    xul|menulist {
+      appearance: none !important;
+      background-color: var(--in-content-button-background, ButtonFace) !important;
+      color: var(--in-content-button-text-color, ButtonText) !important;
+      border-radius: 4px !important;
+      padding-block: 4px !important;
+      padding-inline: 12px 8px !important;
+      margin: 5px 2px 3px !important;
+    }
+    xul|menulist[size="medium"] {
+      padding-block: 6px !important;
+      padding-inline: 16px 10px !important;
+    }
+    xul|menulist[size="large"] {
+      padding-block: 8px !important;
+      padding-inline: 16px 12px !important;
+    }
+    xul|menulist:hover {
+      background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 10%, ButtonFace)) !important;
+    }
+    xul|menulist:hover:active {
+      background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace)) !important;
+    }
+    xul|menulist:-moz-focusring {
+      outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+      outline-offset: var(--focus-outline-offset, 2px) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      xul|menulist:-moz-focusring {
+        outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+      }
+    }
+    #label-box {
+      align-items: center !important;
+      -moz-box-align: center !important;
+      justify-content: center !important;
+      -moz-box-pack: center !important;
+      font-weight: 600 !important;
+    }
+    dropmarker {
+      display: flex !important;
+      display: -moz-box !important;
+      appearance: none !important;
+      width: 12px !important;
+      height: 12px !important;
+    }
+    dropmarker[exportparts="icon: dropmarker-icon"] {
+      /* dropmarker::part(icon)
+       * ::part is not apply chrome
+       */
+      list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+    }
+    #highlightable-label:not([highlightable="true"]),
+    #label[highlightable="true"] {
+      display: none !important;
+    }
+    xul|menuitem > label:not(.menu-text) {
+      margin: 0 3px !important;
+    }
+    /* From common.css */
+    xul|menulist > xul|menupopup {
+      appearance: none !important;
+      /* Reset native styles on Windows and macOS */
+      border: none !important;
+      background-color: transparent !important;
+      --panel-border-color: var(--in-content-box-border-color) !important;
+      --panel-border-radius: 2px !important;
+      --panel-background: var(--in-content-box-background) !important;
+      --panel-color: var(--in-content-text-color) !important;
+      --panel-padding: 0 !important;
+    }
+    xul|menulist > xul|menupopup xul|menu,
+    xul|menulist > xul|menupopup xul|menuitem {
+      appearance: none !important;
+      font-size: 1em !important;
+      padding-block: 0.2em !important;
+      padding-inline: 10px 30px !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+    xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+      color: var(--in-content-item-hover-text) !important;
+      background-color: var(--in-content-item-hover) !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+    xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
+      color: var(--in-content-item-selected-text) !important;
+      background-color: var(--in-content-item-selected) !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu[disabled="true"],
+    xul|menulist > xul|menupopup > xul|menuitem[disabled="true"] {
+      color: #999 !important;
+      /* override the [_moz-menuactive="true"] background color from
+           global/menu.css */
+      background-color: transparent !important;
+    }
+    xul|menulist > xul|menupopup xul|menuseparator {
+      appearance: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      border-top: 1px solid var(--in-content-box-border-color) !important;
+      border-bottom: none !important;
+    }
+    xul|menulist::part(dropmarker) {
+      margin-block: 1px !important;
+    }
+    /* Override menulist.css */
+    xul|menulist[disabled="true"] {
+      background-color: var(--in-content-button-background) !important;
+    }
+    xul|menulist:-moz-focusring > xul|*.menulist-label-box {
+      outline: none !important;
+    }
+    /*- List Boxes -------------------------------------------------------------*/
+    html|select[size][multiple],
+    xul|listheader,
+    xul|richlistbox {
+      appearance: none !important;
+      margin-inline: 0 !important;
+      background-color: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: var(--in-content-text-color) !important;
+    }
+    xul|listheader {
+      border-bottom: none !important;
+      border-bottom-left-radius: 0 !important;
+      border-bottom-right-radius: 0 !important;
+      padding-bottom: 1px !important;
+      box-shadow: inset 0 -1px var(--in-content-table-border-color) !important;
+      overflow: clip !important; /* Clip border-radius */
+    }
+    xul|listheader + xul|richlistbox {
+      margin-top: 0 !important;
+      border-top: none !important;
+      border-top-left-radius: 0 !important;
+      border-top-right-radius: 0 !important;
+    }
+    html|select[size][multiple] > html|option,
+    xul|treechildren::-moz-tree-row {
+      padding: 0.3em inherit !important;
+      margin: 0 !important;
+      border: none !important;
+      border-radius: 0 !important;
+      background-image: none !important;
+    }
+    xul|treechildren::-moz-tree-row(multicol, odd) {
+      background-color: var(--in-content-box-background-odd);
+    }
+    html|select[size][multiple] > html|option:hover,
+    xul|richlistbox > xul|richlistitem:not([disabled="true"], [selected]):hover,
+    xul|treechildren::-moz-tree-row(hover) {
+      background-color: var(--in-content-item-hover) !important;
+      color: var(--in-content-item-hover-text) !important;
+    }
+    xul|richlistbox > xul|richlistitem[selected],
+    xul|treechildren::-moz-tree-row(selected) {
+      background-color: var(--in-content-item-selected) !important;
+      color: var(--in-content-item-selected-text) !important;
+    }
+    xul|richlistbox:not(#categories) > xul|richlistitem[selected] {
+      /* Ensure buttons/menulists inside richlistitems (containers, applications) look OK */
+      --in-content-button-background: color-mix(in srgb, currentColor 15%, transparent) !important;
+      --in-content-button-background-hover: color-mix(in srgb, currentColor 30%, transparent) !important;
+      --in-content-button-background-active: color-mix(in srgb, currentColor 45%, transparent) !important;
+      --in-content-button-text-color: var(--in-content-item-selected-text) !important;
+      --in-content-button-text-color-hover: var(--in-content-item-selected-text) !important;
+      --in-content-focus-outline-color: var(--in-content-item-selected-text) !important;
+    }
+    xul|richlistitem[selected] xul|menulist:focus-visible {
+      outline-offset: -2px !important;
+    }
+    /* Use a 2px border so that selected row highlight is still visible behind
+          an existing high-contrast border that uses the background color */
+    @media (prefers-contrast) {
+      xul|treechildren::-moz-tree-row(selected) {
+        border: 2px solid currentColor !important;
+        border-radius: 4px !important;
+      }
+    }
+    xul|panel[type="autocomplete-richlistbox"] {
+      background-color: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      color: var(--in-content-text-color) !important;
+    }
+    /*- Each OS ----------------------------------------------------------------*/
+    @media (-moz-platform: windows) {
+      xul|checkbox,
+      xul|radio {
+        padding-inline-start: 0 !important;
+      }
+      /* Override menulist.css */
+      xul|menulist[disabled="true"] {
+        background-color: var(--in-content-button-background) !important;
+      }
+      xul|menulist:-moz-focusring > xul|*.menulist-label-box {
+        outline: none !important;
+      }
+    }
+    @media (-moz-gtk-csd-available) {
+      /* Overriding appearance also avoids incorrect selection background color with light text. */
+      xul|button > xul|*.button-box,
+      xul|menulist::part(label-box),
+      xul|*.radio-label-box,
+      xul|*.checkbox-label-box {
+        appearance: none !important;
+      }
+      xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
+        appearance: none !important;
+      }
+      xul|menulist {
+        font-size: inherit !important;
+      }
+      xul|menulist::part(dropmarker) {
+        display: flex;
+        display: -moz-box;
+        margin-block: 6px !important;
+      }
+      xul|menulist:-moz-focusring::part(label-box) {
+        outline: none !important;
+      }
+    }
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      xul|menulist > xul|menupopup > xul|menuitem[checked="true"]::before,
+      xul|menulist > xul|menupopup > xul|menuitem[selected="true"]::before {
+        display: none !important;
+      }
+      xul|menulist::part(dropmarker) {
+        display: flex !important;
+        display: -moz-box !important;
+        margin-block: 1px !important;
+      }
+      xul|menulist > xul|menupopup xul|menu,
+      xul|menulist > xul|menupopup xul|menuitem {
+        padding-inline-end: 34px !important;
+      }
+      xul|*.checkbox-icon,
+      xul|*.radio-icon {
+        margin-inline-end: 0 !important;
+      }
+      xul|*.text-link:-moz-focusring {
+        box-shadow: none !important;
+      }
+    }
+  }
+  /*= Delete Cert ==============================================================*/
+  @-moz-document url("chrome://pippki/content/deletecert.xhtml")
+  {
+    #certlist {
+      border: 1px solid var(--in-content-table-border-color) !important;
+      border-radius: 4px !important;
+    }
+  } /*= Cert Exception Dialog ====================================================*/
+  @-moz-document url("chrome://pippki/content/exceptionDialog.xhtml")
+  {
+    #locationTextBox {
+      appearance: none !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: inherit !important;
+      background-color: var(--in-content-box-background) !important;
+      font-family: inherit !important;
+      font-size: inherit !important;
+      padding: 8px !important;
+      margin: 2px 4px !important;
+    }
+    #locationTextBox:focus {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    #locationTextBox:-moz-ui-invalid {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-border-invalid) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    #locationTextBox:disabled {
+      opacity: 0.4 !important;
+    }
+    #exceptiondialog:first-child > hbox > vbox:not([flex="1"]) {
+      width: 48px !important;
+      height: 48px !important;
+      background-image: url("chrome://global/skin/icons/warning.svg") !important;
+      background-size: 48px !important;
+      background-repeat: no-repeat !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+    }
+    #exceptiondialog:first-child > hbox > vbox > image {
+      display: none !important;
+    }
+  }
+  /*= Page Info ================================================================*/
+  @-moz-document url("chrome://browser/content/pageinfo/pageInfo.xhtml")
+  {
+    :root {
+      --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important;
+    }
+    #viewGroup > radio {
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      margin: 4px !important;
+      list-style-image: none !important;
+      background-image: var(--viewgroup-image) !important;
+      background-repeat: no-repeat;
+      background-position: top var(--in-content-button-vertical-padding) center;
+      background-size: 32px !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--in-content-deemphasized-text) !important; /* FieldText */
+    }
+    #viewGroup > radio .radio-icon {
+      background-image: none !important;
+    }
+    @media not -moz-pref("userChrome.rounding.square_button") {
+      #viewGroup > radio {
+        border-radius: 8px !important;
+      }
+    }
+    #viewGroup > radio:hover {
+      background-color: var(--in-content-button-background-hover) !important; /* #E0E8F6; */
+    }
+    #viewGroup > radio[selected="true"] {
+      color: var(--in-content-button-text-color) !important; /* SelectedItemText */
+      background-color: var(--in-content-button-background-active) !important; /* #C1D2EE; */
+    }
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      #viewGroup > radio {
+        height: auto !important;
+      }
+    }
+    #generalTab {
+      --viewgroup-image: url(chrome://global/skin/icons/page-portrait.svg);
+    }
+    #mediaTab {
+      --viewgroup-image: url(chrome://browser/skin/canvas.svg);
+    }
+    #permTab {
+      --viewgroup-image: url(chrome://browser/skin/permissions.svg);
+    }
+    #securityTab {
+      --viewgroup-image: url(chrome://global/skin/icons/security.svg);
+    }
+    #viewGroup > radio > .radio-label-box {
+      /* Overwrite */
+      margin: 0 !important;
+      padding: 0 6px !important;
+    }
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      #viewGroup > radio > .radio-label-box {
+        padding-top: 32px !important; /* as -moz-image-region: rect(0px, 32px, 32px, 0px); */
+      }
+    }
+    #mainDeck input {
+      color: var(--in-content-page-color) !important;
+    }
+    #permList {
+      -moz-appearance: none !important;
+      color: var(--in-content-page-color) !important;
+      background-color: var(--in-content-box-background) !important;
+    }
+    .permission:hover {
+      color: var(--in-content-text-color) !important;
+      background-color: var(--in-content-button-background-hover) !important;
+    }
+    .permission radio[disabled] {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    treecols {
+      -moz-appearance: none !important;
+      background: var(--in-content-table-header-background) !important;
+      color: var(--in-content-table-header-color) !important;
+    }
+    treecols > treecol,
+    treecols > treecolpicker.treecol-image {
+      -moz-appearance: none !important;
+      color: var(--in-content-table-header-color) !important;
+      background: var(--in-content-table-header-background) !important;
+      border: 1px solid var(--in-content-table-border-color) !important;
+      padding: 4px !important;
+      border-spacing: 0;
+      text-align: center !important;
+    }
+    tree,
+    treechildren::-moz-tree-row {
+      -moz-appearance: none !important;
+      color: var(--in-content-text-color) !important;
+      background-color: var(--in-content-table-background) !important;
+      border: 1px solid var(--in-content-table-border-color) !important;
+    }
+    treechildren::-moz-tree-row(odd) {
+      background-color: var(--in-content-box-background-odd) !important;
+    }
+    treechildren::-moz-tree-row(hover) {
+      color: var(--in-content-item-hover-text) !important;
+      background-color: var(--in-content-item-hover) !important;
+    }
+    treechildren::-moz-tree-row(selected) {
+      background-color: var(--in-content-item-selected) !important;
+    }
+    treechildren::-moz-tree-cell {
+      border-inline: 1px solid var(--in-content-table-border-color) !important;
+      border-spacing: 0 !important;
+      padding: 4px !important;
+      margin: 0 !important;
+    }
+    treechildren::-moz-tree-cell-text(hover) {
+      color: var(--in-content-item-hover-text) !important;
+    }
+    treechildren::-moz-tree-cell-text(selected) {
+      font-weight: 600 !important;
+      color: var(--in-content-item-selected-text) !important;
+    }
+    #imagecontainerbox {
+      background-color: var(--in-content-box-background) !important;
+    }
+    #metatree,
+    #imagetree,
+    #imagecontainerbox,
+    #permList {
+      border-radius: 4px !important;
+    }
+    #metatree,
+    #imagetree {
+      overflow: hidden !important;
+    }
+    #topBar,
+    #imagecontainerbox,
+    #permList {
+      border-color: var(--in-content-table-border-color) !important;
+    }
+  }
+  /*= Library Popup ============================================================*/
+  @-moz-document url("chrome://browser/content/places/places.xhtml")
+  {
+    @media (-moz-gtk-csd-available) {
+      :root {
+        --organizer-color: -moz-DialogText;
+        --organizer-deemphasized-color: GrayText;
+        --organizer-toolbar-background: -moz-Dialog;
+        --organizer-pane-background: -moz-Dialog;
+        --organizer-content-background: -moz-Dialog;
+        --organizer-hover-background: SelectedItem;
+        --organizer-hover-color: SelectedItemText;
+        --organizer-selected-background: SelectedItem;
+        --organizer-selected-color: SelectedItemText;
+        --organizer-outline-color: SelectedItem;
+        --organizer-separator-color: ThreeDDarkShadow;
+        --organizer-border-color: ThreeDShadow;
+        --organizer-toolbar-field-background: Field;
+        --organizer-toolbar-field-background-focused: Field;
+        --organizer-toolbar-field-border-color: ThreeDShadow;
+        --organizer-toolbar-field-focus-border-color: var(--organizer-outline-color);
+        --organizer-toolbar-field-focus-box-shadow: unset;
+        --organizer-pane-field-border-color: ThreeDShadow;
+      }
+      @media not all and (prefers-contrast) {
+        :root {
+          --organizer-color: var(--in-content-page-color);
+          --organizer-deemphasized-color: var(--in-content-deemphasized-text);
+          --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */
+          --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */
+          --organizer-content-background: var(--in-content-page-background);
+          --organizer-hover-background: var(--in-content-button-background-hover);
+          --organizer-hover-color: var(--organizer-color);
+          --organizer-selected-background: var(--in-content-button-background-active);
+          --organizer-selected-color: var(--organizer-color);
+          --organizer-outline-color: var(--in-content-focus-outline-color);
+          --organizer-separator-color: var(--organizer-pane-field-border-color);
+          --organizer-border-color: var(--in-content-border-color);
+          --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */
+          --organizer-toolbar-field-background-focused: Field;
+          --organizer-toolbar-field-border-color: transparent;
+          --organizer-toolbar-field-focus-border-color: color-mix(
+            in srgb,
+            var(--organizer-outline-color) 50%,
+            transparent
+          );
+          --organizer-toolbar-field-focus-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.23);
+          --organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
+        }
+        @media (prefers-color-scheme: dark) {
+          :root {
+            --organizer-color: rgb(251, 251, 254);
+            --organizer-deemphasized-color: rgb(191, 191, 201);
+            --organizer-toolbar-background: rgb(43, 42, 51);
+            --organizer-pane-background: rgb(35, 34, 43);
+            --organizer-content-background: rgb(28, 27, 34);
+            --organizer-hover-background: rgb(82, 82, 94);
+            --organizer-selected-background: rgb(91, 91, 102);
+            --organizer-toolbar-field-background: var(--in-content-page-background);
+            --organizer-toolbar-field-background-focused: rgb(66, 65, 77);
+            scrollbar-color: rgba(249, 249, 250, 0.4) rgba(20, 20, 25, 0.3);
+          }
+        }
+      }
+      /*- Toolbar & Menus ------------------------------------------------------*/
+      #placesToolbar {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-background) !important;
+        color: var(--organizer-color) !important;
+        border-bottom: 1px solid var(--organizer-border-color) !important;
+        padding: 4px !important;
+        padding-inline-end: 6px !important;
+      }
+      #placesToolbar > toolbarbutton {
+        appearance: none !important;
+        padding: 5px !important;
+        border-radius: 4px !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_button") {
+        #placesToolbar > toolbarbutton {
+          border-radius: 0 !important;
+        }
+      }
+      #placesToolbar > toolbarbutton[disabled] {
+        opacity: 0.6 !important;
+      }
+      #placesToolbar > toolbarbutton:not([disabled]):hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #placesToolbar > toolbarbutton:not([disabled]):hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+      #placesToolbar > toolbarbutton > .toolbarbutton-icon,
+      #placesMenu > menu > image,
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+      #placesMenu {
+        margin-inline-start: 6px !important;
+      }
+      #placesMenu > menu {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        padding-block: 5px !important;
+        padding-inline-start: 5px !important;
+        border-radius: 4px !important;
+        margin-inline-end: 2px !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_button") {
+        #placesMenu > menu {
+          border-radius: 0 !important;
+        }
+      }
+      #placesMenu > menu[_moz-menuactive="true"],
+      #placesMenu > menu:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #placesMenu > menu:hover:active,
+      #placesMenu > menu[open] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        margin-block: 0 !important; /* override menu.css */
+        padding-inline-end: 4px !important;
+      }
+      /*- Search Bar & Input ---------------------------------------------------*/
+      #searchFilter,
+      #detailsPane html|input {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-field-background) !important;
+        color: var(--organizer-color) !important;
+        border: 1px solid var(--organizer-toolbar-field-border-color) !important;
+        border-radius: 4px !important;
+        margin: 0 !important;
+        padding-block: 2px !important;
+        min-height: 24px !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_field") {
+        #searchFilter,
+        #detailsPane html|input {
+          border-radius: 0 !important;
+        }
+      }
+      #searchFilter[focused] {
+        box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important;
+        background-color: var(--organizer-toolbar-field-background-focused) !important;
+        border-color: transparent !important;
+        outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important;
+        outline-offset: -2px !important;
+      }
+      /*- Sidebar & Splitter ---------------------------------------------------*/
+      #placesList {
+        background-color: var(--organizer-pane-background) !important;
+      }
+      #placesView > splitter {
+        border: 0 !important;
+        border-inline-end: 1px solid var(--organizer-border-color) !important;
+        min-width: 0 !important;
+        width: 3px !important;
+        background-color: transparent !important;
+        margin-inline-start: -3px !important;
+        position: relative !important;
+      }
+      /*- Downloads Pane -------------------------------------------------------*/
+      #downloadsRichListBox,
+      #downloadsListBox {
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+      }
+      #clearDownloadsButton:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+      }
+      richlistitem[selected="true"],
+      richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+      richlistbox:where(:focus) > richlistitem[selected="true"] {
+        background-color: var(--organizer-selected-background) !important;
+      }
+      /*- Tree -----------------------------------------------------------------*/
+      #contentView treecol {
+        /* Use box-shadow to draw a bottom border instead of border-bottom
+           * because otherwise the items on contentView won't be perfectly
+           * aligned with the items on the sidebar. */
+        box-shadow: inset 0 -1px var(--organizer-border-color) !important;
+      }
+      tree {
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+      }
+      treecol:not([hideheader="true"]),
+      treecolpicker {
+        appearance: none !important;
+        border: none !important;
+        background-color: var(--in-content-button-background) !important;
+        color: var(--organizer-color, inherit) !important;
+        padding: 5px 10px !important;
+      }
+      treecol:not([hideheader="true"], [sortable="false"]):hover,
+      treecolpicker:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+      treecol:not([hideheader="true"], [sortable="false"]):hover:active,
+      treecolpicker:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+      treecol:not([hideheader="true"], :first-child),
+      treecolpicker {
+        padding-left: 10px !important;
+        border-inline-start-width: 1px !important;
+        border-inline-start-style: solid !important;
+        border-image: linear-gradient(
+            transparent 0%,
+            transparent 20%,
+            var(--organizer-border-color) 20%,
+            var(--organizer-border-color) 80%,
+            transparent 80%,
+            transparent 100%
+          )
+          1 1 !important;
+      }
+      treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection {
+        fill: currentColor !important;
+        width: 18px !important;
+        height: 18px !important;
+      }
+      treechildren::-moz-tree-row {
+        background-color: transparent !important;
+      }
+      treechildren::-moz-tree-row(hover) {
+        background-color: var(--organizer-hover-background) !important;
+      }
+      treechildren::-moz-tree-row(selected) {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+        border: 1px solid transparent !important;
+      }
+      treechildren::-moz-tree-image(hover),
+      treechildren::-moz-tree-twisty(hover),
+      treechildren::-moz-tree-cell-text(hover) {
+        color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-image(selected),
+      treechildren::-moz-tree-twisty(selected),
+      treechildren::-moz-tree-cell-text(selected) {
+        color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-separator {
+        height: 1px !important;
+        border-color: var(--organizer-separator-color) !important;
+      }
+      treechildren::-moz-tree-separator(hover) {
+        border-color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-separator(selected) {
+        border-color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-cell-text(primary, dropOn),
+      treechildren::-moz-tree-drop-feedback {
+        background-color: var(--organizer-outline-color) !important;
+      }
+      /*- Info Box -------------------------------------------------------------*/
+      #detailsPane {
+        background-color: var(--organizer-pane-background) !important;
+        color: var(--organizer-color) !important;
+        padding: 5px !important;
+        border-top: 1px solid var(--organizer-border-color) !important;
+      }
+      #editBookmarkPanelRows .expander-up,
+      #editBookmarkPanelRows .expander-down {
+        appearance: none !important;
+        min-width: 0 !important;
+        padding: 5px !important;
+        margin: 0 !important;
+        margin-inline-end: 4px !important;
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_button") {
+        #editBookmarkPanelRows .expander-up,
+        #editBookmarkPanelRows .expander-down {
+          border-radius: 0 !important;
+        }
+      }
+      #editBookmarkPanelRows .expander-up:hover,
+      #editBookmarkPanelRows .expander-down:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBookmarkPanelRows .expander-up:hover:active,
+      #editBookmarkPanelRows .expander-down:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+      #editBookmarkPanelRows .expander-up:focus-visible,
+      #editBookmarkPanelRows .expander-down:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+      #editBookmarkPanelRows .expander-up > .button-box,
+      #editBookmarkPanelRows .expander-down > .button-box {
+        padding: 0 !important;
+      }
+      #editBookmarkPanelRows .expander-up {
+        list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+      }
+      #editBookmarkPanelRows .expander-down {
+        list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+      }
+      #places input {
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+        min-height: 20px !important;
+        padding-inline: 4px !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_field") {
+        #places input {
+          border-radius: 0 !important;
+        }
+      }
+      #places input:focus {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+      #places input:not(:read-write):focus {
+        outline: none !important;
+      }
+      .caption-label {
+        margin-inline-start: 8px !important;
+        color: var(--organizer-deemphasized-color) !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        border: 1px solid var(--organizer-border-color) !important;
+        border-radius: 4px !important;
+      }
+      @media -moz-pref("userChrome.rounding.square_field") {
+        #editBMPanel_tagsSelectorRow > richlistbox {
+          border-radius: 0 !important;
+        }
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem {
+        border: 1px solid transparent !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem[selected] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+  }
+  #sanitizeEverythingWarningIcon {
+    list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+    -moz-context-properties: fill;
+    fill: var(--uc-warning-icon-bgcolor);
+    width: 48px;
+    height: 48px;
+  }
+}
+/*= Monospace ================================================================*/
+@media -moz-pref("userChrome.theme.monospace") {
+  * {
+    font-family: -moz-fixed;
+  }
+}
+/** Decoration ****************************************************************/
+/*= Cursor Types =============================================================*/
+@media -moz-pref("userChrome.decoration.cursor") {
+  #appMenu-proton-update-banner,
+  #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2,
+  #appMenu-zoomReduce-button2,
+  #appMenu-zoomReset-button2,
+  #appMenu-zoomEnlarge-button2,
+  #appMenu-fullscreen-button2,
+  #panelMenu_showAllBookmarks,
+  #PanelUI-historyMore,
+  #appMenuClearRecentHistory:not([disabled]),
+  #appMenu-library-recentlyClosedTabs > .restoreallitem.panel-subview-footer-button,
+  #appMenu-library-recentlyClosedWindows > .restoreallitem.panel-subview-footer-button,
+  #BMB_viewBookmarksSidebar,
+  #BMB_bookmarksShowAllTop,
+  #BMB_bookmarksShowAll,
+  .urlbarView-row:is([type="switchtab"], [type="remotetab"], [type="clipboard"]) .urlbarView-action,
+  #import-button,
+  menuitem.openintabs-menuitem,
+  #downloadsListBox .downloadButton,
+  #downloadsListBox .download-state[exists],
+  #downloadsListBox .download-state[exists] .downloadDetails,
+  #downloadsHistory,
+  #protections-popup-footer .protections-popup-footer-button,
+  #protections-popup-multiView .panel-subview-footer-button,
+  #identity-popup-clear-sitedata-button,
+  #identity-popup-more-info,
+  #unified-extensions-manage-extensions,
+  .unified-extensions-item-open-menu,
+  .unified-extensions-item-menu-button.subviewbutton,
+  #PopupAutoComplete
+    > richlistbox
+    > richlistitem[originaltype="insecureWarning"]
+    > .ac-title
+    > .ac-text-overflow-container
+    > .ac-title-text {
+    cursor: pointer !important;
+  }
+  #PanelUI-fxa-menu-syncnow-button:has(.syncnow-label[data-l10n-id="fxa-toolbar-sync-syncing2"]),
+  #PanelUI-fxa-menu-syncnow-button .syncnow-label[data-l10n-id="fxa-toolbar-sync-syncing2"],
+  #PanelUI-appMenu-fxa-image-last-synced[syncstatus="active"] {
+    cursor: progress !important;
+  }
+}
+/*= Panel UI Button Separator ================================================*/
+@media -moz-pref("userChrome.decoration.panel_button_separator") {
+  :root:not([chromehidden~="toolbar"]) #PanelUI-button {
+    margin-inline-start: 3px;
+    padding-inline-start: 2px;
+    border-inline-start: 1px solid;
+    border-image: linear-gradient(
+      transparent 4px,
+      var(--toolbarseparator-color) 4px,
+      var(--toolbarseparator-color) calc(100% - 4px),
+      transparent calc(100% - 4px)
+    );
+    border-image-slice: 1;
+  }
+}
+/*= Panel UI Arrow ===========================================================*/
+@media -moz-pref("userChrome.decoration.panel_arrow") {
+  #appMenu-popup {
+    background-image: url("chrome://browser/skin/lepton/panelarrow-vertical.svg");
+    background-repeat: no-repeat;
+    background-position-x: right 10px;
+    background-position-y: top;
+    -moz-context-properties: fill, stroke;
+    fill: var(--panel-background);
+    stroke: var(--panel-border-color);
+  }
+  #appMenu-popup[side="top"] {
+    margin-top: -8px !important; /* Original: -4px */
+    padding-top: 4px;
+  }
+  #appMenu-popup[side="bottom"] {
+    background-image: url("chrome://browser/skin/lepton/panelarrow-vertical-reverse.svg");
+    background-position-y: bottom;
+    margin-bottom: -8px !important; /* Original: -4px */
+    padding-bottom: 4px;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  /*= Field Border ===========================================================*/
+  @media -moz-pref("userChrome.decoration.field_border") {
+    /*- URL, Search Bar --------------------------------------------------------*/
+    #urlbar:hover:not([focused="true"]) > #urlbar-background,
+    #searchbar:hover:not(:focus-within) {
+      --toolbar-field-border-color: var(--toolbar-field-focus-border-color);
+    }
+    @media -moz-pref("userChrome.combined.urlbar_with_reload") {
+      #nav-bar-customization-target
+        > #stop-reload-button:hover
+        ~ #urlbar-container
+        #urlbar:not([focused="true"])
+        > #urlbar-background {
+        --toolbar-field-border-color: var(--toolbar-field-focus-border-color);
+      }
+    }
+    /*- Other Fields -----------------------------------------------------------*/
+    /* Sidebar */
+    .sidebar-panel[lwt-sidebar] #search-box:hover,
+    body[lwt-sidebar] xul|search-textbox.tabsFilter:hover {
+      border-color: var(--lwt-sidebar-highlight-background-color, AccentColor) !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      .sidebar-panel[lwt-sidebar] #search-box:hover,
+      body[lwt-sidebar] xul|search-textbox.tabsFilter:hover {
+        border-color: var(--lwt-sidebar-highlight-background-color, Highlight) !important;
+      }
+    }
+    .sidebar-panel:not([lwt-sidebar]) #search-box:hover,
+    body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover {
+      border-color: AccentColor !important;
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      .sidebar-panel:not([lwt-sidebar]) #search-box:hover,
+      body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover {
+        border-color: -moz-accent-color !important;
+      }
+    }
+    /* Others */
+    #editBMPanel_namePicker:hover,
+    #editBMPanel_tagsField:hover,
+    .findbar-container .findbar-textbox:hover {
+      --input-border-color: color-mix(in srgb, var(--focus-outline-color, AccentColor) 50%, transparent);
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      #editBMPanel_namePicker:hover,
+      #editBMPanel_tagsField:hover,
+      .findbar-container .findbar-textbox:hover {
+        --input-border-color: color-mix(in srgb, var(--focus-outline-color, -moz-accent-color) 50%, transparent);
+      }
+    }
+  }
+  /*= Downloads Panel ========================================================*/
+  @media -moz-pref("userChrome.decoration.download_panel") {
+    /* Accent Color for downloaded item */
+    #downloadsListBox .download-state[exists] .downloadDetails {
+      color: var(--button-primary-bgcolor);
+    }
+    #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover {
+      color: var(--button-primary-hover-bgcolor);
+    }
+    /* File moved or missing */
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget {
+      text-decoration: line-through;
+      text-decoration-color: color-mix(in srgb, currentColor 65%, transparent);
+    }
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget:hover {
+      text-decoration: none;
+    }
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon {
+      filter: grayscale(100%) !important;
+    }
+  }
+  /*= Animate ================================================================*/
+  @media -moz-pref("userChrome.decoration.animate") {
+    /*- Background Color -------------------------------------------------------*/
+    button,
+    toolbarbutton,
+    stack,
+    vbox,
+    .toolbarbutton-icon,
+    #tabs-newtab-button > .toolbarbutton-icon {
+      transition: background-color 1s var(--animation-easing-function) !important;
+    }
+    button:hover,
+    toolbarbutton:hover,
+    stack:hover,
+    vbox:hover,
+    .toolbarbutton-icon:hover,
+    #tabs-newtab-button:hover > .toolbarbutton-icon {
+      transition: background-color 0.25s var(--animation-easing-function) !important;
+    }
+    @media (prefers-reduced-motion: no-preference) and (-moz-gtk-csd-available) {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+        .tabbrowser-tab:is([visuallyselected], [multiselected], [selected])
+        .tab-background {
+        transition: background-image 0.25s var(--animation-easing-function) !important;
+      }
+    }
+    .subviewbutton {
+      /* treechildren::-moz-tree-row: Can't apply
+         menu, menuitem is not apply.
+       */
+      transition: background-color 0.5s var(--animation-easing-function) !important;
+    }
+    .subviewbutton:hover {
+      transition: background-color 0.1s var(--animation-easing-function) !important;
+    }
+    /*- Pinned Tab -------------------------------------------------------------*/
+    #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) {
+      /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */
+      transition: -moz-box-flex 0.2s var(--animation-easing-function), flex 0.2s var(--animation-easing-function),
+        margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important;
+    }
+    #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] {
+      transition: margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out,
+        max-width 0.1s ease-out !important;
+    }
+    #tabbrowser-tabs:not([movingtab]) .tab-content::before,
+    #tabbrowser-tabs:not([movingtab]) .tab-content::after {
+      transition: width 0.2s var(--animation-easing-function), transform 0.2s var(--animation-easing-function) !important;
+    }
+    #tabbrowser-tabs:not([movingtab]) .tab-content .tab-label-container {
+      transition: width 0.3s var(--animation-easing-function) !important;
+    }
+    #tabbrowser-tabs:not([movingtab]) .tab-content .tab-icon-image {
+      transition: all 0.3s var(--animation-easing-function) !important;
+    }
+    /*- URL / Search Bar -------------------------------------------------------*/
+    #urlbar-background {
+      transition: border-color 1s var(--animation-easing-function),
+        background-color 0.5s var(--animation-easing-function) !important;
+    }
+    #urlbar-background:hover {
+      transition: border-color 0.5s var(--animation-easing-function),
+        background-color 0.5s var(--animation-easing-function) !important;
+    }
+    #searchbar {
+      transition: border-color 1s var(--animation-easing-function),
+        background-color 1.5s var(--animation-easing-function) !important;
+    }
+    #searchbar:hover {
+      transition: border-color 0.5s var(--animation-easing-function),
+        background-color 1s var(--animation-easing-function) !important;
+    }
+    /* Buttons in URL bar */
+    #tracking-protection-icon-container,
+    #identity-icon-box,
+    #identity-permission-box,
+    #notification-popup-box,
+    #page-action-buttons > .urlbar-page-action {
+      transition: background-color 2.5s var(--animation-easing-function) !important;
+    }
+    #tracking-protection-icon-container:hover,
+    #identity-icon-box:hover,
+    #identity-permission-box:hover,
+    #notification-popup-box:hover,
+    #page-action-buttons > .urlbar-page-action:hover {
+      transition: background-color 1.25s var(--animation-easing-function) !important;
+    }
+    @media -moz-pref("userChrome.combined.urlbar_with_reload") {
+      #nav-bar-customization-target > #stop-reload-button .toolbarbutton-icon {
+        transition: background-color 2.5s var(--animation-easing-function) !important;
+      }
+      #nav-bar-customization-target > #stop-reload-button .toolbarbutton-icon:hover {
+        transition: background-color 1.25s var(--animation-easing-function) !important;
+      }
+    }
+    /*- Border - Other Fields --------------------------------------------------*/
+    #search-box,
+    xul|search-textbox.tabsFilter,
+    #editBMPanel_namePicker,
+    #editBMPanel_tagsField,
+    .findbar-container .findbar-textbox {
+      transition: border-color 1s var(--animation-easing-function) !important;
+    }
+    #search-box:hover,
+    xul|search-textbox.tabsFilter:hover,
+    #editBMPanel_namePicker:hover,
+    #editBMPanel_tagsField:hover,
+    .findbar-container .findbar-textbox:hover {
+      transition: border-color 0.5s var(--animation-easing-function) !important;
+    }
+    /*- Sidebar ----------------------------------------------------------------*/
+    @media not -moz-pref("userChrome.decoration.disable_sidebar_animate") {
+      #sidebar-box {
+        /* like #sidebar-box > #sidebar */
+        min-width: 14em;
+        width: 18em;
+        max-width: 36em;
+        /* Animation */
+        transition: margin-inline-start 0.25s var(--animation-easing-function), visibility 0s linear !important;
+        will-change: margin-inline-start, visibility;
+      }
+      #sidebar-box[hidden="true"] {
+        display: flex !important;
+        display: -moz-box !important;
+        margin-inline-start: -18em;
+        visibility: collapse;
+        transition-delay: 0s, 0.25s !important;
+      }
+    }
+    /*- Titlebar & Full Screen -------------------------------------------------*/
+    #titlebar {
+      will-change: background-color !important;
+      transition: background-color 0.2s var(--animation-easing-function) !important;
+    }
+    #titlebar:-moz-window-inactive {
+      transition: background-color 0.5s var(--animation-easing-function) !important;
+    }
+    #navigator-toolbox {
+      /* Full screen out */
+      will-change: margin-top, background-color !important;
+      transition: margin-top 1s ease, background-color 0.2s var(--animation-easing-function) !important;
+      transform-origin: top;
+    }
+    #navigator-toolbox:-moz-window-inactive {
+      transition: margin-top 1s ease, background-color 0.5s var(--animation-easing-function) !important;
+    }
+    #navigator-toolbox[inFullscreen="true"] {
+      /* Full screen enter */
+      animation-duration: 1s;
+      animation-name: fullscreen;
+      animation-timing-function: ease;
+      /* Full screen navbar not hover */
+      transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+        background-color 0.2s var(--animation-easing-function) !important;
+    }
+    #navigator-toolbox[inFullscreen="true"]:-moz-window-inactive {
+      transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+        background-color 0.5s var(--animation-easing-function) !important;
+    }
+    #navigator-toolbox[inFullscreen="true"]:hover {
+      margin-top: 0 !important;
+    }
+    @keyframes fullscreen {
+      from {
+        margin-top: 0;
+      }
+      /* Don't use `to`: Depending on density */
+    }
+    /*- Expand - Synced Tabs ---------------------------------------------------*/
+    @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml")
+    {
+      .item-tabs-list {
+        transition: transform 0.2s ease-out, opacity 0.2s ease-out;
+        transform: translateY(0%);
+        opacity: 1;
+        max-height: 100%;
+      }
+      .item.client.closed .item-tabs-list {
+        display: flex !important;
+        transition: transform 0.2s ease-out, opacity 0.2s ease-out,
+          max-height 0.25s cubic-bezier(0.82, 0.085, 0.395, 0.895) 0.05s;
+        visibility: hidden;
+        transform: translateY(-100%);
+        opacity: 0;
+        max-height: 0;
+      }
+    }
+    /*- Arrow - Synced Tabs ----------------------------------------------------*/
+    @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml")
+    {
+      /* treechildren::-moz-tree-twisty: Can't apply */
+      #template-container .item.client .item-twisty-container {
+        transition: transform 0.1s var(--animation-easing-function) !important;
+      }
+      #template-container .item.client.closed .item-twisty-container {
+        transform: rotate(-90deg);
+        background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important;
+      }
+      #template-container .item.client.closed .item-twisty-container:dir(rtl) {
+        transform: rotate(90deg);
+      }
+    }
+    /*- Arrow - Edit Bookmark Popup --------------------------------------------*/
+    #editBookmarkPanelRows .expander-up .button-icon,
+    #editBookmarkPanelRows .expander-down .button-icon {
+      transition: transform 0.1s var(--animation-easing-function) !important;
+    }
+    #editBookmarkPanelRows .expander-up {
+      list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+    }
+    #editBookmarkPanelRows .expander-up .button-icon {
+      transform: rotate(180deg);
+    }
+  }
+  @media -moz-pref("userChrome.decoration.disable_panel_animate") {
+    :root {
+      --panelui-subview-transition-duration: 1ms !important; /* Disable top right corner menu sliding animation (0ms will not work!) */
+    }
+  }
+}
+/** Rounding ******************************************************************/
+/** Rounding ******************************************************************/
+.unified-extensions-item-menu-button.subviewbutton {
+  border-radius: var(--arrowpanel-menuitem-border-radius) !important;
+}
+
+@media -moz-pref("userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 0 !important; /* Original: 4px */
+  }
+}
+@media -moz-pref("userChrome.rounding.square_button") {
+  :root {
+    --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
+  }
+  .toolbarbutton-1,
+  .toolbarbutton-icon,
+  .panel-info-button,
+  .searchbar-engine-one-off-item,
+  .urlbarView-button,
+  .urlbarView-tip-button,
+  .urlbarView-action,
+  toolbarbutton.bookmark-item:not(.subviewbutton),
+  #sidebar-switcher-target {
+    --toolbarbutton-border-radius: 0; /* Original: 4px */
+  }
+  button,
+  .close-icon,
+  input[type="number"].photon-number::-moz-number-spin-box,
+  .toggle-group-label,
+  findbar toolbarbutton,
+  .notification-button,
+  #main-menubar > menu {
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_tab") or -moz-pref("userChrome.rounding.square_button") {
+  /* Fix Tab bar button radius */
+  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button),
+  .tab-close-button {
+    --tab-border-radius: var(--toolbarbutton-border-radius);
+  }
+}
+@media -moz-pref("userChrome.rounding.square_panel") {
+  :root {
+    --arrowpanel-border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_panelitem") {
+  :root {
+    --arrowpanel-menuitem-border-radius: 0 !important;
+    --subviewbutton-border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_menupopup") {
+  menupopup {
+    --panel-border-radius: 0px !important;
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_menuitem") {
+  xul|menulist:not([native]),
+  xul|menulist > xul|menupopup xul|menu,
+  xul|menulist > xul|menupopup xul|menuitem,
+  .customization-uidensity-menuitem {
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_infobox") {
+  #sanitizeEverythingWarningBox {
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_toolbar") {
+  :root {
+    --uc-rounding-toolbar: 0;
+  }
+  .container.infobar,
+  .container.infobar::before,
+  notification-message {
+    border-radius: var(--uc-rounding-toolbar) !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_field") {
+  input:not([type="radio"], [type="checkbox"]),
+  textarea,
+  select,
+  menulist,
+  tree,
+  treecols,
+  listheader,
+  richlistbox,
+  search-textbox,
+  .subviewradio {
+    border-radius: 0 !important;
+  }
+  #urlbar-input-container,
+  #urlbar-background,
+  #searchbar {
+    --toolbarbutton-border-radius: 0;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_urlView_item") {
+  .urlbarView-row,
+  .urlbarView-row-inner {
+    --toolbarbutton-border-radius: 0;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_checklabel") {
+  input[type="checkbox"],
+  .checkbox-check {
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_dialog") {
+  dialog,
+  .dialogBox {
+    border-radius: 0 !important;
+  }
+}
+/*= Library ==============================================================*/
+@media -moz-pref("userChrome.rounding.square_button") {
+  #placesToolbar > toolbarbutton,
+  #placesMenu > menu,
+  #editBookmarkPanelRows .expander-up,
+  #editBookmarkPanelRows .expander-down {
+    border-radius: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.rounding.square_field") {
+  #searchFilter,
+  #detailsPane html|input,
+  #places input #editBMPanel_tagsSelectorRow > richlistbox {
+    border-radius: 0 !important;
+  }
+}
+/*
+--toolbarbutton-border-radius: 4px;
+*/
+/** Reduce Padding ************************************************************/
+/*= Tab Bar - Distribution padding, radius ===================================*/
+@media -moz-pref("userChrome.tab.lepton_like_padding") or -moz-pref("userChrome.tab.photon_like_padding") {
+  :root {
+    --proton-tab-block-margin: var(--tab-block-margin) !important; /* Original: 4px, Legacy */
+  }
+  :root[uidensity="touch"] {
+    /* Like Original */
+    --tab-block-margin: 4px !important;
+  }
+}
+@media -moz-pref("userChrome.tab.lepton_like_padding") {
+  :root {
+    --tab-block-margin: 2px !important; /* New version of --proton-tab-block-margin */
+  }
+  #tabbrowser-tabs[orient="vertical"] {
+    --tab-block-margin: 4px !important;
+  }
+  #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab {
+    margin-block: -1px !important;
+  }
+}
+@media -moz-pref("userChrome.tab.photon_like_padding") {
+  :root {
+    --tab-block-margin: 0px !important;
+  }
+}
+/*= Tab Bar - Reduce Width, Show more tabs ===================================*/
+@media -moz-pref("userChrome.padding.first_tab") {
+  /* for First Tab Space */
+  :root {
+    --uc-space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */
+  }
+  @media not -moz-pref("userChrome.padding.first_tab.always") {
+    :root:not([tabsintitlebar]):not([customtitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]),
+    :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) {
+      padding-inline-start: var(--uc-space-left-tabbar) !important;
+    }
+  }
+  @media -moz-pref("userChrome.padding.first_tab.always") {
+    :root:not([tabsintitlebar]):not([customtitlebar]) #tabbrowser-tabs,
+    :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs {
+      padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width, 0px) + var(--uc-space-left-tabbar)) !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.padding.tabbar_width") {
+  /* Titlebar Space */
+  :root {
+    --uc-title-pre-spacer: 30px; /* Original: 40px */
+    --uc-title-post-spacer: 25px; /* Original: 40px */
+  }
+  :root:-moz-locale-dir(rtl) {
+    --uc-title-pre-spacer: 25px;
+    --uc-title-post-spacer: 30px;
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    .titlebar-spacer[type="pre-tabs"] {
+      width: var(--uc-title-pre-spacer) !important;
+    }
+    .titlebar-spacer[type="post-tabs"] {
+      width: var(--uc-title-post-spacer) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+    .titlebar-spacer[type="pre-tabs"] {
+      width: var(--uc-title-pre-spacer) !important;
+    }
+    .titlebar-spacer[type="post-tabs"] {
+      width: var(--uc-title-post-spacer) !important;
+    }
+  }
+  @media (-moz-platform: windows) {
+    .titlebar-spacer[type="pre-tabs"] {
+      width: var(--uc-title-post-spacer) !important;
+    }
+    .titlebar-spacer[type="post-tabs"] {
+      width: var(--uc-title-pre-spacer) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+    .titlebar-spacer[type="pre-tabs"] {
+      width: var(--uc-title-post-spacer) !important;
+    }
+    .titlebar-spacer[type="post-tabs"] {
+      width: var(--uc-title-pre-spacer) !important;
+    }
+  }
+  /* Tabbar Buttons */
+  :root {
+    --newtab-button-minus-width-padding: 2px;
+    --newtab-button-width-padding: calc(var(--toolbarbutton-inner-padding) - var(--newtab-button-minus-width-padding));
+  }
+  #widget-overflow-mainView #new-tab-button,
+  #widget-overflow-mainView #alltabs-button {
+    --newtab-button-width-padding: 0px;
+  }
+  #new-tab-button > .toolbarbutton-icon,
+  #alltabs-button > .toolbarbutton-badge-stack {
+    /* Original: calc(2 * var(--toolbarbutton-inner-padding) + 16px) */
+    width: calc(2 * var(--newtab-button-width-padding) + 16px) !important;
+    /* Original: --toolbarbutton-inner-padding */
+    padding-left: var(--newtab-button-width-padding) !important;
+    padding-right: var(--newtab-button-width-padding) !important;
+  }
+  @media not -moz-pref("userChrome.tab.photon_like_padding") {
+    #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+      margin-inline-start: 1px !important;
+    }
+  }
+  @media -moz-pref("userChrome.tab.photon_like_padding") {
+    #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+      margin-inline-start: 0 !important;
+    }
+  }
+  :root:not([uidensity="touch"]) #pinned-tabs-container,
+  :root:not([uidensity="touch"]) #tabbrowser-arrowscrollbox {
+    --scrollbtn-inner-padding: 1px;
+    --scrollbtn-outer-padding: 3px;
+  }
+  #scrollbutton-up {
+    padding-left: var(--scrollbtn-inner-padding, 4px) !important; /* Original: 4px */
+    padding-right: var(--scrollbtn-outer-padding, 4px) !important;
+  }
+  #scrollbutton-down {
+    padding-left: var(--scrollbtn-outer-padding, 4px) !important; /* Original: 4px */
+    padding-right: var(--scrollbtn-inner-padding, 4px) !important;
+  }
+  :root:not([uidensity="touch"]) #new-tab-button,
+  #alltabs-button {
+    --toolbarbutton-outer-padding: 1px; /* Original: 2px*/
+  }
+  /* Tab - Max Size */
+  @media not -moz-pref("userChrome.tab.photon_like_padding") {
+    :root {
+      --tab-max-width: 240px;
+    }
+  }
+  @media -moz-pref("userChrome.tab.photon_like_padding") {
+    :root {
+      --tab-max-width: 225px;
+    }
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner") {
+    @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      :root {
+        --tab-max-width: 180px;
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      @media screen and (min-width: 1100px) {
+        :root {
+          --tab-max-width: 180px;
+        }
+      }
+    }
+  }
+  .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    max-width: var(--tab-max-width) !important; /* Original: 225px */
+  }
+  #tabbrowser-tabs[orient="vertical"][expanded] .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    max-width: none !important;
+  }
+  #tabbrowser-tabs[orient="horizontal"]
+    tab-group[collapsed]
+    > .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    min-width: 0 !important;
+    max-width: 0 !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    overflow-clip-margin: 0;
+  }
+  /* neighbouring tabs should "pinch" together */
+  :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery,
+  #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+    > #pinned-tabs-container
+    > #tabbrowser-arrowscrollbox-periphery,
+  #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+    > #tabbrowser-arrowscrollbox
+    > #tabbrowser-arrowscrollbox-periphery {
+    min-width: 3px;
+  }
+  #tabbrowser-tabs[orient="horizontal"] .tab-group-label-container {
+    margin-inline-start: 4px !important;
+  }
+  @media not -moz-pref("userChrome.tab.photon_like_padding") {
+    @media -moz-pref("userChrome.tab.lepton_like_padding") {
+      #TabsToolbar:not([multibar]) .tabbrowser-tab[pinned] {
+        padding-inline: 1px !important;
+      }
+      #TabsToolbar:not([multibar]) .tabbrowser-tab:not([pinned]):not(:first-of-type) {
+        margin-inline: -1px !important;
+      }
+      #TabsToolbar:not([multibar]) .tabbrowser-tab:not([pinned]):first-of-type {
+        margin-inline-end: -1px !important;
+      }
+    }
+    @media not -moz-pref("userChrome.tabbar.multi_row") {
+      #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
+        margin-inline-end: -2px !important;
+      }
+    }
+  }
+  @media -moz-pref("userChrome.tab.photon_like_padding") {
+    .tabbrowser-tab {
+      padding-inline: 0 !important;
+    }
+  }
+}
+/*= Tab Bar - Reduce Height, Show more contents ==============================*/
+@media -moz-pref("userChrome.padding.drag_space") {
+  /* for Extra Drag Space */
+  :root {
+    --uc-space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */
+  }
+  @media (-moz-platform: windows) {
+    :root:is([tabsintitlebar], [customtitlebar])[sizemode="normal"] #toolbar-menubar[autohide="true"] {
+      height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size));
+    }
+    @media -moz-pref("userChrome.padding.drag_space.maximized") {
+      :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"] {
+        height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size));
+      }
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:is([tabsintitlebar], [customtitlebar])[sizemode="normal"] #toolbar-menubar[autohide="true"] {
+      height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar));
+    }
+    @media -moz-pref("userChrome.padding.drag_space.maximized") {
+      :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"] {
+        height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar));
+      }
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    #TabsToolbar > .toolbar-items {
+      padding-top: var(--uc-space-above-tabbar) !important;
+    }
+  }
+  @media (-moz-platform: windows), (-moz-gtk-csd-available) {
+    /* Add extra space to titlebar for dragging */
+    :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+    :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+      padding-top: var(--uc-space-above-tabbar) !important;
+    }
+    @media -moz-pref("userChrome.padding.drag_space.maximized") {
+      :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+      :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+        padding-top: var(--uc-space-above-tabbar) !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.padding.tabbar_height") {
+  /* Toolbar Height */
+  @media -moz-pref("userChrome.tab.lepton_like_padding") {
+    :root:not([uidensity]) {
+      --tab-min-height: 36px !important;
+    }
+    :root[uidensity="compact"] {
+      --tab-min-height: 32px !important;
+    }
+    :root[uidensity="touch"] {
+      --tab-min-height: 41px !important;
+    }
+  }
+  @media -moz-pref("userChrome.tab.photon_like_padding") {
+    :root:not([uidensity]) {
+      --tab-min-height: 32px !important;
+    }
+    :root[uidensity="compact"] {
+      --tab-min-height: 29px !important;
+    }
+    :root[uidensity="touch"] {
+      --tab-min-height: 41px !important;
+    }
+    /* Top Margin */
+    .tab-background,
+    .tab-content {
+      margin-top: 0 !important;
+    }
+  }
+  @media not -moz-pref("userChrome.tab.lepton_like_padding") {
+    @media not -moz-pref("userChrome.tab.photon_like_padding") {
+      :root:not([uidensity]) {
+        --tab-min-height: 36px !important; /* 38px -> 36px */
+      }
+      :root[uidensity="compact"] {
+        --tab-min-height: 29px !important; /* 36px -> 29px */
+      }
+    }
+  }
+  :root {
+    /* Works with TabMixPlus */
+    --tab-min-height_mlt: calc(
+      var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px)))
+    ) !important;
+  }
+  #TabsToolbar[multibar] .tabbrowser-tab {
+    height: unset !important; /* Original: var(--tab-min-height_mlt) */
+  }
+  @media -moz-pref("userChrome.tab.connect_to_window") {
+    :root {
+      --tab-min-height_mlt: calc(
+        var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px))
+      ) !important;
+    }
+    #TabsToolbar {
+      --toolbarbutton-inner-padding: calc(
+        (var(--tab-min-height) - 18px) / 2
+      ) !important; /* Prevent overflow pinned tab bottom margin */
+    }
+    @media not -moz-pref("userChrome.tabbar.multi_row") {
+      :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #pinned-tabs-container,
+      #TabsToolbar:not([multibar]) #pinned-tabs-container[overflowing="true"] > .tabbrowser-tab[pinned="true"],
+      #TabsToolbar:not([multibar])
+        #pinned-tabs-container[overflowing="true"]
+        > .tabbrowser-tab[pinned="true"]
+        .tab-stack,
+      #TabsToolbar:not([multibar])
+        #pinned-tabs-container[overflowing="true"]
+        > .tabbrowser-tab[pinned="true"]
+        .tab-content,
+      :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox,
+      #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"],
+      #TabsToolbar:not([multibar])
+        #tabbrowser-arrowscrollbox[overflowing="true"]
+        > .tabbrowser-tab[pinned="true"]
+        .tab-stack,
+      #TabsToolbar:not([multibar])
+        #tabbrowser-arrowscrollbox[overflowing="true"]
+        > .tabbrowser-tab[pinned="true"]
+        .tab-content {
+        max-height: var(--tab-min-height) !important; /* Force apply height */
+      }
+      :root[uidensity="compact"] #TabsToolbar:not([multibar]) #pinned-tabs-container,
+      :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox {
+        height: var(--tab-min-height) !important;
+      }
+    }
+  }
+  /* Scroll Button - Size Fix */
+  :root #pinned-tabs-container,
+  :root #tabbrowser-arrowscrollbox {
+    --scrollbtn-vertical-padding: 3px;
+    --scrollbtn-vertical-border: 2px;
+    --scrollbtn-border-radius: 7px;
+  }
+  #scrollbutton-up,
+  #scrollbutton-down {
+    /* Original: var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 6px) = 9px */
+    /* https://github.com/mozilla/gecko-dev/blob/71b1259afd1cdaf41871ae675c2dadb967ea5b34/browser/themes/shared/toolbarbuttons.inc.css#L142 */
+    padding-top: var(--scrollbtn-vertical-padding, var(--toolbarbutton-inner-padding)) !important;
+    padding-bottom: var(--scrollbtn-vertical-padding, var(--toolbarbutton-inner-padding)) !important;
+    /* Original: 4px */
+    border-top-width: var(--scrollbtn-vertical-border, 4px) !important;
+    border-bottom-width: var(--scrollbtn-vertical-border, 4px) !important;
+    /* Original: calc(var(--tab-border-radius) + 4px) = 8px */
+    border-radius: var(--scrollbtn-border-radius, calc(var(--tab-border-radius) + 4px)) !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not([uidensity="compact"]) #toolbar-menubar[autohide="true"] {
+    height: calc(
+      var(--tab-min-height) - var(--tabs-navbar-shadow-size) - 2px
+    ); /* Compact: 28px, Normal: 33px, Touch: 38px */
+  }
+}
+/*= Tool Bar - Button Padding ================================================*/
+@media -moz-pref("userChrome.padding.toolbar_button") or -moz-pref("userChrome.tab.newtab_button_smaller") {
+  :root {
+    --uc-small-toolbarbutton-inner-padding: 6px;
+    --uc-toolbarbutton-inner-padding-default: 8px;
+  }
+  :root[uidensity="compact"] {
+    --uc-small-toolbarbutton-inner-padding: 4px;
+    --uc-toolbarbutton-inner-padding-default: 6px;
+  }
+  :root[uidensity="touch"] #tabs-newtab-button > .toolbarbutton-icon {
+    --uc-small-toolbarbutton-inner-padding: 9px;
+    --uc-toolbarbutton-inner-padding-default: 9px;
+  }
+}
+@media -moz-pref("userChrome.padding.toolbar_button") {
+  :root[uidensity="compact"] {
+    --toolbarbutton-outer-padding: 2px !important; /* Original: 3px, General is 2px */
+  }
+  @media -moz-pref("userChrome.padding.toolbar_button.compact") {
+    :root {
+      --toolbarbutton-inner-padding: var(--uc-small-toolbarbutton-inner-padding) !important;
+    }
+  }
+}
+/*= Nav Bar - Reduce Width ===================================================*/
+@media -moz-pref("userChrome.padding.navbar_width") {
+  #nav-bar:not([customizing]) toolbarspring {
+    min-width: 1px !important;
+    max-width: 100px !important;
+  }
+}
+/*= URL Bar - Reduce Padding =================================================*/
+@media not -moz-pref("userChrome.urlView.as_commandbar") {
+  @media -moz-pref("userChrome.padding.urlbar") {
+    :root:not([uidensity="touch"]) #urlbar-container,
+    :root:not([uidensity="touch"]) #search-container {
+      padding-block: 3px !important; /* Original: 4px */
+    }
+    :root:not([uidensity="compact"]) #urlbar-container,
+    :root:not([uidensity="compact"]) #search-container {
+      padding-block: 2px !important;
+    }
+    :root:not([uidensity="compact"]) #urlbar,
+    :root:not([uidensity="compact"]) #searchbar {
+      min-height: calc(var(--urlbar-min-height) - 2px) !important;
+    }
+    :root:not([uidensity="compact"]) #urlbar[breakout] {
+      height: calc(var(--urlbar-height) - 2px) !important;
+    }
+    :root:not([uidensity="compact"]) #urlbar[breakout][breakout-extend],
+    :root:not([uidensity="compact"]) #urlbar[breakout][breakout-extend-disabled][open] {
+      height: auto !important;
+    }
+    /* spread menu */
+    :root:not([uidensity]) .urlbarView-row {
+      padding-block: 1px !important; /* Original: 2px */
+    }
+    :root[uidensity="compact"] .urlbarView-row {
+      padding-block: 0px !important;
+    }
+    :root:not([uidensity]) #urlbar .search-one-offs:not([hidden]) {
+      padding-block: 8px !important; /* Original: 10px */
+    }
+    :root[uidensity="compact"] #urlbar .search-one-offs:not([hidden]) {
+      padding-block: 2px !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.padding.urlView_expanding") or -moz-pref("userChrome.urlView.as_commandbar") {
+  #urlbar[breakout][breakout-extend] {
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
+  }
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container {
+    height: var(--urlbar-height) !important;
+    padding-block: 0 !important;
+    padding-inline: var(--urlbar-container-padding, 0px) !important;
+  }
+}
+@media -moz-pref("userChrome.padding.urlView_expanding") {
+  #urlbar[breakout][breakout-extend] > #urlbar-background {
+    animation-name: none !important;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05) !important;
+  }
+}
+@media -moz-pref("userChrome.padding.urlView_result") {
+  .urlbarView {
+    margin-inline: 0 !important;
+    width: 100% !important;
+  }
+  .urlbarView-row {
+    padding-block: 0 !important;
+  }
+}
+/*= BookMark Bar - Reduce Height =============================================*/
+@media -moz-pref("userChrome.padding.bookmarkbar") {
+  :root[uidensity="compact"] #PersonalToolbar toolbarbutton {
+    margin-top: 0px !important; /* Original: 2px */
+    margin-bottom: 1px !important;
+  }
+}
+/*= Info Bar - Reduce Padding ================================================*/
+@media -moz-pref("userChrome.padding.infobar") or -moz-pref("userChrome.autohide.infobar") {
+  #tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
+    margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin, 8px)) !important;
+  }
+}
+@media -moz-pref("userChrome.padding.infobar") {
+  :root:not([uidensity]) notification-message {
+    --infobar-message-vertical-margin: 3px;
+    --infobar-vertical-margin: 7px;
+    --infobar-button-vertical-margin: 3px;
+  }
+  :root[uidensity="compact"] notification-message {
+    --infobar-message-vertical-margin: 2px;
+    --infobar-vertical-margin: 6px;
+    --infobar-button-vertical-margin: 2px;
+  }
+  :root[uidensity="touch"] notification-message {
+    --infobar-message-vertical-margin: 4px;
+    --infobar-vertical-margin: 8px;
+    --infobar-button-vertical-margin: 4px;
+  }
+  .infobar > .icon {
+    margin-block: var(--infobar-vertical-margin) !important; /* Original: 8px */
+  }
+  .notification-message {
+    padding-block: var(--infobar-vertical-margin) !important; /* Original: 8px */
+  }
+  .notification-button-container > .notification-button {
+    margin-block: var(--infobar-button-vertical-margin) !important; /* Original: 4px */
+  }
+  .notification-close {
+    margin: var(--infobar-button-vertical-margin) 8px !important; /* Original: 4px 8px */
+  }
+  /* Hard coded for compatibility - Disappearing phenomenon */
+  .container.infobar::before {
+    content: "";
+    display: block;
+    width: 2px;
+    position: absolute;
+    background-image: linear-gradient(0deg, #9059ff 0%, #ff4aa2 52.08%, #ffbd4f 100%);
+    top: 0;
+    inset-inline-start: 0;
+    height: 100%;
+    border-start-start-radius: 4px;
+    border-end-start-radius: 4px;
+  }
+}
+/*= Menu - Reduce Padding ====================================================*/
+@media -moz-pref("userChrome.padding.menu") {
+  :root {
+    --menu-padding: 0.35em; /* Win7, 8: 0px */
+  }
+  :root[uidensity="compact"] {
+    --menu-padding: 0.25em;
+  }
+  :root[uidensity="touch"] {
+    --menu-padding: 0.5em;
+  }
+  @media -moz-pref("userChrome.padding.menu_compact") {
+    :root {
+      --menu-padding: 2px;
+    }
+    :root[uidensity="compact"] {
+      --menu-padding: 0px;
+    }
+  }
+  menupopup > menuitem,
+  menupopup > menu {
+    /* Original: 0.5em */
+    padding-block: var(--menu-padding) !important;
+  }
+  @media (-moz-platform: windows) {
+    #ContentSelectDropdown > menupopup > menucaption,
+    #ContentSelectDropdown > menupopup > menuitem {
+      padding-block: 0 !important;
+    }
+    #ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text,
+    #ContentSelectDropdown > menupopup > menuitem > .menu-iconic-text {
+      padding-block: var(--menu-padding) !important;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    #ContentSelectDropdown > menupopup > menucaption,
+    #ContentSelectDropdown > menupopup > menuitem {
+      padding-block: var(--menu-padding) !important;
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    #ContentSelectDropdown > menupopup > menucaption,
+    #ContentSelectDropdown > menupopup > menuitem {
+      padding-block: var(--menu-padding) !important;
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    :root:not([uidensity="touch"]) .menu-text,
+    :root:not([uidensity="touch"]) .menu-iconic-text {
+      padding-inline-end: 0 !important; /* Original: 2px */
+    }
+    :root:not([uidensity="touch"]) .menupopup-arrowscrollbox {
+      padding-block: 1px !important; /* Original: 4px*/
+    }
+    :root:not([uidensity="touch"]) #context-navigation:not([hidden]) {
+      padding: 0 0 1px !important; /* Original: 0 0 4px*/
+    }
+    :root:not([uidensity="touch"]) .menu-right {
+      margin-right: 6px !important; /* Original: 12px */
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    menupopup > menu {
+      padding-inline-start: 0.5em;
+    }
+  }
+  /* Arrow Icon Align to Right */
+  .bookmark-item.subviewbutton > .menu-right {
+    margin-inline-end: 0 !important;
+  }
+}
+/*= Bookmark Menu - Reduce Padding ===========================================*/
+@media -moz-pref("userChrome.padding.bookmark_menu") {
+  :root {
+    --bookmark-menu-padding: 3px;
+  }
+  :root[uidensity="compact"] {
+    --bookmark-menu-padding: 1.5px;
+  }
+  @media -moz-pref("userChrome.padding.menu_compact") {
+    :root {
+      --bookmark-menu-padding: 2px;
+    }
+    :root[uidensity="compact"] {
+      --bookmark-menu-padding: 0px;
+    }
+  }
+  :root:not([uidensity="touch"]) #BMB_bookmarksPopup .subviewbutton,
+  :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .bookmark-item,
+  :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .openintabs-menuitem {
+    padding-block: var(--bookmark-menu-padding) !important;
+  }
+  @media -moz-pref("userChrome.padding.menu_compact") or -moz-pref("userChrome.padding.bookmark_menu.compact") {
+    :root:not([uidensity="touch"]) #BMB_bookmarksPopup .bookmark-item,
+    :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .bookmark-item {
+      min-height: unset !important; /* Original: 24px */
+    }
+  }
+}
+/*= Global Menu - Set Padding ================================================*/
+@media -moz-pref("userChrome.padding.global_menubar") {
+  /* Vertical Align - Center & Height: 100%  */
+  #main-menubar {
+    flex: 1 !important;
+    -moz-box-flex: 1 !important;
+  }
+  /* Rounding */
+  #main-menubar > menu {
+    border-radius: 4px;
+  }
+  /* Menubar item padding */
+  :root {
+    --global-menubar-padding: 2px;
+  }
+  :root[uidensity="compact"] {
+    --global-menubar-padding: 1px;
+  }
+  :root[uidensity="touch"] {
+    --global-menubar-padding: 4px;
+  }
+  #main-menubar > menu {
+    padding-block: var(--global-menubar-padding) !important;
+  }
+  /* Reduce items */
+  #main-menubar > menu > menupopup menuitem,
+  #main-menubar > menu > menupopup menu {
+    padding-block: var(--bookmark-menu-padding) !important;
+  }
+  @media -moz-pref("userChrome.compatibility.os.win11") {
+    #main-menubar > menu > menupopup menuitem,
+    #main-menubar > menu > menupopup menu {
+      --bookmark-menu-padding: 3px;
+    }
+    #main-menubar > menu > menupopup menuitem:is([type="checkbox"], [type="radio"]),
+    #main-menubar > menu > menupopup menu:is([type="checkbox"], [type="radio"]) {
+      --bookmark-menu-padding: 0px;
+    }
+  }
+}
+/*= Panel - Reduce padding ===================================================*/
+@media -moz-pref("userChrome.padding.panel") {
+  :root {
+    --arrowpanel-menuitem-margin-block: 0; /* FF 102 compatibility */
+    --arrowpanel-menuitem-margin-inline: 8px;
+    --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline) !important; /* Original: 0 8px */
+    --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */
+    --arrowpanel-padding: 0.8em !important; /* Original: 16px or .cui-widget-panel, .cui-widget-panel::part(arrowcontent) => 4px 0 */
+  }
+  :root[uidensity="compact"] {
+    --arrowpanel-menuitem-margin-inline: 4px; /* FF 102 compatibility */
+    --arrowpanel-menuitem-padding-block: 3px !important;
+    --arrowpanel-menuitem-padding-inline: 3px !important;
+  }
+  :root[uidensity="touch"] {
+    --arrowpanel-menuitem-padding-block: 8px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding-inline: 8px !important; /* Original: 8px */
+  }
+  .all-tabs-item {
+    margin: var(--arrowpanel-menuitem-margin) !important;
+  }
+  @media not -moz-pref("userChrome.icon.disabled") {
+    @media not -moz-pref("userChrome.icon.panel") {
+      .subviewbutton {
+        min-height: calc(16px + var(--arrowpanel-menuitem-padding-block) * 2) !important;
+      }
+    }
+  }
+  .unified-extensions-item-menu-button.subviewbutton {
+    padding: 0 !important; /* Original: calc(var(--arrowpanel-menuitem-margin-inline) - 1px) var(--arrowpanel-menuitem-margin-inline) */
+  }
+  @media -moz-pref("userChrome.panel.full_width_padding") {
+    .unified-extensions-item-menu-button.subviewbutton {
+      --arrowpanel-menuitem-padding-inline: var(--arrowpanel-menuitem-padding-block);
+    }
+  }
+  :root[uidensity="compact"] :is(.unified-extensions-item, .unified-extensions-item-action-button) {
+    padding-block: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.padding.panel_header") {
+  .panel-header {
+    padding: unset !important;
+    padding-top: 4px !important;
+  }
+}
+/*= Popup Panel - Reduce padding =============================================*/
+@media -moz-pref("userChrome.padding.popup_panel") {
+  #protections-popup-main-header-label {
+    height: unset !important; /* Original: 37.6px */
+  }
+  #identity-popup,
+  #permission-popup,
+  #protections-popup {
+    --vertical-section-padding: 0.8em; /* Original: 0.9em */
+  }
+  .protections-popup-footer-button,
+  .protections-popup-category {
+    min-height: 24px; /* Original: 32px */
+    height: unset !important;
+  }
+  /** Popup panel - Compact mode  */
+  :root[uidensity="compact"] #protections-popup-content {
+    margin-block: 0 !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
+    padding-block-start: 0 !important;
+    padding-block-end: 4px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
+  :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
+    min-height: 20px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike {
+    margin: 0 0 3px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike > button {
+    padding: 3px 8px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-trackersView-settings-button {
+    margin: 4px 8px 0 !important;
+  }
+  :root[uidensity="compact"] #identity-popup-multiView #identity-popup-mainView-panel-header {
+    padding: 2px 5px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-no-trackers-found-description {
+    margin: 2em 4em !important;
+  }
+  :root[uidensity="compact"] #downloadsListBox {
+    margin: 0 !important;
+  }
+}
+/** Tab Bar UI ****************************************************************/
+/*= Tabs on Bottom ===========================================================*/
+@media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.fullscreen.overlap") {
+  /* Don't use display: flex at not fullscreen!! side effect #372 */
+  :root[sizemode="fullscreen"] #navigator-toolbox {
+    display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
+  }
+  :root[sizemode="fullscreen"] #titlebar,
+  :root[sizemode="fullscreen"] #toolbar-menubar,
+  :root[sizemode="fullscreen"] #TabsToolbar,
+  :root[sizemode="fullscreen"] #nav-bar,
+  :root[sizemode="fullscreen"] #PersonalToolbar,
+  :root[sizemode="fullscreen"] #tab-notification-deck,
+  :root[sizemode="fullscreen"] #tab-notification-deck-template {
+    flex-basis: 100%;
+  }
+  /* -moz-default-appearance: -moz-window-titlebar */
+  :root[sizemode="fullscreen"] #titlebar {
+    -moz-appearance: none !important;
+  }
+}
+@media -moz-pref("userChrome.tabbar.on_bottom") {
+  @media not -moz-pref("userChrome.tabbar.one_liner") {
+    /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+    See the above repository for updates as well as full license text. */
+    /*= Tabbar - Move to bottom ==================================================*/
+    #titlebar,
+    #TabsToolbar {
+      order: 2;
+      -moz-box-ordinal-group: 2;
+      --tabs-navbar-shadow-size: 0px;
+    }
+    #tab-notification-deck {
+      order: 2;
+      -moz-box-ordinal-group: 2;
+    }
+    #TabsToolbar .titlebar-spacer {
+      display: none;
+    }
+    #TabsToolbar-customization-target > .toolbarbutton-1:last-child {
+      padding-inline-end: var(--toolbar-start-end-padding, 8px);
+    }
+    @media -moz-pref("userChrome.tabbar.on_bottom.above_bookmark") {
+      #PersonalToolbar {
+        order: 2;
+        -moz-box-ordinal-group: 2;
+      }
+    }
+    @media not -moz-pref("userChrome.tabbar.on_bottom.above_bookmark") {
+      @media -moz-pref("userChrome.tab.connect_to_window") {
+        @media -moz-pref("userChrome.tab.color_like_toolbar") {
+          #navigator-toolbox {
+            border-bottom-color: var(
+              --toolbar-bgcolor
+            ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */
+          }
+        }
+      }
+    }
+    /*= Tabbar - Hidden at single tab ===========================================*/
+    @media -moz-pref("userChrome.tabbar.on_bottom.hidden_single_tab") {
+      #tabbrowser-tabs .tabbrowser-tab:only-of-type {
+        display: none !important;
+      }
+      #tabbrowser-tabs,
+      #tabbrowser-tabs arrowscrollbox {
+        height: auto !important;
+        min-height: auto !important;
+      }
+      @media (prefers-reduced-motion: no-preference) {
+        #tabbrowser-tabs {
+          transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay);
+        }
+      }
+    }
+    /*= Menubar - Always on top ==================================================*/
+    @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+      /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
+      See the above repository for updates as well as full license text. */
+      /* Menubar on top patch - use with tabs_on_bottom.css */
+      /* Only really useful if menubar is ALWAYS visible */
+      :root:not([sizemode="fullscreen"]) {
+        --uc-window-control-width: 0px !important;
+      }
+      /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */
+      :root:not([sizemode="fullscreen"]) #nav-bar {
+        border-inline-width: 0;
+      }
+      #navigator-toolbox {
+        -moz-window-dragging: drag;
+      }
+      :root[sizemode="fullscreen"] #navigator-toolbox {
+        padding-top: 0px !important;
+      }
+      #toolbar-menubar {
+        position: fixed;
+        display: flex;
+        top: var(--uc-titlebar-padding);
+        height: var(--uc-menubar-height);
+        width: 100%;
+        overflow: hidden;
+      }
+      :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+        height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+      }
+      #toolbar-menubar > .titlebar-buttonbox-container {
+        height: 100%;
+        order: 100;
+      }
+      #toolbar-menubar > [flex] {
+        flex-grow: 100;
+      }
+      #toolbar-menubar > spacer[flex] {
+        order: 99;
+        flex-grow: 1;
+        min-width: var(--uc-window-drag-space-post);
+      }
+      #toolbar-menubar .toolbarbutton-1 {
+        --toolbarbutton-inner-padding: 3px;
+      }
+      :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+        #toolbar-menubar:not([autohide="true"])
+        + #TabsToolbar
+        > .titlebar-buttonbox-container {
+        visibility: collapse !important;
+      }
+      :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"])
+        #toolbar-menubar:not([autohide="true"])
+        .titlebar-buttonbox-container {
+        visibility: visible;
+      }
+    }
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner") {
+    @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      @media screen and (max-width: 1100px) {
+        /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+        See the above repository for updates as well as full license text. */
+        /*= Tabbar - Move to bottom ==================================================*/
+        #titlebar,
+        #TabsToolbar {
+          order: 2;
+          -moz-box-ordinal-group: 2;
+          --tabs-navbar-shadow-size: 0px;
+        }
+        #tab-notification-deck {
+          order: 2;
+          -moz-box-ordinal-group: 2;
+        }
+        #TabsToolbar .titlebar-spacer {
+          display: none;
+        }
+        #TabsToolbar-customization-target > .toolbarbutton-1:last-child {
+          padding-inline-end: var(--toolbar-start-end-padding, 8px);
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom.above_bookmark") {
+          #PersonalToolbar {
+            order: 2;
+            -moz-box-ordinal-group: 2;
+          }
+        }
+        @media not -moz-pref("userChrome.tabbar.on_bottom.above_bookmark") {
+          @media -moz-pref("userChrome.tab.connect_to_window") {
+            @media -moz-pref("userChrome.tab.color_like_toolbar") {
+              #navigator-toolbox {
+                border-bottom-color: var(
+                  --toolbar-bgcolor
+                ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */
+              }
+            }
+          }
+        }
+        /*= Tabbar - Hidden at single tab ===========================================*/
+        @media -moz-pref("userChrome.tabbar.on_bottom.hidden_single_tab") {
+          #tabbrowser-tabs .tabbrowser-tab:only-of-type {
+            display: none !important;
+          }
+          #tabbrowser-tabs,
+          #tabbrowser-tabs arrowscrollbox {
+            height: auto !important;
+            min-height: auto !important;
+          }
+          @media screen and (max-width: 1100px) and (prefers-reduced-motion: no-preference) {
+            #tabbrowser-tabs {
+              transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay);
+            }
+          }
+        }
+        /*= Menubar - Always on top ==================================================*/
+        @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+          /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
+          See the above repository for updates as well as full license text. */
+          /* Menubar on top patch - use with tabs_on_bottom.css */
+          /* Only really useful if menubar is ALWAYS visible */
+          :root:not([sizemode="fullscreen"]) {
+            --uc-window-control-width: 0px !important;
+          }
+          /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */
+          :root:not([sizemode="fullscreen"]) #nav-bar {
+            border-inline-width: 0;
+          }
+          #navigator-toolbox {
+            -moz-window-dragging: drag;
+          }
+          :root[sizemode="fullscreen"] #navigator-toolbox {
+            padding-top: 0px !important;
+          }
+          #toolbar-menubar {
+            position: fixed;
+            display: flex;
+            top: var(--uc-titlebar-padding);
+            height: var(--uc-menubar-height);
+            width: 100%;
+            overflow: hidden;
+          }
+          :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+            height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+          }
+          #toolbar-menubar > .titlebar-buttonbox-container {
+            height: 100%;
+            order: 100;
+          }
+          #toolbar-menubar > [flex] {
+            flex-grow: 100;
+          }
+          #toolbar-menubar > spacer[flex] {
+            order: 99;
+            flex-grow: 1;
+            min-width: var(--uc-window-drag-space-post);
+          }
+          #toolbar-menubar .toolbarbutton-1 {
+            --toolbarbutton-inner-padding: 3px;
+          }
+          :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+            #toolbar-menubar:not([autohide="true"])
+            + #TabsToolbar
+            > .titlebar-buttonbox-container {
+            visibility: collapse !important;
+          }
+          :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"])
+            #toolbar-menubar:not([autohide="true"])
+            .titlebar-buttonbox-container {
+            visibility: visible;
+          }
+        }
+      }
+    }
+  }
+}
+/*= Tab Bar - Oneliner =======================================================*/
+@media -moz-pref("userChrome.tabbar.one_liner") {
+  @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+    :root {
+      --uc-navbar-width-origin: 40vw;
+      --uc-navbar-width: var(--uc-navbar-width-origin);
+      --uc-tabbar-width: calc(100vw - var(--uc-navbar-width));
+      --uc-navbar-margin: calc(var(--uc-navbar-width) + var(--uc-navbar-gap, 0px));
+    }
+    @media -moz-pref("userChrome.autohide.fill_urlbar") {
+      :root {
+        --uc-navbar-width-origin: 50vw;
+        --uc-navbar-width: 24em;
+      }
+    }
+    #nav-bar {
+      --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px));
+      height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important;
+      margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important;
+      margin-bottom: var(--uc-navbar-block, 0px) !important;
+    }
+    #titlebar,
+    #toolbar-menubar,
+    #TabsToolbar {
+      transform: translateY(var(--uc-navbar-block, 0px));
+    }
+    #TabsToolbar > .titlebar-buttonbox-container {
+      transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
+    }
+    #navigator-toolbox {
+      position: relative;
+      z-index: 2;
+    }
+    @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+      :root {
+        --uc-navbar-gap: 10px;
+        --uc-navbar-block: 1.5px;
+      }
+      :root[uidensity="compact"] {
+        --uc-navbar-block: 1px;
+      }
+      :root[uidensity="touch"] {
+        --uc-navbar-block: 3px;
+      }
+      #nav-bar {
+        --toolbarbutton-inner-padding: 6px; /* Original: 8px */
+        border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px));
+      }
+      #nav-bar,
+      #nav-bar-customization-target {
+        align-items: center;
+        -moz-box-align: center;
+      }
+      #urlbar-container {
+        min-height: calc(var(--urlbar-container-height) - 2px) !important;
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+      #navigator-toolbox {
+        background-color: var(--toolbar-bgcolor) !important;
+      }
+      #nav-bar {
+        --lwt-tabs-border-color: transparent;
+        background-color: unset !important;
+        background-image: unset !important;
+      }
+    }
+    #urlbar-container {
+      min-width: calc(
+        var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding)
+      ) !important;
+    }
+    #urlbar[breakout][breakout-extend] {
+      min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important;
+    }
+    #PersonalToolbar {
+      position: relative;
+      z-index: -1;
+    }
+    toolbarspring.chromeclass-toolbar-additional {
+      display: none !important;
+    }
+    @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+      #TabsToolbar {
+        margin-inline-start: var(--uc-navbar-margin) !important;
+      }
+      #nav-bar {
+        margin-inline-end: var(--uc-tabbar-width) !important;
+      }
+      .titlebar-spacer[type="pre-tabs"] {
+        display: none !important;
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+      #TabsToolbar {
+        margin-inline-end: var(--uc-navbar-margin) !important;
+      }
+      #nav-bar {
+        margin-inline-start: var(--uc-tabbar-width) !important;
+      }
+      .titlebar-spacer[type="post-tabs"] {
+        display: none !important;
+      }
+    }
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+    @media screen and (min-width: 1100px) {
+      :root {
+        --uc-navbar-width-origin: 40vw;
+        --uc-navbar-width: var(--uc-navbar-width-origin);
+        --uc-tabbar-width: calc(100vw - var(--uc-navbar-width));
+        --uc-navbar-margin: calc(var(--uc-navbar-width) + var(--uc-navbar-gap, 0px));
+      }
+      @media -moz-pref("userChrome.autohide.fill_urlbar") {
+        :root {
+          --uc-navbar-width-origin: 50vw;
+          --uc-navbar-width: 24em;
+        }
+      }
+      #nav-bar {
+        --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px));
+        height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important;
+        margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important;
+        margin-bottom: var(--uc-navbar-block, 0px) !important;
+      }
+      #titlebar,
+      #toolbar-menubar,
+      #TabsToolbar {
+        transform: translateY(var(--uc-navbar-block, 0px));
+      }
+      #TabsToolbar > .titlebar-buttonbox-container {
+        transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
+      }
+      #navigator-toolbox {
+        position: relative;
+        z-index: 2;
+      }
+      @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+        :root {
+          --uc-navbar-gap: 10px;
+          --uc-navbar-block: 1.5px;
+        }
+        :root[uidensity="compact"] {
+          --uc-navbar-block: 1px;
+        }
+        :root[uidensity="touch"] {
+          --uc-navbar-block: 3px;
+        }
+        #nav-bar {
+          --toolbarbutton-inner-padding: 6px; /* Original: 8px */
+          border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px));
+        }
+        #nav-bar,
+        #nav-bar-customization-target {
+          align-items: center;
+          -moz-box-align: center;
+        }
+        #urlbar-container {
+          min-height: calc(var(--urlbar-container-height) - 2px) !important;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+        #navigator-toolbox {
+          background-color: var(--toolbar-bgcolor) !important;
+        }
+        #nav-bar {
+          --lwt-tabs-border-color: transparent;
+          background-color: unset !important;
+          background-image: unset !important;
+        }
+      }
+      #urlbar-container {
+        min-width: calc(
+          var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding)
+        ) !important;
+      }
+      #urlbar[breakout][breakout-extend] {
+        min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important;
+      }
+      #PersonalToolbar {
+        position: relative;
+        z-index: -1;
+      }
+      toolbarspring.chromeclass-toolbar-additional {
+        display: none !important;
+      }
+      @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+        #TabsToolbar {
+          margin-inline-start: var(--uc-navbar-margin) !important;
+        }
+        #nav-bar {
+          margin-inline-end: var(--uc-tabbar-width) !important;
+        }
+        .titlebar-spacer[type="pre-tabs"] {
+          display: none !important;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+        #TabsToolbar {
+          margin-inline-end: var(--uc-navbar-margin) !important;
+        }
+        #nav-bar {
+          margin-inline-start: var(--uc-tabbar-width) !important;
+        }
+        .titlebar-spacer[type="post-tabs"] {
+          display: none !important;
+        }
+      }
+    }
+  }
+}
+/*= Tab Bar - Shared Layout ==================================================*/
+@media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.tabbar.one_liner") or -moz-pref("userChrome.hidden.tabbar") or -moz-pref("userChrome.tabbar.as_titlebar") {
+  :root {
+    --uc-window-control-width: 0px; /* Same as .titlebar-buttonbox-container      -  Space reserved for window controls */
+    --uc-window-drag-space-pre: 0px; /* Same as .titlebar-spacer[type="pre-tabs"]  - Extra space reserved on both sides of the nav-bar to be able to drag the window */
+    --uc-window-drag-space-post: 0px; /* Same as .titlebar-spacer[type="post-tabs"] */
+    --uc-window-control-space: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-post));
+  }
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: var(--uc-title-pre-spacer, 40px);
+    --uc-window-drag-space-post: var(--uc-title-post-spacer, 40px);
+  }
+  @media (-moz-platform: windows) {
+    :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+      --uc-window-control-width: 138px;
+    }
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+      /* 84px is default value of linux */
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button),
+    (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button),
+    (-moz-gtk-csd-available) and (-moz-gtk-csd-close-button) {
+    :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+      --uc-window-control-width: 28px;
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
+    (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+    (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
+    :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+      --uc-window-control-width: 56px;
+    }
+  }
+  @media (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
+    :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+      --uc-window-control-width: 84px;
+    }
+  }
+  @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+    :root:is([tabsintitlebar], [customtitlebar]) {
+      --uc-window-control-width: 72px;
+    }
+    :root[sizemode="fullscreen"] {
+      --uc-window-control-space: 0px;
+    }
+  }
+  :root:is([tabsintitlebar][sizemode="maximized"], [customtitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner") {
+    @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+        @media (-moz-platform: windows) {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+            --uc-window-drag-space-pre: 0px;
+          }
+        }
+        @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+            --uc-window-drag-space-pre: 0px;
+          }
+        }
+        @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+            --uc-window-control-space: 0px;
+          }
+        }
+        @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+            --uc-window-control-space: 0px;
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.as_titlebar") {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) #tabbrowser-tabs {
+            --uc-window-control-space: 0px;
+          }
+        }
+      }
+      @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+        @media not -moz-pref("userChrome.tabbar.as_titlebar") {
+          @media (-moz-platform: windows) {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-control-space: 0px;
+            }
+          }
+          @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-control-space: 0px;
+            }
+          }
+        }
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      @media screen and (max-width: 1100px) {
+        @media (not -moz-pref("userChrome.tabbar.on_bottom")) or (not -moz-pref("userChrome.hidden.tabbar")) {
+          :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+            --uc-window-drag-space-pre: 0px;
+            --uc-window-control-space: 0px;
+          }
+        }
+      }
+      @media screen and (min-width: 1100px) {
+        @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+          @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-drag-space-pre: 0px;
+            }
+          }
+          @media screen and (min-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-drag-space-pre: 0px;
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-control-space: 0px;
+            }
+          }
+          @media screen and (min-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+              --uc-window-control-space: 0px;
+            }
+          }
+          @media -moz-pref("userChrome.tabbar.as_titlebar") {
+            :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) #tabbrowser-tabs {
+              --uc-window-control-space: 0px;
+            }
+          }
+        }
+        @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+          @media not -moz-pref("userChrome.tabbar.as_titlebar") {
+            @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+              :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+                --uc-window-control-space: 0px;
+              }
+            }
+            @media screen and (min-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+              :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+                --uc-window-control-space: 0px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  @supports selector(:has(a)) {
+    #navigator-toolbox:has(#toolbar-menubar[autohide="false"]) {
+      --uc-window-drag-space-pre: 0px;
+      --uc-window-control-space: 0px;
+    }
+  }
+}
+@media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.tabbar.one_liner") or -moz-pref("userChrome.hidden.tabbar") {
+  @media not -moz-pref("userChrome.hidden.titlebar_container") {
+    @media not -moz-pref("userChrome.tabbar.one_liner") {
+      @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+        /*= Windows Control - Move to toolbar ========================================*/
+        /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+        See the above repository for updates as well as full license text. */
+        /* Titlebar Button Box */
+        :root {
+          --uc-titlebar-padding: 0px;
+        }
+        #navigator-toolbox {
+          padding-top: var(--uc-titlebar-padding) !important;
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom") {
+          @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+            #navigator-toolbox {
+              padding-top: calc(
+                max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+              ) !important;
+            }
+          }
+        }
+        #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+        #TabsToolbar > .titlebar-buttonbox-container {
+          position: fixed;
+          display: block;
+          top: 0;
+          right: 0;
+          z-index: 1;
+        }
+        #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+          height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+        }
+        @media (-moz-platform: windows) {
+          #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+            stroke: var(--toolbar-color, currentColor) !important;
+          }
+        }
+        .titlebar-buttonbox-container > .titlebar-buttonbox {
+          height: 100%;
+        }
+        @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+          .titlebar-buttonbox-container > .titlebar-buttonbox {
+            margin-block: 10px;
+          }
+        }
+        @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+          .titlebar-buttonbox-container {
+            left: 0;
+            right: unset !important;
+          }
+        }
+        @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+          .titlebar-buttonbox-container {
+            left: 0;
+            right: unset !important;
+          }
+        }
+        @media (-moz-platform: windows) {
+          :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+            margin-top: calc(-1 * var(--uc-titlebar-padding));
+          }
+          :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+          :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+            appearance: none !important;
+          }
+          .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+            background-clip: border-box !important;
+          }
+        }
+        @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+          #toolbar-menubar:not([autohide="true"]) {
+            visibility: visible !important;
+            height: 0;
+          }
+        }
+        @media not -moz-pref("userChrome.hidden.tabbar") {
+          #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+            opacity: 0;
+            visibility: collapse;
+          }
+        }
+        @media -moz-pref("userChrome.hidden.tabbar") {
+          #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+            opacity: 1;
+            visibility: visible;
+          }
+          @media -moz-pref("userChrome.autohide.navbar") {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              opacity: 0;
+              visibility: collapse;
+            }
+          }
+        }
+        @media -moz-pref("userChrome.hidden.tabbar") {
+          @media -moz-pref("userChrome.autohide.navbar") {
+            #navigator-toolbox:is(:hover, :focus-within)
+              #toolbar-menubar[inactive]:not([customizing])
+              > .titlebar-buttonbox-container {
+              opacity: 1;
+              visibility: visible;
+            }
+          }
+        }
+        @media (prefers-reduced-motion: no-preference) {
+          #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+            transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+              visibility 100ms var(--animation-easing-function) 0.25s !important;
+          }
+          #navigator-toolbox:is(:hover, :focus-within)
+            #toolbar-menubar[inactive]:not([customizing])
+            > .titlebar-buttonbox-container {
+            transition-delay: 0s !important;
+          }
+        }
+        @media -moz-pref("browser.fullscreen.autohide") {
+          :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+            visibility: hidden;
+          }
+        }
+        @media -moz-pref("userChrome.hidden.tabbar") {
+          :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+            visibility: visible !important;
+            min-height: 0 !important;
+            max-height: 0 !important;
+          }
+          :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+            visibility: collapse !important;
+          }
+          :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+          :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+          :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+            z-index: 1;
+          }
+          :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+          :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+          :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+            opacity: 1 !important;
+          }
+          :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+          :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+          :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+            opacity: var(--inactive-titlebar-opacity);
+          }
+        }
+        /* At Activated Menubar */
+        :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+          #toolbar-menubar:not([autohide="true"])
+          + #TabsToolbar
+          > .titlebar-buttonbox-container {
+          display: block !important;
+        }
+        @media not -moz-pref("userChrome.hidden.tabbar") {
+          :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+            visibility: hidden;
+          }
+        }
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner") {
+      @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+          /*= Windows Control - Move to toolbar ========================================*/
+          /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+          See the above repository for updates as well as full license text. */
+          /* Titlebar Button Box */
+          :root {
+            --uc-titlebar-padding: 0px;
+          }
+          #navigator-toolbox {
+            padding-top: var(--uc-titlebar-padding) !important;
+          }
+          @media -moz-pref("userChrome.tabbar.on_bottom") {
+            @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+              #navigator-toolbox {
+                padding-top: calc(
+                  max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+                ) !important;
+              }
+            }
+          }
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+          #TabsToolbar > .titlebar-buttonbox-container {
+            position: fixed;
+            display: block;
+            top: 0;
+            right: 0;
+            z-index: 1;
+          }
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+            height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+          }
+          @media (-moz-platform: windows) {
+            #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+              stroke: var(--toolbar-color, currentColor) !important;
+            }
+          }
+          .titlebar-buttonbox-container > .titlebar-buttonbox {
+            height: 100%;
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            .titlebar-buttonbox-container > .titlebar-buttonbox {
+              margin-block: 10px;
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            .titlebar-buttonbox-container {
+              left: 0;
+              right: unset !important;
+            }
+          }
+          @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+            .titlebar-buttonbox-container {
+              left: 0;
+              right: unset !important;
+            }
+          }
+          @media (-moz-platform: windows) {
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+            :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+              appearance: none !important;
+            }
+            .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+              background-clip: border-box !important;
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            #toolbar-menubar:not([autohide="true"]) {
+              visibility: visible !important;
+              height: 0;
+            }
+          }
+          @media not -moz-pref("userChrome.hidden.tabbar") {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              opacity: 0;
+              visibility: collapse;
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              opacity: 1;
+              visibility: visible;
+            }
+            @media -moz-pref("userChrome.autohide.navbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 0;
+                visibility: collapse;
+              }
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            @media -moz-pref("userChrome.autohide.navbar") {
+              #navigator-toolbox:is(:hover, :focus-within)
+                #toolbar-menubar[inactive]:not([customizing])
+                > .titlebar-buttonbox-container {
+                opacity: 1;
+                visibility: visible;
+              }
+            }
+          }
+          @media (prefers-reduced-motion: no-preference) {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+                visibility 100ms var(--animation-easing-function) 0.25s !important;
+            }
+            #navigator-toolbox:is(:hover, :focus-within)
+              #toolbar-menubar[inactive]:not([customizing])
+              > .titlebar-buttonbox-container {
+              transition-delay: 0s !important;
+            }
+          }
+          @media -moz-pref("browser.fullscreen.autohide") {
+            :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+              visibility: hidden;
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+              visibility: visible !important;
+              min-height: 0 !important;
+              max-height: 0 !important;
+            }
+            :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+              visibility: collapse !important;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+              z-index: 1;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+              opacity: 1 !important;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+              opacity: var(--inactive-titlebar-opacity);
+            }
+          }
+          /* At Activated Menubar */
+          :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+            #toolbar-menubar:not([autohide="true"])
+            + #TabsToolbar
+            > .titlebar-buttonbox-container {
+            display: block !important;
+          }
+          @media not -moz-pref("userChrome.hidden.tabbar") {
+            :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+              visibility: hidden;
+            }
+          }
+        }
+        @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+          /*= Windows Control - Move to toolbar ========================================*/
+          /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+          See the above repository for updates as well as full license text. */
+          /* Titlebar Button Box */
+          :root {
+            --uc-titlebar-padding: 0px;
+          }
+          #navigator-toolbox {
+            padding-top: var(--uc-titlebar-padding) !important;
+          }
+          @media -moz-pref("userChrome.tabbar.on_bottom") {
+            @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+              #navigator-toolbox {
+                padding-top: calc(
+                  max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+                ) !important;
+              }
+            }
+          }
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+          #TabsToolbar > .titlebar-buttonbox-container {
+            position: fixed;
+            display: block;
+            top: 0;
+            right: 0;
+            z-index: 1;
+          }
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+            height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+          }
+          @media (-moz-platform: windows) {
+            #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+              stroke: var(--toolbar-color, currentColor) !important;
+            }
+          }
+          .titlebar-buttonbox-container > .titlebar-buttonbox {
+            height: 100%;
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            .titlebar-buttonbox-container > .titlebar-buttonbox {
+              margin-block: 10px;
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            .titlebar-buttonbox-container {
+              left: 0;
+              right: unset !important;
+            }
+          }
+          @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+            .titlebar-buttonbox-container {
+              left: 0;
+              right: unset !important;
+            }
+          }
+          @media (-moz-platform: windows) {
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+            :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+              appearance: none !important;
+            }
+            .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+              background-clip: border-box !important;
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            #toolbar-menubar:not([autohide="true"]) {
+              visibility: visible !important;
+              height: 0;
+            }
+          }
+          @media not -moz-pref("userChrome.hidden.tabbar") {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              opacity: 0;
+              visibility: collapse;
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              opacity: 1;
+              visibility: visible;
+            }
+            @media -moz-pref("userChrome.autohide.navbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 0;
+                visibility: collapse;
+              }
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            @media -moz-pref("userChrome.autohide.navbar") {
+              #navigator-toolbox:is(:hover, :focus-within)
+                #toolbar-menubar[inactive]:not([customizing])
+                > .titlebar-buttonbox-container {
+                opacity: 1;
+                visibility: visible;
+              }
+            }
+          }
+          @media (prefers-reduced-motion: no-preference) {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+                visibility 100ms var(--animation-easing-function) 0.25s !important;
+            }
+            #navigator-toolbox:is(:hover, :focus-within)
+              #toolbar-menubar[inactive]:not([customizing])
+              > .titlebar-buttonbox-container {
+              transition-delay: 0s !important;
+            }
+          }
+          @media -moz-pref("browser.fullscreen.autohide") {
+            :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+              visibility: hidden;
+            }
+          }
+          @media -moz-pref("userChrome.hidden.tabbar") {
+            :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+              visibility: visible !important;
+              min-height: 0 !important;
+              max-height: 0 !important;
+            }
+            :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+              visibility: collapse !important;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+              z-index: 1;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+              opacity: 1 !important;
+            }
+            :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+            :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+            :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+              opacity: var(--inactive-titlebar-opacity);
+            }
+          }
+          /* At Activated Menubar */
+          :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+            #toolbar-menubar:not([autohide="true"])
+            + #TabsToolbar
+            > .titlebar-buttonbox-container {
+            display: block !important;
+          }
+          @media not -moz-pref("userChrome.hidden.tabbar") {
+            :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+              visibility: hidden;
+            }
+          }
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+          @media screen and (max-width: 1100px) {
+            /*= Windows Control - Move to toolbar ========================================*/
+            /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+            See the above repository for updates as well as full license text. */
+            /* Titlebar Button Box */
+            :root {
+              --uc-titlebar-padding: 0px;
+            }
+            #navigator-toolbox {
+              padding-top: var(--uc-titlebar-padding) !important;
+            }
+            @media -moz-pref("userChrome.tabbar.on_bottom") {
+              @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+                #navigator-toolbox {
+                  padding-top: calc(
+                    max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+                  ) !important;
+                }
+              }
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+            #TabsToolbar > .titlebar-buttonbox-container {
+              position: fixed;
+              display: block;
+              top: 0;
+              right: 0;
+              z-index: 1;
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+              height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+            }
+            /* At Activated Menubar */
+          }
+          @media screen and (max-width: 1100px) and (-moz-platform: windows) {
+            #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+              stroke: var(--toolbar-color, currentColor) !important;
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            .titlebar-buttonbox-container > .titlebar-buttonbox {
+              height: 100%;
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container > .titlebar-buttonbox {
+                margin-block: 10px;
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container {
+                left: 0;
+                right: unset !important;
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+            .titlebar-buttonbox-container {
+              left: 0;
+              right: unset !important;
+            }
+          }
+          @media screen and (max-width: 1100px) and (-moz-platform: windows) {
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+            :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+            :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+              appearance: none !important;
+            }
+            .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+              background-clip: border-box !important;
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              #toolbar-menubar:not([autohide="true"]) {
+                visibility: visible !important;
+                height: 0;
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 0;
+                visibility: collapse;
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 1;
+                visibility: visible;
+              }
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                  opacity: 0;
+                  visibility: collapse;
+                }
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #navigator-toolbox:is(:hover, :focus-within)
+                  #toolbar-menubar[inactive]:not([customizing])
+                  > .titlebar-buttonbox-container {
+                  opacity: 1;
+                  visibility: visible;
+                }
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) and (prefers-reduced-motion: no-preference) {
+            #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+              transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+                visibility 100ms var(--animation-easing-function) 0.25s !important;
+            }
+            #navigator-toolbox:is(:hover, :focus-within)
+              #toolbar-menubar[inactive]:not([customizing])
+              > .titlebar-buttonbox-container {
+              transition-delay: 0s !important;
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media -moz-pref("browser.fullscreen.autohide") {
+              :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+                visibility: visible !important;
+                min-height: 0 !important;
+                max-height: 0 !important;
+              }
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+                visibility: collapse !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+                z-index: 1;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+                opacity: 1 !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+                opacity: var(--inactive-titlebar-opacity);
+              }
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+              #toolbar-menubar:not([autohide="true"])
+              + #TabsToolbar
+              > .titlebar-buttonbox-container {
+              display: block !important;
+            }
+          }
+          @media screen and (max-width: 1100px) {
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              :root:not([chromehidden~="menubar"])
+                #toolbar-menubar:not([autohide="true"])
+                .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+          }
+        }
+        @media screen and (min-width: 1100px) {
+          @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+            /*= Windows Control - Move to toolbar ========================================*/
+            /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+            See the above repository for updates as well as full license text. */
+            /* Titlebar Button Box */
+            :root {
+              --uc-titlebar-padding: 0px;
+            }
+            #navigator-toolbox {
+              padding-top: var(--uc-titlebar-padding) !important;
+            }
+            @media -moz-pref("userChrome.tabbar.on_bottom") {
+              @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+                #navigator-toolbox {
+                  padding-top: calc(
+                    max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+                  ) !important;
+                }
+              }
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+            #TabsToolbar > .titlebar-buttonbox-container {
+              position: fixed;
+              display: block;
+              top: 0;
+              right: 0;
+              z-index: 1;
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+              height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+            }
+            @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+              #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+                stroke: var(--toolbar-color, currentColor) !important;
+              }
+            }
+            .titlebar-buttonbox-container > .titlebar-buttonbox {
+              height: 100%;
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container > .titlebar-buttonbox {
+                margin-block: 10px;
+              }
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container {
+                left: 0;
+                right: unset !important;
+              }
+            }
+            @media screen and (min-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+              .titlebar-buttonbox-container {
+                left: 0;
+                right: unset !important;
+              }
+            }
+            @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+              :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+                margin-top: calc(-1 * var(--uc-titlebar-padding));
+              }
+              :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+              :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+                appearance: none !important;
+              }
+              .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+                background-clip: border-box !important;
+              }
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              #toolbar-menubar:not([autohide="true"]) {
+                visibility: visible !important;
+                height: 0;
+              }
+            }
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 0;
+                visibility: collapse;
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 1;
+                visibility: visible;
+              }
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                  opacity: 0;
+                  visibility: collapse;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #navigator-toolbox:is(:hover, :focus-within)
+                  #toolbar-menubar[inactive]:not([customizing])
+                  > .titlebar-buttonbox-container {
+                  opacity: 1;
+                  visibility: visible;
+                }
+              }
+            }
+            @media screen and (min-width: 1100px) and (prefers-reduced-motion: no-preference) {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+                  visibility 100ms var(--animation-easing-function) 0.25s !important;
+              }
+              #navigator-toolbox:is(:hover, :focus-within)
+                #toolbar-menubar[inactive]:not([customizing])
+                > .titlebar-buttonbox-container {
+                transition-delay: 0s !important;
+              }
+            }
+            @media -moz-pref("browser.fullscreen.autohide") {
+              :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+                visibility: visible !important;
+                min-height: 0 !important;
+                max-height: 0 !important;
+              }
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+                visibility: collapse !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+                z-index: 1;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+                opacity: 1 !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+                opacity: var(--inactive-titlebar-opacity);
+              }
+            }
+            /* At Activated Menubar */
+            :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+              #toolbar-menubar:not([autohide="true"])
+              + #TabsToolbar
+              > .titlebar-buttonbox-container {
+              display: block !important;
+            }
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              :root:not([chromehidden~="menubar"])
+                #toolbar-menubar:not([autohide="true"])
+                .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+          }
+          @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+            /*= Windows Control - Move to toolbar ========================================*/
+            /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+            See the above repository for updates as well as full license text. */
+            /* Titlebar Button Box */
+            :root {
+              --uc-titlebar-padding: 0px;
+            }
+            #navigator-toolbox {
+              padding-top: var(--uc-titlebar-padding) !important;
+            }
+            @media -moz-pref("userChrome.tabbar.on_bottom") {
+              @media -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
+                #navigator-toolbox {
+                  padding-top: calc(
+                    max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+                  ) !important;
+                }
+              }
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+            #TabsToolbar > .titlebar-buttonbox-container {
+              position: fixed;
+              display: block;
+              top: 0;
+              right: 0;
+              z-index: 1;
+            }
+            #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+              height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+            }
+            @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+              #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+                stroke: var(--toolbar-color, currentColor) !important;
+              }
+            }
+            .titlebar-buttonbox-container > .titlebar-buttonbox {
+              height: 100%;
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container > .titlebar-buttonbox {
+                margin-block: 10px;
+              }
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              .titlebar-buttonbox-container {
+                left: 0;
+                right: unset !important;
+              }
+            }
+            @media screen and (min-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+              .titlebar-buttonbox-container {
+                left: 0;
+                right: unset !important;
+              }
+            }
+            @media screen and (min-width: 1100px) and (-moz-platform: windows) {
+              :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+                margin-top: calc(-1 * var(--uc-titlebar-padding));
+              }
+              :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+              :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+                appearance: none !important;
+              }
+              .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+                background-clip: border-box !important;
+              }
+            }
+            @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+              #toolbar-menubar:not([autohide="true"]) {
+                visibility: visible !important;
+                height: 0;
+              }
+            }
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 0;
+                visibility: collapse;
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                opacity: 1;
+                visibility: visible;
+              }
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                  opacity: 0;
+                  visibility: collapse;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              @media -moz-pref("userChrome.autohide.navbar") {
+                #navigator-toolbox:is(:hover, :focus-within)
+                  #toolbar-menubar[inactive]:not([customizing])
+                  > .titlebar-buttonbox-container {
+                  opacity: 1;
+                  visibility: visible;
+                }
+              }
+            }
+            @media screen and (min-width: 1100px) and (prefers-reduced-motion: no-preference) {
+              #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+                transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+                  visibility 100ms var(--animation-easing-function) 0.25s !important;
+              }
+              #navigator-toolbox:is(:hover, :focus-within)
+                #toolbar-menubar[inactive]:not([customizing])
+                > .titlebar-buttonbox-container {
+                transition-delay: 0s !important;
+              }
+            }
+            @media -moz-pref("browser.fullscreen.autohide") {
+              :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+            @media -moz-pref("userChrome.hidden.tabbar") {
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+                visibility: visible !important;
+                min-height: 0 !important;
+                max-height: 0 !important;
+              }
+              :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+                visibility: collapse !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+                z-index: 1;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+                opacity: 1 !important;
+              }
+              :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+              :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+                opacity: var(--inactive-titlebar-opacity);
+              }
+            }
+            /* At Activated Menubar */
+            :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+              #toolbar-menubar:not([autohide="true"])
+              + #TabsToolbar
+              > .titlebar-buttonbox-container {
+              display: block !important;
+            }
+            @media not -moz-pref("userChrome.hidden.tabbar") {
+              :root:not([chromehidden~="menubar"])
+                #toolbar-menubar:not([autohide="true"])
+                .titlebar-buttonbox-container {
+                visibility: hidden;
+              }
+            }
+          }
+        }
+      }
+    }
+    @media not -moz-pref("userChrome.navbar.as_sidebar") {
+      /*= Navbar - Padding for window controls =====================================*/
+      /* Customized https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/window_control_placeholder_support.css */
+      #nav-bar {
+        border-inline-style: solid !important;
+        border-inline-color: transparent;
+      }
+      @media (-moz-platform: windows) {
+        @media not -moz-pref("userChrome.tabbar.one_liner") {
+          #nav-bar {
+            border-inline-start-width: var(--uc-window-drag-space-pre);
+            border-inline-end-width: var(--uc-window-control-space);
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            #nav-bar {
+              border-inline-start-width: var(--uc-window-drag-space-pre);
+              border-inline-end-width: var(--uc-window-control-space);
+            }
+          }
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+              @media screen and (-moz-platform: windows) and (max-width: 1100px) {
+                #nav-bar {
+                  border-inline-start-width: var(--uc-window-drag-space-pre);
+                  border-inline-end-width: var(--uc-window-control-space);
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-start: var(--uc-window-drag-space-pre) !important;
+                }
+              }
+              @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-end: var(--uc-window-control-space) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (-moz-platform: windows) and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+                  }
+                }
+                @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-end: var(--uc-window-control-space) !important;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+        @media not -moz-pref("userChrome.tabbar.one_liner") {
+          #nav-bar {
+            border-inline-start-width: var(--uc-window-drag-space-pre);
+            border-inline-end-width: var(--uc-window-control-space);
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            #nav-bar {
+              border-inline-start-width: var(--uc-window-drag-space-pre);
+              border-inline-end-width: var(--uc-window-control-space);
+            }
+          }
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (max-width: 1100px) {
+                #nav-bar {
+                  border-inline-start-width: var(--uc-window-drag-space-pre);
+                  border-inline-end-width: var(--uc-window-control-space);
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-start: var(--uc-window-drag-space-pre) !important;
+                }
+              }
+              @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-end: var(--uc-window-control-space) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+                  }
+                }
+                @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-end: var(--uc-window-control-space) !important;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+        @media not -moz-pref("userChrome.tabbar.one_liner") {
+          #nav-bar {
+            border-inline-start-width: var(--uc-window-control-space);
+            border-inline-end-width: var(--uc-window-drag-space-pre);
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            #nav-bar {
+              border-inline-start-width: var(--uc-window-control-space);
+              border-inline-end-width: var(--uc-window-drag-space-pre);
+            }
+          }
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+              @media screen and (max-width: 1100px) {
+                #nav-bar {
+                  border-inline-start-width: var(--uc-window-control-space);
+                  border-inline-end-width: var(--uc-window-drag-space-pre);
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-start: var(--uc-window-control-space, 0px) !important;
+                }
+              }
+              @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+                  }
+                }
+                @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                  }
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #TabsToolbar {
+                  margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #TabsToolbar {
+                    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                  }
+                }
+              }
+            }
+          }
+          @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              #TabsToolbar {
+                margin-inline-start: var(--uc-window-control-width, 0px) !important;
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (min-width: 1100px) {
+                #TabsToolbar {
+                  margin-inline-start: var(--uc-window-control-width, 0px) !important;
+                }
+              }
+            }
+          }
+        }
+      }
+      @media (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+        @media not -moz-pref("userChrome.tabbar.one_liner") {
+          #nav-bar {
+            border-inline-start-width: var(--uc-window-control-space);
+            border-inline-end-width: var(--uc-window-drag-space-pre);
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            #nav-bar {
+              border-inline-start-width: var(--uc-window-control-space);
+              border-inline-end-width: var(--uc-window-drag-space-pre);
+            }
+          }
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media -moz-pref("userChrome.tabbar.on_bottom") or -moz-pref("userChrome.hidden.tabbar") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (max-width: 1100px) {
+                #nav-bar {
+                  border-inline-start-width: var(--uc-window-control-space);
+                  border-inline-end-width: var(--uc-window-drag-space-pre);
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-start: var(--uc-window-control-space, 0px) !important;
+                }
+              }
+              @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #nav-bar {
+                  margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+                  }
+                }
+                @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #nav-bar {
+                    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                  }
+                }
+              }
+            }
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.one_liner") {
+          @media not -moz-pref("userChrome.tabbar.one_liner.combine_navbar") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                #TabsToolbar {
+                  margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                }
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (min-width: 1100px) {
+                @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+                  #TabsToolbar {
+                    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+                  }
+                }
+              }
+            }
+          }
+          @media -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+            @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              #TabsToolbar {
+                margin-inline-start: var(--uc-window-control-width, 0px) !important;
+              }
+            }
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (min-width: 1100px) {
+                #TabsToolbar {
+                  margin-inline-start: var(--uc-window-control-width, 0px) !important;
+                }
+              }
+            }
+          }
+        }
+      }
+      @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+        :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container:last-child,
+        :root[sizemode="fullscreen"] #window-controls {
+          right: unset;
+        }
+      }
+    }
+  }
+}
+/*= Tab Bar - Show only current tab ==========================================*/
+@media -moz-pref("userChrome.tabbar.as_titlebar") {
+  :root:not([tabsintitlebar="true"]):not([customtitlebar="true"]) #tabbrowser-tabs,
+  #scrollbutton-up,
+  #scrollbutton-down,
+  .titlebar-spacer[type="pre-tabs"],
+  spacer:is([part="overflow-start-indicator"], [part="overflow-end-indicator"]),
+  .tabbrowser-tab:not([selected="true"]),
+  .tabbrowser-tab[selected="true"] .tab-background,
+  .tabbrowser-tab[selected="true"] .tab-stack:is(::before, ::after),
+  .tabbrowser-tab[selected="true"] .tab-close-button,
+  #tabs-newtab-button {
+    display: none !important;
+  }
+  .tabbrowser-tab[selected="true"] {
+    -moz-window-dragging: drag;
+    --tab-max-width: 100vw;
+    min-width: calc(var(--uc-tabbar-width, 100vw) - var(--uc-window-control-space)) !important;
+    max-width: var(--tab-max-width) !important;
+    margin-inline-start: calc(var(--tab-shadow-max-size) * -1) !important;
+  }
+  .tabbrowser-tab[selected="true"][pinned="true"] {
+    flex: 100;
+    -moz-box-flex: 100;
+    max-width: var(--tab-max-width) !important;
+  }
+  .tabbrowser-tab[selected="true"] .tab-label-container {
+    margin-inline: 0 !important;
+  }
+  .tab-content {
+    margin-inline: auto;
+    width: 100%;
+  }
+  /* Pinned */
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned][selected="true"],
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned][selected="true"] {
+    position: relative !important;
+  }
+  #tabbrowser-tabs {
+    --tab-overflow-pinned-tabs-width: 0 !important;
+    padding-inline: 0 !important; /* Original: var(--tab-overflow-pinned-tabs-width) 0; */
+  }
+  .tab-throbber[pinned],
+  .tab-icon-pending[pinned],
+  .tab-icon-image[pinned],
+  .tab-sharing-icon-overlay[pinned],
+  .tab-icon-overlay[pinned] {
+    margin-inline-end: 5.5px;
+  }
+  .tab-label-container[pinned] {
+    width: unset !important;
+  }
+  /* Padding */
+  @media not -moz-pref("userChrome.centered.tab") {
+    #pinned-tabs-container,
+    #tabbrowser-arrowscrollbox {
+      margin-inline: 2px !important;
+    }
+    :root[sizemode="normal"] #pinned-tabs-container,
+    :root[sizemode="normal"] #tabbrowser-arrowscrollbox {
+      margin-inline: 6px !important;
+    }
+  }
+  @media -moz-pref("userChrome.centered.tab") {
+    @media -moz-pref("userChrome.centered.tab.label") {
+      #pinned-tabs-container,
+      #tabbrowser-arrowscrollbox {
+        margin-inline: 2px !important;
+      }
+      :root[sizemode="normal"] #pinned-tabs-container,
+      :root[sizemode="normal"] #tabbrowser-arrowscrollbox {
+        margin-inline: 6px !important;
+      }
+    }
+  }
+  @media -moz-pref("browser.tabs.tabmanager.enabled") {
+    :root:not([tabsintitlebar="true"]):not([customtitlebar="true"])
+      #tabbrowser-tabs:not([overflow="true"], [hashiddentabs])
+      ~ #alltabs-button,
+    :root:not([tabsintitlebar="true"]):not([customtitlebar="true"])
+      #tabbrowser-tabs[hasadjacentnewtabbutton]:not([overflow="true"])
+      ~ #new-tab-button {
+      display: flex !important;
+      display: -moz-box !important;
+    }
+  }
+}
+/*= Tab Bar - Multi Row ======================================================*/
+@media -moz-pref("userChrome.tabbar.multi_row") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/multi-row_tabs.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  :root {
+    --uc-multirow-tabbar-rows: 3;
+    --uc-multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
+  }
+  #tabbrowser-tabs {
+    min-height: unset !important;
+    padding-inline-start: 0px !important;
+  }
+  @-moz-document url("chrome://browser/content/browser.xhtml")
+  {
+    #scrollbutton-up ~ spacer,
+    #scrollbutton-up,
+    #scrollbutton-down {
+      display: var(--scrollbutton-display-model, initial);
+    }
+    scrollbox[part][orient="horizontal"] {
+      display: flex;
+      flex-wrap: wrap;
+      overflow-y: auto;
+      max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin, 0px)) * var(--uc-multirow-tabbar-rows));
+    }
+  }
+  .scrollbox-clip[orient="horizontal"],
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    overflow: -moz-hidden-unscrollable;
+    display: block;
+    --scrollbutton-display-model: none;
+  }
+  #tabbrowser-tabs .tabbrowser-tab[pinned] {
+    position: static !important;
+    margin-inline-start: 0px !important;
+  }
+  .tabbrowser-tab[fadein]:not([pinned]) {
+    flex-grow: var(--uc-multirow-tab-dynamic-width);
+  }
+  .tabbrowser-tab > stack {
+    width: 100%;
+    height: 100%;
+  }
+  /* remove bottom margin so it doesn't throw off row height computation */
+  #tabs-newtab-button {
+    margin-bottom: 0 !important;
+  }
+  #tabbrowser-tabs[hasadjacentnewtabbutton][overflow="true"]
+    > #tabbrowser-arrowscrollbox
+    > #tabbrowser-arrowscrollbox-periphery
+    > #tabs-newtab-button {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+  #alltabs-button,
+  :root:not([customizing]) #TabsToolbar #new-tab-button,
+  #tabbrowser-arrowscrollbox > spacer,
+  .tabbrowser-tab::after {
+    display: none !important;
+  }
+}
+/*= Tab Bar - Scollmode disabled =============================================*/
+@media -moz-pref("userChrome.tabbar.unscroll") {
+  /* Disable scrollbox */
+  spacer[part="overflow-start-indicator"] + .scrollbox-clip > scrollbox {
+    overflow: -moz-hidden-unscrollable !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not([visuallyselected]) {
+    /* Set minimum width below which tabs will not shrink */
+    --tab-min-width: 16px;
+    container-type: inline-size;
+    container-name: backgroundTab;
+  }
+  @container backgroundTab (max-width: 46px) {
+    #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not([visuallyselected]) .tab-content {
+      --inline-tab-padding: 0px;
+      justify-self: center;
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected])
+      .tab-icon-stack
+      > * {
+      margin-inline-end: 0 !important;
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected])
+      .tab-label-container,
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected]):hover
+      .tab-close-button {
+      visibility: collapse !important;
+    }
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #tabbrowser-arrowscrollbox-periphery {
+    position: absolute !important;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"]
+    #tabbrowser-arrowscrollbox-periphery
+    > #tabs-newtab-button {
+    z-index: 2 !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #pinned-tabs-container,
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #tabbrowser-arrowscrollbox {
+    padding-inline-end: calc(
+      16px + (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding)) * 2
+    ) !important;
+  }
+}
+/*= Tab Bar - Fill width tab =================================================*/
+@media -moz-pref("userChrome.tabbar.fill_width") {
+  /* Why 100vw? Tab closing requires width animation to end and "none" can't be animated */
+  .tabbrowser-tab[fadein]:not([style^="max-width"]) {
+    --tab-max-width: 100vw;
+    max-width: var(--tab-max-width) !important;
+  }
+}
+/** Tab UI ********************************************************************/
+/*= Tab - Connect to window ==============================================*/
+@media -moz-pref("userChrome.tab.connect_to_window") {
+  #TabsToolbar #tabbrowser-tabs:not([orient="vertical"]) {
+    max-height: var(--tab-min-height);
+  }
+  #TabsToolbar #tabbrowser-tabs:not([orient="vertical"])[movingtab] {
+    padding-bottom: unset !important;
+    margin-bottom: unset !important;
+  }
+  #TabsToolbar[multibar] #tabbrowser-tabs:not([orient="vertical"]) {
+    max-height: var(--tab-min-height_mlt);
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) {
+    min-height: unset !important; /* Original: var(--tabstrip-min-height) */
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-background {
+    border-radius: var(--tab-border-radius) var(--tab-border-radius) var(--uc-tab-border-bottom-radius, 0px)
+      var(--uc-tab-border-bottom-radius, 0px) !important;
+    margin-bottom: 0px !important;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-content {
+    margin-top: 0px;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack {
+    margin-top: 0px !important;
+    margin-bottom: 0px !important;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) tab-group .tabbrowser-tab:is([selected], [multiselected]) .tab-group-line {
+    transform: translateY(calc(var(--tab-group-line-thickness) * -1));
+  }
+  #tabbrowser-tabs[orient="vertical"] {
+    --uc-tab-border-bottom-radius: var(--tab-border-radius);
+  }
+  /* Remove line at Toolbar's top */
+  #tabbrowser-tabs {
+    z-index: 1 !important;
+  }
+  @media not -moz-pref("userChrome.tabbar.multi_row") {
+    #TabsToolbar:not([multibar]) {
+      overflow: clip; /* Prevent toolbar area over */
+    }
+  }
+  /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned],
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] {
+    z-index: 0 !important;
+  }
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned] .tab-stack,
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] .tab-stack {
+    /* Temporary solution for compatibility #513 */
+    overflow-y: clip;
+  }
+  /* Border top #889 */
+  #nav-bar {
+    border-top: none !important;
+    box-shadow: 0 -0.01px 0 ThreeDShadow;
+  }
+  @media (-moz-gtk-csd-available) {
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar {
+      box-shadow: 0 -0.01px 0 ThreeDShadow;
+    }
+  }
+}
+/*= Selected Tab =============================================================*/
+/*= Selected Tab - Bold ======================================================*/
+@media -moz-pref("userChrome.tab.selected_bold") {
+  .tab-label:is([selected], [attention]) {
+    font-weight: 600;
+  }
+}
+
+/*= Selected Tab - Color like toolbar ========================================*/
+@media -moz-pref("userChrome.tab.color_like_toolbar") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    /* Fix for windows's system default theme. Using --toolbar-bgcolor, --toolbar-bgimage fallback */
+    --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */
+    --tab-selected-bgimage: unset !important; /* Above FF v101 */
+  }
+  #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon,
+  .tab-background:is([selected], [multiselected]) {
+    background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #pinned-tabs-container > .tabbrowser-tab > .tab-stack > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected] {
+    /* Original: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none)
+     */
+    background-image: linear-gradient(transparent, transparent),
+      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important;
+    background-position: 0, 0, right top;
+    background-attachment: scroll, scroll, fixed;
+    background-repeat: repeat-x, repeat-x, no-repeat !important;
+  }
+  @media -moz-pref("userChrome.theme.transparent.frame") {
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #pinned-tabs-container
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-tabs:not([movingtab])
+      > #pinned-tabs-container
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #pinned-tabs-container
+      > tab-group
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+      > #pinned-tabs-container
+      > tab-group
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-tabs:not([movingtab])
+      > #tabbrowser-arrowscrollbox
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-arrowscrollbox
+      > tab-group
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected],
+    :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+      > #tabbrowser-arrowscrollbox
+      > tab-group
+      > .tabbrowser-tab
+      > .tab-stack
+      > .tab-background[selected] {
+      background-image: linear-gradient(transparent, transparent),
+        linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-additional-images, none) !important;
+      background-repeat: repeat-x, repeat-x, var(--lwt-background-tiling) !important;
+      background-position: 0 0, 0 0, var(--lwt-background-alignment) !important;
+    }
+  }
+}
+/*= Multi Selected Color - More Contrast =====================================*/
+@media -moz-pref("userChrome.tab.multi_selected") {
+  #TabsToolbar,
+  #vertical-tabs {
+    --uc-multiselected-tab-bgcolor: color-mix(in srgb, currentColor 28%, var(--toolbar-bgcolor, transparent));
+  }
+  #TabsToolbar[brighttext],
+  #vertical-tabs[brighttext] {
+    --uc-multiselected-tab-bgcolor: color-mix(in srgb, currentColor 16%, var(--toolbar-bgcolor, transparent));
+  }
+  #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]) {
+    /* Original:
+    background-attachment: scroll, scroll, fixed;
+    background-color: transparent;
+    background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)),
+                      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)),
+                      var(--lwt-header-image, none);
+    background-position: 0 0, 0 0, right top;
+    background-repeat: repeat-x, repeat-x, no-repeat;
+    background-size: auto 100%, auto 100%, auto auto;
+    */
+    background-attachment: scroll, fixed !important;
+    background-color: transparent !important;
+    background-image: linear-gradient(var(--uc-multiselected-tab-bgcolor), var(--uc-multiselected-tab-bgcolor)),
+      var(--lwt-header-image, none) !important;
+    background-position: 0 0, right top !important;
+    background-repeat: repeat-x, no-repeat !important;
+    background-size: auto 100%, auto auto !important;
+  }
+  @media -moz-pref("userChrome.tab.connect_to_window") {
+    .tab-background[multiselected="true"] {
+      outline: none !important;
+    }
+  }
+  @media not -moz-pref("userChrome.tab.connect_to_window") {
+    /* Backport from FF 99 */
+    .tab-background[multiselected="true"] {
+      outline: 1px solid color-mix(in srgb, var(--focus-outline-color, currentColor) 40%, transparent);
+      outline-offset: -1px;
+    }
+    .tab-background[multiselected="true"][selected] {
+      outline-width: 2px;
+      outline-offset: -2px;
+    }
+  }
+}
+/*= Selected Tab - Box Shadow ================================================*/
+@media -moz-pref("userChrome.tab.box_shadow") {
+  #TabsToolbar {
+    --uc-tab-shadow-color: var(
+      --tab-line-color,
+      var(--lwt-tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)))
+    );
+    --uc-tab-shadow-color-bundle: var(--tab-line-color, var(--lwt-tab-line-color, rgba(128, 128, 142, 0.9)));
+  }
+  #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) {
+    box-shadow: unset !important;
+    filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.4));
+  }
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([selected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    filter: drop-shadow(0 0 1px var(--uc-tab-shadow-color, transparent));
+  }
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[visuallyselected]:not(:focus),
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[multiselected]:not([visuallyselected]) {
+    --uc-tab-shadow-color: var(--toolbar-color);
+  }
+  /* For themes outside of Light and Dark (which are curated by Mozilla), show a thicker border
+     around the tab to help themes that are dependent on tab_line to show the selected tab. */
+  :root:not(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    --uc-tab-shadow-color: var(--uc-tab-shadow-color-bundle);
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
+      drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(0 0 2px rgba(128, 128, 142, 0.5));
+  }
+  :root:not(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
+      drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent));
+  }
+}
+/*= Selected Tab - Bottom Rounded Corner =====================================*/
+@media -moz-pref("userChrome.tab.bottom_rounded_corner") {
+  @media not -moz-pref("userChrome.tab.bottom_rounded_corner.wave") {
+    @media not -moz-pref("userChrome.tab.bottom_rounded_corner.australis") {
+      @media not -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") {
+        @media not -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") {
+          @media not -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+            #TabsToolbar {
+              --uc-tab-corner-rounding: 3px; /* 10px looks about like chromium - 17px looks close to Australis tabs */
+              --uc-tab-corner-padding: 0px;
+              --uc-tab-corner-position: calc(var(--uc-tab-corner-padding) - var(--uc-tab-corner-rounding));
+              --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left.svg");
+              --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right.svg");
+            }
+            :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+            :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+              /* Box */
+              display: block;
+              position: absolute;
+              z-index: 1;
+              bottom: 0;
+              /* Shape */
+              width: var(--uc-tab-corner-rounding);
+              height: 100%;
+              /* Color */
+              fill: transparent;
+              stroke: transparent;
+              -moz-context-properties: fill, stroke;
+              /* Image */
+              background-size: var(--uc-tab-corner-rounding);
+              background-repeat: no-repeat;
+              background-position-y: bottom;
+            }
+            @media -moz-pref("userChrome.tab.bottom_rounded_corner.all") {
+              :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+              :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+                content: "";
+              }
+            }
+            @media not -moz-pref("userChrome.tab.color_like_toolbar") {
+              :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+              :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+                /* Based on tab background
+                   background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+
+                   defaults
+                   background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+                   background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
+                */
+                fill: var(
+                  --lwt-selected-tab-background-color,
+                  var(--tab-selected-bgcolor, var(--toolbar-bgcolor))
+                ) !important;
+              }
+            }
+            :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before {
+              left: var(--uc-tab-corner-position);
+              background-image: var(--uc-tab-corner-left-side-svg);
+            }
+            :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+              right: var(--uc-tab-corner-position);
+              background-image: var(--uc-tab-corner-right-side-svg);
+            }
+            :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+            :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+              fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+              stroke: var(--tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)));
+            }
+            @media not -moz-pref("userChrome.tab.bottom_rounded_corner.all") {
+              :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+              :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+                content: "";
+              }
+            }
+            :root:not([customizing="true"]) .tabbrowser-tab[multiselected] .tab-background::before,
+            :root:not([customizing="true"]) .tabbrowser-tab[multiselected] .tab-background::after {
+              fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+            }
+            :root:not([customizing="true"])
+              .tabbrowser-tab:hover:not([visuallyselected], [multiselected])
+              .tab-background::before,
+            :root:not([customizing="true"])
+              .tabbrowser-tab:hover:not([visuallyselected], [multiselected])
+              .tab-background::after {
+              fill: color-mix(in srgb, currentColor 11%, transparent);
+            }
+            @media -moz-pref("userChrome.tab.multi_selected") {
+              :root:not([customizing="true"])
+                .tabbrowser-tab[multiselected]:not([visuallyselected])
+                .tab-background::before,
+              :root:not([customizing="true"])
+                .tabbrowser-tab[multiselected]:not([visuallyselected])
+                .tab-background::after {
+                fill: color-mix(in srgb, currentColor 65%, transparent);
+                opacity: 0.3;
+              }
+            }
+            :root:not([customizing="true"])::is(
+                [lwtheme-mozlightdark],
+                [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+              ):is(:-moz-lwtheme, [lwtheme])
+              #TabsToolbar[brighttext]
+              #tabbrowser-tabs:not([noshadowfortests])
+              .tabbrowser-tab[visuallyselected]
+              .tab-background::before,
+            :root:not([customizing="true"])::is(
+                [lwtheme-mozlightdark],
+                [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+              ):is(:-moz-lwtheme, [lwtheme])
+              #TabsToolbar[brighttext]
+              #tabbrowser-tabs:not([noshadowfortests])
+              .tabbrowser-tab[visuallyselected]
+              .tab-background::after {
+              /* As Selected Tab - Box Shadow */
+              stroke: var(--toolbar-color);
+            }
+            @media (-moz-gtk-csd-available) {
+              :root:not([customizing="true"]) {
+                /* Fill color for GTK */
+              }
+              :root:not([customizing="true"]):not([lwtheme="true"])
+                .tabbrowser-tab:is([visuallyselected], [multiselected])
+                .tab-background::before,
+              :root:not([customizing="true"]):not([lwtheme="true"])
+                .tabbrowser-tab:is([visuallyselected], [multiselected])
+                .tab-background::after {
+                /* As GTK Toolbar's background-color + background-image
+                 * --toolbar-non-lwt-bgcolor: -moz-dialog;
+                 * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
+                 */
+                fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog);
+                stroke: transparent;
+                opacity: 1;
+              }
+              :root:not([customizing="true"]):not([lwtheme="true"])
+                #TabsToolbar[brighttext]
+                .tabbrowser-tab[visuallyselected]
+                .tab-background::before,
+              :root:not([customizing="true"]):not([lwtheme="true"])
+                #TabsToolbar[brighttext]
+                .tabbrowser-tab[visuallyselected]
+                .tab-background::after {
+                stroke: transparent;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") or -moz-pref("userChrome.tab.bottom_rounded_corner.australis") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+    #TabsToolbar {
+      --uc-tab-corner-height: calc(var(--tab-min-height) + 1px);
+      --uc-tab-corner-size: var(--uc-tab-corner-height);
+      --uc-tab-corner-half-size: calc(var(--uc-tab-corner-size) / 2);
+      --uc-tab-corner-half-size-reverse: calc(var(--uc-tab-corner-half-size) * -1);
+      --uc-tab-corner-bgimage: none;
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") {
+      #TabsToolbar {
+        --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave.svg");
+        --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave.svg#svgClipPath");
+        --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave.svg");
+        --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave.svg#svgClipPath");
+        --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave-clipped.svg");
+        --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave-clipped.svg");
+      }
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.australis") {
+      #TabsToolbar {
+        --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis.svg");
+        --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis.svg#svgClipPath");
+        --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis.svg");
+        --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis.svg#svgClipPath");
+        --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis-clipped.svg");
+        --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis-cilpped.svg");
+      }
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") {
+      #TabsToolbar {
+        --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome.svg");
+        --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome.svg#svgClipPath");
+        --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome.svg");
+        --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome.svg#svgClipPath");
+        --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome-clipped.svg");
+        --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome-clipped.svg");
+        --uc-tab-corner-size: 16px;
+      }
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") {
+      #TabsToolbar {
+        --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy.svg");
+        --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy.svg#svgClipPath");
+        --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy.svg");
+        --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy.svg#svgClipPath");
+        --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy-clipped.svg");
+        --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy-clipped.svg");
+      }
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+      #TabsToolbar {
+        --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge.svg");
+        --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge.svg#svgClipPath");
+        --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge.svg");
+        --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge.svg#svgClipPath");
+        --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge-clipped.svg");
+        --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge-clipped.svg");
+        --uc-tab-corner-size: 14px;
+      }
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.all") {
+      .tabbrowser-tab {
+        padding-inline: 0 !important;
+        overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+      }
+      .tabbrowser-tab .tab-background {
+        --tab-border-radius: 0px;
+        margin-inline: var(--uc-tab-corner-half-size) !important;
+        position: relative;
+      }
+    }
+    @media not -moz-pref("userChrome.tab.bottom_rounded_corner.all") {
+      .tabbrowser-tab[visuallyselected] {
+        padding-inline: 0 !important;
+        overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+      }
+      .tabbrowser-tab[visuallyselected] .tab-background {
+        --tab-border-radius: 0px;
+        margin-inline: var(--uc-tab-corner-half-size) !important;
+        position: relative;
+      }
+      .tabbrowser-tab[visuallyselected] .tab-background::before,
+      .tabbrowser-tab[visuallyselected] .tab-background::after {
+        content: "";
+      }
+    }
+    .tabbrowser-tab .tab-background::before,
+    .tabbrowser-tab .tab-background::after {
+      /* Box */
+      display: block;
+      position: absolute;
+      z-index: -1;
+      bottom: -1px;
+      /* Shape */
+      width: var(--uc-tab-corner-size);
+      height: var(--uc-tab-corner-height);
+      /* Color */
+      fill: transparent;
+      -moz-context-properties: fill;
+      /* Image */
+      background-size: cover, auto auto;
+      background-repeat: no-repeat, no-repeat;
+      background-position: bottom, right top;
+      background-attachment: scroll, fixed;
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.all") {
+      .tabbrowser-tab .tab-background::before,
+      .tabbrowser-tab .tab-background::after {
+        content: "";
+      }
+    }
+    @media not -moz-pref("userChrome.tab.color_like_toolbar") {
+      .tabbrowser-tab .tab-background::before,
+      .tabbrowser-tab .tab-background::after {
+        /* Based on tab background
+             background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+
+             defaults
+             background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+             background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
+        */
+        fill: var(--lwt-selected-tab-background-color, var(--tab-selected-bgcolor, var(--toolbar-bgcolor))) !important;
+      }
+    }
+    .tabbrowser-tab .tab-background::before {
+      right: 100%;
+      background-image: var(--uc-tab-corner-left-side-svg), var(--uc-tab-corner-bgimage);
+      clip-path: var(--uc-tab-corner-left-side-clipPath);
+    }
+    .tabbrowser-tab .tab-background::after {
+      left: 100%;
+      background-image: var(--uc-tab-corner-right-side-svg), var(--uc-tab-corner-bgimage);
+      clip-path: var(--uc-tab-corner-right-side-clipPath);
+    }
+    .tabbrowser-tab:has(+ .tabbrowser-tab[visuallyselected]) .tab-background::after {
+      --uc-tab-corner-right-side-svg: var(--uc-tab-corner-right-side-svg-clipped);
+    }
+    .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-background::before {
+      --uc-tab-corner-left-side-svg: var(--uc-tab-corner-left-side-svg-clipped);
+    }
+    .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background {
+      --uc-tab-corner-bgimage: var(--lwt-header-image, none);
+    }
+    .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background::before,
+    .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background::after {
+      fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+    }
+    .tabbrowser-tab:hover:not([visuallyselected], [multiselected]) .tab-background::before,
+    .tabbrowser-tab:hover:not([visuallyselected], [multiselected]) .tab-background::after {
+      fill: color-mix(in srgb, currentColor 11%, transparent);
+    }
+    @media -moz-pref("userChrome.tab.multi_selected") {
+      .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::before,
+      .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::after {
+        fill: var(--uc-multiselected-tab-bgcolor);
+      }
+    }
+    :root:is(:-moz-lwtheme, [lwtheme])
+      #tabbrowser-tabs[movingtab]
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      .tab-background {
+      --uc-tab-corner-bgimage: none;
+    }
+    @media (-moz-gtk-csd-available) {
+      /* Fill color for GTK */
+      @media -moz-pref("userChrome.tab.box_shadow") {
+        :root:not([lwtheme="true"]) .tabbrowser-tab {
+          --uc-tab-shadow-color: rgba(0, 0, 0, 0.4);
+        }
+      }
+      :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background {
+        background-clip: content-box;
+      }
+      :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+      :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+        /* As GTK Toolbar's background-color + background-image
+         * --toolbar-non-lwt-bgcolor: -moz-dialog;
+         * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
+         */
+        --uc-tab-corner-bgimage: linear-gradient(var(--toolbar-non-lwt-bgcolor), var(--toolbar-non-lwt-bgcolor));
+        fill: rgba(255, 255, 255, 0.075);
+      }
+      @media not -moz-pref("userChrome.tab.color_like_toolbar") {
+        :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+        :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+          fill: rgba(255, 255, 255, 0.15);
+        }
+      }
+    }
+    #tabbrowser-tabs[positionpinnedtabs],
+    #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-of-type,
+    #tabbrowser-tabs[overflow]
+      .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+      margin-left: var(--uc-tab-corner-half-size) !important;
+    }
+    .tabbrowser-tab:last-of-type {
+      margin-right: var(--uc-tab-corner-half-size) !important;
+    }
+  }
+}
+/*= Selected Tab - Photon like contextline ===================================*/
+@media -moz-pref("userChrome.tab.photon_like_contextline") or -moz-pref("userChrome.tab.static_separator") or -moz-pref("userChrome.tab.bar_separator") {
+  @media -moz-pref("userChrome.tab.blue_accent") {
+    :root,
+    #tabbrowser-tabs {
+      --tab-line-color: rgb(10, 132, 255) !important;
+    }
+  }
+  @media not -moz-pref("userChrome.tab.blue_accent") {
+    @media (-moz-gtk-csd-available) {
+      :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs {
+        --tab-line-color: AccentColor !important; /* -moz-accent-color */
+      }
+      @media -moz-pref("userChrome.compatibility.accent_color") {
+        :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs {
+          --tab-line-color: Highlight !important; /* -moz-accent-color */
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.tab.photon_like_contextline") {
+  .tab-context-line {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+    height: 2px !important;
+    border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important;
+  }
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line {
+    --tab-line-color: rgb(10, 132, 255);
+  }
+  .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line {
+    /* Photon like color
+       Default: var(--tab-line-color, rgb(10, 132, 255))
+       Automatic: color-mix(in srgb, var(--button-primary-bgcolor) 80%, transparent)
+
+       FF v96+ replace by var(--lwt-tab-line-color) */
+    background-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255))) !important;
+  }
+  .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line {
+    background-color: rgba(0, 0, 0, 0.2) !important;
+    opacity: 1 !important;
+    transform: none !important;
+  }
+  #TabsToolbar[brighttext]
+    .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+    > .tab-stack
+    > .tab-background
+    > .tab-context-line {
+    background-color: rgba(255, 255, 255, 0.2) !important;
+  }
+  /* Prevent identity color flashing */
+  .tabbrowser-tab[usercontextid] .tab-context-line {
+    --identity-icon-color: none;
+  }
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before,
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after {
+    /* As Selected Tab - Box Shadow */
+    stroke: var(--toolbar-color) !important;
+  }
+  /* Animation */
+  .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line {
+    opacity: 0 !important;
+    transform: scaleX(0) !important;
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line {
+      transition: transform 250ms var(--animation-easing-function), opacity 250ms var(--animation-easing-function) !important; /* --animation-easing-function: cubic-bezier(.07, .95, 0, 1); */
+    }
+  }
+  /* Remove side's background color border */
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    --tabs-border-color: rgba(0, 0, 0, 0.3) !important;
+    box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */
+  }
+  #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */
+  }
+  /* Container Tab */
+  .tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+    margin: unset !important;
+  }
+}
+/*= Selected Tab - Supernova like contextline ===================================*/
+@media not -moz-pref("userChrome.tab.photon_like_contextline") {
+  @media -moz-pref("userChrome.tab.supernova_like_contextline") {
+    /* context line styles */
+    tabs tab.tabbrowser-tab > .tab-stack > .tab-background > .tab-context-line {
+      display: inline-flex !important;
+      display: -moz-inline-box !important;
+    }
+    tabs tab.tabbrowser-tab > .tab-stack > .tab-background > .tab-context-line::before {
+      content: "";
+      height: 1px !important;
+      border-radius: 9999px !important;
+      transform: translateY(5px);
+      margin-top: -1px !important;
+      margin-left: 5px;
+      margin-right: 5px;
+      width: 100%;
+    }
+    /* Override container-tab style */
+    tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+      margin: unset !important;
+    }
+    /* selected tab style */
+    :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+    :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line,
+    :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+    :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line {
+      --tab-line-color: #45a1ff;
+    }
+    .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line::before {
+      background-color: var(--tab-line-color, var(--lwt-tab-line-color, #45a1ff)) !important;
+    }
+    /* Set the active effect */
+    .tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line::before {
+      filter: brightness(70%);
+      margin-left: 6px;
+      margin-right: 6px;
+    }
+    /* Set the hover effect */
+    .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+      > .tab-stack
+      > .tab-background
+      > .tab-context-line::before {
+      background-color: rgba(0, 0, 0, 0.4) !important;
+      opacity: 1 !important;
+    }
+    #TabsToolbar[brighttext]
+      .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+      > .tab-stack
+      > .tab-background
+      > .tab-context-line::before {
+      background-color: rgba(255, 255, 255, 0.4) !important;
+    }
+    /* Animation */
+    @media (prefers-reduced-motion: no-preference) {
+      .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+        > .tab-stack
+        > .tab-background
+        > .tab-context-line::before {
+        animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1);
+      }
+    }
+    /* Animation for hover effect */
+    @keyframes toWide {
+      0% {
+        opacity: 0.8;
+        margin-left: 40%;
+        margin-right: 40%;
+      }
+      100% {
+        opacity: 1;
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+    /* --- copied (not modified) from _photon_like_contextline.scss --- */
+    /* Prevent identity color flashing */
+    .tabbrowser-tab[usercontextid] .tab-context-line {
+      --identity-icon-color: none;
+    }
+    :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before,
+    :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after {
+      /* As Selected Tab - Box Shadow */
+      stroke: var(--toolbar-color) !important;
+    }
+    /* Remove side's background color border */
+    :root:is(:-moz-lwtheme, [lwtheme])
+      #TabsToolbar[brighttext]
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      --tabs-border-color: rgba(0, 0, 0, 0.3) !important;
+      box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */
+    }
+    #TabsToolbar:not([brighttext])
+      #tabbrowser-tabs:not([noshadowfortests])
+      .tabbrowser-tab:is([visuallyselected], [multiselected])
+      > .tab-stack
+      > .tab-background {
+      box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */
+    }
+    @media -moz-pref("userChrome.tab.contextline_blue_accent") {
+      #tabbrowser-tabs .tab-context-line {
+        --tab-line-color: #45a1ff !important;
+      }
+    }
+    @media not -moz-pref("userChrome.tab.contextline_blue_accent") {
+      @media (-moz-gtk-csd-available) {
+        :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs .tab-context-line {
+          --tab-line-color: AccentColor !important; /* -moz-accent-color */
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs .tab-context-line {
+            --tab-line-color: Highlight !important; /* -moz-accent-color */
+          }
+        }
+      }
+    }
+  }
+}
+/*= Unselected Tab - Divide line =============================================*/
+/*= Unselected Tab - Dynamic Separator =======================================*/
+@media -moz-pref("userChrome.tab.dynamic_separator") {
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    --start-tab-separator-position-x: -1.5px;
+    --end-tab-separator-position-x: 1.5px;
+    --tab-separator-position-x: -2.5px;
+    --tab-separator-position-y: calc(-50% + 1px);
+  }
+  #pinned-tabs-container:-moz-locale-dir(rtl),
+  #tabbrowser-arrowscrollbox:-moz-locale-dir(rtl) {
+    --start-tab-separator-position-x: 1.5px;
+    --end-tab-separator-position-x: -1.5px;
+    --tab-separator-position-x: 2.5px;
+  }
+  #tabbrowser-arrowscrollbox-periphery {
+    position: relative;
+  }
+  @media -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+      /* Box Model */
+      content: "";
+      display: block;
+      position: absolute;
+      /* Position */
+      top: 50%;
+      /* Bar shape */
+      width: 1px;
+      height: 20px;
+      /* Bar Color */
+      opacity: 0;
+      background-color: var(--toolbarseparator-color);
+      /* More position */
+      transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+    }
+    @media -moz-pref("userChrome.compatibility.dynamic_separator") {
+      #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+      #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+        background-color: var(--tabs-border-color);
+      }
+    }
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+      left: calc(50% - (8px + var(--toolbarbutton-inner-padding)));
+    }
+  }
+  @media not -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+    #tabbrowser-tabs:not([orient="vertical"])
+      #tabbrowser-arrowscrollbox:not([overflowing])
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+      .tab-stack::after {
+      /* Box Model */
+      content: "";
+      display: block;
+      position: absolute;
+      /* Position */
+      top: 50%;
+      /* Bar shape */
+      width: 1px;
+      height: 20px;
+      /* Bar Color */
+      opacity: 0;
+      background-color: var(--toolbarseparator-color);
+    }
+    @media -moz-pref("userChrome.compatibility.dynamic_separator") {
+      #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+      #tabbrowser-tabs:not([orient="vertical"])
+        #tabbrowser-arrowscrollbox:not([overflowing])
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+        .tab-stack::after {
+        background-color: var(--tabs-border-color);
+      }
+    }
+    #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before {
+      transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
+    }
+    #tabbrowser-tabs:not([orient="vertical"]) .tabbrowser-tab:last-of-type .tab-stack::after {
+      right: 0;
+      transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
+    }
+  }
+  #pinned-tabs-container:not([orient="vertical"]):not(:empty):not(
+      :has(.tabbrowser-tab[pinned]:is([visuallyselected], [multiselected], :hover):last-of-type)
+    )
+    ~ #tabbrowser-arrowscrollbox:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+    .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-of-type)
+    .tab-stack::before {
+    opacity: var(--tab-separator-opacity);
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner") {
+    @media not -moz-pref("userChrome.tabbar.one_liner.tabbar_first") {
+      @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        #tabbrowser-tabs:not([orient="vertical"])
+          .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+          .tab-stack::before {
+          opacity: var(--tab-separator-opacity);
+          transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media screen and (min-width: 1100px) {
+          #tabbrowser-tabs:not([orient="vertical"])
+            .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+            .tab-stack::before {
+            opacity: var(--tab-separator-opacity);
+            transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+          }
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button:not(:hover, [open])::before {
+      opacity: var(--tab-separator-opacity);
+    }
+  }
+  @media not -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #tabbrowser-tabs:not([orient="vertical"])
+      #tabbrowser-arrowscrollbox:not([overflowing])
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+      .tab-stack::after {
+      opacity: var(--tab-separator-opacity);
+    }
+  }
+  #tabbrowser-tabs:not([orient="vertical"])
+    tab-group:has(.tabbrowser-tab:last-child:is(:hover, [selected]))
+    + .tabbrowser-tab
+    .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"]) tab-group[collapsed] + .tabbrowser-tab .tab-stack::before {
+    opacity: 0 !important;
+  }
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))):is(
+      [visuallyselected],
+      [multiselected],
+      :hover
+    )
+    .tab-stack::before,
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox[overflowing]
+    tab.tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden])))
+    .tab-stack::before {
+    opacity: 0 !important;
+  }
+  @media -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #navigator-toolbox:not([movingtab])
+      #tabbrowser-tabs:not([orient="vertical"])
+      .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
+      + .tabbrowser-tab
+      .tab-stack::before,
+    #navigator-toolbox:not([movingtab])
+      #tabbrowser-tabs:not([orient="vertical"])
+      .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
+      ~ #tabs-newtab-button::before,
+    #navigator-toolbox:not([movingtab])
+      #tabbrowser-tabs:not([orient="vertical"])
+      .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
+      ~ #tabbrowser-arrowscrollbox-periphery
+      #tabs-newtab-button::before {
+      opacity: 0 !important;
+    }
+  }
+  @media not -moz-pref("userChrome.tab.newtab_button_like_tab") {
+    #tabbrowser-tabs:not([orient="vertical"])
+      .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
+      + .tabbrowser-tab:not([visuallyselected])
+      .tab-stack::before {
+      opacity: 0 !important;
+    }
+    :root:not([uidensity="compact"])
+      #tabbrowser-tabs:not([orient="vertical"])
+      #tabs-newtab-button
+      > .toolbarbutton-icon {
+      margin-left: 2px;
+    }
+    :root[uidensity="compact"] #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button > .toolbarbutton-icon {
+      margin-left: 1px;
+    }
+  }
+  /* Animate */
+  @media (prefers-reduced-motion: no-preference) {
+    #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before {
+      transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+    }
+    @media -moz-pref("userChrome.tab.newtab_button_like_tab") {
+      #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+        transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+      }
+    }
+    @media not -moz-pref("userChrome.tab.newtab_button_like_tab") {
+      #tabbrowser-tabs:not([orient="vertical"])
+        #tabbrowser-arrowscrollbox:not([overflowing])
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+        .tab-stack::after {
+        transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+      }
+    }
+  }
+  /* Latest Tab & New tab margin */
+  #tabbrowser-tabs:not([orient="vertical"]) #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-of-type {
+    margin-inline-end: 1px !important;
+  }
+}
+/*= Unselected Tab - Static Separator ========================================*/
+@media -moz-pref("userChrome.tab.static_separator") {
+  #TabsToolbar {
+    --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
+  }
+  .tab-stack::before,
+  .tabbrowser-tab:last-of-type .tab-stack::after {
+    content: "";
+  }
+  .tab-stack::before,
+  .tab-stack::after {
+    /* Box Model */
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 1;
+    /* Bar shape */
+    width: 0px;
+    height: 100%;
+    /* Bar Color */
+    border-right: 1px solid var(--toolbarseparator-color);
+  }
+  .tab-stack::after {
+    right: 0;
+  }
+  @media -moz-pref("userChrome.tab.static_separator.selected_accent") {
+    .tabbrowser-tab[visuallyselected] .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] .tab-stack::after {
+      --toolbarseparator-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)));
+    }
+  }
+  @media not -moz-pref("userChrome.tab.static_separator.selected_accent") {
+    .tabbrowser-tab[visuallyselected] .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] .tab-stack::after {
+      opacity: 0;
+    }
+  }
+  /* Animate */
+  @media (prefers-reduced-motion: no-preference) {
+    .tab-stack::before,
+    .tab-stack::after {
+      transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+    }
+  }
+}
+/*= Unselected Tab - Bar Separator ===========================================*/
+@media -moz-pref("userChrome.tab.bar_separator") {
+  .tab-stack::before {
+    /* Box Model */
+    content: "";
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    left: 0%;
+    transform: translateX(calc((var(--inline-tab-padding) - 5px) / 2)) translateY(calc(-50% + var(--tab-block-margin)));
+    z-index: 1;
+    /* Bar shape */
+    width: 3px;
+    height: 20px;
+    /* Bar Color */
+    background-color: var(
+      --uc-bar-separator-color,
+      var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)))
+    );
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    .tab-stack::before {
+      transition-property: opacity, background-color;
+      transition-duration: 0.2s;
+      transition-timing-function: var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+    }
+  }
+  :root[sessionrestored] .tabbrowser-tab[busy] .tab-stack::before {
+    --uc-bar-separator-color: currentColor;
+    opacity: 0.7;
+  }
+  :root[sessionrestored] .tabbrowser-tab[busy][progress] .tab-stack::before {
+    --uc-bar-separator-color: var(--tab-loading-fill);
+    opacity: 1;
+  }
+  :root[sessionrestored]
+    #TabsToolbar[brighttext]
+    .tabbrowser-tab[busy][progress]:not([selected="true"])
+    .tab-stack::before {
+    --uc-bar-separator-color: var(--lwt-tab-loading-fill-inactive, #84c1ff);
+  }
+  @media -moz-pref("userChrome.tab.unloaded") {
+    :root[sessionrestored] .tabbrowser-tab[pending] .tab-stack::before {
+      opacity: 0.7;
+    }
+  }
+}
+/*= New tab button ============================================================*/
+/*= New tab button - Looks like tab ==========================================*/
+@media -moz-pref("userChrome.tab.newtab_button_like_tab") {
+  @media -moz-pref("userChrome.tab.connect_to_window") {
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+      /* Size */
+      align-items: stretch !important;
+      -moz-box-align: stretch !important;
+      padding-top: var(--tab-block-margin) !important;
+    }
+  }
+  @media -moz-pref("userChrome.tab.bottom_rounded_corner") {
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+      /* Original:
+       margin: 0 0 var(--tabs-navbar-shadow-size) !important
+       => Can't override style. Therefore, we should approach it by bypass.
+      */
+      --tabs-navbar-shadow-size: -1px; /* Original: 1px */
+      --uc-tabs-navbar-shadow-size: 0.5px;
+      --uc-tab-corner-rounding: 4px; /* Hardcoded */
+      --uc-newtab-bgcolor: transparent;
+      /* Corner Rounding Image */
+      --uc-newtab-position: calc((var(--uc-tab-corner-rounding) / 2) * -1);
+      background-image: var(--uc-tab-corner-left-side-svg), var(--uc-tab-corner-right-side-svg);
+      background-repeat: no-repeat;
+      background-position: left var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size),
+        right var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size);
+      background-size: var(--uc-tab-corner-rounding);
+      /* Corner Rounding Color */
+      fill: var(--uc-newtab-bgcolor) !important;
+      -moz-context-properties: fill !important;
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") or -moz-pref("userChrome.tab.bottom_rounded_corner.australis") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+      #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+        --uc-newtab-position: 0px;
+        --uc-newtab-non-corner-bgwidth: 0px;
+        --uc-tab-corner-half-height: calc(var(--uc-tab-corner-height) / 2);
+        --uc-tab-corner-half-height-reverse: calc(var(--uc-tab-corner-half-height) * -1);
+        transform: translateX(var(--uc-tab-corner-half-height-reverse));
+        padding-inline: var(--uc-tab-corner-half-height) !important;
+        overflow-clip-margin: var(--uc-tab-corner-half-height) !important;
+        background-image: var(--uc-tab-corner-left-side-svg),
+          linear-gradient(to left, var(--uc-newtab-bgcolor), var(--uc-newtab-bgcolor)),
+          var(--uc-tab-corner-right-side-svg);
+        background-position: left var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size),
+          center bottom var(--uc-tabs-navbar-shadow-size),
+          right var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size);
+        background-size: var(--uc-tab-corner-height) var(--uc-tab-corner-height),
+          var(--uc-newtab-non-corner-bgwidth) var(--uc-tab-corner-height),
+          var(--uc-tab-corner-height) var(--uc-tab-corner-height);
+        background-origin: padding-box;
+      }
+      @media -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+        #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+          --uc-newtab-non-corner-bgwidth: calc(2 * var(--toolbarbutton-inner-padding));
+        }
+      }
+    }
+  }
+  /* Corner Rounding Color */
+  #tabs-newtab-button:hover {
+    --uc-newtab-bgcolor: var(--toolbarbutton-hover-background);
+  }
+  #tabs-newtab-button:hover:active {
+    --uc-newtab-bgcolor: var(--toolbarbutton-active-background);
+  }
+  @media (-moz-windows-accent-color-in-titlebar) {
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([orient="vertical"])
+      #tabs-newtab-button:hover,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      #tabbrowser-tabs:not([orient="vertical"])
+      #tabs-newtab-button:hover {
+      fill: color-mix(in srgb, AccentColorText 10%, transparent) !important; /* Hardcoded for compatibility */
+    }
+    :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+      #tabbrowser-tabs:not([orient="vertical"])
+      #tabs-newtab-button:hover:active,
+    :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+      #tabbrowser-tabs:not([orient="vertical"])
+      #tabs-newtab-button:hover:active {
+      fill: color-mix(in srgb, AccentColorText 15%, transparent) !important; /* Hardcoded for compatibility */
+    }
+    @media -moz-pref("userChrome.tab.bottom_rounded_corner") {
+      @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") or -moz-pref("userChrome.tab.bottom_rounded_corner.australis") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+        :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+          #tabbrowser-tabs:not([orient="vertical"])
+          #tabs-newtab-button:hover,
+        :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+          #tabbrowser-tabs:not([orient="vertical"])
+          #tabs-newtab-button:hover {
+          background-image: var(--uc-tab-corner-left-side-svg),
+            linear-gradient(
+              to left,
+              color-mix(in srgb, AccentColorText 10%, transparent),
+              color-mix(in srgb, AccentColorText 10%, transparent)
+            ),
+            var(--uc-tab-corner-right-side-svg);
+        }
+        :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+          #tabbrowser-tabs:not([orient="vertical"])
+          #tabs-newtab-button:hover:active,
+        :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+          #tabbrowser-tabs:not([orient="vertical"])
+          #tabs-newtab-button:hover:active {
+          background-image: var(--uc-tab-corner-left-side-svg),
+            linear-gradient(
+              to left,
+              color-mix(in srgb, AccentColorText 15%, transparent),
+              color-mix(in srgb, AccentColorText 15%, transparent)
+            ),
+            var(--uc-tab-corner-right-side-svg);
+        }
+      }
+    }
+    @media -moz-pref("userChrome.compatibility.accent_color") {
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        #tabbrowser-tabs:not([orient="vertical"])
+        #tabs-newtab-button:hover,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        #tabbrowser-tabs:not([orient="vertical"])
+        #tabs-newtab-button:hover {
+        fill: color-mix(
+          in srgb,
+          -moz-accent-color-foreground 10%,
+          transparent
+        ) !important; /* Hardcoded for compatibility */
+      }
+      :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+        #tabbrowser-tabs:not([orient="vertical"])
+        #tabs-newtab-button:hover:active,
+      :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+        #tabbrowser-tabs:not([orient="vertical"])
+        #tabs-newtab-button:hover:active {
+        fill: color-mix(
+          in srgb,
+          -moz-accent-color-foreground 15%,
+          transparent
+        ) !important; /* Hardcoded for compatibility */
+      }
+      @media -moz-pref("userChrome.tab.bottom_rounded_corner") {
+        @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") or -moz-pref("userChrome.tab.bottom_rounded_corner.australis") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+          :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(
+              :not([lwtheme]),
+              :not(:-moz-lwtheme)
+            )
+            #tabbrowser-tabs:not([orient="vertical"])
+            #tabs-newtab-button:hover,
+          :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+            #tabbrowser-tabs:not([orient="vertical"])
+            #tabs-newtab-button:hover {
+            background-image: var(--uc-tab-corner-left-side-svg),
+              linear-gradient(
+                to left,
+                color-mix(in srgb, -moz-accent-color-foreground 10%, transparent),
+                color-mix(in srgb, -moz-accent-color-foreground 10%, transparent)
+              ),
+              var(--uc-tab-corner-right-side-svg);
+          }
+          :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(
+              :not([lwtheme]),
+              :not(:-moz-lwtheme)
+            )
+            #tabbrowser-tabs:not([orient="vertical"])
+            #tabs-newtab-button:hover:active,
+          :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+            #tabbrowser-tabs:not([orient="vertical"])
+            #tabs-newtab-button:hover:active {
+            background-image: var(--uc-tab-corner-left-side-svg),
+              linear-gradient(
+                to left,
+                color-mix(in srgb, -moz-accent-color-foreground 15%, transparent),
+                color-mix(in srgb, -moz-accent-color-foreground 15%, transparent)
+              ),
+              var(--uc-tab-corner-right-side-svg);
+          }
+        }
+      }
+    }
+  }
+  /* '+'Icon */
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button .toolbarbutton-icon {
+    border-radius: var(--tab-border-radius) var(--tab-border-radius) 0 0 !important; /* Original: var(--tab-border-radius) */
+    padding: calc(var(--toolbarbutton-inner-padding) - var(--tab-block-margin) / 4) var(--toolbarbutton-inner-padding)
+      calc(var(--toolbarbutton-inner-padding) + var(--tab-block-margin) / 4 + var(--uc-tabs-navbar-shadow-size)) !important;
+    -moz-context-properties: fill, fill-opacity;
+    fill: var(--toolbarbutton-icon-fill);
+    fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+  }
+  @media -moz-pref("userChrome.tab.bottom_rounded_corner.wave") or -moz-pref("userChrome.tab.bottom_rounded_corner.australis") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome_legacy") or -moz-pref("userChrome.tab.bottom_rounded_corner.chrome") or -moz-pref("userChrome.tab.bottom_rounded_corner.edge") {
+    #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button .toolbarbutton-icon {
+      --tab-border-radius: 0px;
+      width: unset !important;
+      padding-inline: 0px !important;
+      margin-inline: calc(var(--uc-tab-corner-half-height) - 7.75px) !important;
+      background-color: transparent !important;
+    }
+  }
+  /* Fix tab overlap #678 */
+  @media -moz-pref("userChrome.tab.bottom_rounded_corner") {
+    tab:where([visuallyselected]) {
+      z-index: 1;
+    }
+  }
+}
+/*= New tab button - Smaller button ==========================================*/
+@media -moz-pref("userChrome.tab.newtab_button_smaller") {
+  #tabs-newtab-button > .toolbarbutton-icon {
+    --tab-border-radius: var(--toolbarbutton-border-radius);
+    margin-left: 1px;
+    /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */
+    --toolbarbutton-inner-padding: var(--uc-small-toolbarbutton-inner-padding);
+  }
+}
+/*= New tab button - Proton like button ======================================*/
+@media -moz-pref("userChrome.tab.newtab_button_proton") {
+  :root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon {
+    --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px);
+  }
+}
+/*= Unloaded Tab - Contents Opacity ===========================================*/
+@media -moz-pref("userChrome.tab.unloaded") {
+  .tabbrowser-tab[pending] .tab-content {
+    opacity: 0.7;
+  }
+}
+/*= Clipped tabs =============================================================*/
+/** Clipped tabs - Letters cleary *********************************************/
+@media -moz-pref("userChrome.tab.letters_cleary") {
+  #tabbrowser-tabs[closebuttons="activetab"] {
+    --inline-tab-padding: 7px !important; /* Original: 8px */
+  }
+  #tabbrowser-tabs[overflow="true"] {
+    --inline-tab-padding: 6px !important; /* Original: 8px */
+  }
+  .tab-content[pinned] {
+    --inline-tab-padding: 10px; /* Prevent overflow pinned tab's divide line not aligned */
+    padding-inline: var(--inline-tab-padding) !important;
+  }
+  :root[uidensity="compact"] .tab-content[pinned] {
+    --inline-tab-padding: 8px;
+  }
+  .tabbrowser-tab .tab-label-container {
+    --tab-label-mask-size: 1.8em; /* Original: 2em */
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-label-container {
+    --tab-label-mask-size: 30%;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:is([visuallyselected], [multiselected="true"])
+    .tab-label-container {
+    --tab-label-mask-size: 25%;
+  }
+  .tabbrowser-tab[visuallyselected]:not([labelendaligned]):hover .tab-label-container,
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    > #pinned-tabs-container
+    > .tabbrowser-tab:not([visuallyselected], [labelendaligned]):hover
+    .tab-label-container,
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:not([visuallyselected], [labelendaligned]):hover
+    .tab-label-container {
+    --tab-label-mask-size: 0.9em; /* Original: 1em */
+  }
+}
+/** Clipped tabs - Show close button at hover *********************************/
+@media -moz-pref("userChrome.tab.close_button_at_hover") {
+  #tabbrowser-tabs[closebuttons="activetab"]
+    > #pinned-tabs-container
+    > .tabbrowser-tab:not([pinned])
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button:not([selected]),
+  #tabbrowser-tabs[closebuttons="activetab"]
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:not([pinned])
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button:not([selected]) {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button {
+    visibility: collapse !important;
+    opacity: 0;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:hover .tab-close-button {
+    visibility: visible !important;
+    opacity: 1;
+  }
+  @media -moz-pref("userChrome.tab.close_button_at_hover.with_selected") {
+    #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not(:hover) .tab-close-button {
+      visibility: collapse !important;
+      opacity: 0;
+    }
+  }
+  @media -moz-pref("userChrome.tab.close_button_at_hover.always") {
+    .tabbrowser-tab:not([visuallyselected]) .tab-close-button {
+      visibility: collapse !important;
+      opacity: 0;
+    }
+    .tabbrowser-tab:hover .tab-close-button {
+      visibility: visible !important;
+      opacity: 1;
+    }
+    @media -moz-pref("userChrome.tab.close_button_at_hover.with_selected") {
+      .tabbrowser-tab:not([pinned]):not(:hover) .tab-close-button {
+        visibility: collapse !important;
+        opacity: 0;
+      }
+    }
+  }
+  /* Animate */
+  @media (prefers-reduced-motion: no-preference) {
+    /* Fade out */
+    .tabbrowser-tab .tab-close-button {
+      transition: opacity 0.1s var(--animation-easing-function) !important;
+    }
+    /* Fade in */
+    .tabbrowser-tab:hover .tab-close-button {
+      transition: opacity 0.25s var(--animation-easing-function) !important;
+    }
+  }
+  /* Closed Button's icon thicker */
+  .tabbrowser-tab .tab-content > .close-icon {
+    list-style-image: url("chrome://browser/skin/lepton/dismiss-filled.svg") !important;
+  }
+  /* Closed Button's icon larger */
+  .tab-close-button {
+    padding: 6px !important; /* Original: 7px */
+  }
+  .tabbrowser-tab:not(:hover, [pinned]) > .tab-stack > .tab-content > .tab-close-button {
+    padding-inline-start: 1px !important; /* Original: 0px */
+    width: 19px !important; /* Original: 17px */
+  }
+  /* Closed Button's padding reduce */
+  #tabbrowser-tabs[closebuttons="activetab"] .tab-content > .tab-close-button {
+    margin-inline-end: calc(
+      var(--inline-tab-padding) / -2 + 2px
+    ) !important; /* Original: calc(var(--inline-tab-padding) / -2)*/
+    padding: 4px !important; /* Original: 7px */
+    width: 20px !important; /* Original: 24px */
+    height: 20px !important; /* Original: 24px */
+  }
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:not(:hover)
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button {
+    padding-inline-start: 3px !important; /* Original: 0px */
+    width: 19px !important; /* Redefine from 19px !important, Original: 17px = (width - padding)  */
+  }
+}
+/** Clipped tabs - Show close button at pinned tab ****************************/
+@media -moz-pref("userChrome.tab.close_button_at_pinned") {
+  @media not -moz-pref("userChrome.tabbar.as_titlebar") {
+    #tabbrowser-tabs {
+      --uc-close-button-size: 24px;
+      --uc-close-button-padding: 6px;
+      --uc-close-button-margin: calc((var(--uc-close-button-size) - 16px) / -2);
+    }
+    #tabbrowser-tabs[closebuttons="activetab"] {
+      --uc-close-button-size: 20px;
+      --uc-close-button-padding: 4px;
+    }
+    .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy])
+      .tab-close-button {
+      display: flex !important;
+      display: -moz-box !important;
+      order: -1 !important;
+      -moz-box-ordinal-group: 0 !important;
+      /* Looks like hover */
+      width: var(--uc-close-button-size) !important;
+      height: var(--uc-close-button-size) !important;
+      padding: var(--uc-close-button-padding) !important;
+      margin-inline: var(--uc-close-button-margin) !important;
+    }
+    .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-icon-stack {
+      width: 0 !important;
+      position: absolute;
+      bottom: 8px;
+    }
+    .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover .tab-icon-image {
+      display: none !important;
+    }
+    @media -moz-pref("userChrome.tab.close_button_at_pinned.always") {
+      .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button {
+        display: flex !important;
+        display: -moz-box !important;
+        order: -1 !important;
+        -moz-box-ordinal-group: 0 !important;
+        /* Looks like hover */
+        width: var(--uc-close-button-size) !important;
+        height: var(--uc-close-button-size) !important;
+        padding: var(--uc-close-button-padding) !important;
+        margin-inline: var(--uc-close-button-margin) !important;
+      }
+      .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-icon-stack {
+        width: 0 !important;
+        position: absolute;
+        bottom: 8px;
+      }
+      .tabbrowser-tab[pinned][visuallyselected] .tab-icon-image {
+        display: none !important;
+      }
+    }
+    @media -moz-pref("userChrome.tab.close_button_at_pinned.background") {
+      .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button {
+        display: flex !important;
+        display: -moz-box !important;
+        order: -1 !important;
+        -moz-box-ordinal-group: 0 !important;
+        /* Looks like hover */
+        width: var(--uc-close-button-size) !important;
+        height: var(--uc-close-button-size) !important;
+        padding: var(--uc-close-button-padding) !important;
+        margin-inline: var(--uc-close-button-margin) !important;
+      }
+      .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-icon-stack {
+        width: 0 !important;
+        position: absolute;
+        bottom: 8px;
+      }
+      .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover .tab-icon-image {
+        display: none !important;
+      }
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy])
+      .tab-close-button {
+      margin-inline-end: var(--uc-close-button-margin) !important;
+    }
+  }
+}
+/** Clipped tabs - Always show tab icon ***************************************/
+@media -moz-pref("userChrome.tab.always_show_tab_icon") {
+  .tab-icon-image:not([src], [pinned], [crashed], [busy]) {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+}
+/*= Sound Tab ================================================================*/
+/*= Sound Tab - Hide Label ===================================================*/
+@media -moz-pref("userChrome.tab.sound_hide_label") {
+  @media not -moz-pref("userChrome.tab.sound_show_label") {
+    .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) {
+      display: none !important;
+    }
+  }
+}
+/*= Sound Tab - Show Label ===================================================*/
+@media -moz-pref("userChrome.tab.sound_show_label") {
+  .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+}
+/*= Sound Tab - Show with Favicons ===========================================*/
+@media -moz-pref("userChrome.tab.sound_with_favicons") {
+  /* Makes the favicons always visible (also on hover) */
+  .tab-icon-image:not([pinned]) {
+    opacity: 1 !important;
+  }
+  /* Makes the speaker icon to always appear if the tab is playing (not only on hover) */
+  .tabbrowser-tab {
+    --uc-sound-tab-icon-position-x-default: -0.5px;
+    --uc-sound-tab-icon-position-x: var(--uc-sound-tab-icon-position-x-default);
+    --uc-sound-tab-icon-position-y: -6px;
+  }
+  .tabbrowser-tab:-moz-locale-dir(rtl) {
+    --uc-sound-tab-icon-position-x: calc(-1 * var(--uc-sound-tab-icon-position-x-default));
+  }
+  @media -moz-pref("userChrome.tab.sound_with_favicons.on_center") {
+    .tabbrowser-tab:not([pinned]) {
+      --uc-sound-tab-icon-position-x-default: 7px;
+      --uc-sound-tab-icon-position-y: -1px;
+    }
+  }
+  .tab-icon-overlay:not([crashed]),
+  .tab-icon-overlay[pinned][crashed][selected] {
+    /* Position */
+    top: 0 !important;
+    inset-inline-end: -9px !important;
+    z-index: 1 !important;
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(var(--uc-sound-tab-icon-position-y));
+    /* Shape */
+    padding: 1.5px !important;
+    border-radius: 10px !important;
+    width: 17px !important;
+    height: 17px !important;
+  }
+  .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    -moz-context-properties: fill, fill-opacity, stroke !important;
+    fill: currentColor !important;
+    border: none !important;
+  }
+  .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+    stroke: var(--tab-icon-overlay-stroke, light-dark(white, black));
+    color: var(--tab-icon-overlay-fill, light-dark(black, white));
+  }
+  .tab-icon-overlay:not([crashed])[soundplaying] {
+    list-style-image: url("./icons/tab-audio-playing-small.svg");
+  }
+  .tab-icon-overlay:not([crashed])[muted] {
+    list-style-image: url("./icons/tab-audio-muted-small.svg");
+  }
+  .tab-icon-overlay:not([crashed])[activemedia-blocked] {
+    list-style-image: url("./icons/tab-audio-blocked-small.svg");
+  }
+  .tab-icon-overlay:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    /* Color */
+    color: currentColor !important;
+    stroke: transparent !important;
+    background: transparent !important;
+    fill-opacity: 0.8 !important;
+    opacity: 1 !important;
+  }
+  .tab-audio-button:not([crashed]),
+  .tab-audio-button[pinned][crashed][selected] {
+    /* Position */
+    margin-inline-start: -8px !important;
+    margin-inline-end: -4px !important;
+    z-index: 1 !important;
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(var(--uc-sound-tab-icon-position-y));
+    /* Shape */
+    --button-size-icon-small: 17px !important;
+    --button-min-height-small: 17px !important;
+    --button-border-radius: 100% !important;
+    width: 17px !important;
+    height: 17px !important;
+    border-radius: 100%;
+    overflow: clip;
+    --button-text-color-ghost-hover: light-dark(white, black);
+    --button-background-color-ghost-hover: light-dark(black, white);
+  }
+  .tab-audio-button:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    display: flex !important;
+    fill-opacity: 0.8 !important;
+    opacity: 1 !important;
+  }
+  /* Label */
+  @media not -moz-pref("userChrome.hidden.tab_icon") {
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container {
+      --uc-sound-tab-label-position-x-default: 4px;
+    }
+    @media -moz-pref("userChrome.tab.sound_with_favicons.on_center") {
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container {
+        --uc-sound-tab-label-position-x-default: 8px;
+      }
+    }
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container[labeldirection="ltr"],
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+      --uc-sound-tab-label-position-x: var(--uc-sound-tab-label-position-x-default);
+    }
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container[labeldirection="rtl"],
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+      --uc-sound-tab-label-position-x: calc(-1 * var(--uc-sound-tab-label-position-x-default));
+    }
+    .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+      .tab-label-container
+      > * {
+      transform: translateX(var(--uc-sound-tab-label-position-x));
+    }
+  }
+  @media -moz-pref("userChrome.hidden.tab_icon") {
+    @media not -moz-pref("userChrome.hidden.tab_icon.always") {
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container {
+        --uc-sound-tab-label-position-x-default: 4px;
+      }
+      @media -moz-pref("userChrome.tab.sound_with_favicons.on_center") {
+        .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+          .tab-label-container {
+          --uc-sound-tab-label-position-x-default: 8px;
+        }
+      }
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container[labeldirection="ltr"],
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+        --uc-sound-tab-label-position-x: var(--uc-sound-tab-label-position-x-default);
+      }
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container[labeldirection="rtl"],
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+        --uc-sound-tab-label-position-x: calc(-1 * var(--uc-sound-tab-label-position-x-default));
+      }
+      .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container
+        > * {
+        transform: translateX(var(--uc-sound-tab-label-position-x));
+      }
+    }
+  }
+  /* Animate */
+  @media (prefers-reduced-motion: no-preference) {
+    .tab-icon-overlay:not([crashed]),
+    .tab-icon-overlay[pinned][crashed][selected] {
+      transition: 0.1s var(--animation-easing-function);
+    }
+    .tab-label-container > * {
+      transition: transform 0.25s var(--animation-easing-function);
+    }
+  }
+  /* None exist favicon - Size bigger */
+  @media not -moz-pref("userChrome.tab.always_show_tab_icon") {
+    .tabbrowser-tab .tab-label-container[labeldirection="ltr"],
+    .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+      --uc-sound-tab-no-icon-position-x: -0.5px;
+      --uc-sound-tab-no-icon-label-position-x: 3px;
+    }
+    .tabbrowser-tab .tab-label-container[labeldirection="rtl"],
+    .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+      --uc-sound-tab-no-icon-position-x: 0.5px;
+      --uc-sound-tab-no-icon-label-position-x: -3px;
+    }
+    @media not -moz-pref("userChrome.hidden.tab_icon") {
+      .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) {
+        transform: translateX(var(--uc-sound-tab-no-icon-position-x)) translateY(-1px);
+        inset-inline-end: 0 !important;
+        margin-inline-end: 0 !important;
+        padding: 0 !important;
+      }
+      .tabbrowser-tab:not([image]):is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) {
+        opacity: 0 !important; /* Favicon hidden */
+      }
+      .tabbrowser-tab:not([image]):not([image]):not([pinned], [sharing], [crashed]):is(
+          [soundplaying],
+          [muted],
+          [activemedia-blocked]
+        )
+        .tab-label-container
+        > * {
+        transform: translateX(var(--uc-sound-tab-no-icon-label-position-x));
+      }
+    }
+    @media -moz-pref("userChrome.hidden.tab_icon") {
+      @media not -moz-pref("userChrome.hidden.tab_icon.always") {
+        .tabbrowser-tab .tab-icon-overlay:not([pinned], [sharing], [crashed]) {
+          transform: translateX(var(--uc-sound-tab-no-icon-position-x)) translateY(-1px);
+          inset-inline-end: 0 !important;
+          margin-inline-end: 0 !important;
+          padding: 0 !important;
+        }
+        .tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) {
+          opacity: 0 !important; /* Favicon hidden */
+        }
+        .tabbrowser-tab:not([image]):not([pinned], [sharing], [crashed]):is(
+            [soundplaying],
+            [muted],
+            [activemedia-blocked]
+          )
+          .tab-label-container
+          > * {
+          transform: translateX(var(--uc-sound-tab-no-icon-label-position-x));
+        }
+      }
+    }
+  }
+  /* Busy - Show */
+  .tab-throbber[busy],
+  .tab-icon-pending[busy] {
+    opacity: 1 !important;
+  }
+  /* Busy - Overlay Position */
+  .tabbrowser-tab:not([pinned])[busy] .tab-icon-overlay:is([soundplaying], [muted], [activemedia-blocked]) {
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(-6px);
+  }
+  .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed])[busy] {
+    inset-inline-end: -9px !important;
+    margin-inline-end: 9.5px !important;
+    padding: 1.5px !important;
+  }
+  /* Hover */
+  .tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  .tab-icon-overlay:not([crashed])[muted]:hover,
+  .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover {
+    color: var(--toolbar-bgcolor, white) !important;
+    stroke: var(--lwt-tab-text, var(--toolbar-color)) !important;
+    background-color: var(--lwt-tab-text, var(--toolbar-color)) !important;
+    fill-opacity: 0.95 !important;
+  }
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[muted]:hover,
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover {
+    color: var(--toolbar-bgcolor, black) !important;
+  }
+  .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]):hover {
+    padding: 0 !important;
+  }
+}
+/*= PictureInPicture Tab - Show PIP Icon =====================================*/
+@media -moz-pref("userChrome.tab.pip") {
+  #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after,
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab[pictureinpicture]:not([pinned], :hover)
+    .tab-content::after {
+    content: "";
+  }
+  .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after {
+    /* Shape */
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+    width: 14px;
+    height: 14px;
+    background-size: 14px;
+    order: 1 !important;
+    -moz-box-ordinal-group: 1 !important;
+    /* Color */
+    fill: currentColor;
+    opacity: 0.8;
+    -moz-context-properties: fill;
+    /* Icon */
+    background-image: url("chrome://global/skin/media/picture-in-picture-open.svg");
+  }
+  .tabbrowser-tab[pictureinpicture]:not([pinned])[selected] .tab-content::after {
+    opacity: 0.95;
+  }
+  /* Close Button's position */
+  .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
+    order: 2 !important;
+    -moz-box-ordinal-group: 2 !important;
+  }
+  #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
+    margin-left: 7px !important;
+  }
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    .tabbrowser-tab[pictureinpicture]:not([pinned]):hover
+    .tab-close-button {
+    margin-left: 2px !important;
+  }
+}
+/*= Container Tab - Color line at icon's bottom ==============================*/
+@media -moz-pref("userChrome.tab.container") {
+  @media not -moz-pref("userChrome.tabbar.as_titlebar") {
+    @media not -moz-pref("userChrome.tab.photon_like_contextline") {
+      .tab-context-line {
+        display: none;
+      }
+    }
+    #tabbrowser-tabs {
+      --uc-container-position-x: 9px;
+      --uc-container-position-y-default: 11.5px;
+      --uc-container-position-y-bottom: calc(50% + var(--uc-container-position-y-default));
+      --uc-container-position-y: var(--uc-container-position-y-bottom);
+      --uc-titlechanged-container-position-x: 32%, 50%, 70%;
+    }
+    #tabbrowser-tabs:-moz-locale-dir(rtl) {
+      --uc-container-position-x: -9px;
+    }
+    @media -moz-pref("userChrome.tab.container.on_top") {
+      #tabbrowser-tabs {
+        --uc-container-position-y: calc(var(--uc-container-position-y-bottom) * -1);
+      }
+    }
+    :root[uidensity="compact"] #tabbrowser-tabs {
+      --uc-container-position-y-default: 10.5px;
+      --uc-titlechanged-container-position-x: 30%, 50%, 70%;
+    }
+    :root[uidensity="touch"] #tabbrowser-tabs {
+      --uc-container-position-y-default: 12.5px;
+    }
+    .tab-content::before {
+      /* Box Model */
+      content: "";
+      display: block;
+      position: absolute;
+      top: 50%;
+      transform: translate(var(--uc-container-position-x), var(--uc-container-position-y));
+      /* Shape */
+      border-bottom: 2px solid var(--identity-icon-color);
+      width: calc(100% - 30px);
+      opacity: 0.75;
+    }
+    .tabbrowser-tab[visuallyselected] .tab-content::before {
+      opacity: 1;
+    }
+    @media not -moz-pref("userChrome.tab.container.always_long") {
+      .tab-content::before {
+        width: 25%;
+      }
+      .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before {
+        width: calc(100% - 30px);
+      }
+      #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before {
+        width: calc(100% - 33px);
+      }
+    }
+    /* Animate */
+    @media (prefers-reduced-motion: no-preference) {
+      .tab-content:not([titlechanged])::before {
+        transition: 0.15s var(--animation-easing-function);
+        transition-property: width, opacity;
+      }
+    }
+    /* Pinned Tab */
+    .tabbrowser-tab[pinned] .tab-content::before {
+      transform: translateY(var(--uc-container-position-y));
+      width: 16px;
+    }
+    @media -moz-pref("userChrome.tab.close_button_at_pinned") {
+      .tabbrowser-tab[pinned][visuallyselected]:not([busy]):hover .tab-content::before {
+        opacity: 0;
+      }
+    }
+    @media not -moz-pref("userChrome.tab.container.on_top") {
+      .tabbrowser-tab:is([image], [pinned])[usercontextid]
+        > .tab-stack
+        > .tab-content[attention]:not([selected])::before,
+      .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before {
+        opacity: 0;
+      }
+      /* Pinned Tab - Titlechanged Indicator override */
+      .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected]),
+      .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+        /* Original: radial-gradient(circle, var(--attention-icon-color), var(--attention-icon-color) 2px, transparent 2px); */
+        --dotted-identity-image: radial-gradient(
+          circle,
+          var(--identity-icon-color),
+          var(--identity-icon-color) 2px,
+          transparent 2px
+        );
+        background-image: var(--dotted-identity-image), var(--dotted-identity-image), var(--dotted-identity-image) !important;
+        background-position-x: var(--uc-titlechanged-container-position-x) !important;
+      }
+      .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
+      .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+        /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */
+        background-position-y: top var(--uc-container-position-y) !important;
+      }
+      /* Pinned Tab - Titlechanged & soundplaying */
+      .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+        > .tab-stack
+        > .tab-content[attention]:not([selected]),
+      .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+        > .tab-stack
+        > .tab-content[pinned][titlechanged]:not([selected]) {
+        --uc-titlechanged-container-position-x: calc(32% - 1px), calc(50% - 1px), calc(70% - 1px);
+      }
+      :root[uidensity="compact"]
+        .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+        > .tab-stack
+        > .tab-content[attention]:not([selected]),
+      :root[uidensity="compact"]
+        .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+        > .tab-stack
+        > .tab-content[pinned][titlechanged]:not([selected]) {
+        --uc-titlechanged-container-position-x: calc(30% - 1px), calc(50% - 1px), calc(70% - 1px);
+      }
+    }
+    @media -moz-pref("userChrome.tab.container.on_top") {
+      .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
+      .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+        /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */
+        background-position-y: top var(--uc-container-position-y-bottom) !important;
+      }
+    }
+  }
+}
+/*= Crashed Tab - Don't show Favicons ========================================*/
+@media -moz-pref("userChrome.tab.crashed") {
+  .tab-icon-image[crashed] {
+    display: none !important;
+  }
+}
+/** Nav Bar UI ****************************************************************/
+/*= Nav Bar - Navbar comabine with sidebar===================================*/
+@media -moz-pref("userChrome.navbar.as_sidebar") {
+  :root {
+    --uc-navbar-margin-block: var(--toolbarbutton-inner-padding);
+    --uc-urlbar-margin-top: calc(var(--uc-navbar-height) + var(--uc-navbar-margin-block));
+    --uc-urlbar-container-height: 36px;
+    --uc-navbar-sideblock-height: calc(var(--uc-urlbar-margin-top) + var(--uc-urlbar-container-height));
+  }
+  #nav-bar,
+  #sidebar-box,
+  #sidebar-header,
+  #sidebar {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  #nav-bar,
+  #wrapper-urlbar-container,
+  #urlbar-container {
+    position: absolute !important;
+  }
+  #nav-bar-customization-target {
+    justify-content: space-between;
+    -moz-box-pack: justify;
+  }
+  #nav-bar {
+    z-index: 1;
+    margin-top: calc(
+      var(--uc-tabbar-height) + var(--uc-bm-height) + var(--uc-menubar-height) + var(--uc-navbar-margin-block)
+    );
+    overflow-y: visible !important;
+    background: none !important;
+    box-shadow: none !important;
+    -moz-window-dragging: drag;
+  }
+  @supports selector(:has(a)) {
+    :root:has(#sidebar-box[hidden="true"]) #nav-bar {
+      margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+      opacity: 0;
+      visibility: hidden;
+    }
+    :root:has(#sidebar-box[positionend]) #nav-bar {
+      right: 0;
+    }
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    @media -moz-pref("userChrome.decoration.animate") {
+      @media not -moz-pref("userChrome.decoration.disable_sidebar_animate") {
+        #nav-bar {
+          transition: margin-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out,
+            visibility 0s linear,
+            margin-top var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            var(--ext-theme-background-transition) !important;
+          will-change: margin-inline-start, opacity, visibility, margin-top;
+        }
+        :root:has(#sidebar-box[hidden="true"]) #nav-bar,
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar {
+          transition-delay: 0s, 0s, 0.25s, 0s, 0s !important;
+        }
+      }
+      @media -moz-pref("userChrome.decoration.disable_sidebar_animate") {
+        #nav-bar {
+          transition: margin-top var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            var(--ext-theme-background-transition) !important;
+          will-change: margin-top;
+        }
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar {
+          transition-delay: 0s !important;
+        }
+      }
+    }
+  }
+  #urlbar-container {
+    top: var(--uc-urlbar-margin-top);
+    min-width: calc(var(--uc-sidebar-activate-width) - 2 * var(--toolbarbutton-inner-padding)) !important;
+    margin-inline: auto !important; /* Original: var(--urlbar-margin-inline) */
+    left: 50%;
+    transform: translateX(-50%);
+  }
+  #customizableui-special-spring1,
+  #customizableui-special-spring2,
+  #wrapper-customizableui-special-spring1,
+  #wrapper-customizableui-special-spring2 {
+    display: none !important;
+  }
+  #sidebar-header {
+    margin-top: var(--uc-navbar-sideblock-height) !important;
+    -moz-window-dragging: drag;
+  }
+  :root[customizing="true"] #wrapper-urlbar-container {
+    left: 50%;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] {
+    visibility: visible !important;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #appcontent {
+    visibility: collapse;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #sidebar-box {
+    position: absolute;
+    height: 100%;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #sidebar-box[positionend] {
+    right: 0;
+  }
+  :root[customizing="true"] #customization-container {
+    --uc-customization-conatiner-margin: var(--uc-navbar-height-default);
+    width: calc(100% - var(--uc-sidebar-activate-width));
+    height: calc(100% - var(--uc-customization-conatiner-margin));
+  }
+  @media -moz-pref("userChrome.hidden.tabbar") {
+    :root[customizing="true"] #customization-container {
+      --uc-customization-conatiner-margin: calc(var(--uc-navbar-height-default) - var(--uc-tabbar-height-default));
+    }
+  }
+  :root[customizing="true"]:has(#sidebar-box:not([positionend])) #customization-container {
+    margin-inline-start: var(--uc-sidebar-activate-width);
+  }
+  :root[customizing="true"]:has(#sidebar-box[positionend]) #customization-container {
+    margin-inline-end: var(--uc-sidebar-activate-width);
+  }
+  :root[customizing="true"] #customization-palette-container,
+  :root[customizing="true"] #customization-panel-container {
+    flex-shrink: 0.5 !important;
+  }
+}
+/** Bookark Bar UI ************************************************************/
+@media -moz-pref("userChrome.bookmarkbar.multi_row") {
+  #PersonalToolbar {
+    --uc-multirow-bookmark-rows: 3;
+    --uc-multirow-bookmark-row-margin: 2px;
+    max-height: none !important;
+    height: unset !important;
+  }
+  #PlacesToolbar > hbox {
+    display: block;
+    width: 100vw;
+  }
+  #PlacesToolbarItems {
+    display: flex;
+    flex-wrap: wrap;
+    overflow-y: auto;
+    scroll-snap-type: y mandatory;
+    max-height: calc(
+      var(--uc-multirow-bookmark-rows) *
+        (
+          var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + 2 *
+            var(--uc-multirow-bookmark-row-margin)
+        )
+    ) !important;
+  }
+  #PlacesChevron {
+    display: none;
+  }
+  #PlacesToolbarItems > .bookmark-item {
+    scroll-snap-align: start;
+    margin-block: var(--uc-multirow-bookmark-row-margin) !important;
+  }
+}
+/** Url View UI ***************************************************************/
+/*= Url Bar - Icon box as Separator ==========================================*/
+@media -moz-pref("userChrome.urlbar.iconbox_with_separator") {
+  #identity-box {
+    /* separator */
+    position: relative;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:not(:hover, [open]),
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:not(:hover, [open]),
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:not(:hover, [open]) {
+    /* remove background from urlbar box */
+    background-color: transparent !important;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:not(:hover, [open])::after,
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:not(:hover, [open])::after,
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:not(:hover, [open])::after {
+    opacity: 0.375;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button::after,
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button::after,
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button::after {
+    /* Box Model */
+    content: "";
+    position: absolute;
+    display: block;
+    /* Position */
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    /* Bar shape */
+    width: 1px;
+    height: 1em;
+    /* Bar Color */
+    opacity: 0;
+    background-color: currentColor;
+  }
+  #identity-box[pageproxystate="valid"] #identity-icon-label {
+    /* increase space between icon and text - as identity box padding */
+    padding-inline-start: 8px !important;
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    .identity-box-button::after {
+      transition: opacity 0.2s var(--animation-easing-function);
+    }
+  }
+}
+/*= Url View - Share Layout ==================================================*/
+@media -moz-pref("userChrome.urlView.as_commandbar") or -moz-pref("userChrome.urlView.full_width_padding") {
+  .urlbarView {
+    --uc-urlView-padding: calc(5px + var(--urlbar-container-padding));
+    margin-inline: 0 !important; /* Original: calc(5px + var(--urlbar-container-padding)) */
+  }
+}
+/*= Url View - Looks like Launcher ===========================================*/
+@media -moz-pref("userChrome.urlView.as_commandbar") {
+  /* Init & Base Layout */
+  .urlbarView {
+    --urlbarView-favicon-width: 32px; /* Original: 16px */
+    --uc-urlView-typeIcon-size: 18px;
+    --uc-urlView-icon-size-differ: 14px;
+    --uc-searchBar-icon-size: 20px;
+    --uc-searchBar-button-size: 32px;
+    --uc-urlView-row-padding: 8px;
+    --uc-urlView-row-bottom: 2px;
+    --uc-urlView-margin: calc(var(--uc-sidebar-activate-width, 18rem) + var(--toolbarbutton-inner-padding));
+    position: fixed !important;
+    left: 50vw;
+    transform: translateX(-50%);
+    top: 12vh !important;
+    width: calc(100vw - (var(--uc-urlView-margin) + var(--toolbarbutton-inner-padding))) !important;
+    /* paddding as margin */
+    /* background */
+    background-color: var(--toolbar-field-focus-background-color) !important;
+    background-clip: border-box;
+    border: 1px solid var(--arrowpanel-border-color) !important;
+    border-radius: var(--toolbarbutton-border-radius) !important;
+    box-shadow: 0 2px 14px rgba(0, 0, 0, 0.13);
+  }
+  @media not -moz-pref("userChrome.urlView.full_width_padding") {
+    .urlbarView {
+      padding-inline: var(--uc-urlView-padding) !important;
+    }
+  }
+  .urlbarView-body-inner {
+    border-top: none !important;
+  }
+  /* Big icons */
+  :root[uidensity="compact"] .urlbarView {
+    --urlbarView-favicon-width: 24px; /* Original: 16px */
+    --uc-urlView-typeIcon-size: 16px;
+    --uc-urlView-icon-size-differ: 8px;
+    --uc-searchBar-icon-size: 18px;
+    --uc-searchBar-button-size: 30px;
+  }
+  :root[uidensity="touch"] .urlbarView {
+    --uc-urlView-row-padding: 17px;
+    --uc-urlView-row-bottom: 11px;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) {
+    position: relative;
+    min-height: calc(var(--urlbarView-favicon-width) + var(--uc-urlView-row-padding)) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-row-inner {
+    height: var(--urlbarView-favicon-width) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-favicon {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-title {
+    padding-inline-start: calc(
+      var(--urlbarView-item-inline-padding) + var(--identity-box-margin-inline) + var(--urlbarView-favicon-width)
+    ) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-type-icon {
+    width: var(--uc-urlView-typeIcon-size) !important;
+    height: var(--uc-urlView-typeIcon-size) !important;
+    margin-inline-start: calc(
+      var(--uc-urlView-icon-size-differ) + var(--urlbarView-item-inline-padding)
+    ) !important; /* Original: 8px */
+    bottom: var(--uc-urlView-row-bottom);
+  }
+  .urlbarView-row[dynamicType="quickactions"] .urlbarView-favicon-img {
+    width: var(--urlbarView-favicon-width) !important; /* Original: 16px */
+    height: var(--urlbarView-favicon-width) !important; /* Original: 16px */
+  }
+  .urlbarView-row[dynamicType="quickactions"] .urlbarView-label {
+    font-size: 0.95em !important; /* Original: 11px */
+  }
+  :root[uidensity="touch"] .urlbarView-row {
+    padding-block: 6px !important;
+  }
+  :root[uidensity="touch"] .urlbarView-row-inner {
+    padding-block: 11px !important;
+  }
+  #urlbar .searchbar-engine-one-off-item {
+    min-width: var(--uc-searchBar-button-size) !important; /* Original: 28px */
+    height: var(--uc-searchBar-button-size) !important;
+  }
+  #urlbar .searchbar-engine-one-off-item > .button-box > .button-icon {
+    width: var(--uc-searchBar-icon-size) !important; /* Original: 16px */
+    height: var(--uc-searchBar-icon-size) !important;
+  }
+}
+/*= Url View - Full Width Pddding ============================================*/
+@media -moz-pref("userChrome.urlView.full_width_padding") {
+  .urlbarView {
+    --uc-urlView-padding-double: calc(var(--uc-urlView-padding) * 2);
+    --uc-urlView-full-width-padding: var(--uc-urlView-padding-double);
+  }
+  @media not -moz-pref("userChrome.urlView.as_commandbar") {
+    .urlbarView {
+      --uc-urlView-full-width-padding: var(--uc-urlView-padding);
+      width: 100% !important;
+    }
+  }
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner {
+    border-color: transparent !important;
+  }
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner::before {
+    content: "";
+    position: absolute;
+    border-top: 1px solid var(--autocomplete-popup-separator-color);
+    transform: translate(-50%, -1px);
+    left: 50%;
+  }
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner::before,
+  .urlbarView .search-one-offs {
+    width: calc(100% + 2px - var(--uc-urlView-padding-double)) !important;
+  }
+  .urlbarView .search-one-offs {
+    margin-inline: var(--uc-urlView-full-width-padding) !important;
+  }
+  .urlbarView-row-inner {
+    padding-inline: calc(var(--uc-urlView-full-width-padding) + var(--urlbarView-item-inline-padding)) !important;
+  }
+}
+/*= Url View - Always show page actions ======================================*/
+@media -moz-pref("userChrome.urlbar.always_show_page_actions") {
+  #urlbar:not([breakout-extend="true"]) #pageActionButton {
+    display: block !important;
+    visibility: visible !important;
+  }
+}
+/*= Url View - Move icon to left =============================================*/
+@media -moz-pref("userChrome.urlView.move_icon_to_left") {
+  .urlbarView-type-icon {
+    min-width: 16px !important;
+    height: 16px !important;
+    margin-block: 0 !important;
+    margin-inline-start: 0 !important;
+  }
+  .urlbarView-favicon {
+    margin-inline-start: 20px !important;
+  }
+}
+/*= Url View - Go button when typing =========================================*/
+@media -moz-pref("userChrome.urlView.go_button_when_typing") {
+  #urlbar-input-container[pageproxystate="invalid"] #urlbar-go-button {
+    display: block !important;
+  }
+}
+/*= Url View - Item Focus Border =============================================*/
+@media -moz-pref("userChrome.urlView.focus_item_border") {
+  .urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner,
+  .urlbarView-row-inner[selected] {
+    box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important;
+  }
+}
+/** Panel UI ******************************************************************/
+@media -moz-pref("userChrome.panel.remove_strip") {
+  #appMenu-fxa-separator {
+    --panel-separator-zap-gradient: none; /* Original: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%) */
+  }
+}
+@media -moz-pref("userChrome.panel.full_width_separator") {
+  /* Full width separators */
+  :root {
+    /* Original
+    --panel-separator-margin-vertical: 4px;
+    --panel-separator-margin-horizontal: 8px;
+    --panel-separator-margin: var(--panel-separator-margin-vertical) var(--panel-separator-margin-horizontal);
+     */
+    --panel-separator-margin-horizontal: 0 !important;
+  }
+}
+@media -moz-pref("userChrome.panel.full_width_padding") {
+  /* Original
+  --arrowpanel-menuitem-margin: 0 8px;
+  --arrowpanel-menuitem-padding-block: 8px;
+  --arrowpanel-menuitem-padding-inline: 8px;
+  --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline);
+  */
+  :root,
+  :root:is([uidensity="compact"], [uidensity="touch"]) {
+    --arrowpanel-menuitem-margin: 0 !important;
+    --arrowpanel-menuitem-margin-inline: 0 !important;
+    --arrowpanel-menuitem-padding-inline: calc(var(--arrowpanel-menuitem-padding-block) + 8px) !important;
+  }
+}
+/** Sidebar UI ****************************************************************/
+@media -moz-pref("userChrome.sidebar.overlap") or -moz-pref("userChrome.autohide.sidebar") or -moz-pref("userChrome.navbar.as_sidebar") {
+  :root {
+    /* Original
+     min-width: 14em;
+     width: 18em;
+     max-width: 36em;
+    */
+    --uc-sidebar-width: 40px;
+    --uc-sidebar-activate-width: 18rem;
+    --uc-sidebar-activate-width-reverse: calc(-1 * var(--uc-sidebar-activate-width));
+    --uc-sidebar-fullscreen-width: 4px;
+    --uc-sidebar-shadow-size: 1px;
+    --uc-sidebar-shadow-width: 0px;
+    --uc-sidebar-shadow-position: var(--uc-sidebar-shadow-position-default);
+    --uc-sidebar-shadow-position-default: calc(var(--uc-sidebar-shadow-size) + var(--uc-sidebar-shadow-width));
+    --uc-sidebar-shadow-color: #28282f;
+    --uc-autohide-sidebar-speed: 750ms;
+    --uc-autohide-fullscreen-sidebar-speed: 1s;
+    --uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */
+  }
+  #sidebar-splitter {
+    display: none !important;
+  }
+}
+@media -moz-pref("userChrome.sidebar.overlap") or -moz-pref("userChrome.autohide.sidebar") {
+  #sidebar-box {
+    --uc-sidebar-shadow-color: #28282f;
+    z-index: var(--browser-area-z-index-sidebar-splitter, 3) !important;
+    position: relative !important;
+    box-shadow: var(--uc-sidebar-shadow-position) 0px 15px -10px var(--uc-sidebar-shadow-color);
+  }
+  #sidebar-box[positionend] {
+    --uc-sidebar-shadow-position: calc(-1 * var(--uc-sidebar-shadow-position-default));
+  }
+  #sidebar {
+    display: block;
+  }
+  #main-window > body > box {
+    z-index: 2 !important;
+  }
+}
+@media -moz-pref("userChrome.sidebar.overlap") {
+  #sidebar-box[positionend] {
+    direction: rtl;
+  }
+  #sidebar-header,
+  #sidebar {
+    background-color: var(--sidebar-background-color) !important;
+    color: var(--sidebar-text-color) !important;
+    overflow: hidden;
+  }
+  #sidebar-header {
+    font-size: unset !important;
+  }
+  #sidebar-header > #sidebar-switcher-target {
+    font-size: 1.333em;
+  }
+  @media not -moz-pref("userChrome.autohide.sidebar") {
+    #sidebar-box,
+    #sidebar-header,
+    #sidebar {
+      min-width: var(--uc-sidebar-activate-width) !important;
+      max-width: var(--uc-sidebar-activate-width) !important;
+    }
+    #sidebar-box {
+      margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+      will-change: padding-inline;
+      --uc-sidebar-shadow-width: var(--uc-sidebar-activate-width);
+    }
+    #sidebar-box:not([hidden="true"]) {
+      padding-inline-start: var(--uc-sidebar-activate-width) !important;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #sidebar-box {
+        transition: padding-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out,
+          box-shadow 0s linear, visibility 0s linear !important;
+      }
+    }
+  }
+}
+/** Combined UI ***************************************************************/
+/*= Combined - At URL bar ====================================================*/
+@media -moz-pref("userChrome.combined.nav_button") or -moz-pref("userChrome.combined.nav_button.home_button") or -moz-pref("userChrome.combined.urlbar.nav_button") or -moz-pref("userChrome.combined.urlbar.home_button") or -moz-pref("userChrome.combined.urlbar.reload_button") {
+  #nav-bar {
+    --uc-combined-circlebutton-background: hsla(0, 100%, 100%, 0.5);
+    --uc-combined-circlebutton-hover-background: var(--uc-combined-circlebutton-background);
+    --uc-combined-circlebutton-active-background: var(--toolbarbutton-active-background);
+    --uc-combined-circlebutton-border-color: hsla(240, 5%, 5%, 0.3);
+    --uc-toolbarbutton-boundary: calc(var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding));
+    --uc-toolbarbutton-padding: calc(2 * var(--uc-toolbarbutton-boundary));
+    --uc-toolbarbutton-size: calc(12px + var(--uc-toolbarbutton-padding));
+    --uc-toolbarbutton-halfsize: calc(6px + var(--uc-toolbarbutton-boundary));
+    --uc-urlbar-icon-size: calc(16px + 2 * var(--urlbar-icon-padding));
+  }
+  #nav-bar[brighttext] {
+    --uc-combined-circlebutton-background: var(--toolbarbutton-hover-background);
+    --uc-combined-circlebutton-hover-background: var(--toolbarbutton-active-background);
+    --uc-combined-circlebutton-active-background: color-mix(in srgb, currentColor 20%, transparent);
+  }
+  #nav-bar-customization-target > * {
+    order: 1;
+    -moz-box-ordinal-group: 1;
+  }
+  #nav-bar-customization-target > #urlbar-container {
+    order: 5;
+    -moz-box-ordinal-group: 5;
+  }
+  #nav-bar-customization-target > #urlbar-container ~ * {
+    order: 7;
+    -moz-box-ordinal-group: 7;
+  }
+}
+@media -moz-pref("userChrome.combined.urlbar.nav_button") or -moz-pref("userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #urlbar-container {
+    /* var(--urlbar-margin-inline) */
+    margin-inline-start: calc(-1 * var(--uc-urlbar-combined-margin, 0px)) !important;
+  }
+  #nav-bar-customization-target > #urlbar-container > #urlbar:not([breakout][breakout-extend]) {
+    padding-left: var(--uc-urlbar-combined-margin, 0px);
+  }
+  @media -moz-pref("userChrome.combined.urlbar.nav_button") {
+    #nav-bar-customization-target > #urlbar-container {
+      --uc-urlbar-combined-margin: var(--uc-toolbarbutton-size);
+    }
+  }
+  @media not -moz-pref("userChrome.combined.urlbar.nav_button") {
+    #nav-bar-customization-target > #urlbar-container {
+      --uc-urlbar-combined-margin: var(--uc-toolbarbutton-halfsize);
+    }
+    @media -moz-pref("userChrome.combined.nav_button") {
+      @media -moz-pref("userChrome.combined.nav_button.home_button") {
+        @media -moz-pref("userChrome.combined.urlbar.home_button") {
+          #nav-bar-customization-target > #urlbar-container {
+            --uc-urlbar-combined-margin: var(--uc-toolbarbutton-size);
+          }
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.combined.urlbar.nav_button") {
+    @media -moz-pref("userChrome.autohide.forward_button") {
+      #nav-bar-customization-target
+        > #forward-button[disabled="true"]
+        ~ #urlbar-container
+        > #urlbar:not([breakout][breakout-extend]) {
+        padding-left: calc(var(--uc-urlbar-combined-margin, 0px) - var(--urlbar-icon-padding));
+      }
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #nav-bar-customization-target > #forward-button[disabled="true"] ~ #urlbar-container > #urlbar {
+        transition-property: margin-left, padding-left;
+        transition-duration: 0.5s;
+        transition-timing-function: var(--animation-easing-function);
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.combined.nav_button") or -moz-pref("userChrome.combined.urlbar.nav_button") {
+  @media -moz-pref("userChrome.combined.urlbar.nav_button") or ((not -moz-pref("userChrome.combined.sub_button.as_normal")) or (-moz-pref("userChrome.combined.nav_button") and -moz-pref("userChrome.combined.urlbar.home_button"))) {
+    #nav-bar-customization-target > #forward-button {
+      --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px);
+      z-index: 2;
+      position: relative;
+    }
+    #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+      padding-inline-end: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */
+      padding-block: var(--urlbar-icon-padding) !important;
+      height: var(--uc-urlbar-icon-size) !important;
+    }
+    @media -moz-pref("userChrome.combined.urlbar.nav_button") {
+      #nav-bar-customization-target > #forward-button {
+        padding-inline-end: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */
+      }
+    }
+    @media not -moz-pref("userChrome.combined.urlbar.nav_button") {
+      @media not -moz-pref("userChrome.combined.sub_button.none_background") {
+        @media -moz-pref("userChrome.combined.urlbar.home_button") {
+          @media not -moz-pref("userChrome.combined.nav_button.home_button") {
+            #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+              background-color: var(--uc-combined-circlebutton-background);
+            }
+            #nav-bar-customization-target > #forward-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+              background-color: var(--uc-combined-circlebutton-hover-background) !important;
+              box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+              border-color: hsla(240deg, 5%, 5%, 0.35);
+            }
+            #nav-bar-customization-target > #forward-button[open] > .toolbarbutton-icon,
+            #nav-bar-customization-target > #forward-button:not([disabled]):hover:active > .toolbarbutton-icon {
+              background-color: var(--uc-combined-circlebutton-active-background) !important;
+              border-color: hsla(240deg, 5%, 5%, 0.4);
+            }
+            #nav-bar-customization-target > #forward-button[disabled="true"] > .toolbarbutton-icon {
+              background-color: color-mix(
+                in srgb,
+                var(--toolbarbutton-hover-background),
+                var(--toolbar-field-background-color) 40%
+              ) !important;
+              fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+            }
+            @media not -moz-pref("userChrome.autohide.forward_button") {
+              #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
+                opacity: 1 !important; /* Original: 0.4 */
+              }
+            }
+          }
+        }
+        @media not -moz-pref("userChrome.combined.urlbar.home_button") {
+          #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+            background-color: var(--uc-combined-circlebutton-background);
+          }
+          #nav-bar-customization-target > #forward-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+            background-color: var(--uc-combined-circlebutton-hover-background) !important;
+            box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+            border-color: hsla(240deg, 5%, 5%, 0.35);
+          }
+          #nav-bar-customization-target > #forward-button[open] > .toolbarbutton-icon,
+          #nav-bar-customization-target > #forward-button:not([disabled]):hover:active > .toolbarbutton-icon {
+            background-color: var(--uc-combined-circlebutton-active-background) !important;
+            border-color: hsla(240deg, 5%, 5%, 0.4);
+          }
+          #nav-bar-customization-target > #forward-button[disabled="true"] > .toolbarbutton-icon {
+            background-color: color-mix(
+              in srgb,
+              var(--toolbarbutton-hover-background),
+              var(--toolbar-field-background-color) 40%
+            ) !important;
+            fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+          }
+          @media not -moz-pref("userChrome.autohide.forward_button") {
+            #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
+              opacity: 1 !important; /* Original: 0.4 */
+            }
+          }
+        }
+      }
+    }
+    @media not -moz-pref("userChrome.autohide.forward_button") {
+      #nav-bar-customization-target > #forward-button {
+        margin-inline-start: var(--uc-forward-button-margin) !important;
+      }
+    }
+    @media -moz-pref("userChrome.autohide.forward_button") {
+      #nav-bar-customization-target > #forward-button:not([disabled="true"]) {
+        margin-inline-start: var(--uc-forward-button-margin) !important;
+      }
+    }
+  }
+  #nav-bar-customization-target > #back-button {
+    position: relative;
+  }
+  @media not -moz-pref("userChrome.combined.urlbar.home_button") {
+    @media not -moz-pref("userChrome.combined.nav_button.home_button") {
+      #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+        background-color: var(--uc-combined-circlebutton-background);
+      }
+      #nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+        background-color: var(--uc-combined-circlebutton-hover-background) !important;
+        box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+        border-color: hsla(240deg, 5%, 5%, 0.35);
+      }
+      #nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
+      #nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
+        background-color: var(--uc-combined-circlebutton-active-background) !important;
+        border-color: hsla(240deg, 5%, 5%, 0.4);
+      }
+      #nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
+        background-color: color-mix(
+          in srgb,
+          var(--toolbarbutton-hover-background),
+          var(--toolbar-field-background-color) 40%
+        ) !important;
+        fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+      }
+      @media not -moz-pref("userChrome.autohide.back_button") {
+        #nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
+          opacity: 1 !important; /* Original: 0.4 */
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.combined.nav_button.home_button") or -moz-pref("userChrome.combined.urlbar.home_button") {
+    #nav-bar-customization-target > #back-button {
+      z-index: 2;
+    }
+    @media not -moz-pref("userChrome.combined.sub_button.as_normal") {
+      #nav-bar-customization-target > #back-button {
+        margin-inline-end: calc(-1 * var(--uc-toolbarbutton-boundary) - 1px) !important;
+      }
+      @media not -moz-pref("userChrome.combined.sub_button.none_background") {
+        #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+          background-color: var(--uc-combined-circlebutton-background);
+        }
+        #nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+          background-color: var(--uc-combined-circlebutton-hover-background) !important;
+          box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+          border-color: hsla(240deg, 5%, 5%, 0.35);
+        }
+        #nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
+        #nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
+          background-color: var(--uc-combined-circlebutton-active-background) !important;
+          border-color: hsla(240deg, 5%, 5%, 0.4);
+        }
+        #nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
+          background-color: color-mix(
+            in srgb,
+            var(--toolbarbutton-hover-background),
+            var(--toolbar-field-background-color) 40%
+          ) !important;
+          fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+        }
+        @media not -moz-pref("userChrome.autohide.back_button") {
+          #nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
+            opacity: 1 !important; /* Original: 0.4 */
+          }
+        }
+      }
+      #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+        padding-inline-start: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */
+        padding-block: var(--urlbar-icon-padding) !important;
+        height: var(--uc-urlbar-icon-size) !important;
+      }
+    }
+  }
+  @media not -moz-pref("userChrome.combined.nav_button.home_button") {
+    @media -moz-pref("userChrome.combined.urlbar.nav_button") {
+      @media not -moz-pref("userChrome.combined.urlbar.home_button") {
+        #nav-bar-customization-target > #back-button {
+          z-index: 3 !important;
+          background-color: var(--toolbar-bgcolor) !important;
+          background-clip: content-box !important;
+          border-radius: 100%;
+          padding-block: 0 !important;
+        }
+        @media -moz-pref("userChrome.padding.toolbar_button") {
+          @media -moz-pref("userChrome.padding.toolbar_button.compact") {
+            #nav-bar-customization-target > #back-button {
+              --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+            }
+          }
+        }
+        @media not -moz-pref("userChrome.autohide.back_button") {
+          #nav-bar-customization-target > #back-button {
+            padding-inline-end: 0 !important;
+          }
+        }
+        @media -moz-pref("userChrome.autohide.back_button") {
+          #nav-bar-customization-target > #back-button:not([disabled="true"]) {
+            padding-inline-end: 0 !important;
+          }
+          #nav-bar-customization-target > #back-button[disabled="true"] {
+            padding-inline-end: calc(var(--toolbarbutton-outer-padding) + 1px) !important;
+          }
+        }
+        #nav-bar-customization-target > #back-button > menupopup {
+          margin-top: -1px !important;
+        }
+        #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+          background-origin: padding-box;
+          background-clip: padding-box;
+          border: 1px solid var(--uc-combined-circlebutton-border-color);
+          border-radius: 10000px !important;
+          padding-inline-end: var(--urlbar-icon-padding) !important;
+          height: auto !important;
+        }
+      }
+    }
+    @media not -moz-pref("userChrome.combined.urlbar.nav_button") {
+      #nav-bar-customization-target > #back-button {
+        z-index: 3 !important;
+        background-color: var(--toolbar-bgcolor) !important;
+        background-clip: content-box !important;
+        border-radius: 100%;
+        padding-block: 0 !important;
+      }
+      @media -moz-pref("userChrome.padding.toolbar_button") {
+        @media -moz-pref("userChrome.padding.toolbar_button.compact") {
+          #nav-bar-customization-target > #back-button {
+            --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+          }
+        }
+      }
+      @media not -moz-pref("userChrome.autohide.back_button") {
+        #nav-bar-customization-target > #back-button {
+          padding-inline-end: 0 !important;
+        }
+      }
+      @media -moz-pref("userChrome.autohide.back_button") {
+        #nav-bar-customization-target > #back-button:not([disabled="true"]) {
+          padding-inline-end: 0 !important;
+        }
+        #nav-bar-customization-target > #back-button[disabled="true"] {
+          padding-inline-end: calc(var(--toolbarbutton-outer-padding) + 1px) !important;
+        }
+      }
+      #nav-bar-customization-target > #back-button > menupopup {
+        margin-top: -1px !important;
+      }
+      #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+        background-origin: padding-box;
+        background-clip: padding-box;
+        border: 1px solid var(--uc-combined-circlebutton-border-color);
+        border-radius: 10000px !important;
+        padding-inline-end: var(--urlbar-icon-padding) !important;
+        height: auto !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.combined.nav_button") {
+  @media -moz-pref("userChrome.combined.nav_button.home_button") {
+    #nav-bar-customization-target > #home-button {
+      position: relative;
+      z-index: 3 !important;
+      background-color: var(--toolbar-bgcolor) !important;
+      background-clip: content-box !important;
+      border-radius: 100%;
+      padding-block: 0 !important;
+      padding-inline-end: 0 !important;
+    }
+    @media -moz-pref("userChrome.padding.toolbar_button") {
+      @media -moz-pref("userChrome.padding.toolbar_button.compact") {
+        #nav-bar-customization-target > #home-button {
+          --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+        }
+      }
+    }
+    #nav-bar-customization-target > #home-button > menupopup {
+      margin-top: -1px !important;
+    }
+    #nav-bar-customization-target > #home-button > .toolbarbutton-icon {
+      background-color: var(--uc-combined-circlebutton-background);
+      background-origin: padding-box;
+      background-clip: padding-box;
+      border: 1px solid var(--uc-combined-circlebutton-border-color);
+      border-radius: 10000px !important;
+      padding-inline-end: var(--urlbar-icon-padding) !important;
+      height: auto !important;
+    }
+    #nav-bar-customization-target > #home-button:hover > .toolbarbutton-icon {
+      background-color: var(--uc-combined-circlebutton-hover-background) !important;
+      box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+      border-color: hsla(240deg, 5%, 5%, 0.35);
+    }
+    #nav-bar-customization-target > #home-button:hover:active > .toolbarbutton-icon {
+      background-color: var(--uc-combined-circlebutton-active-background) !important;
+      border-color: hsla(240deg, 5%, 5%, 0.4);
+    }
+  }
+}
+@media -moz-pref("userChrome.combined.urlbar.nav_button") {
+  #nav-bar-customization-target > #back-button {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  #nav-bar-customization-target > #forward-button {
+    order: 4;
+    -moz-box-ordinal-group: 4;
+  }
+  @media -moz-pref("userChrome.combined.urlbar.home_button") {
+    #nav-bar-customization-target
+      > :first-child:is(#back-button, #forward-button, #home-button)
+      + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
+    #nav-bar-customization-target
+      > :first-child:is(#back-button, #forward-button, #home-button)
+      + :is(#back-button, #forward-button, #home-button)
+      + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
+    #nav-bar-customization-target
+      > :first-child:is(#back-button, #forward-button, #home-button)
+      + :is(#back-button, #forward-button, #home-button)
+      + :is(#back-button, #forward-button, #home-button)
+      + :is(toolbarbutton, toolbaritem) {
+      padding-inline-start: var(--toolbar-start-end-padding) !important;
+    }
+  }
+  @media not -moz-pref("userChrome.combined.urlbar.home_button") {
+    #nav-bar-customization-target
+      > :first-child:is(#back-button, #forward-button)
+      + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button),
+    #nav-bar-customization-target
+      > :first-child:is(#back-button, #forward-button)
+      + :is(#back-button, #forward-button)
+      + :is(toolbarbutton, toolbaritem) {
+      padding-inline-start: var(--toolbar-start-end-padding) !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button {
+    order: 3;
+    -moz-box-ordinal-group: 3;
+  }
+  @media not -moz-pref("userChrome.combined.urlbar.nav_button") {
+    #nav-bar-customization-target > #home-button:is(:first-child) + :is(toolbarbutton, toolbaritem) {
+      padding-inline-start: var(--toolbar-start-end-padding) !important;
+    }
+  }
+  #nav-bar-customization-target > #home-button {
+    position: relative;
+    z-index: 3 !important;
+    background-color: var(--toolbar-bgcolor) !important;
+    background-clip: content-box !important;
+    border-radius: 100%;
+    padding-block: 0 !important;
+    padding-inline-end: 0 !important;
+  }
+  @media -moz-pref("userChrome.padding.toolbar_button") {
+    @media -moz-pref("userChrome.padding.toolbar_button.compact") {
+      #nav-bar-customization-target > #home-button {
+        --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+      }
+    }
+  }
+  #nav-bar-customization-target > #home-button > menupopup {
+    margin-top: -1px !important;
+  }
+  #nav-bar-customization-target > #home-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+    background-origin: padding-box;
+    background-clip: padding-box;
+    border: 1px solid var(--uc-combined-circlebutton-border-color);
+    border-radius: 10000px !important;
+    padding-inline-end: var(--urlbar-icon-padding) !important;
+    height: auto !important;
+  }
+  #nav-bar-customization-target > #home-button:hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+  #nav-bar-customization-target > #home-button:hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+}
+@media -moz-pref("userChrome.combined.urlbar.reload_button") {
+  #nav-bar-customization-target > #stop-reload-button {
+    order: 6;
+    -moz-box-ordinal-group: 6;
+  }
+  #urlbar {
+    padding-right: calc(var(--uc-toolbarbutton-size) - var(--urlbar-margin-inline) / 2);
+  }
+  #nav-bar-customization-target > #stop-reload-button {
+    z-index: 3;
+    position: relative;
+    --toolbarbutton-hover-background: var(--urlbar-box-hover-bgcolor);
+    color: var(--urlbar-box-hover-text-color) !important;
+    margin-left: calc(-1 * (var(--uc-toolbarbutton-size) + var(--urlbar-margin-inline)));
+  }
+  #nav-bar-customization-target > #stop-reload-button > .toolbarbutton-1 > .toolbarbutton-icon {
+    width: var(--uc-urlbar-icon-size) !important;
+    height: var(--uc-urlbar-icon-size) !important;
+    padding: var(--urlbar-icon-padding) !important;
+  }
+}
+/** Others UI *****************************************************************/
+/*= Counter for Tab ==========================================================*/
+@media -moz-pref("userChrome.counter.tab") {
+  #tabbrowser-tabs {
+    counter-reset: tab-counts;
+  }
+  .tabbrowser-tab:not([hidden="true"]) {
+    counter-increment: tab-counts;
+  }
+  .tabbrowser-tab:not([hidden="true"])[pinned="true"] .tab-label-container::before {
+    content: "ย " counter(tab-counts);
+  }
+  .tabbrowser-tab:not([hidden="true"]):not([pinned="true"]) .tab-label-container::before {
+    content: counter(tab-counts) ":ย ";
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+    display: grid;
+    align-content: safe center;
+    align-items: safe center;
+  }
+  @media -moz-pref("userChrome.centered.tab") {
+    @media not -moz-pref("userChrome.centered.tab.label") {
+      .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+        justify-content: start;
+        justify-items: start;
+      }
+    }
+  }
+  @media not -moz-pref("userChrome.centered.tab") {
+    .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+      justify-content: start;
+      justify-items: start;
+    }
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container::before {
+    display: inline-block;
+    grid-row: 1;
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container > .tab-text {
+    grid-row: 1;
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] {
+    width: unset !important; /* Original: 0 */
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] > .tab-text,
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] > .tab-secondary-label {
+    width: 0;
+  }
+  .tab-label,
+  .tab-secondary-label {
+    overflow: hidden;
+  }
+  @media -moz-pref("userChrome.tab.sound_with_favicons") {
+    @media not -moz-pref("userChrome.hidden.tab_icon") {
+      .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+        .tab-label-container[labeldirection="ltr"],
+      .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+        .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+        --uc-sound-tab-label-position-x: 2px;
+      }
+      .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+        .tab-label-container[labeldirection="rtl"],
+      .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+        .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+        --uc-sound-tab-label-position-x: -2px;
+      }
+      .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+        .tab-label-container::before {
+        transform: translateX(var(--uc-sound-tab-label-position-x, 0px));
+      }
+    }
+    @media -moz-pref("userChrome.hidden.tab_icon") {
+      @media not -moz-pref("userChrome.hidden.tab_icon.always") {
+        .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+          .tab-label-container[labeldirection="ltr"],
+        .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+          .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+          --uc-sound-tab-label-position-x: 2px;
+        }
+        .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+          .tab-label-container[labeldirection="rtl"],
+        .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+          .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+          --uc-sound-tab-label-position-x: -2px;
+        }
+        .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+          .tab-label-container::before {
+          transform: translateX(var(--uc-sound-tab-label-position-x, 0px));
+        }
+      }
+    }
+    .tab-label-container::beforee {
+      transition: transform 0.25s var(--animation-easing-function);
+    }
+  }
+}
+/*= Counter for Bookmark menu ================================================*/
+@media -moz-pref("userChrome.counter.bookmark_menu") {
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
+    counter-reset: bookmark-counts 0;
+  }
+  menupopup[placespopup="true"] > menu.bookmark-item::after {
+    display: inline-flex;
+    display: -moz-inline-box;
+    content: "(" counter(bookmark-counts) ")";
+  }
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-iconic-highlightable-text,
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-accel-container,
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  menu.bookmark-item > menupopup[placespopup="true"] > .bookmark-item {
+    counter-increment: bookmark-counts;
+  }
+}
+@media -moz-pref("userChrome.findbar.floating_on_top") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/floating_findbar_on_top.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Note that privacy.resistFingerprinting.letterboxing prevents this from working properly */
+  #main-window > body > box {
+    z-index: 1;
+  }
+  findbar {
+    order: -1;
+    -moz-box-ordinal-group: 0;
+    position: relative;
+    height: 0 !important;
+    overflow: visible;
+    border-top: none !important;
+    padding: 0 !important;
+    background: none !important;
+    pointer-events: none;
+    z-index: 1;
+    margin-right: 16px;
+    border-right: 1px solid var(--chrome-content-separator-color);
+  }
+  findbar::before {
+    content: "";
+    display: flex;
+    display: -moz-box;
+    position: absolute;
+    flex: 200;
+    -moz-box-flex: 200;
+  }
+  .findbar-container,
+  .findbar-closebutton {
+    border-style: solid;
+    border-color: var(--chrome-content-separator-color);
+    background: var(--uc-light-bkgnd-color, var(--toolbar-bgcolor)) !important;
+    pointer-events: auto;
+    height: 33px !important;
+  }
+  .findbar-container {
+    flex-direction: row-reverse;
+    -moz-box-direction: reverse;
+    border-width: 0 0 1px 1px;
+    border-radius: var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) 0 0
+      var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) !important;
+  }
+  .findbar-container > .findbar-find-fast {
+    padding: var(--toolbarbutton-inner-padding) 1px;
+    margin: 0 !important;
+  }
+  .findbar-container > .findbar-find-status {
+    display: flex;
+    display: -moz-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1;
+    -moz-box-flex: 1;
+  }
+  .findbar-container > hbox {
+    margin-inline: 5px;
+  }
+  .findbar-closebutton {
+    width: 30px !important; /* Original: 24px */
+    margin: 0 !important;
+    border-width: 0 1px 1px 0px;
+    border-radius: 0 var(--toolbarbutton-border-radius) var(--toolbarbutton-border-radius) 0 !important;
+    padding: 2px 5px 2px 3px !important;
+    overflow: clip;
+  }
+  .findbar-closebutton image {
+    padding: 4px;
+    border-radius: var(--toolbarbutton-border-radius);
+  }
+  .findbar-closebutton:hover > image {
+    background: var(--toolbarbutton-hover-background) !important;
+  }
+}
+/** Fullscreen - Overlap toolbar **********************************************/
+@media -moz-pref("userChrome.fullscreen.overlap") {
+  @media -moz-pref("browser.fullscreen.autohide") {
+    :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #navigator-toolbox {
+      position: fixed !important; /* Needed for content to take up entire height */
+      z-index: 1000 !important; /* Puts the UI above the content */
+    }
+    :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #navigator-toolbox:is(:hover, :focus-within) {
+      margin-top: 0 !important;
+    }
+    :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"])
+      :-moz-any(#navigator-toolbox, #titlebar, #toolbar-menubar, #TabsToolbar, #nav-bar, #PersonalToolbar) {
+      width: 100%; /* Makes the UI take up the entire width */
+    }
+    :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #urlbar:popover-open {
+      position: fixed !important;
+    }
+    @media (-moz-gtk-csd-available) {
+      /* Fix transparent background */
+      :root:is([tabsintitlebar], [customtitlebar])[sizemode="fullscreen"]:not([inDOMFullscreen="true"]):is(
+          :not([lwtheme]),
+          :not(:-moz-lwtheme)
+        )
+        #TabsToolbar {
+        appearance: auto !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.fullscreen.show_bookmarkbar") {
+  :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]),
+  :root[sizemode="fullscreen"] #PersonalToolbar[initialized] {
+    visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */
+  }
+}
+/** Centered ******************************************************************/
+/*= Centered - Tab ===========================================================*/
+@media -moz-pref("userChrome.centered.tab") {
+  @media -moz-pref("userChrome.centered.tab.label") {
+    .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+    .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+      margin-inline-end: 5px;
+    }
+  }
+  @media -moz-pref("userChrome.tab.close_button_at_hover") {
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not(:hover, [pinned])
+      .tab-label-container:not([textoverflow]) {
+      margin-inline-end: 1px;
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([selected]):not(:hover, [pinned])
+      .tab-label-container
+      label {
+      padding-inline-end: 18px;
+    }
+  }
+  @media not -moz-pref("userChrome.centered.tab.label") {
+    .tab-icon-stack {
+      margin-inline-start: auto;
+    }
+    .tab-label-container {
+      max-width: min-content;
+      margin-inline-end: auto;
+    }
+    @media -moz-pref("userChrome.tab.close_button_at_hover") {
+      .tabbrowser-tab:not(:hover, [pinned]) > .tab-stack > .tab-content > .tab-close-button {
+        padding-inline-start: 6px !important; /* Original: 0px */
+        width: 24px !important; /* Original: 17px */
+      }
+    }
+  }
+  @media -moz-pref("userChrome.centered.tab.label") {
+    /* Based on https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/centered_tab_label.css */
+    .tab-label-container {
+      display: grid;
+    }
+    .tab-label,
+    .tab-secondary-label {
+      overflow: clip;
+      justify-self: safe center;
+      align-self: safe center;
+    }
+    .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+    .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+      margin-inline-end: 5px;
+    }
+  }
+}
+/*= Centered - URL Bar =======================================================*/
+@media -moz-pref("userChrome.centered.urlbar") {
+  #urlbar:not([focused]) #urlbar-input,
+  #urlbar:not([focused]) .urlbar-input {
+    text-align: center !important;
+  }
+}
+/*= Centered - Bookmark Bar ==================================================*/
+@media -moz-pref("userChrome.centered.bookmarkbar") {
+  #PlacesToolbarItems {
+    display: flex !important;
+    justify-content: safe center !important;
+  }
+}
+/** Auto Hide *****************************************************************/
+@media -moz-pref("userChrome.autohide.back_button") or -moz-pref("userChrome.autohide.forward_button") {
+  :root {
+    --uc-toolbarbutton-hide-size: calc(
+      -1 * (16px + (2 * (var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding))))
+    );
+  }
+}
+@-moz-document url("chrome://browser/content/browser.xhtml")
+{
+  @media -moz-pref("userChrome.autohide.back_button") {
+    :root:not([customizing="true"]) #back-button[disabled="true"] {
+      margin-left: var(--uc-toolbarbutton-hide-size) !important;
+      opacity: 0 !important;
+      pointer-events: none;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #back-button {
+        transition-property: background-color, opacity, margin-left !important;
+      }
+      #back-button[disabled="true"] {
+        transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function),
+          margin-left 0.5s ease !important;
+      }
+    }
+  }
+  @media -moz-pref("userChrome.autohide.forward_button") {
+    :root:not([customizing="true"]) #forward-button[disabled="true"] {
+      margin-left: var(--uc-toolbarbutton-hide-size) !important;
+      opacity: 0 !important;
+      pointer-events: none;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #forward-button {
+        transition-property: background-color, opacity, margin-left !important;
+      }
+      #forward-button[disabled="true"] {
+        transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function),
+          margin-left 0.5s ease !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.page_action") {
+  #page-action-buttons > .urlbar-page-action {
+    margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding));
+    opacity: 0;
+  }
+  #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action,
+  .urlbar-page-action[open],
+  .urlbar-page-action[open] ~ .urlbar-page-action {
+    margin-inline-end: 0px !important;
+    opacity: 1;
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    #page-action-buttons > .urlbar-page-action {
+      transition: margin-inline-end 50ms var(--animation-easing-function) 900ms,
+        opacity 1.5s var(--animation-easing-function) 600ms !important;
+    }
+    @media -moz-pref("userChrome.decoration.animate") {
+      #page-action-buttons > .urlbar-page-action {
+        transition: margin-inline-end 50ms var(--animation-easing-function) 900ms,
+          opacity 1.5s var(--animation-easing-function) 600ms, background-color 2.5s var(--animation-easing-function) !important;
+      }
+    }
+    #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action,
+    .urlbar-page-action[open],
+    .urlbar-page-action[open] ~ .urlbar-page-action {
+      transition-delay: 0s !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.tab") {
+  @media not -moz-pref("userChrome.autohide.tab.opacity") {
+    @media not -moz-pref("userChrome.autohide.tab.blur") {
+      .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+        margin-bottom: -64px;
+      }
+    }
+  }
+  @media -moz-pref("userChrome.autohide.tab.opacity") {
+    .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+      opacity: 0%;
+    }
+  }
+  @media -moz-pref("userChrome.autohide.tab.blur") {
+    .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+      filter: blur(8px);
+    }
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+      transition-timing-function: var(--animation-easing-function);
+      transition-duration: 0.2s;
+      transition-delay: 600ms;
+    }
+    .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]):is(:hover, :focus-within) {
+      transition-delay: 0s;
+    }
+    @media not -moz-pref("userChrome.autohide.tab.opacity") {
+      @media not -moz-pref("userChrome.autohide.tab.blur") {
+        .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+          transition-property: margin-bottom;
+        }
+      }
+    }
+    @media -moz-pref("userChrome.autohide.tab.opacity") {
+      .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+        transition-property: opacity;
+      }
+    }
+    @media -moz-pref("userChrome.autohide.tab.blur") {
+      .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+        transition-property: filter;
+      }
+    }
+  }
+}
+:root {
+  --uc-autohide-toolbar-speed: 0.25s;
+  --uc-autohide-toolbar-delay: 600ms;
+}
+
+@media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.autohide.navbar") or -moz-pref("userChrome.autohide.bookmarkbar") or -moz-pref("userChrome.tabbar.one_liner") or -moz-pref("userChrome.tabbar.on_bottom.menubar_on_top") or -moz-pref("userChrome.hidden.tabbar") or -moz-pref("userChrome.navbar.as_sidebar") {
+  :root {
+    --uc-tabbar-height: var(--uc-tabbar-height-default);
+    --uc-tabbar-height-default: var(--tab-min-height);
+    --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
+    --uc-navbar-height: var(--uc-navbar-height-default);
+    --uc-navbar-height-default: calc(
+      16px + 2 * (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding))
+    );
+    --uc-navbar-hide-height: calc(-1 * var(--uc-navbar-height));
+    --uc-bm-height: var(--uc-bm-height-default);
+    --uc-bm-height-default: calc(
+      20px + (2 * var(--bookmark-block-padding, 4px))
+    ); /* 20px = 16px + (2px * 2) [margin block] */
+    --uc-bm-hide-height: calc(-1 * var(--uc-bm-height));
+    --uc-titlebar-buttonbox-height: 34px;
+    --uc-menubar-height: 0px;
+    --uc-menubar-height-default: calc(1.6rem + 2px);
+    --uc-menubar-inner-height: calc(1.6rem - 2px);
+  }
+  @media -moz-pref("userChrome.hidden.tabbar") {
+    @media not -moz-pref("userChrome.tabbar.one_liner") {
+      :root {
+        --uc-tabbar-height: 0px;
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner") {
+      @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media screen and (max-width: 1100px) {
+          :root {
+            --uc-tabbar-height: 0px;
+          }
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.hidden.navbar") {
+    :root {
+      --uc-navbar-height: 0px;
+    }
+  }
+  @supports selector(:has(a)) {
+    :root:not([tabsintitlebar]):not([customtitlebar]):has(#toolbar-menubar) {
+      --uc-menubar-height: var(--uc-menubar-height-default);
+    }
+    @media (-moz-gtk-csd-available) {
+      :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"]) {
+        --uc-menubar-height: calc(var(--tab-min-height) + 2 * var(--tab-block-margin));
+      }
+    }
+    @media (-moz-platform: windows) {
+      :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"]) {
+        --uc-menubar-height: calc(var(--tab-min-height) - var(--tabs-navbar-shadow-size));
+      }
+    }
+    :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="false"]) {
+      --uc-menubar-height: var(--uc-titlebar-buttonbox-height);
+    }
+    :root:not([tabsintitlebar]):not([customtitlebar]):has(#toolbar-menubar[autohide="true"][inactive="true"]),
+    :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"][inactive="true"]) {
+      --uc-menubar-height: 0px;
+    }
+    #navigator-toolbox:has(#PersonalToolbar[collapsed="true"]) {
+      --uc-bm-height: 0px;
+    }
+    @media -moz-pref("userChrome.navbar.as_sidebar") {
+      #navigator-toolbox:has(#PersonalToolbar[collapsed="false"]) #nav-bar {
+        --uc-bm-height: var(--uc-bm-height-default);
+      }
+      @media -moz-pref("userChrome.autohide.bookmarkbar") {
+        #navigator-toolbox:has(#PersonalToolbar[collapsed="false"]):not(:hover) #nav-bar {
+          --uc-bm-height: 0px;
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.autohide.navbar") or -moz-pref("userChrome.autohide.bookmarkbar") or -moz-pref("userChrome.autohide.infobar") {
+  #navigator-toolbox {
+    position: relative;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) {
+    z-index: 2;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar {
+    z-index: -1;
+  }
+  #navigator-toolbox:not(:hover):not(:focus-within) {
+    animation: 1s keepfront;
+  }
+  @keyframes keepfront {
+    from {
+      z-index: 3;
+    }
+    to {
+      z-index: 3;
+    }
+  }
+  #sidebar-box:is(:hover, :focus-within) {
+    position: relative;
+    z-index: 2 !important;
+  }
+  @media -moz-pref("userChrome.autohide.toolbar_overlap") {
+    #navigator-toolbox {
+      --uc-toolbar-hide-height: calc(-1 * var(--uc-toolbar-height, 0));
+      margin-bottom: var(--uc-toolbar-hide-height) !important;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      @media -moz-pref("userChrome.decoration.animate") {
+        #navigator-toolbox {
+          will-change: margin-top, margin-bottom, background-color !important;
+          transition: margin-top 1s ease,
+            margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            background-color 0.2s var(--animation-easing-function) !important;
+        }
+        #navigator-toolbox:-moz-window-inactive {
+          transition: margin-top 1s ease,
+            margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            background-color 0.5s var(--animation-easing-function) !important;
+        }
+        #navigator-toolbox:is(:hover, :focus-within) {
+          transition-delay: 0s, 0s, 0.2s !important;
+        }
+        #navigator-toolbox[inFullscreen="true"] {
+          transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+            margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            background-color 0.2s var(--animation-easing-function) !important;
+        }
+        #navigator-toolbox[inFullscreen="true"]:-moz-window-inactive {
+          transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+            margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            background-color 0.5s var(--animation-easing-function) !important;
+        }
+      }
+      @media not -moz-pref("userChrome.decoration.animate") {
+        #navigator-toolbox {
+          transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            background-color 0.2s var(--animation-easing-function) !important;
+        }
+        #navigator-toolbox:is(:hover, :focus-within) {
+          transition-delay: 0s !important;
+        }
+      }
+    }
+    @media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.autohide.navbar") {
+      @media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.tabbar.one_liner") {
+        #navigator-toolbox:is(:hover, :focus-within) {
+          --uc-toolbar-height: var(--uc-tabbar-height);
+        }
+        @media not -moz-pref("userChrome.autohide.navbar") {
+          @media -moz-pref("userChrome.autohide.bookmarkbar") {
+            #navigator-toolbox:is(:hover, :focus-within) {
+              --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-bm-height));
+            }
+          }
+        }
+        @media -moz-pref("userChrome.autohide.navbar") {
+          @media not -moz-pref("userChrome.tabbar.one_liner") {
+            @media not -moz-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:is(:hover, :focus-within) {
+                --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+              }
+            }
+            @media -moz-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:is(:hover, :focus-within) {
+                --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
+              }
+            }
+          }
+          @media -moz-pref("userChrome.tabbar.one_liner") {
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (max-width: 1100px) {
+                @media not -moz-pref("userChrome.autohide.bookmarkbar") {
+                  #navigator-toolbox:is(:hover, :focus-within) {
+                    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+                  }
+                }
+                @media -moz-pref("userChrome.autohide.bookmarkbar") {
+                  #navigator-toolbox:is(:hover, :focus-within) {
+                    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    @media not -moz-pref("userChrome.autohide.tabbar") {
+      @media not -moz-pref("userChrome.autohide.navbar") {
+        @media -moz-pref("userChrome.autohide.bookmarkbar") {
+          #navigator-toolbox:is(:hover, :focus-within) {
+            --uc-toolbar-height: var(--uc-bm-height);
+          }
+        }
+      }
+      @media -moz-pref("userChrome.autohide.navbar") or -moz-pref("userChrome.tabbar.one_liner") {
+        @media -moz-pref("userChrome.autohide.navbar") {
+          @media not -moz-pref("userChrome.tabbar.one_liner") {
+            @media not -moz-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:is(:hover, :focus-within) {
+                --uc-toolbar-height: var(--uc-navbar-height);
+              }
+            }
+            @media -moz-pref("userChrome.autohide.bookmarkbar") {
+              #navigator-toolbox:is(:hover, :focus-within) {
+                --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
+              }
+            }
+          }
+          @media -moz-pref("userChrome.tabbar.one_liner") {
+            @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+              @media screen and (max-width: 1100px) {
+                @media not -moz-pref("userChrome.autohide.bookmarkbar") {
+                  #navigator-toolbox:is(:hover, :focus-within) {
+                    --uc-toolbar-height: var(--uc-navbar-height);
+                  }
+                }
+                @media -moz-pref("userChrome.autohide.bookmarkbar") {
+                  #navigator-toolbox:is(:hover, :focus-within) {
+                    --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.autohide.navbar") {
+  @media -moz-pref("userChrome.autohide.tabbar") or -moz-pref("userChrome.tabbar.one_liner") {
+    @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      :root:not([customizing]) #titlebar,
+      :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+        margin-bottom: var(--uc-tabbar-hide-height);
+        will-change: margin-bottom;
+      }
+      #TabsToolbar:not([customizing]) {
+        will-change: opacity;
+      }
+      @media not -moz-pref("userChrome.tabbar.on_bottom") {
+        #TabsToolbar:not([customizing]),
+        #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+          opacity: 0;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.on_bottom") {
+        #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+          opacity: 0;
+        }
+      }
+      #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+      #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+        margin-bottom: 0px;
+      }
+      @media not -moz-pref("userChrome.tabbar.on_bottom") {
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+          opacity: 1;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.on_bottom") {
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+          opacity: 1;
+        }
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+      @media screen and (min-width: 1100px) {
+        :root:not([customizing]) #titlebar,
+        :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+          margin-bottom: var(--uc-tabbar-hide-height);
+          will-change: margin-bottom;
+        }
+        #TabsToolbar:not([customizing]) {
+          will-change: opacity;
+        }
+        @media not -moz-pref("userChrome.tabbar.on_bottom") {
+          #TabsToolbar:not([customizing]),
+          #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+            opacity: 0;
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom") {
+          #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+            opacity: 0;
+          }
+        }
+        #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+        #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+          margin-bottom: 0px;
+        }
+        @media not -moz-pref("userChrome.tabbar.on_bottom") {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+            opacity: 1;
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom") {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+            opacity: 1;
+          }
+        }
+      }
+      @media -moz-pref("userChrome.autohide.tabbar") {
+        :root:not([customizing]) #titlebar,
+        :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+          margin-bottom: var(--uc-tabbar-hide-height);
+          will-change: margin-bottom;
+        }
+        #TabsToolbar:not([customizing]) {
+          will-change: opacity;
+        }
+        @media not -moz-pref("userChrome.tabbar.on_bottom") {
+          #TabsToolbar:not([customizing]),
+          #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+            opacity: 0;
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom") {
+          #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+            opacity: 0;
+          }
+        }
+        #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+        #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+          margin-bottom: 0px;
+        }
+        @media not -moz-pref("userChrome.tabbar.on_bottom") {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+            opacity: 1;
+          }
+        }
+        @media -moz-pref("userChrome.tabbar.on_bottom") {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+            opacity: 1;
+          }
+        }
+      }
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #titlebar:not([customizing]) {
+        transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+            var(--uc-autohide-toolbar-delay),
+          background-color 1s var(--animation-easing-function) !important;
+      }
+      @media not -moz-pref("userChrome.tabbar.on_bottom") {
+        #TabsToolbar:not([customizing]),
+        #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+          transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+            var(--uc-autohide-toolbar-delay) !important;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.on_bottom") {
+        #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+          transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+            var(--uc-autohide-toolbar-delay) !important;
+        }
+      }
+      #navigator-toolbox:is(:hover, :focus-within) {
+        transition-delay: 0s !important;
+      }
+      #navigator-toolbox:is(:hover, :focus-within) > #titlebar:not([customizing]) {
+        transition-delay: 0s !important;
+      }
+      @media not -moz-pref("userChrome.tabbar.on_bottom") {
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]),
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+          transition-delay: 0s !important;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.on_bottom") {
+        #navigator-toolbox:is(:hover, :focus-within)
+          #TabsToolbar:not([customizing])
+          > *:not(.titlebar-buttonbox-container) {
+          transition-delay: 0s !important;
+        }
+      }
+    }
+  }
+  @media -moz-pref("userChrome.autohide.navbar") or -moz-pref("userChrome.tabbar.one_liner") {
+    @media -moz-pref("userChrome.autohide.navbar") {
+      @media not -moz-pref("userChrome.tabbar.one_liner") {
+        #nav-bar:not([customizing]) {
+          margin-bottom: var(--uc-navbar-hide-height);
+        }
+        #nav-bar:not([customizing]),
+        #nav-bar:not([customizing]) #urlbar {
+          opacity: 0;
+          will-change: margin-bottom, opacity;
+        }
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
+          margin-bottom: 0;
+        }
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+        #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+          opacity: 1;
+        }
+        #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+          pointer-events: none;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner") {
+        @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+          @media screen and (max-width: 1100px) {
+            #nav-bar:not([customizing]) {
+              margin-bottom: var(--uc-navbar-hide-height);
+            }
+            #nav-bar:not([customizing]),
+            #nav-bar:not([customizing]) #urlbar {
+              opacity: 0;
+              will-change: margin-bottom, opacity;
+            }
+            #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
+              margin-bottom: 0;
+            }
+            #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+            #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+              opacity: 1;
+            }
+            #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+              pointer-events: none;
+            }
+          }
+        }
+      }
+    }
+    #mainPopupSet:not(:hover) ~ #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) {
+      -moz-window-dragging: no-drag;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #nav-bar:not([customizing]) {
+        transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+            var(--uc-autohide-toolbar-delay),
+          opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+          var(--ext-theme-background-transition) !important;
+      }
+      @media -moz-pref("userChrome.autohide.fill_urlbar") {
+        #nav-bar:not([customizing]) {
+          transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+            var(--ext-theme-background-transition) !important;
+        }
+      }
+      #nav-bar:not([customizing]) #urlbar {
+        transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+          var(--uc-autohide-toolbar-delay) !important;
+      }
+      #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+      #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+        transition-delay: 0s !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.bookmarkbar") {
+  #PersonalToolbar:not([customizing]) {
+    margin-bottom: var(--uc-bm-hide-height);
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+  @media -moz-pref("userChrome.autohide.toolbar_overlap") {
+    @media not -moz-pref("userChrome.autohide.toolbar_overlap.allow_layout_shift") {
+      @supports not selector(:has(a)) {
+        #PersonalToolbar:not([customizing])[collapsed="true"] {
+          visibility: visible !important;
+          max-height: unset !important;
+        }
+      }
+    }
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) {
+    margin-bottom: 0;
+    opacity: 1;
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    #PersonalToolbar:not([customizing]) {
+      transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+          var(--uc-autohide-toolbar-delay),
+        opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+        min-height 170ms ease-out, max-height 170ms ease-out, var(--ext-theme-background-transition) !important;
+    }
+    #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) {
+      transition-delay: 0s !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.infobar") {
+  #tab-notification-deck:not([customizing]) > .notificationbox-stack {
+    --infobar-height: calc(
+      25px + (var(--infobar-button-vertical-margin, 4px) * 2) + var(--infobar-message-vertical-margin, 8px)
+    );
+  }
+  #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
+    --infobar-message-margin: 0 4px calc(-1 * var(--infobar-height));
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #tab-notification-deck:not([customizing])
+    > .notificationbox-stack[slot="selected"]
+    > notification-message {
+    --infobar-message-margin: 0 4px var(--infobar-message-vertical-margin, 8px);
+    opacity: 1;
+  }
+  @media -moz-pref("userChrome.autohide.toolbar_overlap") {
+    #tab-notification-deck:not([customizing]) {
+      height: 0;
+    }
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
+      transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+          var(--uc-autohide-toolbar-delay),
+        opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+        var(--ext-theme-background-transition) !important;
+    }
+    #navigator-toolbox:is(:hover, :focus-within)
+      #tab-notification-deck:not([customizing])
+      > .notificationbox-stack[slot="selected"]
+      > notification-message {
+      transition-delay: 0s !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.sidebar") {
+  #sidebar-box {
+    min-width: var(--uc-sidebar-width) !important;
+    max-width: var(--uc-sidebar-width) !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  @media -moz-pref("userChrome.sidebar.overlap") {
+    #sidebar-header,
+    #sidebar {
+      min-width: var(--uc-sidebar-width) !important;
+      max-width: var(--uc-sidebar-width) !important;
+      will-change: min-width, max-width;
+    }
+    #sidebar-box:is(:hover, :focus-within),
+    #sidebar-box:has(#sidebar-switcher-target.active) {
+      --uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
+    }
+    #sidebar-box:is(:hover, :focus-within) > #sidebar-header,
+    #sidebar-box:is(:hover, :focus-within) > #sidebar,
+    #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+    #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
+      min-width: var(--uc-sidebar-activate-width) !important;
+      max-width: var(--uc-sidebar-activate-width) !important;
+    }
+    :root[inFullscreen="true"] #sidebar-box {
+      --uc-sidebar-shadow-width: var(--uc-sidebar-fullscreen-width);
+      margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+      padding-inline-start: var(--uc-sidebar-fullscreen-width);
+      will-change: padding-inline-start, opacity, box-shadow, visibility;
+    }
+    :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
+      --uc-sidebar-shadow-width: var(--uc-sidebar-activate-width);
+      padding-inline-start: var(--uc-sidebar-activate-width);
+    }
+    :root[inFullscreen="true"] #sidebar-box #sidebar-header,
+    :root[inFullscreen="true"] #sidebar-box #sidebar {
+      min-width: calc(var(--uc-sidebar-activate-width)) !important;
+      max-width: calc(var(--uc-sidebar-activate-width)) !important;
+      will-change: unset;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #sidebar-header,
+      #sidebar {
+        transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
+          var(--uc-autohide-sidebar-delay) !important;
+      }
+      #sidebar-box:is(:hover, :focus-within),
+      #sidebar-box:has(#sidebar-switcher-target.active) {
+        transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function),
+          opacity var(--uc-autohide-sidebar-speed) ease-in-out,
+          box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed),
+          visibility 0s linear !important;
+      }
+      #sidebar-box:is(:hover, :focus-within) > #sidebar-header,
+      #sidebar-box:is(:hover, :focus-within) > #sidebar,
+      #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+      #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
+        transition-delay: 0ms !important;
+      }
+      :root[inFullscreen="true"] #sidebar-box {
+        transition: padding-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function)
+            var(--uc-autohide-sidebar-delay),
+          opacity var(--uc-autohide-fullscreen-sidebar-speed) ease-in-out,
+          box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
+          visibility 0s linear !important;
+      }
+      :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+      :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
+        transition-delay: 0ms !important;
+      }
+    }
+  }
+  @media not -moz-pref("userChrome.sidebar.overlap") {
+    #sidebar-box {
+      --uc-sidebar-fullscreen-margin: calc(
+        var(--uc-sidebar-fullscreen-width) + var(--uc-sidebar-activate-width-reverse)
+      );
+      overflow: hidden;
+      will-change: min-width, max-width;
+    }
+    #sidebar-box:is(:hover, :focus-within),
+    #sidebar-box:has(#sidebar-switcher-target.active) {
+      min-width: var(--uc-sidebar-activate-width) !important;
+      max-width: var(--uc-sidebar-activate-width) !important;
+    }
+    :root[inFullscreen="true"] #sidebar-box:not([positionend]) {
+      margin-inline-start: var(--uc-sidebar-fullscreen-margin) !important;
+      will-change: margin-inline-start;
+    }
+    :root[inFullscreen="true"] #sidebar-box:not([positionend]):is(:hover, :focus-within) {
+      margin-inline-start: 0 !important;
+    }
+    :root[inFullscreen="true"] #sidebar-box[positionend] {
+      margin-inline-end: var(--uc-sidebar-fullscreen-margin) !important;
+      will-change: margin-inline-end;
+    }
+    :root[inFullscreen="true"] #sidebar-box[positionend]:is(:hover, :focus-within) {
+      margin-inline-end: 0 !important;
+    }
+    @media (prefers-reduced-motion: no-preference) {
+      #sidebar-box {
+        transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
+            var(--uc-autohide-sidebar-delay),
+          max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
+      }
+      #sidebar-box:is(:hover, :focus-within),
+      #sidebar-box:has(#sidebar-switcher-target.active) {
+        transition-delay: 0ms !important;
+      }
+      :root[inFullscreen="true"] #sidebar-box {
+        transition: margin-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function)
+          var(--uc-autohide-sidebar-delay) !important;
+      }
+      :root[inFullscreen="true"] #sidebar-box[positionend] {
+        transition-property: margin-inline-end !important;
+      }
+      :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+      :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
+        transition-delay: 0ms !important;
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.autohide.fill_urlbar") {
+  #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+    order: -1;
+    -moz-box-ordinal-group: 0;
+    min-width: calc(
+      var(--uc-navbar-width, 100vw) -
+        (2 * var(--urlbar-margin-inline) + var(--uc-window-drag-space-pre, 0px) + var(--uc-navbar-gap, 0px))
+    ) !important;
+  }
+  @media -moz-pref("userChrome.tabbar.one_liner") {
+    #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+      --uc-tabbar-width: calc(100vw - var(--uc-navbar-width-origin));
+    }
+  }
+  @media (prefers-reduced-motion: no-preference) {
+    @media -moz-pref("userChrome.tabbar.one_liner") {
+      @media not -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        #nav-bar {
+          transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay),
+            var(--ext-theme-background-transition) !important;
+        }
+        #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+          transition-delay: 0s !important;
+        }
+      }
+      @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media screen and (prefers-reduced-motion: no-preference) and (min-width: 1100px) {
+          #nav-bar {
+            transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+                var(--uc-autohide-toolbar-delay),
+              var(--ext-theme-background-transition) !important;
+          }
+          #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+            transition-delay: 0s !important;
+          }
+        }
+      }
+    }
+    @media not -moz-pref("userChrome.tabbar.one_liner") {
+      #urlbar-container {
+        transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+          var(--uc-autohide-toolbar-delay);
+      }
+      #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+        transition-delay: 0s !important;
+      }
+    }
+    @media -moz-pref("userChrome.tabbar.one_liner") {
+      @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+        @media screen and (prefers-reduced-motion: no-preference) and (max-width: 1100px) {
+          #urlbar-container {
+            transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+              var(--uc-autohide-toolbar-delay);
+          }
+          #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+            transition-delay: 0s !important;
+          }
+        }
+      }
+    }
+  }
+}
+/** Hidden ********************************************************************/
+@media not -moz-pref("userChrome.tabbar.one_liner") {
+  @media -moz-pref("userChrome.hidden.tabbar") {
+    #TabsToolbar {
+      display: none !important;
+    }
+  }
+  @media -moz-pref("userChrome.hidden.navbar") {
+    #nav-bar {
+      visibility: collapse; /* display: none is not work */
+    }
+  }
+}
+@media -moz-pref("userChrome.tabbar.one_liner") {
+  @media -moz-pref("userChrome.tabbar.one_liner.responsive") {
+    @media screen and (max-width: 1100px) {
+      @media -moz-pref("userChrome.hidden.tabbar") {
+        #TabsToolbar {
+          display: none !important;
+        }
+      }
+      @media -moz-pref("userChrome.hidden.navbar") {
+        #nav-bar {
+          visibility: collapse; /* display: none is not work */
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userChrome.hidden.tab_icon") {
+  @media not -moz-pref("userChrome.hidden.tab_icon.always") {
+    .tabbrowser-tab:not([pinned="true"]) .tab-icon-image {
+      display: none;
+    }
+  }
+  @media -moz-pref("userChrome.hidden.tab_icon.always") {
+    .tabbrowser-tab:not([pinned="true"]) .tab-icon-stack {
+      display: none;
+    }
+  }
+}
+@media -moz-pref("userChrome.hidden.private_indicator") {
+  .private-browsing-indicator,
+  #private-browsing-indicator-with-label {
+    display: none;
+  }
+}
+@media -moz-pref("userChrome.hidden.titlebar_container") {
+  .titlebar-buttonbox-container {
+    display: none !important;
+  }
+}
+@media -moz-pref("userChrome.hidden.sidebar_header") {
+  @media not -moz-pref("userChrome.hidden.sidebar_header.vertical_tab_only") {
+    #sidebar-header {
+      display: none !important;
+    }
+  }
+  @media -moz-pref("userChrome.hidden.sidebar_header.vertical_tab_only") {
+    #sidebar-box:is(
+        [sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"],
+        [sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"],
+        [sidebarcommand="sidebartabs_asamuzak_jp-sidebar-action"]
+      )
+      #sidebar-header {
+      display: none !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.hidden.urlbar_iconbox") {
+  @media not -moz-pref("userChrome.hidden.urlbar_iconbox.label_only") {
+    #identity-box[pageproxystate="valid"].notSecureText #identity-icon-label,
+    #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box,
+    #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box {
+      display: none;
+    }
+    #identity-box[pageproxystate="valid"].notSecureText #identity-icon-box {
+      padding-inline-end: 5px; /* Original: 8px */
+    }
+  }
+  @media -moz-pref("userChrome.hidden.urlbar_iconbox.label_only") {
+    #identity-box[pageproxystate="valid"].notSecureText,
+    #identity-box[pageproxystate="valid"].chromeUI,
+    #identity-box[pageproxystate="valid"].extensionPage {
+      margin-inline-end: var(--identity-box-margin-inline) !important;
+    }
+    #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box:not(:hover),
+    #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box:not(:hover) {
+      background-color: transparent !important;
+    }
+    @media not -moz-pref("userChrome.urlbar.iconbox_with_separator") {
+      #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box,
+      #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box {
+        padding-inline: var(--urlbar-icon-padding) !important;
+      }
+    }
+    #identity-box[pageproxystate="valid"] #identity-icon-label {
+      display: none !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.hidden.bookmarkbar_icon") {
+  #PlacesToolbarItems .bookmark-item > .toolbarbutton-icon {
+    display: none;
+  }
+}
+@media -moz-pref("userChrome.hidden.bookmarkbar_label") {
+  #PlacesToolbarItems .bookmark-item > .toolbarbutton-text {
+    visibility: collapse; /* display: none is not work */
+  }
+}
+
+@media -moz-pref("userChrome.hidden.disabled_menu") {
+  menu[disabled="true"],
+  menuitem:not(#context-back, #context-forward)[disabled="true"] {
+    visibility: collapse !important;
+  }
+  @media -moz-pref("widget.macos.native-context-menus") or -moz-pref("widget.gtk.native-context-menus") {
+    #context-back[disabled="true"],
+    #context-forward[disabled="true"] {
+      visibility: collapse !important;
+    }
+  }
+}
+/** Icons *********************************************************************/
+@media not -moz-pref("userChrome.icon.disabled") {
+  /** Icons - List **************************************************************/
+  :root {
+    --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    --uc-tab-icon: url("chrome://browser/skin/lepton/tab.svg");
+    --uc-tab-copy-icon: url("chrome://browser/skin/lepton/tab-copy.svg");
+    --uc-tab-unload-icon: url("chrome://browser/skin/lepton/tab-unload.svg");
+    --uc-tab-multiple-icon: url("chrome://browser/skin/lepton/tab-desktop-multiple.svg");
+    --uc-tab-close-icon: url("chrome://browser/skin/lepton/close-tab.svg");
+    --uc-tab-close-duplicate-icon: url("chrome://browser/skin/lepton/close-duplicate-tabs.svg");
+    --uc-new-tab-icon: url("chrome://browser/skin/lepton/new-tab.svg");
+    --uc-new-tab-forward-icon: url("chrome://browser/skin/lepton/new-tab-forward.svg");
+    --uc-new-tab-skip-forward-icon: url("chrome://browser/skin/lepton/new-tab-skip-forward.svg");
+    --uc-new-tab-multiple-icon: url("chrome://browser/skin/lepton/new-tab-multiple.svg");
+    --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
+    --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
+  }
+  @media -moz-pref("userChrome.icon.library") {
+    :root {
+      --uc-folder-icon: url("chrome://browser/skin/lepton/folder.svg");
+    }
+  }
+  @media -moz-pref("userChrome.tab.connect_to_window") {
+    :root {
+      --uc-tab-icon: url("chrome://browser/skin/lepton/tab-photon.svg");
+      --uc-tab-copy-icon: url("chrome://browser/skin/lepton/tab-copy-photon.svg");
+      --uc-tab-unload-icon: url("chrome://browser/skin/lepton/tab-unload-photon.svg");
+      --uc-tab-multiple-icon: url("chrome://browser/skin/lepton/tab-multiple.svg");
+      --uc-tab-close-icon: url("chrome://browser/skin/lepton/close-tab-photon.svg");
+      --uc-tab-close-duplicate-icon: url("chrome://browser/skin/lepton/close-duplicate-tabs-photon.svg");
+      --uc-new-tab-icon: url("chrome://browser/skin/lepton/new-tab-photon.svg");
+      --uc-new-tab-forward-icon: url("chrome://browser/skin/lepton/new-tab-forward-photon.svg");
+      --uc-new-tab-skip-forward-icon: url("chrome://browser/skin/lepton/new-tab-skip-forward-photon.svg");
+    }
+  }
+  @supports selector(:has(a)) {
+    :root:has(#sidebar-box[positionend]) {
+      --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg");
+      --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg");
+    }
+  }
+  #TabsToolbar #new-tab-button {
+    --uc-new-tab-icon: url(chrome://global/skin/icons/plus.svg);
+  }
+  .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+  #urlbar-engine-one-off-item-tabs {
+    list-style-image: var(--uc-tab-icon) !important;
+  }
+  /** Library - Icons Replace ***************************************************/
+  @media -moz-pref("userChrome.icon.library") {
+    /*= Standard Folder - More Visible ===========================================*/
+    /* on Toolbar and Menus */
+    :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+      .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]),
+    :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(title, container),
+    #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]),
+    #editBMPanel_folderMenuList .folder-icon:not([id]),
+    .downloadIconShow > .button-box > .button-icon {
+      list-style-image: var(--uc-folder-icon) !important;
+    }
+    /* Standard Folder - Open */
+    :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+      .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"],
+    :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(title, container, open) {
+      list-style-image: url("chrome://browser/skin/lepton/folder-open.svg") !important;
+    }
+    /*= Other Folder - Inbox Icon ================================================*/
+    /* on Menus */
+    #PlacesToolbar #OtherBookmarks,
+    #BMB_bookmarksPopup #BMB_unsortedBookmarks,
+    #bookmarksMenuPopup #menu_unsortedBookmarks,
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks),
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, queryFolder_unfiled_____),
+    #editBMPanel_unfiledRootItem,
+    #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] {
+      list-style-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg") !important;
+    }
+    /* Other Folder - Open */
+    #PlacesToolbar #OtherBookmarks[open="true"],
+    #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"],
+    #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"],
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks),
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) {
+      list-style-image: url("chrome://browser/skin/lepton/mail-inbox.svg") !important;
+    }
+    /*= Default Icon - Override ===================================================*/
+    /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */
+    /* Query */
+    :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) {
+      list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important;
+    }
+    /* History */
+    :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer),
+    :-moz-any(#historyTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
+      list-style-image: url("chrome://browser/skin/history.svg") !important;
+    }
+    /* Downloads */
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
+      list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important;
+    }
+    /* Tag */
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+    .bookmark-item[query][tagContainer] {
+      list-style-image: url("chrome://browser/skin/lepton/tag.svg") !important;
+    }
+    /* Bookmark */
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
+      list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
+    }
+    /* Bookmark Toolbar */
+    #BMB_bookmarksPopup #BMB_bookmarksToolbar,
+    #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+    #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+    #editBMPanel_toolbarFolderItem,
+    #bookmarksToolbarFolderMenu,
+    #BMB_bookmarksToolbar,
+    #panelMenu_bookmarksToolbar,
+    #bookmarks-toolbar-button,
+    #bookmarks-toolbar-placeholder {
+      list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg") !important;
+    }
+    /* Bookmark Menu */
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, queryFolder_menu________) {
+      list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important;
+    }
+    /*= Default Icon - Open ======================================================*/
+    /* Query */
+    :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+      .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"]
+      > .menu-iconic-left
+      > .menu-iconic-icon {
+      transform: rotate(15deg) !important;
+    }
+    /* History */
+    :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer),
+    :-moz-any(#historyTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) {
+      list-style-image: url("chrome://browser/skin/lepton/history-reverse.svg") !important;
+    }
+    /* Tag */
+    :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+      .bookmark-item[container="true"][tagContainer="true"][open="true"],
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer),
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) {
+      list-style-image: url("chrome://browser/skin/lepton/tag-open.svg") !important;
+    }
+    /* Bookmark */
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
+      list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
+    }
+    /* Bookmark Toolbar */
+    #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"],
+    #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
+      list-style-image: url("chrome://browser/skin/lepton/bookmarksToolbar-open-alt.svg") !important;
+    }
+    /* Bookmark Menu */
+    :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+      treechildren::-moz-tree-image(container, open, queryFolder_menu________) {
+      list-style-image: url("chrome://browser/skin/lepton/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */
+    }
+    @-moz-document url("chrome://browser/content/places/places.xhtml")
+    {
+      @media (-moz-gtk-csd-available) {
+        /*= Menubar - Icons ==========================================================*/
+        #organizeButton,
+        #viewMenu,
+        #maintenanceButton,
+        #back-button,
+        #forward-button,
+        #clearDownloadsButton {
+          fill: currentColor !important;
+          -moz-context-properties: fill, fill-opacity, stroke !important;
+        }
+        /* Add */
+        #organizeButton {
+          list-style-image: url("chrome://global/skin/icons/settings.svg") !important;
+        }
+        #viewMenu {
+          list-style-image: url("chrome://browser/skin/lepton/sort.svg") !important;
+        }
+        #maintenanceButton {
+          list-style-image: url("chrome://browser/skin/lepton/import-export.svg") !important;
+        }
+        #clearDownloadsButton {
+          list-style-image: url("chrome://global/skin/icons/delete.svg") !important;
+        }
+        #clearDownloadsButton > .toolbarbutton-icon {
+          display: inline-flex !important;
+          display: -moz-inline-box !important;
+          margin-top: 0;
+          margin-bottom: 0;
+          margin-inline-start: 0;
+          margin-inline-end: 2px;
+        }
+        /* Replace */
+        #back-button {
+          list-style-image: url("chrome://browser/skin/back.svg") !important;
+        }
+        #forward-button {
+          list-style-image: url("chrome://browser/skin/forward.svg") !important;
+        }
+        #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+        #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+          transform: scaleX(-1) !important;
+        }
+      }
+    }
+  }
+  /** Panel - Icons *************************************************************/
+  @media -moz-pref("userChrome.icon.panel") {
+    /*= Padding ==================================================================*/
+    :root {
+      --arrowpanel-menuicon-padding: 8px;
+      --arrowpanel-menublank-padding: calc(
+        var(--arrowpanel-menuicon-padding) * 2 + var(--arrowpanel-menuitem-padding-inline)
+      ) !important;
+      --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important;
+      --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important;
+    }
+    .subviewbutton > .toolbarbutton-icon {
+      width: 16px;
+    }
+    @media not -moz-pref("userChrome.icon.panel_full") {
+      :root {
+        /* Global */
+        --arrowpanel-menuicon-paddingx2: calc(var(--arrowpanel-menuicon-padding) * 2);
+        /* General Panel */
+        --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-paddingx2) + 8px) !important;
+        --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important;
+        /* Blank Menu Left Padding */
+        --arrowpanel-menuimageblank-padding-horizontal: calc(
+          var(--arrowpanel-menuicon-paddingx2) + var(--arrowpanel-menuitem-padding-inline)
+        );
+        --arrowpanel-menuitemblank-padding: calc(var(--arrowpanel-menuitem-padding-block) + 1px);
+      }
+    }
+    #downloadsHistory .button-text,
+    .subviewbutton > .toolbarbutton-text {
+      padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
+    }
+    .toolbaritem-combined-buttons:not(.unified-extensions-item)
+      > .subviewbutton:not(.subviewbutton-iconic)
+      > .toolbarbutton-text {
+      padding-inline-start: 0 !important;
+    }
+    #panelMenu_bookmarksMenu .subviewbutton[disabled="true"],
+    #appMenu_historyMenu .subviewbutton[disabled="true"] {
+      margin-inline-start: 0 !important;
+      padding-inline-start: 0 !important;
+    }
+    #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text,
+    #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text {
+      padding-inline-start: var(--arrowpanel-menublank-padding) !important;
+    }
+    #appMenu-proton-update-banner .toolbarbutton-text {
+      margin-inline-start: 0 !important;
+      padding-inline-start: 0 !important; /* FF v107 */
+    }
+    #appMenu-multiView .subviewbutton::before,
+    #appMenu-proton-update-banner::before {
+      display: inline-flex;
+      display: -moz-inline-box;
+      margin-inline-end: var(--arrowpanel-menuicon-padding);
+      width: 16px;
+      height: 16px;
+    }
+    #appMenu-proton-update-banner {
+      margin-bottom: 2px !important;
+      padding-inline-start: var(--arrowpanel-menuitem-padding-inline) !important;
+    }
+    #appMenu-fxa-status2,
+    #appMenu-zoom-controls2,
+    #appMenu-zoom-controls {
+      align-items: center;
+      padding-top: var(--arrowpanel-menuimageblank-padding-block) !important;
+      padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important;
+    }
+    #appMenu-zoom-controls2::before,
+    #appMenu-zoom-controls::before {
+      margin-inline-end: 0 !important;
+    }
+    #appMenu-zoomReduce-button2,
+    #appMenu-zoomReset-button2,
+    #appMenu-zoomEnlarge-button2,
+    #appMenu-fullscreen-button2 {
+      --arrowpanel-menuitem-padding-block: 0px;
+    }
+    .subviewbutton[type="checkbox"]:not([checked="true"], #allTabsMenu_sortTabsButton) > .toolbarbutton-text {
+      margin-left: 16px !important;
+    }
+    /* Icons Color */
+    #appMenu-multiView .subviewbutton::before,
+    #appMenu-proton-update-banner::before,
+    #downloadsHistory .button-icon,
+    .subviewbutton:not(#appMenu-proton-update-banner) > image {
+      fill: currentColor !important;
+      fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important;
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+    }
+    #appMenu-zoomReduce-button2 > .toolbarbutton-icon,
+    #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon {
+      stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important;
+    }
+    #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon,
+    #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon {
+      stroke: var(--button-hover-bgcolor) !important;
+    }
+    .subviewbutton[disabled="true"] > image {
+      /* Ghost icons when disabled */
+      opacity: 0.4;
+    }
+    /*= Panel - Main =============================================================*/
+    #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon {
+      display: inline-flex !important;
+      display: -moz-inline-box !important;
+      margin-inline-start: var(--arrowpanel-menuicon-padding);
+      order: -1 !important;
+      -moz-box-ordinal-group: 0 !important;
+    }
+    #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon {
+      display: inline-flex !important;
+    }
+    #appMenu-update-banner::before,
+    #appMenu-proton-update-banner::before {
+      content: url("chrome://browser/skin/lepton/whatsnew.svg");
+      margin-inline-end: 0px !important;
+    }
+    #appMenu-fxa-status2::before {
+      /* Don't exist img tag */
+      content: url("chrome://browser/skin/fxa/avatar-empty.svg");
+    }
+    #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"])::before {
+      display: none;
+    }
+    #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"])
+      #appMenu-fxa-label2::before {
+      /* url("https://profile.accounts.firefox.com/v1/avatar/a") */
+      content: "";
+      border-radius: 50% !important;
+      background-size: 16px !important;
+      background-image: var(--avatar-image-url) !important;
+    }
+    #appMenu-profiles-button > image,
+    #appMenu-empty-profiles-button > image {
+      fill: transparent !important;
+    }
+    #appMenu-empty-profiles-button,
+    #PanelUI-fxa-menu-empty-profiles-button {
+      list-style-image: url("chrome://browser/content/profiles/assets/16_heart.svg");
+    }
+    #profiles-manage-profiles-button {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    #new-tab-button {
+      list-style-image: var(--uc-new-tab-icon) !important;
+    }
+    @media -moz-pref("userChrome.icon.panel_full") or -moz-pref("userChrome.icon.panel_photon") {
+      #appMenu-new-tab-button2 {
+        list-style-image: var(--uc-new-tab-icon);
+      }
+    }
+    @media -moz-pref("userChrome.icon.panel_photon") {
+      #appMenu-save-file-button2,
+      #appMenu-find-button2,
+      #appMenu-more-button2 {
+        padding-top: var(--arrowpanel-menuitemblank-padding) !important;
+        padding-bottom: var(--arrowpanel-menuitemblank-padding) !important;
+      }
+      #appMenu-zoom-controls2,
+      #appMenu-zoom-controls {
+        padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important;
+      }
+    }
+    @media not -moz-pref("userChrome.icon.panel_photon") {
+      @media not -moz-pref("userChrome.icon.panel_full") {
+        #appMenu-new-tab-button2,
+        #appMenu-passwords-button,
+        #appMenu-extensions-themes-button,
+        #appMenu-save-file-button2,
+        #appMenu-find-button2,
+        #appMenu-more-button2,
+        #appMenu-help-button2,
+        #appMenu-quit-button2 {
+          padding-top: var(--arrowpanel-menuitemblank-padding-block) !important;
+          padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important;
+        }
+        #appMenu-zoom-controls2,
+        #appMenu-zoom-controls {
+          padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important;
+        }
+      }
+    }
+    #appMenu-new-window-button2 {
+      list-style-image: url("chrome://browser/skin/window.svg");
+    }
+    #appMenu-new-private-window-button2 {
+      list-style-image: url("chrome://browser/skin/privateBrowsing.svg");
+    }
+    #appMenu-bookmarks-button {
+      list-style-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    #appMenu-history-button {
+      list-style-image: url("chrome://browser/skin/history.svg");
+    }
+    #appMenu-downloads-button {
+      list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+    }
+    @media -moz-pref("userChrome.icon.panel_full") or -moz-pref("userChrome.icon.panel_photon") {
+      #appMenu-passwords-button {
+        list-style-image: url("chrome://browser/skin/login.svg");
+      }
+      #appMenu-extensions-themes-button {
+        list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+      }
+    }
+    #appMenu-print-button2 {
+      list-style-image: url("chrome://global/skin/icons/print.svg");
+    }
+    @media -moz-pref("userChrome.icon.panel_full") {
+      #appMenu-save-file-button2 {
+        list-style-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #appMenu-find-button2 {
+        list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+      }
+      #appMenu-translate-button {
+        list-style-image: url("chrome://browser/skin/lepton/translations.svg");
+      }
+      #appMenu-zoom-controls2::before,
+      #appMenu-zoom-controls::before {
+        content: url("chrome://browser/skin/lepton/screenshot.svg");
+      }
+    }
+    #save-page-button {
+      list-style-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg") !important;
+    }
+    #open-file-button {
+      list-style-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg") !important;
+    }
+    #cut-button {
+      list-style-image: url("chrome://browser/skin/lepton/edit-cut.svg") !important;
+    }
+    #copy-button {
+      list-style-image: url("chrome://browser/skin/lepton/edit-copy.svg") !important;
+    }
+    #paste-button {
+      list-style-image: url("chrome://browser/skin/lepton/edit-paste.svg") !important;
+    }
+    #characterencoding-button {
+      list-style-image: url("chrome://browser/skin/lepton/characterEncoding.svg") !important;
+    }
+    #screenshot-button {
+      list-style-image: url("chrome://browser/skin/lepton/screenshot-1.svg") !important;
+    }
+    #email-link-button {
+      list-style-image: url("chrome://browser/skin/lepton/mail.svg") !important;
+    }
+    #panic-button {
+      list-style-image: url("chrome://browser/skin/lepton/forget.svg") !important;
+    }
+    #profiler-button-button > .toolbarbutton-icon {
+      list-style-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+    }
+    #developer-button {
+      list-style-image: url("chrome://browser/skin/lepton/wrench-filled.svg") !important;
+    }
+    #appMenu-settings-button {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    @media -moz-pref("userChrome.icon.panel_full") {
+      #appMenu-more-button2 {
+        list-style-image: url("chrome://browser/skin/lepton/ion.svg");
+      }
+    }
+    @media -moz-pref("userChrome.icon.panel_full") or -moz-pref("userChrome.icon.panel_photon") {
+      #appMenu-help-button2 {
+        list-style-image: url("chrome://global/skin/icons/help.svg");
+      }
+      #appMenu-quit-button2 {
+        list-style-image: url("chrome://browser/skin/lepton/quit.svg");
+      }
+    }
+    /*= Panel - Account ==========================================================*/
+    #PanelUI-fxa-menu-connect-device-button .toolbarbutton-icon,
+    #PanelUI-fxa-menu-account-signout-button .toolbarbutton-icon {
+      width: 16px !important;
+      height: 16px !important;
+    }
+    /* Default */
+    #fxa-manage-account-button::before {
+      content: "";
+      display: inline-flex;
+      display: -moz-inline-box;
+      width: 32px !important;
+      height: 32px !important;
+      border-radius: 50%;
+      background-size: 32px;
+      background-image: var(--avatar-image-url);
+      margin-inline-end: var(--arrowpanel-menuicon-padding);
+    }
+    @media -moz-pref("userChrome.icon.account_image_to_right") {
+      #fxa-manage-account-button::before {
+        order: 2 !important;
+        -moz-box-ordinal-group: 2 !important;
+      }
+    }
+    @media -moz-pref("userChrome.icon.account_label_to_right") {
+      #fxa-menu-header-title,
+      #fxa-menu-header-description {
+        text-align: right;
+      }
+    }
+    .syncNowBtn {
+      visibility: visible !important;
+      order: -1 !important;
+      -moz-box-ordinal-group: 0 !important;
+      margin-inline-end: var(--arrowpanel-menuicon-padding);
+    }
+    #PanelUI-fxa-menu-setup-sync-button {
+      list-style-image: url("chrome://browser/skin/sync.svg");
+    }
+    @media (prefers-reduced-motion: reduce) {
+      #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon,
+      #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon,
+      .syncNowBtn[syncstatus="active"] {
+        list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important;
+      }
+    }
+    #PanelUI-fxa-menu-connect-device-button {
+      list-style-image: url("chrome://browser/skin/lepton/add-device.svg");
+    }
+    #PanelUI-fxa-menu-sendtab-button {
+      list-style-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+    }
+    #PanelUI-fxa-menu-sync-prefs-button {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    #PanelUI-fxa-menu-account-signout-button {
+      list-style-image: url("chrome://browser/skin/lepton/sign-out.svg");
+    }
+    #PanelUI-remotetabs-view-managedevices::before {
+      /* Box */
+      content: "";
+      padding-inline-end: 16px;
+      padding-block: 1px;
+      margin-inline-end: var(--arrowpanel-menuicon-padding);
+      /* Color */
+      fill: currentColor;
+      fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+      -moz-context-properties: fill, fill-opacity, stroke;
+      background-size: 16px;
+      background-repeat: no-repeat;
+      background-position: left center;
+      background-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    .PanelUI-remotetabs-notabsforclient-label {
+      margin-inline-start: calc(
+        var(--arrowpanel-menuicon-padding) + var(--arrowpanel-menuitem-padding-inline)
+      ) !important;
+      padding-inline-start: var(--arrowpanel-menublank-padding) !important;
+    }
+    /* Change Separator */
+    #PanelUI-fxa-menu::before {
+      content: "";
+      display: flex;
+      display: -moz-box;
+      border-bottom: 1px solid var(--panel-separator-color);
+      margin: var(--panel-separator-margin);
+      padding: 0;
+    }
+    #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator {
+      display: none;
+    }
+    #PanelUI-fxa-menu > :first-child,
+    #fxa-manage-account-button {
+      order: -1;
+      -moz-box-ordinal-group: 0;
+    }
+    #PanelUI-sign-out-separator {
+      display: none;
+    }
+    .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""],
+    .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""] {
+      list-style-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+    }
+    .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]),
+    .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]) {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    .sendToDevice-device[clientType="phone"] {
+      list-style-image: url("chrome://browser/skin/lepton/device-phone.svg") !important;
+    }
+    .sendToDevice-device[clientType="tablet"] {
+      list-style-image: url("chrome://browser/skin/lepton/device-tablet.svg") !important;
+    }
+    .sendToDevice-device[clientType="desktop"] {
+      list-style-image: url("chrome://browser/skin/lepton/device-desktop.svg") !important;
+    }
+    .sendToDevice-device[clientType="tv"] {
+      list-style-image: url("chrome://browser/skin/lepton/device-tv.svg") !important;
+    }
+    .sendToDevice-device[clientType="vr"] {
+      list-style-image: url("chrome://browser/skin/lepton/device-vr.svg") !important;
+    }
+    /*= Panel - Bookmark =========================================================*/
+    #panelMenuBookmarkThisPage {
+      list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
+    }
+    panelMenuBookmarkThisPage[starred] {
+      list-style-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    #panelMenu_searchBookmarks {
+      list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+    }
+    #panelMenu_viewBookmarksToolbar {
+      list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+    }
+    #panelMenu_showAllBookmarks {
+      list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+    }
+    /*= Panel - History ==========================================================*/
+    #appMenuRecentlyClosedTabs {
+      list-style-image: var(--uc-tab-icon);
+    }
+    #appMenuRecentlyClosedWindows {
+      list-style-image: url("chrome://browser/skin/window.svg");
+    }
+    #appMenuSearchHistory {
+      list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+    }
+    #appMenuRestoreSession,
+    #appMenu-restoreSession {
+      list-style-image: url("chrome://browser/skin/lepton/restore-session.svg");
+    }
+    #appMenuClearRecentHistory {
+      list-style-image: url("chrome://browser/skin/lepton/forget.svg");
+    }
+    #PanelUI-historyMore {
+      list-style-image: url("chrome://browser/skin/history.svg");
+    }
+    #appMenu-library-recentlyClosedTabs {
+      list-style-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+    }
+    #appMenu-library-recentlyClosedWindows {
+      list-style-image: url("chrome://browser/skin/lepton/restore-session.svg");
+    }
+    /*= Panel - More tools =======================================================*/
+    #appmenu-moreTools-button {
+      list-style-image: url("chrome://browser/skin/customize.svg");
+    }
+    /* Web Developer Tools */
+    #appmenu-developer-tools-view .subviewbutton:nth-child(1),
+    #PanelUI-developer-tools-view .subviewbutton:nth-child(1) {
+      list-style-image: url("chrome://browser/skin/lepton/developer.svg");
+    }
+    /* Task Manager */
+    #appmenu-developer-tools-view .subviewbutton:nth-child(2),
+    #PanelUI-developer-tools-view .subviewbutton:nth-child(2) {
+      list-style-image: url("chrome://browser/skin/lepton/performance.svg");
+    }
+    /* Remote Debugging - Edge bug.svg */
+    #appmenu-developer-tools-view .subviewbutton:nth-child(3),
+    #PanelUI-developer-tools-view .subviewbutton:nth-child(3) {
+      list-style-image: url("chrome://browser/skin/lepton/bug.svg");
+    }
+    /* Browser Toolbox - Edge webdeveloper.svg */
+    #appmenu-developer-tools-view .subviewbutton:nth-child(4),
+    #PanelUI-developer-tools-view .subviewbutton:nth-child(4) {
+      list-style-image: url("chrome://browser/skin/lepton/window-dev-tools.svg");
+    }
+    /* Browser Content Toolbox */
+    #appmenu-developer-tools-view .subviewbutton:nth-child(5),
+    #PanelUI-developer-tools-view .subviewbutton:nth-child(5) {
+      list-style-image: url("chrome://browser/skin/lepton/command-frames.svg");
+    }
+    /* Browser Console */
+    #appmenu-developer-tools-view .subviewbutton:nth-last-child(5),
+    #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) {
+      list-style-image: url("chrome://browser/skin/lepton/command-console.svg");
+    }
+    /* Responsive Design Mode */
+    #appmenu-developer-tools-view .subviewbutton:nth-last-child(4),
+    #PanelUI-developer-tools-view .subviewbutton:nth-last-child(4) {
+      list-style-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+    }
+    /* Eyedropper */
+    #appmenu-developer-tools-view .subviewbutton:nth-last-child(3),
+    #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) {
+      list-style-image: url("chrome://browser/skin/lepton/command-eyedropper.svg");
+    }
+    /* Page Source - Edge file-search.svg */
+    #appmenu-developer-tools-view .subviewbutton:nth-last-child(2),
+    #PanelUI-developer-tools-view .subviewbutton:nth-last-child(2) {
+      list-style-image: url("chrome://browser/skin/lepton/document-search.svg");
+    }
+    /* Extensions for Devel */
+    #appmenu-developer-tools-view .subviewbutton:nth-last-child(1),
+    #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) {
+      list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+    }
+    #appmenu-developer-tools-view .subviewbutton:last-child {
+      margin-bottom: 6px !important;
+    }
+    /*= Panel - Help =============================================================*/
+    #appMenu_menu_openHelp {
+      list-style-image: url("chrome://global/skin/icons/help.svg");
+    }
+    #appMenu_feedbackPage {
+      list-style-image: url("chrome://browser/skin/lepton/send.svg");
+    }
+    #appMenu_helpSafeMode {
+      list-style-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+    }
+    #appMenu_troubleShooting {
+      list-style-image: url("chrome://global/skin/icons/more.svg");
+    }
+    #appMenu-report-broken-site-button,
+    #appMenu_help_reportSiteIssue {
+      list-style-image: url("chrome://global/skin/icons/lightbulb.svg");
+    }
+    #appMenu_menu_HelpPopup_reportPhishingtoolmenu {
+      list-style-image: url("chrome://global/skin/icons/warning.svg");
+    }
+    #appMenu_helpSwitchDevice {
+      list-style-image: url("chrome://browser/skin/lepton/add-device.svg");
+    }
+    #appMenu_aboutName {
+      list-style-image: url("chrome://global/skin/icons/info.svg");
+    }
+    /*= Panel - Library ==========================================================*/
+    #appMenu-library-bookmarks-button {
+      list-style-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    #appMenu-library-history-button {
+      list-style-image: url("chrome://browser/skin/history.svg");
+    }
+    #appMenu-library-downloads-button {
+      list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+    }
+    /*= Panel - Downloads ========================================================*/
+    #downloadsHistory {
+      list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+    }
+    #downloadsHistory .box-inherit.button-box {
+      display: inline-flex !important;
+      display: -moz-inline-box !important;
+    }
+    /*= Toolbar - Overflow Menu ==================================================*/
+    #overflowMenu-customize-button {
+      list-style-image: url("chrome://browser/skin/customize.svg");
+    }
+    /*= Tabbar - All Tab Menu ====================================================*/
+    #allTabsMenu-undoCloseTab {
+      list-style-image: url("chrome://browser/skin/lepton/undo.svg");
+    }
+    #allTabsMenu-searchTabs {
+      list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+    }
+    #allTabsMenu-syncedTabs {
+      list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+    }
+    #allTabsMenu-closeDuplicateTabs {
+      list-style-image: var(--uc-tab-close-duplicate-icon);
+    }
+    #allTabsMenu-containerTabsButton {
+      list-style-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+    }
+    #allTabsMenu-hiddenTabsButton {
+      list-style-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+    }
+    #allTabsMenu-containerTabsView .subviewbutton:last-child {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    /*= BMB_bookmarksPopup =======================================================*/
+    #BMB_viewBookmarksSidebar {
+      --menuitem-image: var(--uc-sidebar-icon);
+    }
+    #BMB_viewBookmarksSidebar[data-l10n-args='{"isVisible":true}'] {
+      --menuitem-image: url("chrome://global/skin/icons/close.svg");
+    }
+    #BMB_searchBookmarks {
+      --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+    }
+    #BMB_bookmarksShowAllTop,
+    #BMB_bookmarksShowAll {
+      --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+    }
+    #BMB_bookmarksToolbar {
+      --menuitem-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+    }
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      #BMB_bookmarksShowAllTop {
+        list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important;
+      }
+      #BMB_bookmarksShowAllTop > .menu-iconic-left {
+        display: flex !important;
+        display: -moz-box !important;
+      }
+    }
+    /* BMB_bookmarksToolbarPopup */
+    #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":true}'] {
+      --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+    }
+    #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":false}'] {
+      --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+    }
+    /*= protections-popup ========================================================*/
+    #protections-popup-settings-button > .protections-popup-settings-icon,
+    #protections-popup-show-report-button > .protections-popup-show-report-icon {
+      -moz-context-properties: fill, fill-opacity, stroke;
+      fill: currentColor;
+      margin-inline-end: 1em;
+    }
+    #protections-popup-report-broken-site-button {
+      list-style-image: url("chrome://global/skin/icons/lightbulb.svg");
+    }
+    #protections-popup-settings-button > .protections-popup-settings-icon,
+    #protections-popup-multiView .panel-subview-footer-button {
+      list-style-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    #protections-popup-show-report-button > .protections-popup-show-report-icon {
+      /* chrome://browser/skin/controlcenter/dashboard.svg */
+      list-style-image: url("chrome://browser/skin/lepton/dashboard.svg");
+    }
+    /*= identity-popup ===========================================================*/
+    #identity-popup-clear-sitedata-button,
+    #identity-popup-more-info {
+      padding-inline: 5px !important;
+    }
+    #identity-popup-securityView-body {
+      margin-inline-start: 32px !important; /* Original: 10px */
+    }
+    #identity-popup-clear-sitedata-button {
+      list-style-image: url("chrome://browser/skin/lepton/broom.svg");
+    }
+    /*= sidebarMenu-popup ========================================================*/
+    #identity-popup-more-info.subviewbutton {
+      list-style-image: url("chrome://global/skin/icons/info.svg");
+    }
+    #identity-popup-more-info:is(menuitem) {
+      --menuitem-image: url("chrome://global/skin/icons/info.svg");
+    }
+    #sidebar-switcher-bookmarks.subviewbutton {
+      list-style-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    #sidebar-switcher-bookmarks:is(menuitem) {
+      --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    #sidebar-switcher-history.subviewbutton {
+      list-style-image: url("chrome://browser/skin/history.svg");
+    }
+    #sidebar-switcher-history:is(menuitem) {
+      --menuitem-image: url("chrome://browser/skin/history.svg");
+    }
+    #sidebar-switcher-tabs.subviewbutton {
+      list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+    }
+    #sidebar-switcher-tabs:is(menuitem) {
+      --menuitem-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+    }
+    #sidebar-switcher-genai-chat.subviewbutton {
+      list-style-image: url("chrome://mozapps/skin/extensions/category-discover.svg");
+    }
+    #sidebar-switcher-genai-chat:is(menuitem) {
+      --menuitem-image: url("chrome://mozapps/skin/extensions/category-discover.svg");
+    }
+    #sidebar-reverse-position.subviewbutton {
+      list-style-image: var(--uc-sidebar-icon-reverse);
+    }
+    #sidebar-reverse-position:is(menuitem) {
+      --menuitem-image: var(--uc-sidebar-icon-reverse);
+    }
+    #sidebarMenu-popup > *.subviewbutton[data-l10n-id="sidebar-menu-close"] {
+      list-style-image: url("chrome://global/skin/icons/close.svg");
+    }
+    #sidebarMenu-popup > *:is(menuitem)[data-l10n-id="sidebar-menu-close"] {
+      --menuitem-image: url("chrome://global/skin/icons/close.svg");
+    }
+    /*= sidebar-context-menu =====================================================*/
+    #sidebar-context-menu-manage-extension {
+      --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+    }
+    #sidebar-context-menu-remove-extension {
+      --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+    }
+    #sidebar-context-menu-report-extension {
+      --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+    }
+    #sidebar-context-menu-unpin-extension {
+      --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+    }
+    #sidebar-context-menu-hide-sidebar {
+      --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+    }
+    #sidebar-context-menu-customize-sidebar {
+      --menuitem-image: url("chrome://browser/skin/customize.svg");
+    }
+    #sidebar-context-menu-enable-vertical-tabs {
+      --menuitem-image: url("chrome://browser/skin/sidebar-collapsed.svg");
+    }
+    /*= chrome://browser/content/syncedtabs/sidebar.xhtml ========================*/
+    .item.client[clientType="phone"] > .item-title-container > .item-icon-container {
+      background-image: url("chrome://browser/skin/lepton/device-phone.svg") !important;
+    }
+    .item.client[clientType="tablet"] > .item-title-container > .item-icon-container {
+      background-image: url("chrome://browser/skin/lepton/device-tablet.svg") !important;
+    }
+    .item.client[clientType="desktop"] > .item-title-container > .item-icon-container {
+      background-image: url("chrome://browser/skin/lepton/device-desktop.svg") !important;
+    }
+    .item.client[clientType="tv"] > .item-title-container > .item-icon-container {
+      background-image: url("chrome://browser/skin/lepton/device-tv.svg") !important;
+    }
+    .item.client[clientType="vr"] > .item-title-container > .item-icon-container {
+      background-image: url("chrome://browser/skin/lepton/device-vr.svg") !important;
+    }
+    /*= unified-extensions-view ===================================================*/
+    #unified-extensions-manage-extensions {
+      list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+    }
+    /*= Compatibility ============================================================*/
+    .sync-engine-tabs .checkbox-icon,
+    .sync-engine-tabs.sync-engine-image,
+    #sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
+    #sync-button {
+      list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg") !important;
+    }
+    /*= Tab Mix Plus =============================================================*/
+    #allTabsMenu_sortTabsButton {
+      list-style-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+    }
+  }
+  /** Menu - Icons Layout *******************************************************/
+  @media -moz-pref("userChrome.icon.menu") {
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+    #main-menubar > menu {
+      -moz-appearance: none !important; /* Linux: menulist */
+    }
+    /* Icon */
+    #main-menubar > menu,
+    :not(menu, #ContentSelectDropdown)
+      > menupopup:not(.in-menulist)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    :not(menu, #ContentSelectDropdown)
+      > menupopup:not(.in-menulist)
+      > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #menu_FilePopup,
+        #menu_EditPopup,
+        #menu_viewPopup,
+        #goPopup,
+        #historyMenuPopup,
+        #bookmarksMenuPopup,
+        #menu_ProfilesPopup,
+        #menu_ToolsPopup,
+        #windowPopup,
+        #menu_HelpPopup,
+        #usercssloader-menupopup,
+        #sidebar-context-menu
+      )
+      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #menu_FilePopup,
+        #menu_EditPopup,
+        #menu_viewPopup,
+        #goPopup,
+        #historyMenuPopup,
+        #bookmarksMenuPopup,
+        #menu_ProfilesPopup,
+        #menu_ToolsPopup,
+        #windowPopup,
+        #menu_HelpPopup,
+        #usercssloader-menupopup,
+        #sidebar-context-menu
+      )
+      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #context_sendTabToDevicePopupMenu,
+        #context-sendpagetodevice-popup,
+        #context-sendlinktodevice-popup,
+        #frame > menupopup,
+        #spell-dictionaries-menu,
+        #context-ask-chat > menupopup
+      )
+      > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+    .openintabs-menuitem,
+    #blockedPopupDontShowMessage,
+    #BMB_viewBookmarksToolbar,
+    #sidebarMenu-popup:is(menupopup),
+    #context_openANewTab.tabmix-newtab-menu-icon {
+      /* Color */
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+      fill: currentColor !important;
+      stroke: currentColor;
+      /* Layout */
+      background-size: 16px !important;
+      background-repeat: no-repeat !important;
+      background-image: var(--menuitem-image);
+    }
+    #tabContextMenu > .tabmix-newtab-menu-icon {
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+      fill: currentColor !important;
+    }
+    /* For native context menus */
+    @media -moz-pref("widget.macos.native-context-menus") or -moz-pref("widget.gtk.native-context-menus") {
+      :not(menu, #ContentSelectDropdown)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      :not(menu, #ContentSelectDropdown)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+      }
+    }
+    /* Padding */
+    :root {
+      --uc-menu-background-position: left;
+      --context-menu-background-padding-default: 5px;
+      --context-menu-background-padding: var(--context-menu-background-padding-default);
+    }
+    :root:-moz-locale-dir(rtl) {
+      --uc-menu-background-position: right;
+    }
+    :not(menu, #ContentSelectDropdown, #context-navigation)
+      > menupopup:not(.in-menulist)
+      > menuitem:not(.menuitem-iconic),
+    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu:not(.menu-iconic),
+    :not(menu, #ContentSelectDropdown, #context-navigation)
+      > menupopup:not(.in-menulist)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    :not(menu, #ContentSelectDropdown, #context-navigation)
+      > menupopup:not(.in-menulist)
+      > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #menu_FilePopup,
+        #menu_EditPopup,
+        #menu_viewPopup,
+        #goPopup,
+        #historyMenuPopup,
+        #bookmarksMenuPopup,
+        #menu_ProfilesPopup,
+        #menu_ToolsPopup,
+        #windowPopup,
+        #menu_HelpPopup,
+        #usercssloader-menupopup,
+        #sidebar-context-menu
+      )
+      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #menu_FilePopup,
+        #menu_EditPopup,
+        #menu_viewPopup,
+        #goPopup,
+        #historyMenuPopup,
+        #bookmarksMenuPopup,
+        #menu_ProfilesPopup,
+        #menu_ToolsPopup,
+        #windowPopup,
+        #menu_HelpPopup,
+        #usercssloader-menupopup,
+        #sidebar-context-menu
+      )
+      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(
+        #context_sendTabToDevicePopupMenu,
+        #context-sendpagetodevice-popup,
+        #context-sendlinktodevice-popup,
+        #frame > menupopup,
+        #spell-dictionaries-menu,
+        #context-ask-chat > menupopup
+      )
+      > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+    .openintabs-menuitem,
+    #blockedPopupDontShowMessage,
+    #BMB_viewBookmarksToolbar,
+    #sidebarMenu-popup:is(menupopup),
+    #context_openANewTab.tabmix-newtab-menu-icon {
+      background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
+      padding-inline-start: var(--context-menu-background-padding) !important;
+    }
+    #sidebarMenu-popup:is(menupopup):not(panel) {
+      --context-menu-background-padding: var(--context-menu-background-padding-default);
+      padding-inline-start: 0 !important;
+    }
+    :not(menu, #ContentSelectDropdown, #context-navigation)
+      > #sidebarMenu-popup:is(menupopup):not(panel)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+      padding-inline-start: 28px !important;
+      margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
+    }
+    /* Menubar */
+    @media -moz-pref("userChrome.icon.global_menubar") {
+      #main-menubar > menu {
+        background-position: var(--uc-menu-background-position) var(--context-menu-background-padding-default) center !important;
+        padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
+        padding-inline-end: 3px;
+      }
+      #main-menubar > menu:first-child {
+        background-position: var(--uc-menu-background-position)
+          calc(3px + var(--context-menu-background-padding-default)) center !important;
+        padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important;
+      }
+      #main-menubar > menu menupopup {
+        --menuitem-image: none; /* Prevent Image Inheritance */
+      }
+      @media (-moz-platform: windows) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          transform: translateY(-1px) !important; /* Fix menu top padding position */
+          padding-inline-start: 0.3em !important;
+        }
+      }
+      @media (-moz-gtk-csd-available) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          padding-inline-start: 3px;
+        }
+      }
+      @media not -moz-pref("userChrome.padding.global_menubar") {
+        #main-menubar > menu {
+          padding-block: 2px !important;
+        }
+      }
+    }
+    /* Padding - Non Native */
+    @media (-moz-platform: windows) and (-moz-platform: windows),
+      (-moz-gtk-csd-available) and (-moz-platform: windows) {
+      :root {
+        --context-menu-background-padding: 1em;
+        --context-menu-text-padding-default: 24px;
+        --context-menu-text-padding: var(--context-menu-text-padding-default);
+        --menu-background-padding-default: calc(
+          var(--context-menu-background-padding) + var(--context-menu-text-padding)
+        );
+        --bookmark-menu-icon-align-padding: 0px;
+      }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(
+          #menu_FilePopup,
+          #menu_EditPopup,
+          #menu_viewPopup,
+          #goPopup,
+          #historyMenuPopup,
+          #bookmarksMenuPopup,
+          #menu_ProfilesPopup,
+          #menu_ToolsPopup,
+          #windowPopup,
+          #menu_HelpPopup,
+          #usercssloader-menupopup,
+          #sidebar-context-menu
+        )
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(
+          #context_sendTabToDevicePopupMenu,
+          #context-sendpagetodevice-popup,
+          #context-sendlinktodevice-popup,
+          #frame > menupopup,
+          #spell-dictionaries-menu,
+          #context-ask-chat > menupopup
+        )
+        > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+      .openintabs-menuitem,
+      #blockedPopupDontShowMessage,
+      #BMB_viewBookmarksToolbar,
+      #sidebarMenu-popup:is(menupopup),
+      #context_openANewTab.tabmix-newtab-menu-icon {
+        padding-inline-start: var(--menu-background-padding-default) !important;
+        margin-left: 0 !important;
+      }
+      .menupopup-arrowscrollbox {
+        padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
+      }
+    }
+    @media (-moz-platform: windows), (-moz-gtk-csd-available) {
+      @media -moz-pref("userChrome.theme.non_native_menu") {
+        @media (-moz-platform: windows) and (-moz-gtk-csd-available),
+          (-moz-gtk-csd-available) and (-moz-gtk-csd-available) {
+          :root {
+            --context-menu-background-padding: 1em;
+            --context-menu-text-padding-default: 24px;
+            --context-menu-text-padding: var(--context-menu-text-padding-default);
+            --menu-background-padding-default: calc(
+              var(--context-menu-background-padding) + var(--context-menu-text-padding)
+            );
+            --bookmark-menu-icon-align-padding: 0px;
+          }
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          :not(menu, #ContentSelectDropdown, #context-navigation)
+            > menupopup:not(.in-menulist)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(
+              #menu_FilePopup,
+              #menu_EditPopup,
+              #menu_viewPopup,
+              #goPopup,
+              #historyMenuPopup,
+              #bookmarksMenuPopup,
+              #menu_ProfilesPopup,
+              #menu_ToolsPopup,
+              #windowPopup,
+              #menu_HelpPopup,
+              #usercssloader-menupopup,
+              #sidebar-context-menu
+            )
+            menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+          menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+          menupopup:is(
+              #context_sendTabToDevicePopupMenu,
+              #context-sendpagetodevice-popup,
+              #context-sendlinktodevice-popup,
+              #frame > menupopup,
+              #spell-dictionaries-menu,
+              #context-ask-chat > menupopup
+            )
+            > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+          .openintabs-menuitem,
+          #blockedPopupDontShowMessage,
+          #BMB_viewBookmarksToolbar,
+          #sidebarMenu-popup:is(menupopup),
+          #context_openANewTab.tabmix-newtab-menu-icon {
+            padding-inline-start: var(--menu-background-padding-default) !important;
+            margin-left: 0 !important;
+          }
+          .menupopup-arrowscrollbox {
+            padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
+          }
+        }
+      }
+    }
+    /* Padding - Windows */
+    @media (-moz-platform: windows) {
+      :root {
+        --bookmark-menu-icon-text-padding: calc(
+          var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+        );
+        --bookmark-menu-icon-background-padding: calc(
+          var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
+        );
+      }
+    }
+    /* Padding - Linux */
+    @media (-moz-gtk-csd-available) {
+      :root {
+        --context-menu-background-padding-default: 6px;
+        --context-menu-text-padding: 21px;
+      }
+      .menu-icon {
+        display: unset !important;
+      }
+      #main-menubar > menu > .menu-icon {
+        display: none !important;
+      }
+    }
+    /* Padding - Mac */
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      :root {
+        --context-menu-background-padding-default: 10px;
+        --context-menu-mac-padding: 21px;
+      }
+      /* context menu width */
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      #blockedPopupDontShowMessage {
+        padding-inline-end: var(--context-menu-background-padding) !important;
+      }
+      /* text position */
+      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem > .menu-text,
+      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu > .menu-text {
+        padding-inline-start: var(--context-menu-mac-padding) !important;
+      }
+      /* Checkbox menuitem, None iconic menu */
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem[type="checkbox"] {
+        padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
+      }
+      /* Global Menu */
+      @media -moz-pref("userChrome.icon.global_menu.mac") {
+        menupopup:is(
+            #menu_FilePopup,
+            #menu_EditPopup,
+            #menu_viewPopup,
+            #goPopup,
+            #historyMenuPopup,
+            #bookmarksMenuPopup,
+            #menu_ProfilesPopup,
+            #menu_ToolsPopup,
+            #windowPopup,
+            #menu_HelpPopup,
+            #usercssloader-menupopup,
+            #sidebar-context-menu
+          )
+          menuitem:not(.menuitem-iconic, .bookmark-item),
+        menupopup:is(
+            #menu_FilePopup,
+            #menu_EditPopup,
+            #menu_viewPopup,
+            #goPopup,
+            #historyMenuPopup,
+            #bookmarksMenuPopup,
+            #menu_ProfilesPopup,
+            #menu_ToolsPopup,
+            #windowPopup,
+            #menu_HelpPopup,
+            #usercssloader-menupopup,
+            #sidebar-context-menu
+          )
+          menu:not(.menu-iconic) {
+          list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+        }
+      }
+      /* Exeptions */
+      #unified-extensions-context-menu > menuitem::before {
+        padding-inline: 0 !important;
+      }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+        padding-inline-start: 0 !important;
+      }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] {
+        padding-left: 4px !important;
+        background-image: none !important;
+      }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] {
+        padding-left: calc(var(--context-menu-mac-padding) - 8px) !important;
+      }
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"]
+        .menu-iconic-text {
+        padding-left: 8px !important;
+      }
+    }
+    /*= Bookmark Menu - Layout ===================================================*/
+    /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
+       * #BMB_bookmarksPopup: looks like arrow panel
+       */
+    /* Empty Menu */
+    menupopup menupopup[emptyplacesresult] .menu-text,
+    #PersonalToolbar menupopup[emptyplacesresult] .menu-text {
+      margin-inline-start: 0 !important;
+    }
+    /* Bookmark Popup - As Arrow Panel */
+    #BMB_bookmarksPopup,
+    #PersonalToolbar {
+      --context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline);
+    }
+    /* Windows */
+    @media (-moz-platform: windows) {
+      /* Bookmark Popup - None icon menu */
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
+        padding-inline-start: var(--bookmark-menu-icon-text-padding) !important;
+        background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important;
+      }
+    }
+    /* Windows 7, 8 */
+    /* Linux */
+    @media (-moz-gtk-csd-available) {
+      /* Global Menu */
+      menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item {
+        padding-inline-start: var(--context-menu-background-padding) !important;
+      }
+      /* Bookmark Popup - Iconic menu */
+      #BMB_bookmarksPopup .menu-iconic-text,
+      #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text {
+        margin-inline-start: -1px !important;
+      }
+      /* Bookmark Popup - None icon menu */
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
+      }
+      @media -moz-pref("userChrome.theme.non_native_menu") {
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+        #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+        #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+          margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
+        }
+      }
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"])
+        .menu-text,
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text,
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text {
+        margin-inline-start: var(--context-menu-text-padding) !important;
+      }
+    }
+    @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+      /* Bookmark Popup - As Arrow Panel */
+      #PersonalToolbar menupopup menuitem,
+      #PersonalToolbar menupopup menu {
+        padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
+      }
+      /* Bookmark Popup - None icon menu */
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
+        padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important;
+      }
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
+      }
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"])
+        > .menu-text,
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text,
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text {
+        padding-inline-start: var(--context-menu-mac-padding) !important;
+      }
+    }
+    @media -moz-pref("userChrome.icon.context_menu") {
+      /** Context Menu - Icons ******************************************************/ /*= tabContextMenu ===========================================================*/
+      #context_openANewTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
+      #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
+      #sidebartabs_asamuzak_jp-menuitem-_newTab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInPrivateWindow {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #context_reloadTab,
+      #context_reloadSelectedTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_reloadTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_reloadTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:reloadTree,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuReloadTab,
+      #sidebartabs_asamuzak_jp-menuitem-_reloadTab,
+      #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+      }
+      #context_playTab,
+      #context_playSelectedTabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/play-fill.svg");
+      }
+      #context_toggleMuteTab,
+      #context_toggleMuteSelectedTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"],
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab,
+      #sidebartabs_asamuzak_jp-menuitem-_muteTab {
+        --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+        stroke: transparent !important;
+      }
+      #context_toggleMuteTab[muted],
+      #context_toggleMuteSelectedTabs[muted],
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"],
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"],
+      #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] {
+        --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
+      }
+      #context_pinTab,
+      #context_pinSelectedTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_pinTab,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab,
+      #sidebartabs_asamuzak_jp-menuitem-_pinTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+      }
+      #context_unpinTab,
+      #context_unpinSelectedTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_unpinTab,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab[label="Unpin Tab"],
+      #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+      }
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/align-distribute-top.svg");
+      }
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/align-space-evenly-vertical.svg");
+      }
+      #context_duplicateTab,
+      #context_duplicateTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
+      #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
+        --menuitem-image: var(--uc-tab-copy-icon);
+      }
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
+        --menuitem-image: var(--uc-tab-unload-icon);
+      }
+      #context_bookmarkTab,
+      #context_bookmarkSelectedTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_bookmarkTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_bookmarkSelected,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:bookmarkTree,
+      #sidebartabs_asamuzak_jp-menuitem-_bookmarkTab,
+      #sidebartabs_asamuzak_jp-menuitem-_bookmarkAllTabs {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #context_moveTabOptions,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_moveTab,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuMoveTab,
+      #sidebartabs_asamuzak_jp-menuitem-_moveTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/arrow-swap.svg");
+      }
+      #context_sendTabToDevice,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice {
+        --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+      }
+      #context_sendTabToDevice:is([disabled="true"]) + #context_shareTabURL,
+      #context_sendTabToDevice:is([disabled="true"]) + menuitem.share-tab-url-item {
+        /* At windows */
+        --menuitem-image: url("chrome://browser/skin/lepton/share.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #context_shareTabURL,
+        menuitem.share-tab-url-item {
+          --menuitem-image: url("chrome://browser/skin/lepton/share.svg");
+        }
+      }
+      #context_reopenInContainer,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_reopenInContainer,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuOpenInContextualTab,
+      #sidebartabs_asamuzak_jp-menuitem-_openNewTabInContainer,
+      #sidebartabs_asamuzak_jp-menuitem-_reopenTabInContainer {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #context_selectAllTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
+      #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
+        --menuitem-image: var(--uc-tab-multiple-icon);
+      }
+      #context_closeTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:closeTree,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTab,
+      #sidebartabs_asamuzak_jp-menuitem-_closeTab {
+        --menuitem-image: url("chrome://global/skin/icons/close.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs,
+        #context_closeDuplicateTabs {
+          --menuitem-image: var(--uc-tab-close-duplicate-icon);
+        }
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #context_closeTabOptions,
+        #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs,
+        #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs,
+        #sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs {
+          --menuitem-image: url("chrome://browser/skin/lepton/filter-dismiss.svg");
+        }
+      }
+      #context_undoCloseTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab,
+      #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_undoCloseTab,
+      #tabcenter-reborn_ariasuni-menuitem-_contextMenuUndoCloseTab,
+      #sidebartabs_asamuzak_jp-menuitem-_undoCloseTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      /*= new-tab-button-popup =====================================================*/
+      #new-tab-button-popup > menuitem[command="Browser:NewUserContextTab"],
+      .new-tab-popup > menuitem[command="Browser:NewUserContextTab"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #new-tab-button-popup > menuitem[command="Browser:OpenAboutContainers"],
+      .new-tab-popup > menuitem[command="Browser:OpenAboutContainers"] {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= toolbar-context-menu =====================================================*/
+      .customize-context-manageExtension {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      .customize-context-removeExtension {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .customize-context-reportExtension {
+        --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+      }
+      .customize-context-moveToPanel {
+        --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+      }
+      #toolbar-context-autohide-downloads-button {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+      }
+      .customize-context-removeFromToolbar {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #toolbar-context-always-open-downloads-panel {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/drawer-arrow-download.svg");
+      }
+      #toolbar-context-openANewTab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #toolbar-context-reloadSelectedTab,
+      #toolbar-context-reloadSelectedTabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+      }
+      #toolbar-context-bookmarkSelectedTab,
+      #toolbar-context-bookmarkSelectedTabs {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #toolbar-context-selectAllTabs {
+        --menuitem-image: var(--uc-tab-multiple-icon);
+      }
+      #toolbar-context-undoCloseTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      #toolbar-context-customize-sidebar {
+        --menuitem-image: url("chrome://browser/skin/customize.svg");
+      }
+      #toolbar-context-toggle-vertical-tabs {
+        --menuitem-image: url("chrome://browser/skin/sidebar-collapsed.svg");
+      }
+      #toggle_toolbar-menubar {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/calendar-agenda.svg");
+      }
+      #toggle_PersonalToolbar {
+        /* Also placeContext */
+        --menuitem-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+      }
+      menuitem.viewCustomizeToolbar {
+        --menuitem-image: url("chrome://browser/skin/customize.svg");
+      }
+      .fullscreen-context-autohide {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+      }
+      #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] {
+        --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+      }
+      /*= Tab Mix Plus =============================================================*/
+      @media (-moz-platform: windows) {
+        #context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left {
+          display: none;
+        }
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #tm-duplicateinWin {
+          --menuitem-image: url("chrome://browser/skin/lepton/tab-desktop-multiple-bottom.svg");
+        }
+        #tm-mergeWindowsTab {
+          --menuitem-image: url("chrome://browser/skin/lepton/merge.svg");
+        }
+      }
+      #tm-renameTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+      }
+      #tm-copyTabUrl {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      #tm-autoreloadTab_menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/timer10.svg");
+      }
+      #context_reloadTabOptions {
+        --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #context_reloadTabOptions {
+          --menuitem-image: url("chrome://browser/skin/lepton/filter-reload.svg");
+        }
+      }
+      @media not -moz-pref("userChrome.icon.menu.full") {
+        #context_reloadTabOptions + #context_reloadTab {
+          --menuitem-image: url("chrome://browser/skin/lepton/blank.svg");
+        }
+      }
+      #tm-docShell {
+        --menuitem-image: url("chrome://browser/skin/permissions.svg");
+      }
+      #tm-freezeTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/weather-snowflake.svg");
+      }
+      #tm-protectTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/shield-task.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #tm-lockTab {
+          --menuitem-image: url("chrome://browser/skin/lepton/lock-closed.svg");
+        }
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #context_bookmarkAllTabs {
+          --menuitem-image: url("chrome://browser/skin/lepton/bookmark-multiple.svg");
+        }
+      }
+      /*= contentAreaContextMenu ===================================================*/
+      #context-viewsource-goToLine {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-number-format.svg");
+      }
+      #context-viewsource-wrapLongLines {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/arrow-sort-down-lines.svg");
+      }
+      #context-viewsource-highlightSyntax {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/highlight.svg");
+      }
+      #spell-no-suggestions {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-proofing-tools.svg");
+      }
+      #spell-add-to-dictionary,
+      #spell-add-dictionaries {
+        --menuitem-image: url("chrome://browser/skin/lepton/book-add.svg");
+      }
+      #spell-undo-add-to-dictionary {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      #context-openlinkincurrent {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #context-openlinkincontainertab,
+      #context-openlinkintab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #context-openlinkinusercontext-menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #context-openlink {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #context-openlinkprivate {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #context-bookmarklink {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #context-savelink {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #context-savelinktopocket {
+        --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+      }
+      #context-copyemail {
+        --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+      }
+      #context-copyphone {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-phone.svg");
+      }
+      #context-copylink {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      #context-stripOnShareLink {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-no-tracking.svg");
+      }
+      #context-sendlinktodevice {
+        --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+      }
+      #context-media-play {
+        --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+      }
+      #context-media-pause {
+        --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+      }
+      #context-media-mute {
+        --menuitem-image: url("chrome://global/skin/media/audio-muted.svg");
+      }
+      #context-media-unmute {
+        --menuitem-image: url("chrome://global/skin/media/audio.svg");
+      }
+      #context-media-playbackrate {
+        --menuitem-image: url("chrome://browser/skin/lepton/time-picker.svg");
+      }
+      #context-media-loop {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/arrow-repeat-all.svg");
+      }
+      #context-leave-dom-fullscreen {
+        --menuitem-image: url("chrome://global/skin/media/fullscreenExitButton.svg");
+      }
+      #context-video-fullscreen {
+        --menuitem-image: url("chrome://global/skin/media/fullscreenEnterButton.svg");
+      }
+      #context-media-hidecontrols {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      #context-media-showcontrols {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+      }
+      #context-viewvideo {
+        --menuitem-image: url("chrome://browser/skin/lepton/video.svg");
+      }
+      #context-video-pictureinpicture {
+        /* checkbox */
+        --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg");
+      }
+      #context-reloadimage {
+        --menuitem-image: url("chrome://browser/skin/lepton/image-arrow-counterclockwise.svg");
+      }
+      #context-viewimage {
+        --menuitem-image: url("chrome://browser/skin/lepton/image-add.svg");
+      }
+      #context-saveimage {
+        --menuitem-image: url("chrome://browser/skin/lepton/image.svg");
+      }
+      #context-video-saveimage {
+        --menuitem-image: url("chrome://browser/skin/lepton/video-snapshot.svg");
+      }
+      #context-savevideo {
+        --menuitem-image: url("chrome://browser/skin/lepton/video.svg");
+      }
+      #context-saveaudio {
+        --menuitem-image: url("chrome://global/skin/media/audio.svg");
+      }
+      #context-copyimage-contents {
+        --menuitem-image: url("chrome://browser/skin/lepton/image-copy.svg");
+      }
+      #context-copyimage,
+      #context-copyvideourl,
+      #context-copyaudiourl {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      #context-sendimage,
+      #context-sendvideo,
+      #context-sendaudio {
+        --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+      }
+      #context-viewimageinfo {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+      #context-viewimagedesc {
+        --menuitem-image: url("chrome://browser/skin/lepton/image-alt-text.svg");
+      }
+      #context-setDesktopBackground {
+        --menuitem-image: url("chrome://browser/skin/lepton/resize-image.svg");
+      }
+      #context-ctp-play {
+        --menuitem-image: url("chrome://global/skin/icons/plugin.svg");
+      }
+      #context-ctp-hide {
+        --menuitem-image: url("chrome://global/skin/icons/plugin-blocked.svg");
+      }
+      #context-savepage {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #context-pocket {
+        --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+      }
+      #context-sendpagetodevice {
+        --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+      }
+      #fill-login {
+        --menuitem-image: url("chrome://browser/skin/lepton/password.svg");
+      }
+      #fill-login-generated-password {
+        --menuitem-image: url("chrome://browser/skin/login.svg");
+      }
+      #use-relay-mask {
+        --menuitem-image: url("chrome://browser/skin/lepton/relay-logo.svg");
+      }
+      #manage-saved-logins {
+        --menuitem-image: url("chrome://browser/skin/lepton/key-multiple.svg");
+      }
+      #context-undo,
+      #context-pdfjs-undo {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #context-redo,
+        #context-pdfjs-redo {
+          --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+        }
+      }
+      #context-cut,
+      #context-pdfjs-cut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #context-copy,
+      #context-pdfjs-copy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #context-paste,
+      #context-pdfjs-paste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #context-delete,
+      #context-pdfjs-delete {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #context-selectall,
+      #context-pdfjs-selectall {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      #context-pdfjs-highlight-selection {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-editorHighlight.svg");
+      }
+      #context-reveal-password {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+      }
+      #context-print-selection {
+        --menuitem-image: url("chrome://global/skin/icons/print.svg");
+      }
+      #context-take-screenshot {
+        --menuitem-image: url("chrome://browser/skin/lepton/screenshot-1.svg");
+      }
+      #context-keywordfield {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #context-searchselect,
+      #context-searchselect-private {
+        --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+      }
+      #context-translate-selection {
+        --menuitem-image: url("chrome://browser/skin/lepton/translations.svg");
+      }
+      #context-ask-chat {
+        --menuitem-image: url("chrome://browser/skin/lepton/chat-sparkle.svg");
+      }
+      #frame {
+        --menuitem-image: url("chrome://browser/skin/lepton/command-frames.svg");
+      }
+      #spell-check-enabled {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/text-proofing-tools.svg");
+      }
+      #spell-add-dictionaries-main {
+        --menuitem-image: url("chrome://browser/skin/lepton/book-add.svg");
+      }
+      #spell-dictionaries {
+        --menuitem-image: url("chrome://browser/skin/lepton/book.svg");
+      }
+      #context-bidi-text-direction-toggle {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-direction-horizontal-ltr.svg");
+      }
+      #context-bidi-page-direction-toggle {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-landscape-split-hint.svg");
+      }
+      #context-viewpartialsource-selection,
+      #context-viewsource {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+      }
+      #context-inspect-a11y {
+        --menuitem-image: url("chrome://browser/skin/lepton/tool-accessibility.svg");
+      }
+      #context-inspect {
+        --menuitem-image: url("chrome://browser/skin/lepton/command-pick.svg");
+      }
+      #context-media-eme-learnmore {
+        /* iconic */
+      }
+      @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+        #context-back {
+          --menuitem-image: url("chrome://browser/skin/back.svg");
+        }
+        #context-forward {
+          --menuitem-image: url("chrome://browser/skin/forward.svg");
+        }
+        #context-reload {
+          --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+        }
+        #context-stop {
+          --menuitem-image: url("chrome://global/skin/icons/close.svg");
+        }
+        #context-bookmarkpage {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }
+      }
+      /*= context-ask-chat =========================================================*/
+      #ask-chat-shortcuts .toolbarbutton-icon {
+        order: -1;
+        margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important;
+      }
+      #ask-chat-shortcuts .subviewbutton:nth-child(1) {
+        list-style-image: url("chrome://browser/skin/lepton/apps-list-detail.svg");
+      }
+      #ask-chat-shortcuts .subviewbutton:nth-child(2) {
+        list-style-image: url("chrome://browser/skin/lepton/code-text.svg");
+      }
+      #ask-chat-shortcuts .subviewbutton:nth-child(3) {
+        list-style-image: url("chrome://browser/skin/lepton/tetris-app.svg");
+      }
+      #ask-chat-shortcuts .subviewbutton:nth-child(4) {
+        list-style-image: url("chrome://browser/skin/lepton/arrow-up-exclamation.svg");
+      }
+      #context-ask-chat menuitem:nth-child(1) {
+        --menuitem-image: url("chrome://browser/skin/lepton/apps-list-detail.svg");
+      }
+      #context-ask-chat menuitem:nth-child(2) {
+        --menuitem-image: url("chrome://browser/skin/lepton/code-text.svg");
+      }
+      #context-ask-chat menuitem:nth-child(3) {
+        --menuitem-image: url("chrome://browser/skin/lepton/tetris-app.svg");
+      }
+      #context-ask-chat menuitem:nth-child(4) {
+        --menuitem-image: url("chrome://browser/skin/lepton/arrow-up-exclamation.svg");
+      }
+      /*= main-context-menu-frame ==================================================*/
+      #context-showonlythisframe {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+      }
+      #context-openframeintab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #context-openframe {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #context-reloadframe {
+        --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+      }
+      #context-bookmarkframe {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #context-saveframe {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #context-printframe {
+        --menuitem-image: url("chrome://global/skin/icons/print.svg");
+      }
+      #context-take-frame-screenshot {
+        --menuitem-image: url("chrome://browser/skin/lepton/screenshot-1.svg");
+      }
+      #context-viewframesource {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+      }
+      #context-viewframeinfo {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+      /*= Tab Mix Plus =============================================================*/
+      #tm-autoreload_menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/timer10.svg");
+      }
+      #tm-linkWithhistory {
+        --menuitem-image: var(--uc-new-tab-skip-forward-icon);
+      }
+      #tm-openAllLinks {
+        --menuitem-image: var(--uc-new-tab-multiple-icon);
+      }
+      #tm-openinverselink {
+        --menuitem-image: var(--uc-new-tab-forward-icon);
+      }
+      #tm-content-closetab {
+        --menuitem-image: url("chrome://browser/skin/lepton/dismiss-filled.svg");
+      }
+      #tm-duplicateTabContext {
+        --menuitem-image: var(--uc-tab-copy-icon);
+      }
+      #tm-duplicateinWinContext {
+        --menuitem-image: url("chrome://browser/skin/lepton/tab-desktop-multiple-bottom.svg");
+      }
+      #tm-detachTabContext {
+        --menuitem-image: url("chrome://browser/skin/lepton/convert-range.svg");
+      }
+      #tm-mergeWindows {
+        --menuitem-image: url("chrome://browser/skin/lepton/merge.svg");
+      }
+      #tm-content-freezeTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/weather-snowflake.svg");
+      }
+      #tm-content-protectTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/shield-task.svg");
+      }
+      #tm-content-lockTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/lock-closed.svg");
+      }
+      #tm-content-undoCloseTab {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      /*= downloadsContextMenu =====================================================*/
+      .downloadPauseMenuItem {
+        --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+      }
+      .downloadResumeMenuItem {
+        --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+      }
+      .downloadUnblockMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+      }
+      .downloadUseSystemDefaultMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+      }
+      .downloadAlwaysUseSystemDefaultMenuItem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/folder-globe.svg");
+      }
+      .downloadAlwaysOpenSimilarFilesMenuItem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+      }
+      .downloadShowMenuItem {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
+      #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
+      #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      .downloadDeleteFileMenuItem {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .downloadRemoveFromHistoryMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+      }
+      #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
+      #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/broom.svg");
+      }
+      /*= placeContext =============================================================*/
+      #placesContext_open {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #placesContext_openBookmarkContainer\:tabs,
+      #placesContext_openBookmarkLinks\:tabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+      #placesContext_open\:newtab,
+      #placesContext_openContainer\:tabs,
+      #placesContext_openLinks\:tabs {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #placesContext_open\:newcontainertab {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #placesContext_open\:newwindow {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #placesContext_open\:newprivatewindow {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #placesContext_show_bookmark\:info,
+      #placesContext_show\:info,
+      #placesContext_show_folder\:info {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+      }
+      #placesContext_deleteBookmark,
+      #placesContext_deleteFolder,
+      #placesContext_delete,
+      #placesContext_delete_history {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #placesContext_deleteHost {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      #placesContext_sortBy\:name {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+      }
+      #placesContext_cut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #placesContext_copy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #placesContext_paste_group {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #placesContext_new\:bookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #placesContext_showInFolder,
+      #placesContext_new\:folder {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #placesContext_new\:separator {
+        --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+      }
+      #placesContext_paste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #placesContext_createBookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #show-other-bookmarks_PersonalToolbar {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/star-line-horizontal.svg");
+      }
+      #placesContext_showAllBookmarks {
+        --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+      }
+      .openintabs-menuitem {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+      /*= Notification =============================================================*/
+      #doNotDisturbMenuItem {
+        --menuitem-image: url(chrome://global/skin/media/pause-fill.svg);
+      }
+      #disableForOriginMenuItem {
+        --menuitem-image: url("chrome://global/skin/icons/blocked.svg");
+      }
+      #openSettingsMenuItem {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= blockedPopupOptions ======================================================*/
+      #blockedPopupAllowSite {
+        --menuitem-image: url("chrome://global/skin/icons/check.svg");
+      }
+      #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+      }
+      #blockedPopupDontShowMessage {
+        /* checkbox */
+        --menuitem-image: url("chrome://global/skin/icons/blocked.svg");
+      }
+      menuitem[data-l10n-id="popup-show-popup-menuitem"] {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+      }
+      /*= autohide-context =========================================================*/
+      #autohide-context > menuitem[data-l10n-id="full-screen-autohide"] {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+      }
+      #autohide-context > menuitem[data-l10n-id="full-screen-exit"] {
+        --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+      }
+      /*= pictureInPictureToggleContextMenu ========================================*/
+      #pictureInPictureToggleContextMenu > menuitem[oncommand="PictureInPicture.hideToggle();"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      /*= pageActionContextMenu ====================================================*/
+      .pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      .pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      /*= customizationPanelItemContextMenu ========================================*/
+      #customizationPanelItemContextMenuUnpin {
+        --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+      }
+      .customize-context-removeFromPanel {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      /*= customizationPaletteItemContextMenu ======================================*/
+      .customize-context-addToToolbar {
+        --menuitem-image: url("chrome://devtools/skin/images/dock-bottom.svg");
+      }
+      .customize-context-addToPanel {
+        --menuitem-image: url("chrome://browser/skin/menu.svg");
+      }
+      /*= customizationPanelContextMenu ============================================*/
+      #customizationPanelContextMenu > menuitem[command="cmd_CustomizeToolbars"] {
+        --menuitem-image: url("chrome://browser/skin/customize.svg");
+      }
+      /*= downloads-button-autohide-panel ==========================================*/
+      #downloads-button-autohide-checkbox {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+      }
+      /*= SyncedTabsSidebarContext =================================================*/
+      #syncedTabsOpenSelected {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #syncedTabsOpenSelectedInTab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #syncedTabsOpenSelectedInWindow {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #syncedTabsOpenSelectedInPrivateWindow {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #syncedTabsBookmarkSelected {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #syncedTabsCopySelected {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      #syncedTabsOpenAllInTabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+      #syncedTabsManageDevices {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      #syncedTabsRefresh {
+        --menuitem-image: url("chrome://browser/skin/sync.svg");
+      }
+      /*= SyncedTabsSidebarTabsFilterContext =======================================*/
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_undo"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_selectAll"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      #syncedTabsRefreshFilter {
+        --menuitem-image: url("chrome://browser/skin/sync.svg");
+      }
+      /*= urlbar-input-container ===================================================*/
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_undo"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_redo"] {
+          --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+        }
+      }
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #strip-on-share {
+          --menuitem-image: url("chrome://browser/skin/lepton/link-no-tracking.svg");
+        }
+      }
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #paste-and-go {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-paste-go.svg");
+        }
+      }
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_selectAll"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      /*= textbox-contextmenu ======================================================*/
+      /* Browser's Searchbar, Library's Searchbar, Page Info */
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        .textbox-contextmenu > menuitem[data-l10n-id="text-action-redo"] {
+          --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+        }
+      }
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .textbox-contextmenu > menuitem[data-l10n-id="text-action-select-all"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      /* Only searchbar */
+      @media -moz-pref("userChrome.icon.menu.full") {
+        menuitem.searchbar-paste-and-search {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-paste-search.svg");
+        }
+      }
+      menuitem.searchbar-clear-history {
+        --menuitem-image: url("chrome://browser/skin/lepton/forget.svg");
+      }
+      /*= context_sendTabToDevicePopupMenu =========================================*/
+      .sync-menuitem.sendtab-target[clientType="phone"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-phone.svg");
+      }
+      .sync-menuitem.sendtab-target[clientType="tablet"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-tablet.svg");
+      }
+      .sync-menuitem.sendtab-target[clientType="desktop"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-desktop.svg");
+      }
+      .sync-menuitem.sendtab-target[clientType="tv"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-tv.svg");
+      }
+      .sync-menuitem.sendtab-target[clientType="vr"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/device-vr.svg");
+      }
+      .sync-menuitem.sendtab-target[clientType=""] {
+        --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+      }
+      .sync-menuitem.sendtab-target:not([clientType]) {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= unified-extensions-context-menu ==========================================*/
+      .unified-extensions-context-menu-pin-to-toolbar {
+        --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+      }
+      .unified-extensions-context-menu-move-widget-up {
+        --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg");
+      }
+      .unified-extensions-context-menu-move-widget-down {
+        --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg");
+      }
+      .unified-extensions-context-menu-manage-extension {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      .unified-extensions-context-menu-remove-extension {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .unified-extensions-context-menu-report-extension {
+        --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+      }
+      /*= urlbarView-result-menu ===================================================*/
+      .urlbarView-result-menuitem[data-command="trendingblock"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      .urlbarView-result-menuitem[data-command="dismiss"] {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .urlbarView-result-menuitem[data-command="help"] {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+      /*= full-page-translations-panel-settings-menupopup ==========================*/
+      .manage-languages-menuitem {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+      /*= select-translations-panel-settings-menupopup =============================*/
+      #select-translations-panel-open-settings-page-menuitem {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      #select-translations-panel-about-translations-menuitem {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+    }
+    @media -moz-pref("userChrome.icon.global_menubar") {
+      /*= main-menubar =============================================================*/
+      #file-menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg");
+      }
+      #edit-menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+      }
+      #view-menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/content-view.svg");
+      }
+      #history-menu {
+        --menuitem-image: url("chrome://browser/skin/history.svg");
+      }
+      #bookmarksMenu {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #profiles-menu:is(menu) {
+        fill: transparent !important;
+        --menuitem-image: url("chrome://browser/content/profiles/assets/16_heart.svg");
+      }
+      #tools-menu {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbox.svg");
+      }
+      #tabSharingMenu {
+        --menuitem-image: url("chrome://browser/skin/notification-icons/screen.svg");
+      }
+      #helpMenu {
+        --menuitem-image: url("chrome://global/skin/icons/help.svg");
+      }
+      /*= Others ===================================================================*/
+      #alltabs-button {
+        list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+      }
+      #alltabs-button > .toolbarbutton-badge-stack > .toolbarbutton-icon {
+        /* Original
+           width: 20px;
+           margin: -2px;
+         */
+        width: 16px !important;
+        margin: 0 !important;
+      }
+    }
+    @media -moz-pref("userChrome.icon.global_menu") {
+      /** Global Menu ***************************************************************/
+      /*= menu_FilePopup ===========================================================*/
+      #menu_newNavigatorTab {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #menu_newUserContext {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #menu_newNavigator {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #menu_newPrivateWindow {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #menu_openFile {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+      }
+      #menu_close {
+        --menuitem-image: var(--uc-tab-close-icon);
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #menu_closeWindow {
+          --menuitem-image: url("chrome://browser/skin/lepton/close-window.svg");
+        }
+      }
+      #menu_savePage {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #menu_sendLink {
+        --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+      }
+      menu.share-tab-url-item {
+        --menuitem-image: url("chrome://browser/skin/share.svg");
+      }
+      #menu_print {
+        --menuitem-image: url("chrome://global/skin/icons/print.svg");
+      }
+      #menu_importFromAnotherBrowser {
+        --menuitem-image: url("chrome://browser/skin/import.svg");
+      }
+      #goOfflineMenuitem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/plug-disconnected.svg");
+      }
+      #menu_FileQuitItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/quit.svg");
+      }
+      /* Mange Containers */
+      #menu_newUserContext menupopup menuitem:last-child {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= menu_EditPopup ===========================================================*/
+      #menu_undo {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #menu_redo {
+          --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+        }
+      }
+      #menu_cut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #menu_copy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #menu_paste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #menu_delete {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #menu_selectAll {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      #menu_find {
+        --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #menu_findAgain {
+          --menuitem-image: url("chrome://browser/skin/lepton/find-again.svg");
+        }
+      }
+      #menu_preferences {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= menu_viewPopup ===========================================================*/
+      #viewToolbarsMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbar.svg");
+      }
+      #viewSidebarMenuMenu {
+        --menuitem-image: var(--uc-sidebar-icon);
+      }
+      #viewFullZoomMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/screenshot.svg");
+      }
+      #pageStyleMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-css.svg");
+      }
+      #repair-text-encoding {
+        --menuitem-image: url("chrome://browser/skin/lepton/characterEncoding.svg");
+      }
+      #enterFullScreenItem {
+        --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+      }
+      #exitFullScreenItem {
+        --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+      }
+      #fullScreenItem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+      }
+      #menu_readerModeItem {
+        --menuitem-image: url("chrome://browser/skin/reader-mode.svg");
+      }
+      #menu_showAllTabs {
+        --menuitem-image: var(--uc-tab-icon);
+      }
+      #documentDirection-swap {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-direction-horizontal-ltr.svg");
+      }
+      /* view-menu-popup sub menu */
+      #menu_customizeToolbars {
+        --menuitem-image: url("chrome://browser/skin/customize.svg");
+      }
+      /* viewSidebarMenu sub menu */
+      #menu_bookmarksSidebar {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #menu_historySidebar {
+        --menuitem-image: url("chrome://browser/skin/history.svg");
+      }
+      #menu_tabsSidebar {
+        --menuitem-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+      }
+      /* viewFullZoomMenu sub menu */
+      #menu_zoomEnlarge {
+        --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg");
+        stroke: transparent !important;
+      }
+      #menu_zoomReduce {
+        --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg");
+        stroke: transparent !important;
+      }
+      #menu_zoomReset {
+        --menuitem-image: url("chrome://browser/skin/lepton/resize.svg");
+      }
+      #toggle_zoom {
+        --menuitem-image: url("chrome://browser/skin/lepton/screenshot.svg");
+      }
+      /*= goPopup ==================================================================*/
+      #menu_showAllHistory {
+        --menuitem-image: url("chrome://browser/skin/history.svg");
+      }
+      #sanitizeItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/forget.svg");
+      }
+      #sync-tabs-menuitem {
+        --menuitem-image: url("chrome://browser/skin/sync.svg");
+      }
+      #historyRestoreLastSession {
+        --menuitem-image: url("chrome://browser/skin/lepton/restore-session.svg");
+      }
+      #hiddenTabsMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      #menu_searchHistory {
+        --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+      }
+      #historyUndoMenu {
+        --menuitem-image: var(--uc-tab-icon);
+      }
+      #historyUndoWindowMenu {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      /* sub menu */
+      #historyUndoPopup .restoreallitem {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+      #historyUndoWindowPopup .restoreallitem {
+        --menuitem-image: url("chrome://browser/skin/lepton/restore-session.svg");
+      }
+      /*= bookmarksMenuPopup =======================================================*/
+      #bookmarksShowAll {
+        --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+      }
+      #menu_bookmarkThisPage,
+      #menu_bookmarkAllTabs {
+        --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg");
+      }
+      #menu_bookmarkThisPage[data-l10n-id="menu-bookmark-edit"] {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #menu_searchBookmarks {
+        --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+      }
+      /*= menu_ProfilesPopup =======================================================*/
+      #menu_manageProfiles {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+      /*= menu_ToolsPopup ==========================================================*/
+      #menu_openDownloads {
+        --menuitem-image: url("chrome://browser/skin/downloads/downloads.svg");
+      }
+      #menu_openAddons {
+        --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg");
+      }
+      #sync-setup {
+        --menuitem-image: url("chrome://browser/skin/fxa/avatar-empty.svg");
+      }
+      #sync-syncnowitem {
+        --menuitem-image: url("chrome://browser/skin/sync.svg");
+      }
+      #menu_openFirefoxView {
+        --menuitem-image: url("chrome://browser/skin/lepton/firefox-view.svg");
+      }
+      #webDeveloperMenu,
+      #browserToolsMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+      }
+      #menu_pageInfo {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-endnote.svg");
+      }
+      /* menuWebDeveloperPopup sub menu */
+      #menu_devToolbox {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+      }
+      #menu_taskManager {
+        --menuitem-image: url("chrome://browser/skin/lepton/performance.svg");
+      }
+      #menu_devtools_remotedebugging {
+        --menuitem-image: url("chrome://browser/skin/lepton/bug.svg");
+      }
+      #menu_browserToolbox {
+        --menuitem-image: url("chrome://browser/skin/lepton/window-dev-tools.svg");
+      }
+      #menu_browserContentToolbox {
+        --menuitem-image: url("chrome://browser/skin/lepton/command-frames.svg");
+      }
+      #menu_browserConsole {
+        --menuitem-image: url("chrome://browser/skin/lepton/command-console.svg");
+      }
+      #menu_responsiveUI {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+      }
+      #menu_eyedropper {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/command-eyedropper.svg");
+      }
+      #menu_pageSource {
+        --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+      }
+      #extensionsForDevelopers {
+        --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg");
+      }
+      /*= windowPopup ==============================================================*/
+      #windowPopup > menuitem[command="minimizeWindow"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/arrow-between-down.svg");
+      }
+      #windowPopup > menuitem[command="zoomWindow"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/auto-fit-width.svg");
+      }
+      /*= menu_HelpPopup ===========================================================*/
+      #menu_openHelp {
+        --menuitem-image: url("chrome://global/skin/icons/help.svg");
+      }
+      #help_reportBrokenSite {
+        --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg");
+      }
+      #feedbackPage {
+        --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+      }
+      #helpSafeMode {
+        --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+      }
+      #troubleShooting {
+        --menuitem-image: url("chrome://global/skin/icons/more.svg");
+      }
+      #help_reportSiteIssue {
+        --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg");
+      }
+      #menu_HelpPopup_reportPhishingtoolmenu {
+        --menuitem-image: url("chrome://global/skin/icons/warning.svg");
+      }
+      #menu_HelpPopup_reportPhishingErrortoolmenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+      }
+      #helpSwitchDevice {
+        --menuitem-image: url("chrome://browser/skin/lepton/add-device.svg");
+      }
+      #aboutName {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
+    }
+    @media -moz-pref("userChrome.icon.library") {
+      /*= organizeButtonPopup ======================================================*/
+      #newbookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #newfolder {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #newseparator {
+        --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+      }
+      #orgUndo {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #orgRedo {
+          --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+        }
+      }
+      #orgCut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #orgCopy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #orgPaste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #orgDelete {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #orgSelectAll {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+      #orgClose {
+        --menuitem-image: url("chrome://global/skin/icons/close.svg");
+      }
+      /*= viewMenuPopup ============================================================*/
+      #viewColumns {
+        --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
+      }
+      #viewSort {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+      }
+      /*= maintenanceButtonPopup ===================================================*/
+      #backupBookmarks {
+        --menuitem-image: url("chrome://browser/skin/lepton/datastore.svg");
+      }
+      @media -moz-pref("userChrome.icon.menu.full") {
+        #fileRestoreMenu {
+          --menuitem-image: url("chrome://browser/skin/lepton/datarestore.svg");
+        }
+      }
+      #fileImport {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+      #fileExport {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+      }
+      #browserImport {
+        --menuitem-image: url("chrome://browser/skin/import.svg");
+      }
+    }
+  }
+  /** Icons - 1.25px Stroke Width ***********************************************/
+  @media -moz-pref("userChrome.icon.1-25px_stroke") {
+    #firefox-view-button {
+      list-style-image: url("chrome://browser/skin/lepton/firefox-view.svg") !important;
+    }
+    #reset-pbm-toolbar-button {
+      list-style-image: url("chrome://browser/skin/lepton/flame.svg") !important;
+    }
+    #translations-button-icon {
+      list-style-image: url("chrome://browser/skin/lepton/translations.svg") !important;
+    }
+    .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"],
+    [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image
+    {
+      content: url("chrome://browser/skin/lepton/performance.svg") !important;
+    }
+    .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image
+    {
+      content: url("chrome://browser/skin/lepton/developer.svg") !important;
+    }
+    .tabbrowser-tab:is([image="chrome://browser/skin/controlcenter/dashboard.svg"]) .tab-icon-image
+    {
+      content: url("chrome://browser/skin/lepton/dashboard.svg") !important;
+    }
+  }
+  /** Icons for fork browsers ***************************************************/
+  /*= Waterfox =================================================================*/
+  @media -moz-pref("userChrome.icon.panel") {
+    #appMenu-restart-button {
+      list-style-image: url("chrome://browser/skin/lepton/refresh-cw.svg") !important;
+    }
+  }
+  @media -moz-pref("userChrome.icon.menu") {
+    #menu_FileRestartItem {
+      --menuitem-image: url("chrome://browser/skin/lepton/refresh-cw.svg");
+    }
+    #toggle_status-dummybar {
+      --menuitem-image: url("chrome://browser/skin/lepton/pulse-square.svg");
+    }
+    menuitem.privatetab-icon {
+      --menuitem-image: url("chrome://browser/skin/lepton/private-favicon.svg");
+    }
+    #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure {
+      --menuitem-image: url("chrome://browser/skin/lepton/organization-horizontal.svg");
+    }
+  }
+  /*= Tor Browser ==============================================================*/
+  @media -moz-pref("userChrome.icon.panel") {
+    #appMenuNewIdentity {
+      list-style-image: url("chrome://browser/skin/new_identity.svg");
+    }
+    #appMenuNewCircuit {
+      list-style-image: url("chrome://browser/skin/new_circuit.svg");
+    }
+    #appMenu_torBrowserUserManual {
+      list-style-image: url("chrome://browser/skin/onion.svg");
+    }
+  }
+  @media -moz-pref("userChrome.icon.menu") {
+    #menu_newIdentity {
+      --menuitem-image: url("chrome://browser/skin/new_identity.svg");
+    }
+    #menu_newCircuit {
+      --menuitem-image: url("chrome://browser/skin/new_circuit.svg");
+    }
+    #torBrowserUserManual {
+      --menuitem-image: url("chrome://browser/skin/onion.svg");
+    }
+  }
+  /*= Floorp Browser ===========================================================*/
+  #ssbPageAction-image {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg");
+  }
+  #ssbPageAction-image[open-ssb="true"] {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+  }
+  @media -moz-pref("userChrome.icon.panel") {
+    #rebootappmenu {
+      list-style-image: url("chrome://browser/skin/lepton/refresh-cw.svg");
+    }
+    #openprofiledir {
+      list-style-image: var(--uc-folder-icon);
+    }
+    #appMenu-ssb-button {
+      list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg");
+    }
+    #appMenu-install-or-open-ssb-current-page-button {
+      list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg");
+    }
+    #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] {
+      list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+    }
+  }
+  @media -moz-pref("userChrome.icon.menu") {
+    #toggle_sharemode {
+      --menuitem-image: url("chrome://branding/content/about-logo-private.png");
+    }
+    #usercssloader-menu {
+      --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+    }
+    #usercssloader-menupopup > menu[data-l10n-id="css-menu"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/document-css.svg");
+    }
+    #usercssloader-submenupopup > menuitem[data-l10n-id="rebuild-css"] {
+      --menuitem-image: url("chrome://global/skin/icons/reload.svg");
+    }
+    #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+    }
+    #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] {
+      --menuitem-image: var(--uc-folder-icon);
+    }
+    #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] {
+      --menuitem-image: url("chrome://browser/skin/window.svg");
+    }
+    #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userContentCss-editor"] {
+      --menuitem-image: url("chrome://global/skin/icons/page-portrait.svg");
+    }
+    #context_toggleToPrivateContainer,
+    #open_in_private_container {
+      --menuitem-image: url("chrome://browser/skin/lepton/private-favicon.svg");
+    }
+    #toggle_statusBar {
+      --menuitem-image: url("chrome://browser/skin/lepton/pulse-square.svg");
+    }
+    #muteMenu {
+      --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+      stroke: transparent !important;
+    }
+    #unloadWebpanelMenu {
+      --menuitem-image: var(--uc-tab-unload-icon);
+    }
+    #changeUAWebpanelMenu {
+      --menuitem-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+      fill-opacity: 0;
+    }
+    #deleteWebpanelMenu {
+      --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+    }
+    #run-ssb-contextmenu {
+      --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+    }
+    #uninstall-ssb-contextmenu {
+      --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg");
+    }
+  }
+}
+/*@ DEPRECATED @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/** Default Theme - Contrast **************************************************/
+@media (-moz-bool-pref: "userChrome.theme.built_in_contrast") {
+  /*= Lightmode - Color darker =================================================*/
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] {
+    --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */
+  }
+  /*= Darkmode - Color lighter =================================================*/
+}
+@media (-moz-bool-pref: "userChrome.theme.built_in_contrast") and (-moz-platform: windows) {
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+    background-color: var(--lwt-accent-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.built_in_contrast") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox {
+    background-color: var(--lwt-accent-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.built_in_contrast") {
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
+    --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; /* Original: rgba(43, 42, 51, 1) */
+  }
+}
+/** Compatibility Fixes *******************************************************/
+/*= Theme - Compatibility ====================================================*/
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  /*= Hotfix #98 ===============================================================*/
+  /* Hidden Tab Panel Padding */
+  #allTabsMenu-hiddenTabsView .all-tabs-item {
+    margin-inline: 8px;
+    border-radius: 4px;
+  }
+  /*= Remote Tabs Panel's Bottom Padding =======================================*/
+  #PanelUI-remotetabs #PanelUI-remotetabs-main {
+    margin-bottom: 6px;
+  }
+  /*= Identity Popup Icon Crop =================================================*/
+  .identity-popup-security-connection.identity-button {
+    padding-block: 1px !important;
+  }
+  /*= Zoom in button's plus icon horizontal rate ===============================*/
+  #customization-palette-container #zoom-in-button > .toolbarbutton-icon,
+  #customization-panel-container #zoom-in-button > .toolbarbutton-icon,
+  #widget-overflow-mainView #zoom-in-button > .toolbarbutton-icon {
+    padding-inline-start: 0px !important;
+  }
+  /*= Subview button, Menu's right padding #597 ================================*/
+  .subviewbutton.toolbaritem-combined-buttons:not([shortcut]),
+  .subviewbutton.subviewbutton-nav:not([shortcut]),
+  menu.subviewbutton {
+    padding-inline-end: 0 !important;
+  }
+  #allTabsMenu-allTabsView .subviewbutton.subviewbutton-nav:not([shortcut]) {
+    padding-inline-end: var(--arrowpanel-menuitem-padding-inline) !important;
+  }
+  /*= First visible tab margin at maximized #332 ===============================*/
+  :root:is([tabsintitlebar="true"], [customtitlebar="true"])[sizemode="maximized"] #TabsToolbar {
+    margin-left: -1px;
+  }
+  /*= Disabled menu background color ===========================================*/
+  menuitem[disabled="true"],
+  menu[disabled="true"] {
+    background-color: transparent !important;
+  }
+  /*= Remove Tab Border ========================================================*/
+  /*= Tab Separator Color ======================================================*/
+  /*= Light Weight Theme =======================================================*/
+  /* Header Image */
+  /* Navbar Border */
+  /*= Findbar Border Color =====================================================*/
+  /*= Drop Indicator Color #473 ================================================*/
+  /*= Firefox View Border #498 =================================================*/
+  /*= Menubar rounding #814 ====================================================*/
+  /*= Infobar Align #858 =======================================================*/
+  /*= Inactive transparent #882 ================================================*/
+  /*= Tabpreviw transparent #890 ===============================================*/
+  /*= Design token =============================================================*/
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  /* TARGET: original, photon */
+  #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    /* Nightly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
+    border: unset !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    /* Nightly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
+    border: unset !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon,
+  :root:is(:-moz-lwtheme, [lwtheme]) .tab-background[selected] {
+    outline-color: transparent !important;
+  }
+  .keyboard-focused-tab > .tab-stack > .tab-background,
+  .tabbrowser-tab:focus:not([aria-activedescendant]) > .tab-stack > .tab-background {
+    outline: var(--focus-outline) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #TabsToolbar,
+  #nav-bar {
+    --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent); /* 60% at v105 */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root[lwtheme-image] > body {
+    background-image: var(--lwt-header-image) !important; /* Original: var(--lwt-header-image) */
+    background-repeat: no-repeat !important;
+    background-position: right top !important;
+    background-color: var(--lwt-accent-color, Window) !important;
+  }
+  :root[lwtheme-image] > body:-moz-window-inactive {
+    background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") and (min-width: 2500px) {
+  :root[lwtheme-image] > body {
+    background-size: contain;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") and (min-width: 2500px) and (-moz-bool-pref: "userChrome.compatibility.covered_header_image") {
+  :root[lwtheme-image] > body {
+    background-size: cover;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root[lwtheme-image] > body :root:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox {
+    background-image: var(--lwt-header-image), var(--lwt-additional-images) !important;
+    background-repeat: var(--lwt-background-tiling) !important;
+    background-position: var(--lwt-background-alignment) !important;
+    background-color: unset !important; /* Original:  var(--lwt-accent-color) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox {
+    --tabs-border-color: rgba(0, 0, 0, 0.4); /* Legacy: v96, (0, 0, 0, 0.3) -> (0, 0, 0, 0.4)  */
+    --lwt-tabs-border-color: rgba(0, 0, 0, 0.4);
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #main-window {
+    background-color: WindowFrame !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root[lwtheme][lwtheme-image] #customization-container {
+    background-image: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #customization-container {
+    background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root:not([lwtheme]) #customization-container {
+    background-color: var(--toolbar-non-lwt-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  html|input.findbar-textbox {
+    border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  treechildren::-moz-tree-cell-text(primary, dropOn),
+  treechildren::-moz-tree-drop-feedback,
+  vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] {
+    background-color: var(
+      --button-primary-bgcolor,
+      var(--focus-outline-color)
+    ) !important; /* Original: SelectedItem or AccentColor*/
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #bookmarksPanel[lwt-sidebar="true"] {
+    --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root:not([privatebrowsingmode="temporary"])[firefoxviewhidden] #firefox-view-button + #tabbrowser-tabs {
+    border-inline-start: none !important;
+    padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important;
+    margin-inline-start: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.static_separator") {
+  #tabbrowser-tabs {
+    border-inline-start: none !important;
+    padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important;
+    margin-inline-start: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #main-menubar {
+    --panel-border-radius: var(--arrowpanel-border-radius);
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  .container.infobar {
+    align-items: center !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+    color: color-mix(in srgb, currentColor calc(var(--inactive-titlebar-opacity, 0.75) * 100%), transparent) !important;
+    --inactive-toolbarbutton-icon-fill-opacity: calc(
+      var(--toolbarbutton-icon-fill-opacity, 1) * var(--inactive-titlebar-opacity, 0.75)
+    );
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .toolbarbutton-icon,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .toolbarbutton-icon,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .toolbarbutton-icon {
+    fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1);
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  #tab-preview-panel {
+    --panel-background: var(
+      --arrowpanel-background
+    ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */
+    --panel-color: var(
+      --arrowpanel-color
+    ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.theme") {
+  :root,
+  :host {
+    --button-color: var(--button-text-color);
+    --button-bgcolor: var(--button-background-color);
+    --button-hover-bgcolor: var(--button-background-color-hover);
+    --button-active-bgcolor: var(--button-background-color-active);
+    --button-primary-color: var(--button-text-color-primary);
+    --button-primary-bgcolor: var(--button-background-color-primary);
+    --button-primary-hover-bgcolor: var(--button-background-color-primary-hover);
+    --button-primary-active-bgcolor: var(--button-background-color-primary-active);
+  }
+}
+/*= OS - Compatibility =======================================================*/
+@media (-moz-bool-pref: "userChrome.compatibility.os") {
+  /*= Windows 10 - Top border of accent color at ESR #358 ======================*/
+  /*= Windows 7, 8 - Tab Bar Background *****************************************/
+  /*= Windows 7, 8 - Menu Bar ==================================================*/
+  /*= Windows - Native Menu ====================================================*/
+  /*= Linux - Light System Default Theme's Selected Tab ========================*/
+  /*= Titlebar Container Size at maximized #384 ================================*/
+  /*= Windows - Classic Theme #734 =============================================*/
+  /*= MacOS Fullscreen clipping #1045 ==========================================*/
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-platform: windows) {
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+    border-top: 0.5px solid rgb(47, 47, 47) !important;
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]):-moz-window-inactive #navigator-toolbox {
+    border-top-color: rgb(57, 57, 57) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-platform: windows) and (-moz-windows-accent-color-in-titlebar) {
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+    border-top-color: ActiveBorder !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-platform: windows) and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox {
+    border-top-color: -moz-accent-color !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-gtk-csd-available) {
+  /*= Linux - Global Menubar Active Color ====================================*/
+  #main-menubar > menu[open="true"],
+  #main-menubar > menu[_moz-menuactive="true"] {
+    color: inherit !important; /* Original: -moz-menubarhovertext */
+    background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
+  /* Because of
+    #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected], [multiselected]) > .tab-stack > .tab-background {
+      border: 1px solid var(--tab-line-color, rgba(128,128,142,0.9));
+      box-shadow: 0 0 4px rgba(128,128,142,0.5);
+    }
+   */
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    box-shadow: 0 0 4px rgba(128, 128, 142, 0.5) !important;
+  }
+  #TabsToolbar:not([brighttext])
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    box-shadow: 0 0 1px var(--tab-line-color, rgba(128, 128, 142, 0.9)), 0 0 4px rgba(128, 128, 142, 0.5) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-platform: windows) and (not (-moz-bool-pref: "userChrome.compatibility.os.windows_maximized")) {
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    /* -moz-default-appearance: -moz-window-titlebar */
+    appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.compatibility.os.windows_maximized") {
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #titlebar {
+    appearance: none !important;
+    padding-top: 8px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.os") {
+  :root[sizemode="fullscreen"][macOSNativeFullscreen]:not([inDOMFullscreen="true"]) #TabsToolbar {
+    min-height: var(--tab-min-height, fit-content) !important;
+  }
+}
+/*= Others - Compatibility ===================================================*/
+@media (-moz-bool-pref: "userChrome.compatibility.panel_cutoff") {
+  #appMenu-popup panelview {
+    width: 24.5em !important; /* can modify panel width, Original: 22.5em */
+  }
+}
+@media (-moz-bool-pref: "userChrome.compatibility.navbar_top_border") {
+  #nav-bar {
+    box-shadow: none !important;
+  }
+}
+/** Theme *********************************************************************/
+/*= System Default Theme =====================================================*/
+@media (-moz-bool-pref: "userChrome.theme.system_default") {
+  /*= Common - URL Bar focus color =============================================*/ /*= Windows7 - Aero Based Theme ==============================================*/ /*= Windows10 - UWP like color ===============================================*/
+  /*= Windows10 - Titlebar accent color ========================================*/
+  /*= GTK - URL View url accent color ==========================================*/ /*= Mac - Default like color =================================================*/
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar),
+  (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
+  /* URL Bar */
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+    --focus-outline-color: AccentColor !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #urlbar[open]
+    > #urlbar-background,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #urlbar[open]
+    > #urlbar-background {
+    border-color: color-mix(
+      in srgb,
+      AccentColor 50%,
+      transparent
+    ) !important; /* Like: --toolbar-field-focus-border-color */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color"),
+  (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+    --focus-outline-color: -moz-accent-color !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #urlbar[open]
+    > #urlbar-background,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #urlbar[open]
+    > #urlbar-background {
+    border-color: color-mix(
+      in srgb,
+      -moz-accent-color 50%,
+      transparent
+    ) !important; /* Like: --toolbar-field-focus-border-color */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --win-text-color: rgba(0, 0, 0);
+    --win-bgcolor: rgb(204, 204, 204);
+    --win-disabled-color: rgb(145, 145, 145);
+    --win-disabled-bgcolor: transparent;
+    --win-hover-bgcolor: rgb(218, 218, 218); /* also button-bgcolor */
+    --win-hover-active-bgcolor: #c2c2c2; /* also button-hover-bgcolor */
+    --win-button-hover-bgcolor: rgba(218, 218, 218, 0.66);
+    --win-button-active-bgcolor: #aaaaaa;
+    --win-field-bgcolor: #ffffff;
+    --win-component-bgcolor: #f2f2f2;
+    --win-border-color: #8a8a8a;
+    --win-tab-separator-color: #a3a3a3;
+    --win-sidebar-bgcolor: #e6e6e6;
+    --win-sidebar-hover-bgcolor: #cfcfcf;
+    --win-sidebar-button-hover-bgcolor: #b8b8b8;
+    --win-sidebar-button-hover-active-bgcolor: #a3a3a3;
+    --win-button-border: #747474;
+    --win-shortcut-text-color: #757575;
+    --win-error-color: #b31616;
+    --win-red-border-color: #ff4343;
+    --win-accent-foreground-color: AccentColorText;
+    --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, AccentColor);
+    --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, AccentColor);
+    --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, AccentColor);
+    --win-accent-active-color: AccentColor;
+  }
+  /*- Separator --------------------------------------------------------------*/
+  /*- Proton Tab Selected ----------------------------------------------------*/
+  /*- Menu -------------------------------------------------------------------*/
+  /*- Toolbar ----------------------------------------------------------------*/
+  /*- Sidebar ----------------------------------------------------------------*/
+  /*- Panel ------------------------------------------------------------------*/
+  /*- Others -----------------------------------------------------------------*/
+  /* For overwrite */
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --win-accent-foreground-color: -moz-accent-color-foreground;
+    --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color);
+    --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color);
+    --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color);
+    --win-accent-active-color: -moz-accent-color;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.compatibility.os.win11") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --win-text-color: #1a1a1a;
+    --win-bgcolor: #e8e8e8;
+    --win-hover-bgcolor: #eaeaea; /* also button-bgcolor */
+    --win-disabled-color: #9f9f9f;
+    --win-hover-active-bgcolor: #d9d9d9; /* also button-active-color */
+    --win-button-hover-bgcolor: #d9d9d9;
+    --win-button-active-bgcolor: rgba(46, 46, 46, 0.66);
+    --win-component-bgcolor: #f8f8f8;
+    --win-border-color: #e9e9e9;
+    --win-tab-separator-color: #dadada;
+    --win-sidebar-bgcolor: #ffffff;
+    --win-button-border: var(--win-border-color);
+    --win11-chrome-separator-color: #d6d6d6;
+    --win11-tab-border-color: #dadada;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --win-text-color: #ffffff;
+    --win-bgcolor: #2b2b2b;
+    --win-disabled-color: #747474;
+    --win-disabled-bgcolor: transparent;
+    --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */
+    --win-hover-active-bgcolor: #454545; /* also button-active-color */
+    --win-button-hover-bgcolor: rgba(46, 46, 46, 0.66);
+    --win-button-active-bgcolor: #515151;
+    --win-field-bgcolor: #373737;
+    --win-component-bgcolor: #171717;
+    --win-border-color: #5b5b5b;
+    --win-tab-separator-color: #555555;
+    --win-sidebar-bgcolor: #1f1f1f;
+    --win-sidebar-hover-bgcolor: #353535;
+    --win-sidebar-button-hover-bgcolor: #353535;
+    --win-sidebar-button-hover-active-bgcolor: #4c4c4c;
+    --win-button-border: #8f8f8f;
+    --win-shortcut-text-color: #adadad;
+    --win-error-color: #ffb900;
+    --win-red-border-color: #ff4343;
+    --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, AccentColor);
+    --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, AccentColor);
+    --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, AccentColor);
+    --win-accent-active-color: AccentColor;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, -moz-accent-color);
+    --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, -moz-accent-color);
+    --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, -moz-accent-color);
+    --win-accent-active-color: -moz-accent-color;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) and (-moz-bool-pref: "userChrome.compatibility.os.win11") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --win-bgcolor: #202020;
+    --win-hover-bgcolor: #383838; /* also button-bgcolor */
+    --win-disabled-color: #797979;
+    --win-hover-active-bgcolor: #454545; /* also button-active-color */
+    --win-button-hover-bgcolor: #454545;
+    --win-button-active-bgcolor: rgba(46, 46, 46, 0.66);
+    --win-field-bgcolor: #232323;
+    --win-component-bgcolor: #2c2c2c;
+    --win-border-color: #3d3d3d;
+    --win-tab-separator-color: #323232;
+    --win-sidebar-bgcolor: var(--win-component-bgcolor);
+    --win-button-border: var(--win-border-color);
+    --win11-chrome-separator-color: #3a3a3a;
+    --win11-tab-border-color: #1d1d1d;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    /* Text, Icon Color */
+    --menu-color: var(--win-text-color) !important;
+    --lwt-text-color: var(--win-text-color) !important;
+    --button-color: var(--win-text-color) !important;
+    --input-color: var(--win-text-color) !important;
+    --toolbar-color: var(--win-text-color) !important;
+    --toolbar-non-lwt-textcolor: var(--win-text-color) !important;
+    --toolbarbutton-icon-fill: var(--win-text-color) !important;
+    --toolbar-field-focus-color: var(--win-text-color) !important;
+    --urlbar-popup-action-color: var(--win-text-color) !important;
+    --toolbar-field-color: var(--win-text-color) !important;
+    --autocomplete-popup-highlight-color: var(--win-text-color) !important;
+    --tab-icon-overlay-fill: var(--win-text-color) !important;
+    --panel-banner-item-color: var(--win-text-color) !important;
+    --arrowpanel-color: var(--win-text-color) !important;
+    --autocomplete-popup-color: var(--win-text-color) !important;
+    /* Text Disabled Color */
+    --menu-disabled-color: var(--win-disabled-color) !important;
+    --checkbox-unchecked-active-bgcolor: var(--win-disabled-color) !important;
+    --panel-disabled-color: var(--win-disabled-color) !important;
+    --download-progress-paused-color: var(--win-disabled-color) !important;
+    /* Text Shortcut Color */
+    --panel-shortcut-color: var(--win-shortcut-text-color) !important;
+    --panel-description-color: var(--win-shortcut-text-color) !important;
+    /* Title Background */
+    --lwt-accent-color: var(--win-bgcolor) !important;
+    --toolbar-field-border-color: var(--win-bgcolor) !important;
+    --chrome-content-separator-color: var(--win-bgcolor) !important;
+    /* Component Background Color */
+    --menu-background-color: var(--win-component-bgcolor) !important;
+    --toolbar-bgcolor: var(--win-component-bgcolor) !important;
+    --toolbar-non-lwt-bgcolor: var(--win-component-bgcolor) !important;
+    --arrowpanel-background: var(--win-component-bgcolor) !important;
+    --autocomplete-popup-background: var(--win-component-bgcolor) !important;
+    /* Border Color */
+    /* Separator */
+    --toolbarseparator-color: var(--win-tab-separator-color) !important;
+    /* Field Background Color */
+    --input-bgcolor: var(--win-field-bgcolor) !important;
+    --toolbar-field-background-color: var(--win-field-bgcolor) !important;
+    --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important;
+    --tab-icon-overlay-stroke: var(--win-field-bgcolor) !important;
+    /* Hover Background Color, Button Color  */
+    --menuitem-hover-background-color: var(--win-hover-bgcolor) !important;
+    --toolbarbutton-hover-background: var(--win-hover-bgcolor) !important;
+    --button-bgcolor: var(--win-hover-bgcolor) !important;
+    --panel-banner-item-background-color: var(--win-hover-bgcolor) !important;
+    /* Hover Active, Button Hover Color */
+    --checkbox-unchecked-bgcolor: var(--win-hover-active-bgcolor) !important;
+    --urlbar-box-bgcolor: var(--win-hover-active-bgcolor) !important;
+    --urlbar-box-focus-bgcolor: var(--win-hover-active-bgcolor) !important;
+    --toolbarbutton-active-background: var(--win-hover-active-bgcolor) !important;
+    --urlbar-box-active-bgcolor: var(--win-hover-active-bgcolor) !important;
+    --autocomplete-popup-highlight-background: var(--win-hover-active-bgcolor) !important;
+    --panel-banner-item-hover-bgcolor: var(--win-hover-active-bgcolor) !important;
+    /* Button Hover Active Color */
+    --button-active-bgcolor: var(--win-button-active-bgcolor) !important;
+    --panel-banner-item-active-bgcolor: var(--win-button-active-bgcolor) !important;
+    /* Disabled Background Color */
+    --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important;
+    /* Button Hover Color */
+    --button-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+    --checkbox-unchecked-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+    --urlbar-box-hover-bgcolor: var(--win-button-hover-bgcolor) !important;
+    --autocomplete-popup-hover-background: var(--win-button-hover-bgcolor) !important;
+    /* Button Border Color */
+    --checkbox-border-color: var(--win-button-border) !important;
+    --input-border-color: var(--win-button-border) !important;
+    --autocomplete-popup-separator-color: var(--win-button-border) !important;
+    /* Accent Foreground Color */
+    --button-primary-color: var(--win-accent-foreground-color) !important;
+    --checkbox-checked-color: var(--win-accent-foreground-color) !important;
+    /* Accent Color */
+    --button-primary-bgcolor: var(--win-accent-color) !important;
+    --focus-outline-color: var(--win-accent-color) !important;
+    --checkbox-checked-bgcolor: var(--win-accent-color) !important;
+    /* Accent Content Color */
+    --toolbarbutton-icon-fill-attention: var(--win-accent-content-color) !important;
+    --urlbar-popup-url-color: var(--win-accent-content-color) !important;
+    --download-progress-fill-color: var(--win-accent-content-color) !important;
+    /* Accent Hover Color */
+    --button-primary-hover-bgcolor: var(--win-accent-hover-color) !important;
+    --checkbox-checked-hover-bgcolor: var(--win-accent-hover-color) !important;
+    /* Accent Hover Active Color */
+    --button-primary-active-bgcolor: var(--win-accent-active-color) !important;
+    --checkbox-checked-active-bgcolor: var(--win-accent-active-color) !important;
+    /* Error Color */
+    --error-text-color: var(--win-error-color) !important;
+    --input-error-border-color: var(--win-error-color) !important;
+    /* Others */
+    --tab-line-color: AccentColor !important;
+    --tab-selected-bgcolor: unset !important;
+    --tabs-border-color: transparent !important;
+    --checkbox-checked-border-color: transparent !important;
+    /* Other Defaults */
+    --arrowpanel-dimmed: color-mix(in srgb, currentColor 12%, transparent) !important;
+    --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 20%, transparent) !important;
+    --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 27%, transparent) !important;
+    --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important;
+    --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --tab-line-color: Highlight !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #navigator-toolbox {
+    background: var(--lwt-accent-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(#main-window):is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --arrowpanel-border-color: var(--win-bgcolor) !important;
+    --panel-separator-color: var(--win-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+  :root:is(#main-window):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --arrowpanel-border-color: var(--win-border-color) !important;
+    --panel-separator-color: var(--win-border-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+    --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* As default */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.compatibility.os.win11") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --chrome-content-separator-color: var(--win11-chrome-separator-color) !important;
+  }
+  #nav-bar {
+    --lwt-tabs-border-color: var(--win11-tab-border-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --win-proton-tab-selected-bgcolor: color-mix(in srgb, var(--win-bgcolor) 5%, var(--win-component-bgcolor));
+  }
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --tab-selected-color: var(--win-proton-tab-selected-bgcolor) !important;
+  }
+  :root[lwt-default-theme-in-dark-mode] {
+    --lwt-selected-tab-background-color: var(--win-proton-tab-selected-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) html#main-window menupopup {
+    --menu-color: var(--win-text-color) !important;
+    --menu-background-color: var(--win-component-bgcolor) !important;
+    --menu-border-color: var(--win-bgcolor) !important;
+    --menuitem-hover-background-color: var(--win-hover-bgcolor) !important;
+    --menu-disabled-color: var(--win-disabled-color) !important;
+    --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+  :root[lwt-default-theme-in-dark-mode] #titlebar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+  :root[lwt-default-theme-in-dark-mode] #toolbar-menubar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar,
+  :root[lwt-default-theme-in-dark-mode] #TabsToolbar {
+    --button-hover-bgcolor: var(--win-sidebar-button-hover-bgcolor);
+    --button-active-bgcolor: var(--win-sidebar-button-hover-active-bgcolor);
+    --toolbarbutton-hover-background: var(--win-sidebar-button-hover-bgcolor);
+    --toolbarbutton-active-background: var(--win-sidebar-button-hover-active-bgcolor);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  #sidebar-box:not([lwt-sidebar]) {
+    appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #sidebar-box,
+  :root[lwt-default-theme-in-dark-mode] #sidebar-box {
+    --sidebar-background-color: var(--win-sidebar-bgcolor) !important;
+    --sidebar-text-color: var(--win-text-color) !important;
+    --sidebar-border-color: var(--win-border-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+  .sidebar-panel[style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+  html[lwt-sidebar][style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+  body[lwt-sidebar][style*="--lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] {
+    /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */
+    --lwt-sidebar-background-color: var(--win-sidebar-bgcolor) !important;
+    --lwt-sidebar-text-color: var(--win-text-color) !important;
+    --panel-separator-color: var(--win-border-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .subviewbutton,
+  :root[lwt-default-theme-in-dark-mode] .subviewbutton {
+    --button-hover-bgcolor: var(--win-hover-active-bgcolor) !important;
+    --button-active-bgcolor: var(--win-button-active-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    toolbarbutton.subviewbutton:not(
+      [disabled],
+      [open],
+      :active,
+      #appMenu-fxa-label2,
+      #appMenu-zoomReduce-button2,
+      #appMenu-zoomReset-button2,
+      #appMenu-zoomEnlarge-button2,
+      #appMenu-fullscreen-button2,
+      .unified-extensions-item-menu-button
+    ):is(:hover),
+  :root[lwt-default-theme-in-dark-mode]
+    toolbarbutton.subviewbutton:not(
+      [disabled],
+      [open],
+      :active,
+      #appMenu-fxa-label2,
+      #appMenu-zoomReduce-button2,
+      #appMenu-zoomReset-button2,
+      #appMenu-zoomEnlarge-button2,
+      #appMenu-fullscreen-button2,
+      .unified-extensions-item-menu-button
+    ):is(:hover) {
+    background-color: var(--win-hover-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    toolbarbutton.subviewbutton:not(
+      [disabled],
+      #appMenu-fxa-label2,
+      #appMenu-zoomReduce-button2,
+      #appMenu-zoomReset-button2,
+      #appMenu-zoomEnlarge-button2,
+      #appMenu-fullscreen-button2
+    ):is([open], :hover:active),
+  :root[lwt-default-theme-in-dark-mode]
+    toolbarbutton.subviewbutton:not(
+      [disabled],
+      #appMenu-fxa-label2,
+      #appMenu-zoomReduce-button2,
+      #appMenu-zoomReset-button2,
+      #appMenu-zoomEnlarge-button2,
+      #appMenu-fullscreen-button2
+    ):is([open], :hover:active) {
+    background-color: var(--win-hover-active-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]):is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    /* Light Theme */
+    --lwt-accent-color: var(--win-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+  :root[lwt-default-theme-in-dark-mode][lwthemetextcolor="bright"] {
+    --toolbar-bgcolor: var(--win-component-bgcolor) !important; /* Original: rgba(43, 42, 51, 1) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-platform: windows) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  :root[lwtheme-mozlightdark]
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  :root[lwtheme-mozlightdark]
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]) {
+    background-image: linear-gradient(
+        color-mix(in srgb, currentColor 11%, transparent),
+        color-mix(in srgb, currentColor 11%, transparent)
+      ),
+      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) {
+  /* Tab Bar */
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .titlebar-color,
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .browser-titlebar,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .titlebar-color,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .browser-titlebar {
+    color: AccentColorText !important;
+    background-color: AccentColor !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .titlebar-color,
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .browser-titlebar,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .titlebar-color,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .browser-titlebar {
+    color: -moz-accent-color-foreground !important;
+    background-color: -moz-accent-color !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .toolbar-items,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .toolbar-items {
+    --toolbarbutton-icon-fill: currentColor;
+    --toolbarbutton-hover-background: color-mix(in srgb, AccentColorText 10%, transparent);
+    --toolbarbutton-active-background: color-mix(in srgb, AccentColorText 15%, transparent);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .toolbar-items,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    .toolbar-items {
+    --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent);
+    --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --toolbar-field-background-color: Field !important;
+    --toolbar-field-color: FieldText !important;
+    --toolbar-field-border-color: ThreeDShadow !important;
+  }
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .urlbarView-url {
+    --urlbar-popup-url-color: AccentColor;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) .urlbarView-url {
+    --urlbar-popup-url-color: -moz-accent-color;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #urlbar-background,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #searchbar {
+    background-color: var(--toolbar-field-background-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    /* Colors */
+    --mac-text-color: -moz-dialogtext;
+    --mac-disabled-color: GrayText;
+    --mac-bgcolor: Window;
+    --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field);
+    --mac-field-bgcolor: Window;
+    --mac-panel-bgcolor: Menu;
+    --mac-sidebar-bgcolor: Window;
+    --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor));
+    --mac-hover-bgcolor: Window;
+    --mac-disabled-bgcolor: transparent;
+    --mac-primary-button-color: AccentColorText; /* or -moz-mac-menutextselect */
+    --mac-accent-color: AccentColor; /* or LinkText */
+    --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, AccentColor);
+    --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, AccentColor); /* or -moz-mac-menuselect, Highlight */
+    --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, AccentColor); /* or ActiveBorder */
+    /* Text, Icon Color */
+    --menu-color: var(--mac-text-color) !important;
+    --lwt-text-color: var(--mac-text-color) !important;
+    --button-color: var(--mac-text-color) !important;
+    --input-color: var(--mac-text-color) !important;
+    --toolbar-color: var(--mac-text-color) !important;
+    --toolbar-non-lwt-textcolor: var(--mac-text-color) !important;
+    --toolbarbutton-icon-fill: var(--mac-text-color) !important;
+    --toolbar-field-focus-color: var(--mac-text-color) !important;
+    --urlbar-popup-action-color: var(--mac-text-color) !important;
+    --toolbar-field-color: var(--mac-text-color) !important;
+    --autocomplete-popup-highlight-color: var(--mac-text-color) !important;
+    --tab-icon-overlay-fill: var(--mac-text-color) !important;
+    --panel-banner-item-color: var(--mac-text-color) !important;
+    --arrowpanel-color: var(--mac-text-color) !important;
+    --autocomplete-popup-color: var(--mac-text-color) !important;
+    --panel-shortcut-color: var(--mac-text-color) !important;
+    --panel-description-color: var(--mac-text-color) !important;
+    /* Text Disabled Color */
+    --menu-disabled-color: var(--mac-disabled-color) !important;
+    --button-active-bgcolor: var(--mac-disabled-color) !important;
+    --checkbox-unchecked-active-bgcolor: var(--mac-disabled-color) !important;
+    --panel-disabled-color: var(--mac-disabled-color) !important;
+    --download-progress-paused-color: var(--mac-disabled-color) !important;
+    /* Background Color */
+    --lwt-accent-color: var(--mac-bgcolor) !important;
+    --menu-background-color: var(--mac-bgcolor) !important;
+    --autocomplete-popup-background: var(--mac-bgcolor) !important;
+    /* Selected Background Color */
+    --toolbar-bgcolor: var(--mac-selected-bgcolor) !important;
+    --toolbar-non-lwt-bgcolor: var(--mac-selected-bgcolor) !important;
+    /* Field Background Color */
+    --input-bgcolor: var(--mac-field-bgcolor) !important;
+    --toolbar-field-background-color: var(--mac-field-bgcolor) !important;
+    --tab-icon-overlay-stroke: var(--mac-field-bgcolor) !important;
+    /* Panel Background Color */
+    --arrowpanel-background: var(--mac-panel-bgcolor) !important;
+    /* Hover Background Color  */
+    --menuitem-hover-background-color: var(--mac-hover-bgcolor) !important;
+    --toolbarbutton-hover-background: var(--mac-hover-bgcolor) !important;
+    --panel-banner-item-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+    --button-bgcolor: var(--mac-hover-bgcolor) !important;
+    --checkbox-unchecked-bgcolor: var(--mac-hover-bgcolor) !important;
+    --panel-banner-item-background-color: var(--mac-hover-bgcolor) !important;
+    --urlbar-box-bgcolor: var(--mac-hover-bgcolor) !important;
+    --urlbar-box-focus-bgcolor: var(--mac-hover-bgcolor) !important;
+    --panel-banner-item-active-bgcolor: var(--mac-hover-bgcolor) !important;
+    --toolbarbutton-active-background: var(--mac-hover-bgcolor) !important;
+    --urlbar-box-active-bgcolor: var(--mac-hover-bgcolor) !important;
+    --autocomplete-popup-highlight-background: var(--mac-hover-bgcolor) !important;
+    --button-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+    --checkbox-unchecked-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+    --urlbar-box-hover-bgcolor: var(--mac-hover-bgcolor) !important;
+    --autocomplete-popup-hover-background: var(--mac-hover-bgcolor) !important;
+    /* Disabled Background Color */
+    --menuitem-disabled-hover-background-color: var(--mac-disabled-bgcolor) !important;
+    /* Border Color */
+    /*
+      --menu-border-color: var(--mac-bgcolor) !important;
+      --toolbar-field-border-color: var(--mac-bgcolor) !important;
+      --arrowpanel-border-color: var(--mac-bgcolor) !important;
+      --chrome-content-separator-color: var(--mac-bgcolor) !important;
+      --toolbarseparator-color: var(--mac-bgcolor) !important;
+      --panel-separator-color: var(--mac-bgcolor) !important;
+     */
+    /* Button Border Color */
+    /*
+      --tab-line-color: var(---mac-bgcolor) !important;
+      --checkbox-border-color: var(--mac-bgcolor) !important;
+      --input-border-color: var(--mac-bgcolor) !important;
+      --autocomplete-popup-separator-color: var(--mac-bgcolor) !important;
+     */
+    /* Accent Color Foreground */
+    --button-primary-color: var(--mac-primary-button-color) !important;
+    --checkbox-checked-color: var(--mac-primary-button-color) !important;
+    /* Accent Color */
+    --button-primary-bgcolor: var(--mac-accent-color) !important;
+    --focus-outline-color: var(--mac-accent-color) !important;
+    --checkbox-checked-bgcolor: var(--mac-accent-color) !important;
+    /* Accent Content Color */
+    --toolbarbutton-icon-fill-attention: var(--mac-accent-content-color) !important;
+    --urlbar-popup-url-color: var(--mac-accent-content-color) !important;
+    --download-progress-fill-color: var(--mac-accent-content-color) !important;
+    /* Accent Hover Color */
+    --button-primary-hover-bgcolor: var(--mac-accent-hover-color) !important;
+    --checkbox-checked-hover-bgcolor: var(--mac-accent-hover-color) !important;
+    /* Accent Hover Active Color */
+    --button-primary-active-bgcolor: var(--mac-accent-active-color) !important;
+    --checkbox-checked-active-bgcolor: var(--mac-accent-active-color) !important;
+    /* Error Color */
+    /*
+      --error-text-color: var(--win-error-color) !important;
+      --input-error-border-color: var(--win-error-color) !important;
+     */
+    /* Others */
+    --tab-selected-bgcolor: unset !important;
+    --tabs-border-color: transparent !important;
+    --checkbox-checked-border-color: transparent !important;
+    /* Other Defaults */
+    --arrowpanel-dimmed: color-mix(in srgb, currentColor 12%, transparent) !important;
+    --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 20%, transparent) !important;
+    --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 27%, transparent) !important;
+    --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important;
+    --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
+  }
+  /*- Proton Tab Selected ----------------------------------------------------*/
+  /*- Toolbar ----------------------------------------------------------------*/
+  /*- Sidebar ----------------------------------------------------------------*/
+  /*- Others -----------------------------------------------------------------*/
+  /* For Overwrite */
+  /* Hard Coded */
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --mac-primary-button-color: -moz-accent-color-foreground; /* or -moz-mac-menutextselect */
+    --mac-accent-color: -moz-accent-color; /* or LinkText */
+    --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color);
+    --mac-accent-hover-color: color-mix(
+      in srgb,
+      rgb(0, 0, 0) 10%,
+      -moz-accent-color
+    ); /* or -moz-mac-menuselect, Highlight */
+    --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); /* or ActiveBorder */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-color-scheme: dark) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --mac-field-bgcolor: Field;
+    --mac-panel-bgcolor: -moz-CellHighlight;
+    --mac-hover-bgcolor: ButtonFace;
+    --toolbar-field-focus-background-color: var(--mac-bgcolor) !important;
+    --toolbar-field-background-color: var(--mac-sidebar-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+  :root[lwt-default-theme-in-dark-mode] {
+    --mac-proton-tab-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 20%, -moz-dialog);
+  }
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --tab-selected-color: var(--mac-proton-tab-selected-bgcolor) !important;
+  }
+  :root[lwt-default-theme-in-dark-mode] {
+    --lwt-selected-tab-background-color: var(--mac-proton-tab-selected-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #navigator-toolbox,
+  :root[lwt-default-theme-in-dark-mode] #navigator-toolbox {
+    background-color: var(--mac-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar {
+    --mac-hover-bgcolor: ButtonFace;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #titlebar,
+  :root[lwt-default-theme-in-dark-mode] #titlebar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #toolbar-menubar,
+  :root[lwt-default-theme-in-dark-mode] #toolbar-menubar,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #TabsToolbar,
+  :root[lwt-default-theme-in-dark-mode] #TabsToolbar {
+    --button-hover-bgcolor: var(--mac-hover-bgcolor);
+    --button-active-bgcolor: var(--mac-hover-bgcolor);
+    --toolbarbutton-hover-background: var(--mac-hover-bgcolor);
+    --toolbarbutton-active-background: var(--mac-hover-bgcolor);
+    /* Prevent transparent tabbar at fullscreen hover #312 */
+    background: var(--mac-bgcolor);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root[lwt-default-theme-in-dark-mode] #urlbar {
+    --autocomplete-popup-highlight-background: var(--mac-hover-bgcolor) !important;
+    --autocomplete-popup-hover-background: var(--mac-hover-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #sidebar-box:not([lwt-sidebar]) {
+    appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #sidebar-box,
+  :root[lwt-default-theme-in-dark-mode] #sidebar-box {
+    --sidebar-background-color: var(--mac-sidebar-bgcolor) !important;
+    --sidebar-text-color: var(--mac-text-color) !important;
+    /* --sidebar-border-color: var(--win-sidebar-border-color) !important; */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-color-scheme: dark) {
+  .sidebar-panel[style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+  body[lwt-sidebar][style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+  .sidebar-panel[style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],
+  body[lwt-sidebar][style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] {
+    /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */
+    --lwt-sidebar-background-color: transparent !important;
+    --lwt-sidebar-text-color: var(--mac-text-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root[lwt-default-theme-in-dark-mode] #sidebarMenu-popup {
+    --button-hover-bgcolor: var(--mac-sidebar-hover-bgcolor);
+    --button-active-bgcolor: var(--mac-sidebar-hover-bgcolor);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-color-scheme: dark) {
+  :root[lwt-default-theme-in-dark-mode][lwthemetextcolor="bright"] {
+    --toolbar-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tab.color_like_toolbar") {
+  :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode]
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][lwt-default-theme-in-dark-mode]
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root[lwtheme-mozlightdark][lwt-default-theme-in-dark-mode]
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][lwt-default-theme-in-dark-mode]
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected] {
+    background: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)):not([customizing="true"]) tab[visuallyselected] > stack::before,
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)):not([customizing="true"]) tab[visuallyselected] > stack::after,
+  :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::before,
+  :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::after {
+    fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important;
+  }
+}
+/*= None Native Menu =========================================================*/
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  :root {
+    /* Override some menu color variables for light browser themes. */
+    --menu-icon-opacity: 0.7;
+    --nested-margin: -10px;
+    --windows-panel-box-shadow: 0 0 4px hsla(0, 0%, 0%, 0.2);
+    --menu-checkbox-padding: 12px;
+  }
+  /* For Windows 10, prevent using native OS drawing of certain menu elements,
+     especially background colors and shadows. */
+  /* Menu item text also needs native drawing disabled. */
+  /* For Windows 10, checkbox, radio and iconified menuitems need the default
+     appearance disabled so they pick up our custom styles instead. */
+  /* We need to do something to override the default style for selected
+     checkboxes and radio buttons because the native drawing we use on other
+     Windows versions looks pretty bad with the Win10 styles, so for now we'll
+     insert a generic checkmark icon for both types. */
+  /* :not([hidden]) to avoid the display: flex unhiding the item. */
+  /* override styles from shared/contextmenu.inc.css */
+  /* If the menu is wider than the icons strictly need, the <menuitem> elements
+   * will stretch to pick up the extra space. In that case, the outer icons
+   * should align to the start/end of their containing <menuitem>: */
+  /* Other menu separators don't extend all the way to the menu edges, but the
+     one below the navigation buttons in the content context menu should. */
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+  :root {
+    /* Override the menu color variables for dark browser themes. */
+    --menu-icon-opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu,
+  menuitem,
+  menucaption {
+    appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu,
+  menuitem {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu > .menu-text,
+  menuitem > .menu-text,
+  menu > .menu-iconic-text,
+  menuitem > .menu-iconic-text {
+    appearance: none !important;
+    margin-inline-start: 0 !important; /* need !important to override the other !important below... */
+    padding-inline-end: 0;
+  }
+  menu > .menu-text::before,
+  menuitem > .menu-text::before,
+  menu > .menu-iconic-text::before,
+  menuitem > .menu-iconic-text::before {
+    box-sizing: border-box !important;
+    height: calc(2px + 1.2em) !important;
+    padding: 1px 0 !important;
+  }
+  menu > .menu-text[value*="โ€ฆ"]::before,
+  menuitem > .menu-text[value*="โ€ฆ"]::before,
+  menu > .menu-iconic-text[value*="โ€ฆ"]::before,
+  menuitem > .menu-iconic-text[value*="โ€ฆ"]::before {
+    padding: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu[_moz-menuactive="true"]:not([disabled="true"]),
+  menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+    background-color: var(--menuitem-hover-background-color) !important;
+    color: var(--menu-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu:where([_moz-menuactive="true"][disabled="true"]),
+  menuitem:where([_moz-menuactive="true"][disabled="true"]) {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-text {
+    padding-inline-start: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-right {
+    appearance: none !important;
+    width: unset !important;
+    list-style-image: url("chrome://global/skin/icons/arrow-right.svg") !important;
+    -moz-context-properties: fill, fill-opacity !important;
+    fill: currentColor !important;
+    fill-opacity: var(--menu-icon-opacity) !important;
+    margin-inline-end: 1px !important;
+    padding-top: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-right > image {
+    /* Do not make this smaller than the size of the svg, but upscale for
+     * people with large fonts. */
+    width: max(1em, 16px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-right:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://global/skin/icons/arrow-left.svg") !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menulist > menupopup > menuitem {
+    padding-inline-end: 1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menupopup[needsgutter] menu:not([icon], .menu-iconic),
+  menupopup[needsgutter] menuitem:not([type="checkbox"], [type="radio"], [icon], .menuitem-iconic) {
+    padding-inline-start: 36px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-iconic-left,
+  menuitem[type="checkbox"],
+  menuitem[type="radio"] {
+    appearance: none !important; /* to override more specific selectors above. */
+    width: unset !important;
+  }
+  .menu-iconic-left .menu-iconic-icon,
+  .menu-iconic-left .menu-icon,
+  menuitem[type="checkbox"] .menu-iconic-icon,
+  menuitem[type="checkbox"] .menu-icon,
+  menuitem[type="radio"] .menu-iconic-icon,
+  menuitem[type="radio"] .menu-icon {
+    appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menu-iconic > .menu-iconic-left,
+  .menuitem-iconic > .menu-iconic-left {
+    padding-inline-end: 0 !important;
+    margin-inline-end: 8px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menuitem[type="checkbox"],
+  menuitem[type="radio"] {
+    --menu-background-padding-default: var(--menu-checkbox-padding);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menuitem[checked="true"] {
+    padding-inline-start: var(--menu-checkbox-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item .menu-iconic-left {
+    padding-inline-end: 0 !important;
+    margin-inline-end: 6px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menuitem[checked="true"] > .menu-iconic-left,
+  menuitem[checked="true"] > .menu-icon {
+    -moz-context-properties: fill, fill-opacity !important;
+    fill: currentColor !important;
+    fill-opacity: var(--menu-icon-opacity) !important;
+    list-style-image: url("chrome://browser/skin/lepton/menu-check.svg") !important;
+    width: 16px !important;
+    margin-inline-end: 8px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon {
+    display: initial !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menuseparator {
+    appearance: none !important;
+    border-top: 1px solid var(--menu-border-color) !important;
+    border-bottom: none !important;
+    padding: 0 !important;
+    /* The side margins should align with the start of the menu item text. */
+    margin: 2px 1em !important;
+  }
+  menuseparator::before {
+    display: none !important; /* Original: block */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menupopup {
+    /* Disable the default appearance so we can override the native styling. */
+    appearance: none !important;
+    /* Prevent any background or border around the outside of the shadow. */
+    background-color: transparent !important;
+    border: none !important;
+    /* To account for the box-shadow below */
+    margin: -4px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menupopup:not([placespopup="true"]) > menuitem,
+  menupopup:not([placespopup="true"]) > menu {
+    padding-block: var(--menu-padding, 0.5em) !important;
+    padding-inline-start: 1em !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  .menupopup-arrowscrollbox[part*="content"] {
+    box-shadow: var(--windows-panel-box-shadow) !important;
+    margin: 4px !important;
+    padding: 4px 0 !important;
+    color: var(--menu-color) !important;
+    background: var(--menu-background-color) !important;
+    border-radius: 4px !important;
+    border: 1px solid var(--menu-border-color) !important;
+    min-width: 0 !important;
+    min-height: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_menupopup") {
+  .menupopup-arrowscrollbox[part*="content"] {
+    border-radius: 0px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menupopup > menu > menupopup {
+    /* align submenus */
+    margin-inline-start: var(--nested-margin) !important;
+    margin-top: var(--nested-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #mainPopupSet {
+    --menu-background-padding-default: calc(
+      var(--context-menu-background-padding) + var(--context-menu-text-padding-default)
+    );
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation:not([hidden]) {
+    /* The Windows 10 version of the navigation area needs the scrollbox's
+       background color, not the builtin "menu" color. */
+    background-color: inherit !important;
+    /* Match the inner top padding of the menupopup to center the icons visually. */
+    padding-bottom: 4px !important;
+    /* Use modern flex box so we can use percentage widths to redistribute
+     * spacing manually. */
+    display: flex !important;
+    flex-direction: row !important;
+    /* We want the first and last icons to align with the text items which
+     * have 1em inline padding, and for icons to be centered within their
+     * hover state, so each icon of 16px needs 1em padding on both sides:
+     */
+    --menuitem-min-width: calc(2em + 16px) !important;
+    /* The total width of the container should then be at least 4 times that: */
+    min-width: calc(4 * var(--menuitem-min-width)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic {
+    flex: 1 0 auto !important;
+    padding: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic[_moz-menuactive="true"] {
+    /* We only show hover state on the icons. This ensures there is no
+     * dead space between icons, but the visible hover state is only
+     * around the icons, and all the icons' hover states match each other.
+     */
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic > .menu-iconic-left,
+  #context-navigation > .menuitem-iconic > .menu-icon {
+    margin: 0 !important;
+    padding: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon,
+  #context-navigation > .menuitem-iconic > .menu-icon {
+    width: var(--menuitem-min-width) !important;
+    height: 32px !important;
+    padding: 8px 1em !important;
+    margin: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon,
+  #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-icon {
+    background-color: var(--menuitem-hover-background-color) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation
+    > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon,
+  #context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-icon {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic:first-child {
+    justify-content: flex-start !important;
+    -moz-box-pack: start !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic:last-child {
+    justify-content: flex-end !important;
+    -moz-box-pack: end !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-navigation > .menuitem-iconic:last-child,
+  #context-navigation > .menuitem-iconic:first-child {
+    flex-grow: 0 !important;
+    /* The first and last items start off as 16px + 2em, like the other ones.
+     * 100% is the width of the parent, which will be at least 4 * the width of
+     * an individual item (16px + 2em)
+     * So 100% - 4 item widths gets us the remaining available space if
+     * #context-navigation is wider than that.
+     * Then divide by 6 to get the 1/6 of that extra space, and add this space
+     * to the width of the first/last items.
+     * This ensures that the 3 visual gaps between the 4 icons are all the same
+     * size, with each 1/3 of the available space evenly distributed between
+     * the 2 items on either side of the gap.
+     */
+    width: calc(var(--menuitem-min-width) + (100% - 4 * var(--menuitem-min-width)) / 6) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  #context-sep-navigation {
+    margin-top: 0 !important;
+    margin-inline: 0 !important;
+  }
+}
+/*= Fully Theme Mode =========================================================*/
+@media (-moz-bool-pref: "userChrome.theme.proton_color") {
+  /*= Default Colors - Hard Coded ==============================================*/
+  /* Based on chrome://global/skin/in-content/common.css */
+  :host,
+  :root {
+    --in-content-page-color: rgb(21, 20, 26);
+    --in-content-page-background: #fff;
+    --in-content-text-color: var(--in-content-page-color);
+    --in-content-deemphasized-text: rgb(91, 91, 102);
+    --in-content-box-background: #fff;
+    --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */
+    --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent);
+    --in-content-box-info-background: #f0f0f4;
+    --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent);
+    --in-content-item-hover-text: var(--in-content-page-color);
+    --in-content-item-selected: var(--in-content-primary-button-background);
+    --in-content-item-selected-text: var(--in-content-primary-button-text-color);
+    --in-content-icon-color: rgb(91, 91, 102);
+    --in-content-accent-color: #0a84ff;
+    --in-content-accent-color-active: #0060df;
+    --in-content-border-hover: var(--grey-90-a50);
+    --in-content-border-invalid: var(--red-50);
+    --in-content-border-color: #d7d7db;
+    --in-content-error-text-color: #c50042;
+    --in-content-link-color: var(--blue-60);
+    --in-content-link-color-hover: var(--blue-70);
+    --in-content-link-color-active: var(--blue-80);
+    --in-content-link-color-visited: var(--blue-60);
+    /* button background states are also used for checkboxes and radio buttons */
+    --in-content-button-text-color: var(--in-content-text-color);
+    --in-content-button-text-color-hover: var(--in-content-text-color);
+    --in-content-button-background: rgba(207, 207, 216, 0.33);
+    --in-content-button-background-hover: rgba(207, 207, 216, 0.66);
+    --in-content-button-background-active: rgb(207, 207, 216);
+    --in-content-primary-button-text-color: rgb(251, 251, 254);
+    --in-content-primary-button-text-color-hover: var(--in-content-primary-button-text-color);
+    --in-content-primary-button-background: #0061e0;
+    --in-content-primary-button-background-hover: #0250bb;
+    --in-content-primary-button-background-active: #053e94;
+    --in-content-danger-button-background: #e22850;
+    --in-content-danger-button-background-hover: #c50042;
+    --in-content-danger-button-background-active: #810220;
+    --in-content-focus-outline-color: var(--in-content-primary-button-background);
+    /* Note: 1px smaller than we want because we have a 1px transparent border. */
+    /* Once proton ships, these can probably stop being variables. */
+    --in-content-button-border-radius: 4px;
+    --in-content-button-horizontal-padding: 15px;
+    --in-content-button-vertical-padding: 7px;
+    --in-content-table-background: #f8f8fa;
+    --in-content-table-border-color: var(--in-content-box-border-color); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */
+    --in-content-table-border-dark-color: var(--in-content-table-border-color);
+    --in-content-table-header-background: var(
+      --in-content-primary-button-background
+    ); /* Legacy: #0a84ff; rgb(5, 64, 150); */
+    --in-content-table-header-color: var(
+      --in-content-primary-button-text-color
+    ); /* Legacy: #ffffff; var(--in-content-page-color); */
+    --in-content-sidebar-width: 240px;
+    --dialog-warning-text-color: var(--red-60);
+    --checkbox-border-color: var(--in-content-box-border-color);
+    --checkbox-unchecked-bgcolor: var(--in-content-button-background);
+    --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover);
+    --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active);
+    --checkbox-checked-bgcolor: var(--in-content-primary-button-background);
+    --checkbox-checked-color: var(--in-content-primary-button-text-color);
+    --checkbox-checked-border-color: transparent;
+    --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover);
+    --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active);
+    --blue-40: #45a1ff;
+    --blue-50: #0a84ff;
+    --blue-60: #0060df;
+    --blue-70: #003eaa;
+    --blue-80: #002275;
+    --grey-30: #d7d7db;
+    --grey-60: #4a4a4f;
+    --grey-90-a10: rgba(12, 12, 13, 0.1);
+    --grey-90-a20: rgba(12, 12, 13, 0.2);
+    --grey-90-a30: rgba(12, 12, 13, 0.3);
+    --grey-90-a50: rgba(12, 12, 13, 0.5);
+    --grey-90-a60: rgba(12, 12, 13, 0.6);
+    --green-50: #30e60b;
+    --green-60: #12bc00;
+    --green-70: #058b00;
+    --green-80: #006504;
+    --green-90: #003706;
+    --orange-50: #ff9400;
+    --red-40: #ff4f5e;
+    --red-50: #ff0039;
+    --red-60: #d70022;
+    --red-70: #a4000f;
+    --red-80: #5a0002;
+    --red-90: #3e0200;
+    --yellow-50: #ffe900;
+    --yellow-60: #d7b600;
+    --yellow-60-a30: rgba(215, 182, 0, 0.3);
+    --yellow-70: #a47f00;
+    --yellow-80: #715100;
+    --yellow-90: #3e2800;
+    --shadow-10: 0 1px 4px var(--grey-90-a10);
+    --shadow-30: 0 4px 16px var(--grey-90-a10);
+    --card-padding: 16px;
+    --card-shadow: var(--shadow-10);
+    --card-outline-color: var(--grey-30);
+    --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+    --uc-warning-icon-bgcolor: #ffa436;
+  }
+  /*= Menu color #477 ==========================================================*/
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (prefers-color-scheme: dark) {
+  :host,
+  :root {
+    /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
+    --in-content-page-background: rgb(28, 27, 34);
+    --in-content-page-color: rgb(251, 251, 254);
+    --in-content-deemphasized-text: rgb(191, 191, 201);
+    --in-content-box-background: rgb(35, 34, 43);
+    --in-content-box-background-odd: rgba(249, 249, 250, 0.05);
+    --in-content-box-info-background: rgba(249, 249, 250, 0.15);
+    --in-content-border-color: rgba(249, 249, 250, 0.2);
+    --in-content-border-hover: rgba(249, 249, 250, 0.3);
+    --in-content-border-invalid: rgb(255, 132, 139);
+    --in-content-error-text-color: #ff9aa2;
+    --in-content-button-background: rgb(43, 42, 51);
+    --in-content-button-background-hover: rgb(82, 82, 94);
+    --in-content-button-background-active: rgb(91, 91, 102);
+    --in-content-icon-color: rgb(251, 251, 254);
+    --in-content-primary-button-text-color: rgb(43, 42, 51);
+    --in-content-primary-button-background: rgb(0, 221, 255);
+    --in-content-primary-button-background-hover: rgb(128, 235, 255);
+    --in-content-primary-button-background-active: rgb(170, 242, 255);
+    --in-content-danger-button-background: #ff848b;
+    --in-content-danger-button-background-hover: #ffbdc5;
+    --in-content-danger-button-background-active: #ffdfe7;
+    --in-content-table-background: rgb(35, 34, 43);
+    --in-content-table-border-dark-color: var(--in-content-box-border-color);
+    --in-content-accent-color: var(--in-content-primary-button-background);
+    --in-content-accent-color-active: var(--in-content-primary-button-background-hover);
+    --in-content-link-color: var(--in-content-primary-button-background);
+    --in-content-link-color-hover: var(--in-content-primary-button-background-hover);
+    --in-content-link-color-active: var(--in-content-primary-button-background-active);
+    --in-content-link-color-visited: var(--in-content-link-color);
+    --card-outline-color: var(--grey-60);
+    --dialog-warning-text-color: var(--red-40);
+    --uc-warning-icon-bgcolor: #ffbd4f;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (prefers-contrast) {
+  :host,
+  :root {
+    --uc-warning-icon-bgcolor: var(--in-content-page-color);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-platform: windows) {
+  :root {
+    /* Override some menu color variables for light browser themes. */
+    --menuitem-hover-background-color: #e0e0e6;
+    --menu-background-color: #f9f9fb;
+    --menu-color: #15141a;
+    --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+    --menu-disabled-color: rgba(21, 20, 26, 0.4);
+    --menu-border-color: #cfcfd8;
+    --menu-icon-opacity: 0.7;
+    /* Declare menu colors for dark themes, but don't override anything yet. */
+    --dark-menuitem-hover-background-color: #52525e;
+    --dark-menu-background-color: #2b2a33;
+    --dark-menu-color: #fbfbfe;
+    --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+    --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+    --dark-menu-border-color: #5b5b66;
+    --dark-menu-icon-opacity: 1;
+  }
+  /* Override the menu color variables for dark browser themes. */
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+  :root {
+    --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+    --menu-background-color: var(--dark-menu-background-color);
+    --menu-color: var(--dark-menu-color);
+    --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+    --menu-disabled-color: var(--dark-menu-disabled-color);
+    --menu-border-color: var(--dark-menu-border-color);
+    --menu-icon-opacity: var(--dark-menu-icon-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  :root {
+    /* Override some menu color variables for light browser themes. */
+    --menuitem-hover-background-color: #e0e0e6;
+    --menu-background-color: #f9f9fb;
+    --menu-color: #15141a;
+    --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+    --menu-disabled-color: rgba(21, 20, 26, 0.4);
+    --menu-border-color: #cfcfd8;
+    --menu-icon-opacity: 0.7;
+    /* Declare menu colors for dark themes, but don't override anything yet. */
+    --dark-menuitem-hover-background-color: #52525e;
+    --dark-menu-background-color: #2b2a33;
+    --dark-menu-color: #fbfbfe;
+    --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+    --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+    --dark-menu-border-color: #5b5b66;
+    --dark-menu-icon-opacity: 1;
+  }
+  /* Override the menu color variables for dark browser themes. */
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+  :root {
+    --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+    --menu-background-color: var(--dark-menu-background-color);
+    --menu-color: var(--dark-menu-color);
+    --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+    --menu-disabled-color: var(--dark-menu-disabled-color);
+    --menu-border-color: var(--dark-menu-border-color);
+    --menu-icon-opacity: var(--dark-menu-icon-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-bool-pref: "userChrome.theme.proton_color.dark_blue_accent") and (prefers-color-scheme: dark) {
+  :host,
+  :root {
+    /* Color Memo
+     Just refer - Photon's dark color
+     --button-primary-bgcolor: #0060DF;
+     --button-primary-hover-bgcolor: #003EAA;
+     --button-primary-active-bgcolor: #002275;
+     --lwt-brighttext-url-color: #74c0ff;
+     --lwt-toolbarbutton-icon-fill-attention: #45a1ff;
+
+     Just refer - Proton's light color
+     --in-content-accent-color: #0a84ff;
+     --in-content-accent-color-active: #0060df;
+     --in-content-primary-button-background: #0061e0;
+     --in-content-primary-button-background-hover: #0250bb;
+     --in-content-primary-button-background-active: #053e94;
+
+     --blue-40: #45a1ff; rgb(69, 161, 255)
+     --blue-50: #0a84ff; rgb(10, 132, 255)
+     --blue-60: #0060df; rgb(0, 96, 223)
+     --blue-70: #003eaa; rgb(0, 62, 170)
+     --blue-80: #002275; rgb(0, 34, 117)
+
+     Relation
+     lighten(#0060df,   29%): #74b0ff;
+     lighten(#0060df, 19.8%): #4595ff
+     lighten(#0060df,  8.3%): #0a74ff
+     #0060df
+     darken(#0060df, 15.5%):  #003e90;
+     darken(#0060df, 28.1%):  #002250;
+    */
+    --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/
+    --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */
+  }
+  :host,
+  :root,
+  dialog {
+    --in-content-primary-button-text-color: var(--in-content-page-color) !important;
+    --in-content-primary-button-background: var(--blue-60) !important;
+    --in-content-primary-button-background-hover: var(--blue-50) !important;
+    --in-content-primary-button-background-active: var(--blue-40) !important;
+    --in-content-focus-outline-color: var(--blue-40) !important;
+    --in-content-accent-color: var(--blue-40) !important;
+    --in-content-accent-color-active: var(--blue-30) !important;
+    --in-content-table-background: rgb(35, 34, 43) !important;
+    --in-content-table-border-color: rgba(249, 249, 250, 0.2) !important;
+    --in-content-table-header-background: rgb(5, 64, 150) !important;
+    --in-content-table-header-color: var(--in-content-page-color) !important;
+    --in-content-link-color: var(--blue-40) !important;
+    --in-content-link-color-hover: var(--blue-30) !important;
+    --in-content-link-color-active: var(--blue-20) !important;
+    --in-content-link-color-visited: var(--blue-40) !important;
+  }
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
+    --button-primary-color: var(--in-content-page-color) !important;
+    --button-primary-bgcolor: var(--blue-60) !important;
+    --button-primary-hover-bgcolor: var(--blue-50) !important;
+    --button-primary-active-bgcolor: var(--blue-40) !important;
+    --focus-outline-color: var(--blue-40) !important;
+    --lwt-toolbarbutton-icon-fill-attention: var(--blue-40) !important;
+    --download-progress-fill-color: var(--blue-40) !important;
+    --panel-banner-item-info-icon-bgcolor: var(--blue-30) !important;
+    --lwt-brighttext-url-color: var(--blue-30) !important; /* Original: as primary bgcolor */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.proton_color") and (-moz-bool-pref: "userChrome.theme.proton_color.dark_blue_accent") and (prefers-color-scheme: dark) and (-moz-bool-pref: "userChrome.decoration.download_panel") {
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"] #downloadsListBox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] #downloadsListBox {
+    --button-primary-bgcolor: var(--blue-30);
+    --button-primary-hover-bgcolor: var(--blue-20);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.private") {
+  :root[privatebrowsingmode="temporary"],
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"],
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"],
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"] {
+    --lwt-additional-images: none !important;
+    --lwt-header-image: none !important;
+    --lwt-tab-text: rgba(232, 224, 255) !important;
+    --lwt-text-color: var(--lwt-tab-text) !important;
+    --toolbar-color: var(--lwt-tab-text) !important;
+    --toolbar-non-lwt-textcolor: var(--lwt-tab-text) !important;
+    --arrowpanel-color: var(--lwt-tab-text) !important;
+    --focus-outline-color: rgb(172, 112, 255) !important;
+    --toolbar-bgcolor: #322560 !important;
+    --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor) !important;
+    --lwt-accent-color: #19162f !important;
+    --in-content-page-background: var(--lwt-accent-color) !important;
+    --toolbar-field-background-color: #0b0724 !important;
+    --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
+    --toolbarbutton-hover-background: rgba(255, 255, 255, 0.05) !important;
+    --toolbarbutton-active-background: #4d4175 !important;
+    --arrowpanel-background: #1d1935 !important;
+    --arrowpanel-border-color: #322560 !important;
+    --chrome-content-separator-color: none !important;
+    --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important;
+    --autocomplete-popup-hover-background: #1d1935 !important;
+    --autocomplete-popup-highlight-background: rgba(65, 48, 117, 0.5) !important;
+    --button-bgcolor: color-mix(in srgb, currentColor 13%, transparent) !important;
+    --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent) !important;
+    --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent) !important;
+    --urlbar-box-bgcolor: color-mix(in srgb, currentColor 16%, transparent) !important;
+  }
+  :root[privatebrowsingmode="temporary"]:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"]:is(:-moz-lwtheme, [lwtheme])
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox {
+    --lwt-tabs-border-color: var(--focus-outline-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[privatebrowsingmode="temporary"][lwtheme-image]:is(:-moz-lwtheme, [lwtheme]) #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] #navigator-toolbox,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    #navigator-toolbox,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"][lwtheme-image]:is(
+      :-moz-lwtheme,
+      [lwtheme]
+    )
+    #navigator-toolbox {
+    background-color: var(--lwt-accent-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    #TabsToolbar,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] #TabsToolbar,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    #TabsToolbar {
+    --lwt-tab-line-color: var(--focus-outline-color) !important;
+  }
+  :root[privatebrowsingmode="temporary"] notification-message[message-bar-type="infobar"],
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    notification-message[message-bar-type="infobar"] {
+    --message-bar-text-color: var(--lwt-tab-text) !important;
+    --in-content-page-color: var(--lwt-tab-text) !important;
+  }
+  :root[privatebrowsingmode="temporary"] menupopup,
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"])[privatebrowsingmode="temporary"] menupopup,
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"][privatebrowsingmode="temporary"]
+    menupopup,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"][privatebrowsingmode="temporary"] menupopup,
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"][privatebrowsingmode="temporary"]
+    menupopup {
+    --menuitem-hover-background-color: #413d54 !important;
+    --menu-background-color: #1d1935 !important;
+    --menu-color: #eeeeee !important;
+    --menuitem-disabled-hover-background-color: #ffffff00 !important;
+    --menu-disabled-color: #ffffff50 !important;
+    --menu-border-color: #322560 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  /*== Menu Color ==============================================================*/
+  html#main-window menupopup:not(.in-menulist) {
+    /* is same as toolbar color https://github.com/mozilla/gecko-dev/blob/master/toolkit/themes/windows/global/global.css#L17-L67 */
+    --menu-color: var(--arrowpanel-color, var(--in-content-page-color)) !important;
+    --menu-background-color: var(--arrowpanel-background, var(--in-content-button-background)) !important;
+    --menu-border-color: var(
+      --panel-separator-color,
+      var(--toolbarbutton-active-background, var(--button-active-bgcolor, var(--card-outline-color)))
+    ) !important;
+    --menuitem-hover-background-color: var(
+      --toolbarbutton-hover-background,
+      var(--button-hover-bgcolor, var(--in-content-button-background-hover))
+    ) !important;
+    --menu-disabled-color: color-mix(in srgb, var(--menu-color) 40%, transparent) !important;
+    --menuitem-disabled-hover-background-color: color-mix(
+      in srgb,
+      var(--menuitem-hover-background-color) 40%,
+      transparent
+    ) !important;
+  }
+  /* Default theme color preservation */
+  /*== Info Bar Color ==========================================================*/
+  /*== Bookmark Popup Color ====================================================*/
+  /*== Sidebar - Field Color ===================================================*/
+  /*= PopupAutoComplete ========================================================*/
+  /* New Folder Button */
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") and (-moz-platform: windows) {
+  html#main-window menupopup:not(.in-menulist) {
+    /* Above FF v105 #466 */
+    --panel-color: var(--menu-color) !important;
+    --panel-background: var(--menu-background-color) !important;
+    --panel-border-color: var(--menu-border-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+  html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
+  html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
+    border-color: var(--menu-border-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menuitem[disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"][disabled="true"] {
+    color: var(--menu-disabled-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"]:not([disabled="true"]),
+  html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+    background-color: var(--menuitem-hover-background-color) !important;
+    color: var(--menu-color) !important;
+  }
+  html#main-window
+    menupopup
+    #context-navigation
+    > .menuitem-iconic[_moz-menuactive="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon {
+    background-color: var(--menuitem-hover-background-color) !important;
+  }
+  html#main-window
+    menupopup
+    #context-navigation
+    > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") and (-moz-platform: windows) and (prefers-color-scheme: light) {
+  :root[style*="background-noodles-right"] menupopup {
+    --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  html#main-window menupopup:not(.in-menulist) {
+    /* Above FF v105 #466 */
+    --panel-color: var(--menu-color) !important;
+    --panel-background: var(--menu-background-color) !important;
+    --panel-border-color: var(--menu-border-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+  html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
+  html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
+    border-color: var(--menu-border-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menuitem[disabled="true"],
+  html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"][disabled="true"] {
+    color: var(--menu-disabled-color) !important;
+  }
+  html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"]:not([disabled="true"]),
+  html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+    background-color: var(--menuitem-hover-background-color) !important;
+    color: var(--menu-color) !important;
+  }
+  html#main-window
+    menupopup
+    #context-navigation
+    > .menuitem-iconic[_moz-menuactive="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon {
+    background-color: var(--menuitem-hover-background-color) !important;
+  }
+  html#main-window
+    menupopup
+    #context-navigation
+    > .menuitem-iconic[_moz-menuactive="true"][disabled="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
+  :root[style*="background-noodles-right"] menupopup {
+    --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  @media not all and (-moz-gtk-csd-available) {
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menupopup {
+      --panel-color: var(--lwt-sidebar-text-color, var(--menu-color)) !important;
+      --panel-background: var(--lwt-sidebar-background-color, var(--menu-background-color)) !important;
+    }
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menu[_moz-menuactive="true"]:not([disabled="true"]),
+    window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"]
+      menuitem[_moz-menuactive="true"]:not([disabled="true"]) {
+      --menuitem-hover-background-color: color-mix(
+        in srgb,
+        currentColor 17%,
+        transparent
+      ); /* Looks like toolbar button */
+      /* or var(--lwt-sidebar-highlight-background-color)
+           If this value is used, unset is required in the default theme.
+        */
+      background-color: var(--menuitem-hover-background-color) !important;
+    }
+    /* Fallback background - Set to Legacy. It will be removed Next update
+    menupopup:not(.cui-widget-panel.cui-widget-panelview, [placespopup="true"]) {
+      background-color: var(--lwt-accent-color, var(--in-content-page-background)) !important;
+    }
+    */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  :root[lwtheme-mozlightdark] menupopup:not(#BMB_bookmarksPopup, [placespopup="true"]),
+  :root[lwtheme-mozlightdark] menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    menupopup:not(#BMB_bookmarksPopup, [placespopup="true"]),
+  :root:is(
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    )
+    menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) {
+    --menu-color: var(--toolbar-color, var(--in-content-page-color)) !important;
+    --arrowpanel-background: var(
+      --toolbar-bgcolor,
+      var(--in-content-button-background)
+    ) !important; /* --menu-background-color */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  @media not all and (-moz-gtk-csd-available) {
+    window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(249, 249, 251, 1);"] menupopup,
+    window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] menupopup {
+      /* Default Dark Mode */
+      --panel-color: var(--menu-color) !important;
+      --panel-background: var(--menu-background-color, -moz-menuhover) !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .container.infobar {
+    background-color: var(--urlbar-box-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .notification-button {
+    background-color: var(--button-bgcolor) !important;
+  }
+  .notification-button:hover {
+    background-color: var(--button-hover-bgcolor) !important;
+  }
+  .notification-button:hover:active {
+    background-color: var(--button-active-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .notification-button.primary {
+    background-color: var(--button-primary-bgcolor) !important;
+  }
+  .notification-button.primary:hover {
+    background-color: var(--button-primary-hover-bgcolor) !important;
+  }
+  .notification-button.primary:hover:active {
+    background-color: var(--button-primary-active-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  html|button.ghost-button:not(.semi-transparent):enabled:hover {
+    background-color: var(--button-hover-bgcolor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  html|button.ghost-button:not(.semi-transparent):enabled:hover:active {
+    background-color: var(--in-content-button-background-active) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector {
+    appearance: none !important;
+    border: 0.5px solid var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-image,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(hover),
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(selected),
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector > richlistitem {
+    color: var(--lwt-text-color, fieldtext) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-cell-text(selected) {
+    font-weight: 600 !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren,
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_tagsSelector {
+    background-color: color-mix(in srgb, var(--arrowpanel-background) 35%, var(--in-content-box-background)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-row(hover),
+  #editBMPanel_tagsSelector > richlistitem:hover {
+    background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 17%, transparent)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  :root:is(:-moz-lwtheme, [lwtheme]) #editBMPanel_folderTree > treechildren::-moz-tree-row(selected),
+  #editBMPanel_tagsSelector > richlistitem[selected="true"] {
+    background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  #editBookmarkPanel #editBMPanel_namePicker,
+  #editBookmarkPanel #editBMPanel_tagsField {
+    --input-bgcolor: var(--arrowpanel-background, Field);
+    --input-color: var(--arrowpanel-color, FieldText);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  html[lwt-sidebar]:not(#main-window) body {
+    background-color: var(--lwt-sidebar-background-color, Field) !important;
+    color: var(--lwt-sidebar-text-color, FieldText) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .sidebar-panel #search-box,
+  xul|search-textbox.tabsFilter {
+    --input-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
+    appearance: none !important;
+    padding: 5px 8px !important;
+    border: 1px solid var(--input-bgcolor) !important;
+    background-color: var(--lwt-sidebar-background-color, Field) !important;
+    color: var(--lwt-sidebar-text-color, FieldText) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .sidebar-panel:not([lwt-sidebar]) #search-box {
+    --input-bgcolor: ThreeDShadow;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .sidebar-panel #search-box[focused="true"],
+  xul|search-textbox.tabsFilter[focused="true"] {
+    outline: 1px solid var(--input-bgcolor);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .sidebar-panel[lwt-sidebar] #search-box[focused="true"],
+  body[lwt-sidebar] xul|search-textbox.tabsFilter[focused="true"] {
+    --input-bgcolor: var(--lwt-sidebar-highlight-background-color, Highlight) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"],
+  body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] {
+    border-color: AccentColor !important; /* Hard Coded */
+    outline-color: AccentColor !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"],
+  body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] {
+    border-color: -moz-accent-color !important; /* Hard Coded */
+    outline-color: -moz-accent-color !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  #PopupAutoComplete {
+    --panel-bgcolor: var(--arrowpanel-background, var(--in-content-button-background));
+    /* overwrite */
+    --panel-border-radius: 4px !important; /* Original: 0 */
+    --panel-border-color: var(
+      --arrowpanel-border-color,
+      var(--menu-border-color)
+    ) !important; /* Original: ThreeDShadow */
+    appearance: none !important;
+    background: transparent !important;
+    border: none !important;
+    clip-path: inset(0 round var(--panel-border-radius));
+  }
+  #PopupAutoComplete > richlistbox {
+    border-radius: var(--panel-border-radius) !important;
+    background-color: var(--panel-bgcolor) !important; /* Original: Field */
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FiledText */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  .autocomplete-richlistitem:hover {
+    background-color: var(--arrowpanel-dimmed) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon {
+    fill: GrayText !important;
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] {
+    --panel-border-color: var(--panel-bgcolor);
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FieldText */
+    background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; /* Original: hsla(0,0%,80%,.35) */
+    border-color: var(--panel-border-color) !important; /* Original: rgba(38,38,38,.15) */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"]:hover,
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"][selected] {
+    background-color: var(
+      --arrowpanel-dimmed-further,
+      hsla(0deg, 0%, 80%, 0.5)
+    ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] {
+    background-color: var(--panel-bgcolor) !important; /* Original: var(--arrowpanel-dimmed) */
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"]:hover {
+    background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important;
+  }
+  #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title {
+    color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: var(--grey-60) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.fully_color") {
+  #editBMPanel_newFolderButton {
+    appearance: none;
+    border: 0;
+    border-radius: 4px;
+    background-color: var(--button-bgcolor);
+    color: var(--button-color, inherit);
+    font-weight: 600;
+    min-width: 0;
+    padding: 8px 16px;
+    /* This button is deeper in the visual hierarchy than others (notably the
+       buttons at the bottom of the panel), so it should be slightly smaller. */
+    font-size: 90%;
+    /* This button needs to align with the tree above it. */
+    margin-inline-start: 4px;
+  }
+  #editBMPanel_newFolderButton:hover {
+    background-color: var(--button-hover-bgcolor);
+  }
+  #editBMPanel_newFolderButton:hover:active {
+    background-color: var(--button-active-bgcolor);
+  }
+}
+/*= Fully Dark Mode ==========================================================*/
+@media (-moz-bool-pref: "userChrome.theme.fully_dark") {
+  /*= Remove White Flash =======================================================*/
+  #tabbrowser-tabbox,
+  #tabbrowser-tabpanels,
+  browser[type="content-primary"],
+  browser[type="content"] > html {
+    background: var(--in-content-page-background) !important;
+  }
+  /*= Notification =============================================================*/
+  @-moz-document url("chrome://global/content/alerts/alert.xhtml")
+  {
+    /* Color */
+    :root {
+      --menu-color: #15141a;
+      --menu-background-color: #f9f9fb;
+      --menu-border-color: #cfcfd8;
+      --menuitem-hover-background-color: #e0e0e6;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.fully_dark") and (prefers-color-scheme: dark) {
+      :root {
+        --menu-border-color: rgba(107, 107, 107, 0.3);
+        --menu-color: #fbfbfe;
+        --menu-background-color: #2b2a33;
+        --menuitem-hover-background-color: #52525e;
+      }
+      #alertSourceLabel {
+        color: rgb(5, 209, 241) !important;
+      }
+    }
+    /* line below removes background from the notification "window" on linux */
+    #alertNotification {
+      background: transparent !important;
+    }
+    #alertBox {
+      color: var(--menu-color) !important;
+      background-color: var(--menu-background-color) !important;
+      border-color: var(--menu-border-color) !important;
+      border-radius: 6px !important;
+      -moz-window-shadow: cliprounded !important;
+    }
+    #alertSettings {
+      fill: currentColor !important;
+      color: inherit !important;
+      border-radius: 0 !important;
+      margin-inline: 0 !important;
+      margin-bottom: -4px !important;
+    }
+    .close-icon,
+    #alertSettings {
+      background: transparent !important;
+    }
+    .close-icon:hover > .toolbarbutton-icon,
+    #alertSettings:is(:hover, [open]) > .button-box > .box-inherit {
+      background-color: var(--menuitem-hover-background-color, #e0e0e6) !important;
+    }
+    /* Shape */
+    .close-icon > .toolbarbutton-icon,
+    #alertSettings > .button-box > .box-inherit {
+      border-radius: 4px !important;
+      padding: 2px !important;
+      margin: 2px 2px -2px 0 !important;
+    }
+    #alertSettings > .button-box > .box-inherit {
+      margin: -4px 4px 3px 0 !important;
+    }
+    #alertSettings > .button-box > .box-inherit > .button-icon {
+      padding: 1px;
+    }
+  }
+}
+/*= Transparent ==============================================================*/
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) {
+  #main-window,
+  #navigator-toolbox-background {
+    background-color: transparent !important;
+    appearance: auto !important;
+    -moz-default-appearance: -moz-win-borderless-glass !important;
+  }
+  #navigator-toolbox {
+    background-color: transparent !important;
+    background-image: none !important;
+  }
+  #nav-bar,
+  #PersonalToolbar {
+    background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-additional-images);
+    background-repeat: repeat-x, var(--lwt-background-tiling);
+    background-position: 0 0, var(--lwt-background-alignment);
+    background-attachment: scroll, fixed !important;
+    background-size: auto 100%, auto auto;
+  }
+  #appcontent {
+    appearance: auto !important;
+    -moz-default-appearance: -moz-win-exclude-glass !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    --lwt-accent-color: Window !important;
+    --lwt-text-color: WindowText !important;
+  }
+  :root[style*="--focus-outline-color: rgb(172, 112, 255); --panel-separator-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%);"] {
+    --lwt-accent-color: rgb(45, 36, 91) !important;
+  }
+  #titlebar,
+  #toolbar-menubar,
+  #TabsToolbar {
+    --uc-frame-element-background: color-mix(in srgb, var(--lwt-accent-color, Window) 60%, transparent);
+    --toolbarbutton-hover-background: color-mix(in srgb, var(--lwt-accent-color, Window) 85%, transparent);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+  #titlebar,
+  #toolbar-menubar,
+  #TabsToolbar {
+    --toolbarbutton-hover-background: color-mix(
+      in srgb,
+      var(--lwt-accent-color, Window) 40%,
+      rgba(255, 255, 255, 0.25)
+    );
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) {
+  #main-menubar {
+    border-radius: 4px;
+  }
+  #main-menubar:not(:-moz-window-inactive) {
+    background-color: var(--uc-frame-element-background) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) and (-moz-gtk-csd-available) {
+  .titlebar-buttonbox-container:not(:-moz-window-inactive) {
+    background-color: var(--uc-frame-element-background) !important;
+    border-radius: 4px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) {
+  #TabsToolbar {
+    --toolbarseparator-color: transparent;
+  }
+  #TabsToolbar .tabbrowser-tab > .tab-stack > .tab-background:not([selected], [multiselected]) {
+    background-color: var(--uc-frame-element-background);
+  }
+  #TabsToolbar #firefox-view-button:hover:not([open]) > .toolbarbutton-icon,
+  #TabsToolbar .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected], [multiselected]) {
+    background-color: var(
+      --toolbarbutton-hover-background
+    ) !important; /* Original: color-mix(in srgb, currentColor 11%, transparent) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-gtk-csd-available) {
+  #scrollbutton-up,
+  #scrollbutton-down,
+  #alltabs-button > .toolbarbutton-badge-stack,
+  #TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon {
+    background-color: var(--uc-frame-element-background);
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-platform: windows) {
+  :root,
+  #navigator-toolbox {
+    --lwt-accent-color: transparent !important;
+    --lwt-text-color: WindowText !important;
+  }
+  #titlebar .toolbarbutton-1,
+  #toolbar-menubar .toolbarbutton-1,
+  #TabsToolbar .toolbarbutton-1 {
+    --toolbarbutton-icon-fill: var(--lwt-text-color) !important;
+  }
+  :root:not([sizemode="fullscreen"]) .titlebar-buttonbox-container .titlebar-button:not(.titlebar-close:hover) {
+    list-style-image: none !important;
+  }
+  :root:not([sizemode="fullscreen"])
+    #toolbar-menubar[autohide="true"][inactive="true"]
+    + #TabsToolbar
+    .titlebar-button:is(.titlebar-close:hover)
+    .toolbarbutton-icon {
+    transform: translateY(-7px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.frame") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:not(:-moz-window-inactive) #navigator-toolbox {
+    background-color: transparent !important;
+  }
+  #TabsToolbar,
+  #titlebar,
+  #nav-bar,
+  #PersonalToolbar,
+  #tabbrowser-tabs {
+    -moz-appearance: -moz-mac-source-list !important;
+    background-color: transparent !important;
+  }
+  /* De-emphasize tab icons and names when window is unfocused */
+  :root:-moz-window-inactive .tab-content,
+  :root:-moz-window-inactive #urlbar {
+    opacity: 0.6;
+  }
+  :root:-moz-window-inactive #urlbar-background {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.menu") {
+  .menupopup-arrowscrollbox[part*="content"] {
+    background: color-mix(in srgb, var(--menu-background-color, Menu) 90%, transparent) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.menu") and (not (-moz-bool-pref: "userChrome.theme.non_native_menu")) and (-moz-gtk-csd-available) {
+  html#main-window #mainPopupSet menupopup:not(.in-menulist) {
+    --menu-background-color: Menu !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.theme.transparent.panel") {
+  panel[type="arrow"] {
+    --panel-background: transparent !important;
+  }
+  panelview {
+    background: color-mix(in srgb, var(--arrowpanel-background) 90%, transparent) !important;
+  }
+}
+/*= Proton Theme Mode ========================================================*/
+@media (-moz-bool-pref: "userChrome.theme.proton_chrome") {
+  /*= Proton Commons ===========================================================*/
+  @-moz-document url("chrome://global/content/commonDialog.xhtml"), url("chrome://pippki/content/editcacert.xhtml"), url("chrome://pippki/content/deletecert.xhtml"), url("chrome://pippki/content/exceptionDialog.xhtml"), url("chrome://mozapps/content/downloads/unknownContentType.xhtml"), url("chrome://global/content/appPicker.xhtml"), url("chrome://browser/content/pageinfo/pageInfo.xhtml")
+  {
+    /*- Overwrite --------------------------------------------------------------*/
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-color-scheme: dark) {
+      :root {
+        --in-content-page-background: #42414d;
+      }
+    }
+    :root:is(:not([lwtheme]), :not(:-moz-lwtheme)),
+    :root[lwt-default-theme-in-dark-mode] {
+      --checkbox-unchecked-bgcolor: var(--in-content-button-background) !important;
+      --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover) !important;
+      --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active) !important;
+      --checkbox-checked-bgcolor: var(--in-content-primary-button-background) !important;
+      --checkbox-checked-color: var(--in-content-primary-button-text-color) !important;
+      --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover) !important;
+      --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active) !important;
+    }
+    /*- Dialog -----------------------------------------------------------------*/
+    #commonDialog,
+    #editCaCert,
+    #deleteCertificate,
+    #exceptiondialog,
+    #unknownContentType,
+    #app-picker,
+    #topBar,
+    #mainDeck {
+      -moz-appearance: none !important; /* For Mac */
+      color: var(--in-content-page-color) !important;
+      background-color: var(--in-content-page-background) !important;
+      /* border-radius: 0 0 8px 8px !important; */
+    }
+    /*- Button -----------------------------------------------------------------*/
+    button {
+      -moz-appearance: none !important;
+      color: var(--in-content-button-text-color) !important;
+      background-color: var(--in-content-button-background) !important;
+      font: inherit;
+      font-size: 1em !important;
+      font-weight: 600 !important;
+      min-height: 32px !important;
+      border: 1px solid transparent !important; /* shows up in high-contrast mode */
+      border-radius: var(--in-content-button-border-radius) !important;
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      min-height: 32px !important;
+      /* Use the same margin of other elements for the alignment */
+      margin-inline: 4px !important;
+      min-width: 6.3em !important;
+    }
+    button.medium {
+      /* Medium and small buttons get sized to 7/14 and 6/12px padding (when adding
+       * the 1px border): */
+      padding: 6px 13px !important;
+      min-height: 28px !important;
+      font-size: 0.95em !important;
+    }
+    button.small {
+      padding: 5px 11px !important;
+      min-height: 24px !important;
+      font-size: 0.9em !important;
+    }
+    /* Remove margin added by button.css */
+    xul|button > .button-box > .button-text {
+      margin: 0 !important;
+    }
+    button:not([disabled="true"]):hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    xul|button:not([disabled="true"]):hover:active,
+    xul|button[open],
+    xul|button[open]:hover,
+    xul|menulist[open="true"]:not([disabled="true"]) {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    xul|button[default] {
+      background-color: var(--in-content-primary-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    xul|button[default]:not([disabled="true"]):hover {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    xul|button[default]:not([disabled="true"]):hover:active {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    xul|button[disabled="true"],
+    xul|menulist[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    xul|button:not([disabled="true"]):hover,
+    xul|menulist:not([disabled="true"]):hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) {
+      xul|button[default]:not([disabled="true"]):hover {
+        border-color: currentColor !important;
+      }
+      button:focus {
+        color: var(--in-content-button-text-color) !important;
+      }
+      xul|button[default]:focus,
+      button.primary:focus {
+        color: var(--in-content-primary-button-text-color) !important;
+      }
+    }
+    button:-moz-focusring,
+    xul|menulist:-moz-focusring,
+    xul|checkbox:-moz-focusring > .checkbox-check,
+    xul|radio[focused="true"]:-moz-focusring {
+      box-shadow: none !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 2px !important;
+    }
+    /*- Radio Button -----------------------------------------------------------*/
+    xul|radio {
+      /* margin-inline-start: 0 !important; */
+      appearance: none !important;
+    }
+    xul|*.radio-check {
+      appearance: none !important;
+      width: 16px !important;
+      height: 16px !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 100% !important;
+      padding: 0 !important;
+      margin-inline: 0 6px !important;
+      margin-block: 2px !important; /* extend the vertical clicktarget */
+      background-color: var(--in-content-button-background) !important;
+      background-position: center !important;
+      flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+    }
+    xul|*.radio-check[selected] {
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--in-content-primary-button-text-color) !important;
+      background-color: var(--in-content-primary-button-background) !important;
+      background-image: url("chrome://browser/skin/lepton/radio.svg") !important;
+      border-color: transparent !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+    }
+    xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+    }
+    xul|radio:not([disabled="true"]):hover:active > xul|*.radio-check {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    xul|radio:not([disabled="true"])[selected]:hover > xul|*.radio-check {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+    }
+    xul|radio:not([disabled="true"])[selected]:hover:active > xul|*.radio-check {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    xul|*.radio-label-box {
+      margin-inline: 0 8px !important;
+      padding-inline-start: 0 !important;
+    }
+    /* Disabled checkboxes, radios and labels */
+    xul|checkbox[disabled="true"],
+    xul|radio[disabled="true"],
+    xul|label[disabled="true"] {
+      color: inherit !important;
+      opacity: 0.5 !important;
+    }
+    /*- Check Box --------------------------------------------------------------*/
+    /* From checkbox.css */
+    checkbox {
+      appearance: none !important;
+      align-items: center !important;
+      -moz-box-align: center !important;
+      margin: 4px 2px !important;
+    }
+    .checkbox-check {
+      appearance: none !important;
+      width: 16px !important;
+      height: 16px !important;
+      border: 1px solid currentColor !important;
+      border-radius: 2px !important;
+      color: var(--checkbox-border-color, ThreeDDarkShadow) !important;
+      background-color: var(--checkbox-unchecked-bgcolor, Field) !important;
+      margin-inline-end: 6px !important; /* or 2px */
+      margin-block: 2px !important; /* From common.css */
+    }
+    .checkbox-check[checked] {
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      border-color: var(--checkbox-checked-border-color, transparent) !important;
+      background-image: url("chrome://global/skin/icons/check.svg") !important;
+      background-position: center !important;
+      background-repeat: no-repeat !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+      color: var(--checkbox-checked-color, AccentColorText) !important;
+      background-color: var(--checkbox-checked-bgcolor, AccentColor) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      .checkbox-check[checked] {
+        color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+        background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover > .checkbox-check {
+      background-color: var(--checkbox-unchecked-hover-bgcolor, color-mix(in srgb, AccentColor 4%, Field)) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover > .checkbox-check {
+        background-color: var(
+          --checkbox-unchecked-hover-bgcolor,
+          color-mix(in srgb, -moz-accent-color 4%, Field)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover:active > .checkbox-check {
+      background-color: var(--checkbox-unchecked-active-bgcolor, color-mix(in srgb, AccentColor 8%, Field)) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check {
+        background-color: var(
+          --checkbox-unchecked-active-bgcolor,
+          color-mix(in srgb, -moz-accent-color 8%, Field)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover > .checkbox-check[checked] {
+      background-color: var(
+        --checkbox-checked-hover-bgcolor,
+        color-mix(in srgb, currentColor 12.5%, AccentColor)
+      ) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover > .checkbox-check[checked] {
+        background-color: var(
+          --checkbox-checked-hover-bgcolor,
+          color-mix(in srgb, currentColor 12.5%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] {
+      background-color: var(
+        --checkbox-checked-active-bgcolor,
+        color-mix(in srgb, currentColor 25%, AccentColor)
+      ) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] {
+        background-color: var(
+          --checkbox-checked-active-bgcolor,
+          color-mix(in srgb, currentColor 25%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    checkbox:-moz-focusring > .checkbox-check {
+      outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+      outline-offset: var(--focus-outline-offset, 2px) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:-moz-focusring > .checkbox-check {
+        outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) {
+      checkbox:not([disabled="true"]):hover > .checkbox-check {
+        /* color will set the border-color on the check due to how HCM works for in-content pages. */
+        color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover > .checkbox-check {
+        /* color will set the border-color on the check due to how HCM works for in-content pages. */
+        color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) {
+      .checkbox-check[checked] {
+        color: var(--checkbox-checked-border-color, currentColor) !important;
+        fill: var(--checkbox-checked-color, AccentColorText) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      .checkbox-check[checked] {
+        fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked],
+      checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] {
+        color: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+        fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked],
+      checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] {
+        color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+        fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+      }
+    }
+    .checkbox-icon[src] {
+      margin-inline-end: 2px !important;
+    }
+    .checkbox-label {
+      margin: 1px 0 !important;
+    }
+    checkbox[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    /* From common.css */
+    xul|richlistitem > xul|*.checkbox-check {
+      margin: 3px 6px !important;
+    }
+    /*- Menulist ---------------------------------------------------------------*/
+    /* From mulist.css */
+    xul|menulist {
+      appearance: none !important;
+      background-color: var(--in-content-button-background, ButtonFace) !important;
+      color: var(--in-content-button-text-color, ButtonText) !important;
+      border-radius: 4px !important;
+      padding-block: 4px !important;
+      padding-inline: 12px 8px !important;
+      margin: 5px 2px 3px !important;
+    }
+    xul|menulist[size="medium"] {
+      padding-block: 6px !important;
+      padding-inline: 16px 10px !important;
+    }
+    xul|menulist[size="large"] {
+      padding-block: 8px !important;
+      padding-inline: 16px 12px !important;
+    }
+    xul|menulist:hover {
+      background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 10%, ButtonFace)) !important;
+    }
+    xul|menulist:hover:active {
+      background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace)) !important;
+    }
+    xul|menulist:-moz-focusring {
+      outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+      outline-offset: var(--focus-outline-offset, 2px) !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      xul|menulist:-moz-focusring {
+        outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+      }
+    }
+    #label-box {
+      align-items: center !important;
+      -moz-box-align: center !important;
+      justify-content: center !important;
+      -moz-box-pack: center !important;
+      font-weight: 600 !important;
+    }
+    dropmarker {
+      display: flex !important;
+      display: -moz-box !important;
+      appearance: none !important;
+      width: 12px !important;
+      height: 12px !important;
+    }
+    dropmarker[exportparts="icon: dropmarker-icon"] {
+      /* dropmarker::part(icon)
+       * ::part is not apply chrome
+       */
+      list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+    }
+    #highlightable-label:not([highlightable="true"]),
+    #label[highlightable="true"] {
+      display: none !important;
+    }
+    xul|menuitem > label:not(.menu-text) {
+      margin: 0 3px !important;
+    }
+    /* From common.css */
+    xul|menulist > xul|menupopup {
+      appearance: none !important;
+      /* Reset native styles on Windows and macOS */
+      border: none !important;
+      background-color: transparent !important;
+      --panel-border-color: var(--in-content-box-border-color) !important;
+      --panel-border-radius: 2px !important;
+      --panel-background: var(--in-content-box-background) !important;
+      --panel-color: var(--in-content-text-color) !important;
+      --panel-padding: 0 !important;
+    }
+    xul|menulist > xul|menupopup xul|menu,
+    xul|menulist > xul|menupopup xul|menuitem {
+      appearance: none !important;
+      font-size: 1em !important;
+      padding-block: 0.2em !important;
+      padding-inline: 10px 30px !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+    xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+      color: var(--in-content-item-hover-text) !important;
+      background-color: var(--in-content-item-hover) !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+    xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
+      color: var(--in-content-item-selected-text) !important;
+      background-color: var(--in-content-item-selected) !important;
+    }
+    xul|menulist > xul|menupopup > xul|menu[disabled="true"],
+    xul|menulist > xul|menupopup > xul|menuitem[disabled="true"] {
+      color: #999 !important;
+      /* override the [_moz-menuactive="true"] background color from
+           global/menu.css */
+      background-color: transparent !important;
+    }
+    xul|menulist > xul|menupopup xul|menuseparator {
+      appearance: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      border-top: 1px solid var(--in-content-box-border-color) !important;
+      border-bottom: none !important;
+    }
+    xul|menulist::part(dropmarker) {
+      margin-block: 1px !important;
+    }
+    /* Override menulist.css */
+    xul|menulist[disabled="true"] {
+      background-color: var(--in-content-button-background) !important;
+    }
+    xul|menulist:-moz-focusring > xul|*.menulist-label-box {
+      outline: none !important;
+    }
+    /*- List Boxes -------------------------------------------------------------*/
+    html|select[size][multiple],
+    xul|listheader,
+    xul|richlistbox {
+      appearance: none !important;
+      margin-inline: 0 !important;
+      background-color: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: var(--in-content-text-color) !important;
+    }
+    xul|listheader {
+      border-bottom: none !important;
+      border-bottom-left-radius: 0 !important;
+      border-bottom-right-radius: 0 !important;
+      padding-bottom: 1px !important;
+      box-shadow: inset 0 -1px var(--in-content-table-border-color) !important;
+      overflow: clip !important; /* Clip border-radius */
+    }
+    xul|listheader + xul|richlistbox {
+      margin-top: 0 !important;
+      border-top: none !important;
+      border-top-left-radius: 0 !important;
+      border-top-right-radius: 0 !important;
+    }
+    html|select[size][multiple] > html|option,
+    xul|treechildren::-moz-tree-row {
+      padding: 0.3em inherit !important;
+      margin: 0 !important;
+      border: none !important;
+      border-radius: 0 !important;
+      background-image: none !important;
+    }
+    xul|treechildren::-moz-tree-row(multicol, odd) {
+      background-color: var(--in-content-box-background-odd);
+    }
+    html|select[size][multiple] > html|option:hover,
+    xul|richlistbox > xul|richlistitem:not([disabled="true"], [selected]):hover,
+    xul|treechildren::-moz-tree-row(hover) {
+      background-color: var(--in-content-item-hover) !important;
+      color: var(--in-content-item-hover-text) !important;
+    }
+    xul|richlistbox > xul|richlistitem[selected],
+    xul|treechildren::-moz-tree-row(selected) {
+      background-color: var(--in-content-item-selected) !important;
+      color: var(--in-content-item-selected-text) !important;
+    }
+    xul|richlistbox:not(#categories) > xul|richlistitem[selected] {
+      /* Ensure buttons/menulists inside richlistitems (containers, applications) look OK */
+      --in-content-button-background: color-mix(in srgb, currentColor 15%, transparent) !important;
+      --in-content-button-background-hover: color-mix(in srgb, currentColor 30%, transparent) !important;
+      --in-content-button-background-active: color-mix(in srgb, currentColor 45%, transparent) !important;
+      --in-content-button-text-color: var(--in-content-item-selected-text) !important;
+      --in-content-button-text-color-hover: var(--in-content-item-selected-text) !important;
+      --in-content-focus-outline-color: var(--in-content-item-selected-text) !important;
+    }
+    xul|richlistitem[selected] xul|menulist:focus-visible {
+      outline-offset: -2px !important;
+    }
+    /* Use a 2px border so that selected row highlight is still visible behind
+          an existing high-contrast border that uses the background color */
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (prefers-contrast) {
+      xul|treechildren::-moz-tree-row(selected) {
+        border: 2px solid currentColor !important;
+        border-radius: 4px !important;
+      }
+    }
+    xul|panel[type="autocomplete-richlistbox"] {
+      background-color: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      color: var(--in-content-text-color) !important;
+    }
+    /*- Each OS ----------------------------------------------------------------*/
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-platform: windows) {
+      xul|checkbox,
+      xul|radio {
+        padding-inline-start: 0 !important;
+      }
+      /* Override menulist.css */
+      xul|menulist[disabled="true"] {
+        background-color: var(--in-content-button-background) !important;
+      }
+      xul|menulist:-moz-focusring > xul|*.menulist-label-box {
+        outline: none !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      /* Overriding appearance also avoids incorrect selection background color with light text. */
+      xul|button > xul|*.button-box,
+      xul|menulist::part(label-box),
+      xul|*.radio-label-box,
+      xul|*.checkbox-label-box {
+        appearance: none !important;
+      }
+      xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
+        appearance: none !important;
+      }
+      xul|menulist {
+        font-size: inherit !important;
+      }
+      xul|menulist::part(dropmarker) {
+        display: flex;
+        display: -moz-box;
+        margin-block: 6px !important;
+      }
+      xul|menulist:-moz-focusring::part(label-box) {
+        outline: none !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+      xul|menulist > xul|menupopup > xul|menuitem[checked="true"]::before,
+      xul|menulist > xul|menupopup > xul|menuitem[selected="true"]::before {
+        display: none !important;
+      }
+      xul|menulist::part(dropmarker) {
+        display: flex !important;
+        display: -moz-box !important;
+        margin-block: 1px !important;
+      }
+      xul|menulist > xul|menupopup xul|menu,
+      xul|menulist > xul|menupopup xul|menuitem {
+        padding-inline-end: 34px !important;
+      }
+      xul|*.checkbox-icon,
+      xul|*.radio-icon {
+        margin-inline-end: 0 !important;
+      }
+      xul|*.text-link:-moz-focusring {
+        box-shadow: none !important;
+      }
+    }
+  }
+  /*= Delete Cert ==============================================================*/
+  @-moz-document url("chrome://pippki/content/deletecert.xhtml")
+  {
+    #certlist {
+      border: 1px solid var(--in-content-table-border-color) !important;
+      border-radius: 4px !important;
+    }
+  } /*= Cert Exception Dialog ====================================================*/
+  @-moz-document url("chrome://pippki/content/exceptionDialog.xhtml")
+  {
+    #locationTextBox {
+      appearance: none !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: inherit !important;
+      background-color: var(--in-content-box-background) !important;
+      font-family: inherit !important;
+      font-size: inherit !important;
+      padding: 8px !important;
+      margin: 2px 4px !important;
+    }
+    #locationTextBox:focus {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    #locationTextBox:-moz-ui-invalid {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-border-invalid) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    #locationTextBox:disabled {
+      opacity: 0.4 !important;
+    }
+    #exceptiondialog:first-child > hbox > vbox:not([flex="1"]) {
+      width: 48px !important;
+      height: 48px !important;
+      background-image: url("chrome://global/skin/icons/warning.svg") !important;
+      background-size: 48px !important;
+      background-repeat: no-repeat !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+    }
+    #exceptiondialog:first-child > hbox > vbox > image {
+      display: none !important;
+    }
+  }
+  /*= Page Info ================================================================*/
+  @-moz-document url("chrome://browser/content/pageinfo/pageInfo.xhtml")
+  {
+    :root {
+      --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important;
+    }
+    #viewGroup > radio {
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      margin: 4px !important;
+      list-style-image: none !important;
+      background-image: var(--viewgroup-image) !important;
+      background-repeat: no-repeat;
+      background-position: top var(--in-content-button-vertical-padding) center;
+      background-size: 32px !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--in-content-deemphasized-text) !important; /* FieldText */
+    }
+    #viewGroup > radio .radio-icon {
+      background-image: none !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (not (-moz-bool-pref: "userChrome.rounding.square_button")) {
+      #viewGroup > radio {
+        border-radius: 8px !important;
+      }
+    }
+    #viewGroup > radio:hover {
+      background-color: var(--in-content-button-background-hover) !important; /* #E0E8F6; */
+    }
+    #viewGroup > radio[selected="true"] {
+      color: var(--in-content-button-text-color) !important; /* SelectedItemText */
+      background-color: var(--in-content-button-background-active) !important; /* #C1D2EE; */
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+      #viewGroup > radio {
+        height: auto !important;
+      }
+    }
+    #generalTab {
+      --viewgroup-image: url(chrome://global/skin/icons/page-portrait.svg);
+    }
+    #mediaTab {
+      --viewgroup-image: url(chrome://browser/skin/canvas.svg);
+    }
+    #permTab {
+      --viewgroup-image: url(chrome://browser/skin/permissions.svg);
+    }
+    #securityTab {
+      --viewgroup-image: url(chrome://global/skin/icons/security.svg);
+    }
+    #viewGroup > radio > .radio-label-box {
+      /* Overwrite */
+      margin: 0 !important;
+      padding: 0 6px !important;
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+      #viewGroup > radio > .radio-label-box {
+        padding-top: 32px !important; /* as -moz-image-region: rect(0px, 32px, 32px, 0px); */
+      }
+    }
+    #mainDeck input {
+      color: var(--in-content-page-color) !important;
+    }
+    #permList {
+      -moz-appearance: none !important;
+      color: var(--in-content-page-color) !important;
+      background-color: var(--in-content-box-background) !important;
+    }
+    .permission:hover {
+      color: var(--in-content-text-color) !important;
+      background-color: var(--in-content-button-background-hover) !important;
+    }
+    .permission radio[disabled] {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    treecols {
+      -moz-appearance: none !important;
+      background: var(--in-content-table-header-background) !important;
+      color: var(--in-content-table-header-color) !important;
+    }
+    treecols > treecol,
+    treecols > treecolpicker.treecol-image {
+      -moz-appearance: none !important;
+      color: var(--in-content-table-header-color) !important;
+      background: var(--in-content-table-header-background) !important;
+      border: 1px solid var(--in-content-table-border-color) !important;
+      padding: 4px !important;
+      border-spacing: 0;
+      text-align: center !important;
+    }
+    tree,
+    treechildren::-moz-tree-row {
+      -moz-appearance: none !important;
+      color: var(--in-content-text-color) !important;
+      background-color: var(--in-content-table-background) !important;
+      border: 1px solid var(--in-content-table-border-color) !important;
+    }
+    treechildren::-moz-tree-row(odd) {
+      background-color: var(--in-content-box-background-odd) !important;
+    }
+    treechildren::-moz-tree-row(hover) {
+      color: var(--in-content-item-hover-text) !important;
+      background-color: var(--in-content-item-hover) !important;
+    }
+    treechildren::-moz-tree-row(selected) {
+      background-color: var(--in-content-item-selected) !important;
+    }
+    treechildren::-moz-tree-cell {
+      border-inline: 1px solid var(--in-content-table-border-color) !important;
+      border-spacing: 0 !important;
+      padding: 4px !important;
+      margin: 0 !important;
+    }
+    treechildren::-moz-tree-cell-text(hover) {
+      color: var(--in-content-item-hover-text) !important;
+    }
+    treechildren::-moz-tree-cell-text(selected) {
+      font-weight: 600 !important;
+      color: var(--in-content-item-selected-text) !important;
+    }
+    #imagecontainerbox {
+      background-color: var(--in-content-box-background) !important;
+    }
+    #metatree,
+    #imagetree,
+    #imagecontainerbox,
+    #permList {
+      border-radius: 4px !important;
+    }
+    #metatree,
+    #imagetree {
+      overflow: hidden !important;
+    }
+    #topBar,
+    #imagecontainerbox,
+    #permList {
+      border-color: var(--in-content-table-border-color) !important;
+    }
+  }
+  /*= Library Popup ============================================================*/
+  @-moz-document url("chrome://browser/content/places/places.xhtml")
+  {
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      :root {
+        --organizer-color: -moz-DialogText;
+        --organizer-deemphasized-color: GrayText;
+        --organizer-toolbar-background: -moz-Dialog;
+        --organizer-pane-background: -moz-Dialog;
+        --organizer-content-background: -moz-Dialog;
+        --organizer-hover-background: SelectedItem;
+        --organizer-hover-color: SelectedItemText;
+        --organizer-selected-background: SelectedItem;
+        --organizer-selected-color: SelectedItemText;
+        --organizer-outline-color: SelectedItem;
+        --organizer-separator-color: ThreeDDarkShadow;
+        --organizer-border-color: ThreeDShadow;
+        --organizer-toolbar-field-background: Field;
+        --organizer-toolbar-field-background-focused: Field;
+        --organizer-toolbar-field-border-color: ThreeDShadow;
+        --organizer-toolbar-field-focus-border-color: var(--organizer-outline-color);
+        --organizer-toolbar-field-focus-box-shadow: unset;
+        --organizer-pane-field-border-color: ThreeDShadow;
+      }
+      @media not all and (prefers-contrast) {
+        :root {
+          --organizer-color: var(--in-content-page-color);
+          --organizer-deemphasized-color: var(--in-content-deemphasized-text);
+          --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */
+          --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */
+          --organizer-content-background: var(--in-content-page-background);
+          --organizer-hover-background: var(--in-content-button-background-hover);
+          --organizer-hover-color: var(--organizer-color);
+          --organizer-selected-background: var(--in-content-button-background-active);
+          --organizer-selected-color: var(--organizer-color);
+          --organizer-outline-color: var(--in-content-focus-outline-color);
+          --organizer-separator-color: var(--organizer-pane-field-border-color);
+          --organizer-border-color: var(--in-content-border-color);
+          --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */
+          --organizer-toolbar-field-background-focused: Field;
+          --organizer-toolbar-field-border-color: transparent;
+          --organizer-toolbar-field-focus-border-color: color-mix(
+            in srgb,
+            var(--organizer-outline-color) 50%,
+            transparent
+          );
+          --organizer-toolbar-field-focus-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.23);
+          --organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
+        }
+        @media (prefers-color-scheme: dark) {
+          :root {
+            --organizer-color: rgb(251, 251, 254);
+            --organizer-deemphasized-color: rgb(191, 191, 201);
+            --organizer-toolbar-background: rgb(43, 42, 51);
+            --organizer-pane-background: rgb(35, 34, 43);
+            --organizer-content-background: rgb(28, 27, 34);
+            --organizer-hover-background: rgb(82, 82, 94);
+            --organizer-selected-background: rgb(91, 91, 102);
+            --organizer-toolbar-field-background: var(--in-content-page-background);
+            --organizer-toolbar-field-background-focused: rgb(66, 65, 77);
+            scrollbar-color: rgba(249, 249, 250, 0.4) rgba(20, 20, 25, 0.3);
+          }
+        }
+      }
+      /*- Toolbar & Menus ------------------------------------------------------*/
+      #placesToolbar {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-background) !important;
+        color: var(--organizer-color) !important;
+        border-bottom: 1px solid var(--organizer-border-color) !important;
+        padding: 4px !important;
+        padding-inline-end: 6px !important;
+      }
+      #placesToolbar > toolbarbutton {
+        appearance: none !important;
+        padding: 5px !important;
+        border-radius: 4px !important;
+      }
+      /*- Search Bar & Input ---------------------------------------------------*/
+      /*- Sidebar & Splitter ---------------------------------------------------*/
+      /*- Downloads Pane -------------------------------------------------------*/
+      /*- Tree -----------------------------------------------------------------*/
+      /*- Info Box -------------------------------------------------------------*/
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #placesToolbar > toolbarbutton {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesToolbar > toolbarbutton[disabled] {
+        opacity: 0.6 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesToolbar > toolbarbutton:not([disabled]):hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #placesToolbar > toolbarbutton:not([disabled]):hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesToolbar > toolbarbutton > .toolbarbutton-icon,
+      #placesMenu > menu > image,
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesMenu {
+        margin-inline-start: 6px !important;
+      }
+      #placesMenu > menu {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        padding-block: 5px !important;
+        padding-inline-start: 5px !important;
+        border-radius: 4px !important;
+        margin-inline-end: 2px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #placesMenu > menu {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesMenu > menu[_moz-menuactive="true"],
+      #placesMenu > menu:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesMenu > menu:hover:active,
+      #placesMenu > menu[open] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        margin-block: 0 !important; /* override menu.css */
+        padding-inline-end: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #searchFilter,
+      #detailsPane html|input {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-field-background) !important;
+        color: var(--organizer-color) !important;
+        border: 1px solid var(--organizer-toolbar-field-border-color) !important;
+        border-radius: 4px !important;
+        margin: 0 !important;
+        padding-block: 2px !important;
+        min-height: 24px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #searchFilter,
+      #detailsPane html|input {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #searchFilter[focused] {
+        box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important;
+        background-color: var(--organizer-toolbar-field-background-focused) !important;
+        border-color: transparent !important;
+        outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important;
+        outline-offset: -2px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesList {
+        background-color: var(--organizer-pane-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #placesView > splitter {
+        border: 0 !important;
+        border-inline-end: 1px solid var(--organizer-border-color) !important;
+        min-width: 0 !important;
+        width: 3px !important;
+        background-color: transparent !important;
+        margin-inline-start: -3px !important;
+        position: relative !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #downloadsRichListBox,
+      #downloadsListBox {
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #clearDownloadsButton:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      richlistitem[selected="true"],
+      richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      richlistbox:where(:focus) > richlistitem[selected="true"] {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #contentView treecol {
+        /* Use box-shadow to draw a bottom border instead of border-bottom
+           * because otherwise the items on contentView won't be perfectly
+           * aligned with the items on the sidebar. */
+        box-shadow: inset 0 -1px var(--organizer-border-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      tree {
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      treecol:not([hideheader="true"]),
+      treecolpicker {
+        appearance: none !important;
+        border: none !important;
+        background-color: var(--in-content-button-background) !important;
+        color: var(--organizer-color, inherit) !important;
+        padding: 5px 10px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      treecol:not([hideheader="true"], [sortable="false"]):hover,
+      treecolpicker:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+      treecol:not([hideheader="true"], [sortable="false"]):hover:active,
+      treecolpicker:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      treecol:not([hideheader="true"], :first-child),
+      treecolpicker {
+        padding-left: 10px !important;
+        border-inline-start-width: 1px !important;
+        border-inline-start-style: solid !important;
+        border-image: linear-gradient(
+            transparent 0%,
+            transparent 20%,
+            var(--organizer-border-color) 20%,
+            var(--organizer-border-color) 80%,
+            transparent 80%,
+            transparent 100%
+          )
+          1 1 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection {
+        fill: currentColor !important;
+        width: 18px !important;
+        height: 18px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      treechildren::-moz-tree-row {
+        background-color: transparent !important;
+      }
+      treechildren::-moz-tree-row(hover) {
+        background-color: var(--organizer-hover-background) !important;
+      }
+      treechildren::-moz-tree-row(selected) {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+        border: 1px solid transparent !important;
+      }
+      treechildren::-moz-tree-image(hover),
+      treechildren::-moz-tree-twisty(hover),
+      treechildren::-moz-tree-cell-text(hover) {
+        color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-image(selected),
+      treechildren::-moz-tree-twisty(selected),
+      treechildren::-moz-tree-cell-text(selected) {
+        color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-separator {
+        height: 1px !important;
+        border-color: var(--organizer-separator-color) !important;
+      }
+      treechildren::-moz-tree-separator(hover) {
+        border-color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-separator(selected) {
+        border-color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-cell-text(primary, dropOn),
+      treechildren::-moz-tree-drop-feedback {
+        background-color: var(--organizer-outline-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #detailsPane {
+        background-color: var(--organizer-pane-background) !important;
+        color: var(--organizer-color) !important;
+        padding: 5px !important;
+        border-top: 1px solid var(--organizer-border-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBookmarkPanelRows .expander-up,
+      #editBookmarkPanelRows .expander-down {
+        appearance: none !important;
+        min-width: 0 !important;
+        padding: 5px !important;
+        margin: 0 !important;
+        margin-inline-end: 4px !important;
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #editBookmarkPanelRows .expander-up,
+      #editBookmarkPanelRows .expander-down {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBookmarkPanelRows .expander-up:hover,
+      #editBookmarkPanelRows .expander-down:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBookmarkPanelRows .expander-up:hover:active,
+      #editBookmarkPanelRows .expander-down:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBookmarkPanelRows .expander-up:focus-visible,
+      #editBookmarkPanelRows .expander-down:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBookmarkPanelRows .expander-up > .button-box,
+      #editBookmarkPanelRows .expander-down > .button-box {
+        padding: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBookmarkPanelRows .expander-up {
+        list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+      }
+      #editBookmarkPanelRows .expander-down {
+        list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #places input {
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+        min-height: 20px !important;
+        padding-inline: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #places input {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #places input:focus {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #places input:not(:read-write):focus {
+        outline: none !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      .caption-label {
+        margin-inline-start: 8px !important;
+        color: var(--organizer-deemphasized-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBMPanel_tagsSelectorRow > richlistbox {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        border: 1px solid var(--organizer-border-color) !important;
+        border-radius: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #editBMPanel_tagsSelectorRow > richlistbox {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.theme.proton_chrome") and (-moz-gtk-csd-available) {
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem {
+        border: 1px solid transparent !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem[selected] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+  }
+  #sanitizeEverythingWarningIcon {
+    list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+    -moz-context-properties: fill;
+    fill: var(--uc-warning-icon-bgcolor);
+    width: 48px;
+    height: 48px;
+  }
+}
+/*= Monospace ================================================================*/
+@media (-moz-bool-pref: "userChrome.theme.monospace") {
+  * {
+    font-family: -moz-fixed;
+  }
+}
+/** Decoration ****************************************************************/
+/*= Cursor Types =============================================================*/
+@media (-moz-bool-pref: "userChrome.decoration.cursor") {
+  #appMenu-proton-update-banner,
+  #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2,
+  #appMenu-zoomReduce-button2,
+  #appMenu-zoomReset-button2,
+  #appMenu-zoomEnlarge-button2,
+  #appMenu-fullscreen-button2,
+  #panelMenu_showAllBookmarks,
+  #PanelUI-historyMore,
+  #appMenuClearRecentHistory:not([disabled]),
+  #appMenu-library-recentlyClosedTabs > .restoreallitem.panel-subview-footer-button,
+  #appMenu-library-recentlyClosedWindows > .restoreallitem.panel-subview-footer-button,
+  #BMB_viewBookmarksSidebar,
+  #BMB_bookmarksShowAllTop,
+  #BMB_bookmarksShowAll,
+  .urlbarView-row:is([type="switchtab"], [type="remotetab"], [type="clipboard"]) .urlbarView-action,
+  #import-button,
+  menuitem.openintabs-menuitem,
+  #downloadsListBox .downloadButton,
+  #downloadsListBox .download-state[exists],
+  #downloadsListBox .download-state[exists] .downloadDetails,
+  #downloadsHistory,
+  #protections-popup-footer .protections-popup-footer-button,
+  #protections-popup-multiView .panel-subview-footer-button,
+  #identity-popup-clear-sitedata-button,
+  #identity-popup-more-info,
+  #unified-extensions-manage-extensions,
+  .unified-extensions-item-open-menu,
+  .unified-extensions-item-menu-button.subviewbutton,
+  #PopupAutoComplete
+    > richlistbox
+    > richlistitem[originaltype="insecureWarning"]
+    > .ac-title
+    > .ac-text-overflow-container
+    > .ac-title-text {
+    cursor: pointer !important;
+  }
+  #PanelUI-fxa-menu-syncnow-button:has(.syncnow-label[data-l10n-id="fxa-toolbar-sync-syncing2"]),
+  #PanelUI-fxa-menu-syncnow-button .syncnow-label[data-l10n-id="fxa-toolbar-sync-syncing2"],
+  #PanelUI-appMenu-fxa-image-last-synced[syncstatus="active"] {
+    cursor: progress !important;
+  }
+}
+/*= Panel UI Button Separator ================================================*/
+@media (-moz-bool-pref: "userChrome.decoration.panel_button_separator") {
+  :root:not([chromehidden~="toolbar"]) #PanelUI-button {
+    margin-inline-start: 3px;
+    padding-inline-start: 2px;
+    border-inline-start: 1px solid;
+    border-image: linear-gradient(
+      transparent 4px,
+      var(--toolbarseparator-color) 4px,
+      var(--toolbarseparator-color) calc(100% - 4px),
+      transparent calc(100% - 4px)
+    );
+    border-image-slice: 1;
+  }
+}
+/*= Panel UI Arrow ===========================================================*/
+@media (-moz-bool-pref: "userChrome.decoration.panel_arrow") {
+  #appMenu-popup {
+    background-image: url("chrome://browser/skin/lepton/panelarrow-vertical.svg");
+    background-repeat: no-repeat;
+    background-position-x: right 10px;
+    background-position-y: top;
+    -moz-context-properties: fill, stroke;
+    fill: var(--panel-background);
+    stroke: var(--panel-border-color);
+  }
+  #appMenu-popup[side="top"] {
+    margin-top: -8px !important; /* Original: -4px */
+    padding-top: 4px;
+  }
+  #appMenu-popup[side="bottom"] {
+    background-image: url("chrome://browser/skin/lepton/panelarrow-vertical-reverse.svg");
+    background-position-y: bottom;
+    margin-bottom: -8px !important; /* Original: -4px */
+    padding-bottom: 4px;
+  }
+}
+@media (prefers-reduced-motion: no-preference) {
+  /*= Field Border ===========================================================*/
+  /*= Downloads Panel ========================================================*/
+  /*= Animate ================================================================*/
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") {
+  /*- URL, Search Bar --------------------------------------------------------*/
+  #urlbar:hover:not([focused="true"]) > #urlbar-background,
+  #searchbar:hover:not(:focus-within) {
+    --toolbar-field-border-color: var(--toolbar-field-focus-border-color);
+  }
+  /*- Other Fields -----------------------------------------------------------*/
+  /* Sidebar */
+  /* Others */
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") and (-moz-bool-pref: "userChrome.combined.urlbar_with_reload") {
+  #nav-bar-customization-target
+    > #stop-reload-button:hover
+    ~ #urlbar-container
+    #urlbar:not([focused="true"])
+    > #urlbar-background {
+    --toolbar-field-border-color: var(--toolbar-field-focus-border-color);
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") {
+  .sidebar-panel[lwt-sidebar] #search-box:hover,
+  body[lwt-sidebar] xul|search-textbox.tabsFilter:hover {
+    border-color: var(--lwt-sidebar-highlight-background-color, AccentColor) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  .sidebar-panel[lwt-sidebar] #search-box:hover,
+  body[lwt-sidebar] xul|search-textbox.tabsFilter:hover {
+    border-color: var(--lwt-sidebar-highlight-background-color, Highlight) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") {
+  .sidebar-panel:not([lwt-sidebar]) #search-box:hover,
+  body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover {
+    border-color: AccentColor !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  .sidebar-panel:not([lwt-sidebar]) #search-box:hover,
+  body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover {
+    border-color: -moz-accent-color !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") {
+  #editBMPanel_namePicker:hover,
+  #editBMPanel_tagsField:hover,
+  .findbar-container .findbar-textbox:hover {
+    --input-border-color: color-mix(in srgb, var(--focus-outline-color, AccentColor) 50%, transparent);
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.field_border") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  #editBMPanel_namePicker:hover,
+  #editBMPanel_tagsField:hover,
+  .findbar-container .findbar-textbox:hover {
+    --input-border-color: color-mix(in srgb, var(--focus-outline-color, -moz-accent-color) 50%, transparent);
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.download_panel") {
+  /* Accent Color for downloaded item */
+  #downloadsListBox .download-state[exists] .downloadDetails {
+    color: var(--button-primary-bgcolor);
+  }
+  #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover {
+    color: var(--button-primary-hover-bgcolor);
+  }
+  /* File moved or missing */
+  #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget {
+    text-decoration: line-through;
+    text-decoration-color: color-mix(in srgb, currentColor 65%, transparent);
+  }
+  #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget:hover {
+    text-decoration: none;
+  }
+  #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon {
+    filter: grayscale(100%) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  /*- Background Color -------------------------------------------------------*/
+  button,
+  toolbarbutton,
+  stack,
+  vbox,
+  .toolbarbutton-icon,
+  #tabs-newtab-button > .toolbarbutton-icon {
+    transition: background-color 1s var(--animation-easing-function) !important;
+  }
+  button:hover,
+  toolbarbutton:hover,
+  stack:hover,
+  vbox:hover,
+  .toolbarbutton-icon:hover,
+  #tabs-newtab-button:hover > .toolbarbutton-icon {
+    transition: background-color 0.25s var(--animation-easing-function) !important;
+  }
+  /*- Pinned Tab -------------------------------------------------------------*/
+  /*- URL / Search Bar -------------------------------------------------------*/
+  /* Buttons in URL bar */
+  /*- Border - Other Fields --------------------------------------------------*/
+  /*- Sidebar ----------------------------------------------------------------*/
+  /*- Titlebar & Full Screen -------------------------------------------------*/
+  /*- Expand - Synced Tabs ---------------------------------------------------*/
+  /*- Arrow - Synced Tabs ----------------------------------------------------*/
+  /*- Arrow - Edit Bookmark Popup --------------------------------------------*/
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme))
+    .tabbrowser-tab:is([visuallyselected], [multiselected], [selected])
+    .tab-background {
+    transition: background-image 0.25s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  .subviewbutton {
+    /* treechildren::-moz-tree-row: Can't apply
+       menu, menuitem is not apply.
+     */
+    transition: background-color 0.5s var(--animation-easing-function) !important;
+  }
+  .subviewbutton:hover {
+    transition: background-color 0.1s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) {
+    /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */
+    transition: -moz-box-flex 0.2s var(--animation-easing-function), flex 0.2s var(--animation-easing-function),
+      margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important;
+  }
+  #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] {
+    transition: margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out,
+      max-width 0.1s ease-out !important;
+  }
+  #tabbrowser-tabs:not([movingtab]) .tab-content::before,
+  #tabbrowser-tabs:not([movingtab]) .tab-content::after {
+    transition: width 0.2s var(--animation-easing-function), transform 0.2s var(--animation-easing-function) !important;
+  }
+  #tabbrowser-tabs:not([movingtab]) .tab-content .tab-label-container {
+    transition: width 0.3s var(--animation-easing-function) !important;
+  }
+  #tabbrowser-tabs:not([movingtab]) .tab-content .tab-icon-image {
+    transition: all 0.3s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #urlbar-background {
+    transition: border-color 1s var(--animation-easing-function), background-color 0.5s var(--animation-easing-function) !important;
+  }
+  #urlbar-background:hover {
+    transition: border-color 0.5s var(--animation-easing-function),
+      background-color 0.5s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #searchbar {
+    transition: border-color 1s var(--animation-easing-function), background-color 1.5s var(--animation-easing-function) !important;
+  }
+  #searchbar:hover {
+    transition: border-color 0.5s var(--animation-easing-function), background-color 1s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #tracking-protection-icon-container,
+  #identity-icon-box,
+  #identity-permission-box,
+  #notification-popup-box,
+  #page-action-buttons > .urlbar-page-action {
+    transition: background-color 2.5s var(--animation-easing-function) !important;
+  }
+  #tracking-protection-icon-container:hover,
+  #identity-icon-box:hover,
+  #identity-permission-box:hover,
+  #notification-popup-box:hover,
+  #page-action-buttons > .urlbar-page-action:hover {
+    transition: background-color 1.25s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") and (-moz-bool-pref: "userChrome.combined.urlbar_with_reload") {
+  #nav-bar-customization-target > #stop-reload-button .toolbarbutton-icon {
+    transition: background-color 2.5s var(--animation-easing-function) !important;
+  }
+  #nav-bar-customization-target > #stop-reload-button .toolbarbutton-icon:hover {
+    transition: background-color 1.25s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #search-box,
+  xul|search-textbox.tabsFilter,
+  #editBMPanel_namePicker,
+  #editBMPanel_tagsField,
+  .findbar-container .findbar-textbox {
+    transition: border-color 1s var(--animation-easing-function) !important;
+  }
+  #search-box:hover,
+  xul|search-textbox.tabsFilter:hover,
+  #editBMPanel_namePicker:hover,
+  #editBMPanel_tagsField:hover,
+  .findbar-container .findbar-textbox:hover {
+    transition: border-color 0.5s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") and (not (-moz-bool-pref: "userChrome.decoration.disable_sidebar_animate")) {
+  #sidebar-box {
+    /* like #sidebar-box > #sidebar */
+    min-width: 14em;
+    width: 18em;
+    max-width: 36em;
+    /* Animation */
+    transition: margin-inline-start 0.25s var(--animation-easing-function), visibility 0s linear !important;
+    will-change: margin-inline-start, visibility;
+  }
+  #sidebar-box[hidden="true"] {
+    display: flex !important;
+    display: -moz-box !important;
+    margin-inline-start: -18em;
+    visibility: collapse;
+    transition-delay: 0s, 0.25s !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #titlebar {
+    will-change: background-color !important;
+    transition: background-color 0.2s var(--animation-easing-function) !important;
+  }
+  #titlebar:-moz-window-inactive {
+    transition: background-color 0.5s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #navigator-toolbox {
+    /* Full screen out */
+    will-change: margin-top, background-color !important;
+    transition: margin-top 1s ease, background-color 0.2s var(--animation-easing-function) !important;
+    transform-origin: top;
+  }
+  #navigator-toolbox:-moz-window-inactive {
+    transition: margin-top 1s ease, background-color 0.5s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox[inFullscreen="true"] {
+    /* Full screen enter */
+    animation-duration: 1s;
+    animation-name: fullscreen;
+    animation-timing-function: ease;
+    /* Full screen navbar not hover */
+    transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+      background-color 0.2s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox[inFullscreen="true"]:-moz-window-inactive {
+    transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+      background-color 0.5s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox[inFullscreen="true"]:hover {
+    margin-top: 0 !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  @keyframes fullscreen {
+    from {
+      margin-top: 0;
+    }
+    /* Don't use `to`: Depending on density */
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml")
+  {
+    .item-tabs-list {
+      transition: transform 0.2s ease-out, opacity 0.2s ease-out;
+      transform: translateY(0%);
+      opacity: 1;
+      max-height: 100%;
+    }
+    .item.client.closed .item-tabs-list {
+      display: flex !important;
+      transition: transform 0.2s ease-out, opacity 0.2s ease-out,
+        max-height 0.25s cubic-bezier(0.82, 0.085, 0.395, 0.895) 0.05s;
+      visibility: hidden;
+      transform: translateY(-100%);
+      opacity: 0;
+      max-height: 0;
+    }
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml")
+  {
+    /* treechildren::-moz-tree-twisty: Can't apply */
+    #template-container .item.client .item-twisty-container {
+      transition: transform 0.1s var(--animation-easing-function) !important;
+    }
+    #template-container .item.client.closed .item-twisty-container {
+      transform: rotate(-90deg);
+      background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important;
+    }
+    #template-container .item.client.closed .item-twisty-container:dir(rtl) {
+      transform: rotate(90deg);
+    }
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #editBookmarkPanelRows .expander-up .button-icon,
+  #editBookmarkPanelRows .expander-down .button-icon {
+    transition: transform 0.1s var(--animation-easing-function) !important;
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #editBookmarkPanelRows .expander-up {
+    list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+  }
+  #editBookmarkPanelRows .expander-up .button-icon {
+    transform: rotate(180deg);
+  }
+}
+@media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.disable_panel_animate") {
+  :root {
+    --panelui-subview-transition-duration: 1ms !important; /* Disable top right corner menu sliding animation (0ms will not work!) */
+  }
+}
+/** Rounding ******************************************************************/
+/** Rounding ******************************************************************/
+.unified-extensions-item-menu-button.subviewbutton {
+  border-radius: var(--arrowpanel-menuitem-border-radius) !important;
+}
+
+@media (-moz-bool-pref: "userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 0 !important; /* Original: 4px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_button") {
+  :root {
+    --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
+  }
+  .toolbarbutton-1,
+  .toolbarbutton-icon,
+  .panel-info-button,
+  .searchbar-engine-one-off-item,
+  .urlbarView-button,
+  .urlbarView-tip-button,
+  .urlbarView-action,
+  toolbarbutton.bookmark-item:not(.subviewbutton),
+  #sidebar-switcher-target {
+    --toolbarbutton-border-radius: 0; /* Original: 4px */
+  }
+  button,
+  .close-icon,
+  input[type="number"].photon-number::-moz-number-spin-box,
+  .toggle-group-label,
+  findbar toolbarbutton,
+  .notification-button,
+  #main-menubar > menu {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_tab"), (-moz-bool-pref: "userChrome.rounding.square_button") {
+  /* Fix Tab bar button radius */
+  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button),
+  .tab-close-button {
+    --tab-border-radius: var(--toolbarbutton-border-radius);
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_panel") {
+  :root {
+    --arrowpanel-border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_panelitem") {
+  :root {
+    --arrowpanel-menuitem-border-radius: 0 !important;
+    --subviewbutton-border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_menupopup") {
+  menupopup {
+    --panel-border-radius: 0px !important;
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_menuitem") {
+  xul|menulist:not([native]),
+  xul|menulist > xul|menupopup xul|menu,
+  xul|menulist > xul|menupopup xul|menuitem,
+  .customization-uidensity-menuitem {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_infobox") {
+  #sanitizeEverythingWarningBox {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_toolbar") {
+  :root {
+    --uc-rounding-toolbar: 0;
+  }
+  .container.infobar,
+  .container.infobar::before,
+  notification-message {
+    border-radius: var(--uc-rounding-toolbar) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_field") {
+  input:not([type="radio"], [type="checkbox"]),
+  textarea,
+  select,
+  menulist,
+  tree,
+  treecols,
+  listheader,
+  richlistbox,
+  search-textbox,
+  .subviewradio {
+    border-radius: 0 !important;
+  }
+  #urlbar-input-container,
+  #urlbar-background,
+  #searchbar {
+    --toolbarbutton-border-radius: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_urlView_item") {
+  .urlbarView-row,
+  .urlbarView-row-inner {
+    --toolbarbutton-border-radius: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_checklabel") {
+  input[type="checkbox"],
+  .checkbox-check {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_dialog") {
+  dialog,
+  .dialogBox {
+    border-radius: 0 !important;
+  }
+}
+/*= Library ==============================================================*/
+@media (-moz-bool-pref: "userChrome.rounding.square_button") {
+  #placesToolbar > toolbarbutton,
+  #placesMenu > menu,
+  #editBookmarkPanelRows .expander-up,
+  #editBookmarkPanelRows .expander-down {
+    border-radius: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_field") {
+  #searchFilter,
+  #detailsPane html|input,
+  #places input #editBMPanel_tagsSelectorRow > richlistbox {
+    border-radius: 0 !important;
+  }
+}
+/*
+--toolbarbutton-border-radius: 4px;
+*/
+/** Reduce Padding ************************************************************/
+/*= Tab Bar - Distribution padding, radius ===================================*/
+@media (-moz-bool-pref: "userChrome.tab.lepton_like_padding"), (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  :root {
+    --proton-tab-block-margin: var(--tab-block-margin) !important; /* Original: 4px, Legacy */
+  }
+  :root[uidensity="touch"] {
+    /* Like Original */
+    --tab-block-margin: 4px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.lepton_like_padding") {
+  :root {
+    --tab-block-margin: 2px !important; /* New version of --proton-tab-block-margin */
+  }
+  #tabbrowser-tabs[orient="vertical"] {
+    --tab-block-margin: 4px !important;
+  }
+  #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab {
+    margin-block: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  :root {
+    --tab-block-margin: 0px !important;
+  }
+}
+/*= Tab Bar - Reduce Width, Show more tabs ===================================*/
+@media (-moz-bool-pref: "userChrome.padding.first_tab") {
+  /* for First Tab Space */
+  :root {
+    --uc-space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.first_tab") and (not (-moz-bool-pref: "userChrome.padding.first_tab.always")) {
+  :root:not([tabsintitlebar]):not([customtitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]),
+  :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) {
+    padding-inline-start: var(--uc-space-left-tabbar) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.first_tab") and (-moz-bool-pref: "userChrome.padding.first_tab.always") {
+  :root:not([tabsintitlebar]):not([customtitlebar]) #tabbrowser-tabs,
+  :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs {
+    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width, 0px) + var(--uc-space-left-tabbar)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  /* Titlebar Space */
+  :root {
+    --uc-title-pre-spacer: 30px; /* Original: 40px */
+    --uc-title-post-spacer: 25px; /* Original: 40px */
+  }
+  :root:-moz-locale-dir(rtl) {
+    --uc-title-pre-spacer: 25px;
+    --uc-title-post-spacer: 30px;
+  }
+  /* Tabbar Buttons */
+  /* Tab - Max Size */
+  /* neighbouring tabs should "pinch" together */
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-spacer[type="pre-tabs"] {
+    width: var(--uc-title-pre-spacer) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    width: var(--uc-title-post-spacer) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-spacer[type="pre-tabs"] {
+    width: var(--uc-title-pre-spacer) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    width: var(--uc-title-post-spacer) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-platform: windows) {
+  .titlebar-spacer[type="pre-tabs"] {
+    width: var(--uc-title-post-spacer) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    width: var(--uc-title-pre-spacer) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+  .titlebar-spacer[type="pre-tabs"] {
+    width: var(--uc-title-post-spacer) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    width: var(--uc-title-pre-spacer) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  :root {
+    --newtab-button-minus-width-padding: 2px;
+    --newtab-button-width-padding: calc(var(--toolbarbutton-inner-padding) - var(--newtab-button-minus-width-padding));
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  #widget-overflow-mainView #new-tab-button,
+  #widget-overflow-mainView #alltabs-button {
+    --newtab-button-width-padding: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  #new-tab-button > .toolbarbutton-icon,
+  #alltabs-button > .toolbarbutton-badge-stack {
+    /* Original: calc(2 * var(--toolbarbutton-inner-padding) + 16px) */
+    width: calc(2 * var(--newtab-button-width-padding) + 16px) !important;
+    /* Original: --toolbarbutton-inner-padding */
+    padding-left: var(--newtab-button-width-padding) !important;
+    padding-right: var(--newtab-button-width-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (not (-moz-bool-pref: "userChrome.tab.photon_like_padding")) {
+  #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+    margin-inline-start: 1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+    margin-inline-start: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  :root:not([uidensity="touch"]) #pinned-tabs-container,
+  :root:not([uidensity="touch"]) #tabbrowser-arrowscrollbox {
+    --scrollbtn-inner-padding: 1px;
+    --scrollbtn-outer-padding: 3px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  #scrollbutton-up {
+    padding-left: var(--scrollbtn-inner-padding, 4px) !important; /* Original: 4px */
+    padding-right: var(--scrollbtn-outer-padding, 4px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  #scrollbutton-down {
+    padding-left: var(--scrollbtn-outer-padding, 4px) !important; /* Original: 4px */
+    padding-right: var(--scrollbtn-inner-padding, 4px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  :root:not([uidensity="touch"]) #new-tab-button,
+  #alltabs-button {
+    --toolbarbutton-outer-padding: 1px; /* Original: 2px*/
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (not (-moz-bool-pref: "userChrome.tab.photon_like_padding")) {
+  :root {
+    --tab-max-width: 240px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  :root {
+    --tab-max-width: 225px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  :root {
+    --tab-max-width: 180px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  :root {
+    --tab-max-width: 180px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    max-width: var(--tab-max-width) !important; /* Original: 225px */
+  }
+  #tabbrowser-tabs[orient="vertical"][expanded] .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    max-width: none !important;
+  }
+  #tabbrowser-tabs[orient="horizontal"]
+    tab-group[collapsed]
+    > .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) {
+    min-width: 0 !important;
+    max-width: 0 !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    overflow-clip-margin: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery,
+  #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+    > #pinned-tabs-container
+    > #tabbrowser-arrowscrollbox-periphery,
+  #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+    > #tabbrowser-arrowscrollbox
+    > #tabbrowser-arrowscrollbox-periphery {
+    min-width: 3px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") {
+  #tabbrowser-tabs[orient="horizontal"] .tab-group-label-container {
+    margin-inline-start: 4px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (not (-moz-bool-pref: "userChrome.tab.photon_like_padding")) and (-moz-bool-pref: "userChrome.tab.lepton_like_padding") {
+  #TabsToolbar:not([multibar]) .tabbrowser-tab[pinned] {
+    padding-inline: 1px !important;
+  }
+  #TabsToolbar:not([multibar]) .tabbrowser-tab:not([pinned]):not(:first-of-type) {
+    margin-inline: -1px !important;
+  }
+  #TabsToolbar:not([multibar]) .tabbrowser-tab:not([pinned]):first-of-type {
+    margin-inline-end: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (not (-moz-bool-pref: "userChrome.tab.photon_like_padding")) and (not (-moz-bool-pref: "userChrome.tabbar.multi_row")) {
+  #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
+    margin-inline-end: -2px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_width") and (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  .tabbrowser-tab {
+    padding-inline: 0 !important;
+  }
+}
+/*= Tab Bar - Reduce Height, Show more contents ==============================*/
+@media (-moz-bool-pref: "userChrome.padding.drag_space") {
+  /* for Extra Drag Space */
+  :root {
+    --uc-space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="normal"] #toolbar-menubar[autohide="true"] {
+    height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size));
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.padding.drag_space.maximized") {
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"] {
+    height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size));
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-gtk-csd-available) {
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="normal"] #toolbar-menubar[autohide="true"] {
+    height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar));
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.padding.drag_space.maximized") {
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"] {
+    height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar));
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #TabsToolbar > .toolbar-items {
+    padding-top: var(--uc-space-above-tabbar) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-gtk-csd-available) {
+  /* Add extra space to titlebar for dragging */
+  :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+  :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+    padding-top: var(--uc-space-above-tabbar) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.padding.drag_space.maximized"),
+  (-moz-bool-pref: "userChrome.padding.drag_space") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.padding.drag_space.maximized") {
+  :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+  :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+    padding-top: var(--uc-space-above-tabbar) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  /* Toolbar Height */
+  /* Scroll Button - Size Fix */
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") and (-moz-bool-pref: "userChrome.tab.lepton_like_padding") {
+  :root:not([uidensity]) {
+    --tab-min-height: 36px !important;
+  }
+  :root[uidensity="compact"] {
+    --tab-min-height: 32px !important;
+  }
+  :root[uidensity="touch"] {
+    --tab-min-height: 41px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") and (-moz-bool-pref: "userChrome.tab.photon_like_padding") {
+  :root:not([uidensity]) {
+    --tab-min-height: 32px !important;
+  }
+  :root[uidensity="compact"] {
+    --tab-min-height: 29px !important;
+  }
+  :root[uidensity="touch"] {
+    --tab-min-height: 41px !important;
+  }
+  /* Top Margin */
+  .tab-background,
+  .tab-content {
+    margin-top: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") and (not (-moz-bool-pref: "userChrome.tab.lepton_like_padding")) and (not (-moz-bool-pref: "userChrome.tab.photon_like_padding")) {
+  :root:not([uidensity]) {
+    --tab-min-height: 36px !important; /* 38px -> 36px */
+  }
+  :root[uidensity="compact"] {
+    --tab-min-height: 29px !important; /* 36px -> 29px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  :root {
+    /* Works with TabMixPlus */
+    --tab-min-height_mlt: calc(
+      var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px)))
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  #TabsToolbar[multibar] .tabbrowser-tab {
+    height: unset !important; /* Original: var(--tab-min-height_mlt) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  :root {
+    --tab-min-height_mlt: calc(
+      var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px))
+    ) !important;
+  }
+  #TabsToolbar {
+    --toolbarbutton-inner-padding: calc(
+      (var(--tab-min-height) - 18px) / 2
+    ) !important; /* Prevent overflow pinned tab bottom margin */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") and (-moz-bool-pref: "userChrome.tab.connect_to_window") and (not (-moz-bool-pref: "userChrome.tabbar.multi_row")) {
+  :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #pinned-tabs-container,
+  #TabsToolbar:not([multibar]) #pinned-tabs-container[overflowing="true"] > .tabbrowser-tab[pinned="true"],
+  #TabsToolbar:not([multibar]) #pinned-tabs-container[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack,
+  #TabsToolbar:not([multibar]) #pinned-tabs-container[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content,
+  :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox,
+  #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"],
+  #TabsToolbar:not([multibar])
+    #tabbrowser-arrowscrollbox[overflowing="true"]
+    > .tabbrowser-tab[pinned="true"]
+    .tab-stack,
+  #TabsToolbar:not([multibar])
+    #tabbrowser-arrowscrollbox[overflowing="true"]
+    > .tabbrowser-tab[pinned="true"]
+    .tab-content {
+    max-height: var(--tab-min-height) !important; /* Force apply height */
+  }
+  :root[uidensity="compact"] #TabsToolbar:not([multibar]) #pinned-tabs-container,
+  :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox {
+    height: var(--tab-min-height) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  :root #pinned-tabs-container,
+  :root #tabbrowser-arrowscrollbox {
+    --scrollbtn-vertical-padding: 3px;
+    --scrollbtn-vertical-border: 2px;
+    --scrollbtn-border-radius: 7px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  #scrollbutton-up,
+  #scrollbutton-down {
+    /* Original: var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 6px) = 9px */
+    /* https://github.com/mozilla/gecko-dev/blob/71b1259afd1cdaf41871ae675c2dadb967ea5b34/browser/themes/shared/toolbarbuttons.inc.css#L142 */
+    padding-top: var(--scrollbtn-vertical-padding, var(--toolbarbutton-inner-padding)) !important;
+    padding-bottom: var(--scrollbtn-vertical-padding, var(--toolbarbutton-inner-padding)) !important;
+    /* Original: 4px */
+    border-top-width: var(--scrollbtn-vertical-border, 4px) !important;
+    border-bottom-width: var(--scrollbtn-vertical-border, 4px) !important;
+    /* Original: calc(var(--tab-border-radius) + 4px) = 8px */
+    border-radius: var(--scrollbtn-border-radius, calc(var(--tab-border-radius) + 4px)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.tabbar_height") {
+  :root:is([tabsintitlebar], [customtitlebar]):not([uidensity="compact"]) #toolbar-menubar[autohide="true"] {
+    height: calc(
+      var(--tab-min-height) - var(--tabs-navbar-shadow-size) - 2px
+    ); /* Compact: 28px, Normal: 33px, Touch: 38px */
+  }
+}
+/*= Tool Bar - Button Padding ================================================*/
+@media (-moz-bool-pref: "userChrome.padding.toolbar_button"), (-moz-bool-pref: "userChrome.tab.newtab_button_smaller") {
+  :root {
+    --uc-small-toolbarbutton-inner-padding: 6px;
+    --uc-toolbarbutton-inner-padding-default: 8px;
+  }
+  :root[uidensity="compact"] {
+    --uc-small-toolbarbutton-inner-padding: 4px;
+    --uc-toolbarbutton-inner-padding-default: 6px;
+  }
+  :root[uidensity="touch"] #tabs-newtab-button > .toolbarbutton-icon {
+    --uc-small-toolbarbutton-inner-padding: 9px;
+    --uc-toolbarbutton-inner-padding-default: 9px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.toolbar_button") {
+  :root[uidensity="compact"] {
+    --toolbarbutton-outer-padding: 2px !important; /* Original: 3px, General is 2px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact") {
+  :root {
+    --toolbarbutton-inner-padding: var(--uc-small-toolbarbutton-inner-padding) !important;
+  }
+}
+/*= Nav Bar - Reduce Width ===================================================*/
+@media (-moz-bool-pref: "userChrome.padding.navbar_width") {
+  #nav-bar:not([customizing]) toolbarspring {
+    min-width: 1px !important;
+    max-width: 100px !important;
+  }
+}
+/*= URL Bar - Reduce Padding =================================================*/
+@media (not (-moz-bool-pref: "userChrome.urlView.as_commandbar")) and (-moz-bool-pref: "userChrome.padding.urlbar") {
+  :root:not([uidensity="touch"]) #urlbar-container,
+  :root:not([uidensity="touch"]) #search-container {
+    padding-block: 3px !important; /* Original: 4px */
+  }
+  :root:not([uidensity="compact"]) #urlbar-container,
+  :root:not([uidensity="compact"]) #search-container {
+    padding-block: 2px !important;
+  }
+  :root:not([uidensity="compact"]) #urlbar,
+  :root:not([uidensity="compact"]) #searchbar {
+    min-height: calc(var(--urlbar-min-height) - 2px) !important;
+  }
+  :root:not([uidensity="compact"]) #urlbar[breakout] {
+    height: calc(var(--urlbar-height) - 2px) !important;
+  }
+  :root:not([uidensity="compact"]) #urlbar[breakout][breakout-extend],
+  :root:not([uidensity="compact"]) #urlbar[breakout][breakout-extend-disabled][open] {
+    height: auto !important;
+  }
+  /* spread menu */
+  :root:not([uidensity]) .urlbarView-row {
+    padding-block: 1px !important; /* Original: 2px */
+  }
+  :root[uidensity="compact"] .urlbarView-row {
+    padding-block: 0px !important;
+  }
+  :root:not([uidensity]) #urlbar .search-one-offs:not([hidden]) {
+    padding-block: 8px !important; /* Original: 10px */
+  }
+  :root[uidensity="compact"] #urlbar .search-one-offs:not([hidden]) {
+    padding-block: 2px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.urlView_expanding"), (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  #urlbar[breakout][breakout-extend] {
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
+  }
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container {
+    height: var(--urlbar-height) !important;
+    padding-block: 0 !important;
+    padding-inline: var(--urlbar-container-padding, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.urlView_expanding") {
+  #urlbar[breakout][breakout-extend] > #urlbar-background {
+    animation-name: none !important;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.urlView_result") {
+  .urlbarView {
+    margin-inline: 0 !important;
+    width: 100% !important;
+  }
+  .urlbarView-row {
+    padding-block: 0 !important;
+  }
+}
+/*= BookMark Bar - Reduce Height =============================================*/
+@media (-moz-bool-pref: "userChrome.padding.bookmarkbar") {
+  :root[uidensity="compact"] #PersonalToolbar toolbarbutton {
+    margin-top: 0px !important; /* Original: 2px */
+    margin-bottom: 1px !important;
+  }
+}
+/*= Info Bar - Reduce Padding ================================================*/
+@media (-moz-bool-pref: "userChrome.padding.infobar"), (-moz-bool-pref: "userChrome.autohide.infobar") {
+  #tab-notification-deck notification-message[message-bar-type="infobar"]:not([style*="margin-top"]) {
+    margin: var(--infobar-message-margin, 0 4px var(--infobar-message-vertical-margin, 8px)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.infobar") {
+  :root:not([uidensity]) notification-message {
+    --infobar-message-vertical-margin: 3px;
+    --infobar-vertical-margin: 7px;
+    --infobar-button-vertical-margin: 3px;
+  }
+  :root[uidensity="compact"] notification-message {
+    --infobar-message-vertical-margin: 2px;
+    --infobar-vertical-margin: 6px;
+    --infobar-button-vertical-margin: 2px;
+  }
+  :root[uidensity="touch"] notification-message {
+    --infobar-message-vertical-margin: 4px;
+    --infobar-vertical-margin: 8px;
+    --infobar-button-vertical-margin: 4px;
+  }
+  .infobar > .icon {
+    margin-block: var(--infobar-vertical-margin) !important; /* Original: 8px */
+  }
+  .notification-message {
+    padding-block: var(--infobar-vertical-margin) !important; /* Original: 8px */
+  }
+  .notification-button-container > .notification-button {
+    margin-block: var(--infobar-button-vertical-margin) !important; /* Original: 4px */
+  }
+  .notification-close {
+    margin: var(--infobar-button-vertical-margin) 8px !important; /* Original: 4px 8px */
+  }
+  /* Hard coded for compatibility - Disappearing phenomenon */
+  .container.infobar::before {
+    content: "";
+    display: block;
+    width: 2px;
+    position: absolute;
+    background-image: linear-gradient(0deg, #9059ff 0%, #ff4aa2 52.08%, #ffbd4f 100%);
+    top: 0;
+    inset-inline-start: 0;
+    height: 100%;
+    border-start-start-radius: 4px;
+    border-end-start-radius: 4px;
+  }
+}
+/*= Menu - Reduce Padding ====================================================*/
+@media (-moz-bool-pref: "userChrome.padding.menu") {
+  :root {
+    --menu-padding: 0.35em; /* Win7, 8: 0px */
+  }
+  :root[uidensity="compact"] {
+    --menu-padding: 0.25em;
+  }
+  :root[uidensity="touch"] {
+    --menu-padding: 0.5em;
+  }
+  /* Arrow Icon Align to Right */
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-bool-pref: "userChrome.padding.menu_compact") {
+  :root {
+    --menu-padding: 2px;
+  }
+  :root[uidensity="compact"] {
+    --menu-padding: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") {
+  menupopup > menuitem,
+  menupopup > menu {
+    /* Original: 0.5em */
+    padding-block: var(--menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-platform: windows) {
+  #ContentSelectDropdown > menupopup > menucaption,
+  #ContentSelectDropdown > menupopup > menuitem {
+    padding-block: 0 !important;
+  }
+  #ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text,
+  #ContentSelectDropdown > menupopup > menuitem > .menu-iconic-text {
+    padding-block: var(--menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-gtk-csd-available) {
+  #ContentSelectDropdown > menupopup > menucaption,
+  #ContentSelectDropdown > menupopup > menuitem {
+    padding-block: var(--menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #ContentSelectDropdown > menupopup > menucaption,
+  #ContentSelectDropdown > menupopup > menuitem {
+    padding-block: var(--menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:not([uidensity="touch"]) .menu-text,
+  :root:not([uidensity="touch"]) .menu-iconic-text {
+    padding-inline-end: 0 !important; /* Original: 2px */
+  }
+  :root:not([uidensity="touch"]) .menupopup-arrowscrollbox {
+    padding-block: 1px !important; /* Original: 4px*/
+  }
+  :root:not([uidensity="touch"]) #context-navigation:not([hidden]) {
+    padding: 0 0 1px !important; /* Original: 0 0 4px*/
+  }
+  :root:not([uidensity="touch"]) .menu-right {
+    margin-right: 6px !important; /* Original: 12px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") and (-moz-gtk-csd-available) {
+  menupopup > menu {
+    padding-inline-start: 0.5em;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.menu") {
+  .bookmark-item.subviewbutton > .menu-right {
+    margin-inline-end: 0 !important;
+  }
+}
+/*= Bookmark Menu - Reduce Padding ===========================================*/
+@media (-moz-bool-pref: "userChrome.padding.bookmark_menu") {
+  :root {
+    --bookmark-menu-padding: 3px;
+  }
+  :root[uidensity="compact"] {
+    --bookmark-menu-padding: 1.5px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.bookmark_menu") and (-moz-bool-pref: "userChrome.padding.menu_compact") {
+  :root {
+    --bookmark-menu-padding: 2px;
+  }
+  :root[uidensity="compact"] {
+    --bookmark-menu-padding: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.bookmark_menu") {
+  :root:not([uidensity="touch"]) #BMB_bookmarksPopup .subviewbutton,
+  :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .bookmark-item,
+  :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .openintabs-menuitem {
+    padding-block: var(--bookmark-menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.bookmark_menu") and (-moz-bool-pref: "userChrome.padding.menu_compact"),
+  (-moz-bool-pref: "userChrome.padding.bookmark_menu") and (-moz-bool-pref: "userChrome.padding.bookmark_menu.compact") {
+  :root:not([uidensity="touch"]) #BMB_bookmarksPopup .bookmark-item,
+  :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .bookmark-item {
+    min-height: unset !important; /* Original: 24px */
+  }
+}
+/*= Global Menu - Set Padding ================================================*/
+@media (-moz-bool-pref: "userChrome.padding.global_menubar") {
+  /* Vertical Align - Center & Height: 100%  */
+  #main-menubar {
+    flex: 1 !important;
+    -moz-box-flex: 1 !important;
+  }
+  /* Rounding */
+  #main-menubar > menu {
+    border-radius: 4px;
+  }
+  /* Menubar item padding */
+  :root {
+    --global-menubar-padding: 2px;
+  }
+  :root[uidensity="compact"] {
+    --global-menubar-padding: 1px;
+  }
+  :root[uidensity="touch"] {
+    --global-menubar-padding: 4px;
+  }
+  #main-menubar > menu {
+    padding-block: var(--global-menubar-padding) !important;
+  }
+  /* Reduce items */
+  #main-menubar > menu > menupopup menuitem,
+  #main-menubar > menu > menupopup menu {
+    padding-block: var(--bookmark-menu-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.global_menubar") and (-moz-bool-pref: "userChrome.compatibility.os.win11") {
+  #main-menubar > menu > menupopup menuitem,
+  #main-menubar > menu > menupopup menu {
+    --bookmark-menu-padding: 3px;
+  }
+  #main-menubar > menu > menupopup menuitem:is([type="checkbox"], [type="radio"]),
+  #main-menubar > menu > menupopup menu:is([type="checkbox"], [type="radio"]) {
+    --bookmark-menu-padding: 0px;
+  }
+}
+/*= Panel - Reduce padding ===================================================*/
+@media (-moz-bool-pref: "userChrome.padding.panel") {
+  :root {
+    --arrowpanel-menuitem-margin-block: 0; /* FF 102 compatibility */
+    --arrowpanel-menuitem-margin-inline: 8px;
+    --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline) !important; /* Original: 0 8px */
+    --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */
+    --arrowpanel-padding: 0.8em !important; /* Original: 16px or .cui-widget-panel, .cui-widget-panel::part(arrowcontent) => 4px 0 */
+  }
+  :root[uidensity="compact"] {
+    --arrowpanel-menuitem-margin-inline: 4px; /* FF 102 compatibility */
+    --arrowpanel-menuitem-padding-block: 3px !important;
+    --arrowpanel-menuitem-padding-inline: 3px !important;
+  }
+  :root[uidensity="touch"] {
+    --arrowpanel-menuitem-padding-block: 8px !important; /* Original: 8px */
+    --arrowpanel-menuitem-padding-inline: 8px !important; /* Original: 8px */
+  }
+  .all-tabs-item {
+    margin: var(--arrowpanel-menuitem-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.panel") and (not (-moz-bool-pref: "userChrome.icon.disabled")) and (not (-moz-bool-pref: "userChrome.icon.panel")) {
+  .subviewbutton {
+    min-height: calc(16px + var(--arrowpanel-menuitem-padding-block) * 2) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.panel") {
+  .unified-extensions-item-menu-button.subviewbutton {
+    padding: 0 !important; /* Original: calc(var(--arrowpanel-menuitem-margin-inline) - 1px) var(--arrowpanel-menuitem-margin-inline) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.panel") and (-moz-bool-pref: "userChrome.panel.full_width_padding") {
+  .unified-extensions-item-menu-button.subviewbutton {
+    --arrowpanel-menuitem-padding-inline: var(--arrowpanel-menuitem-padding-block);
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.panel") {
+  :root[uidensity="compact"] :is(.unified-extensions-item, .unified-extensions-item-action-button) {
+    padding-block: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.padding.panel_header") {
+  .panel-header {
+    padding: unset !important;
+    padding-top: 4px !important;
+  }
+}
+/*= Popup Panel - Reduce padding =============================================*/
+@media (-moz-bool-pref: "userChrome.padding.popup_panel") {
+  #protections-popup-main-header-label {
+    height: unset !important; /* Original: 37.6px */
+  }
+  #identity-popup,
+  #permission-popup,
+  #protections-popup {
+    --vertical-section-padding: 0.8em; /* Original: 0.9em */
+  }
+  .protections-popup-footer-button,
+  .protections-popup-category {
+    min-height: 24px; /* Original: 32px */
+    height: unset !important;
+  }
+  /** Popup panel - Compact mode  */
+  :root[uidensity="compact"] #protections-popup-content {
+    margin-block: 0 !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
+    padding-block-start: 0 !important;
+    padding-block-end: 4px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
+  :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
+    min-height: 20px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike {
+    margin: 0 0 3px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike > button {
+    padding: 3px 8px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-trackersView-settings-button {
+    margin: 4px 8px 0 !important;
+  }
+  :root[uidensity="compact"] #identity-popup-multiView #identity-popup-mainView-panel-header {
+    padding: 2px 5px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-no-trackers-found-description {
+    margin: 2em 4em !important;
+  }
+  :root[uidensity="compact"] #downloadsListBox {
+    margin: 0 !important;
+  }
+}
+/** Tab Bar UI ****************************************************************/
+/*= Tabs on Bottom ===========================================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom"), (-moz-bool-pref: "userChrome.fullscreen.overlap") {
+  /* Don't use display: flex at not fullscreen!! side effect #372 */
+  :root[sizemode="fullscreen"] #navigator-toolbox {
+    display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
+  }
+  :root[sizemode="fullscreen"] #titlebar,
+  :root[sizemode="fullscreen"] #toolbar-menubar,
+  :root[sizemode="fullscreen"] #TabsToolbar,
+  :root[sizemode="fullscreen"] #nav-bar,
+  :root[sizemode="fullscreen"] #PersonalToolbar,
+  :root[sizemode="fullscreen"] #tab-notification-deck,
+  :root[sizemode="fullscreen"] #tab-notification-deck-template {
+    flex-basis: 100%;
+  }
+  /* -moz-default-appearance: -moz-window-titlebar */
+  :root[sizemode="fullscreen"] #titlebar {
+    -moz-appearance: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /*= Tabbar - Move to bottom ==================================================*/
+  #titlebar,
+  #TabsToolbar {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+    --tabs-navbar-shadow-size: 0px;
+  }
+  #tab-notification-deck {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  #TabsToolbar .titlebar-spacer {
+    display: none;
+  }
+  #TabsToolbar-customization-target > .toolbarbutton-1:last-child {
+    padding-inline-end: var(--toolbar-start-end-padding, 8px);
+  }
+  /*= Tabbar - Hidden at single tab ===========================================*/
+  /*= Menubar - Always on top ==================================================*/
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.above_bookmark") {
+  #PersonalToolbar {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom.above_bookmark")) and (-moz-bool-pref: "userChrome.tab.connect_to_window") and (-moz-bool-pref: "userChrome.tab.color_like_toolbar") {
+  #navigator-toolbox {
+    border-bottom-color: var(
+      --toolbar-bgcolor
+    ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.hidden_single_tab") {
+  #tabbrowser-tabs .tabbrowser-tab:only-of-type {
+    display: none !important;
+  }
+  #tabbrowser-tabs,
+  #tabbrowser-tabs arrowscrollbox {
+    height: auto !important;
+    min-height: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.hidden_single_tab") and (prefers-reduced-motion: no-preference) {
+  #tabbrowser-tabs {
+    transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Menubar on top patch - use with tabs_on_bottom.css */
+  /* Only really useful if menubar is ALWAYS visible */
+  :root:not([sizemode="fullscreen"]) {
+    --uc-window-control-width: 0px !important;
+  }
+  /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */
+  :root:not([sizemode="fullscreen"]) #nav-bar {
+    border-inline-width: 0;
+  }
+  #navigator-toolbox {
+    -moz-window-dragging: drag;
+  }
+  :root[sizemode="fullscreen"] #navigator-toolbox {
+    padding-top: 0px !important;
+  }
+  #toolbar-menubar {
+    position: fixed;
+    display: flex;
+    top: var(--uc-titlebar-padding);
+    height: var(--uc-menubar-height);
+    width: 100%;
+    overflow: hidden;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+    height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+  }
+  #toolbar-menubar > .titlebar-buttonbox-container {
+    height: 100%;
+    order: 100;
+  }
+  #toolbar-menubar > [flex] {
+    flex-grow: 100;
+  }
+  #toolbar-menubar > spacer[flex] {
+    order: 99;
+    flex-grow: 1;
+    min-width: var(--uc-window-drag-space-post);
+  }
+  #toolbar-menubar .toolbarbutton-1 {
+    --toolbarbutton-inner-padding: 3px;
+  }
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    visibility: collapse !important;
+  }
+  :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    .titlebar-buttonbox-container {
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /*= Tabbar - Move to bottom ==================================================*/
+  #titlebar,
+  #TabsToolbar {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+    --tabs-navbar-shadow-size: 0px;
+  }
+  #tab-notification-deck {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  #TabsToolbar .titlebar-spacer {
+    display: none;
+  }
+  #TabsToolbar-customization-target > .toolbarbutton-1:last-child {
+    padding-inline-end: var(--toolbar-start-end-padding, 8px);
+  }
+  /*= Tabbar - Hidden at single tab ===========================================*/
+  /*= Menubar - Always on top ==================================================*/
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.above_bookmark") {
+  #PersonalToolbar {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom.above_bookmark")) and (-moz-bool-pref: "userChrome.tab.connect_to_window") and (-moz-bool-pref: "userChrome.tab.color_like_toolbar") {
+  #navigator-toolbox {
+    border-bottom-color: var(
+      --toolbar-bgcolor
+    ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.hidden_single_tab") {
+  #tabbrowser-tabs .tabbrowser-tab:only-of-type {
+    display: none !important;
+  }
+  #tabbrowser-tabs,
+  #tabbrowser-tabs arrowscrollbox {
+    height: auto !important;
+    min-height: auto !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.hidden_single_tab") and (prefers-reduced-motion: no-preference) {
+  #tabbrowser-tabs {
+    transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Menubar on top patch - use with tabs_on_bottom.css */
+  /* Only really useful if menubar is ALWAYS visible */
+  :root:not([sizemode="fullscreen"]) {
+    --uc-window-control-width: 0px !important;
+  }
+  /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */
+  :root:not([sizemode="fullscreen"]) #nav-bar {
+    border-inline-width: 0;
+  }
+  #navigator-toolbox {
+    -moz-window-dragging: drag;
+  }
+  :root[sizemode="fullscreen"] #navigator-toolbox {
+    padding-top: 0px !important;
+  }
+  #toolbar-menubar {
+    position: fixed;
+    display: flex;
+    top: var(--uc-titlebar-padding);
+    height: var(--uc-menubar-height);
+    width: 100%;
+    overflow: hidden;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) {
+    height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */
+  }
+  #toolbar-menubar > .titlebar-buttonbox-container {
+    height: 100%;
+    order: 100;
+  }
+  #toolbar-menubar > [flex] {
+    flex-grow: 100;
+  }
+  #toolbar-menubar > spacer[flex] {
+    order: 99;
+    flex-grow: 1;
+    min-width: var(--uc-window-drag-space-post);
+  }
+  #toolbar-menubar .toolbarbutton-1 {
+    --toolbarbutton-inner-padding: 3px;
+  }
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    visibility: collapse !important;
+  }
+  :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    .titlebar-buttonbox-container {
+    visibility: visible;
+  }
+}
+/*= Tab Bar - Oneliner =======================================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  :root {
+    --uc-navbar-width-origin: 40vw;
+    --uc-navbar-width: var(--uc-navbar-width-origin);
+    --uc-tabbar-width: calc(100vw - var(--uc-navbar-width));
+    --uc-navbar-margin: calc(var(--uc-navbar-width) + var(--uc-navbar-gap, 0px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar") {
+  :root {
+    --uc-navbar-width-origin: 50vw;
+    --uc-navbar-width: 24em;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #nav-bar {
+    --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px));
+    height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important;
+    margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important;
+    margin-bottom: var(--uc-navbar-block, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #titlebar,
+  #toolbar-menubar,
+  #TabsToolbar {
+    transform: translateY(var(--uc-navbar-block, 0px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #TabsToolbar > .titlebar-buttonbox-container {
+    transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #navigator-toolbox {
+    position: relative;
+    z-index: 2;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) {
+  :root {
+    --uc-navbar-gap: 10px;
+    --uc-navbar-block: 1.5px;
+  }
+  :root[uidensity="compact"] {
+    --uc-navbar-block: 1px;
+  }
+  :root[uidensity="touch"] {
+    --uc-navbar-block: 3px;
+  }
+  #nav-bar {
+    --toolbarbutton-inner-padding: 6px; /* Original: 8px */
+    border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px));
+  }
+  #nav-bar,
+  #nav-bar-customization-target {
+    align-items: center;
+    -moz-box-align: center;
+  }
+  #urlbar-container {
+    min-height: calc(var(--urlbar-container-height) - 2px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #navigator-toolbox {
+    background-color: var(--toolbar-bgcolor) !important;
+  }
+  #nav-bar {
+    --lwt-tabs-border-color: transparent;
+    background-color: unset !important;
+    background-image: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #urlbar-container {
+    min-width: calc(
+      var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding)
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #urlbar[breakout][breakout-extend] {
+    min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #PersonalToolbar {
+    position: relative;
+    z-index: -1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  toolbarspring.chromeclass-toolbar-additional {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-navbar-margin) !important;
+  }
+  #nav-bar {
+    margin-inline-end: var(--uc-tabbar-width) !important;
+  }
+  .titlebar-spacer[type="pre-tabs"] {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-navbar-margin) !important;
+  }
+  #nav-bar {
+    margin-inline-start: var(--uc-tabbar-width) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    display: none !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  :root {
+    --uc-navbar-width-origin: 40vw;
+    --uc-navbar-width: var(--uc-navbar-width-origin);
+    --uc-tabbar-width: calc(100vw - var(--uc-navbar-width));
+    --uc-navbar-margin: calc(var(--uc-navbar-width) + var(--uc-navbar-gap, 0px));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar") {
+  :root {
+    --uc-navbar-width-origin: 50vw;
+    --uc-navbar-width: 24em;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #nav-bar {
+    --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px));
+    height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important;
+    margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important;
+    margin-bottom: var(--uc-navbar-block, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #titlebar,
+  #toolbar-menubar,
+  #TabsToolbar {
+    transform: translateY(var(--uc-navbar-block, 0px));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #TabsToolbar > .titlebar-buttonbox-container {
+    transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #navigator-toolbox {
+    position: relative;
+    z-index: 2;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) {
+  :root {
+    --uc-navbar-gap: 10px;
+    --uc-navbar-block: 1.5px;
+  }
+  :root[uidensity="compact"] {
+    --uc-navbar-block: 1px;
+  }
+  :root[uidensity="touch"] {
+    --uc-navbar-block: 3px;
+  }
+  #nav-bar {
+    --toolbarbutton-inner-padding: 6px; /* Original: 8px */
+    border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px));
+  }
+  #nav-bar,
+  #nav-bar-customization-target {
+    align-items: center;
+    -moz-box-align: center;
+  }
+  #urlbar-container {
+    min-height: calc(var(--urlbar-container-height) - 2px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #navigator-toolbox {
+    background-color: var(--toolbar-bgcolor) !important;
+  }
+  #nav-bar {
+    --lwt-tabs-border-color: transparent;
+    background-color: unset !important;
+    background-image: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #urlbar-container {
+    min-width: calc(
+      var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding)
+    ) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #urlbar[breakout][breakout-extend] {
+    min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #PersonalToolbar {
+    position: relative;
+    z-index: -1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  toolbarspring.chromeclass-toolbar-additional {
+    display: none !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-navbar-margin) !important;
+  }
+  #nav-bar {
+    margin-inline-end: var(--uc-tabbar-width) !important;
+  }
+  .titlebar-spacer[type="pre-tabs"] {
+    display: none !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-navbar-margin) !important;
+  }
+  #nav-bar {
+    margin-inline-start: var(--uc-tabbar-width) !important;
+  }
+  .titlebar-spacer[type="post-tabs"] {
+    display: none !important;
+  }
+}
+/*= Tab Bar - Shared Layout ==================================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  :root {
+    --uc-window-control-width: 0px; /* Same as .titlebar-buttonbox-container      -  Space reserved for window controls */
+    --uc-window-drag-space-pre: 0px; /* Same as .titlebar-spacer[type="pre-tabs"]  - Extra space reserved on both sides of the nav-bar to be able to drag the window */
+    --uc-window-drag-space-post: 0px; /* Same as .titlebar-spacer[type="post-tabs"] */
+    --uc-window-control-space: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-post));
+  }
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: var(--uc-title-pre-spacer, 40px);
+    --uc-window-drag-space-post: var(--uc-title-post-spacer, 40px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-width: 138px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    /* 84px is default value of linux */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-close-button) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-width: 28px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-width: 56px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-width: 84px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is([tabsintitlebar], [customtitlebar]) {
+    --uc-window-control-width: 72px;
+  }
+  :root[sizemode="fullscreen"] {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  :root:is([tabsintitlebar][sizemode="maximized"], [customtitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) #tabbrowser-tabs {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-drag-space-pre: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) #tabbrowser-tabs {
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-platform: windows) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0),
+  screen and (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) {
+  :root:is([tabsintitlebar], [customtitlebar], [sizemode="fullscreen"]) {
+    --uc-window-control-space: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  @supports selector(:has(a)) {
+    #navigator-toolbox:has(#toolbar-menubar[autohide="false"]) {
+      --uc-window-drag-space-pre: 0px;
+      --uc-window-control-space: 0px;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  /*= Windows Control - Move to toolbar ========================================*/
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Titlebar Button Box */
+  :root {
+    --uc-titlebar-padding: 0px;
+  }
+  #navigator-toolbox {
+    padding-top: var(--uc-titlebar-padding) !important;
+  }
+  /* At Activated Menubar */
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") {
+  #navigator-toolbox {
+    padding-top: calc(
+      max(var(--uc-menubar-height), var(--uc-menubar-height-default)) + var(--uc-titlebar-padding)
+    ) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
+  #TabsToolbar > .titlebar-buttonbox-container {
+    position: fixed;
+    display: block;
+    top: 0;
+    right: 0;
+    z-index: 1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+    height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) {
+  #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button {
+    stroke: var(--toolbar-color, currentColor) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    height: 100%;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container > .titlebar-buttonbox {
+    margin-block: 10px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) {
+  .titlebar-buttonbox-container {
+    left: 0;
+    right: unset !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) {
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #navigator-toolbox-background {
+    margin-top: calc(-1 * var(--uc-titlebar-padding));
+  }
+  :root[sizemode="normal"]:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root[sizemode="maximized"]:is([tabsintitlebar], [customtitlebar]) #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color):not(.browser-titlebar) {
+    background-clip: border-box !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    opacity: 0;
+    visibility: collapse;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") {
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (prefers-reduced-motion: no-preference) {
+  #toolbar-menubar[inactive] > .titlebar-buttonbox-container {
+    transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms),
+      visibility 100ms var(--animation-easing-function) 0.25s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #toolbar-menubar[inactive]:not([customizing])
+    > .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"] #navigator-toolbox:not(:hover) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #toolbar-menubar {
+    visibility: visible !important;
+    min-height: 0 !important;
+    max-height: 0 !important;
+  }
+  :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items {
+    visibility: collapse !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar {
+    z-index: 1;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive {
+    opacity: 1 !important;
+  }
+  :root:is([tabsintitlebar], [customtitlebar]) #titlebar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #toolbar-menubar:-moz-window-inactive .titlebar-buttonbox,
+  :root:is([tabsintitlebar], [customtitlebar]) #TabsToolbar:-moz-window-inactive .titlebar-buttonbox {
+    opacity: var(--inactive-titlebar-opacity);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
+    #toolbar-menubar:not([autohide="true"])
+    + #TabsToolbar
+    > .titlebar-buttonbox-container {
+    display: block !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.hidden.tabbar")) {
+  :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
+    visibility: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) {
+  /*= Navbar - Padding for window controls =====================================*/
+  /* Customized https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/window_control_placeholder_support.css */
+  #nav-bar {
+    border-inline-style: solid !important;
+    border-inline-color: transparent;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-control-space) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-control-space) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-drag-space-pre);
+    border-inline-end-width: var(--uc-window-control-space);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-control-space) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-drag-space-pre) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement: 0) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-control-space) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-window-control-width, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-window-control-width, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar") {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) {
+  #nav-bar {
+    border-inline-start-width: var(--uc-window-control-space);
+    border-inline-end-width: var(--uc-window-drag-space-pre);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #nav-bar {
+    margin-inline-start: var(--uc-window-control-space, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") {
+  #nav-bar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.combine_navbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) {
+  #TabsToolbar {
+    margin-inline-end: var(--uc-window-drag-space-pre, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-window-control-width, 0px) !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-gtk-csd-available) and (-moz-gtk-csd-reversed-placement) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #TabsToolbar {
+    margin-inline-start: var(--uc-window-control-width, 0px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.navbar.as_sidebar")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container:last-child,
+  :root[sizemode="fullscreen"] #window-controls {
+    right: unset;
+  }
+}
+/*= Tab Bar - Show only current tab ==========================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.as_titlebar") {
+  :root:not([tabsintitlebar="true"]):not([customtitlebar="true"]) #tabbrowser-tabs,
+  #scrollbutton-up,
+  #scrollbutton-down,
+  .titlebar-spacer[type="pre-tabs"],
+  spacer:is([part="overflow-start-indicator"], [part="overflow-end-indicator"]),
+  .tabbrowser-tab:not([selected="true"]),
+  .tabbrowser-tab[selected="true"] .tab-background,
+  .tabbrowser-tab[selected="true"] .tab-stack:is(::before, ::after),
+  .tabbrowser-tab[selected="true"] .tab-close-button,
+  #tabs-newtab-button {
+    display: none !important;
+  }
+  .tabbrowser-tab[selected="true"] {
+    -moz-window-dragging: drag;
+    --tab-max-width: 100vw;
+    min-width: calc(var(--uc-tabbar-width, 100vw) - var(--uc-window-control-space)) !important;
+    max-width: var(--tab-max-width) !important;
+    margin-inline-start: calc(var(--tab-shadow-max-size) * -1) !important;
+  }
+  .tabbrowser-tab[selected="true"][pinned="true"] {
+    flex: 100;
+    -moz-box-flex: 100;
+    max-width: var(--tab-max-width) !important;
+  }
+  .tabbrowser-tab[selected="true"] .tab-label-container {
+    margin-inline: 0 !important;
+  }
+  .tab-content {
+    margin-inline: auto;
+    width: 100%;
+  }
+  /* Pinned */
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned][selected="true"],
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned][selected="true"] {
+    position: relative !important;
+  }
+  #tabbrowser-tabs {
+    --tab-overflow-pinned-tabs-width: 0 !important;
+    padding-inline: 0 !important; /* Original: var(--tab-overflow-pinned-tabs-width) 0; */
+  }
+  .tab-throbber[pinned],
+  .tab-icon-pending[pinned],
+  .tab-icon-image[pinned],
+  .tab-sharing-icon-overlay[pinned],
+  .tab-icon-overlay[pinned] {
+    margin-inline-end: 5.5px;
+  }
+  .tab-label-container[pinned] {
+    width: unset !important;
+  }
+  /* Padding */
+}
+@media (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (not (-moz-bool-pref: "userChrome.centered.tab")) {
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    margin-inline: 2px !important;
+  }
+  :root[sizemode="normal"] #pinned-tabs-container,
+  :root[sizemode="normal"] #tabbrowser-arrowscrollbox {
+    margin-inline: 6px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "userChrome.centered.tab") and (-moz-bool-pref: "userChrome.centered.tab.label") {
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    margin-inline: 2px !important;
+  }
+  :root[sizemode="normal"] #pinned-tabs-container,
+  :root[sizemode="normal"] #tabbrowser-arrowscrollbox {
+    margin-inline: 6px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tabbar.as_titlebar") and (-moz-bool-pref: "browser.tabs.tabmanager.enabled") {
+  :root:not([tabsintitlebar="true"]):not([customtitlebar="true"])
+    #tabbrowser-tabs:not([overflow="true"], [hashiddentabs])
+    ~ #alltabs-button,
+  :root:not([tabsintitlebar="true"]):not([customtitlebar="true"])
+    #tabbrowser-tabs[hasadjacentnewtabbutton]:not([overflow="true"])
+    ~ #new-tab-button {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+}
+/*= Tab Bar - Multi Row ======================================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.multi_row") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/multi-row_tabs.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  :root {
+    --uc-multirow-tabbar-rows: 3;
+    --uc-multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
+  }
+  #tabbrowser-tabs {
+    min-height: unset !important;
+    padding-inline-start: 0px !important;
+  }
+  @-moz-document url("chrome://browser/content/browser.xhtml")
+  {
+    #scrollbutton-up ~ spacer,
+    #scrollbutton-up,
+    #scrollbutton-down {
+      display: var(--scrollbutton-display-model, initial);
+    }
+    scrollbox[part][orient="horizontal"] {
+      display: flex;
+      flex-wrap: wrap;
+      overflow-y: auto;
+      max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin, 0px)) * var(--uc-multirow-tabbar-rows));
+    }
+  }
+  .scrollbox-clip[orient="horizontal"],
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    overflow: -moz-hidden-unscrollable;
+    display: block;
+    --scrollbutton-display-model: none;
+  }
+  #tabbrowser-tabs .tabbrowser-tab[pinned] {
+    position: static !important;
+    margin-inline-start: 0px !important;
+  }
+  .tabbrowser-tab[fadein]:not([pinned]) {
+    flex-grow: var(--uc-multirow-tab-dynamic-width);
+  }
+  .tabbrowser-tab > stack {
+    width: 100%;
+    height: 100%;
+  }
+  /* remove bottom margin so it doesn't throw off row height computation */
+  #tabs-newtab-button {
+    margin-bottom: 0 !important;
+  }
+  #tabbrowser-tabs[hasadjacentnewtabbutton][overflow="true"]
+    > #tabbrowser-arrowscrollbox
+    > #tabbrowser-arrowscrollbox-periphery
+    > #tabs-newtab-button {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+  #alltabs-button,
+  :root:not([customizing]) #TabsToolbar #new-tab-button,
+  #tabbrowser-arrowscrollbox > spacer,
+  .tabbrowser-tab::after {
+    display: none !important;
+  }
+}
+/*= Tab Bar - Scollmode disabled =============================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.unscroll") {
+  /* Disable scrollbox */
+  spacer[part="overflow-start-indicator"] + .scrollbox-clip > scrollbox {
+    overflow: -moz-hidden-unscrollable !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not([visuallyselected]) {
+    /* Set minimum width below which tabs will not shrink */
+    --tab-min-width: 16px;
+    container-type: inline-size;
+    container-name: backgroundTab;
+  }
+  @container backgroundTab (max-width: 46px) {
+    #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not([visuallyselected]) .tab-content {
+      --inline-tab-padding: 0px;
+      justify-self: center;
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected])
+      .tab-icon-stack
+      > * {
+      margin-inline-end: 0 !important;
+    }
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected])
+      .tab-label-container,
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([pinned]):not([visuallyselected]):hover
+      .tab-close-button {
+      visibility: collapse !important;
+    }
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #tabbrowser-arrowscrollbox-periphery {
+    position: absolute !important;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"]
+    #tabbrowser-arrowscrollbox-periphery
+    > #tabs-newtab-button {
+    z-index: 2 !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #pinned-tabs-container,
+  #tabbrowser-tabs[closebuttons="activetab"][hasadjacentnewtabbutton="true"] #tabbrowser-arrowscrollbox {
+    padding-inline-end: calc(
+      16px + (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding)) * 2
+    ) !important;
+  }
+}
+/*= Tab Bar - Fill width tab =================================================*/
+@media (-moz-bool-pref: "userChrome.tabbar.fill_width") {
+  /* Why 100vw? Tab closing requires width animation to end and "none" can't be animated */
+  .tabbrowser-tab[fadein]:not([style^="max-width"]) {
+    --tab-max-width: 100vw;
+    max-width: var(--tab-max-width) !important;
+  }
+}
+/** Tab UI ********************************************************************/
+/*= Tab - Connect to window ==============================================*/
+@media (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  #TabsToolbar #tabbrowser-tabs:not([orient="vertical"]) {
+    max-height: var(--tab-min-height);
+  }
+  #TabsToolbar #tabbrowser-tabs:not([orient="vertical"])[movingtab] {
+    padding-bottom: unset !important;
+    margin-bottom: unset !important;
+  }
+  #TabsToolbar[multibar] #tabbrowser-tabs:not([orient="vertical"]) {
+    max-height: var(--tab-min-height_mlt);
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) {
+    min-height: unset !important; /* Original: var(--tabstrip-min-height) */
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-background {
+    border-radius: var(--tab-border-radius) var(--tab-border-radius) var(--uc-tab-border-bottom-radius, 0px)
+      var(--uc-tab-border-bottom-radius, 0px) !important;
+    margin-bottom: 0px !important;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-content {
+    margin-top: 0px;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack {
+    margin-top: 0px !important;
+    margin-bottom: 0px !important;
+  }
+  #tabbrowser-tabs:not([orient="vertical"]) tab-group .tabbrowser-tab:is([selected], [multiselected]) .tab-group-line {
+    transform: translateY(calc(var(--tab-group-line-thickness) * -1));
+  }
+  #tabbrowser-tabs[orient="vertical"] {
+    --uc-tab-border-bottom-radius: var(--tab-border-radius);
+  }
+  /* Remove line at Toolbar's top */
+  #tabbrowser-tabs {
+    z-index: 1 !important;
+  }
+  /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */
+  /* Border top #889 */
+}
+@media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (not (-moz-bool-pref: "userChrome.tabbar.multi_row")) {
+  #TabsToolbar:not([multibar]) {
+    overflow: clip; /* Prevent toolbar area over */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned],
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] {
+    z-index: 0 !important;
+  }
+  #tabbrowser-tabs[positionpinnedtabs] > #pinned-tabs-container > .tabbrowser-tab[pinned] .tab-stack,
+  #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] .tab-stack {
+    /* Temporary solution for compatibility #513 */
+    overflow-y: clip;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  #nav-bar {
+    border-top: none !important;
+    box-shadow: 0 -0.01px 0 ThreeDShadow;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar {
+    box-shadow: 0 -0.01px 0 ThreeDShadow;
+  }
+}
+/*= Selected Tab =============================================================*/
+/*= Selected Tab - Bold ======================================================*/
+@media (-moz-bool-pref: "userChrome.tab.selected_bold") {
+  .tab-label:is([selected], [attention]) {
+    font-weight: 600;
+  }
+}
+
+/*= Selected Tab - Color like toolbar ========================================*/
+@media (-moz-bool-pref: "userChrome.tab.color_like_toolbar") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) {
+    /* Fix for windows's system default theme. Using --toolbar-bgcolor, --toolbar-bgimage fallback */
+    --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */
+    --tab-selected-bgimage: unset !important; /* Above FF v101 */
+  }
+  #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon,
+  .tab-background:is([selected], [multiselected]) {
+    background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important;
+  }
+  :root:is(:-moz-lwtheme, [lwtheme]) #pinned-tabs-container > .tabbrowser-tab > .tab-stack > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected] {
+    /* Original: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none)
+     */
+    background-image: linear-gradient(transparent, transparent),
+      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important;
+    background-position: 0, 0, right top;
+    background-attachment: scroll, scroll, fixed;
+    background-repeat: repeat-x, repeat-x, no-repeat !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.color_like_toolbar") and (-moz-bool-pref: "userChrome.theme.transparent.frame") {
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected],
+  :root:not([lwtheme-image]):is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[orient="horizontal"]:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[selected] {
+    background-image: linear-gradient(transparent, transparent),
+      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-additional-images, none) !important;
+    background-repeat: repeat-x, repeat-x, var(--lwt-background-tiling) !important;
+    background-position: 0 0, 0 0, var(--lwt-background-alignment) !important;
+  }
+}
+/*= Multi Selected Color - More Contrast =====================================*/
+@media (-moz-bool-pref: "userChrome.tab.multi_selected") {
+  #TabsToolbar,
+  #vertical-tabs {
+    --uc-multiselected-tab-bgcolor: color-mix(in srgb, currentColor 28%, var(--toolbar-bgcolor, transparent));
+  }
+  #TabsToolbar[brighttext],
+  #vertical-tabs[brighttext] {
+    --uc-multiselected-tab-bgcolor: color-mix(in srgb, currentColor 16%, var(--toolbar-bgcolor, transparent));
+  }
+  #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #pinned-tabs-container
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]),
+  #tabbrowser-tabs:not([movingtab])
+    > #tabbrowser-arrowscrollbox
+    > tab-group
+    > .tabbrowser-tab
+    > .tab-stack
+    > .tab-background[multiselected]:not([selected]) {
+    /* Original:
+    background-attachment: scroll, scroll, fixed;
+    background-color: transparent;
+    background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)),
+                      linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)),
+                      var(--lwt-header-image, none);
+    background-position: 0 0, 0 0, right top;
+    background-repeat: repeat-x, repeat-x, no-repeat;
+    background-size: auto 100%, auto 100%, auto auto;
+    */
+    background-attachment: scroll, fixed !important;
+    background-color: transparent !important;
+    background-image: linear-gradient(var(--uc-multiselected-tab-bgcolor), var(--uc-multiselected-tab-bgcolor)),
+      var(--lwt-header-image, none) !important;
+    background-position: 0 0, right top !important;
+    background-repeat: repeat-x, no-repeat !important;
+    background-size: auto 100%, auto auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.multi_selected") and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  .tab-background[multiselected="true"] {
+    outline: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.multi_selected") and (not (-moz-bool-pref: "userChrome.tab.connect_to_window")) {
+  /* Backport from FF 99 */
+  .tab-background[multiselected="true"] {
+    outline: 1px solid color-mix(in srgb, var(--focus-outline-color, currentColor) 40%, transparent);
+    outline-offset: -1px;
+  }
+  .tab-background[multiselected="true"][selected] {
+    outline-width: 2px;
+    outline-offset: -2px;
+  }
+}
+/*= Selected Tab - Box Shadow ================================================*/
+@media (-moz-bool-pref: "userChrome.tab.box_shadow") {
+  #TabsToolbar {
+    --uc-tab-shadow-color: var(
+      --tab-line-color,
+      var(--lwt-tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)))
+    );
+    --uc-tab-shadow-color-bundle: var(--tab-line-color, var(--lwt-tab-line-color, rgba(128, 128, 142, 0.9)));
+  }
+  #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) {
+    box-shadow: unset !important;
+    filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.4));
+  }
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([selected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    filter: drop-shadow(0 0 1px var(--uc-tab-shadow-color, transparent));
+  }
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[visuallyselected]:not(:focus),
+  :root:is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[multiselected]:not([visuallyselected]) {
+    --uc-tab-shadow-color: var(--toolbar-color);
+  }
+  /* For themes outside of Light and Dark (which are curated by Mozilla), show a thicker border
+     around the tab to help themes that are dependent on tab_line to show the selected tab. */
+  :root:not(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    --uc-tab-shadow-color: var(--uc-tab-shadow-color-bundle);
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
+      drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(0 0 2px rgba(128, 128, 142, 0.5));
+  }
+  :root:not(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
+      drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent));
+  }
+}
+/*= Selected Tab - Bottom Rounded Corner =====================================*/
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  #TabsToolbar {
+    --uc-tab-corner-rounding: 3px; /* 10px looks about like chromium - 17px looks close to Australis tabs */
+    --uc-tab-corner-padding: 0px;
+    --uc-tab-corner-position: calc(var(--uc-tab-corner-padding) - var(--uc-tab-corner-rounding));
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left.svg");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right.svg");
+  }
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+    /* Box */
+    display: block;
+    position: absolute;
+    z-index: 1;
+    bottom: 0;
+    /* Shape */
+    width: var(--uc-tab-corner-rounding);
+    height: 100%;
+    /* Color */
+    fill: transparent;
+    stroke: transparent;
+    -moz-context-properties: fill, stroke;
+    /* Image */
+    background-size: var(--uc-tab-corner-rounding);
+    background-repeat: no-repeat;
+    background-position-y: bottom;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all") {
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+    content: "";
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")) {
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+    /* Based on tab background
+       background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+
+       defaults
+       background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+       background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
+    */
+    fill: var(--lwt-selected-tab-background-color, var(--tab-selected-bgcolor, var(--toolbar-bgcolor))) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::before {
+    left: var(--uc-tab-corner-position);
+    background-image: var(--uc-tab-corner-left-side-svg);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"]) .tabbrowser-tab .tab-background::after {
+    right: var(--uc-tab-corner-position);
+    background-image: var(--uc-tab-corner-right-side-svg);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+    fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+    stroke: var(--tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")) {
+  :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+    content: "";
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"]) .tabbrowser-tab[multiselected] .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab[multiselected] .tab-background::after {
+    fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"])
+    .tabbrowser-tab:hover:not([visuallyselected], [multiselected])
+    .tab-background::before,
+  :root:not([customizing="true"])
+    .tabbrowser-tab:hover:not([visuallyselected], [multiselected])
+    .tab-background::after {
+    fill: color-mix(in srgb, currentColor 11%, transparent);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) and (-moz-bool-pref: "userChrome.tab.multi_selected") {
+  :root:not([customizing="true"]) .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::before,
+  :root:not([customizing="true"]) .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::after {
+    fill: color-mix(in srgb, currentColor 65%, transparent);
+    opacity: 0.3;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) {
+  :root:not([customizing="true"])::is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[visuallyselected]
+    .tab-background::before,
+  :root:not([customizing="true"])::is(
+      [lwtheme-mozlightdark],
+      [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]
+    ):is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab[visuallyselected]
+    .tab-background::after {
+    /* As Selected Tab - Box Shadow */
+    stroke: var(--toolbar-color);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy")) and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge")) and (-moz-gtk-csd-available) {
+  :root:not([customizing="true"]) {
+    /* Fill color for GTK */
+  }
+  :root:not([customizing="true"]):not([lwtheme="true"])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    .tab-background::before,
+  :root:not([customizing="true"]):not([lwtheme="true"])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    .tab-background::after {
+    /* As GTK Toolbar's background-color + background-image
+     * --toolbar-non-lwt-bgcolor: -moz-dialog;
+     * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
+     */
+    fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog);
+    stroke: transparent;
+    opacity: 1;
+  }
+  :root:not([customizing="true"]):not([lwtheme="true"])
+    #TabsToolbar[brighttext]
+    .tabbrowser-tab[visuallyselected]
+    .tab-background::before,
+  :root:not([customizing="true"]):not([lwtheme="true"])
+    #TabsToolbar[brighttext]
+    .tabbrowser-tab[visuallyselected]
+    .tab-background::after {
+    stroke: transparent;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #TabsToolbar {
+    --uc-tab-corner-height: calc(var(--tab-min-height) + 1px);
+    --uc-tab-corner-size: var(--uc-tab-corner-height);
+    --uc-tab-corner-half-size: calc(var(--uc-tab-corner-size) / 2);
+    --uc-tab-corner-half-size-reverse: calc(var(--uc-tab-corner-half-size) * -1);
+    --uc-tab-corner-bgimage: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") {
+  #TabsToolbar {
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave.svg");
+    --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave.svg#svgClipPath");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave.svg");
+    --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave.svg#svgClipPath");
+    --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-wave-clipped.svg");
+    --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-wave-clipped.svg");
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") {
+  #TabsToolbar {
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis.svg");
+    --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis.svg#svgClipPath");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis.svg");
+    --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis.svg#svgClipPath");
+    --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-australis-clipped.svg");
+    --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-australis-cilpped.svg");
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") {
+  #TabsToolbar {
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome.svg");
+    --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome.svg#svgClipPath");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome.svg");
+    --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome.svg#svgClipPath");
+    --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chrome-clipped.svg");
+    --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chrome-clipped.svg");
+    --uc-tab-corner-size: 16px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") {
+  #TabsToolbar {
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy.svg");
+    --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy.svg#svgClipPath");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy.svg");
+    --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy.svg#svgClipPath");
+    --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-chromeLegacy-clipped.svg");
+    --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-chromeLegacy-clipped.svg");
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #TabsToolbar {
+    --uc-tab-corner-left-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge.svg");
+    --uc-tab-corner-left-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge.svg#svgClipPath");
+    --uc-tab-corner-right-side-svg: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge.svg");
+    --uc-tab-corner-right-side-clipPath: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge.svg#svgClipPath");
+    --uc-tab-corner-left-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-left-edge-clipped.svg");
+    --uc-tab-corner-right-side-svg-clipped: url("chrome://browser/skin/lepton/tab-bottom-corner-right-edge-clipped.svg");
+    --uc-tab-corner-size: 14px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all") {
+  .tabbrowser-tab {
+    padding-inline: 0 !important;
+    overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+  }
+  .tabbrowser-tab .tab-background {
+    --tab-border-radius: 0px;
+    margin-inline: var(--uc-tab-corner-half-size) !important;
+    position: relative;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (not (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all")) {
+  .tabbrowser-tab[visuallyselected] {
+    padding-inline: 0 !important;
+    overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+  }
+  .tabbrowser-tab[visuallyselected] .tab-background {
+    --tab-border-radius: 0px;
+    margin-inline: var(--uc-tab-corner-half-size) !important;
+    position: relative;
+  }
+  .tabbrowser-tab[visuallyselected] .tab-background::before,
+  .tabbrowser-tab[visuallyselected] .tab-background::after {
+    content: "";
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab .tab-background::before,
+  .tabbrowser-tab .tab-background::after {
+    /* Box */
+    display: block;
+    position: absolute;
+    z-index: -1;
+    bottom: -1px;
+    /* Shape */
+    width: var(--uc-tab-corner-size);
+    height: var(--uc-tab-corner-height);
+    /* Color */
+    fill: transparent;
+    -moz-context-properties: fill;
+    /* Image */
+    background-size: cover, auto auto;
+    background-repeat: no-repeat, no-repeat;
+    background-position: bottom, right top;
+    background-attachment: scroll, fixed;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.all") {
+  .tabbrowser-tab .tab-background::before,
+  .tabbrowser-tab .tab-background::after {
+    content: "";
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")) {
+  .tabbrowser-tab .tab-background::before,
+  .tabbrowser-tab .tab-background::after {
+    /* Based on tab background
+         background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+
+         defaults
+         background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+         background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
+    */
+    fill: var(--lwt-selected-tab-background-color, var(--tab-selected-bgcolor, var(--toolbar-bgcolor))) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab .tab-background::before {
+    right: 100%;
+    background-image: var(--uc-tab-corner-left-side-svg), var(--uc-tab-corner-bgimage);
+    clip-path: var(--uc-tab-corner-left-side-clipPath);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab .tab-background::after {
+    left: 100%;
+    background-image: var(--uc-tab-corner-right-side-svg), var(--uc-tab-corner-bgimage);
+    clip-path: var(--uc-tab-corner-right-side-clipPath);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab:has(+ .tabbrowser-tab[visuallyselected]) .tab-background::after {
+    --uc-tab-corner-right-side-svg: var(--uc-tab-corner-right-side-svg-clipped);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-background::before {
+    --uc-tab-corner-left-side-svg: var(--uc-tab-corner-left-side-svg-clipped);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background {
+    --uc-tab-corner-bgimage: var(--lwt-header-image, none);
+  }
+  .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background::before,
+  .tabbrowser-tab:is([visuallyselected], [multiselected]) .tab-background::after {
+    fill: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab:hover:not([visuallyselected], [multiselected]) .tab-background::before,
+  .tabbrowser-tab:hover:not([visuallyselected], [multiselected]) .tab-background::after {
+    fill: color-mix(in srgb, currentColor 11%, transparent);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.multi_selected"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.multi_selected"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.multi_selected"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.multi_selected"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.multi_selected") {
+  .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::before,
+  .tabbrowser-tab[multiselected]:not([visuallyselected]) .tab-background::after {
+    fill: var(--uc-multiselected-tab-bgcolor);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #tabbrowser-tabs[movingtab]
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    .tab-background {
+    --uc-tab-corner-bgimage: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-gtk-csd-available) {
+  /* Fill color for GTK */
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.tab.box_shadow"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.tab.box_shadow"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.tab.box_shadow"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.tab.box_shadow"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.tab.box_shadow") {
+  :root:not([lwtheme="true"]) .tabbrowser-tab {
+    --uc-tab-shadow-color: rgba(0, 0, 0, 0.4);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-gtk-csd-available) {
+  :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background {
+    background-clip: content-box;
+  }
+  :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+  :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+    /* As GTK Toolbar's background-color + background-image
+     * --toolbar-non-lwt-bgcolor: -moz-dialog;
+     * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
+     */
+    --uc-tab-corner-bgimage: linear-gradient(var(--toolbar-non-lwt-bgcolor), var(--toolbar-non-lwt-bgcolor));
+    fill: rgba(255, 255, 255, 0.075);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-gtk-csd-available) and (not (-moz-bool-pref: "userChrome.tab.color_like_toolbar")) {
+  :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::before,
+  :root:not([lwtheme="true"]) .tabbrowser-tab[visuallyselected] .tab-background::after {
+    fill: rgba(255, 255, 255, 0.15);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #tabbrowser-tabs[positionpinnedtabs],
+  #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-of-type,
+  #tabbrowser-tabs[overflow]
+    .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
+    margin-left: var(--uc-tab-corner-half-size) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  .tabbrowser-tab:last-of-type {
+    margin-right: var(--uc-tab-corner-half-size) !important;
+  }
+}
+/*= Selected Tab - Photon like contextline ===================================*/
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (-moz-bool-pref: "userChrome.tab.blue_accent"),
+  (-moz-bool-pref: "userChrome.tab.static_separator") and (-moz-bool-pref: "userChrome.tab.blue_accent"),
+  (-moz-bool-pref: "userChrome.tab.bar_separator") and (-moz-bool-pref: "userChrome.tab.blue_accent") {
+  :root,
+  #tabbrowser-tabs {
+    --tab-line-color: rgb(10, 132, 255) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.static_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available),
+  (-moz-bool-pref: "userChrome.tab.bar_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs {
+    --tab-line-color: AccentColor !important; /* -moz-accent-color */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"),
+  (-moz-bool-pref: "userChrome.tab.static_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"),
+  (-moz-bool-pref: "userChrome.tab.bar_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs {
+    --tab-line-color: Highlight !important; /* -moz-accent-color */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") {
+  .tab-context-line {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+    height: 2px !important;
+    border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important;
+  }
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line {
+    --tab-line-color: rgb(10, 132, 255);
+  }
+  .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line {
+    /* Photon like color
+       Default: var(--tab-line-color, rgb(10, 132, 255))
+       Automatic: color-mix(in srgb, var(--button-primary-bgcolor) 80%, transparent)
+
+       FF v96+ replace by var(--lwt-tab-line-color) */
+    background-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255))) !important;
+  }
+  .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line {
+    background-color: rgba(0, 0, 0, 0.2) !important;
+    opacity: 1 !important;
+    transform: none !important;
+  }
+  #TabsToolbar[brighttext]
+    .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+    > .tab-stack
+    > .tab-background
+    > .tab-context-line {
+    background-color: rgba(255, 255, 255, 0.2) !important;
+  }
+  /* Prevent identity color flashing */
+  .tabbrowser-tab[usercontextid] .tab-context-line {
+    --identity-icon-color: none;
+  }
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before,
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after {
+    /* As Selected Tab - Box Shadow */
+    stroke: var(--toolbar-color) !important;
+  }
+  /* Animation */
+  .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line {
+    opacity: 0 !important;
+    transform: scaleX(0) !important;
+  }
+  /* Remove side's background color border */
+  /* Container Tab */
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (prefers-reduced-motion: no-preference) {
+  .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line {
+    transition: transform 250ms var(--animation-easing-function), opacity 250ms var(--animation-easing-function) !important; /* --animation-easing-function: cubic-bezier(.07, .95, 0, 1); */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") {
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    --tabs-border-color: rgba(0, 0, 0, 0.3) !important;
+    box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") {
+  #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") {
+  .tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+    margin: unset !important;
+  }
+}
+/*= Selected Tab - Supernova like contextline ===================================*/
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  /* context line styles */
+  tabs tab.tabbrowser-tab > .tab-stack > .tab-background > .tab-context-line {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+  tabs tab.tabbrowser-tab > .tab-stack > .tab-background > .tab-context-line::before {
+    content: "";
+    height: 1px !important;
+    border-radius: 9999px !important;
+    transform: translateY(5px);
+    margin-top: -1px !important;
+    margin-left: 5px;
+    margin-right: 5px;
+    width: 100%;
+  }
+  /* Override container-tab style */
+  tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+    margin: unset !important;
+  }
+  /* selected tab style */
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line,
+  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line {
+    --tab-line-color: #45a1ff;
+  }
+  .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line::before {
+    background-color: var(--tab-line-color, var(--lwt-tab-line-color, #45a1ff)) !important;
+  }
+  /* Set the active effect */
+  .tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line::before {
+    filter: brightness(70%);
+    margin-left: 6px;
+    margin-right: 6px;
+  }
+  /* Set the hover effect */
+  .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+    > .tab-stack
+    > .tab-background
+    > .tab-context-line::before {
+    background-color: rgba(0, 0, 0, 0.4) !important;
+    opacity: 1 !important;
+  }
+  #TabsToolbar[brighttext]
+    .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+    > .tab-stack
+    > .tab-background
+    > .tab-context-line::before {
+    background-color: rgba(255, 255, 255, 0.4) !important;
+  }
+  /* Animation */
+  /* Animation for hover effect */
+  /* --- copied (not modified) from _photon_like_contextline.scss --- */
+  /* Prevent identity color flashing */
+  /* Remove side's background color border */
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") and (prefers-reduced-motion: no-preference) {
+  .tabbrowser-tab:hover:not([selected="true"], [multiselected])
+    > .tab-stack
+    > .tab-background
+    > .tab-context-line::before {
+    animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  @keyframes toWide {
+    0% {
+      opacity: 0.8;
+      margin-left: 40%;
+      margin-right: 40%;
+    }
+    100% {
+      opacity: 1;
+      margin-left: 5px;
+      margin-right: 5px;
+    }
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  .tabbrowser-tab[usercontextid] .tab-context-line {
+    --identity-icon-color: none;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before,
+  :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after {
+    /* As Selected Tab - Box Shadow */
+    stroke: var(--toolbar-color) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  :root:is(:-moz-lwtheme, [lwtheme])
+    #TabsToolbar[brighttext]
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    --tabs-border-color: rgba(0, 0, 0, 0.3) !important;
+    box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") {
+  #TabsToolbar:not([brighttext])
+    #tabbrowser-tabs:not([noshadowfortests])
+    .tabbrowser-tab:is([visuallyselected], [multiselected])
+    > .tab-stack
+    > .tab-background {
+    box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") and (-moz-bool-pref: "userChrome.tab.contextline_blue_accent") {
+  #tabbrowser-tabs .tab-context-line {
+    --tab-line-color: #45a1ff !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.contextline_blue_accent")) and (-moz-gtk-csd-available) {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs .tab-context-line {
+    --tab-line-color: AccentColor !important; /* -moz-accent-color */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.contextline_blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #tabbrowser-tabs .tab-context-line {
+    --tab-line-color: Highlight !important; /* -moz-accent-color */
+  }
+}
+/*= Unselected Tab - Divide line =============================================*/
+/*= Unselected Tab - Dynamic Separator =======================================*/
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") {
+  #pinned-tabs-container,
+  #tabbrowser-arrowscrollbox {
+    --start-tab-separator-position-x: -1.5px;
+    --end-tab-separator-position-x: 1.5px;
+    --tab-separator-position-x: -2.5px;
+    --tab-separator-position-y: calc(-50% + 1px);
+  }
+  #pinned-tabs-container:-moz-locale-dir(rtl),
+  #tabbrowser-arrowscrollbox:-moz-locale-dir(rtl) {
+    --start-tab-separator-position-x: 1.5px;
+    --end-tab-separator-position-x: -1.5px;
+    --tab-separator-position-x: 2.5px;
+  }
+  #tabbrowser-arrowscrollbox-periphery {
+    position: relative;
+  }
+  /* Animate */
+  /* Latest Tab & New tab margin */
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+    /* Box Model */
+    content: "";
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    /* Bar shape */
+    width: 1px;
+    height: 20px;
+    /* Bar Color */
+    opacity: 0;
+    background-color: var(--toolbarseparator-color);
+    /* More position */
+    transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.compatibility.dynamic_separator") {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+    background-color: var(--tabs-border-color);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+    left: calc(50% - (8px + var(--toolbarbutton-inner-padding)));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox:not([overflowing])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+    .tab-stack::after {
+    /* Box Model */
+    content: "";
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    /* Bar shape */
+    width: 1px;
+    height: 20px;
+    /* Bar Color */
+    opacity: 0;
+    background-color: var(--toolbarseparator-color);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) and (-moz-bool-pref: "userChrome.compatibility.dynamic_separator") {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox:not([overflowing])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+    .tab-stack::after {
+    background-color: var(--tabs-border-color);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before {
+    transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"]) .tabbrowser-tab:last-of-type .tab-stack::after {
+    right: 0;
+    transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") {
+  #pinned-tabs-container:not([orient="vertical"]):not(:empty):not(
+      :has(.tabbrowser-tab[pinned]:is([visuallyselected], [multiselected], :hover):last-of-type)
+    )
+    ~ #tabbrowser-arrowscrollbox:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+    .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-of-type)
+    .tab-stack::before {
+    opacity: var(--tab-separator-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+    .tab-stack::before {
+    opacity: var(--tab-separator-opacity);
+    transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type
+    .tab-stack::before {
+    opacity: var(--tab-separator-opacity);
+    transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button:not(:hover, [open])::before {
+    opacity: var(--tab-separator-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox:not([overflowing])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+    .tab-stack::after {
+    opacity: var(--tab-separator-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") {
+  #tabbrowser-tabs:not([orient="vertical"])
+    tab-group:has(.tabbrowser-tab:last-child:is(:hover, [selected]))
+    + .tabbrowser-tab
+    .tab-stack::before,
+  #tabbrowser-tabs:not([orient="vertical"]) tab-group[collapsed] + .tabbrowser-tab .tab-stack::before {
+    opacity: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") {
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))):is(
+      [visuallyselected],
+      [multiselected],
+      :hover
+    )
+    .tab-stack::before,
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox[overflowing]
+    tab.tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden])))
+    .tab-stack::before {
+    opacity: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
+    + .tabbrowser-tab
+    .tab-stack::before,
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
+    ~ #tabs-newtab-button::before,
+  #navigator-toolbox:not([movingtab])
+    #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
+    ~ #tabbrowser-arrowscrollbox-periphery
+    #tabs-newtab-button::before {
+    opacity: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"])
+    .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
+    + .tabbrowser-tab:not([visuallyselected])
+    .tab-stack::before {
+    opacity: 0 !important;
+  }
+  :root:not([uidensity="compact"]) #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button > .toolbarbutton-icon {
+    margin-left: 2px;
+  }
+  :root[uidensity="compact"] #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button > .toolbarbutton-icon {
+    margin-left: 1px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (prefers-reduced-motion: no-preference) {
+  #tabbrowser-tabs:not([orient="vertical"]) .tab-stack::before {
+    transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button::before {
+    transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab")) {
+  #tabbrowser-tabs:not([orient="vertical"])
+    #tabbrowser-arrowscrollbox:not([overflowing])
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
+    .tab-stack::after {
+    transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.dynamic_separator") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-of-type {
+    margin-inline-end: 1px !important;
+  }
+}
+/*= Unselected Tab - Static Separator ========================================*/
+@media (-moz-bool-pref: "userChrome.tab.static_separator") {
+  #TabsToolbar {
+    --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
+  }
+  .tab-stack::before,
+  .tabbrowser-tab:last-of-type .tab-stack::after {
+    content: "";
+  }
+  .tab-stack::before,
+  .tab-stack::after {
+    /* Box Model */
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 1;
+    /* Bar shape */
+    width: 0px;
+    height: 100%;
+    /* Bar Color */
+    border-right: 1px solid var(--toolbarseparator-color);
+  }
+  .tab-stack::after {
+    right: 0;
+  }
+  /* Animate */
+}
+@media (-moz-bool-pref: "userChrome.tab.static_separator") and (-moz-bool-pref: "userChrome.tab.static_separator.selected_accent") {
+  .tabbrowser-tab[visuallyselected] .tab-stack::before,
+  .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+  .tabbrowser-tab[visuallyselected] .tab-stack::after {
+    --toolbarseparator-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.static_separator") and (not (-moz-bool-pref: "userChrome.tab.static_separator.selected_accent")) {
+  .tabbrowser-tab[visuallyselected] .tab-stack::before,
+  .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+  .tabbrowser-tab[visuallyselected] .tab-stack::after {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.static_separator") and (prefers-reduced-motion: no-preference) {
+  .tab-stack::before,
+  .tab-stack::after {
+    transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+  }
+}
+/*= Unselected Tab - Bar Separator ===========================================*/
+@media (-moz-bool-pref: "userChrome.tab.bar_separator") {
+  .tab-stack::before {
+    /* Box Model */
+    content: "";
+    display: block;
+    position: absolute;
+    /* Position */
+    top: 50%;
+    left: 0%;
+    transform: translateX(calc((var(--inline-tab-padding) - 5px) / 2)) translateY(calc(-50% + var(--tab-block-margin)));
+    z-index: 1;
+    /* Bar shape */
+    width: 3px;
+    height: 20px;
+    /* Bar Color */
+    background-color: var(
+      --uc-bar-separator-color,
+      var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)))
+    );
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bar_separator") and (prefers-reduced-motion: no-preference) {
+  .tab-stack::before {
+    transition-property: opacity, background-color;
+    transition-duration: 0.2s;
+    transition-timing-function: var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bar_separator") {
+  :root[sessionrestored] .tabbrowser-tab[busy] .tab-stack::before {
+    --uc-bar-separator-color: currentColor;
+    opacity: 0.7;
+  }
+  :root[sessionrestored] .tabbrowser-tab[busy][progress] .tab-stack::before {
+    --uc-bar-separator-color: var(--tab-loading-fill);
+    opacity: 1;
+  }
+  :root[sessionrestored]
+    #TabsToolbar[brighttext]
+    .tabbrowser-tab[busy][progress]:not([selected="true"])
+    .tab-stack::before {
+    --uc-bar-separator-color: var(--lwt-tab-loading-fill-inactive, #84c1ff);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.bar_separator") and (-moz-bool-pref: "userChrome.tab.unloaded") {
+  :root[sessionrestored] .tabbrowser-tab[pending] .tab-stack::before {
+    opacity: 0.7;
+  }
+}
+/*= New tab button ============================================================*/
+/*= New tab button - Looks like tab ==========================================*/
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  /* Corner Rounding Color */
+  /* '+'Icon */
+  /* Fix tab overlap #678 */
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+    /* Size */
+    align-items: stretch !important;
+    -moz-box-align: stretch !important;
+    padding-top: var(--tab-block-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+    /* Original:
+     margin: 0 0 var(--tabs-navbar-shadow-size) !important
+     => Can't override style. Therefore, we should approach it by bypass.
+    */
+    --tabs-navbar-shadow-size: -1px; /* Original: 1px */
+    --uc-tabs-navbar-shadow-size: 0.5px;
+    --uc-tab-corner-rounding: 4px; /* Hardcoded */
+    --uc-newtab-bgcolor: transparent;
+    /* Corner Rounding Image */
+    --uc-newtab-position: calc((var(--uc-tab-corner-rounding) / 2) * -1);
+    background-image: var(--uc-tab-corner-left-side-svg), var(--uc-tab-corner-right-side-svg);
+    background-repeat: no-repeat;
+    background-position: left var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size),
+      right var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size);
+    background-size: var(--uc-tab-corner-rounding);
+    /* Corner Rounding Color */
+    fill: var(--uc-newtab-bgcolor) !important;
+    -moz-context-properties: fill !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+    --uc-newtab-position: 0px;
+    --uc-newtab-non-corner-bgwidth: 0px;
+    --uc-tab-corner-half-height: calc(var(--uc-tab-corner-height) / 2);
+    --uc-tab-corner-half-height-reverse: calc(var(--uc-tab-corner-half-height) * -1);
+    transform: translateX(var(--uc-tab-corner-half-height-reverse));
+    padding-inline: var(--uc-tab-corner-half-height) !important;
+    overflow-clip-margin: var(--uc-tab-corner-half-height) !important;
+    background-image: var(--uc-tab-corner-left-side-svg),
+      linear-gradient(to left, var(--uc-newtab-bgcolor), var(--uc-newtab-bgcolor)), var(--uc-tab-corner-right-side-svg);
+    background-position: left var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size),
+      center bottom var(--uc-tabs-navbar-shadow-size),
+      right var(--uc-newtab-position) bottom var(--uc-tabs-navbar-shadow-size);
+    background-size: var(--uc-tab-corner-height) var(--uc-tab-corner-height),
+      var(--uc-newtab-non-corner-bgwidth) var(--uc-tab-corner-height),
+      var(--uc-tab-corner-height) var(--uc-tab-corner-height);
+    background-origin: padding-box;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button {
+    --uc-newtab-non-corner-bgwidth: calc(2 * var(--toolbarbutton-inner-padding));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabs-newtab-button:hover {
+    --uc-newtab-bgcolor: var(--toolbarbutton-hover-background);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabs-newtab-button:hover:active {
+    --uc-newtab-bgcolor: var(--toolbarbutton-active-background);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover {
+    fill: color-mix(in srgb, AccentColorText 10%, transparent) !important; /* Hardcoded for compatibility */
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active {
+    fill: color-mix(in srgb, AccentColorText 15%, transparent) !important; /* Hardcoded for compatibility */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover {
+    background-image: var(--uc-tab-corner-left-side-svg),
+      linear-gradient(
+        to left,
+        color-mix(in srgb, AccentColorText 10%, transparent),
+        color-mix(in srgb, AccentColorText 10%, transparent)
+      ),
+      var(--uc-tab-corner-right-side-svg);
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active {
+    background-image: var(--uc-tab-corner-left-side-svg),
+      linear-gradient(
+        to left,
+        color-mix(in srgb, AccentColorText 15%, transparent),
+        color-mix(in srgb, AccentColorText 15%, transparent)
+      ),
+      var(--uc-tab-corner-right-side-svg);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover {
+    fill: color-mix(
+      in srgb,
+      -moz-accent-color-foreground 10%,
+      transparent
+    ) !important; /* Hardcoded for compatibility */
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active {
+    fill: color-mix(
+      in srgb,
+      -moz-accent-color-foreground 15%,
+      transparent
+    ) !important; /* Hardcoded for compatibility */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-windows-accent-color-in-titlebar) and (-moz-bool-pref: "userChrome.compatibility.accent_color") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover {
+    background-image: var(--uc-tab-corner-left-side-svg),
+      linear-gradient(
+        to left,
+        color-mix(in srgb, -moz-accent-color-foreground 10%, transparent),
+        color-mix(in srgb, -moz-accent-color-foreground 10%, transparent)
+      ),
+      var(--uc-tab-corner-right-side-svg);
+  }
+  :root:is([tabsintitlebar], [customtitlebar]):not(:-moz-window-inactive):is(:not([lwtheme]), :not(:-moz-lwtheme))
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active,
+  :root:is([tabsintitlebar], [customtitlebar])[lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive)
+    #tabbrowser-tabs:not([orient="vertical"])
+    #tabs-newtab-button:hover:active {
+    background-image: var(--uc-tab-corner-left-side-svg),
+      linear-gradient(
+        to left,
+        color-mix(in srgb, -moz-accent-color-foreground 15%, transparent),
+        color-mix(in srgb, -moz-accent-color-foreground 15%, transparent)
+      ),
+      var(--uc-tab-corner-right-side-svg);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button .toolbarbutton-icon {
+    border-radius: var(--tab-border-radius) var(--tab-border-radius) 0 0 !important; /* Original: var(--tab-border-radius) */
+    padding: calc(var(--toolbarbutton-inner-padding) - var(--tab-block-margin) / 4) var(--toolbarbutton-inner-padding)
+      calc(var(--toolbarbutton-inner-padding) + var(--tab-block-margin) / 4 + var(--uc-tabs-navbar-shadow-size)) !important;
+    -moz-context-properties: fill, fill-opacity;
+    fill: var(--toolbarbutton-icon-fill);
+    fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.wave"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.australis"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome_legacy"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.chrome"),
+  (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner.edge") {
+  #tabbrowser-tabs:not([orient="vertical"]) #tabs-newtab-button .toolbarbutton-icon {
+    --tab-border-radius: 0px;
+    width: unset !important;
+    padding-inline: 0px !important;
+    margin-inline: calc(var(--uc-tab-corner-half-height) - 7.75px) !important;
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_like_tab") and (-moz-bool-pref: "userChrome.tab.bottom_rounded_corner") {
+  tab:where([visuallyselected]) {
+    z-index: 1;
+  }
+}
+/*= New tab button - Smaller button ==========================================*/
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_smaller") {
+  #tabs-newtab-button > .toolbarbutton-icon {
+    --tab-border-radius: var(--toolbarbutton-border-radius);
+    margin-left: 1px;
+    /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */
+    --toolbarbutton-inner-padding: var(--uc-small-toolbarbutton-inner-padding);
+  }
+}
+/*= New tab button - Proton like button ======================================*/
+@media (-moz-bool-pref: "userChrome.tab.newtab_button_proton") {
+  :root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon {
+    --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px);
+  }
+}
+/*= Unloaded Tab - Contents Opacity ===========================================*/
+@media (-moz-bool-pref: "userChrome.tab.unloaded") {
+  .tabbrowser-tab[pending] .tab-content {
+    opacity: 0.7;
+  }
+}
+/*= Clipped tabs =============================================================*/
+/** Clipped tabs - Letters cleary *********************************************/
+@media (-moz-bool-pref: "userChrome.tab.letters_cleary") {
+  #tabbrowser-tabs[closebuttons="activetab"] {
+    --inline-tab-padding: 7px !important; /* Original: 8px */
+  }
+  #tabbrowser-tabs[overflow="true"] {
+    --inline-tab-padding: 6px !important; /* Original: 8px */
+  }
+  .tab-content[pinned] {
+    --inline-tab-padding: 10px; /* Prevent overflow pinned tab's divide line not aligned */
+    padding-inline: var(--inline-tab-padding) !important;
+  }
+  :root[uidensity="compact"] .tab-content[pinned] {
+    --inline-tab-padding: 8px;
+  }
+  .tabbrowser-tab .tab-label-container {
+    --tab-label-mask-size: 1.8em; /* Original: 2em */
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-label-container {
+    --tab-label-mask-size: 30%;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:is([visuallyselected], [multiselected="true"])
+    .tab-label-container {
+    --tab-label-mask-size: 25%;
+  }
+  .tabbrowser-tab[visuallyselected]:not([labelendaligned]):hover .tab-label-container,
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    > #pinned-tabs-container
+    > .tabbrowser-tab:not([visuallyselected], [labelendaligned]):hover
+    .tab-label-container,
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:not([visuallyselected], [labelendaligned]):hover
+    .tab-label-container {
+    --tab-label-mask-size: 0.9em; /* Original: 1em */
+  }
+}
+/** Clipped tabs - Show close button at hover *********************************/
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  #tabbrowser-tabs[closebuttons="activetab"]
+    > #pinned-tabs-container
+    > .tabbrowser-tab:not([pinned])
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button:not([selected]),
+  #tabbrowser-tabs[closebuttons="activetab"]
+    > #tabbrowser-arrowscrollbox
+    > .tabbrowser-tab:not([pinned])
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button:not([selected]) {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button {
+    visibility: collapse !important;
+    opacity: 0;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:hover .tab-close-button {
+    visibility: visible !important;
+    opacity: 1;
+  }
+  /* Animate */
+  /* Closed Button's icon thicker */
+  /* Closed Button's icon larger */
+  /* Closed Button's padding reduce */
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") and (-moz-bool-pref: "userChrome.tab.close_button_at_hover.with_selected") {
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]):not(:hover) .tab-close-button {
+    visibility: collapse !important;
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") and (-moz-bool-pref: "userChrome.tab.close_button_at_hover.always") {
+  .tabbrowser-tab:not([visuallyselected]) .tab-close-button {
+    visibility: collapse !important;
+    opacity: 0;
+  }
+  .tabbrowser-tab:hover .tab-close-button {
+    visibility: visible !important;
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") and (-moz-bool-pref: "userChrome.tab.close_button_at_hover.always") and (-moz-bool-pref: "userChrome.tab.close_button_at_hover.with_selected") {
+  .tabbrowser-tab:not([pinned]):not(:hover) .tab-close-button {
+    visibility: collapse !important;
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") and (prefers-reduced-motion: no-preference) {
+  /* Fade out */
+  .tabbrowser-tab .tab-close-button {
+    transition: opacity 0.1s var(--animation-easing-function) !important;
+  }
+  /* Fade in */
+  .tabbrowser-tab:hover .tab-close-button {
+    transition: opacity 0.25s var(--animation-easing-function) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  .tabbrowser-tab .tab-content > .close-icon {
+    list-style-image: url("chrome://browser/skin/lepton/dismiss-filled.svg") !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  .tab-close-button {
+    padding: 6px !important; /* Original: 7px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  .tabbrowser-tab:not(:hover, [pinned]) > .tab-stack > .tab-content > .tab-close-button {
+    padding-inline-start: 1px !important; /* Original: 0px */
+    width: 19px !important; /* Original: 17px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  #tabbrowser-tabs[closebuttons="activetab"] .tab-content > .tab-close-button {
+    margin-inline-end: calc(
+      var(--inline-tab-padding) / -2 + 2px
+    ) !important; /* Original: calc(var(--inline-tab-padding) / -2)*/
+    padding: 4px !important; /* Original: 7px */
+    width: 20px !important; /* Original: 24px */
+    height: 20px !important; /* Original: 24px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:not(:hover)
+    > .tab-stack
+    > .tab-content
+    > .tab-close-button {
+    padding-inline-start: 3px !important; /* Original: 0px */
+    width: 19px !important; /* Redefine from 19px !important, Original: 17px = (width - padding)  */
+  }
+}
+/** Clipped tabs - Show close button at pinned tab ****************************/
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_pinned") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  #tabbrowser-tabs {
+    --uc-close-button-size: 24px;
+    --uc-close-button-padding: 6px;
+    --uc-close-button-margin: calc((var(--uc-close-button-size) - 16px) / -2);
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] {
+    --uc-close-button-size: 20px;
+    --uc-close-button-padding: 4px;
+  }
+  .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button {
+    display: flex !important;
+    display: -moz-box !important;
+    order: -1 !important;
+    -moz-box-ordinal-group: 0 !important;
+    /* Looks like hover */
+    width: var(--uc-close-button-size) !important;
+    height: var(--uc-close-button-size) !important;
+    padding: var(--uc-close-button-padding) !important;
+    margin-inline: var(--uc-close-button-margin) !important;
+  }
+  .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-icon-stack {
+    width: 0 !important;
+    position: absolute;
+    bottom: 8px;
+  }
+  .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover .tab-icon-image {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_pinned") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-bool-pref: "userChrome.tab.close_button_at_pinned.always") {
+  .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button {
+    display: flex !important;
+    display: -moz-box !important;
+    order: -1 !important;
+    -moz-box-ordinal-group: 0 !important;
+    /* Looks like hover */
+    width: var(--uc-close-button-size) !important;
+    height: var(--uc-close-button-size) !important;
+    padding: var(--uc-close-button-padding) !important;
+    margin-inline: var(--uc-close-button-margin) !important;
+  }
+  .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-icon-stack {
+    width: 0 !important;
+    position: absolute;
+    bottom: 8px;
+  }
+  .tabbrowser-tab[pinned][visuallyselected] .tab-icon-image {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_pinned") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-bool-pref: "userChrome.tab.close_button_at_pinned.background") {
+  .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button {
+    display: flex !important;
+    display: -moz-box !important;
+    order: -1 !important;
+    -moz-box-ordinal-group: 0 !important;
+    /* Looks like hover */
+    width: var(--uc-close-button-size) !important;
+    height: var(--uc-close-button-size) !important;
+    padding: var(--uc-close-button-padding) !important;
+    margin-inline: var(--uc-close-button-margin) !important;
+  }
+  .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-icon-stack {
+    width: 0 !important;
+    position: absolute;
+    bottom: 8px;
+  }
+  .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover .tab-icon-image {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.close_button_at_pinned") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy])
+    .tab-close-button {
+    margin-inline-end: var(--uc-close-button-margin) !important;
+  }
+}
+/** Clipped tabs - Always show tab icon ***************************************/
+@media (-moz-bool-pref: "userChrome.tab.always_show_tab_icon") {
+  .tab-icon-image:not([src], [pinned], [crashed], [busy]) {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+}
+/*= Sound Tab ================================================================*/
+/*= Sound Tab - Hide Label ===================================================*/
+@media (-moz-bool-pref: "userChrome.tab.sound_hide_label") and (not (-moz-bool-pref: "userChrome.tab.sound_show_label")) {
+  .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) {
+    display: none !important;
+  }
+}
+/*= Sound Tab - Show Label ===================================================*/
+@media (-moz-bool-pref: "userChrome.tab.sound_show_label") {
+  .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+}
+/*= Sound Tab - Show with Favicons ===========================================*/
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  /* Makes the favicons always visible (also on hover) */
+  .tab-icon-image:not([pinned]) {
+    opacity: 1 !important;
+  }
+  /* Makes the speaker icon to always appear if the tab is playing (not only on hover) */
+  .tabbrowser-tab {
+    --uc-sound-tab-icon-position-x-default: -0.5px;
+    --uc-sound-tab-icon-position-x: var(--uc-sound-tab-icon-position-x-default);
+    --uc-sound-tab-icon-position-y: -6px;
+  }
+  .tabbrowser-tab:-moz-locale-dir(rtl) {
+    --uc-sound-tab-icon-position-x: calc(-1 * var(--uc-sound-tab-icon-position-x-default));
+  }
+  /* Label */
+  /* Animate */
+  /* None exist favicon - Size bigger */
+  /* Busy - Show */
+  /* Busy - Overlay Position */
+  /* Hover */
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.tab.sound_with_favicons.on_center") {
+  .tabbrowser-tab:not([pinned]) {
+    --uc-sound-tab-icon-position-x-default: 7px;
+    --uc-sound-tab-icon-position-y: -1px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-icon-overlay:not([crashed]),
+  .tab-icon-overlay[pinned][crashed][selected] {
+    /* Position */
+    top: 0 !important;
+    inset-inline-end: -9px !important;
+    z-index: 1 !important;
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(var(--uc-sound-tab-icon-position-y));
+    /* Shape */
+    padding: 1.5px !important;
+    border-radius: 10px !important;
+    width: 17px !important;
+    height: 17px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    -moz-context-properties: fill, fill-opacity, stroke !important;
+    fill: currentColor !important;
+    border: none !important;
+  }
+  .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+    stroke: var(--tab-icon-overlay-stroke, light-dark(white, black));
+    color: var(--tab-icon-overlay-fill, light-dark(black, white));
+  }
+  .tab-icon-overlay:not([crashed])[soundplaying] {
+    list-style-image: url("./icons/tab-audio-playing-small.svg");
+  }
+  .tab-icon-overlay:not([crashed])[muted] {
+    list-style-image: url("./icons/tab-audio-muted-small.svg");
+  }
+  .tab-icon-overlay:not([crashed])[activemedia-blocked] {
+    list-style-image: url("./icons/tab-audio-blocked-small.svg");
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-icon-overlay:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    /* Color */
+    color: currentColor !important;
+    stroke: transparent !important;
+    background: transparent !important;
+    fill-opacity: 0.8 !important;
+    opacity: 1 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-audio-button:not([crashed]),
+  .tab-audio-button[pinned][crashed][selected] {
+    /* Position */
+    margin-inline-start: -8px !important;
+    margin-inline-end: -4px !important;
+    z-index: 1 !important;
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(var(--uc-sound-tab-icon-position-y));
+    /* Shape */
+    --button-size-icon-small: 17px !important;
+    --button-min-height-small: 17px !important;
+    --button-border-radius: 100% !important;
+    width: 17px !important;
+    height: 17px !important;
+    border-radius: 100%;
+    overflow: clip;
+    --button-text-color-ghost-hover: light-dark(white, black);
+    --button-background-color-ghost-hover: light-dark(black, white);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-audio-button:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+    display: flex !important;
+    fill-opacity: 0.8 !important;
+    opacity: 1 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container {
+    --uc-sound-tab-label-position-x-default: 4px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) and (-moz-bool-pref: "userChrome.tab.sound_with_favicons.on_center") {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container {
+    --uc-sound-tab-label-position-x-default: 8px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container[labeldirection="ltr"],
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+    --uc-sound-tab-label-position-x: var(--uc-sound-tab-label-position-x-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container[labeldirection="rtl"],
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+    --uc-sound-tab-label-position-x: calc(-1 * var(--uc-sound-tab-label-position-x-default));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container
+    > * {
+    transform: translateX(var(--uc-sound-tab-label-position-x));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container {
+    --uc-sound-tab-label-position-x-default: 4px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) and (-moz-bool-pref: "userChrome.tab.sound_with_favicons.on_center") {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container {
+    --uc-sound-tab-label-position-x-default: 8px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container[labeldirection="ltr"],
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+    --uc-sound-tab-label-position-x: var(--uc-sound-tab-label-position-x-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container[labeldirection="rtl"],
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+    --uc-sound-tab-label-position-x: calc(-1 * var(--uc-sound-tab-label-position-x-default));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container
+    > * {
+    transform: translateX(var(--uc-sound-tab-label-position-x));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (prefers-reduced-motion: no-preference) {
+  .tab-icon-overlay:not([crashed]),
+  .tab-icon-overlay[pinned][crashed][selected] {
+    transition: 0.1s var(--animation-easing-function);
+  }
+  .tab-label-container > * {
+    transition: transform 0.25s var(--animation-easing-function);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.tab.always_show_tab_icon")) {
+  .tabbrowser-tab .tab-label-container[labeldirection="ltr"],
+  .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+    --uc-sound-tab-no-icon-position-x: -0.5px;
+    --uc-sound-tab-no-icon-label-position-x: 3px;
+  }
+  .tabbrowser-tab .tab-label-container[labeldirection="rtl"],
+  .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+    --uc-sound-tab-no-icon-position-x: 0.5px;
+    --uc-sound-tab-no-icon-label-position-x: -3px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.tab.always_show_tab_icon")) and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) {
+    transform: translateX(var(--uc-sound-tab-no-icon-position-x)) translateY(-1px);
+    inset-inline-end: 0 !important;
+    margin-inline-end: 0 !important;
+    padding: 0 !important;
+  }
+  .tabbrowser-tab:not([image]):is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) {
+    opacity: 0 !important; /* Favicon hidden */
+  }
+  .tabbrowser-tab:not([image]):not([image]):not([pinned], [sharing], [crashed]):is(
+      [soundplaying],
+      [muted],
+      [activemedia-blocked]
+    )
+    .tab-label-container
+    > * {
+    transform: translateX(var(--uc-sound-tab-no-icon-label-position-x));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.tab.always_show_tab_icon")) and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab .tab-icon-overlay:not([pinned], [sharing], [crashed]) {
+    transform: translateX(var(--uc-sound-tab-no-icon-position-x)) translateY(-1px);
+    inset-inline-end: 0 !important;
+    margin-inline-end: 0 !important;
+    padding: 0 !important;
+  }
+  .tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) {
+    opacity: 0 !important; /* Favicon hidden */
+  }
+  .tabbrowser-tab:not([image]):not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container
+    > * {
+    transform: translateX(var(--uc-sound-tab-no-icon-label-position-x));
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-throbber[busy],
+  .tab-icon-pending[busy] {
+    opacity: 1 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tabbrowser-tab:not([pinned])[busy] .tab-icon-overlay:is([soundplaying], [muted], [activemedia-blocked]) {
+    transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(-6px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed])[busy] {
+    inset-inline-end: -9px !important;
+    margin-inline-end: 9.5px !important;
+    padding: 1.5px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  .tab-icon-overlay:not([crashed])[muted]:hover,
+  .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover {
+    color: var(--toolbar-bgcolor, white) !important;
+    stroke: var(--lwt-tab-text, var(--toolbar-color)) !important;
+    background-color: var(--lwt-tab-text, var(--toolbar-color)) !important;
+    fill-opacity: 0.95 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[muted]:hover,
+  #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover {
+    color: var(--toolbar-bgcolor, black) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]):hover {
+    padding: 0 !important;
+  }
+}
+/*= PictureInPicture Tab - Show PIP Icon =====================================*/
+@media (-moz-bool-pref: "userChrome.tab.pip") {
+  #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after,
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab[pictureinpicture]:not([pinned], :hover)
+    .tab-content::after {
+    content: "";
+  }
+  .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after {
+    /* Shape */
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+    width: 14px;
+    height: 14px;
+    background-size: 14px;
+    order: 1 !important;
+    -moz-box-ordinal-group: 1 !important;
+    /* Color */
+    fill: currentColor;
+    opacity: 0.8;
+    -moz-context-properties: fill;
+    /* Icon */
+    background-image: url("chrome://global/skin/media/picture-in-picture-open.svg");
+  }
+  .tabbrowser-tab[pictureinpicture]:not([pinned])[selected] .tab-content::after {
+    opacity: 0.95;
+  }
+  /* Close Button's position */
+  .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
+    order: 2 !important;
+    -moz-box-ordinal-group: 2 !important;
+  }
+  #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
+    margin-left: 7px !important;
+  }
+  #tabbrowser-tabs:not([closebuttons="activetab"])
+    .tabbrowser-tab[pictureinpicture]:not([pinned]):hover
+    .tab-close-button {
+    margin-left: 2px !important;
+  }
+}
+/*= Container Tab - Color line at icon's bottom ==============================*/
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  /* Animate */
+  /* Pinned Tab */
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) {
+  .tab-context-line {
+    display: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  #tabbrowser-tabs {
+    --uc-container-position-x: 9px;
+    --uc-container-position-y-default: 11.5px;
+    --uc-container-position-y-bottom: calc(50% + var(--uc-container-position-y-default));
+    --uc-container-position-y: var(--uc-container-position-y-bottom);
+    --uc-titlechanged-container-position-x: 32%, 50%, 70%;
+  }
+  #tabbrowser-tabs:-moz-locale-dir(rtl) {
+    --uc-container-position-x: -9px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-bool-pref: "userChrome.tab.container.on_top") {
+  #tabbrowser-tabs {
+    --uc-container-position-y: calc(var(--uc-container-position-y-bottom) * -1);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  :root[uidensity="compact"] #tabbrowser-tabs {
+    --uc-container-position-y-default: 10.5px;
+    --uc-titlechanged-container-position-x: 30%, 50%, 70%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  :root[uidensity="touch"] #tabbrowser-tabs {
+    --uc-container-position-y-default: 12.5px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  .tab-content::before {
+    /* Box Model */
+    content: "";
+    display: block;
+    position: absolute;
+    top: 50%;
+    transform: translate(var(--uc-container-position-x), var(--uc-container-position-y));
+    /* Shape */
+    border-bottom: 2px solid var(--identity-icon-color);
+    width: calc(100% - 30px);
+    opacity: 0.75;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  .tabbrowser-tab[visuallyselected] .tab-content::before {
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.always_long")) {
+  .tab-content::before {
+    width: 25%;
+  }
+  .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before {
+    width: calc(100% - 30px);
+  }
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before {
+    width: calc(100% - 33px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (prefers-reduced-motion: no-preference) {
+  .tab-content:not([titlechanged])::before {
+    transition: 0.15s var(--animation-easing-function);
+    transition-property: width, opacity;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) {
+  .tabbrowser-tab[pinned] .tab-content::before {
+    transform: translateY(var(--uc-container-position-y));
+    width: 16px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-bool-pref: "userChrome.tab.close_button_at_pinned") {
+  .tabbrowser-tab[pinned][visuallyselected]:not([busy]):hover .tab-content::before {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.on_top")) {
+  .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected])::before,
+  .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before {
+    opacity: 0;
+  }
+  /* Pinned Tab - Titlechanged Indicator override */
+  .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected]),
+  .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+    /* Original: radial-gradient(circle, var(--attention-icon-color), var(--attention-icon-color) 2px, transparent 2px); */
+    --dotted-identity-image: radial-gradient(
+      circle,
+      var(--identity-icon-color),
+      var(--identity-icon-color) 2px,
+      transparent 2px
+    );
+    background-image: var(--dotted-identity-image), var(--dotted-identity-image), var(--dotted-identity-image) !important;
+    background-position-x: var(--uc-titlechanged-container-position-x) !important;
+  }
+  .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
+  .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+    /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */
+    background-position-y: top var(--uc-container-position-y) !important;
+  }
+  /* Pinned Tab - Titlechanged & soundplaying */
+  .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+    > .tab-stack
+    > .tab-content[attention]:not([selected]),
+  .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+    > .tab-stack
+    > .tab-content[pinned][titlechanged]:not([selected]) {
+    --uc-titlechanged-container-position-x: calc(32% - 1px), calc(50% - 1px), calc(70% - 1px);
+  }
+  :root[uidensity="compact"]
+    .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+    > .tab-stack
+    > .tab-content[attention]:not([selected]),
+  :root[uidensity="compact"]
+    .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked])
+    > .tab-stack
+    > .tab-content[pinned][titlechanged]:not([selected]) {
+    --uc-titlechanged-container-position-x: calc(30% - 1px), calc(50% - 1px), calc(70% - 1px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (-moz-bool-pref: "userChrome.tab.container.on_top") {
+  .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
+  .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) {
+    /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */
+    background-position-y: top var(--uc-container-position-y-bottom) !important;
+  }
+}
+/*= Crashed Tab - Don't show Favicons ========================================*/
+@media (-moz-bool-pref: "userChrome.tab.crashed") {
+  .tab-icon-image[crashed] {
+    display: none !important;
+  }
+}
+/** Nav Bar UI ****************************************************************/
+/*= Nav Bar - Navbar comabine with sidebar===================================*/
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root {
+    --uc-navbar-margin-block: var(--toolbarbutton-inner-padding);
+    --uc-urlbar-margin-top: calc(var(--uc-navbar-height) + var(--uc-navbar-margin-block));
+    --uc-urlbar-container-height: 36px;
+    --uc-navbar-sideblock-height: calc(var(--uc-urlbar-margin-top) + var(--uc-urlbar-container-height));
+  }
+  #nav-bar,
+  #sidebar-box,
+  #sidebar-header,
+  #sidebar {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  #nav-bar,
+  #wrapper-urlbar-container,
+  #urlbar-container {
+    position: absolute !important;
+  }
+  #nav-bar-customization-target {
+    justify-content: space-between;
+    -moz-box-pack: justify;
+  }
+  #nav-bar {
+    z-index: 1;
+    margin-top: calc(
+      var(--uc-tabbar-height) + var(--uc-bm-height) + var(--uc-menubar-height) + var(--uc-navbar-margin-block)
+    );
+    overflow-y: visible !important;
+    background: none !important;
+    box-shadow: none !important;
+    -moz-window-dragging: drag;
+  }
+  @supports selector(:has(a)) {
+    :root:has(#sidebar-box[hidden="true"]) #nav-bar {
+      margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+      opacity: 0;
+      visibility: hidden;
+    }
+    :root:has(#sidebar-box[positionend]) #nav-bar {
+      right: 0;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") and (not (-moz-bool-pref: "userChrome.decoration.disable_sidebar_animate")) {
+  #nav-bar {
+    transition: margin-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out,
+      visibility 0s linear,
+      margin-top var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+    will-change: margin-inline-start, opacity, visibility, margin-top;
+  }
+  :root:has(#sidebar-box[hidden="true"]) #nav-bar,
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar {
+    transition-delay: 0s, 0s, 0.25s, 0s, 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") and (-moz-bool-pref: "userChrome.decoration.disable_sidebar_animate") {
+  #nav-bar {
+    transition: margin-top var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+    will-change: margin-top;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  #urlbar-container {
+    top: var(--uc-urlbar-margin-top);
+    min-width: calc(var(--uc-sidebar-activate-width) - 2 * var(--toolbarbutton-inner-padding)) !important;
+    margin-inline: auto !important; /* Original: var(--urlbar-margin-inline) */
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  #customizableui-special-spring1,
+  #customizableui-special-spring2,
+  #wrapper-customizableui-special-spring1,
+  #wrapper-customizableui-special-spring2 {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  #sidebar-header {
+    margin-top: var(--uc-navbar-sideblock-height) !important;
+    -moz-window-dragging: drag;
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root[customizing="true"] #wrapper-urlbar-container {
+    left: 50%;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] {
+    visibility: visible !important;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #appcontent {
+    visibility: collapse;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #sidebar-box {
+    position: absolute;
+    height: 100%;
+  }
+  :root[customizing="true"] #browser[collapsed="true"] #sidebar-box[positionend] {
+    right: 0;
+  }
+  :root[customizing="true"] #customization-container {
+    --uc-customization-conatiner-margin: var(--uc-navbar-height-default);
+    width: calc(100% - var(--uc-sidebar-activate-width));
+    height: calc(100% - var(--uc-customization-conatiner-margin));
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  :root[customizing="true"] #customization-container {
+    --uc-customization-conatiner-margin: calc(var(--uc-navbar-height-default) - var(--uc-tabbar-height-default));
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root[customizing="true"]:has(#sidebar-box:not([positionend])) #customization-container {
+    margin-inline-start: var(--uc-sidebar-activate-width);
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root[customizing="true"]:has(#sidebar-box[positionend]) #customization-container {
+    margin-inline-end: var(--uc-sidebar-activate-width);
+  }
+}
+@media (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root[customizing="true"] #customization-palette-container,
+  :root[customizing="true"] #customization-panel-container {
+    flex-shrink: 0.5 !important;
+  }
+}
+/** Bookark Bar UI ************************************************************/
+@media (-moz-bool-pref: "userChrome.bookmarkbar.multi_row") {
+  #PersonalToolbar {
+    --uc-multirow-bookmark-rows: 3;
+    --uc-multirow-bookmark-row-margin: 2px;
+    max-height: none !important;
+    height: unset !important;
+  }
+  #PlacesToolbar > hbox {
+    display: block;
+    width: 100vw;
+  }
+  #PlacesToolbarItems {
+    display: flex;
+    flex-wrap: wrap;
+    overflow-y: auto;
+    scroll-snap-type: y mandatory;
+    max-height: calc(
+      var(--uc-multirow-bookmark-rows) *
+        (
+          var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + 2 *
+            var(--uc-multirow-bookmark-row-margin)
+        )
+    ) !important;
+  }
+  #PlacesChevron {
+    display: none;
+  }
+  #PlacesToolbarItems > .bookmark-item {
+    scroll-snap-align: start;
+    margin-block: var(--uc-multirow-bookmark-row-margin) !important;
+  }
+}
+/** Url View UI ***************************************************************/
+/*= Url Bar - Icon box as Separator ==========================================*/
+@media (-moz-bool-pref: "userChrome.urlbar.iconbox_with_separator") {
+  #identity-box {
+    /* separator */
+    position: relative;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:not(:hover, [open]),
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:not(:hover, [open]),
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:not(:hover, [open]) {
+    /* remove background from urlbar box */
+    background-color: transparent !important;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button:not(:hover, [open])::after,
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button:not(:hover, [open])::after,
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button:not(:hover, [open])::after {
+    opacity: 0.375;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button::after,
+  #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button::after,
+  #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button::after {
+    /* Box Model */
+    content: "";
+    position: absolute;
+    display: block;
+    /* Position */
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    /* Bar shape */
+    width: 1px;
+    height: 1em;
+    /* Bar Color */
+    opacity: 0;
+    background-color: currentColor;
+  }
+  #identity-box[pageproxystate="valid"] #identity-icon-label {
+    /* increase space between icon and text - as identity box padding */
+    padding-inline-start: 8px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlbar.iconbox_with_separator") and (prefers-reduced-motion: no-preference) {
+  .identity-box-button::after {
+    transition: opacity 0.2s var(--animation-easing-function);
+  }
+}
+/*= Url View - Share Layout ==================================================*/
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar"), (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  .urlbarView {
+    --uc-urlView-padding: calc(5px + var(--urlbar-container-padding));
+    margin-inline: 0 !important; /* Original: calc(5px + var(--urlbar-container-padding)) */
+  }
+}
+/*= Url View - Looks like Launcher ===========================================*/
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  /* Init & Base Layout */
+  .urlbarView {
+    --urlbarView-favicon-width: 32px; /* Original: 16px */
+    --uc-urlView-typeIcon-size: 18px;
+    --uc-urlView-icon-size-differ: 14px;
+    --uc-searchBar-icon-size: 20px;
+    --uc-searchBar-button-size: 32px;
+    --uc-urlView-row-padding: 8px;
+    --uc-urlView-row-bottom: 2px;
+    --uc-urlView-margin: calc(var(--uc-sidebar-activate-width, 18rem) + var(--toolbarbutton-inner-padding));
+    position: fixed !important;
+    left: 50vw;
+    transform: translateX(-50%);
+    top: 12vh !important;
+    width: calc(100vw - (var(--uc-urlView-margin) + var(--toolbarbutton-inner-padding))) !important;
+    /* paddding as margin */
+    /* background */
+    background-color: var(--toolbar-field-focus-background-color) !important;
+    background-clip: border-box;
+    border: 1px solid var(--arrowpanel-border-color) !important;
+    border-radius: var(--toolbarbutton-border-radius) !important;
+    box-shadow: 0 2px 14px rgba(0, 0, 0, 0.13);
+  }
+  /* Big icons */
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") and (not (-moz-bool-pref: "userChrome.urlView.full_width_padding")) {
+  .urlbarView {
+    padding-inline: var(--uc-urlView-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  .urlbarView-body-inner {
+    border-top: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  :root[uidensity="compact"] .urlbarView {
+    --urlbarView-favicon-width: 24px; /* Original: 16px */
+    --uc-urlView-typeIcon-size: 16px;
+    --uc-urlView-icon-size-differ: 8px;
+    --uc-searchBar-icon-size: 18px;
+    --uc-searchBar-button-size: 30px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  :root[uidensity="touch"] .urlbarView {
+    --uc-urlView-row-padding: 17px;
+    --uc-urlView-row-bottom: 11px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) {
+    position: relative;
+    min-height: calc(var(--urlbarView-favicon-width) + var(--uc-urlView-row-padding)) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-row-inner {
+    height: var(--urlbarView-favicon-width) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-favicon {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-title {
+    padding-inline-start: calc(
+      var(--urlbarView-item-inline-padding) + var(--identity-box-margin-inline) + var(--urlbarView-favicon-width)
+    ) !important;
+  }
+  .urlbarView-row:not([type="tip"], [type="dynamic"]) .urlbarView-type-icon {
+    width: var(--uc-urlView-typeIcon-size) !important;
+    height: var(--uc-urlView-typeIcon-size) !important;
+    margin-inline-start: calc(
+      var(--uc-urlView-icon-size-differ) + var(--urlbarView-item-inline-padding)
+    ) !important; /* Original: 8px */
+    bottom: var(--uc-urlView-row-bottom);
+  }
+  .urlbarView-row[dynamicType="quickactions"] .urlbarView-favicon-img {
+    width: var(--urlbarView-favicon-width) !important; /* Original: 16px */
+    height: var(--urlbarView-favicon-width) !important; /* Original: 16px */
+  }
+  .urlbarView-row[dynamicType="quickactions"] .urlbarView-label {
+    font-size: 0.95em !important; /* Original: 11px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  :root[uidensity="touch"] .urlbarView-row {
+    padding-block: 6px !important;
+  }
+  :root[uidensity="touch"] .urlbarView-row-inner {
+    padding-block: 11px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
+  #urlbar .searchbar-engine-one-off-item {
+    min-width: var(--uc-searchBar-button-size) !important; /* Original: 28px */
+    height: var(--uc-searchBar-button-size) !important;
+  }
+  #urlbar .searchbar-engine-one-off-item > .button-box > .button-icon {
+    width: var(--uc-searchBar-icon-size) !important; /* Original: 16px */
+    height: var(--uc-searchBar-icon-size) !important;
+  }
+}
+/*= Url View - Full Width Pddding ============================================*/
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  .urlbarView {
+    --uc-urlView-padding-double: calc(var(--uc-urlView-padding) * 2);
+    --uc-urlView-full-width-padding: var(--uc-urlView-padding-double);
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") and (not (-moz-bool-pref: "userChrome.urlView.as_commandbar")) {
+  .urlbarView {
+    --uc-urlView-full-width-padding: var(--uc-urlView-padding);
+    width: 100% !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner {
+    border-color: transparent !important;
+  }
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner::before {
+    content: "";
+    position: absolute;
+    border-top: 1px solid var(--autocomplete-popup-separator-color);
+    transform: translate(-50%, -1px);
+    left: 50%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  #urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner::before,
+  .urlbarView .search-one-offs {
+    width: calc(100% + 2px - var(--uc-urlView-padding-double)) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  .urlbarView .search-one-offs {
+    margin-inline: var(--uc-urlView-full-width-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.urlView.full_width_padding") {
+  .urlbarView-row-inner {
+    padding-inline: calc(var(--uc-urlView-full-width-padding) + var(--urlbarView-item-inline-padding)) !important;
+  }
+}
+/*= Url View - Always show page actions ======================================*/
+@media (-moz-bool-pref: "userChrome.urlbar.always_show_page_actions") {
+  #urlbar:not([breakout-extend="true"]) #pageActionButton {
+    display: block !important;
+    visibility: visible !important;
+  }
+}
+/*= Url View - Move icon to left =============================================*/
+@media (-moz-bool-pref: "userChrome.urlView.move_icon_to_left") {
+  .urlbarView-type-icon {
+    min-width: 16px !important;
+    height: 16px !important;
+    margin-block: 0 !important;
+    margin-inline-start: 0 !important;
+  }
+  .urlbarView-favicon {
+    margin-inline-start: 20px !important;
+  }
+}
+/*= Url View - Go button when typing =========================================*/
+@media (-moz-bool-pref: "userChrome.urlView.go_button_when_typing") {
+  #urlbar-input-container[pageproxystate="invalid"] #urlbar-go-button {
+    display: block !important;
+  }
+}
+/*= Url View - Item Focus Border =============================================*/
+@media (-moz-bool-pref: "userChrome.urlView.focus_item_border") {
+  .urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner,
+  .urlbarView-row-inner[selected] {
+    box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important;
+  }
+}
+/** Panel UI ******************************************************************/
+@media (-moz-bool-pref: "userChrome.panel.remove_strip") {
+  #appMenu-fxa-separator {
+    --panel-separator-zap-gradient: none; /* Original: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.panel.full_width_separator") {
+  /* Full width separators */
+  :root {
+    /* Original
+    --panel-separator-margin-vertical: 4px;
+    --panel-separator-margin-horizontal: 8px;
+    --panel-separator-margin: var(--panel-separator-margin-vertical) var(--panel-separator-margin-horizontal);
+     */
+    --panel-separator-margin-horizontal: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.panel.full_width_padding") {
+  /* Original
+  --arrowpanel-menuitem-margin: 0 8px;
+  --arrowpanel-menuitem-padding-block: 8px;
+  --arrowpanel-menuitem-padding-inline: 8px;
+  --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline);
+  */
+  :root,
+  :root:is([uidensity="compact"], [uidensity="touch"]) {
+    --arrowpanel-menuitem-margin: 0 !important;
+    --arrowpanel-menuitem-margin-inline: 0 !important;
+    --arrowpanel-menuitem-padding-inline: calc(var(--arrowpanel-menuitem-padding-block) + 8px) !important;
+  }
+}
+/** Sidebar UI ****************************************************************/
+@media (-moz-bool-pref: "userChrome.sidebar.overlap"),
+  (-moz-bool-pref: "userChrome.autohide.sidebar"),
+  (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root {
+    /* Original
+     min-width: 14em;
+     width: 18em;
+     max-width: 36em;
+    */
+    --uc-sidebar-width: 40px;
+    --uc-sidebar-activate-width: 18rem;
+    --uc-sidebar-activate-width-reverse: calc(-1 * var(--uc-sidebar-activate-width));
+    --uc-sidebar-fullscreen-width: 4px;
+    --uc-sidebar-shadow-size: 1px;
+    --uc-sidebar-shadow-width: 0px;
+    --uc-sidebar-shadow-position: var(--uc-sidebar-shadow-position-default);
+    --uc-sidebar-shadow-position-default: calc(var(--uc-sidebar-shadow-size) + var(--uc-sidebar-shadow-width));
+    --uc-sidebar-shadow-color: #28282f;
+    --uc-autohide-sidebar-speed: 750ms;
+    --uc-autohide-fullscreen-sidebar-speed: 1s;
+    --uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */
+  }
+  #sidebar-splitter {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.sidebar.overlap"), (-moz-bool-pref: "userChrome.autohide.sidebar") {
+  #sidebar-box {
+    --uc-sidebar-shadow-color: #28282f;
+    z-index: var(--browser-area-z-index-sidebar-splitter, 3) !important;
+    position: relative !important;
+    box-shadow: var(--uc-sidebar-shadow-position) 0px 15px -10px var(--uc-sidebar-shadow-color);
+  }
+  #sidebar-box[positionend] {
+    --uc-sidebar-shadow-position: calc(-1 * var(--uc-sidebar-shadow-position-default));
+  }
+  #sidebar {
+    display: block;
+  }
+  #main-window > body > box {
+    z-index: 2 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.sidebar.overlap") {
+  #sidebar-box[positionend] {
+    direction: rtl;
+  }
+  #sidebar-header,
+  #sidebar {
+    background-color: var(--sidebar-background-color) !important;
+    color: var(--sidebar-text-color) !important;
+    overflow: hidden;
+  }
+  #sidebar-header {
+    font-size: unset !important;
+  }
+  #sidebar-header > #sidebar-switcher-target {
+    font-size: 1.333em;
+  }
+}
+@media (-moz-bool-pref: "userChrome.sidebar.overlap") and (not (-moz-bool-pref: "userChrome.autohide.sidebar")) {
+  #sidebar-box,
+  #sidebar-header,
+  #sidebar {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  #sidebar-box {
+    margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+    will-change: padding-inline;
+    --uc-sidebar-shadow-width: var(--uc-sidebar-activate-width);
+  }
+  #sidebar-box:not([hidden="true"]) {
+    padding-inline-start: var(--uc-sidebar-activate-width) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.sidebar.overlap") and (not (-moz-bool-pref: "userChrome.autohide.sidebar")) and (prefers-reduced-motion: no-preference) {
+  #sidebar-box {
+    transition: padding-inline-start 0.25s var(--animation-easing-function), opacity 0.25s ease-in-out,
+      box-shadow 0s linear, visibility 0s linear !important;
+  }
+}
+/** Combined UI ***************************************************************/
+/*= Combined - At URL bar ====================================================*/
+@media (-moz-bool-pref: "userChrome.combined.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.nav_button.home_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.reload_button") {
+  #nav-bar {
+    --uc-combined-circlebutton-background: hsla(0, 100%, 100%, 0.5);
+    --uc-combined-circlebutton-hover-background: var(--uc-combined-circlebutton-background);
+    --uc-combined-circlebutton-active-background: var(--toolbarbutton-active-background);
+    --uc-combined-circlebutton-border-color: hsla(240, 5%, 5%, 0.3);
+    --uc-toolbarbutton-boundary: calc(var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding));
+    --uc-toolbarbutton-padding: calc(2 * var(--uc-toolbarbutton-boundary));
+    --uc-toolbarbutton-size: calc(12px + var(--uc-toolbarbutton-padding));
+    --uc-toolbarbutton-halfsize: calc(6px + var(--uc-toolbarbutton-boundary));
+    --uc-urlbar-icon-size: calc(16px + 2 * var(--urlbar-icon-padding));
+  }
+  #nav-bar[brighttext] {
+    --uc-combined-circlebutton-background: var(--toolbarbutton-hover-background);
+    --uc-combined-circlebutton-hover-background: var(--toolbarbutton-active-background);
+    --uc-combined-circlebutton-active-background: color-mix(in srgb, currentColor 20%, transparent);
+  }
+  #nav-bar-customization-target > * {
+    order: 1;
+    -moz-box-ordinal-group: 1;
+  }
+  #nav-bar-customization-target > #urlbar-container {
+    order: 5;
+    -moz-box-ordinal-group: 5;
+  }
+  #nav-bar-customization-target > #urlbar-container ~ * {
+    order: 7;
+    -moz-box-ordinal-group: 7;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #urlbar-container {
+    /* var(--urlbar-margin-inline) */
+    margin-inline-start: calc(-1 * var(--uc-urlbar-combined-margin, 0px)) !important;
+  }
+  #nav-bar-customization-target > #urlbar-container > #urlbar:not([breakout][breakout-extend]) {
+    padding-left: var(--uc-urlbar-combined-margin, 0px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") {
+  #nav-bar-customization-target > #urlbar-container {
+    --uc-urlbar-combined-margin: var(--uc-toolbarbutton-size);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) {
+  #nav-bar-customization-target > #urlbar-container {
+    --uc-urlbar-combined-margin: var(--uc-toolbarbutton-halfsize);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #urlbar-container {
+    --uc-urlbar-combined-margin: var(--uc-toolbarbutton-size);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.autohide.forward_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.autohide.forward_button") {
+  #nav-bar-customization-target
+    > #forward-button[disabled="true"]
+    ~ #urlbar-container
+    > #urlbar:not([breakout][breakout-extend]) {
+    padding-left: calc(var(--uc-urlbar-combined-margin, 0px) - var(--urlbar-icon-padding));
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (prefers-reduced-motion: no-preference) {
+  #nav-bar-customization-target > #forward-button[disabled="true"] ~ #urlbar-container > #urlbar {
+    transition-property: margin-left, padding-left;
+    transition-duration: 0.5s;
+    transition-timing-function: var(--animation-easing-function);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) {
+  #nav-bar-customization-target > #forward-button {
+    --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px);
+    z-index: 2;
+    position: relative;
+  }
+  #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+    padding-inline-end: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */
+    padding-block: var(--urlbar-icon-padding) !important;
+    height: var(--uc-urlbar-icon-size) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") {
+  #nav-bar-customization-target > #forward-button {
+    padding-inline-end: 0px !important; /* Original: var(--toolbarbutton-outer-padding) */
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) {
+  #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+  }
+  #nav-bar-customization-target > #forward-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+  #nav-bar-customization-target > #forward-button[open] > .toolbarbutton-icon,
+  #nav-bar-customization-target > #forward-button:not([disabled]):hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+  #nav-bar-customization-target > #forward-button[disabled="true"] > .toolbarbutton-icon {
+    background-color: color-mix(
+      in srgb,
+      var(--toolbarbutton-hover-background),
+      var(--toolbar-field-background-color) 40%
+    ) !important;
+    fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")) {
+  #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
+    opacity: 1 !important; /* Original: 0.4 */
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) {
+  #nav-bar-customization-target > #forward-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+  }
+  #nav-bar-customization-target > #forward-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+  #nav-bar-customization-target > #forward-button[open] > .toolbarbutton-icon,
+  #nav-bar-customization-target > #forward-button:not([disabled]):hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+  #nav-bar-customization-target > #forward-button[disabled="true"] > .toolbarbutton-icon {
+    background-color: color-mix(
+      in srgb,
+      var(--toolbarbutton-hover-background),
+      var(--toolbar-field-background-color) 40%
+    ) !important;
+    fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")) {
+  #nav-bar-customization-target > #forward-button[disabled="true"][disabled="true"] {
+    opacity: 1 !important; /* Original: 0.4 */
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.autohide.forward_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (not (-moz-bool-pref: "userChrome.autohide.forward_button")) {
+  #nav-bar-customization-target > #forward-button {
+    margin-inline-start: var(--uc-forward-button-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.autohide.forward_button"),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (-moz-bool-pref: "userChrome.autohide.forward_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.autohide.forward_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and ((not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) or ((-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"))) and (-moz-bool-pref: "userChrome.autohide.forward_button") {
+  #nav-bar-customization-target > #forward-button:not([disabled="true"]) {
+    margin-inline-start: var(--uc-forward-button-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button"), (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") {
+  #nav-bar-customization-target > #back-button {
+    position: relative;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) {
+  #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+  }
+  #nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+  #nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
+  #nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+  #nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
+    background-color: color-mix(
+      in srgb,
+      var(--toolbarbutton-hover-background),
+      var(--toolbar-field-background-color) 40%
+    ) !important;
+    fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")) {
+  #nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
+    opacity: 1 !important; /* Original: 0.4 */
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button"),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #back-button {
+    z-index: 2;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) {
+  #nav-bar-customization-target > #back-button {
+    margin-inline-end: calc(-1 * var(--uc-toolbarbutton-boundary) - 1px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) {
+  #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+  }
+  #nav-bar-customization-target > #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+  #nav-bar-customization-target > #back-button[open] > .toolbarbutton-icon,
+  #nav-bar-customization-target > #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+  #nav-bar-customization-target > #back-button[disabled="true"] > .toolbarbutton-icon {
+    background-color: color-mix(
+      in srgb,
+      var(--toolbarbutton-hover-background),
+      var(--toolbar-field-background-color) 40%
+    ) !important;
+    fill: color-mix(in srgb, var(--toolbarbutton-icon-fill), transparent 60%);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) and (not (-moz-bool-pref: "userChrome.combined.sub_button.none_background")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")) {
+  #nav-bar-customization-target > #back-button[disabled="true"][disabled="true"] {
+    opacity: 1 !important; /* Original: 0.4 */
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.sub_button.as_normal")) {
+  #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+    padding-inline-start: var(--urlbar-icon-padding) !important; /* Original: var(--toolbarbutton-inner-padding) */
+    padding-block: var(--urlbar-icon-padding) !important;
+    height: var(--uc-urlbar-icon-size) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) {
+  #nav-bar-customization-target > #back-button {
+    z-index: 3 !important;
+    background-color: var(--toolbar-bgcolor) !important;
+    background-clip: content-box !important;
+    border-radius: 100%;
+    padding-block: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact") {
+  #nav-bar-customization-target > #back-button {
+    --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")) {
+  #nav-bar-customization-target > #back-button {
+    padding-inline-end: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (-moz-bool-pref: "userChrome.autohide.back_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) and (-moz-bool-pref: "userChrome.autohide.back_button") {
+  #nav-bar-customization-target > #back-button:not([disabled="true"]) {
+    padding-inline-end: 0 !important;
+  }
+  #nav-bar-customization-target > #back-button[disabled="true"] {
+    padding-inline-end: calc(var(--toolbarbutton-outer-padding) + 1px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) {
+  #nav-bar-customization-target > #back-button > menupopup {
+    margin-top: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) {
+  #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+    background-origin: padding-box;
+    background-clip: padding-box;
+    border: 1px solid var(--uc-combined-circlebutton-border-color);
+    border-radius: 10000px !important;
+    padding-inline-end: var(--urlbar-icon-padding) !important;
+    height: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) {
+  #nav-bar-customization-target > #back-button {
+    z-index: 3 !important;
+    background-color: var(--toolbar-bgcolor) !important;
+    background-clip: content-box !important;
+    border-radius: 100%;
+    padding-block: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact") {
+  #nav-bar-customization-target > #back-button {
+    --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (not (-moz-bool-pref: "userChrome.autohide.back_button")) {
+  #nav-bar-customization-target > #back-button {
+    padding-inline-end: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.autohide.back_button"),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) and (-moz-bool-pref: "userChrome.autohide.back_button") {
+  #nav-bar-customization-target > #back-button:not([disabled="true"]) {
+    padding-inline-end: 0 !important;
+  }
+  #nav-bar-customization-target > #back-button[disabled="true"] {
+    padding-inline-end: calc(var(--toolbarbutton-outer-padding) + 1px) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) {
+  #nav-bar-customization-target > #back-button > menupopup {
+    margin-top: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")),
+  (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.nav_button.home_button")) and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) {
+  #nav-bar-customization-target > #back-button > .toolbarbutton-icon {
+    background-origin: padding-box;
+    background-clip: padding-box;
+    border: 1px solid var(--uc-combined-circlebutton-border-color);
+    border-radius: 10000px !important;
+    padding-inline-end: var(--urlbar-icon-padding) !important;
+    height: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") {
+  #nav-bar-customization-target > #home-button {
+    position: relative;
+    z-index: 3 !important;
+    background-color: var(--toolbar-bgcolor) !important;
+    background-clip: content-box !important;
+    border-radius: 100%;
+    padding-block: 0 !important;
+    padding-inline-end: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact") {
+  #nav-bar-customization-target > #home-button {
+    --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") {
+  #nav-bar-customization-target > #home-button > menupopup {
+    margin-top: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") {
+  #nav-bar-customization-target > #home-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+    background-origin: padding-box;
+    background-clip: padding-box;
+    border: 1px solid var(--uc-combined-circlebutton-border-color);
+    border-radius: 10000px !important;
+    padding-inline-end: var(--urlbar-icon-padding) !important;
+    height: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") {
+  #nav-bar-customization-target > #home-button:hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.nav_button") and (-moz-bool-pref: "userChrome.combined.nav_button.home_button") {
+  #nav-bar-customization-target > #home-button:hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") {
+  #nav-bar-customization-target > #back-button {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  #nav-bar-customization-target > #forward-button {
+    order: 4;
+    -moz-box-ordinal-group: 4;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target
+    > :first-child:is(#back-button, #forward-button, #home-button)
+    + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
+  #nav-bar-customization-target
+    > :first-child:is(#back-button, #forward-button, #home-button)
+    + :is(#back-button, #forward-button, #home-button)
+    + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button, #home-button),
+  #nav-bar-customization-target
+    > :first-child:is(#back-button, #forward-button, #home-button)
+    + :is(#back-button, #forward-button, #home-button)
+    + :is(#back-button, #forward-button, #home-button)
+    + :is(toolbarbutton, toolbaritem) {
+    padding-inline-start: var(--toolbar-start-end-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.nav_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.home_button")) {
+  #nav-bar-customization-target
+    > :first-child:is(#back-button, #forward-button)
+    + :is(toolbarbutton, toolbaritem):not(#back-button, #forward-button),
+  #nav-bar-customization-target
+    > :first-child:is(#back-button, #forward-button)
+    + :is(#back-button, #forward-button)
+    + :is(toolbarbutton, toolbaritem) {
+    padding-inline-start: var(--toolbar-start-end-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button {
+    order: 3;
+    -moz-box-ordinal-group: 3;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (not (-moz-bool-pref: "userChrome.combined.urlbar.nav_button")) {
+  #nav-bar-customization-target > #home-button:is(:first-child) + :is(toolbarbutton, toolbaritem) {
+    padding-inline-start: var(--toolbar-start-end-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button {
+    position: relative;
+    z-index: 3 !important;
+    background-color: var(--toolbar-bgcolor) !important;
+    background-clip: content-box !important;
+    border-radius: 100%;
+    padding-block: 0 !important;
+    padding-inline-end: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button") and (-moz-bool-pref: "userChrome.padding.toolbar_button.compact") {
+  #nav-bar-customization-target > #home-button {
+    --toolbarbutton-inner-padding: var(--uc-toolbarbutton-inner-padding-default);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button > menupopup {
+    margin-top: -1px !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-background);
+    background-origin: padding-box;
+    background-clip: padding-box;
+    border: 1px solid var(--uc-combined-circlebutton-border-color);
+    border-radius: 10000px !important;
+    padding-inline-end: var(--urlbar-icon-padding) !important;
+    height: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button:hover > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-hover-background) !important;
+    box-shadow: 0 1px 6px hsla(0deg, 0%, 0%, 0.1);
+    border-color: hsla(240deg, 5%, 5%, 0.35);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.home_button") {
+  #nav-bar-customization-target > #home-button:hover:active > .toolbarbutton-icon {
+    background-color: var(--uc-combined-circlebutton-active-background) !important;
+    border-color: hsla(240deg, 5%, 5%, 0.4);
+  }
+}
+@media (-moz-bool-pref: "userChrome.combined.urlbar.reload_button") {
+  #nav-bar-customization-target > #stop-reload-button {
+    order: 6;
+    -moz-box-ordinal-group: 6;
+  }
+  #urlbar {
+    padding-right: calc(var(--uc-toolbarbutton-size) - var(--urlbar-margin-inline) / 2);
+  }
+  #nav-bar-customization-target > #stop-reload-button {
+    z-index: 3;
+    position: relative;
+    --toolbarbutton-hover-background: var(--urlbar-box-hover-bgcolor);
+    color: var(--urlbar-box-hover-text-color) !important;
+    margin-left: calc(-1 * (var(--uc-toolbarbutton-size) + var(--urlbar-margin-inline)));
+  }
+  #nav-bar-customization-target > #stop-reload-button > .toolbarbutton-1 > .toolbarbutton-icon {
+    width: var(--uc-urlbar-icon-size) !important;
+    height: var(--uc-urlbar-icon-size) !important;
+    padding: var(--urlbar-icon-padding) !important;
+  }
+}
+/** Others UI *****************************************************************/
+/*= Counter for Tab ==========================================================*/
+@media (-moz-bool-pref: "userChrome.counter.tab") {
+  #tabbrowser-tabs {
+    counter-reset: tab-counts;
+  }
+  .tabbrowser-tab:not([hidden="true"]) {
+    counter-increment: tab-counts;
+  }
+  .tabbrowser-tab:not([hidden="true"])[pinned="true"] .tab-label-container::before {
+    content: "ย " counter(tab-counts);
+  }
+  .tabbrowser-tab:not([hidden="true"]):not([pinned="true"]) .tab-label-container::before {
+    content: counter(tab-counts) ":ย ";
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+    display: grid;
+    align-content: safe center;
+    align-items: safe center;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") and (-moz-bool-pref: "userChrome.centered.tab") and (not (-moz-bool-pref: "userChrome.centered.tab.label")) {
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+    justify-content: start;
+    justify-items: start;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") and (not (-moz-bool-pref: "userChrome.centered.tab")) {
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container {
+    justify-content: start;
+    justify-items: start;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") {
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container::before {
+    display: inline-block;
+    grid-row: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") {
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container > .tab-text {
+    grid-row: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") {
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] {
+    width: unset !important; /* Original: 0 */
+  }
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] > .tab-text,
+  .tabbrowser-tab:not([hidden="true"]) .tab-label-container[pinned] > .tab-secondary-label {
+    width: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") {
+  .tab-label,
+  .tab-secondary-label {
+    overflow: hidden;
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") and (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon")) {
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container[labeldirection="ltr"],
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+    --uc-sound-tab-label-position-x: 2px;
+  }
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container[labeldirection="rtl"],
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+    --uc-sound-tab-label-position-x: -2px;
+  }
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container::before {
+    transform: translateX(var(--uc-sound-tab-label-position-x, 0px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") and (-moz-bool-pref: "userChrome.tab.sound_with_favicons") and (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container[labeldirection="ltr"],
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) {
+    --uc-sound-tab-label-position-x: 2px;
+  }
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container[labeldirection="rtl"],
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned]
+    .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
+    --uc-sound-tab-label-position-x: -2px;
+  }
+  .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])
+    .tab-label-container::before {
+    transform: translateX(var(--uc-sound-tab-label-position-x, 0px));
+  }
+}
+@media (-moz-bool-pref: "userChrome.counter.tab") and (-moz-bool-pref: "userChrome.tab.sound_with_favicons") {
+  .tab-label-container::beforee {
+    transition: transform 0.25s var(--animation-easing-function);
+  }
+}
+/*= Counter for Bookmark menu ================================================*/
+@media (-moz-bool-pref: "userChrome.counter.bookmark_menu") {
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
+    counter-reset: bookmark-counts 0;
+  }
+  menupopup[placespopup="true"] > menu.bookmark-item::after {
+    display: inline-flex;
+    display: -moz-inline-box;
+    content: "(" counter(bookmark-counts) ")";
+  }
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-iconic-highlightable-text,
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-accel-container,
+  menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
+    order: 2;
+    -moz-box-ordinal-group: 2;
+  }
+  menu.bookmark-item > menupopup[placespopup="true"] > .bookmark-item {
+    counter-increment: bookmark-counts;
+  }
+}
+@media (-moz-bool-pref: "userChrome.findbar.floating_on_top") {
+  /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/floating_findbar_on_top.css made available under Mozilla Public License v. 2.0
+  See the above repository for updates as well as full license text. */
+  /* Note that privacy.resistFingerprinting.letterboxing prevents this from working properly */
+  #main-window > body > box {
+    z-index: 1;
+  }
+  findbar {
+    order: -1;
+    -moz-box-ordinal-group: 0;
+    position: relative;
+    height: 0 !important;
+    overflow: visible;
+    border-top: none !important;
+    padding: 0 !important;
+    background: none !important;
+    pointer-events: none;
+    z-index: 1;
+    margin-right: 16px;
+    border-right: 1px solid var(--chrome-content-separator-color);
+  }
+  findbar::before {
+    content: "";
+    display: flex;
+    display: -moz-box;
+    position: absolute;
+    flex: 200;
+    -moz-box-flex: 200;
+  }
+  .findbar-container,
+  .findbar-closebutton {
+    border-style: solid;
+    border-color: var(--chrome-content-separator-color);
+    background: var(--uc-light-bkgnd-color, var(--toolbar-bgcolor)) !important;
+    pointer-events: auto;
+    height: 33px !important;
+  }
+  .findbar-container {
+    flex-direction: row-reverse;
+    -moz-box-direction: reverse;
+    border-width: 0 0 1px 1px;
+    border-radius: var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) 0 0
+      var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) !important;
+  }
+  .findbar-container > .findbar-find-fast {
+    padding: var(--toolbarbutton-inner-padding) 1px;
+    margin: 0 !important;
+  }
+  .findbar-container > .findbar-find-status {
+    display: flex;
+    display: -moz-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1;
+    -moz-box-flex: 1;
+  }
+  .findbar-container > hbox {
+    margin-inline: 5px;
+  }
+  .findbar-closebutton {
+    width: 30px !important; /* Original: 24px */
+    margin: 0 !important;
+    border-width: 0 1px 1px 0px;
+    border-radius: 0 var(--toolbarbutton-border-radius) var(--toolbarbutton-border-radius) 0 !important;
+    padding: 2px 5px 2px 3px !important;
+    overflow: clip;
+  }
+  .findbar-closebutton image {
+    padding: 4px;
+    border-radius: var(--toolbarbutton-border-radius);
+  }
+  .findbar-closebutton:hover > image {
+    background: var(--toolbarbutton-hover-background) !important;
+  }
+}
+/** Fullscreen - Overlap toolbar **********************************************/
+@media (-moz-bool-pref: "userChrome.fullscreen.overlap") and (-moz-bool-pref: "browser.fullscreen.autohide") {
+  :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #navigator-toolbox {
+    position: fixed !important; /* Needed for content to take up entire height */
+    z-index: 1000 !important; /* Puts the UI above the content */
+  }
+  :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #navigator-toolbox:is(:hover, :focus-within) {
+    margin-top: 0 !important;
+  }
+  :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"])
+    :-moz-any(#navigator-toolbox, #titlebar, #toolbar-menubar, #TabsToolbar, #nav-bar, #PersonalToolbar) {
+    width: 100%; /* Makes the UI take up the entire width */
+  }
+  :root[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #urlbar:popover-open {
+    position: fixed !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.fullscreen.overlap") and (-moz-bool-pref: "browser.fullscreen.autohide") and (-moz-gtk-csd-available) {
+  /* Fix transparent background */
+  :root:is([tabsintitlebar], [customtitlebar])[sizemode="fullscreen"]:not([inDOMFullscreen="true"]):is(
+      :not([lwtheme]),
+      :not(:-moz-lwtheme)
+    )
+    #TabsToolbar {
+    appearance: auto !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.fullscreen.show_bookmarkbar") {
+  :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]),
+  :root[sizemode="fullscreen"] #PersonalToolbar[initialized] {
+    visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */
+  }
+}
+/** Centered ******************************************************************/
+/*= Centered - Tab ===========================================================*/
+@media (-moz-bool-pref: "userChrome.centered.tab") and (-moz-bool-pref: "userChrome.centered.tab.label") {
+  .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+  .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+    margin-inline-end: 5px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.centered.tab") and (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:not(:hover, [pinned])
+    .tab-label-container:not([textoverflow]) {
+    margin-inline-end: 1px;
+  }
+  #tabbrowser-tabs[closebuttons="activetab"]
+    .tabbrowser-tab:not([selected]):not(:hover, [pinned])
+    .tab-label-container
+    label {
+    padding-inline-end: 18px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.centered.tab") and (not (-moz-bool-pref: "userChrome.centered.tab.label")) {
+  .tab-icon-stack {
+    margin-inline-start: auto;
+  }
+  .tab-label-container {
+    max-width: min-content;
+    margin-inline-end: auto;
+  }
+}
+@media (-moz-bool-pref: "userChrome.centered.tab") and (not (-moz-bool-pref: "userChrome.centered.tab.label")) and (-moz-bool-pref: "userChrome.tab.close_button_at_hover") {
+  .tabbrowser-tab:not(:hover, [pinned]) > .tab-stack > .tab-content > .tab-close-button {
+    padding-inline-start: 6px !important; /* Original: 0px */
+    width: 24px !important; /* Original: 17px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.centered.tab") and (-moz-bool-pref: "userChrome.centered.tab.label") {
+  /* Based on https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/centered_tab_label.css */
+  .tab-label-container {
+    display: grid;
+  }
+  .tab-label,
+  .tab-secondary-label {
+    overflow: clip;
+    justify-self: safe center;
+    align-self: safe center;
+  }
+  .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+  .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+    margin-inline-end: 5px;
+  }
+}
+/*= Centered - URL Bar =======================================================*/
+@media (-moz-bool-pref: "userChrome.centered.urlbar") {
+  #urlbar:not([focused]) #urlbar-input,
+  #urlbar:not([focused]) .urlbar-input {
+    text-align: center !important;
+  }
+}
+/*= Centered - Bookmark Bar ==================================================*/
+@media (-moz-bool-pref: "userChrome.centered.bookmarkbar") {
+  #PlacesToolbarItems {
+    display: flex !important;
+    justify-content: safe center !important;
+  }
+}
+/** Auto Hide *****************************************************************/
+@media (-moz-bool-pref: "userChrome.autohide.back_button"), (-moz-bool-pref: "userChrome.autohide.forward_button") {
+  :root {
+    --uc-toolbarbutton-hide-size: calc(
+      -1 * (16px + (2 * (var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding))))
+    );
+  }
+}
+@-moz-document url("chrome://browser/content/browser.xhtml")
+{
+  @media (-moz-bool-pref: "userChrome.autohide.back_button") {
+    :root:not([customizing="true"]) #back-button[disabled="true"] {
+      margin-left: var(--uc-toolbarbutton-hide-size) !important;
+      opacity: 0 !important;
+      pointer-events: none;
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.autohide.back_button") and (prefers-reduced-motion: no-preference) {
+    #back-button {
+      transition-property: background-color, opacity, margin-left !important;
+    }
+    #back-button[disabled="true"] {
+      transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function),
+        margin-left 0.5s ease !important;
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.autohide.forward_button") {
+    :root:not([customizing="true"]) #forward-button[disabled="true"] {
+      margin-left: var(--uc-toolbarbutton-hide-size) !important;
+      opacity: 0 !important;
+      pointer-events: none;
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.autohide.forward_button") and (prefers-reduced-motion: no-preference) {
+    #forward-button {
+      transition-property: background-color, opacity, margin-left !important;
+    }
+    #forward-button[disabled="true"] {
+      transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function),
+        margin-left 0.5s ease !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.page_action") {
+  #page-action-buttons > .urlbar-page-action {
+    margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding));
+    opacity: 0;
+  }
+  #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action,
+  .urlbar-page-action[open],
+  .urlbar-page-action[open] ~ .urlbar-page-action {
+    margin-inline-end: 0px !important;
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.page_action") and (prefers-reduced-motion: no-preference) {
+  #page-action-buttons > .urlbar-page-action {
+    transition: margin-inline-end 50ms var(--animation-easing-function) 900ms,
+      opacity 1.5s var(--animation-easing-function) 600ms !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.page_action") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #page-action-buttons > .urlbar-page-action {
+    transition: margin-inline-end 50ms var(--animation-easing-function) 900ms,
+      opacity 1.5s var(--animation-easing-function) 600ms, background-color 2.5s var(--animation-easing-function) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.page_action") and (prefers-reduced-motion: no-preference) {
+  #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action,
+  .urlbar-page-action[open],
+  .urlbar-page-action[open] ~ .urlbar-page-action {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (not (-moz-bool-pref: "userChrome.autohide.tab.opacity")) and (not (-moz-bool-pref: "userChrome.autohide.tab.blur")) {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    margin-bottom: -64px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (-moz-bool-pref: "userChrome.autohide.tab.opacity") {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    opacity: 0%;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (-moz-bool-pref: "userChrome.autohide.tab.blur") {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    filter: blur(8px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (prefers-reduced-motion: no-preference) {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    transition-timing-function: var(--animation-easing-function);
+    transition-duration: 0.2s;
+    transition-delay: 600ms;
+  }
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]):is(:hover, :focus-within) {
+    transition-delay: 0s;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.autohide.tab.opacity")) and (not (-moz-bool-pref: "userChrome.autohide.tab.blur")) {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    transition-property: margin-bottom;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.tab.opacity") {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    transition-property: opacity;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tab") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.tab.blur") {
+  .tabbrowser-tab:not([multiselected]) .tab-content:not(:hover):not([selected]) {
+    transition-property: filter;
+  }
+}
+:root {
+  --uc-autohide-toolbar-speed: 0.25s;
+  --uc-autohide-toolbar-delay: 600ms;
+}
+
+@media (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  :root {
+    --uc-tabbar-height: var(--uc-tabbar-height-default);
+    --uc-tabbar-height-default: var(--tab-min-height);
+    --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
+    --uc-navbar-height: var(--uc-navbar-height-default);
+    --uc-navbar-height-default: calc(
+      16px + 2 * (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding))
+    );
+    --uc-navbar-hide-height: calc(-1 * var(--uc-navbar-height));
+    --uc-bm-height: var(--uc-bm-height-default);
+    --uc-bm-height-default: calc(
+      20px + (2 * var(--bookmark-block-padding, 4px))
+    ); /* 20px = 16px + (2px * 2) [margin block] */
+    --uc-bm-hide-height: calc(-1 * var(--uc-bm-height));
+    --uc-titlebar-buttonbox-height: 34px;
+    --uc-menubar-height: 0px;
+    --uc-menubar-height-default: calc(1.6rem + 2px);
+    --uc-menubar-inner-height: calc(1.6rem - 2px);
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  :root {
+    --uc-tabbar-height: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) {
+  :root {
+    --uc-tabbar-height: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.hidden.navbar"),
+  (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.hidden.navbar") {
+  :root {
+    --uc-navbar-height: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top"),
+  (-moz-bool-pref: "userChrome.hidden.tabbar"),
+  (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+  @supports selector(:has(a)) {
+    :root:not([tabsintitlebar]):not([customtitlebar]):has(#toolbar-menubar) {
+      --uc-menubar-height: var(--uc-menubar-height-default);
+    }
+    @media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-gtk-csd-available),
+      (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-gtk-csd-available) {
+      :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"]) {
+        --uc-menubar-height: calc(var(--tab-min-height) + 2 * var(--tab-block-margin));
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows),
+      (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-platform: windows) {
+      :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"]) {
+        --uc-menubar-height: calc(var(--tab-min-height) - var(--tabs-navbar-shadow-size));
+      }
+    }
+    :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="false"]) {
+      --uc-menubar-height: var(--uc-titlebar-buttonbox-height);
+    }
+    :root:not([tabsintitlebar]):not([customtitlebar]):has(#toolbar-menubar[autohide="true"][inactive="true"]),
+    :root:is([tabsintitlebar], [customtitlebar]):has(#toolbar-menubar[autohide="true"][inactive="true"]) {
+      --uc-menubar-height: 0px;
+    }
+    #navigator-toolbox:has(#PersonalToolbar[collapsed="true"]) {
+      --uc-bm-height: 0px;
+    }
+    @media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar"),
+      (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") {
+      #navigator-toolbox:has(#PersonalToolbar[collapsed="false"]) #nav-bar {
+        --uc-bm-height: var(--uc-bm-height-default);
+      }
+    }
+    @media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.tabbar.on_bottom.menubar_on_top") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+      (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.navbar.as_sidebar") and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+      #navigator-toolbox:has(#PersonalToolbar[collapsed="false"]):not(:hover) #nav-bar {
+        --uc-bm-height: 0px;
+      }
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") {
+  #navigator-toolbox {
+    position: relative;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) {
+    z-index: 2;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar {
+    z-index: -1;
+  }
+  #navigator-toolbox:not(:hover):not(:focus-within) {
+    animation: 1s keepfront;
+  }
+  @keyframes keepfront {
+    from {
+      z-index: 3;
+    }
+    to {
+      z-index: 3;
+    }
+  }
+  #sidebar-box:is(:hover, :focus-within) {
+    position: relative;
+    z-index: 2 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") {
+  #navigator-toolbox {
+    --uc-toolbar-hide-height: calc(-1 * var(--uc-toolbar-height, 0));
+    margin-bottom: var(--uc-toolbar-hide-height) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.animate") {
+  #navigator-toolbox {
+    will-change: margin-top, margin-bottom, background-color !important;
+    transition: margin-top 1s ease,
+      margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      background-color 0.2s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox:-moz-window-inactive {
+    transition: margin-top 1s ease,
+      margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      background-color 0.5s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) {
+    transition-delay: 0s, 0s, 0.2s !important;
+  }
+  #navigator-toolbox[inFullscreen="true"] {
+    transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+      margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      background-color 0.2s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox[inFullscreen="true"]:-moz-window-inactive {
+    transition: margin-top 1.3s var(--animation-easing-function) 50ms,
+      margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      background-color 0.5s var(--animation-easing-function) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.decoration.animate")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.decoration.animate")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.decoration.animate")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.decoration.animate")) {
+  #navigator-toolbox {
+    transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      background-color 0.2s var(--animation-easing-function) !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: var(--uc-tabbar-height);
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-bm-height));
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")) {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")) {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height) + var(--uc-bm-height));
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (not (-moz-bool-pref: "userChrome.autohide.navbar")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: var(--uc-bm-height);
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")) {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: var(--uc-navbar-height);
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (not (-moz-bool-pref: "userChrome.autohide.bookmarkbar")) {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: var(--uc-navbar-height);
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar"),
+  screen and (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.tabbar")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    --uc-toolbar-height: calc(var(--uc-navbar-height) + var(--uc-bm-height));
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  :root:not([customizing]) #titlebar,
+  :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+    margin-bottom: var(--uc-tabbar-hide-height);
+    will-change: margin-bottom;
+  }
+  #TabsToolbar:not([customizing]) {
+    will-change: opacity;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #TabsToolbar:not([customizing]),
+  #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+  #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+    margin-bottom: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+    opacity: 1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  :root:not([customizing]) #titlebar,
+  :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+    margin-bottom: var(--uc-tabbar-hide-height);
+    will-change: margin-bottom;
+  }
+  #TabsToolbar:not([customizing]) {
+    will-change: opacity;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #TabsToolbar:not([customizing]),
+  #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+    opacity: 0;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+    opacity: 0;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+  #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+    margin-bottom: 0px;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+    opacity: 1;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") {
+  :root:not([customizing]) #titlebar,
+  :root:not([customizing]) #navigator-toolbox > #TabsToolbar {
+    margin-bottom: var(--uc-tabbar-hide-height);
+    will-change: margin-bottom;
+  }
+  #TabsToolbar:not([customizing]) {
+    will-change: opacity;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #TabsToolbar:not([customizing]),
+  #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+    opacity: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") {
+  #navigator-toolbox:is(:hover, :focus-within) > #titlebar,
+  #navigator-toolbox:is(:hover, :focus-within) > #TabsToolbar {
+    margin-bottom: 0px;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) {
+  #titlebar:not([customizing]) {
+    transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      background-color 1s var(--animation-easing-function) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #TabsToolbar:not([customizing]),
+  #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+    transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+      var(--uc-autohide-toolbar-delay) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+    transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+      var(--uc-autohide-toolbar-delay) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) {
+  #navigator-toolbox:is(:hover, :focus-within) {
+    transition-delay: 0s !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) > #titlebar:not([customizing]) {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.on_bottom")) {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]),
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.tabbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") {
+  #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #nav-bar:not([customizing]) {
+    margin-bottom: var(--uc-navbar-hide-height);
+  }
+  #nav-bar:not([customizing]),
+  #nav-bar:not([customizing]) #urlbar {
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
+    margin-bottom: 0;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+    opacity: 1;
+  }
+  #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+    pointer-events: none;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px),
+  screen and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) {
+  #nav-bar:not([customizing]) {
+    margin-bottom: var(--uc-navbar-hide-height);
+  }
+  #nav-bar:not([customizing]),
+  #nav-bar:not([customizing]) #urlbar {
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) {
+    margin-bottom: 0;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+    opacity: 1;
+  }
+  #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+    pointer-events: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") {
+  #mainPopupSet:not(:hover) ~ #navigator-toolbox:not(:hover, :focus-within) #nav-bar:not([customizing]) {
+    -moz-window-dragging: no-drag;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) {
+  #nav-bar:not([customizing]) {
+    transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar"),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar"),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.autohide.fill_urlbar") {
+  #nav-bar:not([customizing]) {
+    transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) {
+  #nav-bar:not([customizing]) #urlbar {
+    transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+      var(--uc-autohide-toolbar-delay) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.tabbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.autohide.navbar") and (prefers-reduced-motion: no-preference),
+  (-moz-bool-pref: "userChrome.autohide.navbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (prefers-reduced-motion: no-preference) {
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]),
+  #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) #urlbar {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #PersonalToolbar:not([customizing]) {
+    margin-bottom: var(--uc-bm-hide-height);
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") and (not (-moz-bool-pref: "userChrome.autohide.toolbar_overlap.allow_layout_shift")) {
+  @supports not selector(:has(a)) {
+    #PersonalToolbar:not([customizing])[collapsed="true"] {
+      visibility: visible !important;
+      max-height: unset !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.bookmarkbar") {
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) {
+    margin-bottom: 0;
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.bookmarkbar") and (prefers-reduced-motion: no-preference) {
+  #PersonalToolbar:not([customizing]) {
+    transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      min-height 170ms ease-out, max-height 170ms ease-out, var(--ext-theme-background-transition) !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.infobar") {
+  #tab-notification-deck:not([customizing]) > .notificationbox-stack {
+    --infobar-height: calc(
+      25px + (var(--infobar-button-vertical-margin, 4px) * 2) + var(--infobar-message-vertical-margin, 8px)
+    );
+  }
+  #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
+    --infobar-message-margin: 0 4px calc(-1 * var(--infobar-height));
+    opacity: 0;
+    will-change: margin-bottom, opacity;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #tab-notification-deck:not([customizing])
+    > .notificationbox-stack[slot="selected"]
+    > notification-message {
+    --infobar-message-margin: 0 4px var(--infobar-message-vertical-margin, 8px);
+    opacity: 1;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.infobar") and (-moz-bool-pref: "userChrome.autohide.toolbar_overlap") {
+  #tab-notification-deck:not([customizing]) {
+    height: 0;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.infobar") and (prefers-reduced-motion: no-preference) {
+  #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
+    transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+  }
+  #navigator-toolbox:is(:hover, :focus-within)
+    #tab-notification-deck:not([customizing])
+    > .notificationbox-stack[slot="selected"]
+    > notification-message {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.sidebar") {
+  #sidebar-box {
+    min-width: var(--uc-sidebar-width) !important;
+    max-width: var(--uc-sidebar-width) !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.sidebar") and (-moz-bool-pref: "userChrome.sidebar.overlap") {
+  #sidebar-header,
+  #sidebar {
+    min-width: var(--uc-sidebar-width) !important;
+    max-width: var(--uc-sidebar-width) !important;
+    will-change: min-width, max-width;
+  }
+  #sidebar-box:is(:hover, :focus-within),
+  #sidebar-box:has(#sidebar-switcher-target.active) {
+    --uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
+  }
+  #sidebar-box:is(:hover, :focus-within) > #sidebar-header,
+  #sidebar-box:is(:hover, :focus-within) > #sidebar,
+  #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+  #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box {
+    --uc-sidebar-shadow-width: var(--uc-sidebar-fullscreen-width);
+    margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important;
+    padding-inline-start: var(--uc-sidebar-fullscreen-width);
+    will-change: padding-inline-start, opacity, box-shadow, visibility;
+  }
+  :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
+    --uc-sidebar-shadow-width: var(--uc-sidebar-activate-width);
+    padding-inline-start: var(--uc-sidebar-activate-width);
+  }
+  :root[inFullscreen="true"] #sidebar-box #sidebar-header,
+  :root[inFullscreen="true"] #sidebar-box #sidebar {
+    min-width: calc(var(--uc-sidebar-activate-width)) !important;
+    max-width: calc(var(--uc-sidebar-activate-width)) !important;
+    will-change: unset;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.sidebar") and (-moz-bool-pref: "userChrome.sidebar.overlap") and (prefers-reduced-motion: no-preference) {
+  #sidebar-header,
+  #sidebar {
+    transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
+      var(--uc-autohide-sidebar-delay) !important;
+  }
+  #sidebar-box:is(:hover, :focus-within),
+  #sidebar-box:has(#sidebar-switcher-target.active) {
+    transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function),
+      opacity var(--uc-autohide-sidebar-speed) ease-in-out,
+      box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed),
+      visibility 0s linear !important;
+  }
+  #sidebar-box:is(:hover, :focus-within) > #sidebar-header,
+  #sidebar-box:is(:hover, :focus-within) > #sidebar,
+  #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+  #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
+    transition-delay: 0ms !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box {
+    transition: padding-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function)
+        var(--uc-autohide-sidebar-delay),
+      opacity var(--uc-autohide-fullscreen-sidebar-speed) ease-in-out,
+      box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
+      visibility 0s linear !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+  :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
+    transition-delay: 0ms !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.sidebar") and (not (-moz-bool-pref: "userChrome.sidebar.overlap")) {
+  #sidebar-box {
+    --uc-sidebar-fullscreen-margin: calc(var(--uc-sidebar-fullscreen-width) + var(--uc-sidebar-activate-width-reverse));
+    overflow: hidden;
+    will-change: min-width, max-width;
+  }
+  #sidebar-box:is(:hover, :focus-within),
+  #sidebar-box:has(#sidebar-switcher-target.active) {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box:not([positionend]) {
+    margin-inline-start: var(--uc-sidebar-fullscreen-margin) !important;
+    will-change: margin-inline-start;
+  }
+  :root[inFullscreen="true"] #sidebar-box:not([positionend]):is(:hover, :focus-within) {
+    margin-inline-start: 0 !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box[positionend] {
+    margin-inline-end: var(--uc-sidebar-fullscreen-margin) !important;
+    will-change: margin-inline-end;
+  }
+  :root[inFullscreen="true"] #sidebar-box[positionend]:is(:hover, :focus-within) {
+    margin-inline-end: 0 !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.sidebar") and (not (-moz-bool-pref: "userChrome.sidebar.overlap")) and (prefers-reduced-motion: no-preference) {
+  #sidebar-box {
+    transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
+        var(--uc-autohide-sidebar-delay),
+      max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
+  }
+  #sidebar-box:is(:hover, :focus-within),
+  #sidebar-box:has(#sidebar-switcher-target.active) {
+    transition-delay: 0ms !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box {
+    transition: margin-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function)
+      var(--uc-autohide-sidebar-delay) !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box[positionend] {
+    transition-property: margin-inline-end !important;
+  }
+  :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+  :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
+    transition-delay: 0ms !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.fill_urlbar") {
+  #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+    order: -1;
+    -moz-box-ordinal-group: 0;
+    min-width: calc(
+      var(--uc-navbar-width, 100vw) -
+        (2 * var(--urlbar-margin-inline) + var(--uc-window-drag-space-pre, 0px) + var(--uc-navbar-gap, 0px))
+    ) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.fill_urlbar") and (-moz-bool-pref: "userChrome.tabbar.one_liner") {
+  #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+    --uc-tabbar-width: calc(100vw - var(--uc-navbar-width-origin));
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.fill_urlbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) {
+  #nav-bar {
+    transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+  }
+  #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+    transition-delay: 0s !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.fill_urlbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) {
+  #nav-bar {
+    transition: margin-inline var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+        var(--uc-autohide-toolbar-delay),
+      var(--ext-theme-background-transition) !important;
+  }
+  #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) {
+    transition-delay: 0s !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.autohide.fill_urlbar") and (prefers-reduced-motion: no-preference) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) {
+  #urlbar-container {
+    transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+      var(--uc-autohide-toolbar-delay);
+  }
+  #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+    transition-delay: 0s !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.autohide.fill_urlbar") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) {
+  #urlbar-container {
+    transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
+      var(--uc-autohide-toolbar-delay);
+  }
+  #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+    transition-delay: 0s !important;
+  }
+}
+/** Hidden ********************************************************************/
+@media (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #TabsToolbar {
+    display: none !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.navbar") {
+  #nav-bar {
+    visibility: collapse; /* display: none is not work */
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.tabbar") {
+  #TabsToolbar {
+    display: none !important;
+  }
+}
+@media screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (max-width: 1100px) and (-moz-bool-pref: "userChrome.hidden.navbar") {
+  #nav-bar {
+    visibility: collapse; /* display: none is not work */
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.tab_icon") and (not (-moz-bool-pref: "userChrome.hidden.tab_icon.always")) {
+  .tabbrowser-tab:not([pinned="true"]) .tab-icon-image {
+    display: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.tab_icon") and (-moz-bool-pref: "userChrome.hidden.tab_icon.always") {
+  .tabbrowser-tab:not([pinned="true"]) .tab-icon-stack {
+    display: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.private_indicator") {
+  .private-browsing-indicator,
+  #private-browsing-indicator-with-label {
+    display: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.titlebar_container") {
+  .titlebar-buttonbox-container {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.sidebar_header") and (not (-moz-bool-pref: "userChrome.hidden.sidebar_header.vertical_tab_only")) {
+  #sidebar-header {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.sidebar_header") and (-moz-bool-pref: "userChrome.hidden.sidebar_header.vertical_tab_only") {
+  #sidebar-box:is(
+      [sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"],
+      [sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"],
+      [sidebarcommand="sidebartabs_asamuzak_jp-sidebar-action"]
+    )
+    #sidebar-header {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox") and (not (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox.label_only")) {
+  #identity-box[pageproxystate="valid"].notSecureText #identity-icon-label,
+  #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box,
+  #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box {
+    display: none;
+  }
+  #identity-box[pageproxystate="valid"].notSecureText #identity-icon-box {
+    padding-inline-end: 5px; /* Original: 8px */
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox") and (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox.label_only") {
+  #identity-box[pageproxystate="valid"].notSecureText,
+  #identity-box[pageproxystate="valid"].chromeUI,
+  #identity-box[pageproxystate="valid"].extensionPage {
+    margin-inline-end: var(--identity-box-margin-inline) !important;
+  }
+  #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box:not(:hover),
+  #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box:not(:hover) {
+    background-color: transparent !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox") and (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox.label_only") and (not (-moz-bool-pref: "userChrome.urlbar.iconbox_with_separator")) {
+  #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box,
+  #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box {
+    padding-inline: var(--urlbar-icon-padding) !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox") and (-moz-bool-pref: "userChrome.hidden.urlbar_iconbox.label_only") {
+  #identity-box[pageproxystate="valid"] #identity-icon-label {
+    display: none !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.bookmarkbar_icon") {
+  #PlacesToolbarItems .bookmark-item > .toolbarbutton-icon {
+    display: none;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.bookmarkbar_label") {
+  #PlacesToolbarItems .bookmark-item > .toolbarbutton-text {
+    visibility: collapse; /* display: none is not work */
+  }
+}
+
+@media (-moz-bool-pref: "userChrome.hidden.disabled_menu") {
+  menu[disabled="true"],
+  menuitem:not(#context-back, #context-forward)[disabled="true"] {
+    visibility: collapse !important;
+  }
+}
+@media (-moz-bool-pref: "userChrome.hidden.disabled_menu") and (-moz-bool-pref: "widget.macos.native-context-menus"),
+  (-moz-bool-pref: "userChrome.hidden.disabled_menu") and (-moz-bool-pref: "widget.gtk.native-context-menus") {
+  #context-back[disabled="true"],
+  #context-forward[disabled="true"] {
+    visibility: collapse !important;
+  }
+}
+/** Icons *********************************************************************/
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  /** Icons - List **************************************************************/
+  :root {
+    --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    --uc-tab-icon: url("chrome://browser/skin/lepton/tab.svg");
+    --uc-tab-copy-icon: url("chrome://browser/skin/lepton/tab-copy.svg");
+    --uc-tab-unload-icon: url("chrome://browser/skin/lepton/tab-unload.svg");
+    --uc-tab-multiple-icon: url("chrome://browser/skin/lepton/tab-desktop-multiple.svg");
+    --uc-tab-close-icon: url("chrome://browser/skin/lepton/close-tab.svg");
+    --uc-tab-close-duplicate-icon: url("chrome://browser/skin/lepton/close-duplicate-tabs.svg");
+    --uc-new-tab-icon: url("chrome://browser/skin/lepton/new-tab.svg");
+    --uc-new-tab-forward-icon: url("chrome://browser/skin/lepton/new-tab-forward.svg");
+    --uc-new-tab-skip-forward-icon: url("chrome://browser/skin/lepton/new-tab-skip-forward.svg");
+    --uc-new-tab-multiple-icon: url("chrome://browser/skin/lepton/new-tab-multiple.svg");
+    --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
+    --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
+  }
+  /** Library - Icons Replace ***************************************************/
+  /** Panel - Icons *************************************************************/
+  /** Menu - Icons Layout *******************************************************/
+  /** Icons - 1.25px Stroke Width ***********************************************/
+  /** Icons for fork browsers ***************************************************/
+  /*= Waterfox =================================================================*/
+  /*= Tor Browser ==============================================================*/
+  /*= Floorp Browser ===========================================================*/
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") {
+  :root {
+    --uc-folder-icon: url("chrome://browser/skin/lepton/folder.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  :root {
+    --uc-tab-icon: url("chrome://browser/skin/lepton/tab-photon.svg");
+    --uc-tab-copy-icon: url("chrome://browser/skin/lepton/tab-copy-photon.svg");
+    --uc-tab-unload-icon: url("chrome://browser/skin/lepton/tab-unload-photon.svg");
+    --uc-tab-multiple-icon: url("chrome://browser/skin/lepton/tab-multiple.svg");
+    --uc-tab-close-icon: url("chrome://browser/skin/lepton/close-tab-photon.svg");
+    --uc-tab-close-duplicate-icon: url("chrome://browser/skin/lepton/close-duplicate-tabs-photon.svg");
+    --uc-new-tab-icon: url("chrome://browser/skin/lepton/new-tab-photon.svg");
+    --uc-new-tab-forward-icon: url("chrome://browser/skin/lepton/new-tab-forward-photon.svg");
+    --uc-new-tab-skip-forward-icon: url("chrome://browser/skin/lepton/new-tab-skip-forward-photon.svg");
+  }
+}
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  @supports selector(:has(a)) {
+    :root:has(#sidebar-box[positionend]) {
+      --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg");
+      --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg");
+    }
+  }
+}
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  #TabsToolbar #new-tab-button {
+    --uc-new-tab-icon: url(chrome://global/skin/icons/plus.svg);
+  }
+}
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+  #urlbar-engine-one-off-item-tabs {
+    list-style-image: var(--uc-tab-icon) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") {
+  /*= Standard Folder - More Visible ===========================================*/
+  /* on Toolbar and Menus */
+  :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+    .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]),
+  :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(title, container),
+  #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]),
+  #editBMPanel_folderMenuList .folder-icon:not([id]),
+  .downloadIconShow > .button-box > .button-icon {
+    list-style-image: var(--uc-folder-icon) !important;
+  }
+  /* Standard Folder - Open */
+  :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+    .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"],
+  :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(title, container, open) {
+    list-style-image: url("chrome://browser/skin/lepton/folder-open.svg") !important;
+  }
+  /*= Other Folder - Inbox Icon ================================================*/
+  /* on Menus */
+  #PlacesToolbar #OtherBookmarks,
+  #BMB_bookmarksPopup #BMB_unsortedBookmarks,
+  #bookmarksMenuPopup #menu_unsortedBookmarks,
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks),
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, queryFolder_unfiled_____),
+  #editBMPanel_unfiledRootItem,
+  #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] {
+    list-style-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg") !important;
+  }
+  /* Other Folder - Open */
+  #PlacesToolbar #OtherBookmarks[open="true"],
+  #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"],
+  #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"],
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks),
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) {
+    list-style-image: url("chrome://browser/skin/lepton/mail-inbox.svg") !important;
+  }
+  /*= Default Icon - Override ===================================================*/
+  /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */
+  /* Query */
+  :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) {
+    list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important;
+  }
+  /* History */
+  :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer),
+  :-moz-any(#historyTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
+    list-style-image: url("chrome://browser/skin/history.svg") !important;
+  }
+  /* Downloads */
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
+    list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important;
+  }
+  /* Tag */
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+  .bookmark-item[query][tagContainer] {
+    list-style-image: url("chrome://browser/skin/lepton/tag.svg") !important;
+  }
+  /* Bookmark */
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
+    list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
+  }
+  /* Bookmark Toolbar */
+  #BMB_bookmarksPopup #BMB_bookmarksToolbar,
+  #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+  #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+  #editBMPanel_toolbarFolderItem,
+  #bookmarksToolbarFolderMenu,
+  #BMB_bookmarksToolbar,
+  #panelMenu_bookmarksToolbar,
+  #bookmarks-toolbar-button,
+  #bookmarks-toolbar-placeholder {
+    list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg") !important;
+  }
+  /* Bookmark Menu */
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, queryFolder_menu________) {
+    list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important;
+  }
+  /*= Default Icon - Open ======================================================*/
+  /* Query */
+  :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+    .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"]
+    > .menu-iconic-left
+    > .menu-iconic-icon {
+    transform: rotate(15deg) !important;
+  }
+  /* History */
+  :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer),
+  :-moz-any(#historyTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) {
+    list-style-image: url("chrome://browser/skin/lepton/history-reverse.svg") !important;
+  }
+  /* Tag */
+  :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+    .bookmark-item[container="true"][tagContainer="true"][open="true"],
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer),
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) {
+    list-style-image: url("chrome://browser/skin/lepton/tag-open.svg") !important;
+  }
+  /* Bookmark */
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
+    list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
+  }
+  /* Bookmark Toolbar */
+  #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"],
+  #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
+    list-style-image: url("chrome://browser/skin/lepton/bookmarksToolbar-open-alt.svg") !important;
+  }
+  /* Bookmark Menu */
+  :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+    treechildren::-moz-tree-image(container, open, queryFolder_menu________) {
+    list-style-image: url("chrome://browser/skin/lepton/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */
+  }
+  @-moz-document url("chrome://browser/content/places/places.xhtml")
+  {
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") and (-moz-gtk-csd-available) {
+      /*= Menubar - Icons ==========================================================*/
+      #organizeButton,
+      #viewMenu,
+      #maintenanceButton,
+      #back-button,
+      #forward-button,
+      #clearDownloadsButton {
+        fill: currentColor !important;
+        -moz-context-properties: fill, fill-opacity, stroke !important;
+      }
+      /* Add */
+      #organizeButton {
+        list-style-image: url("chrome://global/skin/icons/settings.svg") !important;
+      }
+      #viewMenu {
+        list-style-image: url("chrome://browser/skin/lepton/sort.svg") !important;
+      }
+      #maintenanceButton {
+        list-style-image: url("chrome://browser/skin/lepton/import-export.svg") !important;
+      }
+      #clearDownloadsButton {
+        list-style-image: url("chrome://global/skin/icons/delete.svg") !important;
+      }
+      #clearDownloadsButton > .toolbarbutton-icon {
+        display: inline-flex !important;
+        display: -moz-inline-box !important;
+        margin-top: 0;
+        margin-bottom: 0;
+        margin-inline-start: 0;
+        margin-inline-end: 2px;
+      }
+      /* Replace */
+      #back-button {
+        list-style-image: url("chrome://browser/skin/back.svg") !important;
+      }
+      #forward-button {
+        list-style-image: url("chrome://browser/skin/forward.svg") !important;
+      }
+      #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+      #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+        transform: scaleX(-1) !important;
+      }
+    }
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  /*= Padding ==================================================================*/
+  :root {
+    --arrowpanel-menuicon-padding: 8px;
+    --arrowpanel-menublank-padding: calc(
+      var(--arrowpanel-menuicon-padding) * 2 + var(--arrowpanel-menuitem-padding-inline)
+    ) !important;
+    --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important;
+    --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important;
+  }
+  .subviewbutton > .toolbarbutton-icon {
+    width: 16px;
+  }
+  /* Icons Color */
+  /*= Panel - Main =============================================================*/
+  /*= Panel - Account ==========================================================*/
+  /* Default */
+  /* Change Separator */
+  /*= Panel - Bookmark =========================================================*/
+  /*= Panel - History ==========================================================*/
+  /*= Panel - More tools =======================================================*/
+  /* Web Developer Tools */
+  /* Task Manager */
+  /* Remote Debugging - Edge bug.svg */
+  /* Browser Toolbox - Edge webdeveloper.svg */
+  /* Browser Content Toolbox */
+  /* Browser Console */
+  /* Responsive Design Mode */
+  /* Eyedropper */
+  /* Page Source - Edge file-search.svg */
+  /* Extensions for Devel */
+  /*= Panel - Help =============================================================*/
+  /*= Panel - Library ==========================================================*/
+  /*= Panel - Downloads ========================================================*/
+  /*= Toolbar - Overflow Menu ==================================================*/
+  /*= Tabbar - All Tab Menu ====================================================*/
+  /*= BMB_bookmarksPopup =======================================================*/
+  /* BMB_bookmarksToolbarPopup */
+  /*= protections-popup ========================================================*/
+  /*= identity-popup ===========================================================*/
+  /*= sidebarMenu-popup ========================================================*/
+  /*= sidebar-context-menu =====================================================*/
+  /*= chrome://browser/content/syncedtabs/sidebar.xhtml ========================*/
+  /*= unified-extensions-view ===================================================*/
+  /*= Compatibility ============================================================*/
+  /*= Tab Mix Plus =============================================================*/
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (not (-moz-bool-pref: "userChrome.icon.panel_full")) {
+  :root {
+    /* Global */
+    --arrowpanel-menuicon-paddingx2: calc(var(--arrowpanel-menuicon-padding) * 2);
+    /* General Panel */
+    --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-paddingx2) + 8px) !important;
+    --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important;
+    /* Blank Menu Left Padding */
+    --arrowpanel-menuimageblank-padding-horizontal: calc(
+      var(--arrowpanel-menuicon-paddingx2) + var(--arrowpanel-menuitem-padding-inline)
+    );
+    --arrowpanel-menuitemblank-padding: calc(var(--arrowpanel-menuitem-padding-block) + 1px);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #downloadsHistory .button-text,
+  .subviewbutton > .toolbarbutton-text {
+    padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .toolbaritem-combined-buttons:not(.unified-extensions-item)
+    > .subviewbutton:not(.subviewbutton-iconic)
+    > .toolbarbutton-text {
+    padding-inline-start: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenu_bookmarksMenu .subviewbutton[disabled="true"],
+  #appMenu_historyMenu .subviewbutton[disabled="true"] {
+    margin-inline-start: 0 !important;
+    padding-inline-start: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text,
+  #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text {
+    padding-inline-start: var(--arrowpanel-menublank-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-proton-update-banner .toolbarbutton-text {
+    margin-inline-start: 0 !important;
+    padding-inline-start: 0 !important; /* FF v107 */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-multiView .subviewbutton::before,
+  #appMenu-proton-update-banner::before {
+    display: inline-flex;
+    display: -moz-inline-box;
+    margin-inline-end: var(--arrowpanel-menuicon-padding);
+    width: 16px;
+    height: 16px;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-proton-update-banner {
+    margin-bottom: 2px !important;
+    padding-inline-start: var(--arrowpanel-menuitem-padding-inline) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-fxa-status2,
+  #appMenu-zoom-controls2,
+  #appMenu-zoom-controls {
+    align-items: center;
+    padding-top: var(--arrowpanel-menuimageblank-padding-block) !important;
+    padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-zoom-controls2::before,
+  #appMenu-zoom-controls::before {
+    margin-inline-end: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-zoomReduce-button2,
+  #appMenu-zoomReset-button2,
+  #appMenu-zoomEnlarge-button2,
+  #appMenu-fullscreen-button2 {
+    --arrowpanel-menuitem-padding-block: 0px;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .subviewbutton[type="checkbox"]:not([checked="true"], #allTabsMenu_sortTabsButton) > .toolbarbutton-text {
+    margin-left: 16px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-multiView .subviewbutton::before,
+  #appMenu-proton-update-banner::before,
+  #downloadsHistory .button-icon,
+  .subviewbutton:not(#appMenu-proton-update-banner) > image {
+    fill: currentColor !important;
+    fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important;
+    -moz-context-properties: fill, fill-opacity, stroke !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-zoomReduce-button2 > .toolbarbutton-icon,
+  #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon {
+    stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon,
+  #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon {
+    stroke: var(--button-hover-bgcolor) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .subviewbutton[disabled="true"] > image {
+    /* Ghost icons when disabled */
+    opacity: 0.4;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+    margin-inline-start: var(--arrowpanel-menuicon-padding);
+    order: -1 !important;
+    -moz-box-ordinal-group: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon {
+    display: inline-flex !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-update-banner::before,
+  #appMenu-proton-update-banner::before {
+    content: url("chrome://browser/skin/lepton/whatsnew.svg");
+    margin-inline-end: 0px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-fxa-status2::before {
+    /* Don't exist img tag */
+    content: url("chrome://browser/skin/fxa/avatar-empty.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"])::before {
+    display: none;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"])
+    #appMenu-fxa-label2::before {
+    /* url("https://profile.accounts.firefox.com/v1/avatar/a") */
+    content: "";
+    border-radius: 50% !important;
+    background-size: 16px !important;
+    background-image: var(--avatar-image-url) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-profiles-button > image,
+  #appMenu-empty-profiles-button > image {
+    fill: transparent !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-empty-profiles-button,
+  #PanelUI-fxa-menu-empty-profiles-button {
+    list-style-image: url("chrome://browser/content/profiles/assets/16_heart.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #profiles-manage-profiles-button {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #new-tab-button {
+    list-style-image: var(--uc-new-tab-icon) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
+  #appMenu-new-tab-button2 {
+    list-style-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
+  #appMenu-save-file-button2,
+  #appMenu-find-button2,
+  #appMenu-more-button2 {
+    padding-top: var(--arrowpanel-menuitemblank-padding) !important;
+    padding-bottom: var(--arrowpanel-menuitemblank-padding) !important;
+  }
+  #appMenu-zoom-controls2,
+  #appMenu-zoom-controls {
+    padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (not (-moz-bool-pref: "userChrome.icon.panel_photon")) and (not (-moz-bool-pref: "userChrome.icon.panel_full")) {
+  #appMenu-new-tab-button2,
+  #appMenu-passwords-button,
+  #appMenu-extensions-themes-button,
+  #appMenu-save-file-button2,
+  #appMenu-find-button2,
+  #appMenu-more-button2,
+  #appMenu-help-button2,
+  #appMenu-quit-button2 {
+    padding-top: var(--arrowpanel-menuitemblank-padding-block) !important;
+    padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important;
+  }
+  #appMenu-zoom-controls2,
+  #appMenu-zoom-controls {
+    padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-new-window-button2 {
+    list-style-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-new-private-window-button2 {
+    list-style-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-bookmarks-button {
+    list-style-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-history-button {
+    list-style-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-downloads-button {
+    list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
+  #appMenu-passwords-button {
+    list-style-image: url("chrome://browser/skin/login.svg");
+  }
+  #appMenu-extensions-themes-button {
+    list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-print-button2 {
+    list-style-image: url("chrome://global/skin/icons/print.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full") {
+  #appMenu-save-file-button2 {
+    list-style-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+  #appMenu-find-button2 {
+    list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+  #appMenu-translate-button {
+    list-style-image: url("chrome://browser/skin/lepton/translations.svg");
+  }
+  #appMenu-zoom-controls2::before,
+  #appMenu-zoom-controls::before {
+    content: url("chrome://browser/skin/lepton/screenshot.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #save-page-button {
+    list-style-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #open-file-button {
+    list-style-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #cut-button {
+    list-style-image: url("chrome://browser/skin/lepton/edit-cut.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #copy-button {
+    list-style-image: url("chrome://browser/skin/lepton/edit-copy.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #paste-button {
+    list-style-image: url("chrome://browser/skin/lepton/edit-paste.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #characterencoding-button {
+    list-style-image: url("chrome://browser/skin/lepton/characterEncoding.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #screenshot-button {
+    list-style-image: url("chrome://browser/skin/lepton/screenshot-1.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #email-link-button {
+    list-style-image: url("chrome://browser/skin/lepton/mail.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panic-button {
+    list-style-image: url("chrome://browser/skin/lepton/forget.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #profiler-button-button > .toolbarbutton-icon {
+    list-style-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #developer-button {
+    list-style-image: url("chrome://browser/skin/lepton/wrench-filled.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-settings-button {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full") {
+  #appMenu-more-button2 {
+    list-style-image: url("chrome://browser/skin/lepton/ion.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
+  #appMenu-help-button2 {
+    list-style-image: url("chrome://global/skin/icons/help.svg");
+  }
+  #appMenu-quit-button2 {
+    list-style-image: url("chrome://browser/skin/lepton/quit.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-connect-device-button .toolbarbutton-icon,
+  #PanelUI-fxa-menu-account-signout-button .toolbarbutton-icon {
+    width: 16px !important;
+    height: 16px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #fxa-manage-account-button::before {
+    content: "";
+    display: inline-flex;
+    display: -moz-inline-box;
+    width: 32px !important;
+    height: 32px !important;
+    border-radius: 50%;
+    background-size: 32px;
+    background-image: var(--avatar-image-url);
+    margin-inline-end: var(--arrowpanel-menuicon-padding);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.account_image_to_right") {
+  #fxa-manage-account-button::before {
+    order: 2 !important;
+    -moz-box-ordinal-group: 2 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.account_label_to_right") {
+  #fxa-menu-header-title,
+  #fxa-menu-header-description {
+    text-align: right;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .syncNowBtn {
+    visibility: visible !important;
+    order: -1 !important;
+    -moz-box-ordinal-group: 0 !important;
+    margin-inline-end: var(--arrowpanel-menuicon-padding);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-setup-sync-button {
+    list-style-image: url("chrome://browser/skin/sync.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (prefers-reduced-motion: reduce) {
+  #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon,
+  #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon,
+  .syncNowBtn[syncstatus="active"] {
+    list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-connect-device-button {
+    list-style-image: url("chrome://browser/skin/lepton/add-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-sendtab-button {
+    list-style-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-sync-prefs-button {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu-account-signout-button {
+    list-style-image: url("chrome://browser/skin/lepton/sign-out.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-remotetabs-view-managedevices::before {
+    /* Box */
+    content: "";
+    padding-inline-end: 16px;
+    padding-block: 1px;
+    margin-inline-end: var(--arrowpanel-menuicon-padding);
+    /* Color */
+    fill: currentColor;
+    fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+    -moz-context-properties: fill, fill-opacity, stroke;
+    background-size: 16px;
+    background-repeat: no-repeat;
+    background-position: left center;
+    background-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .PanelUI-remotetabs-notabsforclient-label {
+    margin-inline-start: calc(
+      var(--arrowpanel-menuicon-padding) + var(--arrowpanel-menuitem-padding-inline)
+    ) !important;
+    padding-inline-start: var(--arrowpanel-menublank-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu::before {
+    content: "";
+    display: flex;
+    display: -moz-box;
+    border-bottom: 1px solid var(--panel-separator-color);
+    margin: var(--panel-separator-margin);
+    padding: 0;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator {
+    display: none;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-fxa-menu > :first-child,
+  #fxa-manage-account-button {
+    order: -1;
+    -moz-box-ordinal-group: 0;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-sign-out-separator {
+    display: none;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""],
+  .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""] {
+    list-style-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]),
+  .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]) {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .sendToDevice-device[clientType="phone"] {
+    list-style-image: url("chrome://browser/skin/lepton/device-phone.svg") !important;
+  }
+  .sendToDevice-device[clientType="tablet"] {
+    list-style-image: url("chrome://browser/skin/lepton/device-tablet.svg") !important;
+  }
+  .sendToDevice-device[clientType="desktop"] {
+    list-style-image: url("chrome://browser/skin/lepton/device-desktop.svg") !important;
+  }
+  .sendToDevice-device[clientType="tv"] {
+    list-style-image: url("chrome://browser/skin/lepton/device-tv.svg") !important;
+  }
+  .sendToDevice-device[clientType="vr"] {
+    list-style-image: url("chrome://browser/skin/lepton/device-vr.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenuBookmarkThisPage {
+    list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  panelMenuBookmarkThisPage[starred] {
+    list-style-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenu_searchBookmarks {
+    list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenu_viewBookmarksToolbar {
+    list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panelMenu_showAllBookmarks {
+    list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuRecentlyClosedTabs {
+    list-style-image: var(--uc-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuRecentlyClosedWindows {
+    list-style-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuSearchHistory {
+    list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuRestoreSession,
+  #appMenu-restoreSession {
+    list-style-image: url("chrome://browser/skin/lepton/restore-session.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuClearRecentHistory {
+    list-style-image: url("chrome://browser/skin/lepton/forget.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #PanelUI-historyMore {
+    list-style-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-library-recentlyClosedTabs {
+    list-style-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-library-recentlyClosedWindows {
+    list-style-image: url("chrome://browser/skin/lepton/restore-session.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-moreTools-button {
+    list-style-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-child(1),
+  #PanelUI-developer-tools-view .subviewbutton:nth-child(1) {
+    list-style-image: url("chrome://browser/skin/lepton/developer.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-child(2),
+  #PanelUI-developer-tools-view .subviewbutton:nth-child(2) {
+    list-style-image: url("chrome://browser/skin/lepton/performance.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-child(3),
+  #PanelUI-developer-tools-view .subviewbutton:nth-child(3) {
+    list-style-image: url("chrome://browser/skin/lepton/bug.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-child(4),
+  #PanelUI-developer-tools-view .subviewbutton:nth-child(4) {
+    list-style-image: url("chrome://browser/skin/lepton/window-dev-tools.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-child(5),
+  #PanelUI-developer-tools-view .subviewbutton:nth-child(5) {
+    list-style-image: url("chrome://browser/skin/lepton/command-frames.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-last-child(5),
+  #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) {
+    list-style-image: url("chrome://browser/skin/lepton/command-console.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-last-child(4),
+  #PanelUI-developer-tools-view .subviewbutton:nth-last-child(4) {
+    list-style-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-last-child(3),
+  #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) {
+    list-style-image: url("chrome://browser/skin/lepton/command-eyedropper.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-last-child(2),
+  #PanelUI-developer-tools-view .subviewbutton:nth-last-child(2) {
+    list-style-image: url("chrome://browser/skin/lepton/document-search.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:nth-last-child(1),
+  #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) {
+    list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appmenu-developer-tools-view .subviewbutton:last-child {
+    margin-bottom: 6px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_menu_openHelp {
+    list-style-image: url("chrome://global/skin/icons/help.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_feedbackPage {
+    list-style-image: url("chrome://browser/skin/lepton/send.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_helpSafeMode {
+    list-style-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_troubleShooting {
+    list-style-image: url("chrome://global/skin/icons/more.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-report-broken-site-button,
+  #appMenu_help_reportSiteIssue {
+    list-style-image: url("chrome://global/skin/icons/lightbulb.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_menu_HelpPopup_reportPhishingtoolmenu {
+    list-style-image: url("chrome://global/skin/icons/warning.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_helpSwitchDevice {
+    list-style-image: url("chrome://browser/skin/lepton/add-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu_aboutName {
+    list-style-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-library-bookmarks-button {
+    list-style-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-library-history-button {
+    list-style-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-library-downloads-button {
+    list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #downloadsHistory {
+    list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #downloadsHistory .box-inherit.button-box {
+    display: inline-flex !important;
+    display: -moz-inline-box !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #overflowMenu-customize-button {
+    list-style-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-undoCloseTab {
+    list-style-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-searchTabs {
+    list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-syncedTabs {
+    list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-closeDuplicateTabs {
+    list-style-image: var(--uc-tab-close-duplicate-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-containerTabsButton {
+    list-style-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-hiddenTabsButton {
+    list-style-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu-containerTabsView .subviewbutton:last-child {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #BMB_viewBookmarksSidebar {
+    --menuitem-image: var(--uc-sidebar-icon);
+  }
+  #BMB_viewBookmarksSidebar[data-l10n-args='{"isVisible":true}'] {
+    --menuitem-image: url("chrome://global/skin/icons/close.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #BMB_searchBookmarks {
+    --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #BMB_bookmarksShowAllTop,
+  #BMB_bookmarksShowAll {
+    --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #BMB_bookmarksToolbar {
+    --menuitem-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #BMB_bookmarksShowAllTop {
+    list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important;
+  }
+  #BMB_bookmarksShowAllTop > .menu-iconic-left {
+    display: flex !important;
+    display: -moz-box !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":true}'] {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+  #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":false}'] {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #protections-popup-settings-button > .protections-popup-settings-icon,
+  #protections-popup-show-report-button > .protections-popup-show-report-icon {
+    -moz-context-properties: fill, fill-opacity, stroke;
+    fill: currentColor;
+    margin-inline-end: 1em;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #protections-popup-report-broken-site-button {
+    list-style-image: url("chrome://global/skin/icons/lightbulb.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #protections-popup-settings-button > .protections-popup-settings-icon,
+  #protections-popup-multiView .panel-subview-footer-button {
+    list-style-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #protections-popup-show-report-button > .protections-popup-show-report-icon {
+    /* chrome://browser/skin/controlcenter/dashboard.svg */
+    list-style-image: url("chrome://browser/skin/lepton/dashboard.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #identity-popup-clear-sitedata-button,
+  #identity-popup-more-info {
+    padding-inline: 5px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #identity-popup-securityView-body {
+    margin-inline-start: 32px !important; /* Original: 10px */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #identity-popup-clear-sitedata-button {
+    list-style-image: url("chrome://browser/skin/lepton/broom.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #identity-popup-more-info.subviewbutton {
+    list-style-image: url("chrome://global/skin/icons/info.svg");
+  }
+  #identity-popup-more-info:is(menuitem) {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-switcher-bookmarks.subviewbutton {
+    list-style-image: url("chrome://browser/skin/bookmark.svg");
+  }
+  #sidebar-switcher-bookmarks:is(menuitem) {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-switcher-history.subviewbutton {
+    list-style-image: url("chrome://browser/skin/history.svg");
+  }
+  #sidebar-switcher-history:is(menuitem) {
+    --menuitem-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-switcher-tabs.subviewbutton {
+    list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+  }
+  #sidebar-switcher-tabs:is(menuitem) {
+    --menuitem-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-switcher-genai-chat.subviewbutton {
+    list-style-image: url("chrome://mozapps/skin/extensions/category-discover.svg");
+  }
+  #sidebar-switcher-genai-chat:is(menuitem) {
+    --menuitem-image: url("chrome://mozapps/skin/extensions/category-discover.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-reverse-position.subviewbutton {
+    list-style-image: var(--uc-sidebar-icon-reverse);
+  }
+  #sidebar-reverse-position:is(menuitem) {
+    --menuitem-image: var(--uc-sidebar-icon-reverse);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebarMenu-popup > *.subviewbutton[data-l10n-id="sidebar-menu-close"] {
+    list-style-image: url("chrome://global/skin/icons/close.svg");
+  }
+  #sidebarMenu-popup > *:is(menuitem)[data-l10n-id="sidebar-menu-close"] {
+    --menuitem-image: url("chrome://global/skin/icons/close.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-manage-extension {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-remove-extension {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-report-extension {
+    --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-unpin-extension {
+    --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-hide-sidebar {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-customize-sidebar {
+    --menuitem-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #sidebar-context-menu-enable-vertical-tabs {
+    --menuitem-image: url("chrome://browser/skin/sidebar-collapsed.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .item.client[clientType="phone"] > .item-title-container > .item-icon-container {
+    background-image: url("chrome://browser/skin/lepton/device-phone.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .item.client[clientType="tablet"] > .item-title-container > .item-icon-container {
+    background-image: url("chrome://browser/skin/lepton/device-tablet.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .item.client[clientType="desktop"] > .item-title-container > .item-icon-container {
+    background-image: url("chrome://browser/skin/lepton/device-desktop.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .item.client[clientType="tv"] > .item-title-container > .item-icon-container {
+    background-image: url("chrome://browser/skin/lepton/device-tv.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .item.client[clientType="vr"] > .item-title-container > .item-icon-container {
+    background-image: url("chrome://browser/skin/lepton/device-vr.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #unified-extensions-manage-extensions {
+    list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  .sync-engine-tabs .checkbox-icon,
+  .sync-engine-tabs.sync-engine-image,
+  #sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
+  #sync-button {
+    list-style-image: url("chrome://browser/skin/lepton/synced-tabs.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #allTabsMenu_sortTabsButton {
+    list-style-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+  menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+  menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+  menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+  menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+  menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+  #main-menubar > menu {
+    -moz-appearance: none !important; /* Linux: menulist */
+  }
+  /* Icon */
+  #main-menubar > menu,
+  :not(menu, #ContentSelectDropdown)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+  .openintabs-menuitem,
+  #blockedPopupDontShowMessage,
+  #BMB_viewBookmarksToolbar,
+  #sidebarMenu-popup:is(menupopup),
+  #context_openANewTab.tabmix-newtab-menu-icon {
+    /* Color */
+    -moz-context-properties: fill, fill-opacity, stroke !important;
+    fill: currentColor !important;
+    stroke: currentColor;
+    /* Layout */
+    background-size: 16px !important;
+    background-repeat: no-repeat !important;
+    background-image: var(--menuitem-image);
+  }
+  #tabContextMenu > .tabmix-newtab-menu-icon {
+    -moz-context-properties: fill, fill-opacity, stroke !important;
+    fill: currentColor !important;
+  }
+  /* For native context menus */
+  /* Padding */
+  /* Menubar */
+  /* Padding - Non Native */
+  /* Padding - Windows */
+  /* Padding - Linux */
+  /* Padding - Mac */
+  /*= Bookmark Menu - Layout ===================================================*/
+  /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
+     * #BMB_bookmarksPopup: looks like arrow panel
+     */
+  /* Empty Menu */
+  /* Bookmark Popup - As Arrow Panel */
+  /* Windows */
+  /* Windows 7, 8 */
+  /* Linux */
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "widget.macos.native-context-menus"),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "widget.gtk.native-context-menus") {
+  :not(menu, #ContentSelectDropdown)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+    list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  :root {
+    --uc-menu-background-position: left;
+    --context-menu-background-padding-default: 5px;
+    --context-menu-background-padding: var(--context-menu-background-padding-default);
+  }
+  :root:-moz-locale-dir(rtl) {
+    --uc-menu-background-position: right;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic),
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu:not(.menu-iconic),
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+  .openintabs-menuitem,
+  #blockedPopupDontShowMessage,
+  #BMB_viewBookmarksToolbar,
+  #sidebarMenu-popup:is(menupopup),
+  #context_openANewTab.tabmix-newtab-menu-icon {
+    background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
+    padding-inline-start: var(--context-menu-background-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  #sidebarMenu-popup:is(menupopup):not(panel) {
+    --context-menu-background-padding: var(--context-menu-background-padding-default);
+    padding-inline-start: 0 !important;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > #sidebarMenu-popup:is(menupopup):not(panel)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+    padding-inline-start: 28px !important;
+    margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") {
+  #main-menubar > menu {
+    background-position: var(--uc-menu-background-position) var(--context-menu-background-padding-default) center !important;
+    padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
+    padding-inline-end: 3px;
+  }
+  #main-menubar > menu:first-child {
+    background-position: var(--uc-menu-background-position) calc(3px + var(--context-menu-background-padding-default))
+      center !important;
+    padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important;
+  }
+  #main-menubar > menu menupopup {
+    --menuitem-image: none; /* Prevent Image Inheritance */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-platform: windows) {
+  #main-menubar > menu > :is(.menubar-text, .menu-text) {
+    transform: translateY(-1px) !important; /* Fix menu top padding position */
+    padding-inline-start: 0.3em !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-gtk-csd-available) {
+  #main-menubar > menu > :is(.menubar-text, .menu-text) {
+    padding-inline-start: 3px;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (not (-moz-bool-pref: "userChrome.padding.global_menubar")) {
+  #main-menubar > menu {
+    padding-block: 2px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-platform: windows),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-platform: windows) {
+  :root {
+    --context-menu-background-padding: 1em;
+    --context-menu-text-padding-default: 24px;
+    --context-menu-text-padding: var(--context-menu-text-padding-default);
+    --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
+    --bookmark-menu-icon-align-padding: 0px;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+  .openintabs-menuitem,
+  #blockedPopupDontShowMessage,
+  #BMB_viewBookmarksToolbar,
+  #sidebarMenu-popup:is(menupopup),
+  #context_openANewTab.tabmix-newtab-menu-icon {
+    padding-inline-start: var(--menu-background-padding-default) !important;
+    margin-left: 0 !important;
+  }
+  .menupopup-arrowscrollbox {
+    padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available),
+  (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  :root {
+    --context-menu-background-padding: 1em;
+    --context-menu-text-padding-default: 24px;
+    --context-menu-text-padding: var(--context-menu-text-padding-default);
+    --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
+    --bookmark-menu-icon-align-padding: 0px;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  menupopup:is(
+      #context_sendTabToDevicePopupMenu,
+      #context-sendpagetodevice-popup,
+      #context-sendlinktodevice-popup,
+      #frame > menupopup,
+      #spell-dictionaries-menu,
+      #context-ask-chat > menupopup
+    )
+    > menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+  .openintabs-menuitem,
+  #blockedPopupDontShowMessage,
+  #BMB_viewBookmarksToolbar,
+  #sidebarMenu-popup:is(menupopup),
+  #context_openANewTab.tabmix-newtab-menu-icon {
+    padding-inline-start: var(--menu-background-padding-default) !important;
+    margin-left: 0 !important;
+  }
+  .menupopup-arrowscrollbox {
+    padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
+  :root {
+    --bookmark-menu-icon-text-padding: calc(
+      var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+    );
+    --bookmark-menu-icon-background-padding: calc(
+      var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
+    );
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) {
+  :root {
+    --context-menu-background-padding-default: 6px;
+    --context-menu-text-padding: 21px;
+  }
+  .menu-icon {
+    display: unset !important;
+  }
+  #main-menubar > menu > .menu-icon {
+    display: none !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :root {
+    --context-menu-background-padding-default: 10px;
+    --context-menu-mac-padding: 21px;
+  }
+  /* context menu width */
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+  #blockedPopupDontShowMessage {
+    padding-inline-end: var(--context-menu-background-padding) !important;
+  }
+  /* text position */
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem > .menu-text,
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu > .menu-text {
+    padding-inline-start: var(--context-menu-mac-padding) !important;
+  }
+  /* Checkbox menuitem, None iconic menu */
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem[type="checkbox"] {
+    padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
+  }
+  /* Global Menu */
+  /* Exeptions */
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.icon.global_menu.mac") {
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menuitem:not(.menuitem-iconic, .bookmark-item),
+  menupopup:is(
+      #menu_FilePopup,
+      #menu_EditPopup,
+      #menu_viewPopup,
+      #goPopup,
+      #historyMenuPopup,
+      #bookmarksMenuPopup,
+      #menu_ProfilesPopup,
+      #menu_ToolsPopup,
+      #windowPopup,
+      #menu_HelpPopup,
+      #usercssloader-menupopup,
+      #sidebar-context-menu
+    )
+    menu:not(.menu-iconic) {
+    list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #unified-extensions-context-menu > menuitem::before {
+    padding-inline: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+    padding-inline-start: 0 !important;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] {
+    padding-left: 4px !important;
+    background-image: none !important;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] {
+    padding-left: calc(var(--context-menu-mac-padding) - 8px) !important;
+  }
+  :not(menu, #ContentSelectDropdown, #context-navigation)
+    > menupopup:not(.in-menulist)
+    > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"]
+    .menu-iconic-text {
+    padding-left: 8px !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  menupopup menupopup[emptyplacesresult] .menu-text,
+  #PersonalToolbar menupopup[emptyplacesresult] .menu-text {
+    margin-inline-start: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  #BMB_bookmarksPopup,
+  #PersonalToolbar {
+    --context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
+  /* Bookmark Popup - None icon menu */
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+    margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
+    padding-inline-start: var(--bookmark-menu-icon-text-padding) !important;
+    background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) {
+  /* Global Menu */
+  menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item {
+    padding-inline-start: var(--context-menu-background-padding) !important;
+  }
+  /* Bookmark Popup - Iconic menu */
+  #BMB_bookmarksPopup .menu-iconic-text,
+  #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text {
+    margin-inline-start: -1px !important;
+  }
+  /* Bookmark Popup - None icon menu */
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+    padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+    margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text,
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text {
+    margin-inline-start: var(--context-menu-text-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  /* Bookmark Popup - As Arrow Panel */
+  #PersonalToolbar menupopup menuitem,
+  #PersonalToolbar menupopup menu {
+    padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
+  }
+  /* Bookmark Popup - None icon menu */
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
+    padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important;
+  }
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+    padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
+  }
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text,
+  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text {
+    padding-inline-start: var(--context-menu-mac-padding) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  /** Context Menu - Icons ******************************************************/ /*= tabContextMenu ===========================================================*/
+  #context_openANewTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
+  #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
+  #sidebartabs_asamuzak_jp-menuitem-_newTab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+  #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+  #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInPrivateWindow {
+    --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+  #context_reloadTab,
+  #context_reloadSelectedTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_reloadTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_reloadTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:reloadTree,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuReloadTab,
+  #sidebartabs_asamuzak_jp-menuitem-_reloadTab,
+  #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+  }
+  #context_playTab,
+  #context_playSelectedTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/play-fill.svg");
+  }
+  #context_toggleMuteTab,
+  #context_toggleMuteSelectedTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"],
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab,
+  #sidebartabs_asamuzak_jp-menuitem-_muteTab {
+    --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+    stroke: transparent !important;
+  }
+  #context_toggleMuteTab[muted],
+  #context_toggleMuteSelectedTabs[muted],
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"],
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"],
+  #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] {
+    --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
+  }
+  #context_pinTab,
+  #context_pinSelectedTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_pinTab,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab,
+  #sidebartabs_asamuzak_jp-menuitem-_pinTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+  }
+  #context_unpinTab,
+  #context_unpinSelectedTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_unpinTab,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab[label="Unpin Tab"],
+  #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+  }
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/align-distribute-top.svg");
+  }
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/align-space-evenly-vertical.svg");
+  }
+  #context_duplicateTab,
+  #context_duplicateTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
+  #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
+    --menuitem-image: var(--uc-tab-copy-icon);
+  }
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
+    --menuitem-image: var(--uc-tab-unload-icon);
+  }
+  #context_bookmarkTab,
+  #context_bookmarkSelectedTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_bookmarkTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_bookmarkSelected,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:bookmarkTree,
+  #sidebartabs_asamuzak_jp-menuitem-_bookmarkTab,
+  #sidebartabs_asamuzak_jp-menuitem-_bookmarkAllTabs {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+  #context_moveTabOptions,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_moveTab,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuMoveTab,
+  #sidebartabs_asamuzak_jp-menuitem-_moveTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/arrow-swap.svg");
+  }
+  #context_sendTabToDevice,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice {
+    --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+  #context_sendTabToDevice:is([disabled="true"]) + #context_shareTabURL,
+  #context_sendTabToDevice:is([disabled="true"]) + menuitem.share-tab-url-item {
+    /* At windows */
+    --menuitem-image: url("chrome://browser/skin/lepton/share.svg");
+  }
+  /*= new-tab-button-popup =====================================================*/
+  /*= toolbar-context-menu =====================================================*/
+  /*= Tab Mix Plus =============================================================*/
+  /*= contentAreaContextMenu ===================================================*/
+  /*= context-ask-chat =========================================================*/
+  /*= main-context-menu-frame ==================================================*/
+  /*= Tab Mix Plus =============================================================*/
+  /*= downloadsContextMenu =====================================================*/ /*= placeContext =============================================================*/ /*= Notification =============================================================*/
+  /*= blockedPopupOptions ======================================================*/
+  /*= autohide-context =========================================================*/
+  /*= pictureInPictureToggleContextMenu ========================================*/
+  /*= pageActionContextMenu ====================================================*/
+  /*= customizationPanelItemContextMenu ========================================*/
+  /*= customizationPaletteItemContextMenu ======================================*/
+  /*= customizationPanelContextMenu ============================================*/
+  /*= downloads-button-autohide-panel ==========================================*/
+  /*= SyncedTabsSidebarContext =================================================*/
+  /*= SyncedTabsSidebarTabsFilterContext =======================================*/
+  /*= urlbar-input-container ===================================================*/
+  /*= textbox-contextmenu ======================================================*/
+  /* Browser's Searchbar, Library's Searchbar, Page Info */
+  /* Only searchbar */
+  /*= context_sendTabToDevicePopupMenu =========================================*/
+  /*= unified-extensions-context-menu ==========================================*/
+  /*= urlbarView-result-menu ===================================================*/
+  /*= full-page-translations-panel-settings-menupopup ==========================*/
+  /*= select-translations-panel-settings-menupopup =============================*/
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #context_shareTabURL,
+  menuitem.share-tab-url-item {
+    --menuitem-image: url("chrome://browser/skin/lepton/share.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context_reopenInContainer,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_reopenInContainer,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuOpenInContextualTab,
+  #sidebartabs_asamuzak_jp-menuitem-_openNewTabInContainer,
+  #sidebartabs_asamuzak_jp-menuitem-_reopenTabInContainer {
+    --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context_selectAllTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
+  #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
+    --menuitem-image: var(--uc-tab-multiple-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context_closeTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:closeTree,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTab,
+  #sidebartabs_asamuzak_jp-menuitem-_closeTab {
+    --menuitem-image: url("chrome://global/skin/icons/close.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs,
+  #context_closeDuplicateTabs {
+    --menuitem-image: var(--uc-tab-close-duplicate-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #context_closeTabOptions,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs,
+  #sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/filter-dismiss.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context_undoCloseTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab,
+  #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_undoCloseTab,
+  #tabcenter-reborn_ariasuni-menuitem-_contextMenuUndoCloseTab,
+  #sidebartabs_asamuzak_jp-menuitem-_undoCloseTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #new-tab-button-popup > menuitem[command="Browser:NewUserContextTab"],
+  .new-tab-popup > menuitem[command="Browser:NewUserContextTab"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #new-tab-button-popup > menuitem[command="Browser:OpenAboutContainers"],
+  .new-tab-popup > menuitem[command="Browser:OpenAboutContainers"] {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-manageExtension {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-removeExtension {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-reportExtension {
+    --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-moveToPanel {
+    --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-autohide-downloads-button {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-removeFromToolbar {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-always-open-downloads-panel {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/drawer-arrow-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-openANewTab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-reloadSelectedTab,
+  #toolbar-context-reloadSelectedTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-bookmarkSelectedTab,
+  #toolbar-context-bookmarkSelectedTabs {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-selectAllTabs {
+    --menuitem-image: var(--uc-tab-multiple-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-undoCloseTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-customize-sidebar {
+    --menuitem-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-toggle-vertical-tabs {
+    --menuitem-image: url("chrome://browser/skin/sidebar-collapsed.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toggle_toolbar-menubar {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/calendar-agenda.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toggle_PersonalToolbar {
+    /* Also placeContext */
+    --menuitem-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  menuitem.viewCustomizeToolbar {
+    --menuitem-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .fullscreen-context-autohide {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] {
+    --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-platform: windows) {
+  #context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left {
+    display: none;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #tm-duplicateinWin {
+    --menuitem-image: url("chrome://browser/skin/lepton/tab-desktop-multiple-bottom.svg");
+  }
+  #tm-mergeWindowsTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/merge.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-renameTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-copyTabUrl {
+    --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-autoreloadTab_menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/timer10.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context_reloadTabOptions {
+    --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #context_reloadTabOptions {
+    --menuitem-image: url("chrome://browser/skin/lepton/filter-reload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (not (-moz-bool-pref: "userChrome.icon.menu.full")) {
+  #context_reloadTabOptions + #context_reloadTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/blank.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-docShell {
+    --menuitem-image: url("chrome://browser/skin/permissions.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-freezeTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/weather-snowflake.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-protectTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/shield-task.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #tm-lockTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/lock-closed.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #context_bookmarkAllTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/bookmark-multiple.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewsource-goToLine {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-number-format.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewsource-wrapLongLines {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/arrow-sort-down-lines.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewsource-highlightSyntax {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/highlight.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-no-suggestions {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-proofing-tools.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-add-to-dictionary,
+  #spell-add-dictionaries {
+    --menuitem-image: url("chrome://browser/skin/lepton/book-add.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-undo-add-to-dictionary {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openlinkincurrent {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openlinkincontainertab,
+  #context-openlinkintab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openlinkinusercontext-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openlink {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openlinkprivate {
+    --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-bookmarklink {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-savelink {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-savelinktopocket {
+    --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copyemail {
+    --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copyphone {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-phone.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copylink {
+    --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-stripOnShareLink {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-no-tracking.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-sendlinktodevice {
+    --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-play {
+    --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-pause {
+    --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-mute {
+    --menuitem-image: url("chrome://global/skin/media/audio-muted.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-unmute {
+    --menuitem-image: url("chrome://global/skin/media/audio.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-playbackrate {
+    --menuitem-image: url("chrome://browser/skin/lepton/time-picker.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-loop {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/arrow-repeat-all.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-leave-dom-fullscreen {
+    --menuitem-image: url("chrome://global/skin/media/fullscreenExitButton.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-video-fullscreen {
+    --menuitem-image: url("chrome://global/skin/media/fullscreenEnterButton.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-hidecontrols {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-showcontrols {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewvideo {
+    --menuitem-image: url("chrome://browser/skin/lepton/video.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-video-pictureinpicture {
+    /* checkbox */
+    --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-reloadimage {
+    --menuitem-image: url("chrome://browser/skin/lepton/image-arrow-counterclockwise.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewimage {
+    --menuitem-image: url("chrome://browser/skin/lepton/image-add.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-saveimage {
+    --menuitem-image: url("chrome://browser/skin/lepton/image.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-video-saveimage {
+    --menuitem-image: url("chrome://browser/skin/lepton/video-snapshot.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-savevideo {
+    --menuitem-image: url("chrome://browser/skin/lepton/video.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-saveaudio {
+    --menuitem-image: url("chrome://global/skin/media/audio.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copyimage-contents {
+    --menuitem-image: url("chrome://browser/skin/lepton/image-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copyimage,
+  #context-copyvideourl,
+  #context-copyaudiourl {
+    --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-sendimage,
+  #context-sendvideo,
+  #context-sendaudio {
+    --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewimageinfo {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewimagedesc {
+    --menuitem-image: url("chrome://browser/skin/lepton/image-alt-text.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-setDesktopBackground {
+    --menuitem-image: url("chrome://browser/skin/lepton/resize-image.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ctp-play {
+    --menuitem-image: url("chrome://global/skin/icons/plugin.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ctp-hide {
+    --menuitem-image: url("chrome://global/skin/icons/plugin-blocked.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-savepage {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-pocket {
+    --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-sendpagetodevice {
+    --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #fill-login {
+    --menuitem-image: url("chrome://browser/skin/lepton/password.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #fill-login-generated-password {
+    --menuitem-image: url("chrome://browser/skin/login.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #use-relay-mask {
+    --menuitem-image: url("chrome://browser/skin/lepton/relay-logo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #manage-saved-logins {
+    --menuitem-image: url("chrome://browser/skin/lepton/key-multiple.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-undo,
+  #context-pdfjs-undo {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #context-redo,
+  #context-pdfjs-redo {
+    --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-cut,
+  #context-pdfjs-cut {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copy,
+  #context-pdfjs-copy {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-paste,
+  #context-pdfjs-paste {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-delete,
+  #context-pdfjs-delete {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-selectall,
+  #context-pdfjs-selectall {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-pdfjs-highlight-selection {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-editorHighlight.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-reveal-password {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-print-selection {
+    --menuitem-image: url("chrome://global/skin/icons/print.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-take-screenshot {
+    --menuitem-image: url("chrome://browser/skin/lepton/screenshot-1.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-keywordfield {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-searchselect,
+  #context-searchselect-private {
+    --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-translate-selection {
+    --menuitem-image: url("chrome://browser/skin/lepton/translations.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ask-chat {
+    --menuitem-image: url("chrome://browser/skin/lepton/chat-sparkle.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #frame {
+    --menuitem-image: url("chrome://browser/skin/lepton/command-frames.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-check-enabled {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/text-proofing-tools.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-add-dictionaries-main {
+    --menuitem-image: url("chrome://browser/skin/lepton/book-add.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #spell-dictionaries {
+    --menuitem-image: url("chrome://browser/skin/lepton/book.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-bidi-text-direction-toggle {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-direction-horizontal-ltr.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-bidi-page-direction-toggle {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-landscape-split-hint.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewpartialsource-selection,
+  #context-viewsource {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-inspect-a11y {
+    --menuitem-image: url("chrome://browser/skin/lepton/tool-accessibility.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-inspect {
+    --menuitem-image: url("chrome://browser/skin/lepton/command-pick.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-media-eme-learnmore {
+    /* iconic */
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+  #context-back {
+    --menuitem-image: url("chrome://browser/skin/back.svg");
+  }
+  #context-forward {
+    --menuitem-image: url("chrome://browser/skin/forward.svg");
+  }
+  #context-reload {
+    --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+  }
+  #context-stop {
+    --menuitem-image: url("chrome://global/skin/icons/close.svg");
+  }
+  #context-bookmarkpage {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #ask-chat-shortcuts .toolbarbutton-icon {
+    order: -1;
+    margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #ask-chat-shortcuts .subviewbutton:nth-child(1) {
+    list-style-image: url("chrome://browser/skin/lepton/apps-list-detail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #ask-chat-shortcuts .subviewbutton:nth-child(2) {
+    list-style-image: url("chrome://browser/skin/lepton/code-text.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #ask-chat-shortcuts .subviewbutton:nth-child(3) {
+    list-style-image: url("chrome://browser/skin/lepton/tetris-app.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #ask-chat-shortcuts .subviewbutton:nth-child(4) {
+    list-style-image: url("chrome://browser/skin/lepton/arrow-up-exclamation.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ask-chat menuitem:nth-child(1) {
+    --menuitem-image: url("chrome://browser/skin/lepton/apps-list-detail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ask-chat menuitem:nth-child(2) {
+    --menuitem-image: url("chrome://browser/skin/lepton/code-text.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ask-chat menuitem:nth-child(3) {
+    --menuitem-image: url("chrome://browser/skin/lepton/tetris-app.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-ask-chat menuitem:nth-child(4) {
+    --menuitem-image: url("chrome://browser/skin/lepton/arrow-up-exclamation.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-showonlythisframe {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openframeintab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-openframe {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-reloadframe {
+    --menuitem-image: url("chrome://browser/skin/lepton/reload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-bookmarkframe {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-saveframe {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-printframe {
+    --menuitem-image: url("chrome://global/skin/icons/print.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-take-frame-screenshot {
+    --menuitem-image: url("chrome://browser/skin/lepton/screenshot-1.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewframesource {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-viewframeinfo {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-autoreload_menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/timer10.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-linkWithhistory {
+    --menuitem-image: var(--uc-new-tab-skip-forward-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-openAllLinks {
+    --menuitem-image: var(--uc-new-tab-multiple-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-openinverselink {
+    --menuitem-image: var(--uc-new-tab-forward-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-content-closetab {
+    --menuitem-image: url("chrome://browser/skin/lepton/dismiss-filled.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-duplicateTabContext {
+    --menuitem-image: var(--uc-tab-copy-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-duplicateinWinContext {
+    --menuitem-image: url("chrome://browser/skin/lepton/tab-desktop-multiple-bottom.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-detachTabContext {
+    --menuitem-image: url("chrome://browser/skin/lepton/convert-range.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-mergeWindows {
+    --menuitem-image: url("chrome://browser/skin/lepton/merge.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-content-freezeTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/weather-snowflake.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-content-protectTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/shield-task.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-content-lockTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/lock-closed.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #tm-content-undoCloseTab {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadPauseMenuItem {
+    --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadResumeMenuItem {
+    --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadUnblockMenuItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadUseSystemDefaultMenuItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadAlwaysUseSystemDefaultMenuItem {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/folder-globe.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadAlwaysOpenSimilarFilesMenuItem {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadShowMenuItem {
+    --menuitem-image: var(--uc-folder-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
+  #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+  }
+  #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
+  #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadDeleteFileMenuItem {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .downloadRemoveFromHistoryMenuItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
+  #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/broom.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_open {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_openBookmarkContainer\:tabs,
+  #placesContext_openBookmarkLinks\:tabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_open\:newtab,
+  #placesContext_openContainer\:tabs,
+  #placesContext_openLinks\:tabs {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_open\:newcontainertab {
+    --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_open\:newwindow {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_open\:newprivatewindow {
+    --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_show_bookmark\:info,
+  #placesContext_show\:info,
+  #placesContext_show_folder\:info {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_deleteBookmark,
+  #placesContext_deleteFolder,
+  #placesContext_delete,
+  #placesContext_delete_history {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_deleteHost {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_sortBy\:name {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_cut {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_copy {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_paste_group {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_new\:bookmark {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_showInFolder,
+  #placesContext_new\:folder {
+    --menuitem-image: var(--uc-folder-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_new\:separator {
+    --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_paste {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_createBookmark {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #show-other-bookmarks_PersonalToolbar {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/star-line-horizontal.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #placesContext_showAllBookmarks {
+    --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .openintabs-menuitem {
+    --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #doNotDisturbMenuItem {
+    --menuitem-image: url(chrome://global/skin/media/pause-fill.svg);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #disableForOriginMenuItem {
+    --menuitem-image: url("chrome://global/skin/icons/blocked.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #openSettingsMenuItem {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #blockedPopupAllowSite {
+    --menuitem-image: url("chrome://global/skin/icons/check.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #blockedPopupDontShowMessage {
+    /* checkbox */
+    --menuitem-image: url("chrome://global/skin/icons/blocked.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  menuitem[data-l10n-id="popup-show-popup-menuitem"] {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-show.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #autohide-context > menuitem[data-l10n-id="full-screen-autohide"] {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #autohide-context > menuitem[data-l10n-id="full-screen-exit"] {
+    --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #pictureInPictureToggleContextMenu > menuitem[oncommand="PictureInPicture.hideToggle();"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+  .pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #customizationPanelItemContextMenuUnpin {
+    --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-removeFromPanel {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-addToToolbar {
+    --menuitem-image: url("chrome://devtools/skin/images/dock-bottom.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .customize-context-addToPanel {
+    --menuitem-image: url("chrome://browser/skin/menu.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #customizationPanelContextMenu > menuitem[command="cmd_CustomizeToolbars"] {
+    --menuitem-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #downloads-button-autohide-checkbox {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-tracking-off.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsOpenSelected {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsOpenSelectedInTab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsOpenSelectedInWindow {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsOpenSelectedInPrivateWindow {
+    --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsBookmarkSelected {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsCopySelected {
+    --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsOpenAllInTabs {
+    --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsManageDevices {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsRefresh {
+    --menuitem-image: url("chrome://browser/skin/sync.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_undo"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_selectAll"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #syncedTabsRefreshFilter {
+    --menuitem-image: url("chrome://browser/skin/sync.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_undo"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_redo"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #strip-on-share {
+    --menuitem-image: url("chrome://browser/skin/lepton/link-no-tracking.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #paste-and-go {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste-go.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_selectAll"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-redo"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .textbox-contextmenu > menuitem[data-l10n-id="text-action-select-all"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  menuitem.searchbar-paste-and-search {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste-search.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  menuitem.searchbar-clear-history {
+    --menuitem-image: url("chrome://browser/skin/lepton/forget.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .sync-menuitem.sendtab-target[clientType="phone"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-phone.svg");
+  }
+  .sync-menuitem.sendtab-target[clientType="tablet"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-tablet.svg");
+  }
+  .sync-menuitem.sendtab-target[clientType="desktop"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-desktop.svg");
+  }
+  .sync-menuitem.sendtab-target[clientType="tv"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-tv.svg");
+  }
+  .sync-menuitem.sendtab-target[clientType="vr"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/device-vr.svg");
+  }
+  .sync-menuitem.sendtab-target[clientType=""] {
+    --menuitem-image: url("chrome://browser/skin/lepton/send-to-device.svg");
+  }
+  .sync-menuitem.sendtab-target:not([clientType]) {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-pin-to-toolbar {
+    --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-move-widget-up {
+    --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-move-widget-down {
+    --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-manage-extension {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-remove-extension {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .unified-extensions-context-menu-report-extension {
+    --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .urlbarView-result-menuitem[data-command="trendingblock"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+  .urlbarView-result-menuitem[data-command="dismiss"] {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+  .urlbarView-result-menuitem[data-command="help"] {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  .manage-languages-menuitem {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #select-translations-panel-open-settings-page-menuitem {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #select-translations-panel-about-translations-menuitem {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") {
+  /*= main-menubar =============================================================*/
+  #file-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg");
+  }
+  #edit-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+  }
+  #view-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/content-view.svg");
+  }
+  #history-menu {
+    --menuitem-image: url("chrome://browser/skin/history.svg");
+  }
+  #bookmarksMenu {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+  #profiles-menu:is(menu) {
+    fill: transparent !important;
+    --menuitem-image: url("chrome://browser/content/profiles/assets/16_heart.svg");
+  }
+  #tools-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbox.svg");
+  }
+  #tabSharingMenu {
+    --menuitem-image: url("chrome://browser/skin/notification-icons/screen.svg");
+  }
+  #helpMenu {
+    --menuitem-image: url("chrome://global/skin/icons/help.svg");
+  }
+  /*= Others ===================================================================*/
+  #alltabs-button {
+    list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important;
+  }
+  #alltabs-button > .toolbarbutton-badge-stack > .toolbarbutton-icon {
+    /* Original
+       width: 20px;
+       margin: -2px;
+     */
+    width: 16px !important;
+    margin: 0 !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  /** Global Menu ***************************************************************/
+  /*= menu_FilePopup ===========================================================*/
+  #menu_newNavigatorTab {
+    --menuitem-image: var(--uc-new-tab-icon);
+  }
+  #menu_newUserContext {
+    --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+  }
+  #menu_newNavigator {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+  #menu_newPrivateWindow {
+    --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+  }
+  #menu_openFile {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+  }
+  #menu_close {
+    --menuitem-image: var(--uc-tab-close-icon);
+  }
+  /* Mange Containers */
+  /*= menu_EditPopup ===========================================================*/
+  /*= menu_viewPopup ===========================================================*/
+  /* view-menu-popup sub menu */
+  /* viewSidebarMenu sub menu */
+  /* viewFullZoomMenu sub menu */
+  /*= goPopup ==================================================================*/
+  /* sub menu */
+  /*= bookmarksMenuPopup =======================================================*/
+  /*= menu_ProfilesPopup =======================================================*/
+  /*= menu_ToolsPopup ==========================================================*/
+  /* menuWebDeveloperPopup sub menu */
+  /*= windowPopup ==============================================================*/
+  /*= menu_HelpPopup ===========================================================*/
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #menu_closeWindow {
+    --menuitem-image: url("chrome://browser/skin/lepton/close-window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_savePage {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_sendLink {
+    --menuitem-image: url("chrome://browser/skin/lepton/mail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  menu.share-tab-url-item {
+    --menuitem-image: url("chrome://browser/skin/share.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_print {
+    --menuitem-image: url("chrome://global/skin/icons/print.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_importFromAnotherBrowser {
+    --menuitem-image: url("chrome://browser/skin/import.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #goOfflineMenuitem {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/plug-disconnected.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_FileQuitItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/quit.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_newUserContext menupopup menuitem:last-child {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_undo {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #menu_redo {
+    --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_cut {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_copy {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_paste {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_delete {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_selectAll {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_find {
+    --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #menu_findAgain {
+    --menuitem-image: url("chrome://browser/skin/lepton/find-again.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_preferences {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #viewToolbarsMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbar.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #viewSidebarMenuMenu {
+    --menuitem-image: var(--uc-sidebar-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #viewFullZoomMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/screenshot.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #pageStyleMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-css.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #repair-text-encoding {
+    --menuitem-image: url("chrome://browser/skin/lepton/characterEncoding.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #enterFullScreenItem {
+    --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #exitFullScreenItem {
+    --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #fullScreenItem {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_readerModeItem {
+    --menuitem-image: url("chrome://browser/skin/reader-mode.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_showAllTabs {
+    --menuitem-image: var(--uc-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #documentDirection-swap {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-direction-horizontal-ltr.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_customizeToolbars {
+    --menuitem-image: url("chrome://browser/skin/customize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_bookmarksSidebar {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_historySidebar {
+    --menuitem-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_tabsSidebar {
+    --menuitem-image: url("chrome://browser/skin/lepton/synced-tabs.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_zoomEnlarge {
+    --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg");
+    stroke: transparent !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_zoomReduce {
+    --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg");
+    stroke: transparent !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_zoomReset {
+    --menuitem-image: url("chrome://browser/skin/lepton/resize.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #toggle_zoom {
+    --menuitem-image: url("chrome://browser/skin/lepton/screenshot.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_showAllHistory {
+    --menuitem-image: url("chrome://browser/skin/history.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #sanitizeItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/forget.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #sync-tabs-menuitem {
+    --menuitem-image: url("chrome://browser/skin/sync.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #historyRestoreLastSession {
+    --menuitem-image: url("chrome://browser/skin/lepton/restore-session.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #hiddenTabsMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_searchHistory {
+    --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #historyUndoMenu {
+    --menuitem-image: var(--uc-tab-icon);
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #historyUndoWindowMenu {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #historyUndoPopup .restoreallitem {
+    --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #historyUndoWindowPopup .restoreallitem {
+    --menuitem-image: url("chrome://browser/skin/lepton/restore-session.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #bookmarksShowAll {
+    --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_bookmarkThisPage,
+  #menu_bookmarkAllTabs {
+    --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_bookmarkThisPage[data-l10n-id="menu-bookmark-edit"] {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_searchBookmarks {
+    --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_manageProfiles {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_openDownloads {
+    --menuitem-image: url("chrome://browser/skin/downloads/downloads.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_openAddons {
+    --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #sync-setup {
+    --menuitem-image: url("chrome://browser/skin/fxa/avatar-empty.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #sync-syncnowitem {
+    --menuitem-image: url("chrome://browser/skin/sync.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_openFirefoxView {
+    --menuitem-image: url("chrome://browser/skin/lepton/firefox-view.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #webDeveloperMenu,
+  #browserToolsMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_pageInfo {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-endnote.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_devToolbox {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_taskManager {
+    --menuitem-image: url("chrome://browser/skin/lepton/performance.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_devtools_remotedebugging {
+    --menuitem-image: url("chrome://browser/skin/lepton/bug.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_browserToolbox {
+    --menuitem-image: url("chrome://browser/skin/lepton/window-dev-tools.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_browserContentToolbox {
+    --menuitem-image: url("chrome://browser/skin/lepton/command-frames.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_browserConsole {
+    --menuitem-image: url("chrome://browser/skin/lepton/command-console.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_responsiveUI {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_eyedropper {
+    /* checkbox */
+    --menuitem-image: url("chrome://browser/skin/lepton/command-eyedropper.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_pageSource {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-search.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #extensionsForDevelopers {
+    --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #windowPopup > menuitem[command="minimizeWindow"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/arrow-between-down.svg");
+  }
+  #windowPopup > menuitem[command="zoomWindow"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/auto-fit-width.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_openHelp {
+    --menuitem-image: url("chrome://global/skin/icons/help.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #help_reportBrokenSite {
+    --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #feedbackPage {
+    --menuitem-image: url("chrome://browser/skin/lepton/send.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #helpSafeMode {
+    --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #troubleShooting {
+    --menuitem-image: url("chrome://global/skin/icons/more.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #help_reportSiteIssue {
+    --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_HelpPopup_reportPhishingtoolmenu {
+    --menuitem-image: url("chrome://global/skin/icons/warning.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #menu_HelpPopup_reportPhishingErrortoolmenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #helpSwitchDevice {
+    --menuitem-image: url("chrome://browser/skin/lepton/add-device.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+  #aboutName {
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  /*= organizeButtonPopup ======================================================*/
+  #newbookmark {
+    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+  }
+  #newfolder {
+    --menuitem-image: var(--uc-folder-icon);
+  }
+  #newseparator {
+    --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+  }
+  #orgUndo {
+    --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+  }
+  /*= viewMenuPopup ============================================================*/
+  /*= maintenanceButtonPopup ===================================================*/
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #orgRedo {
+    --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgCut {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgCopy {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgPaste {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgDelete {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgSelectAll {
+    --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #orgClose {
+    --menuitem-image: url("chrome://global/skin/icons/close.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #viewColumns {
+    --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #viewSort {
+    --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #backupBookmarks {
+    --menuitem-image: url("chrome://browser/skin/lepton/datastore.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #fileRestoreMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/datarestore.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #fileImport {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #fileExport {
+    --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+  #browserImport {
+    --menuitem-image: url("chrome://browser/skin/import.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.1-25px_stroke") {
+  #firefox-view-button {
+    list-style-image: url("chrome://browser/skin/lepton/firefox-view.svg") !important;
+  }
+  #reset-pbm-toolbar-button {
+    list-style-image: url("chrome://browser/skin/lepton/flame.svg") !important;
+  }
+  #translations-button-icon {
+    list-style-image: url("chrome://browser/skin/lepton/translations.svg") !important;
+  }
+  .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"],
+  [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image
+  {
+    content: url("chrome://browser/skin/lepton/performance.svg") !important;
+  }
+  .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image
+  {
+    content: url("chrome://browser/skin/lepton/developer.svg") !important;
+  }
+  .tabbrowser-tab:is([image="chrome://browser/skin/controlcenter/dashboard.svg"]) .tab-icon-image
+  {
+    content: url("chrome://browser/skin/lepton/dashboard.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenu-restart-button {
+    list-style-image: url("chrome://browser/skin/lepton/refresh-cw.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  #menu_FileRestartItem {
+    --menuitem-image: url("chrome://browser/skin/lepton/refresh-cw.svg");
+  }
+  #toggle_status-dummybar {
+    --menuitem-image: url("chrome://browser/skin/lepton/pulse-square.svg");
+  }
+  menuitem.privatetab-icon {
+    --menuitem-image: url("chrome://browser/skin/lepton/private-favicon.svg");
+  }
+  #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure {
+    --menuitem-image: url("chrome://browser/skin/lepton/organization-horizontal.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #appMenuNewIdentity {
+    list-style-image: url("chrome://browser/skin/new_identity.svg");
+  }
+  #appMenuNewCircuit {
+    list-style-image: url("chrome://browser/skin/new_circuit.svg");
+  }
+  #appMenu_torBrowserUserManual {
+    list-style-image: url("chrome://browser/skin/onion.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  #menu_newIdentity {
+    --menuitem-image: url("chrome://browser/skin/new_identity.svg");
+  }
+  #menu_newCircuit {
+    --menuitem-image: url("chrome://browser/skin/new_circuit.svg");
+  }
+  #torBrowserUserManual {
+    --menuitem-image: url("chrome://browser/skin/onion.svg");
+  }
+}
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  #ssbPageAction-image {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg");
+  }
+  #ssbPageAction-image[open-ssb="true"] {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #rebootappmenu {
+    list-style-image: url("chrome://browser/skin/lepton/refresh-cw.svg");
+  }
+  #openprofiledir {
+    list-style-image: var(--uc-folder-icon);
+  }
+  #appMenu-ssb-button {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg");
+  }
+  #appMenu-install-or-open-ssb-current-page-button {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg");
+  }
+  #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] {
+    list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  #toggle_sharemode {
+    --menuitem-image: url("chrome://branding/content/about-logo-private.png");
+  }
+  #usercssloader-menu {
+    --menuitem-image: url("chrome://browser/skin/lepton/developer.svg");
+  }
+  #usercssloader-menupopup > menu[data-l10n-id="css-menu"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/document-css.svg");
+  }
+  #usercssloader-submenupopup > menuitem[data-l10n-id="rebuild-css"] {
+    --menuitem-image: url("chrome://global/skin/icons/reload.svg");
+  }
+  #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] {
+    --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+  }
+  #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] {
+    --menuitem-image: var(--uc-folder-icon);
+  }
+  #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userChromeCss-editor"] {
+    --menuitem-image: url("chrome://browser/skin/window.svg");
+  }
+  #usercssloader-submenupopup > menuitem[data-l10n-id="edit-userContentCss-editor"] {
+    --menuitem-image: url("chrome://global/skin/icons/page-portrait.svg");
+  }
+  #context_toggleToPrivateContainer,
+  #open_in_private_container {
+    --menuitem-image: url("chrome://browser/skin/lepton/private-favicon.svg");
+  }
+  #toggle_statusBar {
+    --menuitem-image: url("chrome://browser/skin/lepton/pulse-square.svg");
+  }
+  #muteMenu {
+    --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+    stroke: transparent !important;
+  }
+  #unloadWebpanelMenu {
+    --menuitem-image: var(--uc-tab-unload-icon);
+  }
+  #changeUAWebpanelMenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/command-responsivemode.svg");
+    fill-opacity: 0;
+  }
+  #deleteWebpanelMenu {
+    --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+  }
+  #run-ssb-contextmenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg");
+  }
+  #uninstall-ssb-contextmenu {
+    --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg");
+  }
+}
diff --git a/waterfox/browser/themes/lepton/leptonContent.css b/waterfox/browser/themes/lepton/leptonContent.css
new file mode 100644
index 0000000000000..7d0e1de7fe65c
--- /dev/null
+++ b/waterfox/browser/themes/lepton/leptonContent.css
@@ -0,0 +1,7622 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+/** Compatibility *************************************************************/
+@-moz-document url-prefix("about:preferences") {
+  .content-blocking-warning.info-box-container > hbox > .content-blocking-warning-image {
+    margin-inline-start: -7px !important;
+    margin-inline-end: 8px !important;
+    width: 20px !important;
+  }
+  #pane-experimental-search-results-header,
+  #pane-experimental-subtitle {
+    min-height: 27px !important;
+    padding-inline-start: 35px !important;
+  }
+  .translations-manage-language:first-child {
+    padding-block: 4px !important;
+    margin-bottom: 4px !important;
+  }
+  .translations-manage-language button {
+    min-height: var(--size-item-medium, 28px) !important;
+    max-height: var(--size-item-medium, 28px) !important;
+  }
+  #firefoxExperimentalCategory:not([hidden="true"]) {
+    display: inline-block;
+  }
+  #firefoxExperimentalCategory > label {
+    float: left;
+  }
+  #firefoxExperimentalCategory > hbox {
+    transform: translateY(5px);
+  }
+  #firefoxExperimentalCategory .description-deemphasized {
+    display: none;
+  }
+  #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] {
+    border-bottom: 1px solid var(--in-content-border-color);
+    padding-bottom: 1.5em;
+  }
+}
+@-moz-document url-prefix("about:addons") {
+  #updates-message + .page-options-menu > .more-options-button {
+    box-sizing: content-box;
+    padding: 0 !important;
+  }
+  button[data-l10n-id="addon-updates-manual-updates-found"] {
+    height: 100%;
+  }
+  #categories {
+    padding-inline-end: 1px !important; /* Original: 4px */
+  }
+}
+@-moz-document url-prefix("about:policies") {
+  #categories > .category {
+    box-sizing: border-box;
+  }
+}
+/** Video player **************************************************************/
+/* Control Bar Size */
+@media -moz-pref("userContent.player.size") {
+  #controlsContainer {
+    --controlBar-height: 40px; /* Original: 40px, Replace to this value */
+  }
+  #controlsContainer .touch {
+    --button-size: 48px !important; /* Original: 40px */
+    --controlBar-height: 52px; /* Original: 52px */
+  }
+  #controlsContainer .controlBar {
+    height: var(--controlBar-height) !important; /* Original: 40px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer {
+    --button-size: 64px !important; /* Original: 30px */
+    --track-size: 6px !important; /* Original: 5px, Touch: 7px */
+    --thumb-size: 15px !important; /* Original: 13px, Touch: 16px */
+    --controlBar-height: 64px; /* Original: 40px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer .touch {
+    --button-size: 72px !important; /* Original: 40px */
+    --controlBar-height: 64px; /* Original: 52px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer .controlBar {
+    padding-bottom: 8px !important;
+  }
+}
+/* Control Bar UI */
+@media -moz-pref("userContent.player.ui") {
+  audio {
+    --duration-color: #929292; /* Like Original */
+    --media-background: rgba(26, 26, 26, 0.8); /* Like Original */
+    border-radius: 8px;
+    --box-shadow1: rgba(14, 13, 26, 0.12);
+    --box-shadow2: rgba(7, 48, 114, 0.12);
+    --box-shadow3: rgba(34, 0, 51, 0.04);
+    box-shadow: 0 5px 10px -3px var(--box-shadow1), 0 3px 16px 2px var(--box-shadow2), 0 8px 12px 1px var(--box-shadow3);
+    /* Or: 0 2px 15px rgba(0,0,0,.1); */
+  }
+  @media (prefers-color-scheme: dark) {
+    audio {
+      --box-shadow1: rgba(249, 249, 250, 0.12);
+      --box-shadow2: rgba(91, 91, 102, 0.12);
+      --box-shadow3: rgba(82, 82, 94, 0.04);
+    }
+  }
+  video {
+    --duration-color: #eee;
+    --media-background: linear-gradient(transparent, rgba(26, 26, 26, 0.85));
+  }
+  @media (prefers-contrast) {
+    video {
+      --duration-color: #929292; /* Like Original */
+      --media-background: rgba(26, 26, 26, 0.8); /* Like Original */
+    }
+  }
+  #controlsContainer .controlBar {
+    background: var(--media-background) !important;
+  }
+  #controlsContainer .duration {
+    color: var(--duration-color) !important; /* Original: #929292 */
+  }
+  @media -moz-pref("userContent.player.ui.twoline") {
+    audio {
+      /* #controlsContainer .controlBar */
+      --controlBar-flex-wrap: unset;
+      --controlBar-justify-content: center;
+      --controlBar-align-content: unset;
+      --controlBar-twoline-more-height: 0px;
+      --controlBar-padding-inline: 9px;
+      /* #controlsContainer .scrubberStack */
+      /* .scrubberStack - Vertical */
+      --scrubberStack-order: unset;
+      --scrubberStack-height: 100%;
+      --scrubberStack-transform: none;
+      /* .scrubberStack - Horizontal */
+      --scrubberStack-margin-inline: 9px;
+      /* #controlsContainer .positionDurationBox */
+      --positionDurationBox-flex-grow: unset;
+      --positionDurationBox-margin-left: unset;
+      --positionDurationBox-text-align: center;
+      /* Others */
+      --button-outside-margin: 0;
+    }
+    video {
+      /* #scrubber .scrubber::-moz-range-thumb */
+      --scrubber-thumb-scale: 0;
+      --scrubber-thumb-color: #48a0f7; /* Color as hover, Prevent flashing */
+      /* .progressBar::-moz-progress-bar */
+      --progressBar-scale: 0.65;
+      /* #controlsContainer .controlBar */
+      --controlBar-flex-wrap: wrap;
+      --controlBar-justify-content: space-between;
+      --controlBar-align-content: space-around;
+      --controlBar-padding-inline: 0 !important; /* Original: 9px */
+      /* #controlsContainer .scrubberStack */
+      /* .scrubberStack - Vertical */
+      --scrubberStack-order: -1;
+      /* .scrubberStack - Horizontal */
+      --scrubberStack-flex-basis: auto;
+      --scrubberStack-twoline-width: 100%;
+      --scrubberStack-margin-inline: 0;
+      /* #controlsContainer .positionDurationBox */
+      --positionDurationBox-flex-grow: 2;
+      --positionDurationBox-margin-left: 15px;
+      --positionDurationBox-text-align: left;
+      /* Others */
+      --duration-color: #dadada;
+      --button-outside-margin: 9px;
+    }
+    .scrubber:not(:hover)::-moz-range-thumb {
+      transform: scale(var(--scrubber-thumb-scale, 1));
+      background-color: var(--scrubber-thumb-color, currentColor) !important;
+    }
+    .progressStack {
+      transform-origin: bottom;
+      transform: scaleY(var(--progressBar-scale, 1));
+    }
+    .scrubber:hover::-moz-range-thumb,
+    .progressContainer:hover .progressStack {
+      transform: scale(1);
+    }
+    #controlsContainer .controlBar {
+      flex-wrap: var(--controlBar-flex-wrap);
+      justify-content: var(--controlBar-justify-content);
+      align-content: var(--controlBar-align-content);
+      height: calc(var(--controlBar-height) + var(--controlBar-twoline-more-height, var(--thumb-size))) !important;
+      padding-inline: var(--controlBar-padding-inline) !important; /* Original: 9px */
+    }
+    #controlsContainer .scrubberStack {
+      /* Vertical */
+      order: var(--scrubberStack-order);
+      height: var(--scrubberStack-height, var(--thumb-size)) !important;
+      transform: var(--scrubberStack-transform, translateY(calc(var(--thumb-size) / 2)));
+      /* Horizontal */
+      flex-basis: var(--scrubberStack-flex-basis, calc(var(--scrubberStack-width) - 18px)) !important;
+      width: var(--scrubberStack-twoline-width, var(--scrubberStack-width));
+      margin-inline: var(--scrubberStack-margin-inline) !important;
+    }
+    #controlsContainer .positionDurationBox {
+      flex-grow: var(--positionDurationBox-flex-grow);
+      margin-left: var(--positionDurationBox-margin-left);
+      text-align: var(--positionDurationBox-text-align) !important;
+    }
+    #playButton {
+      margin-left: var(--button-outside-margin) !important;
+    }
+    #fullscreenButton {
+      margin-right: var(--button-outside-margin) !important;
+    }
+  }
+}
+@media -moz-pref("userContent.player.icon") {
+  #controlsContainer .fullscreenButton {
+    background-image: url("chrome://browser/skin/lepton/enter-fullscreen.svg") !important;
+  }
+  #controlsContainer .fullscreenButton[fullscreened] {
+    background-image: url("chrome://browser/skin/lepton/exit-fullscreen.svg") !important;
+  }
+}
+@media -moz-pref("userContent.player.noaudio") {
+  #controlsContainer .muteButton[noAudio] {
+    /* Remove volume button at noAudio */
+    display: none !important;
+  }
+}
+/* Click to play UI */
+@media -moz-pref("userContent.player.click_to_play") {
+  #controlsContainer .clickToPlay {
+    cursor: pointer;
+    opacity: 0.65 !important;
+  }
+  #controlsContainer .controlsSpacerStack:hover > .clickToPlay {
+    opacity: 0.85 !important;
+  }
+  #controlsContainer .controlsSpacerStack:hover > .clickToPlay:hover {
+    opacity: 1 !important;
+    fill: #48a0f7 !important; /* color as .scrubber */
+  }
+}
+/* Animation */
+@media -moz-pref("userContent.player.animate") {
+  @media (prefers-reduced-motion: no-preference) {
+    /* Control Bar */
+    #controlsContainer .controlBar {
+      transition: transform 350ms ease;
+      opacity: 1 !important;
+    }
+    #controlsContainer .controlBar[hidden] {
+      transform: translateY(100%);
+      transition: transform 350ms ease-in-out, opacity 1s ease 100ms !important;
+      opacity: 0 !important;
+    }
+    #controlsContainer .controlBar[hidden] .progressBar,
+    #controlsContainer .controlBar[hidden] .bufferBar {
+      display: unset !important;
+      opacity: 0.55;
+      transition: opacity 150ms ease 50ms;
+    }
+    /* Two line Control Bar */
+    .scrubber::-moz-range-thumb,
+    .progressStack {
+      transition: transform 0.1s cubic-bezier(0, 0, 0.2, 1);
+    }
+    /* Click to play */
+    #controlsContainer .clickToPlay {
+      transition: opacity 150ms ease-in-out, fill 150ms ease-in-out;
+    }
+  }
+}
+/** Activity Stream ***********************************************************/
+@-moz-document url("about:home"), url("about:newtab") {
+  /** Activity Stream - Search Focus Border: like URL *************************/
+  @media -moz-pref("userContent.page.field_border") {
+    /* At DarkMode, Color */
+    body[style*="--newtab-background-color:rgba(28, 27, 34, 1);"],
+    body[style*="--newtab-background-color:rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"],
+    body[style*="--newtab-background-color: rgb(43, 42, 51);"] {
+      /* inner */
+      --newtab-focus-border: rgba(
+        0,
+        221,
+        255,
+        0.5
+      ) !important; /* Original: #B5D3FF, Better color-mix(in srgb, #B5D3FF 70%, transparent) */
+      --newtab-focus-border-selected: var(--newtab-focus-border) !important; /* Original: #B5D3FF */
+      /* For Nightly */
+      --newtab-primary-action-background: var(--newtab-focus-border) !important;
+    }
+    @media -moz-pref("userContent.page.proton_color") {
+      @media -moz-pref("userContent.page.proton_color.dark_blue_accent") {
+        body[style*="--newtab-background-color:rgba(28, 27, 34, 1);"],
+        body[style*="--newtab-background-color:rgba(42, 42, 46, 1);"],
+        body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"],
+        body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"],
+        body[style*="--newtab-background-color: rgb(43, 42, 51);"] {
+          --newtab-focus-border: var(--in-content-focus-outline-color) !important;
+        }
+      }
+    }
+  }
+  /** Activity Stream - Menu Icons ********************************************/
+  @media -moz-pref("userChrome.icon.context_menu") {
+    .context-menu-list .context-menu-item button {
+      padding-inline-start: 0 !important;
+    }
+    .context-menu-list .context-menu-item button span {
+      /* Color */
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+      fill: currentColor !important;
+      stroke: currentColor;
+      /* Layout */
+      background-size: 16px !important;
+      background-repeat: no-repeat !important;
+      background-image: var(--menuitem-image);
+      padding-inline-start: 24px; /* 16p + (4px *  2) */
+      background-position: var(--uc-menu-background-position, left) 4px center;
+    }
+    .context-menu-list .context-menu-item button span:dir(rtl) {
+      --uc-menu-background-position: right;
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-pin"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-unpin"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
+      --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-remove-bookmark"] {
+      --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-save-to-pocket"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-open-file"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-show-file"] {
+      --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+    }
+    @media -moz-pref("userChrome.icon.library") {
+      .context-menu-item span[data-l10n-id="newtab-menu-show-file"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/folder.svg");
+      }
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-open-new-window"] {
+      --menuitem-image: url("chrome://browser/skin/window.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-open-new-private-window"] {
+      --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-dismiss"] {
+      --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-delete-history"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+    }
+  }
+  /** Activity Stream - Web Site Icon: full size ******************************/
+  @media -moz-pref("userContent.newTab.full_icon") {
+    .top-site-outer {
+      width: 120px !important; /* v135: calc(var(--size-item-large) * 3); */
+    }
+    .top-site-outer .tile {
+      width: 80px !important; /* v135: calc(var(--size-item-large) * 2); */
+      height: 80px !important; /* v135: calc(var(--size-item-large) * 2); */
+      overflow: hidden;
+    }
+    .top-site-outer .icon-wrapper {
+      width: 100% !important; /* Original: 48px */
+      height: 100% !important; /* Original: 48px */
+    }
+    .top-site-outer.add-button .tile .icon-wrapper {
+      width: 24px !important;
+      height: 24px !important;
+    }
+    .top-site-outer .context-menu-button {
+      top: 0px !important; /* Original: -20px */
+      right: 0px !important;
+      width: 22px !important;
+      height: 22px !important;
+    }
+    .top-site-outer .context-menu {
+      top: 16.75px !important; /* Original: 6.75px */
+    }
+  }
+  /** Activity Stream - Animate ***********************************************/
+  @media -moz-pref("userContent.newTab.animate") {
+    @media (prefers-reduced-motion: no-preference) {
+      :root {
+        --animation-easing-function: cubic-bezier(0.07, 0.95, 0, 1);
+      }
+      /* Background */
+      .top-site-outer,
+      #searchSubmit,
+      button.icon,
+      button.close-button {
+        transition: background 1.5s var(--animation-easing-function);
+      }
+      .top-site-outer:hover,
+      #searchSubmit:hover,
+      button.icon:hover,
+      button.close-button:hover {
+        transition: background 0.5s var(--animation-easing-function);
+      }
+      /* Search Bar */
+      .search-wrapper .search-inner-wrapper > input,
+      .search-wrapper .search-inner-wrapper > .search-handoff-button {
+        transition: 1s var(--animation-easing-function);
+        transition-property: border-color, box-shadow;
+      }
+      .search-wrapper .search-inner-wrapper:active > input,
+      .search-wrapper .search-inner-wrapper:active > .search-handoff-button,
+      .search-wrapper .search-inner-wrapper > input:focus,
+      .search-wrapper .search-inner-wrapper > .search-handoff-button:focus {
+        transition: border-color 0.5s var(--animation-easing-function), box-shadow 1s var(--animation-easing-function);
+      }
+      @media -moz-pref("userContent.page.field_border") {
+        .search-wrapper .search-inner-wrapper:hover > input,
+        .search-wrapper .search-inner-wrapper:hover > .search-handoff-button {
+          border-color: var(--newtab-primary-action-background) !important;
+          transition: border-color 0.5s var(--animation-easing-function);
+        }
+      }
+    }
+  }
+  /** Activity Stream - Pocket order to last **********************************/
+  @media -moz-pref("userContent.newTab.pocket_to_last") {
+    .body-wrapper.on {
+      display: flex;
+      flex-wrap: wrap !important;
+      flex-direction: row !important;
+    }
+    .body-wrapper.on > .discovery-stream.ds-layout {
+      flex-basis: 100%;
+    }
+    .body-wrapper.on > .collapsible-section[data-section-id="topstories"],
+    .home-section > #pocket-section,
+    .home-section > .divider,
+    .home-section > div:not(.section) {
+      order: 2;
+    }
+  }
+  /** Activity Stream - Home Search Bar looks like proton *********************/
+  @media -moz-pref("userContent.newTab.searchbar") {
+    /* Dropdown Colors */
+    #root {
+      --newtab-search-background-color: rgba(255, 255, 255, 1); /* Same as light theme's --panel-background */
+      /* Set search dropdown background */
+      --newtab-search-dropdown-header-color: var(--newtab-search-background-color) !important;
+      --newtab-search-dropdown-color: var(--newtab-search-background-color) !important;
+      --newtab-element-hover-color: color-mix(in srgb, currentColor 9%, transparent) !important;
+    }
+    @media (prefers-color-scheme: dark) {
+      #root {
+        /* Default Dark Mode */
+        --newtab-search-background-color: rgba(66, 65, 77, 1); /* Same as dark theme's --panel-background */
+      }
+    }
+    .activity-stream[lwt-sidebar]:not([style*="--newtab-background-color: rgba(43, 42, 51, 1);"]) #root {
+      /* Light weight theme */
+      --newtab-search-background-color: var(--lwt-sidebar-background-color);
+    }
+    /* Padding */
+    #searchSuggestionTable {
+      border-radius: 4px !important;
+      -moz-window-shadow: cliprounded;
+    }
+    .contentSearchSuggestionTable .contentSearchOneOffItem {
+      width: 32px !important;
+      height: 32px !important;
+      /* Margin */
+      margin-block: 5px !important;
+      margin-inline-start: 5px !important;
+      margin-inline-end: 8px !important;
+      /* Border */
+      border-radius: 4px !important;
+      border-image: none !important; /* Original: linear-gradient(transparent 18%, var(--newtab-border-secondary-color) 18%, var(--newtab-border-secondary-color) 82%, transparent 82%) 1; */
+      border-inline-end: none !important; /* Original: 1px solid; */
+    }
+    #contentSearchSettingsButton::before {
+      content: url("chrome://global/skin/icons/settings.svg") !important;
+      display: inline-flex;
+      display: -moz-inline-box;
+      /* Color */
+      -moz-context-properties: fill, fill-opacity !important;
+      fill: currentColor !important;
+      /* Align */
+      margin-inline-end: 5px;
+      vertical-align: -25%;
+    }
+    /* Pointer */
+    .contentSearchSuggestionTable .contentSearchOneOffItem,
+    #contentSearchSettingsButton {
+      cursor: pointer;
+    }
+    /*- Fix Color For Nightly ------------------------------------------------*/
+    .contentSearchSuggestionTable,
+    .contentSearchHeaderRow,
+    .contentSearchHeader,
+    .contentSearchSuggestionsContainer {
+      color: var(--newtab-text-primary-color) !important;
+      background: var(--newtab-search-background-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected,
+    .contentSearchSuggestionTable .contentSearchSettingsButton:hover {
+      color: var(--newtab-text-primary-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected,
+    .contentSearchSuggestionTable .contentSearchSettingsButton:hover,
+    .contentSearchSuggestionTable .contentSearchOneOffItem.selected {
+      background: var(--newtab-element-hover-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected:active,
+    .contentSearchSuggestionTable .contentSearchOneOffItem:active {
+      background: var(--newtab-element-active-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected .historyIcon {
+      fill: var(--newtab-icon-secondary-color) !important;
+    }
+  }
+  /** Activity Stream - Hide Firefox's logo ***********************************/
+  @media -moz-pref("userContent.newTab.hidden_logo") {
+    .logo-and-wordmark {
+      display: none !important;
+    }
+    .outer-wrapper:not(.fixed-search) .search-wrapper {
+      padding-top: 0 !important;
+    }
+  }
+  /** Activity Stream - Custom background image *******************************/
+  @media -moz-pref("userContent.newTab.background_image") {
+    body::before {
+      content: "";
+      position: fixed;
+      width: 100%;
+      height: 100%;
+      background-image: var(--uc-newTab-wallpaper, url("chrome://browser/skin/lepton/horizon-sunrise.svg"));
+      background-size: cover; /* or auto auto */
+      background-repeat: no-repeat;
+      background-position: right top;
+      background-attachment: fixed;
+      /** Use night sky version in dark mode **********************************/
+    }
+    @media (prefers-color-scheme: dark) {
+      body::before {
+        background-image: var(--uc-newTab-wallpaper, url("chrome://browser/skin/lepton/horizon-night.svg"));
+      }
+    }
+  }
+}
+/** Error Page - Restore illustrations ****************************************/
+@media -moz-pref("userContent.page.illustration") {
+  @-moz-document url-prefix("about:neterror"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
+  {
+    /* Illustrations Position */
+    #errorPageContainer,
+    .neterror > .container,
+    .description-wrapper {
+      min-height: 300px;
+      background-position: left center;
+      background-repeat: no-repeat;
+      background-size: 38%;
+      background-image: var(--uc-error-llustration);
+    }
+    #errorPageContainer {
+      display: flex;
+      flex-direction: column;
+    }
+    .description-wrapper {
+      padding-inline-start: 38%;
+    }
+    /* Container */
+    .container {
+      min-width: var(--in-content-container-min-width); /* 13em */
+      max-width: var(--in-content-container-max-width); /* 52em */
+    }
+    /* Text Position */
+    #text-container {
+      margin: auto;
+      padding-inline-start: 38%;
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml")
+  {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-connection-failure.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=dnsNotFound") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-server-not-found.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=blockedByPolicy"), url-prefix("about:neterror?e=deniedPortAccess"), url-prefix("about:neterror?e=malformedURI") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/illustrations/error-malformed-url.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=clockSkewError"), url-prefix("about:neterror?e=nssFailure") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/blue-berror.svg);
+    }
+    #errorPageContainer,
+    .neterror > .container {
+      background-size: 18.5em;
+    }
+  }
+  @-moz-document url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
+  {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-session-restore.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=fileNotFound") {
+    @media (min-width: 970px) {
+      .title {
+        background-image: url("chrome://global/skin/icons/info.svg") !important;
+      }
+    }
+    #text-container {
+      padding-inline-start: 0;
+    }
+  }
+  @-moz-document url-prefix("about:tabcrashed") {
+    @media (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/skin/tab-crashed.svg") !important;
+      }
+    }
+  }
+  @-moz-document url("about:robots"), url("chrome://browser/content/aboutRobots.xhtml")
+  {
+    @media (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/content/aboutRobots-icon.png") !important;
+      }
+    }
+  }
+  @-moz-document url("about:welcomeBack"), url("chrome://browser/content/aboutWelcomeBack.xhtml")
+  {
+    @media (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/skin/lepton/welcome-back.svg") !important;
+      }
+    }
+  }
+  @-moz-document url-prefix("about:preferences") {
+    #no-results-message::after {
+      content: url("chrome://browser/skin/lepton/no-search-results.svg");
+      width: 380px;
+      height: 293px;
+      margin-top: 64px;
+      margin-inline: auto;
+    }
+  }
+}
+/** Fully Dark Mode ***********************************************************/
+/*= Fully Dark Mode - Dark Mode Colors =======================================*/
+@media -moz-pref("userContent.page.proton_color") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^((jar:)?file:///).*/$")
+  {
+    /*= Default Colors - Hard Coded ==============================================*/
+    /* Based on chrome://global/skin/in-content/common.css */
+    :host,
+    :root {
+      --in-content-page-color: rgb(21, 20, 26);
+      --in-content-page-background: #fff;
+      --in-content-text-color: var(--in-content-page-color);
+      --in-content-deemphasized-text: rgb(91, 91, 102);
+      --in-content-box-background: #fff;
+      --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */
+      --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent);
+      --in-content-box-info-background: #f0f0f4;
+      --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent);
+      --in-content-item-hover-text: var(--in-content-page-color);
+      --in-content-item-selected: var(--in-content-primary-button-background);
+      --in-content-item-selected-text: var(--in-content-primary-button-text-color);
+      --in-content-icon-color: rgb(91, 91, 102);
+      --in-content-accent-color: #0a84ff;
+      --in-content-accent-color-active: #0060df;
+      --in-content-border-hover: var(--grey-90-a50);
+      --in-content-border-invalid: var(--red-50);
+      --in-content-border-color: #d7d7db;
+      --in-content-error-text-color: #c50042;
+      --in-content-link-color: var(--blue-60);
+      --in-content-link-color-hover: var(--blue-70);
+      --in-content-link-color-active: var(--blue-80);
+      --in-content-link-color-visited: var(--blue-60);
+      /* button background states are also used for checkboxes and radio buttons */
+      --in-content-button-text-color: var(--in-content-text-color);
+      --in-content-button-text-color-hover: var(--in-content-text-color);
+      --in-content-button-background: rgba(207, 207, 216, 0.33);
+      --in-content-button-background-hover: rgba(207, 207, 216, 0.66);
+      --in-content-button-background-active: rgb(207, 207, 216);
+      --in-content-primary-button-text-color: rgb(251, 251, 254);
+      --in-content-primary-button-text-color-hover: var(--in-content-primary-button-text-color);
+      --in-content-primary-button-background: #0061e0;
+      --in-content-primary-button-background-hover: #0250bb;
+      --in-content-primary-button-background-active: #053e94;
+      --in-content-danger-button-background: #e22850;
+      --in-content-danger-button-background-hover: #c50042;
+      --in-content-danger-button-background-active: #810220;
+      --in-content-focus-outline-color: var(--in-content-primary-button-background);
+      /* Note: 1px smaller than we want because we have a 1px transparent border. */
+      /* Once proton ships, these can probably stop being variables. */
+      --in-content-button-border-radius: 4px;
+      --in-content-button-horizontal-padding: 15px;
+      --in-content-button-vertical-padding: 7px;
+      --in-content-table-background: #f8f8fa;
+      --in-content-table-border-color: var(
+        --in-content-box-border-color
+      ); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */
+      --in-content-table-border-dark-color: var(--in-content-table-border-color);
+      --in-content-table-header-background: var(
+        --in-content-primary-button-background
+      ); /* Legacy: #0a84ff; rgb(5, 64, 150); */
+      --in-content-table-header-color: var(
+        --in-content-primary-button-text-color
+      ); /* Legacy: #ffffff; var(--in-content-page-color); */
+      --in-content-sidebar-width: 240px;
+      --dialog-warning-text-color: var(--red-60);
+      --checkbox-border-color: var(--in-content-box-border-color);
+      --checkbox-unchecked-bgcolor: var(--in-content-button-background);
+      --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover);
+      --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active);
+      --checkbox-checked-bgcolor: var(--in-content-primary-button-background);
+      --checkbox-checked-color: var(--in-content-primary-button-text-color);
+      --checkbox-checked-border-color: transparent;
+      --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover);
+      --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active);
+      --blue-40: #45a1ff;
+      --blue-50: #0a84ff;
+      --blue-60: #0060df;
+      --blue-70: #003eaa;
+      --blue-80: #002275;
+      --grey-30: #d7d7db;
+      --grey-60: #4a4a4f;
+      --grey-90-a10: rgba(12, 12, 13, 0.1);
+      --grey-90-a20: rgba(12, 12, 13, 0.2);
+      --grey-90-a30: rgba(12, 12, 13, 0.3);
+      --grey-90-a50: rgba(12, 12, 13, 0.5);
+      --grey-90-a60: rgba(12, 12, 13, 0.6);
+      --green-50: #30e60b;
+      --green-60: #12bc00;
+      --green-70: #058b00;
+      --green-80: #006504;
+      --green-90: #003706;
+      --orange-50: #ff9400;
+      --red-40: #ff4f5e;
+      --red-50: #ff0039;
+      --red-60: #d70022;
+      --red-70: #a4000f;
+      --red-80: #5a0002;
+      --red-90: #3e0200;
+      --yellow-50: #ffe900;
+      --yellow-60: #d7b600;
+      --yellow-60-a30: rgba(215, 182, 0, 0.3);
+      --yellow-70: #a47f00;
+      --yellow-80: #715100;
+      --yellow-90: #3e2800;
+      --shadow-10: 0 1px 4px var(--grey-90-a10);
+      --shadow-30: 0 4px 16px var(--grey-90-a10);
+      --card-padding: 16px;
+      --card-shadow: var(--shadow-10);
+      --card-outline-color: var(--grey-30);
+      --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+      --uc-warning-icon-bgcolor: #ffa436;
+    }
+    @media (prefers-color-scheme: dark) {
+      :host,
+      :root {
+        /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
+        --in-content-page-background: rgb(28, 27, 34);
+        --in-content-page-color: rgb(251, 251, 254);
+        --in-content-deemphasized-text: rgb(191, 191, 201);
+        --in-content-box-background: rgb(35, 34, 43);
+        --in-content-box-background-odd: rgba(249, 249, 250, 0.05);
+        --in-content-box-info-background: rgba(249, 249, 250, 0.15);
+        --in-content-border-color: rgba(249, 249, 250, 0.2);
+        --in-content-border-hover: rgba(249, 249, 250, 0.3);
+        --in-content-border-invalid: rgb(255, 132, 139);
+        --in-content-error-text-color: #ff9aa2;
+        --in-content-button-background: rgb(43, 42, 51);
+        --in-content-button-background-hover: rgb(82, 82, 94);
+        --in-content-button-background-active: rgb(91, 91, 102);
+        --in-content-icon-color: rgb(251, 251, 254);
+        --in-content-primary-button-text-color: rgb(43, 42, 51);
+        --in-content-primary-button-background: rgb(0, 221, 255);
+        --in-content-primary-button-background-hover: rgb(128, 235, 255);
+        --in-content-primary-button-background-active: rgb(170, 242, 255);
+        --in-content-danger-button-background: #ff848b;
+        --in-content-danger-button-background-hover: #ffbdc5;
+        --in-content-danger-button-background-active: #ffdfe7;
+        --in-content-table-background: rgb(35, 34, 43);
+        --in-content-table-border-dark-color: var(--in-content-box-border-color);
+        --in-content-accent-color: var(--in-content-primary-button-background);
+        --in-content-accent-color-active: var(--in-content-primary-button-background-hover);
+        --in-content-link-color: var(--in-content-primary-button-background);
+        --in-content-link-color-hover: var(--in-content-primary-button-background-hover);
+        --in-content-link-color-active: var(--in-content-primary-button-background-active);
+        --in-content-link-color-visited: var(--in-content-link-color);
+        --card-outline-color: var(--grey-60);
+        --dialog-warning-text-color: var(--red-40);
+        --uc-warning-icon-bgcolor: #ffbd4f;
+      }
+    }
+    @media (prefers-contrast) {
+      :host,
+      :root {
+        --uc-warning-icon-bgcolor: var(--in-content-page-color);
+      }
+    }
+    /*= Menu color #477 ==========================================================*/
+    @media (-moz-platform: windows) {
+      :root {
+        /* Override some menu color variables for light browser themes. */
+        --menuitem-hover-background-color: #e0e0e6;
+        --menu-background-color: #f9f9fb;
+        --menu-color: #15141a;
+        --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+        --menu-disabled-color: rgba(21, 20, 26, 0.4);
+        --menu-border-color: #cfcfd8;
+        --menu-icon-opacity: 0.7;
+        /* Declare menu colors for dark themes, but don't override anything yet. */
+        --dark-menuitem-hover-background-color: #52525e;
+        --dark-menu-background-color: #2b2a33;
+        --dark-menu-color: #fbfbfe;
+        --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+        --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+        --dark-menu-border-color: #5b5b66;
+        --dark-menu-icon-opacity: 1;
+      }
+      /* Override the menu color variables for dark browser themes. */
+    }
+    @media (-moz-platform: windows) and (prefers-color-scheme: dark) {
+      :root {
+        --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+        --menu-background-color: var(--dark-menu-background-color);
+        --menu-color: var(--dark-menu-color);
+        --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+        --menu-disabled-color: var(--dark-menu-disabled-color);
+        --menu-border-color: var(--dark-menu-border-color);
+        --menu-icon-opacity: var(--dark-menu-icon-opacity);
+      }
+    }
+    @media -moz-pref("userChrome.theme.non_native_menu") {
+      @media (-moz-gtk-csd-available) {
+        :root {
+          /* Override some menu color variables for light browser themes. */
+          --menuitem-hover-background-color: #e0e0e6;
+          --menu-background-color: #f9f9fb;
+          --menu-color: #15141a;
+          --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+          --menu-disabled-color: rgba(21, 20, 26, 0.4);
+          --menu-border-color: #cfcfd8;
+          --menu-icon-opacity: 0.7;
+          /* Declare menu colors for dark themes, but don't override anything yet. */
+          --dark-menuitem-hover-background-color: #52525e;
+          --dark-menu-background-color: #2b2a33;
+          --dark-menu-color: #fbfbfe;
+          --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+          --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+          --dark-menu-border-color: #5b5b66;
+          --dark-menu-icon-opacity: 1;
+        }
+        /* Override the menu color variables for dark browser themes. */
+      }
+      @media (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+        :root {
+          --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+          --menu-background-color: var(--dark-menu-background-color);
+          --menu-color: var(--dark-menu-color);
+          --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+          --menu-disabled-color: var(--dark-menu-disabled-color);
+          --menu-border-color: var(--dark-menu-border-color);
+          --menu-icon-opacity: var(--dark-menu-icon-opacity);
+        }
+      }
+    }
+    @media -moz-pref("userContent.page.proton_color.dark_blue_accent") or -moz-pref("userContent.page.proton_color.system_accent") {
+      :root,
+      :host(.anonymous-content-host) {
+        --color-accent-primary: var(--in-content-primary-button-background) !important;
+        --color-accent-primary-hover: var(--in-content-primary-button-background-hover) !important;
+        --color-accent-primary-active: light-dark(var(--color-blue-70), var(--color-cyan-20));
+      }
+    }
+    @media -moz-pref("userContent.page.proton_color.dark_blue_accent") {
+      @media (prefers-color-scheme: dark) {
+        :host,
+        :root {
+          /* Color Memo
+           Just refer - Photon's dark color
+           --button-primary-bgcolor: #0060DF;
+           --button-primary-hover-bgcolor: #003EAA;
+           --button-primary-active-bgcolor: #002275;
+           --lwt-brighttext-url-color: #74c0ff;
+           --lwt-toolbarbutton-icon-fill-attention: #45a1ff;
+
+           Just refer - Proton's light color
+           --in-content-accent-color: #0a84ff;
+           --in-content-accent-color-active: #0060df;
+           --in-content-primary-button-background: #0061e0;
+           --in-content-primary-button-background-hover: #0250bb;
+           --in-content-primary-button-background-active: #053e94;
+
+           --blue-40: #45a1ff; rgb(69, 161, 255)
+           --blue-50: #0a84ff; rgb(10, 132, 255)
+           --blue-60: #0060df; rgb(0, 96, 223)
+           --blue-70: #003eaa; rgb(0, 62, 170)
+           --blue-80: #002275; rgb(0, 34, 117)
+
+           Relation
+           lighten(#0060df,   29%): #74b0ff;
+           lighten(#0060df, 19.8%): #4595ff
+           lighten(#0060df,  8.3%): #0a74ff
+           #0060df
+           darken(#0060df, 15.5%):  #003e90;
+           darken(#0060df, 28.1%):  #002250;
+          */
+          --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/
+          --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */
+        }
+        :host,
+        :root {
+          --in-content-primary-button-text-color: var(--in-content-page-color) !important;
+          --in-content-primary-button-background: var(--blue-60) !important;
+          --in-content-primary-button-background-hover: var(--blue-50) !important;
+          --in-content-primary-button-background-active: var(--blue-40) !important;
+          --in-content-focus-outline-color: var(--blue-40) !important;
+          --in-content-accent-color: var(--blue-40) !important;
+          --in-content-accent-color-active: var(--blue-30) !important;
+          --in-content-table-background: rgb(35, 34, 43) !important;
+          --in-content-table-border-color: rgba(249, 249, 250, 0.2) !important;
+          --in-content-table-header-background: rgb(5, 64, 150) !important;
+          --in-content-table-header-color: var(--in-content-page-color) !important;
+          --in-content-link-color: var(--blue-40) !important;
+          --in-content-link-color-hover: var(--blue-30) !important;
+          --in-content-link-color-active: var(--blue-20) !important;
+          --in-content-link-color-visited: var(--blue-40) !important;
+        }
+      }
+    }
+    @media -moz-pref("userContent.page.proton_color.system_accent") {
+      :host,
+      :root {
+        --in-content-primary-button-text-color: AccentColorText !important;
+        --in-content-primary-button-background: AccentColor !important;
+        --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, AccentColor) !important;
+        --in-content-primary-button-background-active: color-mix(in srgb, black 20%, AccentColor) !important;
+      }
+      @media -moz-pref("userChrome.compatibility.accent_color") {
+        :host,
+        :root {
+          --in-content-primary-button-text-color: HighlightText !important;
+          --in-content-primary-button-background: Highlight !important;
+          --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, Highlight) !important;
+          --in-content-primary-button-background-active: color-mix(in srgb, black 20%, Highlight) !important;
+        }
+      }
+    }
+  }
+}
+@media -moz-pref("userContent.page.dark_mode") {
+  @media (prefers-color-scheme: dark) {
+    /*= Addons.org =============================================================*/
+    @-moz-document url-prefix("https://addons.mozilla.org")
+    {
+      /* Basic */
+      .Page-content,
+      .SecondaryHero,
+      body,
+      main[aria-label="Content"] {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-page-background) !important;
+      }
+      /* Text */
+      input,
+      textarea,
+      select,
+      .AutoSearchInput-query,
+      .AutoSearchInput-suggestions-list,
+      .Page-content h1,
+      .Page-content h2,
+      .SearchResult-link,
+      .Home-SubjectShelf-link:link,
+      .Home-SubjectShelf-link:visited,
+      .DropdownMenuItem-link a,
+      .DropdownMenuItem-link button,
+      .Select,
+      .Badge,
+      .Notice-generic,
+      .Notice-genericWarning,
+      .Notice-button,
+      .Paginate .Button.Paginate-item:first-child,
+      .Paginate .Button.Paginate-item:last-child,
+      .Paginate .Button.Paginate-item--current-page,
+      .Button--neutral,
+      .blog-entry-title,
+      .blogpost-nav * {
+        color: var(--in-content-text-color) !important;
+      }
+      .AutoSearchInput-suggestions-item:is(:active, :focus, :hover),
+      .AutoSearchInput-suggestions-item--highlighted,
+      .SecondaryHero-message-link,
+      .SecondaryHero-module-link,
+      .Card-contents a:not(.Button),
+      .Card-footer-link a,
+      .Card-shelf-footer-in-header a,
+      .SearchResult-link:is(:active, :focus, :hover),
+      .SearchResult:hover .SearchResult-link,
+      .Home-SubjectShelf-link:is(:active, :focus, :hover),
+      .DropdownMenuItem-link a:is(:active, :focus, :hover),
+      .DropdownMenuItem-link button:is(:active, :focus, :hover),
+      .AddonMeta .MetadataCard-title a:is(:active, :hover),
+      .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link:is(:active, :hover),
+      .AddonMeta .MetadataCard-content a:is(:active, :hover),
+      .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link:is(:active, :hover),
+      .Addon-summary a,
+      .RatingsByStar-count a:hover,
+      .RatingsByStar-star a:hover,
+      .Paginate .Button.Paginate-item:not(:first-child, :last-child, .Paginate-item--current-page),
+      .AddonTitle-author a,
+      .PermissionsCard-learn-more,
+      .DefinitionList a,
+      .ShowMoreCard-contents a,
+      .AddonDescription-contents a,
+      .AddonTitle a,
+      .TooltipMenu-opener,
+      .LanguageTools .Card-contents a,
+      .Button--primary,
+      .blog-entry-read-more-link,
+      .blogpost-nav-next.blogpost-nav-no-prev:hover p,
+      .blogpost-content-wrapper p a,
+      .blogpost-nav-prev:hover p,
+      .blogpost-nav-next:hover p {
+        color: var(--in-content-link-color) !important;
+      }
+      .SearchResult--meta-section,
+      .MetadataCard-title,
+      .MetadataCard-title a,
+      .MetadataCard-content a,
+      .CollectionSort-label,
+      .SearchResult-summary,
+      .SearchResult-note,
+      .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link,
+      .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link,
+      .PermissionsCard-subhead--optional,
+      .PermissionsCard-subhead--required,
+      .Definition-dt,
+      .RatingsByStar-count a,
+      .RatingsByStar-star a,
+      .Paginate-page-number,
+      .AddonSummaryCard-addonAverage,
+      .AddonReviewCard-authorByLine,
+      .UserReview-byLine,
+      .UserReview-reply-header,
+      .Home-heroHeader-subtitle,
+      .blog-entry-date,
+      .blogpost-breadcrumb *,
+      .AddonTitle-author,
+      .ExpandableCard-ToggleLink,
+      .SearchFilters-label,
+      .PromotedBadge-label--line {
+        color: var(--in-content-deemphasized-text) !important;
+      }
+      .PromotedBadge-label--recommended {
+        color: color-mix(in srgb, #712b00 15%, #ff9400) !important;
+      }
+      /* Background */
+      .Button--action,
+      .DevHub-Navigation ul li.DevHub-Navigation-Register .Button,
+      .DevHub-MyAddons-item-buttons-submit .Button {
+        color: var(--in-content-primary-button-text-color) !important;
+        background: var(--in-content-primary-button-background) !important;
+      }
+      select,
+      .Select,
+      .Button--primary,
+      .Button--neutral,
+      .Button--neutral:link,
+      .Notice-button,
+      .AMInstallButton .AMInstallButton-loading-button {
+        background-color: var(--in-content-button-background) !important;
+      }
+      .Button--primary:hover,
+      .Button--neutral.Button--micro:not(.Button--disabled):hover,
+      .Button--neutral:not(.Button--disabled):hover,
+      .Notice-button:hover {
+        background: var(--in-content-button-background-hover) !important;
+      }
+      .Button--action.Button--micro:not(.Button--disabled):hover,
+      .Button--action:not(.Button--disabled):hover,
+      .DevHub-Navigation ul li.DevHub-Navigation-Register .Button:hover,
+      .DevHub-MyAddons-item-buttons-submit .Button:hover {
+        background: var(--in-content-primary-button-background-hover) !important;
+      }
+      .ShowMoreCard-contents::after {
+        background: linear-gradient(hsla(0deg, 0%, 100%, 0), var(--in-content-table-background)) !important;
+      }
+      input,
+      textarea,
+      .AutoSearchInput-query,
+      .AutoSearchInput-suggestions-list,
+      .SecondaryHero-module,
+      .Card-header,
+      .Card-contents,
+      .CardList ul > li,
+      .AddonsCard--horizontal ul.AddonsCard-list .SearchResult-wrapper:is(:focus, :hover),
+      .Paginate,
+      .LandingPage-header,
+      .DropdownMenu-items,
+      .DropdownMenu-items::after,
+      .MetadataCard,
+      .AddonsCard-list,
+      .Card-footer,
+      .StaticAddonCard,
+      .blogpost-nav,
+      .blogpost-nav * {
+        background: var(--in-content-table-background) !important;
+      }
+      .Paginate .Button.Paginate-item:is(:active, :hover) {
+        background: var(--in-content-button-background-hover) !important;
+      }
+      .Notice-generic,
+      .Notice-genericWarning {
+        background: color-mix(
+          in srgb,
+          var(--in-content-page-background) 40%,
+          var(--in-content-table-background)
+        ) !important;
+      }
+      .LanguageTools-header-row {
+        color: var(--in-content-table-header-color) !important;
+        background: var(--in-content-table-header-background) !important;
+      }
+      .LanguageTools-table.responsiveTable tbody tr:nth-child(2n) {
+        background-color: var(--in-content-box-background-odd) !important;
+      }
+      /* Fill */
+      .Icon-arrow-blue.SearchSuggestion-icon-arrow {
+        filter: hue-rotate(330deg) brightness(1.3) !important;
+      }
+      .SecondaryHero-module-icon {
+        filter: invert(85%) !important;
+      }
+      .Icon-magnifying-glass,
+      .Notice-icon {
+        filter: invert(65%) !important;
+      }
+      .PermissionsCard-learn-more .Icon,
+      .Permission .Icon {
+        filter: invert(100%) !important;
+      }
+      .Icon-heart {
+        filter: brightness(0) !important;
+      }
+      /* Others */
+      .DropdownMenu-items {
+        box-shadow: 0 0 2px var(--in-content-border-color) !important;
+      }
+      input,
+      textarea,
+      select {
+        border-color: var(--in-content-box-border-color) !important;
+      }
+      .UserProfileEdit input:disabled,
+      .UserProfileEdit textarea:disabled {
+        background-color: var(--in-content-box-background-odd) !important;
+      }
+      .AutoSearchInput-query {
+        border: 1px solid var(--in-content-table-background) !important;
+      }
+      .AutoSearchInput-query:is(:hover, :focus),
+      .UserProfileEditNotifications .UserProfileEditNotification-input:checked ~ .UserProfileEditNotification-checkbox {
+        border-color: var(--in-content-primary-button-background) !important;
+      }
+      .UserProfileEdit input:focus,
+      .UserProfileEdit textarea:focus,
+      .AutoSearchInput-query:focus,
+      .UserProfileEditNotifications .UserProfileEditNotification-input:focus ~ .UserProfileEditNotification-checkbox {
+        box-shadow: inset 0 0 0 1px var(--in-content-primary-button-background),
+          0 0 0 1px var(--in-content-primary-button-background), 0 0 0 4px rgba(0, 211, 255, 0.3) !important;
+      }
+      .PromotedBadge-link--line {
+        border-color: var(--in-content-deemphasized-text) !important;
+      }
+      .PromotedBadge-link--line:hover {
+        border-color: var(--in-content-button-background-hover) !important;
+      }
+      .blog-entry-read-more-link {
+        border-color: var(--in-content-link-color) !important;
+      }
+      .blogpost-nav-arrow-left .cls-1,
+      .blogpost-nav-arrow-right .cls-1 {
+        stroke: var(--in-content-text-color) !important;
+      }
+      /* /developers/ */
+      .DevHub-Navigation-Logo > .Logo::before {
+        -moz-context-properties: fill !important;
+        fill: var(--in-content-primary-button-background) !important;
+        background-image: url("chrome://browser/skin/lepton/addons-logo.svg") !important;
+      }
+      .DevHub-Navigation,
+      .DevHub-submit-addon,
+      .DevHub-get-involved,
+      .DevHub-MyAddons > * {
+        background: var(--in-content-page-background) !important;
+        color: var(--in-content-page-color) !important;
+      }
+      .DevHub-Footer {
+        background: var(--in-content-box-background) !important;
+        color: var(--in-content-page-color) !important;
+      }
+      .DevHub-callout-box {
+        background: var(--in-content-box-background-odd) !important;
+        color: var(--in-content-page-color) !important;
+      }
+      .DevHub-Navigation.scheme-light ul li a,
+      .DevHub-Footer-sections-header,
+      .DevHub-Footer-section h4,
+      .DevHub-Footer-section p,
+      .DevHub-content-copy h2 {
+        color: var(--in-content-page-color) !important;
+      }
+      .DevHub-content-copy p,
+      .DevHub-callout-box p {
+        color: var(--in-content-deemphasized-text) !important;
+      }
+      .DevHub-Banner a,
+      .DevHub-Footer a,
+      .DevHub-MyAddons-list a,
+      .DevHub-MyAddons-item-buttons-all,
+      .DevHub-content-copy a,
+      .DevHub-callout-box a {
+        color: var(--in-content-link-color) !important;
+      }
+      body:is(.developer-hub, .statistics) {
+        /* Elements */
+        /* .developer-hub */
+        /* Text */
+        /* .developer-hub */
+        /* Background */
+        /* Border */
+        /* Others */
+      }
+      body:is(.developer-hub, .statistics) #main-wrapper,
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after,
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li:hover::after,
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul,
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul a,
+      body:is(.developer-hub, .statistics) .menu-nav em,
+      body:is(.developer-hub, .statistics) .primary,
+      body:is(.developer-hub, .statistics) .secondary,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item {
+        background: var(--in-content-page-background) !important;
+        color: var(--in-content-page-color) !important;
+      }
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul a:hover,
+      body:is(.developer-hub, .statistics) .install-note,
+      body:is(.developer-hub, .statistics) .modal,
+      body:is(.developer-hub, .statistics) .popup {
+        background: var(--in-content-box-background-odd) !important;
+      }
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after,
+      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul {
+        box-shadow: 0 0 3px var(--in-content-border-color) !important;
+      }
+      body:is(.developer-hub, .statistics) #footer {
+        background: linear-gradient(
+          to bottom,
+          var(--in-content-page-background) 0,
+          var(--in-content-page-background) 123px,
+          #0c99d5 123px,
+          #0c99d5 200px,
+          var(--in-content-page-background) 200px,
+          rgba(12, 153, 213, 0) 400px
+        ) !important;
+      }
+      body:is(.developer-hub, .statistics) #homepage h2,
+      body:is(.developer-hub, .statistics) header h2,
+      body:is(.developer-hub, .statistics) .primary h2,
+      body:is(.developer-hub, .statistics) h1,
+      body:is(.developer-hub, .statistics) hgroup h2.addon,
+      body:is(.developer-hub, .statistics) hgroup h2.collection,
+      body:is(.developer-hub, .statistics) h3,
+      body:is(.developer-hub, .statistics) .results h4,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item:hover h5,
+      body:is(.developer-hub, .statistics) .secondary .addon-status,
+      body:is(.developer-hub, .statistics) .secondary .addon-status .addon-details li.addon-listed-status,
+      body:is(.developer-hub, .statistics) #refine-results h5,
+      body:is(.developer-hub, .statistics) .island.criteria li,
+      body:is(.developer-hub, .statistics) .two-up div {
+        color: var(--in-content-page-color) !important;
+      }
+      body:is(.developer-hub, .statistics) .item-actions h5,
+      body:is(.developer-hub, .statistics) .item-actions > ul,
+      body:is(.developer-hub, .statistics) .item-actions > ul > li,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item .item-actions a,
+      body:is(.developer-hub, .statistics) .edit-media-details,
+      body:is(.developer-hub, .statistics) .devhub-form table th,
+      body:is(.developer-hub, .statistics) #recent-activity .listing .item .timestamp,
+      body:is(.developer-hub, .statistics) #upload-file .upload-status #uploadstatus,
+      body:is(.developer-hub, .statistics) #addon-validator-suite,
+      body:is(.developer-hub, .statistics) #addon-validator-suite .msg > *,
+      body:is(.developer-hub, .statistics) .island.criteria li a.inactive {
+        color: var(--in-content-deemphasized-text) !important;
+      }
+      body:is(.developer-hub, .statistics) section[role="main"] a,
+      body:is(.developer-hub, .statistics) header a,
+      body:is(.developer-hub, .statistics) .more-info,
+      body:is(.developer-hub, .statistics) .primary a,
+      body:is(.developer-hub, .statistics) .secondary a,
+      body:is(.developer-hub, .statistics) .submission-type-tabs a,
+      body:is(.developer-hub, .statistics) .popup a,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item:hover a,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item:hover .item-actions a,
+      body:is(.developer-hub, .statistics) #upload-status-results.status-pass strong,
+      body:is(.developer-hub, .statistics) #addon-validator-suite a,
+      body:is(.developer-hub, .statistics) #create-addon a,
+      body:is(.developer-hub, .statistics) .html-support {
+        color: var(--in-content-link-color) !important;
+      }
+      body:is(.developer-hub, .statistics) .dashboard .listing .item:hover a {
+        color: var(--in-content-link-color-hover) !important;
+      }
+      body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .downloads,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .price,
+      body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .users {
+        color: var(--green-60) !important;
+      }
+      body:is(.developer-hub, .statistics) .status-admin-disabled b,
+      body:is(.developer-hub, .statistics) .status-disabled b,
+      body:is(.developer-hub, .statistics) .status-incomplete b,
+      body:is(.developer-hub, .statistics) .status-purgatory b {
+        color: var(--red-60) !important;
+      }
+      body:is(.developer-hub, .statistics) .submission-type-tabs a.active,
+      body:is(.developer-hub, .statistics) .island.criteria li.selected a {
+        color: var(--orange-50) !important;
+      }
+      body:is(.developer-hub, .statistics) .secondary .addon-status,
+      body:is(.developer-hub, .statistics) .devhub-form .item,
+      body:is(.developer-hub, .statistics) #icons_default,
+      body:is(.developer-hub, .statistics) .listing .item,
+      body:is(.developer-hub, .statistics) .object-lead,
+      body:is(.developer-hub, .statistics) #addon-validator-suite .results .tier-results,
+      body:is(.developer-hub, .statistics) #addon-validator-suite .suite,
+      body:is(.developer-hub, .statistics) #addon-validator-suite .suite-container {
+        border-color: var(--in-content-border-color) !important;
+        background: var(--in-content-box-background) !important;
+      }
+      body:is(.developer-hub, .statistics) .highlight,
+      body:is(.developer-hub, .statistics) .listing-footer,
+      body:is(.developer-hub, .statistics) .tab-wrapper .fm-control {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-box-info-background) !important;
+      }
+      body:is(.developer-hub, .statistics) .submission-type-tabs a,
+      body:is(.developer-hub, .statistics) #head-chart {
+        background: var(--in-content-page-background) !important;
+      }
+      body:is(.developer-hub, .statistics) #head-chart rect {
+        fill: var(--in-content-page-background) !important;
+      }
+      body:is(.developer-hub, .statistics) #head-chart text {
+        fill: var(--in-content-deemphasized-text) !important;
+      }
+      body:is(.developer-hub, .statistics) #head-chart .highcharts-legend .highcharts-legend-item:hover text {
+        fill: var(--in-content-page-color) !important;
+        paint-order: stroke !important;
+        stroke: var(--in-content-page-color) !important;
+        stroke-width: 0.4px !important;
+        stroke-linecap: butt !important;
+        stroke-linejoin: miter !important;
+      }
+      body:is(.developer-hub, .statistics)
+        #head-chart
+        .highcharts-legend
+        .highcharts-legend-item
+        path[stroke="#CCC"]
+        ~ text {
+        fill: #ccc !important;
+      }
+      body:is(.developer-hub, .statistics) #icons_default li a:hover,
+      body:is(.developer-hub, .statistics) #side-nav .active a,
+      body:is(.developer-hub, .statistics) span.tip,
+      body:is(.developer-hub, .statistics) .addon-submission-process .tip,
+      body:is(.developer-hub, .statistics) .devhub-form .tip,
+      body:is(.developer-hub, .statistics) a.remove,
+      body:is(.developer-hub, .statistics) span.remove,
+      body:is(.developer-hub, .statistics) ul.errorlist li span.tip {
+        background-color: var(--in-content-box-info-background) !important;
+      }
+      body:is(.developer-hub, .statistics) a.remove:hover,
+      body:is(.developer-hub, .statistics) span.tip:hover {
+        background-color: var(--in-content-primary-button-background-hover) !important;
+      }
+      body:is(.developer-hub, .statistics) .submission-type-tabs a,
+      body:is(.developer-hub, .statistics) .devhub-sidebar,
+      body:is(.developer-hub, .statistics) .devhub-sidebar div.item,
+      body:is(.developer-hub, .statistics) .devhub-form .listing-footer {
+        border-color: var(--in-content-border-color) !important;
+      }
+      body:is(.developer-hub, .statistics) #background-wrapper,
+      body:is(.developer-hub, .statistics) #main-wrapper {
+        border-color: var(--in-content-page-background) !important;
+      }
+      body:is(.developer-hub, .statistics) .item-actions a.more-actions:hover:after,
+      body:is(.developer-hub, .statistics) .item-actions button.link.more-actions:hover:after,
+      body:is(.developer-hub, .statistics) #change-locale::after {
+        border-top-color: var(--in-content-link-color) !important;
+      }
+      body:is(.developer-hub, .statistics) install-note::after,
+      body:is(.developer-hub, .statistics) .popup::after {
+        border-bottom-color: var(--in-content-box-background) !important;
+      }
+      body:is(.developer-hub, .statistics) .install-note::before,
+      body:is(.developer-hub, .statistics) .popup::before {
+        border-bottom-color: grey !important;
+      }
+      body:is(.developer-hub, .statistics) #refine-results,
+      body:is(.developer-hub, .statistics) .other-categories,
+      body:is(.developer-hub, .statistics) .versions .primary > .warning {
+        border-color: transparent !important;
+      }
+      body:is(.developer-hub, .statistics) .results {
+        border-color: var(--in-content-box-background-odd) !important;
+        background: transparent !important;
+      }
+      body:is(.developer-hub, .statistics) .results-inner {
+        border-color: var(--in-content-border-color) !important;
+        background: var(--in-content-border-color) !important;
+      }
+      body:is(.developer-hub, .statistics) #promos .view-button a,
+      body:is(.developer-hub, .statistics) #upload-file-finish.button,
+      body:is(.developer-hub, .statistics) #upload-file-widget .button.prominent,
+      body:is(.developer-hub, .statistics) .button,
+      body:is(.developer-hub, .statistics) .cta a.button:link,
+      body:is(.developer-hub, .statistics) .cta a.button:visited,
+      body:is(.developer-hub, .statistics) .linux .button.linux,
+      body:is(.developer-hub, .statistics) .mac .button.mac,
+      body:is(.developer-hub, .statistics) .other .button.bsd,
+      body:is(.developer-hub, .statistics) .other .button.solaris,
+      body:is(.developer-hub, .statistics) .sidebar a.button,
+      body:is(.developer-hub, .statistics) .sidebar button,
+      body:is(.developer-hub, .statistics) .theme .choices button,
+      body:is(.developer-hub, .statistics) .theme-queue a.button,
+      body:is(.developer-hub, .statistics) .theme-queue button,
+      body:is(.developer-hub, .statistics) .windows .button.windows,
+      body:is(.developer-hub, .statistics) a.button:link,
+      body:is(.developer-hub, .statistics) a.button:visited,
+      body:is(.developer-hub, .statistics) a.delete-button.delete-addon,
+      body:is(.developer-hub, .statistics) button,
+      body:is(.developer-hub, .statistics) button.button,
+      body:is(.developer-hub, .statistics) input:not(.upvotes):not(.downvotes)[type="submit"] {
+        color: var(--in-content-primary-button-text-color) !important;
+        background: var(--in-content-primary-button-background) !important;
+      }
+      body:is(.developer-hub, .statistics) #promos .view-button a:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) #upload-file-finish.button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) #upload-file-widget .button.prominent:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .cta a.button:link:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .cta a.button:visited:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .linux .button.linux:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .mac .button.mac:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .other .button.bsd:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .other .button.solaris:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .sidebar a.button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .sidebar button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .theme .choices button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .theme-queue a.button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .theme-queue button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) .windows .button.windows:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) a.button:link:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) a.button:visited:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) a.delete-button.delete-addon:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics) button.button:is(.selected, :focus, :hover),
+      body:is(.developer-hub, .statistics)
+        input:not(.upvotes):not(.downvotes)[type="submit"]:is(.selected, :focus, :hover) {
+        background: var(--in-content-primary-button-background-hover) !important;
+      }
+      body:is(.developer-hub, .statistics) .edit_with_prefix span,
+      body:is(.developer-hub, .statistics) .edit_with_suffix span {
+        border-color: var(--in-content-box-border-color) !important;
+        background-color: var(--in-content-box-background-odd) !important;
+        color: var(--in-content-deemphasized-text) !important;
+        padding-block: 3px !important;
+        cursor: not-allowed;
+      }
+      body:is(.developer-hub, .statistics) .devhub-form .item_wrapper input[type="email"] {
+        appearance: none !important;
+        padding: 2px 5px;
+        border: 1px solid;
+      }
+      body:is(.developer-hub, .statistics) #addon-validator-suite .suite-summary {
+        color: var(--in-content-deemphasized-text) !important;
+        background: var(--in-content-button-background) !important;
+        border-top-color: var(--in-content-border-color) !important;
+      }
+      body:is(.developer-hub, .statistics) #addon-validator-suite .context {
+        border-color: var(--in-content-box-border-color) !important;
+        background-color: var(--in-content-button-background) !important;
+        background: var(--in-content-table-background) !important;
+      }
+    }
+    /*= Support.org ============================================================*/
+    @-moz-document url-prefix("https://support.mozilla.org")
+    {
+      /* Basic */
+      :root {
+        --color-blue-06: var(--in-content-link-color) !important;
+        --color-blue-07: var(--in-content-link-color-hover) !important;
+        --color-blue-09: var(--in-content-link-color-active) !important;
+        --page-bg: var(--in-content-page-background) !important;
+        --color-white: var(--in-content-page-background) !important;
+        --color-shade-bg: var(--in-content-page-background) !important;
+        --color-marketing-gray-02: var(--card-outline-color) !important;
+        --color-inverse-bg: var(--in-content-page-color) !important;
+        --color-inverse: var(--in-content-page-background) !important;
+        --color-text: var(--in-content-page-color) !important;
+        --color-moz-text: var(--in-content-page-color) !important;
+        --color-moz-heading: var(--in-content-page-color) !important;
+        --color-text-light: var(--in-content-deemphasized-text) !important;
+        --color-link: var(--in-content-link-color) !important;
+        --color-success: var(--green-70) !important;
+        --color-warning: var(--yellow-80) !important;
+        --color-error: var(--red-60) !important;
+        --color-error-hover: var(--red-50) !important;
+        --color-moz-heading: #fff;
+        --color-moz-inverse-bg: var(red) !important;
+        --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent),
+          0 0 0 2px var(--in-content-primary-button-background-active);
+        --color-dark-gray-10: var(--in-content-deemphasized-text) !important;
+      }
+      .warning {
+        --color-link: rgb(55, 255, 255) !important;
+      }
+      body,
+      #main-content,
+      #instant-search-content,
+      #mzp-c-menu-panel-help,
+      .mzp-c-navigation,
+      .kbox-container {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-page-background) !important;
+      }
+      #editor {
+        border: 2px solid var(--in-content-border-color) !important;
+      }
+      .CodeMirror-linenumbers {
+        background: var(--in-content-table-background);
+      }
+      .CodeMirror-lines {
+        color: var(--in-content-deemphasized-text) !important;
+        background: var(--in-content-page-background) !important;
+      }
+      .CodeMirror-scroll {
+        background: var(--in-content-page-background) !important;
+      }
+      /* Text */
+      blockquote,
+      .mzp-c-menu-category .mzp-c-menu-title,
+      .mzp-c-menu-item .mzp-c-menu-item-link,
+      .mzp-c-menu-item .mzp-c-menu-item-link > *,
+      .mzp-c-menu-item .mzp-c-menu-item-list a,
+      #doc-content .menu,
+      .document--content .menu,
+      .forum--entry-content .menu,
+      .tag-name a {
+        color: var(--in-content-page-color) !important;
+      }
+      .ts-select-trigger,
+      input[type="date"],
+      input[type="email"],
+      input[type="number"],
+      input[type="password"],
+      input[type="search"],
+      input[type="tel"],
+      input[type="text"],
+      input[type="time"],
+      input[type="url"],
+      select,
+      textarea,
+      #doc-content .button,
+      #doc-content .key,
+      .document--content .button,
+      .document--content .key,
+      .forum--entry-content .button,
+      .forum--entry-content .key {
+        color: var(--in-content-deemphasized-text) !important;
+      }
+      .tag-list a {
+        color: var(--color-marketing-gray-10) !important;
+      }
+      .tag-list a:hover,
+      .sidebar-nav a:hover {
+        color: var(--color-link) !important;
+      }
+      .tag-list li {
+        background: var(--in-content-page-color) !important;
+      }
+      .tag-list li:hover {
+        background: var(--in-content-deemphasized-text) !important;
+      }
+      #remaining-characters {
+        color: var(--in-content-page-color) !important;
+      }
+      /* Background */
+      .sidebar-nav.topics,
+      .sidebar-nav.topics > li {
+        background: var(--in-content-page-background) !important;
+      }
+      .mzp-c-menu-panel {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-page-background) !important;
+      }
+      .mzp-c-menu-list-list,
+      .mzp-c-menu-list-list:hover {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-box-background) !important;
+      }
+      .mzp-c-menu-list-item:focus,
+      .mzp-c-menu-list-item:hover {
+        background: var(--in-content-button-background-hover) !important;
+      }
+      .cm-bold {
+        color: var(--in-content-page-color) !important;
+      }
+      /* Fill */
+      .sumo-nav--logo,
+      .sumo-nav--search-button,
+      .sumo-nav--toggle-button,
+      .card:not(.is-inverse) .card--icon-sm,
+      .mzp-c-menu-item-icon,
+      .mzp-c-menu-button-close,
+      .topic-article--icon,
+      .card--topic > .card--icon,
+      .mzp-c-details .is-summary button::before,
+      details .is-summary button::before,
+      summary::before,
+      .icon-button > button,
+      .search-button,
+      img:is(.pencil, .thumbsup, .syncing.icon),
+      #step-indicator li:not([status="done"])::before {
+        filter: invert(95%) !important;
+      }
+      button.markup-toolbar-button {
+        /*using 0.5 because in middle*/
+        filter: invert(0.5) !important;
+      }
+      /* Others */
+      .support-callouts > .card.is-inverse {
+        background: #20133a !important;
+      }
+      .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) {
+        color: var(--in-content-page-color) !important;
+      }
+      blockquote {
+        border-color: var(--in-content-border-color) !important;
+      }
+      .sumo-button.secondary-button {
+        border-color: transparent !important;
+      }
+      .mzp-c-menu-panel {
+        border-color: var(--in-content-button-background-hover) !important;
+      }
+      .mzp-c-menu-item:is(:focus, :hover, :active) .mzp-c-menu-item-link .mzp-c-menu-item-title {
+        border-color: var(--in-content-page-color) !important;
+      }
+      @media screen and (prefers-color-scheme: dark) and (min-width: 768px) {
+        .mzp-c-menu-panel {
+          box-shadow: 0 16px 16px -16px rgba(255, 255, 255, 0.3) !important;
+        }
+      }
+      .card--product,
+      .card--topic,
+      .card--article {
+        box-shadow: 0 5px 10px -3px rgba(249, 249, 250, 0.12), 0 3px 16px 2px rgba(91, 91, 102, 0.12),
+          0 8px 12px 1px rgba(82, 82, 94, 0.04) !important;
+      }
+    }
+    /*= Accounts.com ===========================================================*/
+    @-moz-document url-prefix("https://accounts.firefox.com")
+    {
+      /* Basic */
+      body {
+        color: var(--in-content-page-color) !important;
+        background: var(--in-content-page-background) !important;
+      }
+      .button.primary-button,
+      .button[type="submit"]:not(.secondary-button),
+      .settings-button.primary-button,
+      .settings-button[type="submit"]:not(.secondary-button),
+      button.primary-button,
+      button[type="submit"]:not(.secondary-button) {
+        color: var(--in-content-primary-button-text-color) !important;
+        background: var(--in-content-primary-button-background) !important;
+      }
+      /* Text */
+      header h1,
+      .info,
+      .info a,
+      .prefillEmail,
+      .faint a:hover,
+      .cta-neutral:hover {
+        color: var(--in-content-page-color) !important;
+      }
+      #main-content.panel a,
+      .nav-active,
+      .links a,
+      .link-blue,
+      .text-blue-500 {
+        color: var(--in-content-link-color) !important;
+      }
+      .link-blue:hover {
+        color: var(--in-content-link-color-hover) !important;
+      }
+      .signed-in-email-message,
+      .verification-email-message,
+      .verification-message,
+      .verification-recovery-code-message,
+      .verification-totp-message,
+      .input-row input[type="email"],
+      .input-row input[type="number"],
+      .input-row input[type="password"],
+      .input-row input[type="tel"],
+      .input-row input[type="text"],
+      .input-row input::placeholder,
+      .input-text,
+      .firefox-family-services > ul > .firefox-service,
+      .faint,
+      .faint a,
+      .text-grey-400 {
+        color: var(--in-content-deemphasized-text) !important;
+      }
+      /* Background */
+      .flex .flex-wrap {
+        background: var(--in-content-page-background);
+      }
+      .password-row .show-password-label {
+        background-color: unset !important;
+      }
+      #main-content,
+      .modal,
+      .firefox-family-services,
+      .input-row input[type="email"],
+      .input-row input[type="number"],
+      .input-row input[type="password"],
+      .input-row input[type="tel"],
+      .input-row input[type="text"],
+      .input-text,
+      header,
+      .card,
+      .card-base,
+      .bg-white:not(nav) {
+        background: var(--in-content-box-background) !important;
+      }
+      #suggest-sync,
+      .cta-neutral {
+        background: var(--in-content-button-background) !important;
+      }
+      .cta-neutral:hover,
+      .bg-grey-50:hover,
+      .hover\:bg-grey-100:hover {
+        background: var(--in-content-button-background-hover) !important;
+      }
+      .nav-active,
+      .text-blue-500 .cta-neutral,
+      .text-blue-500 .bg-grey-50,
+      .text-blue-500 .hover\:bg-grey-100 {
+        background: var(--in-content-button-background) !important;
+      }
+      .hover\:bg-grey-200:hover {
+        background: var(--in-content-button-background-active) !important;
+      }
+      .button.primary-button:hover:enabled,
+      .button[type="submit"]:not(.secondary-button):hover:enabled,
+      .settings-button.primary-button:hover:enabled,
+      .settings-button[type="submit"]:not(.secondary-button):hover:enabled,
+      button.primary-button:hover:enabled,
+      button[type="submit"]:not(.secondary-button):hover:enabled {
+        background: var(--in-content-primary-button-background-hover) !important;
+      }
+      .tooltip,
+      .tooltip::before {
+        background: var(--in-content-danger-button-background) !important;
+      }
+      /* Fill */
+      .dismiss,
+      #about-mozilla,
+      .show-password-label,
+      footer a[data-testid="link-mozilla"] {
+        filter: invert(95%) !important;
+      }
+      div[data-testid="settings-connected-service"]
+        svg:is(
+          [data-testid="mobile-icon"],
+          [data-testid="desktop-icon"],
+          [data-testid="tablet-icon"],
+          [data-testid="vr-icon"],
+          [data-testid="addon-icon"]
+        ),
+      header button svg,
+      header .rounded svg,
+      #service svg {
+        filter: brightness(15) !important;
+      }
+      button.relative,
+      #fxa-settings nav svg {
+        filter: brightness(2) !important;
+      }
+      /* Others */
+      .border-grey-100,
+      .input-row input[type="email"],
+      .input-row input[type="number"],
+      .input-row input[type="password"],
+      .input-row input[type="tel"],
+      .input-row input[type="text"],
+      .unit-row-hr .border-grey-100 {
+        border-color: var(--in-content-border-color) !important;
+      }
+      .border-grey-100:hover,
+      .input-row input[type="email"]:hover,
+      .input-row input[type="number"]:hover,
+      .input-row input[type="password"]:hover,
+      .input-row input[type="tel"]:hover,
+      .input-row input[type="text"]:hover {
+        border-color: var(--in-content-border-hover) !important;
+      }
+      #main-content {
+        box-shadow: 0 12px 18px 2px rgba(249, 249, 250, 0.12), 0 6px 22px 4px rgba(91, 91, 102, 0.12),
+          0 6px 10px -4px rgba(82, 82, 94, 0.04) !important;
+      }
+      .input-row input[type="email"]:focus,
+      .input-row input[type="number"]:focus,
+      .input-row input[type="password"]:focus,
+      .input-row input[type="tel"]:focus,
+      .input-row input[type="text"]:focus {
+        box-shadow: 0 0 0 3px color-mix(in srgb, var(--in-content-primary-button-background-hover) 80%, transparent) !important;
+      }
+    }
+    @media -moz-pref("userContent.page.dark_mode.pdf") {
+      @-moz-document unobservable-document() {
+        @-moz-document regexp("^(?!.*\\.pdf\\?n).*") {
+          #outerContainer {
+            --sidebaritem-bg-color: #38383d;
+            --uc-pdf-dark-filter: grayscale(10%) invert(90%);
+          }
+          #sidebarContainer > #sidebarContent > #thumbnailView .thumbnailImage {
+            filter: var(--uc-pdf-dark-filter);
+            box-shadow: 0 0 0 1px hsla(0deg, 0%, 100%, 0.5), 0 2px 8px hsla(0deg, 0%, 100%, 0.3) !important;
+          }
+          #viewerContainer > #viewer > .page > .canvasWrapper > canvas {
+            filter: var(--uc-pdf-dark-filter);
+          }
+        }
+      }
+    }
+  }
+}
+/** Fully Proton Mode *********************************************************/
+@media -moz-pref("userContent.page.proton") {
+  /*= Common contents ==========================================================*/ /*= abouts' common ===========================================================*/
+  @-moz-document url-prefix("about:"), url-prefix("chrome://pippki/content/"), url-prefix("chrome://browser/content/")
+  {
+    xul|treecols {
+      border-bottom-color: var(--in-content-box-border-color) !important;
+    }
+  }
+  @-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard"), url-prefix("about:sync-log"), url-prefix("about:memory"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  {
+    /* Base */
+    html,
+    body {
+      font: message-box !important;
+      appearance: none !important;
+      background-color: var(--in-content-page-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    body {
+      font-size: 15px !important;
+      font-weight: normal !important;
+      margin: 0 !important;
+    }
+    h1 {
+      line-height: 1.2 !important;
+    }
+    h2 {
+      line-height: 1.4em !important;
+    }
+    /* Link */
+    a {
+      color: var(--in-content-link-color) !important;
+    }
+    a:hover,
+    .text-link:hover {
+      color: var(--in-content-link-color-hover) !important;
+      text-decoration: underline !important;
+    }
+    a:visited {
+      color: var(--in-content-link-color-visited) !important;
+    }
+    a:hover:active,
+    .text-link:hover:active {
+      color: var(--in-content-link-color-active) !important;
+    }
+    a:-moz-focusring,
+    .text-link:-moz-focusring {
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 1px !important;
+      border-radius: 4px !important;
+    }
+    /* Button */
+    button {
+      font: inherit;
+    }
+    button,
+    select,
+    input[type="color"] {
+      appearance: none !important;
+      min-height: 32px !important;
+      color: var(--in-content-button-text-color, inherit) !important;
+      border: 1px solid transparent !important; /* shows up in high-contrast mode */
+      border-radius: var(--in-content-button-border-radius) !important;
+      background-color: var(--in-content-button-background) !important;
+      font-weight: 400 !important;
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      text-decoration: none !important;
+      margin: 4px 8px !important;
+      /* Ensure font-size isn't overridden by widget styling (e.g. in forms.css) */
+      font-size: 1em !important;
+    }
+    @media -moz-pref("userChrome.rounding.square_button") {
+      button,
+      select,
+      input[type="color"] {
+        border-radius: 0 !important;
+      }
+    }
+    button {
+      font-weight: 600 !important;
+      /* Use the same margin of other elements for the alignment */
+      margin-inline: 4px !important;
+      min-width: 6.3em !important;
+    }
+    /* Medium and small buttons get sized to 7/14 and 6/12px padding (when adding
+       * the 1px border): */
+    button.medium {
+      --in-content-button-vertical-padding: 6px;
+      --in-content-button-horizontal-padding: 13px;
+      min-height: 28px !important;
+      font-size: 0.95em !important;
+    }
+    button.small {
+      --in-content-button-vertical-padding: 5px;
+      --in-content-button-horizontal-padding: 11px;
+      min-height: 24px !important;
+      font-size: 0.9em !important;
+    }
+    ::-moz-focus-inner {
+      border: none !important;
+    }
+    button:-moz-focusring {
+      box-shadow: none !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 2px !important;
+    }
+    button:enabled:hover,
+    input[type="color"]:hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    button:enabled:hover:active,
+    input[type="color"]:enabled:hover:active {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    button:disabled,
+    input[type="color"]:disabled {
+      opacity: 0.4 !important;
+    }
+    button[autofocus],
+    button[type="submit"],
+    button.primary {
+      background-color: var(--in-content-primary-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    button[autofocus]:enabled:hover,
+    button[type="submit"]:enabled:hover,
+    button.primary:enabled:hover {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+    }
+    button[autofocus]:enabled:hover:active,
+    button[type="submit"]:enabled:hover:active,
+    button.primary:enabled:hover:active {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    /* Checkbox */
+    input[type="checkbox"] {
+      margin-block: 2px !important;
+    }
+    input[type="checkbox"] {
+      appearance: none !important;
+      height: 16px !important;
+      width: 16px !important;
+      border: 1px solid var(--checkbox-border-color) !important;
+      background-color: var(--checkbox-unchecked-bgcolor) !important;
+      border-radius: 2px !important;
+      margin-inline: 0 6px !important;
+      flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+    }
+    @media -moz-pref("userChrome.rounding.square_checklabel") {
+      input[type="checkbox"] {
+        border-radius: 0 !important;
+      }
+    }
+    input[type="checkbox"]:enabled:hover {
+      background-color: var(--checkbox-unchecked-hover-bgcolor) !important;
+    }
+    input[type="checkbox"]:enabled:hover:active {
+      background-color: var(--checkbox-unchecked-active-bgcolor) !important;
+    }
+    input[type="checkbox"]:checked {
+      border-color: var(--checkbox-checked-border-color) !important;
+      background-color: var(--checkbox-checked-bgcolor) !important;
+      background-image: url("chrome://global/skin/icons/check.svg") !important;
+      background-position: center !important;
+      background-repeat: no-repeat !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--checkbox-checked-color) !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+    }
+    input[type="checkbox"]:enabled:checked:hover {
+      background-color: var(--checkbox-checked-hover-bgcolor) !important;
+    }
+    input[type="checkbox"]:enabled:checked:hover:active {
+      background-color: var(--checkbox-checked-active-bgcolor) !important;
+    }
+    /* Textarea */
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    textarea {
+      appearance: none !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: inherit !important;
+      background-color: var(--in-content-box-background) !important;
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    textarea {
+      font-family: inherit !important;
+      font-size: inherit !important;
+      padding: 8px !important;
+      margin: 2px 4px !important;
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus,
+    textarea:focus,
+    search-textbox[focused],
+    tree:focus-visible,
+    richlistbox:focus-visible {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    input:is(
+        [type="email"],
+        [type="tel"],
+        [type="text"],
+        [type="password"],
+        [type="url"],
+        [type="number"]
+      ):-moz-ui-invalid,
+    textarea:-moz-ui-invalid {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-border-invalid) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
+    textarea:disabled,
+    search-textbox[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    /* Table */
+    table {
+      width: 100% !important;
+    }
+  }
+  @-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard") {
+    table {
+      border: 1px solid var(--in-content-table-border-color) !important;
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:cache"), url-prefix("about:checkerboard") {
+    th,
+    td {
+      border: 1px solid var(--in-content-table-border-color) !important;
+    }
+    th {
+      background-color: var(--in-content-table-header-background) !important;
+      color: var(--in-content-table-header-color) !important;
+    }
+  }
+  /*= Field Border =============================================================*/
+  @media -moz-pref("userContent.page.field_border") {
+    @media (prefers-reduced-motion: no-preference) {
+      @-moz-document url-prefix("about:") {
+        html|input:is(
+            [type="email"],
+            [type="tel"],
+            [type="text"],
+            [type="password"],
+            [type="url"],
+            [type="number"]
+          ):not(#newtab-search-text):hover,
+        html|textarea:hover,
+        xul|search-textbox:hover {
+          border-color: var(--in-content-focus-outline-color) !important;
+          transition: border-color 0.5s var(--animation-easing-function);
+        }
+      }
+    }
+  }
+  /*= View Source ==============================================================*/
+  @-moz-document url-prefix("view-source") {
+    :root {
+      background-color: var(--in-content-page-background) !important; /* Original: white */
+      color: var(--in-content-page-color) !important; /* Original: black */
+      /* Colors */
+      --view-source-green: var(--green-80);
+      --view-source-purple: #800080; /* Like alphenglow */
+    }
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --view-source-green: var(--green-60);
+        --view-source-purple: #c68aff;
+      }
+    }
+    pre[id]::before,
+    span[id]::before {
+      color: color-mix(
+        in srgb,
+        var(--in-content-page-color) 70%,
+        var(--in-content-page-background)
+      ) !important; /* Original: #ccc */
+    }
+    .highlight .start-tag,
+    .highlight .end-tag {
+      color: var(--view-source-purple) !important; /* Original: purple */
+    }
+    .highlight .comment {
+      color: var(--view-source-green) !important; /* Original: green */
+    }
+    .highlight .cdata {
+      color: var(--in-content-border-invalid) !important; /* Original: #CC0066 */
+    }
+    .highlight .doctype {
+      color: #4682b4 !important; /* Original: steelblue */
+    }
+    .highlight .pi {
+      color: orchid !important; /* Original: orchid */
+    }
+    .highlight .entity {
+      color: #ff4500 !important; /* Original: #FF4500 */
+    }
+    .highlight .attribute-name {
+      color: var(--view-source-green) !important; /* Original: black */
+    }
+    .highlight .attribute-value {
+      color: var(--in-content-link-color) !important; /* Original: blue */
+    }
+    .highlight .markupdeclaration {
+      color: #4682b4 !important; /* Original: steelblue */
+    }
+    .highlight .error,
+    .highlight
+      .error
+      > :-moz-any(.start-tag, .end-tag, .comment, .cdata, .doctype, .pi, .entity, .attribute-name, .attribute-value) {
+      color: var(--in-content-error-text-color) !important; /* Original: red */
+    }
+  }
+  /*= Directory View ===========================================================*/
+  @-moz-document url-prefix("about:sync-log"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  {
+    body {
+      background-color: var(--in-content-box-background) !important;
+      margin: 4em auto !important; /* Override to default */
+    }
+    thead a {
+      color: var(--in-content-page-color) !important;
+    }
+    td ::before {
+      vertical-align: top !important;
+    }
+  }
+  /*= about:plugins ============================================================*/
+  @-moz-document url-prefix("about:plugins") {
+    .notice {
+      background: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-border-color) !important;
+    }
+  }
+  /*= about:cache ==============================================================*/
+  @-moz-document url-prefix("about:cache") {
+    table {
+      padding: 0 !important;
+    }
+    th,
+    td {
+      padding: 4px !important;
+      text-align: match-parent !important;
+    }
+  }
+  /*= about:checkerboard =======================================================*/
+  @-moz-document url-prefix("about:checkerboard") {
+    #canvas {
+      border: 1px solid var(--in-content-border-color) !important;
+    }
+    #excludePageFromZoom {
+      vertical-align: bottom !important;
+    }
+  }
+  /*= about:memory =============================================================*/
+  @-moz-document url-prefix("about:memory") {
+    .opsRow,
+    .section {
+      background-color: var(--in-content-box-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    .opsRowLabel input {
+      vertical-align: bottom !important;
+    }
+  }
+  /*= about:preferences ========================================================*/
+  @-moz-document url-prefix("chrome://browser/content")
+  {
+    #sanitizeEverythingWarningIcon {
+      list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+      -moz-context-properties: fill;
+      fill: var(--uc-warning-icon-bgcolor);
+      width: 48px;
+      height: 48px;
+    }
+  }
+  @-moz-document url-prefix("about:preferences"), url-prefix("chrome://browser/content/preferences/dialogs/"), url-prefix("chrome://pippki/content/")
+  {
+    :is(.contentPane, .main-content, #certmanagertabs) richlistbox > richlistitem:hover,
+    #translations-manage-install-list > .translations-manage-language:hover {
+      background-color: var(--in-content-item-hover);
+      color: var(--in-content-item-hover-text);
+    }
+    :is(.contentPane, .main-content, #certmanagertabs) richlistbox > richlistitem[selected="true"],
+    #translations-manage-install-list > .translations-manage-language[selected="true"] {
+      background-color: var(--in-content-item-selected);
+      color: var(--in-content-item-selected-text);
+    }
+    :is(.contentPane, .main-content, #certmanagertabs)
+      richlistbox
+      > richlistitem:nth-child(even):not([selected="true"], :hover),
+    #translations-manage-install-list > .translations-manage-language:nth-child(even):not([selected="true"], :hover) {
+      background-color: var(--in-content-box-background-odd);
+    }
+  }
+  @-moz-document url-prefix("about:preferences") {
+    .privacy-extra-information > .custom-option:not(:first-child) {
+      margin-block: 2px !important; /* Original: 10px */
+    }
+    .extra-information-label:not(:first-child) {
+      margin-top: 4px !important; /* Original: 19px */
+    }
+  }
+  /*= about:processes ==========================================================*/
+  @-moz-document url-prefix("about:processes"), url-prefix("about:performance") {
+    td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");']
+    {
+      background-image: url("chrome://browser/skin/lepton/link.svg") !important;
+    }
+    .profiler-icon {
+      cursor: pointer;
+      background-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+      background-repeat: no-repeat !important;
+      background-position: center !important;
+      color: inherit !important;
+    }
+    @media not -moz-pref("userChrome.rounding.square_button") {
+      .profiler-icon {
+        border-radius: 8px !important;
+      }
+    }
+  }
+  @-moz-document url-prefix("about:profiling") {
+    .perf-intro-icon {
+      background-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+    }
+  }
+  /*= about:processes ==========================================================*/
+  @-moz-document url-prefix("about:support") {
+    #reset-box-button {
+      --in-content-focus-outline-color: var(--in-content-danger-button-background) !important;
+      background-color: var(--in-content-danger-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+      border-color: var(--in-content-primary-button-border-color) !important;
+    }
+    #reset-box-button:enabled:hover {
+      background-color: var(--in-content-danger-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+      border-color: var(--in-content-primary-button-border-hover) !important;
+    }
+    #reset-box-button:enabled:hover:active {
+      background-color: var(--in-content-danger-button-background-active) !important;
+      color: var(--in-content-primary-button-text-color-active) !important;
+      border-color: var(--in-content-primary-button-border-active) !important;
+    }
+  }
+  /*= chrome://browser/content/places/places.xhtml =============================*/
+  @-moz-document url("chrome://browser/content/places/places.xhtml")
+  {
+    /** Library - Icons Replace *************************************************/
+    @media -moz-pref("userChrome.icon.library") {
+      /*= Standard Folder - More Visible ===========================================*/
+      /* on Toolbar and Menus */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]),
+      :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, container),
+      #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]),
+      #editBMPanel_folderMenuList .folder-icon:not([id]),
+      .downloadIconShow > .button-box > .button-icon {
+        list-style-image: var(--uc-folder-icon) !important;
+      }
+      /* Standard Folder - Open */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"],
+      :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, container, open) {
+        list-style-image: url("chrome://browser/skin/lepton/folder-open.svg") !important;
+      }
+      /*= Other Folder - Inbox Icon ================================================*/
+      /* on Menus */
+      #PlacesToolbar #OtherBookmarks,
+      #BMB_bookmarksPopup #BMB_unsortedBookmarks,
+      #bookmarksMenuPopup #menu_unsortedBookmarks,
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks),
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_unfiled_____),
+      #editBMPanel_unfiledRootItem,
+      #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] {
+        list-style-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg") !important;
+      }
+      /* Other Folder - Open */
+      #PlacesToolbar #OtherBookmarks[open="true"],
+      #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"],
+      #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"],
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks),
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) {
+        list-style-image: url("chrome://browser/skin/lepton/mail-inbox.svg") !important;
+      }
+      /*= Default Icon - Override ===================================================*/
+      /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */
+      /* Query */
+      :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) {
+        list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important;
+      }
+      /* History */
+      :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer),
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
+        list-style-image: url("chrome://browser/skin/history.svg") !important;
+      }
+      /* Downloads */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
+        list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important;
+      }
+      /* Tag */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+      .bookmark-item[query][tagContainer] {
+        list-style-image: url("chrome://browser/skin/lepton/tag.svg") !important;
+      }
+      /* Bookmark */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
+        list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
+      }
+      /* Bookmark Toolbar */
+      #BMB_bookmarksPopup #BMB_bookmarksToolbar,
+      #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+      #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+      #editBMPanel_toolbarFolderItem,
+      #bookmarksToolbarFolderMenu,
+      #BMB_bookmarksToolbar,
+      #panelMenu_bookmarksToolbar,
+      #bookmarks-toolbar-button,
+      #bookmarks-toolbar-placeholder {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg") !important;
+      }
+      /* Bookmark Menu */
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_menu________) {
+        list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important;
+      }
+      /*= Default Icon - Open ======================================================*/
+      /* Query */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"]
+        > .menu-iconic-left
+        > .menu-iconic-icon {
+        transform: rotate(15deg) !important;
+      }
+      /* History */
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, query, open, dayContainer),
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) {
+        list-style-image: url("chrome://browser/skin/lepton/history-reverse.svg") !important;
+      }
+      /* Tag */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"][tagContainer="true"][open="true"],
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer),
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) {
+        list-style-image: url("chrome://browser/skin/lepton/tag-open.svg") !important;
+      }
+      /* Bookmark */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
+        list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
+      }
+      /* Bookmark Toolbar */
+      #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"],
+      #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarksToolbar-open-alt.svg") !important;
+      }
+      /* Bookmark Menu */
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_menu________) {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */
+      }
+      /*= Menubar - Icons ==========================================================*/
+      #organizeButton,
+      #viewMenu,
+      #maintenanceButton,
+      #back-button,
+      #forward-button,
+      #clearDownloadsButton {
+        fill: currentColor !important;
+        -moz-context-properties: fill, fill-opacity, stroke !important;
+      }
+      /* Add */
+      #organizeButton {
+        list-style-image: url("chrome://global/skin/icons/settings.svg") !important;
+      }
+      #viewMenu {
+        list-style-image: url("chrome://browser/skin/lepton/sort.svg") !important;
+      }
+      #maintenanceButton {
+        list-style-image: url("chrome://browser/skin/lepton/import-export.svg") !important;
+      }
+      #clearDownloadsButton {
+        list-style-image: url("chrome://global/skin/icons/delete.svg") !important;
+      }
+      #clearDownloadsButton > .toolbarbutton-icon {
+        display: inline-flex !important;
+        display: -moz-inline-box !important;
+        margin-top: 0;
+        margin-bottom: 0;
+        margin-inline-start: 0;
+        margin-inline-end: 2px;
+      }
+      /* Replace */
+      #back-button {
+        list-style-image: url("chrome://browser/skin/back.svg") !important;
+      }
+      #forward-button {
+        list-style-image: url("chrome://browser/skin/forward.svg") !important;
+      }
+      #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+      #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+        transform: scaleX(-1) !important;
+      }
+    }
+    @media (-moz-gtk-csd-available) {
+      /*= Layout Fixes =========================================================*/
+      menupopup menu {
+        padding-block: 4px;
+      }
+      .menu-right {
+        width: 16px !important; /* Original: 1ex */
+        background-image: url("chrome://global/skin/icons/arrow-right.svg");
+        background-position: right center;
+      }
+      /*= Proton ===============================================================*/
+      @media -moz-pref("userContent.page.proton") {
+        :root {
+          --organizer-color: -moz-DialogText;
+          --organizer-deemphasized-color: GrayText;
+          --organizer-toolbar-background: -moz-Dialog;
+          --organizer-pane-background: -moz-Dialog;
+          --organizer-content-background: -moz-Dialog;
+          --organizer-hover-background: SelectedItem;
+          --organizer-hover-color: SelectedItemText;
+          --organizer-selected-background: SelectedItem;
+          --organizer-selected-color: SelectedItemText;
+          --organizer-outline-color: SelectedItem;
+          --organizer-separator-color: ThreeDDarkShadow;
+          --organizer-border-color: ThreeDShadow;
+          --organizer-toolbar-field-background: Field;
+          --organizer-toolbar-field-background-focused: Field;
+          --organizer-toolbar-field-border-color: ThreeDShadow;
+          --organizer-toolbar-field-focus-border-color: var(--organizer-outline-color);
+          --organizer-toolbar-field-focus-box-shadow: unset;
+          --organizer-pane-field-border-color: ThreeDShadow;
+        }
+        @media not all and (prefers-contrast) {
+          :root {
+            --organizer-color: var(--in-content-page-color);
+            --organizer-deemphasized-color: var(--in-content-deemphasized-text);
+            --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */
+            --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */
+            --organizer-content-background: var(--in-content-page-background);
+            --organizer-hover-background: var(--in-content-button-background-hover);
+            --organizer-hover-color: var(--organizer-color);
+            --organizer-selected-background: var(--in-content-button-background-active);
+            --organizer-selected-color: var(--organizer-color);
+            --organizer-outline-color: var(--in-content-focus-outline-color);
+            --organizer-separator-color: var(--organizer-pane-field-border-color);
+            --organizer-border-color: var(--in-content-border-color);
+            --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */
+            --organizer-toolbar-field-background-focused: Field;
+            --organizer-toolbar-field-border-color: transparent;
+            --organizer-toolbar-field-focus-border-color: color-mix(
+              in srgb,
+              var(--organizer-outline-color) 50%,
+              transparent
+            );
+            --organizer-toolbar-field-focus-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.23);
+            --organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
+          }
+          @media (prefers-color-scheme: dark) {
+            :root {
+              --organizer-color: rgb(251, 251, 254);
+              --organizer-deemphasized-color: rgb(191, 191, 201);
+              --organizer-toolbar-background: rgb(43, 42, 51);
+              --organizer-pane-background: rgb(35, 34, 43);
+              --organizer-content-background: rgb(28, 27, 34);
+              --organizer-hover-background: rgb(82, 82, 94);
+              --organizer-selected-background: rgb(91, 91, 102);
+              --organizer-toolbar-field-background: var(--in-content-page-background);
+              --organizer-toolbar-field-background-focused: rgb(66, 65, 77);
+              scrollbar-color: rgba(249, 249, 250, 0.4) rgba(20, 20, 25, 0.3);
+            }
+          }
+        }
+        /*- Toolbar & Menus ------------------------------------------------------*/
+        #placesToolbar {
+          appearance: none !important;
+          background-color: var(--organizer-toolbar-background) !important;
+          color: var(--organizer-color) !important;
+          border-bottom: 1px solid var(--organizer-border-color) !important;
+          padding: 4px !important;
+          padding-inline-end: 6px !important;
+        }
+        #placesToolbar > toolbarbutton {
+          appearance: none !important;
+          padding: 5px !important;
+          border-radius: 4px !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_button") {
+          #placesToolbar > toolbarbutton {
+            border-radius: 0 !important;
+          }
+        }
+        #placesToolbar > toolbarbutton[disabled] {
+          opacity: 0.6 !important;
+        }
+        #placesToolbar > toolbarbutton:not([disabled]):hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-hover-color) !important;
+        }
+        #placesToolbar > toolbarbutton:not([disabled]):hover:active {
+          background-color: var(--organizer-selected-background) !important;
+        }
+        #placesToolbar > toolbarbutton > .toolbarbutton-icon,
+        #placesMenu > menu > image,
+        #placesMenu > menu > :is(.menubar-text, .menu-text) {
+          -moz-context-properties: fill !important;
+          fill: currentColor !important;
+        }
+        #placesMenu {
+          margin-inline-start: 6px !important;
+        }
+        #placesMenu > menu {
+          appearance: none !important;
+          color: var(--organizer-color) !important;
+          padding-block: 5px !important;
+          padding-inline-start: 5px !important;
+          border-radius: 4px !important;
+          margin-inline-end: 2px !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_button") {
+          #placesMenu > menu {
+            border-radius: 0 !important;
+          }
+        }
+        #placesMenu > menu[_moz-menuactive="true"],
+        #placesMenu > menu:hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-hover-color) !important;
+        }
+        #placesMenu > menu:hover:active,
+        #placesMenu > menu[open] {
+          background-color: var(--organizer-selected-background) !important;
+          color: var(--organizer-selected-color) !important;
+        }
+        #placesMenu > menu > :is(.menubar-text, .menu-text) {
+          margin-block: 0 !important; /* override menu.css */
+          padding-inline-end: 4px !important;
+        }
+        /*- Search Bar & Input ---------------------------------------------------*/
+        #searchFilter,
+        #detailsPane html|input {
+          appearance: none !important;
+          background-color: var(--organizer-toolbar-field-background) !important;
+          color: var(--organizer-color) !important;
+          border: 1px solid var(--organizer-toolbar-field-border-color) !important;
+          border-radius: 4px !important;
+          margin: 0 !important;
+          padding-block: 2px !important;
+          min-height: 24px !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_field") {
+          #searchFilter,
+          #detailsPane html|input {
+            border-radius: 0 !important;
+          }
+        }
+        #searchFilter[focused] {
+          box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important;
+          background-color: var(--organizer-toolbar-field-background-focused) !important;
+          border-color: transparent !important;
+          outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important;
+          outline-offset: -2px !important;
+        }
+        /*- Sidebar & Splitter ---------------------------------------------------*/
+        #placesList {
+          background-color: var(--organizer-pane-background) !important;
+        }
+        #placesView > splitter {
+          border: 0 !important;
+          border-inline-end: 1px solid var(--organizer-border-color) !important;
+          min-width: 0 !important;
+          width: 3px !important;
+          background-color: transparent !important;
+          margin-inline-start: -3px !important;
+          position: relative !important;
+        }
+        /*- Downloads Pane -------------------------------------------------------*/
+        #downloadsRichListBox,
+        #downloadsListBox {
+          color: var(--organizer-color) !important;
+          background-color: var(--organizer-content-background) !important;
+        }
+        #clearDownloadsButton:focus-visible {
+          outline: 2px solid var(--organizer-outline-color) !important;
+        }
+        richlistitem[selected="true"],
+        richlistitem:hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-color) !important;
+        }
+        richlistbox:where(:focus) > richlistitem[selected="true"] {
+          background-color: var(--organizer-selected-background) !important;
+        }
+        /*- Tree -----------------------------------------------------------------*/
+        #contentView treecol {
+          /* Use box-shadow to draw a bottom border instead of border-bottom
+             * because otherwise the items on contentView won't be perfectly
+             * aligned with the items on the sidebar. */
+          box-shadow: inset 0 -1px var(--organizer-border-color) !important;
+        }
+        tree {
+          background-color: var(--organizer-content-background) !important;
+          color: var(--organizer-color) !important;
+        }
+        treecol:not([hideheader="true"]),
+        treecolpicker {
+          appearance: none !important;
+          border: none !important;
+          background-color: var(--in-content-button-background) !important;
+          color: var(--organizer-color, inherit) !important;
+          padding: 5px 10px !important;
+        }
+        treecol:not([hideheader="true"], [sortable="false"]):hover,
+        treecolpicker:hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-color) !important;
+        }
+        treecol:not([hideheader="true"], [sortable="false"]):hover:active,
+        treecolpicker:hover:active {
+          background-color: var(--organizer-selected-background) !important;
+        }
+        treecol:not([hideheader="true"], :first-child),
+        treecolpicker {
+          padding-left: 10px !important;
+          border-inline-start-width: 1px !important;
+          border-inline-start-style: solid !important;
+          border-image: linear-gradient(
+              transparent 0%,
+              transparent 20%,
+              var(--organizer-border-color) 20%,
+              var(--organizer-border-color) 80%,
+              transparent 80%,
+              transparent 100%
+            )
+            1 1 !important;
+        }
+        treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection {
+          fill: currentColor !important;
+          width: 18px !important;
+          height: 18px !important;
+        }
+        treechildren::-moz-tree-row {
+          background-color: transparent !important;
+        }
+        treechildren::-moz-tree-row(hover) {
+          background-color: var(--organizer-hover-background) !important;
+        }
+        treechildren::-moz-tree-row(selected) {
+          background-color: var(--organizer-selected-background) !important;
+          color: var(--organizer-selected-color) !important;
+          border: 1px solid transparent !important;
+        }
+        treechildren::-moz-tree-image(hover),
+        treechildren::-moz-tree-twisty(hover),
+        treechildren::-moz-tree-cell-text(hover) {
+          color: var(--organizer-hover-color) !important;
+        }
+        treechildren::-moz-tree-image(selected),
+        treechildren::-moz-tree-twisty(selected),
+        treechildren::-moz-tree-cell-text(selected) {
+          color: var(--organizer-selected-color) !important;
+        }
+        treechildren::-moz-tree-separator {
+          height: 1px !important;
+          border-color: var(--organizer-separator-color) !important;
+        }
+        treechildren::-moz-tree-separator(hover) {
+          border-color: var(--organizer-hover-color) !important;
+        }
+        treechildren::-moz-tree-separator(selected) {
+          border-color: var(--organizer-selected-color) !important;
+        }
+        treechildren::-moz-tree-cell-text(primary, dropOn),
+        treechildren::-moz-tree-drop-feedback {
+          background-color: var(--organizer-outline-color) !important;
+        }
+        /*- Info Box -------------------------------------------------------------*/
+        #detailsPane {
+          background-color: var(--organizer-pane-background) !important;
+          color: var(--organizer-color) !important;
+          padding: 5px !important;
+          border-top: 1px solid var(--organizer-border-color) !important;
+        }
+        #editBookmarkPanelRows .expander-up,
+        #editBookmarkPanelRows .expander-down {
+          appearance: none !important;
+          min-width: 0 !important;
+          padding: 5px !important;
+          margin: 0 !important;
+          margin-inline-end: 4px !important;
+          border: 1px solid var(--organizer-pane-field-border-color) !important;
+          border-radius: 4px !important;
+          color: var(--organizer-color) !important;
+          background-color: var(--organizer-content-background) !important;
+          -moz-context-properties: fill !important;
+          fill: currentColor !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_button") {
+          #editBookmarkPanelRows .expander-up,
+          #editBookmarkPanelRows .expander-down {
+            border-radius: 0 !important;
+          }
+        }
+        #editBookmarkPanelRows .expander-up:hover,
+        #editBookmarkPanelRows .expander-down:hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-hover-color) !important;
+        }
+        #editBookmarkPanelRows .expander-up:hover:active,
+        #editBookmarkPanelRows .expander-down:hover:active {
+          background-color: var(--organizer-selected-background) !important;
+          color: var(--organizer-selected-color) !important;
+        }
+        #editBookmarkPanelRows .expander-up:focus-visible,
+        #editBookmarkPanelRows .expander-down:focus-visible {
+          outline: 2px solid var(--organizer-outline-color) !important;
+          outline-offset: -1px !important;
+        }
+        #editBookmarkPanelRows .expander-up > .button-box,
+        #editBookmarkPanelRows .expander-down > .button-box {
+          padding: 0 !important;
+        }
+        #editBookmarkPanelRows .expander-up {
+          list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+        }
+        #editBookmarkPanelRows .expander-down {
+          list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+        }
+        #places input {
+          border: 1px solid var(--organizer-pane-field-border-color) !important;
+          border-radius: 4px !important;
+          background-color: var(--organizer-content-background) !important;
+          color: var(--organizer-color) !important;
+          min-height: 20px !important;
+          padding-inline: 4px !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_field") {
+          #places input {
+            border-radius: 0 !important;
+          }
+        }
+        #places input:focus {
+          outline: 2px solid var(--organizer-outline-color) !important;
+          outline-offset: -1px !important;
+        }
+        #places input:not(:read-write):focus {
+          outline: none !important;
+        }
+        .caption-label {
+          margin-inline-start: 8px !important;
+          color: var(--organizer-deemphasized-color) !important;
+        }
+        #editBMPanel_tagsSelectorRow > richlistbox {
+          appearance: none !important;
+          color: var(--organizer-color) !important;
+          background-color: var(--organizer-content-background) !important;
+          border: 1px solid var(--organizer-border-color) !important;
+          border-radius: 4px !important;
+        }
+        @media -moz-pref("userChrome.rounding.square_field") {
+          #editBMPanel_tagsSelectorRow > richlistbox {
+            border-radius: 0 !important;
+          }
+        }
+        #editBMPanel_tagsSelectorRow > richlistbox > richlistitem {
+          border: 1px solid transparent !important;
+        }
+        #editBMPanel_tagsSelectorRow > richlistbox > richlistitem:hover {
+          background-color: var(--organizer-hover-background) !important;
+          color: var(--organizer-hover-color) !important;
+        }
+        #editBMPanel_tagsSelectorRow > richlistbox > richlistitem[selected] {
+          background-color: var(--organizer-selected-background) !important;
+          color: var(--organizer-selected-color) !important;
+        }
+        /*- Radio Button -------------------------------------------------------------*/
+        menuitem[type="radio"] {
+          /* margin-inline-start: 0 !important; */
+          appearance: none !important;
+        }
+        menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
+          appearance: none !important;
+          width: 16px !important;
+          height: 16px !important;
+          border: 1px solid var(--in-content-box-border-color) !important;
+          border-radius: 100% !important;
+          padding: 0 !important;
+          margin-inline: 0 6px !important;
+          margin-block: 2px !important; /* extend the vertical clicktarget */
+          background-color: var(--in-content-button-background) !important;
+          background-position: center !important;
+          flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+        }
+        menuitem[type="radio"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+          -moz-context-properties: fill !important;
+          fill: currentColor !important;
+          color: var(--in-content-primary-button-text-color) !important;
+          background-color: var(--in-content-primary-button-background) !important;
+          background-image: url("chrome://browser/skin/lepton/radio.svg") !important;
+          border-color: transparent !important;
+          /* Style the button also when printing with "Print Backgrounds" unchecked */
+          color-adjust: exact !important;
+        }
+        menuitem[type="radio"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+          background-color: var(--in-content-button-background-hover) !important;
+          color: var(--in-content-button-text-color-hover) !important;
+        }
+        menuitem[type="radio"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+          background-color: var(--in-content-button-background-active) !important;
+        }
+        menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover > .menu-iconic-left > .menu-iconic-icon {
+          background-color: var(--in-content-primary-button-background-hover) !important;
+          color: var(--in-content-primary-button-text-color-hover) !important;
+        }
+        menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover:active
+          > .menu-iconic-left
+          > .menu-iconic-icon {
+          background-color: var(--in-content-primary-button-background-active) !important;
+        }
+        menuitem[type="radio"] > .menu-iconic-text {
+          margin-inline: 0 8px !important;
+          padding-inline-start: 0 !important;
+        }
+        /* Disabled checkboxes, radios and labels */
+        menuitem[type="radio"][disabled="true"],
+        menuitem[type="checkbox"][disabled="true"] {
+          color: inherit !important;
+          opacity: 0.5 !important;
+        }
+        /*- Check Box ----------------------------------------------------------------*/
+        /* From checkbox.css */
+        menuitem[type="checkbox"] {
+          appearance: none !important;
+          align-items: center !important;
+          -moz-box-align: center !important;
+          margin: 0px 2px !important;
+        }
+        menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon {
+          appearance: none !important;
+          width: 16px !important;
+          height: 16px !important;
+          border: 1px solid currentColor !important;
+          border-radius: 2px !important;
+          color: var(--checkbox-border-color, ThreeDDarkShadow) !important;
+          background-color: var(--checkbox-unchecked-bgcolor, Field) !important;
+          margin-inline-end: 6px !important; /* or 2px */
+          margin-block: 2px !important; /* From common.css */
+        }
+        menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+          -moz-context-properties: fill !important;
+          fill: currentColor !important;
+          border-color: var(--checkbox-checked-border-color, transparent) !important;
+          background-image: url("chrome://global/skin/icons/check.svg") !important;
+          background-position: center !important;
+          background-repeat: no-repeat !important;
+          /* Style the button also when printing with "Print Backgrounds" unchecked */
+          color-adjust: exact !important;
+          color: var(--checkbox-checked-color, AccentColorText) !important;
+          background-color: var(--checkbox-checked-bgcolor, AccentColor) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+            color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+            background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important;
+          }
+        }
+        menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+          background-color: var(
+            --checkbox-unchecked-hover-bgcolor,
+            color-mix(in srgb, AccentColor 4%, Field)
+          ) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+            background-color: var(
+              --checkbox-unchecked-hover-bgcolor,
+              color-mix(in srgb, -moz-accent-color 4%, Field)
+            ) !important;
+          }
+        }
+        menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+          background-color: var(
+            --checkbox-unchecked-active-bgcolor,
+            color-mix(in srgb, AccentColor 8%, Field)
+          ) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+            background-color: var(
+              --checkbox-unchecked-active-bgcolor,
+              color-mix(in srgb, -moz-accent-color 8%, Field)
+            ) !important;
+          }
+        }
+        menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+          background-color: var(
+            --checkbox-checked-hover-bgcolor,
+            color-mix(in srgb, currentColor 12.5%, AccentColor)
+          ) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"]:not([disabled="true"]):hover
+            > .menu-iconic-left[checked="true"]
+            > .menu-iconic-icon {
+            background-color: var(
+              --checkbox-checked-hover-bgcolor,
+              color-mix(in srgb, currentColor 12.5%, -moz-accent-color)
+            ) !important;
+          }
+        }
+        menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+          > .menu-iconic-left[checked="true"]
+          > .menu-iconic-icon {
+          background-color: var(
+            --checkbox-checked-active-bgcolor,
+            color-mix(in srgb, currentColor 25%, AccentColor)
+          ) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+            > .menu-iconic-left[checked="true"]
+            > .menu-iconic-icon {
+            background-color: var(
+              --checkbox-checked-active-bgcolor,
+              color-mix(in srgb, currentColor 25%, -moz-accent-color)
+            ) !important;
+          }
+        }
+        menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon {
+          outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+          outline-offset: var(--focus-outline-offset, 2px) !important;
+        }
+        @media -moz-pref("userChrome.compatibility.accent_color") {
+          menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon {
+            outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+          }
+        }
+        @media (-moz-gtk-csd-available) and (prefers-contrast) {
+          menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
+            /* color will set the border-color on the check due to how HCM works for in-content pages. */
+            color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important;
+          }
+          @media -moz-pref("userChrome.compatibility.accent_color") {
+            menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
+              /* color will set the border-color on the check due to how HCM works for in-content pages. */
+              color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important;
+            }
+          }
+          menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] {
+            color: var(--checkbox-checked-border-color, currentColor) !important;
+            fill: var(--checkbox-checked-color, AccentColorText) !important;
+          }
+          @media -moz-pref("userChrome.compatibility.accent_color") {
+            menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] {
+              fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+            }
+          }
+          menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+            > .menu-iconic-left[checked="true"]
+            > .menu-iconic-icon,
+          menuitem[type="checkbox"]:not([disabled="true"]):hover
+            > .menu-iconic-left[checked="true"]
+            > .menu-iconic-icon {
+            color: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+            fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+          }
+          @media -moz-pref("userChrome.compatibility.accent_color") {
+            menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+              > .menu-iconic-left[checked="true"]
+              > .menu-iconic-icon,
+            menuitem[type="checkbox"]:not([disabled="true"]):hover
+              > .menu-iconic-left[checked="true"]
+              > .menu-iconic-icon {
+              color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+              fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+            }
+          }
+        }
+        menuitem[type="checkbox"] > .menu-iconic-text {
+          margin: 1px 0 !important;
+        }
+        menuitem[type="checkbox"][disabled="true"] {
+          opacity: 0.4 !important;
+        }
+        /*- Menu Separator -----------------------------------------------------------*/
+        menuseparator {
+          appearance: none !important;
+          min-width: 2px;
+          min-height: 0;
+          border-top: 1px solid var(--in-content-box-border-color, ThreeDDarkShadow);
+          border-bottom: none;
+          padding: 0;
+          margin: var(--panel-separator-margin, 6px);
+        }
+      }
+    }
+  }
+}
+/** Rounding ******************************************************************/
+@media -moz-pref("userChrome.rounding.square_button") {
+  .all-buttons-container,
+  .highlight-buttons > button,
+  .cancel-shot,
+  #pictureInPictureToggle > .pip-small {
+    border-radius: 0 !important;
+  }
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    button:not(.toggle-button),
+    .close-icon,
+    .action-icon::before,
+    .page-section-header > .twisty,
+    .closed-tab-li-main,
+    #categories > .category,
+    .sidebar-footer-link {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .sidebar-item {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("chrome://browser/content/places/places.xhtml"), url-prefix("about:downloads")
+  {
+    .downloadButton > .button-box {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:protections") {
+    #manage-protections,
+    #sign-up-for-monitor-link,
+    #get-proxy-extension-link,
+    #get-vpn-link,
+    #vpn-banner-link,
+    .monitor-partial-breaches-link-wrapper,
+    .monitor-breaches-link-wrapper {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarButton,
+    .dropdownToolbarButton,
+    .secondaryToolbarButton,
+    .dialogButton {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.rounding.square_dialog") {
+  @-moz-document url("about:home"), url("about:newtab") {
+    .modal {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.rounding.square_checklabel") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    input[type="checkbox"]:not(.toggle-button),
+    .checkbox-check {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.rounding.square_field") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    input:is(
+        [type="color"],
+        [type="email"],
+        [type="tel"],
+        [type="text"],
+        [type="password"],
+        [type="url"],
+        [type="number"]
+      ),
+    textarea,
+    select,
+    menulist,
+    tree,
+    treecols,
+    listheader,
+    richlistbox,
+    search-textbox,
+    .web-appearance-choice,
+    .content-blocking-category,
+    #translations-manage-install-list {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .default-input {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url("about:home"), url("about:newtab") {
+    .search-wrapper .search-handoff-button,
+    .search-wrapper input {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarField,
+    .thumbnailSelectionRing {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.rounding.square_menupopup") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://")
+  {
+    panel,
+    menupopup {
+      --panel-border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:addons") {
+    panel-list {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:logins") {
+    .menu {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url("about:home"), url("about:newtab") {
+    .context-menu {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .doorHanger,
+    .doorHangerRight {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media -moz-pref("userChrome.rounding.square_infobox") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    /*
+     * .container is inside shadow DOM,
+     * and it does not have any other classes,
+     * but there may be other elements with the same class,
+     * hence the weird selector.
+     */
+    link[href="chrome://global/content/elements/message-bar.css"] + .container,
+    .info-box-container:not(.content-blocking-category),
+    .options-container,
+    #sanitizeEverythingWarningBox {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .message {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:firefoxview") {
+    .card,
+    .card::before,
+    .empty-container,
+    .synced-tab-a,
+    .synced-tab-li-placeholder {
+      border-radius: 0 !important;
+    }
+  }
+}
+@-moz-document url-prefix("about:"), regexp(".*.pdf$") {
+  @media -moz-pref("userChrome.rounding.square_dialog") {
+    dialog,
+    .dialogBox {
+      border-radius: 0 !important;
+    }
+  }
+}
+@-moz-document url("chrome://browser/content/places/places.xhtml")
+{
+  /*= Library ==============================================================*/
+  @media -moz-pref("userChrome.rounding.square_button") {
+    #placesToolbar > toolbarbutton,
+    #placesMenu > menu,
+    #editBookmarkPanelRows .expander-up,
+    #editBookmarkPanelRows .expander-down {
+      border-radius: 0 !important;
+    }
+  }
+  @media -moz-pref("userChrome.rounding.square_field") {
+    #searchFilter,
+    #detailsPane html|input,
+    #places input #editBMPanel_tagsSelectorRow > richlistbox {
+      border-radius: 0 !important;
+    }
+  }
+}
+/** Monospace *****************************************************************/
+@media -moz-pref("userContent.page.monospace") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$")
+  {
+    * {
+      font-family: -moz-fixed;
+    }
+  }
+}
+/** Menu - Icons Layout *******************************************************/
+@media not -moz-pref("userChrome.icon.disabled") {
+  @media -moz-pref("userChrome.icon.menu") {
+    @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$")
+    {
+      :root {
+        --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+      }
+      @media -moz-pref("userChrome.icon.library") {
+        :root {
+          --uc-folder-icon: url("chrome://browser/skin/lepton/folder.svg");
+        }
+      }
+    }
+    @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads")
+    {
+      menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+      menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+      menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon {
+        -moz-appearance: none !important; /* Linux: menulist */
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        /* Color */
+        -moz-context-properties: fill, fill-opacity, stroke !important;
+        fill: currentColor !important;
+        stroke: currentColor;
+        /* Layout */
+        background-size: 16px !important;
+        background-repeat: no-repeat !important;
+        background-image: var(--menuitem-image);
+      }
+      /* For native context menus */
+      @media -moz-pref("widget.macos.native-context-menus") or -moz-pref("widget.gtk.native-context-menus") {
+        :not(menu, #ContentSelectDropdown)
+          > menupopup:not(.in-menulist)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        :not(menu, #ContentSelectDropdown)
+          > menupopup:not(.in-menulist)
+          > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+        }
+      }
+      /* Padding */
+      :root {
+        --uc-menu-background-position: left;
+        --context-menu-background-padding-default: 5px;
+        --context-menu-background-padding: var(--context-menu-background-padding-default);
+      }
+      :root:-moz-locale-dir(rtl) {
+        --uc-menu-background-position: right;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
+        padding-inline-start: var(--context-menu-background-padding) !important;
+      }
+      /* Padding - Non Native */
+      @media (-moz-platform: windows) and (-moz-platform: windows),
+        (-moz-gtk-csd-available) and (-moz-platform: windows) {
+        :root {
+          --context-menu-background-padding: 1em;
+          --context-menu-text-padding-default: 24px;
+          --context-menu-text-padding: var(--context-menu-text-padding-default);
+          --menu-background-padding-default: calc(
+            var(--context-menu-background-padding) + var(--context-menu-text-padding)
+          );
+          --bookmark-menu-icon-align-padding: 0px;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          padding-inline-start: var(--menu-background-padding-default) !important;
+          margin-left: 0 !important;
+        }
+      }
+      @media (-moz-platform: windows), (-moz-gtk-csd-available) {
+        @media -moz-pref("userChrome.theme.non_native_menu") {
+          @media (-moz-platform: windows) and (-moz-gtk-csd-available),
+            (-moz-gtk-csd-available) and (-moz-gtk-csd-available) {
+            :root {
+              --context-menu-background-padding: 1em;
+              --context-menu-text-padding-default: 24px;
+              --context-menu-text-padding: var(--context-menu-text-padding-default);
+              --menu-background-padding-default: calc(
+                var(--context-menu-background-padding) + var(--context-menu-text-padding)
+              );
+              --bookmark-menu-icon-align-padding: 0px;
+            }
+            menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+              menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+            menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+              menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+            menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+              > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+            menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+              > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+              padding-inline-start: var(--menu-background-padding-default) !important;
+              margin-left: 0 !important;
+            }
+          }
+        }
+      }
+      /* Padding - Windows */
+      @media (-moz-platform: windows) {
+        :root {
+          --bookmark-menu-icon-text-padding: calc(
+            var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+          );
+          --bookmark-menu-icon-background-padding: calc(
+            var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
+          );
+        }
+      }
+      /* Padding - Linux */
+      @media (-moz-gtk-csd-available) {
+        :root {
+          --context-menu-background-padding-default: 6px;
+          --context-menu-text-padding: 21px;
+        }
+        .menu-icon {
+          display: unset !important;
+        }
+        #main-menubar > menu > .menu-icon {
+          display: none !important;
+        }
+        /* Contextmenu Checkbox Unset */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
+          margin-inline: 0 !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]
+          > .menu-iconic-left
+          > .menu-iconic-icon,
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]
+          > .menu-icon {
+          margin-inline-end: 0 !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]:not([checked="true"])
+          > .menu-iconic-left
+          > .menu-iconic-icon,
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]:not([checked="true"])
+          > .menu-icon {
+          border: none !important;
+          background-color: unset !important;
+        }
+      }
+      /* Padding - Mac */
+      @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
+        :root {
+          --context-menu-background-padding-default: 10px;
+          --context-menu-mac-padding: 21px;
+        }
+        /* context menu width */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          padding-inline-end: var(--context-menu-background-padding) !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+          > .menu-text,
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"])
+          > .menu-text {
+          /* text position */
+          padding-inline-start: var(--context-menu-mac-padding) !important;
+        }
+        /* Checkbox menuitem, None iconic menu */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"],
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) {
+          padding-inline-start: calc(
+            var(--context-menu-background-padding) + var(--context-menu-mac-padding)
+          ) !important;
+        }
+      }
+      /*= Context Menu ===========================================================*/
+      @media -moz-pref("userChrome.icon.context_menu") {
+        /* Icon lists */
+        /*= downloadsContextMenu =====================================================*/
+        .downloadPauseMenuItem {
+          --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+        }
+        .downloadResumeMenuItem {
+          --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+        }
+        .downloadUnblockMenuItem {
+          --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+        }
+        .downloadUseSystemDefaultMenuItem {
+          --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+        }
+        .downloadAlwaysUseSystemDefaultMenuItem {
+          /* checkbox */
+          --menuitem-image: url("chrome://browser/skin/lepton/folder-globe.svg");
+        }
+        .downloadAlwaysOpenSimilarFilesMenuItem {
+          /* checkbox */
+          --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+        }
+        .downloadShowMenuItem {
+          --menuitem-image: var(--uc-folder-icon);
+        }
+        #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
+        #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
+          --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+        }
+        #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
+        #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
+          --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+        }
+        .downloadDeleteFileMenuItem {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }
+        .downloadRemoveFromHistoryMenuItem {
+          --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+        }
+        #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
+        #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
+          --menuitem-image: url("chrome://browser/skin/lepton/broom.svg");
+        }
+        /*= placeContext =============================================================*/
+        #placesContext_open {
+          --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+        }
+        #placesContext_openBookmarkContainer\:tabs,
+        #placesContext_openBookmarkLinks\:tabs {
+          --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+        }
+        #placesContext_open\:newtab,
+        #placesContext_openContainer\:tabs,
+        #placesContext_openLinks\:tabs {
+          --menuitem-image: var(--uc-new-tab-icon);
+        }
+        #placesContext_open\:newcontainertab {
+          --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+        }
+        #placesContext_open\:newwindow {
+          --menuitem-image: url("chrome://browser/skin/window.svg");
+        }
+        #placesContext_open\:newprivatewindow {
+          --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+        }
+        #placesContext_show_bookmark\:info,
+        #placesContext_show\:info,
+        #placesContext_show_folder\:info {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+        }
+        #placesContext_deleteBookmark,
+        #placesContext_deleteFolder,
+        #placesContext_delete,
+        #placesContext_delete_history {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }
+        #placesContext_deleteHost {
+          --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+        }
+        #placesContext_sortBy\:name {
+          --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+        }
+        #placesContext_cut {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+        }
+        #placesContext_copy {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+        }
+        #placesContext_paste_group {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+        }
+        #placesContext_new\:bookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }
+        #placesContext_showInFolder,
+        #placesContext_new\:folder {
+          --menuitem-image: var(--uc-folder-icon);
+        }
+        #placesContext_new\:separator {
+          --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+        }
+        #placesContext_paste {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+        }
+        #placesContext_createBookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }
+        #show-other-bookmarks_PersonalToolbar {
+          /* checkbox */
+          --menuitem-image: url("chrome://browser/skin/lepton/star-line-horizontal.svg");
+        }
+        #placesContext_showAllBookmarks {
+          --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+        }
+        .openintabs-menuitem {
+          --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+        }
+      }
+      @media -moz-pref("userChrome.icon.global_menu") {
+        /*= organizeButtonPopup ======================================================*/
+        #newbookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }
+        #newfolder {
+          --menuitem-image: var(--uc-folder-icon);
+        }
+        #newseparator {
+          --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+        }
+        #orgUndo {
+          --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+        }
+        @media -moz-pref("userChrome.icon.menu.full") {
+          #orgRedo {
+            --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+          }
+        }
+        #orgCut {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+        }
+        #orgCopy {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+        }
+        #orgPaste {
+          --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+        }
+        #orgDelete {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }
+        #orgSelectAll {
+          --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+        }
+        #orgClose {
+          --menuitem-image: url("chrome://global/skin/icons/close.svg");
+        }
+        /*= viewMenuPopup ============================================================*/
+        #viewColumns {
+          --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
+        }
+        #viewSort {
+          --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+        }
+        /*= maintenanceButtonPopup ===================================================*/
+        #backupBookmarks {
+          --menuitem-image: url("chrome://browser/skin/lepton/datastore.svg");
+        }
+        @media -moz-pref("userChrome.icon.menu.full") {
+          #fileRestoreMenu {
+            --menuitem-image: url("chrome://browser/skin/lepton/datarestore.svg");
+          }
+        }
+        #fileImport {
+          --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+        }
+        #fileExport {
+          --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+        }
+        #browserImport {
+          --menuitem-image: url("chrome://browser/skin/import.svg");
+        }
+      }
+    }
+    @-moz-document url-prefix("about:addons") {
+      @media -moz-pref("userChrome.icon.context_menu") {
+        button:is([role="menuitem"], [role="menuitemcheckbox"]) {
+          background-image: var(--icon, url("chrome://browser/skin/lepton/blank.svg")); /* Don't use !important. because of [checked] */
+        }
+        panel-item[action="check-for-updates"] {
+          --icon: url("chrome://browser/skin/lepton/refresh-cw.svg");
+        }
+        panel-item[action="view-recent-updates"] {
+          --icon: url("chrome://global/skin/icons/info.svg");
+        }
+        panel-item[action="install-from-file"] {
+          --icon: url("chrome://devtools/skin/images/import.svg");
+        }
+        panel-item[action="debug-addons"] {
+          --icon: url("chrome://browser/skin/lepton/bug.svg");
+        }
+        panel-item[action="set-update-automatically"] {
+          --icon: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+        }
+        panel-item[action="reset-update-states"] {
+          --icon: url("chrome://devtools/skin/images/debugging-workers.svg");
+        }
+        panel-item[action="manage-shortcuts"],
+        panel-item[data-l10n-id="preferences-addon-button"],
+        panel-item[data-l10n-id="manage-addon-button"] {
+          --icon: url("chrome://global/skin/icons/settings.svg");
+        }
+      }
+    }
+    @-moz-document url-prefix("about:logins") {
+      @media -moz-pref("userChrome.icon.context_menu") {
+        .menuitem-export {
+          background-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg") !important;
+        }
+      }
+    }
+  }
+}
+/** Download Panel ************************************************************/
+@-moz-document url-prefix("about:downloads") {
+  @media (prefers-reduced-motion: no-preference) {
+    @media -moz-pref("userChrome.decoration.download_panel") {
+      /* Accent Color for downloaded item */
+      #downloadsListBox .download-state[exists] .downloadDetails {
+        color: var(--button-primary-bgcolor);
+      }
+      #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover {
+        color: var(--button-primary-hover-bgcolor);
+      }
+      /* File moved or missing */
+      #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget {
+        text-decoration: line-through;
+        text-decoration-color: color-mix(in srgb, currentColor 65%, transparent);
+      }
+      #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget:hover {
+        text-decoration: none;
+      }
+      #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon {
+        filter: grayscale(100%) !important;
+      }
+    }
+  }
+} /*@ DEPRECATED @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/** Compatibility *************************************************************/
+@-moz-document url-prefix("about:preferences") {
+  .content-blocking-warning.info-box-container > hbox > .content-blocking-warning-image {
+    margin-inline-start: -7px !important;
+    margin-inline-end: 8px !important;
+    width: 20px !important;
+  }
+  #pane-experimental-search-results-header,
+  #pane-experimental-subtitle {
+    min-height: 27px !important;
+    padding-inline-start: 35px !important;
+  }
+  .translations-manage-language:first-child {
+    padding-block: 4px !important;
+    margin-bottom: 4px !important;
+  }
+  .translations-manage-language button {
+    min-height: var(--size-item-medium, 28px) !important;
+    max-height: var(--size-item-medium, 28px) !important;
+  }
+  #firefoxExperimentalCategory:not([hidden="true"]) {
+    display: inline-block;
+  }
+  #firefoxExperimentalCategory > label {
+    float: left;
+  }
+  #firefoxExperimentalCategory > hbox {
+    transform: translateY(5px);
+  }
+  #firefoxExperimentalCategory .description-deemphasized {
+    display: none;
+  }
+  #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] {
+    border-bottom: 1px solid var(--in-content-border-color);
+    padding-bottom: 1.5em;
+  }
+}
+@-moz-document url-prefix("about:addons") {
+  #updates-message + .page-options-menu > .more-options-button {
+    box-sizing: content-box;
+    padding: 0 !important;
+  }
+  button[data-l10n-id="addon-updates-manual-updates-found"] {
+    height: 100%;
+  }
+  #categories {
+    padding-inline-end: 1px !important; /* Original: 4px */
+  }
+}
+@-moz-document url-prefix("about:policies") {
+  #categories > .category {
+    box-sizing: border-box;
+  }
+}
+/** Video player **************************************************************/
+/* Control Bar Size */
+@media (-moz-bool-pref: "userContent.player.size") {
+  #controlsContainer {
+    --controlBar-height: 40px; /* Original: 40px, Replace to this value */
+  }
+  #controlsContainer .touch {
+    --button-size: 48px !important; /* Original: 40px */
+    --controlBar-height: 52px; /* Original: 52px */
+  }
+  #controlsContainer .controlBar {
+    height: var(--controlBar-height) !important; /* Original: 40px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer {
+    --button-size: 64px !important; /* Original: 30px */
+    --track-size: 6px !important; /* Original: 5px, Touch: 7px */
+    --thumb-size: 15px !important; /* Original: 13px, Touch: 16px */
+    --controlBar-height: 64px; /* Original: 40px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer .touch {
+    --button-size: 72px !important; /* Original: 40px */
+    --controlBar-height: 64px; /* Original: 52px */
+  }
+  .videocontrols[inDOMFullscreen] #controlsContainer .controlBar {
+    padding-bottom: 8px !important;
+  }
+}
+/* Control Bar UI */
+@media (-moz-bool-pref: "userContent.player.ui") {
+  audio {
+    --duration-color: #929292; /* Like Original */
+    --media-background: rgba(26, 26, 26, 0.8); /* Like Original */
+    border-radius: 8px;
+    --box-shadow1: rgba(14, 13, 26, 0.12);
+    --box-shadow2: rgba(7, 48, 114, 0.12);
+    --box-shadow3: rgba(34, 0, 51, 0.04);
+    box-shadow: 0 5px 10px -3px var(--box-shadow1), 0 3px 16px 2px var(--box-shadow2), 0 8px 12px 1px var(--box-shadow3);
+    /* Or: 0 2px 15px rgba(0,0,0,.1); */
+  }
+}
+@media (-moz-bool-pref: "userContent.player.ui") and (prefers-color-scheme: dark) {
+  audio {
+    --box-shadow1: rgba(249, 249, 250, 0.12);
+    --box-shadow2: rgba(91, 91, 102, 0.12);
+    --box-shadow3: rgba(82, 82, 94, 0.04);
+  }
+}
+@media (-moz-bool-pref: "userContent.player.ui") {
+  video {
+    --duration-color: #eee;
+    --media-background: linear-gradient(transparent, rgba(26, 26, 26, 0.85));
+  }
+}
+@media (-moz-bool-pref: "userContent.player.ui") and (prefers-contrast) {
+  video {
+    --duration-color: #929292; /* Like Original */
+    --media-background: rgba(26, 26, 26, 0.8); /* Like Original */
+  }
+}
+@media (-moz-bool-pref: "userContent.player.ui") {
+  #controlsContainer .controlBar {
+    background: var(--media-background) !important;
+  }
+  #controlsContainer .duration {
+    color: var(--duration-color) !important; /* Original: #929292 */
+  }
+}
+@media (-moz-bool-pref: "userContent.player.ui") and (-moz-bool-pref: "userContent.player.ui.twoline") {
+  audio {
+    /* #controlsContainer .controlBar */
+    --controlBar-flex-wrap: unset;
+    --controlBar-justify-content: center;
+    --controlBar-align-content: unset;
+    --controlBar-twoline-more-height: 0px;
+    --controlBar-padding-inline: 9px;
+    /* #controlsContainer .scrubberStack */
+    /* .scrubberStack - Vertical */
+    --scrubberStack-order: unset;
+    --scrubberStack-height: 100%;
+    --scrubberStack-transform: none;
+    /* .scrubberStack - Horizontal */
+    --scrubberStack-margin-inline: 9px;
+    /* #controlsContainer .positionDurationBox */
+    --positionDurationBox-flex-grow: unset;
+    --positionDurationBox-margin-left: unset;
+    --positionDurationBox-text-align: center;
+    /* Others */
+    --button-outside-margin: 0;
+  }
+  video {
+    /* #scrubber .scrubber::-moz-range-thumb */
+    --scrubber-thumb-scale: 0;
+    --scrubber-thumb-color: #48a0f7; /* Color as hover, Prevent flashing */
+    /* .progressBar::-moz-progress-bar */
+    --progressBar-scale: 0.65;
+    /* #controlsContainer .controlBar */
+    --controlBar-flex-wrap: wrap;
+    --controlBar-justify-content: space-between;
+    --controlBar-align-content: space-around;
+    --controlBar-padding-inline: 0 !important; /* Original: 9px */
+    /* #controlsContainer .scrubberStack */
+    /* .scrubberStack - Vertical */
+    --scrubberStack-order: -1;
+    /* .scrubberStack - Horizontal */
+    --scrubberStack-flex-basis: auto;
+    --scrubberStack-twoline-width: 100%;
+    --scrubberStack-margin-inline: 0;
+    /* #controlsContainer .positionDurationBox */
+    --positionDurationBox-flex-grow: 2;
+    --positionDurationBox-margin-left: 15px;
+    --positionDurationBox-text-align: left;
+    /* Others */
+    --duration-color: #dadada;
+    --button-outside-margin: 9px;
+  }
+  .scrubber:not(:hover)::-moz-range-thumb {
+    transform: scale(var(--scrubber-thumb-scale, 1));
+    background-color: var(--scrubber-thumb-color, currentColor) !important;
+  }
+  .progressStack {
+    transform-origin: bottom;
+    transform: scaleY(var(--progressBar-scale, 1));
+  }
+  .scrubber:hover::-moz-range-thumb,
+  .progressContainer:hover .progressStack {
+    transform: scale(1);
+  }
+  #controlsContainer .controlBar {
+    flex-wrap: var(--controlBar-flex-wrap);
+    justify-content: var(--controlBar-justify-content);
+    align-content: var(--controlBar-align-content);
+    height: calc(var(--controlBar-height) + var(--controlBar-twoline-more-height, var(--thumb-size))) !important;
+    padding-inline: var(--controlBar-padding-inline) !important; /* Original: 9px */
+  }
+  #controlsContainer .scrubberStack {
+    /* Vertical */
+    order: var(--scrubberStack-order);
+    height: var(--scrubberStack-height, var(--thumb-size)) !important;
+    transform: var(--scrubberStack-transform, translateY(calc(var(--thumb-size) / 2)));
+    /* Horizontal */
+    flex-basis: var(--scrubberStack-flex-basis, calc(var(--scrubberStack-width) - 18px)) !important;
+    width: var(--scrubberStack-twoline-width, var(--scrubberStack-width));
+    margin-inline: var(--scrubberStack-margin-inline) !important;
+  }
+  #controlsContainer .positionDurationBox {
+    flex-grow: var(--positionDurationBox-flex-grow);
+    margin-left: var(--positionDurationBox-margin-left);
+    text-align: var(--positionDurationBox-text-align) !important;
+  }
+  #playButton {
+    margin-left: var(--button-outside-margin) !important;
+  }
+  #fullscreenButton {
+    margin-right: var(--button-outside-margin) !important;
+  }
+}
+@media (-moz-bool-pref: "userContent.player.icon") {
+  #controlsContainer .fullscreenButton {
+    background-image: url("chrome://browser/skin/lepton/enter-fullscreen.svg") !important;
+  }
+  #controlsContainer .fullscreenButton[fullscreened] {
+    background-image: url("chrome://browser/skin/lepton/exit-fullscreen.svg") !important;
+  }
+}
+@media (-moz-bool-pref: "userContent.player.noaudio") {
+  #controlsContainer .muteButton[noAudio] {
+    /* Remove volume button at noAudio */
+    display: none !important;
+  }
+}
+/* Click to play UI */
+@media (-moz-bool-pref: "userContent.player.click_to_play") {
+  #controlsContainer .clickToPlay {
+    cursor: pointer;
+    opacity: 0.65 !important;
+  }
+  #controlsContainer .controlsSpacerStack:hover > .clickToPlay {
+    opacity: 0.85 !important;
+  }
+  #controlsContainer .controlsSpacerStack:hover > .clickToPlay:hover {
+    opacity: 1 !important;
+    fill: #48a0f7 !important; /* color as .scrubber */
+  }
+}
+/* Animation */
+@media (-moz-bool-pref: "userContent.player.animate") and (prefers-reduced-motion: no-preference) {
+  /* Control Bar */
+  #controlsContainer .controlBar {
+    transition: transform 350ms ease;
+    opacity: 1 !important;
+  }
+  #controlsContainer .controlBar[hidden] {
+    transform: translateY(100%);
+    transition: transform 350ms ease-in-out, opacity 1s ease 100ms !important;
+    opacity: 0 !important;
+  }
+  #controlsContainer .controlBar[hidden] .progressBar,
+  #controlsContainer .controlBar[hidden] .bufferBar {
+    display: unset !important;
+    opacity: 0.55;
+    transition: opacity 150ms ease 50ms;
+  }
+  /* Two line Control Bar */
+  .scrubber::-moz-range-thumb,
+  .progressStack {
+    transition: transform 0.1s cubic-bezier(0, 0, 0.2, 1);
+  }
+  /* Click to play */
+  #controlsContainer .clickToPlay {
+    transition: opacity 150ms ease-in-out, fill 150ms ease-in-out;
+  }
+}
+/** Activity Stream ***********************************************************/
+@-moz-document url("about:home"), url("about:newtab") {
+  /** Activity Stream - Search Focus Border: like URL *************************/
+  @media (-moz-bool-pref: "userContent.page.field_border") {
+    /* At DarkMode, Color */
+    body[style*="--newtab-background-color:rgba(28, 27, 34, 1);"],
+    body[style*="--newtab-background-color:rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"],
+    body[style*="--newtab-background-color: rgb(43, 42, 51);"] {
+      /* inner */
+      --newtab-focus-border: rgba(
+        0,
+        221,
+        255,
+        0.5
+      ) !important; /* Original: #B5D3FF, Better color-mix(in srgb, #B5D3FF 70%, transparent) */
+      --newtab-focus-border-selected: var(--newtab-focus-border) !important; /* Original: #B5D3FF */
+      /* For Nightly */
+      --newtab-primary-action-background: var(--newtab-focus-border) !important;
+    }
+  }
+  @media (-moz-bool-pref: "userContent.page.field_border") and (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.dark_blue_accent") {
+    body[style*="--newtab-background-color:rgba(28, 27, 34, 1);"],
+    body[style*="--newtab-background-color:rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"],
+    body[style*="--newtab-background-color: rgb(43, 42, 51);"] {
+      --newtab-focus-border: var(--in-content-focus-outline-color) !important;
+    }
+  }
+  /** Activity Stream - Menu Icons ********************************************/
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") {
+    .context-menu-list .context-menu-item button {
+      padding-inline-start: 0 !important;
+    }
+    .context-menu-list .context-menu-item button span {
+      /* Color */
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+      fill: currentColor !important;
+      stroke: currentColor;
+      /* Layout */
+      background-size: 16px !important;
+      background-repeat: no-repeat !important;
+      background-image: var(--menuitem-image);
+      padding-inline-start: 24px; /* 16p + (4px *  2) */
+      background-position: var(--uc-menu-background-position, left) 4px center;
+    }
+    .context-menu-list .context-menu-item button span:dir(rtl) {
+      --uc-menu-background-position: right;
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-pin"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/pin-tab.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-unpin"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/unpin-tab.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] {
+      --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-remove-bookmark"] {
+      --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-save-to-pocket"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/pocket-outline.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-open-file"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+    }
+    .context-menu-item span[data-l10n-id="newtab-menu-show-file"] {
+      --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.library") {
+    .context-menu-item span[data-l10n-id="newtab-menu-show-file"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/folder.svg");
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") {
+    .context-menu-item span[data-l10n-id="newtab-menu-open-new-window"] {
+      --menuitem-image: url("chrome://browser/skin/window.svg");
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") {
+    .context-menu-item span[data-l10n-id="newtab-menu-open-new-private-window"] {
+      --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") {
+    .context-menu-item span[data-l10n-id="newtab-menu-dismiss"] {
+      --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.icon.context_menu") {
+    .context-menu-item span[data-l10n-id="newtab-menu-delete-history"] {
+      --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+    }
+  }
+  /** Activity Stream - Web Site Icon: full size ******************************/
+  @media (-moz-bool-pref: "userContent.newTab.full_icon") {
+    .top-site-outer {
+      width: 120px !important; /* v135: calc(var(--size-item-large) * 3); */
+    }
+    .top-site-outer .tile {
+      width: 80px !important; /* v135: calc(var(--size-item-large) * 2); */
+      height: 80px !important; /* v135: calc(var(--size-item-large) * 2); */
+      overflow: hidden;
+    }
+    .top-site-outer .icon-wrapper {
+      width: 100% !important; /* Original: 48px */
+      height: 100% !important; /* Original: 48px */
+    }
+    .top-site-outer.add-button .tile .icon-wrapper {
+      width: 24px !important;
+      height: 24px !important;
+    }
+    .top-site-outer .context-menu-button {
+      top: 0px !important; /* Original: -20px */
+      right: 0px !important;
+      width: 22px !important;
+      height: 22px !important;
+    }
+    .top-site-outer .context-menu {
+      top: 16.75px !important; /* Original: 6.75px */
+    }
+  }
+  /** Activity Stream - Animate ***********************************************/
+  @media (-moz-bool-pref: "userContent.newTab.animate") and (prefers-reduced-motion: no-preference) {
+    :root {
+      --animation-easing-function: cubic-bezier(0.07, 0.95, 0, 1);
+    }
+    /* Background */
+    .top-site-outer,
+    #searchSubmit,
+    button.icon,
+    button.close-button {
+      transition: background 1.5s var(--animation-easing-function);
+    }
+    .top-site-outer:hover,
+    #searchSubmit:hover,
+    button.icon:hover,
+    button.close-button:hover {
+      transition: background 0.5s var(--animation-easing-function);
+    }
+    /* Search Bar */
+    .search-wrapper .search-inner-wrapper > input,
+    .search-wrapper .search-inner-wrapper > .search-handoff-button {
+      transition: 1s var(--animation-easing-function);
+      transition-property: border-color, box-shadow;
+    }
+    .search-wrapper .search-inner-wrapper:active > input,
+    .search-wrapper .search-inner-wrapper:active > .search-handoff-button,
+    .search-wrapper .search-inner-wrapper > input:focus,
+    .search-wrapper .search-inner-wrapper > .search-handoff-button:focus {
+      transition: border-color 0.5s var(--animation-easing-function), box-shadow 1s var(--animation-easing-function);
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.animate") and (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userContent.page.field_border") {
+    .search-wrapper .search-inner-wrapper:hover > input,
+    .search-wrapper .search-inner-wrapper:hover > .search-handoff-button {
+      border-color: var(--newtab-primary-action-background) !important;
+      transition: border-color 0.5s var(--animation-easing-function);
+    }
+  } /** Activity Stream - Pocket order to last **********************************/
+  @media (-moz-bool-pref: "userContent.newTab.pocket_to_last") {
+    .body-wrapper.on {
+      display: flex;
+      flex-wrap: wrap !important;
+      flex-direction: row !important;
+    }
+    .body-wrapper.on > .discovery-stream.ds-layout {
+      flex-basis: 100%;
+    }
+    .body-wrapper.on > .collapsible-section[data-section-id="topstories"],
+    .home-section > #pocket-section,
+    .home-section > .divider,
+    .home-section > div:not(.section) {
+      order: 2;
+    }
+  }
+  /** Activity Stream - Home Search Bar looks like proton *********************/
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    /* Dropdown Colors */
+    #root {
+      --newtab-search-background-color: rgba(255, 255, 255, 1); /* Same as light theme's --panel-background */
+      /* Set search dropdown background */
+      --newtab-search-dropdown-header-color: var(--newtab-search-background-color) !important;
+      --newtab-search-dropdown-color: var(--newtab-search-background-color) !important;
+      --newtab-element-hover-color: color-mix(in srgb, currentColor 9%, transparent) !important;
+    }
+    /* Padding */
+    /* Pointer */
+    /*- Fix Color For Nightly ------------------------------------------------*/
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") and (prefers-color-scheme: dark) {
+    #root {
+      /* Default Dark Mode */
+      --newtab-search-background-color: rgba(66, 65, 77, 1); /* Same as dark theme's --panel-background */
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    .activity-stream[lwt-sidebar]:not([style*="--newtab-background-color: rgba(43, 42, 51, 1);"]) #root {
+      /* Light weight theme */
+      --newtab-search-background-color: var(--lwt-sidebar-background-color);
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    #searchSuggestionTable {
+      border-radius: 4px !important;
+      -moz-window-shadow: cliprounded;
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    .contentSearchSuggestionTable .contentSearchOneOffItem {
+      width: 32px !important;
+      height: 32px !important;
+      /* Margin */
+      margin-block: 5px !important;
+      margin-inline-start: 5px !important;
+      margin-inline-end: 8px !important;
+      /* Border */
+      border-radius: 4px !important;
+      border-image: none !important; /* Original: linear-gradient(transparent 18%, var(--newtab-border-secondary-color) 18%, var(--newtab-border-secondary-color) 82%, transparent 82%) 1; */
+      border-inline-end: none !important; /* Original: 1px solid; */
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    #contentSearchSettingsButton::before {
+      content: url("chrome://global/skin/icons/settings.svg") !important;
+      display: inline-flex;
+      display: -moz-inline-box;
+      /* Color */
+      -moz-context-properties: fill, fill-opacity !important;
+      fill: currentColor !important;
+      /* Align */
+      margin-inline-end: 5px;
+      vertical-align: -25%;
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    .contentSearchSuggestionTable .contentSearchOneOffItem,
+    #contentSearchSettingsButton {
+      cursor: pointer;
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    .contentSearchSuggestionTable,
+    .contentSearchHeaderRow,
+    .contentSearchHeader,
+    .contentSearchSuggestionsContainer {
+      color: var(--newtab-text-primary-color) !important;
+      background: var(--newtab-search-background-color) !important;
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.searchbar") {
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected,
+    .contentSearchSuggestionTable .contentSearchSettingsButton:hover {
+      color: var(--newtab-text-primary-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected,
+    .contentSearchSuggestionTable .contentSearchSettingsButton:hover,
+    .contentSearchSuggestionTable .contentSearchOneOffItem.selected {
+      background: var(--newtab-element-hover-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected:active,
+    .contentSearchSuggestionTable .contentSearchOneOffItem:active {
+      background: var(--newtab-element-active-color) !important;
+    }
+    .contentSearchSuggestionTable .contentSearchSuggestionRow.selected .historyIcon {
+      fill: var(--newtab-icon-secondary-color) !important;
+    }
+  }
+  /** Activity Stream - Hide Firefox's logo ***********************************/
+  @media (-moz-bool-pref: "userContent.newTab.hidden_logo") {
+    .logo-and-wordmark {
+      display: none !important;
+    }
+    .outer-wrapper:not(.fixed-search) .search-wrapper {
+      padding-top: 0 !important;
+    }
+  }
+  /** Activity Stream - Custom background image *******************************/
+  @media (-moz-bool-pref: "userContent.newTab.background_image") {
+    body::before {
+      content: "";
+      position: fixed;
+      width: 100%;
+      height: 100%;
+      background-image: var(--uc-newTab-wallpaper, url("chrome://browser/skin/lepton/horizon-sunrise.svg"));
+      background-size: cover; /* or auto auto */
+      background-repeat: no-repeat;
+      background-position: right top;
+      background-attachment: fixed;
+      /** Use night sky version in dark mode **********************************/
+    }
+  }
+  @media (-moz-bool-pref: "userContent.newTab.background_image") and (prefers-color-scheme: dark) {
+    body::before {
+      background-image: var(--uc-newTab-wallpaper, url("chrome://browser/skin/lepton/horizon-night.svg"));
+    }
+  }
+}
+/** Error Page - Restore illustrations ****************************************/
+@media (-moz-bool-pref: "userContent.page.illustration") {
+  @-moz-document url-prefix("about:neterror"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
+  {
+    /* Illustrations Position */
+    #errorPageContainer,
+    .neterror > .container,
+    .description-wrapper {
+      min-height: 300px;
+      background-position: left center;
+      background-repeat: no-repeat;
+      background-size: 38%;
+      background-image: var(--uc-error-llustration);
+    }
+    #errorPageContainer {
+      display: flex;
+      flex-direction: column;
+    }
+    .description-wrapper {
+      padding-inline-start: 38%;
+    }
+    /* Container */
+    .container {
+      min-width: var(--in-content-container-min-width); /* 13em */
+      max-width: var(--in-content-container-max-width); /* 52em */
+    }
+    /* Text Position */
+    #text-container {
+      margin: auto;
+      padding-inline-start: 38%;
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml")
+  {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-connection-failure.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=dnsNotFound") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-server-not-found.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=blockedByPolicy"), url-prefix("about:neterror?e=deniedPortAccess"), url-prefix("about:neterror?e=malformedURI") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/illustrations/error-malformed-url.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=clockSkewError"), url-prefix("about:neterror?e=nssFailure") {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/blue-berror.svg);
+    }
+    #errorPageContainer,
+    .neterror > .container {
+      background-size: 18.5em;
+    }
+  }
+  @-moz-document url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
+  {
+    :root {
+      --uc-error-llustration: url(chrome://browser/skin/lepton/error-session-restore.svg);
+    }
+  }
+  @-moz-document url-prefix("about:neterror?e=fileNotFound") {
+    @media (-moz-bool-pref: "userContent.page.illustration") and (min-width: 970px) {
+      .title {
+        background-image: url("chrome://global/skin/icons/info.svg") !important;
+      }
+    }
+    #text-container {
+      padding-inline-start: 0;
+    }
+  }
+  @-moz-document url-prefix("about:tabcrashed") {
+    @media (-moz-bool-pref: "userContent.page.illustration") and (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/skin/tab-crashed.svg") !important;
+      }
+    }
+  }
+  @-moz-document url("about:robots"), url("chrome://browser/content/aboutRobots.xhtml")
+  {
+    @media (-moz-bool-pref: "userContent.page.illustration") and (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/content/aboutRobots-icon.png") !important;
+      }
+    }
+  }
+  @-moz-document url("about:welcomeBack"), url("chrome://browser/content/aboutWelcomeBack.xhtml")
+  {
+    @media (-moz-bool-pref: "userContent.page.illustration") and (min-width: 970px) {
+      .title {
+        background-image: url("chrome://browser/skin/lepton/welcome-back.svg") !important;
+      }
+    }
+  }
+  @-moz-document url-prefix("about:preferences") {
+    #no-results-message::after {
+      content: url("chrome://browser/skin/lepton/no-search-results.svg");
+      width: 380px;
+      height: 293px;
+      margin-top: 64px;
+      margin-inline: auto;
+    }
+  }
+}
+/** Fully Dark Mode ***********************************************************/
+/*= Fully Dark Mode - Dark Mode Colors =======================================*/
+@media (-moz-bool-pref: "userContent.page.proton_color") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^((jar:)?file:///).*/$")
+  {
+    /*= Default Colors - Hard Coded ==============================================*/
+    /* Based on chrome://global/skin/in-content/common.css */
+    :host,
+    :root {
+      --in-content-page-color: rgb(21, 20, 26);
+      --in-content-page-background: #fff;
+      --in-content-text-color: var(--in-content-page-color);
+      --in-content-deemphasized-text: rgb(91, 91, 102);
+      --in-content-box-background: #fff;
+      --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */
+      --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent);
+      --in-content-box-info-background: #f0f0f4;
+      --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent);
+      --in-content-item-hover-text: var(--in-content-page-color);
+      --in-content-item-selected: var(--in-content-primary-button-background);
+      --in-content-item-selected-text: var(--in-content-primary-button-text-color);
+      --in-content-icon-color: rgb(91, 91, 102);
+      --in-content-accent-color: #0a84ff;
+      --in-content-accent-color-active: #0060df;
+      --in-content-border-hover: var(--grey-90-a50);
+      --in-content-border-invalid: var(--red-50);
+      --in-content-border-color: #d7d7db;
+      --in-content-error-text-color: #c50042;
+      --in-content-link-color: var(--blue-60);
+      --in-content-link-color-hover: var(--blue-70);
+      --in-content-link-color-active: var(--blue-80);
+      --in-content-link-color-visited: var(--blue-60);
+      /* button background states are also used for checkboxes and radio buttons */
+      --in-content-button-text-color: var(--in-content-text-color);
+      --in-content-button-text-color-hover: var(--in-content-text-color);
+      --in-content-button-background: rgba(207, 207, 216, 0.33);
+      --in-content-button-background-hover: rgba(207, 207, 216, 0.66);
+      --in-content-button-background-active: rgb(207, 207, 216);
+      --in-content-primary-button-text-color: rgb(251, 251, 254);
+      --in-content-primary-button-text-color-hover: var(--in-content-primary-button-text-color);
+      --in-content-primary-button-background: #0061e0;
+      --in-content-primary-button-background-hover: #0250bb;
+      --in-content-primary-button-background-active: #053e94;
+      --in-content-danger-button-background: #e22850;
+      --in-content-danger-button-background-hover: #c50042;
+      --in-content-danger-button-background-active: #810220;
+      --in-content-focus-outline-color: var(--in-content-primary-button-background);
+      /* Note: 1px smaller than we want because we have a 1px transparent border. */
+      /* Once proton ships, these can probably stop being variables. */
+      --in-content-button-border-radius: 4px;
+      --in-content-button-horizontal-padding: 15px;
+      --in-content-button-vertical-padding: 7px;
+      --in-content-table-background: #f8f8fa;
+      --in-content-table-border-color: var(
+        --in-content-box-border-color
+      ); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */
+      --in-content-table-border-dark-color: var(--in-content-table-border-color);
+      --in-content-table-header-background: var(
+        --in-content-primary-button-background
+      ); /* Legacy: #0a84ff; rgb(5, 64, 150); */
+      --in-content-table-header-color: var(
+        --in-content-primary-button-text-color
+      ); /* Legacy: #ffffff; var(--in-content-page-color); */
+      --in-content-sidebar-width: 240px;
+      --dialog-warning-text-color: var(--red-60);
+      --checkbox-border-color: var(--in-content-box-border-color);
+      --checkbox-unchecked-bgcolor: var(--in-content-button-background);
+      --checkbox-unchecked-hover-bgcolor: var(--in-content-button-background-hover);
+      --checkbox-unchecked-active-bgcolor: var(--in-content-button-background-active);
+      --checkbox-checked-bgcolor: var(--in-content-primary-button-background);
+      --checkbox-checked-color: var(--in-content-primary-button-text-color);
+      --checkbox-checked-border-color: transparent;
+      --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover);
+      --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active);
+      --blue-40: #45a1ff;
+      --blue-50: #0a84ff;
+      --blue-60: #0060df;
+      --blue-70: #003eaa;
+      --blue-80: #002275;
+      --grey-30: #d7d7db;
+      --grey-60: #4a4a4f;
+      --grey-90-a10: rgba(12, 12, 13, 0.1);
+      --grey-90-a20: rgba(12, 12, 13, 0.2);
+      --grey-90-a30: rgba(12, 12, 13, 0.3);
+      --grey-90-a50: rgba(12, 12, 13, 0.5);
+      --grey-90-a60: rgba(12, 12, 13, 0.6);
+      --green-50: #30e60b;
+      --green-60: #12bc00;
+      --green-70: #058b00;
+      --green-80: #006504;
+      --green-90: #003706;
+      --orange-50: #ff9400;
+      --red-40: #ff4f5e;
+      --red-50: #ff0039;
+      --red-60: #d70022;
+      --red-70: #a4000f;
+      --red-80: #5a0002;
+      --red-90: #3e0200;
+      --yellow-50: #ffe900;
+      --yellow-60: #d7b600;
+      --yellow-60-a30: rgba(215, 182, 0, 0.3);
+      --yellow-70: #a47f00;
+      --yellow-80: #715100;
+      --yellow-90: #3e2800;
+      --shadow-10: 0 1px 4px var(--grey-90-a10);
+      --shadow-30: 0 4px 16px var(--grey-90-a10);
+      --card-padding: 16px;
+      --card-shadow: var(--shadow-10);
+      --card-outline-color: var(--grey-30);
+      --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+      --uc-warning-icon-bgcolor: #ffa436;
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (prefers-color-scheme: dark) {
+      :host,
+      :root {
+        /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
+        --in-content-page-background: rgb(28, 27, 34);
+        --in-content-page-color: rgb(251, 251, 254);
+        --in-content-deemphasized-text: rgb(191, 191, 201);
+        --in-content-box-background: rgb(35, 34, 43);
+        --in-content-box-background-odd: rgba(249, 249, 250, 0.05);
+        --in-content-box-info-background: rgba(249, 249, 250, 0.15);
+        --in-content-border-color: rgba(249, 249, 250, 0.2);
+        --in-content-border-hover: rgba(249, 249, 250, 0.3);
+        --in-content-border-invalid: rgb(255, 132, 139);
+        --in-content-error-text-color: #ff9aa2;
+        --in-content-button-background: rgb(43, 42, 51);
+        --in-content-button-background-hover: rgb(82, 82, 94);
+        --in-content-button-background-active: rgb(91, 91, 102);
+        --in-content-icon-color: rgb(251, 251, 254);
+        --in-content-primary-button-text-color: rgb(43, 42, 51);
+        --in-content-primary-button-background: rgb(0, 221, 255);
+        --in-content-primary-button-background-hover: rgb(128, 235, 255);
+        --in-content-primary-button-background-active: rgb(170, 242, 255);
+        --in-content-danger-button-background: #ff848b;
+        --in-content-danger-button-background-hover: #ffbdc5;
+        --in-content-danger-button-background-active: #ffdfe7;
+        --in-content-table-background: rgb(35, 34, 43);
+        --in-content-table-border-dark-color: var(--in-content-box-border-color);
+        --in-content-accent-color: var(--in-content-primary-button-background);
+        --in-content-accent-color-active: var(--in-content-primary-button-background-hover);
+        --in-content-link-color: var(--in-content-primary-button-background);
+        --in-content-link-color-hover: var(--in-content-primary-button-background-hover);
+        --in-content-link-color-active: var(--in-content-primary-button-background-active);
+        --in-content-link-color-visited: var(--in-content-link-color);
+        --card-outline-color: var(--grey-60);
+        --dialog-warning-text-color: var(--red-40);
+        --uc-warning-icon-bgcolor: #ffbd4f;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (prefers-contrast) {
+      :host,
+      :root {
+        --uc-warning-icon-bgcolor: var(--in-content-page-color);
+      }
+    }
+    /*= Menu color #477 ==========================================================*/
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-platform: windows) {
+      :root {
+        /* Override some menu color variables for light browser themes. */
+        --menuitem-hover-background-color: #e0e0e6;
+        --menu-background-color: #f9f9fb;
+        --menu-color: #15141a;
+        --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+        --menu-disabled-color: rgba(21, 20, 26, 0.4);
+        --menu-border-color: #cfcfd8;
+        --menu-icon-opacity: 0.7;
+        /* Declare menu colors for dark themes, but don't override anything yet. */
+        --dark-menuitem-hover-background-color: #52525e;
+        --dark-menu-background-color: #2b2a33;
+        --dark-menu-color: #fbfbfe;
+        --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+        --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+        --dark-menu-border-color: #5b5b66;
+        --dark-menu-icon-opacity: 1;
+      }
+      /* Override the menu color variables for dark browser themes. */
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-platform: windows) and (prefers-color-scheme: dark) {
+      :root {
+        --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+        --menu-background-color: var(--dark-menu-background-color);
+        --menu-color: var(--dark-menu-color);
+        --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+        --menu-disabled-color: var(--dark-menu-disabled-color);
+        --menu-border-color: var(--dark-menu-border-color);
+        --menu-icon-opacity: var(--dark-menu-icon-opacity);
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+      :root {
+        /* Override some menu color variables for light browser themes. */
+        --menuitem-hover-background-color: #e0e0e6;
+        --menu-background-color: #f9f9fb;
+        --menu-color: #15141a;
+        --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4);
+        --menu-disabled-color: rgba(21, 20, 26, 0.4);
+        --menu-border-color: #cfcfd8;
+        --menu-icon-opacity: 0.7;
+        /* Declare menu colors for dark themes, but don't override anything yet. */
+        --dark-menuitem-hover-background-color: #52525e;
+        --dark-menu-background-color: #2b2a33;
+        --dark-menu-color: #fbfbfe;
+        --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4);
+        --dark-menu-disabled-color: rgba(251, 251, 254, 0.4);
+        --dark-menu-border-color: #5b5b66;
+        --dark-menu-icon-opacity: 1;
+      }
+      /* Override the menu color variables for dark browser themes. */
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) and (prefers-color-scheme: dark) {
+      :root {
+        --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color);
+        --menu-background-color: var(--dark-menu-background-color);
+        --menu-color: var(--dark-menu-color);
+        --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color);
+        --menu-disabled-color: var(--dark-menu-disabled-color);
+        --menu-border-color: var(--dark-menu-border-color);
+        --menu-icon-opacity: var(--dark-menu-icon-opacity);
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.dark_blue_accent"),
+      (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.system_accent") {
+      :root,
+      :host(.anonymous-content-host) {
+        --color-accent-primary: var(--in-content-primary-button-background) !important;
+        --color-accent-primary-hover: var(--in-content-primary-button-background-hover) !important;
+        --color-accent-primary-active: light-dark(var(--color-blue-70), var(--color-cyan-20));
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.dark_blue_accent") and (prefers-color-scheme: dark) {
+      :host,
+      :root {
+        /* Color Memo
+         Just refer - Photon's dark color
+         --button-primary-bgcolor: #0060DF;
+         --button-primary-hover-bgcolor: #003EAA;
+         --button-primary-active-bgcolor: #002275;
+         --lwt-brighttext-url-color: #74c0ff;
+         --lwt-toolbarbutton-icon-fill-attention: #45a1ff;
+
+         Just refer - Proton's light color
+         --in-content-accent-color: #0a84ff;
+         --in-content-accent-color-active: #0060df;
+         --in-content-primary-button-background: #0061e0;
+         --in-content-primary-button-background-hover: #0250bb;
+         --in-content-primary-button-background-active: #053e94;
+
+         --blue-40: #45a1ff; rgb(69, 161, 255)
+         --blue-50: #0a84ff; rgb(10, 132, 255)
+         --blue-60: #0060df; rgb(0, 96, 223)
+         --blue-70: #003eaa; rgb(0, 62, 170)
+         --blue-80: #002275; rgb(0, 34, 117)
+
+         Relation
+         lighten(#0060df,   29%): #74b0ff;
+         lighten(#0060df, 19.8%): #4595ff
+         lighten(#0060df,  8.3%): #0a74ff
+         #0060df
+         darken(#0060df, 15.5%):  #003e90;
+         darken(#0060df, 28.1%):  #002250;
+        */
+        --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/
+        --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */
+      }
+      :host,
+      :root {
+        --in-content-primary-button-text-color: var(--in-content-page-color) !important;
+        --in-content-primary-button-background: var(--blue-60) !important;
+        --in-content-primary-button-background-hover: var(--blue-50) !important;
+        --in-content-primary-button-background-active: var(--blue-40) !important;
+        --in-content-focus-outline-color: var(--blue-40) !important;
+        --in-content-accent-color: var(--blue-40) !important;
+        --in-content-accent-color-active: var(--blue-30) !important;
+        --in-content-table-background: rgb(35, 34, 43) !important;
+        --in-content-table-border-color: rgba(249, 249, 250, 0.2) !important;
+        --in-content-table-header-background: rgb(5, 64, 150) !important;
+        --in-content-table-header-color: var(--in-content-page-color) !important;
+        --in-content-link-color: var(--blue-40) !important;
+        --in-content-link-color-hover: var(--blue-30) !important;
+        --in-content-link-color-active: var(--blue-20) !important;
+        --in-content-link-color-visited: var(--blue-40) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.system_accent") {
+      :host,
+      :root {
+        --in-content-primary-button-text-color: AccentColorText !important;
+        --in-content-primary-button-background: AccentColor !important;
+        --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, AccentColor) !important;
+        --in-content-primary-button-background-active: color-mix(in srgb, black 20%, AccentColor) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton_color") and (-moz-bool-pref: "userContent.page.proton_color.system_accent") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      :host,
+      :root {
+        --in-content-primary-button-text-color: HighlightText !important;
+        --in-content-primary-button-background: Highlight !important;
+        --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, Highlight) !important;
+        --in-content-primary-button-background-active: color-mix(in srgb, black 20%, Highlight) !important;
+      }
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.dark_mode") and (prefers-color-scheme: dark) {
+  /*= Addons.org =============================================================*/
+  @-moz-document url-prefix("https://addons.mozilla.org")
+  {
+    /* Basic */
+    .Page-content,
+    .SecondaryHero,
+    body,
+    main[aria-label="Content"] {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-page-background) !important;
+    }
+    /* Text */
+    input,
+    textarea,
+    select,
+    .AutoSearchInput-query,
+    .AutoSearchInput-suggestions-list,
+    .Page-content h1,
+    .Page-content h2,
+    .SearchResult-link,
+    .Home-SubjectShelf-link:link,
+    .Home-SubjectShelf-link:visited,
+    .DropdownMenuItem-link a,
+    .DropdownMenuItem-link button,
+    .Select,
+    .Badge,
+    .Notice-generic,
+    .Notice-genericWarning,
+    .Notice-button,
+    .Paginate .Button.Paginate-item:first-child,
+    .Paginate .Button.Paginate-item:last-child,
+    .Paginate .Button.Paginate-item--current-page,
+    .Button--neutral,
+    .blog-entry-title,
+    .blogpost-nav * {
+      color: var(--in-content-text-color) !important;
+    }
+    .AutoSearchInput-suggestions-item:is(:active, :focus, :hover),
+    .AutoSearchInput-suggestions-item--highlighted,
+    .SecondaryHero-message-link,
+    .SecondaryHero-module-link,
+    .Card-contents a:not(.Button),
+    .Card-footer-link a,
+    .Card-shelf-footer-in-header a,
+    .SearchResult-link:is(:active, :focus, :hover),
+    .SearchResult:hover .SearchResult-link,
+    .Home-SubjectShelf-link:is(:active, :focus, :hover),
+    .DropdownMenuItem-link a:is(:active, :focus, :hover),
+    .DropdownMenuItem-link button:is(:active, :focus, :hover),
+    .AddonMeta .MetadataCard-title a:is(:active, :hover),
+    .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link:is(:active, :hover),
+    .AddonMeta .MetadataCard-content a:is(:active, :hover),
+    .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link:is(:active, :hover),
+    .Addon-summary a,
+    .RatingsByStar-count a:hover,
+    .RatingsByStar-star a:hover,
+    .Paginate .Button.Paginate-item:not(:first-child, :last-child, .Paginate-item--current-page),
+    .AddonTitle-author a,
+    .PermissionsCard-learn-more,
+    .DefinitionList a,
+    .ShowMoreCard-contents a,
+    .AddonDescription-contents a,
+    .AddonTitle a,
+    .TooltipMenu-opener,
+    .LanguageTools .Card-contents a,
+    .Button--primary,
+    .blog-entry-read-more-link,
+    .blogpost-nav-next.blogpost-nav-no-prev:hover p,
+    .blogpost-content-wrapper p a,
+    .blogpost-nav-prev:hover p,
+    .blogpost-nav-next:hover p {
+      color: var(--in-content-link-color) !important;
+    }
+    .SearchResult--meta-section,
+    .MetadataCard-title,
+    .MetadataCard-title a,
+    .MetadataCard-content a,
+    .CollectionSort-label,
+    .SearchResult-summary,
+    .SearchResult-note,
+    .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link,
+    .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link,
+    .PermissionsCard-subhead--optional,
+    .PermissionsCard-subhead--required,
+    .Definition-dt,
+    .RatingsByStar-count a,
+    .RatingsByStar-star a,
+    .Paginate-page-number,
+    .AddonSummaryCard-addonAverage,
+    .AddonReviewCard-authorByLine,
+    .UserReview-byLine,
+    .UserReview-reply-header,
+    .Home-heroHeader-subtitle,
+    .blog-entry-date,
+    .blogpost-breadcrumb *,
+    .AddonTitle-author,
+    .ExpandableCard-ToggleLink,
+    .SearchFilters-label,
+    .PromotedBadge-label--line {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    .PromotedBadge-label--recommended {
+      color: color-mix(in srgb, #712b00 15%, #ff9400) !important;
+    }
+    /* Background */
+    .Button--action,
+    .DevHub-Navigation ul li.DevHub-Navigation-Register .Button,
+    .DevHub-MyAddons-item-buttons-submit .Button {
+      color: var(--in-content-primary-button-text-color) !important;
+      background: var(--in-content-primary-button-background) !important;
+    }
+    select,
+    .Select,
+    .Button--primary,
+    .Button--neutral,
+    .Button--neutral:link,
+    .Notice-button,
+    .AMInstallButton .AMInstallButton-loading-button {
+      background-color: var(--in-content-button-background) !important;
+    }
+    .Button--primary:hover,
+    .Button--neutral.Button--micro:not(.Button--disabled):hover,
+    .Button--neutral:not(.Button--disabled):hover,
+    .Notice-button:hover {
+      background: var(--in-content-button-background-hover) !important;
+    }
+    .Button--action.Button--micro:not(.Button--disabled):hover,
+    .Button--action:not(.Button--disabled):hover,
+    .DevHub-Navigation ul li.DevHub-Navigation-Register .Button:hover,
+    .DevHub-MyAddons-item-buttons-submit .Button:hover {
+      background: var(--in-content-primary-button-background-hover) !important;
+    }
+    .ShowMoreCard-contents::after {
+      background: linear-gradient(hsla(0deg, 0%, 100%, 0), var(--in-content-table-background)) !important;
+    }
+    input,
+    textarea,
+    .AutoSearchInput-query,
+    .AutoSearchInput-suggestions-list,
+    .SecondaryHero-module,
+    .Card-header,
+    .Card-contents,
+    .CardList ul > li,
+    .AddonsCard--horizontal ul.AddonsCard-list .SearchResult-wrapper:is(:focus, :hover),
+    .Paginate,
+    .LandingPage-header,
+    .DropdownMenu-items,
+    .DropdownMenu-items::after,
+    .MetadataCard,
+    .AddonsCard-list,
+    .Card-footer,
+    .StaticAddonCard,
+    .blogpost-nav,
+    .blogpost-nav * {
+      background: var(--in-content-table-background) !important;
+    }
+    .Paginate .Button.Paginate-item:is(:active, :hover) {
+      background: var(--in-content-button-background-hover) !important;
+    }
+    .Notice-generic,
+    .Notice-genericWarning {
+      background: color-mix(
+        in srgb,
+        var(--in-content-page-background) 40%,
+        var(--in-content-table-background)
+      ) !important;
+    }
+    .LanguageTools-header-row {
+      color: var(--in-content-table-header-color) !important;
+      background: var(--in-content-table-header-background) !important;
+    }
+    .LanguageTools-table.responsiveTable tbody tr:nth-child(2n) {
+      background-color: var(--in-content-box-background-odd) !important;
+    }
+    /* Fill */
+    .Icon-arrow-blue.SearchSuggestion-icon-arrow {
+      filter: hue-rotate(330deg) brightness(1.3) !important;
+    }
+    .SecondaryHero-module-icon {
+      filter: invert(85%) !important;
+    }
+    .Icon-magnifying-glass,
+    .Notice-icon {
+      filter: invert(65%) !important;
+    }
+    .PermissionsCard-learn-more .Icon,
+    .Permission .Icon {
+      filter: invert(100%) !important;
+    }
+    .Icon-heart {
+      filter: brightness(0) !important;
+    }
+    /* Others */
+    .DropdownMenu-items {
+      box-shadow: 0 0 2px var(--in-content-border-color) !important;
+    }
+    input,
+    textarea,
+    select {
+      border-color: var(--in-content-box-border-color) !important;
+    }
+    .UserProfileEdit input:disabled,
+    .UserProfileEdit textarea:disabled {
+      background-color: var(--in-content-box-background-odd) !important;
+    }
+    .AutoSearchInput-query {
+      border: 1px solid var(--in-content-table-background) !important;
+    }
+    .AutoSearchInput-query:is(:hover, :focus),
+    .UserProfileEditNotifications .UserProfileEditNotification-input:checked ~ .UserProfileEditNotification-checkbox {
+      border-color: var(--in-content-primary-button-background) !important;
+    }
+    .UserProfileEdit input:focus,
+    .UserProfileEdit textarea:focus,
+    .AutoSearchInput-query:focus,
+    .UserProfileEditNotifications .UserProfileEditNotification-input:focus ~ .UserProfileEditNotification-checkbox {
+      box-shadow: inset 0 0 0 1px var(--in-content-primary-button-background),
+        0 0 0 1px var(--in-content-primary-button-background), 0 0 0 4px rgba(0, 211, 255, 0.3) !important;
+    }
+    .PromotedBadge-link--line {
+      border-color: var(--in-content-deemphasized-text) !important;
+    }
+    .PromotedBadge-link--line:hover {
+      border-color: var(--in-content-button-background-hover) !important;
+    }
+    .blog-entry-read-more-link {
+      border-color: var(--in-content-link-color) !important;
+    }
+    .blogpost-nav-arrow-left .cls-1,
+    .blogpost-nav-arrow-right .cls-1 {
+      stroke: var(--in-content-text-color) !important;
+    }
+    /* /developers/ */
+    .DevHub-Navigation-Logo > .Logo::before {
+      -moz-context-properties: fill !important;
+      fill: var(--in-content-primary-button-background) !important;
+      background-image: url("chrome://browser/skin/lepton/addons-logo.svg") !important;
+    }
+    .DevHub-Navigation,
+    .DevHub-submit-addon,
+    .DevHub-get-involved,
+    .DevHub-MyAddons > * {
+      background: var(--in-content-page-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    .DevHub-Footer {
+      background: var(--in-content-box-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    .DevHub-callout-box {
+      background: var(--in-content-box-background-odd) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    .DevHub-Navigation.scheme-light ul li a,
+    .DevHub-Footer-sections-header,
+    .DevHub-Footer-section h4,
+    .DevHub-Footer-section p,
+    .DevHub-content-copy h2 {
+      color: var(--in-content-page-color) !important;
+    }
+    .DevHub-content-copy p,
+    .DevHub-callout-box p {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    .DevHub-Banner a,
+    .DevHub-Footer a,
+    .DevHub-MyAddons-list a,
+    .DevHub-MyAddons-item-buttons-all,
+    .DevHub-content-copy a,
+    .DevHub-callout-box a {
+      color: var(--in-content-link-color) !important;
+    }
+    body:is(.developer-hub, .statistics) {
+      /* Elements */
+      /* .developer-hub */
+      /* Text */
+      /* .developer-hub */
+      /* Background */
+      /* Border */
+      /* Others */
+    }
+    body:is(.developer-hub, .statistics) #main-wrapper,
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after,
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li:hover::after,
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul,
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul a,
+    body:is(.developer-hub, .statistics) .menu-nav em,
+    body:is(.developer-hub, .statistics) .primary,
+    body:is(.developer-hub, .statistics) .secondary,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item {
+      background: var(--in-content-page-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul a:hover,
+    body:is(.developer-hub, .statistics) .install-note,
+    body:is(.developer-hub, .statistics) .modal,
+    body:is(.developer-hub, .statistics) .popup {
+      background: var(--in-content-box-background-odd) !important;
+    }
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after,
+    body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul {
+      box-shadow: 0 0 3px var(--in-content-border-color) !important;
+    }
+    body:is(.developer-hub, .statistics) #footer {
+      background: linear-gradient(
+        to bottom,
+        var(--in-content-page-background) 0,
+        var(--in-content-page-background) 123px,
+        #0c99d5 123px,
+        #0c99d5 200px,
+        var(--in-content-page-background) 200px,
+        rgba(12, 153, 213, 0) 400px
+      ) !important;
+    }
+    body:is(.developer-hub, .statistics) #homepage h2,
+    body:is(.developer-hub, .statistics) header h2,
+    body:is(.developer-hub, .statistics) .primary h2,
+    body:is(.developer-hub, .statistics) h1,
+    body:is(.developer-hub, .statistics) hgroup h2.addon,
+    body:is(.developer-hub, .statistics) hgroup h2.collection,
+    body:is(.developer-hub, .statistics) h3,
+    body:is(.developer-hub, .statistics) .results h4,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item:hover h5,
+    body:is(.developer-hub, .statistics) .secondary .addon-status,
+    body:is(.developer-hub, .statistics) .secondary .addon-status .addon-details li.addon-listed-status,
+    body:is(.developer-hub, .statistics) #refine-results h5,
+    body:is(.developer-hub, .statistics) .island.criteria li,
+    body:is(.developer-hub, .statistics) .two-up div {
+      color: var(--in-content-page-color) !important;
+    }
+    body:is(.developer-hub, .statistics) .item-actions h5,
+    body:is(.developer-hub, .statistics) .item-actions > ul,
+    body:is(.developer-hub, .statistics) .item-actions > ul > li,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item .item-actions a,
+    body:is(.developer-hub, .statistics) .edit-media-details,
+    body:is(.developer-hub, .statistics) .devhub-form table th,
+    body:is(.developer-hub, .statistics) #recent-activity .listing .item .timestamp,
+    body:is(.developer-hub, .statistics) #upload-file .upload-status #uploadstatus,
+    body:is(.developer-hub, .statistics) #addon-validator-suite,
+    body:is(.developer-hub, .statistics) #addon-validator-suite .msg > *,
+    body:is(.developer-hub, .statistics) .island.criteria li a.inactive {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    body:is(.developer-hub, .statistics) section[role="main"] a,
+    body:is(.developer-hub, .statistics) header a,
+    body:is(.developer-hub, .statistics) .more-info,
+    body:is(.developer-hub, .statistics) .primary a,
+    body:is(.developer-hub, .statistics) .secondary a,
+    body:is(.developer-hub, .statistics) .submission-type-tabs a,
+    body:is(.developer-hub, .statistics) .popup a,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item:hover a,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item:hover .item-actions a,
+    body:is(.developer-hub, .statistics) #upload-status-results.status-pass strong,
+    body:is(.developer-hub, .statistics) #addon-validator-suite a,
+    body:is(.developer-hub, .statistics) #create-addon a,
+    body:is(.developer-hub, .statistics) .html-support {
+      color: var(--in-content-link-color) !important;
+    }
+    body:is(.developer-hub, .statistics) .dashboard .listing .item:hover a {
+      color: var(--in-content-link-color-hover) !important;
+    }
+    body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .downloads,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .price,
+    body:is(.developer-hub, .statistics) .dashboard .listing .item .item-info .users {
+      color: var(--green-60) !important;
+    }
+    body:is(.developer-hub, .statistics) .status-admin-disabled b,
+    body:is(.developer-hub, .statistics) .status-disabled b,
+    body:is(.developer-hub, .statistics) .status-incomplete b,
+    body:is(.developer-hub, .statistics) .status-purgatory b {
+      color: var(--red-60) !important;
+    }
+    body:is(.developer-hub, .statistics) .submission-type-tabs a.active,
+    body:is(.developer-hub, .statistics) .island.criteria li.selected a {
+      color: var(--orange-50) !important;
+    }
+    body:is(.developer-hub, .statistics) .secondary .addon-status,
+    body:is(.developer-hub, .statistics) .devhub-form .item,
+    body:is(.developer-hub, .statistics) #icons_default,
+    body:is(.developer-hub, .statistics) .listing .item,
+    body:is(.developer-hub, .statistics) .object-lead,
+    body:is(.developer-hub, .statistics) #addon-validator-suite .results .tier-results,
+    body:is(.developer-hub, .statistics) #addon-validator-suite .suite,
+    body:is(.developer-hub, .statistics) #addon-validator-suite .suite-container {
+      border-color: var(--in-content-border-color) !important;
+      background: var(--in-content-box-background) !important;
+    }
+    body:is(.developer-hub, .statistics) .highlight,
+    body:is(.developer-hub, .statistics) .listing-footer,
+    body:is(.developer-hub, .statistics) .tab-wrapper .fm-control {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-box-info-background) !important;
+    }
+    body:is(.developer-hub, .statistics) .submission-type-tabs a,
+    body:is(.developer-hub, .statistics) #head-chart {
+      background: var(--in-content-page-background) !important;
+    }
+    body:is(.developer-hub, .statistics) #head-chart rect {
+      fill: var(--in-content-page-background) !important;
+    }
+    body:is(.developer-hub, .statistics) #head-chart text {
+      fill: var(--in-content-deemphasized-text) !important;
+    }
+    body:is(.developer-hub, .statistics) #head-chart .highcharts-legend .highcharts-legend-item:hover text {
+      fill: var(--in-content-page-color) !important;
+      paint-order: stroke !important;
+      stroke: var(--in-content-page-color) !important;
+      stroke-width: 0.4px !important;
+      stroke-linecap: butt !important;
+      stroke-linejoin: miter !important;
+    }
+    body:is(.developer-hub, .statistics)
+      #head-chart
+      .highcharts-legend
+      .highcharts-legend-item
+      path[stroke="#CCC"]
+      ~ text {
+      fill: #ccc !important;
+    }
+    body:is(.developer-hub, .statistics) #icons_default li a:hover,
+    body:is(.developer-hub, .statistics) #side-nav .active a,
+    body:is(.developer-hub, .statistics) span.tip,
+    body:is(.developer-hub, .statistics) .addon-submission-process .tip,
+    body:is(.developer-hub, .statistics) .devhub-form .tip,
+    body:is(.developer-hub, .statistics) a.remove,
+    body:is(.developer-hub, .statistics) span.remove,
+    body:is(.developer-hub, .statistics) ul.errorlist li span.tip {
+      background-color: var(--in-content-box-info-background) !important;
+    }
+    body:is(.developer-hub, .statistics) a.remove:hover,
+    body:is(.developer-hub, .statistics) span.tip:hover {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+    }
+    body:is(.developer-hub, .statistics) .submission-type-tabs a,
+    body:is(.developer-hub, .statistics) .devhub-sidebar,
+    body:is(.developer-hub, .statistics) .devhub-sidebar div.item,
+    body:is(.developer-hub, .statistics) .devhub-form .listing-footer {
+      border-color: var(--in-content-border-color) !important;
+    }
+    body:is(.developer-hub, .statistics) #background-wrapper,
+    body:is(.developer-hub, .statistics) #main-wrapper {
+      border-color: var(--in-content-page-background) !important;
+    }
+    body:is(.developer-hub, .statistics) .item-actions a.more-actions:hover:after,
+    body:is(.developer-hub, .statistics) .item-actions button.link.more-actions:hover:after,
+    body:is(.developer-hub, .statistics) #change-locale::after {
+      border-top-color: var(--in-content-link-color) !important;
+    }
+    body:is(.developer-hub, .statistics) install-note::after,
+    body:is(.developer-hub, .statistics) .popup::after {
+      border-bottom-color: var(--in-content-box-background) !important;
+    }
+    body:is(.developer-hub, .statistics) .install-note::before,
+    body:is(.developer-hub, .statistics) .popup::before {
+      border-bottom-color: grey !important;
+    }
+    body:is(.developer-hub, .statistics) #refine-results,
+    body:is(.developer-hub, .statistics) .other-categories,
+    body:is(.developer-hub, .statistics) .versions .primary > .warning {
+      border-color: transparent !important;
+    }
+    body:is(.developer-hub, .statistics) .results {
+      border-color: var(--in-content-box-background-odd) !important;
+      background: transparent !important;
+    }
+    body:is(.developer-hub, .statistics) .results-inner {
+      border-color: var(--in-content-border-color) !important;
+      background: var(--in-content-border-color) !important;
+    }
+    body:is(.developer-hub, .statistics) #promos .view-button a,
+    body:is(.developer-hub, .statistics) #upload-file-finish.button,
+    body:is(.developer-hub, .statistics) #upload-file-widget .button.prominent,
+    body:is(.developer-hub, .statistics) .button,
+    body:is(.developer-hub, .statistics) .cta a.button:link,
+    body:is(.developer-hub, .statistics) .cta a.button:visited,
+    body:is(.developer-hub, .statistics) .linux .button.linux,
+    body:is(.developer-hub, .statistics) .mac .button.mac,
+    body:is(.developer-hub, .statistics) .other .button.bsd,
+    body:is(.developer-hub, .statistics) .other .button.solaris,
+    body:is(.developer-hub, .statistics) .sidebar a.button,
+    body:is(.developer-hub, .statistics) .sidebar button,
+    body:is(.developer-hub, .statistics) .theme .choices button,
+    body:is(.developer-hub, .statistics) .theme-queue a.button,
+    body:is(.developer-hub, .statistics) .theme-queue button,
+    body:is(.developer-hub, .statistics) .windows .button.windows,
+    body:is(.developer-hub, .statistics) a.button:link,
+    body:is(.developer-hub, .statistics) a.button:visited,
+    body:is(.developer-hub, .statistics) a.delete-button.delete-addon,
+    body:is(.developer-hub, .statistics) button,
+    body:is(.developer-hub, .statistics) button.button,
+    body:is(.developer-hub, .statistics) input:not(.upvotes):not(.downvotes)[type="submit"] {
+      color: var(--in-content-primary-button-text-color) !important;
+      background: var(--in-content-primary-button-background) !important;
+    }
+    body:is(.developer-hub, .statistics) #promos .view-button a:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) #upload-file-finish.button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) #upload-file-widget .button.prominent:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .cta a.button:link:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .cta a.button:visited:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .linux .button.linux:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .mac .button.mac:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .other .button.bsd:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .other .button.solaris:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .sidebar a.button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .sidebar button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .theme .choices button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .theme-queue a.button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .theme-queue button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) .windows .button.windows:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) a.button:link:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) a.button:visited:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) a.delete-button.delete-addon:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics) button.button:is(.selected, :focus, :hover),
+    body:is(.developer-hub, .statistics)
+      input:not(.upvotes):not(.downvotes)[type="submit"]:is(.selected, :focus, :hover) {
+      background: var(--in-content-primary-button-background-hover) !important;
+    }
+    body:is(.developer-hub, .statistics) .edit_with_prefix span,
+    body:is(.developer-hub, .statistics) .edit_with_suffix span {
+      border-color: var(--in-content-box-border-color) !important;
+      background-color: var(--in-content-box-background-odd) !important;
+      color: var(--in-content-deemphasized-text) !important;
+      padding-block: 3px !important;
+      cursor: not-allowed;
+    }
+    body:is(.developer-hub, .statistics) .devhub-form .item_wrapper input[type="email"] {
+      appearance: none !important;
+      padding: 2px 5px;
+      border: 1px solid;
+    }
+    body:is(.developer-hub, .statistics) #addon-validator-suite .suite-summary {
+      color: var(--in-content-deemphasized-text) !important;
+      background: var(--in-content-button-background) !important;
+      border-top-color: var(--in-content-border-color) !important;
+    }
+    body:is(.developer-hub, .statistics) #addon-validator-suite .context {
+      border-color: var(--in-content-box-border-color) !important;
+      background-color: var(--in-content-button-background) !important;
+      background: var(--in-content-table-background) !important;
+    }
+  }
+  /*= Support.org ============================================================*/
+  @-moz-document url-prefix("https://support.mozilla.org")
+  {
+    /* Basic */
+    :root {
+      --color-blue-06: var(--in-content-link-color) !important;
+      --color-blue-07: var(--in-content-link-color-hover) !important;
+      --color-blue-09: var(--in-content-link-color-active) !important;
+      --page-bg: var(--in-content-page-background) !important;
+      --color-white: var(--in-content-page-background) !important;
+      --color-shade-bg: var(--in-content-page-background) !important;
+      --color-marketing-gray-02: var(--card-outline-color) !important;
+      --color-inverse-bg: var(--in-content-page-color) !important;
+      --color-inverse: var(--in-content-page-background) !important;
+      --color-text: var(--in-content-page-color) !important;
+      --color-moz-text: var(--in-content-page-color) !important;
+      --color-moz-heading: var(--in-content-page-color) !important;
+      --color-text-light: var(--in-content-deemphasized-text) !important;
+      --color-link: var(--in-content-link-color) !important;
+      --color-success: var(--green-70) !important;
+      --color-warning: var(--yellow-80) !important;
+      --color-error: var(--red-60) !important;
+      --color-error-hover: var(--red-50) !important;
+      --color-moz-heading: #fff;
+      --color-moz-inverse-bg: var(red) !important;
+      --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent),
+        0 0 0 2px var(--in-content-primary-button-background-active);
+      --color-dark-gray-10: var(--in-content-deemphasized-text) !important;
+    }
+    .warning {
+      --color-link: rgb(55, 255, 255) !important;
+    }
+    body,
+    #main-content,
+    #instant-search-content,
+    #mzp-c-menu-panel-help,
+    .mzp-c-navigation,
+    .kbox-container {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-page-background) !important;
+    }
+    #editor {
+      border: 2px solid var(--in-content-border-color) !important;
+    }
+    .CodeMirror-linenumbers {
+      background: var(--in-content-table-background);
+    }
+    .CodeMirror-lines {
+      color: var(--in-content-deemphasized-text) !important;
+      background: var(--in-content-page-background) !important;
+    }
+    .CodeMirror-scroll {
+      background: var(--in-content-page-background) !important;
+    }
+    /* Text */
+    blockquote,
+    .mzp-c-menu-category .mzp-c-menu-title,
+    .mzp-c-menu-item .mzp-c-menu-item-link,
+    .mzp-c-menu-item .mzp-c-menu-item-link > *,
+    .mzp-c-menu-item .mzp-c-menu-item-list a,
+    #doc-content .menu,
+    .document--content .menu,
+    .forum--entry-content .menu,
+    .tag-name a {
+      color: var(--in-content-page-color) !important;
+    }
+    .ts-select-trigger,
+    input[type="date"],
+    input[type="email"],
+    input[type="number"],
+    input[type="password"],
+    input[type="search"],
+    input[type="tel"],
+    input[type="text"],
+    input[type="time"],
+    input[type="url"],
+    select,
+    textarea,
+    #doc-content .button,
+    #doc-content .key,
+    .document--content .button,
+    .document--content .key,
+    .forum--entry-content .button,
+    .forum--entry-content .key {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    .tag-list a {
+      color: var(--color-marketing-gray-10) !important;
+    }
+    .tag-list a:hover,
+    .sidebar-nav a:hover {
+      color: var(--color-link) !important;
+    }
+    .tag-list li {
+      background: var(--in-content-page-color) !important;
+    }
+    .tag-list li:hover {
+      background: var(--in-content-deemphasized-text) !important;
+    }
+    #remaining-characters {
+      color: var(--in-content-page-color) !important;
+    }
+    /* Background */
+    .sidebar-nav.topics,
+    .sidebar-nav.topics > li {
+      background: var(--in-content-page-background) !important;
+    }
+    .mzp-c-menu-panel {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-page-background) !important;
+    }
+    .mzp-c-menu-list-list,
+    .mzp-c-menu-list-list:hover {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-box-background) !important;
+    }
+    .mzp-c-menu-list-item:focus,
+    .mzp-c-menu-list-item:hover {
+      background: var(--in-content-button-background-hover) !important;
+    }
+    .cm-bold {
+      color: var(--in-content-page-color) !important;
+    }
+    /* Fill */
+    .sumo-nav--logo,
+    .sumo-nav--search-button,
+    .sumo-nav--toggle-button,
+    .card:not(.is-inverse) .card--icon-sm,
+    .mzp-c-menu-item-icon,
+    .mzp-c-menu-button-close,
+    .topic-article--icon,
+    .card--topic > .card--icon,
+    .mzp-c-details .is-summary button::before,
+    details .is-summary button::before,
+    summary::before,
+    .icon-button > button,
+    .search-button,
+    img:is(.pencil, .thumbsup, .syncing.icon),
+    #step-indicator li:not([status="done"])::before {
+      filter: invert(95%) !important;
+    }
+    button.markup-toolbar-button {
+      /*using 0.5 because in middle*/
+      filter: invert(0.5) !important;
+    }
+    /* Others */
+    .support-callouts > .card.is-inverse {
+      background: #20133a !important;
+    }
+    .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) {
+      color: var(--in-content-page-color) !important;
+    }
+    blockquote {
+      border-color: var(--in-content-border-color) !important;
+    }
+    .sumo-button.secondary-button {
+      border-color: transparent !important;
+    }
+    .mzp-c-menu-panel {
+      border-color: var(--in-content-button-background-hover) !important;
+    }
+    .mzp-c-menu-item:is(:focus, :hover, :active) .mzp-c-menu-item-link .mzp-c-menu-item-title {
+      border-color: var(--in-content-page-color) !important;
+    }
+    @media screen and (-moz-bool-pref: "userContent.page.dark_mode") and (prefers-color-scheme: dark) and (min-width: 768px) {
+      .mzp-c-menu-panel {
+        box-shadow: 0 16px 16px -16px rgba(255, 255, 255, 0.3) !important;
+      }
+    }
+    .card--product,
+    .card--topic,
+    .card--article {
+      box-shadow: 0 5px 10px -3px rgba(249, 249, 250, 0.12), 0 3px 16px 2px rgba(91, 91, 102, 0.12),
+        0 8px 12px 1px rgba(82, 82, 94, 0.04) !important;
+    }
+  }
+  /*= Accounts.com ===========================================================*/
+  @-moz-document url-prefix("https://accounts.firefox.com")
+  {
+    /* Basic */
+    body {
+      color: var(--in-content-page-color) !important;
+      background: var(--in-content-page-background) !important;
+    }
+    .button.primary-button,
+    .button[type="submit"]:not(.secondary-button),
+    .settings-button.primary-button,
+    .settings-button[type="submit"]:not(.secondary-button),
+    button.primary-button,
+    button[type="submit"]:not(.secondary-button) {
+      color: var(--in-content-primary-button-text-color) !important;
+      background: var(--in-content-primary-button-background) !important;
+    }
+    /* Text */
+    header h1,
+    .info,
+    .info a,
+    .prefillEmail,
+    .faint a:hover,
+    .cta-neutral:hover {
+      color: var(--in-content-page-color) !important;
+    }
+    #main-content.panel a,
+    .nav-active,
+    .links a,
+    .link-blue,
+    .text-blue-500 {
+      color: var(--in-content-link-color) !important;
+    }
+    .link-blue:hover {
+      color: var(--in-content-link-color-hover) !important;
+    }
+    .signed-in-email-message,
+    .verification-email-message,
+    .verification-message,
+    .verification-recovery-code-message,
+    .verification-totp-message,
+    .input-row input[type="email"],
+    .input-row input[type="number"],
+    .input-row input[type="password"],
+    .input-row input[type="tel"],
+    .input-row input[type="text"],
+    .input-row input::placeholder,
+    .input-text,
+    .firefox-family-services > ul > .firefox-service,
+    .faint,
+    .faint a,
+    .text-grey-400 {
+      color: var(--in-content-deemphasized-text) !important;
+    }
+    /* Background */
+    .flex .flex-wrap {
+      background: var(--in-content-page-background);
+    }
+    .password-row .show-password-label {
+      background-color: unset !important;
+    }
+    #main-content,
+    .modal,
+    .firefox-family-services,
+    .input-row input[type="email"],
+    .input-row input[type="number"],
+    .input-row input[type="password"],
+    .input-row input[type="tel"],
+    .input-row input[type="text"],
+    .input-text,
+    header,
+    .card,
+    .card-base,
+    .bg-white:not(nav) {
+      background: var(--in-content-box-background) !important;
+    }
+    #suggest-sync,
+    .cta-neutral {
+      background: var(--in-content-button-background) !important;
+    }
+    .cta-neutral:hover,
+    .bg-grey-50:hover,
+    .hover\:bg-grey-100:hover {
+      background: var(--in-content-button-background-hover) !important;
+    }
+    .nav-active,
+    .text-blue-500 .cta-neutral,
+    .text-blue-500 .bg-grey-50,
+    .text-blue-500 .hover\:bg-grey-100 {
+      background: var(--in-content-button-background) !important;
+    }
+    .hover\:bg-grey-200:hover {
+      background: var(--in-content-button-background-active) !important;
+    }
+    .button.primary-button:hover:enabled,
+    .button[type="submit"]:not(.secondary-button):hover:enabled,
+    .settings-button.primary-button:hover:enabled,
+    .settings-button[type="submit"]:not(.secondary-button):hover:enabled,
+    button.primary-button:hover:enabled,
+    button[type="submit"]:not(.secondary-button):hover:enabled {
+      background: var(--in-content-primary-button-background-hover) !important;
+    }
+    .tooltip,
+    .tooltip::before {
+      background: var(--in-content-danger-button-background) !important;
+    }
+    /* Fill */
+    .dismiss,
+    #about-mozilla,
+    .show-password-label,
+    footer a[data-testid="link-mozilla"] {
+      filter: invert(95%) !important;
+    }
+    div[data-testid="settings-connected-service"]
+      svg:is(
+        [data-testid="mobile-icon"],
+        [data-testid="desktop-icon"],
+        [data-testid="tablet-icon"],
+        [data-testid="vr-icon"],
+        [data-testid="addon-icon"]
+      ),
+    header button svg,
+    header .rounded svg,
+    #service svg {
+      filter: brightness(15) !important;
+    }
+    button.relative,
+    #fxa-settings nav svg {
+      filter: brightness(2) !important;
+    }
+    /* Others */
+    .border-grey-100,
+    .input-row input[type="email"],
+    .input-row input[type="number"],
+    .input-row input[type="password"],
+    .input-row input[type="tel"],
+    .input-row input[type="text"],
+    .unit-row-hr .border-grey-100 {
+      border-color: var(--in-content-border-color) !important;
+    }
+    .border-grey-100:hover,
+    .input-row input[type="email"]:hover,
+    .input-row input[type="number"]:hover,
+    .input-row input[type="password"]:hover,
+    .input-row input[type="tel"]:hover,
+    .input-row input[type="text"]:hover {
+      border-color: var(--in-content-border-hover) !important;
+    }
+    #main-content {
+      box-shadow: 0 12px 18px 2px rgba(249, 249, 250, 0.12), 0 6px 22px 4px rgba(91, 91, 102, 0.12),
+        0 6px 10px -4px rgba(82, 82, 94, 0.04) !important;
+    }
+    .input-row input[type="email"]:focus,
+    .input-row input[type="number"]:focus,
+    .input-row input[type="password"]:focus,
+    .input-row input[type="tel"]:focus,
+    .input-row input[type="text"]:focus {
+      box-shadow: 0 0 0 3px color-mix(in srgb, var(--in-content-primary-button-background-hover) 80%, transparent) !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.dark_mode") and (prefers-color-scheme: dark) and (-moz-bool-pref: "userContent.page.dark_mode.pdf") {
+  @-moz-document unobservable-document() {
+    @-moz-document regexp("^(?!.*\\.pdf\\?n).*") {
+      #outerContainer {
+        --sidebaritem-bg-color: #38383d;
+        --uc-pdf-dark-filter: grayscale(10%) invert(90%);
+      }
+      #sidebarContainer > #sidebarContent > #thumbnailView .thumbnailImage {
+        filter: var(--uc-pdf-dark-filter);
+        box-shadow: 0 0 0 1px hsla(0deg, 0%, 100%, 0.5), 0 2px 8px hsla(0deg, 0%, 100%, 0.3) !important;
+      }
+      #viewerContainer > #viewer > .page > .canvasWrapper > canvas {
+        filter: var(--uc-pdf-dark-filter);
+      }
+    }
+  }
+}
+/** Fully Proton Mode *********************************************************/
+@media (-moz-bool-pref: "userContent.page.proton") {
+  /*= Common contents ==========================================================*/ /*= abouts' common ===========================================================*/
+  @-moz-document url-prefix("about:"), url-prefix("chrome://pippki/content/"), url-prefix("chrome://browser/content/")
+  {
+    xul|treecols {
+      border-bottom-color: var(--in-content-box-border-color) !important;
+    }
+  }
+  @-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard"), url-prefix("about:sync-log"), url-prefix("about:memory"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  {
+    /* Base */
+    html,
+    body {
+      font: message-box !important;
+      appearance: none !important;
+      background-color: var(--in-content-page-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    body {
+      font-size: 15px !important;
+      font-weight: normal !important;
+      margin: 0 !important;
+    }
+    h1 {
+      line-height: 1.2 !important;
+    }
+    h2 {
+      line-height: 1.4em !important;
+    }
+    /* Link */
+    a {
+      color: var(--in-content-link-color) !important;
+    }
+    a:hover,
+    .text-link:hover {
+      color: var(--in-content-link-color-hover) !important;
+      text-decoration: underline !important;
+    }
+    a:visited {
+      color: var(--in-content-link-color-visited) !important;
+    }
+    a:hover:active,
+    .text-link:hover:active {
+      color: var(--in-content-link-color-active) !important;
+    }
+    a:-moz-focusring,
+    .text-link:-moz-focusring {
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 1px !important;
+      border-radius: 4px !important;
+    }
+    /* Button */
+    button {
+      font: inherit;
+    }
+    button,
+    select,
+    input[type="color"] {
+      appearance: none !important;
+      min-height: 32px !important;
+      color: var(--in-content-button-text-color, inherit) !important;
+      border: 1px solid transparent !important; /* shows up in high-contrast mode */
+      border-radius: var(--in-content-button-border-radius) !important;
+      background-color: var(--in-content-button-background) !important;
+      font-weight: 400 !important;
+      padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important;
+      text-decoration: none !important;
+      margin: 4px 8px !important;
+      /* Ensure font-size isn't overridden by widget styling (e.g. in forms.css) */
+      font-size: 1em !important;
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      button,
+      select,
+      input[type="color"] {
+        border-radius: 0 !important;
+      }
+    }
+    button {
+      font-weight: 600 !important;
+      /* Use the same margin of other elements for the alignment */
+      margin-inline: 4px !important;
+      min-width: 6.3em !important;
+    }
+    /* Medium and small buttons get sized to 7/14 and 6/12px padding (when adding
+       * the 1px border): */
+    button.medium {
+      --in-content-button-vertical-padding: 6px;
+      --in-content-button-horizontal-padding: 13px;
+      min-height: 28px !important;
+      font-size: 0.95em !important;
+    }
+    button.small {
+      --in-content-button-vertical-padding: 5px;
+      --in-content-button-horizontal-padding: 11px;
+      min-height: 24px !important;
+      font-size: 0.9em !important;
+    }
+    ::-moz-focus-inner {
+      border: none !important;
+    }
+    button:-moz-focusring {
+      box-shadow: none !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: 2px !important;
+    }
+    button:enabled:hover,
+    input[type="color"]:hover {
+      background-color: var(--in-content-button-background-hover) !important;
+      color: var(--in-content-button-text-color-hover) !important;
+      border-color: transparent !important;
+    }
+    button:enabled:hover:active,
+    input[type="color"]:enabled:hover:active {
+      background-color: var(--in-content-button-background-active) !important;
+    }
+    button:disabled,
+    input[type="color"]:disabled {
+      opacity: 0.4 !important;
+    }
+    button[autofocus],
+    button[type="submit"],
+    button.primary {
+      background-color: var(--in-content-primary-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+    }
+    button[autofocus]:enabled:hover,
+    button[type="submit"]:enabled:hover,
+    button.primary:enabled:hover {
+      background-color: var(--in-content-primary-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+    }
+    button[autofocus]:enabled:hover:active,
+    button[type="submit"]:enabled:hover:active,
+    button.primary:enabled:hover:active {
+      background-color: var(--in-content-primary-button-background-active) !important;
+    }
+    /* Checkbox */
+    input[type="checkbox"] {
+      margin-block: 2px !important;
+    }
+    input[type="checkbox"] {
+      appearance: none !important;
+      height: 16px !important;
+      width: 16px !important;
+      border: 1px solid var(--checkbox-border-color) !important;
+      background-color: var(--checkbox-unchecked-bgcolor) !important;
+      border-radius: 2px !important;
+      margin-inline: 0 6px !important;
+      flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_checklabel") {
+      input[type="checkbox"] {
+        border-radius: 0 !important;
+      }
+    }
+    input[type="checkbox"]:enabled:hover {
+      background-color: var(--checkbox-unchecked-hover-bgcolor) !important;
+    }
+    input[type="checkbox"]:enabled:hover:active {
+      background-color: var(--checkbox-unchecked-active-bgcolor) !important;
+    }
+    input[type="checkbox"]:checked {
+      border-color: var(--checkbox-checked-border-color) !important;
+      background-color: var(--checkbox-checked-bgcolor) !important;
+      background-image: url("chrome://global/skin/icons/check.svg") !important;
+      background-position: center !important;
+      background-repeat: no-repeat !important;
+      -moz-context-properties: fill !important;
+      fill: currentColor !important;
+      color: var(--checkbox-checked-color) !important;
+      /* Style the button also when printing with "Print Backgrounds" unchecked */
+      color-adjust: exact !important;
+    }
+    input[type="checkbox"]:enabled:checked:hover {
+      background-color: var(--checkbox-checked-hover-bgcolor) !important;
+    }
+    input[type="checkbox"]:enabled:checked:hover:active {
+      background-color: var(--checkbox-checked-active-bgcolor) !important;
+    }
+    /* Textarea */
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    textarea {
+      appearance: none !important;
+      border: 1px solid var(--in-content-box-border-color) !important;
+      border-radius: 4px !important;
+      color: inherit !important;
+      background-color: var(--in-content-box-background) !important;
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    textarea {
+      font-family: inherit !important;
+      font-size: inherit !important;
+      padding: 8px !important;
+      margin: 2px 4px !important;
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus,
+    textarea:focus,
+    search-textbox[focused],
+    tree:focus-visible,
+    richlistbox:focus-visible {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-focus-outline-color) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    input:is(
+        [type="email"],
+        [type="tel"],
+        [type="text"],
+        [type="password"],
+        [type="url"],
+        [type="number"]
+      ):-moz-ui-invalid,
+    textarea:-moz-ui-invalid {
+      border-color: transparent !important;
+      outline: 2px solid var(--in-content-border-invalid) !important;
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
+    }
+    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
+    textarea:disabled,
+    search-textbox[disabled="true"] {
+      opacity: 0.4 !important;
+    }
+    /* Table */
+    table {
+      width: 100% !important;
+    }
+  }
+  @-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard") {
+    table {
+      border: 1px solid var(--in-content-table-border-color) !important;
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:cache"), url-prefix("about:checkerboard") {
+    th,
+    td {
+      border: 1px solid var(--in-content-table-border-color) !important;
+    }
+    th {
+      background-color: var(--in-content-table-header-background) !important;
+      color: var(--in-content-table-header-color) !important;
+    }
+  }
+  /*= Field Border =============================================================*/
+  /*= View Source ==============================================================*/
+  /*= Directory View ===========================================================*/
+  /*= about:plugins ============================================================*/
+  /*= about:cache ==============================================================*/
+  /*= about:checkerboard =======================================================*/
+  /*= about:memory =============================================================*/
+  /*= about:preferences ========================================================*/
+  /*= about:processes ==========================================================*/
+  /*= about:processes ==========================================================*/
+  /*= chrome://browser/content/places/places.xhtml =============================*/
+}
+@media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userContent.page.field_border") and (prefers-reduced-motion: no-preference) {
+  @-moz-document url-prefix("about:") {
+    html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):not(
+        #newtab-search-text
+      ):hover,
+    html|textarea:hover,
+    xul|search-textbox:hover {
+      border-color: var(--in-content-focus-outline-color) !important;
+      transition: border-color 0.5s var(--animation-easing-function);
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("view-source") {
+    :root {
+      background-color: var(--in-content-page-background) !important; /* Original: white */
+      color: var(--in-content-page-color) !important; /* Original: black */
+      /* Colors */
+      --view-source-green: var(--green-80);
+      --view-source-purple: #800080; /* Like alphenglow */
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (prefers-color-scheme: dark) {
+      :root {
+        --view-source-green: var(--green-60);
+        --view-source-purple: #c68aff;
+      }
+    }
+    pre[id]::before,
+    span[id]::before {
+      color: color-mix(
+        in srgb,
+        var(--in-content-page-color) 70%,
+        var(--in-content-page-background)
+      ) !important; /* Original: #ccc */
+    }
+    .highlight .start-tag,
+    .highlight .end-tag {
+      color: var(--view-source-purple) !important; /* Original: purple */
+    }
+    .highlight .comment {
+      color: var(--view-source-green) !important; /* Original: green */
+    }
+    .highlight .cdata {
+      color: var(--in-content-border-invalid) !important; /* Original: #CC0066 */
+    }
+    .highlight .doctype {
+      color: #4682b4 !important; /* Original: steelblue */
+    }
+    .highlight .pi {
+      color: orchid !important; /* Original: orchid */
+    }
+    .highlight .entity {
+      color: #ff4500 !important; /* Original: #FF4500 */
+    }
+    .highlight .attribute-name {
+      color: var(--view-source-green) !important; /* Original: black */
+    }
+    .highlight .attribute-value {
+      color: var(--in-content-link-color) !important; /* Original: blue */
+    }
+    .highlight .markupdeclaration {
+      color: #4682b4 !important; /* Original: steelblue */
+    }
+    .highlight .error,
+    .highlight
+      .error
+      > :-moz-any(.start-tag, .end-tag, .comment, .cdata, .doctype, .pi, .entity, .attribute-name, .attribute-value) {
+      color: var(--in-content-error-text-color) !important; /* Original: red */
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:sync-log"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  {
+    body {
+      background-color: var(--in-content-box-background) !important;
+      margin: 4em auto !important; /* Override to default */
+    }
+    thead a {
+      color: var(--in-content-page-color) !important;
+    }
+    td ::before {
+      vertical-align: top !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:plugins") {
+    .notice {
+      background: var(--in-content-box-background) !important;
+      border: 1px solid var(--in-content-border-color) !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:cache") {
+    table {
+      padding: 0 !important;
+    }
+    th,
+    td {
+      padding: 4px !important;
+      text-align: match-parent !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:checkerboard") {
+    #canvas {
+      border: 1px solid var(--in-content-border-color) !important;
+    }
+    #excludePageFromZoom {
+      vertical-align: bottom !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:memory") {
+    .opsRow,
+    .section {
+      background-color: var(--in-content-box-background) !important;
+      color: var(--in-content-page-color) !important;
+    }
+    .opsRowLabel input {
+      vertical-align: bottom !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("chrome://browser/content")
+  {
+    #sanitizeEverythingWarningIcon {
+      list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+      -moz-context-properties: fill;
+      fill: var(--uc-warning-icon-bgcolor);
+      width: 48px;
+      height: 48px;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:preferences"), url-prefix("chrome://browser/content/preferences/dialogs/"), url-prefix("chrome://pippki/content/")
+  {
+    :is(.contentPane, .main-content, #certmanagertabs) richlistbox > richlistitem:hover,
+    #translations-manage-install-list > .translations-manage-language:hover {
+      background-color: var(--in-content-item-hover);
+      color: var(--in-content-item-hover-text);
+    }
+    :is(.contentPane, .main-content, #certmanagertabs) richlistbox > richlistitem[selected="true"],
+    #translations-manage-install-list > .translations-manage-language[selected="true"] {
+      background-color: var(--in-content-item-selected);
+      color: var(--in-content-item-selected-text);
+    }
+    :is(.contentPane, .main-content, #certmanagertabs)
+      richlistbox
+      > richlistitem:nth-child(even):not([selected="true"], :hover),
+    #translations-manage-install-list > .translations-manage-language:nth-child(even):not([selected="true"], :hover) {
+      background-color: var(--in-content-box-background-odd);
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:preferences") {
+    .privacy-extra-information > .custom-option:not(:first-child) {
+      margin-block: 2px !important; /* Original: 10px */
+    }
+    .extra-information-label:not(:first-child) {
+      margin-top: 4px !important; /* Original: 19px */
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:processes"), url-prefix("about:performance") {
+    td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");']
+    {
+      background-image: url("chrome://browser/skin/lepton/link.svg") !important;
+    }
+    .profiler-icon {
+      cursor: pointer;
+      background-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+      background-repeat: no-repeat !important;
+      background-position: center !important;
+      color: inherit !important;
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (not (-moz-bool-pref: "userChrome.rounding.square_button")) {
+      .profiler-icon {
+        border-radius: 8px !important;
+      }
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:profiling") {
+    .perf-intro-icon {
+      background-image: url("chrome://browser/skin/lepton/performance.svg") !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url-prefix("about:support") {
+    #reset-box-button {
+      --in-content-focus-outline-color: var(--in-content-danger-button-background) !important;
+      background-color: var(--in-content-danger-button-background) !important;
+      color: var(--in-content-primary-button-text-color) !important;
+      border-color: var(--in-content-primary-button-border-color) !important;
+    }
+    #reset-box-button:enabled:hover {
+      background-color: var(--in-content-danger-button-background-hover) !important;
+      color: var(--in-content-primary-button-text-color-hover) !important;
+      border-color: var(--in-content-primary-button-border-hover) !important;
+    }
+    #reset-box-button:enabled:hover:active {
+      background-color: var(--in-content-danger-button-background-active) !important;
+      color: var(--in-content-primary-button-text-color-active) !important;
+      border-color: var(--in-content-primary-button-border-active) !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userContent.page.proton") {
+  @-moz-document url("chrome://browser/content/places/places.xhtml")
+  {
+    /** Library - Icons Replace *************************************************/
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.icon.library") {
+      /*= Standard Folder - More Visible ===========================================*/
+      /* on Toolbar and Menus */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]),
+      :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, container),
+      #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]),
+      #editBMPanel_folderMenuList .folder-icon:not([id]),
+      .downloadIconShow > .button-box > .button-icon {
+        list-style-image: var(--uc-folder-icon) !important;
+      }
+      /* Standard Folder - Open */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"],
+      :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, container, open) {
+        list-style-image: url("chrome://browser/skin/lepton/folder-open.svg") !important;
+      }
+      /*= Other Folder - Inbox Icon ================================================*/
+      /* on Menus */
+      #PlacesToolbar #OtherBookmarks,
+      #BMB_bookmarksPopup #BMB_unsortedBookmarks,
+      #bookmarksMenuPopup #menu_unsortedBookmarks,
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks),
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_unfiled_____),
+      #editBMPanel_unfiledRootItem,
+      #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] {
+        list-style-image: url("chrome://browser/skin/lepton/mail-inbox-all.svg") !important;
+      }
+      /* Other Folder - Open */
+      #PlacesToolbar #OtherBookmarks[open="true"],
+      #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"],
+      #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"],
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks),
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) {
+        list-style-image: url("chrome://browser/skin/lepton/mail-inbox.svg") !important;
+      }
+      /*= Default Icon - Override ===================================================*/
+      /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */
+      /* Query */
+      :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) {
+        list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important;
+      }
+      /* History */
+      :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer),
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
+        list-style-image: url("chrome://browser/skin/history.svg") !important;
+      }
+      /* Downloads */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
+        list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important;
+      }
+      /* Tag */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+      .bookmark-item[query][tagContainer] {
+        list-style-image: url("chrome://browser/skin/lepton/tag.svg") !important;
+      }
+      /* Bookmark */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
+        list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
+      }
+      /* Bookmark Toolbar */
+      #BMB_bookmarksPopup #BMB_bookmarksToolbar,
+      #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+      #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+      #editBMPanel_toolbarFolderItem,
+      #bookmarksToolbarFolderMenu,
+      #BMB_bookmarksToolbar,
+      #panelMenu_bookmarksToolbar,
+      #bookmarks-toolbar-button,
+      #bookmarks-toolbar-placeholder {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarks-toolbar-alt.svg") !important;
+      }
+      /* Bookmark Menu */
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, queryFolder_menu________) {
+        list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important;
+      }
+      /*= Default Icon - Open ======================================================*/
+      /* Query */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"]
+        > .menu-iconic-left
+        > .menu-iconic-icon {
+        transform: rotate(15deg) !important;
+      }
+      /* History */
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(title, query, open, dayContainer),
+      :-moz-any(#historyTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) {
+        list-style-image: url("chrome://browser/skin/lepton/history-reverse.svg") !important;
+      }
+      /* Tag */
+      :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu)
+        .bookmark-item[container="true"][tagContainer="true"][open="true"],
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer),
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) {
+        list-style-image: url("chrome://browser/skin/lepton/tag-open.svg") !important;
+      }
+      /* Bookmark */
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
+        list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
+      }
+      /* Bookmark Toolbar */
+      #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"],
+      #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarksToolbar-open-alt.svg") !important;
+      }
+      /* Bookmark Menu */
+      :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
+        treechildren::-moz-tree-image(container, open, queryFolder_menu________) {
+        list-style-image: url("chrome://browser/skin/lepton/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */
+      }
+      /*= Menubar - Icons ==========================================================*/
+      #organizeButton,
+      #viewMenu,
+      #maintenanceButton,
+      #back-button,
+      #forward-button,
+      #clearDownloadsButton {
+        fill: currentColor !important;
+        -moz-context-properties: fill, fill-opacity, stroke !important;
+      }
+      /* Add */
+      #organizeButton {
+        list-style-image: url("chrome://global/skin/icons/settings.svg") !important;
+      }
+      #viewMenu {
+        list-style-image: url("chrome://browser/skin/lepton/sort.svg") !important;
+      }
+      #maintenanceButton {
+        list-style-image: url("chrome://browser/skin/lepton/import-export.svg") !important;
+      }
+      #clearDownloadsButton {
+        list-style-image: url("chrome://global/skin/icons/delete.svg") !important;
+      }
+      #clearDownloadsButton > .toolbarbutton-icon {
+        display: inline-flex !important;
+        display: -moz-inline-box !important;
+        margin-top: 0;
+        margin-bottom: 0;
+        margin-inline-start: 0;
+        margin-inline-end: 2px;
+      }
+      /* Replace */
+      #back-button {
+        list-style-image: url("chrome://browser/skin/back.svg") !important;
+      }
+      #forward-button {
+        list-style-image: url("chrome://browser/skin/forward.svg") !important;
+      }
+      #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+      #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+        transform: scaleX(-1) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) {
+      /*= Layout Fixes =========================================================*/
+      menupopup menu {
+        padding-block: 4px;
+      }
+      .menu-right {
+        width: 16px !important; /* Original: 1ex */
+        background-image: url("chrome://global/skin/icons/arrow-right.svg");
+        background-position: right center;
+      }
+      /*= Proton ===============================================================*/
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      :root {
+        --organizer-color: -moz-DialogText;
+        --organizer-deemphasized-color: GrayText;
+        --organizer-toolbar-background: -moz-Dialog;
+        --organizer-pane-background: -moz-Dialog;
+        --organizer-content-background: -moz-Dialog;
+        --organizer-hover-background: SelectedItem;
+        --organizer-hover-color: SelectedItemText;
+        --organizer-selected-background: SelectedItem;
+        --organizer-selected-color: SelectedItemText;
+        --organizer-outline-color: SelectedItem;
+        --organizer-separator-color: ThreeDDarkShadow;
+        --organizer-border-color: ThreeDShadow;
+        --organizer-toolbar-field-background: Field;
+        --organizer-toolbar-field-background-focused: Field;
+        --organizer-toolbar-field-border-color: ThreeDShadow;
+        --organizer-toolbar-field-focus-border-color: var(--organizer-outline-color);
+        --organizer-toolbar-field-focus-box-shadow: unset;
+        --organizer-pane-field-border-color: ThreeDShadow;
+      }
+      @media not all and (prefers-contrast) {
+        :root {
+          --organizer-color: var(--in-content-page-color);
+          --organizer-deemphasized-color: var(--in-content-deemphasized-text);
+          --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */
+          --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */
+          --organizer-content-background: var(--in-content-page-background);
+          --organizer-hover-background: var(--in-content-button-background-hover);
+          --organizer-hover-color: var(--organizer-color);
+          --organizer-selected-background: var(--in-content-button-background-active);
+          --organizer-selected-color: var(--organizer-color);
+          --organizer-outline-color: var(--in-content-focus-outline-color);
+          --organizer-separator-color: var(--organizer-pane-field-border-color);
+          --organizer-border-color: var(--in-content-border-color);
+          --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */
+          --organizer-toolbar-field-background-focused: Field;
+          --organizer-toolbar-field-border-color: transparent;
+          --organizer-toolbar-field-focus-border-color: color-mix(
+            in srgb,
+            var(--organizer-outline-color) 50%,
+            transparent
+          );
+          --organizer-toolbar-field-focus-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.23);
+          --organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
+        }
+        @media (prefers-color-scheme: dark) {
+          :root {
+            --organizer-color: rgb(251, 251, 254);
+            --organizer-deemphasized-color: rgb(191, 191, 201);
+            --organizer-toolbar-background: rgb(43, 42, 51);
+            --organizer-pane-background: rgb(35, 34, 43);
+            --organizer-content-background: rgb(28, 27, 34);
+            --organizer-hover-background: rgb(82, 82, 94);
+            --organizer-selected-background: rgb(91, 91, 102);
+            --organizer-toolbar-field-background: var(--in-content-page-background);
+            --organizer-toolbar-field-background-focused: rgb(66, 65, 77);
+            scrollbar-color: rgba(249, 249, 250, 0.4) rgba(20, 20, 25, 0.3);
+          }
+        }
+      }
+      /*- Toolbar & Menus ------------------------------------------------------*/
+      #placesToolbar {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-background) !important;
+        color: var(--organizer-color) !important;
+        border-bottom: 1px solid var(--organizer-border-color) !important;
+        padding: 4px !important;
+        padding-inline-end: 6px !important;
+      }
+      #placesToolbar > toolbarbutton {
+        appearance: none !important;
+        padding: 5px !important;
+        border-radius: 4px !important;
+      }
+      /*- Search Bar & Input ---------------------------------------------------*/
+      /*- Sidebar & Splitter ---------------------------------------------------*/
+      /*- Downloads Pane -------------------------------------------------------*/
+      /*- Tree -----------------------------------------------------------------*/
+      /*- Info Box -------------------------------------------------------------*/
+      /*- Radio Button -------------------------------------------------------------*/
+      /* Disabled checkboxes, radios and labels */
+      /*- Check Box ----------------------------------------------------------------*/
+      /* From checkbox.css */
+      /*- Menu Separator -----------------------------------------------------------*/
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #placesToolbar > toolbarbutton {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesToolbar > toolbarbutton[disabled] {
+        opacity: 0.6 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesToolbar > toolbarbutton:not([disabled]):hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #placesToolbar > toolbarbutton:not([disabled]):hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesToolbar > toolbarbutton > .toolbarbutton-icon,
+      #placesMenu > menu > image,
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesMenu {
+        margin-inline-start: 6px !important;
+      }
+      #placesMenu > menu {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        padding-block: 5px !important;
+        padding-inline-start: 5px !important;
+        border-radius: 4px !important;
+        margin-inline-end: 2px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #placesMenu > menu {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesMenu > menu[_moz-menuactive="true"],
+      #placesMenu > menu:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesMenu > menu:hover:active,
+      #placesMenu > menu[open] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesMenu > menu > :is(.menubar-text, .menu-text) {
+        margin-block: 0 !important; /* override menu.css */
+        padding-inline-end: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #searchFilter,
+      #detailsPane html|input {
+        appearance: none !important;
+        background-color: var(--organizer-toolbar-field-background) !important;
+        color: var(--organizer-color) !important;
+        border: 1px solid var(--organizer-toolbar-field-border-color) !important;
+        border-radius: 4px !important;
+        margin: 0 !important;
+        padding-block: 2px !important;
+        min-height: 24px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #searchFilter,
+      #detailsPane html|input {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #searchFilter[focused] {
+        box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important;
+        background-color: var(--organizer-toolbar-field-background-focused) !important;
+        border-color: transparent !important;
+        outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important;
+        outline-offset: -2px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesList {
+        background-color: var(--organizer-pane-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #placesView > splitter {
+        border: 0 !important;
+        border-inline-end: 1px solid var(--organizer-border-color) !important;
+        min-width: 0 !important;
+        width: 3px !important;
+        background-color: transparent !important;
+        margin-inline-start: -3px !important;
+        position: relative !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #downloadsRichListBox,
+      #downloadsListBox {
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #clearDownloadsButton:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      richlistitem[selected="true"],
+      richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      richlistbox:where(:focus) > richlistitem[selected="true"] {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #contentView treecol {
+        /* Use box-shadow to draw a bottom border instead of border-bottom
+           * because otherwise the items on contentView won't be perfectly
+           * aligned with the items on the sidebar. */
+        box-shadow: inset 0 -1px var(--organizer-border-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      tree {
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      treecol:not([hideheader="true"]),
+      treecolpicker {
+        appearance: none !important;
+        border: none !important;
+        background-color: var(--in-content-button-background) !important;
+        color: var(--organizer-color, inherit) !important;
+        padding: 5px 10px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      treecol:not([hideheader="true"], [sortable="false"]):hover,
+      treecolpicker:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-color) !important;
+      }
+      treecol:not([hideheader="true"], [sortable="false"]):hover:active,
+      treecolpicker:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      treecol:not([hideheader="true"], :first-child),
+      treecolpicker {
+        padding-left: 10px !important;
+        border-inline-start-width: 1px !important;
+        border-inline-start-style: solid !important;
+        border-image: linear-gradient(
+            transparent 0%,
+            transparent 20%,
+            var(--organizer-border-color) 20%,
+            var(--organizer-border-color) 80%,
+            transparent 80%,
+            transparent 100%
+          )
+          1 1 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection {
+        fill: currentColor !important;
+        width: 18px !important;
+        height: 18px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      treechildren::-moz-tree-row {
+        background-color: transparent !important;
+      }
+      treechildren::-moz-tree-row(hover) {
+        background-color: var(--organizer-hover-background) !important;
+      }
+      treechildren::-moz-tree-row(selected) {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+        border: 1px solid transparent !important;
+      }
+      treechildren::-moz-tree-image(hover),
+      treechildren::-moz-tree-twisty(hover),
+      treechildren::-moz-tree-cell-text(hover) {
+        color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-image(selected),
+      treechildren::-moz-tree-twisty(selected),
+      treechildren::-moz-tree-cell-text(selected) {
+        color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-separator {
+        height: 1px !important;
+        border-color: var(--organizer-separator-color) !important;
+      }
+      treechildren::-moz-tree-separator(hover) {
+        border-color: var(--organizer-hover-color) !important;
+      }
+      treechildren::-moz-tree-separator(selected) {
+        border-color: var(--organizer-selected-color) !important;
+      }
+      treechildren::-moz-tree-cell-text(primary, dropOn),
+      treechildren::-moz-tree-drop-feedback {
+        background-color: var(--organizer-outline-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #detailsPane {
+        background-color: var(--organizer-pane-background) !important;
+        color: var(--organizer-color) !important;
+        padding: 5px !important;
+        border-top: 1px solid var(--organizer-border-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBookmarkPanelRows .expander-up,
+      #editBookmarkPanelRows .expander-down {
+        appearance: none !important;
+        min-width: 0 !important;
+        padding: 5px !important;
+        margin: 0 !important;
+        margin-inline-end: 4px !important;
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_button") {
+      #editBookmarkPanelRows .expander-up,
+      #editBookmarkPanelRows .expander-down {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBookmarkPanelRows .expander-up:hover,
+      #editBookmarkPanelRows .expander-down:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBookmarkPanelRows .expander-up:hover:active,
+      #editBookmarkPanelRows .expander-down:hover:active {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBookmarkPanelRows .expander-up:focus-visible,
+      #editBookmarkPanelRows .expander-down:focus-visible {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBookmarkPanelRows .expander-up > .button-box,
+      #editBookmarkPanelRows .expander-down > .button-box {
+        padding: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBookmarkPanelRows .expander-up {
+        list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+      }
+      #editBookmarkPanelRows .expander-down {
+        list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #places input {
+        border: 1px solid var(--organizer-pane-field-border-color) !important;
+        border-radius: 4px !important;
+        background-color: var(--organizer-content-background) !important;
+        color: var(--organizer-color) !important;
+        min-height: 20px !important;
+        padding-inline: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #places input {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #places input:focus {
+        outline: 2px solid var(--organizer-outline-color) !important;
+        outline-offset: -1px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #places input:not(:read-write):focus {
+        outline: none !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      .caption-label {
+        margin-inline-start: 8px !important;
+        color: var(--organizer-deemphasized-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBMPanel_tagsSelectorRow > richlistbox {
+        appearance: none !important;
+        color: var(--organizer-color) !important;
+        background-color: var(--organizer-content-background) !important;
+        border: 1px solid var(--organizer-border-color) !important;
+        border-radius: 4px !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.rounding.square_field") {
+      #editBMPanel_tagsSelectorRow > richlistbox {
+        border-radius: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem {
+        border: 1px solid transparent !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem:hover {
+        background-color: var(--organizer-hover-background) !important;
+        color: var(--organizer-hover-color) !important;
+      }
+      #editBMPanel_tagsSelectorRow > richlistbox > richlistitem[selected] {
+        background-color: var(--organizer-selected-background) !important;
+        color: var(--organizer-selected-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="radio"] {
+        /* margin-inline-start: 0 !important; */
+        appearance: none !important;
+      }
+      menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
+        appearance: none !important;
+        width: 16px !important;
+        height: 16px !important;
+        border: 1px solid var(--in-content-box-border-color) !important;
+        border-radius: 100% !important;
+        padding: 0 !important;
+        margin-inline: 0 6px !important;
+        margin-block: 2px !important; /* extend the vertical clicktarget */
+        background-color: var(--in-content-button-background) !important;
+        background-position: center !important;
+        flex-shrink: 0 !important; /* avoid shrinking inside flex container */
+      }
+      menuitem[type="radio"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+        color: var(--in-content-primary-button-text-color) !important;
+        background-color: var(--in-content-primary-button-background) !important;
+        background-image: url("chrome://browser/skin/lepton/radio.svg") !important;
+        border-color: transparent !important;
+        /* Style the button also when printing with "Print Backgrounds" unchecked */
+        color-adjust: exact !important;
+      }
+      menuitem[type="radio"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(--in-content-button-background-hover) !important;
+        color: var(--in-content-button-text-color-hover) !important;
+      }
+      menuitem[type="radio"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(--in-content-button-background-active) !important;
+      }
+      menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(--in-content-primary-button-background-hover) !important;
+        color: var(--in-content-primary-button-text-color-hover) !important;
+      }
+      menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover:active
+        > .menu-iconic-left
+        > .menu-iconic-icon {
+        background-color: var(--in-content-primary-button-background-active) !important;
+      }
+      menuitem[type="radio"] > .menu-iconic-text {
+        margin-inline: 0 8px !important;
+        padding-inline-start: 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="radio"][disabled="true"],
+      menuitem[type="checkbox"][disabled="true"] {
+        color: inherit !important;
+        opacity: 0.5 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"] {
+        appearance: none !important;
+        align-items: center !important;
+        -moz-box-align: center !important;
+        margin: 0px 2px !important;
+      }
+      menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon {
+        appearance: none !important;
+        width: 16px !important;
+        height: 16px !important;
+        border: 1px solid currentColor !important;
+        border-radius: 2px !important;
+        color: var(--checkbox-border-color, ThreeDDarkShadow) !important;
+        background-color: var(--checkbox-unchecked-bgcolor, Field) !important;
+        margin-inline-end: 6px !important; /* or 2px */
+        margin-block: 2px !important; /* From common.css */
+      }
+      menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        -moz-context-properties: fill !important;
+        fill: currentColor !important;
+        border-color: var(--checkbox-checked-border-color, transparent) !important;
+        background-image: url("chrome://global/skin/icons/check.svg") !important;
+        background-position: center !important;
+        background-repeat: no-repeat !important;
+        /* Style the button also when printing with "Print Backgrounds" unchecked */
+        color-adjust: exact !important;
+        color: var(--checkbox-checked-color, AccentColorText) !important;
+        background-color: var(--checkbox-checked-bgcolor, AccentColor) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+        background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(--checkbox-unchecked-hover-bgcolor, color-mix(in srgb, AccentColor 4%, Field)) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-unchecked-hover-bgcolor,
+          color-mix(in srgb, -moz-accent-color 4%, Field)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-unchecked-active-bgcolor,
+          color-mix(in srgb, AccentColor 8%, Field)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-unchecked-active-bgcolor,
+          color-mix(in srgb, -moz-accent-color 8%, Field)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-checked-hover-bgcolor,
+          color-mix(in srgb, currentColor 12.5%, AccentColor)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-checked-hover-bgcolor,
+          color-mix(in srgb, currentColor 12.5%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+        > .menu-iconic-left[checked="true"]
+        > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-checked-active-bgcolor,
+          color-mix(in srgb, currentColor 25%, AccentColor)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+        > .menu-iconic-left[checked="true"]
+        > .menu-iconic-icon {
+        background-color: var(
+          --checkbox-checked-active-bgcolor,
+          color-mix(in srgb, currentColor 25%, -moz-accent-color)
+        ) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon {
+        outline: 2px solid var(--focus-outline-color, AccentColor) !important;
+        outline-offset: var(--focus-outline-offset, 2px) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon {
+        outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) {
+      menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
+        /* color will set the border-color on the check due to how HCM works for in-content pages. */
+        color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
+        /* color will set the border-color on the check due to how HCM works for in-content pages. */
+        color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) {
+      menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] {
+        color: var(--checkbox-checked-border-color, currentColor) !important;
+        fill: var(--checkbox-checked-color, AccentColorText) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] {
+        fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+        > .menu-iconic-left[checked="true"]
+        > .menu-iconic-icon,
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        color: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+        fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") and (prefers-contrast) and (-moz-bool-pref: "userChrome.compatibility.accent_color") {
+      menuitem[type="checkbox"]:not([disabled="true"]):hover:active
+        > .menu-iconic-left[checked="true"]
+        > .menu-iconic-icon,
+      menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon {
+        color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+        fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"] > .menu-iconic-text {
+        margin: 1px 0 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuitem[type="checkbox"][disabled="true"] {
+        opacity: 0.4 !important;
+      }
+    }
+    @media (-moz-bool-pref: "userContent.page.proton") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userContent.page.proton") {
+      menuseparator {
+        appearance: none !important;
+        min-width: 2px;
+        min-height: 0;
+        border-top: 1px solid var(--in-content-box-border-color, ThreeDDarkShadow);
+        border-bottom: none;
+        padding: 0;
+        margin: var(--panel-separator-margin, 6px);
+      }
+    }
+  }
+}
+/** Rounding ******************************************************************/
+@media (-moz-bool-pref: "userChrome.rounding.square_button") {
+  .all-buttons-container,
+  .highlight-buttons > button,
+  .cancel-shot,
+  #pictureInPictureToggle > .pip-small {
+    border-radius: 0 !important;
+  }
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    button:not(.toggle-button),
+    .close-icon,
+    .action-icon::before,
+    .page-section-header > .twisty,
+    .closed-tab-li-main,
+    #categories > .category,
+    .sidebar-footer-link {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .sidebar-item {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("chrome://browser/content/places/places.xhtml"), url-prefix("about:downloads")
+  {
+    .downloadButton > .button-box {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:protections") {
+    #manage-protections,
+    #sign-up-for-monitor-link,
+    #get-proxy-extension-link,
+    #get-vpn-link,
+    #vpn-banner-link,
+    .monitor-partial-breaches-link-wrapper,
+    .monitor-breaches-link-wrapper {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarButton,
+    .dropdownToolbarButton,
+    .secondaryToolbarButton,
+    .dialogButton {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_dialog") {
+  @-moz-document url("about:home"), url("about:newtab") {
+    .modal {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_checklabel") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    input[type="checkbox"]:not(.toggle-button),
+    .checkbox-check {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_field") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    input:is(
+        [type="color"],
+        [type="email"],
+        [type="tel"],
+        [type="text"],
+        [type="password"],
+        [type="url"],
+        [type="number"]
+      ),
+    textarea,
+    select,
+    menulist,
+    tree,
+    treecols,
+    listheader,
+    richlistbox,
+    search-textbox,
+    .web-appearance-choice,
+    .content-blocking-category,
+    #translations-manage-install-list {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .default-input {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url("about:home"), url("about:newtab") {
+    .search-wrapper .search-handoff-button,
+    .search-wrapper input {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarField,
+    .thumbnailSelectionRing {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_menupopup") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://")
+  {
+    panel,
+    menupopup {
+      --panel-border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:addons") {
+    panel-list {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:logins") {
+    .menu {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url("about:home"), url("about:newtab") {
+    .context-menu {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document regexp(".*.pdf$") {
+    .doorHanger,
+    .doorHangerRight {
+      border-radius: 0 !important;
+    }
+  }
+}
+@media (-moz-bool-pref: "userChrome.rounding.square_infobox") {
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
+  {
+    /*
+     * .container is inside shadow DOM,
+     * and it does not have any other classes,
+     * but there may be other elements with the same class,
+     * hence the weird selector.
+     */
+    link[href="chrome://global/content/elements/message-bar.css"] + .container,
+    .info-box-container:not(.content-blocking-category),
+    .options-container,
+    #sanitizeEverythingWarningBox {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:debugging") {
+    .message {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:firefoxview") {
+    .card,
+    .card::before,
+    .empty-container,
+    .synced-tab-a,
+    .synced-tab-li-placeholder {
+      border-radius: 0 !important;
+    }
+  }
+}
+@-moz-document url-prefix("about:"), regexp(".*.pdf$") {
+  @media (-moz-bool-pref: "userChrome.rounding.square_dialog") {
+    dialog,
+    .dialogBox {
+      border-radius: 0 !important;
+    }
+  }
+}
+@-moz-document url("chrome://browser/content/places/places.xhtml")
+{
+  /*= Library ==============================================================*/
+  @media (-moz-bool-pref: "userChrome.rounding.square_button") {
+    #placesToolbar > toolbarbutton,
+    #placesMenu > menu,
+    #editBookmarkPanelRows .expander-up,
+    #editBookmarkPanelRows .expander-down {
+      border-radius: 0 !important;
+    }
+  }
+  @media (-moz-bool-pref: "userChrome.rounding.square_field") {
+    #searchFilter,
+    #detailsPane html|input,
+    #places input #editBMPanel_tagsSelectorRow > richlistbox {
+      border-radius: 0 !important;
+    }
+  }
+}
+/** Monospace *****************************************************************/
+@media (-moz-bool-pref: "userContent.page.monospace") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$")
+  {
+    * {
+      font-family: -moz-fixed;
+    }
+  }
+}
+/** Menu - Icons Layout *******************************************************/
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") {
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$")
+  {
+    :root {
+      --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
+      :root {
+        --uc-folder-icon: url("chrome://browser/skin/lepton/folder.svg");
+      }
+    }
+  }
+  @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads")
+  {
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon,
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-icon {
+      -moz-appearance: none !important; /* Linux: menulist */
+    }
+    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+      /* Color */
+      -moz-context-properties: fill, fill-opacity, stroke !important;
+      fill: currentColor !important;
+      stroke: currentColor;
+      /* Layout */
+      background-size: 16px !important;
+      background-repeat: no-repeat !important;
+      background-image: var(--menuitem-image);
+    }
+    /* For native context menus */
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "widget.macos.native-context-menus"),
+      (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "widget.gtk.native-context-menus") {
+      :not(menu, #ContentSelectDropdown)
+        > menupopup:not(.in-menulist)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      :not(menu, #ContentSelectDropdown)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        list-style-image: var(--menuitem-image, url("chrome://browser/skin/lepton/blank.svg")) !important;
+      }
+    }
+    /* Padding */
+    :root {
+      --uc-menu-background-position: left;
+      --context-menu-background-padding-default: 5px;
+      --context-menu-background-padding: var(--context-menu-background-padding-default);
+    }
+    :root:-moz-locale-dir(rtl) {
+      --uc-menu-background-position: right;
+    }
+    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+      background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
+      padding-inline-start: var(--context-menu-background-padding) !important;
+    }
+    /* Padding - Non Native */
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-platform: windows),
+      (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-platform: windows) {
+      :root {
+        --context-menu-background-padding: 1em;
+        --context-menu-text-padding-default: 24px;
+        --context-menu-text-padding: var(--context-menu-text-padding-default);
+        --menu-background-padding-default: calc(
+          var(--context-menu-background-padding) + var(--context-menu-text-padding)
+        );
+        --bookmark-menu-icon-align-padding: 0px;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        padding-inline-start: var(--menu-background-padding-default) !important;
+        margin-left: 0 !important;
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available),
+      (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+      :root {
+        --context-menu-background-padding: 1em;
+        --context-menu-text-padding-default: 24px;
+        --context-menu-text-padding: var(--context-menu-text-padding-default);
+        --menu-background-padding-default: calc(
+          var(--context-menu-background-padding) + var(--context-menu-text-padding)
+        );
+        --bookmark-menu-icon-align-padding: 0px;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        padding-inline-start: var(--menu-background-padding-default) !important;
+        margin-left: 0 !important;
+      }
+    }
+    /* Padding - Windows */
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
+      :root {
+        --bookmark-menu-icon-text-padding: calc(
+          var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+        );
+        --bookmark-menu-icon-background-padding: calc(
+          var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
+        );
+      }
+    }
+    /* Padding - Linux */
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) {
+      :root {
+        --context-menu-background-padding-default: 6px;
+        --context-menu-text-padding: 21px;
+      }
+      .menu-icon {
+        display: unset !important;
+      }
+      #main-menubar > menu > .menu-icon {
+        display: none !important;
+      }
+      /* Contextmenu Checkbox Unset */
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
+        margin-inline: 0 !important;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem[type="checkbox"]
+        > .menu-iconic-left
+        > .menu-iconic-icon,
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem[type="checkbox"]
+        > .menu-icon {
+        margin-inline-end: 0 !important;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem[type="checkbox"]:not([checked="true"])
+        > .menu-iconic-left
+        > .menu-iconic-icon,
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem[type="checkbox"]:not([checked="true"])
+        > .menu-icon {
+        border: none !important;
+        background-color: unset !important;
+      }
+    }
+    /* Padding - Mac */
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
+      :root {
+        --context-menu-background-padding-default: 10px;
+        --context-menu-mac-padding: 21px;
+      }
+      /* context menu width */
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        padding-inline-end: var(--context-menu-background-padding) !important;
+      }
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+        > .menu-text,
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"])
+        > .menu-text {
+        /* text position */
+        padding-inline-start: var(--context-menu-mac-padding) !important;
+      }
+      /* Checkbox menuitem, None iconic menu */
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"],
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) {
+        padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
+      }
+    }
+    /*= Context Menu ===========================================================*/
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+      /* Icon lists */
+      /*= downloadsContextMenu =====================================================*/
+      .downloadPauseMenuItem {
+        --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+      }
+      .downloadResumeMenuItem {
+        --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+      }
+      .downloadUnblockMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/checkmark-circle.svg");
+      }
+      .downloadUseSystemDefaultMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+      }
+      .downloadAlwaysUseSystemDefaultMenuItem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/folder-globe.svg");
+      }
+      .downloadAlwaysOpenSimilarFilesMenuItem {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/fluid.svg");
+      }
+      .downloadShowMenuItem {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
+      #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
+      #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/link.svg");
+      }
+      .downloadDeleteFileMenuItem {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      .downloadRemoveFromHistoryMenuItem {
+        --menuitem-image: url("chrome://browser/skin/lepton/eraser.svg");
+      }
+      #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
+      #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
+        --menuitem-image: url("chrome://browser/skin/lepton/broom.svg");
+      }
+      /*= placeContext =============================================================*/
+      #placesContext_open {
+        --menuitem-image: url("chrome://browser/skin/lepton/link-square.svg");
+      }
+      #placesContext_openBookmarkContainer\:tabs,
+      #placesContext_openBookmarkLinks\:tabs {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+      #placesContext_open\:newtab,
+      #placesContext_openContainer\:tabs,
+      #placesContext_openLinks\:tabs {
+        --menuitem-image: var(--uc-new-tab-icon);
+      }
+      #placesContext_open\:newcontainertab {
+        --menuitem-image: url("chrome://browser/skin/lepton/container-openin-16.svg");
+      }
+      #placesContext_open\:newwindow {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #placesContext_open\:newprivatewindow {
+        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+      }
+      #placesContext_show_bookmark\:info,
+      #placesContext_show\:info,
+      #placesContext_show_folder\:info {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-active.svg");
+      }
+      #placesContext_deleteBookmark,
+      #placesContext_deleteFolder,
+      #placesContext_delete,
+      #placesContext_delete_history {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+      #placesContext_deleteHost {
+        --menuitem-image: url("chrome://browser/skin/lepton/eye-hide.svg");
+      }
+      #placesContext_sortBy\:name {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+      }
+      #placesContext_cut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+      #placesContext_copy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+      #placesContext_paste_group {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #placesContext_new\:bookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #placesContext_showInFolder,
+      #placesContext_new\:folder {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #placesContext_new\:separator {
+        --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+      }
+      #placesContext_paste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+      #placesContext_createBookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #show-other-bookmarks_PersonalToolbar {
+        /* checkbox */
+        --menuitem-image: url("chrome://browser/skin/lepton/star-line-horizontal.svg");
+      }
+      #placesContext_showAllBookmarks {
+        --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+      }
+      .openintabs-menuitem {
+        --menuitem-image: url("chrome://browser/skin/lepton/movetowindow-16.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      /*= organizeButtonPopup ======================================================*/
+      #newbookmark {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #newfolder {
+        --menuitem-image: var(--uc-folder-icon);
+      }
+      #newseparator {
+        --menuitem-image: url("chrome://browser/skin/lepton/vertical-line.svg");
+      }
+      #orgUndo {
+        --menuitem-image: url("chrome://browser/skin/lepton/undo.svg");
+      }
+      /*= viewMenuPopup ============================================================*/
+      /*= maintenanceButtonPopup ===================================================*/
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+      #orgRedo {
+        --menuitem-image: url("chrome://browser/skin/lepton/redo.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgCut {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-cut.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgCopy {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-copy.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgPaste {
+        --menuitem-image: url("chrome://browser/skin/lepton/edit-paste.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgDelete {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgSelectAll {
+        --menuitem-image: url("chrome://browser/skin/lepton/select-all-on.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #orgClose {
+        --menuitem-image: url("chrome://global/skin/icons/close.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #viewColumns {
+        --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #viewSort {
+        --menuitem-image: url("chrome://browser/skin/lepton/text-sort-ascending.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #backupBookmarks {
+        --menuitem-image: url("chrome://browser/skin/lepton/datastore.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+      #fileRestoreMenu {
+        --menuitem-image: url("chrome://browser/skin/lepton/datarestore.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #fileImport {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #fileExport {
+        --menuitem-image: url("chrome://browser/skin/lepton/toolbarButton-upload.svg");
+      }
+    }
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
+      #browserImport {
+        --menuitem-image: url("chrome://browser/skin/import.svg");
+      }
+    }
+  }
+  @-moz-document url-prefix("about:addons") {
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+      button:is([role="menuitem"], [role="menuitemcheckbox"]) {
+        background-image: var(--icon, url("chrome://browser/skin/lepton/blank.svg")); /* Don't use !important. because of [checked] */
+      }
+      panel-item[action="check-for-updates"] {
+        --icon: url("chrome://browser/skin/lepton/refresh-cw.svg");
+      }
+      panel-item[action="view-recent-updates"] {
+        --icon: url("chrome://global/skin/icons/info.svg");
+      }
+      panel-item[action="install-from-file"] {
+        --icon: url("chrome://devtools/skin/images/import.svg");
+      }
+      panel-item[action="debug-addons"] {
+        --icon: url("chrome://browser/skin/lepton/bug.svg");
+      }
+      panel-item[action="set-update-automatically"] {
+        --icon: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+      }
+      panel-item[action="reset-update-states"] {
+        --icon: url("chrome://devtools/skin/images/debugging-workers.svg");
+      }
+      panel-item[action="manage-shortcuts"],
+      panel-item[data-l10n-id="preferences-addon-button"],
+      panel-item[data-l10n-id="manage-addon-button"] {
+        --icon: url("chrome://global/skin/icons/settings.svg");
+      }
+    }
+  }
+  @-moz-document url-prefix("about:logins") {
+    @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+      .menuitem-export {
+        background-image: url("chrome://browser/skin/lepton/toolbarButton-download.svg") !important;
+      }
+    }
+  }
+}
+/** Download Panel ************************************************************/
+@-moz-document url-prefix("about:downloads") {
+  @media (prefers-reduced-motion: no-preference) and (-moz-bool-pref: "userChrome.decoration.download_panel") {
+    /* Accent Color for downloaded item */
+    #downloadsListBox .download-state[exists] .downloadDetails {
+      color: var(--button-primary-bgcolor);
+    }
+    #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover {
+      color: var(--button-primary-hover-bgcolor);
+    }
+    /* File moved or missing */
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget {
+      text-decoration: line-through;
+      text-decoration-color: color-mix(in srgb, currentColor 65%, transparent);
+    }
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget:hover {
+      text-decoration: none;
+    }
+    #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTypeIcon {
+      filter: grayscale(100%) !important;
+    }
+  }
+}
diff --git a/waterfox/browser/themes/lepton/prefs-lepton.js b/waterfox/browser/themes/lepton/prefs-lepton.js
new file mode 100644
index 0000000000000..3c07ad17ca278
--- /dev/null
+++ b/waterfox/browser/themes/lepton/prefs-lepton.js
@@ -0,0 +1,103 @@
+// ** Theme Related Options ****************************************************
+// == Theme Distribution Settings ==============================================
+// The rows that are located continuously must be changed `true`/`false` explicitly because there is a collision.
+// https://github.com/black7375/Firefox-UI-Fix/wiki/Options#important
+pref("userChrome.tab.connect_to_window",          true); // Original, Photon
+pref("userChrome.tab.color_like_toolbar",         true); // Original, Photon
+
+pref("userChrome.tab.lepton_like_padding",        true); // Original
+pref("userChrome.tab.photon_like_padding",       false); // Photon
+
+pref("userChrome.tab.dynamic_separator",          true); // Original, Proton
+pref("userChrome.tab.static_separator",          false); // Photon
+pref("userChrome.tab.static_separator.selected_accent", false); // Just option
+pref("userChrome.tab.bar_separator",             false); // Just option
+
+pref("userChrome.tab.newtab_button_like_tab",     true); // Original
+pref("userChrome.tab.newtab_button_smaller",     false); // Photon
+pref("userChrome.tab.newtab_button_proton",      false); // Proton
+
+pref("userChrome.icon.panel_full",                true); // Original, Proton
+pref("userChrome.icon.panel_photon",             false); // Photon
+
+// Original Only
+pref("userChrome.tab.box_shadow",                 true);
+pref("userChrome.tab.bottom_rounded_corner",      true);
+
+// Photon Only
+pref("userChrome.tab.photon_like_contextline",   true);
+pref("userChrome.rounding.square_tab",           false);
+
+#ifdef XP_WIN
+pref("userChrome.compatibility.os.windows_maximized", true);
+pref("userChrome.compatibility.os.win11",             true);
+#endif
+
+pref("userChrome.theme.private",             true);
+
+pref("userChrome.compatibility.theme",       false);
+pref("userChrome.compatibility.os",          true);
+
+pref("userChrome.theme.built_in_contrast",   true);
+pref("userChrome.theme.proton_color",        true);
+pref("userChrome.theme.proton_chrome",       true); // Need proton_color
+pref("userChrome.theme.fully_color",         false); // Need proton_color
+pref("userChrome.theme.fully_dark",          true); // Need proton_color
+
+pref("userChrome.decoration.cursor",         true);
+pref("userChrome.decoration.field_border",   true);
+pref("userChrome.decoration.download_panel", true);
+pref("userChrome.decoration.animate",        true);
+
+pref("userChrome.padding.tabbar_width",      true);
+pref("userChrome.padding.tabbar_height",     true);
+pref("userChrome.padding.toolbar_button",    true);
+pref("userChrome.padding.navbar_width",      false);
+pref("userChrome.padding.urlbar",            true);
+pref("userChrome.padding.bookmarkbar",       true);
+pref("userChrome.padding.infobar",           true);
+pref("userChrome.padding.menu",              true);
+pref("userChrome.padding.bookmark_menu",     true);
+pref("userChrome.padding.global_menubar",    true);
+pref("userChrome.padding.panel",             true);
+pref("userChrome.padding.popup_panel",       true);
+
+pref("userChrome.tab.multi_selected",        true);
+pref("userChrome.tab.unloaded",              true);
+pref("userChrome.tab.letters_cleary",        true);
+pref("userChrome.tab.close_button_at_hover", true);
+pref("userChrome.tab.sound_hide_label",      true);
+pref("userChrome.tab.sound_with_favicons",   true);
+pref("userChrome.tab.pip",                   true);
+pref("userChrome.tab.container",             true);
+pref("userChrome.tab.crashed",               true);
+
+pref("userChrome.fullscreen.overlap",        true);
+pref("userChrome.fullscreen.show_bookmarkbar", true);
+
+pref("userChrome.icon.library",              true);
+pref("userChrome.icon.panel",                true);
+pref("userChrome.icon.menu",                 true);
+pref("userChrome.icon.context_menu",         true);
+pref("userChrome.icon.global_menu",          true);
+pref("userChrome.icon.global_menubar",       true);
+pref("userChrome.icon.1-25px_stroke",        true);
+
+// -- User Content -------------------------------------------------------------
+pref("userContent.player.ui",             true);
+pref("userContent.player.icon",           true);
+pref("userContent.player.noaudio",        true);
+pref("userContent.player.size",           true);
+pref("userContent.player.click_to_play",  true);
+pref("userContent.player.animate",        true);
+
+pref("userContent.newTab.hidden_logo",    false);
+pref("userContent.newTab.full_icon",      true);
+pref("userContent.newTab.animate",        true);
+pref("userContent.newTab.searchbar",      true);
+
+pref("userContent.page.field_border",     true);
+pref("userContent.page.illustration",     true);
+pref("userContent.page.proton_color",     true);
+pref("userContent.page.dark_mode",        true); // Need proton_color
+pref("userContent.page.proton",           true); // Need proton_color
diff --git a/waterfox/browser/themes/lepton/waterfox.sh b/waterfox/browser/themes/lepton/waterfox.sh
new file mode 100755
index 0000000000000..12ab57b57cc9a
--- /dev/null
+++ b/waterfox/browser/themes/lepton/waterfox.sh
@@ -0,0 +1,29 @@
+## Please refer to the following commit:
+# https://github.com/WaterfoxCo/Waterfox/commit/f92e95c09ecd98f987bf54e1e6a1cf969b683277
+
+# Make sure to execute from the scripts directory
+cd $(dirname $0)
+
+## Download latest release, override icons and CSS
+mkdir -p tmp
+## curl -LJ https://github.com/black7375/Firefox-UI-Fix/tarball/master | tar -zxf - --strip 1 -C tmp
+curl -LJ `curl -s https://api.github.com/repos/black7375/Firefox-UI-Fix/releases/latest | python3  -c 'import sys, json; print(json.load(sys.stdin)["tarball_url"])'` | tar -zxf - --strip 1 -C tmp
+mv -f tmp/icons/* icons
+mv -f tmp/css/leptonChrome.css leptonChrome.css
+mv -f tmp/css/leptonContent.css leptonContent.css
+rm -r tmp
+
+## Replace Path
+# `./icons/` to `chrome://browser/skin/lepton/`
+replace_icon_path() {
+  sedi () {
+    case $(uname -s) in
+        *[Dd]arwin* | *BSD* ) sed -i '' "$@";;
+        *) sed -i "$@";;
+    esac
+}
+  file=$1
+  sedi "s/\.\.\/icons\//chrome:\/\/browser\/skin\/lepton\//g" "${file}"
+}
+replace_icon_path ./leptonChrome.css
+replace_icon_path ./leptonContent.css
diff --git a/waterfox/browser/themes/moz.build b/waterfox/browser/themes/moz.build
new file mode 100644
index 0000000000000..123e8e09f54e6
--- /dev/null
+++ b/waterfox/browser/themes/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]
+
+JS_PREFERENCE_PP_FILES += [
+    "lepton/prefs-lepton.js",
+]
diff --git a/waterfox/browser/themes/waterfox/general.css b/waterfox/browser/themes/waterfox/general.css
new file mode 100644
index 0000000000000..6eaf8321124a2
--- /dev/null
+++ b/waterfox/browser/themes/waterfox/general.css
@@ -0,0 +1,210 @@
+/* Add any imports of other css here. */
+
+%ifndef XP_MACOSX
+  /* Ensure that bottom positioned tabs are colored according to theme */
+  #browser-bottombox {
+    background-color: var(--lwt-accent-color);
+  }
+%endif
+
+%ifdef XP_MACOSX
+  /* Remove padding to left of tabs when in fullscreen */
+  :root[inFullscreen] .titlebar-buttonbox-container {
+    display: none !important;
+  }
+%endif
+
+/* Ensure that bottom positioned tabs collapse when video's are fullscreen */
+:root[inDOMFullscreen] #browser-bottombox {
+  visibility: collapse;
+}
+
+/* about:preferences Look & Feel icon */
+#category-theme > .category-icon {
+  list-style-image: url("chrome://browser/skin/customize.svg");
+}
+
+#waterfoxUserChromeCustomizations {
+  padding-right: 50px;
+}
+
+.presets-header {
+  max-height: 30px;
+}
+
+/* Popup container */
+.popup-container {
+    position: relative;
+    display: inline-block;
+    cursor: pointer;
+    user-select: none;
+}
+
+/* The actual popup */
+.popup-container .info-popup {
+    visibility: hidden;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 8px 0;
+    position: absolute;
+    z-index: 1;
+    bottom: 125%;
+    left: 50%;
+    margin-left: -80px;
+    max-height: 400px;
+}
+
+.popup-container .show {
+    visibility: visible;
+    max-width: 750px;
+}
+
+.preferences-info-button {
+  content: url("chrome://global/skin/icons/info.svg");
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  width: 16px;
+  /* Vertically center */
+  margin: 0 10px;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+#autoHideTabsImage {
+  content: url("chrome://browser/content/overlays/images/autohide_tab.png");
+}
+
+#autoBlurTabsImage {
+  content: url("chrome://browser/content/overlays/images/autoblur_tab.png");
+}
+
+#centerTabContentImage {
+  content: url("chrome://browser/content/overlays/images/tab_center.png");
+}
+
+#centerTabLabelImage {
+  content: url("chrome://browser/content/overlays/images/tab_label.png");
+}
+
+#squareTabEdgesImage {
+  content: url("chrome://browser/content/overlays/images/tab_square.png");
+}
+
+#dragSpaceImage {
+  content: url("chrome://browser/content/overlays/images/drag_space.png");
+}
+
+#closeButtonHoverImage {
+  content: url("chrome://browser/content/overlays/images/close_button_hover.png");
+}
+
+#autoHideBackImage {
+  content: url("chrome://browser/content/overlays/images/autohide_back.png");
+}
+
+#autoHideForwardImage {
+  content: url("chrome://browser/content/overlays/images/autohide_forward.png");
+}
+
+#hideNavBarIconBoxImage {
+  content: url("chrome://browser/content/overlays/images/hide_iconbox.png");
+}
+
+#centerNavBarTextImage {
+  content: url("chrome://browser/content/overlays/images/navbar_center.png");
+}
+
+#squareButtonEdgesImage {
+  content: url("chrome://browser/content/overlays/images/square_button.png");
+}
+
+#hideBookmbarkBarIconImage {
+  content: url("chrome://browser/content/overlays/images/bookmarkbar_label.png");
+}
+
+#hideBookmarkBarLabelImage {
+  content: url("chrome://browser/content/overlays/images/bookmarkbar_icon.png");
+}
+
+#monospaceFontImage {
+  content: url("chrome://browser/content/overlays/images/monospace_font.png");
+}
+
+#monospaceFontThemeImage {
+  content: url("chrome://browser/content/overlays/images/monospace_theme.png");
+}
+
+#hideDisabledMenuItemsImage {
+  content: url("chrome://browser/content/overlays/images/disabled_menu.png");
+}
+
+#squareMenuPanelImage {
+  content: url("chrome://browser/content/overlays/images/square_panel.png");
+}
+
+#squareMenuPopupImage {
+  content: url("chrome://browser/content/overlays/images/square_popup.png");
+}
+
+#squareFieldImage {
+  content: url("chrome://browser/content/overlays/images/square_field.png");
+}
+
+#removePanelStripImage {
+  content: url("chrome://browser/content/overlays/images/no_panel_separator.png");
+}
+
+#fullPanelStripImage {
+  content: url("chrome://browser/content/overlays/images/full_panel_separator.png");
+}
+
+#autoHideSidebarImage {
+  content: url("chrome://browser/content/overlays/images/autohide_sidebar.png");
+}
+
+#hideSidebarHeaderImage {
+  content: url("chrome://browser/content/overlays/images/sidebar_no_header.png");
+}
+
+#showMacMenuIconsImage {
+  content: url("chrome://browser/content/overlays/images/mac_icons.png");
+}
+
+#contextLineImage {
+  content: url("chrome://browser/content/overlays/images/tab_contextline.png");
+}
+
+/* Prevent any horizontal scrolling on about:preferences */
+#preferences-body .main-content {
+  overflow-x: hidden !important;
+}
+
+@supports -moz-bool-pref("browser.tabs.closeButtons") {
+  .tab-close-button {
+    display: none !important
+  }
+}
+
+/* Tree Vertical Tabs */
+
+/* tabs sidebar box */
+#tree-vertical-tabs-box {
+  background-color: var(--sidebar-background-color);
+  color: var(--sidebar-text-color);
+  text-shadow: none;
+  min-width: 50px;
+}
+:root[BookmarksToolbarOverlapsBrowser] #tree-vertical-tabs-box {
+  padding-top: var(--bookmarks-toolbar-overlapping-browser-height);
+}
+
+#tree-vertical-tabs {
+  flex: 1;
+}
+
+#category-tree > .category-icon {
+  list-style-image: url("./tree-vertical-tabs-24x24.svg#default-context");
+}
diff --git a/waterfox/browser/themes/waterfox/tree-vertical-tabs-24x24.svg b/waterfox/browser/themes/waterfox/tree-vertical-tabs-24x24.svg
new file mode 100644
index 0000000000000..c171fcf3cb4ca
--- /dev/null
+++ b/waterfox/browser/themes/waterfox/tree-vertical-tabs-24x24.svg
@@ -0,0 +1,69 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<style>
+	:root {
+		color-scheme: light dark;
+	}
+	g:target {
+		fill-rule: evenodd;
+	}
+	g.context:target {
+		fill: context-fill;
+		fill-opacity: context-fill-opacity;
+	}
+	g.theme:target {
+		fill: transparent /* TO BE REPLACED WITH THEME COLOR */;
+	}
+	g.prefer-color-scheme.default:target {
+		fill: light-dark(
+			rgb(21, 20, 26), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/toolkit/themes/shared/in-content/common-shared.css#16 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.prefer-color-scheme.toolbar:target {
+		fill: light-dark(
+			rgb(91, 91, 102), /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+			rgb(251, 251, 254) /* https://searchfox.org/mozilla-central/rev/d6576544301cacc0e393fbc919c53e4e6b0d46ec/browser/themes/shared/browser-custom-colors.css#74 */
+		);
+	}
+	g.mask {
+		fill: black;
+	}
+	g:not(.mask):not(:target),
+	g:target ~ g.mask {
+		display: none;
+	}
+</style>
+<symbol id="icon">
+	<path d="M20,1H4C2.346,1,1,2.346,1,4v16c0,1.654,1.346,3,3,3h16c1.654,0,3-1.346,3-3V4C23,2.346,21.654,1,20,1z
+		 M9,15c-0.5,0-1-0.5-1-1v-4h13v5H9z M3,4c0-0.551,0.449-1,1-1h16c0.552,0,1,0.449,1,1v5H4C3.5,9,3,8.5,3,8V4z M20,21h-6
+		c-0.5,0-1-0.5-1-1v-4h8v4C21,20.552,20.552,21,20,21z"/>
+	<circle cx="6" cy="6" r="1"/>
+	<circle cx="11" cy="12.375" r="1"/>
+	<circle cx="16" cy="18.5" r="1"/>
+</symbol>
+<g id="toolbar-context" class="context toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-context" class="context default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar-theme" class="theme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default-theme" class="theme default">
+	<use href="#icon"/>
+</g>
+<g id="toolbar" class="prefer-color-scheme toolbar">
+	<use href="#icon"/>
+</g>
+<g id="default" class="prefer-color-scheme default">
+	<use href="#icon"/>
+</g>
+<g id="mask" class="mask">
+	<use href="#icon"/>
+</g>
+</svg>
diff --git a/waterfox/defs.mk b/waterfox/defs.mk
new file mode 100644
index 0000000000000..fd88c6585e27e
--- /dev/null
+++ b/waterfox/defs.mk
@@ -0,0 +1 @@
+XPI_ROOT_APPID=$(MOZ_APP_ID)
diff --git a/waterfox/moz.build b/waterfox/moz.build
new file mode 100644
index 0000000000000..280af2959cf14
--- /dev/null
+++ b/waterfox/moz.build
@@ -0,0 +1,14 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+for icon in ("firefox", "document", "newwindow", "newtab", "pbmode", "document_pdf"):
+    DEFINES[icon.upper() + "_ICO"] = '"%s/%s/%s.ico"' % (
+        TOPSRCDIR,
+        "waterfox/branding",
+        icon,
+    )
+
+DIRS += ["browser"]
diff --git a/waterfox/moz.configure b/waterfox/moz.configure
new file mode 100644
index 0000000000000..b0458c3835190
--- /dev/null
+++ b/waterfox/moz.configure
@@ -0,0 +1,8 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+imply_option("MOZ_APP_UA_NAME", "Firefox")
+imply_option("MOZ_APP_PROFILE", "Waterfox")
diff --git a/widget/gtk/NativeMenuSupport.cpp b/widget/gtk/NativeMenuSupport.cpp
index 60517cd5265e6..cdd1eb8a774c7 100644
--- a/widget/gtk/NativeMenuSupport.cpp
+++ b/widget/gtk/NativeMenuSupport.cpp
@@ -10,6 +10,8 @@
 #include "NativeMenuGtk.h"
 #include "DBusMenu.h"
 #include "nsWindow.h"
+#include "nsINativeMenuService.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla::widget {
 
@@ -18,6 +20,14 @@ void NativeMenuSupport::CreateNativeMenuBar(nsIWidget* aParent,
   MOZ_RELEASE_ASSERT(NS_IsMainThread(),
                      "Attempting to create native menu bar on wrong thread!");
 
+  nsCOMPtr<nsINativeMenuService> nms =
+      do_GetService("@mozilla.org/widget/nativemenuservice;1");
+  if (!nms) {
+    return;
+  }
+
+  nms->CreateNativeMenuBar(aParent, aMenuBarElement);
+
 #ifdef MOZ_ENABLE_DBUS
   if (aMenuBarElement && StaticPrefs::widget_gtk_global_menu_enabled() &&
       DBusMenuFunctions::Init()) {
diff --git a/widget/gtk/NativeMenuSupport.h b/widget/gtk/NativeMenuSupport.h
new file mode 100644
index 0000000000000..0843d45185e51
--- /dev/null
+++ b/widget/gtk/NativeMenuSupport.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef mozilla_widget_NativeMenuSupport_h
+#define mozilla_widget_NativeMenuSupport_h
+
+class nsIWidget;
+
+namespace mozilla {
+
+namespace dom {
+class Element;
+}
+
+namespace widget {
+
+class NativeMenuSupport final {
+public:
+    // Given a top-level window widget and a menu bar DOM node, sets up native
+    // menus. Once created, native menus are controlled via the DOM, including
+    // destruction.
+    static void CreateNativeMenuBar(nsIWidget* aParent,
+                                    dom::Element* aMenuBarElement);
+};
+
+}  // namespace widget
+}  // namespace mozilla
+
+#endif  // mozilla_widget_NativeMenuSupport_h
diff --git a/widget/gtk/components.conf b/widget/gtk/components.conf
index 541df93378339..4a364c27ced38 100644
--- a/widget/gtk/components.conf
+++ b/widget/gtk/components.conf
@@ -115,6 +115,14 @@ Classes = [
         'headers': ['/widget/gtk/nsUserIdleServiceGTK.h'],
         'constructor': 'nsUserIdleServiceGTK::GetInstance',
     },
+    {
+        'cid': '{0b3fe5aa-bc72-4303-85ae-76365df1251d}',
+        'contract_ids': ['@mozilla.org/widget/nativemenuservice;1'],
+        'singleton': True,
+        'type': 'nsNativeMenuService',
+        'constructor': 'nsNativeMenuService::GetInstanceForServiceManager',
+        'headers': ['/widget/gtk/nsNativeMenuService.h'],
+    },
 ]
 
 if defined('NS_PRINTING'):
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index 99882b6616364..2ab55e3ae2662 100644
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -106,6 +106,15 @@ UNIFIED_SOURCES += [
 
 SOURCES += [
     "MediaKeysEventSourceFactory.cpp",
+    "nsDbusmenu.cpp",
+    "nsMenu.cpp", # conflicts with X11 headers
+    "nsMenuBar.cpp",
+    "nsMenuContainer.cpp",
+    "nsMenuItem.cpp",
+    "nsMenuObject.cpp",
+    "nsMenuSeparator.cpp",
+    "nsNativeMenuDocListener.cpp",
+    "nsNativeMenuService.cpp",
     "nsNativeThemeGTK.cpp",  # conflicts with X11 headers
     "nsWindow.cpp",  # conflicts with X11 headers
     "WaylandVsyncSource.cpp",  # conflicts with X11 headers
@@ -157,6 +166,7 @@ LOCAL_INCLUDES += [
     "/layout/base",
     "/layout/forms",
     "/layout/generic",
+    "/layout/style",
     "/layout/xul",
     "/other-licenses/atk-1.0",
     "/third_party/cups/include",
diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
index 99fd6dc873362..b5cf7ef750a48 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -420,7 +420,8 @@ nsresult nsAppShell::Init() {
     gchar* name = gdk_pixbuf_format_get_name(format);
     if (strcmp(name, "jpeg") && strcmp(name, "png") && strcmp(name, "gif") &&
         strcmp(name, "bmp") && strcmp(name, "ico") && strcmp(name, "xpm") &&
-        strcmp(name, "svg") && strcmp(name, "webp") && strcmp(name, "avif")) {
+        strcmp(name, "svg") && strcmp(name, "webp") && strcmp(name, "avif") &&
+        strcmp(name, "jxl")) {
       gdk_pixbuf_format_set_disabled(format, TRUE);
     }
     g_free(name);
diff --git a/widget/gtk/nsDbusmenu.cpp b/widget/gtk/nsDbusmenu.cpp
new file mode 100644
index 0000000000000..f79d6841a56ef
--- /dev/null
+++ b/widget/gtk/nsDbusmenu.cpp
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsDbusmenu.h"
+#include "prlink.h"
+#include "mozilla/ArrayUtils.h"
+
+#define FUNC(name, type, params) \
+nsDbusmenuFunctions::_##name##_fn nsDbusmenuFunctions::s_##name;
+DBUSMENU_GLIB_FUNCTIONS
+DBUSMENU_GTK_FUNCTIONS
+#undef FUNC
+
+static PRLibrary *gDbusmenuGlib = nullptr;
+static PRLibrary *gDbusmenuGtk = nullptr;
+
+typedef void (*nsDbusmenuFunc)();
+struct nsDbusmenuDynamicFunction {
+    const char *functionName;
+    nsDbusmenuFunc *function;
+};
+
+/* static */ nsresult
+nsDbusmenuFunctions::Init()
+{
+#define FUNC(name, type, params) \
+    { #name, (nsDbusmenuFunc *)&nsDbusmenuFunctions::s_##name },
+    static const nsDbusmenuDynamicFunction kDbusmenuGlibSymbols[] = {
+        DBUSMENU_GLIB_FUNCTIONS
+    };
+    static const nsDbusmenuDynamicFunction kDbusmenuGtkSymbols[] = {
+        DBUSMENU_GTK_FUNCTIONS
+    };
+
+#define LOAD_LIBRARY(symbol, name) \
+    if (!g##symbol) { \
+        g##symbol = PR_LoadLibrary(name); \
+        if (!g##symbol) { \
+            return NS_ERROR_FAILURE; \
+        } \
+    } \
+    for (uint32_t i = 0; i < std::size(k##symbol##Symbols); ++i) { \
+        *k##symbol##Symbols[i].function = \
+            PR_FindFunctionSymbol(g##symbol, k##symbol##Symbols[i].functionName); \
+        if (!*k##symbol##Symbols[i].function) { \
+            return NS_ERROR_FAILURE; \
+        } \
+    }
+
+    LOAD_LIBRARY(DbusmenuGlib, "libdbusmenu-glib.so.4")
+#ifdef MOZ_WIDGET_GTK
+    LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk3.so.4")
+#endif
+#undef LOAD_LIBRARY
+
+    return NS_OK;
+}
diff --git a/widget/gtk/nsDbusmenu.h b/widget/gtk/nsDbusmenu.h
new file mode 100644
index 0000000000000..8d46a0d27bdbd
--- /dev/null
+++ b/widget/gtk/nsDbusmenu.h
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsDbusmenu_h__
+#define __nsDbusmenu_h__
+
+#include "nsError.h"
+
+#include <glib.h>
+#include <gdk/gdk.h>
+
+#define DBUSMENU_GLIB_FUNCTIONS \
+    FUNC(dbusmenu_menuitem_child_add_position, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child, guint position)) \
+    FUNC(dbusmenu_menuitem_child_append, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child)) \
+    FUNC(dbusmenu_menuitem_child_delete, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child)) \
+    FUNC(dbusmenu_menuitem_get_children, GList*, (DbusmenuMenuitem *mi)) \
+    FUNC(dbusmenu_menuitem_new, DbusmenuMenuitem*, (void)) \
+    FUNC(dbusmenu_menuitem_property_get, const gchar*, (DbusmenuMenuitem *mi, const gchar *property)) \
+    FUNC(dbusmenu_menuitem_property_get_bool, gboolean, (DbusmenuMenuitem *mi, const gchar *property)) \
+    FUNC(dbusmenu_menuitem_property_remove, void, (DbusmenuMenuitem *mi, const gchar *property)) \
+    FUNC(dbusmenu_menuitem_property_set, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gchar *value)) \
+    FUNC(dbusmenu_menuitem_property_set_bool, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gboolean value)) \
+    FUNC(dbusmenu_menuitem_property_set_int, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gint value)) \
+    FUNC(dbusmenu_menuitem_show_to_user, void, (DbusmenuMenuitem *mi, guint timestamp)) \
+    FUNC(dbusmenu_menuitem_take_children, GList*, (DbusmenuMenuitem *mi)) \
+    FUNC(dbusmenu_server_new, DbusmenuServer*, (const gchar *object)) \
+    FUNC(dbusmenu_server_set_root, void, (DbusmenuServer *server, DbusmenuMenuitem *root)) \
+    FUNC(dbusmenu_server_set_status, void, (DbusmenuServer *server, DbusmenuStatus status))
+
+#define DBUSMENU_GTK_FUNCTIONS \
+    FUNC(dbusmenu_menuitem_property_set_image, gboolean, (DbusmenuMenuitem *menuitem, const gchar *property, const GdkPixbuf *data)) \
+    FUNC(dbusmenu_menuitem_property_set_shortcut, gboolean, (DbusmenuMenuitem *menuitem, guint key, GdkModifierType modifier))
+
+typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
+typedef struct _DbusmenuServer DbusmenuServer;
+
+enum DbusmenuStatus {
+    DBUSMENU_STATUS_NORMAL,
+    DBUSMENU_STATUS_NOTICE
+};
+
+#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu"
+#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display"
+#define DBUSMENU_MENUITEM_PROP_ENABLED "enabled"
+#define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data"
+#define DBUSMENU_MENUITEM_PROP_LABEL "label"
+#define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut"
+#define DBUSMENU_MENUITEM_PROP_TYPE "type"
+#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state"
+#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type"
+#define DBUSMENU_MENUITEM_PROP_VISIBLE "visible"
+#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW "about-to-show"
+#define DBUSMENU_MENUITEM_SIGNAL_EVENT "event"
+#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated"
+#define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark"
+#define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio"
+#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1
+#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0
+#define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object"
+
+class nsDbusmenuFunctions
+{
+public:
+    nsDbusmenuFunctions() = delete;
+
+    static nsresult Init();
+
+#define FUNC(name, type, params) \
+    typedef type (*_##name##_fn) params; \
+    static _##name##_fn s_##name;
+    DBUSMENU_GLIB_FUNCTIONS
+    DBUSMENU_GTK_FUNCTIONS
+#undef FUNC
+
+};
+
+#define dbusmenu_menuitem_child_add_position nsDbusmenuFunctions::s_dbusmenu_menuitem_child_add_position
+#define dbusmenu_menuitem_child_append nsDbusmenuFunctions::s_dbusmenu_menuitem_child_append
+#define dbusmenu_menuitem_child_delete nsDbusmenuFunctions::s_dbusmenu_menuitem_child_delete
+#define dbusmenu_menuitem_get_children nsDbusmenuFunctions::s_dbusmenu_menuitem_get_children
+#define dbusmenu_menuitem_new nsDbusmenuFunctions::s_dbusmenu_menuitem_new
+#define dbusmenu_menuitem_property_get nsDbusmenuFunctions::s_dbusmenu_menuitem_property_get
+#define dbusmenu_menuitem_property_get_bool nsDbusmenuFunctions::s_dbusmenu_menuitem_property_get_bool
+#define dbusmenu_menuitem_property_remove nsDbusmenuFunctions::s_dbusmenu_menuitem_property_remove
+#define dbusmenu_menuitem_property_set nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set
+#define dbusmenu_menuitem_property_set_bool nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_bool
+#define dbusmenu_menuitem_property_set_int nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_int
+#define dbusmenu_menuitem_show_to_user nsDbusmenuFunctions::s_dbusmenu_menuitem_show_to_user
+#define dbusmenu_menuitem_take_children nsDbusmenuFunctions::s_dbusmenu_menuitem_take_children
+#define dbusmenu_server_new nsDbusmenuFunctions::s_dbusmenu_server_new
+#define dbusmenu_server_set_root nsDbusmenuFunctions::s_dbusmenu_server_set_root
+#define dbusmenu_server_set_status nsDbusmenuFunctions::s_dbusmenu_server_set_status
+
+#define dbusmenu_menuitem_property_set_image nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_image
+#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
+
+#endif /* __nsDbusmenu_h__ */
diff --git a/widget/gtk/nsMenu.cpp b/widget/gtk/nsMenu.cpp
new file mode 100644
index 0000000000000..255eb390e577d
--- /dev/null
+++ b/widget/gtk/nsMenu.cpp
@@ -0,0 +1,795 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#define _IMPL_NS_LAYOUT
+
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/ComputedStyleInlines.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/PresShellInlines.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContentUtils.h"
+#include "nsCSSValue.h"
+#include "nsGkAtoms.h"
+#include "nsGtkUtils.h"
+#include "nsAtom.h"
+#include "nsIContent.h"
+#include "nsIRunnable.h"
+#include "nsITimer.h"
+#include "nsString.h"
+#include "nsStyleStruct.h"
+#include "nsThreadUtils.h"
+
+#include "nsNativeMenuDocListener.h"
+
+#include <glib-object.h>
+
+#include "nsMenu.h"
+
+using namespace mozilla;
+
+class nsMenuContentInsertedEvent : public Runnable
+{
+public:
+    nsMenuContentInsertedEvent(nsMenu *aMenu,
+                               nsIContent *aContainer,
+                               nsIContent *aChild,
+                               nsIContent *aPrevSibling) :
+        Runnable("nsMenuContentInsertedEvent"),
+        mWeakMenu(aMenu),
+        mContainer(aContainer),
+        mChild(aChild),
+        mPrevSibling(aPrevSibling) { }
+
+    NS_IMETHODIMP Run()
+    {
+        if (!mWeakMenu) {
+            return NS_OK;
+        }
+
+        static_cast<nsMenu *>(mWeakMenu.get())->HandleContentInserted(mContainer,
+                                                                      mChild,
+                                                                      mPrevSibling);
+        return NS_OK;
+    }
+
+private:
+    nsWeakMenuObject mWeakMenu;
+
+    nsCOMPtr<nsIContent> mContainer;
+    nsCOMPtr<nsIContent> mChild;
+    nsCOMPtr<nsIContent> mPrevSibling;
+};
+
+class nsMenuContentRemovedEvent : public Runnable
+{
+public:
+    nsMenuContentRemovedEvent(nsMenu *aMenu,
+                              nsIContent *aContainer,
+                              nsIContent *aChild) :
+        Runnable("nsMenuContentRemovedEvent"),
+        mWeakMenu(aMenu),
+        mContainer(aContainer),
+        mChild(aChild) { }
+
+    NS_IMETHODIMP Run()
+    {
+        if (!mWeakMenu) {
+            return NS_OK;
+        }
+
+        static_cast<nsMenu *>(mWeakMenu.get())->HandleContentRemoved(mContainer,
+                                                                     mChild);
+        return NS_OK;
+    }
+
+private:
+    nsWeakMenuObject mWeakMenu;
+
+    nsCOMPtr<nsIContent> mContainer;
+    nsCOMPtr<nsIContent> mChild;
+};
+
+static void
+DispatchMouseEvent(nsIContent *aTarget, mozilla::EventMessage aMsg)
+{
+    if (!aTarget) {
+        return;
+    }
+
+    WidgetMouseEvent event(true, aMsg, nullptr, WidgetMouseEvent::eReal);
+    EventDispatcher::Dispatch(aTarget, nullptr, &event);
+}
+
+void
+nsMenu::SetPopupState(EPopupState aState)
+{
+    mPopupState = aState;
+
+    if (!mPopupContent) {
+        return;
+    }
+
+    nsAutoString state;
+    switch (aState) {
+        case ePopupState_Showing:
+            state.Assign(u"showing"_ns);
+            break;
+        case ePopupState_Open:
+            state.Assign(u"open"_ns);
+            break;
+        case ePopupState_Hiding:
+            state.Assign(u"hiding"_ns);
+            break;
+        default:
+            break;
+    }
+
+    if (state.IsEmpty()) {
+        mPopupContent->AsElement()->UnsetAttr(
+            kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate,
+            false);
+    } else {
+        mPopupContent->AsElement()->SetAttr(
+            kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate,
+            state, false);
+    }
+}
+
+/* static */ void
+nsMenu::DoOpenCallback(nsITimer *aTimer, void *aClosure)
+{
+    nsMenu* self = static_cast<nsMenu *>(aClosure);
+
+    dbusmenu_menuitem_show_to_user(self->GetNativeData(), 0);
+
+    self->mOpenDelayTimer = nullptr;
+}
+
+/* static */ void
+nsMenu::menu_event_cb(DbusmenuMenuitem *menu,
+                      const gchar *name,
+                      GVariant *value,
+                      guint timestamp,
+                      gpointer user_data)
+{
+    nsMenu *self = static_cast<nsMenu *>(user_data);
+
+    nsAutoCString event(name);
+
+    if (event.Equals("closed"_ns)) {
+        self->OnClose();
+        return;
+    }
+
+    if (event.Equals("opened"_ns)) {
+        self->OnOpen();
+        return;
+    }
+}
+
+void
+nsMenu::MaybeAddPlaceholderItem()
+{
+    MOZ_ASSERT(!IsInBatchedUpdate(),
+               "Shouldn't be modifying the native menu structure now");
+
+    GList *children = dbusmenu_menuitem_get_children(GetNativeData());
+    if (!children) {
+        MOZ_ASSERT(!mPlaceholderItem);
+
+        mPlaceholderItem = dbusmenu_menuitem_new();
+        if (!mPlaceholderItem) {
+            return;
+        }
+
+        dbusmenu_menuitem_property_set_bool(mPlaceholderItem,
+                                            DBUSMENU_MENUITEM_PROP_VISIBLE,
+                                            false);
+
+        MOZ_ALWAYS_TRUE(
+            dbusmenu_menuitem_child_append(GetNativeData(), mPlaceholderItem));
+    }
+}
+
+void
+nsMenu::EnsureNoPlaceholderItem()
+{
+    MOZ_ASSERT(!IsInBatchedUpdate(),
+               "Shouldn't be modifying the native menu structure now");
+
+    if (!mPlaceholderItem) {
+        return;
+    }
+
+    MOZ_ALWAYS_TRUE(
+        dbusmenu_menuitem_child_delete(GetNativeData(), mPlaceholderItem));
+    MOZ_ASSERT(!dbusmenu_menuitem_get_children(GetNativeData()));
+
+    g_object_unref(mPlaceholderItem);
+    mPlaceholderItem = nullptr;
+}
+
+void
+nsMenu::OnOpen()
+{
+    if (mNeedsRebuild) {
+        Build();
+    }
+
+    nsWeakMenuObject self(this);
+    nsCOMPtr<nsIContent> origPopupContent(mPopupContent);
+    {
+        nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker;
+
+        SetPopupState(ePopupState_Showing);
+        DispatchMouseEvent(mPopupContent, eXULPopupShowing);
+
+        ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, nsGkAtoms::open,
+                                            u"true"_ns, true);
+    }
+
+    if (!self) {
+        // We were deleted!
+        return;
+    }
+
+    // I guess that the popup could have changed
+    if (origPopupContent != mPopupContent) {
+        return;
+    }
+
+    nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker;
+
+    size_t count = ChildCount();
+    for (size_t i = 0; i < count; ++i) {
+        ChildAt(i)->ContainerIsOpening();
+    }
+
+    SetPopupState(ePopupState_Open);
+    DispatchMouseEvent(mPopupContent, eXULPopupShown);
+}
+
+void
+nsMenu::Build()
+{
+    mNeedsRebuild = false;
+
+    while (ChildCount() > 0) {
+        RemoveChildAt(0);
+    }
+
+    InitializePopup();
+
+    if (!mPopupContent) {
+        return;
+    }
+
+    uint32_t count = mPopupContent->GetChildCount();
+    for (uint32_t i = 0; i < count; ++i) {
+        nsIContent *childContent = mPopupContent->GetChildAt_Deprecated(i);
+
+        UniquePtr<nsMenuObject> child = CreateChild(childContent);
+
+        if (!child) {
+            continue;
+        }
+
+        AppendChild(std::move(child));
+    }
+}
+
+void
+nsMenu::InitializePopup()
+{
+    nsCOMPtr<nsIContent> oldPopupContent;
+    oldPopupContent.swap(mPopupContent);
+
+    for (uint32_t i = 0; i < ContentNode()->GetChildCount(); ++i) {
+        nsIContent *child = ContentNode()->GetChildAt_Deprecated(i);
+
+        if (child->NodeInfo()->NameAtom() == nsGkAtoms::menupopup) {
+            mPopupContent = child;
+            break;
+        }
+    }
+
+    if (oldPopupContent == mPopupContent) {
+        return;
+    }
+
+    // The popup has changed
+
+    if (oldPopupContent) {
+        DocListener()->UnregisterForContentChanges(oldPopupContent);
+    }
+
+    SetPopupState(ePopupState_Closed);
+
+    if (!mPopupContent) {
+        return;
+    }
+
+    DocListener()->RegisterForContentChanges(mPopupContent, this);
+}
+
+void
+nsMenu::RemoveChildAt(size_t aIndex)
+{
+    MOZ_ASSERT(IsInBatchedUpdate() || !mPlaceholderItem,
+               "Shouldn't have a placeholder menuitem");
+
+    nsMenuContainer::RemoveChildAt(aIndex, !IsInBatchedUpdate());
+    StructureMutated();
+
+    if (!IsInBatchedUpdate()) {
+        MaybeAddPlaceholderItem();
+    }
+}
+
+void
+nsMenu::RemoveChild(nsIContent *aChild)
+{
+    size_t index = IndexOf(aChild);
+    if (index == NoIndex) {
+        return;
+    }
+
+    RemoveChildAt(index);
+}
+
+void
+nsMenu::InsertChildAfter(UniquePtr<nsMenuObject> aChild,
+                         nsIContent *aPrevSibling)
+{
+    if (!IsInBatchedUpdate()) {
+        EnsureNoPlaceholderItem();
+    }
+
+    nsMenuContainer::InsertChildAfter(std::move(aChild), aPrevSibling,
+                                      !IsInBatchedUpdate());
+    StructureMutated();
+}
+
+void
+nsMenu::AppendChild(UniquePtr<nsMenuObject> aChild)
+{
+    if (!IsInBatchedUpdate()) {
+        EnsureNoPlaceholderItem();
+    }
+
+    nsMenuContainer::AppendChild(std::move(aChild), !IsInBatchedUpdate());
+    StructureMutated();
+}
+
+bool
+nsMenu::IsInBatchedUpdate() const
+{
+    return mBatchedUpdateState != eBatchedUpdateState_Inactive;
+}
+
+void
+nsMenu::StructureMutated()
+{
+    if (!IsInBatchedUpdate()) {
+        return;
+    }
+
+    mBatchedUpdateState = eBatchedUpdateState_DidMutate;
+}
+
+bool
+nsMenu::CanOpen() const
+{
+    bool isVisible = dbusmenu_menuitem_property_get_bool(GetNativeData(),
+                                                         DBUSMENU_MENUITEM_PROP_VISIBLE);
+    bool isDisabled = ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                              nsGkAtoms::disabled,
+                                                              nsGkAtoms::_true,
+                                                              eCaseMatters);
+
+    return (isVisible && !isDisabled);
+}
+
+void
+nsMenu::HandleContentInserted(nsIContent *aContainer,
+                              nsIContent *aChild,
+                              nsIContent *aPrevSibling)
+{
+    if (aContainer == mPopupContent) {
+        UniquePtr<nsMenuObject> child = CreateChild(aChild);
+
+        if (child) {
+            InsertChildAfter(std::move(child), aPrevSibling);
+        }
+    } else {
+        Build();
+    }
+}
+
+void
+nsMenu::HandleContentRemoved(nsIContent *aContainer, nsIContent *aChild)
+{
+    if (aContainer == mPopupContent) {
+        RemoveChild(aChild);
+    } else {
+        Build();
+    }
+}
+
+void
+nsMenu::InitializeNativeData()
+{
+    // Dbusmenu provides an "about-to-show" signal, and also "opened" and
+    // "closed" events. However, Unity is the only thing that sends
+    // both "about-to-show" and "opened" events. Unity 2D and the HUD only
+    // send "opened" events, so we ignore "about-to-show" (I don't think
+    // there's any real difference between them anyway).
+    // To complicate things, there are certain conditions where we don't
+    // get a "closed" event, so we need to be able to handle this :/
+    g_signal_connect(G_OBJECT(GetNativeData()), "event",
+                     G_CALLBACK(menu_event_cb), this);
+
+    mNeedsRebuild = true;
+    mNeedsUpdate = true;
+
+    MaybeAddPlaceholderItem();
+}
+
+void
+nsMenu::Update(const ComputedStyle *aComputedStyle)
+{
+    if (mNeedsUpdate) {
+        mNeedsUpdate = false;
+
+        UpdateLabel();
+        UpdateSensitivity();
+    }
+
+    UpdateVisibility(aComputedStyle);
+    UpdateIcon(aComputedStyle);
+}
+
+nsMenuObject::PropertyFlags
+nsMenu::SupportedProperties() const
+{
+    return static_cast<nsMenuObject::PropertyFlags>(
+        nsMenuObject::ePropLabel |
+        nsMenuObject::ePropEnabled |
+        nsMenuObject::ePropVisible |
+        nsMenuObject::ePropIconData |
+        nsMenuObject::ePropChildDisplay
+    );
+}
+
+void
+nsMenu::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute)
+{
+    MOZ_ASSERT(aContent == ContentNode() || aContent == mPopupContent,
+               "Received an event that wasn't meant for us!");
+
+    if (mNeedsUpdate) {
+        return;
+    }
+
+    if (aContent != ContentNode()) {
+        return;
+    }
+
+    if (!Parent()->IsBeingDisplayed()) {
+        mNeedsUpdate = true;
+        return;
+    }
+
+    if (aAttribute == nsGkAtoms::disabled) {
+        UpdateSensitivity();
+    } else if (aAttribute == nsGkAtoms::label ||
+               aAttribute == nsGkAtoms::accesskey ||
+               aAttribute == nsGkAtoms::crop) {
+        UpdateLabel();
+    } else if (aAttribute == nsGkAtoms::hidden ||
+        aAttribute == nsGkAtoms::collapsed) {
+        RefPtr<const ComputedStyle> style = GetComputedStyle();
+        UpdateVisibility(style);
+    } else if (aAttribute == nsGkAtoms::image) {
+        RefPtr<const ComputedStyle> style = GetComputedStyle();
+        UpdateIcon(style);
+    }
+}
+
+void
+nsMenu::OnContentInserted(nsIContent *aContainer, nsIContent *aChild,
+                          nsIContent *aPrevSibling)
+{
+    MOZ_ASSERT(aContainer == ContentNode() || aContainer == mPopupContent,
+               "Received an event that wasn't meant for us!");
+
+    if (mNeedsRebuild) {
+        return;
+    }
+
+    if (mPopupState == ePopupState_Closed) {
+        mNeedsRebuild = true;
+        return;
+    }
+
+    nsContentUtils::AddScriptRunner(
+        new nsMenuContentInsertedEvent(this, aContainer, aChild,
+                                       aPrevSibling));
+}
+
+void
+nsMenu::OnContentRemoved(nsIContent *aContainer, nsIContent *aChild)
+{
+    MOZ_ASSERT(aContainer == ContentNode() || aContainer == mPopupContent,
+               "Received an event that wasn't meant for us!");
+
+    if (mNeedsRebuild) {
+        return;
+    }
+
+    if (mPopupState == ePopupState_Closed) {
+        mNeedsRebuild = true;
+        return;
+    }
+
+    nsContentUtils::AddScriptRunner(
+        new nsMenuContentRemovedEvent(this, aContainer, aChild));
+}
+
+/*
+ * Some menus (eg, the History menu in Firefox) refresh themselves on
+ * opening by removing all children and then re-adding new ones. As this
+ * happens whilst the menu is opening in Unity, it causes some flickering
+ * as the menu popup is resized multiple times. To avoid this, we try to
+ * reuse native menu items when the menu structure changes during a
+ * batched update. If we can handle menu structure changes from Gecko
+ * just by updating properties of native menu items (rather than destroying
+ * and creating new ones), then we eliminate any flickering that occurs as
+ * the menu is opened. To do this, we don't modify any native menu items
+ * until the end of the update batch.
+ */
+
+void
+nsMenu::OnBeginUpdates(nsIContent *aContent)
+{
+    MOZ_ASSERT(aContent == ContentNode() || aContent == mPopupContent,
+               "Received an event that wasn't meant for us!");
+    MOZ_ASSERT(!IsInBatchedUpdate(), "Already in an update batch!");
+
+    if (aContent != mPopupContent) {
+        return;
+    }
+
+    mBatchedUpdateState = eBatchedUpdateState_Active;
+}
+
+void
+nsMenu::OnEndUpdates()
+{
+    if (!IsInBatchedUpdate()) {
+        return;
+    }
+
+    bool didMutate = mBatchedUpdateState == eBatchedUpdateState_DidMutate;
+    mBatchedUpdateState = eBatchedUpdateState_Inactive;
+
+    /* Optimize for the case where we only had attribute changes */
+    if (!didMutate) {
+        return;
+    }
+
+    EnsureNoPlaceholderItem();
+
+    GList *nextNativeChild = dbusmenu_menuitem_get_children(GetNativeData());
+    DbusmenuMenuitem *nextOwnedNativeChild = nullptr;
+
+    size_t count = ChildCount();
+
+    // Find the first native menu item that is `owned` by a corresponding
+    // Gecko menuitem
+    for (size_t i = 0; i < count; ++i) {
+        if (ChildAt(i)->GetNativeData()) {
+            nextOwnedNativeChild = ChildAt(i)->GetNativeData();
+            break;
+        }
+    }
+
+    // Now iterate over all Gecko menuitems
+    for (size_t i = 0; i < count; ++i) {
+        nsMenuObject *child = ChildAt(i);
+
+        if (child->GetNativeData()) {
+            // This child already has a corresponding native menuitem.
+            // Remove all preceding orphaned native items. At this point, we
+            // modify the native menu structure.
+            while (nextNativeChild &&
+                   nextNativeChild->data != nextOwnedNativeChild) {
+
+                DbusmenuMenuitem *data =
+                    static_cast<DbusmenuMenuitem *>(nextNativeChild->data);
+                nextNativeChild = nextNativeChild->next;
+
+                MOZ_ALWAYS_TRUE(dbusmenu_menuitem_child_delete(GetNativeData(),
+                                                               data));
+            }
+
+            if (nextNativeChild) {
+                nextNativeChild = nextNativeChild->next;
+            }
+
+            // Now find the next native menu item that is `owned`
+            nextOwnedNativeChild = nullptr;
+            for (size_t j = i + 1; j < count; ++j) {
+                if (ChildAt(j)->GetNativeData()) {
+                    nextOwnedNativeChild = ChildAt(j)->GetNativeData();
+                    break;
+                }
+            }
+        } else {
+            // This child is new, and doesn't have a native menu item. Find one!
+            if (nextNativeChild &&
+                nextNativeChild->data != nextOwnedNativeChild) {
+
+                DbusmenuMenuitem *data =
+                    static_cast<DbusmenuMenuitem *>(nextNativeChild->data);
+
+                if (NS_SUCCEEDED(child->AdoptNativeData(data))) {
+                    nextNativeChild = nextNativeChild->next;
+                }
+            }
+
+            // There wasn't a suitable one available, so create a new one.
+            // At this point, we modify the native menu structure.
+            if (!child->GetNativeData()) {
+                child->CreateNativeData();
+                MOZ_ALWAYS_TRUE(
+                    dbusmenu_menuitem_child_add_position(GetNativeData(),
+                                                         child->GetNativeData(),
+                                                         i));
+            }
+        }
+    }
+
+    while (nextNativeChild) {
+        DbusmenuMenuitem *data =
+            static_cast<DbusmenuMenuitem *>(nextNativeChild->data);
+        nextNativeChild = nextNativeChild->next;
+
+        MOZ_ALWAYS_TRUE(dbusmenu_menuitem_child_delete(GetNativeData(), data));
+    }
+
+    MaybeAddPlaceholderItem();
+}
+
+nsMenu::nsMenu(nsMenuContainer *aParent, nsIContent *aContent) :
+    nsMenuContainer(aParent, aContent),
+    mNeedsRebuild(false),
+    mNeedsUpdate(false),
+    mPlaceholderItem(nullptr),
+    mPopupState(ePopupState_Closed),
+    mBatchedUpdateState(eBatchedUpdateState_Inactive)
+{
+    MOZ_COUNT_CTOR(nsMenu);
+}
+
+nsMenu::~nsMenu()
+{
+    if (IsInBatchedUpdate()) {
+        OnEndUpdates();
+    }
+
+    // Although nsTArray will take care of this in its destructor,
+    // we have to manually ensure children are removed from our native menu
+    // item, just in case our parent recycles us
+    while (ChildCount() > 0) {
+        RemoveChildAt(0);
+    }
+
+    EnsureNoPlaceholderItem();
+
+    if (DocListener() && mPopupContent) {
+        DocListener()->UnregisterForContentChanges(mPopupContent);
+    }
+
+    if (GetNativeData()) {
+        g_signal_handlers_disconnect_by_func(GetNativeData(),
+                                             FuncToGpointer(menu_event_cb),
+                                             this);
+    }
+
+    MOZ_COUNT_DTOR(nsMenu);
+}
+
+nsMenuObject::EType
+nsMenu::Type() const
+{
+    return eType_Menu;
+}
+
+bool
+nsMenu::IsBeingDisplayed() const
+{
+    return mPopupState == ePopupState_Open;
+}
+
+bool
+nsMenu::NeedsRebuild() const
+{
+    return mNeedsRebuild;
+}
+
+void
+nsMenu::OpenMenu()
+{
+    if (!CanOpen()) {
+        return;
+    }
+
+    if (mOpenDelayTimer) {
+        return;
+    }
+
+    // Here, we synchronously fire popupshowing and popupshown events and then
+    // open the menu after a short delay. This allows the menu to refresh before
+    // it's shown, and avoids an issue where keyboard focus is not on the first
+    // item of the history menu in Firefox when opening it with the keyboard,
+    // because extra items to appear at the top of the menu
+
+    OnOpen();
+
+    mOpenDelayTimer = NS_NewTimer();
+    if (!mOpenDelayTimer) {
+        return;
+    }
+
+    if (NS_FAILED(mOpenDelayTimer->InitWithNamedFuncCallback(DoOpenCallback,
+                                                             this,
+                                                             100,
+                                                             nsITimer::TYPE_ONE_SHOT,
+                                                             "nsMenu::DoOpenCallback"))) {
+        mOpenDelayTimer = nullptr;
+    }
+}
+
+void
+nsMenu::OnClose()
+{
+    if (mPopupState == ePopupState_Closed) {
+        return;
+    }
+
+    MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
+
+    // We do this to avoid mutating our view of the menu until
+    // after we have finished
+    nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker;
+
+    SetPopupState(ePopupState_Hiding);
+    DispatchMouseEvent(mPopupContent, eXULPopupHiding);
+
+    // Sigh, make sure all of our descendants are closed, as we don't
+    // always get closed events for submenus when scrubbing quickly through
+    // the menu
+    size_t count = ChildCount();
+    for (size_t i = 0; i < count; ++i) {
+        if (ChildAt(i)->Type() == nsMenuObject::eType_Menu) {
+            static_cast<nsMenu *>(ChildAt(i))->OnClose();
+        }
+    }
+
+    SetPopupState(ePopupState_Closed);
+    DispatchMouseEvent(mPopupContent, eXULPopupHidden);
+
+    ContentNode()->AsElement()->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open,
+                                          true);
+}
+
diff --git a/widget/gtk/nsMenu.h b/widget/gtk/nsMenu.h
new file mode 100644
index 0000000000000..40244d0122901
--- /dev/null
+++ b/widget/gtk/nsMenu.h
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenu_h__
+#define __nsMenu_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+
+#include "nsDbusmenu.h"
+#include "nsMenuContainer.h"
+#include "nsMenuObject.h"
+
+#include <glib.h>
+
+class nsAtom;
+class nsIContent;
+class nsITimer;
+
+#define NSMENU_NUMBER_OF_POPUPSTATE_BITS 2U
+#define NSMENU_NUMBER_OF_FLAGS           4U
+
+// This class represents a menu
+class nsMenu final : public nsMenuContainer
+{
+public:
+    nsMenu(nsMenuContainer *aParent, nsIContent *aContent);
+    ~nsMenu();
+
+    nsMenuObject::EType Type() const override;
+
+    bool IsBeingDisplayed() const override;
+    bool NeedsRebuild() const override;
+
+    // Tell the desktop shell to display this menu
+    void OpenMenu();
+
+    // Normally called via the shell, but it's public so that child
+    // menuitems can do the shells work. Sigh....
+    void OnClose();
+
+private:
+    friend class nsMenuContentInsertedEvent;
+    friend class nsMenuContentRemovedEvent;
+
+    enum EPopupState {
+        ePopupState_Closed,
+        ePopupState_Showing,
+        ePopupState_Open,
+        ePopupState_Hiding
+    };
+
+    void SetPopupState(EPopupState aState);
+
+    static void DoOpenCallback(nsITimer *aTimer, void *aClosure);
+    static void menu_event_cb(DbusmenuMenuitem *menu,
+                              const gchar *name,
+                              GVariant *value,
+                              guint timestamp,
+                              gpointer user_data);
+
+    // We add a placeholder item to empty menus so that Unity actually treats
+    // us as a proper menu, rather than a menuitem without a submenu
+    void MaybeAddPlaceholderItem();
+
+    // Removes a placeholder item if it exists and asserts that this succeeds
+    void EnsureNoPlaceholderItem();
+
+    void OnOpen();
+    void Build();
+    void InitializePopup();
+    void RemoveChildAt(size_t aIndex);
+    void RemoveChild(nsIContent *aChild);
+    void InsertChildAfter(mozilla::UniquePtr<nsMenuObject> aChild,
+                          nsIContent *aPrevSibling);
+    void AppendChild(mozilla::UniquePtr<nsMenuObject> aChild);
+    bool IsInBatchedUpdate() const;
+    void StructureMutated();
+    bool CanOpen() const;
+
+    void HandleContentInserted(nsIContent *aContainer,
+                               nsIContent *aChild,
+                               nsIContent *aPrevSibling);
+    void HandleContentRemoved(nsIContent *aContainer,
+                              nsIContent *aChild);
+
+    void InitializeNativeData() override;
+    void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+    nsMenuObject::PropertyFlags SupportedProperties() const override;
+
+    void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override;
+    void OnContentInserted(nsIContent *aContainer, nsIContent *aChild,
+                           nsIContent *aPrevSibling) override;
+    void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) override;
+    void OnBeginUpdates(nsIContent *aContent) override;
+    void OnEndUpdates() override;
+
+    bool mNeedsRebuild;
+    bool mNeedsUpdate;
+
+    DbusmenuMenuitem *mPlaceholderItem;
+
+    EPopupState mPopupState;
+
+    enum EBatchedUpdateState {
+        eBatchedUpdateState_Inactive,
+        eBatchedUpdateState_Active,
+        eBatchedUpdateState_DidMutate
+    };
+
+    EBatchedUpdateState mBatchedUpdateState;
+
+    nsCOMPtr<nsIContent> mPopupContent;
+
+    nsCOMPtr<nsITimer> mOpenDelayTimer;
+};
+
+#endif /* __nsMenu_h__ */
diff --git a/widget/gtk/nsMenuBar.cpp b/widget/gtk/nsMenuBar.cpp
new file mode 100644
index 0000000000000..71834e55fad64
--- /dev/null
+++ b/widget/gtk/nsMenuBar.cpp
@@ -0,0 +1,548 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/Assertions.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
+#include "mozilla/dom/KeyboardEvent.h"
+#include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/Preferences.h"
+#include "nsContentUtils.h"
+#include "nsIDOMEventListener.h"
+#include "nsIRunnable.h"
+#include "nsIWidget.h"
+#include "nsTArray.h"
+#include "nsUnicharUtils.h"
+
+#include "nsMenu.h"
+#include "nsNativeMenuService.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include "nsMenuBar.h"
+
+using namespace mozilla;
+
+static bool
+ShouldHandleKeyEvent(dom::KeyboardEvent *aEvent)
+{
+    return !aEvent->DefaultPrevented() && aEvent->IsTrusted();
+}
+
+class nsMenuBarContentInsertedEvent : public Runnable
+{
+public:
+    nsMenuBarContentInsertedEvent(nsMenuBar *aMenuBar,
+                                  nsIContent *aChild,
+                                  nsIContent *aPrevSibling) :
+        Runnable("nsMenuBarContentInsertedEvent"),
+        mWeakMenuBar(aMenuBar),
+        mChild(aChild),
+        mPrevSibling(aPrevSibling) { }
+
+    NS_IMETHODIMP Run()
+    {
+        if (!mWeakMenuBar) {
+            return NS_OK;
+        }
+
+        static_cast<nsMenuBar *>(mWeakMenuBar.get())->HandleContentInserted(mChild,
+                                                                            mPrevSibling);
+        return NS_OK;
+    }
+
+private:
+    nsWeakMenuObject mWeakMenuBar;
+
+    nsCOMPtr<nsIContent> mChild;
+    nsCOMPtr<nsIContent> mPrevSibling;
+};
+
+class nsMenuBarContentRemovedEvent : public Runnable
+{
+public:
+    nsMenuBarContentRemovedEvent(nsMenuBar *aMenuBar,
+                                 nsIContent *aChild) :
+        Runnable("nsMenuBarContentRemovedEvent"),
+        mWeakMenuBar(aMenuBar),
+        mChild(aChild) { }
+
+    NS_IMETHODIMP Run()
+    {
+        if (!mWeakMenuBar) {
+            return NS_OK;
+        }
+
+        static_cast<nsMenuBar *>(mWeakMenuBar.get())->HandleContentRemoved(mChild);
+        return NS_OK;
+    }
+
+private:
+    nsWeakMenuObject mWeakMenuBar;
+
+    nsCOMPtr<nsIContent> mChild;
+};
+
+class nsMenuBar::DocEventListener final : public nsIDOMEventListener
+{
+public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIDOMEVENTLISTENER
+
+    DocEventListener(nsMenuBar *aOwner) : mOwner(aOwner) { };
+
+private:
+    ~DocEventListener() { };
+
+    nsMenuBar *mOwner;
+};
+
+NS_IMPL_ISUPPORTS(nsMenuBar::DocEventListener, nsIDOMEventListener)
+
+NS_IMETHODIMP
+nsMenuBar::DocEventListener::HandleEvent(dom::Event *aEvent)
+{
+    nsAutoString type;
+    aEvent->GetType(type);
+
+    if (type.Equals(u"focus"_ns)) {
+        mOwner->Focus();
+    } else if (type.Equals(u"blur"_ns)) {
+        mOwner->Blur();
+    }
+
+    RefPtr<dom::KeyboardEvent> keyEvent = aEvent->AsKeyboardEvent();
+    if (!keyEvent) {
+        return NS_OK;
+    }
+
+    if (type.Equals(u"keypress"_ns)) {
+        return mOwner->Keypress(keyEvent);
+    } else if (type.Equals(u"keydown"_ns)) {
+        return mOwner->KeyDown(keyEvent);
+    } else if (type.Equals(u"keyup"_ns)) {
+        return mOwner->KeyUp(keyEvent);
+    }
+
+    return NS_OK;
+}
+
+nsMenuBar::nsMenuBar(nsIContent *aMenuBarNode) :
+    nsMenuContainer(new nsNativeMenuDocListener(aMenuBarNode), aMenuBarNode),
+    mTopLevel(nullptr),
+    mServer(nullptr),
+    mIsActive(false)
+{
+    MOZ_COUNT_CTOR(nsMenuBar);
+}
+
+nsresult
+nsMenuBar::Init(nsIWidget *aParent)
+{
+    MOZ_ASSERT(aParent);
+
+    GdkWindow *gdkWin = static_cast<GdkWindow *>(
+        aParent->GetNativeData(NS_NATIVE_WINDOW));
+    if (!gdkWin) {
+        return NS_ERROR_FAILURE;
+    }
+
+    gpointer user_data = nullptr;
+    gdk_window_get_user_data(gdkWin, &user_data);
+    if (!user_data || !GTK_IS_CONTAINER(user_data)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    mTopLevel = gtk_widget_get_toplevel(GTK_WIDGET(user_data));
+    if (!mTopLevel) {
+        return NS_ERROR_FAILURE;
+    }
+
+    g_object_ref(mTopLevel);
+
+    nsAutoCString path;
+    path.Append("/com/canonical/menu/"_ns);
+    char xid[10];
+    sprintf(xid, "%X", static_cast<uint32_t>(
+        GDK_WINDOW_XID(gtk_widget_get_window(mTopLevel))));
+    path.Append(xid);
+
+    mServer = dbusmenu_server_new(path.get());
+    if (!mServer) {
+        return NS_ERROR_FAILURE;
+    }
+
+    CreateNativeData();
+    if (!GetNativeData()) {
+        return NS_ERROR_FAILURE;
+    }
+
+    dbusmenu_server_set_root(mServer, GetNativeData());
+
+    mEventListener = new DocEventListener(this);
+
+    mDocument = ContentNode()->OwnerDoc();
+
+    mAccessKey = Preferences::GetInt("ui.key.menuAccessKey");
+    if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_SHIFT) {
+        mAccessKeyMask = eModifierShift;
+    } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_CONTROL) {
+        mAccessKeyMask = eModifierCtrl;
+    } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_ALT) {
+        mAccessKeyMask = eModifierAlt;
+    } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_META) {
+        mAccessKeyMask = eModifierMeta;
+    } else {
+        mAccessKeyMask = eModifierAlt;
+    }
+
+    return NS_OK;
+}
+
+void
+nsMenuBar::Build()
+{
+    uint32_t count = ContentNode()->GetChildCount();
+    for (uint32_t i = 0; i < count; ++i) {
+        nsIContent *childContent = ContentNode()->GetChildAt_Deprecated(i);
+
+        UniquePtr<nsMenuObject> child = CreateChild(childContent);
+
+        if (!child) {
+            continue;
+        }
+
+        AppendChild(std::move(child));
+    }
+}
+
+void
+nsMenuBar::DisconnectDocumentEventListeners()
+{
+    mDocument->RemoveEventListener(u"focus"_ns,
+                                   mEventListener,
+                                   true);
+    mDocument->RemoveEventListener(u"blur"_ns,
+                                   mEventListener,
+                                   true);
+    mDocument->RemoveEventListener(u"keypress"_ns,
+                                   mEventListener,
+                                   false);
+    mDocument->RemoveEventListener(u"keydown"_ns,
+                                   mEventListener,
+                                   false);
+    mDocument->RemoveEventListener(u"keyup"_ns,
+                                   mEventListener,
+                                   false);
+}
+
+void
+nsMenuBar::SetShellShowingMenuBar(bool aShowing)
+{
+    ContentNode()->OwnerDoc()->GetRootElement()->SetAttr(
+        kNameSpaceID_None, nsGkAtoms::shellshowingmenubar,
+        aShowing ? u"true"_ns : u"false"_ns,
+        true);
+}
+
+void
+nsMenuBar::Focus()
+{
+    ContentNode()->AsElement()->SetAttr(kNameSpaceID_None,
+                                        nsGkAtoms::openedwithkey,
+                                        u"false"_ns, true);
+}
+
+void
+nsMenuBar::Blur()
+{
+    // We do this here in case we lose focus before getting the
+    // keyup event, which leaves the menubar state looking like
+    // the alt key is stuck down
+    dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NORMAL);
+}
+
+nsMenuBar::ModifierFlags
+nsMenuBar::GetModifiersFromEvent(dom::KeyboardEvent *aEvent)
+{
+    ModifierFlags modifiers = static_cast<ModifierFlags>(0);
+
+    if (aEvent->AltKey()) {
+        modifiers = static_cast<ModifierFlags>(modifiers | eModifierAlt);
+    }
+
+    if (aEvent->ShiftKey()) {
+        modifiers = static_cast<ModifierFlags>(modifiers | eModifierShift);
+    }
+
+    if (aEvent->CtrlKey()) {
+        modifiers = static_cast<ModifierFlags>(modifiers | eModifierCtrl);
+    }
+
+    if (aEvent->MetaKey()) {
+        modifiers = static_cast<ModifierFlags>(modifiers | eModifierMeta);
+    }
+
+    return modifiers;
+}
+
+nsresult
+nsMenuBar::Keypress(dom::KeyboardEvent *aEvent)
+{
+    if (!ShouldHandleKeyEvent(aEvent)) {
+        return NS_OK;
+    }
+
+    ModifierFlags modifiers = GetModifiersFromEvent(aEvent);
+    if (((modifiers & mAccessKeyMask) == 0) ||
+        ((modifiers & ~mAccessKeyMask) != 0)) {
+        return NS_OK;
+    }
+
+    uint32_t charCode = aEvent->CharCode();
+    if (charCode == 0) {
+        return NS_OK;
+    }
+
+    char16_t ch = char16_t(charCode);
+    char16_t chl = ToLowerCase(ch);
+    char16_t chu = ToUpperCase(ch);
+
+    nsMenuObject *found = nullptr;
+    uint32_t count = ChildCount();
+    for (uint32_t i = 0; i < count; ++i) {
+        nsAutoString accesskey;
+        ChildAt(i)->ContentNode()->AsElement()->GetAttr(kNameSpaceID_None,
+                                                        nsGkAtoms::accesskey,
+                                                        accesskey);
+        const nsAutoString::char_type *key = accesskey.BeginReading();
+        if (*key == chu || *key == chl) {
+            found = ChildAt(i);
+            break;
+        }
+    }
+
+    if (!found || found->Type() != nsMenuObject::eType_Menu) {
+        return NS_OK;
+    }
+
+    ContentNode()->AsElement()->SetAttr(kNameSpaceID_None,
+                                        nsGkAtoms::openedwithkey,
+                                        u"true"_ns, true);
+    static_cast<nsMenu *>(found)->OpenMenu();
+
+    aEvent->StopPropagation();
+    aEvent->PreventDefault();
+
+    return NS_OK;
+}
+
+nsresult
+nsMenuBar::KeyDown(dom::KeyboardEvent *aEvent)
+{
+    if (!ShouldHandleKeyEvent(aEvent)) {
+        return NS_OK;
+    }
+
+    uint32_t keyCode = aEvent->KeyCode();
+    ModifierFlags modifiers = GetModifiersFromEvent(aEvent);
+    if ((keyCode != mAccessKey) || ((modifiers & ~mAccessKeyMask) != 0)) {
+        return NS_OK;
+    }
+
+    dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NOTICE);
+
+    return NS_OK;
+}
+
+nsresult
+nsMenuBar::KeyUp(dom::KeyboardEvent *aEvent)
+{
+    if (!ShouldHandleKeyEvent(aEvent)) {
+        return NS_OK;
+    }
+
+    uint32_t keyCode = aEvent->KeyCode();
+    if (keyCode == mAccessKey) {
+        dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NORMAL);
+    }
+
+    return NS_OK;
+}
+
+void
+nsMenuBar::HandleContentInserted(nsIContent *aChild, nsIContent *aPrevSibling)
+{
+    UniquePtr<nsMenuObject> child = CreateChild(aChild);
+
+    if (!child) {
+        return;
+    }
+
+    InsertChildAfter(std::move(child), aPrevSibling);
+}
+
+void
+nsMenuBar::HandleContentRemoved(nsIContent *aChild)
+{
+    RemoveChild(aChild);
+}
+
+void
+nsMenuBar::OnContentInserted(nsIContent *aContainer, nsIContent *aChild,
+                             nsIContent *aPrevSibling)
+{
+    MOZ_ASSERT(aContainer == ContentNode(),
+               "Received an event that wasn't meant for us");
+
+    nsContentUtils::AddScriptRunner(
+        new nsMenuBarContentInsertedEvent(this, aChild, aPrevSibling));
+}
+
+void
+nsMenuBar::OnContentRemoved(nsIContent *aContainer, nsIContent *aChild)
+{
+    MOZ_ASSERT(aContainer == ContentNode(),
+               "Received an event that wasn't meant for us");
+
+    nsContentUtils::AddScriptRunner(
+        new nsMenuBarContentRemovedEvent(this, aChild));
+}
+
+nsMenuBar::~nsMenuBar()
+{
+    nsNativeMenuService *service = nsNativeMenuService::GetSingleton();
+    if (service) {
+        service->NotifyNativeMenuBarDestroyed(this);
+    }
+
+    if (ContentNode()) {
+        SetShellShowingMenuBar(false);
+    }
+
+    // We want to destroy all children before dropping our reference
+    // to the doc listener
+    while (ChildCount() > 0) {
+        RemoveChildAt(0);
+    }
+
+    if (mTopLevel) {
+        g_object_unref(mTopLevel);
+    }
+
+    if (DocListener()) {
+        DocListener()->Stop();
+    }
+
+    if (mDocument) {
+        DisconnectDocumentEventListeners();
+    }
+
+    if (mServer) {
+        g_object_unref(mServer);
+    }
+
+    MOZ_COUNT_DTOR(nsMenuBar);
+}
+
+/* static */ UniquePtr<nsMenuBar>
+nsMenuBar::Create(nsIWidget *aParent, nsIContent *aMenuBarNode)
+{
+    UniquePtr<nsMenuBar> menubar(new nsMenuBar(aMenuBarNode));
+    if (NS_FAILED(menubar->Init(aParent))) {
+        return nullptr;
+    }
+
+    return menubar;
+}
+
+nsMenuObject::EType
+nsMenuBar::Type() const
+{
+    return eType_MenuBar;
+}
+
+bool
+nsMenuBar::IsBeingDisplayed() const
+{
+    return true;
+}
+
+uint32_t
+nsMenuBar::WindowId() const
+{
+    return static_cast<uint32_t>(GDK_WINDOW_XID(gtk_widget_get_window(mTopLevel)));
+}
+
+nsCString
+nsMenuBar::ObjectPath() const
+{
+    gchar *tmp;
+    g_object_get(mServer, DBUSMENU_SERVER_PROP_DBUS_OBJECT, &tmp, NULL);
+
+    nsCString result;
+    result.Adopt(tmp);
+
+    return result;
+}
+
+void
+nsMenuBar::Activate()
+{
+    if (mIsActive) {
+        return;
+    }
+
+    mIsActive = true;
+
+    mDocument->AddEventListener(u"focus"_ns,
+                                mEventListener,
+                                true);
+    mDocument->AddEventListener(u"blur"_ns,
+                                mEventListener,
+                                true);
+    mDocument->AddEventListener(u"keypress"_ns,
+                                mEventListener,
+                                false);
+    mDocument->AddEventListener(u"keydown"_ns,
+                                mEventListener,
+                                false);
+    mDocument->AddEventListener(u"keyup"_ns,
+                                mEventListener,
+                                false);
+
+    // Clear this. Not sure if we really need to though
+    ContentNode()->AsElement()->SetAttr(kNameSpaceID_None,
+                                        nsGkAtoms::openedwithkey,
+                                        u"false"_ns, true);
+
+    DocListener()->Start();
+    Build();
+    SetShellShowingMenuBar(true);
+}
+
+void
+nsMenuBar::Deactivate()
+{
+    if (!mIsActive) {
+        return;
+    }
+
+    mIsActive = false;
+
+    SetShellShowingMenuBar(false);
+    while (ChildCount() > 0) {
+        RemoveChildAt(0);
+    }
+    DocListener()->Stop();
+    DisconnectDocumentEventListeners();
+}
diff --git a/widget/gtk/nsMenuBar.h b/widget/gtk/nsMenuBar.h
new file mode 100644
index 0000000000000..7a04316330c19
--- /dev/null
+++ b/widget/gtk/nsMenuBar.h
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenuBar_h__
+#define __nsMenuBar_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+
+#include "nsDbusmenu.h"
+#include "nsMenuContainer.h"
+#include "nsMenuObject.h"
+
+#include <gtk/gtk.h>
+
+class nsIContent;
+class nsIWidget;
+class nsMenuBarDocEventListener;
+
+namespace mozilla {
+namespace dom {
+class Document;
+class KeyboardEvent;
+}
+}
+
+/*
+ * The menubar class. There is one of these per window (and the window
+ * owns its menubar). Each menubar has an object path, and the service is
+ * responsible for telling the desktop shell which object path corresponds
+ * to a particular window. A menubar and its hierarchy also own a
+ * nsNativeMenuDocListener.
+ */
+class nsMenuBar final : public nsMenuContainer
+{
+public:
+    ~nsMenuBar() override;
+
+    static mozilla::UniquePtr<nsMenuBar> Create(nsIWidget *aParent,
+                                                nsIContent *aMenuBarNode);
+
+    nsMenuObject::EType Type() const override;
+
+    bool IsBeingDisplayed() const override;
+
+    // Get the native window ID for this menubar
+    uint32_t WindowId() const;
+
+    // Get the object path for this menubar
+    nsCString ObjectPath() const;
+
+    // Get the top-level GtkWindow handle
+    GtkWidget* TopLevelWindow() { return mTopLevel; }
+
+    // Called from the menuservice when the menubar is about to be registered.
+    // Causes the native menubar to be created, and the XUL menubar to be hidden
+    void Activate();
+
+    // Called from the menuservice when the menubar is no longer registered
+    // with the desktop shell. Will cause the XUL menubar to be shown again
+    void Deactivate();
+
+private:
+    class DocEventListener;
+    friend class nsMenuBarContentInsertedEvent;
+    friend class nsMenuBarContentRemovedEvent;
+
+    enum ModifierFlags {
+        eModifierShift = (1 << 0),
+        eModifierCtrl = (1 << 1),
+        eModifierAlt = (1 << 2),
+        eModifierMeta = (1 << 3)
+    };
+
+    nsMenuBar(nsIContent *aMenuBarNode);
+    nsresult Init(nsIWidget *aParent);
+    void Build();
+    void DisconnectDocumentEventListeners();
+    void SetShellShowingMenuBar(bool aShowing);
+    void Focus();
+    void Blur();
+    ModifierFlags GetModifiersFromEvent(mozilla::dom::KeyboardEvent *aEvent);
+    nsresult Keypress(mozilla::dom::KeyboardEvent *aEvent);
+    nsresult KeyDown(mozilla::dom::KeyboardEvent *aEvent);
+    nsresult KeyUp(mozilla::dom::KeyboardEvent *aEvent);
+
+    void HandleContentInserted(nsIContent *aChild,
+                               nsIContent *aPrevSibling);
+    void HandleContentRemoved(nsIContent *aChild);
+
+    void OnContentInserted(nsIContent *aContainer, nsIContent *aChild,
+                           nsIContent *aPrevSibling) override;
+    void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) override;
+
+    GtkWidget *mTopLevel;
+    DbusmenuServer *mServer;
+    nsCOMPtr<mozilla::dom::Document> mDocument;
+    RefPtr<DocEventListener> mEventListener;
+
+    uint32_t mAccessKey;
+    ModifierFlags mAccessKeyMask;
+    bool mIsActive;
+};
+
+#endif /* __nsMenuBar_h__ */
diff --git a/widget/gtk/nsMenuContainer.cpp b/widget/gtk/nsMenuContainer.cpp
new file mode 100644
index 0000000000000..f419201f6338b
--- /dev/null
+++ b/widget/gtk/nsMenuContainer.cpp
@@ -0,0 +1,170 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/DebugOnly.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+
+#include "nsDbusmenu.h"
+#include "nsMenu.h"
+#include "nsMenuItem.h"
+#include "nsMenuSeparator.h"
+
+#include "nsMenuContainer.h"
+
+using namespace mozilla;
+
+const nsMenuContainer::ChildTArray::index_type nsMenuContainer::NoIndex = nsMenuContainer::ChildTArray::NoIndex;
+
+typedef UniquePtr<nsMenuObject> (*nsMenuObjectConstructor)(nsMenuContainer*,
+                                                           nsIContent*);
+
+template<class T>
+static UniquePtr<nsMenuObject> CreateMenuObject(nsMenuContainer *aContainer,
+                                                nsIContent *aContent)
+{
+    return UniquePtr<T>(new T(aContainer, aContent));
+}
+
+static nsMenuObjectConstructor
+GetMenuObjectConstructor(nsIContent *aContent)
+{
+    if (aContent->IsXULElement(nsGkAtoms::menuitem)) {
+        return CreateMenuObject<nsMenuItem>;
+    } else if (aContent->IsXULElement(nsGkAtoms::menu)) {
+        return CreateMenuObject<nsMenu>;
+    } else if (aContent->IsXULElement(nsGkAtoms::menuseparator)) {
+        return CreateMenuObject<nsMenuSeparator>;
+    }
+
+    return nullptr;
+}
+
+static bool
+ContentIsSupported(nsIContent *aContent)
+{
+    return GetMenuObjectConstructor(aContent) ? true : false;
+}
+
+nsMenuContainer::nsMenuContainer(nsMenuContainer *aParent,
+                                 nsIContent *aContent) :
+    nsMenuObject(aParent, aContent)
+{
+}
+
+nsMenuContainer::nsMenuContainer(nsNativeMenuDocListener *aListener,
+                                 nsIContent *aContent) :
+    nsMenuObject(aListener, aContent)
+{
+}
+
+UniquePtr<nsMenuObject>
+nsMenuContainer::CreateChild(nsIContent *aContent)
+{
+    nsMenuObjectConstructor ctor = GetMenuObjectConstructor(aContent);
+    if (!ctor) {
+        // There are plenty of node types we might stumble across that
+        // aren't supported
+        return nullptr;
+    }
+
+    UniquePtr<nsMenuObject> res = ctor(this, aContent);
+    return res;
+}
+
+size_t
+nsMenuContainer::IndexOf(nsIContent *aChild) const
+{
+    if (!aChild) {
+        return NoIndex;
+    }
+
+    size_t count = ChildCount();
+    for (size_t i = 0; i < count; ++i) {
+        if (ChildAt(i)->ContentNode() == aChild) {
+            return i;
+        }
+    }
+
+    return NoIndex;
+}
+
+void
+nsMenuContainer::RemoveChildAt(size_t aIndex, bool aUpdateNative)
+{
+    MOZ_ASSERT(aIndex < ChildCount());
+
+    if (aUpdateNative) {
+        MOZ_ALWAYS_TRUE(
+            dbusmenu_menuitem_child_delete(GetNativeData(),
+                                           ChildAt(aIndex)->GetNativeData()));
+    }
+
+    mChildren.RemoveElementAt(aIndex);
+}
+
+void
+nsMenuContainer::RemoveChild(nsIContent *aChild, bool aUpdateNative)
+{
+    size_t index = IndexOf(aChild);
+    if (index == NoIndex) {
+        return;
+    }
+
+    RemoveChildAt(index, aUpdateNative);
+}
+
+void
+nsMenuContainer::InsertChildAfter(UniquePtr<nsMenuObject> aChild,
+                                  nsIContent *aPrevSibling,
+                                  bool aUpdateNative)
+{
+    size_t index = IndexOf(aPrevSibling);
+    MOZ_ASSERT(!aPrevSibling || index != NoIndex);
+
+    ++index;
+
+    if (aUpdateNative) {
+        aChild->CreateNativeData();
+        MOZ_ALWAYS_TRUE(
+            dbusmenu_menuitem_child_add_position(GetNativeData(),
+                                                 aChild->GetNativeData(),
+                                                 index));
+    }
+
+    mChildren.InsertElementAt(index, std::move(aChild));
+}
+
+void
+nsMenuContainer::AppendChild(UniquePtr<nsMenuObject> aChild,
+                             bool aUpdateNative)
+{
+    if (aUpdateNative) {
+        aChild->CreateNativeData();
+        MOZ_ALWAYS_TRUE(
+            dbusmenu_menuitem_child_append(GetNativeData(),
+                                           aChild->GetNativeData()));
+    }
+
+    mChildren.AppendElement(std::move(aChild));
+}
+
+bool
+nsMenuContainer::NeedsRebuild() const
+{
+    return false;
+}
+
+/* static */ nsIContent*
+nsMenuContainer::GetPreviousSupportedSibling(nsIContent *aContent)
+{
+    do {
+        aContent = aContent->GetPreviousSibling();
+    } while (aContent && !ContentIsSupported(aContent));
+
+    return aContent;
+}
diff --git a/widget/gtk/nsMenuContainer.h b/widget/gtk/nsMenuContainer.h
new file mode 100644
index 0000000000000..b7e8fa8db46fb
--- /dev/null
+++ b/widget/gtk/nsMenuContainer.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenuContainer_h__
+#define __nsMenuContainer_h__
+
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
+#include "nsMenuObject.h"
+
+class nsIContent;
+class nsNativeMenuDocListener;
+
+// Base class for containers (menus and menubars)
+class nsMenuContainer : public nsMenuObject
+{
+public:
+    typedef nsTArray<mozilla::UniquePtr<nsMenuObject> > ChildTArray;
+
+    // Determine if this container is being displayed on screen. Must be
+    // implemented by subclasses. Must return true if the container is
+    // in the fully open state, or false otherwise
+    virtual bool IsBeingDisplayed() const = 0;
+
+    // Determine if this container will be rebuilt the next time it opens.
+    // Returns false by default but can be overridden by subclasses
+    virtual bool NeedsRebuild() const;
+
+    // Return the first previous sibling that is of a type supported by the
+    // menu system
+    static nsIContent* GetPreviousSupportedSibling(nsIContent *aContent);
+
+    static const ChildTArray::index_type NoIndex;
+
+protected:
+    nsMenuContainer(nsMenuContainer *aParent, nsIContent *aContent);
+    nsMenuContainer(nsNativeMenuDocListener *aListener, nsIContent *aContent);
+
+    // Create a new child element for the specified content node
+    mozilla::UniquePtr<nsMenuObject> CreateChild(nsIContent *aContent);
+
+    // Return the index of the child for the specified content node
+    size_t IndexOf(nsIContent *aChild) const;
+
+    size_t ChildCount() const { return mChildren.Length(); }
+    nsMenuObject* ChildAt(size_t aIndex) const { return mChildren[aIndex].get(); }
+
+    void RemoveChildAt(size_t aIndex, bool aUpdateNative = true);
+
+    // Remove the child that owns the specified content node
+    void RemoveChild(nsIContent *aChild, bool aUpdateNative = true);
+
+    // Insert a new child after the child that owns the specified content node
+    void InsertChildAfter(mozilla::UniquePtr<nsMenuObject> aChild,
+                          nsIContent *aPrevSibling,
+                          bool aUpdateNative = true);
+
+    void AppendChild(mozilla::UniquePtr<nsMenuObject> aChild,
+                     bool aUpdateNative = true);
+
+private:
+    ChildTArray mChildren;
+};
+
+#endif /* __nsMenuContainer_h__ */
diff --git a/widget/gtk/nsMenuItem.cpp b/widget/gtk/nsMenuItem.cpp
new file mode 100644
index 0000000000000..3e9d04a8ae46f
--- /dev/null
+++ b/widget/gtk/nsMenuItem.cpp
@@ -0,0 +1,766 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/dom/XULCommandEvent.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
+#include "nsContentUtils.h"
+#include "nsCRT.h"
+#include "nsGkAtoms.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGtkUtils.h"
+#include "nsIContent.h"
+#include "nsIRunnable.h"
+#include "nsQueryObject.h"
+#include "nsReadableUtils.h"
+#include "nsString.h"
+#include "nsThreadUtils.h"
+
+#include "nsMenu.h"
+#include "nsMenuBar.h"
+#include "nsMenuContainer.h"
+#include "nsNativeMenuDocListener.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#include "nsMenuItem.h"
+
+using namespace mozilla;
+
+struct KeyCodeData {
+    const char* str;
+    size_t strlength;
+    uint32_t keycode;
+};
+
+static struct KeyCodeData gKeyCodes[] = {
+#define NS_DEFINE_VK(aDOMKeyName, aDOMKeyCode) \
+  { #aDOMKeyName, sizeof(#aDOMKeyName) - 1, aDOMKeyCode },
+#include "mozilla/VirtualKeyCodeList.h"
+#undef NS_DEFINE_VK
+  { nullptr, 0, 0 }
+};
+
+struct KeyPair {
+    uint32_t DOMKeyCode;
+    guint GDKKeyval;
+};
+
+//
+// Netscape keycodes are defined in widget/public/nsGUIEvent.h
+// GTK keycodes are defined in <gdk/gdkkeysyms.h>
+//
+static const KeyPair gKeyPairs[] = {
+    { NS_VK_CANCEL,     GDK_Cancel },
+    { NS_VK_BACK,       GDK_BackSpace },
+    { NS_VK_TAB,        GDK_Tab },
+    { NS_VK_TAB,        GDK_ISO_Left_Tab },
+    { NS_VK_CLEAR,      GDK_Clear },
+    { NS_VK_RETURN,     GDK_Return },
+    { NS_VK_SHIFT,      GDK_Shift_L },
+    { NS_VK_SHIFT,      GDK_Shift_R },
+    { NS_VK_SHIFT,      GDK_Shift_Lock },
+    { NS_VK_CONTROL,    GDK_Control_L },
+    { NS_VK_CONTROL,    GDK_Control_R },
+    { NS_VK_ALT,        GDK_Alt_L },
+    { NS_VK_ALT,        GDK_Alt_R },
+    { NS_VK_META,       GDK_Meta_L },
+    { NS_VK_META,       GDK_Meta_R },
+
+    // Assume that Super or Hyper is always mapped to physical Win key.
+    { NS_VK_WIN,        GDK_Super_L },
+    { NS_VK_WIN,        GDK_Super_R },
+    { NS_VK_WIN,        GDK_Hyper_L },
+    { NS_VK_WIN,        GDK_Hyper_R },
+
+    // GTK's AltGraph key is similar to Mac's Option (Alt) key.  However,
+    // unfortunately, browsers on Mac are using NS_VK_ALT for it even though
+    // it's really different from Alt key on Windows.
+    // On the other hand, GTK's AltGrapsh keys are really different from
+    // Alt key.  However, there is no AltGrapsh key on Windows.  On Windows,
+    // both Ctrl and Alt keys are pressed internally when AltGr key is pressed.
+    // For some languages' users, AltGraph key is important, so, web
+    // applications on such locale may want to know AltGraph key press.
+    // Therefore, we should map AltGr keycode for them only on GTK.
+    { NS_VK_ALTGR,      GDK_ISO_Level3_Shift },
+    { NS_VK_ALTGR,      GDK_ISO_Level5_Shift },
+    // We assume that Mode_switch is always used for level3 shift.
+    { NS_VK_ALTGR,      GDK_Mode_switch },
+
+    { NS_VK_PAUSE,      GDK_Pause },
+    { NS_VK_CAPS_LOCK,  GDK_Caps_Lock },
+    { NS_VK_KANA,       GDK_Kana_Lock },
+    { NS_VK_KANA,       GDK_Kana_Shift },
+    { NS_VK_HANGUL,     GDK_Hangul },
+    // { NS_VK_JUNJA,      GDK_XXX },
+    // { NS_VK_FINAL,      GDK_XXX },
+    { NS_VK_HANJA,      GDK_Hangul_Hanja },
+    { NS_VK_KANJI,      GDK_Kanji },
+    { NS_VK_ESCAPE,     GDK_Escape },
+    { NS_VK_CONVERT,    GDK_Henkan },
+    { NS_VK_NONCONVERT, GDK_Muhenkan },
+    // { NS_VK_ACCEPT,     GDK_XXX },
+    // { NS_VK_MODECHANGE, GDK_XXX },
+    { NS_VK_SPACE,      GDK_space },
+    { NS_VK_PAGE_UP,    GDK_Page_Up },
+    { NS_VK_PAGE_DOWN,  GDK_Page_Down },
+    { NS_VK_END,        GDK_End },
+    { NS_VK_HOME,       GDK_Home },
+    { NS_VK_LEFT,       GDK_Left },
+    { NS_VK_UP,         GDK_Up },
+    { NS_VK_RIGHT,      GDK_Right },
+    { NS_VK_DOWN,       GDK_Down },
+    { NS_VK_SELECT,     GDK_Select },
+    { NS_VK_PRINT,      GDK_Print },
+    { NS_VK_EXECUTE,    GDK_Execute },
+    { NS_VK_PRINTSCREEN, GDK_Print },
+    { NS_VK_INSERT,     GDK_Insert },
+    { NS_VK_DELETE,     GDK_Delete },
+    { NS_VK_HELP,       GDK_Help },
+
+    // keypad keys
+    { NS_VK_LEFT,       GDK_KP_Left },
+    { NS_VK_RIGHT,      GDK_KP_Right },
+    { NS_VK_UP,         GDK_KP_Up },
+    { NS_VK_DOWN,       GDK_KP_Down },
+    { NS_VK_PAGE_UP,    GDK_KP_Page_Up },
+    // Not sure what these are
+    //{ NS_VK_,       GDK_KP_Prior },
+    //{ NS_VK_,        GDK_KP_Next },
+    { NS_VK_CLEAR,      GDK_KP_Begin }, // Num-unlocked 5
+    { NS_VK_PAGE_DOWN,  GDK_KP_Page_Down },
+    { NS_VK_HOME,       GDK_KP_Home },
+    { NS_VK_END,        GDK_KP_End },
+    { NS_VK_INSERT,     GDK_KP_Insert },
+    { NS_VK_DELETE,     GDK_KP_Delete },
+    { NS_VK_RETURN,     GDK_KP_Enter },
+
+    { NS_VK_NUM_LOCK,   GDK_Num_Lock },
+    { NS_VK_SCROLL_LOCK,GDK_Scroll_Lock },
+
+    // Function keys
+    { NS_VK_F1,         GDK_F1 },
+    { NS_VK_F2,         GDK_F2 },
+    { NS_VK_F3,         GDK_F3 },
+    { NS_VK_F4,         GDK_F4 },
+    { NS_VK_F5,         GDK_F5 },
+    { NS_VK_F6,         GDK_F6 },
+    { NS_VK_F7,         GDK_F7 },
+    { NS_VK_F8,         GDK_F8 },
+    { NS_VK_F9,         GDK_F9 },
+    { NS_VK_F10,        GDK_F10 },
+    { NS_VK_F11,        GDK_F11 },
+    { NS_VK_F12,        GDK_F12 },
+    { NS_VK_F13,        GDK_F13 },
+    { NS_VK_F14,        GDK_F14 },
+    { NS_VK_F15,        GDK_F15 },
+    { NS_VK_F16,        GDK_F16 },
+    { NS_VK_F17,        GDK_F17 },
+    { NS_VK_F18,        GDK_F18 },
+    { NS_VK_F19,        GDK_F19 },
+    { NS_VK_F20,        GDK_F20 },
+    { NS_VK_F21,        GDK_F21 },
+    { NS_VK_F22,        GDK_F22 },
+    { NS_VK_F23,        GDK_F23 },
+    { NS_VK_F24,        GDK_F24 },
+
+    // context menu key, keysym 0xff67, typically keycode 117 on 105-key (Microsoft)
+    // x86 keyboards, located between right 'Windows' key and right Ctrl key
+    { NS_VK_CONTEXT_MENU, GDK_Menu },
+    { NS_VK_SLEEP,      GDK_Sleep },
+
+    { NS_VK_ATTN,       GDK_3270_Attn },
+    { NS_VK_CRSEL,      GDK_3270_CursorSelect },
+    { NS_VK_EXSEL,      GDK_3270_ExSelect },
+    { NS_VK_EREOF,      GDK_3270_EraseEOF },
+    { NS_VK_PLAY,       GDK_3270_Play },
+    //{ NS_VK_ZOOM,       GDK_XXX },
+    { NS_VK_PA1,        GDK_3270_PA1 },
+};
+
+static guint
+ConvertGeckoKeyNameToGDKKeyval(nsAString& aKeyName)
+{
+    NS_ConvertUTF16toUTF8 keyName(aKeyName);
+    ToUpperCase(keyName); // We want case-insensitive comparison with data
+                          // stored as uppercase.
+
+    uint32_t keyCode = 0;
+
+    uint32_t keyNameLength = keyName.Length();
+    const char* keyNameStr = keyName.get();
+    for (uint16_t i = 0; i < std::size(gKeyCodes); ++i) {
+        if (keyNameLength == gKeyCodes[i].strlength &&
+            !nsCRT::strcmp(gKeyCodes[i].str, keyNameStr)) {
+            keyCode = gKeyCodes[i].keycode;
+            break;
+        }
+    }
+
+    // First, try to handle alphanumeric input, not listed in nsKeycodes:
+    // most likely, more letters will be getting typed in than things in
+    // the key list, so we will look through these first.
+
+    if (keyCode >= NS_VK_A && keyCode <= NS_VK_Z) {
+        // gdk and DOM both use the ASCII codes for these keys.
+        return keyCode;
+    }
+
+    // numbers
+    if (keyCode >= NS_VK_0 && keyCode <= NS_VK_9) {
+        // gdk and DOM both use the ASCII codes for these keys.
+        return keyCode - NS_VK_0 + GDK_0;
+    }
+
+    switch (keyCode) {
+        // keys in numpad
+        case NS_VK_MULTIPLY:  return GDK_KP_Multiply;
+        case NS_VK_ADD:       return GDK_KP_Add;
+        case NS_VK_SEPARATOR: return GDK_KP_Separator;
+        case NS_VK_SUBTRACT:  return GDK_KP_Subtract;
+        case NS_VK_DECIMAL:   return GDK_KP_Decimal;
+        case NS_VK_DIVIDE:    return GDK_KP_Divide;
+        case NS_VK_NUMPAD0:   return GDK_KP_0;
+        case NS_VK_NUMPAD1:   return GDK_KP_1;
+        case NS_VK_NUMPAD2:   return GDK_KP_2;
+        case NS_VK_NUMPAD3:   return GDK_KP_3;
+        case NS_VK_NUMPAD4:   return GDK_KP_4;
+        case NS_VK_NUMPAD5:   return GDK_KP_5;
+        case NS_VK_NUMPAD6:   return GDK_KP_6;
+        case NS_VK_NUMPAD7:   return GDK_KP_7;
+        case NS_VK_NUMPAD8:   return GDK_KP_8;
+        case NS_VK_NUMPAD9:   return GDK_KP_9;
+        // other prinable keys
+        case NS_VK_SPACE:               return GDK_space;
+        case NS_VK_COLON:               return GDK_colon;
+        case NS_VK_SEMICOLON:           return GDK_semicolon;
+        case NS_VK_LESS_THAN:           return GDK_less;
+        case NS_VK_EQUALS:              return GDK_equal;
+        case NS_VK_GREATER_THAN:        return GDK_greater;
+        case NS_VK_QUESTION_MARK:       return GDK_question;
+        case NS_VK_AT:                  return GDK_at;
+        case NS_VK_CIRCUMFLEX:          return GDK_asciicircum;
+        case NS_VK_EXCLAMATION:         return GDK_exclam;
+        case NS_VK_DOUBLE_QUOTE:        return GDK_quotedbl;
+        case NS_VK_HASH:                return GDK_numbersign;
+        case NS_VK_DOLLAR:              return GDK_dollar;
+        case NS_VK_PERCENT:             return GDK_percent;
+        case NS_VK_AMPERSAND:           return GDK_ampersand;
+        case NS_VK_UNDERSCORE:          return GDK_underscore;
+        case NS_VK_OPEN_PAREN:          return GDK_parenleft;
+        case NS_VK_CLOSE_PAREN:         return GDK_parenright;
+        case NS_VK_ASTERISK:            return GDK_asterisk;
+        case NS_VK_PLUS:                return GDK_plus;
+        case NS_VK_PIPE:                return GDK_bar;
+        case NS_VK_HYPHEN_MINUS:        return GDK_minus;
+        case NS_VK_OPEN_CURLY_BRACKET:  return GDK_braceleft;
+        case NS_VK_CLOSE_CURLY_BRACKET: return GDK_braceright;
+        case NS_VK_TILDE:               return GDK_asciitilde;
+        case NS_VK_COMMA:               return GDK_comma;
+        case NS_VK_PERIOD:              return GDK_period;
+        case NS_VK_SLASH:               return GDK_slash;
+        case NS_VK_BACK_QUOTE:          return GDK_grave;
+        case NS_VK_OPEN_BRACKET:        return GDK_bracketleft;
+        case NS_VK_BACK_SLASH:          return GDK_backslash;
+        case NS_VK_CLOSE_BRACKET:       return GDK_bracketright;
+        case NS_VK_QUOTE:               return GDK_apostrophe;
+    }
+
+    // misc other things
+    for (uint32_t i = 0; i < std::size(gKeyPairs); ++i) {
+        if (gKeyPairs[i].DOMKeyCode == keyCode) {
+            return gKeyPairs[i].GDKKeyval;
+        }
+    }
+
+    return 0;
+}
+
+class nsMenuItemUncheckSiblingsRunnable final : public Runnable
+{
+public:
+    NS_IMETHODIMP Run()
+    {
+        if (mMenuItem) {
+            static_cast<nsMenuItem *>(mMenuItem.get())->UncheckSiblings();
+        }
+        return NS_OK;
+    }
+
+    nsMenuItemUncheckSiblingsRunnable(nsMenuItem *aMenuItem) :
+        Runnable("nsMenuItemUncheckSiblingsRunnable"),
+        mMenuItem(aMenuItem) { };
+
+private:
+    nsWeakMenuObject mMenuItem;
+};
+
+bool
+nsMenuItem::IsCheckboxOrRadioItem() const
+{
+    return mType == eMenuItemType_Radio ||
+           mType == eMenuItemType_CheckBox;
+}
+
+/* static */ void
+nsMenuItem::item_activated_cb(DbusmenuMenuitem *menuitem,
+                              guint timestamp,
+                              gpointer user_data)
+{
+    nsMenuItem *item = static_cast<nsMenuItem *>(user_data);
+    item->Activate(timestamp);
+}
+
+void
+nsMenuItem::Activate(uint32_t aTimestamp)
+{
+    GdkWindow *window = gtk_widget_get_window(MenuBar()->TopLevelWindow());
+    gdk_x11_window_set_user_time(
+        window, std::min(aTimestamp, gdk_x11_get_server_time(window)));
+
+    // We do this to avoid mutating our view of the menu until
+    // after we have finished
+    nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker;
+
+    if (!ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                 nsGkAtoms::autocheck,
+                                                 nsGkAtoms::_false,
+                                                 eCaseMatters) &&
+        (mType == eMenuItemType_CheckBox ||
+         (mType == eMenuItemType_Radio && !mIsChecked))) {
+        ContentNode()->AsElement()->SetAttr(kNameSpaceID_None,
+                                            nsGkAtoms::checked,
+                                            mIsChecked ?
+                                                u"false"_ns
+                                                : u"true"_ns,
+                                            true);
+    }
+
+    dom::Document *doc = ContentNode()->OwnerDoc();
+    ErrorResult rv;
+    RefPtr<dom::Event> event =
+        doc->CreateEvent(u"xulcommandevent"_ns,
+                         dom::CallerType::System, rv);
+    if (!rv.Failed()) {
+        RefPtr<dom::XULCommandEvent> command = event->AsXULCommandEvent();
+        if (command) {
+            command->InitCommandEvent(u"command"_ns, true, true,
+                                      nsGlobalWindowInner::Cast(doc->GetInnerWindow()),
+                                      0, false, false, false, false, 0, nullptr, 0, rv);
+            if (!rv.Failed()) {
+                event->SetTrusted(true);
+                ContentNode()->DispatchEvent(*event, rv);
+                if (rv.Failed()) {
+                    NS_WARNING("Failed to dispatch event");
+                    rv.SuppressException();
+                }
+            } else {
+                NS_WARNING("Failed to initialize command event");
+                rv.SuppressException();
+            }
+        }
+    } else {
+        NS_WARNING("CreateEvent failed");
+        rv.SuppressException();
+    }
+
+    // This kinda sucks, but Unity doesn't send a closed event
+    // after activating a menuitem
+    nsMenuObject *ancestor = Parent();
+    while (ancestor && ancestor->Type() == eType_Menu) {
+        static_cast<nsMenu *>(ancestor)->OnClose();
+        ancestor = ancestor->Parent();
+    }
+}
+
+void
+nsMenuItem::CopyAttrFromNodeIfExists(nsIContent *aContent, nsAtom *aAttribute)
+{
+    nsAutoString value;
+    if (aContent->AsElement()->GetAttr(kNameSpaceID_None, aAttribute, value)) {
+        ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, aAttribute,
+                                            value, true);
+    }
+}
+
+void
+nsMenuItem::UpdateState()
+{
+    if (!IsCheckboxOrRadioItem()) {
+        return;
+    }
+
+    mIsChecked = ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                         nsGkAtoms::checked,
+                                                         nsGkAtoms::_true,
+                                                         eCaseMatters);
+    dbusmenu_menuitem_property_set_int(GetNativeData(),
+                                       DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,
+                                       mIsChecked ?
+                                         DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED :
+                                         DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED);
+}
+
+void
+nsMenuItem::UpdateTypeAndState()
+{
+    static mozilla::dom::Element::AttrValuesArray attrs[] =
+        { nsGkAtoms::checkbox, nsGkAtoms::radio, nullptr };
+    int32_t type = ContentNode()->AsElement()->FindAttrValueIn(kNameSpaceID_None,
+                                                               nsGkAtoms::type,
+                                                               attrs, eCaseMatters);
+
+    if (type >= 0 && type < 2) {
+        if (type == 0) {
+            dbusmenu_menuitem_property_set(GetNativeData(),
+                                           DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
+                                           DBUSMENU_MENUITEM_TOGGLE_CHECK);
+            mType = eMenuItemType_CheckBox;
+        } else if (type == 1) {
+            dbusmenu_menuitem_property_set(GetNativeData(),
+                                           DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
+                                           DBUSMENU_MENUITEM_TOGGLE_RADIO);
+            mType = eMenuItemType_Radio;
+        }
+
+        UpdateState();
+    } else {
+        dbusmenu_menuitem_property_remove(GetNativeData(),
+                                          DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
+        dbusmenu_menuitem_property_remove(GetNativeData(),
+                                          DBUSMENU_MENUITEM_PROP_TOGGLE_STATE);
+        mType = eMenuItemType_Normal;
+    }
+}
+
+void
+nsMenuItem::UpdateAccel()
+{
+    dom::Document *doc = ContentNode()->GetUncomposedDoc();
+    if (doc) {
+        nsCOMPtr<nsIContent> oldKeyContent;
+        oldKeyContent.swap(mKeyContent);
+
+        nsAutoString key;
+        ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::key,
+                                            key);
+        if (!key.IsEmpty()) {
+            mKeyContent = doc->GetElementById(key);
+        }
+
+        if (mKeyContent != oldKeyContent) {
+            if (oldKeyContent) {
+                DocListener()->UnregisterForContentChanges(oldKeyContent);
+            }
+            if (mKeyContent) {
+                DocListener()->RegisterForContentChanges(mKeyContent, this);
+            }
+        }
+    }
+
+    if (!mKeyContent) {
+        dbusmenu_menuitem_property_remove(GetNativeData(),
+                                          DBUSMENU_MENUITEM_PROP_SHORTCUT);
+        return;
+    }
+
+    nsAutoString modifiers;
+    mKeyContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers,
+                                      modifiers);
+
+    uint32_t modifier = 0;
+
+    if (!modifiers.IsEmpty()) {
+        char* str = ToNewUTF8String(modifiers);
+        char *token = strtok(str, ", \t");
+        while(token) {
+            if (nsCRT::strcmp(token, "shift") == 0) {
+                modifier |= GDK_SHIFT_MASK;
+            } else if (nsCRT::strcmp(token, "alt") == 0) {
+                modifier |= GDK_MOD1_MASK;
+            } else if (nsCRT::strcmp(token, "meta") == 0) {
+                modifier |= GDK_META_MASK;
+            } else if (nsCRT::strcmp(token, "control") == 0) {
+                modifier |= GDK_CONTROL_MASK;
+            } else if (nsCRT::strcmp(token, "accel") == 0) {
+                int32_t accel = Preferences::GetInt("ui.key.accelKey");
+                if (accel == dom::KeyboardEvent_Binding::DOM_VK_META) {
+                    modifier |= GDK_META_MASK;
+                } else if (accel == dom::KeyboardEvent_Binding::DOM_VK_ALT) {
+                    modifier |= GDK_MOD1_MASK;
+                } else {
+                    modifier |= GDK_CONTROL_MASK;
+                }
+            }
+
+            token = strtok(nullptr, ", \t");
+        }
+
+        free(str);
+    }
+
+    nsAutoString keyStr;
+    mKeyContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::key,
+                                      keyStr);
+
+    guint key = 0;
+    if (!keyStr.IsEmpty()) {
+        key = gdk_unicode_to_keyval(*keyStr.BeginReading());
+    }
+
+    if (key == 0) {
+        mKeyContent->AsElement()->GetAttr(kNameSpaceID_None,
+                                          nsGkAtoms::keycode, keyStr);
+        if (!keyStr.IsEmpty()) {
+            key = ConvertGeckoKeyNameToGDKKeyval(keyStr);
+        }
+    }
+
+    if (key == 0) {
+        key = GDK_VoidSymbol;
+    }
+
+    if (key != GDK_VoidSymbol) {
+        dbusmenu_menuitem_property_set_shortcut(GetNativeData(), key,
+                                                static_cast<GdkModifierType>(modifier));
+    } else {
+        dbusmenu_menuitem_property_remove(GetNativeData(),
+                                          DBUSMENU_MENUITEM_PROP_SHORTCUT);
+    }
+}
+
+nsMenuBar*
+nsMenuItem::MenuBar()
+{
+    nsMenuObject *tmp = this;
+    while (tmp->Parent()) {
+        tmp = tmp->Parent();
+    }
+
+    MOZ_ASSERT(tmp->Type() == eType_MenuBar, "The top-level should be a menubar");
+
+    return static_cast<nsMenuBar *>(tmp);
+}
+
+void
+nsMenuItem::UncheckSiblings()
+{
+    if (!ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                 nsGkAtoms::type,
+                                                 nsGkAtoms::radio,
+                                                 eCaseMatters)) {
+        // If we're not a radio button, we don't care
+        return;
+    }
+
+    nsAutoString name;
+    ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::name,
+                                        name);
+
+    nsIContent *parent = ContentNode()->GetParent();
+    if (!parent) {
+        return;
+    }
+
+    uint32_t count = parent->GetChildCount();
+    for (uint32_t i = 0; i < count; ++i) {
+        nsIContent *sibling = parent->GetChildAt_Deprecated(i);
+
+        if (sibling->IsComment()) {
+            continue;
+        }
+
+        nsAutoString otherName;
+        sibling->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::name,
+                                      otherName);
+
+        if (sibling != ContentNode() && otherName == name &&
+            sibling->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                              nsGkAtoms::type,
+                                              nsGkAtoms::radio,
+                                              eCaseMatters)) {
+            sibling->AsElement()->UnsetAttr(kNameSpaceID_None,
+                                            nsGkAtoms::checked, true);
+        }
+    }
+}
+
+void
+nsMenuItem::InitializeNativeData()
+{
+    g_signal_connect(G_OBJECT(GetNativeData()),
+                     DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                     G_CALLBACK(item_activated_cb), this);
+    mNeedsUpdate = true;
+}
+
+void
+nsMenuItem::UpdateContentAttributes()
+{
+    dom::Document *doc = ContentNode()->GetUncomposedDoc();
+    if (!doc) {
+        return;
+    }
+
+    nsAutoString command;
+    ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::command,
+                                        command);
+    if (command.IsEmpty()) {
+        return;
+    }
+
+    nsCOMPtr<nsIContent> commandContent = doc->GetElementById(command);
+    if (!commandContent) {
+        return;
+    }
+
+    if (commandContent->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                 nsGkAtoms::disabled,
+                                                 nsGkAtoms::_true,
+                                                 eCaseMatters)) {
+        ContentNode()->AsElement()->SetAttr(kNameSpaceID_None,
+                                            nsGkAtoms::disabled,
+                                            u"true"_ns, true);
+    } else {
+        ContentNode()->AsElement()->UnsetAttr(kNameSpaceID_None,
+                                              nsGkAtoms::disabled, true);
+    }
+
+    CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::checked);
+    CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::accesskey);
+    CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::label);
+    CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::hidden);
+}
+
+void
+nsMenuItem::Update(const ComputedStyle *aComputedStyle)
+{
+    if (mNeedsUpdate) {
+        mNeedsUpdate = false;
+
+        UpdateTypeAndState();
+        UpdateAccel();
+        UpdateLabel();
+        UpdateSensitivity();
+    }
+
+    UpdateVisibility(aComputedStyle);
+    UpdateIcon(aComputedStyle);
+}
+
+bool
+nsMenuItem::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const
+{
+    return nsCRT::strcmp(dbusmenu_menuitem_property_get(aNativeData,
+                                                        DBUSMENU_MENUITEM_PROP_TYPE),
+                         "separator") != 0;
+}
+
+nsMenuObject::PropertyFlags
+nsMenuItem::SupportedProperties() const
+{
+    return static_cast<nsMenuObject::PropertyFlags>(
+        nsMenuObject::ePropLabel |
+        nsMenuObject::ePropEnabled |
+        nsMenuObject::ePropVisible |
+        nsMenuObject::ePropIconData |
+        nsMenuObject::ePropShortcut |
+        nsMenuObject::ePropToggleType |
+        nsMenuObject::ePropToggleState
+    );
+}
+
+void
+nsMenuItem::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute)
+{
+    MOZ_ASSERT(aContent == ContentNode() || aContent == mKeyContent,
+               "Received an event that wasn't meant for us!");
+
+    if (aContent == ContentNode() && aAttribute == nsGkAtoms::checked &&
+        aContent->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                           nsGkAtoms::checked,
+                                           nsGkAtoms::_true, eCaseMatters)) {
+        nsContentUtils::AddScriptRunner(
+            new nsMenuItemUncheckSiblingsRunnable(this));
+    }
+
+    if (mNeedsUpdate) {
+        return;
+    }
+
+    if (!Parent()->IsBeingDisplayed()) {
+        mNeedsUpdate = true;
+        return;
+    }
+
+    if (aContent == ContentNode()) {
+        if (aAttribute == nsGkAtoms::key) {
+            UpdateAccel();
+        } else if (aAttribute == nsGkAtoms::label ||
+                   aAttribute == nsGkAtoms::accesskey ||
+                   aAttribute == nsGkAtoms::crop) {
+            UpdateLabel();
+        } else if (aAttribute == nsGkAtoms::disabled) {
+            UpdateSensitivity();
+        } else if (aAttribute == nsGkAtoms::type) {
+            UpdateTypeAndState();
+        } else if (aAttribute == nsGkAtoms::checked) {
+            UpdateState();
+        } else if (aAttribute == nsGkAtoms::hidden ||
+                   aAttribute == nsGkAtoms::collapsed) {
+            RefPtr<const ComputedStyle> style = GetComputedStyle();
+            UpdateVisibility(style);
+        } else if (aAttribute == nsGkAtoms::image) {
+            RefPtr<const ComputedStyle> style = GetComputedStyle();
+            UpdateIcon(style);
+        }
+    } else if (aContent == mKeyContent &&
+               (aAttribute == nsGkAtoms::key ||
+                aAttribute == nsGkAtoms::keycode ||
+                aAttribute == nsGkAtoms::modifiers)) {
+        UpdateAccel();
+    }
+}
+
+nsMenuItem::nsMenuItem(nsMenuContainer *aParent, nsIContent *aContent) :
+    nsMenuObject(aParent, aContent),
+    mType(eMenuItemType_Normal),
+    mIsChecked(false),
+    mNeedsUpdate(false)
+{
+    MOZ_COUNT_CTOR(nsMenuItem);
+}
+
+nsMenuItem::~nsMenuItem()
+{
+    if (DocListener() && mKeyContent) {
+        DocListener()->UnregisterForContentChanges(mKeyContent);
+    }
+
+    if (GetNativeData()) {
+        g_signal_handlers_disconnect_by_func(GetNativeData(),
+                                             FuncToGpointer(item_activated_cb),
+                                             this);
+    }
+
+    MOZ_COUNT_DTOR(nsMenuItem);
+}
+
+nsMenuObject::EType
+nsMenuItem::Type() const
+{
+    return eType_MenuItem;
+}
diff --git a/widget/gtk/nsMenuItem.h b/widget/gtk/nsMenuItem.h
new file mode 100644
index 0000000000000..c621b4e223f17
--- /dev/null
+++ b/widget/gtk/nsMenuItem.h
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenuItem_h__
+#define __nsMenuItem_h__
+
+#include "mozilla/Attributes.h"
+#include "nsCOMPtr.h"
+
+#include "nsDbusmenu.h"
+#include "nsMenuObject.h"
+
+#include <glib.h>
+
+class nsAtom;
+class nsIContent;
+class nsMenuBar;
+class nsMenuContainer;
+
+/*
+ * This class represents 3 main classes of menuitems: labels, checkboxes and
+ * radio buttons (with/without an icon)
+ */
+class nsMenuItem final : public nsMenuObject
+{
+public:
+    nsMenuItem(nsMenuContainer *aParent, nsIContent *aContent);
+    ~nsMenuItem() override;
+
+    nsMenuObject::EType Type() const override;
+
+private:
+    friend class nsMenuItemUncheckSiblingsRunnable;
+
+    enum {
+        eMenuItemFlag_ToggleState = (1 << 0)
+    };
+
+    enum EMenuItemType {
+        eMenuItemType_Normal,
+        eMenuItemType_Radio,
+        eMenuItemType_CheckBox
+    };
+
+    bool IsCheckboxOrRadioItem() const;
+
+    static void item_activated_cb(DbusmenuMenuitem *menuitem,
+                                  guint timestamp,
+                                  gpointer user_data);
+    void Activate(uint32_t aTimestamp);
+
+    void CopyAttrFromNodeIfExists(nsIContent *aContent, nsAtom *aAtom);
+    void UpdateState();
+    void UpdateTypeAndState();
+    void UpdateAccel();
+    nsMenuBar* MenuBar();
+    void UncheckSiblings();
+
+    void InitializeNativeData() override;
+    void UpdateContentAttributes() override;
+    void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+    bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override;
+    nsMenuObject::PropertyFlags SupportedProperties() const override;
+
+    void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override;
+
+    EMenuItemType mType;
+
+    bool mIsChecked;
+
+    bool mNeedsUpdate;
+
+    nsCOMPtr<nsIContent> mKeyContent;
+};
+
+#endif /* __nsMenuItem_h__ */
diff --git a/widget/gtk/nsMenuObject.cpp b/widget/gtk/nsMenuObject.cpp
new file mode 100644
index 0000000000000..4d46f71c85fca
--- /dev/null
+++ b/widget/gtk/nsMenuObject.cpp
@@ -0,0 +1,654 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ImageOps.h"
+#include "imgIContainer.h"
+#include "imgINotificationObserver.h"
+#include "imgLoader.h"
+#include "imgRequestProxy.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/PresShellInlines.h"
+#include "mozilla/GRefPtr.h"
+#include "nsAttrValue.h"
+#include "nsComputedDOMStyle.h"
+#include "nsContentUtils.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+#include "nsIContentPolicy.h"
+#include "nsILoadGroup.h"
+#include "nsImageToPixbuf.h"
+#include "nsIURI.h"
+#include "nsNetUtil.h"
+#include "nsPresContext.h"
+#include "nsRect.h"
+#include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsStyleConsts.h"
+#include "nsStyleStruct.h"
+#include "nsUnicharUtils.h"
+
+#include "nsMenuContainer.h"
+#include "nsNativeMenuDocListener.h"
+
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <pango/pango.h>
+
+#include "nsMenuObject.h"
+
+// X11's None clashes with StyleDisplay::None
+#include "X11UndefineNone.h"
+
+#undef None
+
+using namespace mozilla;
+using mozilla::image::ImageOps;
+
+#define MAX_WIDTH 350000
+
+const char *gPropertyStrings[] = {
+#define DBUSMENU_PROPERTY(e, s, b) s,
+    DBUSMENU_PROPERTIES
+#undef DBUSMENU_PROPERTY
+    nullptr
+};
+
+nsWeakMenuObject* nsWeakMenuObject::sHead;
+PangoLayout* gPangoLayout = nullptr;
+
+class nsMenuObjectIconLoader final : public imgINotificationObserver
+{
+public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_IMGINOTIFICATIONOBSERVER
+
+    nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner) { };
+
+    void LoadIcon(const ComputedStyle *aComputedStyle);
+    void Destroy();
+
+private:
+    ~nsMenuObjectIconLoader() { };
+
+    nsMenuObject *mOwner;
+    RefPtr<imgRequestProxy> mImageRequest;
+    nsCOMPtr<nsIURI> mURI;
+};
+
+NS_IMPL_ISUPPORTS(nsMenuObjectIconLoader, imgINotificationObserver)
+
+void
+nsMenuObjectIconLoader::Notify(imgIRequest *aProxy,
+                               int32_t aType, const nsIntRect *aRect)
+{
+    if (!mOwner) {
+        return;
+    }
+
+    if (aProxy != mImageRequest) {
+        return;
+    }
+
+    if (aType == imgINotificationObserver::LOAD_COMPLETE) {
+        uint32_t status = imgIRequest::STATUS_ERROR;
+        if (NS_FAILED(mImageRequest->GetImageStatus(&status)) ||
+            (status & imgIRequest::STATUS_ERROR)) {
+            mImageRequest->Cancel(NS_BINDING_ABORTED);
+            mImageRequest = nullptr;
+            return;
+        }
+
+        nsCOMPtr<imgIContainer> image;
+        mImageRequest->GetImage(getter_AddRefs(image));
+        MOZ_ASSERT(image);
+
+        // Ask the image to decode at its intrinsic size.
+        int32_t width = 0, height = 0;
+        image->GetWidth(&width);
+        image->GetHeight(&height);
+        image->RequestDecodeForSize(nsIntSize(width, height), imgIContainer::FLAG_NONE);
+        return;
+    }
+
+    if (aType == imgINotificationObserver::DECODE_COMPLETE) {
+        mImageRequest->Cancel(NS_BINDING_ABORTED);
+        mImageRequest = nullptr;
+        return;
+    }
+
+    if (aType != imgINotificationObserver::FRAME_COMPLETE) {
+        return;
+    }
+
+    nsCOMPtr<imgIContainer> img;
+    mImageRequest->GetImage(getter_AddRefs(img));
+    if (!img) {
+        return;
+    }
+
+    int32_t width, height;
+    img->GetWidth(&width);
+    img->GetHeight(&height);
+
+    if (width <= 0 || height <= 0) {
+        mOwner->ClearIcon();
+        return;
+    }
+
+    if (width > 100 || height > 100) {
+        // The icon data needs to go across DBus. Make sure the icon
+        // data isn't too large, else our connection gets terminated and
+        // GDbus helpfully aborts the application. Thank you :)
+        NS_WARNING("Icon data too large");
+        mOwner->ClearIcon();
+        return;
+    }
+
+    RefPtr<GdkPixbuf> pixbuf = nsImageToPixbuf::ImageToPixbuf(img);
+    if (pixbuf) {
+        dbusmenu_menuitem_property_set_image(mOwner->GetNativeData(),
+                                             DBUSMENU_MENUITEM_PROP_ICON_DATA,
+                                             pixbuf);
+    }
+
+    return;
+}
+
+void
+nsMenuObjectIconLoader::LoadIcon(const ComputedStyle *aComputedStyle)
+{
+    dom::Document *doc = mOwner->ContentNode()->OwnerDoc();
+
+    nsCOMPtr<nsIURI> uri;
+    imgRequestProxy *imageRequest = nullptr;
+
+    nsAutoString uriString;
+    if (mOwner->ContentNode()->AsElement()->GetAttr(kNameSpaceID_None,
+                                                    nsGkAtoms::image,
+                                                    uriString)) {
+        NS_NewURI(getter_AddRefs(uri), uriString);
+    } else {
+        PresShell *shell = doc->GetPresShell();
+        if (!shell) {
+            return;
+        }
+
+        nsPresContext *pc = shell->GetPresContext();
+        if (!pc || !aComputedStyle) {
+            return;
+        }
+
+        const nsStyleList *list = aComputedStyle->StyleList();
+        imageRequest = list->mListStyleImage.GetImageRequest();
+        if (imageRequest) {
+            imageRequest->GetURI(getter_AddRefs(uri));
+        }
+    }
+
+    if (!uri) {
+        mOwner->ClearIcon();
+        mURI = nullptr;
+
+        if (mImageRequest) {
+            mImageRequest->Cancel(NS_BINDING_ABORTED);
+            mImageRequest = nullptr;
+        }
+
+        return;
+    }
+
+    bool same;
+    if (mURI && NS_SUCCEEDED(mURI->Equals(uri, &same)) && same &&
+        !imageRequest) {
+        return;
+    }
+
+    if (mImageRequest) {
+        mImageRequest->Cancel(NS_BINDING_ABORTED);
+        mImageRequest = nullptr;
+    }
+
+    mURI = uri;
+
+    if (imageRequest) {
+        imageRequest->Clone(this, nullptr, getter_AddRefs(mImageRequest));
+    } else {
+        nsCOMPtr<nsILoadGroup> loadGroup = doc->GetDocumentLoadGroup();
+        RefPtr<imgLoader> loader =
+            nsContentUtils::GetImgLoaderForDocument(doc);
+        if (!loader || !loadGroup) {
+            NS_WARNING("Failed to get loader or load group for image load");
+            return;
+        }
+
+        loader->LoadImage(uri, nullptr, nullptr,
+                          nullptr, 0, loadGroup, this, nullptr, nullptr,
+                          nsIRequest::LOAD_NORMAL, nullptr,
+                          nsIContentPolicy::TYPE_IMAGE, EmptyString(),
+                          false, false, 0, dom::FetchPriority::Auto,
+                          getter_AddRefs(mImageRequest));
+    }
+}
+
+void
+nsMenuObjectIconLoader::Destroy()
+{
+    if (mImageRequest) {
+        mImageRequest->CancelAndForgetObserver(NS_BINDING_ABORTED);
+        mImageRequest = nullptr;
+    }
+
+    mOwner = nullptr;
+}
+
+static int
+CalculateTextWidth(const nsAString& aText)
+{
+    if (!gPangoLayout) {
+        PangoFontMap *fontmap = pango_cairo_font_map_get_default();
+        PangoContext *ctx = pango_font_map_create_context(fontmap);
+        gPangoLayout = pango_layout_new(ctx);
+        g_object_unref(ctx);
+    }
+
+    pango_layout_set_text(gPangoLayout, NS_ConvertUTF16toUTF8(aText).get(), -1);
+
+    int width, dummy;
+    pango_layout_get_size(gPangoLayout, &width, &dummy);
+
+    return width;
+}
+
+static const nsDependentString
+GetEllipsis()
+{
+    static char16_t sBuf[4] = { 0, 0, 0, 0 };
+    if (!sBuf[0]) {
+        nsString ellipsis;
+        Preferences::GetLocalizedString("intl.ellipsis", ellipsis);
+        if (!ellipsis.IsEmpty()) {
+            uint32_t l = ellipsis.Length();
+            const nsString::char_type *c = ellipsis.BeginReading();
+            uint32_t i = 0;
+            while (i < 3 && i < l) {
+                sBuf[i++] = *(c++);
+            }
+        } else {
+            sBuf[0] = '.';
+            sBuf[1] = '.';
+            sBuf[2] = '.';
+        }
+    }
+
+    return nsDependentString(sBuf);
+}
+
+static int
+GetEllipsisWidth()
+{
+    static int sEllipsisWidth = -1;
+
+    if (sEllipsisWidth == -1) {
+        sEllipsisWidth = CalculateTextWidth(GetEllipsis());
+    }
+
+    return sEllipsisWidth;
+}
+
+nsMenuObject::nsMenuObject(nsMenuContainer *aParent, nsIContent *aContent) :
+    mContent(aContent),
+    mListener(aParent->DocListener()),
+    mParent(aParent),
+    mNativeData(nullptr)
+{
+    MOZ_ASSERT(mContent);
+    MOZ_ASSERT(mListener);
+    MOZ_ASSERT(mParent);
+}
+
+nsMenuObject::nsMenuObject(nsNativeMenuDocListener *aListener,
+                           nsIContent *aContent) :
+    mContent(aContent),
+    mListener(aListener),
+    mParent(nullptr),
+    mNativeData(nullptr)
+{
+    MOZ_ASSERT(mContent);
+    MOZ_ASSERT(mListener);
+}
+
+void
+nsMenuObject::UpdateLabel()
+{
+    // Gecko stores the label and access key in separate attributes
+    // so we need to convert label="Foo_Bar"/accesskey="F" in to
+    // label="_Foo__Bar" for dbusmenu
+
+    nsAutoString label;
+    mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::label, label);
+
+    nsAutoString accesskey;
+    mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey,
+                                   accesskey);
+
+    const nsAutoString::char_type *akey = accesskey.BeginReading();
+    char16_t keyLower = ToLowerCase(*akey);
+    char16_t keyUpper = ToUpperCase(*akey);
+
+    const nsAutoString::char_type *iter = label.BeginReading();
+    const nsAutoString::char_type *end = label.EndReading();
+    uint32_t length = label.Length();
+    uint32_t pos = 0;
+    bool foundAccessKey = false;
+
+    while (iter != end) {
+        if (*iter != char16_t('_')) {
+            if ((*iter != keyLower && *iter != keyUpper) || foundAccessKey) {
+                ++iter;
+                ++pos;
+                continue;
+            }
+            foundAccessKey = true;
+        }
+
+        label.SetLength(++length);
+
+        iter = label.BeginReading() + pos;
+        end = label.EndReading();
+        nsAutoString::char_type *cur = label.BeginWriting() + pos;
+
+        memmove(cur + 1, cur, (length - 1 - pos) * sizeof(nsAutoString::char_type));
+        *cur = nsAutoString::char_type('_');
+
+        iter += 2;
+        pos += 2;
+    }
+
+    if (CalculateTextWidth(label) <= MAX_WIDTH) {
+        dbusmenu_menuitem_property_set(mNativeData,
+                                       DBUSMENU_MENUITEM_PROP_LABEL,
+                                       NS_ConvertUTF16toUTF8(label).get());
+        return;
+    }
+
+    // This sucks.
+    // This should be done at the point where the menu is drawn (hello Unity),
+    // but unfortunately it doesn't do that and will happily fill your entire
+    // screen width with a menu if you have a bookmark with a really long title.
+    // This leaves us with no other option but to ellipsize here, with no proper
+    // knowledge of Unity's render path, font size etc. This is better than nothing
+    nsAutoString truncated;
+    int target = MAX_WIDTH - GetEllipsisWidth();
+    length = label.Length();
+
+    static mozilla::dom::Element::AttrValuesArray strings[] = {
+        nsGkAtoms::left, nsGkAtoms::start,
+        nsGkAtoms::center, nsGkAtoms::right,
+        nsGkAtoms::end, nullptr
+    };
+
+    int32_t type = mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None,
+                                                          nsGkAtoms::crop,
+                                                          strings, eCaseMatters);
+
+    switch (type) {
+        case 0:
+        case 1:
+            // FIXME: Implement left cropping
+        case 2:
+            // FIXME: Implement center cropping
+        case 3:
+        case 4:
+        default:
+            for (uint32_t i = 0; i < length; i++) {
+                truncated.Append(label.CharAt(i));
+                if (CalculateTextWidth(truncated) > target) {
+                    break;
+                }
+            }
+
+            truncated.Append(GetEllipsis());
+    }
+
+    dbusmenu_menuitem_property_set(mNativeData,
+                                   DBUSMENU_MENUITEM_PROP_LABEL,
+                                   NS_ConvertUTF16toUTF8(truncated).get());
+}
+
+void
+nsMenuObject::UpdateVisibility(const ComputedStyle *aComputedStyle)
+{
+    bool vis = true;
+
+    if (aComputedStyle &&
+        (aComputedStyle->StyleDisplay()->mDisplay == StyleDisplay::None ||
+         aComputedStyle->StyleVisibility()->mVisible ==
+            StyleVisibility::Collapse)) {
+        vis = false;
+    }
+
+    dbusmenu_menuitem_property_set_bool(mNativeData,
+                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
+                                        vis);
+}
+
+void
+nsMenuObject::UpdateSensitivity()
+{
+    bool disabled = mContent->AsElement()->AttrValueIs(kNameSpaceID_None,
+                                                       nsGkAtoms::disabled,
+                                                       nsGkAtoms::_true,
+                                                       eCaseMatters);
+
+    dbusmenu_menuitem_property_set_bool(mNativeData,
+                                        DBUSMENU_MENUITEM_PROP_ENABLED,
+                                        !disabled);
+
+}
+
+void
+nsMenuObject::UpdateIcon(const ComputedStyle *aComputedStyle)
+{
+    if (ShouldShowIcon()) {
+        if (!mIconLoader) {
+            mIconLoader = new nsMenuObjectIconLoader(this);
+        }
+
+        mIconLoader->LoadIcon(aComputedStyle);
+    } else {
+        if (mIconLoader) {
+            mIconLoader->Destroy();
+            mIconLoader = nullptr;
+        }
+
+        ClearIcon();
+    }
+}
+
+already_AddRefed<const ComputedStyle>
+nsMenuObject::GetComputedStyle()
+{
+    RefPtr<const ComputedStyle> style =
+        nsComputedDOMStyle::GetComputedStyleNoFlush(
+            mContent->AsElement());
+
+    return style.forget();
+}
+
+void
+nsMenuObject::InitializeNativeData()
+{
+}
+
+nsMenuObject::PropertyFlags
+nsMenuObject::SupportedProperties() const
+{
+    return static_cast<nsMenuObject::PropertyFlags>(0);
+}
+
+bool
+nsMenuObject::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const
+{
+    return true;
+}
+
+void
+nsMenuObject::UpdateContentAttributes()
+{
+}
+
+void
+nsMenuObject::Update(const ComputedStyle *aComputedStyle)
+{
+}
+
+bool
+nsMenuObject::ShouldShowIcon() const
+{
+    // Ideally we want to know the visibility of the anonymous XUL image in
+    // our menuitem, but this isn't created because we don't have a frame.
+    // The following works by default (because xul.css hides images in menuitems
+    // that don't have the "menuitem-with-favicon" class). It's possible a third
+    // party theme could override this, but, oh well...
+    const nsAttrValue *classes = mContent->AsElement()->GetClasses();
+    if (!classes) {
+        return false;
+    }
+
+    for (uint32_t i = 0; i < classes->GetAtomCount(); ++i) {
+        if (classes->AtomAt(i) == nsGkAtoms::menuitem_with_favicon) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void
+nsMenuObject::ClearIcon()
+{
+    dbusmenu_menuitem_property_remove(mNativeData,
+                                      DBUSMENU_MENUITEM_PROP_ICON_DATA);
+}
+
+nsMenuObject::~nsMenuObject()
+{
+    nsWeakMenuObject::NotifyDestroyed(this);
+
+    if (mIconLoader) {
+        mIconLoader->Destroy();
+    }
+
+    if (mListener) {
+        mListener->UnregisterForContentChanges(mContent);
+    }
+
+    if (mNativeData) {
+        g_object_unref(mNativeData);
+        mNativeData = nullptr;
+    }
+}
+
+void
+nsMenuObject::CreateNativeData()
+{
+    MOZ_ASSERT(mNativeData == nullptr, "This node already has a DbusmenuMenuitem. The old one will be leaked");
+
+    mNativeData = dbusmenu_menuitem_new();
+    InitializeNativeData();
+    if (mParent && mParent->IsBeingDisplayed()) {
+        ContainerIsOpening();
+    }
+
+    mListener->RegisterForContentChanges(mContent, this);
+}
+
+nsresult
+nsMenuObject::AdoptNativeData(DbusmenuMenuitem *aNativeData)
+{
+    MOZ_ASSERT(mNativeData == nullptr, "This node already has a DbusmenuMenuitem. The old one will be leaked");
+
+    if (!IsCompatibleWithNativeData(aNativeData)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    mNativeData = aNativeData;
+    g_object_ref(mNativeData);
+
+    PropertyFlags supported = SupportedProperties();
+    PropertyFlags mask = static_cast<PropertyFlags>(1);
+
+    for (uint32_t i = 0; gPropertyStrings[i]; ++i) {
+        if (!(mask & supported)) {
+            dbusmenu_menuitem_property_remove(mNativeData, gPropertyStrings[i]);
+        }
+        mask = static_cast<PropertyFlags>(mask << 1);
+    }
+
+    InitializeNativeData();
+    if (mParent && mParent->IsBeingDisplayed()) {
+        ContainerIsOpening();
+    }
+
+    mListener->RegisterForContentChanges(mContent, this);
+
+    return NS_OK;
+}
+
+void
+nsMenuObject::ContainerIsOpening()
+{
+    MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
+
+    UpdateContentAttributes();
+
+    RefPtr<const ComputedStyle> style = GetComputedStyle();
+    Update(style);
+}
+
+/* static */ void
+nsWeakMenuObject::AddWeakReference(nsWeakMenuObject *aWeak)
+{
+    aWeak->mPrev = sHead;
+    sHead = aWeak;
+}
+
+/* static */ void
+nsWeakMenuObject::RemoveWeakReference(nsWeakMenuObject *aWeak)
+{
+    if (aWeak == sHead) {
+        sHead = aWeak->mPrev;
+        return;
+    }
+
+    nsWeakMenuObject *weak = sHead;
+    while (weak && weak->mPrev != aWeak) {
+        weak = weak->mPrev;
+    }
+
+    if (weak) {
+        weak->mPrev = aWeak->mPrev;
+    }
+}
+
+/* static */ void
+nsWeakMenuObject::NotifyDestroyed(nsMenuObject *aMenuObject)
+{
+    nsWeakMenuObject *weak = sHead;
+    while (weak) {
+        if (weak->mMenuObject == aMenuObject) {
+            weak->mMenuObject = nullptr;
+        }
+
+        weak = weak->mPrev;
+    }
+}
diff --git a/widget/gtk/nsMenuObject.h b/widget/gtk/nsMenuObject.h
new file mode 100644
index 0000000000000..92b1ffd8f2fae
--- /dev/null
+++ b/widget/gtk/nsMenuObject.h
@@ -0,0 +1,169 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenuObject_h__
+#define __nsMenuObject_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/ComputedStyleInlines.h"
+#include "nsCOMPtr.h"
+
+#include "nsDbusmenu.h"
+#include "nsNativeMenuDocListener.h"
+
+class nsIContent;
+class nsMenuContainer;
+class nsMenuObjectIconLoader;
+
+#define DBUSMENU_PROPERTIES \
+    DBUSMENU_PROPERTY(Label, DBUSMENU_MENUITEM_PROP_LABEL, 0) \
+    DBUSMENU_PROPERTY(Enabled, DBUSMENU_MENUITEM_PROP_ENABLED, 1) \
+    DBUSMENU_PROPERTY(Visible, DBUSMENU_MENUITEM_PROP_VISIBLE, 2) \
+    DBUSMENU_PROPERTY(IconData, DBUSMENU_MENUITEM_PROP_ICON_DATA, 3) \
+    DBUSMENU_PROPERTY(Type, DBUSMENU_MENUITEM_PROP_TYPE, 4) \
+    DBUSMENU_PROPERTY(Shortcut, DBUSMENU_MENUITEM_PROP_SHORTCUT, 5) \
+    DBUSMENU_PROPERTY(ToggleType, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, 6) \
+    DBUSMENU_PROPERTY(ToggleState, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, 7) \
+    DBUSMENU_PROPERTY(ChildDisplay, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, 8)
+
+/*
+ * This is the base class for all menu nodes. Each instance represents
+ * a single node in the menu hierarchy. It wraps the corresponding DOM node and
+ * native menu node, keeps them in sync and transfers events between the two.
+ * It is not reference counted - each node is owned by its parent (the top
+ * level menubar is owned by the window) and keeps a weak pointer to its
+ * parent (which is guaranteed to always be valid because a node will never
+ * outlive its parent). It is not safe to keep a reference to nsMenuObject
+ * externally.
+ */
+class nsMenuObject : public nsNativeMenuChangeObserver
+{
+public:
+    enum EType {
+        eType_MenuBar,
+        eType_Menu,
+        eType_MenuItem
+    };
+
+    virtual ~nsMenuObject();
+
+    // Get the native menu item node
+    DbusmenuMenuitem* GetNativeData() const { return mNativeData; }
+
+    // Get the parent menu object
+    nsMenuContainer* Parent() const { return mParent; }
+
+    // Get the content node
+    nsIContent* ContentNode() const { return mContent; }
+
+    // Get the type of this node. Must be provided by subclasses
+    virtual EType Type() const = 0;
+
+    // Get the document listener
+    nsNativeMenuDocListener* DocListener() const { return mListener; }
+
+    // Create the native menu item node (called by containers)
+    void CreateNativeData();
+
+    // Adopt the specified native menu item node (called by containers)
+    nsresult AdoptNativeData(DbusmenuMenuitem *aNativeData);
+
+    // Called by the container to tell us that it's opening
+    void ContainerIsOpening();
+
+protected:
+    nsMenuObject(nsMenuContainer *aParent, nsIContent *aContent);
+    nsMenuObject(nsNativeMenuDocListener *aListener, nsIContent *aContent);
+
+    enum PropertyFlags {
+#define DBUSMENU_PROPERTY(e, s, b) eProp##e = (1 << b),
+        DBUSMENU_PROPERTIES
+#undef DBUSMENU_PROPERTY
+    };
+
+    void UpdateLabel();
+    void UpdateVisibility(const mozilla::ComputedStyle *aComputedStyle);
+    void UpdateSensitivity();
+    void UpdateIcon(const mozilla::ComputedStyle *aComputedStyle);
+
+    already_AddRefed<const mozilla::ComputedStyle> GetComputedStyle();
+
+private:
+    friend class nsMenuObjectIconLoader;
+
+    // Set up initial properties on the native data, connect to signals etc.
+    // This should be implemented by subclasses
+    virtual void InitializeNativeData();
+
+    // Return the properties that this menu object type supports
+    // This should be implemented by subclasses
+    virtual PropertyFlags SupportedProperties() const;
+
+    // Determine whether this menu object could use the specified
+    // native item. Returns true by default but can be overridden by subclasses
+    virtual bool
+    IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const;
+
+    // Update attributes on this objects content node when the container opens.
+    // This is called before style resolution, and should be implemented by
+    // subclasses who want to modify attributes that might affect style.
+    // This will not be called when there are script blockers
+    virtual void UpdateContentAttributes();
+
+    // Update properties that should be refreshed when the container opens.
+    // This should be implemented by subclasses that have properties which
+    // need refreshing
+    virtual void Update(const mozilla::ComputedStyle *aComputedStyle);
+
+    bool ShouldShowIcon() const;
+    void ClearIcon();
+
+    nsCOMPtr<nsIContent> mContent;
+    // mListener is a strong ref for simplicity - someone in the tree needs to
+    // own it, and this only really needs to be the top-level object (as no
+    // children outlives their parent). However, we need to keep it alive until
+    // after running the nsMenuObject destructor for the top-level menu object,
+    // hence the strong ref
+    RefPtr<nsNativeMenuDocListener> mListener;
+    nsMenuContainer *mParent; // [weak]
+    DbusmenuMenuitem *mNativeData; // [strong]
+    RefPtr<nsMenuObjectIconLoader> mIconLoader;
+};
+
+// Keep a weak pointer to a menu object
+class nsWeakMenuObject
+{
+public:
+    nsWeakMenuObject() : mPrev(nullptr), mMenuObject(nullptr) {}
+
+    nsWeakMenuObject(nsMenuObject *aMenuObject) :
+        mPrev(nullptr), mMenuObject(aMenuObject)
+    {
+        AddWeakReference(this);
+    }
+
+    ~nsWeakMenuObject() { RemoveWeakReference(this); }
+
+    nsMenuObject* get() const { return mMenuObject; }
+
+    nsMenuObject* operator->() const { return mMenuObject; }
+
+    explicit operator bool() const { return !!mMenuObject; }
+
+    static void NotifyDestroyed(nsMenuObject *aMenuObject);
+
+private:
+    static void AddWeakReference(nsWeakMenuObject *aWeak);
+    static void RemoveWeakReference(nsWeakMenuObject *aWeak);
+
+    nsWeakMenuObject *mPrev;
+    static nsWeakMenuObject *sHead;
+
+    nsMenuObject *mMenuObject;
+};
+
+#endif /* __nsMenuObject_h__ */
diff --git a/widget/gtk/nsMenuSeparator.cpp b/widget/gtk/nsMenuSeparator.cpp
new file mode 100644
index 0000000000000..3ab135bd8a200
--- /dev/null
+++ b/widget/gtk/nsMenuSeparator.cpp
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/Assertions.h"
+#include "nsCRT.h"
+#include "nsGkAtoms.h"
+
+#include "nsDbusmenu.h"
+
+#include "nsMenuContainer.h"
+#include "nsMenuSeparator.h"
+
+using namespace mozilla;
+
+void
+nsMenuSeparator::InitializeNativeData()
+{
+    dbusmenu_menuitem_property_set(GetNativeData(),
+                                   DBUSMENU_MENUITEM_PROP_TYPE,
+                                   "separator");
+}
+
+void
+nsMenuSeparator::Update(const ComputedStyle *aComputedStyle)
+{
+    UpdateVisibility(aComputedStyle);
+}
+
+bool
+nsMenuSeparator::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const
+{
+    return nsCRT::strcmp(dbusmenu_menuitem_property_get(aNativeData,
+                                                        DBUSMENU_MENUITEM_PROP_TYPE),
+                         "separator") == 0;
+}
+
+nsMenuObject::PropertyFlags
+nsMenuSeparator::SupportedProperties() const
+{
+    return static_cast<nsMenuObject::PropertyFlags>(
+        nsMenuObject::ePropVisible |
+        nsMenuObject::ePropType
+    );
+}
+
+void
+nsMenuSeparator::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute)
+{
+    MOZ_ASSERT(aContent == ContentNode(), "Received an event that wasn't meant for us!");
+
+    if (!Parent()->IsBeingDisplayed()) {
+        return;
+    }
+
+    if (aAttribute == nsGkAtoms::hidden ||
+        aAttribute == nsGkAtoms::collapsed) {
+        RefPtr<const ComputedStyle> style = GetComputedStyle();
+        UpdateVisibility(style);
+    }
+}
+
+nsMenuSeparator::nsMenuSeparator(nsMenuContainer *aParent,
+                                 nsIContent *aContent) :
+    nsMenuObject(aParent, aContent)
+{
+    MOZ_COUNT_CTOR(nsMenuSeparator);
+}
+
+nsMenuSeparator::~nsMenuSeparator()
+{
+    MOZ_COUNT_DTOR(nsMenuSeparator);
+}
+
+nsMenuObject::EType
+nsMenuSeparator::Type() const
+{
+    return eType_MenuItem;
+}
diff --git a/widget/gtk/nsMenuSeparator.h b/widget/gtk/nsMenuSeparator.h
new file mode 100644
index 0000000000000..dd3f5b974dd3f
--- /dev/null
+++ b/widget/gtk/nsMenuSeparator.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsMenuSeparator_h__
+#define __nsMenuSeparator_h__
+
+#include "mozilla/Attributes.h"
+
+#include "nsMenuObject.h"
+
+class nsIContent;
+class nsAtom;
+class nsMenuContainer;
+
+// Menu separator class
+class nsMenuSeparator final : public nsMenuObject
+{
+public:
+    nsMenuSeparator(nsMenuContainer *aParent, nsIContent *aContent);
+    ~nsMenuSeparator();
+
+    nsMenuObject::EType Type() const override;
+
+private:
+    void InitializeNativeData() override;
+    void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+    bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override;
+    nsMenuObject::PropertyFlags SupportedProperties() const override;
+
+    void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override;
+};
+
+#endif /* __nsMenuSeparator_h__ */
diff --git a/widget/gtk/nsNativeMenuDocListener.cpp b/widget/gtk/nsNativeMenuDocListener.cpp
new file mode 100644
index 0000000000000..afe4970b63a7e
--- /dev/null
+++ b/widget/gtk/nsNativeMenuDocListener.cpp
@@ -0,0 +1,346 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/Assertions.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "nsContentUtils.h"
+#include "nsAtom.h"
+#include "nsIContent.h"
+
+#include "nsMenuContainer.h"
+
+#include "nsNativeMenuDocListener.h"
+
+using namespace mozilla;
+
+uint32_t nsNativeMenuDocListener::sUpdateBlockersCount = 0;
+
+nsNativeMenuDocListenerTArray *gPendingListeners;
+
+/*
+ * Small helper which caches a single listener, so that consecutive
+ * events which go to the same node avoid multiple hash table lookups
+ */
+class MOZ_STACK_CLASS DispatchHelper
+{
+public:
+    DispatchHelper(nsNativeMenuDocListener *aListener,
+                   nsIContent *aContent) :
+                   mObserver(nullptr)
+    {
+        if (aContent == aListener->mLastSource) {
+            mObserver = aListener->mLastTarget;
+        } else {
+            mObserver = aListener->mContentToObserverTable.Get(aContent);
+            if (mObserver) {
+                aListener->mLastSource = aContent;
+                aListener->mLastTarget = mObserver;
+            }
+        }
+    }
+
+    ~DispatchHelper() { };
+
+    nsNativeMenuChangeObserver* Observer() const { return mObserver; }
+
+    bool HasObserver() const { return !!mObserver; }
+
+private:
+    nsNativeMenuChangeObserver *mObserver;
+};
+
+NS_IMPL_ISUPPORTS(nsNativeMenuDocListener, nsIMutationObserver)
+
+nsNativeMenuDocListener::~nsNativeMenuDocListener()
+{
+    MOZ_ASSERT(mContentToObserverTable.Count() == 0,
+               "Some nodes forgot to unregister listeners. This is bad! (and we're lucky we made it this far)");
+    MOZ_COUNT_DTOR(nsNativeMenuDocListener);
+}
+
+void
+nsNativeMenuDocListener::AttributeChanged(mozilla::dom::Element *aElement,
+                                          int32_t aNameSpaceID,
+                                          nsAtom *aAttribute,
+                                          int32_t aModType,
+                                          const nsAttrValue* aOldValue)
+{
+    if (sUpdateBlockersCount == 0) {
+        DoAttributeChanged(aElement, aAttribute);
+        return;
+    }
+
+    MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get();
+    m->mType = MutationRecord::eAttributeChanged;
+    m->mTarget = aElement;
+    m->mAttribute = aAttribute;
+
+    ScheduleFlush(this);
+}
+
+void
+nsNativeMenuDocListener::ContentAppended(nsIContent *aFirstNewContent)
+{
+    for (nsIContent *c = aFirstNewContent; c; c = c->GetNextSibling()) {
+        ContentInserted(c);
+    }
+}
+
+void
+nsNativeMenuDocListener::ContentInserted(nsIContent *aChild)
+{
+    nsIContent* container = aChild->GetParent();
+    if (!container) {
+      return;
+    }
+
+    nsIContent *prevSibling = nsMenuContainer::GetPreviousSupportedSibling(aChild);
+
+    if (sUpdateBlockersCount == 0) {
+        DoContentInserted(container, aChild, prevSibling);
+        return;
+    }
+
+    MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get();
+    m->mType = MutationRecord::eContentInserted;
+    m->mTarget = container;
+    m->mChild = aChild;
+    m->mPrevSibling = prevSibling;
+
+    ScheduleFlush(this);
+}
+
+void
+nsNativeMenuDocListener::ContentWillBeRemoved(nsIContent* aChild, const BatchRemovalState*)
+{
+    nsIContent* container = aChild->GetParent();
+    if (!container) {
+      return;
+    }
+
+    if (sUpdateBlockersCount == 0) {
+        DoContentRemoved(container, aChild);
+        return;
+    }
+
+    MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get();
+    m->mType = MutationRecord::eContentRemoved;
+    m->mTarget = container;
+    m->mChild = aChild;
+
+    ScheduleFlush(this);
+}
+
+void
+nsNativeMenuDocListener::NodeWillBeDestroyed(nsINode *aNode)
+{
+    mDocument = nullptr;
+}
+
+void
+nsNativeMenuDocListener::DoAttributeChanged(nsIContent *aContent,
+                                            nsAtom *aAttribute)
+{
+    DispatchHelper h(this, aContent);
+    if (h.HasObserver()) {
+        h.Observer()->OnAttributeChanged(aContent, aAttribute);
+    }
+}
+
+void
+nsNativeMenuDocListener::DoContentInserted(nsIContent *aContainer,
+                                           nsIContent *aChild,
+                                           nsIContent *aPrevSibling)
+{
+    DispatchHelper h(this, aContainer);
+    if (h.HasObserver()) {
+        h.Observer()->OnContentInserted(aContainer, aChild, aPrevSibling);
+    }
+}
+
+void
+nsNativeMenuDocListener::DoContentRemoved(nsIContent *aContainer,
+                                          nsIContent *aChild)
+{
+    DispatchHelper h(this, aContainer);
+    if (h.HasObserver()) {
+        h.Observer()->OnContentRemoved(aContainer, aChild);
+    }
+}
+
+void
+nsNativeMenuDocListener::DoBeginUpdates(nsIContent *aTarget)
+{
+    DispatchHelper h(this, aTarget);
+    if (h.HasObserver()) {
+        h.Observer()->OnBeginUpdates(aTarget);
+    }
+}
+
+void
+nsNativeMenuDocListener::DoEndUpdates(nsIContent *aTarget)
+{
+    DispatchHelper h(this, aTarget);
+    if (h.HasObserver()) {
+        h.Observer()->OnEndUpdates();
+    }
+}
+
+void
+nsNativeMenuDocListener::FlushPendingMutations()
+{
+    nsIContent *currentTarget = nullptr;
+    bool inUpdateSequence = false;
+
+    while (mPendingMutations.Length() > 0) {
+        MutationRecord *m = mPendingMutations[0].get();
+
+        if (m->mTarget != currentTarget) {
+            if (inUpdateSequence) {
+                DoEndUpdates(currentTarget);
+                inUpdateSequence = false;
+            }
+
+            currentTarget = m->mTarget;
+
+            if (mPendingMutations.Length() > 1 &&
+                mPendingMutations[1]->mTarget == currentTarget) {
+                DoBeginUpdates(currentTarget);
+                inUpdateSequence = true;
+            }
+        }
+
+        switch (m->mType) {
+            case MutationRecord::eAttributeChanged:
+                DoAttributeChanged(m->mTarget, m->mAttribute);
+                break;
+            case MutationRecord::eContentInserted:
+                DoContentInserted(m->mTarget, m->mChild, m->mPrevSibling);
+                break;
+            case MutationRecord::eContentRemoved:
+                DoContentRemoved(m->mTarget, m->mChild);
+                break;
+            default:
+                MOZ_ASSERT_UNREACHABLE("Invalid type");
+        }
+
+        mPendingMutations.RemoveElementAt(0);
+    }
+
+    if (inUpdateSequence) {
+        DoEndUpdates(currentTarget);
+    }
+}
+
+/* static */ void
+nsNativeMenuDocListener::ScheduleFlush(nsNativeMenuDocListener *aListener)
+{
+    MOZ_ASSERT(sUpdateBlockersCount > 0, "Shouldn't be doing this now");
+
+    if (!gPendingListeners) {
+        gPendingListeners = new nsNativeMenuDocListenerTArray;
+    }
+
+    if (gPendingListeners->IndexOf(aListener) ==
+        nsNativeMenuDocListenerTArray::NoIndex) {
+        gPendingListeners->AppendElement(aListener);
+    }
+}
+
+/* static */ void
+nsNativeMenuDocListener::CancelFlush(nsNativeMenuDocListener *aListener)
+{
+    if (!gPendingListeners) {
+        return;
+    }
+
+    gPendingListeners->RemoveElement(aListener);
+}
+
+/* static */ void
+nsNativeMenuDocListener::RemoveUpdateBlocker()
+{
+    if (sUpdateBlockersCount == 1 && gPendingListeners) {
+        while (gPendingListeners->Length() > 0) {
+            (*gPendingListeners)[0]->FlushPendingMutations();
+            gPendingListeners->RemoveElementAt(0);
+        }
+    }
+
+    MOZ_ASSERT(sUpdateBlockersCount > 0, "Negative update blockers count!");
+    sUpdateBlockersCount--;
+}
+
+nsNativeMenuDocListener::nsNativeMenuDocListener(nsIContent *aRootNode) :
+    mRootNode(aRootNode),
+    mDocument(nullptr),
+    mLastSource(nullptr),
+    mLastTarget(nullptr)
+{
+    MOZ_COUNT_CTOR(nsNativeMenuDocListener);
+}
+
+void
+nsNativeMenuDocListener::RegisterForContentChanges(nsIContent *aContent,
+                                                   nsNativeMenuChangeObserver *aObserver)
+{
+    MOZ_ASSERT(aContent, "Need content parameter");
+    MOZ_ASSERT(aObserver, "Need observer parameter");
+    if (!aContent || !aObserver) {
+        return;
+    }
+
+    DebugOnly<nsNativeMenuChangeObserver *> old;
+    MOZ_ASSERT(!mContentToObserverTable.Get(aContent, &old) || old == aObserver,
+               "Multiple observers for the same content node are not supported");
+
+    mContentToObserverTable.InsertOrUpdate(aContent, aObserver);
+}
+
+void
+nsNativeMenuDocListener::UnregisterForContentChanges(nsIContent *aContent)
+{
+    MOZ_ASSERT(aContent, "Need content parameter");
+    if (!aContent) {
+        return;
+    }
+
+    mContentToObserverTable.Remove(aContent);
+    if (aContent == mLastSource) {
+        mLastSource = nullptr;
+        mLastTarget = nullptr;
+    }
+}
+
+void
+nsNativeMenuDocListener::Start()
+{
+    if (mDocument) {
+        return;
+    }
+
+    mDocument = mRootNode->OwnerDoc();
+    if (!mDocument) {
+        return;
+    }
+
+    mDocument->AddMutationObserver(this);
+}
+
+void
+nsNativeMenuDocListener::Stop()
+{
+    if (mDocument) {
+        mDocument->RemoveMutationObserver(this);
+        mDocument = nullptr;
+    }
+
+    CancelFlush(this);
+    mPendingMutations.Clear();
+}
diff --git a/widget/gtk/nsNativeMenuDocListener.h b/widget/gtk/nsNativeMenuDocListener.h
new file mode 100644
index 0000000000000..5ee99cba70fd4
--- /dev/null
+++ b/widget/gtk/nsNativeMenuDocListener.h
@@ -0,0 +1,152 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsNativeMenuDocListener_h__
+#define __nsNativeMenuDocListener_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/UniquePtr.h"
+#include "nsTHashMap.h"
+#include "nsStubMutationObserver.h"
+#include "nsTArray.h"
+
+class nsAtom;
+class nsIContent;
+class nsNativeMenuChangeObserver;
+
+namespace mozilla {
+namespace dom {
+class Document;
+}
+}
+
+/*
+ * This class keeps a mapping of content nodes to observers and forwards DOM
+ * mutations to these. There is exactly one of these for every menubar.
+ */
+class nsNativeMenuDocListener final : nsStubMutationObserver
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    nsNativeMenuDocListener(nsIContent *aRootNode);
+
+    // Register an observer to receive mutation events for the specified
+    // content node. The caller must keep the observer alive until
+    // UnregisterForContentChanges is called.
+    void RegisterForContentChanges(nsIContent *aContent,
+                                   nsNativeMenuChangeObserver *aObserver);
+
+    // Unregister the registered observer for the specified content node
+    void UnregisterForContentChanges(nsIContent *aContent);
+
+    // Start listening to the document and forwarding DOM mutations to
+    // registered observers.
+    void Start();
+
+    // Stop listening to the document. No DOM mutations will be forwarded
+    // to registered observers.
+    void Stop();
+
+    /*
+     * This class is intended to be used inside GObject signal handlers.
+     * It allows us to queue updates until we have finished delivering
+     * events to Gecko, and then we can batch updates to our view of the
+     * menu. This allows us to do menu updates without altering the structure
+     * seen by the OS.
+     */
+    class MOZ_STACK_CLASS BlockUpdatesScope
+    {
+    public:
+        BlockUpdatesScope()
+        {
+            nsNativeMenuDocListener::AddUpdateBlocker();
+        }
+
+        ~BlockUpdatesScope()
+        {
+            nsNativeMenuDocListener::RemoveUpdateBlocker();
+        }
+    };
+
+private:
+    friend class DispatchHelper;
+
+    struct MutationRecord {
+        enum RecordType {
+            eAttributeChanged,
+            eContentInserted,
+            eContentRemoved
+        } mType;
+
+        nsCOMPtr<nsIContent> mTarget;
+        nsCOMPtr<nsIContent> mChild;
+        nsCOMPtr<nsIContent> mPrevSibling;
+        RefPtr<nsAtom> mAttribute;
+    };
+
+    ~nsNativeMenuDocListener();
+
+    NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
+    NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED
+    NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
+    NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
+    NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
+
+    void DoAttributeChanged(nsIContent *aContent, nsAtom *aAttribute);
+    void DoContentInserted(nsIContent *aContainer,
+                           nsIContent *aChild,
+                           nsIContent *aPrevSibling);
+    void DoContentRemoved(nsIContent *aContainer, nsIContent *aChild);
+    void DoBeginUpdates(nsIContent *aTarget);
+    void DoEndUpdates(nsIContent *aTarget);
+
+    void FlushPendingMutations();
+    static void ScheduleFlush(nsNativeMenuDocListener *aListener);
+    static void CancelFlush(nsNativeMenuDocListener *aListener);
+
+    static void AddUpdateBlocker() { ++sUpdateBlockersCount; }
+    static void RemoveUpdateBlocker();
+
+    nsCOMPtr<nsIContent> mRootNode;
+    mozilla::dom::Document *mDocument;
+    nsIContent *mLastSource;
+    nsNativeMenuChangeObserver *mLastTarget;
+    nsTArray<mozilla::UniquePtr<MutationRecord> > mPendingMutations;
+    nsTHashMap<nsPtrHashKey<nsIContent>, nsNativeMenuChangeObserver *> mContentToObserverTable;
+
+    static uint32_t sUpdateBlockersCount;
+};
+
+typedef nsTArray<RefPtr<nsNativeMenuDocListener> > nsNativeMenuDocListenerTArray;
+
+/*
+ * Implemented by classes that want to listen to mutation events from content
+ * nodes.
+ */
+class nsNativeMenuChangeObserver
+{
+public:
+    virtual void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) {}
+
+    virtual void OnContentInserted(nsIContent *aContainer,
+                                   nsIContent *aChild,
+                                   nsIContent *aPrevSibling) {}
+
+    virtual void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) {}
+
+    // Signals the start of a sequence of more than 1 event for the specified
+    // node. This only happens when events are flushed as all BlockUpdatesScope
+    // instances go out of scope
+    virtual void OnBeginUpdates(nsIContent *aContent) {};
+
+    // Signals the end of a sequence of events
+    virtual void OnEndUpdates() {};
+};
+
+#endif /* __nsNativeMenuDocListener_h__ */
diff --git a/widget/gtk/nsNativeMenuService.cpp b/widget/gtk/nsNativeMenuService.cpp
new file mode 100644
index 0000000000000..5cf36a4470361
--- /dev/null
+++ b/widget/gtk/nsNativeMenuService.cpp
@@ -0,0 +1,478 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/Element.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsGtkUtils.h"
+#include "nsIContent.h"
+#include "nsIWidget.h"
+#include "nsServiceManagerUtils.h"
+#include "nsWindow.h"
+#include "prlink.h"
+
+#include "nsDbusmenu.h"
+#include "nsMenuBar.h"
+#include "nsNativeMenuDocListener.h"
+
+#include <glib-object.h>
+#include <pango/pango.h>
+#include <stdlib.h>
+
+#include "nsNativeMenuService.h"
+
+using namespace mozilla;
+
+nsNativeMenuService* nsNativeMenuService::sService = nullptr;
+
+extern PangoLayout* gPangoLayout;
+extern nsNativeMenuDocListenerTArray* gPendingListeners;
+
+#undef g_dbus_proxy_new_for_bus
+#undef g_dbus_proxy_new_for_bus_finish
+#undef g_dbus_proxy_call
+#undef g_dbus_proxy_call_finish
+#undef g_dbus_proxy_get_name_owner
+
+typedef void (*_g_dbus_proxy_new_for_bus_fn)(GBusType, GDBusProxyFlags,
+                                             GDBusInterfaceInfo*,
+                                             const gchar*, const gchar*,
+                                             const gchar*, GCancellable*,
+                                             GAsyncReadyCallback, gpointer);
+
+typedef GDBusProxy* (*_g_dbus_proxy_new_for_bus_finish_fn)(GAsyncResult*,
+                                                           GError**);
+typedef void (*_g_dbus_proxy_call_fn)(GDBusProxy*, const gchar*, GVariant*,
+                                      GDBusCallFlags, gint, GCancellable*,
+                                      GAsyncReadyCallback, gpointer);
+typedef GVariant* (*_g_dbus_proxy_call_finish_fn)(GDBusProxy*, GAsyncResult*,
+                                                  GError**);
+typedef gchar* (*_g_dbus_proxy_get_name_owner_fn)(GDBusProxy*);
+
+static _g_dbus_proxy_new_for_bus_fn _g_dbus_proxy_new_for_bus;
+static _g_dbus_proxy_new_for_bus_finish_fn _g_dbus_proxy_new_for_bus_finish;
+static _g_dbus_proxy_call_fn _g_dbus_proxy_call;
+static _g_dbus_proxy_call_finish_fn _g_dbus_proxy_call_finish;
+static _g_dbus_proxy_get_name_owner_fn _g_dbus_proxy_get_name_owner;
+
+#define g_dbus_proxy_new_for_bus _g_dbus_proxy_new_for_bus
+#define g_dbus_proxy_new_for_bus_finish _g_dbus_proxy_new_for_bus_finish
+#define g_dbus_proxy_call _g_dbus_proxy_call
+#define g_dbus_proxy_call_finish _g_dbus_proxy_call_finish
+#define g_dbus_proxy_get_name_owner _g_dbus_proxy_get_name_owner
+
+static PRLibrary *gGIOLib = nullptr;
+
+static nsresult
+GDBusInit()
+{
+    gGIOLib = PR_LoadLibrary("libgio-2.0.so.0");
+    if (!gGIOLib) {
+        return NS_ERROR_FAILURE;
+    }
+
+    g_dbus_proxy_new_for_bus = (_g_dbus_proxy_new_for_bus_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_new_for_bus");
+    g_dbus_proxy_new_for_bus_finish = (_g_dbus_proxy_new_for_bus_finish_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_new_for_bus_finish");
+    g_dbus_proxy_call = (_g_dbus_proxy_call_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_call");
+    g_dbus_proxy_call_finish = (_g_dbus_proxy_call_finish_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_call_finish");
+    g_dbus_proxy_get_name_owner = (_g_dbus_proxy_get_name_owner_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_get_name_owner");
+
+    if (!g_dbus_proxy_new_for_bus ||
+        !g_dbus_proxy_new_for_bus_finish ||
+        !g_dbus_proxy_call ||
+        !g_dbus_proxy_call_finish ||
+        !g_dbus_proxy_get_name_owner) {
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(nsNativeMenuService, nsINativeMenuService)
+
+nsNativeMenuService::nsNativeMenuService() :
+    mCreateProxyCancellable(nullptr), mDbusProxy(nullptr), mOnline(false)
+{
+}
+
+nsNativeMenuService::~nsNativeMenuService()
+{
+    SetOnline(false);
+
+    if (mCreateProxyCancellable) {
+        g_cancellable_cancel(mCreateProxyCancellable);
+        g_object_unref(mCreateProxyCancellable);
+        mCreateProxyCancellable = nullptr;
+    }
+
+    // Make sure we disconnect map-event handlers
+    while (mMenuBars.Length() > 0) {
+        NotifyNativeMenuBarDestroyed(mMenuBars[0]);
+    }
+
+    Preferences::UnregisterCallback(PrefChangedCallback,
+                                    "ui.use_unity_menubar");
+
+    if (mDbusProxy) {
+        g_signal_handlers_disconnect_by_func(mDbusProxy,
+                                             FuncToGpointer(name_owner_changed_cb),
+                                             NULL);
+        g_object_unref(mDbusProxy);
+    }
+
+    if (gPendingListeners) {
+        delete gPendingListeners;
+        gPendingListeners = nullptr;
+    }
+    if (gPangoLayout) {
+        g_object_unref(gPangoLayout);
+        gPangoLayout = nullptr;
+    }
+
+    MOZ_ASSERT(sService == this);
+    sService = nullptr;
+}
+
+nsresult
+nsNativeMenuService::Init()
+{
+    nsresult rv = nsDbusmenuFunctions::Init();
+    if (NS_FAILED(rv)) {
+        return rv;
+    }
+
+    rv = GDBusInit();
+    if (NS_FAILED(rv)) {
+        return rv;
+    }
+
+    Preferences::RegisterCallback(PrefChangedCallback,
+                                  "ui.use_unity_menubar");
+
+    mCreateProxyCancellable = g_cancellable_new();
+
+    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION,
+                             static_cast<GDBusProxyFlags>(
+                                 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+                                 G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
+                                 G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START),
+                             nullptr,
+                             "com.canonical.AppMenu.Registrar",
+                             "/com/canonical/AppMenu/Registrar",
+                             "com.canonical.AppMenu.Registrar",
+                             mCreateProxyCancellable, proxy_created_cb,
+                             nullptr);
+
+    /* We don't technically know that the shell will draw the menubar until
+     * we know whether anybody owns the name of the menubar service on the
+     * session bus. However, discovering this happens asynchronously so
+     * we optimize for the common case here by assuming that the shell will
+     * draw window menubars if we are running inside Unity. This should
+     * mean that we avoid temporarily displaying the window menubar ourselves
+     */
+    const char *desktop = getenv("XDG_CURRENT_DESKTOP");
+    if (nsCRT::strcmp(desktop, "Unity") == 0) {
+        SetOnline(true);
+    }
+
+    return NS_OK;
+}
+
+/* static */ void
+nsNativeMenuService::EnsureInitialized()
+{
+    if (sService) {
+        return;
+    }
+    nsCOMPtr<nsINativeMenuService> service =
+        do_GetService("@mozilla.org/widget/nativemenuservice;1");
+}
+
+void
+nsNativeMenuService::SetOnline(bool aOnline)
+{
+    if (!Preferences::GetBool("ui.use_unity_menubar", true)) {
+        aOnline = false;
+    }
+
+    mOnline = aOnline;
+    if (aOnline) {
+        for (uint32_t i = 0; i < mMenuBars.Length(); ++i) {
+            RegisterNativeMenuBar(mMenuBars[i]);
+        }
+    } else {
+        for (uint32_t i = 0; i < mMenuBars.Length(); ++i) {
+            mMenuBars[i]->Deactivate();
+        }
+    }
+}
+
+void
+nsNativeMenuService::RegisterNativeMenuBar(nsMenuBar *aMenuBar)
+{
+    if (!mOnline) {
+        return;
+    }
+
+    // This will effectively create the native menubar for
+    // exporting over the session bus, and hide the XUL menubar
+    aMenuBar->Activate();
+
+    if (!mDbusProxy ||
+        !gtk_widget_get_mapped(aMenuBar->TopLevelWindow()) ||
+        mMenuBarRegistrationCancellables.Get(aMenuBar, nullptr)) {
+        // Don't go further if we don't have a proxy for the shell menu
+        // service, the window isn't mapped or there is a request in progress.
+        return;
+    }
+
+    uint32_t xid = aMenuBar->WindowId();
+    nsCString path = aMenuBar->ObjectPath();
+    if (xid == 0 || path.IsEmpty()) {
+        NS_WARNING("Menubar has invalid XID or object path");
+        return;
+    }
+
+    GCancellable *cancellable = g_cancellable_new();
+    mMenuBarRegistrationCancellables.InsertOrUpdate(aMenuBar, cancellable);
+
+    // We keep a weak ref because we can't assume that GDBus cancellation
+    // is reliable (see https://launchpad.net/bugs/953562)
+
+    g_dbus_proxy_call(mDbusProxy, "RegisterWindow",
+                      g_variant_new("(uo)", xid, path.get()),
+                      G_DBUS_CALL_FLAGS_NONE, -1,
+                      cancellable,
+                      register_native_menubar_cb, aMenuBar);
+}
+
+/* static */ void
+nsNativeMenuService::name_owner_changed_cb(GObject *gobject,
+                                           GParamSpec *pspec,
+                                           gpointer user_data)
+{
+    nsNativeMenuService::GetSingleton()->OnNameOwnerChanged();
+}
+
+/* static */ void
+nsNativeMenuService::proxy_created_cb(GObject *source_object,
+                                      GAsyncResult *res,
+                                      gpointer user_data)
+{
+    GError *error = nullptr;
+    GDBusProxy *proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
+    if (error && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+        g_error_free(error);
+        return;
+    }
+
+    if (error) {
+        g_error_free(error);
+    }
+
+    // We need this check because we can't assume that GDBus cancellation
+    // is reliable (see https://launchpad.net/bugs/953562)
+    nsNativeMenuService *self = nsNativeMenuService::GetSingleton();
+    if (!self) {
+        if (proxy) {
+            g_object_unref(proxy);
+        }
+        return;
+    }
+
+    self->OnProxyCreated(proxy);
+}
+
+/* static */ void
+nsNativeMenuService::register_native_menubar_cb(GObject *source_object,
+                                                GAsyncResult *res,
+                                                gpointer user_data)
+{
+    nsMenuBar *menuBar = static_cast<nsMenuBar *>(user_data);
+
+    GError *error = nullptr;
+    GVariant *results = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object),
+                                                 res, &error);
+    if (results) {
+        // There's nothing useful in the response
+        g_variant_unref(results);
+    }
+
+    bool success = error ? false : true;
+    if (error && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+        g_error_free(error);
+        return;
+    }
+
+    if (error) {
+        g_error_free(error);
+    }
+
+    nsNativeMenuService *self = nsNativeMenuService::GetSingleton();
+    if (!self) {
+        return;
+    }
+
+    self->OnNativeMenuBarRegistered(menuBar, success);
+}
+
+/* static */ gboolean
+nsNativeMenuService::map_event_cb(GtkWidget *widget,
+                                  GdkEvent *event,
+                                  gpointer user_data)
+{
+    nsMenuBar *menubar = static_cast<nsMenuBar *>(user_data);
+    nsNativeMenuService::GetSingleton()->RegisterNativeMenuBar(menubar);
+
+    return FALSE;
+}
+
+void
+nsNativeMenuService::OnNameOwnerChanged()
+{
+    char *owner = g_dbus_proxy_get_name_owner(mDbusProxy);
+    SetOnline(owner ? true : false);
+    g_free(owner);
+}
+
+void
+nsNativeMenuService::OnProxyCreated(GDBusProxy *aProxy)
+{
+    mDbusProxy = aProxy;
+
+    g_object_unref(mCreateProxyCancellable);
+    mCreateProxyCancellable = nullptr;
+
+    if (!mDbusProxy) {
+        SetOnline(false);
+        return;
+    }
+
+    g_signal_connect(mDbusProxy, "notify::g-name-owner",
+                     G_CALLBACK(name_owner_changed_cb), nullptr);
+
+    OnNameOwnerChanged();
+}
+
+void
+nsNativeMenuService::OnNativeMenuBarRegistered(nsMenuBar *aMenuBar,
+                                               bool aSuccess)
+{
+    // Don't assume that GDBus cancellation is reliable (ie, |aMenuBar| might
+    // have already been deleted (see https://launchpad.net/bugs/953562)
+    GCancellable *cancellable = nullptr;
+    if (!mMenuBarRegistrationCancellables.Get(aMenuBar, &cancellable)) {
+        return;
+    }
+
+    g_object_unref(cancellable);
+    mMenuBarRegistrationCancellables.Remove(aMenuBar);
+
+    if (!aSuccess) {
+        aMenuBar->Deactivate();
+    }
+}
+
+/* static */ void
+nsNativeMenuService::PrefChangedCallback(const char *aPref,
+                                         void *aClosure)
+{
+    nsNativeMenuService::GetSingleton()->PrefChanged();
+}
+
+void
+nsNativeMenuService::PrefChanged()
+{
+    if (!mDbusProxy) {
+        SetOnline(false);
+        return;
+    }
+
+    OnNameOwnerChanged();
+}
+
+NS_IMETHODIMP
+nsNativeMenuService::CreateNativeMenuBar(nsIWidget *aParent,
+                                         mozilla::dom::Element *aMenuBarNode)
+{
+    NS_ENSURE_ARG(aParent);
+    NS_ENSURE_ARG(aMenuBarNode);
+
+    if (aMenuBarNode->AttrValueIs(kNameSpaceID_None,
+                                  nsGkAtoms::_moz_menubarkeeplocal,
+                                  nsGkAtoms::_true,
+                                  eCaseMatters)) {
+        return NS_OK;
+    }
+
+    UniquePtr<nsMenuBar> menubar(nsMenuBar::Create(aParent, aMenuBarNode));
+    if (!menubar) {
+        NS_WARNING("Failed to create menubar");
+        return NS_ERROR_FAILURE;
+    }
+
+    // Unity forgets our window if it is unmapped by the application, which
+    // happens with some extensions that add "minimize to tray" type
+    // functionality. We hook on to the MapNotify event to re-register our menu
+    // with Unity
+    g_signal_connect(G_OBJECT(menubar->TopLevelWindow()),
+                     "map-event", G_CALLBACK(map_event_cb),
+                     menubar.get());
+
+    mMenuBars.AppendElement(menubar.get());
+    RegisterNativeMenuBar(menubar.get());
+
+    static_cast<nsWindow *>(aParent)->SetMenuBar(std::move(menubar));
+
+    return NS_OK;
+}
+
+/* static */ already_AddRefed<nsNativeMenuService>
+nsNativeMenuService::GetInstanceForServiceManager()
+{
+    RefPtr<nsNativeMenuService> service(sService);
+
+    if (service) {
+        return service.forget();
+    }
+
+    service = new nsNativeMenuService();
+
+    if (NS_FAILED(service->Init())) {
+        return nullptr;
+    }
+
+    sService = service.get();
+    return service.forget();
+}
+
+/* static */ nsNativeMenuService*
+nsNativeMenuService::GetSingleton()
+{
+    EnsureInitialized();
+    return sService;
+}
+
+void
+nsNativeMenuService::NotifyNativeMenuBarDestroyed(nsMenuBar *aMenuBar)
+{
+    g_signal_handlers_disconnect_by_func(aMenuBar->TopLevelWindow(),
+                                         FuncToGpointer(map_event_cb),
+                                         aMenuBar);
+
+    mMenuBars.RemoveElement(aMenuBar);
+
+    GCancellable *cancellable = nullptr;
+    if (mMenuBarRegistrationCancellables.Get(aMenuBar, &cancellable)) {
+        mMenuBarRegistrationCancellables.Remove(aMenuBar);
+        g_cancellable_cancel(cancellable);
+        g_object_unref(cancellable);
+    }
+}
diff --git a/widget/gtk/nsNativeMenuService.h b/widget/gtk/nsNativeMenuService.h
new file mode 100644
index 0000000000000..2e0d429eddfdf
--- /dev/null
+++ b/widget/gtk/nsNativeMenuService.h
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __nsNativeMenuService_h__
+#define __nsNativeMenuService_h__
+
+#include "mozilla/Attributes.h"
+#include "nsCOMPtr.h"
+#include "nsTHashMap.h"
+#include "nsINativeMenuService.h"
+#include "nsTArray.h"
+
+#include <gdk/gdk.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+
+class nsMenuBar;
+
+/*
+ * The main native menu service singleton.
+ * NativeMenuSupport::CreateNativeMenuBar calls in to this when a new top level
+ * window is created.
+ *
+ * Menubars are owned by their nsWindow. This service holds a weak reference to
+ * each menubar for the purpose of re-registering them with the shell if it
+ * needs to. The menubar is responsible for notifying the service when the last
+ * reference to it is dropped.
+ */
+class nsNativeMenuService final : public nsINativeMenuService
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, mozilla::dom::Element* aMenuBarNode) override;
+
+    // Returns the singleton addref'd for the service manager
+    static already_AddRefed<nsNativeMenuService> GetInstanceForServiceManager();
+
+    // Returns the singleton without increasing the reference count
+    static nsNativeMenuService* GetSingleton();
+
+    // Called by a menubar when it is deleted
+    void NotifyNativeMenuBarDestroyed(nsMenuBar *aMenuBar);
+
+private:
+    nsNativeMenuService();
+    ~nsNativeMenuService();
+    nsresult Init();
+
+    static void EnsureInitialized();
+    void SetOnline(bool aOnline);
+    void RegisterNativeMenuBar(nsMenuBar *aMenuBar);
+    static void name_owner_changed_cb(GObject *gobject,
+                                      GParamSpec *pspec,
+                                      gpointer user_data);
+    static void proxy_created_cb(GObject *source_object,
+                                 GAsyncResult *res,
+                                 gpointer user_data);
+    static void register_native_menubar_cb(GObject *source_object,
+                                           GAsyncResult *res,
+                                           gpointer user_data);
+    static gboolean map_event_cb(GtkWidget *widget, GdkEvent *event,
+                                 gpointer user_data);
+    void OnNameOwnerChanged();
+    void OnProxyCreated(GDBusProxy *aProxy);
+    void OnNativeMenuBarRegistered(nsMenuBar *aMenuBar,
+                                   bool aSuccess);
+    static void PrefChangedCallback(const char *aPref, void *aClosure);
+    void PrefChanged();
+
+    GCancellable *mCreateProxyCancellable;
+    GDBusProxy *mDbusProxy;
+    bool mOnline;
+    nsTArray<nsMenuBar *> mMenuBars;
+    nsTHashMap<nsPtrHashKey<nsMenuBar>, GCancellable*> mMenuBarRegistrationCancellables;
+
+    static bool sShutdown;
+    static nsNativeMenuService *sService;
+};
+
+#endif /* __nsNativeMenuService_h__ */
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index e3a868823abba..b973958365047 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -3604,7 +3604,7 @@ void nsWindow::SetIcon(const nsAString& aIconSpec) {
     nsAutoString brandName;
     WidgetUtils::GetBrandShortName(brandName);
     if (brandName.IsEmpty()) {
-      brandName.AssignLiteral(u"Mozilla");
+      brandName.AssignLiteral(u"Waterfox");
     }
     AppendUTF16toUTF8(brandName, iconName);
     ToLowerCase(iconName);
@@ -7299,6 +7299,10 @@ void nsWindow::HideWindowChrome(bool aShouldHide) {
   SetWindowDecoration(aShouldHide ? BorderStyle::None : mBorderStyle);
 }
 
+void nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) {
+  mMenuBar = std::move(aMenuBar);
+}
+
 bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel,
                               bool aAlwaysRollup) {
   LOG("nsWindow::CheckForRollup() aAlwaysRollup %d", aAlwaysRollup);
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
index 9b3fa79080f54..a196612ff5314 100644
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -31,6 +31,8 @@
 #include "IMContextWrapper.h"
 #include "LookAndFeel.h"
 
+#include "nsMenuBar.h"
+
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/LocalAccessible.h"
 #endif
@@ -246,6 +248,8 @@ class nsWindow final : public nsBaseWidget {
   nsresult MakeFullScreen(bool aFullScreen) override;
   void HideWindowChrome(bool aShouldHide) override;
 
+  void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar);
+
   /**
    * GetLastUserInputTime returns a timestamp for the most recent user input
    * event.  This is intended for pointer grab requests (including drags).
@@ -970,6 +974,8 @@ class nsWindow final : public nsBaseWidget {
 
   static bool sTransparentMainWindow;
 
+  mozilla::UniquePtr<nsMenuBar> mMenuBar;
+
 #ifdef ACCESSIBILITY
   RefPtr<mozilla::a11y::LocalAccessible> mRootAccessible;
 
diff --git a/widget/moz.build b/widget/moz.build
index 4327ffeb16a6e..1913a726d6d75 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -170,6 +170,11 @@ EXPORTS += [
     "PuppetWidget.h",
 ]
 
+if toolkit == "gtk":
+    EXPORTS += [
+        "nsINativeMenuService.h",
+    ]
+
 EXPORTS.mozilla += [
     "BasicEvents.h",
     "ClipboardContentAnalysisChild.h",
diff --git a/widget/nsINativeMenuService.h b/widget/nsINativeMenuService.h
new file mode 100644
index 0000000000000..24b5cef60dacb
--- /dev/null
+++ b/widget/nsINativeMenuService.h
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+#ifndef nsINativeMenuService_h_
+#define nsINativeMenuService_h_
+
+#include "nsISupports.h"
+
+class nsIWidget;
+class nsIContent;
+namespace mozilla {
+namespace dom {
+class Element;
+}
+}  // namespace mozilla
+
+// {90DF88F9-F084-4EF3-829A-49496E636DED}
+#define NS_INATIVEMENUSERVICE_IID                    \
+  {                                                  \
+    0x90DF88F9, 0xF084, 0x4EF3, {                    \
+      0x82, 0x9A, 0x49, 0x49, 0x6E, 0x63, 0x6D, 0xED \
+    }                                                \
+  }
+
+class nsINativeMenuService : public nsISupports {
+ public:
+  NS_INLINE_DECL_STATIC_IID(NS_INATIVEMENUSERVICE_IID)
+  // Given a top-level window widget and a menu bar DOM node, sets up native
+  // menus. Once created, native menus are controlled via the DOM, including
+  // destruction.
+  NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent,
+                                 mozilla::dom::Element* aMenuBarNode) = 0;
+};
+
+
+#endif  // nsINativeMenuService_h_
diff --git a/widget/nsWidgetsCID.h b/widget/nsWidgetsCID.h
index 7710005e171b3..5b737b80483f3 100644
--- a/widget/nsWidgetsCID.h
+++ b/widget/nsWidgetsCID.h
@@ -38,6 +38,14 @@
 // Menus
 //-----------------------------------------------------------
 
+// {0B3FE5AA-BC72-4303-85AE-76365DF1251D}
+#define NS_NATIVEMENUSERVICE_CID                     \
+  {                                                  \
+    0x0B3FE5AA, 0xBC72, 0x4303, {                    \
+      0x85, 0xAE, 0x76, 0x36, 0x5D, 0xF1, 0x25, 0x1D \
+    }                                                \
+  }
+
 // {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
 #define NS_POPUPMENU_CID \
   {0xf6cd4f21, 0x53af, 0x11d2, {0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e}}
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index ff0c90f96ed02..88c9417194b75 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -1971,6 +1971,9 @@ nsresult GfxInfo::GetFeatureStatusImpl(
         !adapterVendorID.Equals(
             GfxDriverInfo::GetDeviceVendor(DeviceVendor::Qualcomm),
             nsCaseInsensitiveStringComparator) &&
+        !adapterVendorID.Equals(
+            GfxDriverInfo::GetDeviceVendor(DeviceVendor::VMWare),
+            nsCaseInsensitiveStringComparator) &&
         // FIXME - these special hex values are currently used in xpcshell tests
         // introduced by bug 625160 patch 8/8. Maybe these tests need to be
         // adjusted now that we're only whitelisting intel/ati/nvidia.
@@ -1981,9 +1984,6 @@ nsresult GfxInfo::GetFeatureStatusImpl(
       if (adapterVendorID.Equals(
               GfxDriverInfo::GetDeviceVendor(DeviceVendor::MicrosoftHyperV),
               nsCaseInsensitiveStringComparator) ||
-          adapterVendorID.Equals(
-              GfxDriverInfo::GetDeviceVendor(DeviceVendor::VMWare),
-              nsCaseInsensitiveStringComparator) ||
           adapterVendorID.Equals(
               GfxDriverInfo::GetDeviceVendor(DeviceVendor::VirtualBox),
               nsCaseInsensitiveStringComparator)) {
diff --git a/widget/windows/WinTaskbar.cpp b/widget/windows/WinTaskbar.cpp
index 8dc5aef71e1d7..ff412dbde356d 100644
--- a/widget/windows/WinTaskbar.cpp
+++ b/widget/windows/WinTaskbar.cpp
@@ -238,7 +238,7 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId,
   nsCString appName;
   if (appInfo && NS_SUCCEEDED(appInfo->GetName(appName))) {
     nsAutoString regKey;
-    regKey.AssignLiteral("Software\\Mozilla\\");
+    regKey.AssignLiteral("Software\\BrowserWorks\\");
     AppendASCIItoUTF16(appName, regKey);
     regKey.AppendLiteral("\\TaskBarIDs");
 
diff --git a/widget/windows/tests/TestUrisToValidate.h b/widget/windows/tests/TestUrisToValidate.h
index cb00366d1ed3e..dedb7524fbac2 100644
--- a/widget/windows/tests/TestUrisToValidate.h
+++ b/widget/windows/tests/TestUrisToValidate.h
@@ -26,9 +26,9 @@ const wchar_t* kTestUris[] = {
     L"firefox.url:%.txt",
     L"firefox.url:%00.txt",
     L"firefox.url:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
-    L"firefoxurl:%.txt",
-    L"firefoxurl:%00.txt",
-    L"firefoxurl:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
+    L"WaterfoxURL:%.txt",
+    L"WaterfoxURL:%00.txt",
+    L"WaterfoxURL:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
     L"ftp:%.txt",
     L"ftp:%00.txt",
     L"ftp:%41%2D%31%5Ftest&quot;ing?%41%31%00.txt",
diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h
index 128bbb2ac21d3..40282d1612090 100644
--- a/xpcom/build/nsXPCOMPrivate.h
+++ b/xpcom/build/nsXPCOMPrivate.h
@@ -56,7 +56,7 @@ void LogTerm();
 
 #  define XPCOM_SEARCH_KEY "PATH"
 #  define GRE_CONF_NAME "gre.config"
-#  define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE"
+#  define GRE_WIN_REG_LOC L"Software\\waterfox.net\\GRE"
 #  define XPCOM_DLL XUL_DLL
 #  define LXPCOM_DLL LXUL_DLL
 #  define XUL_DLL "xul.dll"
diff --git a/xpcom/ds/NativeMenuAtoms.py b/xpcom/ds/NativeMenuAtoms.py
new file mode 100644
index 0000000000000..488c8f49c0217
--- /dev/null
+++ b/xpcom/ds/NativeMenuAtoms.py
@@ -0,0 +1,9 @@
+from Atom import Atom
+
+NATIVE_MENU_ATOMS = [
+    Atom("menuitem_with_favicon", "menuitem-with-favicon"),
+    Atom("_moz_menubarkeeplocal", "_moz-menubarkeeplocal"),
+    Atom("_moz_nativemenupopupstate", "_moz-nativemenupopupstate"),
+    Atom("openedwithkey", "openedwithkey"),
+    Atom("shellshowingmenubar", "shellshowingmenubar"),
+]
diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
index 6609d62abfc44..b31dc1def717f 100644
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@@ -13,6 +13,7 @@
     PseudoElementAtom,
 )
 from HTMLAtoms import HTML_PARSER_ATOMS
+from NativeMenuAtoms import NATIVE_MENU_ATOMS
 
 # Static atom definitions, used to generate nsGkAtomList.h.
 #
@@ -2610,7 +2611,7 @@
     InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
     InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
     # END ATOMS
-] + HTML_PARSER_ATOMS
+] + HTML_PARSER_ATOMS + NATIVE_MENU_ATOMS
 # fmt: on
 
 
diff --git a/xpcom/tests/TestWinReg.js b/xpcom/tests/TestWinReg.js
index 8462f3ff04f32..edc312f9b0e8c 100644
--- a/xpcom/tests/TestWinReg.js
+++ b/xpcom/tests/TestWinReg.js
@@ -7,7 +7,7 @@
  */
 
 const nsIWindowsRegKey = Ci.nsIWindowsRegKey;
-const BASE_PATH = "SOFTWARE\\Mozilla\\Firefox";
+const BASE_PATH = "SOFTWARE\\BrowserWorks\\Waterfox";
 
 function idump(indent, str) {
   for (var j = 0; j < indent; ++j) {
diff --git a/xpcom/windbgdlg/windbgdlg.cpp b/xpcom/windbgdlg/windbgdlg.cpp
index 2bd1139b2354a..591f5fa8f7504 100644
--- a/xpcom/windbgdlg/windbgdlg.cpp
+++ b/xpcom/windbgdlg/windbgdlg.cpp
@@ -76,9 +76,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   DWORD regValue = -1;
   DWORD regLength = sizeof regValue;
   HKEY hkeyCU, hkeyLM;
-  RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\mozilla.org\\windbgdlg", 0,
+  RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\waterfox.org\\windbgdlg", 0,
                 KEY_READ, &hkeyCU);
-  RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\mozilla.org\\windbgdlg", 0,
+  RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\waterfox.org\\windbgdlg", 0,
                 KEY_READ, &hkeyLM);
   for (int i = __argc - 1; regValue == (DWORD)-1 && i; --i) {
     bool ok = false;